diff --git a/.drone.yml b/.drone.yml
index 8fb385b..72d3b03 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,70 +1,89 @@
 ---
 kind: pipeline
 type: docker
-name: build-linux
-
-environment:
-  GOOS: linux
-  GOOPTIONS: -mod=vendor
-  SRCFILES: cmd/pki/*.go
-  PROJECTNAME: pki
+name: cleanup-before
 
 steps:
-  - name: build-linux-amd64
-    image: golang
+  - name: clean
+    image: alpine
     commands:
-      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-    environment:
-      GOARCH: amd64
+      - rm -rf /build/*
+    volumes:
+      - name: build
+        path: /build
     when:
-      event:
-        exclude:
-          - tag
-  - name: build-linux-arm64
-    image: golang
-    commands:
-      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-    environment:
-      GOARCH: arm64
-    when:
-      event:
-        exclude:
-          - tag
+      event: tag
+
+volumes:
+  - name: build
+    host:
+      path: /tmp/pki/build
 
 ---
 kind: pipeline
 type: docker
-name: gitea-release-linux
-
-environment:
-  GOOS: linux
-  GOOPTIONS: -mod=vendor
-  SRCFILES: cmd/pki/*.go
-  PROJECTNAME: pki
+name: default-linux-amd64
 
 steps:
-  - name: build-linux-amd64
+  - name: build
     image: golang
     commands:
-      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-      - tar -czvf $PROJECTNAME-$DRONE_TAG-$GOOS-$GOARCH.tar.gz $PROJECTNAME
-      - echo $PROJECTNAME $DRONE_TAG > VERSION
+      - ./ci-build.sh build
     environment:
+      GOOS: linux
       GOARCH: amd64
-    when:
-      event:
-        - tag
-  - name: build-linux-arm64
+    volumes:
+      - name: build
+        path: /build
+
+volumes:
+  - name: build
+    host:
+      path: /tmp/pki/build
+
+depends_on:
+  - cleanup-before
+
+---
+kind: pipeline
+type: docker
+name: default-linux-arm64
+
+steps:
+  - name: build
     image: golang
     commands:
-      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-      - tar -czvf $PROJECTNAME-$DRONE_TAG-$GOOS-$GOARCH.tar.gz $PROJECTNAME
-      - echo $PROJECTNAME $DRONE_TAG > VERSION
+      - ./ci-build.sh build
     environment:
+      GOOS: linux
       GOARCH: arm64
+    volumes:
+      - name: build
+        path: /build
+
+volumes:
+  - name: build
+    host:
+      path: /tmp/pki/build
+
+depends_on:
+  - cleanup-before
+
+---
+kind: pipeline
+type: docker
+name: gitea-release
+
+steps:
+  - name: move
+    image: alpine
+    commands:
+      - mv build/* ./
+    volumes:
+      - name: build
+        path: /drone/src/build
     when:
-      event:
-        - tag
+      event: tag
   - name: release
     image: plugins/gitea-release
     settings:
@@ -76,6 +95,50 @@ steps:
         - sha256
         - sha512
       title: VERSION
+    volumes:
+      - name: build
+        path: /drone/src/build
     when:
-      event:
-        - tag
+      event: tag
+  - name: ls
+    image: alpine
+    commands:
+      - find .
+    volumes:
+      - name: build
+        path: /drone/src/build
+    when:
+      event: tag
+
+volumes:
+  - name: build
+    host:
+      path: /tmp/pki/build
+
+depends_on:
+  - default-linux-amd64
+  - default-linux-arm64
+
+---
+kind: pipeline
+type: docker
+name: cleanup-after
+
+steps:
+  - name: clean
+    image: alpine
+    commands:
+      - rm -rf /build/*
+    volumes:
+      - name: build
+        path: /build
+    when:
+      event: tag
+
+volumes:
+  - name: build
+    host:
+      path: /tmp/pki/build
+
+depends_on:
+  - gitea-release
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a544f18
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+# pki Makefile
+
+GOCMD=go
+GOBUILDCMD=${GOCMD} build
+GOOPTIONS=-mod=vendor -ldflags="-s -w"
+
+RMCMD=rm
+BINNAME=pki
+
+SRCFILES=cmd/pki/*.go
+
+all: build
+
+build:
+	${GOBUILDCMD} ${GOOPTIONS} ${SRCFILES}
+
+clean:
+	${RMCMD} -f ${BINNAME}
\ No newline at end of file
diff --git a/README.md b/README.md
index bc0eeaf..a4f6277 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ PKI is a centralized Letsencrypt database server and renewer for certificate man
 ### Build
 
 ```bash
-go build cmd/pki/pki.go
+make
 ```
 
 ### Sample config in pki.ini
@@ -40,7 +40,7 @@ ovhck=
 ## License
 
 ```text
-Copyright (c) 2020, 2021, 2022 PaulBSD
+Copyright (c) 2020, 2021 PaulBSD
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ci-build.sh b/ci-build.sh
new file mode 100755
index 0000000..85f340d
--- /dev/null
+++ b/ci-build.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+set -e
+
+PROJECTNAME=pki
+RELEASENAME=${PROJECTNAME}
+VERSION="0"
+
+GOOPTIONS="-mod=vendor"
+SRCFILES=cmd/${PROJECTNAME}/*.go
+
+build() {
+  echo "Begin of build"
+  if [[ ! -z $DRONE_TAG ]]
+  then
+    echo "Drone tag set, let's do a release"
+    VERSION=$DRONE_TAG
+    echo "${PROJECTNAME} ${VERSION}" > /build/VERSION
+  elif [[ ! -z $DRONE_TAG ]]
+  then
+    echo "Drone not set, let's only do a build"
+    VERSION=$DRONE_COMMIT
+  fi
+
+  if [[ ! -z $VERSION && ! -z $GOOS && ! -z $GOARCH ]]
+  then
+    echo "Let's set a release name"
+    RELEASENAME=${PROJECTNAME}-${VERSION}-${GOOS}-${GOARCH}
+  fi
+
+  echo "Building project"
+  go build -o ${PROJECTNAME} ${GOOPTIONS} ${SRCFILES}
+  
+  if [[ ! -z $DRONE_TAG ]]
+  then
+    echo "Let's make archives"
+    mkdir -p /build
+    tar -czvf /build/${RELEASENAME}.tar.gz ${PROJECTNAME}
+  fi
+
+  echo "Removing binary file"
+  rm ${PROJECTNAME}
+
+  echo "End of build"
+}
+
+clean() {
+  rm -rf $RELEASEDIR
+}
+
+case $1 in
+  "build")
+    build
+  ;;
+  "clean")
+    clean
+  ;;
+  *)
+    echo "No options choosen"
+    exit 1
+  ;;
+esac
diff --git a/go.mod b/go.mod
index 922c318..7eb1e93 100644
--- a/go.mod
+++ b/go.mod
@@ -1,42 +1,41 @@
 module git.paulbsd.com/paulbsd/pki
 
-go 1.24.4
+go 1.17
 
 require (
-	github.com/go-acme/lego/v4 v4.23.1
-	github.com/golang/snappy v1.0.0 // indirect
-	github.com/labstack/echo/v4 v4.13.4
-	github.com/lib/pq v1.10.9
-	github.com/miekg/dns v1.1.66 // indirect
+	github.com/go-acme/lego/v4 v4.4.0
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04 // indirect
+	github.com/labstack/echo/v4 v4.5.0
+	github.com/lib/pq v1.10.3
+	github.com/miekg/dns v1.1.43 // indirect
 	github.com/onsi/ginkgo v1.16.0 // indirect
 	github.com/onsi/gomega v1.11.0 // indirect
-	golang.org/x/crypto v0.39.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	golang.org/x/time v0.12.0 // indirect
-	gopkg.in/ini.v1 v1.67.0
-	xorm.io/builder v0.3.13 // indirect
-	xorm.io/xorm v1.3.9
+	github.com/smartystreets/assertions v1.2.0 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gopkg.in/ini.v1 v1.62.1
+	xorm.io/builder v0.3.9 // indirect
+	xorm.io/xorm v1.2.3
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.1 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
+	github.com/goccy/go-json v0.7.8 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/labstack/gommon v0.3.0 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ovh/go-ovh v1.9.0 // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/ovh/go-ovh v1.1.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.2 // indirect
-	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	github.com/valyala/fasttemplate v1.2.1 // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 5f656dc..54d1601 100644
--- a/go.sum
+++ b/go.sum
@@ -1,42 +1,190 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
-github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod h1:Gf7/i2FUpyb/sGBLIFxTBzrNzBo7aPXXE3ZVeDRwdpM=
+github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/akamai/AkamaiOPEN-edgegrid-golang v1.1.0/go.mod h1:kX6YddBkXqqywAe8c9LyvgTCyFuZCTMF4cRPQhc3Fy8=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.976/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
+github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
+github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/c-bata/go-prompt v0.2.5/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw=
+github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
+github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
+github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ=
+github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpu/goacmedns v0.1.1/go.mod h1:MuaouqEhPAHxsbqjgnck5zeghuwBP1dLnPoobeGqugQ=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/deepmap/oapi-codegen v1.3.11/go.mod h1:suMvK7+rKlx3+tpa8ByptmvoXbAV70wERKTOGH3hLp0=
+github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/dnsimple/dnsimple-go v0.63.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/exoscale/egoscale v0.46.0/go.mod h1:mpEXBpROAa/2i5GC0r33rfxG+TxSEka11g1PIXt9+zc=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
+github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/go-acme/lego/v4 v4.16.1 h1:JxZ93s4KG0jL27rZ30UsIgxap6VGzKuREsSkkyzeoCQ=
-github.com/go-acme/lego/v4 v4.16.1/go.mod h1:AVvwdPned/IWpD/ihHhMsKnveF7HHYAz/CmtXi7OZoE=
-github.com/go-acme/lego/v4 v4.17.4 h1:h0nePd3ObP6o7kAkndtpTzCw8shOZuWckNYeUQwo36Q=
-github.com/go-acme/lego/v4 v4.17.4/go.mod h1:dU94SvPNqimEeb7EVilGGSnS0nU1O5Exir0pQ4QFL4U=
-github.com/go-acme/lego/v4 v4.23.1 h1:lZ5fGtGESA2L9FB8dNTvrQUq3/X4QOb8ExkKyY7LSV4=
-github.com/go-acme/lego/v4 v4.23.1/go.mod h1:7UMVR7oQbIYw6V7mTgGwi4Er7B6Ww0c+c8feiBM0EgI=
-github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U=
-github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
-github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
-github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
-github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI=
-github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/getkin/kin-openapi v0.13.0/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-acme/lego/v4 v4.4.0 h1:uHhU5LpOYQOdp3aDU+XY2bajseu8fuExphTL1Ss6/Fc=
+github.com/go-acme/lego/v4 v4.4.0/go.mod h1:l3+tFUFZb590dWcqhWZegynUthtaHJbG2fevUpoOOE0=
+github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b/go.mod h1:Xo4aNUOrJnVruqWQJBtW6+bTBDTniY8yZum5rF3b5jw=
+github.com/goccy/go-json v0.7.4/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.7.8 h1:CvMH7LotYymYuLGEohBM1lTZWX4g6jzWUUl2aLFuBoE=
+github.com/goccy/go-json v0.7.8/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -47,56 +195,254 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
-github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gophercloud/gophercloud v0.15.1-0.20210202035223-633d73521055/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
+github.com/gophercloud/gophercloud v0.16.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
+github.com/gophercloud/utils v0.0.0-20210216074907-f6de111f2eae/go.mod h1:wx8HMD8oQD0Ryhz6+6ykq75PJ79iPyEqYHfwZ4l7OsA=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04 h1:Enykqupm0u6qiUZAc+SiFkMJVqt4o8knNcKJu8NdlJ0=
+github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc=
-github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/infobloxopen/infoblox-go-client v1.1.1/go.mod h1:BXiw7S2b9qJoM8MS40vfgCNB2NLHGusk1DtO16BD9zI=
+github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
+github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
+github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
+github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
+github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g=
+github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
+github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
+github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
+github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE=
+github.com/jackc/pgtype v1.8.0/go.mod h1:PqDKcEBtllAtk/2p6z6SHdXW5UB+MhE75tUol2OKexE=
+github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
+github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
+github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
+github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
+github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
+github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc=
+github.com/jackc/pgx/v4 v4.12.0/go.mod h1:fE547h6VulLPA3kySjfnSG/e2D861g/50JlVUa/ub60=
+github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jarcoal/httpmock v1.0.6/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
-github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
-github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
-github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
-github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
-github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g=
-github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
-github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE=
-github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA=
+github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w=
+github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/echo/v4 v4.5.0 h1:JXk6H5PAw9I3GwizqUHhYyS4f45iyGebR/c1xNCeOCY=
+github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
+github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
+github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
+github.com/linode/linodego v0.25.3/go.mod h1:GSBKPpjoQfxEfryoCRcgkuUOCuVtGHWhzI8OMdycNTE=
+github.com/liquidweb/go-lwApi v0.0.0-20190605172801-52a4864d2738/go.mod h1:0sYF9rMXb0vlG+4SzdiGMXHheCZxjguMq+Zb4S2BfBs=
+github.com/liquidweb/go-lwApi v0.0.5/go.mod h1:0sYF9rMXb0vlG+4SzdiGMXHheCZxjguMq+Zb4S2BfBs=
+github.com/liquidweb/liquidweb-cli v0.6.9/go.mod h1:cE1uvQ+x24NGUL75D0QagOFCG8Wdvmwu8aL9TLmA/eQ=
+github.com/liquidweb/liquidweb-go v1.6.3/go.mod h1:SuXXp+thr28LnjEw18AYtWwIbWMHSUiajPQs8T9c/Rc=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
+github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
+github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
+github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8=
+github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI=
+github.com/nrdcg/desec v0.5.0/go.mod h1:2ejvMazkav1VdDbv2HeQO7w+Ta1CGHqzQr27ZBYTuEQ=
+github.com/nrdcg/dnspod-go v0.4.0/go.mod h1:vZSoFSFeQVm2gWLMkyX61LZ8HI3BaqtHZWgPTGKr6KQ=
+github.com/nrdcg/goinwx v0.8.1/go.mod h1:tILVc10gieBp/5PMvbcYeXM6pVQ+c9jxDZnpaR1UW7c=
+github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw=
+github.com/nrdcg/porkbun v0.1.1/go.mod h1:JWl/WKnguWos4mjfp4YizvvToigk9qpQwrodOk+CPoA=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
@@ -107,159 +453,535 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug=
 github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
-github.com/ovh/go-ovh v1.5.1 h1:P8O+7H+NQuFK9P/j4sFW5C0fvSS2DnHYGPwdVCp45wI=
-github.com/ovh/go-ovh v1.5.1/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c=
-github.com/ovh/go-ovh v1.6.0 h1:ixLOwxQdzYDx296sXcgS35TOPEahJkpjMGtzPadCjQI=
-github.com/ovh/go-ovh v1.6.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c=
-github.com/ovh/go-ovh v1.9.0 h1:6K8VoL3BYjVV3In9tPJUdT7qMx9h0GExN9EXx1r2kKE=
-github.com/ovh/go-ovh v1.9.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
+github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
+github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/ovh/go-ovh v1.1.0 h1:bHXZmw8nTgZin4Nv7JuaLs0KG5x54EQR7migYTd1zrk=
+github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
+github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
+github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
+github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
+github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/pquerna/otp v1.3.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sacloud/libsacloud v1.36.2/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210127161313-bd30bebeac4f/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/gunit v1.0.4/go.mod h1:EH5qMBab2UclzXUcpR8b93eHsIlp9u+pDQIRp5DZNzQ=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/transip/gotransip/v6 v6.2.0/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g=
+github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
-github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/vinyldns/go-vinyldns v0.0.0-20200917153823-148a5f6b8f14/go.mod h1:RWc47jtnVuQv6+lY3c768WtXCas/Xi+U5UFc5xULmYg=
+github.com/vultr/govultr/v2 v2.0.0/go.mod h1:2PsEeg+gs3p/Fo5Pw8F9mv+DUBEOlrNZ8GmCTGmhOhs=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
-golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
+golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210903071746-97244b99971b h1:3Dq0eVHn0uaQJmPO+/aYPI/fRMqdrVDbu7MQcku54gg=
+golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
-golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e h1:4nW4NLDYnU28ojHaHO8OVxFHk/aQ33U01a9cjED+pzE=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
+gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.62.1 h1:Idt4Iidq1iKKmhakQtqAIvBBL53JTyuNIX+wR/rmkp4=
+gopkg.in/ini.v1 v1.62.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ns1/ns1-go.v2 v2.4.4/go.mod h1:GMnKY+ZuoJ+lVLL+78uSTjwTz2jMazq6AfGKQOYhsPk=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
+gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
-modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
-modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
-modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
-modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
-modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
-modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE=
-modernc.org/sqlite v1.20.4/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
-modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
-modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
-modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo=
-xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.9 h1:TUovzS0ko+IQ1XnNLfs5dqK1cJl1H5uHpWbWqAQ04nU=
-xorm.io/xorm v1.3.9/go.mod h1:LsCCffeeYp63ssk0pKumP6l96WZcHix7ChpurcLNuMw=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU=
+lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.33.6 h1:r63dgSzVzRxUpAJFPQWHy1QeZeY1ydNENUDaBx1GqYc=
+modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/ccgo/v3 v3.9.5 h1:dEuUSf8WN51rDkprFuAqjfchKEzN0WttP/Py3enBwjk=
+modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
+modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
+modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.9.11 h1:QUxZMs48Ahg2F7SN41aERvMfGLY2HU/ADnB9DC4Yts8=
+modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
+modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.4.0 h1:GCjoRaBew8ECCKINQA2nYjzvufFW9YiEuuB+rQ9bn2E=
+modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
+modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.11.2 h1:ShWQpeD3ag/bmx6TqidBlIWonWmQaSQKls3aenCbt+w=
+modernc.org/sqlite v1.11.2/go.mod h1:+mhs/P1ONd+6G7hcAs6irwDi/bjTQ7nLW6LHRBsEa3A=
+modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs=
+modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
+modernc.org/tcl v1.5.5/go.mod h1:ADkaTUuwukkrlhqwERyq0SM8OvyXo7+TjFz7yAF56EI=
+modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
+modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
+xorm.io/builder v0.3.9 h1:Sd65/LdWyO7LR8+Cbd+e7mm3sK/7U9k0jS3999IDHMc=
+xorm.io/builder v0.3.9/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
+xorm.io/xorm v1.2.3 h1:ZsVtQEsfkA31bbe8lhrP5cZKUjrxXQQO5tsr7Tf/0eo=
+xorm.io/xorm v1.2.3/go.mod h1:fTG8tSjk6O1BYxwuohZUK+S1glnRycsCF05L1qQyEU0=
diff --git a/src/cert/main.go b/src/cert/main.go
index 2d7e85b..fc68d34 100644
--- a/src/cert/main.go
+++ b/src/cert/main.go
@@ -2,13 +2,10 @@ package cert
 
 import "time"
 
-func (e *Entry) Z() {
-}
-
 // Entry is the main struct for stored certificates
 type Entry struct {
 	ID            int       `xorm:"pk autoincr"`
-	Domain        string    `xorm:"notnull"`
+	Domains       string    `xorm:"notnull"`
 	Certificate   string    `xorm:"text notnull"`
 	PrivateKey    string    `xorm:"text notnull"`
 	AuthURL       string    `xorm:"notnull"`
diff --git a/src/config/main.go b/src/config/main.go
index a482135..5a3f31e 100644
--- a/src/config/main.go
+++ b/src/config/main.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"flag"
+	"fmt"
 
 	"git.paulbsd.com/paulbsd/pki/utils"
 	"github.com/go-acme/lego/v4/lego"
@@ -38,6 +39,7 @@ func (cfg *Config) GetConfig() error {
 	}
 
 	pkisection := inicfg.Section("pki")
+	options := make(map[string]string)
 
 	cfg.DbParams.DbHostname = pkisection.Key("db_hostname").MustString("localhost")
 	cfg.DbParams.DbName = pkisection.Key("db_name").MustString("database")
@@ -53,13 +55,23 @@ func (cfg *Config) GetConfig() error {
 	cfg.ACME.Env = pkisection.Key("env").MustString("prod")
 	cfg.ACME.MaxDaysBefore = pkisection.Key("maxdaysbefore").MustInt(0)
 
+	options["ovhendpoint"] = pkisection.Key("ovhendpoint").MustString("ovh-eu")
+	options["ovhak"] = pkisection.Key("ovhak").MustString("")
+	options["ovhas"] = pkisection.Key("ovhas").MustString("")
+	options["ovhck"] = pkisection.Key("ovhck").MustString("")
+
+	cfg.ACME.ProviderOptions = options
+	for k, v := range options {
+		if v == "" {
+			utils.Advice(fmt.Sprintf("OVH provider parameter %s not set", k))
+		}
+	}
+
 	switch cfg.ACME.Env {
 	case "prod":
 		cfg.ACME.AuthURL = lego.LEDirectoryProduction
 	case "staging":
 		cfg.ACME.AuthURL = lego.LEDirectoryStaging
-	default:
-		cfg.ACME.AuthURL = lego.LEDirectoryStaging
 	}
 
 	return nil
@@ -86,9 +98,10 @@ type Config struct {
 		Init   bool `json:"init"`
 	} `json:"-"`
 	ACME struct {
-		Env           string `json:"env"`
-		AuthURL       string `json:"authurl"`
-		MaxDaysBefore int    `json:"maxdaysbefore"`
+		Env             string            `json:"env"`
+		AuthURL         string            `json:"authurl"`
+		ProviderOptions map[string]string `json:"provideroptions"`
+		MaxDaysBefore   int               `json:"maxdaysbefore"`
 	}
 	Init struct {
 		Email    string `json:"email"`
diff --git a/src/database/main.go b/src/database/main.go
index 2528b77..641bb62 100644
--- a/src/database/main.go
+++ b/src/database/main.go
@@ -7,7 +7,6 @@ import (
 
 	"git.paulbsd.com/paulbsd/pki/src/cert"
 	"git.paulbsd.com/paulbsd/pki/src/config"
-	"git.paulbsd.com/paulbsd/pki/src/domain"
 	"git.paulbsd.com/paulbsd/pki/src/pki"
 	_ "github.com/lib/pq"
 	"xorm.io/xorm"
@@ -17,8 +16,8 @@ import (
 // Init creates connection to database and exec Schema
 func Init(cfg *config.Config) (err error) {
 	var databaseEngine = "postgres"
-	tables := []any{cert.Entry{},
-		pki.User{}, domain.Domain{}, pki.Provider{}}
+	tables := []interface{}{cert.Entry{},
+		pki.User{}}
 
 	cfg.Db, err = xorm.NewEngine(databaseEngine,
 		fmt.Sprintf("%s://%s:%s@%s/%s",
@@ -42,14 +41,8 @@ func Init(cfg *config.Config) (err error) {
 
 	log.Println("Syncing tables")
 	for _, table := range tables {
-		err = cfg.Db.CreateTables(table)
-		if err != nil {
-			log.Fatalln(err)
-		}
-		err = cfg.Db.Sync(table)
-		if err != nil {
-			log.Fatalln(err)
-		}
+		cfg.Db.CreateTables(table)
+		cfg.Db.Sync2(table)
 	}
 	return
 }
diff --git a/src/domain/main.go b/src/domain/main.go
deleted file mode 100644
index 3d13b65..0000000
--- a/src/domain/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package domain
-
-import "time"
-
-// Domain describes a domain
-type Domain struct {
-	ID       int       `xorm:"pk autoincr"`
-	Domain   string    `xorm:"text notnull unique(domain_provider)"`
-	Provider string    `xorm:"text notnull unique(domain_provider)"`
-	Created  time.Time `xorm:"created notnull"`
-	Updated  time.Time `xorm:"updated notnull"`
-}
diff --git a/src/pki/acme.go b/src/pki/acme.go
index 6cd9609..11c77b2 100644
--- a/src/pki/acme.go
+++ b/src/pki/acme.go
@@ -9,13 +9,12 @@ import (
 	"encoding/pem"
 	"fmt"
 	"log"
+	"strings"
 
 	"git.paulbsd.com/paulbsd/pki/src/cert"
 	"git.paulbsd.com/paulbsd/pki/src/config"
-	"git.paulbsd.com/paulbsd/pki/src/domain"
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/certificate"
-	"github.com/go-acme/lego/v4/challenge"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 )
@@ -30,12 +29,15 @@ func (u *User) Init(cfg *config.Config) (err error) {
 }
 
 // GetEntry returns requested acme ressource in database relative to domain
-func (u *User) GetEntry(cfg *config.Config, domain *string) (Entry cert.Entry, err error) {
-	has, err := cfg.Db.Where("domain = ?", domain).And(
+func (u *User) GetEntry(cfg *config.Config, domains []string) (Entry cert.Entry, err error) {
+
+	has, err := cfg.Db.Where("domains = ?", strings.Join(domains, ",")).And(
 		"auth_url = ?", cfg.ACME.AuthURL).And(
 		fmt.Sprintf("validity_end::timestamp-'%d DAY'::INTERVAL >= now()", cfg.ACME.MaxDaysBefore)).Desc(
 		"id").Get(&Entry)
 
+	fmt.Println(has, err)
+
 	if !has {
 		err = fmt.Errorf("entry doesn't exists")
 	}
@@ -66,45 +68,12 @@ func (u *User) HandleRegistration(cfg *config.Config, client *lego.Client) (err
 }
 
 // RequestNewCert returns a newly requested certificate to letsencrypt
-func (u *User) RequestNewCert(cfg *config.Config, domainnames *[]string) (certs *certificate.Resource, err error) {
+func (u *User) RequestNewCert(cfg *config.Config, domains []string) (certificates *certificate.Resource, err error) {
 	legoconfig := lego.NewConfig(u)
 	legoconfig.CADirURL = cfg.ACME.AuthURL
 	legoconfig.Certificate.KeyType = certcrypto.RSA2048
 
-	var dom domain.Domain
-	var has bool
-	for _, d := range *domainnames {
-		dom = domain.Domain{Domain: d}
-		if has, err = cfg.Db.Get(&dom); has {
-			break
-		}
-		if err != nil {
-			log.Println(err)
-		}
-	}
-
-	if !has {
-		err = fmt.Errorf("supplied domain not in allowed domains")
-		return
-	}
-
-	var provider challenge.Provider
-	var pkiprovider Provider
-
-	_, err = cfg.Db.Where("name = ?", dom.Provider).Get(&pkiprovider)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	switch dom.Provider {
-	case "ovh":
-		provider, err = pkiprovider.initOVHProvider()
-	case "pdns":
-		provider, err = pkiprovider.initPowerDNSProvider()
-	default:
-		return
-	}
+	ovhprovider, err := initProvider(cfg)
 	if err != nil {
 		log.Println(err)
 	}
@@ -114,7 +83,7 @@ func (u *User) RequestNewCert(cfg *config.Config, domainnames *[]string) (certs
 		log.Println(err)
 	}
 
-	err = client.Challenge.SetDNS01Provider(provider)
+	err = client.Challenge.SetDNS01Provider(ovhprovider)
 	if err != nil {
 		log.Println(err)
 	}
@@ -128,15 +97,14 @@ func (u *User) RequestNewCert(cfg *config.Config, domainnames *[]string) (certs
 	}
 
 	request := certificate.ObtainRequest{
-		Domains: *domainnames,
+		Domains: domains,
 		Bundle:  true,
 	}
 
-	certs, err = client.Certificate.Obtain(request)
+	certificates, err = client.Certificate.Obtain(request)
 	if err != nil {
 		log.Println(err)
 	}
-
 	return
 }
 
diff --git a/src/pki/provider.go b/src/pki/provider.go
index 4828d82..691c3a9 100644
--- a/src/pki/provider.go
+++ b/src/pki/provider.go
@@ -1,65 +1,20 @@
 package pki
 
 import (
-	"encoding/json"
-	"log"
-	"net/url"
-	"time"
-
+	"git.paulbsd.com/paulbsd/pki/src/config"
 	"github.com/go-acme/lego/v4/providers/dns/ovh"
-	"github.com/go-acme/lego/v4/providers/dns/pdns"
 )
 
-// initOVHProvider initialize DNS provider configuration
-func (p *Provider) initOVHProvider() (ovhprovider *ovh.DNSProvider, err error) {
+// initProvider initialize DNS provider configuration
+func initProvider(cfg *config.Config) (ovhprovider *ovh.DNSProvider, err error) {
 	ovhconfig := ovh.NewDefaultConfig()
 
-	var data = make(map[string]string)
-	err = json.Unmarshal([]byte(p.Config), &data)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	ovhconfig.APIEndpoint = data["ovhendpoint"]
-	ovhconfig.ApplicationKey = data["ovhak"]
-	ovhconfig.ApplicationSecret = data["ovhas"]
-	ovhconfig.ConsumerKey = data["ovhck"]
+	ovhconfig.APIEndpoint = cfg.ACME.ProviderOptions["ovhendpoint"]
+	ovhconfig.ApplicationKey = cfg.ACME.ProviderOptions["ovhak"]
+	ovhconfig.ApplicationSecret = cfg.ACME.ProviderOptions["ovhas"]
+	ovhconfig.ConsumerKey = cfg.ACME.ProviderOptions["ovhck"]
 
 	ovhprovider, err = ovh.NewDNSProviderConfig(ovhconfig)
-	if err != nil {
-		log.Println(err)
-	}
 
 	return
 }
-
-// initPowerDNSProvider initialize DNS provider configuration
-func (p *Provider) initPowerDNSProvider() (pdnsprovider *pdns.DNSProvider, err error) {
-	pdnsconfig := pdns.NewDefaultConfig()
-
-	var data = make(map[string]string)
-	err = json.Unmarshal([]byte(p.Config), &data)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	pdnsconfig.Host, err = url.Parse(data["pdnsapiurl"])
-	pdnsconfig.APIKey = data["pdnsapikey"]
-
-	pdnsprovider, err = pdns.NewDNSProviderConfig(pdnsconfig)
-	if err != nil {
-		log.Println(err)
-	}
-
-	return
-}
-
-type Provider struct {
-	ID      int       `xorm:"pk autoincr"`
-	Name    string    `xorm:"text notnull unique"`
-	Config  string    `xorm:"json notnull"`
-	Created time.Time `xorm:"created notnull"`
-	Updated time.Time `xorm:"updated notnull"`
-}
diff --git a/src/pkiws/server.go b/src/pkiws/server.go
index 34b5635..87fb940 100644
--- a/src/pkiws/server.go
+++ b/src/pkiws/server.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"strings"
 
 	"git.paulbsd.com/paulbsd/pki/src/config"
 	"git.paulbsd.com/paulbsd/pki/src/pki"
@@ -29,18 +30,13 @@ func RunServer(cfg *config.Config) (err error) {
 	e.GET("/", func(c echo.Context) error {
 		return c.String(http.StatusOK, "Welcome to PKI software (https://git.paulbsd.com/paulbsd/pki)")
 	})
-	e.POST("/cert", func(c echo.Context) (err error) {
-		var request = new(EntryRequest)
-		var result = make(map[string]EntryResponse)
-		err = c.Bind(&request)
-		if err != nil {
-			log.Println(err)
-			return c.JSON(http.StatusInternalServerError, "error parsing request")
-		}
+	e.GET("/domain/:domains", func(c echo.Context) (err error) {
+		var result EntryResponse
+		var domains = strings.Split(c.Param("domains"), ",")
 
-		log.Printf("Providing %s to user %s at %s\n", request.Domains, c.Get("username"), c.RealIP())
+		log.Println(fmt.Sprintf("Providing %s to user %s at %s", domains, c.Get("username"), c.RealIP()))
 
-		result, err = GetCertificate(cfg, c.Get("user").(*pki.User), &request.Domains)
+		result, err = GetCertificate(cfg, c.Get("user").(*pki.User), domains)
 		if err != nil {
 			return c.String(http.StatusInternalServerError, fmt.Sprintf("%s", err))
 		}
diff --git a/src/pkiws/serverhandle.go b/src/pkiws/serverhandle.go
index dc1f623..73a2336 100644
--- a/src/pkiws/serverhandle.go
+++ b/src/pkiws/serverhandle.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"strings"
 	"time"
 
 	"git.paulbsd.com/paulbsd/pki/src/cert"
@@ -13,24 +14,18 @@ import (
 	"git.paulbsd.com/paulbsd/pki/src/pki"
 )
 
-const timeformatstring string = "2006-01-02 15:04:05"
-
-var domainRegex, err = regexp.Compile(`^[a-z0-9\*]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,6}$`)
-
 // GetCertificate get certificate from database if exists, of request it from ACME
-func GetCertificate(cfg *config.Config, user *pki.User, domains *[]string) (result map[string]EntryResponse, err error) {
+func GetCertificate(cfg *config.Config, user *pki.User, domains []string) (result EntryResponse, err error) {
 	err = CheckDomains(domains)
 	if err != nil {
 		return result, err
 	}
-	result = make(map[string]EntryResponse)
 
-	firstdomain := (*domains)[0]
-	entry, err := user.GetEntry(cfg, &firstdomain)
+	entry, err := user.GetEntry(cfg, domains)
 	if err != nil {
 		certs, err := user.RequestNewCert(cfg, domains)
 		if err != nil {
-			log.Printf("Error fetching new certificate %s\n", err)
+			log.Println(fmt.Sprintf("Error fetching new certificate %s", err))
 			return result, err
 		}
 		NotBefore, NotAfter, err := GetDates(certs.Certificate)
@@ -38,36 +33,33 @@ func GetCertificate(cfg *config.Config, user *pki.User, domains *[]string) (resu
 			log.Println("Error where parsing dates")
 			return result, err
 		}
-		entry := cert.Entry{Domain: certs.Domain,
+		entry := cert.Entry{Domains: strings.Join(domains, ","),
 			Certificate:   string(certs.Certificate),
 			PrivateKey:    string(certs.PrivateKey),
 			ValidityBegin: NotBefore,
 			ValidityEnd:   NotAfter,
 			AuthURL:       cfg.ACME.AuthURL}
 		cfg.Db.Insert(&entry)
-		result[firstdomain] = convertEntryToResponse(entry)
+		result = convertEntryToResponse(entry)
 		return result, err
 	}
-	result[firstdomain] = convertEntryToResponse(entry)
+	result = convertEntryToResponse(entry)
 	return
 }
 
 // CheckDomains check if requested domains are valid
-func CheckDomains(domains *[]string) (err error) {
-	for _, domain := range *domains {
-		err = CheckDomain(&domain)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
+func CheckDomains(domains []string) (err error) {
+	domainRegex, err := regexp.Compile(`^[a-z0-9\*]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,6}$`)
 
-// CheckDomain check if requested domain are valid
-func CheckDomain(domain *string) (err error) {
-	res := domainRegex.Match([]byte(*domain))
-	if !res {
-		return fmt.Errorf("Domain %s has not a valid syntax %s, please verify", *domain, err)
+	if err != nil {
+		return
+	}
+
+	for _, d := range domains {
+		res := domainRegex.Match([]byte(d))
+		if !res {
+			return fmt.Errorf(fmt.Sprintf("Domain %s has not a valid syntax %s, please verify", d, err))
+		}
 	}
 	return
 }
@@ -88,7 +80,9 @@ func GetDates(cert []byte) (NotBefore time.Time, NotAfter time.Time, err error)
 
 // convertEntryToResponse converts database ACME entry to JSON ACME entry
 func convertEntryToResponse(in cert.Entry) (out EntryResponse) {
-	out.Domains = append(out.Domains, in.Domain)
+	timeformatstring := "2006-01-02 15:04:05"
+
+	out.Domains = in.Domains
 	out.Certificate = in.Certificate
 	out.PrivateKey = in.PrivateKey
 	out.ValidityBegin = in.ValidityBegin.Format(timeformatstring)
@@ -97,16 +91,11 @@ func convertEntryToResponse(in cert.Entry) (out EntryResponse) {
 	return
 }
 
-// EntryRequest
-type EntryRequest struct {
-	Domains []string `json:"domains"`
-}
-
 // EntryResponse is the struct defining JSON response from webservice
 type EntryResponse struct {
-	Domains       []string `json:"domains"`
-	Certificate   string   `json:"certificate"`
-	PrivateKey    string   `json:"privatekey"`
-	ValidityBegin string   `json:"validitybegin"`
-	ValidityEnd   string   `json:"validityend"`
+	Domains       string `json:"domains"`
+	Certificate   string `json:"certificate"`
+	PrivateKey    string `json:"privatekey"`
+	ValidityBegin string `json:"validitybegin"`
+	ValidityEnd   string `json:"validityend"`
 }
diff --git a/vendor/github.com/cenkalti/backoff/v4/.travis.yml b/vendor/github.com/cenkalti/backoff/v4/.travis.yml
new file mode 100644
index 0000000..c79105c
--- /dev/null
+++ b/vendor/github.com/cenkalti/backoff/v4/.travis.yml
@@ -0,0 +1,10 @@
+language: go
+go:
+  - 1.13
+  - 1.x
+  - tip
+before_install:
+  - go get github.com/mattn/goveralls
+  - go get golang.org/x/tools/cmd/cover
+script:
+  - $HOME/gopath/bin/goveralls -service=travis-ci
diff --git a/vendor/github.com/cenkalti/backoff/v4/README.md b/vendor/github.com/cenkalti/backoff/v4/README.md
index 9433004..16abdfc 100644
--- a/vendor/github.com/cenkalti/backoff/v4/README.md
+++ b/vendor/github.com/cenkalti/backoff/v4/README.md
@@ -1,4 +1,4 @@
-# Exponential Backoff [![GoDoc][godoc image]][godoc] [![Coverage Status][coveralls image]][coveralls]
+# Exponential Backoff [![GoDoc][godoc image]][godoc] [![Build Status][travis image]][travis] [![Coverage Status][coveralls image]][coveralls]
 
 This is a Go port of the exponential backoff algorithm from [Google's HTTP Client Library for Java][google-http-java-client].
 
@@ -21,6 +21,8 @@ Use https://pkg.go.dev/github.com/cenkalti/backoff/v4 to view the documentation.
 
 [godoc]: https://pkg.go.dev/github.com/cenkalti/backoff/v4
 [godoc image]: https://godoc.org/github.com/cenkalti/backoff?status.png
+[travis]: https://travis-ci.org/cenkalti/backoff
+[travis image]: https://travis-ci.org/cenkalti/backoff.png?branch=master
 [coveralls]: https://coveralls.io/github/cenkalti/backoff?branch=master
 [coveralls image]: https://coveralls.io/repos/github/cenkalti/backoff/badge.svg?branch=master
 
diff --git a/vendor/github.com/cenkalti/backoff/v4/exponential.go b/vendor/github.com/cenkalti/backoff/v4/exponential.go
index aac99f1..3d34532 100644
--- a/vendor/github.com/cenkalti/backoff/v4/exponential.go
+++ b/vendor/github.com/cenkalti/backoff/v4/exponential.go
@@ -71,9 +71,6 @@ type Clock interface {
 	Now() time.Time
 }
 
-// ExponentialBackOffOpts is a function type used to configure ExponentialBackOff options.
-type ExponentialBackOffOpts func(*ExponentialBackOff)
-
 // Default values for ExponentialBackOff.
 const (
 	DefaultInitialInterval     = 500 * time.Millisecond
@@ -84,7 +81,7 @@ const (
 )
 
 // NewExponentialBackOff creates an instance of ExponentialBackOff using default values.
-func NewExponentialBackOff(opts ...ExponentialBackOffOpts) *ExponentialBackOff {
+func NewExponentialBackOff() *ExponentialBackOff {
 	b := &ExponentialBackOff{
 		InitialInterval:     DefaultInitialInterval,
 		RandomizationFactor: DefaultRandomizationFactor,
@@ -94,62 +91,10 @@ func NewExponentialBackOff(opts ...ExponentialBackOffOpts) *ExponentialBackOff {
 		Stop:                Stop,
 		Clock:               SystemClock,
 	}
-	for _, fn := range opts {
-		fn(b)
-	}
 	b.Reset()
 	return b
 }
 
-// WithInitialInterval sets the initial interval between retries.
-func WithInitialInterval(duration time.Duration) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.InitialInterval = duration
-	}
-}
-
-// WithRandomizationFactor sets the randomization factor to add jitter to intervals.
-func WithRandomizationFactor(randomizationFactor float64) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.RandomizationFactor = randomizationFactor
-	}
-}
-
-// WithMultiplier sets the multiplier for increasing the interval after each retry.
-func WithMultiplier(multiplier float64) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.Multiplier = multiplier
-	}
-}
-
-// WithMaxInterval sets the maximum interval between retries.
-func WithMaxInterval(duration time.Duration) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.MaxInterval = duration
-	}
-}
-
-// WithMaxElapsedTime sets the maximum total time for retries.
-func WithMaxElapsedTime(duration time.Duration) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.MaxElapsedTime = duration
-	}
-}
-
-// WithRetryStopDuration sets the duration after which retries should stop.
-func WithRetryStopDuration(duration time.Duration) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.Stop = duration
-	}
-}
-
-// WithClockProvider sets the clock used to measure time.
-func WithClockProvider(clock Clock) ExponentialBackOffOpts {
-	return func(ebo *ExponentialBackOff) {
-		ebo.Clock = clock
-	}
-}
-
 type systemClock struct{}
 
 func (t systemClock) Now() time.Time {
@@ -202,9 +147,6 @@ func (b *ExponentialBackOff) incrementCurrentInterval() {
 // Returns a random value from the following interval:
 // 	[currentInterval - randomizationFactor * currentInterval, currentInterval + randomizationFactor * currentInterval].
 func getRandomValueFromInterval(randomizationFactor, random float64, currentInterval time.Duration) time.Duration {
-	if randomizationFactor == 0 {
-		return currentInterval // make sure no randomness is used when randomizationFactor is 0.
-	}
 	var delta = randomizationFactor * float64(currentInterval)
 	var minInterval = float64(currentInterval) - delta
 	var maxInterval = float64(currentInterval) + delta
diff --git a/vendor/github.com/cenkalti/backoff/v4/retry.go b/vendor/github.com/cenkalti/backoff/v4/retry.go
index b9c0c51..1ce2507 100644
--- a/vendor/github.com/cenkalti/backoff/v4/retry.go
+++ b/vendor/github.com/cenkalti/backoff/v4/retry.go
@@ -5,20 +5,10 @@ import (
 	"time"
 )
 
-// An OperationWithData is executing by RetryWithData() or RetryNotifyWithData().
-// The operation will be retried using a backoff policy if it returns an error.
-type OperationWithData[T any] func() (T, error)
-
 // An Operation is executing by Retry() or RetryNotify().
 // The operation will be retried using a backoff policy if it returns an error.
 type Operation func() error
 
-func (o Operation) withEmptyData() OperationWithData[struct{}] {
-	return func() (struct{}, error) {
-		return struct{}{}, o()
-	}
-}
-
 // Notify is a notify-on-error function. It receives an operation error and
 // backoff delay if the operation failed (with an error).
 //
@@ -38,41 +28,18 @@ func Retry(o Operation, b BackOff) error {
 	return RetryNotify(o, b, nil)
 }
 
-// RetryWithData is like Retry but returns data in the response too.
-func RetryWithData[T any](o OperationWithData[T], b BackOff) (T, error) {
-	return RetryNotifyWithData(o, b, nil)
-}
-
 // RetryNotify calls notify function with the error and wait duration
 // for each failed attempt before sleep.
 func RetryNotify(operation Operation, b BackOff, notify Notify) error {
 	return RetryNotifyWithTimer(operation, b, notify, nil)
 }
 
-// RetryNotifyWithData is like RetryNotify but returns data in the response too.
-func RetryNotifyWithData[T any](operation OperationWithData[T], b BackOff, notify Notify) (T, error) {
-	return doRetryNotify(operation, b, notify, nil)
-}
-
 // RetryNotifyWithTimer calls notify function with the error and wait duration using the given Timer
 // for each failed attempt before sleep.
 // A default timer that uses system timer is used when nil is passed.
 func RetryNotifyWithTimer(operation Operation, b BackOff, notify Notify, t Timer) error {
-	_, err := doRetryNotify(operation.withEmptyData(), b, notify, t)
-	return err
-}
-
-// RetryNotifyWithTimerAndData is like RetryNotifyWithTimer but returns data in the response too.
-func RetryNotifyWithTimerAndData[T any](operation OperationWithData[T], b BackOff, notify Notify, t Timer) (T, error) {
-	return doRetryNotify(operation, b, notify, t)
-}
-
-func doRetryNotify[T any](operation OperationWithData[T], b BackOff, notify Notify, t Timer) (T, error) {
-	var (
-		err  error
-		next time.Duration
-		res  T
-	)
+	var err error
+	var next time.Duration
 	if t == nil {
 		t = &defaultTimer{}
 	}
@@ -85,22 +52,21 @@ func doRetryNotify[T any](operation OperationWithData[T], b BackOff, notify Noti
 
 	b.Reset()
 	for {
-		res, err = operation()
-		if err == nil {
-			return res, nil
+		if err = operation(); err == nil {
+			return nil
 		}
 
 		var permanent *PermanentError
 		if errors.As(err, &permanent) {
-			return res, permanent.Err
+			return permanent.Err
 		}
 
 		if next = b.NextBackOff(); next == Stop {
 			if cerr := ctx.Err(); cerr != nil {
-				return res, cerr
+				return cerr
 			}
 
-			return res, err
+			return err
 		}
 
 		if notify != nil {
@@ -111,7 +77,7 @@ func doRetryNotify[T any](operation OperationWithData[T], b BackOff, notify Noti
 
 		select {
 		case <-ctx.Done():
-			return res, ctx.Err()
+			return ctx.Err()
 		case <-t.C():
 		}
 	}
diff --git a/vendor/github.com/go-acme/lego/v4/LICENSE b/vendor/github.com/go-acme/lego/v4/LICENSE
index d8eaf91..270cba0 100644
--- a/vendor/github.com/go-acme/lego/v4/LICENSE
+++ b/vendor/github.com/go-acme/lego/v4/LICENSE
@@ -1,6 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2024 Ludovic Fernandez
 Copyright (c) 2015-2017 Sebastian Erhart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/account.go b/vendor/github.com/go-acme/lego/v4/acme/api/account.go
index 85de84e..d1cd72d 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/account.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/account.go
@@ -16,7 +16,7 @@ func (a *AccountService) New(req acme.Account) (acme.ExtendedAccount, error) {
 	resp, err := a.core.post(a.core.GetDirectory().NewAccountURL, req, &account)
 	location := getLocation(resp)
 
-	if location != "" {
+	if len(location) > 0 {
 		a.core.jws.SetKid(location)
 	}
 
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/api.go b/vendor/github.com/go-acme/lego/v4/acme/api/api.go
index b8c9cf0..06b47c4 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/api.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/api.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"bytes"
+	"context"
 	"crypto"
 	"encoding/json"
 	"errors"
@@ -70,7 +71,7 @@ func (a *Core) post(uri string, reqBody, response interface{}) (*http.Response,
 }
 
 // postAsGet performs an HTTP POST ("POST-as-GET") request.
-// https://www.rfc-editor.org/rfc/rfc8555.html#section-6.3
+// https://tools.ietf.org/html/rfc8555#section-6.3
 func (a *Core) postAsGet(uri string, response interface{}) (*http.Response, error) {
 	return a.retrievablePost(uri, []byte{}, response)
 }
@@ -82,6 +83,8 @@ func (a *Core) retrievablePost(uri string, content []byte, response interface{})
 	bo.MaxInterval = 5 * time.Second
 	bo.MaxElapsedTime = 20 * time.Second
 
+	ctx, cancel := context.WithCancel(context.Background())
+
 	var resp *http.Response
 	operation := func() error {
 		var err error
@@ -93,7 +96,8 @@ func (a *Core) retrievablePost(uri string, content []byte, response interface{})
 				return err
 			}
 
-			return backoff.Permanent(err)
+			cancel()
+			return err
 		}
 
 		return nil
@@ -103,7 +107,7 @@ func (a *Core) retrievablePost(uri string, content []byte, response interface{})
 		log.Infof("retry due to: %v", err)
 	}
 
-	err := backoff.RetryNotify(operation, bo, notify)
+	err := backoff.RetryNotify(operation, backoff.WithContext(bo, ctx), notify)
 	if err != nil {
 		return resp, err
 	}
@@ -117,7 +121,7 @@ func (a *Core) signedPost(uri string, content []byte, response interface{}) (*ht
 		return nil, fmt.Errorf("failed to post JWS message: failed to sign content: %w", err)
 	}
 
-	signedBody := bytes.NewBufferString(signedContent.FullSerialize())
+	signedBody := bytes.NewBuffer([]byte(signedContent.FullSerialize()))
 
 	resp, err := a.doer.Post(uri, signedBody, "application/jose+json", response)
 
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/certificate.go b/vendor/github.com/go-acme/lego/v4/acme/api/certificate.go
index 5f31968..8923644 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/certificate.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/certificate.go
@@ -1,11 +1,10 @@
 package api
 
 import (
-	"bytes"
 	"crypto/x509"
 	"encoding/pem"
 	"errors"
-	"io"
+	"io/ioutil"
 	"net/http"
 
 	"github.com/go-acme/lego/v4/acme"
@@ -40,7 +39,7 @@ func (c *CertificateService) GetAll(certURL string, bundle bool) (map[string]*ac
 	certs := map[string]*acme.RawCertificate{certURL: cert}
 
 	// URLs of "alternate" link relation
-	// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.4.2
+	// - https://tools.ietf.org/html/rfc8555#section-7.4.2
 	alts := getLinks(headers, "alternate")
 
 	for _, alt := range alts {
@@ -72,7 +71,7 @@ func (c *CertificateService) get(certURL string, bundle bool) (*acme.RawCertific
 		return nil, nil, err
 	}
 
-	data, err := io.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
+	data, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
 	if err != nil {
 		return nil, resp.Header, err
 	}
@@ -88,17 +87,12 @@ func (c *CertificateService) getCertificateChain(cert []byte, headers http.Heade
 	// See https://community.letsencrypt.org/t/acme-v2-no-up-link-in-response/64962
 	_, issuer := pem.Decode(cert)
 	if issuer != nil {
-		// If bundle is false, we want to return a single certificate.
-		// To do this, we remove the issuer cert(s) from the issued cert.
-		if !bundle {
-			cert = bytes.TrimSuffix(cert, issuer)
-		}
 		return &acme.RawCertificate{Cert: cert, Issuer: issuer}
 	}
 
 	// The issuer certificate link may be supplied via an "up" link
 	// in the response headers of a new certificate.
-	// See https://www.rfc-editor.org/rfc/rfc8555.html#section-7.4.2
+	// See https://tools.ietf.org/html/rfc8555#section-7.4.2
 	up := getLink(headers, "up")
 
 	issuer, err := c.getIssuerFromLink(up)
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/internal/nonces/nonce_manager.go b/vendor/github.com/go-acme/lego/v4/acme/api/internal/nonces/nonce_manager.go
index d089cf0..154cc5e 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/internal/nonces/nonce_manager.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/internal/nonces/nonce_manager.go
@@ -63,7 +63,7 @@ func (n *Manager) getNonce() (string, error) {
 	return GetFromResponse(resp)
 }
 
-// GetFromResponse Extracts a nonce from an HTTP response.
+// GetFromResponse Extracts a nonce from a HTTP response.
 func GetFromResponse(resp *http.Response) (string, error) {
 	if resp == nil {
 		return "", errors.New("nil response")
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/internal/secure/jws.go b/vendor/github.com/go-acme/lego/v4/acme/api/internal/secure/jws.go
index 8afd446..8bc0831 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/internal/secure/jws.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/internal/secure/jws.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/go-acme/lego/v4/acme/api/internal/nonces"
-	jose "github.com/go-jose/go-jose/v4"
+	jose "gopkg.in/square/go-jose.v2"
 )
 
 // JWS Represents a JWS.
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/sender.go b/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/sender.go
index 042a131..fec2a33 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/sender.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/sender.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"runtime"
 	"strings"
@@ -95,7 +96,7 @@ func (d *Doer) do(req *http.Request, response interface{}) (*http.Response, erro
 	}
 
 	if response != nil {
-		raw, err := io.ReadAll(resp.Body)
+		raw, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
 			return resp, err
 		}
@@ -119,7 +120,7 @@ func (d *Doer) formatUserAgent() string {
 
 func checkError(req *http.Request, resp *http.Response) error {
 	if resp.StatusCode >= http.StatusBadRequest {
-		body, err := io.ReadAll(resp.Body)
+		body, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
 			return fmt.Errorf("%d :: %s :: %s :: %w", resp.StatusCode, req.Method, req.URL, err)
 		}
@@ -133,19 +134,11 @@ func checkError(req *http.Request, resp *http.Response) error {
 		errorDetails.Method = req.Method
 		errorDetails.URL = req.URL.String()
 
-		if errorDetails.HTTPStatus == 0 {
-			errorDetails.HTTPStatus = resp.StatusCode
-		}
-
 		// Check for errors we handle specifically
 		if errorDetails.HTTPStatus == http.StatusBadRequest && errorDetails.Type == acme.BadNonceErr {
 			return &acme.NonceError{ProblemDetails: errorDetails}
 		}
 
-		if errorDetails.HTTPStatus == http.StatusConflict && errorDetails.Type == acme.AlreadyReplacedErr {
-			return &acme.AlreadyReplacedError{ProblemDetails: errorDetails}
-		}
-
 		return errorDetails
 	}
 	return nil
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/useragent.go b/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/useragent.go
index 326cfb4..77f1d23 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/useragent.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/internal/sender/useragent.go
@@ -1,10 +1,11 @@
-// Code generated by 'internal/releaser'; DO NOT EDIT.
-
 package sender
 
+// CODE GENERATED AUTOMATICALLY
+// THIS FILE MUST NOT BE EDITED BY HAND
+
 const (
 	// ourUserAgent is the User-Agent of this underlying library package.
-	ourUserAgent = "xenolf-acme/4.23.1"
+	ourUserAgent = "xenolf-acme/4.4.0"
 
 	// ourUserAgentComment is part of the UA comment linked to the version status of this underlying library package.
 	// values: detach|release
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/order.go b/vendor/github.com/go-acme/lego/v4/acme/api/order.go
index 4d310e0..7b2a2be 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/api/order.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/api/order.go
@@ -3,86 +3,25 @@ package api
 import (
 	"encoding/base64"
 	"errors"
-	"fmt"
-	"net"
-	"time"
 
 	"github.com/go-acme/lego/v4/acme"
 )
 
-// OrderOptions used to create an order (optional).
-type OrderOptions struct {
-	NotBefore time.Time
-	NotAfter  time.Time
-
-	// A string uniquely identifying the profile
-	// which will be used to affect issuance of the certificate requested by this Order.
-	// - https://www.ietf.org/id/draft-aaron-acme-profiles-00.html#section-4
-	Profile string
-
-	// A string uniquely identifying a previously-issued certificate which this
-	// order is intended to replace.
-	// - https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-5
-	ReplacesCertID string
-}
-
 type OrderService service
 
 // New Creates a new order.
 func (o *OrderService) New(domains []string) (acme.ExtendedOrder, error) {
-	return o.NewWithOptions(domains, nil)
-}
-
-// NewWithOptions Creates a new order.
-func (o *OrderService) NewWithOptions(domains []string, opts *OrderOptions) (acme.ExtendedOrder, error) {
 	var identifiers []acme.Identifier
 	for _, domain := range domains {
-		ident := acme.Identifier{Value: domain, Type: "dns"}
-
-		if net.ParseIP(domain) != nil {
-			ident.Type = "ip"
-		}
-
-		identifiers = append(identifiers, ident)
+		identifiers = append(identifiers, acme.Identifier{Type: "dns", Value: domain})
 	}
 
 	orderReq := acme.Order{Identifiers: identifiers}
 
-	if opts != nil {
-		if !opts.NotAfter.IsZero() {
-			orderReq.NotAfter = opts.NotAfter.Format(time.RFC3339)
-		}
-
-		if !opts.NotBefore.IsZero() {
-			orderReq.NotBefore = opts.NotBefore.Format(time.RFC3339)
-		}
-
-		if o.core.GetDirectory().RenewalInfo != "" {
-			orderReq.Replaces = opts.ReplacesCertID
-		}
-
-		if opts.Profile != "" {
-			orderReq.Profile = opts.Profile
-		}
-	}
-
 	var order acme.Order
 	resp, err := o.core.post(o.core.GetDirectory().NewOrderURL, orderReq, &order)
 	if err != nil {
-		are := &acme.AlreadyReplacedError{}
-		if !errors.As(err, &are) {
-			return acme.ExtendedOrder{}, err
-		}
-
-		// If the Server rejects the request because the identified certificate has already been marked as replaced,
-		// it MUST return an HTTP 409 (Conflict) with a problem document of type "alreadyReplaced" (see Section 7.4).
-		// https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-08#section-5
-		orderReq.Replaces = ""
-
-		resp, err = o.core.post(o.core.GetDirectory().NewOrderURL, orderReq, &order)
-		if err != nil {
-			return acme.ExtendedOrder{}, err
-		}
+		return acme.ExtendedOrder{}, err
 	}
 
 	return acme.ExtendedOrder{
@@ -119,7 +58,7 @@ func (o *OrderService) UpdateForCSR(orderURL string, csr []byte) (acme.ExtendedO
 	}
 
 	if order.Status == acme.StatusInvalid {
-		return acme.ExtendedOrder{}, fmt.Errorf("invalid order: %w", order.Err())
+		return acme.ExtendedOrder{}, order.Error
 	}
 
 	return acme.ExtendedOrder{Order: order}, nil
diff --git a/vendor/github.com/go-acme/lego/v4/acme/api/renewal.go b/vendor/github.com/go-acme/lego/v4/acme/api/renewal.go
deleted file mode 100644
index 5b4046c..0000000
--- a/vendor/github.com/go-acme/lego/v4/acme/api/renewal.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package api
-
-import (
-	"errors"
-	"net/http"
-)
-
-// ErrNoARI is returned when the server does not advertise a renewal info endpoint.
-var ErrNoARI = errors.New("renewalInfo[get/post]: server does not advertise a renewal info endpoint")
-
-// GetRenewalInfo GETs renewal information for a certificate from the renewalInfo endpoint.
-// This is used to determine if a certificate needs to be renewed.
-//
-// Note: this endpoint is part of a draft specification, not all ACME servers will implement it.
-// This method will return api.ErrNoARI if the server does not advertise a renewal info endpoint.
-//
-// https://datatracker.ietf.org/doc/draft-ietf-acme-ari
-func (c *CertificateService) GetRenewalInfo(certID string) (*http.Response, error) {
-	if c.core.GetDirectory().RenewalInfo == "" {
-		return nil, ErrNoARI
-	}
-
-	if certID == "" {
-		return nil, errors.New("renewalInfo[get]: 'certID' cannot be empty")
-	}
-
-	return c.core.HTTPClient.Get(c.core.GetDirectory().RenewalInfo + "/" + certID)
-}
diff --git a/vendor/github.com/go-acme/lego/v4/acme/commons.go b/vendor/github.com/go-acme/lego/v4/acme/commons.go
index d22ea96..9635c6b 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/commons.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/commons.go
@@ -1,5 +1,5 @@
 // Package acme contains all objects related the ACME endpoints.
-// https://www.rfc-editor.org/rfc/rfc8555.html
+// https://tools.ietf.org/html/rfc8555
 package acme
 
 import (
@@ -7,38 +7,20 @@ import (
 	"time"
 )
 
-// ACME status values of Account, Order, Authorization and Challenge objects.
-// See https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.6 for details.
+// Challenge statuses.
+// https://tools.ietf.org/html/rfc8555#section-7.1.6
 const (
+	StatusPending     = "pending"
+	StatusInvalid     = "invalid"
+	StatusValid       = "valid"
+	StatusProcessing  = "processing"
 	StatusDeactivated = "deactivated"
 	StatusExpired     = "expired"
-	StatusInvalid     = "invalid"
-	StatusPending     = "pending"
-	StatusProcessing  = "processing"
-	StatusReady       = "ready"
 	StatusRevoked     = "revoked"
-	StatusUnknown     = "unknown"
-	StatusValid       = "valid"
-)
-
-// CRL reason codes as defined in RFC 5280.
-// https://datatracker.ietf.org/doc/html/rfc5280#section-5.3.1
-const (
-	CRLReasonUnspecified          uint = 0
-	CRLReasonKeyCompromise        uint = 1
-	CRLReasonCACompromise         uint = 2
-	CRLReasonAffiliationChanged   uint = 3
-	CRLReasonSuperseded           uint = 4
-	CRLReasonCessationOfOperation uint = 5
-	CRLReasonCertificateHold      uint = 6
-	CRLReasonRemoveFromCRL        uint = 8
-	CRLReasonPrivilegeWithdrawn   uint = 9
-	CRLReasonAACompromise         uint = 10
 )
 
 // Directory the ACME directory object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.1
-// - https://datatracker.ietf.org/doc/draft-ietf-acme-ari/
+// - https://tools.ietf.org/html/rfc8555#section-7.1.1
 type Directory struct {
 	NewNonceURL   string `json:"newNonce"`
 	NewAccountURL string `json:"newAccount"`
@@ -47,11 +29,10 @@ type Directory struct {
 	RevokeCertURL string `json:"revokeCert"`
 	KeyChangeURL  string `json:"keyChange"`
 	Meta          Meta   `json:"meta"`
-	RenewalInfo   string `json:"renewalInfo"`
 }
 
 // Meta the ACME meta object (related to Directory).
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.1
+// - https://tools.ietf.org/html/rfc8555#section-7.1.1
 type Meta struct {
 	// termsOfService (optional, string):
 	// A URL identifying the current terms of service.
@@ -71,17 +52,12 @@ type Meta struct {
 
 	// externalAccountRequired (optional, boolean):
 	// If this field is present and set to "true",
-	// then the CA requires that all new-account requests include an "externalAccountBinding" field
+	// then the CA requires that all new- account requests include an "externalAccountBinding" field
 	// associating the new account with an external account.
 	ExternalAccountRequired bool `json:"externalAccountRequired"`
-
-	// profiles (optional, object):
-	// A map of profile names to human-readable descriptions of those profiles.
-	// https://www.ietf.org/id/draft-aaron-acme-profiles-00.html#section-3
-	Profiles map[string]string `json:"profiles"`
 }
 
-// ExtendedAccount an extended Account.
+// ExtendedAccount a extended Account.
 type ExtendedAccount struct {
 	Account
 	// Contains the value of the response header `Location`
@@ -89,14 +65,14 @@ type ExtendedAccount struct {
 }
 
 // Account the ACME account Object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.2
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.3
+// - https://tools.ietf.org/html/rfc8555#section-7.1.2
+// - https://tools.ietf.org/html/rfc8555#section-7.3
 type Account struct {
 	// status (required, string):
 	// The status of this account.
 	// Possible values are: "valid", "deactivated", and "revoked".
 	// The value "deactivated" should be used to indicate client-initiated deactivation
-	// whereas "revoked" should be used to indicate server-initiated deactivation. (See Section 7.1.6)
+	// whereas "revoked" should be used to indicate server- initiated deactivation. (See Section 7.1.6)
 	Status string `json:"status,omitempty"`
 
 	// contact (optional, array of string):
@@ -136,7 +112,7 @@ type ExtendedOrder struct {
 }
 
 // Order the ACME order Object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.3
+// - https://tools.ietf.org/html/rfc8555#section-7.1.3
 type Order struct {
 	// status (required, string):
 	// The status of this order.
@@ -153,12 +129,6 @@ type Order struct {
 	// An array of identifier objects that the order pertains to.
 	Identifiers []Identifier `json:"identifiers"`
 
-	// profile (string, optional):
-	// A string uniquely identifying the profile
-	// which will be used to affect issuance of the certificate requested by this Order.
-	// https://www.ietf.org/id/draft-aaron-acme-profiles-00.html#section-4
-	Profile string `json:"profile,omitempty"`
-
 	// notBefore (optional, string):
 	// The requested value of the notBefore field in the certificate,
 	// in the date format defined in [RFC3339].
@@ -192,24 +162,10 @@ type Order struct {
 	// certificate (optional, string):
 	// A URL for the certificate that has been issued in response to this order
 	Certificate string `json:"certificate,omitempty"`
-
-	// replaces (optional, string):
-	// replaces (string, optional): A string uniquely identifying a
-	// previously-issued certificate which this order is intended to replace.
-	// - https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-5
-	Replaces string `json:"replaces,omitempty"`
-}
-
-func (r *Order) Err() error {
-	if r.Error != nil {
-		return r.Error
-	}
-
-	return nil
 }
 
 // Authorization the ACME authorization object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.4
+// - https://tools.ietf.org/html/rfc8555#section-7.1.4
 type Authorization struct {
 	// status (required, string):
 	// The status of this authorization.
@@ -251,8 +207,8 @@ type ExtendedChallenge struct {
 }
 
 // Challenge the ACME challenge object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.5
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-8
+// - https://tools.ietf.org/html/rfc8555#section-7.1.5
+// - https://tools.ietf.org/html/rfc8555#section-8
 type Challenge struct {
 	// type (required, string):
 	// The type of challenge encoded in the object.
@@ -285,31 +241,23 @@ type Challenge struct {
 	// It MUST NOT contain any characters outside the base64url alphabet,
 	// and MUST NOT include base64 padding characters ("=").
 	// See [RFC4086] for additional information on randomness requirements.
-	// https://www.rfc-editor.org/rfc/rfc8555.html#section-8.3
-	// https://www.rfc-editor.org/rfc/rfc8555.html#section-8.4
+	// https://tools.ietf.org/html/rfc8555#section-8.3
+	// https://tools.ietf.org/html/rfc8555#section-8.4
 	Token string `json:"token"`
 
-	// https://www.rfc-editor.org/rfc/rfc8555.html#section-8.1
+	// https://tools.ietf.org/html/rfc8555#section-8.1
 	KeyAuthorization string `json:"keyAuthorization"`
 }
 
-func (c *Challenge) Err() error {
-	if c.Error != nil {
-		return c.Error
-	}
-
-	return nil
-}
-
 // Identifier the ACME identifier object.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-9.7.7
+// - https://tools.ietf.org/html/rfc8555#section-9.7.7
 type Identifier struct {
 	Type  string `json:"type"`
 	Value string `json:"value"`
 }
 
 // CSRMessage Certificate Signing Request.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.4
+// - https://tools.ietf.org/html/rfc8555#section-7.4
 type CSRMessage struct {
 	// csr (required, string):
 	// A CSR encoding the parameters for the certificate being requested [RFC2986].
@@ -319,8 +267,8 @@ type CSRMessage struct {
 }
 
 // RevokeCertMessage a certificate revocation message.
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.6
-// - https://www.rfc-editor.org/rfc/rfc5280.html#section-5.3.1
+// - https://tools.ietf.org/html/rfc8555#section-7.6
+// - https://tools.ietf.org/html/rfc5280#section-5.3.1
 type RevokeCertMessage struct {
 	// certificate (required, string):
 	// The certificate to be revoked, in the base64url-encoded version of the DER format.
@@ -341,36 +289,3 @@ type RawCertificate struct {
 	Cert   []byte
 	Issuer []byte
 }
-
-// Window is a window of time.
-type Window struct {
-	Start time.Time `json:"start"`
-	End   time.Time `json:"end"`
-}
-
-// RenewalInfoResponse is the response to GET requests made the renewalInfo endpoint.
-// - (4.1. Getting Renewal Information) https://datatracker.ietf.org/doc/draft-ietf-acme-ari/
-type RenewalInfoResponse struct {
-	// SuggestedWindow contains two fields, start and end,
-	// whose values are timestamps which bound the window of time in which the CA recommends renewing the certificate.
-	SuggestedWindow Window `json:"suggestedWindow"`
-	//	ExplanationURL is an optional URL pointing to a page which may explain why the suggested renewal window is what it is.
-	//	For example, it may be a page explaining the CA's dynamic load-balancing strategy,
-	//	or a page documenting which certificates are affected by a mass revocation event.
-	//	Callers SHOULD provide this URL to their operator, if present.
-	ExplanationURL string `json:"explanationURL"`
-}
-
-// RenewalInfoUpdateRequest is the JWS payload for POST requests made to the renewalInfo endpoint.
-// - (4.2. RenewalInfo Objects) https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-4.2
-type RenewalInfoUpdateRequest struct {
-	// CertID is a composite string in the format: base64url(AKI) || '.' || base64url(Serial), where AKI is the
-	// certificate's authority key identifier and Serial is the certificate's serial number. For details, see:
-	// https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-4.1
-	CertID string `json:"certID"`
-	// Replaced is required and indicates whether or not the client considers the certificate to have been replaced.
-	// A certificate is considered replaced when its revocation would not disrupt any ongoing services,
-	// for instance because it has been renewed and the new certificate is in use, or because it is no longer in use.
-	// Clients SHOULD NOT send a request where this value is false.
-	Replaced bool `json:"replaced"`
-}
diff --git a/vendor/github.com/go-acme/lego/v4/acme/errors.go b/vendor/github.com/go-acme/lego/v4/acme/errors.go
index a9d6353..3d6a5ab 100644
--- a/vendor/github.com/go-acme/lego/v4/acme/errors.go
+++ b/vendor/github.com/go-acme/lego/v4/acme/errors.go
@@ -6,14 +6,13 @@ import (
 
 // Errors types.
 const (
-	errNS              = "urn:ietf:params:acme:error:"
-	BadNonceErr        = errNS + "badNonce"
-	AlreadyReplacedErr = errNS + "alreadyReplaced"
+	errNS       = "urn:ietf:params:acme:error:"
+	BadNonceErr = errNS + "badNonce"
 )
 
 // ProblemDetails the problem details object.
-// - https://www.rfc-editor.org/rfc/rfc7807.html#section-3.1
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-7.3.3
+// - https://tools.ietf.org/html/rfc7807#section-3.1
+// - https://tools.ietf.org/html/rfc8555#section-7.3.3
 type ProblemDetails struct {
 	Type        string       `json:"type,omitempty"`
 	Detail      string       `json:"detail,omitempty"`
@@ -26,7 +25,15 @@ type ProblemDetails struct {
 	URL    string `json:"url,omitempty"`
 }
 
-func (p *ProblemDetails) Error() string {
+// SubProblem a "subproblems".
+// - https://tools.ietf.org/html/rfc8555#section-6.7.1
+type SubProblem struct {
+	Type       string     `json:"type,omitempty"`
+	Detail     string     `json:"detail,omitempty"`
+	Identifier Identifier `json:"identifier,omitempty"`
+}
+
+func (p ProblemDetails) Error() string {
 	msg := fmt.Sprintf("acme: error: %d", p.HTTPStatus)
 	if p.Method != "" || p.URL != "" {
 		msg += fmt.Sprintf(" :: %s :: %s", p.Method, p.URL)
@@ -44,23 +51,8 @@ func (p *ProblemDetails) Error() string {
 	return msg
 }
 
-// SubProblem a "subproblems".
-// - https://www.rfc-editor.org/rfc/rfc8555.html#section-6.7.1
-type SubProblem struct {
-	Type       string     `json:"type,omitempty"`
-	Detail     string     `json:"detail,omitempty"`
-	Identifier Identifier `json:"identifier,omitempty"`
-}
-
 // NonceError represents the error which is returned
 // if the nonce sent by the client was not accepted by the server.
 type NonceError struct {
 	*ProblemDetails
 }
-
-// AlreadyReplacedError represents the error which is returned
-// If the Server rejects the request because the identified certificate has already been marked as replaced.
-// - https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-08#section-5
-type AlreadyReplacedError struct {
-	*ProblemDetails
-}
diff --git a/vendor/github.com/go-acme/lego/v4/certcrypto/crypto.go b/vendor/github.com/go-acme/lego/v4/certcrypto/crypto.go
index c655107..44f6e4d 100644
--- a/vendor/github.com/go-acme/lego/v4/certcrypto/crypto.go
+++ b/vendor/github.com/go-acme/lego/v4/certcrypto/crypto.go
@@ -14,8 +14,6 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"net"
-	"slices"
 	"strings"
 	"time"
 
@@ -27,7 +25,6 @@ const (
 	EC256   = KeyType("P256")
 	EC384   = KeyType("P384")
 	RSA2048 = KeyType("2048")
-	RSA3072 = KeyType("3072")
 	RSA4096 = KeyType("4096")
 	RSA8192 = KeyType("8192")
 )
@@ -85,12 +82,9 @@ func ParsePEMBundle(bundle []byte) ([]*x509.Certificate, error) {
 // ParsePEMPrivateKey parses a private key from key, which is a PEM block.
 // Borrowed from Go standard library, to handle various private key and PEM block types.
 // https://github.com/golang/go/blob/693748e9fa385f1e2c3b91ca9acbb6c0ad2d133d/src/crypto/tls/tls.go#L291-L308
-// https://github.com/golang/go/blob/693748e9fa385f1e2c3b91ca9acbb6c0ad2d133d/src/crypto/tls/tls.go#L238
+// https://github.com/golang/go/blob/693748e9fa385f1e2c3b91ca9acbb6c0ad2d133d/src/crypto/tls/tls.go#L238)
 func ParsePEMPrivateKey(key []byte) (crypto.PrivateKey, error) {
 	keyBlockDER, _ := pem.Decode(key)
-	if keyBlockDER == nil {
-		return nil, errors.New("invalid PEM block")
-	}
 
 	if keyBlockDER.Type != "PRIVATE KEY" && !strings.HasSuffix(keyBlockDER.Type, " PRIVATE KEY") {
 		return nil, fmt.Errorf("unknown PEM header %q", keyBlockDER.Type)
@@ -124,8 +118,6 @@ func GeneratePrivateKey(keyType KeyType) (crypto.PrivateKey, error) {
 		return ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
 	case RSA2048:
 		return rsa.GenerateKey(rand.Reader, 2048)
-	case RSA3072:
-		return rsa.GenerateKey(rand.Reader, 3072)
 	case RSA4096:
 		return rsa.GenerateKey(rand.Reader, 4096)
 	case RSA8192:
@@ -135,41 +127,13 @@ func GeneratePrivateKey(keyType KeyType) (crypto.PrivateKey, error) {
 	return nil, fmt.Errorf("invalid KeyType: %s", keyType)
 }
 
-// Deprecated: uses [CreateCSR] instead.
 func GenerateCSR(privateKey crypto.PrivateKey, domain string, san []string, mustStaple bool) ([]byte, error) {
-	return CreateCSR(privateKey, CSROptions{
-		Domain:     domain,
-		SAN:        san,
-		MustStaple: mustStaple,
-	})
-}
-
-type CSROptions struct {
-	Domain         string
-	SAN            []string
-	MustStaple     bool
-	EmailAddresses []string
-}
-
-func CreateCSR(privateKey crypto.PrivateKey, opts CSROptions) ([]byte, error) {
-	var dnsNames []string
-	var ipAddresses []net.IP
-	for _, altname := range opts.SAN {
-		if ip := net.ParseIP(altname); ip != nil {
-			ipAddresses = append(ipAddresses, ip)
-		} else {
-			dnsNames = append(dnsNames, altname)
-		}
-	}
-
 	template := x509.CertificateRequest{
-		Subject:        pkix.Name{CommonName: opts.Domain},
-		DNSNames:       dnsNames,
-		EmailAddresses: opts.EmailAddresses,
-		IPAddresses:    ipAddresses,
+		Subject:  pkix.Name{CommonName: domain},
+		DNSNames: san,
 	}
 
-	if opts.MustStaple {
+	if mustStaple {
 		template.ExtraExtensions = append(template.ExtraExtensions, pkix.Extension{
 			Id:    tlsFeatureExtensionOID,
 			Value: ocspMustStapleFeature,
@@ -234,26 +198,6 @@ func ParsePEMCertificate(cert []byte) (*x509.Certificate, error) {
 	return x509.ParseCertificate(pemBlock.Bytes)
 }
 
-func GetCertificateMainDomain(cert *x509.Certificate) (string, error) {
-	return getMainDomain(cert.Subject, cert.DNSNames)
-}
-
-func GetCSRMainDomain(cert *x509.CertificateRequest) (string, error) {
-	return getMainDomain(cert.Subject, cert.DNSNames)
-}
-
-func getMainDomain(subject pkix.Name, dnsNames []string) (string, error) {
-	if subject.CommonName == "" && len(dnsNames) == 0 {
-		return "", errors.New("missing domain")
-	}
-
-	if subject.CommonName != "" {
-		return subject.CommonName, nil
-	}
-
-	return dnsNames[0], nil
-}
-
 func ExtractDomains(cert *x509.Certificate) []string {
 	var domains []string
 	if cert.Subject.CommonName != "" {
@@ -268,13 +212,6 @@ func ExtractDomains(cert *x509.Certificate) []string {
 		domains = append(domains, sanDomain)
 	}
 
-	commonNameIP := net.ParseIP(cert.Subject.CommonName)
-	for _, sanIP := range cert.IPAddresses {
-		if !commonNameIP.Equal(sanIP) {
-			domains = append(domains, sanIP.String())
-		}
-	}
-
 	return domains
 }
 
@@ -286,7 +223,7 @@ func ExtractDomainsCSR(csr *x509.CertificateRequest) []string {
 
 	// loop over the SubjectAltName DNS names
 	for _, sanName := range csr.DNSNames {
-		if slices.Contains(domains, sanName) {
+		if containsSAN(domains, sanName) {
 			// Duplicate; skip this name
 			continue
 		}
@@ -295,14 +232,16 @@ func ExtractDomainsCSR(csr *x509.CertificateRequest) []string {
 		domains = append(domains, sanName)
 	}
 
-	cnip := net.ParseIP(csr.Subject.CommonName)
-	for _, sanIP := range csr.IPAddresses {
-		if !cnip.Equal(sanIP) {
-			domains = append(domains, sanIP.String())
+	return domains
+}
+
+func containsSAN(domains []string, sanName string) bool {
+	for _, existingName := range domains {
+		if existingName == sanName {
+			return true
 		}
 	}
-
-	return domains
+	return false
 }
 
 func GeneratePemCert(privateKey *rsa.PrivateKey, domain string, extensions []pkix.Extension) ([]byte, error) {
@@ -322,7 +261,7 @@ func generateDerCert(privateKey *rsa.PrivateKey, expiration time.Time, domain st
 	}
 
 	if expiration.IsZero() {
-		expiration = time.Now().AddDate(1, 0, 0)
+		expiration = time.Now().Add(365)
 	}
 
 	template := x509.Certificate{
@@ -335,15 +274,9 @@ func generateDerCert(privateKey *rsa.PrivateKey, expiration time.Time, domain st
 
 		KeyUsage:              x509.KeyUsageKeyEncipherment,
 		BasicConstraintsValid: true,
+		DNSNames:              []string{domain},
 		ExtraExtensions:       extensions,
 	}
 
-	// handling SAN filling as type suspected
-	if ip := net.ParseIP(domain); ip != nil {
-		template.IPAddresses = []net.IP{ip}
-	} else {
-		template.DNSNames = []string{domain}
-	}
-
 	return x509.CreateCertificate(rand.Reader, &template, &template, &privateKey.PublicKey, privateKey)
 }
diff --git a/vendor/github.com/go-acme/lego/v4/certificate/authorization.go b/vendor/github.com/go-acme/lego/v4/certificate/authorization.go
index c77bcbd..9161d75 100644
--- a/vendor/github.com/go-acme/lego/v4/certificate/authorization.go
+++ b/vendor/github.com/go-acme/lego/v4/certificate/authorization.go
@@ -7,10 +7,18 @@ import (
 	"github.com/go-acme/lego/v4/log"
 )
 
+const (
+	// overallRequestLimit is the overall number of request per second
+	// limited on the "new-reg", "new-authz" and "new-cert" endpoints.
+	// From the documentation the limitation is 20 requests per second,
+	// but using 20 as value doesn't work but 18 do.
+	overallRequestLimit = 18
+)
+
 func (c *Certifier) getAuthorizations(order acme.ExtendedOrder) ([]acme.Authorization, error) {
 	resc, errc := make(chan acme.Authorization), make(chan domainError)
 
-	delay := time.Second / time.Duration(c.overallRequestLimit)
+	delay := time.Second / overallRequestLimit
 
 	for _, authzURL := range order.Authorizations {
 		time.Sleep(delay)
@@ -27,14 +35,13 @@ func (c *Certifier) getAuthorizations(order acme.ExtendedOrder) ([]acme.Authoriz
 	}
 
 	var responses []acme.Authorization
-
-	failures := newObtainError()
-	for range len(order.Authorizations) {
+	failures := make(obtainError)
+	for i := 0; i < len(order.Authorizations); i++ {
 		select {
 		case res := <-resc:
 			responses = append(responses, res)
 		case err := <-errc:
-			failures.Add(err.Domain, err.Error)
+			failures[err.Domain] = err.Error
 		}
 	}
 
@@ -45,18 +52,23 @@ func (c *Certifier) getAuthorizations(order acme.ExtendedOrder) ([]acme.Authoriz
 	close(resc)
 	close(errc)
 
-	return responses, failures.Join()
+	// be careful to not return an empty failures map;
+	// even if empty, they become non-nil error values
+	if len(failures) > 0 {
+		return responses, failures
+	}
+	return responses, nil
 }
 
-func (c *Certifier) deactivateAuthorizations(order acme.ExtendedOrder, force bool) {
+func (c *Certifier) deactivateAuthorizations(order acme.ExtendedOrder) {
 	for _, authzURL := range order.Authorizations {
 		auth, err := c.core.Authorizations.Get(authzURL)
 		if err != nil {
-			log.Infof("Unable to get the authorization for %s: %v", authzURL, err)
+			log.Infof("Unable to get the authorization for: %s", authzURL)
 			continue
 		}
 
-		if auth.Status == acme.StatusValid && !force {
+		if auth.Status == acme.StatusValid {
 			log.Infof("Skipping deactivating of valid auth: %s", authzURL)
 			continue
 		}
diff --git a/vendor/github.com/go-acme/lego/v4/certificate/certificates.go b/vendor/github.com/go-acme/lego/v4/certificate/certificates.go
index d03e99c..a130680 100644
--- a/vendor/github.com/go-acme/lego/v4/certificate/certificates.go
+++ b/vendor/github.com/go-acme/lego/v4/certificate/certificates.go
@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
@@ -22,17 +22,6 @@ import (
 	"golang.org/x/net/idna"
 )
 
-const (
-	// DefaultOverallRequestLimit is the overall number of request per second
-	// limited on the "new-reg", "new-authz" and "new-cert" endpoints.
-	// From the documentation the limitation is 20 requests per second,
-	// but using 20 as value doesn't work but 18 do.
-	// https://letsencrypt.org/docs/rate-limits/
-	// ZeroSSL has a limit of 7.
-	// https://help.zerossl.com/hc/en-us/articles/17864245480093-Advantages-over-Using-Let-s-Encrypt#h_01HT4Z1JCJFJQFJ1M3P7S085Q9
-	DefaultOverallRequestLimit = 18
-)
-
 // maxBodySize is the maximum size of body that we will read.
 const maxBodySize = 1024 * 1024
 
@@ -60,61 +49,22 @@ type Resource struct {
 // If you do not want that you can supply your own private key in the privateKey parameter.
 // If this parameter is non-nil it will be used instead of generating a new one.
 //
-// If `Bundle` is true, the `[]byte` contains both the issuer certificate and your issued certificate as a bundle.
-//
-// If `AlwaysDeactivateAuthorizations` is true, the authorizations are also relinquished if the obtain request was successful.
-// See https://datatracker.ietf.org/doc/html/rfc8555#section-7.5.2.
+// If bundle is true, the []byte contains both the issuer certificate and your issued certificate as a bundle.
 type ObtainRequest struct {
 	Domains        []string
+	Bundle         bool
 	PrivateKey     crypto.PrivateKey
 	MustStaple     bool
-	EmailAddresses []string
-
-	NotBefore      time.Time
-	NotAfter       time.Time
-	Bundle         bool
 	PreferredChain string
-
-	// A string uniquely identifying the profile
-	// which will be used to affect issuance of the certificate requested by this Order.
-	// - https://www.ietf.org/id/draft-aaron-acme-profiles-00.html#section-4
-	Profile string
-
-	AlwaysDeactivateAuthorizations bool
-
-	// A string uniquely identifying a previously-issued certificate which this
-	// order is intended to replace.
-	// - https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-5
-	ReplacesCertID string
 }
 
 // ObtainForCSRRequest The request to obtain a certificate matching the CSR passed into it.
 //
-// If `Bundle` is true, the `[]byte` contains both the issuer certificate and your issued certificate as a bundle.
-//
-// If `AlwaysDeactivateAuthorizations` is true, the authorizations are also relinquished if the obtain request was successful.
-// See https://datatracker.ietf.org/doc/html/rfc8555#section-7.5.2.
+// If bundle is true, the []byte contains both the issuer certificate and your issued certificate as a bundle.
 type ObtainForCSRRequest struct {
-	CSR *x509.CertificateRequest
-
-	PrivateKey crypto.PrivateKey
-
-	NotBefore      time.Time
-	NotAfter       time.Time
+	CSR            *x509.CertificateRequest
 	Bundle         bool
 	PreferredChain string
-
-	// A string uniquely identifying the profile
-	// which will be used to affect issuance of the certificate requested by this Order.
-	// - https://www.ietf.org/id/draft-aaron-acme-profiles-00.html#section-4
-	Profile string
-
-	AlwaysDeactivateAuthorizations bool
-
-	// A string uniquely identifying a previously-issued certificate which this
-	// order is intended to replace.
-	// - https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-5
-	ReplacesCertID string
 }
 
 type resolver interface {
@@ -122,33 +72,24 @@ type resolver interface {
 }
 
 type CertifierOptions struct {
-	KeyType             certcrypto.KeyType
-	Timeout             time.Duration
-	OverallRequestLimit int
+	KeyType certcrypto.KeyType
+	Timeout time.Duration
 }
 
 // Certifier A service to obtain/renew/revoke certificates.
 type Certifier struct {
-	core                *api.Core
-	resolver            resolver
-	options             CertifierOptions
-	overallRequestLimit int
+	core     *api.Core
+	resolver resolver
+	options  CertifierOptions
 }
 
 // NewCertifier creates a Certifier.
 func NewCertifier(core *api.Core, resolver resolver, options CertifierOptions) *Certifier {
-	c := &Certifier{
+	return &Certifier{
 		core:     core,
 		resolver: resolver,
 		options:  options,
 	}
-
-	c.overallRequestLimit = options.OverallRequestLimit
-	if c.overallRequestLimit <= 0 {
-		c.overallRequestLimit = DefaultOverallRequestLimit
-	}
-
-	return c
 }
 
 // Obtain tries to obtain a single certificate using all domains passed into it.
@@ -168,14 +109,7 @@ func (c *Certifier) Obtain(request ObtainRequest) (*Resource, error) {
 		log.Infof("[%s] acme: Obtaining SAN certificate", strings.Join(domains, ", "))
 	}
 
-	orderOpts := &api.OrderOptions{
-		NotBefore:      request.NotBefore,
-		NotAfter:       request.NotAfter,
-		Profile:        request.Profile,
-		ReplacesCertID: request.ReplacesCertID,
-	}
-
-	order, err := c.core.Orders.NewWithOptions(domains, orderOpts)
+	order, err := c.core.Orders.New(domains)
 	if err != nil {
 		return nil, err
 	}
@@ -183,32 +117,33 @@ func (c *Certifier) Obtain(request ObtainRequest) (*Resource, error) {
 	authz, err := c.getAuthorizations(order)
 	if err != nil {
 		// If any challenge fails, return. Do not generate partial SAN certificates.
-		c.deactivateAuthorizations(order, request.AlwaysDeactivateAuthorizations)
+		c.deactivateAuthorizations(order)
 		return nil, err
 	}
 
 	err = c.resolver.Solve(authz)
 	if err != nil {
 		// If any challenge fails, return. Do not generate partial SAN certificates.
-		c.deactivateAuthorizations(order, request.AlwaysDeactivateAuthorizations)
+		c.deactivateAuthorizations(order)
 		return nil, err
 	}
 
 	log.Infof("[%s] acme: Validations succeeded; requesting certificates", strings.Join(domains, ", "))
 
-	failures := newObtainError()
-	cert, err := c.getForOrder(domains, order, request)
+	failures := make(obtainError)
+	cert, err := c.getForOrder(domains, order, request.Bundle, request.PrivateKey, request.MustStaple, request.PreferredChain)
 	if err != nil {
 		for _, auth := range authz {
-			failures.Add(challenge.GetTargetedDomain(auth), err)
+			failures[challenge.GetTargetedDomain(auth)] = err
 		}
 	}
 
-	if request.AlwaysDeactivateAuthorizations {
-		c.deactivateAuthorizations(order, true)
+	// Do not return an empty failures map, because
+	// it would still be a non-nil error value
+	if len(failures) > 0 {
+		return cert, failures
 	}
-
-	return cert, failures.Join()
+	return cert, nil
 }
 
 // ObtainForCSR tries to obtain a certificate matching the CSR passed into it.
@@ -235,14 +170,7 @@ func (c *Certifier) ObtainForCSR(request ObtainForCSRRequest) (*Resource, error)
 		log.Infof("[%s] acme: Obtaining SAN certificate given a CSR", strings.Join(domains, ", "))
 	}
 
-	orderOpts := &api.OrderOptions{
-		NotBefore:      request.NotBefore,
-		NotAfter:       request.NotAfter,
-		Profile:        request.Profile,
-		ReplacesCertID: request.ReplacesCertID,
-	}
-
-	order, err := c.core.Orders.NewWithOptions(domains, orderOpts)
+	order, err := c.core.Orders.New(domains)
 	if err != nil {
 		return nil, err
 	}
@@ -250,48 +178,41 @@ func (c *Certifier) ObtainForCSR(request ObtainForCSRRequest) (*Resource, error)
 	authz, err := c.getAuthorizations(order)
 	if err != nil {
 		// If any challenge fails, return. Do not generate partial SAN certificates.
-		c.deactivateAuthorizations(order, request.AlwaysDeactivateAuthorizations)
+		c.deactivateAuthorizations(order)
 		return nil, err
 	}
 
 	err = c.resolver.Solve(authz)
 	if err != nil {
 		// If any challenge fails, return. Do not generate partial SAN certificates.
-		c.deactivateAuthorizations(order, request.AlwaysDeactivateAuthorizations)
+		c.deactivateAuthorizations(order)
 		return nil, err
 	}
 
 	log.Infof("[%s] acme: Validations succeeded; requesting certificates", strings.Join(domains, ", "))
 
-	failures := newObtainError()
-
-	var privateKey []byte
-	if request.PrivateKey != nil {
-		privateKey = certcrypto.PEMEncode(request.PrivateKey)
-	}
-
-	cert, err := c.getForCSR(domains, order, request.Bundle, request.CSR.Raw, privateKey, request.PreferredChain)
+	failures := make(obtainError)
+	cert, err := c.getForCSR(domains, order, request.Bundle, request.CSR.Raw, nil, request.PreferredChain)
 	if err != nil {
 		for _, auth := range authz {
-			failures.Add(challenge.GetTargetedDomain(auth), err)
+			failures[challenge.GetTargetedDomain(auth)] = err
 		}
 	}
 
-	if request.AlwaysDeactivateAuthorizations {
-		c.deactivateAuthorizations(order, true)
-	}
-
 	if cert != nil {
 		// Add the CSR to the certificate so that it can be used for renewals.
 		cert.CSR = certcrypto.PEMEncode(request.CSR)
 	}
 
-	return cert, failures.Join()
+	// Do not return an empty failures map,
+	// because it would still be a non-nil error value
+	if len(failures) > 0 {
+		return cert, failures
+	}
+	return cert, nil
 }
 
-func (c *Certifier) getForOrder(domains []string, order acme.ExtendedOrder, request ObtainRequest) (*Resource, error) {
-	privateKey := request.PrivateKey
-
+func (c *Certifier) getForOrder(domains []string, order acme.ExtendedOrder, bundle bool, privateKey crypto.PrivateKey, mustStaple bool, preferredChain string) (*Resource, error) {
 	if privateKey == nil {
 		var err error
 		privateKey, err = certcrypto.GeneratePrivateKey(c.options.KeyType)
@@ -300,42 +221,29 @@ func (c *Certifier) getForOrder(domains []string, order acme.ExtendedOrder, requ
 		}
 	}
 
-	commonName := ""
-	if len(domains[0]) <= 64 {
-		commonName = domains[0]
-	}
+	// Determine certificate name(s) based on the authorization resources
+	commonName := domains[0]
 
 	// RFC8555 Section 7.4 "Applying for Certificate Issuance"
-	// https://www.rfc-editor.org/rfc/rfc8555.html#section-7.4
+	// https://tools.ietf.org/html/rfc8555#section-7.4
 	// says:
 	//   Clients SHOULD NOT make any assumptions about the sort order of
 	//   "identifiers" or "authorizations" elements in the returned order
 	//   object.
-
-	var san []string
-	if commonName != "" {
-		san = append(san, commonName)
-	}
-
+	san := []string{commonName}
 	for _, auth := range order.Identifiers {
 		if auth.Value != commonName {
 			san = append(san, auth.Value)
 		}
 	}
 
-	csrOptions := certcrypto.CSROptions{
-		Domain:         commonName,
-		SAN:            san,
-		MustStaple:     request.MustStaple,
-		EmailAddresses: request.EmailAddresses,
-	}
-
-	csr, err := certcrypto.CreateCSR(privateKey, csrOptions)
+	// TODO: should the CSR be customizable?
+	csr, err := certcrypto.GenerateCSR(privateKey, commonName, san, mustStaple)
 	if err != nil {
 		return nil, err
 	}
 
-	return c.getForCSR(domains, order, request.Bundle, csr, certcrypto.PEMEncode(privateKey), request.PreferredChain)
+	return c.getForCSR(domains, order, bundle, csr, certcrypto.PEMEncode(privateKey), preferredChain)
 }
 
 func (c *Certifier) getForCSR(domains []string, order acme.ExtendedOrder, bundle bool, csr, privateKeyPem []byte, preferredChain string) (*Resource, error) {
@@ -344,14 +252,15 @@ func (c *Certifier) getForCSR(domains []string, order acme.ExtendedOrder, bundle
 		return nil, err
 	}
 
+	commonName := domains[0]
 	certRes := &Resource{
-		Domain:     domains[0],
+		Domain:     commonName,
 		CertURL:    respOrder.Certificate,
 		PrivateKey: privateKeyPem,
 	}
 
 	if respOrder.Status == acme.StatusValid {
-		// if the certificate is available right away, shortcut!
+		// if the certificate is available right away, short cut!
 		ok, errR := c.checkResponse(respOrder, certRes, bundle, preferredChain)
 		if errR != nil {
 			return nil, errR
@@ -440,11 +349,6 @@ func (c *Certifier) checkResponse(order acme.ExtendedOrder, certRes *Resource, b
 
 // Revoke takes a PEM encoded certificate or bundle and tries to revoke it at the CA.
 func (c *Certifier) Revoke(cert []byte) error {
-	return c.RevokeWithReason(cert, nil)
-}
-
-// RevokeWithReason takes a PEM encoded certificate or bundle and tries to revoke it at the CA.
-func (c *Certifier) RevokeWithReason(cert []byte, reason *uint) error {
 	certificates, err := certcrypto.ParsePEMBundle(cert)
 	if err != nil {
 		return err
@@ -457,28 +361,11 @@ func (c *Certifier) RevokeWithReason(cert []byte, reason *uint) error {
 
 	revokeMsg := acme.RevokeCertMessage{
 		Certificate: base64.RawURLEncoding.EncodeToString(x509Cert.Raw),
-		Reason:      reason,
 	}
 
 	return c.core.Certificates.Revoke(revokeMsg)
 }
 
-// RenewOptions options used by Certifier.RenewWithOptions.
-type RenewOptions struct {
-	NotBefore time.Time
-	NotAfter  time.Time
-	// If true, the []byte contains both the issuer certificate and your issued certificate as a bundle.
-	Bundle         bool
-	PreferredChain string
-
-	Profile string
-
-	AlwaysDeactivateAuthorizations bool
-	// Not supported for CSR request.
-	MustStaple     bool
-	EmailAddresses []string
-}
-
 // Renew takes a Resource and tries to renew the certificate.
 //
 // If the renewal process succeeds, the new certificate will be returned in a new CertResource.
@@ -489,26 +376,7 @@ type RenewOptions struct {
 // If bundle is true, the []byte contains both the issuer certificate and your issued certificate as a bundle.
 //
 // For private key reuse the PrivateKey property of the passed in Resource should be non-nil.
-// Deprecated: use RenewWithOptions instead.
 func (c *Certifier) Renew(certRes Resource, bundle, mustStaple bool, preferredChain string) (*Resource, error) {
-	return c.RenewWithOptions(certRes, &RenewOptions{
-		Bundle:         bundle,
-		PreferredChain: preferredChain,
-		MustStaple:     mustStaple,
-	})
-}
-
-// RenewWithOptions takes a Resource and tries to renew the certificate.
-//
-// If the renewal process succeeds, the new certificate will be returned in a new CertResource.
-// Please be aware that this function will return a new certificate in ANY case that is not an error.
-// If the server does not provide us with a new cert on a GET request to the CertURL
-// this function will start a new-cert flow where a new certificate gets generated.
-//
-// If bundle is true, the []byte contains both the issuer certificate and your issued certificate as a bundle.
-//
-// For private key reuse the PrivateKey property of the passed in Resource should be non-nil.
-func (c *Certifier) RenewWithOptions(certRes Resource, options *RenewOptions) (*Resource, error) {
 	// Input certificate is PEM encoded.
 	// Decode it here as we may need the decoded cert later on in the renewal process.
 	// The input may be a bundle or a single certificate.
@@ -535,18 +403,11 @@ func (c *Certifier) RenewWithOptions(certRes Resource, options *RenewOptions) (*
 			return nil, errP
 		}
 
-		request := ObtainForCSRRequest{CSR: csr}
-
-		if options != nil {
-			request.NotBefore = options.NotBefore
-			request.NotAfter = options.NotAfter
-			request.Bundle = options.Bundle
-			request.PreferredChain = options.PreferredChain
-			request.Profile = options.Profile
-			request.AlwaysDeactivateAuthorizations = options.AlwaysDeactivateAuthorizations
-		}
-
-		return c.ObtainForCSR(request)
+		return c.ObtainForCSR(ObtainForCSRRequest{
+			CSR:            csr,
+			Bundle:         bundle,
+			PreferredChain: preferredChain,
+		})
 	}
 
 	var privateKey crypto.PrivateKey
@@ -557,23 +418,13 @@ func (c *Certifier) RenewWithOptions(certRes Resource, options *RenewOptions) (*
 		}
 	}
 
-	request := ObtainRequest{
+	query := ObtainRequest{
 		Domains:    certcrypto.ExtractDomains(x509Cert),
+		Bundle:     bundle,
 		PrivateKey: privateKey,
+		MustStaple: mustStaple,
 	}
-
-	if options != nil {
-		request.MustStaple = options.MustStaple
-		request.NotBefore = options.NotBefore
-		request.NotAfter = options.NotAfter
-		request.Bundle = options.Bundle
-		request.PreferredChain = options.PreferredChain
-		request.EmailAddresses = options.EmailAddresses
-		request.Profile = options.Profile
-		request.AlwaysDeactivateAuthorizations = options.AlwaysDeactivateAuthorizations
-	}
-
-	return c.Obtain(request)
+	return c.Obtain(query)
 }
 
 // GetOCSP takes a PEM encoded cert or cert bundle returning the raw OCSP response,
@@ -614,7 +465,7 @@ func (c *Certifier) GetOCSP(bundle []byte) ([]byte, *ocsp.Response, error) {
 		}
 		defer resp.Body.Close()
 
-		issuerBytes, errC := io.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
+		issuerBytes, errC := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
 		if errC != nil {
 			return nil, nil, errC
 		}
@@ -643,7 +494,7 @@ func (c *Certifier) GetOCSP(bundle []byte) ([]byte, *ocsp.Response, error) {
 	}
 	defer resp.Body.Close()
 
-	ocspResBytes, err := io.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
+	ocspResBytes, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, maxBodySize))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -674,13 +525,8 @@ func (c *Certifier) Get(url string, bundle bool) (*Resource, error) {
 		return nil, err
 	}
 
-	domain, err := certcrypto.GetCertificateMainDomain(x509Certs[0])
-	if err != nil {
-		return nil, err
-	}
-
 	return &Resource{
-		Domain:            domain,
+		Domain:            x509Certs[0].Subject.CommonName,
 		Certificate:       cert,
 		IssuerCertificate: issuer,
 		CertURL:           url,
@@ -708,17 +554,17 @@ func checkOrderStatus(order acme.ExtendedOrder) (bool, error) {
 	case acme.StatusValid:
 		return true, nil
 	case acme.StatusInvalid:
-		return false, fmt.Errorf("invalid order: %w", order.Err())
+		return false, order.Error
 	default:
 		return false, nil
 	}
 }
 
-// https://www.rfc-editor.org/rfc/rfc8555.html#section-7.1.4
+// https://tools.ietf.org/html/rfc8555#section-7.1.4
 // The domain name MUST be encoded in the form in which it would appear in a certificate.
 // That is, it MUST be encoded according to the rules in Section 7 of [RFC5280].
 //
-// https://www.rfc-editor.org/rfc/rfc5280.html#section-7
+// https://tools.ietf.org/html/rfc5280#section-7
 func sanitizeDomain(domains []string) []string {
 	var sanitizedDomains []string
 	for _, domain := range domains {
diff --git a/vendor/github.com/go-acme/lego/v4/certificate/errors.go b/vendor/github.com/go-acme/lego/v4/certificate/errors.go
index f305524..3adbc78 100644
--- a/vendor/github.com/go-acme/lego/v4/certificate/errors.go
+++ b/vendor/github.com/go-acme/lego/v4/certificate/errors.go
@@ -1,37 +1,27 @@
 package certificate
 
 import (
-	"errors"
+	"bytes"
 	"fmt"
+	"sort"
 )
 
-type obtainError struct {
-	data map[string]error
-}
+// obtainError is returned when there are specific errors available per domain.
+type obtainError map[string]error
 
-func newObtainError() *obtainError {
-	return &obtainError{data: make(map[string]error)}
-}
+func (e obtainError) Error() string {
+	buffer := bytes.NewBufferString("error: one or more domains had a problem:\n")
 
-func (e *obtainError) Add(domain string, err error) {
-	e.data[domain] = err
-}
-
-func (e *obtainError) Join() error {
-	if e == nil {
-		return nil
+	var domains []string
+	for domain := range e {
+		domains = append(domains, domain)
 	}
+	sort.Strings(domains)
 
-	if len(e.data) == 0 {
-		return nil
+	for _, domain := range domains {
+		buffer.WriteString(fmt.Sprintf("[%s] %s\n", domain, e[domain]))
 	}
-
-	var err error
-	for d, e := range e.data {
-		err = errors.Join(err, fmt.Errorf("%s: %w", d, e))
-	}
-
-	return fmt.Errorf("error: one or more domains had a problem:\n%w", err)
+	return buffer.String()
 }
 
 type domainError struct {
diff --git a/vendor/github.com/go-acme/lego/v4/certificate/renewal.go b/vendor/github.com/go-acme/lego/v4/certificate/renewal.go
deleted file mode 100644
index ab21592..0000000
--- a/vendor/github.com/go-acme/lego/v4/certificate/renewal.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package certificate
-
-import (
-	"crypto/x509"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math/rand"
-	"time"
-
-	"github.com/go-acme/lego/v4/acme"
-)
-
-// RenewalInfoRequest contains the necessary renewal information.
-type RenewalInfoRequest struct {
-	Cert *x509.Certificate
-}
-
-// RenewalInfoResponse is a wrapper around acme.RenewalInfoResponse that provides a method for determining when to renew a certificate.
-type RenewalInfoResponse struct {
-	acme.RenewalInfoResponse
-
-	// RetryAfter header indicating the polling interval that the ACME server recommends.
-	// Conforming clients SHOULD query the renewalInfo URL again after the RetryAfter period has passed,
-	// as the server may provide a different suggestedWindow.
-	// https://datatracker.ietf.org/doc/html/draft-ietf-acme-ari-03#section-4.2
-	RetryAfter time.Duration
-}
-
-// ShouldRenewAt determines the optimal renewal time based on the current time (UTC),renewal window suggest by ARI, and the client's willingness to sleep.
-// It returns a pointer to a time.Time value indicating when the renewal should be attempted or nil if deferred until the next normal wake time.
-// This method implements the RECOMMENDED algorithm described in draft-ietf-acme-ari.
-//
-// - (4.1-11. Getting Renewal Information) https://datatracker.ietf.org/doc/draft-ietf-acme-ari/
-func (r *RenewalInfoResponse) ShouldRenewAt(now time.Time, willingToSleep time.Duration) *time.Time {
-	// Explicitly convert all times to UTC.
-	now = now.UTC()
-	start := r.SuggestedWindow.Start.UTC()
-	end := r.SuggestedWindow.End.UTC()
-
-	// Select a uniform random time within the suggested window.
-	rt := start
-	if window := end.Sub(start); window > 0 {
-		randomDuration := time.Duration(rand.Int63n(int64(window)))
-		rt = rt.Add(randomDuration)
-	}
-
-	// If the selected time is in the past, attempt renewal immediately.
-	if rt.Before(now) {
-		return &now
-	}
-
-	// Otherwise, if the client can schedule itself to attempt renewal at exactly the selected time, do so.
-	willingToSleepUntil := now.Add(willingToSleep)
-	if willingToSleepUntil.After(rt) || willingToSleepUntil.Equal(rt) {
-		return &rt
-	}
-
-	// TODO: Otherwise, if the selected time is before the next time that the client would wake up normally, attempt renewal immediately.
-
-	// Otherwise, sleep until the next normal wake time, re-check ARI, and return to Step 1.
-	return nil
-}
-
-// GetRenewalInfo sends a request to the ACME server's renewalInfo endpoint to obtain a suggested renewal window.
-// The caller MUST provide the certificate and issuer certificate for the certificate they wish to renew.
-// The caller should attempt to renew the certificate at the time indicated by the ShouldRenewAt method of the returned RenewalInfoResponse object.
-//
-// Note: this endpoint is part of a draft specification, not all ACME servers will implement it.
-// This method will return api.ErrNoARI if the server does not advertise a renewal info endpoint.
-//
-// https://datatracker.ietf.org/doc/draft-ietf-acme-ari
-func (c *Certifier) GetRenewalInfo(req RenewalInfoRequest) (*RenewalInfoResponse, error) {
-	certID, err := MakeARICertID(req.Cert)
-	if err != nil {
-		return nil, fmt.Errorf("error making certID: %w", err)
-	}
-
-	resp, err := c.core.Certificates.GetRenewalInfo(certID)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var info RenewalInfoResponse
-	err = json.NewDecoder(resp.Body).Decode(&info)
-	if err != nil {
-		return nil, err
-	}
-
-	if retry := resp.Header.Get("Retry-After"); retry != "" {
-		info.RetryAfter, err = time.ParseDuration(retry + "s")
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &info, nil
-}
-
-// MakeARICertID constructs a certificate identifier as described in draft-ietf-acme-ari-03, section 4.1.
-func MakeARICertID(leaf *x509.Certificate) (string, error) {
-	if leaf == nil {
-		return "", errors.New("leaf certificate is nil")
-	}
-
-	// Marshal the Serial Number into DER.
-	der, err := asn1.Marshal(leaf.SerialNumber)
-	if err != nil {
-		return "", err
-	}
-
-	// Check if the DER encoded bytes are sufficient (at least 3 bytes: tag,
-	// length, and value).
-	if len(der) < 3 {
-		return "", errors.New("invalid DER encoding of serial number")
-	}
-
-	// Extract only the integer bytes from the DER encoded Serial Number
-	// Skipping the first 2 bytes (tag and length).
-	serial := base64.RawURLEncoding.EncodeToString(der[2:])
-
-	// Convert the Authority Key Identifier to base64url encoding without
-	// padding.
-	aki := base64.RawURLEncoding.EncodeToString(leaf.AuthorityKeyId)
-
-	// Construct the final identifier by concatenating AKI and Serial Number.
-	return fmt.Sprintf("%s.%s", aki, serial), nil
-}
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/challenges.go b/vendor/github.com/go-acme/lego/v4/challenge/challenges.go
index 39bf3be..4f6dc6b 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/challenges.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/challenges.go
@@ -10,15 +10,15 @@ import (
 type Type string
 
 const (
-	// HTTP01 is the "http-01" ACME challenge https://www.rfc-editor.org/rfc/rfc8555.html#section-8.3
+	// HTTP01 is the "http-01" ACME challenge https://tools.ietf.org/html/rfc8555#section-8.3
 	// Note: ChallengePath returns the URL path to fulfill this challenge.
 	HTTP01 = Type("http-01")
 
-	// DNS01 is the "dns-01" ACME challenge https://www.rfc-editor.org/rfc/rfc8555.html#section-8.4
+	// DNS01 is the "dns-01" ACME challenge https://tools.ietf.org/html/rfc8555#section-8.4
 	// Note: GetRecord returns a DNS record which will fulfill this challenge.
 	DNS01 = Type("dns-01")
 
-	// TLSALPN01 is the "tls-alpn-01" ACME challenge https://www.rfc-editor.org/rfc/rfc8737.html
+	// TLSALPN01 is the "tls-alpn-01" ACME challenge https://tools.ietf.org/html/draft-ietf-acme-tls-alpn-07
 	TLSALPN01 = Type("tls-alpn-01")
 )
 
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/cname.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/cname.go
index 26fe150..ab35ee8 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/cname.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/dns01/cname.go
@@ -1,16 +1,12 @@
 package dns01
 
-import (
-	"strings"
-
-	"github.com/miekg/dns"
-)
+import "github.com/miekg/dns"
 
 // Update FQDN with CNAME if any.
 func updateDomainWithCName(r *dns.Msg, fqdn string) string {
 	for _, rr := range r.Answer {
 		if cn, ok := rr.(*dns.CNAME); ok {
-			if strings.EqualFold(cn.Hdr.Name, fqdn) {
+			if cn.Hdr.Name == fqdn {
 				return cn.Target
 			}
 		}
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge.go
index 8594d27..e46e9ba 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/go-acme/lego/v4/acme"
@@ -115,7 +114,7 @@ func (c *Challenge) Solve(authz acme.Authorization) error {
 		return err
 	}
 
-	info := GetChallengeInfo(authz.Identifier.Value, keyAuth)
+	fqdn, value := GetRecord(authz.Identifier.Value, keyAuth)
 
 	var timeout, interval time.Duration
 	switch provider := c.provider.(type) {
@@ -125,12 +124,12 @@ func (c *Challenge) Solve(authz acme.Authorization) error {
 		timeout, interval = DefaultPropagationTimeout, DefaultPollingInterval
 	}
 
-	log.Infof("[%s] acme: Checking DNS record propagation. [nameservers=%s]", domain, strings.Join(recursiveNameservers, ","))
+	log.Infof("[%s] acme: Checking DNS record propagation using %+v", domain, recursiveNameservers)
 
 	time.Sleep(interval)
 
 	err = wait.For("propagation", timeout, interval, func() (bool, error) {
-		stop, errP := c.preCheck.call(domain, info.EffectiveFQDN, info.Value)
+		stop, errP := c.preCheck.call(domain, fqdn, value)
 		if !stop || errP != nil {
 			log.Infof("[%s] acme: Waiting for DNS record propagation.", domain)
 		}
@@ -173,67 +172,19 @@ type sequential interface {
 }
 
 // GetRecord returns a DNS record which will fulfill the `dns-01` challenge.
-// Deprecated: use GetChallengeInfo instead.
 func GetRecord(domain, keyAuth string) (fqdn, value string) {
-	info := GetChallengeInfo(domain, keyAuth)
-
-	return info.EffectiveFQDN, info.Value
-}
-
-// ChallengeInfo contains the information use to create the TXT record.
-type ChallengeInfo struct {
-	// FQDN is the full-qualified challenge domain (i.e. `_acme-challenge.[domain].`)
-	FQDN string
-
-	// EffectiveFQDN contains the resulting FQDN after the CNAMEs resolutions.
-	EffectiveFQDN string
-
-	// Value contains the value for the TXT record.
-	Value string
-}
-
-// GetChallengeInfo returns information used to create a DNS record which will fulfill the `dns-01` challenge.
-func GetChallengeInfo(domain, keyAuth string) ChallengeInfo {
 	keyAuthShaBytes := sha256.Sum256([]byte(keyAuth))
 	// base64URL encoding without padding
-	value := base64.RawURLEncoding.EncodeToString(keyAuthShaBytes[:sha256.Size])
+	value = base64.RawURLEncoding.EncodeToString(keyAuthShaBytes[:sha256.Size])
+	fqdn = fmt.Sprintf("_acme-challenge.%s.", domain)
 
-	ok, _ := strconv.ParseBool(os.Getenv("LEGO_DISABLE_CNAME_SUPPORT"))
-
-	return ChallengeInfo{
-		Value:         value,
-		FQDN:          getChallengeFQDN(domain, false),
-		EffectiveFQDN: getChallengeFQDN(domain, !ok),
-	}
-}
-
-func getChallengeFQDN(domain string, followCNAME bool) string {
-	fqdn := fmt.Sprintf("_acme-challenge.%s.", domain)
-
-	if !followCNAME {
-		return fqdn
-	}
-
-	// recursion counter so it doesn't spin out of control
-	for range 50 {
-		// Keep following CNAMEs
+	if ok, _ := strconv.ParseBool(os.Getenv("LEGO_EXPERIMENTAL_CNAME_SUPPORT")); ok {
 		r, err := dnsQuery(fqdn, dns.TypeCNAME, recursiveNameservers, true)
-
-		if err != nil || r.Rcode != dns.RcodeSuccess {
-			// No more CNAME records to follow, exit
-			break
+		// Check if the domain has CNAME then return that
+		if err == nil && r.Rcode == dns.RcodeSuccess {
+			fqdn = updateDomainWithCName(r, fqdn)
 		}
-
-		// Check if the domain has CNAME then use that
-		cname := updateDomainWithCName(r, fqdn)
-		if cname == fqdn {
-			break
-		}
-
-		log.Infof("Found CNAME entry for %q: %q", fqdn, cname)
-
-		fqdn = cname
 	}
 
-	return fqdn
+	return
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge_manual.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge_manual.go
index c00d640..b2f5d41 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge_manual.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/dns01/dns_challenge_manual.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	dnsTemplate = `%s %d IN TXT %q`
+	dnsTemplate = `%s %d IN TXT "%s"`
 )
 
 // DNSProviderManual is an implementation of the ChallengeProvider interface.
@@ -21,36 +21,33 @@ func NewDNSProviderManual() (*DNSProviderManual, error) {
 
 // Present prints instructions for manually creating the TXT record.
 func (*DNSProviderManual) Present(domain, token, keyAuth string) error {
-	info := GetChallengeInfo(domain, keyAuth)
+	fqdn, value := GetRecord(domain, keyAuth)
 
-	authZone, err := FindZoneByFqdn(info.EffectiveFQDN)
+	authZone, err := FindZoneByFqdn(fqdn)
 	if err != nil {
-		return fmt.Errorf("manual: could not find zone: %w", err)
+		return err
 	}
 
 	fmt.Printf("lego: Please create the following TXT record in your %s zone:\n", authZone)
-	fmt.Printf(dnsTemplate+"\n", info.EffectiveFQDN, DefaultTTL, info.Value)
+	fmt.Printf(dnsTemplate+"\n", fqdn, DefaultTTL, value)
 	fmt.Printf("lego: Press 'Enter' when you are done\n")
 
 	_, err = bufio.NewReader(os.Stdin).ReadBytes('\n')
-	if err != nil {
-		return fmt.Errorf("manual: %w", err)
-	}
 
-	return nil
+	return err
 }
 
 // CleanUp prints instructions for manually removing the TXT record.
 func (*DNSProviderManual) CleanUp(domain, token, keyAuth string) error {
-	info := GetChallengeInfo(domain, keyAuth)
+	fqdn, _ := GetRecord(domain, keyAuth)
 
-	authZone, err := FindZoneByFqdn(info.EffectiveFQDN)
+	authZone, err := FindZoneByFqdn(fqdn)
 	if err != nil {
-		return fmt.Errorf("manual: could not find zone: %w", err)
+		return err
 	}
 
 	fmt.Printf("lego: You can now remove this TXT record from your %s zone:\n", authZone)
-	fmt.Printf(dnsTemplate+"\n", info.EffectiveFQDN, DefaultTTL, "...")
+	fmt.Printf(dnsTemplate+"\n", fqdn, DefaultTTL, "...")
 
 	return nil
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/domain.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/domain.go
deleted file mode 100644
index e9b0cec..0000000
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/domain.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package dns01
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/miekg/dns"
-)
-
-// ExtractSubDomain extracts the subdomain part from a domain and a zone.
-func ExtractSubDomain(domain, zone string) (string, error) {
-	canonDomain := dns.Fqdn(domain)
-	canonZone := dns.Fqdn(zone)
-
-	if canonDomain == canonZone {
-		return "", fmt.Errorf("no subdomain because the domain and the zone are identical: %s", canonDomain)
-	}
-
-	if !dns.IsSubDomain(canonZone, canonDomain) {
-		return "", fmt.Errorf("%s is not a subdomain of %s", canonDomain, canonZone)
-	}
-
-	return strings.TrimSuffix(canonDomain, "."+canonZone), nil
-}
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver.go
index a8d678a..a6947e9 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver.go
@@ -4,9 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"os"
-	"slices"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -16,7 +13,13 @@ import (
 
 const defaultResolvConf = "/etc/resolv.conf"
 
-var fqdnSoaCache = &sync.Map{}
+// dnsTimeout is used to override the default DNS timeout of 10 seconds.
+var dnsTimeout = 10 * time.Second
+
+var (
+	fqdnSoaCache   = map[string]*soaCacheEntry{}
+	muFqdnSoaCache sync.Mutex
+)
 
 var defaultNameservers = []string{
 	"google-public-dns-a.google.com:53",
@@ -48,11 +51,9 @@ func (cache *soaCacheEntry) isExpired() bool {
 
 // ClearFqdnCache clears the cache of fqdn to zone mappings. Primarily used in testing.
 func ClearFqdnCache() {
-	// TODO(ldez): use `fqdnSoaCache.Clear()` when updating to go1.23
-	fqdnSoaCache.Range(func(k, v any) bool {
-		fqdnSoaCache.Delete(k)
-		return true
-	})
+	muFqdnSoaCache.Lock()
+	fqdnSoaCache = map[string]*soaCacheEntry{}
+	muFqdnSoaCache.Unlock()
 }
 
 func AddDNSTimeout(timeout time.Duration) ChallengeOption {
@@ -98,12 +99,12 @@ func lookupNameservers(fqdn string) ([]string, error) {
 
 	zone, err := FindZoneByFqdn(fqdn)
 	if err != nil {
-		return nil, fmt.Errorf("could not find zone: %w", err)
+		return nil, fmt.Errorf("could not determine the zone: %w", err)
 	}
 
 	r, err := dnsQuery(zone, dns.TypeNS, recursiveNameservers, true)
 	if err != nil {
-		return nil, fmt.Errorf("NS call failed: %w", err)
+		return nil, err
 	}
 
 	for _, rr := range r.Answer {
@@ -115,8 +116,7 @@ func lookupNameservers(fqdn string) ([]string, error) {
 	if len(authoritativeNss) > 0 {
 		return authoritativeNss, nil
 	}
-
-	return nil, fmt.Errorf("[zone=%s] could not determine authoritative nameservers", zone)
+	return nil, errors.New("could not determine authoritative nameservers")
 }
 
 // FindPrimaryNsByFqdn determines the primary nameserver of the zone apex for the given fqdn
@@ -130,7 +130,7 @@ func FindPrimaryNsByFqdn(fqdn string) (string, error) {
 func FindPrimaryNsByFqdnCustom(fqdn string, nameservers []string) (string, error) {
 	soa, err := lookupSoaByFqdn(fqdn, nameservers)
 	if err != nil {
-		return "", fmt.Errorf("[fqdn=%s] %w", fqdn, err)
+		return "", err
 	}
 	return soa.primaryNs, nil
 }
@@ -146,19 +146,18 @@ func FindZoneByFqdn(fqdn string) (string, error) {
 func FindZoneByFqdnCustom(fqdn string, nameservers []string) (string, error) {
 	soa, err := lookupSoaByFqdn(fqdn, nameservers)
 	if err != nil {
-		return "", fmt.Errorf("[fqdn=%s] %w", fqdn, err)
+		return "", err
 	}
 	return soa.zone, nil
 }
 
 func lookupSoaByFqdn(fqdn string, nameservers []string) (*soaCacheEntry, error) {
+	muFqdnSoaCache.Lock()
+	defer muFqdnSoaCache.Unlock()
+
 	// Do we have it cached and is it still fresh?
-	entAny, ok := fqdnSoaCache.Load(fqdn)
-	if ok && entAny != nil {
-		ent, ok1 := entAny.(*soaCacheEntry)
-		if ok1 && !ent.isExpired() {
-			return ent, nil
-		}
+	if ent := fqdnSoaCache[fqdn]; ent != nil && !ent.isExpired() {
+		return ent, nil
 	}
 
 	ent, err := fetchSoaByFqdn(fqdn, nameservers)
@@ -166,42 +165,41 @@ func lookupSoaByFqdn(fqdn string, nameservers []string) (*soaCacheEntry, error)
 		return nil, err
 	}
 
-	fqdnSoaCache.Store(fqdn, ent)
-
+	fqdnSoaCache[fqdn] = ent
 	return ent, nil
 }
 
 func fetchSoaByFqdn(fqdn string, nameservers []string) (*soaCacheEntry, error) {
 	var err error
-	var r *dns.Msg
+	var in *dns.Msg
 
 	labelIndexes := dns.Split(fqdn)
 	for _, index := range labelIndexes {
 		domain := fqdn[index:]
 
-		r, err = dnsQuery(domain, dns.TypeSOA, nameservers, true)
+		in, err = dnsQuery(domain, dns.TypeSOA, nameservers, true)
 		if err != nil {
 			continue
 		}
 
-		if r == nil {
+		if in == nil {
 			continue
 		}
 
-		switch r.Rcode {
+		switch in.Rcode {
 		case dns.RcodeSuccess:
 			// Check if we got a SOA RR in the answer section
-			if len(r.Answer) == 0 {
+			if len(in.Answer) == 0 {
 				continue
 			}
 
 			// CNAME records cannot/should not exist at the root of a zone.
 			// So we skip a domain when a CNAME is found.
-			if dnsMsgContainsCNAME(r) {
+			if dnsMsgContainsCNAME(in) {
 				continue
 			}
 
-			for _, ans := range r.Answer {
+			for _, ans := range in.Answer {
 				if soa, ok := ans.(*dns.SOA); ok {
 					return newSoaCacheEntry(soa), nil
 				}
@@ -210,46 +208,36 @@ func fetchSoaByFqdn(fqdn string, nameservers []string) (*soaCacheEntry, error) {
 			// NXDOMAIN
 		default:
 			// Any response code other than NOERROR and NXDOMAIN is treated as error
-			return nil, &DNSError{Message: fmt.Sprintf("unexpected response for '%s'", domain), MsgOut: r}
+			return nil, fmt.Errorf("unexpected response code '%s' for %s", dns.RcodeToString[in.Rcode], domain)
 		}
 	}
 
-	return nil, &DNSError{Message: fmt.Sprintf("could not find the start of authority for '%s'", fqdn), MsgOut: r, Err: err}
+	return nil, fmt.Errorf("could not find the start of authority for %s%s", fqdn, formatDNSError(in, err))
 }
 
 // dnsMsgContainsCNAME checks for a CNAME answer in msg.
 func dnsMsgContainsCNAME(msg *dns.Msg) bool {
-	return slices.ContainsFunc(msg.Answer, func(rr dns.RR) bool {
-		_, ok := rr.(*dns.CNAME)
-		return ok
-	})
+	for _, ans := range msg.Answer {
+		if _, ok := ans.(*dns.CNAME); ok {
+			return true
+		}
+	}
+	return false
 }
 
 func dnsQuery(fqdn string, rtype uint16, nameservers []string, recursive bool) (*dns.Msg, error) {
 	m := createDNSMsg(fqdn, rtype, recursive)
 
-	if len(nameservers) == 0 {
-		return nil, &DNSError{Message: "empty list of nameservers"}
-	}
-
-	var r *dns.Msg
+	var in *dns.Msg
 	var err error
-	var errAll error
 
 	for _, ns := range nameservers {
-		r, err = sendDNSQuery(m, ns)
-		if err == nil && len(r.Answer) > 0 {
+		in, err = sendDNSQuery(m, ns)
+		if err == nil && len(in.Answer) > 0 {
 			break
 		}
-
-		errAll = errors.Join(errAll, err)
 	}
-
-	if err != nil {
-		return r, errAll
-	}
-
-	return r, nil
+	return in, err
 }
 
 func createDNSMsg(fqdn string, rtype uint16, recursive bool) *dns.Msg {
@@ -265,84 +253,32 @@ func createDNSMsg(fqdn string, rtype uint16, recursive bool) *dns.Msg {
 }
 
 func sendDNSQuery(m *dns.Msg, ns string) (*dns.Msg, error) {
-	if ok, _ := strconv.ParseBool(os.Getenv("LEGO_EXPERIMENTAL_DNS_TCP_ONLY")); ok {
-		tcp := &dns.Client{Net: "tcp", Timeout: dnsTimeout}
-		r, _, err := tcp.Exchange(m, ns)
-		if err != nil {
-			return r, &DNSError{Message: "DNS call error", MsgIn: m, NS: ns, Err: err}
-		}
+	udp := &dns.Client{Net: "udp", Timeout: dnsTimeout}
+	in, _, err := udp.Exchange(m, ns)
 
-		return r, nil
+	if in != nil && in.Truncated {
+		tcp := &dns.Client{Net: "tcp", Timeout: dnsTimeout}
+		// If the TCP request succeeds, the err will reset to nil
+		in, _, err = tcp.Exchange(m, ns)
 	}
 
-	udp := &dns.Client{Net: "udp", Timeout: dnsTimeout}
-	r, _, err := udp.Exchange(m, ns)
+	return in, err
+}
 
-	if r != nil && r.Truncated {
-		tcp := &dns.Client{Net: "tcp", Timeout: dnsTimeout}
-		// If the TCP request succeeds, the "err" will reset to nil
-		r, _, err = tcp.Exchange(m, ns)
+func formatDNSError(msg *dns.Msg, err error) string {
+	var parts []string
+
+	if msg != nil {
+		parts = append(parts, dns.RcodeToString[msg.Rcode])
 	}
 
 	if err != nil {
-		return r, &DNSError{Message: "DNS call error", MsgIn: m, NS: ns, Err: err}
+		parts = append(parts, err.Error())
 	}
 
-	return r, nil
-}
-
-// DNSError error related to DNS calls.
-type DNSError struct {
-	Message string
-	NS      string
-	MsgIn   *dns.Msg
-	MsgOut  *dns.Msg
-	Err     error
-}
-
-func (d *DNSError) Error() string {
-	var details []string
-	if d.NS != "" {
-		details = append(details, "ns="+d.NS)
-	}
-
-	if d.MsgIn != nil && len(d.MsgIn.Question) > 0 {
-		details = append(details, fmt.Sprintf("question='%s'", formatQuestions(d.MsgIn.Question)))
-	}
-
-	if d.MsgOut != nil {
-		if d.MsgIn == nil || len(d.MsgIn.Question) == 0 {
-			details = append(details, fmt.Sprintf("question='%s'", formatQuestions(d.MsgOut.Question)))
-		}
-
-		details = append(details, "code="+dns.RcodeToString[d.MsgOut.Rcode])
-	}
-
-	msg := "DNS error"
-	if d.Message != "" {
-		msg = d.Message
-	}
-
-	if d.Err != nil {
-		msg += ": " + d.Err.Error()
-	}
-
-	if len(details) > 0 {
-		msg += " [" + strings.Join(details, ", ") + "]"
-	}
-
-	return msg
-}
-
-func (d *DNSError) Unwrap() error {
-	return d.Err
-}
-
-func formatQuestions(questions []dns.Question) string {
-	var parts []string
-	for _, question := range questions {
-		parts = append(parts, strings.ReplaceAll(strings.TrimPrefix(question.String(), ";"), "\t", " "))
-	}
-
-	return strings.Join(parts, ";")
+	if len(parts) > 0 {
+		return ": " + strings.Join(parts, " ")
+	}
+
+	return ""
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_unix.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_unix.go
deleted file mode 100644
index a3cbad1..0000000
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build !windows
-
-package dns01
-
-import "time"
-
-// dnsTimeout is used to override the default DNS timeout of 10 seconds.
-var dnsTimeout = 10 * time.Second
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_windows.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_windows.go
deleted file mode 100644
index 739e54a..0000000
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/nameserver_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build windows
-
-package dns01
-
-import "time"
-
-// dnsTimeout is used to override the default DNS timeout of 20 seconds.
-var dnsTimeout = 20 * time.Second
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/dns01/precheck.go b/vendor/github.com/go-acme/lego/v4/challenge/dns01/precheck.go
index 706e8db..f65dfb5 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/dns01/precheck.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/dns01/precheck.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	"time"
 
 	"github.com/miekg/dns"
 )
@@ -24,52 +23,23 @@ func WrapPreCheck(wrap WrapPreCheckFunc) ChallengeOption {
 	}
 }
 
-// DisableCompletePropagationRequirement obsolete.
-// Deprecated: use DisableAuthoritativeNssPropagationRequirement instead.
 func DisableCompletePropagationRequirement() ChallengeOption {
-	return DisableAuthoritativeNssPropagationRequirement()
-}
-
-func DisableAuthoritativeNssPropagationRequirement() ChallengeOption {
 	return func(chlg *Challenge) error {
-		chlg.preCheck.requireAuthoritativeNssPropagation = false
+		chlg.preCheck.requireCompletePropagation = false
 		return nil
 	}
 }
 
-func RecursiveNSsPropagationRequirement() ChallengeOption {
-	return func(chlg *Challenge) error {
-		chlg.preCheck.requireRecursiveNssPropagation = true
-		return nil
-	}
-}
-
-func PropagationWait(wait time.Duration, skipCheck bool) ChallengeOption {
-	return WrapPreCheck(func(domain, fqdn, value string, check PreCheckFunc) (bool, error) {
-		time.Sleep(wait)
-
-		if skipCheck {
-			return true, nil
-		}
-
-		return check(fqdn, value)
-	})
-}
-
 type preCheck struct {
 	// checks DNS propagation before notifying ACME that the DNS challenge is ready.
 	checkFunc WrapPreCheckFunc
-
 	// require the TXT record to be propagated to all authoritative name servers
-	requireAuthoritativeNssPropagation bool
-
-	// require the TXT record to be propagated to all recursive name servers
-	requireRecursiveNssPropagation bool
+	requireCompletePropagation bool
 }
 
 func newPreCheck() preCheck {
 	return preCheck{
-		requireAuthoritativeNssPropagation: true,
+		requireCompletePropagation: true,
 	}
 }
 
@@ -83,48 +53,32 @@ func (p preCheck) call(domain, fqdn, value string) (bool, error) {
 
 // checkDNSPropagation checks if the expected TXT record has been propagated to all authoritative nameservers.
 func (p preCheck) checkDNSPropagation(fqdn, value string) (bool, error) {
-	// Initial attempt to resolve at the recursive NS (require to get CNAME)
+	// Initial attempt to resolve at the recursive NS
 	r, err := dnsQuery(fqdn, dns.TypeTXT, recursiveNameservers, true)
 	if err != nil {
-		return false, fmt.Errorf("initial recursive nameserver: %w", err)
+		return false, err
+	}
+
+	if !p.requireCompletePropagation {
+		return true, nil
 	}
 
 	if r.Rcode == dns.RcodeSuccess {
 		fqdn = updateDomainWithCName(r, fqdn)
 	}
 
-	if p.requireRecursiveNssPropagation {
-		_, err = checkNameserversPropagation(fqdn, value, recursiveNameservers, false)
-		if err != nil {
-			return false, fmt.Errorf("recursive nameservers: %w", err)
-		}
-	}
-
-	if !p.requireAuthoritativeNssPropagation {
-		return true, nil
-	}
-
 	authoritativeNss, err := lookupNameservers(fqdn)
 	if err != nil {
 		return false, err
 	}
 
-	found, err := checkNameserversPropagation(fqdn, value, authoritativeNss, true)
-	if err != nil {
-		return found, fmt.Errorf("authoritative nameservers: %w", err)
-	}
-
-	return found, nil
+	return checkAuthoritativeNss(fqdn, value, authoritativeNss)
 }
 
-// checkNameserversPropagation queries each of the given nameservers for the expected TXT record.
-func checkNameserversPropagation(fqdn, value string, nameservers []string, addPort bool) (bool, error) {
+// checkAuthoritativeNss queries each of the given nameservers for the expected TXT record.
+func checkAuthoritativeNss(fqdn, value string, nameservers []string) (bool, error) {
 	for _, ns := range nameservers {
-		if addPort {
-			ns = net.JoinHostPort(ns, "53")
-		}
-
-		r, err := dnsQuery(fqdn, dns.TypeTXT, []string{ns}, false)
+		r, err := dnsQuery(fqdn, dns.TypeTXT, []string{net.JoinHostPort(ns, "53")}, false)
 		if err != nil {
 			return false, err
 		}
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/http01/domain_matcher.go b/vendor/github.com/go-acme/lego/v4/challenge/http01/domain_matcher.go
index c31aeed..6ac6eab 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/http01/domain_matcher.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/http01/domain_matcher.go
@@ -3,7 +3,6 @@ package http01
 import (
 	"fmt"
 	"net/http"
-	"net/netip"
 	"strings"
 )
 
@@ -24,17 +23,14 @@ import (
 // RFC7239 has standardized the different forwarding headers into a single header named Forwarded.
 // The header value has a different format, so you should use forwardedMatcher
 // when the http01.ProviderServer operates behind a RFC7239 compatible proxy.
-// https://www.rfc-editor.org/rfc/rfc7239.html
+// https://tools.ietf.org/html/rfc7239
 //
 // Note: RFC7239 also reminds us, "that an HTTP list [...] may be split over multiple header fields" (section 7.1),
 // meaning that
-//
-//	X-Header: a
-//	X-Header: b
-//
+//   X-Header: a
+//   X-Header: b
 // is equal to
-//
-//	X-Header: a, b
+//   X-Header: a, b
 //
 // All matcher implementations (explicitly not excluding arbitraryMatcher!)
 // have in common that they only match against the first value in such lists.
@@ -55,10 +51,10 @@ func (m *hostMatcher) name() string {
 }
 
 func (m *hostMatcher) matches(r *http.Request, domain string) bool {
-	return matchDomain(r.Host, domain)
+	return strings.HasPrefix(r.Host, domain)
 }
 
-// arbitraryMatcher checks whether the specified (*net/http.Request).Header value starts with a domain name.
+// hostMatcher checks whether the specified (*net/http.Request).Header value starts with a domain name.
 type arbitraryMatcher string
 
 func (m arbitraryMatcher) name() string {
@@ -66,11 +62,11 @@ func (m arbitraryMatcher) name() string {
 }
 
 func (m arbitraryMatcher) matches(r *http.Request, domain string) bool {
-	return matchDomain(r.Header.Get(m.name()), domain)
+	return strings.HasPrefix(r.Header.Get(m.name()), domain)
 }
 
 // forwardedMatcher checks whether the Forwarded header contains a "host" element starting with a domain name.
-// See https://www.rfc-editor.org/rfc/rfc7239.html for details.
+// See https://tools.ietf.org/html/rfc7239 for details.
 type forwardedMatcher struct{}
 
 func (m *forwardedMatcher) name() string {
@@ -88,7 +84,7 @@ func (m *forwardedMatcher) matches(r *http.Request, domain string) bool {
 	}
 
 	host := fwds[0]["host"]
-	return matchDomain(host, domain)
+	return strings.HasPrefix(host, domain)
 }
 
 // parsing requires some form of state machine.
@@ -134,7 +130,9 @@ func parseForwardedHeader(s string) (elements []map[string]string, err error) {
 
 		case r == ',': // end of forwarded-element
 			if key != "" {
-				val = s[pos:i]
+				if val == "" {
+					val = s[pos:i]
+				}
 				cur[key] = val
 			}
 			elements = append(elements, cur)
@@ -184,12 +182,3 @@ func skipWS(s string, i int) int {
 func isWS(r rune) bool {
 	return strings.ContainsRune(" \t\v\r\n", r)
 }
-
-func matchDomain(src, domain string) bool {
-	addr, err := netip.ParseAddr(domain)
-	if err == nil && addr.Is6() {
-		domain = "[" + domain + "]"
-	}
-
-	return strings.HasPrefix(src, domain)
-}
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge.go b/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge.go
index 79dbfb4..f23e483 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge.go
@@ -2,7 +2,6 @@ package http01
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/go-acme/lego/v4/acme"
 	"github.com/go-acme/lego/v4/acme/api"
@@ -12,16 +11,6 @@ import (
 
 type ValidateFunc func(core *api.Core, domain string, chlng acme.Challenge) error
 
-type ChallengeOption func(*Challenge) error
-
-// SetDelay sets a delay between the start of the HTTP server and the challenge validation.
-func SetDelay(delay time.Duration) ChallengeOption {
-	return func(chlg *Challenge) error {
-		chlg.delay = delay
-		return nil
-	}
-}
-
 // ChallengePath returns the URL path for the `http-01` challenge.
 func ChallengePath(token string) string {
 	return "/.well-known/acme-challenge/" + token
@@ -31,24 +20,14 @@ type Challenge struct {
 	core     *api.Core
 	validate ValidateFunc
 	provider challenge.Provider
-	delay    time.Duration
 }
 
-func NewChallenge(core *api.Core, validate ValidateFunc, provider challenge.Provider, opts ...ChallengeOption) *Challenge {
-	chlg := &Challenge{
+func NewChallenge(core *api.Core, validate ValidateFunc, provider challenge.Provider) *Challenge {
+	return &Challenge{
 		core:     core,
 		validate: validate,
 		provider: provider,
 	}
-
-	for _, opt := range opts {
-		err := opt(chlg)
-		if err != nil {
-			log.Infof("challenge option error: %v", err)
-		}
-	}
-
-	return chlg
 }
 
 func (c *Challenge) SetProvider(provider challenge.Provider) {
@@ -81,10 +60,6 @@ func (c *Challenge) Solve(authz acme.Authorization) error {
 		}
 	}()
 
-	if c.delay > 0 {
-		time.Sleep(c.delay)
-	}
-
 	chlng.KeyAuthorization = keyAuth
 	return c.validate(c.core, domain, chlng)
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge_server.go b/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge_server.go
index 009271c..84a3353 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge_server.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/http01/http_challenge_server.go
@@ -2,11 +2,9 @@ package http01
 
 import (
 	"fmt"
-	"io/fs"
 	"net"
 	"net/http"
 	"net/textproto"
-	"os"
 	"strings"
 
 	"github.com/go-acme/lego/v4/log"
@@ -16,11 +14,8 @@ import (
 // It may be instantiated without using the NewProviderServer function if
 // you want only to use the default values.
 type ProviderServer struct {
-	address string
-	network string // must be valid argument to net.Listen
-
-	socketMode fs.FileMode
-
+	iface    string
+	port     string
 	matcher  domainMatcher
 	done     chan bool
 	listener net.Listener
@@ -34,36 +29,24 @@ func NewProviderServer(iface, port string) *ProviderServer {
 		port = "80"
 	}
 
-	return &ProviderServer{network: "tcp", address: net.JoinHostPort(iface, port), matcher: &hostMatcher{}}
-}
-
-func NewUnixProviderServer(socketPath string, mode fs.FileMode) *ProviderServer {
-	return &ProviderServer{network: "unix", address: socketPath, socketMode: mode, matcher: &hostMatcher{}}
+	return &ProviderServer{iface: iface, port: port, matcher: &hostMatcher{}}
 }
 
 // Present starts a web server and makes the token available at `ChallengePath(token)` for web requests.
 func (s *ProviderServer) Present(domain, token, keyAuth string) error {
 	var err error
-	s.listener, err = net.Listen(s.network, s.GetAddress())
+	s.listener, err = net.Listen("tcp", s.GetAddress())
 	if err != nil {
 		return fmt.Errorf("could not start HTTP server for challenge: %w", err)
 	}
 
-	if s.network == "unix" {
-		if err = os.Chmod(s.address, s.socketMode); err != nil {
-			return fmt.Errorf("chmod %s: %w", s.address, err)
-		}
-	}
-
 	s.done = make(chan bool)
-
 	go s.serve(domain, token, keyAuth)
-
 	return nil
 }
 
 func (s *ProviderServer) GetAddress() string {
-	return s.address
+	return net.JoinHostPort(s.iface, s.port)
 }
 
 // CleanUp closes the HTTP server and removes the token from `ChallengePath(token)`.
@@ -71,11 +54,8 @@ func (s *ProviderServer) CleanUp(domain, token, keyAuth string) error {
 	if s.listener == nil {
 		return nil
 	}
-
 	s.listener.Close()
-
 	<-s.done
-
 	return nil
 }
 
@@ -89,7 +69,7 @@ func (s *ProviderServer) CleanUp(domain, token, keyAuth string) error {
 //
 // The exact behavior depends on the value of headerName:
 // - "" (the empty string) and "Host" will restore the default and only check the Host header
-// - "Forwarded" will look for a Forwarded header, and inspect it according to https://www.rfc-editor.org/rfc/rfc7239.html
+// - "Forwarded" will look for a Forwarded header, and inspect it according to https://tools.ietf.org/html/rfc7239
 // - any other value will check the header value with the same name.
 func (s *ProviderServer) SetProxyHeader(headerName string) {
 	switch h := textproto.CanonicalMIMEHeaderKey(headerName); h {
@@ -105,30 +85,26 @@ func (s *ProviderServer) SetProxyHeader(headerName string) {
 func (s *ProviderServer) serve(domain, token, keyAuth string) {
 	path := ChallengePath(token)
 
-	// The incoming request will be validated to prevent DNS rebind attacks.
+	// The incoming request must will be validated to prevent DNS rebind attacks.
 	// We only respond with the keyAuth, when we're receiving a GET requests with
 	// the "Host" header matching the domain (the latter is configurable though SetProxyHeader).
 	mux := http.NewServeMux()
 	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
 		if r.Method == http.MethodGet && s.matcher.matches(r, domain) {
 			w.Header().Set("Content-Type", "text/plain")
-
 			_, err := w.Write([]byte(keyAuth))
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-
 			log.Infof("[%s] Served key authentication", domain)
-			return
-		}
-
-		log.Warnf("Received request for domain %s with method %s but the domain did not match any challenge. Please ensure you are passing the %s header properly.", r.Host, r.Method, s.matcher.name())
-
-		_, err := w.Write([]byte("TEST"))
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
+		} else {
+			log.Warnf("Received request for domain %s with method %s but the domain did not match any challenge. Please ensure your are passing the %s header properly.", r.Host, r.Method, s.matcher.name())
+			_, err := w.Write([]byte("TEST"))
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
 		}
 	})
 
@@ -142,6 +118,5 @@ func (s *ProviderServer) serve(domain, token, keyAuth string) {
 	if err != nil && !strings.Contains(err.Error(), "use of closed network connection") {
 		log.Println(err)
 	}
-
 	s.done <- true
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/resolver/errors.go b/vendor/github.com/go-acme/lego/v4/challenge/resolver/errors.go
index 94ccbd7..e9da1eb 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/resolver/errors.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/resolver/errors.go
@@ -19,7 +19,7 @@ func (e obtainError) Error() string {
 	sort.Strings(domains)
 
 	for _, domain := range domains {
-		_, _ = fmt.Fprintf(buffer, "[%s] %s\n", domain, e[domain])
+		buffer.WriteString(fmt.Sprintf("[%s] %s\n", domain, e[domain]))
 	}
 	return buffer.String()
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/resolver/prober.go b/vendor/github.com/go-acme/lego/v4/challenge/resolver/prober.go
index 021facb..42c2029 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/resolver/prober.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/resolver/prober.go
@@ -128,7 +128,7 @@ func sequentialSolve(authSolvers []*selectedAuthSolver, failures obtainError) {
 }
 
 func parallelSolve(authSolvers []*selectedAuthSolver, failures obtainError) {
-	// For all valid preSolvers, first submit the challenges, so they have max time to propagate
+	// For all valid preSolvers, first submit the challenges so they have max time to propagate
 	for _, authSolver := range authSolvers {
 		authz := authSolver.authz
 		if solvr, ok := authSolver.solver.(preSolver); ok {
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/resolver/solver_manager.go b/vendor/github.com/go-acme/lego/v4/challenge/resolver/solver_manager.go
index dcde3a3..07d9db5 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/resolver/solver_manager.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/resolver/solver_manager.go
@@ -1,6 +1,7 @@
 package resolver
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sort"
@@ -36,14 +37,14 @@ func NewSolversManager(core *api.Core) *SolverManager {
 }
 
 // SetHTTP01Provider specifies a custom provider p that can solve the given HTTP-01 challenge.
-func (c *SolverManager) SetHTTP01Provider(p challenge.Provider, opts ...http01.ChallengeOption) error {
-	c.solvers[challenge.HTTP01] = http01.NewChallenge(c.core, validate, p, opts...)
+func (c *SolverManager) SetHTTP01Provider(p challenge.Provider) error {
+	c.solvers[challenge.HTTP01] = http01.NewChallenge(c.core, validate, p)
 	return nil
 }
 
 // SetTLSALPN01Provider specifies a custom provider p that can solve the given TLS-ALPN-01 challenge.
-func (c *SolverManager) SetTLSALPN01Provider(p challenge.Provider, opts ...tlsalpn01.ChallengeOption) error {
-	c.solvers[challenge.TLSALPN01] = tlsalpn01.NewChallenge(c.core, validate, p, opts...)
+func (c *SolverManager) SetTLSALPN01Provider(p challenge.Provider) error {
+	c.solvers[challenge.TLSALPN01] = tlsalpn01.NewChallenge(c.core, validate, p)
 	return nil
 }
 
@@ -53,7 +54,7 @@ func (c *SolverManager) SetDNS01Provider(p challenge.Provider, opts ...dns01.Cha
 	return nil
 }
 
-// Remove removes a challenge type from the available solvers.
+// Remove Remove a challenge type from the available solvers.
 func (c *SolverManager) Remove(chlgType challenge.Type) {
 	delete(c.solvers, chlgType)
 }
@@ -106,17 +107,21 @@ func validate(core *api.Core, domain string, chlg acme.Challenge) error {
 	bo.MaxInterval = 10 * initialInterval
 	bo.MaxElapsedTime = 100 * initialInterval
 
+	ctx, cancel := context.WithCancel(context.Background())
+
 	// After the path is sent, the ACME server will access our server.
 	// Repeatedly check the server for an updated status on our request.
 	operation := func() error {
 		authz, err := core.Authorizations.Get(chlng.AuthorizationURL)
 		if err != nil {
-			return backoff.Permanent(err)
+			cancel()
+			return err
 		}
 
 		valid, err := checkAuthorizationStatus(authz)
 		if err != nil {
-			return backoff.Permanent(err)
+			cancel()
+			return err
 		}
 
 		if valid {
@@ -124,10 +129,10 @@ func validate(core *api.Core, domain string, chlg acme.Challenge) error {
 			return nil
 		}
 
-		return fmt.Errorf("the server didn't respond to our request (status=%s)", authz.Status)
+		return errors.New("the server didn't respond to our request")
 	}
 
-	return backoff.Retry(operation, bo)
+	return backoff.Retry(operation, backoff.WithContext(bo, ctx))
 }
 
 func checkChallengeStatus(chlng acme.ExtendedChallenge) (bool, error) {
@@ -137,9 +142,9 @@ func checkChallengeStatus(chlng acme.ExtendedChallenge) (bool, error) {
 	case acme.StatusPending, acme.StatusProcessing:
 		return false, nil
 	case acme.StatusInvalid:
-		return false, fmt.Errorf("invalid challenge: %w", chlng.Err())
+		return false, chlng.Error
 	default:
-		return false, fmt.Errorf("the server returned an unexpected challenge status: %s", chlng.Status)
+		return false, errors.New("the server returned an unexpected state")
 	}
 }
 
@@ -154,11 +159,11 @@ func checkAuthorizationStatus(authz acme.Authorization) (bool, error) {
 	case acme.StatusInvalid:
 		for _, chlg := range authz.Challenges {
 			if chlg.Status == acme.StatusInvalid && chlg.Error != nil {
-				return false, fmt.Errorf("invalid authorization: %w", chlg.Err())
+				return false, chlg.Error
 			}
 		}
-		return false, errors.New("invalid authorization")
+		return false, fmt.Errorf("the authorization state %s", authz.Status)
 	default:
-		return false, fmt.Errorf("the server returned an unexpected authorization status: %s", authz.Status)
+		return false, errors.New("the server returned an unexpected state")
 	}
 }
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge.go b/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge.go
index 559e1f9..7eb02cf 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge.go
@@ -7,7 +7,6 @@ import (
 	"crypto/x509/pkix"
 	"encoding/asn1"
 	"fmt"
-	"time"
 
 	"github.com/go-acme/lego/v4/acme"
 	"github.com/go-acme/lego/v4/acme/api"
@@ -17,43 +16,23 @@ import (
 )
 
 // idPeAcmeIdentifierV1 is the SMI Security for PKIX Certification Extension OID referencing the ACME extension.
-// Reference: https://www.rfc-editor.org/rfc/rfc8737.html#section-6.1
+// Reference: https://tools.ietf.org/html/draft-ietf-acme-tls-alpn-07#section-6.1
 var idPeAcmeIdentifierV1 = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 1, 31}
 
 type ValidateFunc func(core *api.Core, domain string, chlng acme.Challenge) error
 
-type ChallengeOption func(*Challenge) error
-
-// SetDelay sets a delay between the start of the TLS listener and the challenge validation.
-func SetDelay(delay time.Duration) ChallengeOption {
-	return func(chlg *Challenge) error {
-		chlg.delay = delay
-		return nil
-	}
-}
-
 type Challenge struct {
 	core     *api.Core
 	validate ValidateFunc
 	provider challenge.Provider
-	delay    time.Duration
 }
 
-func NewChallenge(core *api.Core, validate ValidateFunc, provider challenge.Provider, opts ...ChallengeOption) *Challenge {
-	chlg := &Challenge{
+func NewChallenge(core *api.Core, validate ValidateFunc, provider challenge.Provider) *Challenge {
+	return &Challenge{
 		core:     core,
 		validate: validate,
 		provider: provider,
 	}
-
-	for _, opt := range opts {
-		err := opt(chlg)
-		if err != nil {
-			log.Infof("challenge option error: %v", err)
-		}
-	}
-
-	return chlg
 }
 
 func (c *Challenge) SetProvider(provider challenge.Provider) {
@@ -87,10 +66,6 @@ func (c *Challenge) Solve(authz acme.Authorization) error {
 		}
 	}()
 
-	if c.delay > 0 {
-		time.Sleep(c.delay)
-	}
-
 	chlng.KeyAuthorization = keyAuth
 	return c.validate(c.core, domain, chlng)
 }
@@ -108,7 +83,7 @@ func ChallengeBlocks(domain, keyAuth string) ([]byte, []byte, error) {
 
 	// Add the keyAuth digest as the acmeValidation-v1 extension
 	// (marked as critical such that it won't be used by non-ACME software).
-	// Reference: https://www.rfc-editor.org/rfc/rfc8737.html#section-3
+	// Reference: https://tools.ietf.org/html/draft-ietf-acme-tls-alpn-07#section-3
 	extensions := []pkix.Extension{
 		{
 			Id:       idPeAcmeIdentifierV1,
diff --git a/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge_server.go b/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge_server.go
index e5581b1..a49dd93 100644
--- a/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge_server.go
+++ b/vendor/github.com/go-acme/lego/v4/challenge/tlsalpn01/tls_alpn_challenge_server.go
@@ -40,7 +40,7 @@ func (s *ProviderServer) GetAddress() string {
 	return net.JoinHostPort(s.iface, s.port)
 }
 
-// Present generates a certificate with an SHA-256 digest of the keyAuth provided
+// Present generates a certificate with a SHA-256 digest of the keyAuth provided
 // as the acmeValidation-v1 extension value to conform to the ACME-TLS-ALPN spec.
 func (s *ProviderServer) Present(domain, token, keyAuth string) error {
 	if s.port == "" {
@@ -61,7 +61,7 @@ func (s *ProviderServer) Present(domain, token, keyAuth string) error {
 
 	// We must set that the `acme-tls/1` application level protocol is supported
 	// so that the protocol negotiation can succeed. Reference:
-	// https://www.rfc-editor.org/rfc/rfc8737.html#section-6.2
+	// https://tools.ietf.org/html/draft-ietf-acme-tls-alpn-07#section-6.2
 	tlsConf.NextProtos = []string{ACMETLS1Protocol}
 
 	// Create the listener with the created tls.Config.
diff --git a/vendor/github.com/go-acme/lego/v4/lego/client.go b/vendor/github.com/go-acme/lego/v4/lego/client.go
index 1109e12..ef72a28 100644
--- a/vendor/github.com/go-acme/lego/v4/lego/client.go
+++ b/vendor/github.com/go-acme/lego/v4/lego/client.go
@@ -53,7 +53,7 @@ func NewClient(config *Config) (*Client, error) {
 	solversManager := resolver.NewSolversManager(core)
 
 	prober := resolver.NewProber(solversManager)
-	certifier := certificate.NewCertifier(core, prober, certificate.CertifierOptions{KeyType: config.Certificate.KeyType, Timeout: config.Certificate.Timeout, OverallRequestLimit: config.Certificate.OverallRequestLimit})
+	certifier := certificate.NewCertifier(core, prober, certificate.CertifierOptions{KeyType: config.Certificate.KeyType, Timeout: config.Certificate.Timeout})
 
 	return &Client{
 		Certificate:  certifier,
diff --git a/vendor/github.com/go-acme/lego/v4/lego/client_config.go b/vendor/github.com/go-acme/lego/v4/lego/client_config.go
index fdf1a55..90ad808 100644
--- a/vendor/github.com/go-acme/lego/v4/lego/client_config.go
+++ b/vendor/github.com/go-acme/lego/v4/lego/client_config.go
@@ -4,11 +4,10 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
-	"strconv"
-	"strings"
 	"time"
 
 	"github.com/go-acme/lego/v4/certcrypto"
@@ -18,18 +17,13 @@ import (
 const (
 	// caCertificatesEnvVar is the environment variable name that can be used to
 	// specify the path to PEM encoded CA Certificates that can be used to
-	// authenticate an ACME server with an HTTPS certificate not issued by a CA in
+	// authenticate an ACME server with a HTTPS certificate not issued by a CA in
 	// the system-wide trusted root list.
-	// Multiple file paths can be added by using os.PathListSeparator as a separator.
 	caCertificatesEnvVar = "LEGO_CA_CERTIFICATES"
 
-	// caSystemCertPool is the environment variable name that can be used to define
-	// if the certificates pool must use a copy of the system cert pool.
-	caSystemCertPool = "LEGO_CA_SYSTEM_CERT_POOL"
-
 	// caServerNameEnvVar is the environment variable name that can be used to
 	// specify the CA server name that can be used to
-	// authenticate an ACME server with an HTTPS certificate not issued by a CA in
+	// authenticate an ACME server with a HTTPS certificate not issued by a CA in
 	// the system-wide trusted root list.
 	caServerNameEnvVar = "LEGO_CA_SERVER_NAME"
 
@@ -61,9 +55,8 @@ func NewConfig(user registration.User) *Config {
 }
 
 type CertificateConfig struct {
-	KeyType             certcrypto.KeyType
-	Timeout             time.Duration
-	OverallRequestLimit int
+	KeyType certcrypto.KeyType
+	Timeout time.Duration
 }
 
 // createDefaultHTTPClient Creates an HTTP client with a reasonable timeout value
@@ -89,60 +82,23 @@ func createDefaultHTTPClient() *http.Client {
 }
 
 // initCertPool creates a *x509.CertPool populated with the PEM certificates
-// found in the filepath specified in the caCertificatesEnvVar OS environment variable.
-// If the caCertificatesEnvVar is not set then initCertPool will return nil.
-// If there is an error creating a *x509.CertPool from the provided caCertificatesEnvVar value then initCertPool will panic.
-// If the caSystemCertPool is set to a "truthy value" (`1`, `t`, `T`, `TRUE`, `true`, `True`) then a copy of system cert pool will be used.
-// caSystemCertPool requires caCertificatesEnvVar to be set.
+// found in the filepath specified in the caCertificatesEnvVar OS environment
+// variable. If the caCertificatesEnvVar is not set then initCertPool will
+// return nil. If there is an error creating a *x509.CertPool from the provided
+// caCertificatesEnvVar value then initCertPool will panic.
 func initCertPool() *x509.CertPool {
-	customCACertsPath := os.Getenv(caCertificatesEnvVar)
-	if customCACertsPath == "" {
-		return nil
-	}
-
-	useSystemCertPool, _ := strconv.ParseBool(os.Getenv(caSystemCertPool))
-
-	caCerts := strings.Split(customCACertsPath, string(os.PathListSeparator))
-
-	certPool, err := CreateCertPool(caCerts, useSystemCertPool)
-	if err != nil {
-		panic(fmt.Sprintf("create certificates pool: %v", err))
-	}
-
-	return certPool
-}
-
-// CreateCertPool creates a *x509.CertPool populated with the PEM certificates.
-func CreateCertPool(caCerts []string, useSystemCertPool bool) (*x509.CertPool, error) {
-	if len(caCerts) == 0 {
-		return nil, nil
-	}
-
-	certPool := newCertPool(useSystemCertPool)
-
-	for _, customPath := range caCerts {
-		customCAs, err := os.ReadFile(customPath)
+	if customCACertsPath := os.Getenv(caCertificatesEnvVar); customCACertsPath != "" {
+		customCAs, err := ioutil.ReadFile(customCACertsPath)
 		if err != nil {
-			return nil, fmt.Errorf("error reading %q: %w", customPath, err)
+			panic(fmt.Sprintf("error reading %s=%q: %v",
+				caCertificatesEnvVar, customCACertsPath, err))
 		}
-
+		certPool := x509.NewCertPool()
 		if ok := certPool.AppendCertsFromPEM(customCAs); !ok {
-			return nil, fmt.Errorf("error creating x509 cert pool from %q: %w", customPath, err)
+			panic(fmt.Sprintf("error creating x509 cert pool from %s=%q: %v",
+				caCertificatesEnvVar, customCACertsPath, err))
 		}
+		return certPool
 	}
-
-	return certPool, nil
-}
-
-func newCertPool(useSystemCertPool bool) *x509.CertPool {
-	if !useSystemCertPool {
-		return x509.NewCertPool()
-	}
-
-	pool, err := x509.SystemCertPool()
-	if err == nil {
-		return pool
-	}
-
-	return x509.NewCertPool()
+	return nil
 }
diff --git a/vendor/github.com/go-acme/lego/v4/platform/config/env/env.go b/vendor/github.com/go-acme/lego/v4/platform/config/env/env.go
index 3fd1e3a..d6428b0 100644
--- a/vendor/github.com/go-acme/lego/v4/platform/config/env/env.go
+++ b/vendor/github.com/go-acme/lego/v4/platform/config/env/env.go
@@ -3,6 +3,7 @@ package env
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -54,6 +55,7 @@ func Get(names ...string) (map[string]string, error) {
 //	// LEGO_TWO=""
 //	env.GetWithFallback([]string{"LEGO_ONE", "LEGO_TWO"})
 //	// => error
+//
 func GetWithFallback(groups ...[]string) (map[string]string, error) {
 	values := map[string]string{}
 
@@ -78,26 +80,15 @@ func GetWithFallback(groups ...[]string) (map[string]string, error) {
 	return values, nil
 }
 
-func GetOneWithFallback[T any](main string, defaultValue T, fn func(string) (T, error), names ...string) T {
-	v, _ := getOneWithFallback(main, names...)
-
-	value, err := fn(v)
-	if err != nil {
-		return defaultValue
-	}
-
-	return value
-}
-
 func getOneWithFallback(main string, names ...string) (string, string) {
 	value := GetOrFile(main)
-	if value != "" {
+	if len(value) > 0 {
 		return value, main
 	}
 
 	for _, name := range names {
 		value := GetOrFile(name)
-		if value != "" {
+		if len(value) > 0 {
 			return value, main
 		}
 	}
@@ -105,32 +96,43 @@ func getOneWithFallback(main string, names ...string) (string, string) {
 	return "", main
 }
 
+// GetOrDefaultInt returns the given environment variable value as an integer.
+// Returns the default if the envvar cannot be coopered to an int, or is not found.
+func GetOrDefaultInt(envVar string, defaultValue int) int {
+	v, err := strconv.Atoi(GetOrFile(envVar))
+	if err != nil {
+		return defaultValue
+	}
+
+	return v
+}
+
+// GetOrDefaultSecond returns the given environment variable value as an time.Duration (second).
+// Returns the default if the envvar cannot be coopered to an int, or is not found.
+func GetOrDefaultSecond(envVar string, defaultValue time.Duration) time.Duration {
+	v := GetOrDefaultInt(envVar, -1)
+	if v < 0 {
+		return defaultValue
+	}
+
+	return time.Duration(v) * time.Second
+}
+
 // GetOrDefaultString returns the given environment variable value as a string.
-// Returns the default if the env var cannot be found.
-func GetOrDefaultString(envVar string, defaultValue string) string {
-	return getOrDefault(envVar, defaultValue, ParseString)
+// Returns the default if the envvar cannot be find.
+func GetOrDefaultString(envVar, defaultValue string) string {
+	v := GetOrFile(envVar)
+	if v == "" {
+		return defaultValue
+	}
+
+	return v
 }
 
 // GetOrDefaultBool returns the given environment variable value as a boolean.
-// Returns the default if the env var cannot be coopered to a boolean, or is not found.
+// Returns the default if the envvar cannot be coopered to a boolean, or is not found.
 func GetOrDefaultBool(envVar string, defaultValue bool) bool {
-	return getOrDefault(envVar, defaultValue, strconv.ParseBool)
-}
-
-// GetOrDefaultInt returns the given environment variable value as an integer.
-// Returns the default if the env var cannot be coopered to an int, or is not found.
-func GetOrDefaultInt(envVar string, defaultValue int) int {
-	return getOrDefault(envVar, defaultValue, strconv.Atoi)
-}
-
-// GetOrDefaultSecond returns the given environment variable value as a time.Duration (second).
-// Returns the default if the env var cannot be coopered to an int, or is not found.
-func GetOrDefaultSecond(envVar string, defaultValue time.Duration) time.Duration {
-	return getOrDefault(envVar, defaultValue, ParseSecond)
-}
-
-func getOrDefault[T any](envVar string, defaultValue T, fn func(string) (T, error)) T {
-	v, err := fn(GetOrFile(envVar))
+	v, err := strconv.ParseBool(GetOrFile(envVar))
 	if err != nil {
 		return defaultValue
 	}
@@ -153,7 +155,7 @@ func GetOrFile(envVar string) string {
 		return envVarValue
 	}
 
-	fileContents, err := os.ReadFile(fileVarValue)
+	fileContents, err := ioutil.ReadFile(fileVarValue)
 	if err != nil {
 		log.Printf("Failed to read the file %s (defined by env var %s): %s", fileVarValue, fileVar, err)
 		return ""
@@ -161,26 +163,3 @@ func GetOrFile(envVar string) string {
 
 	return strings.TrimSuffix(string(fileContents), "\n")
 }
-
-// ParseSecond parses env var value (string) to a second (time.Duration).
-func ParseSecond(s string) (time.Duration, error) {
-	v, err := strconv.Atoi(s)
-	if err != nil {
-		return 0, err
-	}
-
-	if v < 0 {
-		return 0, fmt.Errorf("unsupported value: %d", v)
-	}
-
-	return time.Duration(v) * time.Second, nil
-}
-
-// ParseString parses env var value (string) to a string but throws an error when the string is empty.
-func ParseString(s string) (string, error) {
-	if s == "" {
-		return "", errors.New("empty string")
-	}
-
-	return s, nil
-}
diff --git a/vendor/github.com/go-acme/lego/v4/platform/wait/wait.go b/vendor/github.com/go-acme/lego/v4/platform/wait/wait.go
index 6ad817b..d0c078b 100644
--- a/vendor/github.com/go-acme/lego/v4/platform/wait/wait.go
+++ b/vendor/github.com/go-acme/lego/v4/platform/wait/wait.go
@@ -1,6 +1,7 @@
 package wait
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -17,9 +18,9 @@ func For(msg string, timeout, interval time.Duration, f func() (bool, error)) er
 		select {
 		case <-timeUp:
 			if lastErr == nil {
-				return fmt.Errorf("%s: time limit exceeded", msg)
+				return errors.New("time limit exceeded")
 			}
-			return fmt.Errorf("%s: time limit exceeded: last error: %w", msg, lastErr)
+			return fmt.Errorf("time limit exceeded: last error: %w", lastErr)
 		default:
 		}
 
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/internal/errutils/client.go b/vendor/github.com/go-acme/lego/v4/providers/dns/internal/errutils/client.go
deleted file mode 100644
index 09f1344..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/internal/errutils/client.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package errutils
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strconv"
-)
-
-const legoDebugClientVerboseError = "LEGO_DEBUG_CLIENT_VERBOSE_ERROR"
-
-// HTTPDoError uses with `(http.Client).Do` error.
-type HTTPDoError struct {
-	req *http.Request
-	err error
-}
-
-// NewHTTPDoError creates a new HTTPDoError.
-func NewHTTPDoError(req *http.Request, err error) *HTTPDoError {
-	return &HTTPDoError{req: req, err: err}
-}
-
-func (h HTTPDoError) Error() string {
-	msg := "unable to communicate with the API server:"
-
-	if ok, _ := strconv.ParseBool(os.Getenv(legoDebugClientVerboseError)); ok {
-		msg += fmt.Sprintf(" [request: %s %s]", h.req.Method, h.req.URL)
-	}
-
-	if h.err == nil {
-		return msg
-	}
-
-	return msg + fmt.Sprintf(" error: %v", h.err)
-}
-
-func (h HTTPDoError) Unwrap() error {
-	return h.err
-}
-
-// ReadResponseError use with `io.ReadAll` when reading response body.
-type ReadResponseError struct {
-	req        *http.Request
-	StatusCode int
-	err        error
-}
-
-// NewReadResponseError creates a new ReadResponseError.
-func NewReadResponseError(req *http.Request, statusCode int, err error) *ReadResponseError {
-	return &ReadResponseError{req: req, StatusCode: statusCode, err: err}
-}
-
-func (r ReadResponseError) Error() string {
-	msg := "unable to read response body:"
-
-	if ok, _ := strconv.ParseBool(os.Getenv(legoDebugClientVerboseError)); ok {
-		msg += fmt.Sprintf(" [request: %s %s]", r.req.Method, r.req.URL)
-	}
-
-	msg += fmt.Sprintf(" [status code: %d]", r.StatusCode)
-
-	if r.err == nil {
-		return msg
-	}
-
-	return msg + fmt.Sprintf(" error: %v", r.err)
-}
-
-func (r ReadResponseError) Unwrap() error {
-	return r.err
-}
-
-// UnmarshalError uses with `json.Unmarshal` or `xml.Unmarshal` when reading response body.
-type UnmarshalError struct {
-	req        *http.Request
-	StatusCode int
-	Body       []byte
-	err        error
-}
-
-// NewUnmarshalError creates a new UnmarshalError.
-func NewUnmarshalError(req *http.Request, statusCode int, body []byte, err error) *UnmarshalError {
-	return &UnmarshalError{req: req, StatusCode: statusCode, Body: bytes.TrimSpace(body), err: err}
-}
-
-func (u UnmarshalError) Error() string {
-	msg := "unable to unmarshal response:"
-
-	if ok, _ := strconv.ParseBool(os.Getenv(legoDebugClientVerboseError)); ok {
-		msg += fmt.Sprintf(" [request: %s %s]", u.req.Method, u.req.URL)
-	}
-
-	msg += fmt.Sprintf(" [status code: %d] body: %s", u.StatusCode, string(u.Body))
-
-	if u.err == nil {
-		return msg
-	}
-
-	return msg + fmt.Sprintf(" error: %v", u.err)
-}
-
-func (u UnmarshalError) Unwrap() error {
-	return u.err
-}
-
-// UnexpectedStatusCodeError use when the status of the response is unexpected but there is no API error type.
-type UnexpectedStatusCodeError struct {
-	req        *http.Request
-	StatusCode int
-	Body       []byte
-}
-
-// NewUnexpectedStatusCodeError creates a new UnexpectedStatusCodeError.
-func NewUnexpectedStatusCodeError(req *http.Request, statusCode int, body []byte) *UnexpectedStatusCodeError {
-	return &UnexpectedStatusCodeError{req: req, StatusCode: statusCode, Body: bytes.TrimSpace(body)}
-}
-
-func NewUnexpectedResponseStatusCodeError(req *http.Request, resp *http.Response) *UnexpectedStatusCodeError {
-	raw, _ := io.ReadAll(resp.Body)
-	return &UnexpectedStatusCodeError{req: req, StatusCode: resp.StatusCode, Body: bytes.TrimSpace(raw)}
-}
-
-func (u UnexpectedStatusCodeError) Error() string {
-	msg := "unexpected status code:"
-
-	if ok, _ := strconv.ParseBool(os.Getenv(legoDebugClientVerboseError)); ok {
-		msg += fmt.Sprintf(" [request: %s %s]", u.req.Method, u.req.URL)
-	}
-
-	return msg + fmt.Sprintf(" [status code: %d] body: %s", u.StatusCode, string(u.Body))
-}
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/internal/useragent/useragent.go b/vendor/github.com/go-acme/lego/v4/providers/dns/internal/useragent/useragent.go
deleted file mode 100644
index 02ce230..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/internal/useragent/useragent.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Code generated by 'internal/releaser'; DO NOT EDIT.
-
-package useragent
-
-import (
-	"fmt"
-	"net/http"
-	"runtime"
-)
-
-const (
-	// ourUserAgent is the User-Agent of this underlying library package.
-	ourUserAgent = "goacme-lego/4.23.1"
-
-	// ourUserAgentComment is part of the UA comment linked to the version status of this underlying library package.
-	// values: detach|release
-	// NOTE: Update this with each tagged release.
-	ourUserAgentComment = "release"
-)
-
-// Get builds and returns the User-Agent string.
-func Get() string {
-	return fmt.Sprintf("%s (%s; %s; %s)", ourUserAgent, ourUserAgentComment, runtime.GOOS, runtime.GOARCH)
-}
-
-// SetHeader sets the User-Agent header.
-func SetHeader(h http.Header) {
-	h.Set("User-Agent", Get())
-}
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.go b/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.go
index c70e943..f1aaf86 100644
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.go
+++ b/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.go
@@ -5,25 +5,26 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 
-	"github.com/go-acme/lego/v4/challenge"
 	"github.com/go-acme/lego/v4/challenge/dns01"
 	"github.com/go-acme/lego/v4/platform/config/env"
-	"github.com/go-acme/lego/v4/providers/dns/internal/useragent"
 	"github.com/ovh/go-ovh/ovh"
 )
 
 // OVH API reference:       https://eu.api.ovh.com/
-// Create a Token:          https://eu.api.ovh.com/createToken/
-// Create a OAuth2 client:   https://eu.api.ovh.com/console/?section=%2Fme&branch=v1#post-/me/api/oauth2/client
+// Create a Token:					https://eu.api.ovh.com/createToken/
 
 // Environment variables names.
 const (
 	envNamespace = "OVH_"
 
-	EnvEndpoint = envNamespace + "ENDPOINT"
+	EnvEndpoint          = envNamespace + "ENDPOINT"
+	EnvApplicationKey    = envNamespace + "APPLICATION_KEY"
+	EnvApplicationSecret = envNamespace + "APPLICATION_SECRET"
+	EnvConsumerKey       = envNamespace + "CONSUMER_KEY"
 
 	EnvTTL                = envNamespace + "TTL"
 	EnvPropagationTimeout = envNamespace + "PROPAGATION_TIMEOUT"
@@ -31,24 +32,6 @@ const (
 	EnvHTTPTimeout        = envNamespace + "HTTP_TIMEOUT"
 )
 
-// Authenticate using application key.
-const (
-	EnvApplicationKey    = envNamespace + "APPLICATION_KEY"
-	EnvApplicationSecret = envNamespace + "APPLICATION_SECRET"
-	EnvConsumerKey       = envNamespace + "CONSUMER_KEY"
-)
-
-// Authenticate using OAuth2 client.
-const (
-	EnvClientID     = envNamespace + "CLIENT_ID"
-	EnvClientSecret = envNamespace + "CLIENT_SECRET"
-)
-
-// EnvAccessToken Authenticate using Access Token client.
-const EnvAccessToken = envNamespace + "ACCESS_TOKEN"
-
-var _ challenge.ProviderTimeout = (*DNSProvider)(nil)
-
 // Record a DNS record.
 type Record struct {
 	ID        int64  `json:"id,omitempty"`
@@ -59,24 +42,12 @@ type Record struct {
 	Zone      string `json:"zone,omitempty"`
 }
 
-// OAuth2Config the OAuth2 specific configuration.
-type OAuth2Config struct {
-	ClientID     string
-	ClientSecret string
-}
-
 // Config is used to configure the creation of the DNSProvider.
 type Config struct {
-	APIEndpoint string
-
-	ApplicationKey    string
-	ApplicationSecret string
-	ConsumerKey       string
-
-	OAuth2Config *OAuth2Config
-
-	AccessToken string
-
+	APIEndpoint        string
+	ApplicationKey     string
+	ApplicationSecret  string
+	ConsumerKey        string
 	PropagationTimeout time.Duration
 	PollingInterval    time.Duration
 	TTL                int
@@ -95,10 +66,6 @@ func NewDefaultConfig() *Config {
 	}
 }
 
-func (c *Config) hasAppKeyAuth() bool {
-	return c.ApplicationKey != "" || c.ApplicationSecret != "" || c.ConsumerKey != ""
-}
-
 // DNSProvider implements the challenge.Provider interface.
 type DNSProvider struct {
 	config      *Config
@@ -111,27 +78,17 @@ type DNSProvider struct {
 // Credentials must be passed in the environment variables:
 // OVH_ENDPOINT (must be either "ovh-eu" or "ovh-ca"), OVH_APPLICATION_KEY, OVH_APPLICATION_SECRET, OVH_CONSUMER_KEY.
 func NewDNSProvider() (*DNSProvider, error) {
-	config := NewDefaultConfig()
-
-	// https://github.com/ovh/go-ovh/blob/6817886d12a8c5650794b28da635af9fcdfd1162/ovh/configuration.go#L105
-	config.APIEndpoint = env.GetOrDefaultString(EnvEndpoint, "ovh-eu")
-
-	config.ApplicationKey = env.GetOrFile(EnvApplicationKey)
-	config.ApplicationSecret = env.GetOrFile(EnvApplicationSecret)
-	config.ConsumerKey = env.GetOrFile(EnvConsumerKey)
-
-	config.AccessToken = env.GetOrFile(EnvAccessToken)
-
-	clientID := env.GetOrFile(EnvClientID)
-	clientSecret := env.GetOrFile(EnvClientSecret)
-
-	if clientID != "" || clientSecret != "" {
-		config.OAuth2Config = &OAuth2Config{
-			ClientID:     clientID,
-			ClientSecret: clientSecret,
-		}
+	values, err := env.Get(EnvEndpoint, EnvApplicationKey, EnvApplicationSecret, EnvConsumerKey)
+	if err != nil {
+		return nil, fmt.Errorf("ovh: %w", err)
 	}
 
+	config := NewDefaultConfig()
+	config.APIEndpoint = values[EnvEndpoint]
+	config.ApplicationKey = values[EnvApplicationKey]
+	config.ApplicationSecret = values[EnvApplicationSecret]
+	config.ConsumerKey = values[EnvConsumerKey]
+
 	return NewDNSProviderConfig(config)
 }
 
@@ -141,27 +98,22 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 		return nil, errors.New("ovh: the configuration of the DNS provider is nil")
 	}
 
-	if config.OAuth2Config != nil && config.hasAppKeyAuth() && config.AccessToken != "" {
-		return nil, errors.New("ovh: can't use multiple authentication systems (ApplicationKey, OAuth2, Access Token)")
+	if config.APIEndpoint == "" || config.ApplicationKey == "" || config.ApplicationSecret == "" || config.ConsumerKey == "" {
+		return nil, errors.New("ovh: credentials missing")
 	}
 
-	if config.OAuth2Config != nil && config.AccessToken != "" {
-		return nil, errors.New("ovh: can't use multiple authentication systems (OAuth2, Access Token)")
-	}
-
-	if config.OAuth2Config != nil && config.hasAppKeyAuth() {
-		return nil, errors.New("ovh: can't use multiple authentication systems (ApplicationKey, OAuth2)")
-	}
-
-	if config.hasAppKeyAuth() && config.AccessToken != "" {
-		return nil, errors.New("ovh: can't use multiple authentication systems (ApplicationKey, Access Token)")
-	}
-
-	client, err := newClient(config)
+	client, err := ovh.NewClient(
+		config.APIEndpoint,
+		config.ApplicationKey,
+		config.ApplicationSecret,
+		config.ConsumerKey,
+	)
 	if err != nil {
 		return nil, fmt.Errorf("ovh: %w", err)
 	}
 
+	client.Client = config.HTTPClient
+
 	return &DNSProvider{
 		config:    config,
 		client:    client,
@@ -171,22 +123,19 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 
 // Present creates a TXT record to fulfill the dns-01 challenge.
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
-	info := dns01.GetChallengeInfo(domain, keyAuth)
+	fqdn, value := dns01.GetRecord(domain, keyAuth)
 
-	authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN)
+	// Parse domain name
+	authZone, err := dns01.FindZoneByFqdn(dns01.ToFqdn(domain))
 	if err != nil {
-		return fmt.Errorf("ovh: could not find zone for domain %q: %w", domain, err)
+		return fmt.Errorf("ovh: could not determine zone for domain %q: %w", domain, err)
 	}
 
 	authZone = dns01.UnFqdn(authZone)
-
-	subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, authZone)
-	if err != nil {
-		return fmt.Errorf("ovh: %w", err)
-	}
+	subDomain := extractRecordName(fqdn, authZone)
 
 	reqURL := fmt.Sprintf("/domain/zone/%s/record", authZone)
-	reqData := Record{FieldType: "TXT", SubDomain: subDomain, Target: info.Value, TTL: d.config.TTL}
+	reqData := Record{FieldType: "TXT", SubDomain: subDomain, Target: value, TTL: d.config.TTL}
 
 	// Create TXT record
 	var respData Record
@@ -211,19 +160,19 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 
 // CleanUp removes the TXT record matching the specified parameters.
 func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
-	info := dns01.GetChallengeInfo(domain, keyAuth)
+	fqdn, _ := dns01.GetRecord(domain, keyAuth)
 
 	// get the record's unique ID from when we created it
 	d.recordIDsMu.Lock()
 	recordID, ok := d.recordIDs[token]
 	d.recordIDsMu.Unlock()
 	if !ok {
-		return fmt.Errorf("ovh: unknown record ID for '%s'", info.EffectiveFQDN)
+		return fmt.Errorf("ovh: unknown record ID for '%s'", fqdn)
 	}
 
-	authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN)
+	authZone, err := dns01.FindZoneByFqdn(dns01.ToFqdn(domain))
 	if err != nil {
-		return fmt.Errorf("ovh: could not find zone for domain %q: %w", domain, err)
+		return fmt.Errorf("ovh: could not determine zone for domain %q: %w", domain, err)
 	}
 
 	authZone = dns01.UnFqdn(authZone)
@@ -256,26 +205,10 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
 	return d.config.PropagationTimeout, d.config.PollingInterval
 }
 
-func newClient(config *Config) (*ovh.Client, error) {
-	var client *ovh.Client
-	var err error
-
-	switch {
-	case config.hasAppKeyAuth():
-		client, err = ovh.NewClient(config.APIEndpoint, config.ApplicationKey, config.ApplicationSecret, config.ConsumerKey)
-	case config.OAuth2Config != nil:
-		client, err = ovh.NewOAuth2Client(config.APIEndpoint, config.OAuth2Config.ClientID, config.OAuth2Config.ClientSecret)
-	case config.AccessToken != "":
-		client, err = ovh.NewAccessTokenClient(config.APIEndpoint, config.AccessToken)
-	default:
-		client, err = ovh.NewDefaultClient()
+func extractRecordName(fqdn, zone string) string {
+	name := dns01.UnFqdn(fqdn)
+	if idx := strings.Index(name, "."+zone); idx != -1 {
+		return name[:idx]
 	}
-
-	if err != nil {
-		return nil, fmt.Errorf("new client: %w", err)
-	}
-
-	client.UserAgent = useragent.Get()
-
-	return client, nil
+	return name
 }
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.toml b/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.toml
index 9516218..ea76067 100644
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.toml
+++ b/vendor/github.com/go-acme/lego/v4/providers/dns/ovh/ovh.toml
@@ -5,26 +5,11 @@ Code = "ovh"
 Since = "v0.4.0"
 
 Example = '''
-# Application Key authentication:
-
 OVH_APPLICATION_KEY=1234567898765432 \
 OVH_APPLICATION_SECRET=b9841238feb177a84330febba8a832089 \
 OVH_CONSUMER_KEY=256vfsd347245sdfg \
 OVH_ENDPOINT=ovh-eu \
-lego --email you@example.com --dns ovh -d '*.example.com' -d example.com run
-
-# Or Access Token:
-
-OVH_ACCESS_TOKEN=xxx \
-OVH_ENDPOINT=ovh-eu \
-lego --email you@example.com --dns ovh -d '*.example.com' -d example.com run
-
-# Or OAuth2:
-
-OVH_CLIENT_ID=yyy \
-OVH_CLIENT_SECRET=xxx \
-OVH_ENDPOINT=ovh-eu \
-lego --email you@example.com --dns ovh -d '*.example.com' -d example.com run
+lego --email myemail@example.com --dns ovh --domains my.example.org run
 '''
 
 Additional = '''
@@ -32,7 +17,7 @@ Additional = '''
 
 Application key and secret can be created by following the [OVH guide](https://docs.ovh.com/gb/en/customer/first-steps-with-ovh-api/).
 
-When requesting the consumer key, the following configuration can be used to define access rights:
+When requesting the consumer key, the following configuration can be use to define access rights:
 
 ```json
 {
@@ -48,38 +33,19 @@ When requesting the consumer key, the following configuration can be used to def
   ]
 }
 ```
-
-## OAuth2 Client Credentials
-
-Another method for authentication is by using OAuth2 client credentials.
-
-An IAM policy and service account can be created by following the [OVH guide](https://help.ovhcloud.com/csm/en-manage-service-account?id=kb_article_view&sysparm_article=KB0059343).
-
-Following IAM policies need to be authorized for the affected domain:
-
-* dnsZone:apiovh:record/create
-* dnsZone:apiovh:record/delete
-* dnsZone:apiovh:refresh
-
-## Important Note
-
-Both authentication methods cannot be used at the same time.
 '''
 
 [Configuration]
   [Configuration.Credentials]
     OVH_ENDPOINT = "Endpoint URL (ovh-eu or ovh-ca)"
-    OVH_APPLICATION_KEY = "Application key (Application Key authentication)"
-    OVH_APPLICATION_SECRET = "Application secret (Application Key authentication)"
-    OVH_CONSUMER_KEY = "Consumer key (Application Key authentication)"
-    OVH_CLIENT_ID = "Client ID (OAuth2)"
-    OVH_CLIENT_SECRET = "Client secret (OAuth2)"
-    OVH_ACCESS_TOKEN = "Access token"
+    OVH_APPLICATION_KEY = "Application key"
+    OVH_APPLICATION_SECRET = "Application secret"
+    OVH_CONSUMER_KEY = "Consumer key"
   [Configuration.Additional]
-    OVH_POLLING_INTERVAL = "Time between DNS propagation check in seconds (Default: 2)"
-    OVH_PROPAGATION_TIMEOUT = "Maximum waiting time for DNS propagation in seconds (Default: 60)"
-    OVH_TTL = "The TTL of the TXT record used for the DNS challenge in seconds (Default: 120)"
-    OVH_HTTP_TIMEOUT = "API request timeout in seconds (Default: 180)"
+    OVH_POLLING_INTERVAL = "Time between DNS propagation check"
+    OVH_PROPAGATION_TIMEOUT = "Maximum waiting time for DNS propagation"
+    OVH_TTL = "The TTL of the TXT record used for the DNS challenge"
+    OVH_HTTP_TIMEOUT = "API request timeout"
 
 [Links]
   API = "https://eu.api.ovh.com/"
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/client.go b/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/client.go
deleted file mode 100644
index bc525c5..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/client.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package internal
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/go-acme/lego/v4/providers/dns/internal/errutils"
-	"github.com/miekg/dns"
-)
-
-// Client the PowerDNS API client.
-type Client struct {
-	serverName string
-	apiKey     string
-
-	apiVersion int
-
-	Host       *url.URL
-	HTTPClient *http.Client
-}
-
-// NewClient creates a new Client.
-func NewClient(host *url.URL, serverName string, apiVersion int, apiKey string) *Client {
-	return &Client{
-		serverName: serverName,
-		apiKey:     apiKey,
-		apiVersion: apiVersion,
-		Host:       host,
-		HTTPClient: &http.Client{Timeout: 5 * time.Second},
-	}
-}
-
-func (c *Client) APIVersion() int {
-	return c.apiVersion
-}
-
-func (c *Client) SetAPIVersion(ctx context.Context) error {
-	var err error
-
-	c.apiVersion, err = c.getAPIVersion(ctx)
-
-	return err
-}
-
-func (c *Client) getAPIVersion(ctx context.Context) (int, error) {
-	endpoint := c.joinPath("/", "api")
-
-	req, err := newJSONRequest(ctx, http.MethodGet, endpoint, nil)
-	if err != nil {
-		return 0, err
-	}
-
-	result, err := c.do(req)
-	if err != nil {
-		return 0, err
-	}
-
-	var versions []apiVersion
-	err = json.Unmarshal(result, &versions)
-	if err != nil {
-		return 0, err
-	}
-
-	latestVersion := 0
-	for _, v := range versions {
-		if v.Version > latestVersion {
-			latestVersion = v.Version
-		}
-	}
-
-	return latestVersion, err
-}
-
-func (c *Client) GetHostedZone(ctx context.Context, authZone string) (*HostedZone, error) {
-	endpoint := c.joinPath("/", "servers", c.serverName, "zones", dns.Fqdn(authZone))
-
-	req, err := newJSONRequest(ctx, http.MethodGet, endpoint, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result, err := c.do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	var zone HostedZone
-	err = json.Unmarshal(result, &zone)
-	if err != nil {
-		return nil, err
-	}
-
-	// convert pre-v1 API result
-	if len(zone.Records) > 0 {
-		zone.RRSets = []RRSet{}
-		for _, record := range zone.Records {
-			set := RRSet{
-				Name:    record.Name,
-				Type:    record.Type,
-				Records: []Record{record},
-			}
-			zone.RRSets = append(zone.RRSets, set)
-		}
-	}
-
-	return &zone, nil
-}
-
-func (c *Client) UpdateRecords(ctx context.Context, zone *HostedZone, sets RRSets) error {
-	endpoint := c.joinPath("/", "servers", c.serverName, "zones", zone.ID)
-
-	req, err := newJSONRequest(ctx, http.MethodPatch, endpoint, sets)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.do(req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Client) Notify(ctx context.Context, zone *HostedZone) error {
-	if c.apiVersion < 1 || zone.Kind != "Master" && zone.Kind != "Slave" {
-		return nil
-	}
-
-	endpoint := c.joinPath("/", "servers", c.serverName, "zones", zone.ID, "notify")
-
-	req, err := newJSONRequest(ctx, http.MethodPut, endpoint, nil)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.do(req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Client) joinPath(elem ...string) *url.URL {
-	p := path.Join(elem...)
-
-	if p != "/api" && c.apiVersion > 0 && !strings.HasPrefix(p, "/api/v") {
-		p = path.Join("/api", "v"+strconv.Itoa(c.apiVersion), p)
-	}
-
-	return c.Host.JoinPath(p)
-}
-
-func (c *Client) do(req *http.Request) (json.RawMessage, error) {
-	req.Header.Set("X-API-Key", c.apiKey)
-
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return nil, errutils.NewHTTPDoError(req, err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	if resp.StatusCode != http.StatusUnprocessableEntity && (resp.StatusCode < 200 || resp.StatusCode >= 300) {
-		return nil, errutils.NewUnexpectedResponseStatusCodeError(req, resp)
-	}
-
-	var msg json.RawMessage
-	err = json.NewDecoder(resp.Body).Decode(&msg)
-	if err != nil {
-		if errors.Is(err, io.EOF) {
-			// empty body
-			return nil, nil
-		}
-		// other error
-		return nil, err
-	}
-
-	// check for PowerDNS error message
-	if len(msg) > 0 && msg[0] == '{' {
-		var errInfo apiError
-		err = json.Unmarshal(msg, &errInfo)
-		if err != nil {
-			return nil, errutils.NewUnmarshalError(req, resp.StatusCode, msg, err)
-		}
-		if errInfo.ShortMsg != "" {
-			return nil, fmt.Errorf("error talking to PDNS API: %w", errInfo)
-		}
-	}
-
-	return msg, nil
-}
-
-func newJSONRequest(ctx context.Context, method string, endpoint *url.URL, payload any) (*http.Request, error) {
-	buf := new(bytes.Buffer)
-
-	if payload != nil {
-		err := json.NewEncoder(buf).Encode(payload)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create request JSON body: %w", err)
-		}
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, strings.TrimSuffix(endpoint.String(), "/"), buf)
-	if err != nil {
-		return nil, fmt.Errorf("unable to create request: %w", err)
-	}
-
-	req.Header.Set("Accept", "application/json")
-
-	// PowerDNS doesn't follow HTTP convention about the "Content-Type" header.
-	if method != http.MethodGet && method != http.MethodDelete {
-		req.Header.Set("Content-Type", "application/json")
-	}
-
-	return req, nil
-}
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/types.go b/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/types.go
deleted file mode 100644
index df885d9..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/internal/types.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package internal
-
-type Record struct {
-	Content  string `json:"content"`
-	Disabled bool   `json:"disabled"`
-
-	// pre-v1 API
-	Name string `json:"name"`
-	Type string `json:"type"`
-	TTL  int    `json:"ttl,omitempty"`
-}
-
-type HostedZone struct {
-	ID     string  `json:"id"`
-	Name   string  `json:"name"`
-	URL    string  `json:"url"`
-	Kind   string  `json:"kind"`
-	RRSets []RRSet `json:"rrsets"`
-
-	// pre-v1 API
-	Records []Record `json:"records"`
-}
-
-type RRSet struct {
-	Name       string   `json:"name"`
-	Type       string   `json:"type"`
-	Kind       string   `json:"kind"`
-	ChangeType string   `json:"changetype"`
-	Records    []Record `json:"records,omitempty"`
-	TTL        int      `json:"ttl,omitempty"`
-}
-
-type RRSets struct {
-	RRSets []RRSet `json:"rrsets"`
-}
-
-type apiError struct {
-	ShortMsg string `json:"error"`
-}
-
-func (a apiError) Error() string {
-	return a.ShortMsg
-}
-
-type apiVersion struct {
-	URL     string `json:"url"`
-	Version int    `json:"version"`
-}
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.go b/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.go
deleted file mode 100644
index c2f780b..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Package pdns implements a DNS provider for solving the DNS-01 challenge using PowerDNS nameserver.
-package pdns
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"time"
-
-	"github.com/go-acme/lego/v4/challenge"
-	"github.com/go-acme/lego/v4/challenge/dns01"
-	"github.com/go-acme/lego/v4/log"
-	"github.com/go-acme/lego/v4/platform/config/env"
-	"github.com/go-acme/lego/v4/providers/dns/pdns/internal"
-)
-
-// Environment variables names.
-const (
-	envNamespace = "PDNS_"
-
-	EnvAPIKey = envNamespace + "API_KEY"
-	EnvAPIURL = envNamespace + "API_URL"
-
-	EnvTTL                = envNamespace + "TTL"
-	EnvAPIVersion         = envNamespace + "API_VERSION"
-	EnvPropagationTimeout = envNamespace + "PROPAGATION_TIMEOUT"
-	EnvPollingInterval    = envNamespace + "POLLING_INTERVAL"
-	EnvHTTPTimeout        = envNamespace + "HTTP_TIMEOUT"
-	EnvServerName         = envNamespace + "SERVER_NAME"
-)
-
-var _ challenge.ProviderTimeout = (*DNSProvider)(nil)
-
-// Config is used to configure the creation of the DNSProvider.
-type Config struct {
-	APIKey             string
-	Host               *url.URL
-	ServerName         string
-	APIVersion         int
-	PropagationTimeout time.Duration
-	PollingInterval    time.Duration
-	TTL                int
-	HTTPClient         *http.Client
-}
-
-// NewDefaultConfig returns a default configuration for the DNSProvider.
-func NewDefaultConfig() *Config {
-	return &Config{
-		ServerName:         env.GetOrDefaultString(EnvServerName, "localhost"),
-		APIVersion:         env.GetOrDefaultInt(EnvAPIVersion, 0),
-		TTL:                env.GetOrDefaultInt(EnvTTL, dns01.DefaultTTL),
-		PropagationTimeout: env.GetOrDefaultSecond(EnvPropagationTimeout, 120*time.Second),
-		PollingInterval:    env.GetOrDefaultSecond(EnvPollingInterval, 2*time.Second),
-		HTTPClient: &http.Client{
-			Timeout: env.GetOrDefaultSecond(EnvHTTPTimeout, 30*time.Second),
-		},
-	}
-}
-
-// DNSProvider implements the challenge.Provider interface.
-type DNSProvider struct {
-	config *Config
-	client *internal.Client
-}
-
-// NewDNSProvider returns a DNSProvider instance configured for pdns.
-// Credentials must be passed in the environment variable:
-// PDNS_API_URL and PDNS_API_KEY.
-func NewDNSProvider() (*DNSProvider, error) {
-	values, err := env.Get(EnvAPIKey, EnvAPIURL)
-	if err != nil {
-		return nil, fmt.Errorf("pdns: %w", err)
-	}
-
-	hostURL, err := url.Parse(values[EnvAPIURL])
-	if err != nil {
-		return nil, fmt.Errorf("pdns: %w", err)
-	}
-
-	config := NewDefaultConfig()
-	config.Host = hostURL
-	config.APIKey = values[EnvAPIKey]
-
-	return NewDNSProviderConfig(config)
-}
-
-// NewDNSProviderConfig return a DNSProvider instance configured for pdns.
-func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
-	if config == nil {
-		return nil, errors.New("pdns: the configuration of the DNS provider is nil")
-	}
-
-	if config.APIKey == "" {
-		return nil, errors.New("pdns: API key missing")
-	}
-
-	if config.Host == nil || config.Host.Host == "" {
-		return nil, errors.New("pdns: API URL missing")
-	}
-
-	client := internal.NewClient(config.Host, config.ServerName, config.APIVersion, config.APIKey)
-
-	if config.APIVersion <= 0 {
-		err := client.SetAPIVersion(context.Background())
-		if err != nil {
-			log.Warnf("pdns: failed to get API version %v", err)
-		}
-	}
-
-	return &DNSProvider{config: config, client: client}, nil
-}
-
-// Timeout returns the timeout and interval to use when checking for DNS propagation.
-// Adjusting here to cope with spikes in propagation times.
-func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
-	return d.config.PropagationTimeout, d.config.PollingInterval
-}
-
-// Present creates a TXT record to fulfill the dns-01 challenge.
-func (d *DNSProvider) Present(domain, token, keyAuth string) error {
-	info := dns01.GetChallengeInfo(domain, keyAuth)
-
-	authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN)
-	if err != nil {
-		return fmt.Errorf("pdns: could not find zone for domain %q: %w", domain, err)
-	}
-
-	ctx := context.Background()
-
-	zone, err := d.client.GetHostedZone(ctx, authZone)
-	if err != nil {
-		return fmt.Errorf("pdns: %w", err)
-	}
-
-	name := info.EffectiveFQDN
-	if d.client.APIVersion() == 0 {
-		// pre-v1 API wants non-fqdn
-		name = dns01.UnFqdn(info.EffectiveFQDN)
-	}
-
-	// Look for existing records.
-	existingRRSet := findTxtRecord(zone, info.EffectiveFQDN)
-
-	// merge the existing and new records
-	var records []internal.Record
-	if existingRRSet != nil {
-		records = existingRRSet.Records
-	}
-
-	rec := internal.Record{
-		Content:  strconv.Quote(info.Value),
-		Disabled: false,
-
-		// pre-v1 API
-		Type: "TXT",
-		Name: name,
-		TTL:  d.config.TTL,
-	}
-
-	rrSets := internal.RRSets{
-		RRSets: []internal.RRSet{
-			{
-				Name:       name,
-				ChangeType: "REPLACE",
-				Type:       "TXT",
-				Kind:       "Master",
-				TTL:        d.config.TTL,
-				Records:    append(records, rec),
-			},
-		},
-	}
-
-	err = d.client.UpdateRecords(ctx, zone, rrSets)
-	if err != nil {
-		return fmt.Errorf("pdns: %w", err)
-	}
-
-	return d.client.Notify(ctx, zone)
-}
-
-// CleanUp removes the TXT record matching the specified parameters.
-func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
-	info := dns01.GetChallengeInfo(domain, keyAuth)
-
-	authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN)
-	if err != nil {
-		return fmt.Errorf("pdns: could not find zone for domain %q: %w", domain, err)
-	}
-
-	ctx := context.Background()
-
-	zone, err := d.client.GetHostedZone(ctx, authZone)
-	if err != nil {
-		return fmt.Errorf("pdns: %w", err)
-	}
-
-	set := findTxtRecord(zone, info.EffectiveFQDN)
-
-	if set == nil {
-		return fmt.Errorf("pdns: no existing record found for %s", info.EffectiveFQDN)
-	}
-
-	var records []internal.Record
-	for _, r := range set.Records {
-		if r.Content != strconv.Quote(info.Value) {
-			records = append(records, r)
-		}
-	}
-
-	rrSet := internal.RRSet{
-		Name: set.Name,
-		Type: set.Type,
-	}
-
-	if len(records) > 0 {
-		rrSet.ChangeType = "REPLACE"
-		rrSet.TTL = d.config.TTL
-		rrSet.Records = records
-	} else {
-		rrSet.ChangeType = "DELETE"
-	}
-
-	err = d.client.UpdateRecords(ctx, zone, internal.RRSets{RRSets: []internal.RRSet{rrSet}})
-	if err != nil {
-		return fmt.Errorf("pdns: %w", err)
-	}
-
-	return d.client.Notify(ctx, zone)
-}
-
-func findTxtRecord(zone *internal.HostedZone, fqdn string) *internal.RRSet {
-	for _, set := range zone.RRSets {
-		if set.Type == "TXT" && (set.Name == dns01.UnFqdn(fqdn) || set.Name == fqdn) {
-			return &set
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.toml b/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.toml
deleted file mode 100644
index 53b5547..0000000
--- a/vendor/github.com/go-acme/lego/v4/providers/dns/pdns/pdns.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-Name = "PowerDNS"
-Description = ''''''
-URL = "https://www.powerdns.com/"
-Code = "pdns"
-Since = "v0.4.0"
-
-Example = '''
-PDNS_API_URL=http://pdns-server:80/ \
-PDNS_API_KEY=xxxx \
-lego --email you@example.com --dns pdns -d '*.example.com' -d example.com run
-'''
-
-Additional = '''
-## Information
-
-Tested and confirmed to work with PowerDNS authoritative server 3.4.8 and 4.0.1. Refer to [PowerDNS documentation](https://doc.powerdns.com/md/httpapi/README/) instructions on how to enable the built-in API interface.
-
-PowerDNS Notes:
-- PowerDNS API does not currently support SSL, therefore you should take care to ensure that traffic between lego and the PowerDNS API is over a trusted network, VPN etc.
-- In order to have the SOA serial automatically increment each time the `_acme-challenge` record is added/modified via the API, set `SOA-EDIT-API` to `INCEPTION-INCREMENT` for the zone in the `domainmetadata` table
-- Some PowerDNS servers doesn't have root API endpoints enabled and API version autodetection will not work. In that case version number can be defined using `PDNS_API_VERSION`.
-'''
-
-[Configuration]
-  [Configuration.Credentials]
-    PDNS_API_KEY = "API key"
-    PDNS_API_URL = "API URL"
-  [Configuration.Additional]
-    PDNS_SERVER_NAME = "Name of the server in the URL, 'localhost' by default"
-    PDNS_API_VERSION = "Skip API version autodetection and use the provided version number."
-    PDNS_POLLING_INTERVAL = "Time between DNS propagation check in seconds (Default: 2)"
-    PDNS_PROPAGATION_TIMEOUT = "Maximum waiting time for DNS propagation in seconds (Default: 120)"
-    PDNS_TTL = "The TTL of the TXT record used for the DNS challenge in seconds (Default: 120)"
-    PDNS_HTTP_TIMEOUT = "API request timeout in seconds (Default: 30)"
-
-[Links]
-  API = "https://doc.powerdns.com/md/httpapi/README/"
diff --git a/vendor/github.com/go-acme/lego/v4/registration/registar.go b/vendor/github.com/go-acme/lego/v4/registration/registar.go
index 15c28ba..25a1b7d 100644
--- a/vendor/github.com/go-acme/lego/v4/registration/registar.go
+++ b/vendor/github.com/go-acme/lego/v4/registration/registar.go
@@ -9,11 +9,9 @@ import (
 	"github.com/go-acme/lego/v4/log"
 )
 
-const mailTo = "mailto:"
-
 // Resource represents all important information about a registration
 // of which the client needs to keep track itself.
-// WARNING: will be removed in the future (acme.ExtendedAccount), https://github.com/go-acme/lego/issues/855.
+// WARNING: will be remove in the future (acme.ExtendedAccount), https://github.com/go-acme/lego/issues/855.
 type Resource struct {
 	Body acme.Account `json:"body,omitempty"`
 	URI  string       `json:"uri,omitempty"`
@@ -54,13 +52,13 @@ func (r *Registrar) Register(options RegisterOptions) (*Resource, error) {
 
 	if r.user.GetEmail() != "" {
 		log.Infof("acme: Registering account for %s", r.user.GetEmail())
-		accMsg.Contact = []string{mailTo + r.user.GetEmail()}
+		accMsg.Contact = []string{"mailto:" + r.user.GetEmail()}
 	}
 
 	account, err := r.core.Accounts.New(accMsg)
 	if err != nil {
 		// seems impossible
-		errorDetails := &acme.ProblemDetails{}
+		var errorDetails acme.ProblemDetails
 		if !errors.As(err, &errorDetails) || errorDetails.HTTPStatus != http.StatusConflict {
 			return nil, err
 		}
@@ -78,13 +76,13 @@ func (r *Registrar) RegisterWithExternalAccountBinding(options RegisterEABOption
 
 	if r.user.GetEmail() != "" {
 		log.Infof("acme: Registering account for %s", r.user.GetEmail())
-		accMsg.Contact = []string{mailTo + r.user.GetEmail()}
+		accMsg.Contact = []string{"mailto:" + r.user.GetEmail()}
 	}
 
 	account, err := r.core.Accounts.NewEAB(accMsg, options.Kid, options.HmacEncoded)
 	if err != nil {
 		// seems impossible
-		errorDetails := &acme.ProblemDetails{}
+		var errorDetails acme.ProblemDetails
 		if !errors.As(err, &errorDetails) || errorDetails.HTTPStatus != http.StatusConflict {
 			return nil, err
 		}
@@ -130,7 +128,7 @@ func (r *Registrar) UpdateRegistration(options RegisterOptions) (*Resource, erro
 
 	if r.user.GetEmail() != "" {
 		log.Infof("acme: Registering account for %s", r.user.GetEmail())
-		accMsg.Contact = []string{mailTo + r.user.GetEmail()}
+		accMsg.Contact = []string{"mailto:" + r.user.GetEmail()}
 	}
 
 	accountURL := r.user.GetRegistration().URI
diff --git a/vendor/github.com/go-jose/go-jose/v4/.golangci.yml b/vendor/github.com/go-jose/go-jose/v4/.golangci.yml
deleted file mode 100644
index 2a577a8..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/.golangci.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# https://github.com/golangci/golangci-lint
-
-run:
-  skip-files:
-    - doc_test.go
-  modules-download-mode: readonly
-
-linters:
-  enable-all: true
-  disable:
-    - gochecknoglobals
-    - goconst
-    - lll
-    - maligned
-    - nakedret
-    - scopelint
-    - unparam
-    - funlen # added in 1.18 (requires go-jose changes before it can be enabled)
-
-linters-settings:
-  gocyclo:
-    min-complexity: 35
-
-issues:
-  exclude-rules:
-    - text: "don't use ALL_CAPS in Go names"
-      linters:
-        - golint
-    - text: "hardcoded credentials"
-      linters:
-        - gosec
-    - text: "weak cryptographic primitive"
-      linters:
-        - gosec
-    - path: json/
-      linters:
-        - dupl
-        - errcheck
-        - gocritic
-        - gocyclo
-        - golint
-        - govet
-        - ineffassign
-        - staticcheck
-        - structcheck
-        - stylecheck
-        - unused
-    - path: _test\.go
-      linters:
-        - scopelint
-    - path: jwk.go
-      linters:
-        - gocyclo
diff --git a/vendor/github.com/go-jose/go-jose/v4/.travis.yml b/vendor/github.com/go-jose/go-jose/v4/.travis.yml
deleted file mode 100644
index 48de631..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: go
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - go: tip
-
-go:
-  - "1.13.x"
-  - "1.14.x"
-  - tip
-
-before_script:
-  - export PATH=$HOME/.local/bin:$PATH
-
-before_install:
-  - go get -u github.com/mattn/goveralls github.com/wadey/gocovmerge
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
-  - pip install cram --user
-
-script:
-  - go test -v -covermode=count -coverprofile=profile.cov .
-  - go test -v -covermode=count -coverprofile=cryptosigner/profile.cov ./cryptosigner
-  - go test -v -covermode=count -coverprofile=cipher/profile.cov ./cipher
-  - go test -v -covermode=count -coverprofile=jwt/profile.cov ./jwt
-  - go test -v ./json  # no coverage for forked encoding/json package
-  - golangci-lint run
-  - cd jose-util && go build && PATH=$PWD:$PATH cram -v jose-util.t # cram tests jose-util
-  - cd ..
-
-after_success:
-  - gocovmerge *.cov */*.cov > merged.coverprofile
-  - goveralls -coverprofile merged.coverprofile -service=travis-ci
diff --git a/vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md b/vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md
deleted file mode 100644
index 66a8a0f..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md
+++ /dev/null
@@ -1,101 +0,0 @@
-## Changed
-
-  - Defined a custom error, ErrUnexpectedSignatureAlgorithm, returned when a JWS
-    header contains an unsupported signature algorithm.
-
-# v4.0.4
-
-## Fixed
-
- - Reverted "Allow unmarshalling JSONWebKeySets with unsupported key types" as a
-   breaking change. See #136 / #137.
-
-# v4.0.3
-
-## Changed
-
- - Allow unmarshalling JSONWebKeySets with unsupported key types (#130)
- - Document that OpaqueKeyEncrypter can't be implemented (for now) (#129)
- - Dependency updates
-
-# v4.0.2
-
-## Changed
-
- - Improved documentation of Verify() to note that JSONWebKeySet is a supported
-   argument type (#104)
- - Defined exported error values for missing x5c header and unsupported elliptic
-   curves error cases (#117)
-
-# v4.0.1
-
-## Fixed
-
- - An attacker could send a JWE containing compressed data that used large
-   amounts of memory and CPU when decompressed by `Decrypt` or `DecryptMulti`.
-   Those functions now return an error if the decompressed data would exceed
-   250kB or 10x the compressed size (whichever is larger). Thanks to
-   Enze Wang@Alioth and Jianjun Chen@Zhongguancun Lab (@zer0yu and @chenjj)
-   for reporting.
-
-# v4.0.0
-
-This release makes some breaking changes in order to more thoroughly
-address the vulnerabilities discussed in [Three New Attacks Against JSON Web
-Tokens][1], "Sign/encrypt confusion", "Billion hash attack", and "Polyglot
-token".
-
-## Changed
-
- - Limit JWT encryption types (exclude password or public key types) (#78)
- - Enforce minimum length for HMAC keys (#85)
- - jwt: match any audience in a list, rather than requiring all audiences (#81)
- - jwt: accept only Compact Serialization (#75)
- - jws: Add expected algorithms for signatures (#74)
- - Require specifying expected algorithms for ParseEncrypted,
-   ParseSigned, ParseDetached, jwt.ParseEncrypted, jwt.ParseSigned,
-   jwt.ParseSignedAndEncrypted (#69, #74)
-   - Usually there is a small, known set of appropriate algorithms for a program
-     to use and it's a mistake to allow unexpected algorithms. For instance the
-     "billion hash attack" relies in part on programs accepting the PBES2
-     encryption algorithm and doing the necessary work even if they weren't
-     specifically configured to allow PBES2.
- - Revert "Strip padding off base64 strings" (#82)
-  - The specs require base64url encoding without padding.
- - Minimum supported Go version is now 1.21
-
-## Added
-
- - ParseSignedCompact, ParseSignedJSON, ParseEncryptedCompact, ParseEncryptedJSON.
-   - These allow parsing a specific serialization, as opposed to ParseSigned and
-     ParseEncrypted, which try to automatically detect which serialization was
-     provided. It's common to require a specific serialization for a specific
-     protocol - for instance JWT requires Compact serialization.
-
-[1]: https://i.blackhat.com/BH-US-23/Presentations/US-23-Tervoort-Three-New-Attacks-Against-JSON-Web-Tokens.pdf
-
-# v3.0.2
-
-## Fixed
-
- - DecryptMulti: handle decompression error (#19)
-
-## Changed
-
- - jwe/CompactSerialize: improve performance (#67)
- - Increase the default number of PBKDF2 iterations to 600k (#48)
- - Return the proper algorithm for ECDSA keys (#45)
-
-## Added
-
- - Add Thumbprint support for opaque signers (#38)
-
-# v3.0.1
-
-## Fixed
-
- - Security issue: an attacker specifying a large "p2c" value can cause
-   JSONWebEncryption.Decrypt and JSONWebEncryption.DecryptMulti to consume large
-   amounts of CPU, causing a DoS. Thanks to Matt Schwager (@mschwager) for the
-   disclosure and to Tom Tervoort for originally publishing the category of attack.
-   https://i.blackhat.com/BH-US-23/Presentations/US-23-Tervoort-Three-New-Attacks-Against-JSON-Web-Tokens.pdf
diff --git a/vendor/github.com/go-jose/go-jose/v4/README.md b/vendor/github.com/go-jose/go-jose/v4/README.md
deleted file mode 100644
index 02b5749..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/README.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Go JOSE
-
-[![godoc](https://pkg.go.dev/badge/github.com/go-jose/go-jose/v4.svg)](https://pkg.go.dev/github.com/go-jose/go-jose/v4)
-[![godoc](https://pkg.go.dev/badge/github.com/go-jose/go-jose/v4/jwt.svg)](https://pkg.go.dev/github.com/go-jose/go-jose/v4/jwt)
-[![license](https://img.shields.io/badge/license-apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/go-jose/go-jose/master/LICENSE)
-[![test](https://img.shields.io/github/checks-status/go-jose/go-jose/v4)](https://github.com/go-jose/go-jose/actions)
-
-Package jose aims to provide an implementation of the Javascript Object Signing
-and Encryption set of standards. This includes support for JSON Web Encryption,
-JSON Web Signature, and JSON Web Token standards.
-
-## Overview
-
-The implementation follows the
-[JSON Web Encryption](https://dx.doi.org/10.17487/RFC7516) (RFC 7516),
-[JSON Web Signature](https://dx.doi.org/10.17487/RFC7515) (RFC 7515), and
-[JSON Web Token](https://dx.doi.org/10.17487/RFC7519) (RFC 7519) specifications.
-Tables of supported algorithms are shown below. The library supports both
-the compact and JWS/JWE JSON Serialization formats, and has optional support for
-multiple recipients. It also comes with a small command-line utility
-([`jose-util`](https://pkg.go.dev/github.com/go-jose/go-jose/jose-util))
-for dealing with JOSE messages in a shell.
-
-**Note**: We use a forked version of the `encoding/json` package from the Go
-standard library which uses case-sensitive matching for member names (instead
-of [case-insensitive matching](https://www.ietf.org/mail-archive/web/json/current/msg03763.html)).
-This is to avoid differences in interpretation of messages between go-jose and
-libraries in other languages.
-
-### Versions
-
-[Version 4](https://github.com/go-jose/go-jose)
-([branch](https://github.com/go-jose/go-jose/tree/main),
-[doc](https://pkg.go.dev/github.com/go-jose/go-jose/v4), [releases](https://github.com/go-jose/go-jose/releases)) is the current stable version:
-
-    import "github.com/go-jose/go-jose/v4"
-
-The old [square/go-jose](https://github.com/square/go-jose) repo contains the prior v1 and v2 versions, which
-are still useable but not actively developed anymore.
-
-Version 3, in this repo, is still receiving security fixes but not functionality
-updates.
-
-### Supported algorithms
-
-See below for a table of supported algorithms. Algorithm identifiers match
-the names in the [JSON Web Algorithms](https://dx.doi.org/10.17487/RFC7518)
-standard where possible. The Godoc reference has a list of constants.
-
- Key encryption             | Algorithm identifier(s)
- :------------------------- | :------------------------------
- RSA-PKCS#1v1.5             | RSA1_5
- RSA-OAEP                   | RSA-OAEP, RSA-OAEP-256
- AES key wrap               | A128KW, A192KW, A256KW
- AES-GCM key wrap           | A128GCMKW, A192GCMKW, A256GCMKW
- ECDH-ES + AES key wrap     | ECDH-ES+A128KW, ECDH-ES+A192KW, ECDH-ES+A256KW
- ECDH-ES (direct)           | ECDH-ES<sup>1</sup>
- Direct encryption          | dir<sup>1</sup>
-
-<sup>1. Not supported in multi-recipient mode</sup>
-
- Signing / MAC              | Algorithm identifier(s)
- :------------------------- | :------------------------------
- RSASSA-PKCS#1v1.5          | RS256, RS384, RS512
- RSASSA-PSS                 | PS256, PS384, PS512
- HMAC                       | HS256, HS384, HS512
- ECDSA                      | ES256, ES384, ES512
- Ed25519                    | EdDSA<sup>2</sup>
-
-<sup>2. Only available in version 2 of the package</sup>
-
- Content encryption         | Algorithm identifier(s)
- :------------------------- | :------------------------------
- AES-CBC+HMAC               | A128CBC-HS256, A192CBC-HS384, A256CBC-HS512
- AES-GCM                    | A128GCM, A192GCM, A256GCM
-
- Compression                | Algorithm identifiers(s)
- :------------------------- | -------------------------------
- DEFLATE (RFC 1951)         | DEF
-
-### Supported key types
-
-See below for a table of supported key types. These are understood by the
-library, and can be passed to corresponding functions such as `NewEncrypter` or
-`NewSigner`. Each of these keys can also be wrapped in a JWK if desired, which
-allows attaching a key id.
-
- Algorithm(s)               | Corresponding types
- :------------------------- | -------------------------------
- RSA                        | *[rsa.PublicKey](https://pkg.go.dev/crypto/rsa/#PublicKey), *[rsa.PrivateKey](https://pkg.go.dev/crypto/rsa/#PrivateKey)
- ECDH, ECDSA                | *[ecdsa.PublicKey](https://pkg.go.dev/crypto/ecdsa/#PublicKey), *[ecdsa.PrivateKey](https://pkg.go.dev/crypto/ecdsa/#PrivateKey)
- EdDSA<sup>1</sup>          | [ed25519.PublicKey](https://pkg.go.dev/crypto/ed25519#PublicKey), [ed25519.PrivateKey](https://pkg.go.dev/crypto/ed25519#PrivateKey)
- AES, HMAC                  | []byte
-
-<sup>1. Only available in version 2 or later of the package</sup>
-
-## Examples
-
-[![godoc](https://pkg.go.dev/badge/github.com/go-jose/go-jose/v4.svg)](https://pkg.go.dev/github.com/go-jose/go-jose/v4)
-[![godoc](https://pkg.go.dev/badge/github.com/go-jose/go-jose/v4/jwt.svg)](https://pkg.go.dev/github.com/go-jose/go-jose/v4/jwt)
-
-Examples can be found in the Godoc
-reference for this package. The
-[`jose-util`](https://github.com/go-jose/go-jose/tree/main/jose-util)
-subdirectory also contains a small command-line utility which might be useful
-as an example as well.
diff --git a/vendor/github.com/go-jose/go-jose/v4/SECURITY.md b/vendor/github.com/go-jose/go-jose/v4/SECURITY.md
deleted file mode 100644
index 2f18a75..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/SECURITY.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Security Policy
-This document explains how to contact the Let's Encrypt security team to report security vulnerabilities.
-
-## Supported Versions
-| Version | Supported |
-| ------- | ----------|
-| >= v3   | &check; |
-| v2      | &cross; |
-| v1      | &cross; |
-
-## Reporting a vulnerability
-
-Please see [https://letsencrypt.org/contact/#security](https://letsencrypt.org/contact/#security) for the email address to report a vulnerability. Ensure that the subject line for your report contains the word `vulnerability` and is descriptive. Your email should be acknowledged within 24 hours. If you do not receive a response within 24 hours, please follow-up again with another email.
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go b/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go
deleted file mode 100644
index 6c5a4e7..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go
+++ /dev/null
@@ -1,28 +0,0 @@
-//go:build go1.24
-
-/*-
- * Copyright 2014 Square Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jose
-
-import (
-	"crypto/pbkdf2"
-	"hash"
-)
-
-func pbkdf2Key(h func() hash.Hash, password string, salt []byte, iter, keyLen int) ([]byte, error) {
-	return pbkdf2.Key(h, password, salt, iter, keyLen)
-}
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go b/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go
deleted file mode 100644
index bdfc3d7..0000000
--- a/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go
+++ /dev/null
@@ -1,29 +0,0 @@
-//go:build !go1.24
-
-/*-
- * Copyright 2014 Square Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jose
-
-import (
-	"hash"
-
-	"golang.org/x/crypto/pbkdf2"
-)
-
-func pbkdf2Key(h func() hash.Hash, password string, salt []byte, iter, keyLen int) ([]byte, error) {
-	return pbkdf2.Key([]byte(password), salt, iter, keyLen, h), nil
-}
diff --git a/vendor/github.com/goccy/go-json/.golangci.yml b/vendor/github.com/goccy/go-json/.golangci.yml
index 977acca..44ae40f 100644
--- a/vendor/github.com/goccy/go-json/.golangci.yml
+++ b/vendor/github.com/goccy/go-json/.golangci.yml
@@ -48,17 +48,6 @@ linters:
     - nlreturn
     - testpackage
     - wsl
-    - varnamelen
-    - nilnil
-    - ireturn
-    - govet
-    - forcetypeassert
-    - cyclop
-    - containedctx
-    - revive
-    - nosnakecase
-    - exhaustruct
-    - depguard
 
 issues:
   exclude-rules:
diff --git a/vendor/github.com/goccy/go-json/CHANGELOG.md b/vendor/github.com/goccy/go-json/CHANGELOG.md
index d09bb89..f69c814 100644
--- a/vendor/github.com/goccy/go-json/CHANGELOG.md
+++ b/vendor/github.com/goccy/go-json/CHANGELOG.md
@@ -1,168 +1,3 @@
-# v0.10.2 - 2023/03/20
-
-### New features
-
-* Support DebugDOT option for debugging encoder ( #440 )
-
-### Fix bugs
-
-* Fix combination of embedding structure and omitempty option ( #442 )
-
-# v0.10.1 - 2023/03/13
-
-### Fix bugs
-
-* Fix checkptr error for array decoder ( #415 )
-* Fix added buffer size check when decoding key ( #430 )
-* Fix handling of anonymous fields other than struct ( #431 )
-* Fix to not optimize when lower conversion can't handle byte-by-byte ( #432 )
-* Fix a problem that MarshalIndent does not work when UnorderedMap is specified ( #435 )
-* Fix mapDecoder.DecodeStream() for empty objects containing whitespace ( #425 )
-* Fix an issue that could not set the correct NextField for fields in the embedded structure ( #438 )
-
-# v0.10.0 - 2022/11/29
-
-### New features
-
-* Support JSON Path ( #250 )
-
-### Fix bugs
-
-* Fix marshaler for map's key ( #409 )
-
-# v0.9.11 - 2022/08/18
-
-### Fix bugs
-
-* Fix unexpected behavior when buffer ends with backslash ( #383 )
-* Fix stream decoding of escaped character ( #387 )
-
-# v0.9.10 - 2022/07/15
-
-### Fix bugs
-
-* Fix boundary exception of type caching ( #382 )
-
-# v0.9.9 - 2022/07/15
-
-### Fix bugs
-
-* Fix encoding of directed interface with typed nil ( #377 )
-* Fix embedded primitive type encoding using alias ( #378 )
-* Fix slice/array type encoding with types implementing MarshalJSON ( #379 )
-* Fix unicode decoding when the expected buffer state is not met after reading ( #380 )
-
-# v0.9.8 - 2022/06/30
-
-### Fix bugs
-
-* Fix decoding of surrogate-pair ( #365 )
-* Fix handling of embedded primitive type ( #366 )
-* Add validation of escape sequence for decoder ( #367 )
-* Fix stream tokenizing respecting UseNumber ( #369 )
-* Fix encoding when struct pointer type that implements Marshal JSON is embedded ( #375 )
-
-### Improve performance
-
-* Improve performance of linkRecursiveCode ( #368 )
-
-# v0.9.7 - 2022/04/22
-
-### Fix bugs
-
-#### Encoder
-
-* Add filtering process for encoding on slow path ( #355 )
-* Fix encoding of interface{} with pointer type ( #363 )
-
-#### Decoder
-
-* Fix map key decoder that implements UnmarshalJSON ( #353 )
-* Fix decoding of []uint8 type ( #361 )
-
-### New features
-
-* Add DebugWith option for encoder ( #356 )
-
-# v0.9.6 - 2022/03/22
-
-### Fix bugs
-
-* Correct the handling of the minimum value of int type for decoder ( #344 )
-* Fix bugs of stream decoder's bufferSize ( #349 )
-* Add a guard to use typeptr more safely ( #351 )
-
-### Improve decoder performance
-
-* Improve escapeString's performance ( #345 )
-
-### Others
-
-* Update go version for CI ( #347 )
-
-# v0.9.5 - 2022/03/04
-
-### Fix bugs
-
-* Fix panic when decoding time.Time with context ( #328 )
-* Fix reading the next character in buffer to nul consideration ( #338 )
-* Fix incorrect handling on skipValue ( #341 )
-
-### Improve decoder performance
-
-* Improve performance when a payload contains escape sequence ( #334 )
-
-# v0.9.4 - 2022/01/21
-
-* Fix IsNilForMarshaler for string type with omitempty ( #323 )
-* Fix the case where the embedded field is at the end ( #326 )
-
-# v0.9.3 - 2022/01/14
-
-* Fix logic of removing struct field for decoder ( #322 )
-
-# v0.9.2 - 2022/01/14
-
-* Add invalid decoder to delay type error judgment at decode ( #321 )
-
-# v0.9.1 - 2022/01/11
-
-* Fix encoding of MarshalText/MarshalJSON operation with head offset ( #319 )
-
-# v0.9.0 - 2022/01/05
-
-### New feature
-
-* Supports dynamic filtering of struct fields ( #314 )
-
-### Improve encoding performance
-
-* Improve map encoding performance ( #310 )
-* Optimize encoding path for escaped string ( #311 )
-* Add encoding option for performance ( #312 )
-
-### Fix bugs
-
-* Fix panic at encoding map value on 1.18 ( #310 )
-* Fix MarshalIndent for interface type ( #317 )
-
-# v0.8.1 - 2021/12/05
-
-* Fix operation conversion from PtrHead to Head in Recursive type ( #305 )
-
-# v0.8.0 - 2021/12/02
-
-* Fix embedded field conflict behavior ( #300 )
-* Refactor compiler for encoder ( #301 #302 )
-
-# v0.7.10 - 2021/10/16
-
-* Fix conversion from pointer to uint64  ( #294 )
-
-# v0.7.9 - 2021/09/28
-
-* Fix encoding of nil value about interface type that has method ( #291 )
-
 # v0.7.8 - 2021/09/01
 
 * Fix mapassign_faststr for indirect struct type ( #283 )
diff --git a/vendor/github.com/goccy/go-json/Makefile b/vendor/github.com/goccy/go-json/Makefile
index c030577..363563a 100644
--- a/vendor/github.com/goccy/go-json/Makefile
+++ b/vendor/github.com/goccy/go-json/Makefile
@@ -22,7 +22,7 @@ cover-html: cover
 
 .PHONY: lint
 lint: golangci-lint
-	$(BIN_DIR)/golangci-lint run
+	golangci-lint run
 
 golangci-lint: | $(BIN_DIR)
 	@{ \
@@ -30,7 +30,7 @@ golangci-lint: | $(BIN_DIR)
 		GOLANGCI_LINT_TMP_DIR=$$(mktemp -d); \
 		cd $$GOLANGCI_LINT_TMP_DIR; \
 		go mod init tmp; \
-		GOBIN=$(BIN_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2; \
+		GOBIN=$(BIN_DIR) go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.36.0; \
 		rm -rf $$GOLANGCI_LINT_TMP_DIR; \
 	}
 
diff --git a/vendor/github.com/goccy/go-json/README.md b/vendor/github.com/goccy/go-json/README.md
index 7bacc54..418854e 100644
--- a/vendor/github.com/goccy/go-json/README.md
+++ b/vendor/github.com/goccy/go-json/README.md
@@ -13,7 +13,7 @@ Fast JSON encoder/decoder compatible with encoding/json for Go
 ```
 * version ( expected release date )
 
-* v0.9.0
+* v0.7.0
  |
  | while maintaining compatibility with encoding/json, we will add convenient APIs
  |
@@ -21,8 +21,9 @@ Fast JSON encoder/decoder compatible with encoding/json for Go
 * v1.0.0
 ```
 
-We are accepting requests for features that will be implemented between v0.9.0 and v.1.0.0.
+We are accepting requests for features that will be implemented between v0.7.0 and v.1.0.0.
 If you have the API you need, please submit your issue [here](https://github.com/goccy/go-json/issues).
+For example, I'm thinking of supporting `context.Context` of `json.Marshaler` and decoding using JSON Path.
 
 # Features
 
@@ -31,7 +32,6 @@ If you have the API you need, please submit your issue [here](https://github.com
 - Flexible customization with options
 - Coloring the encoded string
 - Can propagate context.Context to `MarshalJSON` or `UnmarshalJSON`
-- Can dynamically filter the fields of the structure type-safely
 
 # Installation
 
@@ -184,7 +184,7 @@ func Marshal(v interface{}) ([]byte, error) {
 `json.Marshal` and `json.Unmarshal` receive `interface{}` value and they perform type determination dynamically to process.
 In normal case, you need to use the `reflect` library to determine the type dynamically, but since `reflect.Type` is defined as `interface`, when you call the method of `reflect.Type`, The reflect's argument is escaped.
 
-Therefore, the arguments for `Marshal` and `Unmarshal` are always escaped to the heap.
+Therefore, the arguments for `Marshal` and `Unmarshal` are always escape to the heap.
 However, `go-json` can use the feature of `reflect.Type` while avoiding escaping.
 
 `reflect.Type` is defined as `interface`, but in reality `reflect.Type` is implemented only by the structure `rtype` defined in the `reflect` package.
diff --git a/vendor/github.com/goccy/go-json/decode.go b/vendor/github.com/goccy/go-json/decode.go
index 74c6ac3..d99749d 100644
--- a/vendor/github.com/goccy/go-json/decode.go
+++ b/vendor/github.com/goccy/go-json/decode.go
@@ -83,37 +83,6 @@ func unmarshalContext(ctx context.Context, data []byte, v interface{}, optFuncs
 	return validateEndBuf(src, cursor)
 }
 
-var (
-	pathDecoder = decoder.NewPathDecoder()
-)
-
-func extractFromPath(path *Path, data []byte, optFuncs ...DecodeOptionFunc) ([][]byte, error) {
-	if path.path.RootSelectorOnly {
-		return [][]byte{data}, nil
-	}
-	src := make([]byte, len(data)+1) // append nul byte to the end
-	copy(src, data)
-
-	ctx := decoder.TakeRuntimeContext()
-	ctx.Buf = src
-	ctx.Option.Flags = 0
-	ctx.Option.Flags |= decoder.PathOption
-	ctx.Option.Path = path.path
-	for _, optFunc := range optFuncs {
-		optFunc(ctx.Option)
-	}
-	paths, cursor, err := pathDecoder.DecodePath(ctx, 0, 0)
-	if err != nil {
-		decoder.ReleaseRuntimeContext(ctx)
-		return nil, err
-	}
-	decoder.ReleaseRuntimeContext(ctx)
-	if err := validateEndBuf(src, cursor); err != nil {
-		return nil, err
-	}
-	return paths, nil
-}
-
 func unmarshalNoEscape(data []byte, v interface{}, optFuncs ...DecodeOptionFunc) error {
 	src := make([]byte, len(data)+1) // append nul byte to the end
 	copy(src, data)
diff --git a/vendor/github.com/goccy/go-json/docker-compose.yml b/vendor/github.com/goccy/go-json/docker-compose.yml
index db40c79..e510666 100644
--- a/vendor/github.com/goccy/go-json/docker-compose.yml
+++ b/vendor/github.com/goccy/go-json/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   go-json:
-    image: golang:1.18
+    image: golang:1.16
     volumes:
       - '.:/go/src/go-json'
     deploy:
diff --git a/vendor/github.com/goccy/go-json/encode.go b/vendor/github.com/goccy/go-json/encode.go
index c517382..7f198bd 100644
--- a/vendor/github.com/goccy/go-json/encode.go
+++ b/vendor/github.com/goccy/go-json/encode.go
@@ -3,7 +3,6 @@ package json
 import (
 	"context"
 	"io"
-	"os"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/encoder"
@@ -52,7 +51,7 @@ func (e *Encoder) EncodeContext(ctx context.Context, v interface{}, optFuncs ...
 	rctx.Option.Flag |= encoder.ContextOption
 	rctx.Option.Context = ctx
 
-	err := e.encodeWithOption(rctx, v, optFuncs...) //nolint: contextcheck
+	err := e.encodeWithOption(rctx, v, optFuncs...)
 
 	encoder.ReleaseRuntimeContext(rctx)
 	return err
@@ -62,8 +61,6 @@ func (e *Encoder) encodeWithOption(ctx *encoder.RuntimeContext, v interface{}, o
 	if e.enabledHTMLEscape {
 		ctx.Option.Flag |= encoder.HTMLEscapeOption
 	}
-	ctx.Option.Flag |= encoder.NormalizeUTF8Option
-	ctx.Option.DebugOut = os.Stdout
 	for _, optFunc := range optFuncs {
 		optFunc(ctx.Option)
 	}
@@ -114,13 +111,13 @@ func (e *Encoder) SetIndent(prefix, indent string) {
 func marshalContext(ctx context.Context, v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
 	rctx := encoder.TakeRuntimeContext()
 	rctx.Option.Flag = 0
-	rctx.Option.Flag = encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option | encoder.ContextOption
+	rctx.Option.Flag = encoder.HTMLEscapeOption | encoder.ContextOption
 	rctx.Option.Context = ctx
 	for _, optFunc := range optFuncs {
 		optFunc(rctx.Option)
 	}
 
-	buf, err := encode(rctx, v) //nolint: contextcheck
+	buf, err := encode(rctx, v)
 	if err != nil {
 		encoder.ReleaseRuntimeContext(rctx)
 		return nil, err
@@ -142,7 +139,7 @@ func marshal(v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
 	ctx := encoder.TakeRuntimeContext()
 
 	ctx.Option.Flag = 0
-	ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option)
+	ctx.Option.Flag |= encoder.HTMLEscapeOption
 	for _, optFunc := range optFuncs {
 		optFunc(ctx.Option)
 	}
@@ -169,7 +166,7 @@ func marshalNoEscape(v interface{}) ([]byte, error) {
 	ctx := encoder.TakeRuntimeContext()
 
 	ctx.Option.Flag = 0
-	ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option)
+	ctx.Option.Flag |= encoder.HTMLEscapeOption
 
 	buf, err := encodeNoEscape(ctx, v)
 	if err != nil {
@@ -193,7 +190,7 @@ func marshalIndent(v interface{}, prefix, indent string, optFuncs ...EncodeOptio
 	ctx := encoder.TakeRuntimeContext()
 
 	ctx.Option.Flag = 0
-	ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option | encoder.IndentOption)
+	ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.IndentOption)
 	for _, optFunc := range optFuncs {
 		optFunc(ctx.Option)
 	}
@@ -223,7 +220,7 @@ func encode(ctx *encoder.RuntimeContext, v interface{}) ([]byte, error) {
 	typ := header.typ
 
 	typeptr := uintptr(unsafe.Pointer(typ))
-	codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
+	codeSet, err := encoder.CompileToGetCodeSet(typeptr)
 	if err != nil {
 		return nil, err
 	}
@@ -251,7 +248,7 @@ func encodeNoEscape(ctx *encoder.RuntimeContext, v interface{}) ([]byte, error)
 	typ := header.typ
 
 	typeptr := uintptr(unsafe.Pointer(typ))
-	codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
+	codeSet, err := encoder.CompileToGetCodeSet(typeptr)
 	if err != nil {
 		return nil, err
 	}
@@ -278,7 +275,7 @@ func encodeIndent(ctx *encoder.RuntimeContext, v interface{}, prefix, indent str
 	typ := header.typ
 
 	typeptr := uintptr(unsafe.Pointer(typ))
-	codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
+	codeSet, err := encoder.CompileToGetCodeSet(typeptr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/goccy/go-json/error.go b/vendor/github.com/goccy/go-json/error.go
index 5b2dcee..94c1339 100644
--- a/vendor/github.com/goccy/go-json/error.go
+++ b/vendor/github.com/goccy/go-json/error.go
@@ -37,5 +37,3 @@ type UnmarshalTypeError = errors.UnmarshalTypeError
 type UnsupportedTypeError = errors.UnsupportedTypeError
 
 type UnsupportedValueError = errors.UnsupportedValueError
-
-type PathError = errors.PathError
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/anonymous_field.go b/vendor/github.com/goccy/go-json/internal/decoder/anonymous_field.go
index b6876cf..030cb7a 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/anonymous_field.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/anonymous_field.go
@@ -35,7 +35,3 @@ func (d *anonymousFieldDecoder) Decode(ctx *RuntimeContext, cursor, depth int64,
 	p = *(*unsafe.Pointer)(p)
 	return d.dec.Decode(ctx, cursor, depth, unsafe.Pointer(uintptr(p)+d.offset))
 }
-
-func (d *anonymousFieldDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return d.dec.DecodePath(ctx, cursor, depth)
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/array.go b/vendor/github.com/goccy/go-json/internal/decoder/array.go
index 4b23ed4..21f1fd5 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/array.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/array.go
@@ -1,7 +1,6 @@
 package decoder
 
 import (
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/errors"
@@ -19,9 +18,7 @@ type arrayDecoder struct {
 }
 
 func newArrayDecoder(dec Decoder, elemType *runtime.Type, alen int, structName, fieldName string) *arrayDecoder {
-	// workaround to avoid checkptr errors. cannot use `*(*unsafe.Pointer)(unsafe_New(elemType))` directly.
-	zeroValuePtr := unsafe_New(elemType)
-	zeroValue := **(**unsafe.Pointer)(unsafe.Pointer(&zeroValuePtr))
+	zeroValue := *(*unsafe.Pointer)(unsafe_New(elemType))
 	return &arrayDecoder{
 		valueDecoder: dec,
 		elemType:     elemType,
@@ -170,7 +167,3 @@ func (d *arrayDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 		}
 	}
 }
-
-func (d *arrayDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: array decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/assign.go b/vendor/github.com/goccy/go-json/internal/decoder/assign.go
deleted file mode 100644
index c53e6ad..0000000
--- a/vendor/github.com/goccy/go-json/internal/decoder/assign.go
+++ /dev/null
@@ -1,438 +0,0 @@
-package decoder
-
-import (
-	"fmt"
-	"reflect"
-	"strconv"
-)
-
-var (
-	nilValue = reflect.ValueOf(nil)
-)
-
-func AssignValue(src, dst reflect.Value) error {
-	if dst.Type().Kind() != reflect.Ptr {
-		return fmt.Errorf("invalid dst type. required pointer type: %T", dst.Type())
-	}
-	casted, err := castValue(dst.Elem().Type(), src)
-	if err != nil {
-		return err
-	}
-	dst.Elem().Set(casted)
-	return nil
-}
-
-func castValue(t reflect.Type, v reflect.Value) (reflect.Value, error) {
-	switch t.Kind() {
-	case reflect.Int:
-		vv, err := castInt(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(int(vv.Int())), nil
-	case reflect.Int8:
-		vv, err := castInt(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(int8(vv.Int())), nil
-	case reflect.Int16:
-		vv, err := castInt(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(int16(vv.Int())), nil
-	case reflect.Int32:
-		vv, err := castInt(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(int32(vv.Int())), nil
-	case reflect.Int64:
-		return castInt(v)
-	case reflect.Uint:
-		vv, err := castUint(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(uint(vv.Uint())), nil
-	case reflect.Uint8:
-		vv, err := castUint(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(uint8(vv.Uint())), nil
-	case reflect.Uint16:
-		vv, err := castUint(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(uint16(vv.Uint())), nil
-	case reflect.Uint32:
-		vv, err := castUint(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(uint32(vv.Uint())), nil
-	case reflect.Uint64:
-		return castUint(v)
-	case reflect.Uintptr:
-		vv, err := castUint(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(uintptr(vv.Uint())), nil
-	case reflect.String:
-		return castString(v)
-	case reflect.Bool:
-		return castBool(v)
-	case reflect.Float32:
-		vv, err := castFloat(v)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(float32(vv.Float())), nil
-	case reflect.Float64:
-		return castFloat(v)
-	case reflect.Array:
-		return castArray(t, v)
-	case reflect.Slice:
-		return castSlice(t, v)
-	case reflect.Map:
-		return castMap(t, v)
-	case reflect.Struct:
-		return castStruct(t, v)
-	}
-	return v, nil
-}
-
-func castInt(v reflect.Value) (reflect.Value, error) {
-	switch v.Type().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v, nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return reflect.ValueOf(int64(v.Uint())), nil
-	case reflect.String:
-		i64, err := strconv.ParseInt(v.String(), 10, 64)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(i64), nil
-	case reflect.Bool:
-		if v.Bool() {
-			return reflect.ValueOf(int64(1)), nil
-		}
-		return reflect.ValueOf(int64(0)), nil
-	case reflect.Float32, reflect.Float64:
-		return reflect.ValueOf(int64(v.Float())), nil
-	case reflect.Array:
-		if v.Len() > 0 {
-			return castInt(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to int64 from empty array")
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castInt(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to int64 from empty slice")
-	case reflect.Interface:
-		return castInt(reflect.ValueOf(v.Interface()))
-	case reflect.Map:
-		return nilValue, fmt.Errorf("failed to cast to int64 from map")
-	case reflect.Struct:
-		return nilValue, fmt.Errorf("failed to cast to int64 from struct")
-	case reflect.Ptr:
-		return castInt(v.Elem())
-	}
-	return nilValue, fmt.Errorf("failed to cast to int64 from %s", v.Type().Kind())
-}
-
-func castUint(v reflect.Value) (reflect.Value, error) {
-	switch v.Type().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return reflect.ValueOf(uint64(v.Int())), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v, nil
-	case reflect.String:
-		u64, err := strconv.ParseUint(v.String(), 10, 64)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(u64), nil
-	case reflect.Bool:
-		if v.Bool() {
-			return reflect.ValueOf(uint64(1)), nil
-		}
-		return reflect.ValueOf(uint64(0)), nil
-	case reflect.Float32, reflect.Float64:
-		return reflect.ValueOf(uint64(v.Float())), nil
-	case reflect.Array:
-		if v.Len() > 0 {
-			return castUint(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to uint64 from empty array")
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castUint(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to uint64 from empty slice")
-	case reflect.Interface:
-		return castUint(reflect.ValueOf(v.Interface()))
-	case reflect.Map:
-		return nilValue, fmt.Errorf("failed to cast to uint64 from map")
-	case reflect.Struct:
-		return nilValue, fmt.Errorf("failed to cast to uint64 from struct")
-	case reflect.Ptr:
-		return castUint(v.Elem())
-	}
-	return nilValue, fmt.Errorf("failed to cast to uint64 from %s", v.Type().Kind())
-}
-
-func castString(v reflect.Value) (reflect.Value, error) {
-	switch v.Type().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return reflect.ValueOf(fmt.Sprint(v.Int())), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return reflect.ValueOf(fmt.Sprint(v.Uint())), nil
-	case reflect.String:
-		return v, nil
-	case reflect.Bool:
-		if v.Bool() {
-			return reflect.ValueOf("true"), nil
-		}
-		return reflect.ValueOf("false"), nil
-	case reflect.Float32, reflect.Float64:
-		return reflect.ValueOf(fmt.Sprint(v.Float())), nil
-	case reflect.Array:
-		if v.Len() > 0 {
-			return castString(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to string from empty array")
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castString(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to string from empty slice")
-	case reflect.Interface:
-		return castString(reflect.ValueOf(v.Interface()))
-	case reflect.Map:
-		return nilValue, fmt.Errorf("failed to cast to string from map")
-	case reflect.Struct:
-		return nilValue, fmt.Errorf("failed to cast to string from struct")
-	case reflect.Ptr:
-		return castString(v.Elem())
-	}
-	return nilValue, fmt.Errorf("failed to cast to string from %s", v.Type().Kind())
-}
-
-func castBool(v reflect.Value) (reflect.Value, error) {
-	switch v.Type().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch v.Int() {
-		case 0:
-			return reflect.ValueOf(false), nil
-		case 1:
-			return reflect.ValueOf(true), nil
-		}
-		return nilValue, fmt.Errorf("failed to cast to bool from %d", v.Int())
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch v.Uint() {
-		case 0:
-			return reflect.ValueOf(false), nil
-		case 1:
-			return reflect.ValueOf(true), nil
-		}
-		return nilValue, fmt.Errorf("failed to cast to bool from %d", v.Uint())
-	case reflect.String:
-		b, err := strconv.ParseBool(v.String())
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(b), nil
-	case reflect.Bool:
-		return v, nil
-	case reflect.Float32, reflect.Float64:
-		switch v.Float() {
-		case 0:
-			return reflect.ValueOf(false), nil
-		case 1:
-			return reflect.ValueOf(true), nil
-		}
-		return nilValue, fmt.Errorf("failed to cast to bool from %f", v.Float())
-	case reflect.Array:
-		if v.Len() > 0 {
-			return castBool(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to string from empty array")
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castBool(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to string from empty slice")
-	case reflect.Interface:
-		return castBool(reflect.ValueOf(v.Interface()))
-	case reflect.Map:
-		return nilValue, fmt.Errorf("failed to cast to string from map")
-	case reflect.Struct:
-		return nilValue, fmt.Errorf("failed to cast to string from struct")
-	case reflect.Ptr:
-		return castBool(v.Elem())
-	}
-	return nilValue, fmt.Errorf("failed to cast to bool from %s", v.Type().Kind())
-}
-
-func castFloat(v reflect.Value) (reflect.Value, error) {
-	switch v.Type().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return reflect.ValueOf(float64(v.Int())), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return reflect.ValueOf(float64(v.Uint())), nil
-	case reflect.String:
-		f64, err := strconv.ParseFloat(v.String(), 64)
-		if err != nil {
-			return nilValue, err
-		}
-		return reflect.ValueOf(f64), nil
-	case reflect.Bool:
-		if v.Bool() {
-			return reflect.ValueOf(float64(1)), nil
-		}
-		return reflect.ValueOf(float64(0)), nil
-	case reflect.Float32, reflect.Float64:
-		return v, nil
-	case reflect.Array:
-		if v.Len() > 0 {
-			return castFloat(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to float64 from empty array")
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castFloat(v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to float64 from empty slice")
-	case reflect.Interface:
-		return castFloat(reflect.ValueOf(v.Interface()))
-	case reflect.Map:
-		return nilValue, fmt.Errorf("failed to cast to float64 from map")
-	case reflect.Struct:
-		return nilValue, fmt.Errorf("failed to cast to float64 from struct")
-	case reflect.Ptr:
-		return castFloat(v.Elem())
-	}
-	return nilValue, fmt.Errorf("failed to cast to float64 from %s", v.Type().Kind())
-}
-
-func castArray(t reflect.Type, v reflect.Value) (reflect.Value, error) {
-	kind := v.Type().Kind()
-	if kind == reflect.Interface {
-		return castArray(t, reflect.ValueOf(v.Interface()))
-	}
-	if kind != reflect.Slice && kind != reflect.Array {
-		return nilValue, fmt.Errorf("failed to cast to array from %s", kind)
-	}
-	if t.Elem() == v.Type().Elem() {
-		return v, nil
-	}
-	if t.Len() != v.Len() {
-		return nilValue, fmt.Errorf("failed to cast [%d]array from slice of %d length", t.Len(), v.Len())
-	}
-	ret := reflect.New(t).Elem()
-	for i := 0; i < v.Len(); i++ {
-		vv, err := castValue(t.Elem(), v.Index(i))
-		if err != nil {
-			return nilValue, err
-		}
-		ret.Index(i).Set(vv)
-	}
-	return ret, nil
-}
-
-func castSlice(t reflect.Type, v reflect.Value) (reflect.Value, error) {
-	kind := v.Type().Kind()
-	if kind == reflect.Interface {
-		return castSlice(t, reflect.ValueOf(v.Interface()))
-	}
-	if kind != reflect.Slice && kind != reflect.Array {
-		return nilValue, fmt.Errorf("failed to cast to slice from %s", kind)
-	}
-	if t.Elem() == v.Type().Elem() {
-		return v, nil
-	}
-	ret := reflect.MakeSlice(t, v.Len(), v.Len())
-	for i := 0; i < v.Len(); i++ {
-		vv, err := castValue(t.Elem(), v.Index(i))
-		if err != nil {
-			return nilValue, err
-		}
-		ret.Index(i).Set(vv)
-	}
-	return ret, nil
-}
-
-func castMap(t reflect.Type, v reflect.Value) (reflect.Value, error) {
-	ret := reflect.MakeMap(t)
-	switch v.Type().Kind() {
-	case reflect.Map:
-		iter := v.MapRange()
-		for iter.Next() {
-			key, err := castValue(t.Key(), iter.Key())
-			if err != nil {
-				return nilValue, err
-			}
-			value, err := castValue(t.Elem(), iter.Value())
-			if err != nil {
-				return nilValue, err
-			}
-			ret.SetMapIndex(key, value)
-		}
-		return ret, nil
-	case reflect.Interface:
-		return castMap(t, reflect.ValueOf(v.Interface()))
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castMap(t, v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to map from empty slice")
-	}
-	return nilValue, fmt.Errorf("failed to cast to map from %s", v.Type().Kind())
-}
-
-func castStruct(t reflect.Type, v reflect.Value) (reflect.Value, error) {
-	ret := reflect.New(t).Elem()
-	switch v.Type().Kind() {
-	case reflect.Map:
-		iter := v.MapRange()
-		for iter.Next() {
-			key := iter.Key()
-			k, err := castString(key)
-			if err != nil {
-				return nilValue, err
-			}
-			fieldName := k.String()
-			field, ok := t.FieldByName(fieldName)
-			if ok {
-				value, err := castValue(field.Type, iter.Value())
-				if err != nil {
-					return nilValue, err
-				}
-				ret.FieldByName(fieldName).Set(value)
-			}
-		}
-		return ret, nil
-	case reflect.Struct:
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			ret.FieldByName(name).Set(v.FieldByName(name))
-		}
-		return ret, nil
-	case reflect.Interface:
-		return castStruct(t, reflect.ValueOf(v.Interface()))
-	case reflect.Slice:
-		if v.Len() > 0 {
-			return castStruct(t, v.Index(0))
-		}
-		return nilValue, fmt.Errorf("failed to cast to struct from empty slice")
-	default:
-		return nilValue, fmt.Errorf("failed to cast to struct from %s", v.Type().Kind())
-	}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/bool.go b/vendor/github.com/goccy/go-json/internal/decoder/bool.go
index ba6cf5b..455042a 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/bool.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/bool.go
@@ -1,7 +1,6 @@
 package decoder
 
 import (
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/errors"
@@ -77,7 +76,3 @@ func (d *boolDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.
 	}
 	return 0, errors.ErrUnexpectedEndOfJSON("bool", cursor)
 }
-
-func (d *boolDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: bool decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/bytes.go b/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
index 939bf43..01a37fe 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
@@ -2,7 +2,6 @@ package decoder
 
 import (
 	"encoding/base64"
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/errors"
@@ -24,8 +23,9 @@ func byteUnmarshalerSliceDecoder(typ *runtime.Type, structName string, fieldName
 		unmarshalDecoder = newUnmarshalJSONDecoder(runtime.PtrTo(typ), structName, fieldName)
 	case runtime.PtrTo(typ).Implements(unmarshalTextType):
 		unmarshalDecoder = newUnmarshalTextDecoder(runtime.PtrTo(typ), structName, fieldName)
-	default:
-		unmarshalDecoder, _ = compileUint8(typ, structName, fieldName)
+	}
+	if unmarshalDecoder == nil {
+		return nil
 	}
 	return newSliceDecoder(unmarshalDecoder, typ, 1, structName, fieldName)
 }
@@ -79,10 +79,6 @@ func (d *bytesDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 	return cursor, nil
 }
 
-func (d *bytesDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: []byte decoder does not support decode path")
-}
-
 func (d *bytesDecoder) decodeStreamBinary(s *Stream, depth int64, p unsafe.Pointer) ([]byte, error) {
 	c := s.skipWhiteSpace()
 	if c == '[' {
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile.go b/vendor/github.com/goccy/go-json/internal/decoder/compile.go
index 8ad5093..08dd044 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
-	"sync"
 	"sync/atomic"
 	"unicode"
 	"unsafe"
 
+	"github.com/goccy/go-json/internal/errors"
 	"github.com/goccy/go-json/internal/runtime"
 )
 
@@ -18,27 +18,22 @@ var (
 	typeAddr         *runtime.TypeAddr
 	cachedDecoderMap unsafe.Pointer // map[uintptr]decoder
 	cachedDecoder    []Decoder
-	initOnce         sync.Once
 )
 
-func initDecoder() {
-	initOnce.Do(func() {
-		typeAddr = runtime.AnalyzeTypeAddr()
-		if typeAddr == nil {
-			typeAddr = &runtime.TypeAddr{}
-		}
-		cachedDecoder = make([]Decoder, typeAddr.AddrRange>>typeAddr.AddrShift+1)
-	})
+func init() {
+	typeAddr = runtime.AnalyzeTypeAddr()
+	if typeAddr == nil {
+		typeAddr = &runtime.TypeAddr{}
+	}
+	cachedDecoder = make([]Decoder, typeAddr.AddrRange>>typeAddr.AddrShift)
 }
 
 func loadDecoderMap() map[uintptr]Decoder {
-	initDecoder()
 	p := atomic.LoadPointer(&cachedDecoderMap)
 	return *(*map[uintptr]Decoder)(unsafe.Pointer(&p))
 }
 
 func storeDecoder(typ uintptr, dec Decoder, m map[uintptr]Decoder) {
-	initDecoder()
 	newDecoderMap := make(map[uintptr]Decoder, len(m)+1)
 	newDecoderMap[typ] = dec
 
@@ -131,7 +126,13 @@ func compile(typ *runtime.Type, structName, fieldName string, structTypeToDecode
 	case reflect.Func:
 		return compileFunc(typ, structName, fieldName)
 	}
-	return newInvalidDecoder(typ, structName, fieldName), nil
+	return nil, &errors.UnmarshalTypeError{
+		Value:  "object",
+		Type:   runtime.RType2Type(typ),
+		Offset: 0,
+		Struct: structName,
+		Field:  fieldName,
+	}
 }
 
 func isStringTagSupportedType(typ *runtime.Type) bool {
@@ -160,9 +161,6 @@ func compileMapKey(typ *runtime.Type, structName, fieldName string, structTypeTo
 	if runtime.PtrTo(typ).Implements(unmarshalTextType) {
 		return newUnmarshalTextDecoder(runtime.PtrTo(typ), structName, fieldName), nil
 	}
-	if typ.Kind() == reflect.String {
-		return newStringDecoder(structName, fieldName), nil
-	}
 	dec, err := compile(typ, structName, fieldName, structTypeToDecoder)
 	if err != nil {
 		return nil, err
@@ -176,9 +174,17 @@ func compileMapKey(typ *runtime.Type, structName, fieldName string, structTypeTo
 		case *ptrDecoder:
 			dec = t.dec
 		default:
-			return newInvalidDecoder(typ, structName, fieldName), nil
+			goto ERROR
 		}
 	}
+ERROR:
+	return nil, &errors.UnmarshalTypeError{
+		Value:  "object",
+		Type:   runtime.RType2Type(typ),
+		Offset: 0,
+		Struct: structName,
+		Field:  fieldName,
+	}
 }
 
 func compilePtr(typ *runtime.Type, structName, fieldName string, structTypeToDecoder map[uintptr]Decoder) (Decoder, error) {
@@ -316,21 +322,64 @@ func compileFunc(typ *runtime.Type, strutName, fieldName string) (Decoder, error
 	return newFuncDecoder(typ, strutName, fieldName), nil
 }
 
-func typeToStructTags(typ *runtime.Type) runtime.StructTags {
-	tags := runtime.StructTags{}
-	fieldNum := typ.NumField()
-	for i := 0; i < fieldNum; i++ {
-		field := typ.Field(i)
-		if runtime.IsIgnoredStructField(field) {
+func removeConflictFields(fieldMap map[string]*structFieldSet, conflictedMap map[string]struct{}, dec *structDecoder, field reflect.StructField) {
+	for k, v := range dec.fieldMap {
+		if _, exists := conflictedMap[k]; exists {
+			// already conflicted key
 			continue
 		}
-		tags = append(tags, runtime.StructTagFromField(field))
+		set, exists := fieldMap[k]
+		if !exists {
+			fieldSet := &structFieldSet{
+				dec:         v.dec,
+				offset:      field.Offset + v.offset,
+				isTaggedKey: v.isTaggedKey,
+				key:         k,
+				keyLen:      int64(len(k)),
+			}
+			fieldMap[k] = fieldSet
+			lower := strings.ToLower(k)
+			if _, exists := fieldMap[lower]; !exists {
+				fieldMap[lower] = fieldSet
+			}
+			continue
+		}
+		if set.isTaggedKey {
+			if v.isTaggedKey {
+				// conflict tag key
+				delete(fieldMap, k)
+				delete(fieldMap, strings.ToLower(k))
+				conflictedMap[k] = struct{}{}
+				conflictedMap[strings.ToLower(k)] = struct{}{}
+			}
+		} else {
+			if v.isTaggedKey {
+				fieldSet := &structFieldSet{
+					dec:         v.dec,
+					offset:      field.Offset + v.offset,
+					isTaggedKey: v.isTaggedKey,
+					key:         k,
+					keyLen:      int64(len(k)),
+				}
+				fieldMap[k] = fieldSet
+				lower := strings.ToLower(k)
+				if _, exists := fieldMap[lower]; !exists {
+					fieldMap[lower] = fieldSet
+				}
+			} else {
+				// conflict tag key
+				delete(fieldMap, k)
+				delete(fieldMap, strings.ToLower(k))
+				conflictedMap[k] = struct{}{}
+				conflictedMap[strings.ToLower(k)] = struct{}{}
+			}
+		}
 	}
-	return tags
 }
 
 func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeToDecoder map[uintptr]Decoder) (Decoder, error) {
 	fieldNum := typ.NumField()
+	conflictedMap := map[string]struct{}{}
 	fieldMap := map[string]*structFieldSet{}
 	typeptr := uintptr(unsafe.Pointer(typ))
 	if dec, exists := structTypeToDecoder[typeptr]; exists {
@@ -339,8 +388,6 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
 	structDec := newStructDecoder(structName, fieldName, fieldMap)
 	structTypeToDecoder[typeptr] = structDec
 	structName = typ.Name()
-	tags := typeToStructTags(typ)
-	allFields := []*structFieldSet{}
 	for i := 0; i < fieldNum; i++ {
 		field := typ.Field(i)
 		if runtime.IsIgnoredStructField(field) {
@@ -358,19 +405,7 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
 					// recursive definition
 					continue
 				}
-				for k, v := range stDec.fieldMap {
-					if tags.ExistsKey(k) {
-						continue
-					}
-					fieldSet := &structFieldSet{
-						dec:         v.dec,
-						offset:      field.Offset + v.offset,
-						isTaggedKey: v.isTaggedKey,
-						key:         k,
-						keyLen:      int64(len(k)),
-					}
-					allFields = append(allFields, fieldSet)
-				}
+				removeConflictFields(fieldMap, conflictedMap, stDec, field)
 			} else if pdec, ok := dec.(*ptrDecoder); ok {
 				contentDec := pdec.contentDecoder()
 				if pdec.typ == typ {
@@ -386,38 +421,60 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
 				}
 				if dec, ok := contentDec.(*structDecoder); ok {
 					for k, v := range dec.fieldMap {
-						if tags.ExistsKey(k) {
+						if _, exists := conflictedMap[k]; exists {
+							// already conflicted key
 							continue
 						}
-						fieldSet := &structFieldSet{
-							dec:         newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
-							offset:      field.Offset,
-							isTaggedKey: v.isTaggedKey,
-							key:         k,
-							keyLen:      int64(len(k)),
-							err:         fieldSetErr,
+						set, exists := fieldMap[k]
+						if !exists {
+							fieldSet := &structFieldSet{
+								dec:         newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
+								offset:      field.Offset,
+								isTaggedKey: v.isTaggedKey,
+								key:         k,
+								keyLen:      int64(len(k)),
+								err:         fieldSetErr,
+							}
+							fieldMap[k] = fieldSet
+							lower := strings.ToLower(k)
+							if _, exists := fieldMap[lower]; !exists {
+								fieldMap[lower] = fieldSet
+							}
+							continue
+						}
+						if set.isTaggedKey {
+							if v.isTaggedKey {
+								// conflict tag key
+								delete(fieldMap, k)
+								delete(fieldMap, strings.ToLower(k))
+								conflictedMap[k] = struct{}{}
+								conflictedMap[strings.ToLower(k)] = struct{}{}
+							}
+						} else {
+							if v.isTaggedKey {
+								fieldSet := &structFieldSet{
+									dec:         newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
+									offset:      field.Offset,
+									isTaggedKey: v.isTaggedKey,
+									key:         k,
+									keyLen:      int64(len(k)),
+									err:         fieldSetErr,
+								}
+								fieldMap[k] = fieldSet
+								lower := strings.ToLower(k)
+								if _, exists := fieldMap[lower]; !exists {
+									fieldMap[lower] = fieldSet
+								}
+							} else {
+								// conflict tag key
+								delete(fieldMap, k)
+								delete(fieldMap, strings.ToLower(k))
+								conflictedMap[k] = struct{}{}
+								conflictedMap[strings.ToLower(k)] = struct{}{}
+							}
 						}
-						allFields = append(allFields, fieldSet)
 					}
-				} else {
-					fieldSet := &structFieldSet{
-						dec:         pdec,
-						offset:      field.Offset,
-						isTaggedKey: tag.IsTaggedKey,
-						key:         field.Name,
-						keyLen:      int64(len(field.Name)),
-					}
-					allFields = append(allFields, fieldSet)
 				}
-			} else {
-				fieldSet := &structFieldSet{
-					dec:         dec,
-					offset:      field.Offset,
-					isTaggedKey: tag.IsTaggedKey,
-					key:         field.Name,
-					keyLen:      int64(len(field.Name)),
-				}
-				allFields = append(allFields, fieldSet)
 			}
 		} else {
 			if tag.IsString && isStringTagSupportedType(runtime.Type2RType(field.Type)) {
@@ -436,15 +493,11 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
 				key:         key,
 				keyLen:      int64(len(key)),
 			}
-			allFields = append(allFields, fieldSet)
-		}
-	}
-	for _, set := range filterDuplicatedFields(allFields) {
-		fieldMap[set.key] = set
-		lower := strings.ToLower(set.key)
-		if _, exists := fieldMap[lower]; !exists {
-			// first win
-			fieldMap[lower] = set
+			fieldMap[key] = fieldSet
+			lower := strings.ToLower(key)
+			if _, exists := fieldMap[lower]; !exists {
+				fieldMap[lower] = fieldSet
+			}
 		}
 	}
 	delete(structTypeToDecoder, typeptr)
@@ -452,42 +505,6 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
 	return structDec, nil
 }
 
-func filterDuplicatedFields(allFields []*structFieldSet) []*structFieldSet {
-	fieldMap := map[string][]*structFieldSet{}
-	for _, field := range allFields {
-		fieldMap[field.key] = append(fieldMap[field.key], field)
-	}
-	duplicatedFieldMap := map[string]struct{}{}
-	for k, sets := range fieldMap {
-		sets = filterFieldSets(sets)
-		if len(sets) != 1 {
-			duplicatedFieldMap[k] = struct{}{}
-		}
-	}
-
-	filtered := make([]*structFieldSet, 0, len(allFields))
-	for _, field := range allFields {
-		if _, exists := duplicatedFieldMap[field.key]; exists {
-			continue
-		}
-		filtered = append(filtered, field)
-	}
-	return filtered
-}
-
-func filterFieldSets(sets []*structFieldSet) []*structFieldSet {
-	if len(sets) == 1 {
-		return sets
-	}
-	filtered := make([]*structFieldSet, 0, len(sets))
-	for _, set := range sets {
-		if set.isTaggedKey {
-			filtered = append(filtered, set)
-		}
-	}
-	return filtered
-}
-
 func implementsUnmarshalJSONType(typ *runtime.Type) bool {
 	return typ.Implements(unmarshalJSONType) || typ.Implements(unmarshalJSONContextType)
 }
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go b/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
index 025ca85..592f637 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
@@ -1,4 +1,3 @@
-//go:build !race
 // +build !race
 
 package decoder
@@ -10,7 +9,6 @@ import (
 )
 
 func CompileToGetDecoder(typ *runtime.Type) (Decoder, error) {
-	initDecoder()
 	typeptr := uintptr(unsafe.Pointer(typ))
 	if typeptr > typeAddr.MaxTypeAddr {
 		return compileToGetDecoderSlowPath(typeptr, typ)
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go b/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
index 023b817..b691bc9 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
@@ -1,4 +1,3 @@
-//go:build race
 // +build race
 
 package decoder
@@ -13,7 +12,6 @@ import (
 var decMu sync.RWMutex
 
 func CompileToGetDecoder(typ *runtime.Type) (Decoder, error) {
-	initDecoder()
 	typeptr := uintptr(unsafe.Pointer(typ))
 	if typeptr > typeAddr.MaxTypeAddr {
 		return compileToGetDecoderSlowPath(typeptr, typ)
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/float.go b/vendor/github.com/goccy/go-json/internal/decoder/float.go
index 9b2eb8b..dfb7168 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/float.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/float.go
@@ -156,15 +156,3 @@ func (d *floatDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 	d.op(p, f64)
 	return cursor, nil
 }
-
-func (d *floatDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	buf := ctx.Buf
-	bytes, c, err := d.decodeByte(buf, cursor)
-	if err != nil {
-		return nil, 0, err
-	}
-	if bytes == nil {
-		return [][]byte{nullbytes}, c, nil
-	}
-	return [][]byte{bytes}, c, nil
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/func.go b/vendor/github.com/goccy/go-json/internal/decoder/func.go
index 4cc12ca..ee35637 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/func.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/func.go
@@ -2,7 +2,6 @@ package decoder
 
 import (
 	"bytes"
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/errors"
@@ -140,7 +139,3 @@ func (d *funcDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.
 	}
 	return cursor, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
 }
-
-func (d *funcDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: func decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/int.go b/vendor/github.com/goccy/go-json/internal/decoder/int.go
index 1a7f081..7edfb04 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/int.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/int.go
@@ -192,15 +192,15 @@ func (d *intDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
 	}
 	switch d.kind {
 	case reflect.Int8:
-		if i64 < -1*(1<<7) || (1<<7) <= i64 {
+		if i64 <= -1*(1<<7) || (1<<7) <= i64 {
 			return d.typeError(bytes, s.totalOffset())
 		}
 	case reflect.Int16:
-		if i64 < -1*(1<<15) || (1<<15) <= i64 {
+		if i64 <= -1*(1<<15) || (1<<15) <= i64 {
 			return d.typeError(bytes, s.totalOffset())
 		}
 	case reflect.Int32:
-		if i64 < -1*(1<<31) || (1<<31) <= i64 {
+		if i64 <= -1*(1<<31) || (1<<31) <= i64 {
 			return d.typeError(bytes, s.totalOffset())
 		}
 	}
@@ -225,22 +225,18 @@ func (d *intDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.P
 	}
 	switch d.kind {
 	case reflect.Int8:
-		if i64 < -1*(1<<7) || (1<<7) <= i64 {
+		if i64 <= -1*(1<<7) || (1<<7) <= i64 {
 			return 0, d.typeError(bytes, cursor)
 		}
 	case reflect.Int16:
-		if i64 < -1*(1<<15) || (1<<15) <= i64 {
+		if i64 <= -1*(1<<15) || (1<<15) <= i64 {
 			return 0, d.typeError(bytes, cursor)
 		}
 	case reflect.Int32:
-		if i64 < -1*(1<<31) || (1<<31) <= i64 {
+		if i64 <= -1*(1<<31) || (1<<31) <= i64 {
 			return 0, d.typeError(bytes, cursor)
 		}
 	}
 	d.op(p, i64)
 	return cursor, nil
 }
-
-func (d *intDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: int decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/interface.go b/vendor/github.com/goccy/go-json/internal/decoder/interface.go
index 45c69ab..4dbb4be 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/interface.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/interface.go
@@ -94,7 +94,6 @@ func (d *interfaceDecoder) numDecoder(s *Stream) Decoder {
 
 var (
 	emptyInterfaceType = runtime.Type2RType(reflect.TypeOf((*interface{})(nil)).Elem())
-	EmptyInterfaceType = emptyInterfaceType
 	interfaceMapType   = runtime.Type2RType(
 		reflect.TypeOf((*map[string]interface{})(nil)).Elem(),
 	)
@@ -457,72 +456,3 @@ func (d *interfaceDecoder) decodeEmptyInterface(ctx *RuntimeContext, cursor, dep
 	}
 	return cursor, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
 }
-
-func NewPathDecoder() Decoder {
-	ifaceDecoder := &interfaceDecoder{
-		typ:        emptyInterfaceType,
-		structName: "",
-		fieldName:  "",
-		floatDecoder: newFloatDecoder("", "", func(p unsafe.Pointer, v float64) {
-			*(*interface{})(p) = v
-		}),
-		numberDecoder: newNumberDecoder("", "", func(p unsafe.Pointer, v json.Number) {
-			*(*interface{})(p) = v
-		}),
-		stringDecoder: newStringDecoder("", ""),
-	}
-	ifaceDecoder.sliceDecoder = newSliceDecoder(
-		ifaceDecoder,
-		emptyInterfaceType,
-		emptyInterfaceType.Size(),
-		"", "",
-	)
-	ifaceDecoder.mapDecoder = newMapDecoder(
-		interfaceMapType,
-		stringType,
-		ifaceDecoder.stringDecoder,
-		interfaceMapType.Elem(),
-		ifaceDecoder,
-		"", "",
-	)
-	return ifaceDecoder
-}
-
-var (
-	truebytes  = []byte("true")
-	falsebytes = []byte("false")
-)
-
-func (d *interfaceDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	buf := ctx.Buf
-	cursor = skipWhiteSpace(buf, cursor)
-	switch buf[cursor] {
-	case '{':
-		return d.mapDecoder.DecodePath(ctx, cursor, depth)
-	case '[':
-		return d.sliceDecoder.DecodePath(ctx, cursor, depth)
-	case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-		return d.floatDecoder.DecodePath(ctx, cursor, depth)
-	case '"':
-		return d.stringDecoder.DecodePath(ctx, cursor, depth)
-	case 't':
-		if err := validateTrue(buf, cursor); err != nil {
-			return nil, 0, err
-		}
-		cursor += 4
-		return [][]byte{truebytes}, cursor, nil
-	case 'f':
-		if err := validateFalse(buf, cursor); err != nil {
-			return nil, 0, err
-		}
-		cursor += 5
-		return [][]byte{falsebytes}, cursor, nil
-	case 'n':
-		if err := validateNull(buf, cursor); err != nil {
-			return nil, 0, err
-		}
-		cursor += 4
-		return [][]byte{nullbytes}, cursor, nil
-	}
-	return nil, cursor, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/invalid.go b/vendor/github.com/goccy/go-json/internal/decoder/invalid.go
deleted file mode 100644
index 4c9721b..0000000
--- a/vendor/github.com/goccy/go-json/internal/decoder/invalid.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package decoder
-
-import (
-	"reflect"
-	"unsafe"
-
-	"github.com/goccy/go-json/internal/errors"
-	"github.com/goccy/go-json/internal/runtime"
-)
-
-type invalidDecoder struct {
-	typ        *runtime.Type
-	kind       reflect.Kind
-	structName string
-	fieldName  string
-}
-
-func newInvalidDecoder(typ *runtime.Type, structName, fieldName string) *invalidDecoder {
-	return &invalidDecoder{
-		typ:        typ,
-		kind:       typ.Kind(),
-		structName: structName,
-		fieldName:  fieldName,
-	}
-}
-
-func (d *invalidDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) error {
-	return &errors.UnmarshalTypeError{
-		Value:  "object",
-		Type:   runtime.RType2Type(d.typ),
-		Offset: s.totalOffset(),
-		Struct: d.structName,
-		Field:  d.fieldName,
-	}
-}
-
-func (d *invalidDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) (int64, error) {
-	return 0, &errors.UnmarshalTypeError{
-		Value:  "object",
-		Type:   runtime.RType2Type(d.typ),
-		Offset: cursor,
-		Struct: d.structName,
-		Field:  d.fieldName,
-	}
-}
-
-func (d *invalidDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, &errors.UnmarshalTypeError{
-		Value:  "object",
-		Type:   runtime.RType2Type(d.typ),
-		Offset: cursor,
-		Struct: d.structName,
-		Field:  d.fieldName,
-	}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/map.go b/vendor/github.com/goccy/go-json/internal/decoder/map.go
index 07a9cae..bb18ef9 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/map.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/map.go
@@ -87,13 +87,13 @@ func (d *mapDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
 	if mapValue == nil {
 		mapValue = makemap(d.mapType, 0)
 	}
-	s.cursor++
-	if s.skipWhiteSpace() == '}' {
+	if s.buf[s.cursor+1] == '}' {
 		*(*unsafe.Pointer)(p) = mapValue
-		s.cursor++
+		s.cursor += 2
 		return nil
 	}
 	for {
+		s.cursor++
 		k := unsafe_New(d.keyType)
 		if err := d.keyDecoder.DecodeStream(s, depth, k); err != nil {
 			return err
@@ -117,7 +117,6 @@ func (d *mapDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
 		if !s.equalChar(',') {
 			return errors.ErrExpected("comma after object value", s.totalOffset())
 		}
-		s.cursor++
 	}
 }
 
@@ -185,96 +184,3 @@ func (d *mapDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.P
 		cursor++
 	}
 }
-
-func (d *mapDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	buf := ctx.Buf
-	depth++
-	if depth > maxDecodeNestingDepth {
-		return nil, 0, errors.ErrExceededMaxDepth(buf[cursor], cursor)
-	}
-
-	cursor = skipWhiteSpace(buf, cursor)
-	buflen := int64(len(buf))
-	if buflen < 2 {
-		return nil, 0, errors.ErrExpected("{} for map", cursor)
-	}
-	switch buf[cursor] {
-	case 'n':
-		if err := validateNull(buf, cursor); err != nil {
-			return nil, 0, err
-		}
-		cursor += 4
-		return [][]byte{nullbytes}, cursor, nil
-	case '{':
-	default:
-		return nil, 0, errors.ErrExpected("{ character for map value", cursor)
-	}
-	cursor++
-	cursor = skipWhiteSpace(buf, cursor)
-	if buf[cursor] == '}' {
-		cursor++
-		return nil, cursor, nil
-	}
-	keyDecoder, ok := d.keyDecoder.(*stringDecoder)
-	if !ok {
-		return nil, 0, &errors.UnmarshalTypeError{
-			Value:  "string",
-			Type:   reflect.TypeOf(""),
-			Offset: cursor,
-			Struct: d.structName,
-			Field:  d.fieldName,
-		}
-	}
-	ret := [][]byte{}
-	for {
-		key, keyCursor, err := keyDecoder.decodeByte(buf, cursor)
-		if err != nil {
-			return nil, 0, err
-		}
-		cursor = skipWhiteSpace(buf, keyCursor)
-		if buf[cursor] != ':' {
-			return nil, 0, errors.ErrExpected("colon after object key", cursor)
-		}
-		cursor++
-		child, found, err := ctx.Option.Path.Field(string(key))
-		if err != nil {
-			return nil, 0, err
-		}
-		if found {
-			if child != nil {
-				oldPath := ctx.Option.Path.node
-				ctx.Option.Path.node = child
-				paths, c, err := d.valueDecoder.DecodePath(ctx, cursor, depth)
-				if err != nil {
-					return nil, 0, err
-				}
-				ctx.Option.Path.node = oldPath
-				ret = append(ret, paths...)
-				cursor = c
-			} else {
-				start := cursor
-				end, err := skipValue(buf, cursor, depth)
-				if err != nil {
-					return nil, 0, err
-				}
-				ret = append(ret, buf[start:end])
-				cursor = end
-			}
-		} else {
-			c, err := skipValue(buf, cursor, depth)
-			if err != nil {
-				return nil, 0, err
-			}
-			cursor = c
-		}
-		cursor = skipWhiteSpace(buf, cursor)
-		if buf[cursor] == '}' {
-			cursor++
-			return ret, cursor, nil
-		}
-		if buf[cursor] != ',' {
-			return nil, 0, errors.ErrExpected("comma after object value", cursor)
-		}
-		cursor++
-	}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/number.go b/vendor/github.com/goccy/go-json/internal/decoder/number.go
index 10e5435..bf63773 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/number.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/number.go
@@ -51,17 +51,6 @@ func (d *numberDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsaf
 	return cursor, nil
 }
 
-func (d *numberDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	bytes, c, err := d.decodeByte(ctx.Buf, cursor)
-	if err != nil {
-		return nil, 0, err
-	}
-	if bytes == nil {
-		return [][]byte{nullbytes}, c, nil
-	}
-	return [][]byte{bytes}, c, nil
-}
-
 func (d *numberDecoder) decodeStreamByte(s *Stream) ([]byte, error) {
 	start := s.cursor
 	for {
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/option.go b/vendor/github.com/goccy/go-json/internal/decoder/option.go
index 502f772..e41f876 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/option.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/option.go
@@ -7,11 +7,9 @@ type OptionFlags uint8
 const (
 	FirstWinOption OptionFlags = 1 << iota
 	ContextOption
-	PathOption
 )
 
 type Option struct {
 	Flags   OptionFlags
 	Context context.Context
-	Path    *Path
 }
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/path.go b/vendor/github.com/goccy/go-json/internal/decoder/path.go
deleted file mode 100644
index a15ff69..0000000
--- a/vendor/github.com/goccy/go-json/internal/decoder/path.go
+++ /dev/null
@@ -1,670 +0,0 @@
-package decoder
-
-import (
-	"fmt"
-	"reflect"
-	"strconv"
-
-	"github.com/goccy/go-json/internal/errors"
-	"github.com/goccy/go-json/internal/runtime"
-)
-
-type PathString string
-
-func (s PathString) Build() (*Path, error) {
-	builder := new(PathBuilder)
-	return builder.Build([]rune(s))
-}
-
-type PathBuilder struct {
-	root                    PathNode
-	node                    PathNode
-	singleQuotePathSelector bool
-	doubleQuotePathSelector bool
-}
-
-func (b *PathBuilder) Build(buf []rune) (*Path, error) {
-	node, err := b.build(buf)
-	if err != nil {
-		return nil, err
-	}
-	return &Path{
-		node:                    node,
-		RootSelectorOnly:        node == nil,
-		SingleQuotePathSelector: b.singleQuotePathSelector,
-		DoubleQuotePathSelector: b.doubleQuotePathSelector,
-	}, nil
-}
-
-func (b *PathBuilder) build(buf []rune) (PathNode, error) {
-	if len(buf) == 0 {
-		return nil, errors.ErrEmptyPath()
-	}
-	if buf[0] != '$' {
-		return nil, errors.ErrInvalidPath("JSON Path must start with a $ character")
-	}
-	if len(buf) == 1 {
-		return nil, nil
-	}
-	buf = buf[1:]
-	offset, err := b.buildNext(buf)
-	if err != nil {
-		return nil, err
-	}
-	if len(buf) > offset {
-		return nil, errors.ErrInvalidPath("remain invalid path %q", buf[offset:])
-	}
-	return b.root, nil
-}
-
-func (b *PathBuilder) buildNextCharIfExists(buf []rune, cursor int) (int, error) {
-	if len(buf) > cursor {
-		offset, err := b.buildNext(buf[cursor:])
-		if err != nil {
-			return 0, err
-		}
-		return cursor + 1 + offset, nil
-	}
-	return cursor, nil
-}
-
-func (b *PathBuilder) buildNext(buf []rune) (int, error) {
-	switch buf[0] {
-	case '.':
-		if len(buf) == 1 {
-			return 0, errors.ErrInvalidPath("JSON Path ends with dot character")
-		}
-		offset, err := b.buildSelector(buf[1:])
-		if err != nil {
-			return 0, err
-		}
-		return offset + 1, nil
-	case '[':
-		if len(buf) == 1 {
-			return 0, errors.ErrInvalidPath("JSON Path ends with left bracket character")
-		}
-		offset, err := b.buildIndex(buf[1:])
-		if err != nil {
-			return 0, err
-		}
-		return offset + 1, nil
-	default:
-		return 0, errors.ErrInvalidPath("expect dot or left bracket character. but found %c character", buf[0])
-	}
-}
-
-func (b *PathBuilder) buildSelector(buf []rune) (int, error) {
-	switch buf[0] {
-	case '.':
-		if len(buf) == 1 {
-			return 0, errors.ErrInvalidPath("JSON Path ends with double dot character")
-		}
-		offset, err := b.buildPathRecursive(buf[1:])
-		if err != nil {
-			return 0, err
-		}
-		return 1 + offset, nil
-	case '[', ']', '$', '*':
-		return 0, errors.ErrInvalidPath("found invalid path character %c after dot", buf[0])
-	}
-	for cursor := 0; cursor < len(buf); cursor++ {
-		switch buf[cursor] {
-		case '$', '*', ']':
-			return 0, errors.ErrInvalidPath("found %c character in field selector context", buf[cursor])
-		case '.':
-			if cursor+1 >= len(buf) {
-				return 0, errors.ErrInvalidPath("JSON Path ends with dot character")
-			}
-			selector := buf[:cursor]
-			b.addSelectorNode(string(selector))
-			offset, err := b.buildSelector(buf[cursor+1:])
-			if err != nil {
-				return 0, err
-			}
-			return cursor + 1 + offset, nil
-		case '[':
-			if cursor+1 >= len(buf) {
-				return 0, errors.ErrInvalidPath("JSON Path ends with left bracket character")
-			}
-			selector := buf[:cursor]
-			b.addSelectorNode(string(selector))
-			offset, err := b.buildIndex(buf[cursor+1:])
-			if err != nil {
-				return 0, err
-			}
-			return cursor + 1 + offset, nil
-		case '"':
-			if cursor+1 >= len(buf) {
-				return 0, errors.ErrInvalidPath("JSON Path ends with double quote character")
-			}
-			offset, err := b.buildQuoteSelector(buf[cursor+1:], DoubleQuotePathSelector)
-			if err != nil {
-				return 0, err
-			}
-			return cursor + 1 + offset, nil
-		}
-	}
-	b.addSelectorNode(string(buf))
-	return len(buf), nil
-}
-
-func (b *PathBuilder) buildQuoteSelector(buf []rune, sel QuotePathSelector) (int, error) {
-	switch buf[0] {
-	case '[', ']', '$', '.', '*', '\'', '"':
-		return 0, errors.ErrInvalidPath("found invalid path character %c after quote", buf[0])
-	}
-	for cursor := 0; cursor < len(buf); cursor++ {
-		switch buf[cursor] {
-		case '\'':
-			if sel != SingleQuotePathSelector {
-				return 0, errors.ErrInvalidPath("found double quote character in field selector with single quote context")
-			}
-			if len(buf) <= cursor+1 {
-				return 0, errors.ErrInvalidPath("JSON Path ends with single quote character in field selector context")
-			}
-			if buf[cursor+1] != ']' {
-				return 0, errors.ErrInvalidPath("expect right bracket for field selector with single quote but found %c", buf[cursor+1])
-			}
-			selector := buf[:cursor]
-			b.addSelectorNode(string(selector))
-			b.singleQuotePathSelector = true
-			return b.buildNextCharIfExists(buf, cursor+2)
-		case '"':
-			if sel != DoubleQuotePathSelector {
-				return 0, errors.ErrInvalidPath("found single quote character in field selector with double quote context")
-			}
-			selector := buf[:cursor]
-			b.addSelectorNode(string(selector))
-			b.doubleQuotePathSelector = true
-			return b.buildNextCharIfExists(buf, cursor+1)
-		}
-	}
-	return 0, errors.ErrInvalidPath("couldn't find quote character in selector quote path context")
-}
-
-func (b *PathBuilder) buildPathRecursive(buf []rune) (int, error) {
-	switch buf[0] {
-	case '.', '[', ']', '$', '*':
-		return 0, errors.ErrInvalidPath("found invalid path character %c after double dot", buf[0])
-	}
-	for cursor := 0; cursor < len(buf); cursor++ {
-		switch buf[cursor] {
-		case '$', '*', ']':
-			return 0, errors.ErrInvalidPath("found %c character in field selector context", buf[cursor])
-		case '.':
-			if cursor+1 >= len(buf) {
-				return 0, errors.ErrInvalidPath("JSON Path ends with dot character")
-			}
-			selector := buf[:cursor]
-			b.addRecursiveNode(string(selector))
-			offset, err := b.buildSelector(buf[cursor+1:])
-			if err != nil {
-				return 0, err
-			}
-			return cursor + 1 + offset, nil
-		case '[':
-			if cursor+1 >= len(buf) {
-				return 0, errors.ErrInvalidPath("JSON Path ends with left bracket character")
-			}
-			selector := buf[:cursor]
-			b.addRecursiveNode(string(selector))
-			offset, err := b.buildIndex(buf[cursor+1:])
-			if err != nil {
-				return 0, err
-			}
-			return cursor + 1 + offset, nil
-		}
-	}
-	b.addRecursiveNode(string(buf))
-	return len(buf), nil
-}
-
-func (b *PathBuilder) buildIndex(buf []rune) (int, error) {
-	switch buf[0] {
-	case '.', '[', ']', '$':
-		return 0, errors.ErrInvalidPath("found invalid path character %c after left bracket", buf[0])
-	case '\'':
-		if len(buf) == 1 {
-			return 0, errors.ErrInvalidPath("JSON Path ends with single quote character")
-		}
-		offset, err := b.buildQuoteSelector(buf[1:], SingleQuotePathSelector)
-		if err != nil {
-			return 0, err
-		}
-		return 1 + offset, nil
-	case '*':
-		if len(buf) == 1 {
-			return 0, errors.ErrInvalidPath("JSON Path ends with star character")
-		}
-		if buf[1] != ']' {
-			return 0, errors.ErrInvalidPath("expect right bracket character for index all path but found %c character", buf[1])
-		}
-		b.addIndexAllNode()
-		offset := len("*]")
-		if len(buf) > 2 {
-			buildOffset, err := b.buildNext(buf[2:])
-			if err != nil {
-				return 0, err
-			}
-			return offset + buildOffset, nil
-		}
-		return offset, nil
-	}
-
-	for cursor := 0; cursor < len(buf); cursor++ {
-		switch buf[cursor] {
-		case ']':
-			index, err := strconv.ParseInt(string(buf[:cursor]), 10, 64)
-			if err != nil {
-				return 0, errors.ErrInvalidPath("%q is unexpected index path", buf[:cursor])
-			}
-			b.addIndexNode(int(index))
-			return b.buildNextCharIfExists(buf, cursor+1)
-		}
-	}
-	return 0, errors.ErrInvalidPath("couldn't find right bracket character in index path context")
-}
-
-func (b *PathBuilder) addIndexAllNode() {
-	node := newPathIndexAllNode()
-	if b.root == nil {
-		b.root = node
-		b.node = node
-	} else {
-		b.node = b.node.chain(node)
-	}
-}
-
-func (b *PathBuilder) addRecursiveNode(selector string) {
-	node := newPathRecursiveNode(selector)
-	if b.root == nil {
-		b.root = node
-		b.node = node
-	} else {
-		b.node = b.node.chain(node)
-	}
-}
-
-func (b *PathBuilder) addSelectorNode(name string) {
-	node := newPathSelectorNode(name)
-	if b.root == nil {
-		b.root = node
-		b.node = node
-	} else {
-		b.node = b.node.chain(node)
-	}
-}
-
-func (b *PathBuilder) addIndexNode(idx int) {
-	node := newPathIndexNode(idx)
-	if b.root == nil {
-		b.root = node
-		b.node = node
-	} else {
-		b.node = b.node.chain(node)
-	}
-}
-
-type QuotePathSelector int
-
-const (
-	SingleQuotePathSelector QuotePathSelector = 1
-	DoubleQuotePathSelector QuotePathSelector = 2
-)
-
-type Path struct {
-	node                    PathNode
-	RootSelectorOnly        bool
-	SingleQuotePathSelector bool
-	DoubleQuotePathSelector bool
-}
-
-func (p *Path) Field(sel string) (PathNode, bool, error) {
-	if p.node == nil {
-		return nil, false, nil
-	}
-	return p.node.Field(sel)
-}
-
-func (p *Path) Get(src, dst reflect.Value) error {
-	if p.node == nil {
-		return nil
-	}
-	return p.node.Get(src, dst)
-}
-
-func (p *Path) String() string {
-	if p.node == nil {
-		return "$"
-	}
-	return p.node.String()
-}
-
-type PathNode interface {
-	fmt.Stringer
-	Index(idx int) (PathNode, bool, error)
-	Field(fieldName string) (PathNode, bool, error)
-	Get(src, dst reflect.Value) error
-	chain(PathNode) PathNode
-	target() bool
-	single() bool
-}
-
-type BasePathNode struct {
-	child PathNode
-}
-
-func (n *BasePathNode) chain(node PathNode) PathNode {
-	n.child = node
-	return node
-}
-
-func (n *BasePathNode) target() bool {
-	return n.child == nil
-}
-
-func (n *BasePathNode) single() bool {
-	return true
-}
-
-type PathSelectorNode struct {
-	*BasePathNode
-	selector string
-}
-
-func newPathSelectorNode(selector string) *PathSelectorNode {
-	return &PathSelectorNode{
-		BasePathNode: &BasePathNode{},
-		selector:     selector,
-	}
-}
-
-func (n *PathSelectorNode) Index(idx int) (PathNode, bool, error) {
-	return nil, false, &errors.PathError{}
-}
-
-func (n *PathSelectorNode) Field(fieldName string) (PathNode, bool, error) {
-	if n.selector == fieldName {
-		return n.child, true, nil
-	}
-	return nil, false, nil
-}
-
-func (n *PathSelectorNode) Get(src, dst reflect.Value) error {
-	switch src.Type().Kind() {
-	case reflect.Map:
-		iter := src.MapRange()
-		for iter.Next() {
-			key, ok := iter.Key().Interface().(string)
-			if !ok {
-				return fmt.Errorf("invalid map key type %T", src.Type().Key())
-			}
-			child, found, err := n.Field(key)
-			if err != nil {
-				return err
-			}
-			if found {
-				if child != nil {
-					return child.Get(iter.Value(), dst)
-				}
-				return AssignValue(iter.Value(), dst)
-			}
-		}
-	case reflect.Struct:
-		typ := src.Type()
-		for i := 0; i < typ.Len(); i++ {
-			tag := runtime.StructTagFromField(typ.Field(i))
-			child, found, err := n.Field(tag.Key)
-			if err != nil {
-				return err
-			}
-			if found {
-				if child != nil {
-					return child.Get(src.Field(i), dst)
-				}
-				return AssignValue(src.Field(i), dst)
-			}
-		}
-	case reflect.Ptr:
-		return n.Get(src.Elem(), dst)
-	case reflect.Interface:
-		return n.Get(reflect.ValueOf(src.Interface()), dst)
-	case reflect.Float64, reflect.String, reflect.Bool:
-		return AssignValue(src, dst)
-	}
-	return fmt.Errorf("failed to get %s value from %s", n.selector, src.Type())
-}
-
-func (n *PathSelectorNode) String() string {
-	s := fmt.Sprintf(".%s", n.selector)
-	if n.child != nil {
-		s += n.child.String()
-	}
-	return s
-}
-
-type PathIndexNode struct {
-	*BasePathNode
-	selector int
-}
-
-func newPathIndexNode(selector int) *PathIndexNode {
-	return &PathIndexNode{
-		BasePathNode: &BasePathNode{},
-		selector:     selector,
-	}
-}
-
-func (n *PathIndexNode) Index(idx int) (PathNode, bool, error) {
-	if n.selector == idx {
-		return n.child, true, nil
-	}
-	return nil, false, nil
-}
-
-func (n *PathIndexNode) Field(fieldName string) (PathNode, bool, error) {
-	return nil, false, &errors.PathError{}
-}
-
-func (n *PathIndexNode) Get(src, dst reflect.Value) error {
-	switch src.Type().Kind() {
-	case reflect.Array, reflect.Slice:
-		if src.Len() > n.selector {
-			if n.child != nil {
-				return n.child.Get(src.Index(n.selector), dst)
-			}
-			return AssignValue(src.Index(n.selector), dst)
-		}
-	case reflect.Ptr:
-		return n.Get(src.Elem(), dst)
-	case reflect.Interface:
-		return n.Get(reflect.ValueOf(src.Interface()), dst)
-	}
-	return fmt.Errorf("failed to get [%d] value from %s", n.selector, src.Type())
-}
-
-func (n *PathIndexNode) String() string {
-	s := fmt.Sprintf("[%d]", n.selector)
-	if n.child != nil {
-		s += n.child.String()
-	}
-	return s
-}
-
-type PathIndexAllNode struct {
-	*BasePathNode
-}
-
-func newPathIndexAllNode() *PathIndexAllNode {
-	return &PathIndexAllNode{
-		BasePathNode: &BasePathNode{},
-	}
-}
-
-func (n *PathIndexAllNode) Index(idx int) (PathNode, bool, error) {
-	return n.child, true, nil
-}
-
-func (n *PathIndexAllNode) Field(fieldName string) (PathNode, bool, error) {
-	return nil, false, &errors.PathError{}
-}
-
-func (n *PathIndexAllNode) Get(src, dst reflect.Value) error {
-	switch src.Type().Kind() {
-	case reflect.Array, reflect.Slice:
-		var arr []interface{}
-		for i := 0; i < src.Len(); i++ {
-			var v interface{}
-			rv := reflect.ValueOf(&v)
-			if n.child != nil {
-				if err := n.child.Get(src.Index(i), rv); err != nil {
-					return err
-				}
-			} else {
-				if err := AssignValue(src.Index(i), rv); err != nil {
-					return err
-				}
-			}
-			arr = append(arr, v)
-		}
-		if err := AssignValue(reflect.ValueOf(arr), dst); err != nil {
-			return err
-		}
-		return nil
-	case reflect.Ptr:
-		return n.Get(src.Elem(), dst)
-	case reflect.Interface:
-		return n.Get(reflect.ValueOf(src.Interface()), dst)
-	}
-	return fmt.Errorf("failed to get all value from %s", src.Type())
-}
-
-func (n *PathIndexAllNode) String() string {
-	s := "[*]"
-	if n.child != nil {
-		s += n.child.String()
-	}
-	return s
-}
-
-type PathRecursiveNode struct {
-	*BasePathNode
-	selector string
-}
-
-func newPathRecursiveNode(selector string) *PathRecursiveNode {
-	node := newPathSelectorNode(selector)
-	return &PathRecursiveNode{
-		BasePathNode: &BasePathNode{
-			child: node,
-		},
-		selector: selector,
-	}
-}
-
-func (n *PathRecursiveNode) Field(fieldName string) (PathNode, bool, error) {
-	if n.selector == fieldName {
-		return n.child, true, nil
-	}
-	return nil, false, nil
-}
-
-func (n *PathRecursiveNode) Index(_ int) (PathNode, bool, error) {
-	return n, true, nil
-}
-
-func valueToSliceValue(v interface{}) []interface{} {
-	rv := reflect.ValueOf(v)
-	ret := []interface{}{}
-	if rv.Type().Kind() == reflect.Slice || rv.Type().Kind() == reflect.Array {
-		for i := 0; i < rv.Len(); i++ {
-			ret = append(ret, rv.Index(i).Interface())
-		}
-		return ret
-	}
-	return []interface{}{v}
-}
-
-func (n *PathRecursiveNode) Get(src, dst reflect.Value) error {
-	if n.child == nil {
-		return fmt.Errorf("failed to get by recursive path ..%s", n.selector)
-	}
-	var arr []interface{}
-	switch src.Type().Kind() {
-	case reflect.Map:
-		iter := src.MapRange()
-		for iter.Next() {
-			key, ok := iter.Key().Interface().(string)
-			if !ok {
-				return fmt.Errorf("invalid map key type %T", src.Type().Key())
-			}
-			child, found, err := n.Field(key)
-			if err != nil {
-				return err
-			}
-			if found {
-				var v interface{}
-				rv := reflect.ValueOf(&v)
-				_ = child.Get(iter.Value(), rv)
-				arr = append(arr, valueToSliceValue(v)...)
-			} else {
-				var v interface{}
-				rv := reflect.ValueOf(&v)
-				_ = n.Get(iter.Value(), rv)
-				if v != nil {
-					arr = append(arr, valueToSliceValue(v)...)
-				}
-			}
-		}
-		_ = AssignValue(reflect.ValueOf(arr), dst)
-		return nil
-	case reflect.Struct:
-		typ := src.Type()
-		for i := 0; i < typ.Len(); i++ {
-			tag := runtime.StructTagFromField(typ.Field(i))
-			child, found, err := n.Field(tag.Key)
-			if err != nil {
-				return err
-			}
-			if found {
-				var v interface{}
-				rv := reflect.ValueOf(&v)
-				_ = child.Get(src.Field(i), rv)
-				arr = append(arr, valueToSliceValue(v)...)
-			} else {
-				var v interface{}
-				rv := reflect.ValueOf(&v)
-				_ = n.Get(src.Field(i), rv)
-				if v != nil {
-					arr = append(arr, valueToSliceValue(v)...)
-				}
-			}
-		}
-		_ = AssignValue(reflect.ValueOf(arr), dst)
-		return nil
-	case reflect.Array, reflect.Slice:
-		for i := 0; i < src.Len(); i++ {
-			var v interface{}
-			rv := reflect.ValueOf(&v)
-			_ = n.Get(src.Index(i), rv)
-			if v != nil {
-				arr = append(arr, valueToSliceValue(v)...)
-			}
-		}
-		_ = AssignValue(reflect.ValueOf(arr), dst)
-		return nil
-	case reflect.Ptr:
-		return n.Get(src.Elem(), dst)
-	case reflect.Interface:
-		return n.Get(reflect.ValueOf(src.Interface()), dst)
-	}
-	return fmt.Errorf("failed to get %s value from %s", n.selector, src.Type())
-}
-
-func (n *PathRecursiveNode) String() string {
-	s := fmt.Sprintf("..%s", n.selector)
-	if n.child != nil {
-		s += n.child.String()
-	}
-	return s
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/ptr.go b/vendor/github.com/goccy/go-json/internal/decoder/ptr.go
index ae22994..2c83b9c 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/ptr.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/ptr.go
@@ -1,7 +1,6 @@
 package decoder
 
 import (
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/runtime"
@@ -35,10 +34,6 @@ func (d *ptrDecoder) contentDecoder() Decoder {
 //go:linkname unsafe_New reflect.unsafe_New
 func unsafe_New(*runtime.Type) unsafe.Pointer
 
-func UnsafeNew(t *runtime.Type) unsafe.Pointer {
-	return unsafe_New(t)
-}
-
 func (d *ptrDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) error {
 	if s.skipWhiteSpace() == nul {
 		s.read()
@@ -85,13 +80,8 @@ func (d *ptrDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.P
 	}
 	c, err := d.dec.Decode(ctx, cursor, depth, newptr)
 	if err != nil {
-		*(*unsafe.Pointer)(p) = nil
 		return 0, err
 	}
 	cursor = c
 	return cursor, nil
 }
-
-func (d *ptrDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: ptr decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/slice.go b/vendor/github.com/goccy/go-json/internal/decoder/slice.go
index 30a23e4..85b6e11 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/slice.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/slice.go
@@ -299,82 +299,3 @@ func (d *sliceDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 		}
 	}
 }
-
-func (d *sliceDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	buf := ctx.Buf
-	depth++
-	if depth > maxDecodeNestingDepth {
-		return nil, 0, errors.ErrExceededMaxDepth(buf[cursor], cursor)
-	}
-
-	ret := [][]byte{}
-	for {
-		switch buf[cursor] {
-		case ' ', '\n', '\t', '\r':
-			cursor++
-			continue
-		case 'n':
-			if err := validateNull(buf, cursor); err != nil {
-				return nil, 0, err
-			}
-			cursor += 4
-			return [][]byte{nullbytes}, cursor, nil
-		case '[':
-			cursor++
-			cursor = skipWhiteSpace(buf, cursor)
-			if buf[cursor] == ']' {
-				cursor++
-				return ret, cursor, nil
-			}
-			idx := 0
-			for {
-				child, found, err := ctx.Option.Path.node.Index(idx)
-				if err != nil {
-					return nil, 0, err
-				}
-				if found {
-					if child != nil {
-						oldPath := ctx.Option.Path.node
-						ctx.Option.Path.node = child
-						paths, c, err := d.valueDecoder.DecodePath(ctx, cursor, depth)
-						if err != nil {
-							return nil, 0, err
-						}
-						ctx.Option.Path.node = oldPath
-						ret = append(ret, paths...)
-						cursor = c
-					} else {
-						start := cursor
-						end, err := skipValue(buf, cursor, depth)
-						if err != nil {
-							return nil, 0, err
-						}
-						ret = append(ret, buf[start:end])
-						cursor = end
-					}
-				} else {
-					c, err := skipValue(buf, cursor, depth)
-					if err != nil {
-						return nil, 0, err
-					}
-					cursor = c
-				}
-				cursor = skipWhiteSpace(buf, cursor)
-				switch buf[cursor] {
-				case ']':
-					cursor++
-					return ret, cursor, nil
-				case ',':
-					idx++
-				default:
-					return nil, 0, errors.ErrInvalidCharacter(buf[cursor], "slice", cursor)
-				}
-				cursor++
-			}
-		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			return nil, 0, d.errNumber(cursor)
-		default:
-			return nil, 0, errors.ErrUnexpectedEndOfJSON("slice", cursor)
-		}
-	}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/stream.go b/vendor/github.com/goccy/go-json/internal/decoder/stream.go
index a383f72..c274683 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/stream.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/stream.go
@@ -103,7 +103,7 @@ func (s *Stream) statForRetry() ([]byte, int64, unsafe.Pointer) {
 
 func (s *Stream) Reset() {
 	s.reset()
-	s.bufSize = int64(len(s.buf))
+	s.bufSize = initBufSize
 }
 
 func (s *Stream) More() bool {
@@ -138,11 +138,8 @@ func (s *Stream) Token() (interface{}, error) {
 			s.cursor++
 		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
 			bytes := floatBytes(s)
-			str := *(*string)(unsafe.Pointer(&bytes))
-			if s.UseNumber {
-				return json.Number(str), nil
-			}
-			f64, err := strconv.ParseFloat(str, 64)
+			s := *(*string)(unsafe.Pointer(&bytes))
+			f64, err := strconv.ParseFloat(s, 64)
 			if err != nil {
 				return nil, err
 			}
@@ -280,7 +277,7 @@ func (s *Stream) skipObject(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.stat()
+							_, cursor, p = s.statForRetry()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("string of object", cursor)
@@ -343,7 +340,7 @@ func (s *Stream) skipArray(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.stat()
+							_, cursor, p = s.statForRetry()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("string of object", cursor)
@@ -401,7 +398,7 @@ func (s *Stream) skipValue(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.stat()
+							_, cursor, p = s.statForRetry()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("value of string", s.totalOffset())
@@ -426,6 +423,7 @@ func (s *Stream) skipValue(depth int64) error {
 					continue
 				} else if c == nul {
 					if s.read() {
+						s.cursor-- // for retry current character
 						_, cursor, p = s.stat()
 						continue
 					}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/string.go b/vendor/github.com/goccy/go-json/internal/decoder/string.go
index 32602c9..65b1004 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/string.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/string.go
@@ -1,8 +1,6 @@
 package decoder
 
 import (
-	"bytes"
-	"fmt"
 	"reflect"
 	"unicode"
 	"unicode/utf16"
@@ -60,17 +58,6 @@ func (d *stringDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsaf
 	return cursor, nil
 }
 
-func (d *stringDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	bytes, c, err := d.decodeByte(ctx.Buf, cursor)
-	if err != nil {
-		return nil, 0, err
-	}
-	if bytes == nil {
-		return [][]byte{nullbytes}, c, nil
-	}
-	return [][]byte{bytes}, c, nil
-}
-
 var (
 	hexToInt = [256]int{
 		'0': 0,
@@ -106,30 +93,24 @@ func unicodeToRune(code []byte) rune {
 	return r
 }
 
-func readAtLeast(s *Stream, n int64, p *unsafe.Pointer) bool {
-	for s.cursor+n >= s.length {
-		if !s.read() {
-			return false
-		}
-		*p = s.bufptr()
-	}
-	return true
-}
-
 func decodeUnicodeRune(s *Stream, p unsafe.Pointer) (rune, int64, unsafe.Pointer, error) {
 	const defaultOffset = 5
 	const surrogateOffset = 11
 
-	if !readAtLeast(s, defaultOffset, &p) {
-		return rune(0), 0, nil, errors.ErrInvalidCharacter(s.char(), "escaped string", s.totalOffset())
+	if s.cursor+defaultOffset >= s.length {
+		if !s.read() {
+			return rune(0), 0, nil, errors.ErrInvalidCharacter(s.char(), "escaped string", s.totalOffset())
+		}
+		p = s.bufptr()
 	}
 
 	r := unicodeToRune(s.buf[s.cursor+1 : s.cursor+defaultOffset])
 	if utf16.IsSurrogate(r) {
-		if !readAtLeast(s, surrogateOffset, &p) {
-			return unicode.ReplacementChar, defaultOffset, p, nil
+		if s.cursor+surrogateOffset >= s.length {
+			s.read()
+			p = s.bufptr()
 		}
-		if s.buf[s.cursor+defaultOffset] != '\\' || s.buf[s.cursor+defaultOffset+1] != 'u' {
+		if s.cursor+surrogateOffset >= s.length || s.buf[s.cursor+defaultOffset] != '\\' || s.buf[s.cursor+defaultOffset+1] != 'u' {
 			return unicode.ReplacementChar, defaultOffset, p, nil
 		}
 		r2 := unicodeToRune(s.buf[s.cursor+defaultOffset+2 : s.cursor+surrogateOffset])
@@ -182,7 +163,6 @@ RETRY:
 		if !s.read() {
 			return nil, errors.ErrInvalidCharacter(s.char(), "escaped string", s.totalOffset())
 		}
-		p = s.bufptr()
 		goto RETRY
 	default:
 		return nil, errors.ErrUnexpectedEndOfJSON("string", s.totalOffset())
@@ -328,36 +308,49 @@ func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, err
 			cursor++
 			start := cursor
 			b := (*sliceHeader)(unsafe.Pointer(&buf)).data
-			escaped := 0
 			for {
 				switch char(b, cursor) {
 				case '\\':
-					escaped++
 					cursor++
 					switch char(b, cursor) {
-					case '"', '\\', '/', 'b', 'f', 'n', 'r', 't':
-						cursor++
+					case '"':
+						buf[cursor] = '"'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case '\\':
+						buf[cursor] = '\\'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case '/':
+						buf[cursor] = '/'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case 'b':
+						buf[cursor] = '\b'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case 'f':
+						buf[cursor] = '\f'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case 'n':
+						buf[cursor] = '\n'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case 'r':
+						buf[cursor] = '\r'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
+					case 't':
+						buf[cursor] = '\t'
+						buf = append(buf[:cursor-1], buf[cursor:]...)
 					case 'u':
 						buflen := int64(len(buf))
 						if cursor+5 >= buflen {
 							return nil, 0, errors.ErrUnexpectedEndOfJSON("escaped string", cursor)
 						}
-						for i := int64(1); i <= 4; i++ {
-							c := char(b, cursor+i)
-							if !(('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')) {
-								return nil, 0, errors.ErrSyntax(fmt.Sprintf("json: invalid character %c in \\u hexadecimal character escape", c), cursor+i)
-							}
-						}
-						cursor += 5
+						code := unicodeToRune(buf[cursor+1 : cursor+5])
+						unicode := []byte(string(code))
+						buf = append(append(buf[:cursor-1], unicode...), buf[cursor+5:]...)
 					default:
 						return nil, 0, errors.ErrUnexpectedEndOfJSON("escaped string", cursor)
 					}
 					continue
 				case '"':
 					literal := buf[start:cursor]
-					if escaped > 0 {
-						literal = literal[:unescapeString(literal)]
-					}
 					cursor++
 					return literal, cursor, nil
 				case nul:
@@ -376,77 +369,3 @@ func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, err
 		}
 	}
 }
-
-var unescapeMap = [256]byte{
-	'"':  '"',
-	'\\': '\\',
-	'/':  '/',
-	'b':  '\b',
-	'f':  '\f',
-	'n':  '\n',
-	'r':  '\r',
-	't':  '\t',
-}
-
-func unsafeAdd(ptr unsafe.Pointer, offset int) unsafe.Pointer {
-	return unsafe.Pointer(uintptr(ptr) + uintptr(offset))
-}
-
-func unescapeString(buf []byte) int {
-	p := (*sliceHeader)(unsafe.Pointer(&buf)).data
-	end := unsafeAdd(p, len(buf))
-	src := unsafeAdd(p, bytes.IndexByte(buf, '\\'))
-	dst := src
-	for src != end {
-		c := char(src, 0)
-		if c == '\\' {
-			escapeChar := char(src, 1)
-			if escapeChar != 'u' {
-				*(*byte)(dst) = unescapeMap[escapeChar]
-				src = unsafeAdd(src, 2)
-				dst = unsafeAdd(dst, 1)
-			} else {
-				v1 := hexToInt[char(src, 2)]
-				v2 := hexToInt[char(src, 3)]
-				v3 := hexToInt[char(src, 4)]
-				v4 := hexToInt[char(src, 5)]
-				code := rune((v1 << 12) | (v2 << 8) | (v3 << 4) | v4)
-				if code >= 0xd800 && code < 0xdc00 && uintptr(unsafeAdd(src, 11)) < uintptr(end) {
-					if char(src, 6) == '\\' && char(src, 7) == 'u' {
-						v1 := hexToInt[char(src, 8)]
-						v2 := hexToInt[char(src, 9)]
-						v3 := hexToInt[char(src, 10)]
-						v4 := hexToInt[char(src, 11)]
-						lo := rune((v1 << 12) | (v2 << 8) | (v3 << 4) | v4)
-						if lo >= 0xdc00 && lo < 0xe000 {
-							code = (code-0xd800)<<10 | (lo - 0xdc00) + 0x10000
-							src = unsafeAdd(src, 6)
-						}
-					}
-				}
-				var b [utf8.UTFMax]byte
-				n := utf8.EncodeRune(b[:], code)
-				switch n {
-				case 4:
-					*(*byte)(unsafeAdd(dst, 3)) = b[3]
-					fallthrough
-				case 3:
-					*(*byte)(unsafeAdd(dst, 2)) = b[2]
-					fallthrough
-				case 2:
-					*(*byte)(unsafeAdd(dst, 1)) = b[1]
-					fallthrough
-				case 1:
-					*(*byte)(unsafeAdd(dst, 0)) = b[0]
-				}
-				src = unsafeAdd(src, 6)
-				dst = unsafeAdd(dst, n)
-			}
-		} else {
-			*(*byte)(dst) = c
-			src = unsafeAdd(src, 1)
-			dst = unsafeAdd(dst, 1)
-		}
-	}
-	return int(uintptr(dst) - uintptr(p))
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/struct.go b/vendor/github.com/goccy/go-json/internal/decoder/struct.go
index 313da15..2c64680 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/struct.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/struct.go
@@ -51,14 +51,6 @@ func init() {
 	}
 }
 
-func toASCIILower(s string) string {
-	b := []byte(s)
-	for i := range b {
-		b[i] = largeToSmallTable[b[i]]
-	}
-	return string(b)
-}
-
 func newStructDecoder(structName, fieldName string, fieldMap map[string]*structFieldSet) *structDecoder {
 	return &structDecoder{
 		fieldMap:         fieldMap,
@@ -99,10 +91,6 @@ func (d *structDecoder) tryOptimize() {
 	for k, v := range d.fieldMap {
 		key := strings.ToLower(k)
 		if key != k {
-			if key != toASCIILower(k) {
-				d.isTriedOptimize = true
-				return
-			}
 			// already exists same key (e.g. Hello and HELLO has same lower case key
 			if _, exists := conflicted[key]; exists {
 				d.isTriedOptimize = true
@@ -170,53 +158,49 @@ func (d *structDecoder) tryOptimize() {
 }
 
 // decode from '\uXXXX'
-func decodeKeyCharByUnicodeRune(buf []byte, cursor int64) ([]byte, int64, error) {
+func decodeKeyCharByUnicodeRune(buf []byte, cursor int64) ([]byte, int64) {
 	const defaultOffset = 4
 	const surrogateOffset = 6
 
-	if cursor+defaultOffset >= int64(len(buf)) {
-		return nil, 0, errors.ErrUnexpectedEndOfJSON("escaped string", cursor)
-	}
-
 	r := unicodeToRune(buf[cursor : cursor+defaultOffset])
 	if utf16.IsSurrogate(r) {
 		cursor += defaultOffset
 		if cursor+surrogateOffset >= int64(len(buf)) || buf[cursor] != '\\' || buf[cursor+1] != 'u' {
-			return []byte(string(unicode.ReplacementChar)), cursor + defaultOffset - 1, nil
+			return []byte(string(unicode.ReplacementChar)), cursor + defaultOffset - 1
 		}
 		cursor += 2
 		r2 := unicodeToRune(buf[cursor : cursor+defaultOffset])
 		if r := utf16.DecodeRune(r, r2); r != unicode.ReplacementChar {
-			return []byte(string(r)), cursor + defaultOffset - 1, nil
+			return []byte(string(r)), cursor + defaultOffset - 1
 		}
 	}
-	return []byte(string(r)), cursor + defaultOffset - 1, nil
+	return []byte(string(r)), cursor + defaultOffset - 1
 }
 
-func decodeKeyCharByEscapedChar(buf []byte, cursor int64) ([]byte, int64, error) {
+func decodeKeyCharByEscapedChar(buf []byte, cursor int64) ([]byte, int64) {
 	c := buf[cursor]
 	cursor++
 	switch c {
 	case '"':
-		return []byte{'"'}, cursor, nil
+		return []byte{'"'}, cursor
 	case '\\':
-		return []byte{'\\'}, cursor, nil
+		return []byte{'\\'}, cursor
 	case '/':
-		return []byte{'/'}, cursor, nil
+		return []byte{'/'}, cursor
 	case 'b':
-		return []byte{'\b'}, cursor, nil
+		return []byte{'\b'}, cursor
 	case 'f':
-		return []byte{'\f'}, cursor, nil
+		return []byte{'\f'}, cursor
 	case 'n':
-		return []byte{'\n'}, cursor, nil
+		return []byte{'\n'}, cursor
 	case 'r':
-		return []byte{'\r'}, cursor, nil
+		return []byte{'\r'}, cursor
 	case 't':
-		return []byte{'\t'}, cursor, nil
+		return []byte{'\t'}, cursor
 	case 'u':
 		return decodeKeyCharByUnicodeRune(buf, cursor)
 	}
-	return nil, cursor, nil
+	return nil, cursor
 }
 
 func decodeKeyByBitmapUint8(d *structDecoder, buf []byte, cursor int64) (int64, *structFieldSet, error) {
@@ -258,10 +242,7 @@ func decodeKeyByBitmapUint8(d *structDecoder, buf []byte, cursor int64) (int64,
 					return 0, nil, errors.ErrUnexpectedEndOfJSON("string", cursor)
 				case '\\':
 					cursor++
-					chars, nextCursor, err := decodeKeyCharByEscapedChar(buf, cursor)
-					if err != nil {
-						return 0, nil, err
-					}
+					chars, nextCursor := decodeKeyCharByEscapedChar(buf, cursor)
 					for _, c := range chars {
 						curBit &= bitmap[keyIdx][largeToSmallTable[c]]
 						if curBit == 0 {
@@ -324,10 +305,7 @@ func decodeKeyByBitmapUint16(d *structDecoder, buf []byte, cursor int64) (int64,
 					return 0, nil, errors.ErrUnexpectedEndOfJSON("string", cursor)
 				case '\\':
 					cursor++
-					chars, nextCursor, err := decodeKeyCharByEscapedChar(buf, cursor)
-					if err != nil {
-						return 0, nil, err
-					}
+					chars, nextCursor := decodeKeyCharByEscapedChar(buf, cursor)
 					for _, c := range chars {
 						curBit &= bitmap[keyIdx][largeToSmallTable[c]]
 						if curBit == 0 {
@@ -839,7 +817,3 @@ func (d *structDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsaf
 		cursor++
 	}
 }
-
-func (d *structDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: struct decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/type.go b/vendor/github.com/goccy/go-json/internal/decoder/type.go
index beaf3ab..70e9907 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/type.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/type.go
@@ -10,7 +10,6 @@ import (
 
 type Decoder interface {
 	Decode(*RuntimeContext, int64, int64, unsafe.Pointer) (int64, error)
-	DecodePath(*RuntimeContext, int64, int64) ([][]byte, int64, error)
 	DecodeStream(*Stream, int64, unsafe.Pointer) error
 }
 
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/uint.go b/vendor/github.com/goccy/go-json/internal/decoder/uint.go
index 4131731..a62c514 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/uint.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/uint.go
@@ -188,7 +188,3 @@ func (d *uintDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.
 	d.op(p, u64)
 	return cursor, nil
 }
-
-func (d *uintDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: uint decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
index 4cd6dbd..d90f39c 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
@@ -1,9 +1,7 @@
 package decoder
 
 import (
-	"context"
 	"encoding/json"
-	"fmt"
 	"unsafe"
 
 	"github.com/goccy/go-json/internal/errors"
@@ -48,20 +46,13 @@ func (d *unmarshalJSONDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Poi
 		typ: d.typ,
 		ptr: p,
 	}))
-	switch v := v.(type) {
-	case unmarshalerContext:
-		var ctx context.Context
-		if (s.Option.Flags & ContextOption) != 0 {
-			ctx = s.Option.Context
-		} else {
-			ctx = context.Background()
-		}
-		if err := v.UnmarshalJSON(ctx, dst); err != nil {
+	if (s.Option.Flags & ContextOption) != 0 {
+		if err := v.(unmarshalerContext).UnmarshalJSON(s.Option.Context, dst); err != nil {
 			d.annotateError(s.cursor, err)
 			return err
 		}
-	case json.Unmarshaler:
-		if err := v.UnmarshalJSON(dst); err != nil {
+	} else {
+		if err := v.(json.Unmarshaler).UnmarshalJSON(dst); err != nil {
 			d.annotateError(s.cursor, err)
 			return err
 		}
@@ -98,7 +89,3 @@ func (d *unmarshalJSONDecoder) Decode(ctx *RuntimeContext, cursor, depth int64,
 	}
 	return end, nil
 }
-
-func (d *unmarshalJSONDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: unmarshal json decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_text.go b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_text.go
index d711d0f..1ef2877 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_text.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_text.go
@@ -3,7 +3,6 @@ package decoder
 import (
 	"bytes"
 	"encoding"
-	"fmt"
 	"unicode"
 	"unicode/utf16"
 	"unicode/utf8"
@@ -143,11 +142,7 @@ func (d *unmarshalTextDecoder) Decode(ctx *RuntimeContext, cursor, depth int64,
 	return end, nil
 }
 
-func (d *unmarshalTextDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: unmarshal text decoder does not support decode path")
-}
-
-func unquoteBytes(s []byte) (t []byte, ok bool) { //nolint: nonamedreturns
+func unquoteBytes(s []byte) (t []byte, ok bool) {
 	length := len(s)
 	if length < 2 || s[0] != '"' || s[length-1] != '"' {
 		return
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/wrapped_string.go b/vendor/github.com/goccy/go-json/internal/decoder/wrapped_string.go
index 0c4e2e6..66227ae 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/wrapped_string.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/wrapped_string.go
@@ -1,7 +1,6 @@
 package decoder
 
 import (
-	"fmt"
 	"reflect"
 	"unsafe"
 
@@ -67,7 +66,3 @@ func (d *wrappedStringDecoder) Decode(ctx *RuntimeContext, cursor, depth int64,
 	ctx.Buf = oldBuf
 	return c, nil
 }
-
-func (d *wrappedStringDecoder) DecodePath(ctx *RuntimeContext, cursor, depth int64) ([][]byte, int64, error) {
-	return nil, 0, fmt.Errorf("json: wrapped string decoder does not support decode path")
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/code.go b/vendor/github.com/goccy/go-json/internal/encoder/code.go
deleted file mode 100644
index 5b08fae..0000000
--- a/vendor/github.com/goccy/go-json/internal/encoder/code.go
+++ /dev/null
@@ -1,1023 +0,0 @@
-package encoder
-
-import (
-	"fmt"
-	"reflect"
-	"unsafe"
-
-	"github.com/goccy/go-json/internal/runtime"
-)
-
-type Code interface {
-	Kind() CodeKind
-	ToOpcode(*compileContext) Opcodes
-	Filter(*FieldQuery) Code
-}
-
-type AnonymousCode interface {
-	ToAnonymousOpcode(*compileContext) Opcodes
-}
-
-type Opcodes []*Opcode
-
-func (o Opcodes) First() *Opcode {
-	if len(o) == 0 {
-		return nil
-	}
-	return o[0]
-}
-
-func (o Opcodes) Last() *Opcode {
-	if len(o) == 0 {
-		return nil
-	}
-	return o[len(o)-1]
-}
-
-func (o Opcodes) Add(codes ...*Opcode) Opcodes {
-	return append(o, codes...)
-}
-
-type CodeKind int
-
-const (
-	CodeKindInterface CodeKind = iota
-	CodeKindPtr
-	CodeKindInt
-	CodeKindUint
-	CodeKindFloat
-	CodeKindString
-	CodeKindBool
-	CodeKindStruct
-	CodeKindMap
-	CodeKindSlice
-	CodeKindArray
-	CodeKindBytes
-	CodeKindMarshalJSON
-	CodeKindMarshalText
-	CodeKindRecursive
-)
-
-type IntCode struct {
-	typ      *runtime.Type
-	bitSize  uint8
-	isString bool
-	isPtr    bool
-}
-
-func (c *IntCode) Kind() CodeKind {
-	return CodeKindInt
-}
-
-func (c *IntCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		code = newOpCode(ctx, c.typ, OpIntPtr)
-	case c.isString:
-		code = newOpCode(ctx, c.typ, OpIntString)
-	default:
-		code = newOpCode(ctx, c.typ, OpInt)
-	}
-	code.NumBitSize = c.bitSize
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *IntCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type UintCode struct {
-	typ      *runtime.Type
-	bitSize  uint8
-	isString bool
-	isPtr    bool
-}
-
-func (c *UintCode) Kind() CodeKind {
-	return CodeKindUint
-}
-
-func (c *UintCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		code = newOpCode(ctx, c.typ, OpUintPtr)
-	case c.isString:
-		code = newOpCode(ctx, c.typ, OpUintString)
-	default:
-		code = newOpCode(ctx, c.typ, OpUint)
-	}
-	code.NumBitSize = c.bitSize
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *UintCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type FloatCode struct {
-	typ     *runtime.Type
-	bitSize uint8
-	isPtr   bool
-}
-
-func (c *FloatCode) Kind() CodeKind {
-	return CodeKindFloat
-}
-
-func (c *FloatCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		switch c.bitSize {
-		case 32:
-			code = newOpCode(ctx, c.typ, OpFloat32Ptr)
-		default:
-			code = newOpCode(ctx, c.typ, OpFloat64Ptr)
-		}
-	default:
-		switch c.bitSize {
-		case 32:
-			code = newOpCode(ctx, c.typ, OpFloat32)
-		default:
-			code = newOpCode(ctx, c.typ, OpFloat64)
-		}
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *FloatCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type StringCode struct {
-	typ   *runtime.Type
-	isPtr bool
-}
-
-func (c *StringCode) Kind() CodeKind {
-	return CodeKindString
-}
-
-func (c *StringCode) ToOpcode(ctx *compileContext) Opcodes {
-	isJSONNumberType := c.typ == runtime.Type2RType(jsonNumberType)
-	var code *Opcode
-	if c.isPtr {
-		if isJSONNumberType {
-			code = newOpCode(ctx, c.typ, OpNumberPtr)
-		} else {
-			code = newOpCode(ctx, c.typ, OpStringPtr)
-		}
-	} else {
-		if isJSONNumberType {
-			code = newOpCode(ctx, c.typ, OpNumber)
-		} else {
-			code = newOpCode(ctx, c.typ, OpString)
-		}
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *StringCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type BoolCode struct {
-	typ   *runtime.Type
-	isPtr bool
-}
-
-func (c *BoolCode) Kind() CodeKind {
-	return CodeKindBool
-}
-
-func (c *BoolCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		code = newOpCode(ctx, c.typ, OpBoolPtr)
-	default:
-		code = newOpCode(ctx, c.typ, OpBool)
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *BoolCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type BytesCode struct {
-	typ   *runtime.Type
-	isPtr bool
-}
-
-func (c *BytesCode) Kind() CodeKind {
-	return CodeKindBytes
-}
-
-func (c *BytesCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		code = newOpCode(ctx, c.typ, OpBytesPtr)
-	default:
-		code = newOpCode(ctx, c.typ, OpBytes)
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *BytesCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type SliceCode struct {
-	typ   *runtime.Type
-	value Code
-}
-
-func (c *SliceCode) Kind() CodeKind {
-	return CodeKindSlice
-}
-
-func (c *SliceCode) ToOpcode(ctx *compileContext) Opcodes {
-	// header => opcode => elem => end
-	//             ^        |
-	//             |________|
-	size := c.typ.Elem().Size()
-	header := newSliceHeaderCode(ctx, c.typ)
-	ctx.incIndex()
-
-	ctx.incIndent()
-	codes := c.value.ToOpcode(ctx)
-	ctx.decIndent()
-
-	codes.First().Flags |= IndirectFlags
-	elemCode := newSliceElemCode(ctx, c.typ.Elem(), header, size)
-	ctx.incIndex()
-	end := newOpCode(ctx, c.typ, OpSliceEnd)
-	ctx.incIndex()
-	header.End = end
-	header.Next = codes.First()
-	codes.Last().Next = elemCode
-	elemCode.Next = codes.First()
-	elemCode.End = end
-	return Opcodes{header}.Add(codes...).Add(elemCode).Add(end)
-}
-
-func (c *SliceCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type ArrayCode struct {
-	typ   *runtime.Type
-	value Code
-}
-
-func (c *ArrayCode) Kind() CodeKind {
-	return CodeKindArray
-}
-
-func (c *ArrayCode) ToOpcode(ctx *compileContext) Opcodes {
-	// header => opcode => elem => end
-	//             ^        |
-	//             |________|
-	elem := c.typ.Elem()
-	alen := c.typ.Len()
-	size := elem.Size()
-
-	header := newArrayHeaderCode(ctx, c.typ, alen)
-	ctx.incIndex()
-
-	ctx.incIndent()
-	codes := c.value.ToOpcode(ctx)
-	ctx.decIndent()
-
-	codes.First().Flags |= IndirectFlags
-
-	elemCode := newArrayElemCode(ctx, elem, header, alen, size)
-	ctx.incIndex()
-
-	end := newOpCode(ctx, c.typ, OpArrayEnd)
-	ctx.incIndex()
-
-	header.End = end
-	header.Next = codes.First()
-	codes.Last().Next = elemCode
-	elemCode.Next = codes.First()
-	elemCode.End = end
-
-	return Opcodes{header}.Add(codes...).Add(elemCode).Add(end)
-}
-
-func (c *ArrayCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type MapCode struct {
-	typ   *runtime.Type
-	key   Code
-	value Code
-}
-
-func (c *MapCode) Kind() CodeKind {
-	return CodeKindMap
-}
-
-func (c *MapCode) ToOpcode(ctx *compileContext) Opcodes {
-	// header => code => value => code => key => code => value => code => end
-	//                                     ^                       |
-	//                                     |_______________________|
-	header := newMapHeaderCode(ctx, c.typ)
-	ctx.incIndex()
-
-	keyCodes := c.key.ToOpcode(ctx)
-
-	value := newMapValueCode(ctx, c.typ.Elem(), header)
-	ctx.incIndex()
-
-	ctx.incIndent()
-	valueCodes := c.value.ToOpcode(ctx)
-	ctx.decIndent()
-
-	valueCodes.First().Flags |= IndirectFlags
-
-	key := newMapKeyCode(ctx, c.typ.Key(), header)
-	ctx.incIndex()
-
-	end := newMapEndCode(ctx, c.typ, header)
-	ctx.incIndex()
-
-	header.Next = keyCodes.First()
-	keyCodes.Last().Next = value
-	value.Next = valueCodes.First()
-	valueCodes.Last().Next = key
-	key.Next = keyCodes.First()
-
-	header.End = end
-	key.End = end
-	value.End = end
-	return Opcodes{header}.Add(keyCodes...).Add(value).Add(valueCodes...).Add(key).Add(end)
-}
-
-func (c *MapCode) Filter(_ *FieldQuery) Code {
-	return c
-}
-
-type StructCode struct {
-	typ                       *runtime.Type
-	fields                    []*StructFieldCode
-	isPtr                     bool
-	disableIndirectConversion bool
-	isIndirect                bool
-	isRecursive               bool
-}
-
-func (c *StructCode) Kind() CodeKind {
-	return CodeKindStruct
-}
-
-func (c *StructCode) lastFieldCode(field *StructFieldCode, firstField *Opcode) *Opcode {
-	if isEmbeddedStruct(field) {
-		return c.lastAnonymousFieldCode(firstField)
-	}
-	lastField := firstField
-	for lastField.NextField != nil {
-		lastField = lastField.NextField
-	}
-	return lastField
-}
-
-func (c *StructCode) lastAnonymousFieldCode(firstField *Opcode) *Opcode {
-	// firstField is special StructHead operation for anonymous structure.
-	// So, StructHead's next operation is truly struct head operation.
-	for firstField.Op == OpStructHead || firstField.Op == OpStructField {
-		firstField = firstField.Next
-	}
-	lastField := firstField
-	for lastField.NextField != nil {
-		lastField = lastField.NextField
-	}
-	return lastField
-}
-
-func (c *StructCode) ToOpcode(ctx *compileContext) Opcodes {
-	// header => code => structField => code => end
-	//                        ^          |
-	//                        |__________|
-	if c.isRecursive {
-		recursive := newRecursiveCode(ctx, c.typ, &CompiledCode{})
-		recursive.Type = c.typ
-		ctx.incIndex()
-		*ctx.recursiveCodes = append(*ctx.recursiveCodes, recursive)
-		return Opcodes{recursive}
-	}
-	codes := Opcodes{}
-	var prevField *Opcode
-	ctx.incIndent()
-	for idx, field := range c.fields {
-		isFirstField := idx == 0
-		isEndField := idx == len(c.fields)-1
-		fieldCodes := field.ToOpcode(ctx, isFirstField, isEndField)
-		for _, code := range fieldCodes {
-			if c.isIndirect {
-				code.Flags |= IndirectFlags
-			}
-		}
-		firstField := fieldCodes.First()
-		if len(codes) > 0 {
-			codes.Last().Next = firstField
-			firstField.Idx = codes.First().Idx
-		}
-		if prevField != nil {
-			prevField.NextField = firstField
-		}
-		if isEndField {
-			endField := fieldCodes.Last()
-			if len(codes) > 0 {
-				codes.First().End = endField
-			} else {
-				firstField.End = endField
-			}
-			codes = codes.Add(fieldCodes...)
-			break
-		}
-		prevField = c.lastFieldCode(field, firstField)
-		codes = codes.Add(fieldCodes...)
-	}
-	if len(codes) == 0 {
-		head := &Opcode{
-			Op:         OpStructHead,
-			Idx:        opcodeOffset(ctx.ptrIndex),
-			Type:       c.typ,
-			DisplayIdx: ctx.opcodeIndex,
-			Indent:     ctx.indent,
-		}
-		ctx.incOpcodeIndex()
-		end := &Opcode{
-			Op:         OpStructEnd,
-			Idx:        opcodeOffset(ctx.ptrIndex),
-			DisplayIdx: ctx.opcodeIndex,
-			Indent:     ctx.indent,
-		}
-		head.NextField = end
-		head.Next = end
-		head.End = end
-		codes = codes.Add(head, end)
-		ctx.incIndex()
-	}
-	ctx.decIndent()
-	ctx.structTypeToCodes[uintptr(unsafe.Pointer(c.typ))] = codes
-	return codes
-}
-
-func (c *StructCode) ToAnonymousOpcode(ctx *compileContext) Opcodes {
-	// header => code => structField => code => end
-	//                        ^          |
-	//                        |__________|
-	if c.isRecursive {
-		recursive := newRecursiveCode(ctx, c.typ, &CompiledCode{})
-		recursive.Type = c.typ
-		ctx.incIndex()
-		*ctx.recursiveCodes = append(*ctx.recursiveCodes, recursive)
-		return Opcodes{recursive}
-	}
-	codes := Opcodes{}
-	var prevField *Opcode
-	for idx, field := range c.fields {
-		isFirstField := idx == 0
-		isEndField := idx == len(c.fields)-1
-		fieldCodes := field.ToAnonymousOpcode(ctx, isFirstField, isEndField)
-		for _, code := range fieldCodes {
-			if c.isIndirect {
-				code.Flags |= IndirectFlags
-			}
-		}
-		firstField := fieldCodes.First()
-		if len(codes) > 0 {
-			codes.Last().Next = firstField
-			firstField.Idx = codes.First().Idx
-		}
-		if prevField != nil {
-			prevField.NextField = firstField
-		}
-		if isEndField {
-			lastField := fieldCodes.Last()
-			if len(codes) > 0 {
-				codes.First().End = lastField
-			} else {
-				firstField.End = lastField
-			}
-		}
-		prevField = firstField
-		codes = codes.Add(fieldCodes...)
-	}
-	return codes
-}
-
-func (c *StructCode) removeFieldsByTags(tags runtime.StructTags) {
-	fields := make([]*StructFieldCode, 0, len(c.fields))
-	for _, field := range c.fields {
-		if field.isAnonymous {
-			structCode := field.getAnonymousStruct()
-			if structCode != nil && !structCode.isRecursive {
-				structCode.removeFieldsByTags(tags)
-				if len(structCode.fields) > 0 {
-					fields = append(fields, field)
-				}
-				continue
-			}
-		}
-		if tags.ExistsKey(field.key) {
-			continue
-		}
-		fields = append(fields, field)
-	}
-	c.fields = fields
-}
-
-func (c *StructCode) enableIndirect() {
-	if c.isIndirect {
-		return
-	}
-	c.isIndirect = true
-	if len(c.fields) == 0 {
-		return
-	}
-	structCode := c.fields[0].getStruct()
-	if structCode == nil {
-		return
-	}
-	structCode.enableIndirect()
-}
-
-func (c *StructCode) Filter(query *FieldQuery) Code {
-	fieldMap := map[string]*FieldQuery{}
-	for _, field := range query.Fields {
-		fieldMap[field.Name] = field
-	}
-	fields := make([]*StructFieldCode, 0, len(c.fields))
-	for _, field := range c.fields {
-		query, exists := fieldMap[field.key]
-		if !exists {
-			continue
-		}
-		fieldCode := &StructFieldCode{
-			typ:                field.typ,
-			key:                field.key,
-			tag:                field.tag,
-			value:              field.value,
-			offset:             field.offset,
-			isAnonymous:        field.isAnonymous,
-			isTaggedKey:        field.isTaggedKey,
-			isNilableType:      field.isNilableType,
-			isNilCheck:         field.isNilCheck,
-			isAddrForMarshaler: field.isAddrForMarshaler,
-			isNextOpPtrType:    field.isNextOpPtrType,
-		}
-		if len(query.Fields) > 0 {
-			fieldCode.value = fieldCode.value.Filter(query)
-		}
-		fields = append(fields, fieldCode)
-	}
-	return &StructCode{
-		typ:                       c.typ,
-		fields:                    fields,
-		isPtr:                     c.isPtr,
-		disableIndirectConversion: c.disableIndirectConversion,
-		isIndirect:                c.isIndirect,
-		isRecursive:               c.isRecursive,
-	}
-}
-
-type StructFieldCode struct {
-	typ                *runtime.Type
-	key                string
-	tag                *runtime.StructTag
-	value              Code
-	offset             uintptr
-	isAnonymous        bool
-	isTaggedKey        bool
-	isNilableType      bool
-	isNilCheck         bool
-	isAddrForMarshaler bool
-	isNextOpPtrType    bool
-	isMarshalerContext bool
-}
-
-func (c *StructFieldCode) getStruct() *StructCode {
-	value := c.value
-	ptr, ok := value.(*PtrCode)
-	if ok {
-		value = ptr.value
-	}
-	structCode, ok := value.(*StructCode)
-	if ok {
-		return structCode
-	}
-	return nil
-}
-
-func (c *StructFieldCode) getAnonymousStruct() *StructCode {
-	if !c.isAnonymous {
-		return nil
-	}
-	return c.getStruct()
-}
-
-func optimizeStructHeader(code *Opcode, tag *runtime.StructTag) OpType {
-	headType := code.ToHeaderType(tag.IsString)
-	if tag.IsOmitEmpty {
-		headType = headType.HeadToOmitEmptyHead()
-	}
-	return headType
-}
-
-func optimizeStructField(code *Opcode, tag *runtime.StructTag) OpType {
-	fieldType := code.ToFieldType(tag.IsString)
-	if tag.IsOmitEmpty {
-		fieldType = fieldType.FieldToOmitEmptyField()
-	}
-	return fieldType
-}
-
-func (c *StructFieldCode) headerOpcodes(ctx *compileContext, field *Opcode, valueCodes Opcodes) Opcodes {
-	value := valueCodes.First()
-	op := optimizeStructHeader(value, c.tag)
-	field.Op = op
-	if value.Flags&MarshalerContextFlags != 0 {
-		field.Flags |= MarshalerContextFlags
-	}
-	field.NumBitSize = value.NumBitSize
-	field.PtrNum = value.PtrNum
-	field.FieldQuery = value.FieldQuery
-	fieldCodes := Opcodes{field}
-	if op.IsMultipleOpHead() {
-		field.Next = value
-		fieldCodes = fieldCodes.Add(valueCodes...)
-	} else {
-		ctx.decIndex()
-	}
-	return fieldCodes
-}
-
-func (c *StructFieldCode) fieldOpcodes(ctx *compileContext, field *Opcode, valueCodes Opcodes) Opcodes {
-	value := valueCodes.First()
-	op := optimizeStructField(value, c.tag)
-	field.Op = op
-	if value.Flags&MarshalerContextFlags != 0 {
-		field.Flags |= MarshalerContextFlags
-	}
-	field.NumBitSize = value.NumBitSize
-	field.PtrNum = value.PtrNum
-	field.FieldQuery = value.FieldQuery
-
-	fieldCodes := Opcodes{field}
-	if op.IsMultipleOpField() {
-		field.Next = value
-		fieldCodes = fieldCodes.Add(valueCodes...)
-	} else {
-		ctx.decIndex()
-	}
-	return fieldCodes
-}
-
-func (c *StructFieldCode) addStructEndCode(ctx *compileContext, codes Opcodes) Opcodes {
-	end := &Opcode{
-		Op:         OpStructEnd,
-		Idx:        opcodeOffset(ctx.ptrIndex),
-		DisplayIdx: ctx.opcodeIndex,
-		Indent:     ctx.indent,
-	}
-	codes.Last().Next = end
-	code := codes.First()
-	for code.Op == OpStructField || code.Op == OpStructHead {
-		code = code.Next
-	}
-	for code.NextField != nil {
-		code = code.NextField
-	}
-	code.NextField = end
-
-	codes = codes.Add(end)
-	ctx.incOpcodeIndex()
-	return codes
-}
-
-func (c *StructFieldCode) structKey(ctx *compileContext) string {
-	if ctx.escapeKey {
-		rctx := &RuntimeContext{Option: &Option{Flag: HTMLEscapeOption}}
-		return fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, c.key)))
-	}
-	return fmt.Sprintf(`"%s":`, c.key)
-}
-
-func (c *StructFieldCode) flags() OpFlags {
-	var flags OpFlags
-	if c.isTaggedKey {
-		flags |= IsTaggedKeyFlags
-	}
-	if c.isNilableType {
-		flags |= IsNilableTypeFlags
-	}
-	if c.isNilCheck {
-		flags |= NilCheckFlags
-	}
-	if c.isAddrForMarshaler {
-		flags |= AddrForMarshalerFlags
-	}
-	if c.isNextOpPtrType {
-		flags |= IsNextOpPtrTypeFlags
-	}
-	if c.isAnonymous {
-		flags |= AnonymousKeyFlags
-	}
-	if c.isMarshalerContext {
-		flags |= MarshalerContextFlags
-	}
-	return flags
-}
-
-func (c *StructFieldCode) toValueOpcodes(ctx *compileContext) Opcodes {
-	if c.isAnonymous {
-		anonymCode, ok := c.value.(AnonymousCode)
-		if ok {
-			return anonymCode.ToAnonymousOpcode(ctx)
-		}
-	}
-	return c.value.ToOpcode(ctx)
-}
-
-func (c *StructFieldCode) ToOpcode(ctx *compileContext, isFirstField, isEndField bool) Opcodes {
-	field := &Opcode{
-		Idx:        opcodeOffset(ctx.ptrIndex),
-		Flags:      c.flags(),
-		Key:        c.structKey(ctx),
-		Offset:     uint32(c.offset),
-		Type:       c.typ,
-		DisplayIdx: ctx.opcodeIndex,
-		Indent:     ctx.indent,
-		DisplayKey: c.key,
-	}
-	ctx.incIndex()
-	valueCodes := c.toValueOpcodes(ctx)
-	if isFirstField {
-		codes := c.headerOpcodes(ctx, field, valueCodes)
-		if isEndField {
-			codes = c.addStructEndCode(ctx, codes)
-		}
-		return codes
-	}
-	codes := c.fieldOpcodes(ctx, field, valueCodes)
-	if isEndField {
-		if isEnableStructEndOptimization(c.value) {
-			field.Op = field.Op.FieldToEnd()
-		} else {
-			codes = c.addStructEndCode(ctx, codes)
-		}
-	}
-	return codes
-}
-
-func (c *StructFieldCode) ToAnonymousOpcode(ctx *compileContext, isFirstField, isEndField bool) Opcodes {
-	field := &Opcode{
-		Idx:        opcodeOffset(ctx.ptrIndex),
-		Flags:      c.flags() | AnonymousHeadFlags,
-		Key:        c.structKey(ctx),
-		Offset:     uint32(c.offset),
-		Type:       c.typ,
-		DisplayIdx: ctx.opcodeIndex,
-		Indent:     ctx.indent,
-		DisplayKey: c.key,
-	}
-	ctx.incIndex()
-	valueCodes := c.toValueOpcodes(ctx)
-	if isFirstField {
-		return c.headerOpcodes(ctx, field, valueCodes)
-	}
-	return c.fieldOpcodes(ctx, field, valueCodes)
-}
-
-func isEnableStructEndOptimization(value Code) bool {
-	switch value.Kind() {
-	case CodeKindInt,
-		CodeKindUint,
-		CodeKindFloat,
-		CodeKindString,
-		CodeKindBool,
-		CodeKindBytes:
-		return true
-	case CodeKindPtr:
-		return isEnableStructEndOptimization(value.(*PtrCode).value)
-	default:
-		return false
-	}
-}
-
-type InterfaceCode struct {
-	typ        *runtime.Type
-	fieldQuery *FieldQuery
-	isPtr      bool
-}
-
-func (c *InterfaceCode) Kind() CodeKind {
-	return CodeKindInterface
-}
-
-func (c *InterfaceCode) ToOpcode(ctx *compileContext) Opcodes {
-	var code *Opcode
-	switch {
-	case c.isPtr:
-		code = newOpCode(ctx, c.typ, OpInterfacePtr)
-	default:
-		code = newOpCode(ctx, c.typ, OpInterface)
-	}
-	code.FieldQuery = c.fieldQuery
-	if c.typ.NumMethod() > 0 {
-		code.Flags |= NonEmptyInterfaceFlags
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *InterfaceCode) Filter(query *FieldQuery) Code {
-	return &InterfaceCode{
-		typ:        c.typ,
-		fieldQuery: query,
-		isPtr:      c.isPtr,
-	}
-}
-
-type MarshalJSONCode struct {
-	typ                *runtime.Type
-	fieldQuery         *FieldQuery
-	isAddrForMarshaler bool
-	isNilableType      bool
-	isMarshalerContext bool
-}
-
-func (c *MarshalJSONCode) Kind() CodeKind {
-	return CodeKindMarshalJSON
-}
-
-func (c *MarshalJSONCode) ToOpcode(ctx *compileContext) Opcodes {
-	code := newOpCode(ctx, c.typ, OpMarshalJSON)
-	code.FieldQuery = c.fieldQuery
-	if c.isAddrForMarshaler {
-		code.Flags |= AddrForMarshalerFlags
-	}
-	if c.isMarshalerContext {
-		code.Flags |= MarshalerContextFlags
-	}
-	if c.isNilableType {
-		code.Flags |= IsNilableTypeFlags
-	} else {
-		code.Flags &= ^IsNilableTypeFlags
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *MarshalJSONCode) Filter(query *FieldQuery) Code {
-	return &MarshalJSONCode{
-		typ:                c.typ,
-		fieldQuery:         query,
-		isAddrForMarshaler: c.isAddrForMarshaler,
-		isNilableType:      c.isNilableType,
-		isMarshalerContext: c.isMarshalerContext,
-	}
-}
-
-type MarshalTextCode struct {
-	typ                *runtime.Type
-	fieldQuery         *FieldQuery
-	isAddrForMarshaler bool
-	isNilableType      bool
-}
-
-func (c *MarshalTextCode) Kind() CodeKind {
-	return CodeKindMarshalText
-}
-
-func (c *MarshalTextCode) ToOpcode(ctx *compileContext) Opcodes {
-	code := newOpCode(ctx, c.typ, OpMarshalText)
-	code.FieldQuery = c.fieldQuery
-	if c.isAddrForMarshaler {
-		code.Flags |= AddrForMarshalerFlags
-	}
-	if c.isNilableType {
-		code.Flags |= IsNilableTypeFlags
-	} else {
-		code.Flags &= ^IsNilableTypeFlags
-	}
-	ctx.incIndex()
-	return Opcodes{code}
-}
-
-func (c *MarshalTextCode) Filter(query *FieldQuery) Code {
-	return &MarshalTextCode{
-		typ:                c.typ,
-		fieldQuery:         query,
-		isAddrForMarshaler: c.isAddrForMarshaler,
-		isNilableType:      c.isNilableType,
-	}
-}
-
-type PtrCode struct {
-	typ    *runtime.Type
-	value  Code
-	ptrNum uint8
-}
-
-func (c *PtrCode) Kind() CodeKind {
-	return CodeKindPtr
-}
-
-func (c *PtrCode) ToOpcode(ctx *compileContext) Opcodes {
-	codes := c.value.ToOpcode(ctx)
-	codes.First().Op = convertPtrOp(codes.First())
-	codes.First().PtrNum = c.ptrNum
-	return codes
-}
-
-func (c *PtrCode) ToAnonymousOpcode(ctx *compileContext) Opcodes {
-	var codes Opcodes
-	anonymCode, ok := c.value.(AnonymousCode)
-	if ok {
-		codes = anonymCode.ToAnonymousOpcode(ctx)
-	} else {
-		codes = c.value.ToOpcode(ctx)
-	}
-	codes.First().Op = convertPtrOp(codes.First())
-	codes.First().PtrNum = c.ptrNum
-	return codes
-}
-
-func (c *PtrCode) Filter(query *FieldQuery) Code {
-	return &PtrCode{
-		typ:    c.typ,
-		value:  c.value.Filter(query),
-		ptrNum: c.ptrNum,
-	}
-}
-
-func convertPtrOp(code *Opcode) OpType {
-	ptrHeadOp := code.Op.HeadToPtrHead()
-	if code.Op != ptrHeadOp {
-		if code.PtrNum > 0 {
-			// ptr field and ptr head
-			code.PtrNum--
-		}
-		return ptrHeadOp
-	}
-	switch code.Op {
-	case OpInt:
-		return OpIntPtr
-	case OpUint:
-		return OpUintPtr
-	case OpFloat32:
-		return OpFloat32Ptr
-	case OpFloat64:
-		return OpFloat64Ptr
-	case OpString:
-		return OpStringPtr
-	case OpBool:
-		return OpBoolPtr
-	case OpBytes:
-		return OpBytesPtr
-	case OpNumber:
-		return OpNumberPtr
-	case OpArray:
-		return OpArrayPtr
-	case OpSlice:
-		return OpSlicePtr
-	case OpMap:
-		return OpMapPtr
-	case OpMarshalJSON:
-		return OpMarshalJSONPtr
-	case OpMarshalText:
-		return OpMarshalTextPtr
-	case OpInterface:
-		return OpInterfacePtr
-	case OpRecursive:
-		return OpRecursivePtr
-	}
-	return code.Op
-}
-
-func isEmbeddedStruct(field *StructFieldCode) bool {
-	if !field.isAnonymous {
-		return false
-	}
-	t := field.typ
-	if t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	return t.Kind() == reflect.Struct
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compact.go b/vendor/github.com/goccy/go-json/internal/encoder/compact.go
index e287a6c..0eb9545 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compact.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compact.go
@@ -213,8 +213,8 @@ func compactString(dst, src []byte, cursor int64, escape bool) ([]byte, int64, e
 				dst = append(dst, src[start:cursor]...)
 				dst = append(dst, `\u202`...)
 				dst = append(dst, hex[src[cursor+2]&0xF])
-				start = cursor + 3
 				cursor += 2
+				start = cursor + 3
 			}
 		}
 		switch c {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
index b107636..c627ed3 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
@@ -4,8 +4,9 @@ import (
 	"context"
 	"encoding"
 	"encoding/json"
+	"fmt"
 	"reflect"
-	"sync"
+	"strings"
 	"sync/atomic"
 	"unsafe"
 
@@ -25,17 +26,14 @@ var (
 	cachedOpcodeSets       []*OpcodeSet
 	cachedOpcodeMap        unsafe.Pointer // map[uintptr]*OpcodeSet
 	typeAddr               *runtime.TypeAddr
-	initEncoderOnce        sync.Once
 )
 
-func initEncoder() {
-	initEncoderOnce.Do(func() {
-		typeAddr = runtime.AnalyzeTypeAddr()
-		if typeAddr == nil {
-			typeAddr = &runtime.TypeAddr{}
-		}
-		cachedOpcodeSets = make([]*OpcodeSet, typeAddr.AddrRange>>typeAddr.AddrShift+1)
-	})
+func init() {
+	typeAddr = runtime.AnalyzeTypeAddr()
+	if typeAddr == nil {
+		typeAddr = &runtime.TypeAddr{}
+	}
+	cachedOpcodeSets = make([]*OpcodeSet, typeAddr.AddrRange>>typeAddr.AddrShift)
 }
 
 func loadOpcodeMap() map[uintptr]*OpcodeSet {
@@ -59,68 +57,25 @@ func compileToGetCodeSetSlowPath(typeptr uintptr) (*OpcodeSet, error) {
 	if codeSet, exists := opcodeMap[typeptr]; exists {
 		return codeSet, nil
 	}
-	codeSet, err := newCompiler().compile(typeptr)
-	if err != nil {
-		return nil, err
-	}
-	storeOpcodeSet(typeptr, codeSet, opcodeMap)
-	return codeSet, nil
-}
 
-func getFilteredCodeSetIfNeeded(ctx *RuntimeContext, codeSet *OpcodeSet) (*OpcodeSet, error) {
-	if (ctx.Option.Flag & ContextOption) == 0 {
-		return codeSet, nil
-	}
-	query := FieldQueryFromContext(ctx.Option.Context)
-	if query == nil {
-		return codeSet, nil
-	}
-	ctx.Option.Flag |= FieldQueryOption
-	cacheCodeSet := codeSet.getQueryCache(query.Hash())
-	if cacheCodeSet != nil {
-		return cacheCodeSet, nil
-	}
-	queryCodeSet, err := newCompiler().codeToOpcodeSet(codeSet.Type, codeSet.Code.Filter(query))
-	if err != nil {
-		return nil, err
-	}
-	codeSet.setQueryCache(query.Hash(), queryCodeSet)
-	return queryCodeSet, nil
-}
-
-type Compiler struct {
-	structTypeToCode map[uintptr]*StructCode
-}
-
-func newCompiler() *Compiler {
-	return &Compiler{
-		structTypeToCode: map[uintptr]*StructCode{},
-	}
-}
-
-func (c *Compiler) compile(typeptr uintptr) (*OpcodeSet, error) {
 	// noescape trick for header.typ ( reflect.*rtype )
-	typ := *(**runtime.Type)(unsafe.Pointer(&typeptr))
-	code, err := c.typeToCode(typ)
+	copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
+
+	noescapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+	})
 	if err != nil {
 		return nil, err
 	}
-	return c.codeToOpcodeSet(typ, code)
-}
-
-func (c *Compiler) codeToOpcodeSet(typ *runtime.Type, code Code) (*OpcodeSet, error) {
-	noescapeKeyCode := c.codeToOpcode(&compileContext{
-		structTypeToCodes: map[uintptr]Opcodes{},
-		recursiveCodes:    &Opcodes{},
-	}, typ, code)
-	if err := noescapeKeyCode.Validate(); err != nil {
+	escapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+		escapeKey:                true,
+	})
+	if err != nil {
 		return nil, err
 	}
-	escapeKeyCode := c.codeToOpcode(&compileContext{
-		structTypeToCodes: map[uintptr]Opcodes{},
-		recursiveCodes:    &Opcodes{},
-		escapeKey:         true,
-	}, typ, code)
 	noescapeKeyCode = copyOpcode(noescapeKeyCode)
 	escapeKeyCode = copyOpcode(escapeKeyCode)
 	setTotalLengthToInterfaceOp(noescapeKeyCode)
@@ -128,25 +83,26 @@ func (c *Compiler) codeToOpcodeSet(typ *runtime.Type, code Code) (*OpcodeSet, er
 	interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
 	interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
 	codeLength := noescapeKeyCode.TotalLength()
-	return &OpcodeSet{
-		Type:                     typ,
+	codeSet := &OpcodeSet{
+		Type:                     copiedType,
 		NoescapeKeyCode:          noescapeKeyCode,
 		EscapeKeyCode:            escapeKeyCode,
 		InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
 		InterfaceEscapeKeyCode:   interfaceEscapeKeyCode,
 		CodeLength:               codeLength,
 		EndCode:                  ToEndCode(interfaceNoescapeKeyCode),
-		Code:                     code,
-		QueryCache:               map[string]*OpcodeSet{},
-	}, nil
+	}
+	storeOpcodeSet(typeptr, codeSet, opcodeMap)
+	return codeSet, nil
 }
 
-func (c *Compiler) typeToCode(typ *runtime.Type) (Code, error) {
+func compileHead(ctx *compileContext) (*Opcode, error) {
+	typ := ctx.typ
 	switch {
-	case c.implementsMarshalJSON(typ):
-		return c.marshalJSONCode(typ)
-	case c.implementsMarshalText(typ):
-		return c.marshalTextCode(typ)
+	case implementsMarshalJSON(typ):
+		return compileMarshalJSON(ctx)
+	case implementsMarshalText(typ):
+		return compileMarshalText(ctx)
 	}
 
 	isPtr := false
@@ -156,700 +112,262 @@ func (c *Compiler) typeToCode(typ *runtime.Type) (Code, error) {
 		isPtr = true
 	}
 	switch {
-	case c.implementsMarshalJSON(typ):
-		return c.marshalJSONCode(orgType)
-	case c.implementsMarshalText(typ):
-		return c.marshalTextCode(orgType)
+	case implementsMarshalJSON(typ):
+		return compileMarshalJSON(ctx)
+	case implementsMarshalText(typ):
+		return compileMarshalText(ctx)
 	}
 	switch typ.Kind() {
 	case reflect.Slice:
+		ctx := ctx.withType(typ)
 		elem := typ.Elem()
 		if elem.Kind() == reflect.Uint8 {
 			p := runtime.PtrTo(elem)
-			if !c.implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
-				return c.bytesCode(typ, isPtr)
+			if !implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
+				if isPtr {
+					return compileBytesPtr(ctx)
+				}
+				return compileBytes(ctx)
 			}
 		}
-		return c.sliceCode(typ)
+		code, err := compileSlice(ctx)
+		if err != nil {
+			return nil, err
+		}
+		optimizeStructEnd(code)
+		linkRecursiveCode(code)
+		return code, nil
 	case reflect.Map:
 		if isPtr {
-			return c.ptrCode(runtime.PtrTo(typ))
+			return compilePtr(ctx.withType(runtime.PtrTo(typ)))
 		}
-		return c.mapCode(typ)
+		code, err := compileMap(ctx.withType(typ))
+		if err != nil {
+			return nil, err
+		}
+		optimizeStructEnd(code)
+		linkRecursiveCode(code)
+		return code, nil
 	case reflect.Struct:
-		return c.structCode(typ, isPtr)
+		code, err := compileStruct(ctx.withType(typ), isPtr)
+		if err != nil {
+			return nil, err
+		}
+		optimizeStructEnd(code)
+		linkRecursiveCode(code)
+		return code, nil
 	case reflect.Int:
-		return c.intCode(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileIntPtr(ctx)
+		}
+		return compileInt(ctx)
 	case reflect.Int8:
-		return c.int8Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileInt8Ptr(ctx)
+		}
+		return compileInt8(ctx)
 	case reflect.Int16:
-		return c.int16Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileInt16Ptr(ctx)
+		}
+		return compileInt16(ctx)
 	case reflect.Int32:
-		return c.int32Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileInt32Ptr(ctx)
+		}
+		return compileInt32(ctx)
 	case reflect.Int64:
-		return c.int64Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileInt64Ptr(ctx)
+		}
+		return compileInt64(ctx)
 	case reflect.Uint, reflect.Uintptr:
-		return c.uintCode(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileUintPtr(ctx)
+		}
+		return compileUint(ctx)
 	case reflect.Uint8:
-		return c.uint8Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileUint8Ptr(ctx)
+		}
+		return compileUint8(ctx)
 	case reflect.Uint16:
-		return c.uint16Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileUint16Ptr(ctx)
+		}
+		return compileUint16(ctx)
 	case reflect.Uint32:
-		return c.uint32Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileUint32Ptr(ctx)
+		}
+		return compileUint32(ctx)
 	case reflect.Uint64:
-		return c.uint64Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileUint64Ptr(ctx)
+		}
+		return compileUint64(ctx)
 	case reflect.Float32:
-		return c.float32Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileFloat32Ptr(ctx)
+		}
+		return compileFloat32(ctx)
 	case reflect.Float64:
-		return c.float64Code(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileFloat64Ptr(ctx)
+		}
+		return compileFloat64(ctx)
 	case reflect.String:
-		return c.stringCode(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileStringPtr(ctx)
+		}
+		return compileString(ctx)
 	case reflect.Bool:
-		return c.boolCode(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileBoolPtr(ctx)
+		}
+		return compileBool(ctx)
 	case reflect.Interface:
-		return c.interfaceCode(typ, isPtr)
+		ctx := ctx.withType(typ)
+		if isPtr {
+			return compileInterfacePtr(ctx)
+		}
+		return compileInterface(ctx)
 	default:
 		if isPtr && typ.Implements(marshalTextType) {
 			typ = orgType
 		}
-		return c.typeToCodeWithPtr(typ, isPtr)
-	}
-}
-
-func (c *Compiler) typeToCodeWithPtr(typ *runtime.Type, isPtr bool) (Code, error) {
-	switch {
-	case c.implementsMarshalJSON(typ):
-		return c.marshalJSONCode(typ)
-	case c.implementsMarshalText(typ):
-		return c.marshalTextCode(typ)
-	}
-	switch typ.Kind() {
-	case reflect.Ptr:
-		return c.ptrCode(typ)
-	case reflect.Slice:
-		elem := typ.Elem()
-		if elem.Kind() == reflect.Uint8 {
-			p := runtime.PtrTo(elem)
-			if !c.implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
-				return c.bytesCode(typ, false)
-			}
-		}
-		return c.sliceCode(typ)
-	case reflect.Array:
-		return c.arrayCode(typ)
-	case reflect.Map:
-		return c.mapCode(typ)
-	case reflect.Struct:
-		return c.structCode(typ, isPtr)
-	case reflect.Interface:
-		return c.interfaceCode(typ, false)
-	case reflect.Int:
-		return c.intCode(typ, false)
-	case reflect.Int8:
-		return c.int8Code(typ, false)
-	case reflect.Int16:
-		return c.int16Code(typ, false)
-	case reflect.Int32:
-		return c.int32Code(typ, false)
-	case reflect.Int64:
-		return c.int64Code(typ, false)
-	case reflect.Uint:
-		return c.uintCode(typ, false)
-	case reflect.Uint8:
-		return c.uint8Code(typ, false)
-	case reflect.Uint16:
-		return c.uint16Code(typ, false)
-	case reflect.Uint32:
-		return c.uint32Code(typ, false)
-	case reflect.Uint64:
-		return c.uint64Code(typ, false)
-	case reflect.Uintptr:
-		return c.uintCode(typ, false)
-	case reflect.Float32:
-		return c.float32Code(typ, false)
-	case reflect.Float64:
-		return c.float64Code(typ, false)
-	case reflect.String:
-		return c.stringCode(typ, false)
-	case reflect.Bool:
-		return c.boolCode(typ, false)
-	}
-	return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
-}
-
-const intSize = 32 << (^uint(0) >> 63)
-
-//nolint:unparam
-func (c *Compiler) intCode(typ *runtime.Type, isPtr bool) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: intSize, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int8Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 8, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int16Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 16, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int32Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int64Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uintCode(typ *runtime.Type, isPtr bool) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: intSize, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint8Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 8, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint16Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 16, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint32Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint64Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) float32Code(typ *runtime.Type, isPtr bool) (*FloatCode, error) {
-	return &FloatCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) float64Code(typ *runtime.Type, isPtr bool) (*FloatCode, error) {
-	return &FloatCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) stringCode(typ *runtime.Type, isPtr bool) (*StringCode, error) {
-	return &StringCode{typ: typ, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) boolCode(typ *runtime.Type, isPtr bool) (*BoolCode, error) {
-	return &BoolCode{typ: typ, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) intStringCode(typ *runtime.Type) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: intSize, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int8StringCode(typ *runtime.Type) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 8, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int16StringCode(typ *runtime.Type) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 16, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int32StringCode(typ *runtime.Type) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 32, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) int64StringCode(typ *runtime.Type) (*IntCode, error) {
-	return &IntCode{typ: typ, bitSize: 64, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uintStringCode(typ *runtime.Type) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: intSize, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint8StringCode(typ *runtime.Type) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 8, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint16StringCode(typ *runtime.Type) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 16, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint32StringCode(typ *runtime.Type) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 32, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) uint64StringCode(typ *runtime.Type) (*UintCode, error) {
-	return &UintCode{typ: typ, bitSize: 64, isString: true}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) bytesCode(typ *runtime.Type, isPtr bool) (*BytesCode, error) {
-	return &BytesCode{typ: typ, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) interfaceCode(typ *runtime.Type, isPtr bool) (*InterfaceCode, error) {
-	return &InterfaceCode{typ: typ, isPtr: isPtr}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) marshalJSONCode(typ *runtime.Type) (*MarshalJSONCode, error) {
-	return &MarshalJSONCode{
-		typ:                typ,
-		isAddrForMarshaler: c.isPtrMarshalJSONType(typ),
-		isNilableType:      c.isNilableType(typ),
-		isMarshalerContext: typ.Implements(marshalJSONContextType) || runtime.PtrTo(typ).Implements(marshalJSONContextType),
-	}, nil
-}
-
-//nolint:unparam
-func (c *Compiler) marshalTextCode(typ *runtime.Type) (*MarshalTextCode, error) {
-	return &MarshalTextCode{
-		typ:                typ,
-		isAddrForMarshaler: c.isPtrMarshalTextType(typ),
-		isNilableType:      c.isNilableType(typ),
-	}, nil
-}
-
-func (c *Compiler) ptrCode(typ *runtime.Type) (*PtrCode, error) {
-	code, err := c.typeToCodeWithPtr(typ.Elem(), true)
-	if err != nil {
-		return nil, err
-	}
-	ptr, ok := code.(*PtrCode)
-	if ok {
-		return &PtrCode{typ: typ, value: ptr.value, ptrNum: ptr.ptrNum + 1}, nil
-	}
-	return &PtrCode{typ: typ, value: code, ptrNum: 1}, nil
-}
-
-func (c *Compiler) sliceCode(typ *runtime.Type) (*SliceCode, error) {
-	elem := typ.Elem()
-	code, err := c.listElemCode(elem)
-	if err != nil {
-		return nil, err
-	}
-	if code.Kind() == CodeKindStruct {
-		structCode := code.(*StructCode)
-		structCode.enableIndirect()
-	}
-	return &SliceCode{typ: typ, value: code}, nil
-}
-
-func (c *Compiler) arrayCode(typ *runtime.Type) (*ArrayCode, error) {
-	elem := typ.Elem()
-	code, err := c.listElemCode(elem)
-	if err != nil {
-		return nil, err
-	}
-	if code.Kind() == CodeKindStruct {
-		structCode := code.(*StructCode)
-		structCode.enableIndirect()
-	}
-	return &ArrayCode{typ: typ, value: code}, nil
-}
-
-func (c *Compiler) mapCode(typ *runtime.Type) (*MapCode, error) {
-	keyCode, err := c.mapKeyCode(typ.Key())
-	if err != nil {
-		return nil, err
-	}
-	valueCode, err := c.mapValueCode(typ.Elem())
-	if err != nil {
-		return nil, err
-	}
-	if valueCode.Kind() == CodeKindStruct {
-		structCode := valueCode.(*StructCode)
-		structCode.enableIndirect()
-	}
-	return &MapCode{typ: typ, key: keyCode, value: valueCode}, nil
-}
-
-func (c *Compiler) listElemCode(typ *runtime.Type) (Code, error) {
-	switch {
-	case c.implementsMarshalJSONType(typ) || c.implementsMarshalJSONType(runtime.PtrTo(typ)):
-		return c.marshalJSONCode(typ)
-	case !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType):
-		return c.marshalTextCode(typ)
-	case typ.Kind() == reflect.Map:
-		return c.ptrCode(runtime.PtrTo(typ))
-	default:
-		// isPtr was originally used to indicate whether the type of top level is pointer.
-		// However, since the slice/array element is a specification that can get the pointer address, explicitly set isPtr to true.
-		// See here for related issues: https://github.com/goccy/go-json/issues/370
-		code, err := c.typeToCodeWithPtr(typ, true)
+		code, err := compile(ctx.withType(typ), isPtr)
 		if err != nil {
 			return nil, err
 		}
-		ptr, ok := code.(*PtrCode)
-		if ok {
-			if ptr.value.Kind() == CodeKindMap {
-				ptr.ptrNum++
-			}
-		}
+		optimizeStructEnd(code)
+		linkRecursiveCode(code)
 		return code, nil
 	}
 }
 
-func (c *Compiler) mapKeyCode(typ *runtime.Type) (Code, error) {
-	switch {
-	case c.implementsMarshalText(typ):
-		return c.marshalTextCode(typ)
-	}
-	switch typ.Kind() {
-	case reflect.Ptr:
-		return c.ptrCode(typ)
-	case reflect.String:
-		return c.stringCode(typ, false)
-	case reflect.Int:
-		return c.intStringCode(typ)
-	case reflect.Int8:
-		return c.int8StringCode(typ)
-	case reflect.Int16:
-		return c.int16StringCode(typ)
-	case reflect.Int32:
-		return c.int32StringCode(typ)
-	case reflect.Int64:
-		return c.int64StringCode(typ)
-	case reflect.Uint:
-		return c.uintStringCode(typ)
-	case reflect.Uint8:
-		return c.uint8StringCode(typ)
-	case reflect.Uint16:
-		return c.uint16StringCode(typ)
-	case reflect.Uint32:
-		return c.uint32StringCode(typ)
-	case reflect.Uint64:
-		return c.uint64StringCode(typ)
-	case reflect.Uintptr:
-		return c.uintStringCode(typ)
-	}
-	return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
-}
-
-func (c *Compiler) mapValueCode(typ *runtime.Type) (Code, error) {
-	switch typ.Kind() {
-	case reflect.Map:
-		return c.ptrCode(runtime.PtrTo(typ))
-	default:
-		code, err := c.typeToCodeWithPtr(typ, false)
-		if err != nil {
-			return nil, err
-		}
-		ptr, ok := code.(*PtrCode)
-		if ok {
-			if ptr.value.Kind() == CodeKindMap {
-				ptr.ptrNum++
-			}
-		}
-		return code, nil
-	}
-}
-
-func (c *Compiler) structCode(typ *runtime.Type, isPtr bool) (*StructCode, error) {
-	typeptr := uintptr(unsafe.Pointer(typ))
-	if code, exists := c.structTypeToCode[typeptr]; exists {
-		derefCode := *code
-		derefCode.isRecursive = true
-		return &derefCode, nil
-	}
-	indirect := runtime.IfaceIndir(typ)
-	code := &StructCode{typ: typ, isPtr: isPtr, isIndirect: indirect}
-	c.structTypeToCode[typeptr] = code
-
-	fieldNum := typ.NumField()
-	tags := c.typeToStructTags(typ)
-	fields := []*StructFieldCode{}
-	for i, tag := range tags {
-		isOnlyOneFirstField := i == 0 && fieldNum == 1
-		field, err := c.structFieldCode(code, tag, isPtr, isOnlyOneFirstField)
-		if err != nil {
-			return nil, err
-		}
-		if field.isAnonymous {
-			structCode := field.getAnonymousStruct()
-			if structCode != nil {
-				structCode.removeFieldsByTags(tags)
-				if c.isAssignableIndirect(field, isPtr) {
-					if indirect {
-						structCode.isIndirect = true
-					} else {
-						structCode.isIndirect = false
-					}
-				}
-			}
-		} else {
-			structCode := field.getStruct()
-			if structCode != nil {
-				if indirect {
-					// if parent is indirect type, set child indirect property to true
-					structCode.isIndirect = true
-				} else {
-					// if parent is not indirect type, set child indirect property to false.
-					// but if parent's indirect is false and isPtr is true, then indirect must be true.
-					// Do this only if indirectConversion is enabled at the end of compileStruct.
-					structCode.isIndirect = false
-				}
-			}
-		}
-		fields = append(fields, field)
-	}
-	fieldMap := c.getFieldMap(fields)
-	duplicatedFieldMap := c.getDuplicatedFieldMap(fieldMap)
-	code.fields = c.filteredDuplicatedFields(fields, duplicatedFieldMap)
-	if !code.disableIndirectConversion && !indirect && isPtr {
-		code.enableIndirect()
-	}
-	delete(c.structTypeToCode, typeptr)
-	return code, nil
-}
-
-func toElemType(t *runtime.Type) *runtime.Type {
-	for t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	return t
-}
-
-func (c *Compiler) structFieldCode(structCode *StructCode, tag *runtime.StructTag, isPtr, isOnlyOneFirstField bool) (*StructFieldCode, error) {
-	field := tag.Field
-	fieldType := runtime.Type2RType(field.Type)
-	isIndirectSpecialCase := isPtr && isOnlyOneFirstField
-	fieldCode := &StructFieldCode{
-		typ:           fieldType,
-		key:           tag.Key,
-		tag:           tag,
-		offset:        field.Offset,
-		isAnonymous:   field.Anonymous && !tag.IsTaggedKey && toElemType(fieldType).Kind() == reflect.Struct,
-		isTaggedKey:   tag.IsTaggedKey,
-		isNilableType: c.isNilableType(fieldType),
-		isNilCheck:    true,
-	}
-	switch {
-	case c.isMovePointerPositionFromHeadToFirstMarshalJSONFieldCase(fieldType, isIndirectSpecialCase):
-		code, err := c.marshalJSONCode(fieldType)
-		if err != nil {
-			return nil, err
-		}
-		fieldCode.value = code
-		fieldCode.isAddrForMarshaler = true
-		fieldCode.isNilCheck = false
-		structCode.isIndirect = false
-		structCode.disableIndirectConversion = true
-	case c.isMovePointerPositionFromHeadToFirstMarshalTextFieldCase(fieldType, isIndirectSpecialCase):
-		code, err := c.marshalTextCode(fieldType)
-		if err != nil {
-			return nil, err
-		}
-		fieldCode.value = code
-		fieldCode.isAddrForMarshaler = true
-		fieldCode.isNilCheck = false
-		structCode.isIndirect = false
-		structCode.disableIndirectConversion = true
-	case isPtr && c.isPtrMarshalJSONType(fieldType):
-		// *struct{ field T }
-		// func (*T) MarshalJSON() ([]byte, error)
-		code, err := c.marshalJSONCode(fieldType)
-		if err != nil {
-			return nil, err
-		}
-		fieldCode.value = code
-		fieldCode.isAddrForMarshaler = true
-		fieldCode.isNilCheck = false
-	case isPtr && c.isPtrMarshalTextType(fieldType):
-		// *struct{ field T }
-		// func (*T) MarshalText() ([]byte, error)
-		code, err := c.marshalTextCode(fieldType)
-		if err != nil {
-			return nil, err
-		}
-		fieldCode.value = code
-		fieldCode.isAddrForMarshaler = true
-		fieldCode.isNilCheck = false
-	default:
-		code, err := c.typeToCodeWithPtr(fieldType, isPtr)
-		if err != nil {
-			return nil, err
-		}
-		switch code.Kind() {
-		case CodeKindPtr, CodeKindInterface:
-			fieldCode.isNextOpPtrType = true
-		}
-		fieldCode.value = code
-	}
-	return fieldCode, nil
-}
-
-func (c *Compiler) isAssignableIndirect(fieldCode *StructFieldCode, isPtr bool) bool {
-	if isPtr {
-		return false
-	}
-	codeType := fieldCode.value.Kind()
-	if codeType == CodeKindMarshalJSON {
-		return false
-	}
-	if codeType == CodeKindMarshalText {
-		return false
-	}
-	return true
-}
-
-func (c *Compiler) getFieldMap(fields []*StructFieldCode) map[string][]*StructFieldCode {
-	fieldMap := map[string][]*StructFieldCode{}
-	for _, field := range fields {
-		if field.isAnonymous {
-			for k, v := range c.getAnonymousFieldMap(field) {
-				fieldMap[k] = append(fieldMap[k], v...)
-			}
-			continue
-		}
-		fieldMap[field.key] = append(fieldMap[field.key], field)
-	}
-	return fieldMap
-}
-
-func (c *Compiler) getAnonymousFieldMap(field *StructFieldCode) map[string][]*StructFieldCode {
-	fieldMap := map[string][]*StructFieldCode{}
-	structCode := field.getAnonymousStruct()
-	if structCode == nil || structCode.isRecursive {
-		fieldMap[field.key] = append(fieldMap[field.key], field)
-		return fieldMap
-	}
-	for k, v := range c.getFieldMapFromAnonymousParent(structCode.fields) {
-		fieldMap[k] = append(fieldMap[k], v...)
-	}
-	return fieldMap
-}
-
-func (c *Compiler) getFieldMapFromAnonymousParent(fields []*StructFieldCode) map[string][]*StructFieldCode {
-	fieldMap := map[string][]*StructFieldCode{}
-	for _, field := range fields {
-		if field.isAnonymous {
-			for k, v := range c.getAnonymousFieldMap(field) {
-				// Do not handle tagged key when embedding more than once
-				for _, vv := range v {
-					vv.isTaggedKey = false
-				}
-				fieldMap[k] = append(fieldMap[k], v...)
-			}
-			continue
-		}
-		fieldMap[field.key] = append(fieldMap[field.key], field)
-	}
-	return fieldMap
-}
-
-func (c *Compiler) getDuplicatedFieldMap(fieldMap map[string][]*StructFieldCode) map[*StructFieldCode]struct{} {
-	duplicatedFieldMap := map[*StructFieldCode]struct{}{}
-	for _, fields := range fieldMap {
-		if len(fields) == 1 {
-			continue
-		}
-		if c.isTaggedKeyOnly(fields) {
-			for _, field := range fields {
-				if field.isTaggedKey {
-					continue
-				}
-				duplicatedFieldMap[field] = struct{}{}
-			}
-		} else {
-			for _, field := range fields {
-				duplicatedFieldMap[field] = struct{}{}
-			}
-		}
-	}
-	return duplicatedFieldMap
-}
-
-func (c *Compiler) filteredDuplicatedFields(fields []*StructFieldCode, duplicatedFieldMap map[*StructFieldCode]struct{}) []*StructFieldCode {
-	filteredFields := make([]*StructFieldCode, 0, len(fields))
-	for _, field := range fields {
-		if field.isAnonymous {
-			structCode := field.getAnonymousStruct()
-			if structCode != nil && !structCode.isRecursive {
-				structCode.fields = c.filteredDuplicatedFields(structCode.fields, duplicatedFieldMap)
-				if len(structCode.fields) > 0 {
-					filteredFields = append(filteredFields, field)
-				}
+func linkRecursiveCode(c *Opcode) {
+	for code := c; code.Op != OpEnd && code.Op != OpRecursiveEnd; {
+		switch code.Op {
+		case OpRecursive, OpRecursivePtr:
+			if code.Jmp.Linked {
+				code = code.Next
 				continue
 			}
-		}
-		if _, exists := duplicatedFieldMap[field]; exists {
+			code.Jmp.Code = copyOpcode(code.Jmp.Code)
+
+			c := code.Jmp.Code
+			c.End.Next = newEndOp(&compileContext{})
+			c.Op = c.Op.PtrHeadToHead()
+
+			beforeLastCode := c.End
+			lastCode := beforeLastCode.Next
+
+			lastCode.Idx = beforeLastCode.Idx + uintptrSize
+			lastCode.ElemIdx = lastCode.Idx + uintptrSize
+			lastCode.Length = lastCode.Idx + 2*uintptrSize
+
+			// extend length to alloc slot for elemIdx + length
+			totalLength := uintptr(code.TotalLength() + 3)
+			nextTotalLength := uintptr(c.TotalLength() + 3)
+
+			c.End.Next.Op = OpRecursiveEnd
+
+			code.Jmp.CurLen = totalLength
+			code.Jmp.NextLen = nextTotalLength
+			code.Jmp.Linked = true
+
+			linkRecursiveCode(code.Jmp.Code)
+
+			code = code.Next
 			continue
 		}
-		filteredFields = append(filteredFields, field)
-	}
-	return filteredFields
-}
-
-func (c *Compiler) isTaggedKeyOnly(fields []*StructFieldCode) bool {
-	var taggedKeyFieldCount int
-	for _, field := range fields {
-		if field.isTaggedKey {
-			taggedKeyFieldCount++
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		default:
+			code = code.Next
 		}
 	}
-	return taggedKeyFieldCount == 1
 }
 
-func (c *Compiler) typeToStructTags(typ *runtime.Type) runtime.StructTags {
-	tags := runtime.StructTags{}
-	fieldNum := typ.NumField()
-	for i := 0; i < fieldNum; i++ {
-		field := typ.Field(i)
-		if runtime.IsIgnoredStructField(field) {
-			continue
+func optimizeStructEnd(c *Opcode) {
+	for code := c; code.Op != OpEnd; {
+		if code.Op == OpRecursive || code.Op == OpRecursivePtr {
+			// ignore if exists recursive operation
+			return
+		}
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		default:
+			code = code.Next
+		}
+	}
+
+	for code := c; code.Op != OpEnd; {
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		case CodeStructEnd:
+			switch code.Op {
+			case OpStructEnd:
+				prev := code.PrevField
+				prevOp := prev.Op.String()
+				if strings.Contains(prevOp, "Head") ||
+					strings.Contains(prevOp, "Slice") ||
+					strings.Contains(prevOp, "Array") ||
+					strings.Contains(prevOp, "Map") ||
+					strings.Contains(prevOp, "MarshalJSON") ||
+					strings.Contains(prevOp, "MarshalText") {
+					// not exists field
+					code = code.Next
+					break
+				}
+				if prev.Op != prev.Op.FieldToEnd() {
+					prev.Op = prev.Op.FieldToEnd()
+					prev.Next = code.Next
+				}
+				code = code.Next
+			default:
+				code = code.Next
+			}
+		default:
+			code = code.Next
 		}
-		tags = append(tags, runtime.StructTagFromField(field))
 	}
-	return tags
 }
 
-// *struct{ field T } => struct { field *T }
-// func (*T) MarshalJSON() ([]byte, error)
-func (c *Compiler) isMovePointerPositionFromHeadToFirstMarshalJSONFieldCase(typ *runtime.Type, isIndirectSpecialCase bool) bool {
-	return isIndirectSpecialCase && !c.isNilableType(typ) && c.isPtrMarshalJSONType(typ)
-}
-
-// *struct{ field T } => struct { field *T }
-// func (*T) MarshalText() ([]byte, error)
-func (c *Compiler) isMovePointerPositionFromHeadToFirstMarshalTextFieldCase(typ *runtime.Type, isIndirectSpecialCase bool) bool {
-	return isIndirectSpecialCase && !c.isNilableType(typ) && c.isPtrMarshalTextType(typ)
-}
-
-func (c *Compiler) implementsMarshalJSON(typ *runtime.Type) bool {
-	if !c.implementsMarshalJSONType(typ) {
+func implementsMarshalJSON(typ *runtime.Type) bool {
+	if !implementsMarshalJSONType(typ) {
 		return false
 	}
 	if typ.Kind() != reflect.Ptr {
 		return true
 	}
 	// type kind is reflect.Ptr
-	if !c.implementsMarshalJSONType(typ.Elem()) {
+	if !implementsMarshalJSONType(typ.Elem()) {
 		return true
 	}
 	// needs to dereference
 	return false
 }
 
-func (c *Compiler) implementsMarshalText(typ *runtime.Type) bool {
+func implementsMarshalText(typ *runtime.Type) bool {
 	if !typ.Implements(marshalTextType) {
 		return false
 	}
@@ -864,10 +382,931 @@ func (c *Compiler) implementsMarshalText(typ *runtime.Type) bool {
 	return false
 }
 
-func (c *Compiler) isNilableType(typ *runtime.Type) bool {
-	if !runtime.IfaceIndir(typ) {
+func compile(ctx *compileContext, isPtr bool) (*Opcode, error) {
+	typ := ctx.typ
+	switch {
+	case implementsMarshalJSON(typ):
+		return compileMarshalJSON(ctx)
+	case implementsMarshalText(typ):
+		return compileMarshalText(ctx)
+	}
+	switch typ.Kind() {
+	case reflect.Ptr:
+		return compilePtr(ctx)
+	case reflect.Slice:
+		elem := typ.Elem()
+		if elem.Kind() == reflect.Uint8 {
+			p := runtime.PtrTo(elem)
+			if !implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
+				return compileBytes(ctx)
+			}
+		}
+		return compileSlice(ctx)
+	case reflect.Array:
+		return compileArray(ctx)
+	case reflect.Map:
+		return compileMap(ctx)
+	case reflect.Struct:
+		return compileStruct(ctx, isPtr)
+	case reflect.Interface:
+		return compileInterface(ctx)
+	case reflect.Int:
+		return compileInt(ctx)
+	case reflect.Int8:
+		return compileInt8(ctx)
+	case reflect.Int16:
+		return compileInt16(ctx)
+	case reflect.Int32:
+		return compileInt32(ctx)
+	case reflect.Int64:
+		return compileInt64(ctx)
+	case reflect.Uint:
+		return compileUint(ctx)
+	case reflect.Uint8:
+		return compileUint8(ctx)
+	case reflect.Uint16:
+		return compileUint16(ctx)
+	case reflect.Uint32:
+		return compileUint32(ctx)
+	case reflect.Uint64:
+		return compileUint64(ctx)
+	case reflect.Uintptr:
+		return compileUint(ctx)
+	case reflect.Float32:
+		return compileFloat32(ctx)
+	case reflect.Float64:
+		return compileFloat64(ctx)
+	case reflect.String:
+		return compileString(ctx)
+	case reflect.Bool:
+		return compileBool(ctx)
+	}
+	return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
+}
+
+func convertPtrOp(code *Opcode) OpType {
+	ptrHeadOp := code.Op.HeadToPtrHead()
+	if code.Op != ptrHeadOp {
+		if code.PtrNum > 0 {
+			// ptr field and ptr head
+			code.PtrNum--
+		}
+		return ptrHeadOp
+	}
+	switch code.Op {
+	case OpInt:
+		return OpIntPtr
+	case OpUint:
+		return OpUintPtr
+	case OpFloat32:
+		return OpFloat32Ptr
+	case OpFloat64:
+		return OpFloat64Ptr
+	case OpString:
+		return OpStringPtr
+	case OpBool:
+		return OpBoolPtr
+	case OpBytes:
+		return OpBytesPtr
+	case OpNumber:
+		return OpNumberPtr
+	case OpArray:
+		return OpArrayPtr
+	case OpSlice:
+		return OpSlicePtr
+	case OpMap:
+		return OpMapPtr
+	case OpMarshalJSON:
+		return OpMarshalJSONPtr
+	case OpMarshalText:
+		return OpMarshalTextPtr
+	case OpInterface:
+		return OpInterfacePtr
+	case OpRecursive:
+		return OpRecursivePtr
+	}
+	return code.Op
+}
+
+func compileKey(ctx *compileContext) (*Opcode, error) {
+	typ := ctx.typ
+	switch {
+	case implementsMarshalJSON(typ):
+		return compileMarshalJSON(ctx)
+	case implementsMarshalText(typ):
+		return compileMarshalText(ctx)
+	}
+	switch typ.Kind() {
+	case reflect.Ptr:
+		return compilePtr(ctx)
+	case reflect.String:
+		return compileString(ctx)
+	case reflect.Int:
+		return compileIntString(ctx)
+	case reflect.Int8:
+		return compileInt8String(ctx)
+	case reflect.Int16:
+		return compileInt16String(ctx)
+	case reflect.Int32:
+		return compileInt32String(ctx)
+	case reflect.Int64:
+		return compileInt64String(ctx)
+	case reflect.Uint:
+		return compileUintString(ctx)
+	case reflect.Uint8:
+		return compileUint8String(ctx)
+	case reflect.Uint16:
+		return compileUint16String(ctx)
+	case reflect.Uint32:
+		return compileUint32String(ctx)
+	case reflect.Uint64:
+		return compileUint64String(ctx)
+	case reflect.Uintptr:
+		return compileUintString(ctx)
+	}
+	return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
+}
+
+func compilePtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compile(ctx.withType(ctx.typ.Elem()), true)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = convertPtrOp(code)
+	code.PtrNum++
+	return code, nil
+}
+
+func compileMarshalJSON(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpMarshalJSON)
+	typ := ctx.typ
+	if isPtrMarshalJSONType(typ) {
+		code.Flags |= AddrForMarshalerFlags
+	}
+	if typ.Implements(marshalJSONContextType) || runtime.PtrTo(typ).Implements(marshalJSONContextType) {
+		code.Flags |= MarshalerContextFlags
+	}
+	if isNilableType(typ) {
+		code.Flags |= IsNilableTypeFlags
+	} else {
+		code.Flags &= ^IsNilableTypeFlags
+	}
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileMarshalText(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpMarshalText)
+	typ := ctx.typ
+	if !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType) {
+		code.Flags |= AddrForMarshalerFlags
+	}
+	if isNilableType(typ) {
+		code.Flags |= IsNilableTypeFlags
+	} else {
+		code.Flags &= ^IsNilableTypeFlags
+	}
+	ctx.incIndex()
+	return code, nil
+}
+
+const intSize = 32 << (^uint(0) >> 63)
+
+func compileInt(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpInt)
+	code.NumBitSize = intSize
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileIntPtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInt(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpIntPtr
+	return code, nil
+}
+
+func compileInt8(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpInt)
+	code.NumBitSize = 8
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt8Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInt8(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpIntPtr
+	return code, nil
+}
+
+func compileInt16(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpInt)
+	code.NumBitSize = 16
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt16Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInt16(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpIntPtr
+	return code, nil
+}
+
+func compileInt32(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpInt)
+	code.NumBitSize = 32
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt32Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInt32(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpIntPtr
+	return code, nil
+}
+
+func compileInt64(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpInt)
+	code.NumBitSize = 64
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt64Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInt64(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpIntPtr
+	return code, nil
+}
+
+func compileUint(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUint)
+	code.NumBitSize = intSize
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUintPtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileUint(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpUintPtr
+	return code, nil
+}
+
+func compileUint8(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUint)
+	code.NumBitSize = 8
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint8Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileUint8(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpUintPtr
+	return code, nil
+}
+
+func compileUint16(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUint)
+	code.NumBitSize = 16
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint16Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileUint16(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpUintPtr
+	return code, nil
+}
+
+func compileUint32(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUint)
+	code.NumBitSize = 32
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint32Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileUint32(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpUintPtr
+	return code, nil
+}
+
+func compileUint64(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUint)
+	code.NumBitSize = 64
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint64Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileUint64(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpUintPtr
+	return code, nil
+}
+
+func compileIntString(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpIntString)
+	code.NumBitSize = intSize
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt8String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpIntString)
+	code.NumBitSize = 8
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt16String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpIntString)
+	code.NumBitSize = 16
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt32String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpIntString)
+	code.NumBitSize = 32
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInt64String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpIntString)
+	code.NumBitSize = 64
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUintString(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUintString)
+	code.NumBitSize = intSize
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint8String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUintString)
+	code.NumBitSize = 8
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint16String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUintString)
+	code.NumBitSize = 16
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint32String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUintString)
+	code.NumBitSize = 32
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileUint64String(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpUintString)
+	code.NumBitSize = 64
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileFloat32(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpFloat32)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileFloat32Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileFloat32(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpFloat32Ptr
+	return code, nil
+}
+
+func compileFloat64(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpFloat64)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileFloat64Ptr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileFloat64(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpFloat64Ptr
+	return code, nil
+}
+
+func compileString(ctx *compileContext) (*Opcode, error) {
+	var op OpType
+	if ctx.typ == runtime.Type2RType(jsonNumberType) {
+		op = OpNumber
+	} else {
+		op = OpString
+	}
+	code := newOpCode(ctx, op)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileStringPtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileString(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if code.Op == OpNumber {
+		code.Op = OpNumberPtr
+	} else {
+		code.Op = OpStringPtr
+	}
+	return code, nil
+}
+
+func compileBool(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpBool)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileBoolPtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileBool(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpBoolPtr
+	return code, nil
+}
+
+func compileBytes(ctx *compileContext) (*Opcode, error) {
+	code := newOpCode(ctx, OpBytes)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileBytesPtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileBytes(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpBytesPtr
+	return code, nil
+}
+
+func compileInterface(ctx *compileContext) (*Opcode, error) {
+	code := newInterfaceCode(ctx)
+	ctx.incIndex()
+	return code, nil
+}
+
+func compileInterfacePtr(ctx *compileContext) (*Opcode, error) {
+	code, err := compileInterface(ctx)
+	if err != nil {
+		return nil, err
+	}
+	code.Op = OpInterfacePtr
+	return code, nil
+}
+
+func compileSlice(ctx *compileContext) (*Opcode, error) {
+	elem := ctx.typ.Elem()
+	size := elem.Size()
+
+	header := newSliceHeaderCode(ctx)
+	ctx.incIndex()
+
+	code, err := compileListElem(ctx.withType(elem).incIndent())
+	if err != nil {
+		return nil, err
+	}
+	code.Flags |= IndirectFlags
+
+	// header => opcode => elem => end
+	//             ^        |
+	//             |________|
+
+	elemCode := newSliceElemCode(ctx, header, size)
+	ctx.incIndex()
+
+	end := newOpCode(ctx, OpSliceEnd)
+	ctx.incIndex()
+
+	header.End = end
+	header.Next = code
+	code.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(elemCode))
+	elemCode.Next = code
+	elemCode.End = end
+	return (*Opcode)(unsafe.Pointer(header)), nil
+}
+
+func compileListElem(ctx *compileContext) (*Opcode, error) {
+	typ := ctx.typ
+	switch {
+	case isPtrMarshalJSONType(typ):
+		return compileMarshalJSON(ctx)
+	case !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType):
+		return compileMarshalText(ctx)
+	case typ.Kind() == reflect.Map:
+		return compilePtr(ctx.withType(runtime.PtrTo(typ)))
+	default:
+		code, err := compile(ctx, false)
+		if err != nil {
+			return nil, err
+		}
+		if code.Op == OpMapPtr {
+			code.PtrNum++
+		}
+		return code, nil
+	}
+}
+
+func compileArray(ctx *compileContext) (*Opcode, error) {
+	typ := ctx.typ
+	elem := typ.Elem()
+	alen := typ.Len()
+	size := elem.Size()
+
+	header := newArrayHeaderCode(ctx, alen)
+	ctx.incIndex()
+
+	code, err := compileListElem(ctx.withType(elem).incIndent())
+	if err != nil {
+		return nil, err
+	}
+	code.Flags |= IndirectFlags
+	// header => opcode => elem => end
+	//             ^        |
+	//             |________|
+
+	elemCode := newArrayElemCode(ctx, header, alen, size)
+	ctx.incIndex()
+
+	end := newOpCode(ctx, OpArrayEnd)
+	ctx.incIndex()
+
+	header.End = end
+	header.Next = code
+	code.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(elemCode))
+	elemCode.Next = code
+	elemCode.End = end
+	return (*Opcode)(unsafe.Pointer(header)), nil
+}
+
+func compileMap(ctx *compileContext) (*Opcode, error) {
+	// header => code => value => code => key => code => value => code => end
+	//                                     ^                       |
+	//                                     |_______________________|
+	ctx = ctx.incIndent()
+	header := newMapHeaderCode(ctx)
+	ctx.incIndex()
+
+	typ := ctx.typ
+	keyType := ctx.typ.Key()
+	keyCode, err := compileKey(ctx.withType(keyType))
+	if err != nil {
+		return nil, err
+	}
+
+	value := newMapValueCode(ctx, header)
+	ctx.incIndex()
+
+	valueCode, err := compileMapValue(ctx.withType(typ.Elem()))
+	if err != nil {
+		return nil, err
+	}
+	valueCode.Flags |= IndirectFlags
+
+	key := newMapKeyCode(ctx, header)
+	ctx.incIndex()
+
+	ctx = ctx.decIndent()
+
+	end := newMapEndCode(ctx, header)
+	ctx.incIndex()
+
+	header.Next = keyCode
+	keyCode.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(value))
+	value.Next = valueCode
+	valueCode.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(key))
+	key.Next = keyCode
+
+	header.End = end
+	key.End = end
+	value.End = end
+
+	return (*Opcode)(unsafe.Pointer(header)), nil
+}
+
+func compileMapValue(ctx *compileContext) (*Opcode, error) {
+	switch ctx.typ.Kind() {
+	case reflect.Map:
+		return compilePtr(ctx.withType(runtime.PtrTo(ctx.typ)))
+	default:
+		code, err := compile(ctx, false)
+		if err != nil {
+			return nil, err
+		}
+		if code.Op == OpMapPtr {
+			code.PtrNum++
+		}
+		return code, nil
+	}
+}
+
+func optimizeStructHeader(code *Opcode, tag *runtime.StructTag) OpType {
+	headType := code.ToHeaderType(tag.IsString)
+	if tag.IsOmitEmpty {
+		headType = headType.HeadToOmitEmptyHead()
+	}
+	return headType
+}
+
+func optimizeStructField(code *Opcode, tag *runtime.StructTag) OpType {
+	fieldType := code.ToFieldType(tag.IsString)
+	if tag.IsOmitEmpty {
+		fieldType = fieldType.FieldToOmitEmptyField()
+	}
+	return fieldType
+}
+
+func recursiveCode(ctx *compileContext, jmp *CompiledCode) *Opcode {
+	code := newRecursiveCode(ctx, jmp)
+	ctx.incIndex()
+	return code
+}
+
+func compiledCode(ctx *compileContext) *Opcode {
+	typ := ctx.typ
+	typeptr := uintptr(unsafe.Pointer(typ))
+	if cc, exists := ctx.structTypeToCompiledCode[typeptr]; exists {
+		return recursiveCode(ctx, cc)
+	}
+	return nil
+}
+
+func structHeader(ctx *compileContext, fieldCode *Opcode, valueCode *Opcode, tag *runtime.StructTag) *Opcode {
+	op := optimizeStructHeader(valueCode, tag)
+	fieldCode.Op = op
+	fieldCode.NumBitSize = valueCode.NumBitSize
+	fieldCode.PtrNum = valueCode.PtrNum
+	if op.IsMultipleOpHead() {
+		return valueCode.BeforeLastCode()
+	}
+	ctx.decOpcodeIndex()
+	return fieldCode
+}
+
+func structField(ctx *compileContext, fieldCode *Opcode, valueCode *Opcode, tag *runtime.StructTag) *Opcode {
+	op := optimizeStructField(valueCode, tag)
+	fieldCode.Op = op
+	fieldCode.NumBitSize = valueCode.NumBitSize
+	fieldCode.PtrNum = valueCode.PtrNum
+	if op.IsMultipleOpField() {
+		return valueCode.BeforeLastCode()
+	}
+	ctx.decIndex()
+	return fieldCode
+}
+
+func isNotExistsField(head *Opcode) bool {
+	if head == nil {
+		return false
+	}
+	if head.Op != OpStructHead {
+		return false
+	}
+	if (head.Flags & AnonymousHeadFlags) == 0 {
+		return false
+	}
+	if head.Next == nil {
+		return false
+	}
+	if head.NextField == nil {
+		return false
+	}
+	if head.NextField.Op != OpStructAnonymousEnd {
+		return false
+	}
+	if head.Next.Op == OpStructAnonymousEnd {
 		return true
 	}
+	if head.Next.Op.CodeType() != CodeStructField {
+		return false
+	}
+	return isNotExistsField(head.Next)
+}
+
+func optimizeAnonymousFields(head *Opcode) {
+	code := head
+	var prev *Opcode
+	removedFields := map[*Opcode]struct{}{}
+	for {
+		if code.Op == OpStructEnd {
+			break
+		}
+		if code.Op == OpStructField {
+			codeType := code.Next.Op.CodeType()
+			if codeType == CodeStructField {
+				if isNotExistsField(code.Next) {
+					code.Next = code.NextField
+					diff := code.Next.DisplayIdx - code.DisplayIdx
+					for i := uint32(0); i < diff; i++ {
+						code.Next.decOpcodeIndex()
+					}
+					linkPrevToNextField(code, removedFields)
+					code = prev
+				}
+			}
+		}
+		prev = code
+		code = code.NextField
+	}
+}
+
+type structFieldPair struct {
+	prevField   *Opcode
+	curField    *Opcode
+	isTaggedKey bool
+	linked      bool
+}
+
+func anonymousStructFieldPairMap(tags runtime.StructTags, named string, valueCode *Opcode) map[string][]structFieldPair {
+	anonymousFields := map[string][]structFieldPair{}
+	f := valueCode
+	var prevAnonymousField *Opcode
+	removedFields := map[*Opcode]struct{}{}
+	for {
+		existsKey := tags.ExistsKey(f.DisplayKey)
+		isHeadOp := strings.Contains(f.Op.String(), "Head")
+		if existsKey && f.Next != nil && strings.Contains(f.Next.Op.String(), "Recursive") {
+			// through
+		} else if isHeadOp && (f.Flags&AnonymousHeadFlags) == 0 {
+			if existsKey {
+				// TODO: need to remove this head
+				f.Op = OpStructHead
+				f.Flags |= AnonymousKeyFlags
+				f.Flags |= AnonymousHeadFlags
+			} else if named == "" {
+				f.Flags |= AnonymousHeadFlags
+			}
+		} else if named == "" && f.Op == OpStructEnd {
+			f.Op = OpStructAnonymousEnd
+		} else if existsKey {
+			diff := f.NextField.DisplayIdx - f.DisplayIdx
+			for i := uint32(0); i < diff; i++ {
+				f.NextField.decOpcodeIndex()
+			}
+			linkPrevToNextField(f, removedFields)
+		}
+
+		if f.DisplayKey == "" {
+			if f.NextField == nil {
+				break
+			}
+			prevAnonymousField = f
+			f = f.NextField
+			continue
+		}
+
+		key := fmt.Sprintf("%s.%s", named, f.DisplayKey)
+		anonymousFields[key] = append(anonymousFields[key], structFieldPair{
+			prevField:   prevAnonymousField,
+			curField:    f,
+			isTaggedKey: (f.Flags & IsTaggedKeyFlags) != 0,
+		})
+		if f.Next != nil && f.NextField != f.Next && f.Next.Op.CodeType() == CodeStructField {
+			for k, v := range anonymousFieldPairRecursively(named, f.Next) {
+				anonymousFields[k] = append(anonymousFields[k], v...)
+			}
+		}
+		if f.NextField == nil {
+			break
+		}
+		prevAnonymousField = f
+		f = f.NextField
+	}
+	return anonymousFields
+}
+
+func anonymousFieldPairRecursively(named string, valueCode *Opcode) map[string][]structFieldPair {
+	anonymousFields := map[string][]structFieldPair{}
+	f := valueCode
+	var prevAnonymousField *Opcode
+	for {
+		if f.DisplayKey != "" && (f.Flags&AnonymousHeadFlags) != 0 {
+			key := fmt.Sprintf("%s.%s", named, f.DisplayKey)
+			anonymousFields[key] = append(anonymousFields[key], structFieldPair{
+				prevField:   prevAnonymousField,
+				curField:    f,
+				isTaggedKey: (f.Flags & IsTaggedKeyFlags) != 0,
+			})
+			if f.Next != nil && f.NextField != f.Next && f.Next.Op.CodeType() == CodeStructField {
+				for k, v := range anonymousFieldPairRecursively(named, f.Next) {
+					anonymousFields[k] = append(anonymousFields[k], v...)
+				}
+			}
+		}
+		if f.NextField == nil {
+			break
+		}
+		prevAnonymousField = f
+		f = f.NextField
+	}
+	return anonymousFields
+}
+
+func optimizeConflictAnonymousFields(anonymousFields map[string][]structFieldPair) {
+	removedFields := map[*Opcode]struct{}{}
+	for _, fieldPairs := range anonymousFields {
+		if len(fieldPairs) == 1 {
+			continue
+		}
+		// conflict anonymous fields
+		taggedPairs := []structFieldPair{}
+		for _, fieldPair := range fieldPairs {
+			if fieldPair.isTaggedKey {
+				taggedPairs = append(taggedPairs, fieldPair)
+			} else {
+				if !fieldPair.linked {
+					if fieldPair.prevField == nil {
+						// head operation
+						fieldPair.curField.Op = OpStructHead
+						fieldPair.curField.Flags |= AnonymousHeadFlags
+						fieldPair.curField.Flags |= AnonymousKeyFlags
+					} else {
+						diff := fieldPair.curField.NextField.DisplayIdx - fieldPair.curField.DisplayIdx
+						for i := uint32(0); i < diff; i++ {
+							fieldPair.curField.NextField.decOpcodeIndex()
+						}
+						removedFields[fieldPair.curField] = struct{}{}
+						linkPrevToNextField(fieldPair.curField, removedFields)
+					}
+					fieldPair.linked = true
+				}
+			}
+		}
+		if len(taggedPairs) > 1 {
+			for _, fieldPair := range taggedPairs {
+				if !fieldPair.linked {
+					if fieldPair.prevField == nil {
+						// head operation
+						fieldPair.curField.Op = OpStructHead
+						fieldPair.curField.Flags |= AnonymousHeadFlags
+						fieldPair.curField.Flags |= AnonymousKeyFlags
+					} else {
+						diff := fieldPair.curField.NextField.DisplayIdx - fieldPair.curField.DisplayIdx
+						removedFields[fieldPair.curField] = struct{}{}
+						for i := uint32(0); i < diff; i++ {
+							fieldPair.curField.NextField.decOpcodeIndex()
+						}
+						linkPrevToNextField(fieldPair.curField, removedFields)
+					}
+					fieldPair.linked = true
+				}
+			}
+		} else {
+			for _, fieldPair := range taggedPairs {
+				fieldPair.curField.Flags &= ^IsTaggedKeyFlags
+			}
+		}
+	}
+}
+
+func isNilableType(typ *runtime.Type) bool {
 	switch typ.Kind() {
 	case reflect.Ptr:
 		return true
@@ -880,60 +1319,252 @@ func (c *Compiler) isNilableType(typ *runtime.Type) bool {
 	}
 }
 
-func (c *Compiler) implementsMarshalJSONType(typ *runtime.Type) bool {
+func compileStruct(ctx *compileContext, isPtr bool) (*Opcode, error) {
+	if code := compiledCode(ctx); code != nil {
+		return code, nil
+	}
+	typ := ctx.typ
+	typeptr := uintptr(unsafe.Pointer(typ))
+	compiled := &CompiledCode{}
+	ctx.structTypeToCompiledCode[typeptr] = compiled
+	// header => code => structField => code => end
+	//                        ^          |
+	//                        |__________|
+	fieldNum := typ.NumField()
+	indirect := runtime.IfaceIndir(typ)
+	fieldIdx := 0
+	disableIndirectConversion := false
+	var (
+		head      *Opcode
+		code      *Opcode
+		prevField *Opcode
+	)
+	ctx = ctx.incIndent()
+	tags := runtime.StructTags{}
+	anonymousFields := map[string][]structFieldPair{}
+	for i := 0; i < fieldNum; i++ {
+		field := typ.Field(i)
+		if runtime.IsIgnoredStructField(field) {
+			continue
+		}
+		tags = append(tags, runtime.StructTagFromField(field))
+	}
+	for i, tag := range tags {
+		field := tag.Field
+		fieldType := runtime.Type2RType(field.Type)
+		fieldOpcodeIndex := ctx.opcodeIndex
+		fieldPtrIndex := ctx.ptrIndex
+		ctx.incIndex()
+
+		nilcheck := true
+		addrForMarshaler := false
+		isIndirectSpecialCase := isPtr && i == 0 && fieldNum == 1
+		isNilableType := isNilableType(fieldType)
+
+		var valueCode *Opcode
+		switch {
+		case isIndirectSpecialCase && !isNilableType && isPtrMarshalJSONType(fieldType):
+			// *struct{ field T } => struct { field *T }
+			// func (*T) MarshalJSON() ([]byte, error)
+			// move pointer position from head to first field
+			code, err := compileMarshalJSON(ctx.withType(fieldType))
+			if err != nil {
+				return nil, err
+			}
+			addrForMarshaler = true
+			valueCode = code
+			nilcheck = false
+			indirect = false
+			disableIndirectConversion = true
+		case isIndirectSpecialCase && !isNilableType && isPtrMarshalTextType(fieldType):
+			// *struct{ field T } => struct { field *T }
+			// func (*T) MarshalText() ([]byte, error)
+			// move pointer position from head to first field
+			code, err := compileMarshalText(ctx.withType(fieldType))
+			if err != nil {
+				return nil, err
+			}
+			addrForMarshaler = true
+			valueCode = code
+			nilcheck = false
+			indirect = false
+			disableIndirectConversion = true
+		case isPtr && isPtrMarshalJSONType(fieldType):
+			// *struct{ field T }
+			// func (*T) MarshalJSON() ([]byte, error)
+			code, err := compileMarshalJSON(ctx.withType(fieldType))
+			if err != nil {
+				return nil, err
+			}
+			addrForMarshaler = true
+			nilcheck = false
+			valueCode = code
+		case isPtr && isPtrMarshalTextType(fieldType):
+			// *struct{ field T }
+			// func (*T) MarshalText() ([]byte, error)
+			code, err := compileMarshalText(ctx.withType(fieldType))
+			if err != nil {
+				return nil, err
+			}
+			addrForMarshaler = true
+			nilcheck = false
+			valueCode = code
+		default:
+			code, err := compile(ctx.withType(fieldType), isPtr)
+			if err != nil {
+				return nil, err
+			}
+			valueCode = code
+		}
+
+		if field.Anonymous && !tag.IsTaggedKey {
+			tagKey := ""
+			if tag.IsTaggedKey {
+				tagKey = tag.Key
+			}
+			for k, v := range anonymousStructFieldPairMap(tags, tagKey, valueCode) {
+				anonymousFields[k] = append(anonymousFields[k], v...)
+			}
+
+			valueCode.decIndent()
+
+			// fix issue144
+			if !(isPtr && strings.Contains(valueCode.Op.String(), "Marshal")) {
+				if indirect {
+					valueCode.Flags |= IndirectFlags
+				} else {
+					valueCode.Flags &= ^IndirectFlags
+				}
+			}
+		} else {
+			if indirect {
+				// if parent is indirect type, set child indirect property to true
+				valueCode.Flags |= IndirectFlags
+			} else {
+				// if parent is not indirect type, set child indirect property to false.
+				// but if parent's indirect is false and isPtr is true, then indirect must be true.
+				// Do this only if indirectConversion is enabled at the end of compileStruct.
+				if i == 0 {
+					valueCode.Flags &= ^IndirectFlags
+				}
+			}
+		}
+		var flags OpFlags
+		if indirect {
+			flags |= IndirectFlags
+		}
+		if field.Anonymous {
+			flags |= AnonymousKeyFlags
+		}
+		if tag.IsTaggedKey {
+			flags |= IsTaggedKeyFlags
+		}
+		if nilcheck {
+			flags |= NilCheckFlags
+		}
+		if addrForMarshaler {
+			flags |= AddrForMarshalerFlags
+		}
+		if strings.Contains(valueCode.Op.String(), "Ptr") || valueCode.Op == OpInterface {
+			flags |= IsNextOpPtrTypeFlags
+		}
+		if isNilableType {
+			flags |= IsNilableTypeFlags
+		}
+		var key string
+		if ctx.escapeKey {
+			rctx := &RuntimeContext{Option: &Option{Flag: HTMLEscapeOption}}
+			key = fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, tag.Key)))
+		} else {
+			key = fmt.Sprintf(`"%s":`, tag.Key)
+		}
+		fieldCode := &Opcode{
+			Idx:        opcodeOffset(fieldPtrIndex),
+			Next:       valueCode,
+			Flags:      flags,
+			Key:        key,
+			Offset:     uint32(field.Offset),
+			Type:       valueCode.Type,
+			DisplayIdx: fieldOpcodeIndex,
+			Indent:     ctx.indent,
+			DisplayKey: tag.Key,
+		}
+		if fieldIdx == 0 {
+			code = structHeader(ctx, fieldCode, valueCode, tag)
+			head = fieldCode
+			prevField = fieldCode
+		} else {
+			fieldCode.Idx = head.Idx
+			code.Next = fieldCode
+			code = structField(ctx, fieldCode, valueCode, tag)
+			prevField.NextField = fieldCode
+			fieldCode.PrevField = prevField
+			prevField = fieldCode
+		}
+		fieldIdx++
+	}
+
+	structEndCode := &Opcode{
+		Op:     OpStructEnd,
+		Type:   nil,
+		Indent: ctx.indent,
+	}
+
+	ctx = ctx.decIndent()
+
+	// no struct field
+	if head == nil {
+		head = &Opcode{
+			Op:         OpStructHead,
+			Idx:        opcodeOffset(ctx.ptrIndex),
+			NextField:  structEndCode,
+			Type:       typ,
+			DisplayIdx: ctx.opcodeIndex,
+			Indent:     ctx.indent,
+		}
+		structEndCode.PrevField = head
+		ctx.incIndex()
+		code = head
+	}
+
+	structEndCode.DisplayIdx = ctx.opcodeIndex
+	structEndCode.Idx = opcodeOffset(ctx.ptrIndex)
+	ctx.incIndex()
+	structEndCode.Next = newEndOp(ctx)
+
+	if prevField != nil && prevField.NextField == nil {
+		prevField.NextField = structEndCode
+		structEndCode.PrevField = prevField
+	}
+
+	head.End = structEndCode
+	code.Next = structEndCode
+	optimizeConflictAnonymousFields(anonymousFields)
+	optimizeAnonymousFields(head)
+	ret := (*Opcode)(unsafe.Pointer(head))
+	compiled.Code = ret
+
+	delete(ctx.structTypeToCompiledCode, typeptr)
+
+	if !disableIndirectConversion && (head.Flags&IndirectFlags == 0) && isPtr {
+		headCode := head
+		for strings.Contains(headCode.Op.String(), "Head") {
+			headCode.Flags |= IndirectFlags
+			headCode = headCode.Next
+		}
+	}
+
+	return ret, nil
+}
+
+func implementsMarshalJSONType(typ *runtime.Type) bool {
 	return typ.Implements(marshalJSONType) || typ.Implements(marshalJSONContextType)
 }
 
-func (c *Compiler) isPtrMarshalJSONType(typ *runtime.Type) bool {
-	return !c.implementsMarshalJSONType(typ) && c.implementsMarshalJSONType(runtime.PtrTo(typ))
+func isPtrMarshalJSONType(typ *runtime.Type) bool {
+	return !implementsMarshalJSONType(typ) && implementsMarshalJSONType(runtime.PtrTo(typ))
 }
 
-func (c *Compiler) isPtrMarshalTextType(typ *runtime.Type) bool {
+func isPtrMarshalTextType(typ *runtime.Type) bool {
 	return !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType)
 }
-
-func (c *Compiler) codeToOpcode(ctx *compileContext, typ *runtime.Type, code Code) *Opcode {
-	codes := code.ToOpcode(ctx)
-	codes.Last().Next = newEndOp(ctx, typ)
-	c.linkRecursiveCode(ctx)
-	return codes.First()
-}
-
-func (c *Compiler) linkRecursiveCode(ctx *compileContext) {
-	recursiveCodes := map[uintptr]*CompiledCode{}
-	for _, recursive := range *ctx.recursiveCodes {
-		typeptr := uintptr(unsafe.Pointer(recursive.Type))
-		codes := ctx.structTypeToCodes[typeptr]
-		if recursiveCode, ok := recursiveCodes[typeptr]; ok {
-			*recursive.Jmp = *recursiveCode
-			continue
-		}
-
-		code := copyOpcode(codes.First())
-		code.Op = code.Op.PtrHeadToHead()
-		lastCode := newEndOp(&compileContext{}, recursive.Type)
-		lastCode.Op = OpRecursiveEnd
-
-		// OpRecursiveEnd must set before call TotalLength
-		code.End.Next = lastCode
-
-		totalLength := code.TotalLength()
-
-		// Idx, ElemIdx, Length must set after call TotalLength
-		lastCode.Idx = uint32((totalLength + 1) * uintptrSize)
-		lastCode.ElemIdx = lastCode.Idx + uintptrSize
-		lastCode.Length = lastCode.Idx + 2*uintptrSize
-
-		// extend length to alloc slot for elemIdx + length
-		curTotalLength := uintptr(recursive.TotalLength()) + 3
-		nextTotalLength := uintptr(totalLength) + 3
-
-		compiled := recursive.Jmp
-		compiled.Code = code
-		compiled.CurLen = curTotalLength
-		compiled.NextLen = nextTotalLength
-		compiled.Linked = true
-
-		recursiveCodes[typeptr] = compiled
-	}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
index b6f45a4..9d337f1 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
@@ -1,33 +1,56 @@
-//go:build !race
 // +build !race
 
 package encoder
 
-func CompileToGetCodeSet(ctx *RuntimeContext, typeptr uintptr) (*OpcodeSet, error) {
-	initEncoder()
-	if typeptr > typeAddr.MaxTypeAddr || typeptr < typeAddr.BaseTypeAddr {
-		codeSet, err := compileToGetCodeSetSlowPath(typeptr)
-		if err != nil {
-			return nil, err
-		}
-		return getFilteredCodeSetIfNeeded(ctx, codeSet)
+import (
+	"unsafe"
+
+	"github.com/goccy/go-json/internal/runtime"
+)
+
+func CompileToGetCodeSet(typeptr uintptr) (*OpcodeSet, error) {
+	if typeptr > typeAddr.MaxTypeAddr {
+		return compileToGetCodeSetSlowPath(typeptr)
 	}
 	index := (typeptr - typeAddr.BaseTypeAddr) >> typeAddr.AddrShift
 	if codeSet := cachedOpcodeSets[index]; codeSet != nil {
-		filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
-		if err != nil {
-			return nil, err
-		}
-		return filtered, nil
+		return codeSet, nil
 	}
-	codeSet, err := newCompiler().compile(typeptr)
+
+	// noescape trick for header.typ ( reflect.*rtype )
+	copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
+
+	noescapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+	})
 	if err != nil {
 		return nil, err
 	}
-	filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
+	escapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+		escapeKey:                true,
+	})
 	if err != nil {
 		return nil, err
 	}
+	noescapeKeyCode = copyOpcode(noescapeKeyCode)
+	escapeKeyCode = copyOpcode(escapeKeyCode)
+	setTotalLengthToInterfaceOp(noescapeKeyCode)
+	setTotalLengthToInterfaceOp(escapeKeyCode)
+	interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
+	interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
+	codeLength := noescapeKeyCode.TotalLength()
+	codeSet := &OpcodeSet{
+		Type:                     copiedType,
+		NoescapeKeyCode:          noescapeKeyCode,
+		EscapeKeyCode:            escapeKeyCode,
+		InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
+		InterfaceEscapeKeyCode:   interfaceEscapeKeyCode,
+		CodeLength:               codeLength,
+		EndCode:                  ToEndCode(interfaceNoescapeKeyCode),
+	}
 	cachedOpcodeSets[index] = codeSet
-	return filtered, nil
+	return codeSet, nil
 }
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
index 47b482f..3a239e9 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
@@ -1,46 +1,65 @@
-//go:build race
 // +build race
 
 package encoder
 
 import (
 	"sync"
+	"unsafe"
+
+	"github.com/goccy/go-json/internal/runtime"
 )
 
 var setsMu sync.RWMutex
 
-func CompileToGetCodeSet(ctx *RuntimeContext, typeptr uintptr) (*OpcodeSet, error) {
-	initEncoder()
-	if typeptr > typeAddr.MaxTypeAddr || typeptr < typeAddr.BaseTypeAddr {
-		codeSet, err := compileToGetCodeSetSlowPath(typeptr)
-		if err != nil {
-			return nil, err
-		}
-		return getFilteredCodeSetIfNeeded(ctx, codeSet)
+func CompileToGetCodeSet(typeptr uintptr) (*OpcodeSet, error) {
+	if typeptr > typeAddr.MaxTypeAddr {
+		return compileToGetCodeSetSlowPath(typeptr)
 	}
 	index := (typeptr - typeAddr.BaseTypeAddr) >> typeAddr.AddrShift
 	setsMu.RLock()
 	if codeSet := cachedOpcodeSets[index]; codeSet != nil {
-		filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
-		if err != nil {
-			setsMu.RUnlock()
-			return nil, err
-		}
 		setsMu.RUnlock()
-		return filtered, nil
+		return codeSet, nil
 	}
 	setsMu.RUnlock()
 
-	codeSet, err := newCompiler().compile(typeptr)
+	// noescape trick for header.typ ( reflect.*rtype )
+	copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
+
+	noescapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+	})
 	if err != nil {
 		return nil, err
 	}
-	filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
+	escapeKeyCode, err := compileHead(&compileContext{
+		typ:                      copiedType,
+		structTypeToCompiledCode: map[uintptr]*CompiledCode{},
+		escapeKey:                true,
+	})
 	if err != nil {
 		return nil, err
 	}
+
+	noescapeKeyCode = copyOpcode(noescapeKeyCode)
+	escapeKeyCode = copyOpcode(escapeKeyCode)
+	setTotalLengthToInterfaceOp(noescapeKeyCode)
+	setTotalLengthToInterfaceOp(escapeKeyCode)
+	interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
+	interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
+	codeLength := noescapeKeyCode.TotalLength()
+	codeSet := &OpcodeSet{
+		Type:                     copiedType,
+		NoescapeKeyCode:          noescapeKeyCode,
+		EscapeKeyCode:            escapeKeyCode,
+		InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
+		InterfaceEscapeKeyCode:   interfaceEscapeKeyCode,
+		CodeLength:               codeLength,
+		EndCode:                  ToEndCode(interfaceNoescapeKeyCode),
+	}
 	setsMu.Lock()
 	cachedOpcodeSets[index] = codeSet
 	setsMu.Unlock()
-	return filtered, nil
+	return codeSet, nil
 }
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/context.go b/vendor/github.com/goccy/go-json/internal/encoder/context.go
index 3833d0c..61b8908 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/context.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/context.go
@@ -9,20 +9,44 @@ import (
 )
 
 type compileContext struct {
-	opcodeIndex       uint32
-	ptrIndex          int
-	indent            uint32
-	escapeKey         bool
-	structTypeToCodes map[uintptr]Opcodes
-	recursiveCodes    *Opcodes
+	typ                      *runtime.Type
+	opcodeIndex              uint32
+	ptrIndex                 int
+	indent                   uint32
+	escapeKey                bool
+	structTypeToCompiledCode map[uintptr]*CompiledCode
+
+	parent *compileContext
 }
 
-func (c *compileContext) incIndent() {
-	c.indent++
+func (c *compileContext) context() *compileContext {
+	return &compileContext{
+		typ:                      c.typ,
+		opcodeIndex:              c.opcodeIndex,
+		ptrIndex:                 c.ptrIndex,
+		indent:                   c.indent,
+		escapeKey:                c.escapeKey,
+		structTypeToCompiledCode: c.structTypeToCompiledCode,
+		parent:                   c,
+	}
 }
 
-func (c *compileContext) decIndent() {
-	c.indent--
+func (c *compileContext) withType(typ *runtime.Type) *compileContext {
+	ctx := c.context()
+	ctx.typ = typ
+	return ctx
+}
+
+func (c *compileContext) incIndent() *compileContext {
+	ctx := c.context()
+	ctx.indent++
+	return ctx
+}
+
+func (c *compileContext) decIndent() *compileContext {
+	ctx := c.context()
+	ctx.indent--
+	return ctx
 }
 
 func (c *compileContext) incIndex() {
@@ -37,18 +61,30 @@ func (c *compileContext) decIndex() {
 
 func (c *compileContext) incOpcodeIndex() {
 	c.opcodeIndex++
+	if c.parent != nil {
+		c.parent.incOpcodeIndex()
+	}
 }
 
 func (c *compileContext) decOpcodeIndex() {
 	c.opcodeIndex--
+	if c.parent != nil {
+		c.parent.decOpcodeIndex()
+	}
 }
 
 func (c *compileContext) incPtrIndex() {
 	c.ptrIndex++
+	if c.parent != nil {
+		c.parent.incPtrIndex()
+	}
 }
 
 func (c *compileContext) decPtrIndex() {
 	c.ptrIndex--
+	if c.parent != nil {
+		c.parent.decPtrIndex()
+	}
 }
 
 const (
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go b/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go
deleted file mode 100644
index 35c959d..0000000
--- a/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package encoder
-
-import "unicode/utf8"
-
-const (
-	// The default lowest and highest continuation byte.
-	locb = 128 //0b10000000
-	hicb = 191 //0b10111111
-
-	// These names of these constants are chosen to give nice alignment in the
-	// table below. The first nibble is an index into acceptRanges or F for
-	// special one-byte cases. The second nibble is the Rune length or the
-	// Status for the special one-byte case.
-	xx = 0xF1 // invalid: size 1
-	as = 0xF0 // ASCII: size 1
-	s1 = 0x02 // accept 0, size 2
-	s2 = 0x13 // accept 1, size 3
-	s3 = 0x03 // accept 0, size 3
-	s4 = 0x23 // accept 2, size 3
-	s5 = 0x34 // accept 3, size 4
-	s6 = 0x04 // accept 0, size 4
-	s7 = 0x44 // accept 4, size 4
-)
-
-// first is information about the first byte in a UTF-8 sequence.
-var first = [256]uint8{
-	//   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x00-0x0F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x10-0x1F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x20-0x2F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x30-0x3F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x40-0x4F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x50-0x5F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x60-0x6F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x70-0x7F
-	//   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x80-0x8F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x90-0x9F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xA0-0xAF
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xB0-0xBF
-	xx, xx, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xC0-0xCF
-	s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xD0-0xDF
-	s2, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s4, s3, s3, // 0xE0-0xEF
-	s5, s6, s6, s6, s7, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xF0-0xFF
-}
-
-const (
-	lineSep      = byte(168) //'\u2028'
-	paragraphSep = byte(169) //'\u2029'
-)
-
-type decodeRuneState int
-
-const (
-	validUTF8State decodeRuneState = iota
-	runeErrorState
-	lineSepState
-	paragraphSepState
-)
-
-func decodeRuneInString(s string) (decodeRuneState, int) {
-	n := len(s)
-	s0 := s[0]
-	x := first[s0]
-	if x >= as {
-		// The following code simulates an additional check for x == xx and
-		// handling the ASCII and invalid cases accordingly. This mask-and-or
-		// approach prevents an additional branch.
-		mask := rune(x) << 31 >> 31 // Create 0x0000 or 0xFFFF.
-		if rune(s[0])&^mask|utf8.RuneError&mask == utf8.RuneError {
-			return runeErrorState, 1
-		}
-		return validUTF8State, 1
-	}
-	sz := int(x & 7)
-	if n < sz {
-		return runeErrorState, 1
-	}
-	s1 := s[1]
-	switch x >> 4 {
-	case 0:
-		if s1 < locb || hicb < s1 {
-			return runeErrorState, 1
-		}
-	case 1:
-		if s1 < 0xA0 || hicb < s1 {
-			return runeErrorState, 1
-		}
-	case 2:
-		if s1 < locb || 0x9F < s1 {
-			return runeErrorState, 1
-		}
-	case 3:
-		if s1 < 0x90 || hicb < s1 {
-			return runeErrorState, 1
-		}
-	case 4:
-		if s1 < locb || 0x8F < s1 {
-			return runeErrorState, 1
-		}
-	}
-	if sz <= 2 {
-		return validUTF8State, 2
-	}
-	s2 := s[2]
-	if s2 < locb || hicb < s2 {
-		return runeErrorState, 1
-	}
-	if sz <= 3 {
-		// separator character prefixes: [2]byte{226, 128}
-		if s0 == 226 && s1 == 128 {
-			switch s2 {
-			case lineSep:
-				return lineSepState, 3
-			case paragraphSep:
-				return paragraphSepState, 3
-			}
-		}
-		return validUTF8State, 3
-	}
-	s3 := s[3]
-	if s3 < locb || hicb < s3 {
-		return runeErrorState, 1
-	}
-	return validUTF8State, 4
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/encoder.go b/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
index b436f5b..b7fa99a 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
@@ -101,22 +101,6 @@ type OpcodeSet struct {
 	InterfaceEscapeKeyCode   *Opcode
 	CodeLength               int
 	EndCode                  *Opcode
-	Code                     Code
-	QueryCache               map[string]*OpcodeSet
-	cacheMu                  sync.RWMutex
-}
-
-func (s *OpcodeSet) getQueryCache(hash string) *OpcodeSet {
-	s.cacheMu.RLock()
-	codeSet := s.QueryCache[hash]
-	s.cacheMu.RUnlock()
-	return codeSet
-}
-
-func (s *OpcodeSet) setQueryCache(hash string, codeSet *OpcodeSet) {
-	s.cacheMu.Lock()
-	s.QueryCache[hash] = codeSet
-	s.cacheMu.Unlock()
 }
 
 type CompiledCode struct {
@@ -238,56 +222,33 @@ func (m *Mapslice) Swap(i, j int) {
 	m.Items[i], m.Items[j] = m.Items[j], m.Items[i]
 }
 
-//nolint:structcheck,unused
-type mapIter struct {
-	key         unsafe.Pointer
-	elem        unsafe.Pointer
-	t           unsafe.Pointer
-	h           unsafe.Pointer
-	buckets     unsafe.Pointer
-	bptr        unsafe.Pointer
-	overflow    unsafe.Pointer
-	oldoverflow unsafe.Pointer
-	startBucket uintptr
-	offset      uint8
-	wrapped     bool
-	B           uint8
-	i           uint8
-	bucket      uintptr
-	checkBucket uintptr
-}
-
 type MapContext struct {
-	Start int
-	First int
-	Idx   int
+	Pos   []int
 	Slice *Mapslice
 	Buf   []byte
-	Len   int
-	Iter  mapIter
 }
 
 var mapContextPool = sync.Pool{
 	New: func() interface{} {
-		return &MapContext{
-			Slice: &Mapslice{},
-		}
+		return &MapContext{}
 	},
 }
 
-func NewMapContext(mapLen int, unorderedMap bool) *MapContext {
+func NewMapContext(mapLen int) *MapContext {
 	ctx := mapContextPool.Get().(*MapContext)
-	if !unorderedMap {
-		if len(ctx.Slice.Items) < mapLen {
-			ctx.Slice.Items = make([]MapItem, mapLen)
-		} else {
-			ctx.Slice.Items = ctx.Slice.Items[:mapLen]
+	if ctx.Slice == nil {
+		ctx.Slice = &Mapslice{
+			Items: make([]MapItem, 0, mapLen),
 		}
 	}
+	if cap(ctx.Pos) < (mapLen*2 + 1) {
+		ctx.Pos = make([]int, 0, mapLen*2+1)
+		ctx.Slice.Items = make([]MapItem, 0, mapLen)
+	} else {
+		ctx.Pos = ctx.Pos[:0]
+		ctx.Slice.Items = ctx.Slice.Items[:0]
+	}
 	ctx.Buf = ctx.Buf[:0]
-	ctx.Iter = mapIter{}
-	ctx.Idx = 0
-	ctx.Len = mapLen
 	return ctx
 }
 
@@ -295,17 +256,17 @@ func ReleaseMapContext(c *MapContext) {
 	mapContextPool.Put(c)
 }
 
-//go:linkname MapIterInit runtime.mapiterinit
+//go:linkname MapIterInit reflect.mapiterinit
 //go:noescape
-func MapIterInit(mapType *runtime.Type, m unsafe.Pointer, it *mapIter)
+func MapIterInit(mapType *runtime.Type, m unsafe.Pointer) unsafe.Pointer
 
 //go:linkname MapIterKey reflect.mapiterkey
 //go:noescape
-func MapIterKey(it *mapIter) unsafe.Pointer
+func MapIterKey(it unsafe.Pointer) unsafe.Pointer
 
 //go:linkname MapIterNext reflect.mapiternext
 //go:noescape
-func MapIterNext(it *mapIter)
+func MapIterNext(it unsafe.Pointer)
 
 //go:linkname MapLen reflect.maplen
 //go:noescape
@@ -406,11 +367,6 @@ func AppendMarshalJSON(ctx *RuntimeContext, code *Opcode, b []byte, v interface{
 			rv = newV
 		}
 	}
-
-	if rv.Kind() == reflect.Ptr && rv.IsNil() {
-		return AppendNull(ctx, b), nil
-	}
-
 	v = rv.Interface()
 	var bb []byte
 	if (code.Flags & MarshalerContextFlags) != 0 {
@@ -418,11 +374,7 @@ func AppendMarshalJSON(ctx *RuntimeContext, code *Opcode, b []byte, v interface{
 		if !ok {
 			return AppendNull(ctx, b), nil
 		}
-		stdctx := ctx.Option.Context
-		if ctx.Option.Flag&FieldQueryOption != 0 {
-			stdctx = SetFieldQueryToContext(stdctx, code.FieldQuery)
-		}
-		b, err := marshaler.MarshalJSON(stdctx)
+		b, err := marshaler.MarshalJSON(ctx.Option.Context)
 		if err != nil {
 			return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err}
 		}
@@ -594,8 +546,6 @@ func IsNilForMarshaler(v interface{}) bool {
 		return rv.IsNil()
 	case reflect.Slice:
 		return rv.IsNil() || rv.Len() == 0
-	case reflect.String:
-		return rv.Len() == 0
 	}
 	return false
 }
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/int.go b/vendor/github.com/goccy/go-json/internal/encoder/int.go
index 8b5febe..3a3482d 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/int.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/int.go
@@ -1,27 +1,3 @@
-// This files's processing codes are inspired by https://github.com/segmentio/encoding.
-// The license notation is as follows.
-//
-// # MIT License
-//
-// Copyright (c) 2019 Segment.io, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 package encoder
 
 import (
@@ -77,18 +53,7 @@ func numMask(numBitSize uint8) uint64 {
 	return 1<<numBitSize - 1
 }
 
-func AppendInt(_ *RuntimeContext, out []byte, p uintptr, code *Opcode) []byte {
-	var u64 uint64
-	switch code.NumBitSize {
-	case 8:
-		u64 = (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		u64 = (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		u64 = (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		u64 = **(**uint64)(unsafe.Pointer(&p))
-	}
+func AppendInt(_ *RuntimeContext, out []byte, u64 uint64, code *Opcode) []byte {
 	mask := numMask(code.NumBitSize)
 	n := u64 & mask
 	negative := (u64>>(code.NumBitSize-1))&1 == 1
@@ -131,18 +96,7 @@ func AppendInt(_ *RuntimeContext, out []byte, p uintptr, code *Opcode) []byte {
 	return append(out, b[i:]...)
 }
 
-func AppendUint(_ *RuntimeContext, out []byte, p uintptr, code *Opcode) []byte {
-	var u64 uint64
-	switch code.NumBitSize {
-	case 8:
-		u64 = (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		u64 = (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		u64 = (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		u64 = **(**uint64)(unsafe.Pointer(&p))
-	}
+func AppendUint(_ *RuntimeContext, out []byte, u64 uint64, code *Opcode) []byte {
 	mask := numMask(code.NumBitSize)
 	n := u64 & mask
 	if n < 10 {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/map112.go b/vendor/github.com/goccy/go-json/internal/encoder/map112.go
index e96ffad..31858d0 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/map112.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/map112.go
@@ -1,4 +1,3 @@
-//go:build !go1.13
 // +build !go1.13
 
 package encoder
@@ -6,4 +5,4 @@ package encoder
 import "unsafe"
 
 //go:linkname MapIterValue reflect.mapitervalue
-func MapIterValue(it *mapIter) unsafe.Pointer
+func MapIterValue(it unsafe.Pointer) unsafe.Pointer
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/map113.go b/vendor/github.com/goccy/go-json/internal/encoder/map113.go
index 9b69dcc..f49c27b 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/map113.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/map113.go
@@ -1,4 +1,3 @@
-//go:build go1.13
 // +build go1.13
 
 package encoder
@@ -6,4 +5,4 @@ package encoder
 import "unsafe"
 
 //go:linkname MapIterValue reflect.mapiterelem
-func MapIterValue(it *mapIter) unsafe.Pointer
+func MapIterValue(it unsafe.Pointer) unsafe.Pointer
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/opcode.go b/vendor/github.com/goccy/go-json/internal/encoder/opcode.go
index df22f55..7c50eef 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/opcode.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/opcode.go
@@ -1,9 +1,7 @@
 package encoder
 
 import (
-	"bytes"
 	"fmt"
-	"sort"
 	"strings"
 	"unsafe"
 
@@ -40,58 +38,26 @@ type Opcode struct {
 	Flags      OpFlags
 
 	Type       *runtime.Type // go type
+	PrevField  *Opcode       // prev struct field
 	Jmp        *CompiledCode // for recursive call
-	FieldQuery *FieldQuery   // field query for Interface / MarshalJSON / MarshalText
-	ElemIdx    uint32        // offset to access array/slice elem
-	Length     uint32        // offset to access slice length or array length
+	ElemIdx    uint32        // offset to access array/slice/map elem
+	Length     uint32        // offset to access slice/map length or array length
+	MapIter    uint32        // offset to access map iterator
+	MapPos     uint32        // offset to access position list for sorted map
 	Indent     uint32        // indent number
 	Size       uint32        // array/slice elem size
 	DisplayIdx uint32        // opcode index
 	DisplayKey string        // key text to display
 }
 
-func (c *Opcode) Validate() error {
-	var prevIdx uint32
-	for code := c; !code.IsEnd(); {
-		if prevIdx != 0 {
-			if code.DisplayIdx != prevIdx+1 {
-				return fmt.Errorf(
-					"invalid index. previous display index is %d but next is %d. dump = %s",
-					prevIdx, code.DisplayIdx, c.Dump(),
-				)
-			}
-		}
-		prevIdx = code.DisplayIdx
-		code = code.IterNext()
-	}
-	return nil
-}
-
-func (c *Opcode) IterNext() *Opcode {
-	if c == nil {
-		return nil
-	}
-	switch c.Op.CodeType() {
-	case CodeArrayElem, CodeSliceElem, CodeMapKey:
-		return c.End
-	default:
-		return c.Next
-	}
-}
-
-func (c *Opcode) IsEnd() bool {
-	if c == nil {
-		return true
-	}
-	return c.Op == OpEnd || c.Op == OpInterfaceEnd || c.Op == OpRecursiveEnd
-}
-
 func (c *Opcode) MaxIdx() uint32 {
 	max := uint32(0)
 	for _, value := range []uint32{
 		c.Idx,
 		c.ElemIdx,
 		c.Length,
+		c.MapIter,
+		c.MapPos,
 		c.Size,
 	} {
 		if max < value {
@@ -307,75 +273,43 @@ func (c *Opcode) ToFieldType(isString bool) OpType {
 	return OpStructField
 }
 
-func newOpCode(ctx *compileContext, typ *runtime.Type, op OpType) *Opcode {
-	return newOpCodeWithNext(ctx, typ, op, newEndOp(ctx, typ))
+func newOpCode(ctx *compileContext, op OpType) *Opcode {
+	return newOpCodeWithNext(ctx, op, newEndOp(ctx))
 }
 
 func opcodeOffset(idx int) uint32 {
 	return uint32(idx) * uintptrSize
 }
 
-func getCodeAddrByIdx(head *Opcode, idx uint32) *Opcode {
-	addr := uintptr(unsafe.Pointer(head)) + uintptr(idx)*unsafe.Sizeof(Opcode{})
-	return *(**Opcode)(unsafe.Pointer(&addr))
-}
-
 func copyOpcode(code *Opcode) *Opcode {
-	codeNum := ToEndCode(code).DisplayIdx + 1
-	codeSlice := make([]Opcode, codeNum)
-	head := (*Opcode)((*runtime.SliceHeader)(unsafe.Pointer(&codeSlice)).Data)
-	ptr := head
-	c := code
-	for {
-		*ptr = Opcode{
-			Op:         c.Op,
-			Key:        c.Key,
-			PtrNum:     c.PtrNum,
-			NumBitSize: c.NumBitSize,
-			Flags:      c.Flags,
-			Idx:        c.Idx,
-			Offset:     c.Offset,
-			Type:       c.Type,
-			FieldQuery: c.FieldQuery,
-			DisplayIdx: c.DisplayIdx,
-			DisplayKey: c.DisplayKey,
-			ElemIdx:    c.ElemIdx,
-			Length:     c.Length,
-			Size:       c.Size,
-			Indent:     c.Indent,
-			Jmp:        c.Jmp,
-		}
-		if c.End != nil {
-			ptr.End = getCodeAddrByIdx(head, c.End.DisplayIdx)
-		}
-		if c.NextField != nil {
-			ptr.NextField = getCodeAddrByIdx(head, c.NextField.DisplayIdx)
-		}
-		if c.Next != nil {
-			ptr.Next = getCodeAddrByIdx(head, c.Next.DisplayIdx)
-		}
-		if c.IsEnd() {
-			break
-		}
-		ptr = getCodeAddrByIdx(head, c.DisplayIdx+1)
-		c = c.IterNext()
-	}
-	return head
+	codeMap := map[uintptr]*Opcode{}
+	return code.copy(codeMap)
 }
 
 func setTotalLengthToInterfaceOp(code *Opcode) {
-	for c := code; !c.IsEnd(); {
-		if c.Op == OpInterface || c.Op == OpInterfacePtr {
+	c := code
+	for c.Op != OpEnd && c.Op != OpInterfaceEnd {
+		if c.Op == OpInterface {
 			c.Length = uint32(code.TotalLength())
 		}
-		c = c.IterNext()
+		switch c.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			c = c.End
+		default:
+			c = c.Next
+		}
 	}
 }
 
 func ToEndCode(code *Opcode) *Opcode {
 	c := code
-	for !c.IsEnd() {
-		c = c.IterNext()
+	for c.Op != OpEnd && c.Op != OpInterfaceEnd {
+		switch c.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			c = c.End
+		default:
+			c = c.Next
+		}
 	}
 	return c
 }
@@ -391,25 +325,77 @@ func copyToInterfaceOpcode(code *Opcode) *Opcode {
 	return copied
 }
 
-func newOpCodeWithNext(ctx *compileContext, typ *runtime.Type, op OpType, next *Opcode) *Opcode {
+func newOpCodeWithNext(ctx *compileContext, op OpType, next *Opcode) *Opcode {
 	return &Opcode{
 		Op:         op,
 		Idx:        opcodeOffset(ctx.ptrIndex),
 		Next:       next,
-		Type:       typ,
+		Type:       ctx.typ,
 		DisplayIdx: ctx.opcodeIndex,
 		Indent:     ctx.indent,
 	}
 }
 
-func newEndOp(ctx *compileContext, typ *runtime.Type) *Opcode {
-	return newOpCodeWithNext(ctx, typ, OpEnd, nil)
+func newEndOp(ctx *compileContext) *Opcode {
+	return newOpCodeWithNext(ctx, OpEnd, nil)
+}
+
+func (c *Opcode) copy(codeMap map[uintptr]*Opcode) *Opcode {
+	if c == nil {
+		return nil
+	}
+	addr := uintptr(unsafe.Pointer(c))
+	if code, exists := codeMap[addr]; exists {
+		return code
+	}
+	copied := &Opcode{
+		Op:         c.Op,
+		Key:        c.Key,
+		PtrNum:     c.PtrNum,
+		NumBitSize: c.NumBitSize,
+		Flags:      c.Flags,
+		Idx:        c.Idx,
+		Offset:     c.Offset,
+		Type:       c.Type,
+		DisplayIdx: c.DisplayIdx,
+		DisplayKey: c.DisplayKey,
+		ElemIdx:    c.ElemIdx,
+		Length:     c.Length,
+		MapIter:    c.MapIter,
+		MapPos:     c.MapPos,
+		Size:       c.Size,
+		Indent:     c.Indent,
+	}
+	codeMap[addr] = copied
+	copied.End = c.End.copy(codeMap)
+	copied.PrevField = c.PrevField.copy(codeMap)
+	copied.NextField = c.NextField.copy(codeMap)
+	copied.Next = c.Next.copy(codeMap)
+	copied.Jmp = c.Jmp
+	return copied
+}
+
+func (c *Opcode) BeforeLastCode() *Opcode {
+	code := c
+	for {
+		var nextCode *Opcode
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			nextCode = code.End
+		default:
+			nextCode = code.Next
+		}
+		if nextCode.Op == OpEnd {
+			return code
+		}
+		code = nextCode
+	}
 }
 
 func (c *Opcode) TotalLength() int {
 	var idx int
 	code := c
-	for !code.IsEnd() {
+	for code.Op != OpEnd && code.Op != OpInterfaceEnd {
 		maxIdx := int(code.MaxIdx() / uintptrSize)
 		if idx < maxIdx {
 			idx = maxIdx
@@ -417,7 +403,12 @@ func (c *Opcode) TotalLength() int {
 		if code.Op == OpRecursiveEnd {
 			break
 		}
-		code = code.IterNext()
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		default:
+			code = code.Next
+		}
 	}
 	maxIdx := int(code.MaxIdx() / uintptrSize)
 	if idx < maxIdx {
@@ -426,6 +417,42 @@ func (c *Opcode) TotalLength() int {
 	return idx + 1
 }
 
+func (c *Opcode) decOpcodeIndex() {
+	for code := c; code.Op != OpEnd; {
+		code.DisplayIdx--
+		if code.Idx > 0 {
+			code.Idx -= uintptrSize
+		}
+		if code.ElemIdx > 0 {
+			code.ElemIdx -= uintptrSize
+		}
+		if code.MapIter > 0 {
+			code.MapIter -= uintptrSize
+		}
+		if code.Length > 0 && code.Op.CodeType() != CodeArrayHead && code.Op.CodeType() != CodeArrayElem {
+			code.Length -= uintptrSize
+		}
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		default:
+			code = code.Next
+		}
+	}
+}
+
+func (c *Opcode) decIndent() {
+	for code := c; code.Op != OpEnd; {
+		code.Indent--
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			code = code.End
+		default:
+			code = code.Next
+		}
+	}
+}
+
 func (c *Opcode) dumpHead(code *Opcode) string {
 	var length uint32
 	if code.Op.CodeType() == CodeArrayHead {
@@ -434,7 +461,7 @@ func (c *Opcode) dumpHead(code *Opcode) string {
 		length = code.Length / uintptrSize
 	}
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d][elemIdx:%d][length:%d])`,
+		`[%d]%s%s ([idx:%d][elemIdx:%d][length:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
@@ -446,21 +473,26 @@ func (c *Opcode) dumpHead(code *Opcode) string {
 
 func (c *Opcode) dumpMapHead(code *Opcode) string {
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d])`,
+		`[%d]%s%s ([idx:%d][elemIdx:%d][length:%d][mapIter:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
 		code.Idx/uintptrSize,
+		code.ElemIdx/uintptrSize,
+		code.Length/uintptrSize,
+		code.MapIter/uintptrSize,
 	)
 }
 
 func (c *Opcode) dumpMapEnd(code *Opcode) string {
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d])`,
+		`[%d]%s%s ([idx:%d][mapPos:%d][length:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
 		code.Idx/uintptrSize,
+		code.MapPos/uintptrSize,
+		code.Length/uintptrSize,
 	)
 }
 
@@ -472,7 +504,7 @@ func (c *Opcode) dumpElem(code *Opcode) string {
 		length = code.Length / uintptrSize
 	}
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d][elemIdx:%d][length:%d][size:%d])`,
+		`[%d]%s%s ([idx:%d][elemIdx:%d][length:%d][size:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
@@ -485,7 +517,7 @@ func (c *Opcode) dumpElem(code *Opcode) string {
 
 func (c *Opcode) dumpField(code *Opcode) string {
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d][key:%s][offset:%d])`,
+		`[%d]%s%s ([idx:%d][key:%s][offset:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
@@ -497,27 +529,31 @@ func (c *Opcode) dumpField(code *Opcode) string {
 
 func (c *Opcode) dumpKey(code *Opcode) string {
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d])`,
+		`[%d]%s%s ([idx:%d][elemIdx:%d][length:%d][mapIter:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
 		code.Idx/uintptrSize,
+		code.ElemIdx/uintptrSize,
+		code.Length/uintptrSize,
+		code.MapIter/uintptrSize,
 	)
 }
 
 func (c *Opcode) dumpValue(code *Opcode) string {
 	return fmt.Sprintf(
-		`[%03d]%s%s ([idx:%d])`,
+		`[%d]%s%s ([idx:%d][mapIter:%d])`,
 		code.DisplayIdx,
 		strings.Repeat("-", int(code.Indent)),
 		code.Op,
 		code.Idx/uintptrSize,
+		code.MapIter/uintptrSize,
 	)
 }
 
 func (c *Opcode) Dump() string {
 	codes := []string{}
-	for code := c; !code.IsEnd(); {
+	for code := c; code.Op != OpEnd && code.Op != OpInterfaceEnd; {
 		switch code.Op.CodeType() {
 		case CodeSliceHead:
 			codes = append(codes, c.dumpHead(code))
@@ -545,7 +581,7 @@ func (c *Opcode) Dump() string {
 			code = code.Next
 		default:
 			codes = append(codes, fmt.Sprintf(
-				"[%03d]%s%s ([idx:%d])",
+				"[%d]%s%s ([idx:%d])",
 				code.DisplayIdx,
 				strings.Repeat("-", int(code.Indent)),
 				code.Op,
@@ -557,88 +593,44 @@ func (c *Opcode) Dump() string {
 	return strings.Join(codes, "\n")
 }
 
-func (c *Opcode) DumpDOT() string {
-	type edge struct {
-		from, to *Opcode
-		label    string
-		weight   int
+func prevField(code *Opcode, removedFields map[*Opcode]struct{}) *Opcode {
+	if _, exists := removedFields[code]; exists {
+		return prevField(code.PrevField, removedFields)
 	}
-	var edges []edge
-
-	b := &bytes.Buffer{}
-	fmt.Fprintf(b, "digraph \"%p\" {\n", c.Type)
-	fmt.Fprintln(b, "mclimit=1.5;\nrankdir=TD;\nordering=out;\nnode[shape=box];")
-	for code := c; !code.IsEnd(); {
-		label := code.Op.String()
-		fmt.Fprintf(b, "\"%p\" [label=%q];\n", code, label)
-		if p := code.Next; p != nil {
-			edges = append(edges, edge{
-				from:   code,
-				to:     p,
-				label:  "Next",
-				weight: 10,
-			})
-		}
-		if p := code.NextField; p != nil {
-			edges = append(edges, edge{
-				from:   code,
-				to:     p,
-				label:  "NextField",
-				weight: 2,
-			})
-		}
-		if p := code.End; p != nil {
-			edges = append(edges, edge{
-				from:   code,
-				to:     p,
-				label:  "End",
-				weight: 1,
-			})
-		}
-		if p := code.Jmp; p != nil {
-			edges = append(edges, edge{
-				from:   code,
-				to:     p.Code,
-				label:  "Jmp",
-				weight: 1,
-			})
-		}
-
-		switch code.Op.CodeType() {
-		case CodeSliceHead:
-			code = code.Next
-		case CodeMapHead:
-			code = code.Next
-		case CodeArrayElem, CodeSliceElem:
-			code = code.End
-		case CodeMapKey:
-			code = code.End
-		case CodeMapValue:
-			code = code.Next
-		case CodeMapEnd:
-			code = code.Next
-		case CodeStructField:
-			code = code.Next
-		case CodeStructEnd:
-			code = code.Next
-		default:
-			code = code.Next
-		}
-		if code.IsEnd() {
-			fmt.Fprintf(b, "\"%p\" [label=%q];\n", code, code.Op.String())
-		}
-	}
-	sort.Slice(edges, func(i, j int) bool {
-		return edges[i].to.DisplayIdx < edges[j].to.DisplayIdx
-	})
-	for _, e := range edges {
-		fmt.Fprintf(b, "\"%p\" -> \"%p\" [label=%q][weight=%d];\n", e.from, e.to, e.label, e.weight)
-	}
-	fmt.Fprint(b, "}")
-	return b.String()
+	return code
 }
 
-func newSliceHeaderCode(ctx *compileContext, typ *runtime.Type) *Opcode {
+func nextField(code *Opcode, removedFields map[*Opcode]struct{}) *Opcode {
+	if _, exists := removedFields[code]; exists {
+		return nextField(code.NextField, removedFields)
+	}
+	return code
+}
+
+func linkPrevToNextField(cur *Opcode, removedFields map[*Opcode]struct{}) {
+	prev := prevField(cur.PrevField, removedFields)
+	prev.NextField = nextField(cur.NextField, removedFields)
+	code := prev
+	fcode := cur
+	for {
+		var nextCode *Opcode
+		switch code.Op.CodeType() {
+		case CodeArrayElem, CodeSliceElem, CodeMapKey:
+			nextCode = code.End
+		default:
+			nextCode = code.Next
+		}
+		if nextCode == fcode {
+			code.Next = fcode.Next
+			break
+		} else if nextCode.Op == OpEnd {
+			break
+		}
+		code = nextCode
+	}
+}
+
+func newSliceHeaderCode(ctx *compileContext) *Opcode {
 	idx := opcodeOffset(ctx.ptrIndex)
 	ctx.incPtrIndex()
 	elemIdx := opcodeOffset(ctx.ptrIndex)
@@ -646,7 +638,6 @@ func newSliceHeaderCode(ctx *compileContext, typ *runtime.Type) *Opcode {
 	length := opcodeOffset(ctx.ptrIndex)
 	return &Opcode{
 		Op:         OpSlice,
-		Type:       typ,
 		Idx:        idx,
 		DisplayIdx: ctx.opcodeIndex,
 		ElemIdx:    elemIdx,
@@ -655,10 +646,9 @@ func newSliceHeaderCode(ctx *compileContext, typ *runtime.Type) *Opcode {
 	}
 }
 
-func newSliceElemCode(ctx *compileContext, typ *runtime.Type, head *Opcode, size uintptr) *Opcode {
+func newSliceElemCode(ctx *compileContext, head *Opcode, size uintptr) *Opcode {
 	return &Opcode{
 		Op:         OpSliceElem,
-		Type:       typ,
 		Idx:        head.Idx,
 		DisplayIdx: ctx.opcodeIndex,
 		ElemIdx:    head.ElemIdx,
@@ -668,13 +658,12 @@ func newSliceElemCode(ctx *compileContext, typ *runtime.Type, head *Opcode, size
 	}
 }
 
-func newArrayHeaderCode(ctx *compileContext, typ *runtime.Type, alen int) *Opcode {
+func newArrayHeaderCode(ctx *compileContext, alen int) *Opcode {
 	idx := opcodeOffset(ctx.ptrIndex)
 	ctx.incPtrIndex()
 	elemIdx := opcodeOffset(ctx.ptrIndex)
 	return &Opcode{
 		Op:         OpArray,
-		Type:       typ,
 		Idx:        idx,
 		DisplayIdx: ctx.opcodeIndex,
 		ElemIdx:    elemIdx,
@@ -683,10 +672,9 @@ func newArrayHeaderCode(ctx *compileContext, typ *runtime.Type, alen int) *Opcod
 	}
 }
 
-func newArrayElemCode(ctx *compileContext, typ *runtime.Type, head *Opcode, length int, size uintptr) *Opcode {
+func newArrayElemCode(ctx *compileContext, head *Opcode, length int, size uintptr) *Opcode {
 	return &Opcode{
 		Op:         OpArrayElem,
-		Type:       typ,
 		Idx:        head.Idx,
 		DisplayIdx: ctx.opcodeIndex,
 		ElemIdx:    head.ElemIdx,
@@ -696,55 +684,87 @@ func newArrayElemCode(ctx *compileContext, typ *runtime.Type, head *Opcode, leng
 	}
 }
 
-func newMapHeaderCode(ctx *compileContext, typ *runtime.Type) *Opcode {
+func newMapHeaderCode(ctx *compileContext) *Opcode {
 	idx := opcodeOffset(ctx.ptrIndex)
 	ctx.incPtrIndex()
+	elemIdx := opcodeOffset(ctx.ptrIndex)
+	ctx.incPtrIndex()
+	length := opcodeOffset(ctx.ptrIndex)
+	ctx.incPtrIndex()
+	mapIter := opcodeOffset(ctx.ptrIndex)
 	return &Opcode{
 		Op:         OpMap,
-		Type:       typ,
 		Idx:        idx,
+		Type:       ctx.typ,
 		DisplayIdx: ctx.opcodeIndex,
+		ElemIdx:    elemIdx,
+		Length:     length,
+		MapIter:    mapIter,
 		Indent:     ctx.indent,
 	}
 }
 
-func newMapKeyCode(ctx *compileContext, typ *runtime.Type, head *Opcode) *Opcode {
+func newMapKeyCode(ctx *compileContext, head *Opcode) *Opcode {
 	return &Opcode{
 		Op:         OpMapKey,
-		Type:       typ,
-		Idx:        head.Idx,
+		Idx:        opcodeOffset(ctx.ptrIndex),
 		DisplayIdx: ctx.opcodeIndex,
+		ElemIdx:    head.ElemIdx,
+		Length:     head.Length,
+		MapIter:    head.MapIter,
 		Indent:     ctx.indent,
 	}
 }
 
-func newMapValueCode(ctx *compileContext, typ *runtime.Type, head *Opcode) *Opcode {
+func newMapValueCode(ctx *compileContext, head *Opcode) *Opcode {
 	return &Opcode{
 		Op:         OpMapValue,
-		Type:       typ,
-		Idx:        head.Idx,
+		Idx:        opcodeOffset(ctx.ptrIndex),
 		DisplayIdx: ctx.opcodeIndex,
+		ElemIdx:    head.ElemIdx,
+		Length:     head.Length,
+		MapIter:    head.MapIter,
 		Indent:     ctx.indent,
 	}
 }
 
-func newMapEndCode(ctx *compileContext, typ *runtime.Type, head *Opcode) *Opcode {
+func newMapEndCode(ctx *compileContext, head *Opcode) *Opcode {
+	mapPos := opcodeOffset(ctx.ptrIndex)
+	ctx.incPtrIndex()
+	idx := opcodeOffset(ctx.ptrIndex)
 	return &Opcode{
 		Op:         OpMapEnd,
-		Type:       typ,
-		Idx:        head.Idx,
+		Idx:        idx,
+		Next:       newEndOp(ctx),
 		DisplayIdx: ctx.opcodeIndex,
+		Length:     head.Length,
+		MapPos:     mapPos,
 		Indent:     ctx.indent,
-		Next:       newEndOp(ctx, typ),
 	}
 }
 
-func newRecursiveCode(ctx *compileContext, typ *runtime.Type, jmp *CompiledCode) *Opcode {
+func newInterfaceCode(ctx *compileContext) *Opcode {
+	var flag OpFlags
+	if ctx.typ.NumMethod() > 0 {
+		flag |= NonEmptyInterfaceFlags
+	}
+	return &Opcode{
+		Op:         OpInterface,
+		Idx:        opcodeOffset(ctx.ptrIndex),
+		Next:       newEndOp(ctx),
+		Type:       ctx.typ,
+		DisplayIdx: ctx.opcodeIndex,
+		Indent:     ctx.indent,
+		Flags:      flag,
+	}
+}
+
+func newRecursiveCode(ctx *compileContext, jmp *CompiledCode) *Opcode {
 	return &Opcode{
 		Op:         OpRecursive,
-		Type:       typ,
 		Idx:        opcodeOffset(ctx.ptrIndex),
-		Next:       newEndOp(ctx, typ),
+		Next:       newEndOp(ctx),
+		Type:       ctx.typ,
 		DisplayIdx: ctx.opcodeIndex,
 		Indent:     ctx.indent,
 		Jmp:        jmp,
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/option.go b/vendor/github.com/goccy/go-json/internal/encoder/option.go
index 12c58e4..f5f1f04 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/option.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/option.go
@@ -1,9 +1,6 @@
 package encoder
 
-import (
-	"context"
-	"io"
-)
+import "context"
 
 type OptionFlag uint8
 
@@ -14,16 +11,12 @@ const (
 	DebugOption
 	ColorizeOption
 	ContextOption
-	NormalizeUTF8Option
-	FieldQueryOption
 )
 
 type Option struct {
 	Flag        OptionFlag
 	ColorScheme *ColorScheme
 	Context     context.Context
-	DebugOut    io.Writer
-	DebugDOTOut io.WriteCloser
 }
 
 type EncodeFormat struct {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/optype.go b/vendor/github.com/goccy/go-json/internal/encoder/optype.go
index 5c1241b..335fc04 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/optype.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/optype.go
@@ -22,7 +22,7 @@ const (
 	CodeStructEnd   CodeType = 11
 )
 
-var opTypeStrings = [400]string{
+var opTypeStrings = [401]string{
 	"End",
 	"Interface",
 	"Ptr",
@@ -37,6 +37,7 @@ var opTypeStrings = [400]string{
 	"RecursivePtr",
 	"RecursiveEnd",
 	"InterfaceEnd",
+	"StructAnonymousEnd",
 	"Int",
 	"Uint",
 	"Float32",
@@ -442,396 +443,397 @@ const (
 	OpRecursivePtr                           OpType = 11
 	OpRecursiveEnd                           OpType = 12
 	OpInterfaceEnd                           OpType = 13
-	OpInt                                    OpType = 14
-	OpUint                                   OpType = 15
-	OpFloat32                                OpType = 16
-	OpFloat64                                OpType = 17
-	OpBool                                   OpType = 18
-	OpString                                 OpType = 19
-	OpBytes                                  OpType = 20
-	OpNumber                                 OpType = 21
-	OpArray                                  OpType = 22
-	OpMap                                    OpType = 23
-	OpSlice                                  OpType = 24
-	OpStruct                                 OpType = 25
-	OpMarshalJSON                            OpType = 26
-	OpMarshalText                            OpType = 27
-	OpIntString                              OpType = 28
-	OpUintString                             OpType = 29
-	OpFloat32String                          OpType = 30
-	OpFloat64String                          OpType = 31
-	OpBoolString                             OpType = 32
-	OpStringString                           OpType = 33
-	OpNumberString                           OpType = 34
-	OpIntPtr                                 OpType = 35
-	OpUintPtr                                OpType = 36
-	OpFloat32Ptr                             OpType = 37
-	OpFloat64Ptr                             OpType = 38
-	OpBoolPtr                                OpType = 39
-	OpStringPtr                              OpType = 40
-	OpBytesPtr                               OpType = 41
-	OpNumberPtr                              OpType = 42
-	OpArrayPtr                               OpType = 43
-	OpMapPtr                                 OpType = 44
-	OpSlicePtr                               OpType = 45
-	OpMarshalJSONPtr                         OpType = 46
-	OpMarshalTextPtr                         OpType = 47
-	OpInterfacePtr                           OpType = 48
-	OpIntPtrString                           OpType = 49
-	OpUintPtrString                          OpType = 50
-	OpFloat32PtrString                       OpType = 51
-	OpFloat64PtrString                       OpType = 52
-	OpBoolPtrString                          OpType = 53
-	OpStringPtrString                        OpType = 54
-	OpNumberPtrString                        OpType = 55
-	OpStructHeadInt                          OpType = 56
-	OpStructHeadOmitEmptyInt                 OpType = 57
-	OpStructPtrHeadInt                       OpType = 58
-	OpStructPtrHeadOmitEmptyInt              OpType = 59
-	OpStructHeadUint                         OpType = 60
-	OpStructHeadOmitEmptyUint                OpType = 61
-	OpStructPtrHeadUint                      OpType = 62
-	OpStructPtrHeadOmitEmptyUint             OpType = 63
-	OpStructHeadFloat32                      OpType = 64
-	OpStructHeadOmitEmptyFloat32             OpType = 65
-	OpStructPtrHeadFloat32                   OpType = 66
-	OpStructPtrHeadOmitEmptyFloat32          OpType = 67
-	OpStructHeadFloat64                      OpType = 68
-	OpStructHeadOmitEmptyFloat64             OpType = 69
-	OpStructPtrHeadFloat64                   OpType = 70
-	OpStructPtrHeadOmitEmptyFloat64          OpType = 71
-	OpStructHeadBool                         OpType = 72
-	OpStructHeadOmitEmptyBool                OpType = 73
-	OpStructPtrHeadBool                      OpType = 74
-	OpStructPtrHeadOmitEmptyBool             OpType = 75
-	OpStructHeadString                       OpType = 76
-	OpStructHeadOmitEmptyString              OpType = 77
-	OpStructPtrHeadString                    OpType = 78
-	OpStructPtrHeadOmitEmptyString           OpType = 79
-	OpStructHeadBytes                        OpType = 80
-	OpStructHeadOmitEmptyBytes               OpType = 81
-	OpStructPtrHeadBytes                     OpType = 82
-	OpStructPtrHeadOmitEmptyBytes            OpType = 83
-	OpStructHeadNumber                       OpType = 84
-	OpStructHeadOmitEmptyNumber              OpType = 85
-	OpStructPtrHeadNumber                    OpType = 86
-	OpStructPtrHeadOmitEmptyNumber           OpType = 87
-	OpStructHeadArray                        OpType = 88
-	OpStructHeadOmitEmptyArray               OpType = 89
-	OpStructPtrHeadArray                     OpType = 90
-	OpStructPtrHeadOmitEmptyArray            OpType = 91
-	OpStructHeadMap                          OpType = 92
-	OpStructHeadOmitEmptyMap                 OpType = 93
-	OpStructPtrHeadMap                       OpType = 94
-	OpStructPtrHeadOmitEmptyMap              OpType = 95
-	OpStructHeadSlice                        OpType = 96
-	OpStructHeadOmitEmptySlice               OpType = 97
-	OpStructPtrHeadSlice                     OpType = 98
-	OpStructPtrHeadOmitEmptySlice            OpType = 99
-	OpStructHeadStruct                       OpType = 100
-	OpStructHeadOmitEmptyStruct              OpType = 101
-	OpStructPtrHeadStruct                    OpType = 102
-	OpStructPtrHeadOmitEmptyStruct           OpType = 103
-	OpStructHeadMarshalJSON                  OpType = 104
-	OpStructHeadOmitEmptyMarshalJSON         OpType = 105
-	OpStructPtrHeadMarshalJSON               OpType = 106
-	OpStructPtrHeadOmitEmptyMarshalJSON      OpType = 107
-	OpStructHeadMarshalText                  OpType = 108
-	OpStructHeadOmitEmptyMarshalText         OpType = 109
-	OpStructPtrHeadMarshalText               OpType = 110
-	OpStructPtrHeadOmitEmptyMarshalText      OpType = 111
-	OpStructHeadIntString                    OpType = 112
-	OpStructHeadOmitEmptyIntString           OpType = 113
-	OpStructPtrHeadIntString                 OpType = 114
-	OpStructPtrHeadOmitEmptyIntString        OpType = 115
-	OpStructHeadUintString                   OpType = 116
-	OpStructHeadOmitEmptyUintString          OpType = 117
-	OpStructPtrHeadUintString                OpType = 118
-	OpStructPtrHeadOmitEmptyUintString       OpType = 119
-	OpStructHeadFloat32String                OpType = 120
-	OpStructHeadOmitEmptyFloat32String       OpType = 121
-	OpStructPtrHeadFloat32String             OpType = 122
-	OpStructPtrHeadOmitEmptyFloat32String    OpType = 123
-	OpStructHeadFloat64String                OpType = 124
-	OpStructHeadOmitEmptyFloat64String       OpType = 125
-	OpStructPtrHeadFloat64String             OpType = 126
-	OpStructPtrHeadOmitEmptyFloat64String    OpType = 127
-	OpStructHeadBoolString                   OpType = 128
-	OpStructHeadOmitEmptyBoolString          OpType = 129
-	OpStructPtrHeadBoolString                OpType = 130
-	OpStructPtrHeadOmitEmptyBoolString       OpType = 131
-	OpStructHeadStringString                 OpType = 132
-	OpStructHeadOmitEmptyStringString        OpType = 133
-	OpStructPtrHeadStringString              OpType = 134
-	OpStructPtrHeadOmitEmptyStringString     OpType = 135
-	OpStructHeadNumberString                 OpType = 136
-	OpStructHeadOmitEmptyNumberString        OpType = 137
-	OpStructPtrHeadNumberString              OpType = 138
-	OpStructPtrHeadOmitEmptyNumberString     OpType = 139
-	OpStructHeadIntPtr                       OpType = 140
-	OpStructHeadOmitEmptyIntPtr              OpType = 141
-	OpStructPtrHeadIntPtr                    OpType = 142
-	OpStructPtrHeadOmitEmptyIntPtr           OpType = 143
-	OpStructHeadUintPtr                      OpType = 144
-	OpStructHeadOmitEmptyUintPtr             OpType = 145
-	OpStructPtrHeadUintPtr                   OpType = 146
-	OpStructPtrHeadOmitEmptyUintPtr          OpType = 147
-	OpStructHeadFloat32Ptr                   OpType = 148
-	OpStructHeadOmitEmptyFloat32Ptr          OpType = 149
-	OpStructPtrHeadFloat32Ptr                OpType = 150
-	OpStructPtrHeadOmitEmptyFloat32Ptr       OpType = 151
-	OpStructHeadFloat64Ptr                   OpType = 152
-	OpStructHeadOmitEmptyFloat64Ptr          OpType = 153
-	OpStructPtrHeadFloat64Ptr                OpType = 154
-	OpStructPtrHeadOmitEmptyFloat64Ptr       OpType = 155
-	OpStructHeadBoolPtr                      OpType = 156
-	OpStructHeadOmitEmptyBoolPtr             OpType = 157
-	OpStructPtrHeadBoolPtr                   OpType = 158
-	OpStructPtrHeadOmitEmptyBoolPtr          OpType = 159
-	OpStructHeadStringPtr                    OpType = 160
-	OpStructHeadOmitEmptyStringPtr           OpType = 161
-	OpStructPtrHeadStringPtr                 OpType = 162
-	OpStructPtrHeadOmitEmptyStringPtr        OpType = 163
-	OpStructHeadBytesPtr                     OpType = 164
-	OpStructHeadOmitEmptyBytesPtr            OpType = 165
-	OpStructPtrHeadBytesPtr                  OpType = 166
-	OpStructPtrHeadOmitEmptyBytesPtr         OpType = 167
-	OpStructHeadNumberPtr                    OpType = 168
-	OpStructHeadOmitEmptyNumberPtr           OpType = 169
-	OpStructPtrHeadNumberPtr                 OpType = 170
-	OpStructPtrHeadOmitEmptyNumberPtr        OpType = 171
-	OpStructHeadArrayPtr                     OpType = 172
-	OpStructHeadOmitEmptyArrayPtr            OpType = 173
-	OpStructPtrHeadArrayPtr                  OpType = 174
-	OpStructPtrHeadOmitEmptyArrayPtr         OpType = 175
-	OpStructHeadMapPtr                       OpType = 176
-	OpStructHeadOmitEmptyMapPtr              OpType = 177
-	OpStructPtrHeadMapPtr                    OpType = 178
-	OpStructPtrHeadOmitEmptyMapPtr           OpType = 179
-	OpStructHeadSlicePtr                     OpType = 180
-	OpStructHeadOmitEmptySlicePtr            OpType = 181
-	OpStructPtrHeadSlicePtr                  OpType = 182
-	OpStructPtrHeadOmitEmptySlicePtr         OpType = 183
-	OpStructHeadMarshalJSONPtr               OpType = 184
-	OpStructHeadOmitEmptyMarshalJSONPtr      OpType = 185
-	OpStructPtrHeadMarshalJSONPtr            OpType = 186
-	OpStructPtrHeadOmitEmptyMarshalJSONPtr   OpType = 187
-	OpStructHeadMarshalTextPtr               OpType = 188
-	OpStructHeadOmitEmptyMarshalTextPtr      OpType = 189
-	OpStructPtrHeadMarshalTextPtr            OpType = 190
-	OpStructPtrHeadOmitEmptyMarshalTextPtr   OpType = 191
-	OpStructHeadInterfacePtr                 OpType = 192
-	OpStructHeadOmitEmptyInterfacePtr        OpType = 193
-	OpStructPtrHeadInterfacePtr              OpType = 194
-	OpStructPtrHeadOmitEmptyInterfacePtr     OpType = 195
-	OpStructHeadIntPtrString                 OpType = 196
-	OpStructHeadOmitEmptyIntPtrString        OpType = 197
-	OpStructPtrHeadIntPtrString              OpType = 198
-	OpStructPtrHeadOmitEmptyIntPtrString     OpType = 199
-	OpStructHeadUintPtrString                OpType = 200
-	OpStructHeadOmitEmptyUintPtrString       OpType = 201
-	OpStructPtrHeadUintPtrString             OpType = 202
-	OpStructPtrHeadOmitEmptyUintPtrString    OpType = 203
-	OpStructHeadFloat32PtrString             OpType = 204
-	OpStructHeadOmitEmptyFloat32PtrString    OpType = 205
-	OpStructPtrHeadFloat32PtrString          OpType = 206
-	OpStructPtrHeadOmitEmptyFloat32PtrString OpType = 207
-	OpStructHeadFloat64PtrString             OpType = 208
-	OpStructHeadOmitEmptyFloat64PtrString    OpType = 209
-	OpStructPtrHeadFloat64PtrString          OpType = 210
-	OpStructPtrHeadOmitEmptyFloat64PtrString OpType = 211
-	OpStructHeadBoolPtrString                OpType = 212
-	OpStructHeadOmitEmptyBoolPtrString       OpType = 213
-	OpStructPtrHeadBoolPtrString             OpType = 214
-	OpStructPtrHeadOmitEmptyBoolPtrString    OpType = 215
-	OpStructHeadStringPtrString              OpType = 216
-	OpStructHeadOmitEmptyStringPtrString     OpType = 217
-	OpStructPtrHeadStringPtrString           OpType = 218
-	OpStructPtrHeadOmitEmptyStringPtrString  OpType = 219
-	OpStructHeadNumberPtrString              OpType = 220
-	OpStructHeadOmitEmptyNumberPtrString     OpType = 221
-	OpStructPtrHeadNumberPtrString           OpType = 222
-	OpStructPtrHeadOmitEmptyNumberPtrString  OpType = 223
-	OpStructHead                             OpType = 224
-	OpStructHeadOmitEmpty                    OpType = 225
-	OpStructPtrHead                          OpType = 226
-	OpStructPtrHeadOmitEmpty                 OpType = 227
-	OpStructFieldInt                         OpType = 228
-	OpStructFieldOmitEmptyInt                OpType = 229
-	OpStructEndInt                           OpType = 230
-	OpStructEndOmitEmptyInt                  OpType = 231
-	OpStructFieldUint                        OpType = 232
-	OpStructFieldOmitEmptyUint               OpType = 233
-	OpStructEndUint                          OpType = 234
-	OpStructEndOmitEmptyUint                 OpType = 235
-	OpStructFieldFloat32                     OpType = 236
-	OpStructFieldOmitEmptyFloat32            OpType = 237
-	OpStructEndFloat32                       OpType = 238
-	OpStructEndOmitEmptyFloat32              OpType = 239
-	OpStructFieldFloat64                     OpType = 240
-	OpStructFieldOmitEmptyFloat64            OpType = 241
-	OpStructEndFloat64                       OpType = 242
-	OpStructEndOmitEmptyFloat64              OpType = 243
-	OpStructFieldBool                        OpType = 244
-	OpStructFieldOmitEmptyBool               OpType = 245
-	OpStructEndBool                          OpType = 246
-	OpStructEndOmitEmptyBool                 OpType = 247
-	OpStructFieldString                      OpType = 248
-	OpStructFieldOmitEmptyString             OpType = 249
-	OpStructEndString                        OpType = 250
-	OpStructEndOmitEmptyString               OpType = 251
-	OpStructFieldBytes                       OpType = 252
-	OpStructFieldOmitEmptyBytes              OpType = 253
-	OpStructEndBytes                         OpType = 254
-	OpStructEndOmitEmptyBytes                OpType = 255
-	OpStructFieldNumber                      OpType = 256
-	OpStructFieldOmitEmptyNumber             OpType = 257
-	OpStructEndNumber                        OpType = 258
-	OpStructEndOmitEmptyNumber               OpType = 259
-	OpStructFieldArray                       OpType = 260
-	OpStructFieldOmitEmptyArray              OpType = 261
-	OpStructEndArray                         OpType = 262
-	OpStructEndOmitEmptyArray                OpType = 263
-	OpStructFieldMap                         OpType = 264
-	OpStructFieldOmitEmptyMap                OpType = 265
-	OpStructEndMap                           OpType = 266
-	OpStructEndOmitEmptyMap                  OpType = 267
-	OpStructFieldSlice                       OpType = 268
-	OpStructFieldOmitEmptySlice              OpType = 269
-	OpStructEndSlice                         OpType = 270
-	OpStructEndOmitEmptySlice                OpType = 271
-	OpStructFieldStruct                      OpType = 272
-	OpStructFieldOmitEmptyStruct             OpType = 273
-	OpStructEndStruct                        OpType = 274
-	OpStructEndOmitEmptyStruct               OpType = 275
-	OpStructFieldMarshalJSON                 OpType = 276
-	OpStructFieldOmitEmptyMarshalJSON        OpType = 277
-	OpStructEndMarshalJSON                   OpType = 278
-	OpStructEndOmitEmptyMarshalJSON          OpType = 279
-	OpStructFieldMarshalText                 OpType = 280
-	OpStructFieldOmitEmptyMarshalText        OpType = 281
-	OpStructEndMarshalText                   OpType = 282
-	OpStructEndOmitEmptyMarshalText          OpType = 283
-	OpStructFieldIntString                   OpType = 284
-	OpStructFieldOmitEmptyIntString          OpType = 285
-	OpStructEndIntString                     OpType = 286
-	OpStructEndOmitEmptyIntString            OpType = 287
-	OpStructFieldUintString                  OpType = 288
-	OpStructFieldOmitEmptyUintString         OpType = 289
-	OpStructEndUintString                    OpType = 290
-	OpStructEndOmitEmptyUintString           OpType = 291
-	OpStructFieldFloat32String               OpType = 292
-	OpStructFieldOmitEmptyFloat32String      OpType = 293
-	OpStructEndFloat32String                 OpType = 294
-	OpStructEndOmitEmptyFloat32String        OpType = 295
-	OpStructFieldFloat64String               OpType = 296
-	OpStructFieldOmitEmptyFloat64String      OpType = 297
-	OpStructEndFloat64String                 OpType = 298
-	OpStructEndOmitEmptyFloat64String        OpType = 299
-	OpStructFieldBoolString                  OpType = 300
-	OpStructFieldOmitEmptyBoolString         OpType = 301
-	OpStructEndBoolString                    OpType = 302
-	OpStructEndOmitEmptyBoolString           OpType = 303
-	OpStructFieldStringString                OpType = 304
-	OpStructFieldOmitEmptyStringString       OpType = 305
-	OpStructEndStringString                  OpType = 306
-	OpStructEndOmitEmptyStringString         OpType = 307
-	OpStructFieldNumberString                OpType = 308
-	OpStructFieldOmitEmptyNumberString       OpType = 309
-	OpStructEndNumberString                  OpType = 310
-	OpStructEndOmitEmptyNumberString         OpType = 311
-	OpStructFieldIntPtr                      OpType = 312
-	OpStructFieldOmitEmptyIntPtr             OpType = 313
-	OpStructEndIntPtr                        OpType = 314
-	OpStructEndOmitEmptyIntPtr               OpType = 315
-	OpStructFieldUintPtr                     OpType = 316
-	OpStructFieldOmitEmptyUintPtr            OpType = 317
-	OpStructEndUintPtr                       OpType = 318
-	OpStructEndOmitEmptyUintPtr              OpType = 319
-	OpStructFieldFloat32Ptr                  OpType = 320
-	OpStructFieldOmitEmptyFloat32Ptr         OpType = 321
-	OpStructEndFloat32Ptr                    OpType = 322
-	OpStructEndOmitEmptyFloat32Ptr           OpType = 323
-	OpStructFieldFloat64Ptr                  OpType = 324
-	OpStructFieldOmitEmptyFloat64Ptr         OpType = 325
-	OpStructEndFloat64Ptr                    OpType = 326
-	OpStructEndOmitEmptyFloat64Ptr           OpType = 327
-	OpStructFieldBoolPtr                     OpType = 328
-	OpStructFieldOmitEmptyBoolPtr            OpType = 329
-	OpStructEndBoolPtr                       OpType = 330
-	OpStructEndOmitEmptyBoolPtr              OpType = 331
-	OpStructFieldStringPtr                   OpType = 332
-	OpStructFieldOmitEmptyStringPtr          OpType = 333
-	OpStructEndStringPtr                     OpType = 334
-	OpStructEndOmitEmptyStringPtr            OpType = 335
-	OpStructFieldBytesPtr                    OpType = 336
-	OpStructFieldOmitEmptyBytesPtr           OpType = 337
-	OpStructEndBytesPtr                      OpType = 338
-	OpStructEndOmitEmptyBytesPtr             OpType = 339
-	OpStructFieldNumberPtr                   OpType = 340
-	OpStructFieldOmitEmptyNumberPtr          OpType = 341
-	OpStructEndNumberPtr                     OpType = 342
-	OpStructEndOmitEmptyNumberPtr            OpType = 343
-	OpStructFieldArrayPtr                    OpType = 344
-	OpStructFieldOmitEmptyArrayPtr           OpType = 345
-	OpStructEndArrayPtr                      OpType = 346
-	OpStructEndOmitEmptyArrayPtr             OpType = 347
-	OpStructFieldMapPtr                      OpType = 348
-	OpStructFieldOmitEmptyMapPtr             OpType = 349
-	OpStructEndMapPtr                        OpType = 350
-	OpStructEndOmitEmptyMapPtr               OpType = 351
-	OpStructFieldSlicePtr                    OpType = 352
-	OpStructFieldOmitEmptySlicePtr           OpType = 353
-	OpStructEndSlicePtr                      OpType = 354
-	OpStructEndOmitEmptySlicePtr             OpType = 355
-	OpStructFieldMarshalJSONPtr              OpType = 356
-	OpStructFieldOmitEmptyMarshalJSONPtr     OpType = 357
-	OpStructEndMarshalJSONPtr                OpType = 358
-	OpStructEndOmitEmptyMarshalJSONPtr       OpType = 359
-	OpStructFieldMarshalTextPtr              OpType = 360
-	OpStructFieldOmitEmptyMarshalTextPtr     OpType = 361
-	OpStructEndMarshalTextPtr                OpType = 362
-	OpStructEndOmitEmptyMarshalTextPtr       OpType = 363
-	OpStructFieldInterfacePtr                OpType = 364
-	OpStructFieldOmitEmptyInterfacePtr       OpType = 365
-	OpStructEndInterfacePtr                  OpType = 366
-	OpStructEndOmitEmptyInterfacePtr         OpType = 367
-	OpStructFieldIntPtrString                OpType = 368
-	OpStructFieldOmitEmptyIntPtrString       OpType = 369
-	OpStructEndIntPtrString                  OpType = 370
-	OpStructEndOmitEmptyIntPtrString         OpType = 371
-	OpStructFieldUintPtrString               OpType = 372
-	OpStructFieldOmitEmptyUintPtrString      OpType = 373
-	OpStructEndUintPtrString                 OpType = 374
-	OpStructEndOmitEmptyUintPtrString        OpType = 375
-	OpStructFieldFloat32PtrString            OpType = 376
-	OpStructFieldOmitEmptyFloat32PtrString   OpType = 377
-	OpStructEndFloat32PtrString              OpType = 378
-	OpStructEndOmitEmptyFloat32PtrString     OpType = 379
-	OpStructFieldFloat64PtrString            OpType = 380
-	OpStructFieldOmitEmptyFloat64PtrString   OpType = 381
-	OpStructEndFloat64PtrString              OpType = 382
-	OpStructEndOmitEmptyFloat64PtrString     OpType = 383
-	OpStructFieldBoolPtrString               OpType = 384
-	OpStructFieldOmitEmptyBoolPtrString      OpType = 385
-	OpStructEndBoolPtrString                 OpType = 386
-	OpStructEndOmitEmptyBoolPtrString        OpType = 387
-	OpStructFieldStringPtrString             OpType = 388
-	OpStructFieldOmitEmptyStringPtrString    OpType = 389
-	OpStructEndStringPtrString               OpType = 390
-	OpStructEndOmitEmptyStringPtrString      OpType = 391
-	OpStructFieldNumberPtrString             OpType = 392
-	OpStructFieldOmitEmptyNumberPtrString    OpType = 393
-	OpStructEndNumberPtrString               OpType = 394
-	OpStructEndOmitEmptyNumberPtrString      OpType = 395
-	OpStructField                            OpType = 396
-	OpStructFieldOmitEmpty                   OpType = 397
-	OpStructEnd                              OpType = 398
-	OpStructEndOmitEmpty                     OpType = 399
+	OpStructAnonymousEnd                     OpType = 14
+	OpInt                                    OpType = 15
+	OpUint                                   OpType = 16
+	OpFloat32                                OpType = 17
+	OpFloat64                                OpType = 18
+	OpBool                                   OpType = 19
+	OpString                                 OpType = 20
+	OpBytes                                  OpType = 21
+	OpNumber                                 OpType = 22
+	OpArray                                  OpType = 23
+	OpMap                                    OpType = 24
+	OpSlice                                  OpType = 25
+	OpStruct                                 OpType = 26
+	OpMarshalJSON                            OpType = 27
+	OpMarshalText                            OpType = 28
+	OpIntString                              OpType = 29
+	OpUintString                             OpType = 30
+	OpFloat32String                          OpType = 31
+	OpFloat64String                          OpType = 32
+	OpBoolString                             OpType = 33
+	OpStringString                           OpType = 34
+	OpNumberString                           OpType = 35
+	OpIntPtr                                 OpType = 36
+	OpUintPtr                                OpType = 37
+	OpFloat32Ptr                             OpType = 38
+	OpFloat64Ptr                             OpType = 39
+	OpBoolPtr                                OpType = 40
+	OpStringPtr                              OpType = 41
+	OpBytesPtr                               OpType = 42
+	OpNumberPtr                              OpType = 43
+	OpArrayPtr                               OpType = 44
+	OpMapPtr                                 OpType = 45
+	OpSlicePtr                               OpType = 46
+	OpMarshalJSONPtr                         OpType = 47
+	OpMarshalTextPtr                         OpType = 48
+	OpInterfacePtr                           OpType = 49
+	OpIntPtrString                           OpType = 50
+	OpUintPtrString                          OpType = 51
+	OpFloat32PtrString                       OpType = 52
+	OpFloat64PtrString                       OpType = 53
+	OpBoolPtrString                          OpType = 54
+	OpStringPtrString                        OpType = 55
+	OpNumberPtrString                        OpType = 56
+	OpStructHeadInt                          OpType = 57
+	OpStructHeadOmitEmptyInt                 OpType = 58
+	OpStructPtrHeadInt                       OpType = 59
+	OpStructPtrHeadOmitEmptyInt              OpType = 60
+	OpStructHeadUint                         OpType = 61
+	OpStructHeadOmitEmptyUint                OpType = 62
+	OpStructPtrHeadUint                      OpType = 63
+	OpStructPtrHeadOmitEmptyUint             OpType = 64
+	OpStructHeadFloat32                      OpType = 65
+	OpStructHeadOmitEmptyFloat32             OpType = 66
+	OpStructPtrHeadFloat32                   OpType = 67
+	OpStructPtrHeadOmitEmptyFloat32          OpType = 68
+	OpStructHeadFloat64                      OpType = 69
+	OpStructHeadOmitEmptyFloat64             OpType = 70
+	OpStructPtrHeadFloat64                   OpType = 71
+	OpStructPtrHeadOmitEmptyFloat64          OpType = 72
+	OpStructHeadBool                         OpType = 73
+	OpStructHeadOmitEmptyBool                OpType = 74
+	OpStructPtrHeadBool                      OpType = 75
+	OpStructPtrHeadOmitEmptyBool             OpType = 76
+	OpStructHeadString                       OpType = 77
+	OpStructHeadOmitEmptyString              OpType = 78
+	OpStructPtrHeadString                    OpType = 79
+	OpStructPtrHeadOmitEmptyString           OpType = 80
+	OpStructHeadBytes                        OpType = 81
+	OpStructHeadOmitEmptyBytes               OpType = 82
+	OpStructPtrHeadBytes                     OpType = 83
+	OpStructPtrHeadOmitEmptyBytes            OpType = 84
+	OpStructHeadNumber                       OpType = 85
+	OpStructHeadOmitEmptyNumber              OpType = 86
+	OpStructPtrHeadNumber                    OpType = 87
+	OpStructPtrHeadOmitEmptyNumber           OpType = 88
+	OpStructHeadArray                        OpType = 89
+	OpStructHeadOmitEmptyArray               OpType = 90
+	OpStructPtrHeadArray                     OpType = 91
+	OpStructPtrHeadOmitEmptyArray            OpType = 92
+	OpStructHeadMap                          OpType = 93
+	OpStructHeadOmitEmptyMap                 OpType = 94
+	OpStructPtrHeadMap                       OpType = 95
+	OpStructPtrHeadOmitEmptyMap              OpType = 96
+	OpStructHeadSlice                        OpType = 97
+	OpStructHeadOmitEmptySlice               OpType = 98
+	OpStructPtrHeadSlice                     OpType = 99
+	OpStructPtrHeadOmitEmptySlice            OpType = 100
+	OpStructHeadStruct                       OpType = 101
+	OpStructHeadOmitEmptyStruct              OpType = 102
+	OpStructPtrHeadStruct                    OpType = 103
+	OpStructPtrHeadOmitEmptyStruct           OpType = 104
+	OpStructHeadMarshalJSON                  OpType = 105
+	OpStructHeadOmitEmptyMarshalJSON         OpType = 106
+	OpStructPtrHeadMarshalJSON               OpType = 107
+	OpStructPtrHeadOmitEmptyMarshalJSON      OpType = 108
+	OpStructHeadMarshalText                  OpType = 109
+	OpStructHeadOmitEmptyMarshalText         OpType = 110
+	OpStructPtrHeadMarshalText               OpType = 111
+	OpStructPtrHeadOmitEmptyMarshalText      OpType = 112
+	OpStructHeadIntString                    OpType = 113
+	OpStructHeadOmitEmptyIntString           OpType = 114
+	OpStructPtrHeadIntString                 OpType = 115
+	OpStructPtrHeadOmitEmptyIntString        OpType = 116
+	OpStructHeadUintString                   OpType = 117
+	OpStructHeadOmitEmptyUintString          OpType = 118
+	OpStructPtrHeadUintString                OpType = 119
+	OpStructPtrHeadOmitEmptyUintString       OpType = 120
+	OpStructHeadFloat32String                OpType = 121
+	OpStructHeadOmitEmptyFloat32String       OpType = 122
+	OpStructPtrHeadFloat32String             OpType = 123
+	OpStructPtrHeadOmitEmptyFloat32String    OpType = 124
+	OpStructHeadFloat64String                OpType = 125
+	OpStructHeadOmitEmptyFloat64String       OpType = 126
+	OpStructPtrHeadFloat64String             OpType = 127
+	OpStructPtrHeadOmitEmptyFloat64String    OpType = 128
+	OpStructHeadBoolString                   OpType = 129
+	OpStructHeadOmitEmptyBoolString          OpType = 130
+	OpStructPtrHeadBoolString                OpType = 131
+	OpStructPtrHeadOmitEmptyBoolString       OpType = 132
+	OpStructHeadStringString                 OpType = 133
+	OpStructHeadOmitEmptyStringString        OpType = 134
+	OpStructPtrHeadStringString              OpType = 135
+	OpStructPtrHeadOmitEmptyStringString     OpType = 136
+	OpStructHeadNumberString                 OpType = 137
+	OpStructHeadOmitEmptyNumberString        OpType = 138
+	OpStructPtrHeadNumberString              OpType = 139
+	OpStructPtrHeadOmitEmptyNumberString     OpType = 140
+	OpStructHeadIntPtr                       OpType = 141
+	OpStructHeadOmitEmptyIntPtr              OpType = 142
+	OpStructPtrHeadIntPtr                    OpType = 143
+	OpStructPtrHeadOmitEmptyIntPtr           OpType = 144
+	OpStructHeadUintPtr                      OpType = 145
+	OpStructHeadOmitEmptyUintPtr             OpType = 146
+	OpStructPtrHeadUintPtr                   OpType = 147
+	OpStructPtrHeadOmitEmptyUintPtr          OpType = 148
+	OpStructHeadFloat32Ptr                   OpType = 149
+	OpStructHeadOmitEmptyFloat32Ptr          OpType = 150
+	OpStructPtrHeadFloat32Ptr                OpType = 151
+	OpStructPtrHeadOmitEmptyFloat32Ptr       OpType = 152
+	OpStructHeadFloat64Ptr                   OpType = 153
+	OpStructHeadOmitEmptyFloat64Ptr          OpType = 154
+	OpStructPtrHeadFloat64Ptr                OpType = 155
+	OpStructPtrHeadOmitEmptyFloat64Ptr       OpType = 156
+	OpStructHeadBoolPtr                      OpType = 157
+	OpStructHeadOmitEmptyBoolPtr             OpType = 158
+	OpStructPtrHeadBoolPtr                   OpType = 159
+	OpStructPtrHeadOmitEmptyBoolPtr          OpType = 160
+	OpStructHeadStringPtr                    OpType = 161
+	OpStructHeadOmitEmptyStringPtr           OpType = 162
+	OpStructPtrHeadStringPtr                 OpType = 163
+	OpStructPtrHeadOmitEmptyStringPtr        OpType = 164
+	OpStructHeadBytesPtr                     OpType = 165
+	OpStructHeadOmitEmptyBytesPtr            OpType = 166
+	OpStructPtrHeadBytesPtr                  OpType = 167
+	OpStructPtrHeadOmitEmptyBytesPtr         OpType = 168
+	OpStructHeadNumberPtr                    OpType = 169
+	OpStructHeadOmitEmptyNumberPtr           OpType = 170
+	OpStructPtrHeadNumberPtr                 OpType = 171
+	OpStructPtrHeadOmitEmptyNumberPtr        OpType = 172
+	OpStructHeadArrayPtr                     OpType = 173
+	OpStructHeadOmitEmptyArrayPtr            OpType = 174
+	OpStructPtrHeadArrayPtr                  OpType = 175
+	OpStructPtrHeadOmitEmptyArrayPtr         OpType = 176
+	OpStructHeadMapPtr                       OpType = 177
+	OpStructHeadOmitEmptyMapPtr              OpType = 178
+	OpStructPtrHeadMapPtr                    OpType = 179
+	OpStructPtrHeadOmitEmptyMapPtr           OpType = 180
+	OpStructHeadSlicePtr                     OpType = 181
+	OpStructHeadOmitEmptySlicePtr            OpType = 182
+	OpStructPtrHeadSlicePtr                  OpType = 183
+	OpStructPtrHeadOmitEmptySlicePtr         OpType = 184
+	OpStructHeadMarshalJSONPtr               OpType = 185
+	OpStructHeadOmitEmptyMarshalJSONPtr      OpType = 186
+	OpStructPtrHeadMarshalJSONPtr            OpType = 187
+	OpStructPtrHeadOmitEmptyMarshalJSONPtr   OpType = 188
+	OpStructHeadMarshalTextPtr               OpType = 189
+	OpStructHeadOmitEmptyMarshalTextPtr      OpType = 190
+	OpStructPtrHeadMarshalTextPtr            OpType = 191
+	OpStructPtrHeadOmitEmptyMarshalTextPtr   OpType = 192
+	OpStructHeadInterfacePtr                 OpType = 193
+	OpStructHeadOmitEmptyInterfacePtr        OpType = 194
+	OpStructPtrHeadInterfacePtr              OpType = 195
+	OpStructPtrHeadOmitEmptyInterfacePtr     OpType = 196
+	OpStructHeadIntPtrString                 OpType = 197
+	OpStructHeadOmitEmptyIntPtrString        OpType = 198
+	OpStructPtrHeadIntPtrString              OpType = 199
+	OpStructPtrHeadOmitEmptyIntPtrString     OpType = 200
+	OpStructHeadUintPtrString                OpType = 201
+	OpStructHeadOmitEmptyUintPtrString       OpType = 202
+	OpStructPtrHeadUintPtrString             OpType = 203
+	OpStructPtrHeadOmitEmptyUintPtrString    OpType = 204
+	OpStructHeadFloat32PtrString             OpType = 205
+	OpStructHeadOmitEmptyFloat32PtrString    OpType = 206
+	OpStructPtrHeadFloat32PtrString          OpType = 207
+	OpStructPtrHeadOmitEmptyFloat32PtrString OpType = 208
+	OpStructHeadFloat64PtrString             OpType = 209
+	OpStructHeadOmitEmptyFloat64PtrString    OpType = 210
+	OpStructPtrHeadFloat64PtrString          OpType = 211
+	OpStructPtrHeadOmitEmptyFloat64PtrString OpType = 212
+	OpStructHeadBoolPtrString                OpType = 213
+	OpStructHeadOmitEmptyBoolPtrString       OpType = 214
+	OpStructPtrHeadBoolPtrString             OpType = 215
+	OpStructPtrHeadOmitEmptyBoolPtrString    OpType = 216
+	OpStructHeadStringPtrString              OpType = 217
+	OpStructHeadOmitEmptyStringPtrString     OpType = 218
+	OpStructPtrHeadStringPtrString           OpType = 219
+	OpStructPtrHeadOmitEmptyStringPtrString  OpType = 220
+	OpStructHeadNumberPtrString              OpType = 221
+	OpStructHeadOmitEmptyNumberPtrString     OpType = 222
+	OpStructPtrHeadNumberPtrString           OpType = 223
+	OpStructPtrHeadOmitEmptyNumberPtrString  OpType = 224
+	OpStructHead                             OpType = 225
+	OpStructHeadOmitEmpty                    OpType = 226
+	OpStructPtrHead                          OpType = 227
+	OpStructPtrHeadOmitEmpty                 OpType = 228
+	OpStructFieldInt                         OpType = 229
+	OpStructFieldOmitEmptyInt                OpType = 230
+	OpStructEndInt                           OpType = 231
+	OpStructEndOmitEmptyInt                  OpType = 232
+	OpStructFieldUint                        OpType = 233
+	OpStructFieldOmitEmptyUint               OpType = 234
+	OpStructEndUint                          OpType = 235
+	OpStructEndOmitEmptyUint                 OpType = 236
+	OpStructFieldFloat32                     OpType = 237
+	OpStructFieldOmitEmptyFloat32            OpType = 238
+	OpStructEndFloat32                       OpType = 239
+	OpStructEndOmitEmptyFloat32              OpType = 240
+	OpStructFieldFloat64                     OpType = 241
+	OpStructFieldOmitEmptyFloat64            OpType = 242
+	OpStructEndFloat64                       OpType = 243
+	OpStructEndOmitEmptyFloat64              OpType = 244
+	OpStructFieldBool                        OpType = 245
+	OpStructFieldOmitEmptyBool               OpType = 246
+	OpStructEndBool                          OpType = 247
+	OpStructEndOmitEmptyBool                 OpType = 248
+	OpStructFieldString                      OpType = 249
+	OpStructFieldOmitEmptyString             OpType = 250
+	OpStructEndString                        OpType = 251
+	OpStructEndOmitEmptyString               OpType = 252
+	OpStructFieldBytes                       OpType = 253
+	OpStructFieldOmitEmptyBytes              OpType = 254
+	OpStructEndBytes                         OpType = 255
+	OpStructEndOmitEmptyBytes                OpType = 256
+	OpStructFieldNumber                      OpType = 257
+	OpStructFieldOmitEmptyNumber             OpType = 258
+	OpStructEndNumber                        OpType = 259
+	OpStructEndOmitEmptyNumber               OpType = 260
+	OpStructFieldArray                       OpType = 261
+	OpStructFieldOmitEmptyArray              OpType = 262
+	OpStructEndArray                         OpType = 263
+	OpStructEndOmitEmptyArray                OpType = 264
+	OpStructFieldMap                         OpType = 265
+	OpStructFieldOmitEmptyMap                OpType = 266
+	OpStructEndMap                           OpType = 267
+	OpStructEndOmitEmptyMap                  OpType = 268
+	OpStructFieldSlice                       OpType = 269
+	OpStructFieldOmitEmptySlice              OpType = 270
+	OpStructEndSlice                         OpType = 271
+	OpStructEndOmitEmptySlice                OpType = 272
+	OpStructFieldStruct                      OpType = 273
+	OpStructFieldOmitEmptyStruct             OpType = 274
+	OpStructEndStruct                        OpType = 275
+	OpStructEndOmitEmptyStruct               OpType = 276
+	OpStructFieldMarshalJSON                 OpType = 277
+	OpStructFieldOmitEmptyMarshalJSON        OpType = 278
+	OpStructEndMarshalJSON                   OpType = 279
+	OpStructEndOmitEmptyMarshalJSON          OpType = 280
+	OpStructFieldMarshalText                 OpType = 281
+	OpStructFieldOmitEmptyMarshalText        OpType = 282
+	OpStructEndMarshalText                   OpType = 283
+	OpStructEndOmitEmptyMarshalText          OpType = 284
+	OpStructFieldIntString                   OpType = 285
+	OpStructFieldOmitEmptyIntString          OpType = 286
+	OpStructEndIntString                     OpType = 287
+	OpStructEndOmitEmptyIntString            OpType = 288
+	OpStructFieldUintString                  OpType = 289
+	OpStructFieldOmitEmptyUintString         OpType = 290
+	OpStructEndUintString                    OpType = 291
+	OpStructEndOmitEmptyUintString           OpType = 292
+	OpStructFieldFloat32String               OpType = 293
+	OpStructFieldOmitEmptyFloat32String      OpType = 294
+	OpStructEndFloat32String                 OpType = 295
+	OpStructEndOmitEmptyFloat32String        OpType = 296
+	OpStructFieldFloat64String               OpType = 297
+	OpStructFieldOmitEmptyFloat64String      OpType = 298
+	OpStructEndFloat64String                 OpType = 299
+	OpStructEndOmitEmptyFloat64String        OpType = 300
+	OpStructFieldBoolString                  OpType = 301
+	OpStructFieldOmitEmptyBoolString         OpType = 302
+	OpStructEndBoolString                    OpType = 303
+	OpStructEndOmitEmptyBoolString           OpType = 304
+	OpStructFieldStringString                OpType = 305
+	OpStructFieldOmitEmptyStringString       OpType = 306
+	OpStructEndStringString                  OpType = 307
+	OpStructEndOmitEmptyStringString         OpType = 308
+	OpStructFieldNumberString                OpType = 309
+	OpStructFieldOmitEmptyNumberString       OpType = 310
+	OpStructEndNumberString                  OpType = 311
+	OpStructEndOmitEmptyNumberString         OpType = 312
+	OpStructFieldIntPtr                      OpType = 313
+	OpStructFieldOmitEmptyIntPtr             OpType = 314
+	OpStructEndIntPtr                        OpType = 315
+	OpStructEndOmitEmptyIntPtr               OpType = 316
+	OpStructFieldUintPtr                     OpType = 317
+	OpStructFieldOmitEmptyUintPtr            OpType = 318
+	OpStructEndUintPtr                       OpType = 319
+	OpStructEndOmitEmptyUintPtr              OpType = 320
+	OpStructFieldFloat32Ptr                  OpType = 321
+	OpStructFieldOmitEmptyFloat32Ptr         OpType = 322
+	OpStructEndFloat32Ptr                    OpType = 323
+	OpStructEndOmitEmptyFloat32Ptr           OpType = 324
+	OpStructFieldFloat64Ptr                  OpType = 325
+	OpStructFieldOmitEmptyFloat64Ptr         OpType = 326
+	OpStructEndFloat64Ptr                    OpType = 327
+	OpStructEndOmitEmptyFloat64Ptr           OpType = 328
+	OpStructFieldBoolPtr                     OpType = 329
+	OpStructFieldOmitEmptyBoolPtr            OpType = 330
+	OpStructEndBoolPtr                       OpType = 331
+	OpStructEndOmitEmptyBoolPtr              OpType = 332
+	OpStructFieldStringPtr                   OpType = 333
+	OpStructFieldOmitEmptyStringPtr          OpType = 334
+	OpStructEndStringPtr                     OpType = 335
+	OpStructEndOmitEmptyStringPtr            OpType = 336
+	OpStructFieldBytesPtr                    OpType = 337
+	OpStructFieldOmitEmptyBytesPtr           OpType = 338
+	OpStructEndBytesPtr                      OpType = 339
+	OpStructEndOmitEmptyBytesPtr             OpType = 340
+	OpStructFieldNumberPtr                   OpType = 341
+	OpStructFieldOmitEmptyNumberPtr          OpType = 342
+	OpStructEndNumberPtr                     OpType = 343
+	OpStructEndOmitEmptyNumberPtr            OpType = 344
+	OpStructFieldArrayPtr                    OpType = 345
+	OpStructFieldOmitEmptyArrayPtr           OpType = 346
+	OpStructEndArrayPtr                      OpType = 347
+	OpStructEndOmitEmptyArrayPtr             OpType = 348
+	OpStructFieldMapPtr                      OpType = 349
+	OpStructFieldOmitEmptyMapPtr             OpType = 350
+	OpStructEndMapPtr                        OpType = 351
+	OpStructEndOmitEmptyMapPtr               OpType = 352
+	OpStructFieldSlicePtr                    OpType = 353
+	OpStructFieldOmitEmptySlicePtr           OpType = 354
+	OpStructEndSlicePtr                      OpType = 355
+	OpStructEndOmitEmptySlicePtr             OpType = 356
+	OpStructFieldMarshalJSONPtr              OpType = 357
+	OpStructFieldOmitEmptyMarshalJSONPtr     OpType = 358
+	OpStructEndMarshalJSONPtr                OpType = 359
+	OpStructEndOmitEmptyMarshalJSONPtr       OpType = 360
+	OpStructFieldMarshalTextPtr              OpType = 361
+	OpStructFieldOmitEmptyMarshalTextPtr     OpType = 362
+	OpStructEndMarshalTextPtr                OpType = 363
+	OpStructEndOmitEmptyMarshalTextPtr       OpType = 364
+	OpStructFieldInterfacePtr                OpType = 365
+	OpStructFieldOmitEmptyInterfacePtr       OpType = 366
+	OpStructEndInterfacePtr                  OpType = 367
+	OpStructEndOmitEmptyInterfacePtr         OpType = 368
+	OpStructFieldIntPtrString                OpType = 369
+	OpStructFieldOmitEmptyIntPtrString       OpType = 370
+	OpStructEndIntPtrString                  OpType = 371
+	OpStructEndOmitEmptyIntPtrString         OpType = 372
+	OpStructFieldUintPtrString               OpType = 373
+	OpStructFieldOmitEmptyUintPtrString      OpType = 374
+	OpStructEndUintPtrString                 OpType = 375
+	OpStructEndOmitEmptyUintPtrString        OpType = 376
+	OpStructFieldFloat32PtrString            OpType = 377
+	OpStructFieldOmitEmptyFloat32PtrString   OpType = 378
+	OpStructEndFloat32PtrString              OpType = 379
+	OpStructEndOmitEmptyFloat32PtrString     OpType = 380
+	OpStructFieldFloat64PtrString            OpType = 381
+	OpStructFieldOmitEmptyFloat64PtrString   OpType = 382
+	OpStructEndFloat64PtrString              OpType = 383
+	OpStructEndOmitEmptyFloat64PtrString     OpType = 384
+	OpStructFieldBoolPtrString               OpType = 385
+	OpStructFieldOmitEmptyBoolPtrString      OpType = 386
+	OpStructEndBoolPtrString                 OpType = 387
+	OpStructEndOmitEmptyBoolPtrString        OpType = 388
+	OpStructFieldStringPtrString             OpType = 389
+	OpStructFieldOmitEmptyStringPtrString    OpType = 390
+	OpStructEndStringPtrString               OpType = 391
+	OpStructEndOmitEmptyStringPtrString      OpType = 392
+	OpStructFieldNumberPtrString             OpType = 393
+	OpStructFieldOmitEmptyNumberPtrString    OpType = 394
+	OpStructEndNumberPtrString               OpType = 395
+	OpStructEndOmitEmptyNumberPtrString      OpType = 396
+	OpStructField                            OpType = 397
+	OpStructFieldOmitEmpty                   OpType = 398
+	OpStructEnd                              OpType = 399
+	OpStructEndOmitEmpty                     OpType = 400
 )
 
 func (t OpType) String() string {
-	if int(t) >= 400 {
+	if int(t) >= 401 {
 		return ""
 	}
 	return opTypeStrings[int(t)]
@@ -894,7 +896,7 @@ func (t OpType) HeadToOmitEmptyHead() OpType {
 }
 
 func (t OpType) PtrHeadToHead() OpType {
-	idx := strings.Index(t.String(), "PtrHead")
+	idx := strings.Index(t.String(), "Ptr")
 	if idx == -1 {
 		return t
 	}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/query.go b/vendor/github.com/goccy/go-json/internal/encoder/query.go
deleted file mode 100644
index 1e1850c..0000000
--- a/vendor/github.com/goccy/go-json/internal/encoder/query.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package encoder
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-)
-
-var (
-	Marshal   func(interface{}) ([]byte, error)
-	Unmarshal func([]byte, interface{}) error
-)
-
-type FieldQuery struct {
-	Name   string
-	Fields []*FieldQuery
-	hash   string
-}
-
-func (q *FieldQuery) Hash() string {
-	if q.hash != "" {
-		return q.hash
-	}
-	b, _ := Marshal(q)
-	q.hash = string(b)
-	return q.hash
-}
-
-func (q *FieldQuery) MarshalJSON() ([]byte, error) {
-	if q.Name != "" {
-		if len(q.Fields) > 0 {
-			return Marshal(map[string][]*FieldQuery{q.Name: q.Fields})
-		}
-		return Marshal(q.Name)
-	}
-	return Marshal(q.Fields)
-}
-
-func (q *FieldQuery) QueryString() (FieldQueryString, error) {
-	b, err := Marshal(q)
-	if err != nil {
-		return "", err
-	}
-	return FieldQueryString(b), nil
-}
-
-type FieldQueryString string
-
-func (s FieldQueryString) Build() (*FieldQuery, error) {
-	var query interface{}
-	if err := Unmarshal([]byte(s), &query); err != nil {
-		return nil, err
-	}
-	return s.build(reflect.ValueOf(query))
-}
-
-func (s FieldQueryString) build(v reflect.Value) (*FieldQuery, error) {
-	switch v.Type().Kind() {
-	case reflect.String:
-		return s.buildString(v)
-	case reflect.Map:
-		return s.buildMap(v)
-	case reflect.Slice:
-		return s.buildSlice(v)
-	case reflect.Interface:
-		return s.build(reflect.ValueOf(v.Interface()))
-	}
-	return nil, fmt.Errorf("failed to build field query")
-}
-
-func (s FieldQueryString) buildString(v reflect.Value) (*FieldQuery, error) {
-	b := []byte(v.String())
-	switch b[0] {
-	case '[', '{':
-		var query interface{}
-		if err := Unmarshal(b, &query); err != nil {
-			return nil, err
-		}
-		if str, ok := query.(string); ok {
-			return &FieldQuery{Name: str}, nil
-		}
-		return s.build(reflect.ValueOf(query))
-	}
-	return &FieldQuery{Name: string(b)}, nil
-}
-
-func (s FieldQueryString) buildSlice(v reflect.Value) (*FieldQuery, error) {
-	fields := make([]*FieldQuery, 0, v.Len())
-	for i := 0; i < v.Len(); i++ {
-		def, err := s.build(v.Index(i))
-		if err != nil {
-			return nil, err
-		}
-		fields = append(fields, def)
-	}
-	return &FieldQuery{Fields: fields}, nil
-}
-
-func (s FieldQueryString) buildMap(v reflect.Value) (*FieldQuery, error) {
-	keys := v.MapKeys()
-	if len(keys) != 1 {
-		return nil, fmt.Errorf("failed to build field query object")
-	}
-	key := keys[0]
-	if key.Type().Kind() != reflect.String {
-		return nil, fmt.Errorf("failed to build field query. invalid object key type")
-	}
-	name := key.String()
-	def, err := s.build(v.MapIndex(key))
-	if err != nil {
-		return nil, err
-	}
-	return &FieldQuery{
-		Name:   name,
-		Fields: def.Fields,
-	}, nil
-}
-
-type queryKey struct{}
-
-func FieldQueryFromContext(ctx context.Context) *FieldQuery {
-	query := ctx.Value(queryKey{})
-	if query == nil {
-		return nil
-	}
-	q, ok := query.(*FieldQuery)
-	if !ok {
-		return nil
-	}
-	return q
-}
-
-func SetFieldQueryToContext(ctx context.Context, query *FieldQuery) context.Context {
-	return context.WithValue(ctx, queryKey{}, query)
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/string.go b/vendor/github.com/goccy/go-json/internal/encoder/string.go
index 4abb841..a699dba 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/string.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/string.go
@@ -1,32 +1,9 @@
-// This files's string processing codes are inspired by https://github.com/segmentio/encoding.
-// The license notation is as follows.
-//
-// # MIT License
-//
-// Copyright (c) 2019 Segment.io, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 package encoder
 
 import (
 	"math/bits"
 	"reflect"
+	"unicode/utf8"
 	"unsafe"
 )
 
@@ -35,8 +12,390 @@ const (
 	msb = 0x8080808080808080
 )
 
+var needEscapeWithHTML = [256]bool{
+	'"':  true,
+	'&':  true,
+	'<':  true,
+	'>':  true,
+	'\\': true,
+	0x00: true,
+	0x01: true,
+	0x02: true,
+	0x03: true,
+	0x04: true,
+	0x05: true,
+	0x06: true,
+	0x07: true,
+	0x08: true,
+	0x09: true,
+	0x0a: true,
+	0x0b: true,
+	0x0c: true,
+	0x0d: true,
+	0x0e: true,
+	0x0f: true,
+	0x10: true,
+	0x11: true,
+	0x12: true,
+	0x13: true,
+	0x14: true,
+	0x15: true,
+	0x16: true,
+	0x17: true,
+	0x18: true,
+	0x19: true,
+	0x1a: true,
+	0x1b: true,
+	0x1c: true,
+	0x1d: true,
+	0x1e: true,
+	0x1f: true,
+	/* 0x20 - 0x7f */
+	0x80: true,
+	0x81: true,
+	0x82: true,
+	0x83: true,
+	0x84: true,
+	0x85: true,
+	0x86: true,
+	0x87: true,
+	0x88: true,
+	0x89: true,
+	0x8a: true,
+	0x8b: true,
+	0x8c: true,
+	0x8d: true,
+	0x8e: true,
+	0x8f: true,
+	0x90: true,
+	0x91: true,
+	0x92: true,
+	0x93: true,
+	0x94: true,
+	0x95: true,
+	0x96: true,
+	0x97: true,
+	0x98: true,
+	0x99: true,
+	0x9a: true,
+	0x9b: true,
+	0x9c: true,
+	0x9d: true,
+	0x9e: true,
+	0x9f: true,
+	0xa0: true,
+	0xa1: true,
+	0xa2: true,
+	0xa3: true,
+	0xa4: true,
+	0xa5: true,
+	0xa6: true,
+	0xa7: true,
+	0xa8: true,
+	0xa9: true,
+	0xaa: true,
+	0xab: true,
+	0xac: true,
+	0xad: true,
+	0xae: true,
+	0xaf: true,
+	0xb0: true,
+	0xb1: true,
+	0xb2: true,
+	0xb3: true,
+	0xb4: true,
+	0xb5: true,
+	0xb6: true,
+	0xb7: true,
+	0xb8: true,
+	0xb9: true,
+	0xba: true,
+	0xbb: true,
+	0xbc: true,
+	0xbd: true,
+	0xbe: true,
+	0xbf: true,
+	0xc0: true,
+	0xc1: true,
+	0xc2: true,
+	0xc3: true,
+	0xc4: true,
+	0xc5: true,
+	0xc6: true,
+	0xc7: true,
+	0xc8: true,
+	0xc9: true,
+	0xca: true,
+	0xcb: true,
+	0xcc: true,
+	0xcd: true,
+	0xce: true,
+	0xcf: true,
+	0xd0: true,
+	0xd1: true,
+	0xd2: true,
+	0xd3: true,
+	0xd4: true,
+	0xd5: true,
+	0xd6: true,
+	0xd7: true,
+	0xd8: true,
+	0xd9: true,
+	0xda: true,
+	0xdb: true,
+	0xdc: true,
+	0xdd: true,
+	0xde: true,
+	0xdf: true,
+	0xe0: true,
+	0xe1: true,
+	0xe2: true,
+	0xe3: true,
+	0xe4: true,
+	0xe5: true,
+	0xe6: true,
+	0xe7: true,
+	0xe8: true,
+	0xe9: true,
+	0xea: true,
+	0xeb: true,
+	0xec: true,
+	0xed: true,
+	0xee: true,
+	0xef: true,
+	0xf0: true,
+	0xf1: true,
+	0xf2: true,
+	0xf3: true,
+	0xf4: true,
+	0xf5: true,
+	0xf6: true,
+	0xf7: true,
+	0xf8: true,
+	0xf9: true,
+	0xfa: true,
+	0xfb: true,
+	0xfc: true,
+	0xfd: true,
+	0xfe: true,
+	0xff: true,
+}
+
+var needEscape = [256]bool{
+	'"':  true,
+	'\\': true,
+	0x00: true,
+	0x01: true,
+	0x02: true,
+	0x03: true,
+	0x04: true,
+	0x05: true,
+	0x06: true,
+	0x07: true,
+	0x08: true,
+	0x09: true,
+	0x0a: true,
+	0x0b: true,
+	0x0c: true,
+	0x0d: true,
+	0x0e: true,
+	0x0f: true,
+	0x10: true,
+	0x11: true,
+	0x12: true,
+	0x13: true,
+	0x14: true,
+	0x15: true,
+	0x16: true,
+	0x17: true,
+	0x18: true,
+	0x19: true,
+	0x1a: true,
+	0x1b: true,
+	0x1c: true,
+	0x1d: true,
+	0x1e: true,
+	0x1f: true,
+	/* 0x20 - 0x7f */
+	0x80: true,
+	0x81: true,
+	0x82: true,
+	0x83: true,
+	0x84: true,
+	0x85: true,
+	0x86: true,
+	0x87: true,
+	0x88: true,
+	0x89: true,
+	0x8a: true,
+	0x8b: true,
+	0x8c: true,
+	0x8d: true,
+	0x8e: true,
+	0x8f: true,
+	0x90: true,
+	0x91: true,
+	0x92: true,
+	0x93: true,
+	0x94: true,
+	0x95: true,
+	0x96: true,
+	0x97: true,
+	0x98: true,
+	0x99: true,
+	0x9a: true,
+	0x9b: true,
+	0x9c: true,
+	0x9d: true,
+	0x9e: true,
+	0x9f: true,
+	0xa0: true,
+	0xa1: true,
+	0xa2: true,
+	0xa3: true,
+	0xa4: true,
+	0xa5: true,
+	0xa6: true,
+	0xa7: true,
+	0xa8: true,
+	0xa9: true,
+	0xaa: true,
+	0xab: true,
+	0xac: true,
+	0xad: true,
+	0xae: true,
+	0xaf: true,
+	0xb0: true,
+	0xb1: true,
+	0xb2: true,
+	0xb3: true,
+	0xb4: true,
+	0xb5: true,
+	0xb6: true,
+	0xb7: true,
+	0xb8: true,
+	0xb9: true,
+	0xba: true,
+	0xbb: true,
+	0xbc: true,
+	0xbd: true,
+	0xbe: true,
+	0xbf: true,
+	0xc0: true,
+	0xc1: true,
+	0xc2: true,
+	0xc3: true,
+	0xc4: true,
+	0xc5: true,
+	0xc6: true,
+	0xc7: true,
+	0xc8: true,
+	0xc9: true,
+	0xca: true,
+	0xcb: true,
+	0xcc: true,
+	0xcd: true,
+	0xce: true,
+	0xcf: true,
+	0xd0: true,
+	0xd1: true,
+	0xd2: true,
+	0xd3: true,
+	0xd4: true,
+	0xd5: true,
+	0xd6: true,
+	0xd7: true,
+	0xd8: true,
+	0xd9: true,
+	0xda: true,
+	0xdb: true,
+	0xdc: true,
+	0xdd: true,
+	0xde: true,
+	0xdf: true,
+	0xe0: true,
+	0xe1: true,
+	0xe2: true,
+	0xe3: true,
+	0xe4: true,
+	0xe5: true,
+	0xe6: true,
+	0xe7: true,
+	0xe8: true,
+	0xe9: true,
+	0xea: true,
+	0xeb: true,
+	0xec: true,
+	0xed: true,
+	0xee: true,
+	0xef: true,
+	0xf0: true,
+	0xf1: true,
+	0xf2: true,
+	0xf3: true,
+	0xf4: true,
+	0xf5: true,
+	0xf6: true,
+	0xf7: true,
+	0xf8: true,
+	0xf9: true,
+	0xfa: true,
+	0xfb: true,
+	0xfc: true,
+	0xfd: true,
+	0xfe: true,
+	0xff: true,
+}
+
 var hex = "0123456789abcdef"
 
+// escapeIndex finds the index of the first char in `s` that requires escaping.
+// A char requires escaping if it's outside of the range of [0x20, 0x7F] or if
+// it includes a double quote or backslash.
+// If no chars in `s` require escaping, the return value is -1.
+func escapeIndex(s string) int {
+	chunks := stringToUint64Slice(s)
+	for _, n := range chunks {
+		// combine masks before checking for the MSB of each byte. We include
+		// `n` in the mask to check whether any of the *input* byte MSBs were
+		// set (i.e. the byte was outside the ASCII range).
+		mask := n | below(n, 0x20) | contains(n, '"') | contains(n, '\\')
+		if (mask & msb) != 0 {
+			return bits.TrailingZeros64(mask&msb) / 8
+		}
+	}
+
+	valLen := len(s)
+	for i := len(chunks) * 8; i < valLen; i++ {
+		if needEscape[s[i]] {
+			return i
+		}
+	}
+
+	return -1
+}
+
+// below return a mask that can be used to determine if any of the bytes
+// in `n` are below `b`. If a byte's MSB is set in the mask then that byte was
+// below `b`. The result is only valid if `b`, and each byte in `n`, is below
+// 0x80.
+func below(n uint64, b byte) uint64 {
+	return n - expand(b)
+}
+
+// contains returns a mask that can be used to determine if any of the
+// bytes in `n` are equal to `b`. If a byte's MSB is set in the mask then
+// that byte is equal to `b`. The result is only valid if `b`, and each
+// byte in `n`, is below 0x80.
+func contains(n uint64, b byte) uint64 {
+	return (n ^ expand(b)) - lsb
+}
+
+// expand puts the specified byte into each of the 8 bytes of a uint64.
+func expand(b byte) uint64 {
+	return lsb * uint64(b)
+}
+
 //nolint:govet
 func stringToUint64Slice(s string) []uint64 {
 	return *(*[]uint64)(unsafe.Pointer(&reflect.SliceHeader{
@@ -47,19 +406,9 @@ func stringToUint64Slice(s string) []uint64 {
 }
 
 func AppendString(ctx *RuntimeContext, buf []byte, s string) []byte {
-	if ctx.Option.Flag&HTMLEscapeOption != 0 {
-		if ctx.Option.Flag&NormalizeUTF8Option != 0 {
-			return appendNormalizedHTMLString(buf, s)
-		}
-		return appendHTMLString(buf, s)
+	if ctx.Option.Flag&HTMLEscapeOption == 0 {
+		return appendString(buf, s)
 	}
-	if ctx.Option.Flag&NormalizeUTF8Option != 0 {
-		return appendNormalizedString(buf, s)
-	}
-	return appendString(buf, s)
-}
-
-func appendNormalizedHTMLString(buf []byte, s string) []byte {
 	valLen := len(s)
 	if valLen == 0 {
 		return append(buf, `""`...)
@@ -86,7 +435,7 @@ func appendNormalizedHTMLString(buf []byte, s string) []byte {
 			}
 		}
 		for i := len(chunks) * 8; i < valLen; i++ {
-			if needEscapeHTMLNormalizeUTF8[s[i]] {
+			if needEscapeWithHTML[s[i]] {
 				j = i
 				goto ESCAPE_END
 			}
@@ -98,7 +447,7 @@ ESCAPE_END:
 	for j < valLen {
 		c := s[j]
 
-		if !needEscapeHTMLNormalizeUTF8[c] {
+		if !needEscapeWithHTML[c] {
 			// fast path: most of the time, printable ascii characters are used
 			j++
 			continue
@@ -140,9 +489,10 @@ ESCAPE_END:
 			i = j + 1
 			j = j + 1
 			continue
+		}
 
-		case 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0B, 0x0C, 0x0E, 0x0F, // 0x00-0x0F
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F: // 0x10-0x1F
+		// This encodes bytes < 0x20 except for \t, \n and \r.
+		if c < 0x20 {
 			buf = append(buf, s[i:j]...)
 			buf = append(buf, `\u00`...)
 			buf = append(buf, hex[c>>4], hex[c&0xF])
@@ -150,14 +500,19 @@ ESCAPE_END:
 			j = j + 1
 			continue
 		}
-		state, size := decodeRuneInString(s[j:])
-		switch state {
-		case runeErrorState:
+
+		r, size := utf8.DecodeRuneInString(s[j:])
+
+		if r == utf8.RuneError && size == 1 {
 			buf = append(buf, s[i:j]...)
 			buf = append(buf, `\ufffd`...)
-			i = j + 1
-			j = j + 1
+			i = j + size
+			j = j + size
 			continue
+		}
+
+		switch r {
+		case '\u2028', '\u2029':
 			// U+2028 is LINE SEPARATOR.
 			// U+2029 is PARAGRAPH SEPARATOR.
 			// They are both technically valid characters in JSON strings,
@@ -165,231 +520,14 @@ ESCAPE_END:
 			// and can lead to security holes there. It is valid JSON to
 			// escape them, so we do so unconditionally.
 			// See http://timelessrepo.com/json-isnt-a-javascript-subset for discussion.
-		case lineSepState:
 			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u2028`...)
-			i = j + 3
-			j = j + 3
-			continue
-		case paragraphSepState:
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u2029`...)
-			i = j + 3
-			j = j + 3
-			continue
-		}
-		j += size
-	}
-
-	return append(append(buf, s[i:]...), '"')
-}
-
-func appendHTMLString(buf []byte, s string) []byte {
-	valLen := len(s)
-	if valLen == 0 {
-		return append(buf, `""`...)
-	}
-	buf = append(buf, '"')
-	var (
-		i, j int
-	)
-	if valLen >= 8 {
-		chunks := stringToUint64Slice(s)
-		for _, n := range chunks {
-			// combine masks before checking for the MSB of each byte. We include
-			// `n` in the mask to check whether any of the *input* byte MSBs were
-			// set (i.e. the byte was outside the ASCII range).
-			mask := n | (n - (lsb * 0x20)) |
-				((n ^ (lsb * '"')) - lsb) |
-				((n ^ (lsb * '\\')) - lsb) |
-				((n ^ (lsb * '<')) - lsb) |
-				((n ^ (lsb * '>')) - lsb) |
-				((n ^ (lsb * '&')) - lsb)
-			if (mask & msb) != 0 {
-				j = bits.TrailingZeros64(mask&msb) / 8
-				goto ESCAPE_END
-			}
-		}
-		for i := len(chunks) * 8; i < valLen; i++ {
-			if needEscapeHTML[s[i]] {
-				j = i
-				goto ESCAPE_END
-			}
-		}
-		// no found any escape characters.
-		return append(append(buf, s...), '"')
-	}
-ESCAPE_END:
-	for j < valLen {
-		c := s[j]
-
-		if !needEscapeHTML[c] {
-			// fast path: most of the time, printable ascii characters are used
-			j++
+			buf = append(buf, `\u202`...)
+			buf = append(buf, hex[r&0xF])
+			i = j + size
+			j = j + size
 			continue
 		}
 
-		switch c {
-		case '\\', '"':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', c)
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\n':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 'n')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\r':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 'r')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\t':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 't')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '<', '>', '&':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u00`...)
-			buf = append(buf, hex[c>>4], hex[c&0xF])
-			i = j + 1
-			j = j + 1
-			continue
-
-		case 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0B, 0x0C, 0x0E, 0x0F, // 0x00-0x0F
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F: // 0x10-0x1F
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u00`...)
-			buf = append(buf, hex[c>>4], hex[c&0xF])
-			i = j + 1
-			j = j + 1
-			continue
-		}
-		j++
-	}
-
-	return append(append(buf, s[i:]...), '"')
-}
-
-func appendNormalizedString(buf []byte, s string) []byte {
-	valLen := len(s)
-	if valLen == 0 {
-		return append(buf, `""`...)
-	}
-	buf = append(buf, '"')
-	var (
-		i, j int
-	)
-	if valLen >= 8 {
-		chunks := stringToUint64Slice(s)
-		for _, n := range chunks {
-			// combine masks before checking for the MSB of each byte. We include
-			// `n` in the mask to check whether any of the *input* byte MSBs were
-			// set (i.e. the byte was outside the ASCII range).
-			mask := n | (n - (lsb * 0x20)) |
-				((n ^ (lsb * '"')) - lsb) |
-				((n ^ (lsb * '\\')) - lsb)
-			if (mask & msb) != 0 {
-				j = bits.TrailingZeros64(mask&msb) / 8
-				goto ESCAPE_END
-			}
-		}
-		valLen := len(s)
-		for i := len(chunks) * 8; i < valLen; i++ {
-			if needEscapeNormalizeUTF8[s[i]] {
-				j = i
-				goto ESCAPE_END
-			}
-		}
-		return append(append(buf, s...), '"')
-	}
-ESCAPE_END:
-	for j < valLen {
-		c := s[j]
-
-		if !needEscapeNormalizeUTF8[c] {
-			// fast path: most of the time, printable ascii characters are used
-			j++
-			continue
-		}
-
-		switch c {
-		case '\\', '"':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', c)
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\n':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 'n')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\r':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 'r')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case '\t':
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, '\\', 't')
-			i = j + 1
-			j = j + 1
-			continue
-
-		case 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0B, 0x0C, 0x0E, 0x0F, // 0x00-0x0F
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F: // 0x10-0x1F
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u00`...)
-			buf = append(buf, hex[c>>4], hex[c&0xF])
-			i = j + 1
-			j = j + 1
-			continue
-		}
-
-		state, size := decodeRuneInString(s[j:])
-		switch state {
-		case runeErrorState:
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\ufffd`...)
-			i = j + 1
-			j = j + 1
-			continue
-			// U+2028 is LINE SEPARATOR.
-			// U+2029 is PARAGRAPH SEPARATOR.
-			// They are both technically valid characters in JSON strings,
-			// but don't work in JSONP, which has to be evaluated as JavaScript,
-			// and can lead to security holes there. It is valid JSON to
-			// escape them, so we do so unconditionally.
-			// See http://timelessrepo.com/json-isnt-a-javascript-subset for discussion.
-		case lineSepState:
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u2028`...)
-			i = j + 3
-			j = j + 3
-			continue
-		case paragraphSepState:
-			buf = append(buf, s[i:j]...)
-			buf = append(buf, `\u2029`...)
-			i = j + 3
-			j = j + 3
-			continue
-		}
 		j += size
 	}
 
@@ -402,37 +540,19 @@ func appendString(buf []byte, s string) []byte {
 		return append(buf, `""`...)
 	}
 	buf = append(buf, '"')
-	var (
-		i, j int
-	)
+	var escapeIdx int
 	if valLen >= 8 {
-		chunks := stringToUint64Slice(s)
-		for _, n := range chunks {
-			// combine masks before checking for the MSB of each byte. We include
-			// `n` in the mask to check whether any of the *input* byte MSBs were
-			// set (i.e. the byte was outside the ASCII range).
-			mask := n | (n - (lsb * 0x20)) |
-				((n ^ (lsb * '"')) - lsb) |
-				((n ^ (lsb * '\\')) - lsb)
-			if (mask & msb) != 0 {
-				j = bits.TrailingZeros64(mask&msb) / 8
-				goto ESCAPE_END
-			}
+		if escapeIdx = escapeIndex(s); escapeIdx < 0 {
+			return append(append(buf, s...), '"')
 		}
-		valLen := len(s)
-		for i := len(chunks) * 8; i < valLen; i++ {
-			if needEscape[s[i]] {
-				j = i
-				goto ESCAPE_END
-			}
-		}
-		return append(append(buf, s...), '"')
 	}
-ESCAPE_END:
+
+	i := 0
+	j := escapeIdx
 	for j < valLen {
 		c := s[j]
 
-		if !needEscape[c] {
+		if c >= 0x20 && c <= 0x7f && c != '\\' && c != '"' {
 			// fast path: most of the time, printable ascii characters are used
 			j++
 			continue
@@ -467,8 +587,7 @@ ESCAPE_END:
 			j = j + 1
 			continue
 
-		case 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0B, 0x0C, 0x0E, 0x0F, // 0x00-0x0F
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F: // 0x10-0x1F
+		case '<', '>', '&':
 			buf = append(buf, s[i:j]...)
 			buf = append(buf, `\u00`...)
 			buf = append(buf, hex[c>>4], hex[c&0xF])
@@ -476,7 +595,45 @@ ESCAPE_END:
 			j = j + 1
 			continue
 		}
-		j++
+
+		// This encodes bytes < 0x20 except for \t, \n and \r.
+		if c < 0x20 {
+			buf = append(buf, s[i:j]...)
+			buf = append(buf, `\u00`...)
+			buf = append(buf, hex[c>>4], hex[c&0xF])
+			i = j + 1
+			j = j + 1
+			continue
+		}
+
+		r, size := utf8.DecodeRuneInString(s[j:])
+
+		if r == utf8.RuneError && size == 1 {
+			buf = append(buf, s[i:j]...)
+			buf = append(buf, `\ufffd`...)
+			i = j + size
+			j = j + size
+			continue
+		}
+
+		switch r {
+		case '\u2028', '\u2029':
+			// U+2028 is LINE SEPARATOR.
+			// U+2029 is PARAGRAPH SEPARATOR.
+			// They are both technically valid characters in JSON strings,
+			// but don't work in JSONP, which has to be evaluated as JavaScript,
+			// and can lead to security holes there. It is valid JSON to
+			// escape them, so we do so unconditionally.
+			// See http://timelessrepo.com/json-isnt-a-javascript-subset for discussion.
+			buf = append(buf, s[i:j]...)
+			buf = append(buf, `\u202`...)
+			buf = append(buf, hex[r&0xF])
+			i = j + size
+			j = j + size
+			continue
+		}
+
+		j += size
 	}
 
 	return append(append(buf, s[i:]...), '"')
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/string_table.go b/vendor/github.com/goccy/go-json/internal/encoder/string_table.go
deleted file mode 100644
index ebe42c9..0000000
--- a/vendor/github.com/goccy/go-json/internal/encoder/string_table.go
+++ /dev/null
@@ -1,415 +0,0 @@
-package encoder
-
-var needEscapeHTMLNormalizeUTF8 = [256]bool{
-	'"':  true,
-	'&':  true,
-	'<':  true,
-	'>':  true,
-	'\\': true,
-	0x00: true,
-	0x01: true,
-	0x02: true,
-	0x03: true,
-	0x04: true,
-	0x05: true,
-	0x06: true,
-	0x07: true,
-	0x08: true,
-	0x09: true,
-	0x0a: true,
-	0x0b: true,
-	0x0c: true,
-	0x0d: true,
-	0x0e: true,
-	0x0f: true,
-	0x10: true,
-	0x11: true,
-	0x12: true,
-	0x13: true,
-	0x14: true,
-	0x15: true,
-	0x16: true,
-	0x17: true,
-	0x18: true,
-	0x19: true,
-	0x1a: true,
-	0x1b: true,
-	0x1c: true,
-	0x1d: true,
-	0x1e: true,
-	0x1f: true,
-	/* 0x20 - 0x7f */
-	0x80: true,
-	0x81: true,
-	0x82: true,
-	0x83: true,
-	0x84: true,
-	0x85: true,
-	0x86: true,
-	0x87: true,
-	0x88: true,
-	0x89: true,
-	0x8a: true,
-	0x8b: true,
-	0x8c: true,
-	0x8d: true,
-	0x8e: true,
-	0x8f: true,
-	0x90: true,
-	0x91: true,
-	0x92: true,
-	0x93: true,
-	0x94: true,
-	0x95: true,
-	0x96: true,
-	0x97: true,
-	0x98: true,
-	0x99: true,
-	0x9a: true,
-	0x9b: true,
-	0x9c: true,
-	0x9d: true,
-	0x9e: true,
-	0x9f: true,
-	0xa0: true,
-	0xa1: true,
-	0xa2: true,
-	0xa3: true,
-	0xa4: true,
-	0xa5: true,
-	0xa6: true,
-	0xa7: true,
-	0xa8: true,
-	0xa9: true,
-	0xaa: true,
-	0xab: true,
-	0xac: true,
-	0xad: true,
-	0xae: true,
-	0xaf: true,
-	0xb0: true,
-	0xb1: true,
-	0xb2: true,
-	0xb3: true,
-	0xb4: true,
-	0xb5: true,
-	0xb6: true,
-	0xb7: true,
-	0xb8: true,
-	0xb9: true,
-	0xba: true,
-	0xbb: true,
-	0xbc: true,
-	0xbd: true,
-	0xbe: true,
-	0xbf: true,
-	0xc0: true,
-	0xc1: true,
-	0xc2: true,
-	0xc3: true,
-	0xc4: true,
-	0xc5: true,
-	0xc6: true,
-	0xc7: true,
-	0xc8: true,
-	0xc9: true,
-	0xca: true,
-	0xcb: true,
-	0xcc: true,
-	0xcd: true,
-	0xce: true,
-	0xcf: true,
-	0xd0: true,
-	0xd1: true,
-	0xd2: true,
-	0xd3: true,
-	0xd4: true,
-	0xd5: true,
-	0xd6: true,
-	0xd7: true,
-	0xd8: true,
-	0xd9: true,
-	0xda: true,
-	0xdb: true,
-	0xdc: true,
-	0xdd: true,
-	0xde: true,
-	0xdf: true,
-	0xe0: true,
-	0xe1: true,
-	0xe2: true,
-	0xe3: true,
-	0xe4: true,
-	0xe5: true,
-	0xe6: true,
-	0xe7: true,
-	0xe8: true,
-	0xe9: true,
-	0xea: true,
-	0xeb: true,
-	0xec: true,
-	0xed: true,
-	0xee: true,
-	0xef: true,
-	0xf0: true,
-	0xf1: true,
-	0xf2: true,
-	0xf3: true,
-	0xf4: true,
-	0xf5: true,
-	0xf6: true,
-	0xf7: true,
-	0xf8: true,
-	0xf9: true,
-	0xfa: true,
-	0xfb: true,
-	0xfc: true,
-	0xfd: true,
-	0xfe: true,
-	0xff: true,
-}
-
-var needEscapeNormalizeUTF8 = [256]bool{
-	'"':  true,
-	'\\': true,
-	0x00: true,
-	0x01: true,
-	0x02: true,
-	0x03: true,
-	0x04: true,
-	0x05: true,
-	0x06: true,
-	0x07: true,
-	0x08: true,
-	0x09: true,
-	0x0a: true,
-	0x0b: true,
-	0x0c: true,
-	0x0d: true,
-	0x0e: true,
-	0x0f: true,
-	0x10: true,
-	0x11: true,
-	0x12: true,
-	0x13: true,
-	0x14: true,
-	0x15: true,
-	0x16: true,
-	0x17: true,
-	0x18: true,
-	0x19: true,
-	0x1a: true,
-	0x1b: true,
-	0x1c: true,
-	0x1d: true,
-	0x1e: true,
-	0x1f: true,
-	/* 0x20 - 0x7f */
-	0x80: true,
-	0x81: true,
-	0x82: true,
-	0x83: true,
-	0x84: true,
-	0x85: true,
-	0x86: true,
-	0x87: true,
-	0x88: true,
-	0x89: true,
-	0x8a: true,
-	0x8b: true,
-	0x8c: true,
-	0x8d: true,
-	0x8e: true,
-	0x8f: true,
-	0x90: true,
-	0x91: true,
-	0x92: true,
-	0x93: true,
-	0x94: true,
-	0x95: true,
-	0x96: true,
-	0x97: true,
-	0x98: true,
-	0x99: true,
-	0x9a: true,
-	0x9b: true,
-	0x9c: true,
-	0x9d: true,
-	0x9e: true,
-	0x9f: true,
-	0xa0: true,
-	0xa1: true,
-	0xa2: true,
-	0xa3: true,
-	0xa4: true,
-	0xa5: true,
-	0xa6: true,
-	0xa7: true,
-	0xa8: true,
-	0xa9: true,
-	0xaa: true,
-	0xab: true,
-	0xac: true,
-	0xad: true,
-	0xae: true,
-	0xaf: true,
-	0xb0: true,
-	0xb1: true,
-	0xb2: true,
-	0xb3: true,
-	0xb4: true,
-	0xb5: true,
-	0xb6: true,
-	0xb7: true,
-	0xb8: true,
-	0xb9: true,
-	0xba: true,
-	0xbb: true,
-	0xbc: true,
-	0xbd: true,
-	0xbe: true,
-	0xbf: true,
-	0xc0: true,
-	0xc1: true,
-	0xc2: true,
-	0xc3: true,
-	0xc4: true,
-	0xc5: true,
-	0xc6: true,
-	0xc7: true,
-	0xc8: true,
-	0xc9: true,
-	0xca: true,
-	0xcb: true,
-	0xcc: true,
-	0xcd: true,
-	0xce: true,
-	0xcf: true,
-	0xd0: true,
-	0xd1: true,
-	0xd2: true,
-	0xd3: true,
-	0xd4: true,
-	0xd5: true,
-	0xd6: true,
-	0xd7: true,
-	0xd8: true,
-	0xd9: true,
-	0xda: true,
-	0xdb: true,
-	0xdc: true,
-	0xdd: true,
-	0xde: true,
-	0xdf: true,
-	0xe0: true,
-	0xe1: true,
-	0xe2: true,
-	0xe3: true,
-	0xe4: true,
-	0xe5: true,
-	0xe6: true,
-	0xe7: true,
-	0xe8: true,
-	0xe9: true,
-	0xea: true,
-	0xeb: true,
-	0xec: true,
-	0xed: true,
-	0xee: true,
-	0xef: true,
-	0xf0: true,
-	0xf1: true,
-	0xf2: true,
-	0xf3: true,
-	0xf4: true,
-	0xf5: true,
-	0xf6: true,
-	0xf7: true,
-	0xf8: true,
-	0xf9: true,
-	0xfa: true,
-	0xfb: true,
-	0xfc: true,
-	0xfd: true,
-	0xfe: true,
-	0xff: true,
-}
-
-var needEscapeHTML = [256]bool{
-	'"':  true,
-	'&':  true,
-	'<':  true,
-	'>':  true,
-	'\\': true,
-	0x00: true,
-	0x01: true,
-	0x02: true,
-	0x03: true,
-	0x04: true,
-	0x05: true,
-	0x06: true,
-	0x07: true,
-	0x08: true,
-	0x09: true,
-	0x0a: true,
-	0x0b: true,
-	0x0c: true,
-	0x0d: true,
-	0x0e: true,
-	0x0f: true,
-	0x10: true,
-	0x11: true,
-	0x12: true,
-	0x13: true,
-	0x14: true,
-	0x15: true,
-	0x16: true,
-	0x17: true,
-	0x18: true,
-	0x19: true,
-	0x1a: true,
-	0x1b: true,
-	0x1c: true,
-	0x1d: true,
-	0x1e: true,
-	0x1f: true,
-	/* 0x20 - 0xff */
-}
-
-var needEscape = [256]bool{
-	'"':  true,
-	'\\': true,
-	0x00: true,
-	0x01: true,
-	0x02: true,
-	0x03: true,
-	0x04: true,
-	0x05: true,
-	0x06: true,
-	0x07: true,
-	0x08: true,
-	0x09: true,
-	0x0a: true,
-	0x0b: true,
-	0x0c: true,
-	0x0d: true,
-	0x0e: true,
-	0x0f: true,
-	0x10: true,
-	0x11: true,
-	0x12: true,
-	0x13: true,
-	0x14: true,
-	0x15: true,
-	0x16: true,
-	0x17: true,
-	0x18: true,
-	0x19: true,
-	0x1a: true,
-	0x1b: true,
-	0x1c: true,
-	0x1d: true,
-	0x1e: true,
-	0x1f: true,
-	/* 0x20 - 0xff */
-}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm/debug_vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm/debug_vm.go
index 82b6dd4..05509fe 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm/debug_vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm/debug_vm.go
@@ -2,7 +2,6 @@ package vm
 
 import (
 	"fmt"
-	"io"
 
 	"github.com/goccy/go-json/internal/encoder"
 )
@@ -15,24 +14,18 @@ func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet)
 		} else {
 			code = codeSet.NoescapeKeyCode
 		}
-		if wc := ctx.Option.DebugDOTOut; wc != nil {
-			_, _ = io.WriteString(wc, code.DumpDOT())
-			wc.Close()
-			ctx.Option.DebugDOTOut = nil
-		}
 
 		if err := recover(); err != nil {
-			w := ctx.Option.DebugOut
-			fmt.Fprintln(w, "=============[DEBUG]===============")
-			fmt.Fprintln(w, "* [TYPE]")
-			fmt.Fprintln(w, codeSet.Type)
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [ALL OPCODE]")
-			fmt.Fprintln(w, code.Dump())
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [CONTEXT]")
-			fmt.Fprintf(w, "%+v\n", ctx)
-			fmt.Fprintln(w, "===================================")
+			fmt.Println("=============[DEBUG]===============")
+			fmt.Println("* [TYPE]")
+			fmt.Println(codeSet.Type)
+			fmt.Printf("\n")
+			fmt.Println("* [ALL OPCODE]")
+			fmt.Println(code.Dump())
+			fmt.Printf("\n")
+			fmt.Println("* [CONTEXT]")
+			fmt.Printf("%+v\n", ctx)
+			fmt.Println("===================================")
 			panic(err)
 		}
 	}()
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm/util.go b/vendor/github.com/goccy/go-json/internal/encoder/vm/util.go
index 86291d7..f06f9c8 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm/util.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm/util.go
@@ -68,19 +68,7 @@ func loadNPtr(base uintptr, idx uint32, ptrNum uint8) uintptr {
 	return p
 }
 
-func ptrToUint64(p uintptr, bitSize uint8) uint64 {
-	switch bitSize {
-	case 8:
-		return (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		return (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		return (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		return **(**uint64)(unsafe.Pointer(&p))
-	}
-	return 0
-}
+func ptrToUint64(p uintptr) uint64              { return **(**uint64)(unsafe.Pointer(&p)) }
 func ptrToFloat32(p uintptr) float32            { return **(**float32)(unsafe.Pointer(&p)) }
 func ptrToFloat64(p uintptr) float64            { return **(**float64)(unsafe.Pointer(&p)) }
 func ptrToBool(p uintptr) bool                  { return **(**bool)(unsafe.Pointer(&p)) }
@@ -126,10 +114,6 @@ func appendComma(_ *encoder.RuntimeContext, b []byte) []byte {
 	return append(b, ',')
 }
 
-func appendNullComma(_ *encoder.RuntimeContext, b []byte) []byte {
-	return append(b, "null,"...)
-}
-
 func appendColon(_ *encoder.RuntimeContext, b []byte) []byte {
 	last := len(b) - 1
 	b[last] = ':'
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm/vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm/vm.go
index 645d20f..5857249 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm/vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm/vm.go
@@ -3,7 +3,6 @@ package vm
 
 import (
 	"math"
-	"reflect"
 	"sort"
 	"unsafe"
 
@@ -33,38 +32,40 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpIntPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpInt:
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpUint:
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpIntString:
 			b = append(b, '"')
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintString:
 			b = append(b, '"')
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -85,7 +86,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpFloat64Ptr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -102,7 +104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStringPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -115,7 +118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBoolPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -128,7 +132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBytesPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -141,7 +146,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpNumberPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -157,7 +163,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterfacePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -166,7 +173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterface:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -186,24 +194,20 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.NonEmptyInterfaceFlags != 0 {
 				iface := (*nonEmptyInterface)(up)
 				ifacePtr = iface.ptr
-				if iface.itab != nil {
-					typ = iface.itab.typ
-				}
+				typ = iface.itab.typ
 			} else {
 				iface := (*emptyInterface)(up)
 				ifacePtr = iface.ptr
 				typ = iface.typ
 			}
 			if ifacePtr == nil {
-				isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
-				if !isDirectedNil {
-					b = appendNullComma(ctx, b)
-					code = code.Next
-					break
-				}
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
+				code = code.Next
+				break
 			}
 			ctx.KeepRefs = append(ctx.KeepRefs, up)
-			ifaceCodeSet, err := encoder.CompileToGetCodeSet(ctx, uintptr(unsafe.Pointer(typ)))
+			ifaceCodeSet, err := encoder.CompileToGetCodeSet(uintptr(unsafe.Pointer(typ)))
 			if err != nil {
 				return nil, err
 			}
@@ -222,7 +226,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			oldOffset := ptrOffset
 			ptrOffset += totalLength * uintptrSize
 			oldBaseIndent := ctx.BaseIndent
-			ctx.BaseIndent += code.Indent
+			indentDiffFromTop := c.Indent - 1
+			ctx.BaseIndent += code.Indent - indentDiffFromTop
 
 			newLen := offsetNum + totalLength + nextTotalLength
 			if curlen < newLen {
@@ -252,7 +257,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSONPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -261,7 +267,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSON:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -277,7 +284,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalTextPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -303,7 +311,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpSlicePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -313,7 +322,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			slice := ptrToSlice(p)
 			if p == 0 || slice.Data == nil {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -346,7 +356,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArrayPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -355,7 +366,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArray:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -385,7 +397,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMapPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -394,7 +407,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMap:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -406,42 +420,48 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				break
 			}
 			b = appendStructHead(ctx, b)
-			unorderedMap := (ctx.Option.Flag & encoder.UnorderedMapOption) != 0
-			mapCtx := encoder.NewMapContext(mlen, unorderedMap)
-			mapiterinit(code.Type, uptr, &mapCtx.Iter)
-			store(ctxptr, code.Idx, uintptr(unsafe.Pointer(mapCtx)))
-			ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
-			if unorderedMap {
+			iter := mapiterinit(code.Type, uptr)
+			ctx.KeepRefs = append(ctx.KeepRefs, iter)
+			store(ctxptr, code.ElemIdx, 0)
+			store(ctxptr, code.Length, uintptr(mlen))
+			store(ctxptr, code.MapIter, uintptr(iter))
+			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendMapKeyIndent(ctx, code.Next, b)
 			} else {
-				mapCtx.Start = len(b)
-				mapCtx.First = len(b)
+				mapCtx := encoder.NewMapContext(mlen)
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
+				store(ctxptr, code.End.MapPos, uintptr(unsafe.Pointer(mapCtx)))
 			}
-			key := mapiterkey(&mapCtx.Iter)
+			key := mapiterkey(iter)
 			store(ctxptr, code.Next.Idx, uintptr(key))
 			code = code.Next
 		case encoder.OpMapKey:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
-			idx := mapCtx.Idx
+			idx := load(ctxptr, code.ElemIdx)
+			length := load(ctxptr, code.Length)
 			idx++
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
-				if idx < mapCtx.Len {
+				if idx < length {
 					b = appendMapKeyIndent(ctx, code, b)
-					mapCtx.Idx = int(idx)
-					key := mapiterkey(&mapCtx.Iter)
+					store(ctxptr, code.ElemIdx, idx)
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
 					b = appendObjectEnd(ctx, code, b)
-					encoder.ReleaseMapContext(mapCtx)
 					code = code.End.Next
 				}
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Value = b[mapCtx.Start:len(b)]
-				if idx < mapCtx.Len {
-					mapCtx.Idx = int(idx)
-					mapCtx.Start = len(b)
-					key := mapiterkey(&mapCtx.Iter)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				if idx < length {
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					store(ctxptr, code.ElemIdx, idx)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
@@ -449,27 +469,46 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				}
 			}
 		case encoder.OpMapValue:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendColon(ctx, b)
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Key = b[mapCtx.Start:len(b)]
-				mapCtx.Start = len(b)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
 			}
-			value := mapitervalue(&mapCtx.Iter)
+			ptr := load(ctxptr, code.MapIter)
+			iter := ptrToUnsafePtr(ptr)
+			value := mapitervalue(iter)
 			store(ctxptr, code.Next.Idx, uintptr(value))
-			mapiternext(&mapCtx.Iter)
+			mapiternext(iter)
 			code = code.Next
 		case encoder.OpMapEnd:
 			// this operation only used by sorted map.
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
+			length := int(load(ctxptr, code.Length))
+			ptr := load(ctxptr, code.MapPos)
+			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+			pos := mapCtx.Pos
+			for i := 0; i < length; i++ {
+				startKey := pos[i*2]
+				startValue := pos[i*2+1]
+				var endValue int
+				if i+1 < length {
+					endValue = pos[i*2+2]
+				} else {
+					endValue = len(b)
+				}
+				mapCtx.Slice.Items = append(mapCtx.Slice.Items, encoder.MapItem{
+					Key:   b[startKey:startValue],
+					Value: b[startValue:endValue],
+				})
+			}
 			sort.Sort(mapCtx.Slice)
 			buf := mapCtx.Buf
 			for _, item := range mapCtx.Slice.Items {
 				buf = appendMapKeyValue(ctx, code, buf, item.Key, item.Value)
 			}
 			buf = appendMapEnd(ctx, code, buf)
-			b = b[:mapCtx.First]
+			b = b[:pos[0]]
 			b = append(b, buf...)
 			mapCtx.Buf = buf
 			encoder.ReleaseMapContext(mapCtx)
@@ -531,7 +570,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -542,7 +582,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -562,7 +603,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -573,7 +615,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -594,7 +637,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -606,7 +650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -615,7 +660,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyInt:
@@ -623,7 +668,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -635,7 +681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -643,13 +690,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -658,7 +705,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -670,7 +718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -680,7 +729,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -689,7 +738,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -701,7 +751,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -709,15 +760,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
-			u64 := ptrToUint64(p, code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -726,7 +776,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -737,7 +788,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -752,7 +804,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -760,7 +812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -771,7 +824,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -784,7 +838,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -792,7 +846,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -803,7 +858,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -819,7 +875,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -828,7 +884,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -839,7 +896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -853,7 +911,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -863,7 +921,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -875,7 +934,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -884,7 +944,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyUint:
@@ -892,7 +952,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -904,7 +965,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -912,13 +974,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -927,7 +989,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -939,7 +1002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -949,7 +1013,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -958,7 +1022,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -970,7 +1035,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -978,14 +1044,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -994,7 +1060,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1005,7 +1072,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1020,7 +1088,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -1028,7 +1096,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1039,7 +1108,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1052,7 +1122,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -1060,7 +1130,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1071,7 +1142,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1087,7 +1159,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -1096,7 +1168,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1107,7 +1180,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1121,7 +1195,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -1131,7 +1205,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1143,7 +1218,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1160,7 +1236,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1172,7 +1249,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1194,7 +1272,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1206,7 +1285,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1225,7 +1305,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1237,7 +1318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1260,7 +1342,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1271,7 +1354,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1294,7 +1378,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1305,7 +1390,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1326,7 +1412,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1337,7 +1424,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1362,7 +1450,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1373,7 +1462,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1397,7 +1487,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1409,7 +1500,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1430,7 +1522,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1442,7 +1535,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1467,7 +1561,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1479,7 +1574,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1502,7 +1598,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1514,7 +1611,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1540,7 +1638,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1551,7 +1650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1578,7 +1678,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1589,7 +1690,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1614,7 +1716,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1625,7 +1728,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1654,7 +1758,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1665,7 +1770,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1693,7 +1799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1723,7 +1830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1735,7 +1843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1757,7 +1866,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1769,7 +1879,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1786,7 +1897,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1798,7 +1910,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1819,7 +1932,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1830,7 +1944,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1853,7 +1968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1864,7 +1980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1885,7 +2002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1896,7 +2014,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1919,7 +2038,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1930,7 +2050,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1952,7 +2073,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1964,7 +2086,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1981,7 +2104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1993,7 +2117,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2015,7 +2140,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2027,7 +2153,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2046,7 +2173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2058,7 +2186,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2081,7 +2210,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2092,7 +2222,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2115,7 +2246,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2126,7 +2258,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2147,7 +2280,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2158,7 +2292,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2183,7 +2318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2194,7 +2330,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2218,7 +2355,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2230,7 +2368,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2247,7 +2386,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2259,7 +2399,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2280,7 +2421,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2291,7 +2433,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2314,7 +2457,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2325,7 +2469,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2347,7 +2492,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2359,7 +2505,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2379,7 +2526,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2391,7 +2539,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2416,7 +2565,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2428,7 +2578,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2450,7 +2601,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2462,7 +2614,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2488,7 +2641,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2499,7 +2653,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2526,7 +2681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2537,7 +2693,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2561,7 +2718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2572,7 +2730,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2600,7 +2759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2611,7 +2771,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2638,7 +2799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2650,7 +2812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2667,7 +2830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2679,7 +2843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2696,7 +2861,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2708,7 +2874,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2729,7 +2896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2740,7 +2908,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2753,7 +2922,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			}
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				code = code.Next
@@ -2763,7 +2933,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2774,7 +2945,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2796,7 +2968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2807,7 +2980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2825,7 +2999,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2836,7 +3011,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2858,7 +3034,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2869,7 +3046,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2879,13 +3057,15 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 				break
 			}
 			p = ptrToPtr(p + uintptr(code.Offset))
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				if (code.Flags & encoder.IndirectFlags) != 0 {
@@ -2898,7 +3078,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2909,7 +3090,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2936,7 +3118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2949,7 +3132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2958,10 +3142,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -2979,7 +3162,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2992,7 +3176,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3000,10 +3185,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			iface := ptrToInterface(code, p)
@@ -3023,7 +3207,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3034,7 +3219,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3061,7 +3247,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3072,7 +3259,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3099,7 +3287,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3112,7 +3301,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3121,10 +3311,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3142,7 +3331,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3155,7 +3345,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3163,10 +3354,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3185,7 +3375,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3196,7 +3387,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3223,7 +3415,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3234,7 +3427,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3277,16 +3471,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3294,18 +3488,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3317,7 +3511,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3326,7 +3520,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3338,7 +3532,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3349,7 +3543,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3357,16 +3551,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3374,18 +3568,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3397,7 +3591,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3406,7 +3600,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3418,7 +3612,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3429,7 +3623,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3565,7 +3759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -4152,22 +4347,24 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				store(ctxptr, code.Idx, p)
 			}
+		case encoder.OpStructAnonymousEnd:
+			code = code.Next
 		case encoder.OpStructEnd:
 			b = appendStructEndSkipLast(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4177,18 +4374,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4202,7 +4399,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4211,7 +4408,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4225,7 +4422,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4236,7 +4433,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4246,16 +4443,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructEndUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4265,18 +4462,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4290,7 +4487,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4299,7 +4496,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4313,7 +4510,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4324,7 +4521,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/debug_vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/debug_vm.go
index 925f61e..6a6a33d 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/debug_vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/debug_vm.go
@@ -16,17 +16,16 @@ func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet)
 
 	defer func() {
 		if err := recover(); err != nil {
-			w := ctx.Option.DebugOut
-			fmt.Fprintln(w, "=============[DEBUG]===============")
-			fmt.Fprintln(w, "* [TYPE]")
-			fmt.Fprintln(w, codeSet.Type)
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [ALL OPCODE]")
-			fmt.Fprintln(w, code.Dump())
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [CONTEXT]")
-			fmt.Fprintf(w, "%+v\n", ctx)
-			fmt.Fprintln(w, "===================================")
+			fmt.Println("=============[DEBUG]===============")
+			fmt.Println("* [TYPE]")
+			fmt.Println(codeSet.Type)
+			fmt.Printf("\n")
+			fmt.Println("* [ALL OPCODE]")
+			fmt.Println(code.Dump())
+			fmt.Printf("\n")
+			fmt.Println("* [CONTEXT]")
+			fmt.Printf("%+v\n", ctx)
+			fmt.Println("===================================")
 			panic(err)
 		}
 	}()
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/util.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/util.go
index 33f29ae..710087f 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/util.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/util.go
@@ -61,19 +61,7 @@ func loadNPtr(base uintptr, idx uint32, ptrNum uint8) uintptr {
 	return p
 }
 
-func ptrToUint64(p uintptr, bitSize uint8) uint64 {
-	switch bitSize {
-	case 8:
-		return (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		return (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		return (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		return **(**uint64)(unsafe.Pointer(&p))
-	}
-	return 0
-}
+func ptrToUint64(p uintptr) uint64              { return **(**uint64)(unsafe.Pointer(&p)) }
 func ptrToFloat32(p uintptr) float32            { return **(**float32)(unsafe.Pointer(&p)) }
 func ptrToFloat64(p uintptr) float64            { return **(**float64)(unsafe.Pointer(&p)) }
 func ptrToBool(p uintptr) bool                  { return **(**bool)(unsafe.Pointer(&p)) }
@@ -104,17 +92,17 @@ func ptrToInterface(code *encoder.Opcode, p uintptr) interface{} {
 	}))
 }
 
-func appendInt(ctx *encoder.RuntimeContext, b []byte, p uintptr, code *encoder.Opcode) []byte {
+func appendInt(ctx *encoder.RuntimeContext, b []byte, v uint64, code *encoder.Opcode) []byte {
 	format := ctx.Option.ColorScheme.Int
 	b = append(b, format.Header...)
-	b = encoder.AppendInt(ctx, b, p, code)
+	b = encoder.AppendInt(ctx, b, v, code)
 	return append(b, format.Footer...)
 }
 
-func appendUint(ctx *encoder.RuntimeContext, b []byte, p uintptr, code *encoder.Opcode) []byte {
+func appendUint(ctx *encoder.RuntimeContext, b []byte, v uint64, code *encoder.Opcode) []byte {
 	format := ctx.Option.ColorScheme.Uint
 	b = append(b, format.Header...)
-	b = encoder.AppendUint(ctx, b, p, code)
+	b = encoder.AppendUint(ctx, b, v, code)
 	return append(b, format.Footer...)
 }
 
@@ -178,13 +166,6 @@ func appendComma(_ *encoder.RuntimeContext, b []byte) []byte {
 	return append(b, ',')
 }
 
-func appendNullComma(ctx *encoder.RuntimeContext, b []byte) []byte {
-	format := ctx.Option.ColorScheme.Null
-	b = append(b, format.Header...)
-	b = append(b, "null"...)
-	return append(append(b, format.Footer...), ',')
-}
-
 func appendColon(_ *encoder.RuntimeContext, b []byte) []byte {
 	last := len(b) - 1
 	b[last] = ':'
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/vm.go
index a63e83e..73af884 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color/vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color/vm.go
@@ -3,7 +3,6 @@ package vm_color
 
 import (
 	"math"
-	"reflect"
 	"sort"
 	"unsafe"
 
@@ -33,38 +32,40 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpIntPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpInt:
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpUint:
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpIntString:
 			b = append(b, '"')
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintString:
 			b = append(b, '"')
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -85,7 +86,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpFloat64Ptr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -102,7 +104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStringPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -115,7 +118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBoolPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -128,7 +132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBytesPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -141,7 +146,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpNumberPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -157,7 +163,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterfacePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -166,7 +173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterface:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -186,24 +194,20 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.NonEmptyInterfaceFlags != 0 {
 				iface := (*nonEmptyInterface)(up)
 				ifacePtr = iface.ptr
-				if iface.itab != nil {
-					typ = iface.itab.typ
-				}
+				typ = iface.itab.typ
 			} else {
 				iface := (*emptyInterface)(up)
 				ifacePtr = iface.ptr
 				typ = iface.typ
 			}
 			if ifacePtr == nil {
-				isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
-				if !isDirectedNil {
-					b = appendNullComma(ctx, b)
-					code = code.Next
-					break
-				}
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
+				code = code.Next
+				break
 			}
 			ctx.KeepRefs = append(ctx.KeepRefs, up)
-			ifaceCodeSet, err := encoder.CompileToGetCodeSet(ctx, uintptr(unsafe.Pointer(typ)))
+			ifaceCodeSet, err := encoder.CompileToGetCodeSet(uintptr(unsafe.Pointer(typ)))
 			if err != nil {
 				return nil, err
 			}
@@ -222,7 +226,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			oldOffset := ptrOffset
 			ptrOffset += totalLength * uintptrSize
 			oldBaseIndent := ctx.BaseIndent
-			ctx.BaseIndent += code.Indent
+			indentDiffFromTop := c.Indent - 1
+			ctx.BaseIndent += code.Indent - indentDiffFromTop
 
 			newLen := offsetNum + totalLength + nextTotalLength
 			if curlen < newLen {
@@ -252,7 +257,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSONPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -261,7 +267,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSON:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -277,7 +284,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalTextPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -303,7 +311,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpSlicePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -313,7 +322,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			slice := ptrToSlice(p)
 			if p == 0 || slice.Data == nil {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -346,7 +356,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArrayPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -355,7 +366,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArray:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -385,7 +397,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMapPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -394,7 +407,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMap:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -406,42 +420,48 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				break
 			}
 			b = appendStructHead(ctx, b)
-			unorderedMap := (ctx.Option.Flag & encoder.UnorderedMapOption) != 0
-			mapCtx := encoder.NewMapContext(mlen, unorderedMap)
-			mapiterinit(code.Type, uptr, &mapCtx.Iter)
-			store(ctxptr, code.Idx, uintptr(unsafe.Pointer(mapCtx)))
-			ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
-			if unorderedMap {
+			iter := mapiterinit(code.Type, uptr)
+			ctx.KeepRefs = append(ctx.KeepRefs, iter)
+			store(ctxptr, code.ElemIdx, 0)
+			store(ctxptr, code.Length, uintptr(mlen))
+			store(ctxptr, code.MapIter, uintptr(iter))
+			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendMapKeyIndent(ctx, code.Next, b)
 			} else {
-				mapCtx.Start = len(b)
-				mapCtx.First = len(b)
+				mapCtx := encoder.NewMapContext(mlen)
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
+				store(ctxptr, code.End.MapPos, uintptr(unsafe.Pointer(mapCtx)))
 			}
-			key := mapiterkey(&mapCtx.Iter)
+			key := mapiterkey(iter)
 			store(ctxptr, code.Next.Idx, uintptr(key))
 			code = code.Next
 		case encoder.OpMapKey:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
-			idx := mapCtx.Idx
+			idx := load(ctxptr, code.ElemIdx)
+			length := load(ctxptr, code.Length)
 			idx++
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
-				if idx < mapCtx.Len {
+				if idx < length {
 					b = appendMapKeyIndent(ctx, code, b)
-					mapCtx.Idx = int(idx)
-					key := mapiterkey(&mapCtx.Iter)
+					store(ctxptr, code.ElemIdx, idx)
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
 					b = appendObjectEnd(ctx, code, b)
-					encoder.ReleaseMapContext(mapCtx)
 					code = code.End.Next
 				}
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Value = b[mapCtx.Start:len(b)]
-				if idx < mapCtx.Len {
-					mapCtx.Idx = int(idx)
-					mapCtx.Start = len(b)
-					key := mapiterkey(&mapCtx.Iter)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				if idx < length {
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					store(ctxptr, code.ElemIdx, idx)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
@@ -449,27 +469,46 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				}
 			}
 		case encoder.OpMapValue:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendColon(ctx, b)
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Key = b[mapCtx.Start:len(b)]
-				mapCtx.Start = len(b)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
 			}
-			value := mapitervalue(&mapCtx.Iter)
+			ptr := load(ctxptr, code.MapIter)
+			iter := ptrToUnsafePtr(ptr)
+			value := mapitervalue(iter)
 			store(ctxptr, code.Next.Idx, uintptr(value))
-			mapiternext(&mapCtx.Iter)
+			mapiternext(iter)
 			code = code.Next
 		case encoder.OpMapEnd:
 			// this operation only used by sorted map.
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
+			length := int(load(ctxptr, code.Length))
+			ptr := load(ctxptr, code.MapPos)
+			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+			pos := mapCtx.Pos
+			for i := 0; i < length; i++ {
+				startKey := pos[i*2]
+				startValue := pos[i*2+1]
+				var endValue int
+				if i+1 < length {
+					endValue = pos[i*2+2]
+				} else {
+					endValue = len(b)
+				}
+				mapCtx.Slice.Items = append(mapCtx.Slice.Items, encoder.MapItem{
+					Key:   b[startKey:startValue],
+					Value: b[startValue:endValue],
+				})
+			}
 			sort.Sort(mapCtx.Slice)
 			buf := mapCtx.Buf
 			for _, item := range mapCtx.Slice.Items {
 				buf = appendMapKeyValue(ctx, code, buf, item.Key, item.Value)
 			}
 			buf = appendMapEnd(ctx, code, buf)
-			b = b[:mapCtx.First]
+			b = b[:pos[0]]
 			b = append(b, buf...)
 			mapCtx.Buf = buf
 			encoder.ReleaseMapContext(mapCtx)
@@ -531,7 +570,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -542,7 +582,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -562,7 +603,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -573,7 +615,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -594,7 +637,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -606,7 +650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -615,7 +660,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyInt:
@@ -623,7 +668,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -635,7 +681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -643,13 +690,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -658,7 +705,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -670,7 +718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -680,7 +729,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -689,7 +738,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -701,7 +751,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -709,15 +760,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
-			u64 := ptrToUint64(p, code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -726,7 +776,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -737,7 +788,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -752,7 +804,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -760,7 +812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -771,7 +824,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -784,7 +838,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -792,7 +846,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -803,7 +858,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -819,7 +875,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -828,7 +884,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -839,7 +896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -853,7 +911,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -863,7 +921,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -875,7 +934,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -884,7 +944,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyUint:
@@ -892,7 +952,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -904,7 +965,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -912,13 +974,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -927,7 +989,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -939,7 +1002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -949,7 +1013,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -958,7 +1022,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -970,7 +1035,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -978,14 +1044,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -994,7 +1060,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1005,7 +1072,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1020,7 +1088,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -1028,7 +1096,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1039,7 +1108,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1052,7 +1122,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -1060,7 +1130,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1071,7 +1142,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1087,7 +1159,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -1096,7 +1168,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1107,7 +1180,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1121,7 +1195,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -1131,7 +1205,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1143,7 +1218,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1160,7 +1236,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1172,7 +1249,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1194,7 +1272,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1206,7 +1285,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1225,7 +1305,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1237,7 +1318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1260,7 +1342,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1271,7 +1354,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1294,7 +1378,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1305,7 +1390,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1326,7 +1412,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1337,7 +1424,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1362,7 +1450,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1373,7 +1462,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1397,7 +1487,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1409,7 +1500,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1430,7 +1522,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1442,7 +1535,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1467,7 +1561,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1479,7 +1574,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1502,7 +1598,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1514,7 +1611,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1540,7 +1638,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1551,7 +1650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1578,7 +1678,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1589,7 +1690,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1614,7 +1716,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1625,7 +1728,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1654,7 +1758,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1665,7 +1770,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1693,7 +1799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1723,7 +1830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1735,7 +1843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1757,7 +1866,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1769,7 +1879,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1786,7 +1897,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1798,7 +1910,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1819,7 +1932,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1830,7 +1944,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1853,7 +1968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1864,7 +1980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1885,7 +2002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1896,7 +2014,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1919,7 +2038,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1930,7 +2050,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1952,7 +2073,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1964,7 +2086,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1981,7 +2104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1993,7 +2117,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2015,7 +2140,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2027,7 +2153,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2046,7 +2173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2058,7 +2186,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2081,7 +2210,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2092,7 +2222,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2115,7 +2246,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2126,7 +2258,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2147,7 +2280,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2158,7 +2292,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2183,7 +2318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2194,7 +2330,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2218,7 +2355,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2230,7 +2368,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2247,7 +2386,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2259,7 +2399,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2280,7 +2421,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2291,7 +2433,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2314,7 +2457,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2325,7 +2469,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2347,7 +2492,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2359,7 +2505,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2379,7 +2526,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2391,7 +2539,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2416,7 +2565,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2428,7 +2578,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2450,7 +2601,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2462,7 +2614,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2488,7 +2641,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2499,7 +2653,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2526,7 +2681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2537,7 +2693,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2561,7 +2718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2572,7 +2730,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2600,7 +2759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2611,7 +2771,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2638,7 +2799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2650,7 +2812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2667,7 +2830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2679,7 +2843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2696,7 +2861,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2708,7 +2874,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2729,7 +2896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2740,7 +2908,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2753,7 +2922,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			}
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				code = code.Next
@@ -2763,7 +2933,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2774,7 +2945,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2796,7 +2968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2807,7 +2980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2825,7 +2999,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2836,7 +3011,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2858,7 +3034,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2869,7 +3046,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2879,13 +3057,15 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 				break
 			}
 			p = ptrToPtr(p + uintptr(code.Offset))
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				if (code.Flags & encoder.IndirectFlags) != 0 {
@@ -2898,7 +3078,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2909,7 +3090,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2936,7 +3118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2949,7 +3132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2958,10 +3142,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -2979,7 +3162,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2992,7 +3176,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3000,10 +3185,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			iface := ptrToInterface(code, p)
@@ -3023,7 +3207,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3034,7 +3219,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3061,7 +3247,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3072,7 +3259,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3099,7 +3287,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3112,7 +3301,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3121,10 +3311,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3142,7 +3331,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3155,7 +3345,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3163,10 +3354,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3185,7 +3375,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3196,7 +3387,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3223,7 +3415,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3234,7 +3427,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3277,16 +3471,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3294,18 +3488,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3317,7 +3511,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3326,7 +3520,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3338,7 +3532,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3349,7 +3543,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3357,16 +3551,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3374,18 +3568,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3397,7 +3591,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3406,7 +3600,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3418,7 +3612,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3429,7 +3623,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3565,7 +3759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -4152,22 +4347,24 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				store(ctxptr, code.Idx, p)
 			}
+		case encoder.OpStructAnonymousEnd:
+			code = code.Next
 		case encoder.OpStructEnd:
 			b = appendStructEndSkipLast(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4177,18 +4374,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4202,7 +4399,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4211,7 +4408,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4225,7 +4422,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4236,7 +4433,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4246,16 +4443,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructEndUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4265,18 +4462,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4290,7 +4487,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4299,7 +4496,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4313,7 +4510,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4324,7 +4521,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/debug_vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/debug_vm.go
index dd4cd48..a68bbf6 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/debug_vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/debug_vm.go
@@ -16,17 +16,16 @@ func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet)
 
 	defer func() {
 		if err := recover(); err != nil {
-			w := ctx.Option.DebugOut
-			fmt.Fprintln(w, "=============[DEBUG]===============")
-			fmt.Fprintln(w, "* [TYPE]")
-			fmt.Fprintln(w, codeSet.Type)
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [ALL OPCODE]")
-			fmt.Fprintln(w, code.Dump())
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [CONTEXT]")
-			fmt.Fprintf(w, "%+v\n", ctx)
-			fmt.Fprintln(w, "===================================")
+			fmt.Println("=============[DEBUG]===============")
+			fmt.Println("* [TYPE]")
+			fmt.Println(codeSet.Type)
+			fmt.Printf("\n")
+			fmt.Println("* [ALL OPCODE]")
+			fmt.Println(code.Dump())
+			fmt.Printf("\n")
+			fmt.Println("* [CONTEXT]")
+			fmt.Printf("%+v\n", ctx)
+			fmt.Println("===================================")
 			panic(err)
 		}
 	}()
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/util.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/util.go
index 2395abe..1399a25 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/util.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/util.go
@@ -63,20 +63,7 @@ func loadNPtr(base uintptr, idx uint32, ptrNum uint8) uintptr {
 	return p
 }
 
-func ptrToUint64(p uintptr, bitSize uint8) uint64 {
-	switch bitSize {
-	case 8:
-		return (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		return (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		return (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		return **(**uint64)(unsafe.Pointer(&p))
-	}
-	return 0
-}
-
+func ptrToUint64(p uintptr) uint64              { return **(**uint64)(unsafe.Pointer(&p)) }
 func ptrToFloat32(p uintptr) float32            { return **(**float32)(unsafe.Pointer(&p)) }
 func ptrToFloat64(p uintptr) float64            { return **(**float64)(unsafe.Pointer(&p)) }
 func ptrToBool(p uintptr) bool                  { return **(**bool)(unsafe.Pointer(&p)) }
@@ -107,17 +94,17 @@ func ptrToInterface(code *encoder.Opcode, p uintptr) interface{} {
 	}))
 }
 
-func appendInt(ctx *encoder.RuntimeContext, b []byte, p uintptr, code *encoder.Opcode) []byte {
+func appendInt(ctx *encoder.RuntimeContext, b []byte, v uint64, code *encoder.Opcode) []byte {
 	format := ctx.Option.ColorScheme.Int
 	b = append(b, format.Header...)
-	b = encoder.AppendInt(ctx, b, p, code)
+	b = encoder.AppendInt(ctx, b, v, code)
 	return append(b, format.Footer...)
 }
 
-func appendUint(ctx *encoder.RuntimeContext, b []byte, p uintptr, code *encoder.Opcode) []byte {
+func appendUint(ctx *encoder.RuntimeContext, b []byte, v uint64, code *encoder.Opcode) []byte {
 	format := ctx.Option.ColorScheme.Uint
 	b = append(b, format.Header...)
-	b = encoder.AppendUint(ctx, b, p, code)
+	b = encoder.AppendUint(ctx, b, v, code)
 	return append(b, format.Footer...)
 }
 
@@ -181,15 +168,8 @@ func appendComma(_ *encoder.RuntimeContext, b []byte) []byte {
 	return append(b, ',', '\n')
 }
 
-func appendNullComma(ctx *encoder.RuntimeContext, b []byte) []byte {
-	format := ctx.Option.ColorScheme.Null
-	b = append(b, format.Header...)
-	b = append(b, "null"...)
-	return append(append(b, format.Footer...), ',', '\n')
-}
-
 func appendColon(_ *encoder.RuntimeContext, b []byte) []byte {
-	return append(b[:len(b)-2], ':', ' ')
+	return append(b, ':', ' ')
 }
 
 func appendMapKeyValue(ctx *encoder.RuntimeContext, code *encoder.Opcode, b, key, value []byte) []byte {
@@ -229,9 +209,8 @@ func appendEmptyObject(_ *encoder.RuntimeContext, b []byte) []byte {
 
 func appendObjectEnd(ctx *encoder.RuntimeContext, code *encoder.Opcode, b []byte) []byte {
 	last := len(b) - 1
-	// replace comma to newline
-	b[last-1] = '\n'
-	b = appendIndent(ctx, b[:last], code.Indent)
+	b[last] = '\n'
+	b = appendIndent(ctx, b, code.Indent-1)
 	return append(b, '}', ',', '\n')
 }
 
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/vm.go
index 3b4e22e..7b7844e 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_color_indent/vm.go
@@ -3,7 +3,6 @@ package vm_color_indent
 
 import (
 	"math"
-	"reflect"
 	"sort"
 	"unsafe"
 
@@ -33,38 +32,40 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpIntPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpInt:
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpUint:
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpIntString:
 			b = append(b, '"')
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintString:
 			b = append(b, '"')
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -85,7 +86,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpFloat64Ptr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -102,7 +104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStringPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -115,7 +118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBoolPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -128,7 +132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBytesPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -141,7 +146,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpNumberPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -157,7 +163,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterfacePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -166,7 +173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterface:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -186,24 +194,20 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.NonEmptyInterfaceFlags != 0 {
 				iface := (*nonEmptyInterface)(up)
 				ifacePtr = iface.ptr
-				if iface.itab != nil {
-					typ = iface.itab.typ
-				}
+				typ = iface.itab.typ
 			} else {
 				iface := (*emptyInterface)(up)
 				ifacePtr = iface.ptr
 				typ = iface.typ
 			}
 			if ifacePtr == nil {
-				isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
-				if !isDirectedNil {
-					b = appendNullComma(ctx, b)
-					code = code.Next
-					break
-				}
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
+				code = code.Next
+				break
 			}
 			ctx.KeepRefs = append(ctx.KeepRefs, up)
-			ifaceCodeSet, err := encoder.CompileToGetCodeSet(ctx, uintptr(unsafe.Pointer(typ)))
+			ifaceCodeSet, err := encoder.CompileToGetCodeSet(uintptr(unsafe.Pointer(typ)))
 			if err != nil {
 				return nil, err
 			}
@@ -222,7 +226,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			oldOffset := ptrOffset
 			ptrOffset += totalLength * uintptrSize
 			oldBaseIndent := ctx.BaseIndent
-			ctx.BaseIndent += code.Indent
+			indentDiffFromTop := c.Indent - 1
+			ctx.BaseIndent += code.Indent - indentDiffFromTop
 
 			newLen := offsetNum + totalLength + nextTotalLength
 			if curlen < newLen {
@@ -252,7 +257,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSONPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -261,7 +267,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSON:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -277,7 +284,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalTextPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -303,7 +311,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpSlicePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -313,7 +322,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			slice := ptrToSlice(p)
 			if p == 0 || slice.Data == nil {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -346,7 +356,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArrayPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -355,7 +366,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArray:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -385,7 +397,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMapPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -394,7 +407,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMap:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -406,42 +420,48 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				break
 			}
 			b = appendStructHead(ctx, b)
-			unorderedMap := (ctx.Option.Flag & encoder.UnorderedMapOption) != 0
-			mapCtx := encoder.NewMapContext(mlen, unorderedMap)
-			mapiterinit(code.Type, uptr, &mapCtx.Iter)
-			store(ctxptr, code.Idx, uintptr(unsafe.Pointer(mapCtx)))
-			ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
-			if unorderedMap {
+			iter := mapiterinit(code.Type, uptr)
+			ctx.KeepRefs = append(ctx.KeepRefs, iter)
+			store(ctxptr, code.ElemIdx, 0)
+			store(ctxptr, code.Length, uintptr(mlen))
+			store(ctxptr, code.MapIter, uintptr(iter))
+			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendMapKeyIndent(ctx, code.Next, b)
 			} else {
-				mapCtx.Start = len(b)
-				mapCtx.First = len(b)
+				mapCtx := encoder.NewMapContext(mlen)
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
+				store(ctxptr, code.End.MapPos, uintptr(unsafe.Pointer(mapCtx)))
 			}
-			key := mapiterkey(&mapCtx.Iter)
+			key := mapiterkey(iter)
 			store(ctxptr, code.Next.Idx, uintptr(key))
 			code = code.Next
 		case encoder.OpMapKey:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
-			idx := mapCtx.Idx
+			idx := load(ctxptr, code.ElemIdx)
+			length := load(ctxptr, code.Length)
 			idx++
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
-				if idx < mapCtx.Len {
+				if idx < length {
 					b = appendMapKeyIndent(ctx, code, b)
-					mapCtx.Idx = int(idx)
-					key := mapiterkey(&mapCtx.Iter)
+					store(ctxptr, code.ElemIdx, idx)
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
 					b = appendObjectEnd(ctx, code, b)
-					encoder.ReleaseMapContext(mapCtx)
 					code = code.End.Next
 				}
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Value = b[mapCtx.Start:len(b)]
-				if idx < mapCtx.Len {
-					mapCtx.Idx = int(idx)
-					mapCtx.Start = len(b)
-					key := mapiterkey(&mapCtx.Iter)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				if idx < length {
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					store(ctxptr, code.ElemIdx, idx)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
@@ -449,27 +469,46 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				}
 			}
 		case encoder.OpMapValue:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendColon(ctx, b)
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Key = b[mapCtx.Start:len(b)]
-				mapCtx.Start = len(b)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
 			}
-			value := mapitervalue(&mapCtx.Iter)
+			ptr := load(ctxptr, code.MapIter)
+			iter := ptrToUnsafePtr(ptr)
+			value := mapitervalue(iter)
 			store(ctxptr, code.Next.Idx, uintptr(value))
-			mapiternext(&mapCtx.Iter)
+			mapiternext(iter)
 			code = code.Next
 		case encoder.OpMapEnd:
 			// this operation only used by sorted map.
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
+			length := int(load(ctxptr, code.Length))
+			ptr := load(ctxptr, code.MapPos)
+			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+			pos := mapCtx.Pos
+			for i := 0; i < length; i++ {
+				startKey := pos[i*2]
+				startValue := pos[i*2+1]
+				var endValue int
+				if i+1 < length {
+					endValue = pos[i*2+2]
+				} else {
+					endValue = len(b)
+				}
+				mapCtx.Slice.Items = append(mapCtx.Slice.Items, encoder.MapItem{
+					Key:   b[startKey:startValue],
+					Value: b[startValue:endValue],
+				})
+			}
 			sort.Sort(mapCtx.Slice)
 			buf := mapCtx.Buf
 			for _, item := range mapCtx.Slice.Items {
 				buf = appendMapKeyValue(ctx, code, buf, item.Key, item.Value)
 			}
 			buf = appendMapEnd(ctx, code, buf)
-			b = b[:mapCtx.First]
+			b = b[:pos[0]]
 			b = append(b, buf...)
 			mapCtx.Buf = buf
 			encoder.ReleaseMapContext(mapCtx)
@@ -531,7 +570,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -542,7 +582,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -562,7 +603,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -573,7 +615,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -594,7 +637,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -606,7 +650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -615,7 +660,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyInt:
@@ -623,7 +668,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -635,7 +681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -643,13 +690,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -658,7 +705,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -670,7 +718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -680,7 +729,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -689,7 +738,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -701,7 +751,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -709,15 +760,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
-			u64 := ptrToUint64(p, code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -726,7 +776,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -737,7 +788,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -752,7 +804,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -760,7 +812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -771,7 +824,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -784,7 +838,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -792,7 +846,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -803,7 +858,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -819,7 +875,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -828,7 +884,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -839,7 +896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -853,7 +911,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -863,7 +921,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -875,7 +934,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -884,7 +944,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyUint:
@@ -892,7 +952,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -904,7 +965,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -912,13 +974,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -927,7 +989,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -939,7 +1002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -949,7 +1013,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -958,7 +1022,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -970,7 +1035,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -978,14 +1044,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -994,7 +1060,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1005,7 +1072,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1020,7 +1088,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -1028,7 +1096,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1039,7 +1108,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1052,7 +1122,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -1060,7 +1130,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1071,7 +1142,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1087,7 +1159,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -1096,7 +1168,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1107,7 +1180,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1121,7 +1195,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -1131,7 +1205,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1143,7 +1218,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1160,7 +1236,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1172,7 +1249,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1194,7 +1272,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1206,7 +1285,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1225,7 +1305,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1237,7 +1318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1260,7 +1342,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1271,7 +1354,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1294,7 +1378,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1305,7 +1390,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1326,7 +1412,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1337,7 +1424,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1362,7 +1450,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1373,7 +1462,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1397,7 +1487,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1409,7 +1500,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1430,7 +1522,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1442,7 +1535,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1467,7 +1561,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1479,7 +1574,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1502,7 +1598,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1514,7 +1611,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1540,7 +1638,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1551,7 +1650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1578,7 +1678,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1589,7 +1690,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1614,7 +1716,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1625,7 +1728,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1654,7 +1758,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1665,7 +1770,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1693,7 +1799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1723,7 +1830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1735,7 +1843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1757,7 +1866,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1769,7 +1879,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1786,7 +1897,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1798,7 +1910,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1819,7 +1932,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1830,7 +1944,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1853,7 +1968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1864,7 +1980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1885,7 +2002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1896,7 +2014,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1919,7 +2038,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1930,7 +2050,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1952,7 +2073,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1964,7 +2086,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1981,7 +2104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1993,7 +2117,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2015,7 +2140,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2027,7 +2153,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2046,7 +2173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2058,7 +2186,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2081,7 +2210,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2092,7 +2222,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2115,7 +2246,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2126,7 +2258,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2147,7 +2280,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2158,7 +2292,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2183,7 +2318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2194,7 +2330,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2218,7 +2355,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2230,7 +2368,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2247,7 +2386,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2259,7 +2399,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2280,7 +2421,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2291,7 +2433,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2314,7 +2457,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2325,7 +2469,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2347,7 +2492,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2359,7 +2505,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2379,7 +2526,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2391,7 +2539,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2416,7 +2565,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2428,7 +2578,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2450,7 +2601,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2462,7 +2614,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2488,7 +2641,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2499,7 +2653,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2526,7 +2681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2537,7 +2693,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2561,7 +2718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2572,7 +2730,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2600,7 +2759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2611,7 +2771,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2638,7 +2799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2650,7 +2812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2667,7 +2830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2679,7 +2843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2696,7 +2861,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2708,7 +2874,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2729,7 +2896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2740,7 +2908,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2753,7 +2922,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			}
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				code = code.Next
@@ -2763,7 +2933,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2774,7 +2945,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2796,7 +2968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2807,7 +2980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2825,7 +2999,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2836,7 +3011,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2858,7 +3034,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2869,7 +3046,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2879,13 +3057,15 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 				break
 			}
 			p = ptrToPtr(p + uintptr(code.Offset))
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				if (code.Flags & encoder.IndirectFlags) != 0 {
@@ -2898,7 +3078,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2909,7 +3090,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2936,7 +3118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2949,7 +3132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2958,10 +3142,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -2979,7 +3162,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2992,7 +3176,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3000,10 +3185,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			iface := ptrToInterface(code, p)
@@ -3023,7 +3207,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3034,7 +3219,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3061,7 +3247,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3072,7 +3259,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3099,7 +3287,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3112,7 +3301,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3121,10 +3311,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3142,7 +3331,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3155,7 +3345,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3163,10 +3354,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3185,7 +3375,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3196,7 +3387,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3223,7 +3415,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3234,7 +3427,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3277,16 +3471,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3294,18 +3488,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3317,7 +3511,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3326,7 +3520,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3338,7 +3532,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3349,7 +3543,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3357,16 +3551,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3374,18 +3568,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3397,7 +3591,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3406,7 +3600,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3418,7 +3612,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3429,7 +3623,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3565,7 +3759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -4152,22 +4347,24 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				store(ctxptr, code.Idx, p)
 			}
+		case encoder.OpStructAnonymousEnd:
+			code = code.Next
 		case encoder.OpStructEnd:
 			b = appendStructEndSkipLast(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4177,18 +4374,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4202,7 +4399,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4211,7 +4408,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4225,7 +4422,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4236,7 +4433,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4246,16 +4443,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructEndUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4265,18 +4462,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4290,7 +4487,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4299,7 +4496,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4313,7 +4510,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4324,7 +4521,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/debug_vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/debug_vm.go
index 9939538..4cfd17a 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/debug_vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/debug_vm.go
@@ -16,17 +16,16 @@ func DebugRun(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet)
 
 	defer func() {
 		if err := recover(); err != nil {
-			w := ctx.Option.DebugOut
-			fmt.Fprintln(w, "=============[DEBUG]===============")
-			fmt.Fprintln(w, "* [TYPE]")
-			fmt.Fprintln(w, codeSet.Type)
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [ALL OPCODE]")
-			fmt.Fprintln(w, code.Dump())
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintln(w, "* [CONTEXT]")
-			fmt.Fprintf(w, "%+v\n", ctx)
-			fmt.Fprintln(w, "===================================")
+			fmt.Println("=============[DEBUG]===============")
+			fmt.Println("* [TYPE]")
+			fmt.Println(codeSet.Type)
+			fmt.Printf("\n")
+			fmt.Println("* [ALL OPCODE]")
+			fmt.Println(code.Dump())
+			fmt.Printf("\n")
+			fmt.Println("* [CONTEXT]")
+			fmt.Printf("%+v\n", ctx)
+			fmt.Println("===================================")
 			panic(err)
 		}
 	}()
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/util.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/util.go
index 6cb745e..2e3c35f 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/util.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/util.go
@@ -70,19 +70,7 @@ func loadNPtr(base uintptr, idx uint32, ptrNum uint8) uintptr {
 	return p
 }
 
-func ptrToUint64(p uintptr, bitSize uint8) uint64 {
-	switch bitSize {
-	case 8:
-		return (uint64)(**(**uint8)(unsafe.Pointer(&p)))
-	case 16:
-		return (uint64)(**(**uint16)(unsafe.Pointer(&p)))
-	case 32:
-		return (uint64)(**(**uint32)(unsafe.Pointer(&p)))
-	case 64:
-		return **(**uint64)(unsafe.Pointer(&p))
-	}
-	return 0
-}
+func ptrToUint64(p uintptr) uint64              { return **(**uint64)(unsafe.Pointer(&p)) }
 func ptrToFloat32(p uintptr) float32            { return **(**float32)(unsafe.Pointer(&p)) }
 func ptrToFloat64(p uintptr) float64            { return **(**float64)(unsafe.Pointer(&p)) }
 func ptrToBool(p uintptr) bool                  { return **(**bool)(unsafe.Pointer(&p)) }
@@ -128,12 +116,8 @@ func appendComma(_ *encoder.RuntimeContext, b []byte) []byte {
 	return append(b, ',', '\n')
 }
 
-func appendNullComma(_ *encoder.RuntimeContext, b []byte) []byte {
-	return append(b, "null,\n"...)
-}
-
 func appendColon(_ *encoder.RuntimeContext, b []byte) []byte {
-	return append(b[:len(b)-2], ':', ' ')
+	return append(b, ':', ' ')
 }
 
 func appendMapKeyValue(ctx *encoder.RuntimeContext, code *encoder.Opcode, b, key, value []byte) []byte {
@@ -173,9 +157,8 @@ func appendEmptyObject(_ *encoder.RuntimeContext, b []byte) []byte {
 
 func appendObjectEnd(ctx *encoder.RuntimeContext, code *encoder.Opcode, b []byte) []byte {
 	last := len(b) - 1
-	// replace comma to newline
-	b[last-1] = '\n'
-	b = appendIndent(ctx, b[:last], code.Indent)
+	b[last] = '\n'
+	b = appendIndent(ctx, b, code.Indent-1)
 	return append(b, '}', ',', '\n')
 }
 
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/vm.go b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/vm.go
index 836c5c8..6e05155 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/vm.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/vm_indent/vm.go
@@ -3,7 +3,6 @@ package vm_indent
 
 import (
 	"math"
-	"reflect"
 	"sort"
 	"unsafe"
 
@@ -33,38 +32,40 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpIntPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpInt:
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
 			store(ctxptr, code.Idx, p)
 			fallthrough
 		case encoder.OpUint:
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpIntString:
 			b = append(b, '"')
-			b = appendInt(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendInt(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpUintString:
 			b = append(b, '"')
-			b = appendUint(ctx, b, load(ctxptr, code.Idx), code)
+			b = appendUint(ctx, b, ptrToUint64(load(ctxptr, code.Idx)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -85,7 +86,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpFloat64Ptr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -102,7 +104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStringPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -115,7 +118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBoolPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -128,7 +132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpBytesPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -141,7 +146,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpNumberPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -157,7 +163,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterfacePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -166,7 +173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpInterface:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -186,24 +194,20 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.NonEmptyInterfaceFlags != 0 {
 				iface := (*nonEmptyInterface)(up)
 				ifacePtr = iface.ptr
-				if iface.itab != nil {
-					typ = iface.itab.typ
-				}
+				typ = iface.itab.typ
 			} else {
 				iface := (*emptyInterface)(up)
 				ifacePtr = iface.ptr
 				typ = iface.typ
 			}
 			if ifacePtr == nil {
-				isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
-				if !isDirectedNil {
-					b = appendNullComma(ctx, b)
-					code = code.Next
-					break
-				}
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
+				code = code.Next
+				break
 			}
 			ctx.KeepRefs = append(ctx.KeepRefs, up)
-			ifaceCodeSet, err := encoder.CompileToGetCodeSet(ctx, uintptr(unsafe.Pointer(typ)))
+			ifaceCodeSet, err := encoder.CompileToGetCodeSet(uintptr(unsafe.Pointer(typ)))
 			if err != nil {
 				return nil, err
 			}
@@ -222,7 +226,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			oldOffset := ptrOffset
 			ptrOffset += totalLength * uintptrSize
 			oldBaseIndent := ctx.BaseIndent
-			ctx.BaseIndent += code.Indent
+			indentDiffFromTop := c.Indent - 1
+			ctx.BaseIndent += code.Indent - indentDiffFromTop
 
 			newLen := offsetNum + totalLength + nextTotalLength
 			if curlen < newLen {
@@ -252,7 +257,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSONPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -261,7 +267,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalJSON:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -277,7 +284,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMarshalTextPtr:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -303,7 +311,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpSlicePtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -313,7 +322,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			slice := ptrToSlice(p)
 			if p == 0 || slice.Data == nil {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -346,7 +356,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArrayPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -355,7 +366,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpArray:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -385,7 +397,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMapPtr:
 			p := loadNPtr(ctxptr, code.Idx, code.PtrNum)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -394,7 +407,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpMap:
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.End.Next
 				break
 			}
@@ -406,42 +420,48 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				break
 			}
 			b = appendStructHead(ctx, b)
-			unorderedMap := (ctx.Option.Flag & encoder.UnorderedMapOption) != 0
-			mapCtx := encoder.NewMapContext(mlen, unorderedMap)
-			mapiterinit(code.Type, uptr, &mapCtx.Iter)
-			store(ctxptr, code.Idx, uintptr(unsafe.Pointer(mapCtx)))
-			ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
-			if unorderedMap {
+			iter := mapiterinit(code.Type, uptr)
+			ctx.KeepRefs = append(ctx.KeepRefs, iter)
+			store(ctxptr, code.ElemIdx, 0)
+			store(ctxptr, code.Length, uintptr(mlen))
+			store(ctxptr, code.MapIter, uintptr(iter))
+			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendMapKeyIndent(ctx, code.Next, b)
 			} else {
-				mapCtx.Start = len(b)
-				mapCtx.First = len(b)
+				mapCtx := encoder.NewMapContext(mlen)
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				ctx.KeepRefs = append(ctx.KeepRefs, unsafe.Pointer(mapCtx))
+				store(ctxptr, code.End.MapPos, uintptr(unsafe.Pointer(mapCtx)))
 			}
-			key := mapiterkey(&mapCtx.Iter)
+			key := mapiterkey(iter)
 			store(ctxptr, code.Next.Idx, uintptr(key))
 			code = code.Next
 		case encoder.OpMapKey:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
-			idx := mapCtx.Idx
+			idx := load(ctxptr, code.ElemIdx)
+			length := load(ctxptr, code.Length)
 			idx++
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
-				if idx < mapCtx.Len {
+				if idx < length {
 					b = appendMapKeyIndent(ctx, code, b)
-					mapCtx.Idx = int(idx)
-					key := mapiterkey(&mapCtx.Iter)
+					store(ctxptr, code.ElemIdx, idx)
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
 					b = appendObjectEnd(ctx, code, b)
-					encoder.ReleaseMapContext(mapCtx)
 					code = code.End.Next
 				}
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Value = b[mapCtx.Start:len(b)]
-				if idx < mapCtx.Len {
-					mapCtx.Idx = int(idx)
-					mapCtx.Start = len(b)
-					key := mapiterkey(&mapCtx.Iter)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
+				if idx < length {
+					ptr := load(ctxptr, code.MapIter)
+					iter := ptrToUnsafePtr(ptr)
+					store(ctxptr, code.ElemIdx, idx)
+					key := mapiterkey(iter)
 					store(ctxptr, code.Next.Idx, uintptr(key))
 					code = code.Next
 				} else {
@@ -449,27 +469,46 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				}
 			}
 		case encoder.OpMapValue:
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
 			if (ctx.Option.Flag & encoder.UnorderedMapOption) != 0 {
 				b = appendColon(ctx, b)
 			} else {
-				mapCtx.Slice.Items[mapCtx.Idx].Key = b[mapCtx.Start:len(b)]
-				mapCtx.Start = len(b)
+				ptr := load(ctxptr, code.End.MapPos)
+				mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+				mapCtx.Pos = append(mapCtx.Pos, len(b))
 			}
-			value := mapitervalue(&mapCtx.Iter)
+			ptr := load(ctxptr, code.MapIter)
+			iter := ptrToUnsafePtr(ptr)
+			value := mapitervalue(iter)
 			store(ctxptr, code.Next.Idx, uintptr(value))
-			mapiternext(&mapCtx.Iter)
+			mapiternext(iter)
 			code = code.Next
 		case encoder.OpMapEnd:
 			// this operation only used by sorted map.
-			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(load(ctxptr, code.Idx)))
+			length := int(load(ctxptr, code.Length))
+			ptr := load(ctxptr, code.MapPos)
+			mapCtx := (*encoder.MapContext)(ptrToUnsafePtr(ptr))
+			pos := mapCtx.Pos
+			for i := 0; i < length; i++ {
+				startKey := pos[i*2]
+				startValue := pos[i*2+1]
+				var endValue int
+				if i+1 < length {
+					endValue = pos[i*2+2]
+				} else {
+					endValue = len(b)
+				}
+				mapCtx.Slice.Items = append(mapCtx.Slice.Items, encoder.MapItem{
+					Key:   b[startKey:startValue],
+					Value: b[startValue:endValue],
+				})
+			}
 			sort.Sort(mapCtx.Slice)
 			buf := mapCtx.Buf
 			for _, item := range mapCtx.Slice.Items {
 				buf = appendMapKeyValue(ctx, code, buf, item.Key, item.Value)
 			}
 			buf = appendMapEnd(ctx, code, buf)
-			b = b[:mapCtx.First]
+			b = b[:pos[0]]
 			b = append(b, buf...)
 			mapCtx.Buf = buf
 			encoder.ReleaseMapContext(mapCtx)
@@ -531,7 +570,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -542,7 +582,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -562,7 +603,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -573,7 +615,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && ((code.Flags&encoder.IndirectFlags) != 0 || code.Next.Op == encoder.OpStructEnd) {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -594,7 +637,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -606,7 +650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -615,7 +660,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyInt:
@@ -623,7 +668,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -635,7 +681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -643,13 +690,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -658,7 +705,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -670,7 +718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -680,7 +729,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -689,7 +738,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -701,7 +751,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -709,15 +760,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
-			u64 := ptrToUint64(p, code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -726,7 +776,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -737,7 +788,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -752,7 +804,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -760,7 +812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -771,7 +824,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -784,7 +838,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -792,7 +846,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -803,7 +858,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -819,7 +875,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -828,7 +884,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -839,7 +896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -853,7 +911,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -863,7 +921,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -875,7 +934,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -884,7 +944,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructPtrHeadOmitEmptyUint:
@@ -892,7 +952,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -904,7 +965,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -912,13 +974,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 				code = code.Next
 			}
@@ -927,7 +989,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -939,7 +1002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -949,7 +1013,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -958,7 +1022,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -970,7 +1035,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -978,14 +1044,14 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v == 0 {
 				code = code.NextField
 			} else {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 				code = code.Next
@@ -994,7 +1060,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1005,7 +1072,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1020,7 +1088,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -1028,7 +1096,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1039,7 +1108,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1052,7 +1122,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -1060,7 +1130,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1071,7 +1142,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1087,7 +1159,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -1096,7 +1168,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1107,7 +1180,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1121,7 +1195,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -1131,7 +1205,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1143,7 +1218,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1160,7 +1236,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1172,7 +1249,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1194,7 +1272,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1206,7 +1285,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1225,7 +1305,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1237,7 +1318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1260,7 +1342,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1271,7 +1354,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1294,7 +1378,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1305,7 +1390,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1326,7 +1412,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1337,7 +1424,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1362,7 +1450,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1373,7 +1462,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1397,7 +1487,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1409,7 +1500,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1430,7 +1522,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1442,7 +1535,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1467,7 +1561,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1479,7 +1574,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1502,7 +1598,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1514,7 +1611,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1540,7 +1638,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1551,7 +1650,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1578,7 +1678,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1589,7 +1690,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1614,7 +1716,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1625,7 +1728,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1654,7 +1758,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1665,7 +1770,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1693,7 +1799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1723,7 +1830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1735,7 +1843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1757,7 +1866,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1769,7 +1879,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1786,7 +1897,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1798,7 +1910,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1819,7 +1932,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1830,7 +1944,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1853,7 +1968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1864,7 +1980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1885,7 +2002,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1896,7 +2014,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1919,7 +2038,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1930,7 +2050,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1952,7 +2073,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1964,7 +2086,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -1981,7 +2104,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -1993,7 +2117,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2015,7 +2140,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2027,7 +2153,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2046,7 +2173,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2058,7 +2186,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2081,7 +2210,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2092,7 +2222,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2115,7 +2246,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2126,7 +2258,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2147,7 +2280,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2158,7 +2292,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2183,7 +2318,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2194,7 +2330,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2218,7 +2355,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2230,7 +2368,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2247,7 +2386,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2259,7 +2399,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2280,7 +2421,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2291,7 +2433,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2314,7 +2457,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2325,7 +2469,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2347,7 +2492,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2359,7 +2505,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2379,7 +2526,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2391,7 +2539,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2416,7 +2565,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2428,7 +2578,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2450,7 +2601,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2462,7 +2614,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2488,7 +2641,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2499,7 +2653,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2526,7 +2681,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2537,7 +2693,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2561,7 +2718,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2572,7 +2730,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2600,7 +2759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2611,7 +2771,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2638,7 +2799,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2650,7 +2812,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2667,7 +2830,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2679,7 +2843,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2696,7 +2861,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p := load(ctxptr, code.Idx)
 				if p == 0 {
 					if code.Flags&encoder.AnonymousHeadFlags == 0 {
-						b = appendNullComma(ctx, b)
+						b = appendNull(ctx, b)
+						b = appendComma(ctx, b)
 					}
 					code = code.End.Next
 					break
@@ -2708,7 +2874,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2729,7 +2896,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2740,7 +2908,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2753,7 +2922,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			}
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				code = code.Next
@@ -2763,7 +2933,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2774,7 +2945,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2796,7 +2968,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2807,7 +2980,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2825,7 +2999,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2836,7 +3011,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2858,7 +3034,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2869,7 +3046,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2879,13 +3057,15 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			}
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 				break
 			}
 			p = ptrToPtr(p + uintptr(code.Offset))
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.NextField
 			} else {
 				if (code.Flags & encoder.IndirectFlags) != 0 {
@@ -2898,7 +3078,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2909,7 +3090,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2936,7 +3118,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2949,7 +3132,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2958,10 +3142,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -2979,7 +3162,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -2992,7 +3176,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3000,10 +3185,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalJSON {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			iface := ptrToInterface(code, p)
@@ -3023,7 +3207,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3034,7 +3219,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3061,7 +3247,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3072,7 +3259,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3099,7 +3287,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3112,7 +3301,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3121,10 +3311,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendStructHead(ctx, b)
 			}
 			b = appendStructKey(ctx, code, b)
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3142,7 +3331,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3155,7 +3345,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3163,10 +3354,9 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if code.Flags&encoder.AnonymousHeadFlags == 0 {
 				b = appendStructHead(ctx, b)
 			}
-			p += uintptr(code.Offset)
 			if (code.Flags & encoder.IsNilableTypeFlags) != 0 {
 				if (code.Flags&encoder.IndirectFlags) != 0 || code.Op == encoder.OpStructPtrHeadOmitEmptyMarshalText {
-					p = ptrToPtr(p)
+					p = ptrToPtr(p + uintptr(code.Offset))
 				}
 			}
 			if p == 0 && (code.Flags&encoder.NilCheckFlags) != 0 {
@@ -3185,7 +3375,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3196,7 +3387,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3223,7 +3415,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3234,7 +3427,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			if p == 0 && (code.Flags&encoder.IndirectFlags) != 0 {
 				if code.Flags&encoder.AnonymousHeadFlags == 0 {
-					b = appendNullComma(ctx, b)
+					b = appendNull(ctx, b)
+					b = appendComma(ctx, b)
 				}
 				code = code.End.Next
 				break
@@ -3277,16 +3471,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3294,18 +3488,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3317,7 +3511,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3326,7 +3520,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3338,7 +3532,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3349,7 +3543,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3357,16 +3551,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructFieldUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3374,18 +3568,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendComma(ctx, b)
 			code = code.Next
 		case encoder.OpStructFieldOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3397,7 +3591,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendComma(ctx, b)
 			code = code.Next
@@ -3406,7 +3600,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendComma(ctx, b)
 			}
 			code = code.Next
@@ -3418,7 +3612,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendComma(ctx, b)
@@ -3429,7 +3623,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendComma(ctx, b)
 			}
@@ -3565,7 +3759,8 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			b = appendStructKey(ctx, code, b)
 			if p == 0 {
-				b = appendNullComma(ctx, b)
+				b = appendNull(ctx, b)
+				b = appendComma(ctx, b)
 				code = code.Next
 				break
 			}
@@ -4152,22 +4347,24 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				store(ctxptr, code.Idx, p)
 			}
+		case encoder.OpStructAnonymousEnd:
+			code = code.Next
 		case encoder.OpStructEnd:
 			b = appendStructEndSkipLast(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndInt:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyInt:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4177,18 +4374,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+			b = appendInt(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyIntString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p+uintptr(code.Offset), code)
+				b = appendInt(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4202,7 +4399,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4211,7 +4408,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4225,7 +4422,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4236,7 +4433,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendInt(ctx, b, p, code)
+				b = appendInt(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4246,16 +4443,16 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 		case encoder.OpStructEndUint:
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUint:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4265,18 +4462,18 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p := load(ctxptr, code.Idx)
 			b = appendStructKey(ctx, code, b)
 			b = append(b, '"')
-			b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+			b = appendUint(ctx, b, ptrToUint64(p+uintptr(code.Offset)), code)
 			b = append(b, '"')
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
 		case encoder.OpStructEndOmitEmptyUintString:
 			p := load(ctxptr, code.Idx)
-			u64 := ptrToUint64(p+uintptr(code.Offset), code.NumBitSize)
+			u64 := ptrToUint64(p + uintptr(code.Offset))
 			v := u64 & ((1 << code.NumBitSize) - 1)
 			if v != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p+uintptr(code.Offset), code)
+				b = appendUint(ctx, b, u64, code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
@@ -4290,7 +4487,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p == 0 {
 				b = appendNull(ctx, b)
 			} else {
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 			}
 			b = appendStructEnd(ctx, code, b)
 			code = code.Next
@@ -4299,7 +4496,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			p = ptrToNPtr(p+uintptr(code.Offset), code.PtrNum)
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = appendStructEnd(ctx, code, b)
 			} else {
 				b = appendStructEndSkipLast(ctx, code, b)
@@ -4313,7 +4510,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				b = appendNull(ctx, b)
 			} else {
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 			}
 			b = appendStructEnd(ctx, code, b)
@@ -4324,7 +4521,7 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			if p != 0 {
 				b = appendStructKey(ctx, code, b)
 				b = append(b, '"')
-				b = appendUint(ctx, b, p, code)
+				b = appendUint(ctx, b, ptrToUint64(p), code)
 				b = append(b, '"')
 				b = appendStructEnd(ctx, code, b)
 			} else {
diff --git a/vendor/github.com/goccy/go-json/internal/errors/error.go b/vendor/github.com/goccy/go-json/internal/errors/error.go
index 9207d0f..d58e39f 100644
--- a/vendor/github.com/goccy/go-json/internal/errors/error.go
+++ b/vendor/github.com/goccy/go-json/internal/errors/error.go
@@ -162,22 +162,3 @@ func ErrInvalidBeginningOfValue(c byte, cursor int64) *SyntaxError {
 		Offset: cursor,
 	}
 }
-
-type PathError struct {
-	msg string
-}
-
-func (e *PathError) Error() string {
-	return fmt.Sprintf("json: invalid path format: %s", e.msg)
-}
-
-func ErrInvalidPath(msg string, args ...interface{}) *PathError {
-	if len(args) != 0 {
-		return &PathError{msg: fmt.Sprintf(msg, args...)}
-	}
-	return &PathError{msg: msg}
-}
-
-func ErrEmptyPath() *PathError {
-	return &PathError{msg: "path is empty"}
-}
diff --git a/vendor/github.com/goccy/go-json/internal/runtime/rtype.go b/vendor/github.com/goccy/go-json/internal/runtime/rtype.go
index 37cfe35..4db10de 100644
--- a/vendor/github.com/goccy/go-json/internal/runtime/rtype.go
+++ b/vendor/github.com/goccy/go-json/internal/runtime/rtype.go
@@ -252,6 +252,7 @@ func IfaceIndir(*Type) bool
 //go:noescape
 func RType2Type(t *Type) reflect.Type
 
+//go:nolint structcheck
 type emptyInterface struct {
 	_   *Type
 	ptr unsafe.Pointer
diff --git a/vendor/github.com/goccy/go-json/internal/runtime/struct_field.go b/vendor/github.com/goccy/go-json/internal/runtime/struct_field.go
index baab0c5..c321180 100644
--- a/vendor/github.com/goccy/go-json/internal/runtime/struct_field.go
+++ b/vendor/github.com/goccy/go-json/internal/runtime/struct_field.go
@@ -13,11 +13,7 @@ func getTag(field reflect.StructField) string {
 func IsIgnoredStructField(field reflect.StructField) bool {
 	if field.PkgPath != "" {
 		if field.Anonymous {
-			t := field.Type
-			if t.Kind() == reflect.Ptr {
-				t = t.Elem()
-			}
-			if t.Kind() != reflect.Struct {
+			if !(field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct) && field.Type.Kind() != reflect.Struct {
 				return true
 			}
 		} else {
diff --git a/vendor/github.com/goccy/go-json/internal/runtime/type.go b/vendor/github.com/goccy/go-json/internal/runtime/type.go
index 4b693cb..0167cd2 100644
--- a/vendor/github.com/goccy/go-json/internal/runtime/type.go
+++ b/vendor/github.com/goccy/go-json/internal/runtime/type.go
@@ -2,7 +2,6 @@ package runtime
 
 import (
 	"reflect"
-	"sync"
 	"unsafe"
 )
 
@@ -24,8 +23,8 @@ type TypeAddr struct {
 }
 
 var (
-	typeAddr *TypeAddr
-	once     sync.Once
+	typeAddr        *TypeAddr
+	alreadyAnalyzed bool
 )
 
 //go:linkname typelinks reflect.typelinks
@@ -35,64 +34,67 @@ func typelinks() ([]unsafe.Pointer, [][]int32)
 func rtypeOff(unsafe.Pointer, int32) unsafe.Pointer
 
 func AnalyzeTypeAddr() *TypeAddr {
-	once.Do(func() {
-		sections, offsets := typelinks()
-		if len(sections) != 1 {
-			return
+	defer func() {
+		alreadyAnalyzed = true
+	}()
+	if alreadyAnalyzed {
+		return typeAddr
+	}
+	sections, offsets := typelinks()
+	if len(sections) != 1 {
+		return nil
+	}
+	if len(offsets) != 1 {
+		return nil
+	}
+	section := sections[0]
+	offset := offsets[0]
+	var (
+		min         uintptr = uintptr(^uint(0))
+		max         uintptr = 0
+		isAligned64         = true
+		isAligned32         = true
+	)
+	for i := 0; i < len(offset); i++ {
+		typ := (*Type)(rtypeOff(section, offset[i]))
+		addr := uintptr(unsafe.Pointer(typ))
+		if min > addr {
+			min = addr
 		}
-		if len(offsets) != 1 {
-			return
+		if max < addr {
+			max = addr
 		}
-		section := sections[0]
-		offset := offsets[0]
-		var (
-			min         uintptr = uintptr(^uint(0))
-			max         uintptr = 0
-			isAligned64         = true
-			isAligned32         = true
-		)
-		for i := 0; i < len(offset); i++ {
-			typ := (*Type)(rtypeOff(section, offset[i]))
-			addr := uintptr(unsafe.Pointer(typ))
+		if typ.Kind() == reflect.Ptr {
+			addr = uintptr(unsafe.Pointer(typ.Elem()))
 			if min > addr {
 				min = addr
 			}
 			if max < addr {
 				max = addr
 			}
-			if typ.Kind() == reflect.Ptr {
-				addr = uintptr(unsafe.Pointer(typ.Elem()))
-				if min > addr {
-					min = addr
-				}
-				if max < addr {
-					max = addr
-				}
-			}
-			isAligned64 = isAligned64 && (addr-min)&63 == 0
-			isAligned32 = isAligned32 && (addr-min)&31 == 0
 		}
-		addrRange := max - min
-		if addrRange == 0 {
-			return
-		}
-		var addrShift uintptr
-		if isAligned64 {
-			addrShift = 6
-		} else if isAligned32 {
-			addrShift = 5
-		}
-		cacheSize := addrRange >> addrShift
-		if cacheSize > maxAcceptableTypeAddrRange {
-			return
-		}
-		typeAddr = &TypeAddr{
-			BaseTypeAddr: min,
-			MaxTypeAddr:  max,
-			AddrRange:    addrRange,
-			AddrShift:    addrShift,
-		}
-	})
-
+		isAligned64 = isAligned64 && (addr-min)&63 == 0
+		isAligned32 = isAligned32 && (addr-min)&31 == 0
+	}
+	addrRange := max - min
+	if addrRange == 0 {
+		return nil
+	}
+	var addrShift uintptr
+	if isAligned64 {
+		addrShift = 6
+	} else if isAligned32 {
+		addrShift = 5
+	}
+	cacheSize := addrRange >> addrShift
+	if cacheSize > maxAcceptableTypeAddrRange {
+		return nil
+	}
+	typeAddr = &TypeAddr{
+		BaseTypeAddr: min,
+		MaxTypeAddr:  max,
+		AddrRange:    addrRange,
+		AddrShift:    addrShift,
+	}
 	return typeAddr
 }
diff --git a/vendor/github.com/goccy/go-json/json.go b/vendor/github.com/goccy/go-json/json.go
index fb18065..5c9448d 100644
--- a/vendor/github.com/goccy/go-json/json.go
+++ b/vendor/github.com/goccy/go-json/json.go
@@ -89,31 +89,31 @@ type UnmarshalerContext interface {
 //
 // Examples of struct field tags and their meanings:
 //
-//	// Field appears in JSON as key "myName".
-//	Field int `json:"myName"`
+//   // Field appears in JSON as key "myName".
+//   Field int `json:"myName"`
 //
-//	// Field appears in JSON as key "myName" and
-//	// the field is omitted from the object if its value is empty,
-//	// as defined above.
-//	Field int `json:"myName,omitempty"`
+//   // Field appears in JSON as key "myName" and
+//   // the field is omitted from the object if its value is empty,
+//   // as defined above.
+//   Field int `json:"myName,omitempty"`
 //
-//	// Field appears in JSON as key "Field" (the default), but
-//	// the field is skipped if empty.
-//	// Note the leading comma.
-//	Field int `json:",omitempty"`
+//   // Field appears in JSON as key "Field" (the default), but
+//   // the field is skipped if empty.
+//   // Note the leading comma.
+//   Field int `json:",omitempty"`
 //
-//	// Field is ignored by this package.
-//	Field int `json:"-"`
+//   // Field is ignored by this package.
+//   Field int `json:"-"`
 //
-//	// Field appears in JSON as key "-".
-//	Field int `json:"-,"`
+//   // Field appears in JSON as key "-".
+//   Field int `json:"-,"`
 //
 // The "string" option signals that a field is stored as JSON inside a
 // JSON-encoded string. It applies only to fields of string, floating point,
 // integer, or boolean types. This extra level of encoding is sometimes used
 // when communicating with JavaScript programs:
 //
-//	Int64String int64 `json:",string"`
+//    Int64String int64 `json:",string"`
 //
 // The key name will be used if it's a non-empty string consisting of
 // only Unicode letters, digits, and ASCII punctuation except quotation
@@ -166,6 +166,7 @@ type UnmarshalerContext interface {
 // JSON cannot represent cyclic data structures and Marshal does not
 // handle them. Passing cyclic structures to Marshal will result in
 // an infinite recursion.
+//
 func Marshal(v interface{}) ([]byte, error) {
 	return MarshalWithOption(v)
 }
@@ -263,13 +264,14 @@ func MarshalIndentWithOption(v interface{}, prefix, indent string, optFuncs ...E
 //
 // The JSON null value unmarshals into an interface, map, pointer, or slice
 // by setting that Go value to nil. Because null is often used in JSON to mean
-// “not present,� unmarshaling a JSON null into any other Go type has no effect
+// ``not present,'' unmarshaling a JSON null into any other Go type has no effect
 // on the value and produces no error.
 //
 // When unmarshaling quoted strings, invalid UTF-8 or
 // invalid UTF-16 surrogate pairs are not treated as an error.
 // Instead, they are replaced by the Unicode replacement
 // character U+FFFD.
+//
 func Unmarshal(data []byte, v interface{}) error {
 	return unmarshal(data, v)
 }
@@ -297,6 +299,7 @@ func UnmarshalNoEscape(data []byte, v interface{}, optFuncs ...DecodeOptionFunc)
 //	Number, for JSON numbers
 //	string, for JSON string literals
 //	nil, for JSON null
+//
 type Token = json.Token
 
 // A Number represents a JSON number literal.
@@ -361,8 +364,3 @@ func Valid(data []byte) bool {
 	}
 	return decoder.InputOffset() >= int64(len(data))
 }
-
-func init() {
-	encoder.Marshal = Marshal
-	encoder.Unmarshal = Unmarshal
-}
diff --git a/vendor/github.com/goccy/go-json/option.go b/vendor/github.com/goccy/go-json/option.go
index 378031a..ad65091 100644
--- a/vendor/github.com/goccy/go-json/option.go
+++ b/vendor/github.com/goccy/go-json/option.go
@@ -1,8 +1,6 @@
 package json
 
 import (
-	"io"
-
 	"github.com/goccy/go-json/internal/decoder"
 	"github.com/goccy/go-json/internal/encoder"
 )
@@ -17,23 +15,6 @@ func UnorderedMap() EncodeOptionFunc {
 	}
 }
 
-// DisableHTMLEscape disables escaping of HTML characters ( '&', '<', '>' ) when encoding string.
-func DisableHTMLEscape() EncodeOptionFunc {
-	return func(opt *EncodeOption) {
-		opt.Flag &= ^encoder.HTMLEscapeOption
-	}
-}
-
-// DisableNormalizeUTF8
-// By default, when encoding string, UTF8 characters in the range of 0x80 - 0xFF are processed by applying \ufffd for invalid code and escaping for \u2028 and \u2029.
-// This option disables this behaviour. You can expect faster speeds by applying this option, but be careful.
-// encoding/json implements here: https://github.com/golang/go/blob/6178d25fc0b28724b1b5aec2b1b74fc06d9294c7/src/encoding/json/encode.go#L1067-L1093.
-func DisableNormalizeUTF8() EncodeOptionFunc {
-	return func(opt *EncodeOption) {
-		opt.Flag &= ^encoder.NormalizeUTF8Option
-	}
-}
-
 // Debug outputs debug information when panic occurs during encoding.
 func Debug() EncodeOptionFunc {
 	return func(opt *EncodeOption) {
@@ -41,20 +22,6 @@ func Debug() EncodeOptionFunc {
 	}
 }
 
-// DebugWith sets the destination to write debug messages.
-func DebugWith(w io.Writer) EncodeOptionFunc {
-	return func(opt *EncodeOption) {
-		opt.DebugOut = w
-	}
-}
-
-// DebugDOT sets the destination to write opcodes graph.
-func DebugDOT(w io.WriteCloser) EncodeOptionFunc {
-	return func(opt *EncodeOption) {
-		opt.DebugDOTOut = w
-	}
-}
-
 // Colorize add an identifier for coloring to the string of the encoded result.
 func Colorize(scheme *ColorScheme) EncodeOptionFunc {
 	return func(opt *EncodeOption) {
diff --git a/vendor/github.com/goccy/go-json/path.go b/vendor/github.com/goccy/go-json/path.go
deleted file mode 100644
index 38abce7..0000000
--- a/vendor/github.com/goccy/go-json/path.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package json
-
-import (
-	"reflect"
-
-	"github.com/goccy/go-json/internal/decoder"
-)
-
-// CreatePath creates JSON Path.
-//
-// JSON Path rule
-// $   : root object or element. The JSON Path format must start with this operator, which refers to the outermost level of the JSON-formatted string.
-// .   : child operator. You can identify child values using dot-notation.
-// ..  : recursive descent.
-// []  : subscript operator. If the JSON object is an array, you can use brackets to specify the array index.
-// [*] : all objects/elements for array.
-//
-// Reserved words must be properly escaped when included in Path.
-//
-// Escape Rule
-// single quote style escape: e.g.) `$['a.b'].c`
-// double quote style escape: e.g.) `$."a.b".c`
-func CreatePath(p string) (*Path, error) {
-	path, err := decoder.PathString(p).Build()
-	if err != nil {
-		return nil, err
-	}
-	return &Path{path: path}, nil
-}
-
-// Path represents JSON Path.
-type Path struct {
-	path *decoder.Path
-}
-
-// RootSelectorOnly whether only the root selector ($) is used.
-func (p *Path) RootSelectorOnly() bool {
-	return p.path.RootSelectorOnly
-}
-
-// UsedSingleQuotePathSelector whether single quote-based escaping was done when building the JSON Path.
-func (p *Path) UsedSingleQuotePathSelector() bool {
-	return p.path.SingleQuotePathSelector
-}
-
-// UsedSingleQuotePathSelector whether double quote-based escaping was done when building the JSON Path.
-func (p *Path) UsedDoubleQuotePathSelector() bool {
-	return p.path.DoubleQuotePathSelector
-}
-
-// Extract extracts a specific JSON string.
-func (p *Path) Extract(data []byte, optFuncs ...DecodeOptionFunc) ([][]byte, error) {
-	return extractFromPath(p, data, optFuncs...)
-}
-
-// PathString returns original JSON Path string.
-func (p *Path) PathString() string {
-	return p.path.String()
-}
-
-// Unmarshal extract and decode the value of the part corresponding to JSON Path from the input data.
-func (p *Path) Unmarshal(data []byte, v interface{}, optFuncs ...DecodeOptionFunc) error {
-	contents, err := extractFromPath(p, data, optFuncs...)
-	if err != nil {
-		return err
-	}
-	results := make([]interface{}, 0, len(contents))
-	for _, content := range contents {
-		var result interface{}
-		if err := Unmarshal(content, &result); err != nil {
-			return err
-		}
-		results = append(results, result)
-	}
-	if err := decoder.AssignValue(reflect.ValueOf(results), reflect.ValueOf(v)); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Get extract and substitute the value of the part corresponding to JSON Path from the input value.
-func (p *Path) Get(src, dst interface{}) error {
-	return p.path.Get(reflect.ValueOf(src), reflect.ValueOf(dst))
-}
diff --git a/vendor/github.com/goccy/go-json/query.go b/vendor/github.com/goccy/go-json/query.go
deleted file mode 100644
index 4b11cf2..0000000
--- a/vendor/github.com/goccy/go-json/query.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package json
-
-import (
-	"github.com/goccy/go-json/internal/encoder"
-)
-
-type (
-	// FieldQuery you can dynamically filter the fields in the structure by creating a FieldQuery,
-	// adding it to context.Context using SetFieldQueryToContext and then passing it to MarshalContext.
-	// This is a type-safe operation, so it is faster than filtering using map[string]interface{}.
-	FieldQuery       = encoder.FieldQuery
-	FieldQueryString = encoder.FieldQueryString
-)
-
-var (
-	// FieldQueryFromContext get current FieldQuery from context.Context.
-	FieldQueryFromContext = encoder.FieldQueryFromContext
-	// SetFieldQueryToContext set current FieldQuery to context.Context.
-	SetFieldQueryToContext = encoder.SetFieldQueryToContext
-)
-
-// BuildFieldQuery builds FieldQuery by fieldName or sub field query.
-// First, specify the field name that you want to keep in structure type.
-// If the field you want to keep is a structure type, by creating a sub field query using BuildSubFieldQuery,
-// you can select the fields you want to keep in the structure.
-// This description can be written recursively.
-func BuildFieldQuery(fields ...FieldQueryString) (*FieldQuery, error) {
-	query, err := Marshal(fields)
-	if err != nil {
-		return nil, err
-	}
-	return FieldQueryString(query).Build()
-}
-
-// BuildSubFieldQuery builds sub field query.
-func BuildSubFieldQuery(name string) *SubFieldQuery {
-	return &SubFieldQuery{name: name}
-}
-
-type SubFieldQuery struct {
-	name string
-}
-
-func (q *SubFieldQuery) Fields(fields ...FieldQueryString) FieldQueryString {
-	query, _ := Marshal(map[string][]FieldQueryString{q.name: fields})
-	return FieldQueryString(query)
-}
diff --git a/vendor/github.com/golang-jwt/jwt/.gitignore b/vendor/github.com/golang-jwt/jwt/.gitignore
new file mode 100644
index 0000000..09573e0
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+bin
+.idea/
+
diff --git a/vendor/github.com/golang-jwt/jwt/LICENSE b/vendor/github.com/golang-jwt/jwt/LICENSE
new file mode 100644
index 0000000..35dbc25
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/LICENSE
@@ -0,0 +1,9 @@
+Copyright (c) 2012 Dave Grijalva
+Copyright (c) 2021 golang-jwt maintainers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/vendor/github.com/golang-jwt/jwt/MIGRATION_GUIDE.md b/vendor/github.com/golang-jwt/jwt/MIGRATION_GUIDE.md
new file mode 100644
index 0000000..c4efbd2
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/MIGRATION_GUIDE.md
@@ -0,0 +1,22 @@
+## Migration Guide (v3.2.1)
+
+Starting from [v3.2.1](https://github.com/golang-jwt/jwt/releases/tag/v3.2.1]), the import path has changed from `github.com/dgrijalva/jwt-go` to `github.com/golang-jwt/jwt`. Future releases will be using the `github.com/golang-jwt/jwt` import path and continue the existing versioning scheme of `v3.x.x+incompatible`. Backwards-compatible patches and fixes will be done on the `v3` release branch, where as new build-breaking features will be developed in a `v4` release, possibly including a SIV-style import path.
+
+### go.mod replacement
+
+In a first step, the easiest way is to use `go mod edit` to issue a replacement.
+
+```
+go mod edit -replace github.com/dgrijalva/jwt-go=github.com/golang-jwt/jwt@v3.2.1+incompatible
+go mod tidy
+```
+
+This will still keep the old import path in your code but replace it with the new package and also introduce a new indirect dependency to `github.com/golang-jwt/jwt`. Try to compile your project; it should still work.
+
+### Cleanup
+
+If your code still consistently builds, you can replace all occurences of `github.com/dgrijalva/jwt-go` with `github.com/golang-jwt/jwt`, either manually or by using tools such as `sed`. Finally, the `replace` directive in the `go.mod` file can be removed.
+
+## Older releases (before v3.2.0)
+
+The original migration guide for older releases can be found at https://github.com/dgrijalva/jwt-go/blob/master/MIGRATION_GUIDE.md.
\ No newline at end of file
diff --git a/vendor/github.com/golang-jwt/jwt/README.md b/vendor/github.com/golang-jwt/jwt/README.md
new file mode 100644
index 0000000..9b653e4
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/README.md
@@ -0,0 +1,113 @@
+# jwt-go
+
+[![build](https://github.com/golang-jwt/jwt/actions/workflows/build.yml/badge.svg)](https://github.com/golang-jwt/jwt/actions/workflows/build.yml)
+[![Go Reference](https://pkg.go.dev/badge/github.com/golang-jwt/jwt.svg)](https://pkg.go.dev/github.com/golang-jwt/jwt)
+
+A [go](http://www.golang.org) (or 'golang' for search engine friendliness) implementation of [JSON Web Tokens](https://datatracker.ietf.org/doc/html/rfc7519).
+
+**IMPORT PATH CHANGE:** Starting from [v3.2.1](https://github.com/golang-jwt/jwt/releases/tag/v3.2.1), the import path has changed from `github.com/dgrijalva/jwt-go` to `github.com/golang-jwt/jwt`. After the original author of the library suggested migrating the maintenance of `jwt-go`, a dedicated team of open source maintainers decided to clone the existing library into this repository. See [dgrijalva/jwt-go#462](https://github.com/dgrijalva/jwt-go/issues/462) for a detailed discussion on this topic.
+
+Future releases will be using the `github.com/golang-jwt/jwt` import path and continue the existing versioning scheme of `v3.x.x+incompatible`. Backwards-compatible patches and fixes will be done on the `v3` release branch, where as new build-breaking features will be developed in a `v4` release, possibly including a SIV-style import path.
+
+**SECURITY NOTICE:** Some older versions of Go have a security issue in the crypto/elliptic. Recommendation is to upgrade to at least 1.15 See issue [dgrijalva/jwt-go#216](https://github.com/dgrijalva/jwt-go/issues/216) for more detail.
+
+**SECURITY NOTICE:** It's important that you [validate the `alg` presented is what you expect](https://auth0.com/blog/critical-vulnerabilities-in-json-web-token-libraries/). This library attempts to make it easy to do the right thing by requiring key types match the expected alg, but you should take the extra step to verify it in your usage.  See the examples provided.
+
+### Supported Go versions
+
+Our support of Go versions is aligned with Go's [version release policy](https://golang.org/doc/devel/release#policy).
+So we will support a major version of Go until there are two newer major releases.
+We no longer support building jwt-go with unsupported Go versions, as these contain security vulnerabilities
+which will not be fixed.
+
+## What the heck is a JWT?
+
+JWT.io has [a great introduction](https://jwt.io/introduction) to JSON Web Tokens.
+
+In short, it's a signed JSON object that does something useful (for example, authentication).  It's commonly used for `Bearer` tokens in Oauth 2.  A token is made of three parts, separated by `.`'s.  The first two parts are JSON objects, that have been [base64url](https://datatracker.ietf.org/doc/html/rfc4648) encoded.  The last part is the signature, encoded the same way.
+
+The first part is called the header.  It contains the necessary information for verifying the last part, the signature.  For example, which encryption method was used for signing and what key was used.
+
+The part in the middle is the interesting bit.  It's called the Claims and contains the actual stuff you care about.  Refer to [RFC 7519](https://datatracker.ietf.org/doc/html/rfc7519) for information about reserved keys and the proper way to add your own.
+
+## What's in the box?
+
+This library supports the parsing and verification as well as the generation and signing of JWTs.  Current supported signing algorithms are HMAC SHA, RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.
+
+## Examples
+
+See [the project documentation](https://pkg.go.dev/github.com/golang-jwt/jwt) for examples of usage:
+
+* [Simple example of parsing and validating a token](https://pkg.go.dev/github.com/golang-jwt/jwt#example-Parse-Hmac)
+* [Simple example of building and signing a token](https://pkg.go.dev/github.com/golang-jwt/jwt#example-New-Hmac)
+* [Directory of Examples](https://pkg.go.dev/github.com/golang-jwt/jwt#pkg-examples)
+
+## Extensions
+
+This library publishes all the necessary components for adding your own signing methods.  Simply implement the `SigningMethod` interface and register a factory method using `RegisterSigningMethod`.  
+
+Here's an example of an extension that integrates with multiple Google Cloud Platform signing tools (AppEngine, IAM API, Cloud KMS): https://github.com/someone1/gcp-jwt-go
+
+## Compliance
+
+This library was last reviewed to comply with [RTF 7519](https://datatracker.ietf.org/doc/html/rfc7519) dated May 2015 with a few notable differences:
+
+* In order to protect against accidental use of [Unsecured JWTs](https://datatracker.ietf.org/doc/html/rfc7519#section-6), tokens using `alg=none` will only be accepted if the constant `jwt.UnsafeAllowNoneSignatureType` is provided as the key.
+
+## Project Status & Versioning
+
+This library is considered production ready.  Feedback and feature requests are appreciated.  The API should be considered stable.  There should be very few backwards-incompatible changes outside of major version updates (and only with good reason).
+
+This project uses [Semantic Versioning 2.0.0](http://semver.org).  Accepted pull requests will land on `main`.  Periodically, versions will be tagged from `main`.  You can find all the releases on [the project releases page](https://github.com/golang-jwt/jwt/releases).
+
+While we try to make it obvious when we make breaking changes, there isn't a great mechanism for pushing announcements out to users.  You may want to use this alternative package include: `gopkg.in/golang-jwt/jwt.v3`.  It will do the right thing WRT semantic versioning.
+
+**BREAKING CHANGES:*** 
+* Version 3.0.0 includes _a lot_ of changes from the 2.x line, including a few that break the API.  We've tried to break as few things as possible, so there should just be a few type signature changes.  A full list of breaking changes is available in `VERSION_HISTORY.md`.  See `MIGRATION_GUIDE.md` for more information on updating your code.
+
+## Usage Tips
+
+### Signing vs Encryption
+
+A token is simply a JSON object that is signed by its author. this tells you exactly two things about the data:
+
+* The author of the token was in the possession of the signing secret
+* The data has not been modified since it was signed
+
+It's important to know that JWT does not provide encryption, which means anyone who has access to the token can read its contents. If you need to protect (encrypt) the data, there is a companion spec, `JWE`, that provides this functionality. JWE is currently outside the scope of this library.
+
+### Choosing a Signing Method
+
+There are several signing methods available, and you should probably take the time to learn about the various options before choosing one.  The principal design decision is most likely going to be symmetric vs asymmetric.
+
+Symmetric signing methods, such as HSA, use only a single secret. This is probably the simplest signing method to use since any `[]byte` can be used as a valid secret. They are also slightly computationally faster to use, though this rarely is enough to matter. Symmetric signing methods work the best when both producers and consumers of tokens are trusted, or even the same system. Since the same secret is used to both sign and validate tokens, you can't easily distribute the key for validation.
+
+Asymmetric signing methods, such as RSA, use different keys for signing and verifying tokens. This makes it possible to produce tokens with a private key, and allow any consumer to access the public key for verification.
+
+### Signing Methods and Key Types
+
+Each signing method expects a different object type for its signing keys. See the package documentation for details. Here are the most common ones:
+
+* The [HMAC signing method](https://pkg.go.dev/github.com/golang-jwt/jwt#SigningMethodHMAC) (`HS256`,`HS384`,`HS512`) expect `[]byte` values for signing and validation
+* The [RSA signing method](https://pkg.go.dev/github.com/golang-jwt/jwt#SigningMethodRSA) (`RS256`,`RS384`,`RS512`) expect `*rsa.PrivateKey` for signing and `*rsa.PublicKey` for validation
+* The [ECDSA signing method](https://pkg.go.dev/github.com/golang-jwt/jwt#SigningMethodECDSA) (`ES256`,`ES384`,`ES512`) expect `*ecdsa.PrivateKey` for signing and `*ecdsa.PublicKey` for validation
+
+### JWT and OAuth
+
+It's worth mentioning that OAuth and JWT are not the same thing. A JWT token is simply a signed JSON object. It can be used anywhere such a thing is useful. There is some confusion, though, as JWT is the most common type of bearer token used in OAuth2 authentication.
+
+Without going too far down the rabbit hole, here's a description of the interaction of these technologies:
+
+* OAuth is a protocol for allowing an identity provider to be separate from the service a user is logging in to. For example, whenever you use Facebook to log into a different service (Yelp, Spotify, etc), you are using OAuth.
+* OAuth defines several options for passing around authentication data. One popular method is called a "bearer token". A bearer token is simply a string that _should_ only be held by an authenticated user. Thus, simply presenting this token proves your identity. You can probably derive from here why a JWT might make a good bearer token.
+* Because bearer tokens are used for authentication, it's important they're kept secret. This is why transactions that use bearer tokens typically happen over SSL.
+
+### Troubleshooting
+
+This library uses descriptive error messages whenever possible. If you are not getting the expected result, have a look at the errors. The most common place people get stuck is providing the correct type of key to the parser. See the above section on signing methods and key types.
+
+## More
+
+Documentation can be found [on pkg.go.dev](https://pkg.go.dev/github.com/golang-jwt/jwt).
+
+The command line utility included in this project (cmd/jwt) provides a straightforward example of token creation and parsing as well as a useful tool for debugging your own integration. You'll also find several implementation examples in the documentation.
diff --git a/vendor/github.com/golang-jwt/jwt/VERSION_HISTORY.md b/vendor/github.com/golang-jwt/jwt/VERSION_HISTORY.md
new file mode 100644
index 0000000..637f2ba
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/VERSION_HISTORY.md
@@ -0,0 +1,131 @@
+## `jwt-go` Version History
+
+#### 3.2.2
+
+* Starting from this release, we are adopting the policy to support the most 2 recent versions of Go currently available. By the time of this release, this is Go 1.15 and 1.16 ([#28](https://github.com/golang-jwt/jwt/pull/28)).
+* Fixed a potential issue that could occur when the verification of `exp`, `iat` or `nbf` was not required and contained invalid contents, i.e. non-numeric/date. Thanks for @thaJeztah for making us aware of that and @giorgos-f3 for originally reporting it to the formtech fork ([#40](https://github.com/golang-jwt/jwt/pull/40)).
+* Added support for EdDSA / ED25519 ([#36](https://github.com/golang-jwt/jwt/pull/36)).
+* Optimized allocations ([#33](https://github.com/golang-jwt/jwt/pull/33)).
+
+#### 3.2.1
+
+* **Import Path Change**: See MIGRATION_GUIDE.md for tips on updating your code
+	* Changed the import path from `github.com/dgrijalva/jwt-go` to `github.com/golang-jwt/jwt`
+* Fixed type confusing issue between `string` and `[]string` in `VerifyAudience` ([#12](https://github.com/golang-jwt/jwt/pull/12)). This fixes CVE-2020-26160 
+
+#### 3.2.0
+
+* Added method `ParseUnverified` to allow users to split up the tasks of parsing and validation
+* HMAC signing method returns `ErrInvalidKeyType` instead of `ErrInvalidKey` where appropriate
+* Added options to `request.ParseFromRequest`, which allows for an arbitrary list of modifiers to parsing behavior. Initial set include `WithClaims` and `WithParser`. Existing usage of this function will continue to work as before.
+* Deprecated `ParseFromRequestWithClaims` to simplify API in the future.
+
+#### 3.1.0
+
+* Improvements to `jwt` command line tool
+* Added `SkipClaimsValidation` option to `Parser`
+* Documentation updates
+
+#### 3.0.0
+
+* **Compatibility Breaking Changes**: See MIGRATION_GUIDE.md for tips on updating your code
+	* Dropped support for `[]byte` keys when using RSA signing methods.  This convenience feature could contribute to security vulnerabilities involving mismatched key types with signing methods.
+	* `ParseFromRequest` has been moved to `request` subpackage and usage has changed
+	* The `Claims` property on `Token` is now type `Claims` instead of `map[string]interface{}`.  The default value is type `MapClaims`, which is an alias to `map[string]interface{}`.  This makes it possible to use a custom type when decoding claims.
+* Other Additions and Changes
+	* Added `Claims` interface type to allow users to decode the claims into a custom type
+	* Added `ParseWithClaims`, which takes a third argument of type `Claims`.  Use this function instead of `Parse` if you have a custom type you'd like to decode into.
+	* Dramatically improved the functionality and flexibility of `ParseFromRequest`, which is now in the `request` subpackage
+	* Added `ParseFromRequestWithClaims` which is the `FromRequest` equivalent of `ParseWithClaims`
+	* Added new interface type `Extractor`, which is used for extracting JWT strings from http requests.  Used with `ParseFromRequest` and `ParseFromRequestWithClaims`.
+	* Added several new, more specific, validation errors to error type bitmask
+	* Moved examples from README to executable example files
+	* Signing method registry is now thread safe
+	* Added new property to `ValidationError`, which contains the raw error returned by calls made by parse/verify (such as those returned by keyfunc or json parser)
+
+#### 2.7.0
+
+This will likely be the last backwards compatible release before 3.0.0, excluding essential bug fixes.
+
+* Added new option `-show` to the `jwt` command that will just output the decoded token without verifying
+* Error text for expired tokens includes how long it's been expired
+* Fixed incorrect error returned from `ParseRSAPublicKeyFromPEM`
+* Documentation updates
+
+#### 2.6.0
+
+* Exposed inner error within ValidationError
+* Fixed validation errors when using UseJSONNumber flag
+* Added several unit tests
+
+#### 2.5.0
+
+* Added support for signing method none.  You shouldn't use this.  The API tries to make this clear.
+* Updated/fixed some documentation
+* Added more helpful error message when trying to parse tokens that begin with `BEARER `
+
+#### 2.4.0
+
+* Added new type, Parser, to allow for configuration of various parsing parameters
+	* You can now specify a list of valid signing methods.  Anything outside this set will be rejected.
+	* You can now opt to use the `json.Number` type instead of `float64` when parsing token JSON
+* Added support for [Travis CI](https://travis-ci.org/dgrijalva/jwt-go)
+* Fixed some bugs with ECDSA parsing
+
+#### 2.3.0
+
+* Added support for ECDSA signing methods
+* Added support for RSA PSS signing methods (requires go v1.4)
+
+#### 2.2.0
+
+* Gracefully handle a `nil` `Keyfunc` being passed to `Parse`.  Result will now be the parsed token and an error, instead of a panic.
+
+#### 2.1.0
+
+Backwards compatible API change that was missed in 2.0.0.
+
+* The `SignedString` method on `Token` now takes `interface{}` instead of `[]byte`
+
+#### 2.0.0
+
+There were two major reasons for breaking backwards compatibility with this update.  The first was a refactor required to expand the width of the RSA and HMAC-SHA signing implementations.  There will likely be no required code changes to support this change.
+
+The second update, while unfortunately requiring a small change in integration, is required to open up this library to other signing methods.  Not all keys used for all signing methods have a single standard on-disk representation.  Requiring `[]byte` as the type for all keys proved too limiting.  Additionally, this implementation allows for pre-parsed tokens to be reused, which might matter in an application that parses a high volume of tokens with a small set of keys.  Backwards compatibilty has been maintained for passing `[]byte` to the RSA signing methods, but they will also accept `*rsa.PublicKey` and `*rsa.PrivateKey`.
+
+It is likely the only integration change required here will be to change `func(t *jwt.Token) ([]byte, error)` to `func(t *jwt.Token) (interface{}, error)` when calling `Parse`.
+
+* **Compatibility Breaking Changes**
+	* `SigningMethodHS256` is now `*SigningMethodHMAC` instead of `type struct`
+	* `SigningMethodRS256` is now `*SigningMethodRSA` instead of `type struct`
+	* `KeyFunc` now returns `interface{}` instead of `[]byte`
+	* `SigningMethod.Sign` now takes `interface{}` instead of `[]byte` for the key
+	* `SigningMethod.Verify` now takes `interface{}` instead of `[]byte` for the key
+* Renamed type `SigningMethodHS256` to `SigningMethodHMAC`.  Specific sizes are now just instances of this type.
+    * Added public package global `SigningMethodHS256`
+    * Added public package global `SigningMethodHS384`
+    * Added public package global `SigningMethodHS512`
+* Renamed type `SigningMethodRS256` to `SigningMethodRSA`.  Specific sizes are now just instances of this type.
+    * Added public package global `SigningMethodRS256`
+    * Added public package global `SigningMethodRS384`
+    * Added public package global `SigningMethodRS512`
+* Moved sample private key for HMAC tests from an inline value to a file on disk.  Value is unchanged.
+* Refactored the RSA implementation to be easier to read
+* Exposed helper methods `ParseRSAPrivateKeyFromPEM` and `ParseRSAPublicKeyFromPEM`
+
+#### 1.0.2
+
+* Fixed bug in parsing public keys from certificates
+* Added more tests around the parsing of keys for RS256
+* Code refactoring in RS256 implementation.  No functional changes
+
+#### 1.0.1
+
+* Fixed panic if RS256 signing method was passed an invalid key
+
+#### 1.0.0
+
+* First versioned release
+* API stabilized
+* Supports creating, signing, parsing, and validating JWT tokens
+* Supports RS256 and HS256 signing methods
diff --git a/vendor/github.com/golang-jwt/jwt/claims.go b/vendor/github.com/golang-jwt/jwt/claims.go
new file mode 100644
index 0000000..f1dba3c
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/claims.go
@@ -0,0 +1,146 @@
+package jwt
+
+import (
+	"crypto/subtle"
+	"fmt"
+	"time"
+)
+
+// For a type to be a Claims object, it must just have a Valid method that determines
+// if the token is invalid for any supported reason
+type Claims interface {
+	Valid() error
+}
+
+// Structured version of Claims Section, as referenced at
+// https://tools.ietf.org/html/rfc7519#section-4.1
+// See examples for how to use this with your own claim types
+type StandardClaims struct {
+	Audience  string `json:"aud,omitempty"`
+	ExpiresAt int64  `json:"exp,omitempty"`
+	Id        string `json:"jti,omitempty"`
+	IssuedAt  int64  `json:"iat,omitempty"`
+	Issuer    string `json:"iss,omitempty"`
+	NotBefore int64  `json:"nbf,omitempty"`
+	Subject   string `json:"sub,omitempty"`
+}
+
+// Validates time based claims "exp, iat, nbf".
+// There is no accounting for clock skew.
+// As well, if any of the above claims are not in the token, it will still
+// be considered a valid claim.
+func (c StandardClaims) Valid() error {
+	vErr := new(ValidationError)
+	now := TimeFunc().Unix()
+
+	// The claims below are optional, by default, so if they are set to the
+	// default value in Go, let's not fail the verification for them.
+	if !c.VerifyExpiresAt(now, false) {
+		delta := time.Unix(now, 0).Sub(time.Unix(c.ExpiresAt, 0))
+		vErr.Inner = fmt.Errorf("token is expired by %v", delta)
+		vErr.Errors |= ValidationErrorExpired
+	}
+
+	if !c.VerifyIssuedAt(now, false) {
+		vErr.Inner = fmt.Errorf("Token used before issued")
+		vErr.Errors |= ValidationErrorIssuedAt
+	}
+
+	if !c.VerifyNotBefore(now, false) {
+		vErr.Inner = fmt.Errorf("token is not valid yet")
+		vErr.Errors |= ValidationErrorNotValidYet
+	}
+
+	if vErr.valid() {
+		return nil
+	}
+
+	return vErr
+}
+
+// Compares the aud claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (c *StandardClaims) VerifyAudience(cmp string, req bool) bool {
+	return verifyAud([]string{c.Audience}, cmp, req)
+}
+
+// Compares the exp claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (c *StandardClaims) VerifyExpiresAt(cmp int64, req bool) bool {
+	return verifyExp(c.ExpiresAt, cmp, req)
+}
+
+// Compares the iat claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (c *StandardClaims) VerifyIssuedAt(cmp int64, req bool) bool {
+	return verifyIat(c.IssuedAt, cmp, req)
+}
+
+// Compares the iss claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (c *StandardClaims) VerifyIssuer(cmp string, req bool) bool {
+	return verifyIss(c.Issuer, cmp, req)
+}
+
+// Compares the nbf claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (c *StandardClaims) VerifyNotBefore(cmp int64, req bool) bool {
+	return verifyNbf(c.NotBefore, cmp, req)
+}
+
+// ----- helpers
+
+func verifyAud(aud []string, cmp string, required bool) bool {
+	if len(aud) == 0 {
+		return !required
+	}
+	// use a var here to keep constant time compare when looping over a number of claims
+	result := false
+
+	var stringClaims string
+	for _, a := range aud {
+		if subtle.ConstantTimeCompare([]byte(a), []byte(cmp)) != 0 {
+			result = true
+		}
+		stringClaims = stringClaims + a
+	}
+
+	// case where "" is sent in one or many aud claims
+	if len(stringClaims) == 0 {
+		return !required
+	}
+
+	return result
+}
+
+func verifyExp(exp int64, now int64, required bool) bool {
+	if exp == 0 {
+		return !required
+	}
+	return now <= exp
+}
+
+func verifyIat(iat int64, now int64, required bool) bool {
+	if iat == 0 {
+		return !required
+	}
+	return now >= iat
+}
+
+func verifyIss(iss string, cmp string, required bool) bool {
+	if iss == "" {
+		return !required
+	}
+	if subtle.ConstantTimeCompare([]byte(iss), []byte(cmp)) != 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+func verifyNbf(nbf int64, now int64, required bool) bool {
+	if nbf == 0 {
+		return !required
+	}
+	return now >= nbf
+}
diff --git a/vendor/github.com/golang-jwt/jwt/doc.go b/vendor/github.com/golang-jwt/jwt/doc.go
new file mode 100644
index 0000000..a86dc1a
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/doc.go
@@ -0,0 +1,4 @@
+// Package jwt is a Go implementation of JSON Web Tokens: http://self-issued.info/docs/draft-jones-json-web-token.html
+//
+// See README.md for more info.
+package jwt
diff --git a/vendor/github.com/golang-jwt/jwt/ecdsa.go b/vendor/github.com/golang-jwt/jwt/ecdsa.go
new file mode 100644
index 0000000..15e2343
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/ecdsa.go
@@ -0,0 +1,142 @@
+package jwt
+
+import (
+	"crypto"
+	"crypto/ecdsa"
+	"crypto/rand"
+	"errors"
+	"math/big"
+)
+
+var (
+	// Sadly this is missing from crypto/ecdsa compared to crypto/rsa
+	ErrECDSAVerification = errors.New("crypto/ecdsa: verification error")
+)
+
+// Implements the ECDSA family of signing methods signing methods
+// Expects *ecdsa.PrivateKey for signing and *ecdsa.PublicKey for verification
+type SigningMethodECDSA struct {
+	Name      string
+	Hash      crypto.Hash
+	KeySize   int
+	CurveBits int
+}
+
+// Specific instances for EC256 and company
+var (
+	SigningMethodES256 *SigningMethodECDSA
+	SigningMethodES384 *SigningMethodECDSA
+	SigningMethodES512 *SigningMethodECDSA
+)
+
+func init() {
+	// ES256
+	SigningMethodES256 = &SigningMethodECDSA{"ES256", crypto.SHA256, 32, 256}
+	RegisterSigningMethod(SigningMethodES256.Alg(), func() SigningMethod {
+		return SigningMethodES256
+	})
+
+	// ES384
+	SigningMethodES384 = &SigningMethodECDSA{"ES384", crypto.SHA384, 48, 384}
+	RegisterSigningMethod(SigningMethodES384.Alg(), func() SigningMethod {
+		return SigningMethodES384
+	})
+
+	// ES512
+	SigningMethodES512 = &SigningMethodECDSA{"ES512", crypto.SHA512, 66, 521}
+	RegisterSigningMethod(SigningMethodES512.Alg(), func() SigningMethod {
+		return SigningMethodES512
+	})
+}
+
+func (m *SigningMethodECDSA) Alg() string {
+	return m.Name
+}
+
+// Implements the Verify method from SigningMethod
+// For this verify method, key must be an ecdsa.PublicKey struct
+func (m *SigningMethodECDSA) Verify(signingString, signature string, key interface{}) error {
+	var err error
+
+	// Decode the signature
+	var sig []byte
+	if sig, err = DecodeSegment(signature); err != nil {
+		return err
+	}
+
+	// Get the key
+	var ecdsaKey *ecdsa.PublicKey
+	switch k := key.(type) {
+	case *ecdsa.PublicKey:
+		ecdsaKey = k
+	default:
+		return ErrInvalidKeyType
+	}
+
+	if len(sig) != 2*m.KeySize {
+		return ErrECDSAVerification
+	}
+
+	r := big.NewInt(0).SetBytes(sig[:m.KeySize])
+	s := big.NewInt(0).SetBytes(sig[m.KeySize:])
+
+	// Create hasher
+	if !m.Hash.Available() {
+		return ErrHashUnavailable
+	}
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	// Verify the signature
+	if verifystatus := ecdsa.Verify(ecdsaKey, hasher.Sum(nil), r, s); verifystatus {
+		return nil
+	}
+
+	return ErrECDSAVerification
+}
+
+// Implements the Sign method from SigningMethod
+// For this signing method, key must be an ecdsa.PrivateKey struct
+func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) (string, error) {
+	// Get the key
+	var ecdsaKey *ecdsa.PrivateKey
+	switch k := key.(type) {
+	case *ecdsa.PrivateKey:
+		ecdsaKey = k
+	default:
+		return "", ErrInvalidKeyType
+	}
+
+	// Create the hasher
+	if !m.Hash.Available() {
+		return "", ErrHashUnavailable
+	}
+
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	// Sign the string and return r, s
+	if r, s, err := ecdsa.Sign(rand.Reader, ecdsaKey, hasher.Sum(nil)); err == nil {
+		curveBits := ecdsaKey.Curve.Params().BitSize
+
+		if m.CurveBits != curveBits {
+			return "", ErrInvalidKey
+		}
+
+		keyBytes := curveBits / 8
+		if curveBits%8 > 0 {
+			keyBytes += 1
+		}
+
+		// We serialize the outputs (r and s) into big-endian byte arrays
+		// padded with zeros on the left to make sure the sizes work out.
+		// Output must be 2*keyBytes long.
+		out := make([]byte, 2*keyBytes)
+		r.FillBytes(out[0:keyBytes]) // r is assigned to the first half of output.
+		s.FillBytes(out[keyBytes:])  // s is assigned to the second half of output.
+
+		return EncodeSegment(out), nil
+	} else {
+		return "", err
+	}
+}
diff --git a/vendor/github.com/golang-jwt/jwt/ecdsa_utils.go b/vendor/github.com/golang-jwt/jwt/ecdsa_utils.go
new file mode 100644
index 0000000..db9f4be
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/ecdsa_utils.go
@@ -0,0 +1,69 @@
+package jwt
+
+import (
+	"crypto/ecdsa"
+	"crypto/x509"
+	"encoding/pem"
+	"errors"
+)
+
+var (
+	ErrNotECPublicKey  = errors.New("Key is not a valid ECDSA public key")
+	ErrNotECPrivateKey = errors.New("Key is not a valid ECDSA private key")
+)
+
+// Parse PEM encoded Elliptic Curve Private Key Structure
+func ParseECPrivateKeyFromPEM(key []byte) (*ecdsa.PrivateKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	// Parse the key
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParseECPrivateKey(block.Bytes); err != nil {
+		if parsedKey, err = x509.ParsePKCS8PrivateKey(block.Bytes); err != nil {
+			return nil, err
+		}
+	}
+
+	var pkey *ecdsa.PrivateKey
+	var ok bool
+	if pkey, ok = parsedKey.(*ecdsa.PrivateKey); !ok {
+		return nil, ErrNotECPrivateKey
+	}
+
+	return pkey, nil
+}
+
+// Parse PEM encoded PKCS1 or PKCS8 public key
+func ParseECPublicKeyFromPEM(key []byte) (*ecdsa.PublicKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	// Parse the key
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+		if cert, err := x509.ParseCertificate(block.Bytes); err == nil {
+			parsedKey = cert.PublicKey
+		} else {
+			return nil, err
+		}
+	}
+
+	var pkey *ecdsa.PublicKey
+	var ok bool
+	if pkey, ok = parsedKey.(*ecdsa.PublicKey); !ok {
+		return nil, ErrNotECPublicKey
+	}
+
+	return pkey, nil
+}
diff --git a/vendor/github.com/golang-jwt/jwt/ed25519.go b/vendor/github.com/golang-jwt/jwt/ed25519.go
new file mode 100644
index 0000000..a2f8ddb
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/ed25519.go
@@ -0,0 +1,81 @@
+package jwt
+
+import (
+	"errors"
+
+	"crypto/ed25519"
+)
+
+var (
+	ErrEd25519Verification = errors.New("ed25519: verification error")
+)
+
+// Implements the EdDSA family
+// Expects ed25519.PrivateKey for signing and ed25519.PublicKey for verification
+type SigningMethodEd25519 struct{}
+
+// Specific instance for EdDSA
+var (
+	SigningMethodEdDSA *SigningMethodEd25519
+)
+
+func init() {
+	SigningMethodEdDSA = &SigningMethodEd25519{}
+	RegisterSigningMethod(SigningMethodEdDSA.Alg(), func() SigningMethod {
+		return SigningMethodEdDSA
+	})
+}
+
+func (m *SigningMethodEd25519) Alg() string {
+	return "EdDSA"
+}
+
+// Implements the Verify method from SigningMethod
+// For this verify method, key must be an ed25519.PublicKey
+func (m *SigningMethodEd25519) Verify(signingString, signature string, key interface{}) error {
+	var err error
+	var ed25519Key ed25519.PublicKey
+	var ok bool
+
+	if ed25519Key, ok = key.(ed25519.PublicKey); !ok {
+		return ErrInvalidKeyType
+	}
+
+	if len(ed25519Key) != ed25519.PublicKeySize {
+		return ErrInvalidKey
+	}
+
+	// Decode the signature
+	var sig []byte
+	if sig, err = DecodeSegment(signature); err != nil {
+		return err
+	}
+
+	// Verify the signature
+	if !ed25519.Verify(ed25519Key, []byte(signingString), sig) {
+		return ErrEd25519Verification
+	}
+
+	return nil
+}
+
+// Implements the Sign method from SigningMethod
+// For this signing method, key must be an ed25519.PrivateKey
+func (m *SigningMethodEd25519) Sign(signingString string, key interface{}) (string, error) {
+	var ed25519Key ed25519.PrivateKey
+	var ok bool
+
+	if ed25519Key, ok = key.(ed25519.PrivateKey); !ok {
+		return "", ErrInvalidKeyType
+	}
+
+	// ed25519.Sign panics if private key not equal to ed25519.PrivateKeySize
+	// this allows to avoid recover usage
+	if len(ed25519Key) != ed25519.PrivateKeySize {
+		return "", ErrInvalidKey
+	}
+
+	// Sign the string and return the encoded result
+	sig := ed25519.Sign(ed25519Key, []byte(signingString))
+	return EncodeSegment(sig), nil
+}
diff --git a/vendor/github.com/golang-jwt/jwt/ed25519_utils.go b/vendor/github.com/golang-jwt/jwt/ed25519_utils.go
new file mode 100644
index 0000000..c635727
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/ed25519_utils.go
@@ -0,0 +1,64 @@
+package jwt
+
+import (
+	"crypto"
+	"crypto/ed25519"
+	"crypto/x509"
+	"encoding/pem"
+	"errors"
+)
+
+var (
+	ErrNotEdPrivateKey = errors.New("Key is not a valid Ed25519 private key")
+	ErrNotEdPublicKey  = errors.New("Key is not a valid Ed25519 public key")
+)
+
+// Parse PEM-encoded Edwards curve private key
+func ParseEdPrivateKeyFromPEM(key []byte) (crypto.PrivateKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	// Parse the key
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParsePKCS8PrivateKey(block.Bytes); err != nil {
+		return nil, err
+	}
+
+	var pkey ed25519.PrivateKey
+	var ok bool
+	if pkey, ok = parsedKey.(ed25519.PrivateKey); !ok {
+		return nil, ErrNotEdPrivateKey
+	}
+
+	return pkey, nil
+}
+
+// Parse PEM-encoded Edwards curve public key
+func ParseEdPublicKeyFromPEM(key []byte) (crypto.PublicKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	// Parse the key
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+		return nil, err
+	}
+
+	var pkey ed25519.PublicKey
+	var ok bool
+	if pkey, ok = parsedKey.(ed25519.PublicKey); !ok {
+		return nil, ErrNotEdPublicKey
+	}
+
+	return pkey, nil
+}
diff --git a/vendor/github.com/golang-jwt/jwt/errors.go b/vendor/github.com/golang-jwt/jwt/errors.go
new file mode 100644
index 0000000..1c93024
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/errors.go
@@ -0,0 +1,59 @@
+package jwt
+
+import (
+	"errors"
+)
+
+// Error constants
+var (
+	ErrInvalidKey      = errors.New("key is invalid")
+	ErrInvalidKeyType  = errors.New("key is of invalid type")
+	ErrHashUnavailable = errors.New("the requested hash function is unavailable")
+)
+
+// The errors that might occur when parsing and validating a token
+const (
+	ValidationErrorMalformed        uint32 = 1 << iota // Token is malformed
+	ValidationErrorUnverifiable                        // Token could not be verified because of signing problems
+	ValidationErrorSignatureInvalid                    // Signature validation failed
+
+	// Standard Claim validation errors
+	ValidationErrorAudience      // AUD validation failed
+	ValidationErrorExpired       // EXP validation failed
+	ValidationErrorIssuedAt      // IAT validation failed
+	ValidationErrorIssuer        // ISS validation failed
+	ValidationErrorNotValidYet   // NBF validation failed
+	ValidationErrorId            // JTI validation failed
+	ValidationErrorClaimsInvalid // Generic claims validation error
+)
+
+// Helper for constructing a ValidationError with a string error message
+func NewValidationError(errorText string, errorFlags uint32) *ValidationError {
+	return &ValidationError{
+		text:   errorText,
+		Errors: errorFlags,
+	}
+}
+
+// The error from Parse if token is not valid
+type ValidationError struct {
+	Inner  error  // stores the error returned by external dependencies, i.e.: KeyFunc
+	Errors uint32 // bitfield.  see ValidationError... constants
+	text   string // errors that do not have a valid error just have text
+}
+
+// Validation error is an error type
+func (e ValidationError) Error() string {
+	if e.Inner != nil {
+		return e.Inner.Error()
+	} else if e.text != "" {
+		return e.text
+	} else {
+		return "token is invalid"
+	}
+}
+
+// No errors
+func (e *ValidationError) valid() bool {
+	return e.Errors == 0
+}
diff --git a/vendor/github.com/golang-jwt/jwt/hmac.go b/vendor/github.com/golang-jwt/jwt/hmac.go
new file mode 100644
index 0000000..addbe5d
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/hmac.go
@@ -0,0 +1,95 @@
+package jwt
+
+import (
+	"crypto"
+	"crypto/hmac"
+	"errors"
+)
+
+// Implements the HMAC-SHA family of signing methods signing methods
+// Expects key type of []byte for both signing and validation
+type SigningMethodHMAC struct {
+	Name string
+	Hash crypto.Hash
+}
+
+// Specific instances for HS256 and company
+var (
+	SigningMethodHS256  *SigningMethodHMAC
+	SigningMethodHS384  *SigningMethodHMAC
+	SigningMethodHS512  *SigningMethodHMAC
+	ErrSignatureInvalid = errors.New("signature is invalid")
+)
+
+func init() {
+	// HS256
+	SigningMethodHS256 = &SigningMethodHMAC{"HS256", crypto.SHA256}
+	RegisterSigningMethod(SigningMethodHS256.Alg(), func() SigningMethod {
+		return SigningMethodHS256
+	})
+
+	// HS384
+	SigningMethodHS384 = &SigningMethodHMAC{"HS384", crypto.SHA384}
+	RegisterSigningMethod(SigningMethodHS384.Alg(), func() SigningMethod {
+		return SigningMethodHS384
+	})
+
+	// HS512
+	SigningMethodHS512 = &SigningMethodHMAC{"HS512", crypto.SHA512}
+	RegisterSigningMethod(SigningMethodHS512.Alg(), func() SigningMethod {
+		return SigningMethodHS512
+	})
+}
+
+func (m *SigningMethodHMAC) Alg() string {
+	return m.Name
+}
+
+// Verify the signature of HSXXX tokens.  Returns nil if the signature is valid.
+func (m *SigningMethodHMAC) Verify(signingString, signature string, key interface{}) error {
+	// Verify the key is the right type
+	keyBytes, ok := key.([]byte)
+	if !ok {
+		return ErrInvalidKeyType
+	}
+
+	// Decode signature, for comparison
+	sig, err := DecodeSegment(signature)
+	if err != nil {
+		return err
+	}
+
+	// Can we use the specified hashing method?
+	if !m.Hash.Available() {
+		return ErrHashUnavailable
+	}
+
+	// This signing method is symmetric, so we validate the signature
+	// by reproducing the signature from the signing string and key, then
+	// comparing that against the provided signature.
+	hasher := hmac.New(m.Hash.New, keyBytes)
+	hasher.Write([]byte(signingString))
+	if !hmac.Equal(sig, hasher.Sum(nil)) {
+		return ErrSignatureInvalid
+	}
+
+	// No validation errors.  Signature is good.
+	return nil
+}
+
+// Implements the Sign method from SigningMethod for this signing method.
+// Key must be []byte
+func (m *SigningMethodHMAC) Sign(signingString string, key interface{}) (string, error) {
+	if keyBytes, ok := key.([]byte); ok {
+		if !m.Hash.Available() {
+			return "", ErrHashUnavailable
+		}
+
+		hasher := hmac.New(m.Hash.New, keyBytes)
+		hasher.Write([]byte(signingString))
+
+		return EncodeSegment(hasher.Sum(nil)), nil
+	}
+
+	return "", ErrInvalidKeyType
+}
diff --git a/vendor/github.com/golang-jwt/jwt/map_claims.go b/vendor/github.com/golang-jwt/jwt/map_claims.go
new file mode 100644
index 0000000..72c79f9
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/map_claims.go
@@ -0,0 +1,120 @@
+package jwt
+
+import (
+	"encoding/json"
+	"errors"
+	// "fmt"
+)
+
+// Claims type that uses the map[string]interface{} for JSON decoding
+// This is the default claims type if you don't supply one
+type MapClaims map[string]interface{}
+
+// VerifyAudience Compares the aud claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (m MapClaims) VerifyAudience(cmp string, req bool) bool {
+	var aud []string
+	switch v := m["aud"].(type) {
+	case string:
+		aud = append(aud, v)
+	case []string:
+		aud = v
+	case []interface{}:
+		for _, a := range v {
+			vs, ok := a.(string)
+			if !ok {
+				return false
+			}
+			aud = append(aud, vs)
+		}
+	}
+	return verifyAud(aud, cmp, req)
+}
+
+// Compares the exp claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (m MapClaims) VerifyExpiresAt(cmp int64, req bool) bool {
+	exp, ok := m["exp"]
+	if !ok {
+		return !req
+	}
+	switch expType := exp.(type) {
+	case float64:
+		return verifyExp(int64(expType), cmp, req)
+	case json.Number:
+		v, _ := expType.Int64()
+		return verifyExp(v, cmp, req)
+	}
+	return false
+}
+
+// Compares the iat claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (m MapClaims) VerifyIssuedAt(cmp int64, req bool) bool {
+	iat, ok := m["iat"]
+	if !ok {
+		return !req
+	}
+	switch iatType := iat.(type) {
+	case float64:
+		return verifyIat(int64(iatType), cmp, req)
+	case json.Number:
+		v, _ := iatType.Int64()
+		return verifyIat(v, cmp, req)
+	}
+	return false
+}
+
+// Compares the iss claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (m MapClaims) VerifyIssuer(cmp string, req bool) bool {
+	iss, _ := m["iss"].(string)
+	return verifyIss(iss, cmp, req)
+}
+
+// Compares the nbf claim against cmp.
+// If required is false, this method will return true if the value matches or is unset
+func (m MapClaims) VerifyNotBefore(cmp int64, req bool) bool {
+	nbf, ok := m["nbf"]
+	if !ok {
+		return !req
+	}
+	switch nbfType := nbf.(type) {
+	case float64:
+		return verifyNbf(int64(nbfType), cmp, req)
+	case json.Number:
+		v, _ := nbfType.Int64()
+		return verifyNbf(v, cmp, req)
+	}
+	return false
+}
+
+// Validates time based claims "exp, iat, nbf".
+// There is no accounting for clock skew.
+// As well, if any of the above claims are not in the token, it will still
+// be considered a valid claim.
+func (m MapClaims) Valid() error {
+	vErr := new(ValidationError)
+	now := TimeFunc().Unix()
+
+	if !m.VerifyExpiresAt(now, false) {
+		vErr.Inner = errors.New("Token is expired")
+		vErr.Errors |= ValidationErrorExpired
+	}
+
+	if !m.VerifyIssuedAt(now, false) {
+		vErr.Inner = errors.New("Token used before issued")
+		vErr.Errors |= ValidationErrorIssuedAt
+	}
+
+	if !m.VerifyNotBefore(now, false) {
+		vErr.Inner = errors.New("Token is not valid yet")
+		vErr.Errors |= ValidationErrorNotValidYet
+	}
+
+	if vErr.valid() {
+		return nil
+	}
+
+	return vErr
+}
diff --git a/vendor/github.com/golang-jwt/jwt/none.go b/vendor/github.com/golang-jwt/jwt/none.go
new file mode 100644
index 0000000..f04d189
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/none.go
@@ -0,0 +1,52 @@
+package jwt
+
+// Implements the none signing method.  This is required by the spec
+// but you probably should never use it.
+var SigningMethodNone *signingMethodNone
+
+const UnsafeAllowNoneSignatureType unsafeNoneMagicConstant = "none signing method allowed"
+
+var NoneSignatureTypeDisallowedError error
+
+type signingMethodNone struct{}
+type unsafeNoneMagicConstant string
+
+func init() {
+	SigningMethodNone = &signingMethodNone{}
+	NoneSignatureTypeDisallowedError = NewValidationError("'none' signature type is not allowed", ValidationErrorSignatureInvalid)
+
+	RegisterSigningMethod(SigningMethodNone.Alg(), func() SigningMethod {
+		return SigningMethodNone
+	})
+}
+
+func (m *signingMethodNone) Alg() string {
+	return "none"
+}
+
+// Only allow 'none' alg type if UnsafeAllowNoneSignatureType is specified as the key
+func (m *signingMethodNone) Verify(signingString, signature string, key interface{}) (err error) {
+	// Key must be UnsafeAllowNoneSignatureType to prevent accidentally
+	// accepting 'none' signing method
+	if _, ok := key.(unsafeNoneMagicConstant); !ok {
+		return NoneSignatureTypeDisallowedError
+	}
+	// If signing method is none, signature must be an empty string
+	if signature != "" {
+		return NewValidationError(
+			"'none' signing method with non-empty signature",
+			ValidationErrorSignatureInvalid,
+		)
+	}
+
+	// Accept 'none' signing method.
+	return nil
+}
+
+// Only allow 'none' signing if UnsafeAllowNoneSignatureType is specified as the key
+func (m *signingMethodNone) Sign(signingString string, key interface{}) (string, error) {
+	if _, ok := key.(unsafeNoneMagicConstant); ok {
+		return "", nil
+	}
+	return "", NoneSignatureTypeDisallowedError
+}
diff --git a/vendor/github.com/golang-jwt/jwt/parser.go b/vendor/github.com/golang-jwt/jwt/parser.go
new file mode 100644
index 0000000..d6901d9
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/parser.go
@@ -0,0 +1,148 @@
+package jwt
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+type Parser struct {
+	ValidMethods         []string // If populated, only these methods will be considered valid
+	UseJSONNumber        bool     // Use JSON Number format in JSON decoder
+	SkipClaimsValidation bool     // Skip claims validation during token parsing
+}
+
+// Parse, validate, and return a token.
+// keyFunc will receive the parsed token and should return the key for validating.
+// If everything is kosher, err will be nil
+func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) {
+	return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc)
+}
+
+func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) {
+	token, parts, err := p.ParseUnverified(tokenString, claims)
+	if err != nil {
+		return token, err
+	}
+
+	// Verify signing method is in the required set
+	if p.ValidMethods != nil {
+		var signingMethodValid = false
+		var alg = token.Method.Alg()
+		for _, m := range p.ValidMethods {
+			if m == alg {
+				signingMethodValid = true
+				break
+			}
+		}
+		if !signingMethodValid {
+			// signing method is not in the listed set
+			return token, NewValidationError(fmt.Sprintf("signing method %v is invalid", alg), ValidationErrorSignatureInvalid)
+		}
+	}
+
+	// Lookup key
+	var key interface{}
+	if keyFunc == nil {
+		// keyFunc was not provided.  short circuiting validation
+		return token, NewValidationError("no Keyfunc was provided.", ValidationErrorUnverifiable)
+	}
+	if key, err = keyFunc(token); err != nil {
+		// keyFunc returned an error
+		if ve, ok := err.(*ValidationError); ok {
+			return token, ve
+		}
+		return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable}
+	}
+
+	vErr := &ValidationError{}
+
+	// Validate Claims
+	if !p.SkipClaimsValidation {
+		if err := token.Claims.Valid(); err != nil {
+
+			// If the Claims Valid returned an error, check if it is a validation error,
+			// If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set
+			if e, ok := err.(*ValidationError); !ok {
+				vErr = &ValidationError{Inner: err, Errors: ValidationErrorClaimsInvalid}
+			} else {
+				vErr = e
+			}
+		}
+	}
+
+	// Perform validation
+	token.Signature = parts[2]
+	if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil {
+		vErr.Inner = err
+		vErr.Errors |= ValidationErrorSignatureInvalid
+	}
+
+	if vErr.valid() {
+		token.Valid = true
+		return token, nil
+	}
+
+	return token, vErr
+}
+
+// WARNING: Don't use this method unless you know what you're doing
+//
+// This method parses the token but doesn't validate the signature. It's only
+// ever useful in cases where you know the signature is valid (because it has
+// been checked previously in the stack) and you want to extract values from
+// it.
+func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) {
+	parts = strings.Split(tokenString, ".")
+	if len(parts) != 3 {
+		return nil, parts, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed)
+	}
+
+	token = &Token{Raw: tokenString}
+
+	// parse Header
+	var headerBytes []byte
+	if headerBytes, err = DecodeSegment(parts[0]); err != nil {
+		if strings.HasPrefix(strings.ToLower(tokenString), "bearer ") {
+			return token, parts, NewValidationError("tokenstring should not contain 'bearer '", ValidationErrorMalformed)
+		}
+		return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed}
+	}
+	if err = json.Unmarshal(headerBytes, &token.Header); err != nil {
+		return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed}
+	}
+
+	// parse Claims
+	var claimBytes []byte
+	token.Claims = claims
+
+	if claimBytes, err = DecodeSegment(parts[1]); err != nil {
+		return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed}
+	}
+	dec := json.NewDecoder(bytes.NewBuffer(claimBytes))
+	if p.UseJSONNumber {
+		dec.UseNumber()
+	}
+	// JSON Decode.  Special case for map type to avoid weird pointer behavior
+	if c, ok := token.Claims.(MapClaims); ok {
+		err = dec.Decode(&c)
+	} else {
+		err = dec.Decode(&claims)
+	}
+	// Handle decode error
+	if err != nil {
+		return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed}
+	}
+
+	// Lookup signature method
+	if method, ok := token.Header["alg"].(string); ok {
+		if token.Method = GetSigningMethod(method); token.Method == nil {
+			return token, parts, NewValidationError("signing method (alg) is unavailable.", ValidationErrorUnverifiable)
+		}
+	} else {
+		return token, parts, NewValidationError("signing method (alg) is unspecified.", ValidationErrorUnverifiable)
+	}
+
+	return token, parts, nil
+}
diff --git a/vendor/github.com/golang-jwt/jwt/rsa.go b/vendor/github.com/golang-jwt/jwt/rsa.go
new file mode 100644
index 0000000..e4caf1c
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/rsa.go
@@ -0,0 +1,101 @@
+package jwt
+
+import (
+	"crypto"
+	"crypto/rand"
+	"crypto/rsa"
+)
+
+// Implements the RSA family of signing methods signing methods
+// Expects *rsa.PrivateKey for signing and *rsa.PublicKey for validation
+type SigningMethodRSA struct {
+	Name string
+	Hash crypto.Hash
+}
+
+// Specific instances for RS256 and company
+var (
+	SigningMethodRS256 *SigningMethodRSA
+	SigningMethodRS384 *SigningMethodRSA
+	SigningMethodRS512 *SigningMethodRSA
+)
+
+func init() {
+	// RS256
+	SigningMethodRS256 = &SigningMethodRSA{"RS256", crypto.SHA256}
+	RegisterSigningMethod(SigningMethodRS256.Alg(), func() SigningMethod {
+		return SigningMethodRS256
+	})
+
+	// RS384
+	SigningMethodRS384 = &SigningMethodRSA{"RS384", crypto.SHA384}
+	RegisterSigningMethod(SigningMethodRS384.Alg(), func() SigningMethod {
+		return SigningMethodRS384
+	})
+
+	// RS512
+	SigningMethodRS512 = &SigningMethodRSA{"RS512", crypto.SHA512}
+	RegisterSigningMethod(SigningMethodRS512.Alg(), func() SigningMethod {
+		return SigningMethodRS512
+	})
+}
+
+func (m *SigningMethodRSA) Alg() string {
+	return m.Name
+}
+
+// Implements the Verify method from SigningMethod
+// For this signing method, must be an *rsa.PublicKey structure.
+func (m *SigningMethodRSA) Verify(signingString, signature string, key interface{}) error {
+	var err error
+
+	// Decode the signature
+	var sig []byte
+	if sig, err = DecodeSegment(signature); err != nil {
+		return err
+	}
+
+	var rsaKey *rsa.PublicKey
+	var ok bool
+
+	if rsaKey, ok = key.(*rsa.PublicKey); !ok {
+		return ErrInvalidKeyType
+	}
+
+	// Create hasher
+	if !m.Hash.Available() {
+		return ErrHashUnavailable
+	}
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	// Verify the signature
+	return rsa.VerifyPKCS1v15(rsaKey, m.Hash, hasher.Sum(nil), sig)
+}
+
+// Implements the Sign method from SigningMethod
+// For this signing method, must be an *rsa.PrivateKey structure.
+func (m *SigningMethodRSA) Sign(signingString string, key interface{}) (string, error) {
+	var rsaKey *rsa.PrivateKey
+	var ok bool
+
+	// Validate type of key
+	if rsaKey, ok = key.(*rsa.PrivateKey); !ok {
+		return "", ErrInvalidKey
+	}
+
+	// Create the hasher
+	if !m.Hash.Available() {
+		return "", ErrHashUnavailable
+	}
+
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	// Sign the string and return the encoded bytes
+	if sigBytes, err := rsa.SignPKCS1v15(rand.Reader, rsaKey, m.Hash, hasher.Sum(nil)); err == nil {
+		return EncodeSegment(sigBytes), nil
+	} else {
+		return "", err
+	}
+}
diff --git a/vendor/github.com/golang-jwt/jwt/rsa_pss.go b/vendor/github.com/golang-jwt/jwt/rsa_pss.go
new file mode 100644
index 0000000..c014708
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/rsa_pss.go
@@ -0,0 +1,142 @@
+// +build go1.4
+
+package jwt
+
+import (
+	"crypto"
+	"crypto/rand"
+	"crypto/rsa"
+)
+
+// Implements the RSAPSS family of signing methods signing methods
+type SigningMethodRSAPSS struct {
+	*SigningMethodRSA
+	Options *rsa.PSSOptions
+	// VerifyOptions is optional. If set overrides Options for rsa.VerifyPPS.
+	// Used to accept tokens signed with rsa.PSSSaltLengthAuto, what doesn't follow
+	// https://tools.ietf.org/html/rfc7518#section-3.5 but was used previously.
+	// See https://github.com/dgrijalva/jwt-go/issues/285#issuecomment-437451244 for details.
+	VerifyOptions *rsa.PSSOptions
+}
+
+// Specific instances for RS/PS and company.
+var (
+	SigningMethodPS256 *SigningMethodRSAPSS
+	SigningMethodPS384 *SigningMethodRSAPSS
+	SigningMethodPS512 *SigningMethodRSAPSS
+)
+
+func init() {
+	// PS256
+	SigningMethodPS256 = &SigningMethodRSAPSS{
+		SigningMethodRSA: &SigningMethodRSA{
+			Name: "PS256",
+			Hash: crypto.SHA256,
+		},
+		Options: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthEqualsHash,
+		},
+		VerifyOptions: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthAuto,
+		},
+	}
+	RegisterSigningMethod(SigningMethodPS256.Alg(), func() SigningMethod {
+		return SigningMethodPS256
+	})
+
+	// PS384
+	SigningMethodPS384 = &SigningMethodRSAPSS{
+		SigningMethodRSA: &SigningMethodRSA{
+			Name: "PS384",
+			Hash: crypto.SHA384,
+		},
+		Options: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthEqualsHash,
+		},
+		VerifyOptions: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthAuto,
+		},
+	}
+	RegisterSigningMethod(SigningMethodPS384.Alg(), func() SigningMethod {
+		return SigningMethodPS384
+	})
+
+	// PS512
+	SigningMethodPS512 = &SigningMethodRSAPSS{
+		SigningMethodRSA: &SigningMethodRSA{
+			Name: "PS512",
+			Hash: crypto.SHA512,
+		},
+		Options: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthEqualsHash,
+		},
+		VerifyOptions: &rsa.PSSOptions{
+			SaltLength: rsa.PSSSaltLengthAuto,
+		},
+	}
+	RegisterSigningMethod(SigningMethodPS512.Alg(), func() SigningMethod {
+		return SigningMethodPS512
+	})
+}
+
+// Implements the Verify method from SigningMethod
+// For this verify method, key must be an rsa.PublicKey struct
+func (m *SigningMethodRSAPSS) Verify(signingString, signature string, key interface{}) error {
+	var err error
+
+	// Decode the signature
+	var sig []byte
+	if sig, err = DecodeSegment(signature); err != nil {
+		return err
+	}
+
+	var rsaKey *rsa.PublicKey
+	switch k := key.(type) {
+	case *rsa.PublicKey:
+		rsaKey = k
+	default:
+		return ErrInvalidKey
+	}
+
+	// Create hasher
+	if !m.Hash.Available() {
+		return ErrHashUnavailable
+	}
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	opts := m.Options
+	if m.VerifyOptions != nil {
+		opts = m.VerifyOptions
+	}
+
+	return rsa.VerifyPSS(rsaKey, m.Hash, hasher.Sum(nil), sig, opts)
+}
+
+// Implements the Sign method from SigningMethod
+// For this signing method, key must be an rsa.PrivateKey struct
+func (m *SigningMethodRSAPSS) Sign(signingString string, key interface{}) (string, error) {
+	var rsaKey *rsa.PrivateKey
+
+	switch k := key.(type) {
+	case *rsa.PrivateKey:
+		rsaKey = k
+	default:
+		return "", ErrInvalidKeyType
+	}
+
+	// Create the hasher
+	if !m.Hash.Available() {
+		return "", ErrHashUnavailable
+	}
+
+	hasher := m.Hash.New()
+	hasher.Write([]byte(signingString))
+
+	// Sign the string and return the encoded bytes
+	if sigBytes, err := rsa.SignPSS(rand.Reader, rsaKey, m.Hash, hasher.Sum(nil), m.Options); err == nil {
+		return EncodeSegment(sigBytes), nil
+	} else {
+		return "", err
+	}
+}
diff --git a/vendor/github.com/golang-jwt/jwt/rsa_utils.go b/vendor/github.com/golang-jwt/jwt/rsa_utils.go
new file mode 100644
index 0000000..14c78c2
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/rsa_utils.go
@@ -0,0 +1,101 @@
+package jwt
+
+import (
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
+	"errors"
+)
+
+var (
+	ErrKeyMustBePEMEncoded = errors.New("Invalid Key: Key must be a PEM encoded PKCS1 or PKCS8 key")
+	ErrNotRSAPrivateKey    = errors.New("Key is not a valid RSA private key")
+	ErrNotRSAPublicKey     = errors.New("Key is not a valid RSA public key")
+)
+
+// Parse PEM encoded PKCS1 or PKCS8 private key
+func ParseRSAPrivateKeyFromPEM(key []byte) (*rsa.PrivateKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParsePKCS1PrivateKey(block.Bytes); err != nil {
+		if parsedKey, err = x509.ParsePKCS8PrivateKey(block.Bytes); err != nil {
+			return nil, err
+		}
+	}
+
+	var pkey *rsa.PrivateKey
+	var ok bool
+	if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok {
+		return nil, ErrNotRSAPrivateKey
+	}
+
+	return pkey, nil
+}
+
+// Parse PEM encoded PKCS1 or PKCS8 private key protected with password
+func ParseRSAPrivateKeyFromPEMWithPassword(key []byte, password string) (*rsa.PrivateKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	var parsedKey interface{}
+
+	var blockDecrypted []byte
+	if blockDecrypted, err = x509.DecryptPEMBlock(block, []byte(password)); err != nil {
+		return nil, err
+	}
+
+	if parsedKey, err = x509.ParsePKCS1PrivateKey(blockDecrypted); err != nil {
+		if parsedKey, err = x509.ParsePKCS8PrivateKey(blockDecrypted); err != nil {
+			return nil, err
+		}
+	}
+
+	var pkey *rsa.PrivateKey
+	var ok bool
+	if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok {
+		return nil, ErrNotRSAPrivateKey
+	}
+
+	return pkey, nil
+}
+
+// Parse PEM encoded PKCS1 or PKCS8 public key
+func ParseRSAPublicKeyFromPEM(key []byte) (*rsa.PublicKey, error) {
+	var err error
+
+	// Parse PEM block
+	var block *pem.Block
+	if block, _ = pem.Decode(key); block == nil {
+		return nil, ErrKeyMustBePEMEncoded
+	}
+
+	// Parse the key
+	var parsedKey interface{}
+	if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+		if cert, err := x509.ParseCertificate(block.Bytes); err == nil {
+			parsedKey = cert.PublicKey
+		} else {
+			return nil, err
+		}
+	}
+
+	var pkey *rsa.PublicKey
+	var ok bool
+	if pkey, ok = parsedKey.(*rsa.PublicKey); !ok {
+		return nil, ErrNotRSAPublicKey
+	}
+
+	return pkey, nil
+}
diff --git a/vendor/github.com/golang-jwt/jwt/signing_method.go b/vendor/github.com/golang-jwt/jwt/signing_method.go
new file mode 100644
index 0000000..ed1f212
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/signing_method.go
@@ -0,0 +1,35 @@
+package jwt
+
+import (
+	"sync"
+)
+
+var signingMethods = map[string]func() SigningMethod{}
+var signingMethodLock = new(sync.RWMutex)
+
+// Implement SigningMethod to add new methods for signing or verifying tokens.
+type SigningMethod interface {
+	Verify(signingString, signature string, key interface{}) error // Returns nil if signature is valid
+	Sign(signingString string, key interface{}) (string, error)    // Returns encoded signature or error
+	Alg() string                                                   // returns the alg identifier for this method (example: 'HS256')
+}
+
+// Register the "alg" name and a factory function for signing method.
+// This is typically done during init() in the method's implementation
+func RegisterSigningMethod(alg string, f func() SigningMethod) {
+	signingMethodLock.Lock()
+	defer signingMethodLock.Unlock()
+
+	signingMethods[alg] = f
+}
+
+// Get a signing method from an "alg" string
+func GetSigningMethod(alg string) (method SigningMethod) {
+	signingMethodLock.RLock()
+	defer signingMethodLock.RUnlock()
+
+	if methodF, ok := signingMethods[alg]; ok {
+		method = methodF()
+	}
+	return
+}
diff --git a/vendor/github.com/golang-jwt/jwt/token.go b/vendor/github.com/golang-jwt/jwt/token.go
new file mode 100644
index 0000000..6b30ced
--- /dev/null
+++ b/vendor/github.com/golang-jwt/jwt/token.go
@@ -0,0 +1,104 @@
+package jwt
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"strings"
+	"time"
+)
+
+// TimeFunc provides the current time when parsing token to validate "exp" claim (expiration time).
+// You can override it to use another time value.  This is useful for testing or if your
+// server uses a different time zone than your tokens.
+var TimeFunc = time.Now
+
+// Parse methods use this callback function to supply
+// the key for verification.  The function receives the parsed,
+// but unverified Token.  This allows you to use properties in the
+// Header of the token (such as `kid`) to identify which key to use.
+type Keyfunc func(*Token) (interface{}, error)
+
+// A JWT Token.  Different fields will be used depending on whether you're
+// creating or parsing/verifying a token.
+type Token struct {
+	Raw       string                 // The raw token.  Populated when you Parse a token
+	Method    SigningMethod          // The signing method used or to be used
+	Header    map[string]interface{} // The first segment of the token
+	Claims    Claims                 // The second segment of the token
+	Signature string                 // The third segment of the token.  Populated when you Parse a token
+	Valid     bool                   // Is the token valid?  Populated when you Parse/Verify a token
+}
+
+// Create a new Token.  Takes a signing method
+func New(method SigningMethod) *Token {
+	return NewWithClaims(method, MapClaims{})
+}
+
+func NewWithClaims(method SigningMethod, claims Claims) *Token {
+	return &Token{
+		Header: map[string]interface{}{
+			"typ": "JWT",
+			"alg": method.Alg(),
+		},
+		Claims: claims,
+		Method: method,
+	}
+}
+
+// Get the complete, signed token
+func (t *Token) SignedString(key interface{}) (string, error) {
+	var sig, sstr string
+	var err error
+	if sstr, err = t.SigningString(); err != nil {
+		return "", err
+	}
+	if sig, err = t.Method.Sign(sstr, key); err != nil {
+		return "", err
+	}
+	return strings.Join([]string{sstr, sig}, "."), nil
+}
+
+// Generate the signing string.  This is the
+// most expensive part of the whole deal.  Unless you
+// need this for something special, just go straight for
+// the SignedString.
+func (t *Token) SigningString() (string, error) {
+	var err error
+	parts := make([]string, 2)
+	for i := range parts {
+		var jsonValue []byte
+		if i == 0 {
+			if jsonValue, err = json.Marshal(t.Header); err != nil {
+				return "", err
+			}
+		} else {
+			if jsonValue, err = json.Marshal(t.Claims); err != nil {
+				return "", err
+			}
+		}
+
+		parts[i] = EncodeSegment(jsonValue)
+	}
+	return strings.Join(parts, "."), nil
+}
+
+// Parse, validate, and return a token.
+// keyFunc will receive the parsed token and should return the key for validating.
+// If everything is kosher, err will be nil
+func Parse(tokenString string, keyFunc Keyfunc) (*Token, error) {
+	return new(Parser).Parse(tokenString, keyFunc)
+}
+
+func ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) {
+	return new(Parser).ParseWithClaims(tokenString, claims, keyFunc)
+}
+
+// Encode JWT specific base64url encoding with padding stripped
+func EncodeSegment(seg []byte) string {
+	return base64.RawURLEncoding.EncodeToString(seg)
+}
+
+// Decode JWT specific base64url encoding with padding stripped
+func DecodeSegment(seg string) ([]byte, error) {
+	return base64.RawURLEncoding.DecodeString(seg)
+}
diff --git a/vendor/github.com/golang/snappy/README b/vendor/github.com/golang/snappy/README
index fd191f7..cea1287 100644
--- a/vendor/github.com/golang/snappy/README
+++ b/vendor/github.com/golang/snappy/README
@@ -1,13 +1,8 @@
 The Snappy compression format in the Go programming language.
 
-To use as a library:
+To download and install from source:
 $ go get github.com/golang/snappy
 
-To use as a binary:
-$ go install github.com/golang/snappy/cmd/snappytool@latest
-$ cat decoded | ~/go/bin/snappytool -e > encoded
-$ cat encoded | ~/go/bin/snappytool -d > decoded
-
 Unless otherwise noted, the Snappy-Go source files are distributed
 under the BSD-style license found in the LICENSE file.
 
diff --git a/vendor/github.com/golang/snappy/encode_arm64.s b/vendor/github.com/golang/snappy/encode_arm64.s
index f0c876a..f8d54ad 100644
--- a/vendor/github.com/golang/snappy/encode_arm64.s
+++ b/vendor/github.com/golang/snappy/encode_arm64.s
@@ -27,7 +27,7 @@
 // The unusual register allocation of local variables, such as R10 for the
 // source pointer, matches the allocation used at the call site in encodeBlock,
 // which makes it easier to manually inline this function.
-TEXT ·emitLiteral(SB), NOSPLIT, $40-56
+TEXT ·emitLiteral(SB), NOSPLIT, $32-56
 	MOVD dst_base+0(FP), R8
 	MOVD lit_base+24(FP), R10
 	MOVD lit_len+32(FP), R3
@@ -261,7 +261,7 @@ extendMatchEnd:
 // "var table [maxTableSize]uint16" takes up 32768 bytes of stack space. An
 // extra 64 bytes, to call other functions, and an extra 64 bytes, to spill
 // local variables (registers) during calls gives 32768 + 64 + 64 = 32896.
-TEXT ·encodeBlock(SB), 0, $32904-56
+TEXT ·encodeBlock(SB), 0, $32896-56
 	MOVD dst_base+0(FP), R8
 	MOVD src_base+24(FP), R7
 	MOVD src_len+32(FP), R14
diff --git a/vendor/github.com/json-iterator/go/README.md b/vendor/github.com/json-iterator/go/README.md
index c589add..52b111d 100644
--- a/vendor/github.com/json-iterator/go/README.md
+++ b/vendor/github.com/json-iterator/go/README.md
@@ -8,6 +8,8 @@
 
 A high-performance 100% compatible drop-in replacement of "encoding/json"
 
+You can also use thrift like JSON using [thrift-iterator](https://github.com/thrift-iterator/go)
+
 # Benchmark
 
 ![benchmark](http://jsoniter.com/benchmarks/go-benchmark.png)
diff --git a/vendor/github.com/labstack/echo/v4/.travis.yml b/vendor/github.com/labstack/echo/v4/.travis.yml
new file mode 100644
index 0000000..67d45ad
--- /dev/null
+++ b/vendor/github.com/labstack/echo/v4/.travis.yml
@@ -0,0 +1,21 @@
+arch:
+  - amd64
+  - ppc64le
+  
+language: go
+go:
+  - 1.14.x
+  - 1.15.x
+  - tip
+env:
+  - GO111MODULE=on
+install:
+  - go get -v golang.org/x/lint/golint
+script:
+  - golint -set_exit_status ./...
+  - go test -race -coverprofile=coverage.txt -covermode=atomic ./...
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+matrix:
+  allow_failures:
+    - go: tip
diff --git a/vendor/github.com/labstack/echo/v4/CHANGELOG.md b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
index 967fac2..02eb36f 100644
--- a/vendor/github.com/labstack/echo/v4/CHANGELOG.md
+++ b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
@@ -1,389 +1,5 @@
 # Changelog
 
-## v4.13.4 - 2025-05-22
-
-**Enhancements**
-
-* chore: fix some typos in comment by @zhuhaicity in https://github.com/labstack/echo/pull/2735
-* CI: test with Go 1.24 by @aldas in https://github.com/labstack/echo/pull/2748
-* Add support for TLS WebSocket proxy by @t-ibayashi-safie in https://github.com/labstack/echo/pull/2762
-
-**Security**
-
-* Update dependencies for [GO-2025-3487](https://pkg.go.dev/vuln/GO-2025-3487), [GO-2025-3503](https://pkg.go.dev/vuln/GO-2025-3503) and [GO-2025-3595](https://pkg.go.dev/vuln/GO-2025-3595) in https://github.com/labstack/echo/pull/2780
-
-
-## v4.13.3 - 2024-12-19
-
-**Security**
-
-* Update golang.org/x/net dependency [GO-2024-3333](https://pkg.go.dev/vuln/GO-2024-3333) in https://github.com/labstack/echo/pull/2722
-
-
-## v4.13.2 - 2024-12-12
-
-**Security**
-
-* Update dependencies (dependabot reports [GO-2024-3321](https://pkg.go.dev/vuln/GO-2024-3321)) in https://github.com/labstack/echo/pull/2721
-
-
-## v4.13.1 - 2024-12-11
-
-**Fixes**
-
-* Fix BindBody ignoring `Transfer-Encoding: chunked` requests by @178inaba in https://github.com/labstack/echo/pull/2717
-
-
-
-## v4.13.0 - 2024-12-04
-
-**BREAKING CHANGE** JWT Middleware Removed from Core use [labstack/echo-jwt](https://github.com/labstack/echo-jwt) instead
-
-The JWT middleware has been **removed from Echo core** due to another security vulnerability, [CVE-2024-51744](https://nvd.nist.gov/vuln/detail/CVE-2024-51744). For more details, refer to issue [#2699](https://github.com/labstack/echo/issues/2699). A drop-in replacement is available in the [labstack/echo-jwt](https://github.com/labstack/echo-jwt) repository.
-
-**Important**: Direct assignments like `token := c.Get("user").(*jwt.Token)` will now cause a panic due to an invalid cast. Update your code accordingly. Replace the current imports from `"github.com/golang-jwt/jwt"` in your handlers to the new middleware version using `"github.com/golang-jwt/jwt/v5"`.
-
-
-Background: 
-
-The version of `golang-jwt/jwt` (v3.2.2) previously used in Echo core has been in an unmaintained state for some time. This is not the first vulnerability affecting this library; earlier issues were addressed in [PR #1946](https://github.com/labstack/echo/pull/1946).
-JWT middleware was marked as deprecated in Echo core as of [v4.10.0](https://github.com/labstack/echo/releases/tag/v4.10.0) on 2022-12-27. If you did not notice that, consider leveraging tools like [Staticcheck](https://staticcheck.dev/) to catch such deprecations earlier in you dev/CI flow.  For bonus points - check out [gosec](https://github.com/securego/gosec).
-
-We sincerely apologize for any inconvenience caused by this change. While we strive to maintain backward compatibility within Echo core, recurring security issues with third-party dependencies have forced this decision.
-
-**Enhancements**
-
-* remove jwt middleware by @stevenwhitehead in https://github.com/labstack/echo/pull/2701
-* optimization: struct alignment by @behnambm in https://github.com/labstack/echo/pull/2636
-* bind: Maintain backwards compatibility for map[string]interface{} binding by @thesaltree in https://github.com/labstack/echo/pull/2656
-* Add Go 1.23 to CI by @aldas in https://github.com/labstack/echo/pull/2675
-* improve `MultipartForm` test by @martinyonatann in https://github.com/labstack/echo/pull/2682
-* `bind` : add support of multipart multi files by @martinyonatann in https://github.com/labstack/echo/pull/2684
-* Add TemplateRenderer struct to ease creating renderers for `html/template` and `text/template` packages. by @aldas in https://github.com/labstack/echo/pull/2690
-* Refactor TestBasicAuth to utilize table-driven test format by @ErikOlson in https://github.com/labstack/echo/pull/2688
-* Remove broken header by @aldas in https://github.com/labstack/echo/pull/2705
-* fix(bind body): content-length can be -1 by @phamvinhdat in https://github.com/labstack/echo/pull/2710
-* CORS middleware should compile allowOrigin regexp at creation by @aldas in https://github.com/labstack/echo/pull/2709
-* Shorten Github issue template and add test example by @aldas in https://github.com/labstack/echo/pull/2711
-
-
-## v4.12.0 - 2024-04-15
-
-**Security**
-
-* Update golang.org/x/net dep because of [GO-2024-2687](https://pkg.go.dev/vuln/GO-2024-2687) by @aldas in https://github.com/labstack/echo/pull/2625
-
-
-**Enhancements**
-
-* binder: make binding to Map work better with string destinations by @aldas in https://github.com/labstack/echo/pull/2554
-* README.md: add Encore as sponsor by @marcuskohlberg in https://github.com/labstack/echo/pull/2579
-* Reorder paragraphs in README.md by @aldas in https://github.com/labstack/echo/pull/2581
-* CI: upgrade actions/checkout to v4 by @aldas in https://github.com/labstack/echo/pull/2584
-* Remove default charset from 'application/json' Content-Type header by @doortts in https://github.com/labstack/echo/pull/2568
-* CI: Use Go 1.22 by @aldas in https://github.com/labstack/echo/pull/2588
-* binder: allow binding to a nil map by @georgmu in https://github.com/labstack/echo/pull/2574
-* Add Skipper Unit Test In BasicBasicAuthConfig and Add More Detail Explanation regarding BasicAuthValidator by @RyoKusnadi in https://github.com/labstack/echo/pull/2461
-* fix some typos by @teslaedison in https://github.com/labstack/echo/pull/2603
-* fix: some typos by @pomadev in https://github.com/labstack/echo/pull/2596
-* Allow ResponseWriters to unwrap writers when flushing/hijacking by @aldas in https://github.com/labstack/echo/pull/2595
-* Add SPDX licence comments to files.  by @aldas in https://github.com/labstack/echo/pull/2604
-* Upgrade deps by @aldas in https://github.com/labstack/echo/pull/2605
-* Change type definition blocks to single declarations. This helps copy… by @aldas in https://github.com/labstack/echo/pull/2606
-* Fix Real IP logic by @cl-bvl in https://github.com/labstack/echo/pull/2550
-* Default binder can use `UnmarshalParams(params []string) error` inter… by @aldas in https://github.com/labstack/echo/pull/2607
-* Default binder can bind pointer to slice as struct field. For example  `*[]string` by @aldas in https://github.com/labstack/echo/pull/2608
-* Remove maxparam dependence from Context by @aldas in https://github.com/labstack/echo/pull/2611
-* When route is registered with empty path it is normalized to `/`.  by @aldas in https://github.com/labstack/echo/pull/2616
-* proxy middleware should use httputil.ReverseProxy for SSE requests by @aldas in https://github.com/labstack/echo/pull/2624
-
-
-## v4.11.4 - 2023-12-20
-
-**Security**
-
-* Upgrade golang.org/x/crypto to v0.17.0 to fix vulnerability [issue](https://pkg.go.dev/vuln/GO-2023-2402) [#2562](https://github.com/labstack/echo/pull/2562)
-
-**Enhancements**
-
-* Update deps and mark Go version to 1.18 as this is what golang.org/x/* use [#2563](https://github.com/labstack/echo/pull/2563)
-* Request logger: add example for Slog https://pkg.go.dev/log/slog [#2543](https://github.com/labstack/echo/pull/2543)
-
-
-## v4.11.3 - 2023-11-07
-
-**Security**
-
-* 'c.Attachment' and 'c.Inline' should escape filename in 'Content-Disposition' header to avoid 'Reflect File Download' vulnerability. [#2541](https://github.com/labstack/echo/pull/2541)
-
-**Enhancements**
-
-* Tests: refactor context tests to be separate functions [#2540](https://github.com/labstack/echo/pull/2540)
-* Proxy middleware: reuse echo request context [#2537](https://github.com/labstack/echo/pull/2537)
-* Mark unmarshallable yaml struct tags as ignored [#2536](https://github.com/labstack/echo/pull/2536)
-
-
-## v4.11.2 - 2023-10-11
-
-**Security**
-
-* Bump golang.org/x/net to prevent CVE-2023-39325 / CVE-2023-44487 HTTP/2 Rapid Reset Attack [#2527](https://github.com/labstack/echo/pull/2527)
-* fix(sec): randomString bias introduced by #2490 [#2492](https://github.com/labstack/echo/pull/2492)
-* CSRF/RequestID mw: switch math/random usage to crypto/random [#2490](https://github.com/labstack/echo/pull/2490)
-
-**Enhancements**
-
-* Delete unused context in body_limit.go [#2483](https://github.com/labstack/echo/pull/2483)
-* Use Go 1.21 in CI [#2505](https://github.com/labstack/echo/pull/2505)
-* Fix some typos [#2511](https://github.com/labstack/echo/pull/2511)
-* Allow CORS middleware to send Access-Control-Max-Age: 0 [#2518](https://github.com/labstack/echo/pull/2518)
-* Bump dependancies [#2522](https://github.com/labstack/echo/pull/2522)
-
-## v4.11.1 - 2023-07-16
-
-**Fixes**
-
-* Fix `Gzip` middleware not sending response code for no content responses (404, 301/302 redirects etc) [#2481](https://github.com/labstack/echo/pull/2481)
-
-
-## v4.11.0 - 2023-07-14
-
-
-**Fixes**
-
-* Fixes the proxy middleware concurrency issue of calling the Next() proxy target on Round Robin Balancer [#2409](https://github.com/labstack/echo/pull/2409)
-* Fix `group.RouteNotFound` not working when group has attached middlewares [#2411](https://github.com/labstack/echo/pull/2411)
-* Fix global error handler return error message when message is an error [#2456](https://github.com/labstack/echo/pull/2456)
-* Do not use global timeNow variables [#2477](https://github.com/labstack/echo/pull/2477)
-
-
-**Enhancements**
-
-* Added a optional config variable to disable centralized error handler in recovery middleware [#2410](https://github.com/labstack/echo/pull/2410)
-* refactor: use `strings.ReplaceAll` directly [#2424](https://github.com/labstack/echo/pull/2424)
-* Add support for Go1.20 `http.rwUnwrapper` to Response struct [#2425](https://github.com/labstack/echo/pull/2425)
-* Check whether is nil before invoking centralized error handling [#2429](https://github.com/labstack/echo/pull/2429)
-* Proper colon support in `echo.Reverse` method [#2416](https://github.com/labstack/echo/pull/2416)
-* Fix misuses of a vs an in documentation comments [#2436](https://github.com/labstack/echo/pull/2436)
-* Add link to slog.Handler library for Echo logging into README.md [#2444](https://github.com/labstack/echo/pull/2444)
-* In proxy middleware Support retries of failed proxy requests [#2414](https://github.com/labstack/echo/pull/2414)
-* gofmt fixes to comments [#2452](https://github.com/labstack/echo/pull/2452)
-* gzip response only if it exceeds a minimal length [#2267](https://github.com/labstack/echo/pull/2267)
-* Upgrade packages [#2475](https://github.com/labstack/echo/pull/2475)
-
-
-## v4.10.2 - 2023-02-22
-
-**Security**
-
-* `filepath.Clean` behaviour has changed in Go 1.20 - adapt to it [#2406](https://github.com/labstack/echo/pull/2406)
-* Add `middleware.CORSConfig.UnsafeWildcardOriginWithAllowCredentials` to make UNSAFE usages of wildcard origin + allow cretentials less likely [#2405](https://github.com/labstack/echo/pull/2405)
-
-**Enhancements**
-
-* Add more HTTP error values [#2277](https://github.com/labstack/echo/pull/2277)
-
-
-## v4.10.1 - 2023-02-19
-
-**Security**
-
-* Upgrade deps due to the latest golang.org/x/net vulnerability [#2402](https://github.com/labstack/echo/pull/2402)
-
-
-**Enhancements**
-
-* Add new JWT repository to the README [#2377](https://github.com/labstack/echo/pull/2377)
-* Return an empty string for ctx.path if there is no registered path [#2385](https://github.com/labstack/echo/pull/2385)
-* Add context timeout middleware [#2380](https://github.com/labstack/echo/pull/2380)
-* Update link to jaegertracing [#2394](https://github.com/labstack/echo/pull/2394)
-
-
-## v4.10.0 - 2022-12-27
-
-**Security**
-
-* We are deprecating JWT middleware in this repository. Please use https://github.com/labstack/echo-jwt instead. 
-
-  JWT middleware is moved to separate repository to allow us to bump/upgrade version of JWT implementation (`github.com/golang-jwt/jwt`) we are using
-which we can not do in Echo core because this would break backwards compatibility guarantees we try to maintain.
-
-* This minor version bumps minimum Go version to 1.17 (from 1.16) due `golang.org/x/` packages we depend on. There are
-  several vulnerabilities fixed in these libraries.
-
-  Echo still tries to support last 4 Go versions but there are occasions we can not guarantee this promise.
-
-
-**Enhancements**
-
-* Bump x/text to 0.3.8 [#2305](https://github.com/labstack/echo/pull/2305)
-* Bump dependencies and add notes about Go releases we support [#2336](https://github.com/labstack/echo/pull/2336)
-* Add helper interface for ProxyBalancer interface [#2316](https://github.com/labstack/echo/pull/2316)
-* Expose `middleware.CreateExtractors` function so we can use it from echo-contrib repository [#2338](https://github.com/labstack/echo/pull/2338)
-* Refactor func(Context) error to HandlerFunc [#2315](https://github.com/labstack/echo/pull/2315)
-* Improve function comments [#2329](https://github.com/labstack/echo/pull/2329)
-* Add new method HTTPError.WithInternal [#2340](https://github.com/labstack/echo/pull/2340)
-* Replace io/ioutil package usages [#2342](https://github.com/labstack/echo/pull/2342)
-* Add staticcheck to CI flow [#2343](https://github.com/labstack/echo/pull/2343)
-* Replace relative path determination from proprietary to std [#2345](https://github.com/labstack/echo/pull/2345)
-* Remove square brackets from ipv6 addresses in XFF (X-Forwarded-For header) [#2182](https://github.com/labstack/echo/pull/2182)
-* Add testcases for some BodyLimit middleware configuration options [#2350](https://github.com/labstack/echo/pull/2350)
-* Additional configuration options for RequestLogger and Logger middleware [#2341](https://github.com/labstack/echo/pull/2341)
-* Add route to request log [#2162](https://github.com/labstack/echo/pull/2162)
-* GitHub Workflows security hardening [#2358](https://github.com/labstack/echo/pull/2358)
-* Add govulncheck to CI and bump dependencies [#2362](https://github.com/labstack/echo/pull/2362)
-* Fix rate limiter docs [#2366](https://github.com/labstack/echo/pull/2366)
-* Refactor how `e.Routes()` work and introduce `e.OnAddRouteHandler` callback [#2337](https://github.com/labstack/echo/pull/2337)
-
-
-## v4.9.1 - 2022-10-12
-
-**Fixes**
-
-* Fix logger panicing (when template is set to empty) by bumping dependency version [#2295](https://github.com/labstack/echo/issues/2295)
-
-**Enhancements**
-
-* Improve CORS documentation [#2272](https://github.com/labstack/echo/pull/2272)
-* Update readme about supported Go versions [#2291](https://github.com/labstack/echo/pull/2291)
-* Tests: improve error handling on closing body [#2254](https://github.com/labstack/echo/pull/2254)
-* Tests: refactor some of the assertions in tests [#2275](https://github.com/labstack/echo/pull/2275)
-* Tests: refactor assertions [#2301](https://github.com/labstack/echo/pull/2301)
-
-## v4.9.0 - 2022-09-04
-
-**Security**
-
-* Fix open redirect vulnerability in handlers serving static directories (e.Static, e.StaticFs, echo.StaticDirectoryHandler) [#2260](https://github.com/labstack/echo/pull/2260)
-
-**Enhancements**
-
-* Allow configuring ErrorHandler in CSRF middleware [#2257](https://github.com/labstack/echo/pull/2257)
-* Replace HTTP method constants in tests with stdlib constants [#2247](https://github.com/labstack/echo/pull/2247)
-
-
-## v4.8.0 - 2022-08-10
-
-**Most notable things**
-
-You can now add any arbitrary HTTP method type as a route [#2237](https://github.com/labstack/echo/pull/2237)
-```go
-e.Add("COPY", "/*", func(c echo.Context) error 
-  return c.String(http.StatusOK, "OK COPY")
-})
-```
-
-You can add custom 404 handler for specific paths [#2217](https://github.com/labstack/echo/pull/2217)
-```go
-e.RouteNotFound("/*", func(c echo.Context) error { return c.NoContent(http.StatusNotFound) })
-
-g := e.Group("/images")
-g.RouteNotFound("/*", func(c echo.Context) error { return c.NoContent(http.StatusNotFound) })
-```
-
-**Enhancements**
-
-* Add new value binding methods (UnixTimeMilli,TextUnmarshaler,JSONUnmarshaler) to Valuebinder [#2127](https://github.com/labstack/echo/pull/2127)
-* Refactor: body_limit middleware unit test [#2145](https://github.com/labstack/echo/pull/2145)
-* Refactor: Timeout mw: rework how test waits for timeout. [#2187](https://github.com/labstack/echo/pull/2187)
-* BasicAuth middleware returns 500 InternalServerError on invalid base64 strings but should return 400 [#2191](https://github.com/labstack/echo/pull/2191)
-* Refactor: duplicated findStaticChild process at findChildWithLabel [#2176](https://github.com/labstack/echo/pull/2176)
-* Allow different param names in different methods with same path scheme [#2209](https://github.com/labstack/echo/pull/2209)
-* Add support for registering handlers for different 404 routes [#2217](https://github.com/labstack/echo/pull/2217)
-* Middlewares should use errors.As() instead of type assertion on HTTPError [#2227](https://github.com/labstack/echo/pull/2227)
-* Allow arbitrary HTTP method types to be added as routes [#2237](https://github.com/labstack/echo/pull/2237)
-
-## v4.7.2 - 2022-03-16
-
-**Fixes**
-
-* Fix nil pointer exception when calling Start again after address binding error [#2131](https://github.com/labstack/echo/pull/2131)
-* Fix CSRF middleware not being able to extract token from multipart/form-data form [#2136](https://github.com/labstack/echo/pull/2136)
-* Fix Timeout middleware write race [#2126](https://github.com/labstack/echo/pull/2126)
-
-**Enhancements**
-
-* Recover middleware should not log panic for aborted handler [#2134](https://github.com/labstack/echo/pull/2134)
-
-
-## v4.7.1 - 2022-03-13
-
-**Fixes**
-
-* Fix `e.Static`, `.File()`, `c.Attachment()` being picky with paths starting with `./`, `../` and `/` after 4.7.0 introduced echo.Filesystem support (Go1.16+) [#2123](https://github.com/labstack/echo/pull/2123)
-
-**Enhancements**
-
-* Remove some unused code [#2116](https://github.com/labstack/echo/pull/2116)
-
-
-## v4.7.0 - 2022-03-01
-
-**Enhancements**
-
-* Add JWT, KeyAuth, CSRF multivalue extractors [#2060](https://github.com/labstack/echo/pull/2060)
-* Add LogErrorFunc to recover middleware [#2072](https://github.com/labstack/echo/pull/2072)
-* Add support for HEAD method query params binding [#2027](https://github.com/labstack/echo/pull/2027)
-* Improve filesystem support with echo.FileFS, echo.StaticFS, group.FileFS, group.StaticFS [#2064](https://github.com/labstack/echo/pull/2064)
-
-**Fixes**
-
-* Fix X-Real-IP bug, improve tests [#2007](https://github.com/labstack/echo/pull/2007)
-* Minor syntax fixes [#1994](https://github.com/labstack/echo/pull/1994), [#2102](https://github.com/labstack/echo/pull/2102), [#2102](https://github.com/labstack/echo/pull/2102)
-
-**General**
-
-* Add cache-control and connection headers [#2103](https://github.com/labstack/echo/pull/2103)
-* Add Retry-After header constant [#2078](https://github.com/labstack/echo/pull/2078)
-* Upgrade `go` directive in `go.mod` to 1.17 [#2049](https://github.com/labstack/echo/pull/2049)
-* Add Pagoda [#2077](https://github.com/labstack/echo/pull/2077) and Souin [#2069](https://github.com/labstack/echo/pull/2069) to 3rd-party middlewares in README
-
-## v4.6.3 - 2022-01-10
-
-**Fixes**
-
-* Fixed Echo version number in greeting message which was not incremented to `4.6.2` [#2066](https://github.com/labstack/echo/issues/2066)
-
-
-## v4.6.2 - 2022-01-08
-
-**Fixes**
-
-* Fixed route containing escaped colon should be matchable but is not matched to request path [#2047](https://github.com/labstack/echo/pull/2047)
-* Fixed a problem that returned wrong content-encoding when the gzip compressed content was empty. [#1921](https://github.com/labstack/echo/pull/1921)
-* Update (test) dependencies [#2021](https://github.com/labstack/echo/pull/2021)
-
-
-**Enhancements**
-
-* Add support for configurable target header for the request_id middleware [#2040](https://github.com/labstack/echo/pull/2040)
-* Change decompress middleware to use stream decompression instead of buffering [#2018](https://github.com/labstack/echo/pull/2018)
-* Documentation updates
-
-
-## v4.6.1 - 2021-09-26
-
-**Enhancements**
-
-* Add start time to request logger middleware values [#1991](https://github.com/labstack/echo/pull/1991)
-
-## v4.6.0 - 2021-09-20
-
-Introduced a new [request logger](https://github.com/labstack/echo/blob/master/middleware/request_logger.go) middleware 
-to help with cases when you want to use some other logging library in your application.
-
-**Fixes**
-
-* fix timeout middleware warning: superfluous response.WriteHeader [#1905](https://github.com/labstack/echo/issues/1905)
-
-**Enhancements**
-
-* Add Cookie to KeyAuth middleware's KeyLookup [#1929](https://github.com/labstack/echo/pull/1929)
-* JWT middleware should ignore case of auth scheme in request header [#1951](https://github.com/labstack/echo/pull/1951)
-* Refactor default error handler to return first if response is already committed [#1956](https://github.com/labstack/echo/pull/1956)
-* Added request logger middleware which helps to use custom logger library for logging requests. [#1980](https://github.com/labstack/echo/pull/1980)
-* Allow escaping of colon in route path so Google Cloud API "custom methods" could be implemented [#1988](https://github.com/labstack/echo/pull/1988)
-
 ## v4.5.0 - 2021-08-01
 
 **Important notes**
diff --git a/vendor/github.com/labstack/echo/v4/Makefile b/vendor/github.com/labstack/echo/v4/Makefile
index 7f4a220..48061f7 100644
--- a/vendor/github.com/labstack/echo/v4/Makefile
+++ b/vendor/github.com/labstack/echo/v4/Makefile
@@ -9,11 +9,9 @@ tag:
 check: lint vet race ## Check project
 
 init:
-	@go install golang.org/x/lint/golint@latest
-	@go install honnef.co/go/tools/cmd/staticcheck@latest
+	@go get -u golang.org/x/lint/golint
 
 lint: ## Lint the files
-	@staticcheck ${PKG_LIST}
 	@golint -set_exit_status ${PKG_LIST}
 
 vet: ## Vet the files
@@ -31,6 +29,6 @@ benchmark: ## Run benchmarks
 help: ## Display this help screen
 	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-goversion ?= "1.21"
-test_version: ## Run tests inside Docker with given version (defaults to 1.21 oldest supported). Example: make test_version goversion=1.21
+goversion ?= "1.15"
+test_version: ## Run tests inside Docker with given version (defaults to 1.15 oldest supported). Example: make test_version goversion=1.15
 	@docker run --rm -it -v $(shell pwd):/project golang:$(goversion) /bin/sh -c "cd /project && make init check"
diff --git a/vendor/github.com/labstack/echo/v4/README.md b/vendor/github.com/labstack/echo/v4/README.md
index 5381898..4dec531 100644
--- a/vendor/github.com/labstack/echo/v4/README.md
+++ b/vendor/github.com/labstack/echo/v4/README.md
@@ -1,24 +1,30 @@
+<a href="https://echo.labstack.com"><img height="80" src="https://cdn.labstack.com/images/echo-logo.svg"></a>
+
 [![Sourcegraph](https://sourcegraph.com/github.com/labstack/echo/-/badge.svg?style=flat-square)](https://sourcegraph.com/github.com/labstack/echo?badge)
 [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](https://pkg.go.dev/github.com/labstack/echo/v4)
 [![Go Report Card](https://goreportcard.com/badge/github.com/labstack/echo?style=flat-square)](https://goreportcard.com/report/github.com/labstack/echo)
-[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/labstack/echo/echo.yml?style=flat-square)](https://github.com/labstack/echo/actions)
+[![Build Status](http://img.shields.io/travis/labstack/echo.svg?style=flat-square)](https://travis-ci.org/labstack/echo)
 [![Codecov](https://img.shields.io/codecov/c/github/labstack/echo.svg?style=flat-square)](https://codecov.io/gh/labstack/echo)
+[![Join the chat at https://gitter.im/labstack/echo](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/labstack/echo)
 [![Forum](https://img.shields.io/badge/community-forum-00afd1.svg?style=flat-square)](https://github.com/labstack/echo/discussions)
 [![Twitter](https://img.shields.io/badge/twitter-@labstack-55acee.svg?style=flat-square)](https://twitter.com/labstack)
 [![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/echo/master/LICENSE)
 
-## Echo
+## Supported Go versions
 
-High performance, extensible, minimalist Go web framework.
+As of version 4.0.0, Echo is available as a [Go module](https://github.com/golang/go/wiki/Modules).
+Therefore a Go version capable of understanding /vN suffixed imports is required:
 
-* [Official website](https://echo.labstack.com)
-* [Quick start](https://echo.labstack.com/docs/quick-start)
-* [Middlewares](https://echo.labstack.com/docs/category/middleware)
+- 1.9.7+
+- 1.10.3+
+- 1.14+
 
-Help and questions: [Github Discussions](https://github.com/labstack/echo/discussions)
+Any of these versions will allow you to import Echo as `github.com/labstack/echo/v4` which is the recommended
+way of using Echo going forward.
 
+For older versions, please use the latest v3 tag.
 
-### Feature Overview
+## Feature Overview
 
 - Optimized HTTP router which smartly prioritize routes
 - Build robust and scalable RESTful APIs
@@ -34,18 +40,6 @@ Help and questions: [Github Discussions](https://github.com/labstack/echo/discus
 - Automatic TLS via Let’s Encrypt
 - HTTP/2 support
 
-## Sponsors
-
-<div>
-  <a href="https://encore.dev" style="display: inline-flex; align-items: center; gap: 10px">
-    <img src="https://user-images.githubusercontent.com/78424526/214602214-52e0483a-b5fc-4d4c-b03e-0b7b23e012df.svg" height="28px" alt="encore icon"></img>
-  <b>Encore – the platform for building Go-based cloud backends</b>
-    </a>
-</div>
-<br/>
-
-Click [here](https://github.com/sponsors/labstack) for more information on sponsorship.
-
 ## Benchmarks
 
 Date: 2020/11/11<br>
@@ -65,7 +59,6 @@ The benchmarks above were run on an Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
 // go get github.com/labstack/echo/{version}
 go get github.com/labstack/echo/v4
 ```
-Latest version of Echo supports last four Go major [releases](https://go.dev/doc/devel/release) and might work with older versions.
 
 ### Example
 
@@ -73,10 +66,9 @@ Latest version of Echo supports last four Go major [releases](https://go.dev/doc
 package main
 
 import (
+  "net/http"
   "github.com/labstack/echo/v4"
   "github.com/labstack/echo/v4/middleware"
-  "log/slog"
-  "net/http"
 )
 
 func main() {
@@ -91,9 +83,7 @@ func main() {
   e.GET("/", hello)
 
   // Start server
-  if err := e.Start(":8080"); err != nil && !errors.Is(err, http.ErrServerClosed) {
-    slog.Error("failed to start server", "error", err)
-  }
+  e.Logger.Fatal(e.Start(":1323"))
 }
 
 // Handler
@@ -102,32 +92,10 @@ func hello(c echo.Context) error {
 }
 ```
 
-# Official middleware repositories
+## Help
 
-Following list of middleware is maintained by Echo team.
-
-| Repository                                                                   | Description                                                                                                                                                                                                                                                                                                                   |
-|------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [github.com/labstack/echo-jwt](https://github.com/labstack/echo-jwt)         | [JWT](https://github.com/golang-jwt/jwt) middleware                                                                                                                                                                                                                                                                           | 
-| [github.com/labstack/echo-contrib](https://github.com/labstack/echo-contrib) | [casbin](https://github.com/casbin/casbin), [gorilla/sessions](https://github.com/gorilla/sessions), [jaegertracing](https://github.com/uber/jaeger-client-go), [prometheus](https://github.com/prometheus/client_golang/), [pprof](https://pkg.go.dev/net/http/pprof), [zipkin](https://github.com/openzipkin/zipkin-go) middlewares | 
-
-# Third-party middleware repositories
-
-Be careful when adding 3rd party middleware. Echo teams does not have time or manpower to guarantee safety and quality
-of middlewares in this list.
-
-| Repository                                                                                           | Description                                                                                                                                                                                              |
-|------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen)                                      | Automatically generate RESTful API documentation with [OpenAPI](https://swagger.io/specification/) Client and Server Code Generator                                                                      |
-| [github.com/swaggo/echo-swagger](https://github.com/swaggo/echo-swagger)                             | Automatically generate RESTful API documentation with [Swagger](https://swagger.io/) 2.0.                                                                                                                |
-| [github.com/ziflex/lecho](https://github.com/ziflex/lecho)                                           | [Zerolog](https://github.com/rs/zerolog) logging library wrapper for Echo logger interface.                                                                                                              |
-| [github.com/brpaz/echozap](https://github.com/brpaz/echozap)                                         | Uber´s [Zap](https://github.com/uber-go/zap) logging library wrapper for Echo logger interface.                                                                                                          |
-| [github.com/samber/slog-echo](https://github.com/samber/slog-echo)                                         | Go [slog](https://pkg.go.dev/golang.org/x/exp/slog) logging library wrapper for Echo logger interface.                                                                                                          |
-| [github.com/darkweak/souin/plugins/echo](https://github.com/darkweak/souin/tree/master/plugins/echo) | HTTP cache system based on [Souin](https://github.com/darkweak/souin) to automatically get your endpoints cached. It supports some distributed and non-distributed storage systems depending your needs. |
-| [github.com/mikestefanello/pagoda](https://github.com/mikestefanello/pagoda)                         | Rapid, easy full-stack web development starter kit built with Echo.                                                                                                                                      |
-| [github.com/go-woo/protoc-gen-echo](https://github.com/go-woo/protoc-gen-echo)                       | ProtoBuf generate Echo server side code                                                                                                                                                                  |
-
-Please send a PR to add your own library here.
+- [Forum](https://github.com/labstack/echo/discussions)
+- [Chat](https://gitter.im/labstack/echo)
 
 ## Contribute
 
@@ -146,11 +114,8 @@ Please send a PR to add your own library here.
 
 ## Credits
 
-- [Vishal Rana](https://github.com/vishr) (Author)
-- [Nitin Rana](https://github.com/nr17) (Consultant)
-- [Roland Lammel](https://github.com/lammel) (Maintainer)
-- [Martti T.](https://github.com/aldas) (Maintainer)
-- [Pablo Andres Fuente](https://github.com/pafuent) (Maintainer)
+- [Vishal Rana](https://github.com/vishr) - Author
+- [Nitin Rana](https://github.com/nr17) - Consultant
 - [Contributors](https://github.com/labstack/echo/graphs/contributors)
 
 ## License
diff --git a/vendor/github.com/labstack/echo/v4/bind.go b/vendor/github.com/labstack/echo/v4/bind.go
index 5940e15..fdf0524 100644
--- a/vendor/github.com/labstack/echo/v4/bind.go
+++ b/vendor/github.com/labstack/echo/v4/bind.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
@@ -8,35 +5,29 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"mime/multipart"
 	"net/http"
 	"reflect"
 	"strconv"
 	"strings"
 )
 
-// Binder is the interface that wraps the Bind method.
-type Binder interface {
-	Bind(i interface{}, c Context) error
-}
+type (
+	// Binder is the interface that wraps the Bind method.
+	Binder interface {
+		Bind(i interface{}, c Context) error
+	}
 
-// DefaultBinder is the default implementation of the Binder interface.
-type DefaultBinder struct{}
+	// DefaultBinder is the default implementation of the Binder interface.
+	DefaultBinder struct{}
 
-// BindUnmarshaler is the interface used to wrap the UnmarshalParam method.
-// Types that don't implement this, but do implement encoding.TextUnmarshaler
-// will use that interface instead.
-type BindUnmarshaler interface {
-	// UnmarshalParam decodes and assigns a value from an form or query param.
-	UnmarshalParam(param string) error
-}
-
-// bindMultipleUnmarshaler is used by binder to unmarshal multiple values from request at once to
-// type implementing this interface. For example request could have multiple query fields `?a=1&a=2&b=test` in that case
-// for `a` following slice `["1", "2"] will be passed to unmarshaller.
-type bindMultipleUnmarshaler interface {
-	UnmarshalParams(params []string) error
-}
+	// BindUnmarshaler is the interface used to wrap the UnmarshalParam method.
+	// Types that don't implement this, but do implement encoding.TextUnmarshaler
+	// will use that interface instead.
+	BindUnmarshaler interface {
+		// UnmarshalParam decodes and assigns a value from an form or query param.
+		UnmarshalParam(param string) error
+	}
+)
 
 // BindPathParams binds path params to bindable object
 func (b *DefaultBinder) BindPathParams(c Context, i interface{}) error {
@@ -46,7 +37,7 @@ func (b *DefaultBinder) BindPathParams(c Context, i interface{}) error {
 	for i, name := range names {
 		params[name] = []string{values[i]}
 	}
-	if err := b.bindData(i, params, "param", nil); err != nil {
+	if err := b.bindData(i, params, "param"); err != nil {
 		return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 	}
 	return nil
@@ -54,7 +45,7 @@ func (b *DefaultBinder) BindPathParams(c Context, i interface{}) error {
 
 // BindQueryParams binds query params to bindable object
 func (b *DefaultBinder) BindQueryParams(c Context, i interface{}) error {
-	if err := b.bindData(i, c.QueryParams(), "query", nil); err != nil {
+	if err := b.bindData(i, c.QueryParams(), "query"); err != nil {
 		return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 	}
 	return nil
@@ -71,12 +62,9 @@ func (b *DefaultBinder) BindBody(c Context, i interface{}) (err error) {
 		return
 	}
 
-	// mediatype is found like `mime.ParseMediaType()` does it
-	base, _, _ := strings.Cut(req.Header.Get(HeaderContentType), ";")
-	mediatype := strings.TrimSpace(base)
-
-	switch mediatype {
-	case MIMEApplicationJSON:
+	ctype := req.Header.Get(HeaderContentType)
+	switch {
+	case strings.HasPrefix(ctype, MIMEApplicationJSON):
 		if err = c.Echo().JSONSerializer.Deserialize(c, i); err != nil {
 			switch err.(type) {
 			case *HTTPError:
@@ -85,7 +73,7 @@ func (b *DefaultBinder) BindBody(c Context, i interface{}) (err error) {
 				return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 			}
 		}
-	case MIMEApplicationXML, MIMETextXML:
+	case strings.HasPrefix(ctype, MIMEApplicationXML), strings.HasPrefix(ctype, MIMETextXML):
 		if err = xml.NewDecoder(req.Body).Decode(i); err != nil {
 			if ute, ok := err.(*xml.UnsupportedTypeError); ok {
 				return NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unsupported type error: type=%v, error=%v", ute.Type, ute.Error())).SetInternal(err)
@@ -94,20 +82,12 @@ func (b *DefaultBinder) BindBody(c Context, i interface{}) (err error) {
 			}
 			return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 		}
-	case MIMEApplicationForm:
+	case strings.HasPrefix(ctype, MIMEApplicationForm), strings.HasPrefix(ctype, MIMEMultipartForm):
 		params, err := c.FormParams()
 		if err != nil {
 			return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 		}
-		if err = b.bindData(i, params, "form", nil); err != nil {
-			return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
-		}
-	case MIMEMultipartForm:
-		params, err := c.MultipartForm()
-		if err != nil {
-			return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
-		}
-		if err = b.bindData(i, params.Value, "form", params.File); err != nil {
+		if err = b.bindData(i, params, "form"); err != nil {
 			return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 		}
 	default:
@@ -118,7 +98,7 @@ func (b *DefaultBinder) BindBody(c Context, i interface{}) (err error) {
 
 // BindHeaders binds HTTP headers to a bindable object
 func (b *DefaultBinder) BindHeaders(c Context, i interface{}) error {
-	if err := b.bindData(i, c.Request().Header, "header", nil); err != nil {
+	if err := b.bindData(i, c.Request().Header, "header"); err != nil {
 		return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
 	}
 	return nil
@@ -131,11 +111,11 @@ func (b *DefaultBinder) Bind(i interface{}, c Context) (err error) {
 	if err := b.BindPathParams(c, i); err != nil {
 		return err
 	}
-	// Only bind query parameters for GET/DELETE/HEAD to avoid unexpected behavior with destination struct binding from body.
-	// For example a request URL `&id=1&lang=en` with body `{"id":100,"lang":"de"}` would lead to precedence issues.
-	// The HTTP method check restores pre-v4.1.11 behavior to avoid these problems (see issue #1670)
-	method := c.Request().Method
-	if method == http.MethodGet || method == http.MethodDelete || method == http.MethodHead {
+	// Issue #1670 - Query params are binded only for GET/DELETE and NOT for usual request with body (POST/PUT/PATCH)
+	// Reasoning here is that parameters in query and bind destination struct could have UNEXPECTED matches and results due that.
+	// i.e. is `&id=1&lang=en` from URL same as `{"id":100,"lang":"de"}` request body and which one should have priority when binding.
+	// This HTTP method check restores pre v4.1.11 behavior and avoids different problems when query is mixed with body
+	if c.Request().Method == http.MethodGet || c.Request().Method == http.MethodDelete {
 		if err = b.BindQueryParams(c, i); err != nil {
 			return err
 		}
@@ -144,41 +124,17 @@ func (b *DefaultBinder) Bind(i interface{}, c Context) (err error) {
 }
 
 // bindData will bind data ONLY fields in destination struct that have EXPLICIT tag
-func (b *DefaultBinder) bindData(destination interface{}, data map[string][]string, tag string, dataFiles map[string][]*multipart.FileHeader) error {
-	if destination == nil || (len(data) == 0 && len(dataFiles) == 0) {
+func (b *DefaultBinder) bindData(destination interface{}, data map[string][]string, tag string) error {
+	if destination == nil || len(data) == 0 {
 		return nil
 	}
-	hasFiles := len(dataFiles) > 0
 	typ := reflect.TypeOf(destination).Elem()
 	val := reflect.ValueOf(destination).Elem()
 
-	// Support binding to limited Map destinations:
-	// - map[string][]string,
-	// - map[string]string <-- (binds first value from data slice)
-	// - map[string]interface{}
-	// You are better off binding to struct but there are user who want this map feature. Source of data for these cases are:
-	// params,query,header,form as these sources produce string values, most of the time slice of strings, actually.
-	if typ.Kind() == reflect.Map && typ.Key().Kind() == reflect.String {
-		k := typ.Elem().Kind()
-		isElemInterface := k == reflect.Interface
-		isElemString := k == reflect.String
-		isElemSliceOfStrings := k == reflect.Slice && typ.Elem().Elem().Kind() == reflect.String
-		if !(isElemSliceOfStrings || isElemString || isElemInterface) {
-			return nil
-		}
-		if val.IsNil() {
-			val.Set(reflect.MakeMap(typ))
-		}
+	// Map
+	if typ.Kind() == reflect.Map {
 		for k, v := range data {
-			if isElemString {
-				val.SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(v[0]))
-			} else if isElemInterface {
-				// To maintain backward compatibility, we always bind to the first string value
-				// and not the slice of strings when dealing with map[string]interface{}{}
-				val.SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(v[0]))
-			} else {
-				val.SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(v))
-			}
+			val.SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(v[0]))
 		}
 		return nil
 	}
@@ -192,7 +148,7 @@ func (b *DefaultBinder) bindData(destination interface{}, data map[string][]stri
 		return errors.New("binding element must be a struct")
 	}
 
-	for i := 0; i < typ.NumField(); i++ { // iterate over all destination fields
+	for i := 0; i < typ.NumField(); i++ {
 		typeField := typ.Field(i)
 		structField := val.Field(i)
 		if typeField.Anonymous {
@@ -205,16 +161,16 @@ func (b *DefaultBinder) bindData(destination interface{}, data map[string][]stri
 		}
 		structFieldKind := structField.Kind()
 		inputFieldName := typeField.Tag.Get(tag)
-		if typeField.Anonymous && structFieldKind == reflect.Struct && inputFieldName != "" {
+		if typeField.Anonymous && structField.Kind() == reflect.Struct && inputFieldName != "" {
 			// if anonymous struct with query/param/form tags, report an error
 			return errors.New("query/param/form tags are not allowed with anonymous struct field")
 		}
 
 		if inputFieldName == "" {
-			// If tag is nil, we inspect if the field is a not BindUnmarshaler struct and try to bind data into it (might contain fields with tags).
-			// structs that implement BindUnmarshaler are bound only when they have explicit tag
+			// If tag is nil, we inspect if the field is a not BindUnmarshaler struct and try to bind data into it (might contains fields with tags).
+			// structs that implement BindUnmarshaler are binded only when they have explicit tag
 			if _, ok := structField.Addr().Interface().(BindUnmarshaler); !ok && structFieldKind == reflect.Struct {
-				if err := b.bindData(structField.Addr().Interface(), data, tag, dataFiles); err != nil {
+				if err := b.bindData(structField.Addr().Interface(), data, tag); err != nil {
 					return err
 				}
 			}
@@ -222,20 +178,10 @@ func (b *DefaultBinder) bindData(destination interface{}, data map[string][]stri
 			continue
 		}
 
-		if hasFiles {
-			if ok, err := isFieldMultipartFile(structField.Type()); err != nil {
-				return err
-			} else if ok {
-				if ok := setMultipartFileHeaderTypes(structField, inputFieldName, dataFiles); ok {
-					continue
-				}
-			}
-		}
-
 		inputValue, exists := data[inputFieldName]
 		if !exists {
-			// Go json.Unmarshal supports case-insensitive binding.  However the
-			// url params are bound case-sensitive which is inconsistent.  To
+			// Go json.Unmarshal supports case insensitive binding.  However the
+			// url params are bound case sensitive which is inconsistent.  To
 			// fix this we must check all of the map values in a
 			// case-insensitive search.
 			for k, v := range data {
@@ -251,46 +197,27 @@ func (b *DefaultBinder) bindData(destination interface{}, data map[string][]stri
 			continue
 		}
 
-		// NOTE: algorithm here is not particularly sophisticated. It probably does not work with absurd types like `**[]*int`
-		// but it is smart enough to handle niche cases like `*int`,`*[]string`,`[]*int` .
-
-		// try unmarshalling first, in case we're dealing with an alias to an array type
-		if ok, err := unmarshalInputsToField(typeField.Type.Kind(), inputValue, structField); ok {
+		// Call this first, in case we're dealing with an alias to an array type
+		if ok, err := unmarshalField(typeField.Type.Kind(), inputValue[0], structField); ok {
 			if err != nil {
 				return err
 			}
 			continue
 		}
 
-		if ok, err := unmarshalInputToField(typeField.Type.Kind(), inputValue[0], structField); ok {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		// we could be dealing with pointer to slice `*[]string` so dereference it. There are weird OpenAPI generators
-		// that could create struct fields like that.
-		if structFieldKind == reflect.Pointer {
-			structFieldKind = structField.Elem().Kind()
-			structField = structField.Elem()
-		}
-
-		if structFieldKind == reflect.Slice {
+		numElems := len(inputValue)
+		if structFieldKind == reflect.Slice && numElems > 0 {
 			sliceOf := structField.Type().Elem().Kind()
-			numElems := len(inputValue)
 			slice := reflect.MakeSlice(structField.Type(), numElems, numElems)
 			for j := 0; j < numElems; j++ {
 				if err := setWithProperType(sliceOf, inputValue[j], slice.Index(j)); err != nil {
 					return err
 				}
 			}
-			structField.Set(slice)
-			continue
-		}
-
-		if err := setWithProperType(structFieldKind, inputValue[0], structField); err != nil {
+			val.Field(i).Set(slice)
+		} else if err := setWithProperType(typeField.Type.Kind(), inputValue[0], structField); err != nil {
 			return err
+
 		}
 	}
 	return nil
@@ -298,7 +225,7 @@ func (b *DefaultBinder) bindData(destination interface{}, data map[string][]stri
 
 func setWithProperType(valueKind reflect.Kind, val string, structField reflect.Value) error {
 	// But also call it here, in case we're dealing with an array of BindUnmarshalers
-	if ok, err := unmarshalInputToField(valueKind, val, structField); ok {
+	if ok, err := unmarshalField(valueKind, val, structField); ok {
 		return err
 	}
 
@@ -339,41 +266,35 @@ func setWithProperType(valueKind reflect.Kind, val string, structField reflect.V
 	return nil
 }
 
-func unmarshalInputsToField(valueKind reflect.Kind, values []string, field reflect.Value) (bool, error) {
-	if valueKind == reflect.Ptr {
-		if field.IsNil() {
-			field.Set(reflect.New(field.Type().Elem()))
-		}
-		field = field.Elem()
+func unmarshalField(valueKind reflect.Kind, val string, field reflect.Value) (bool, error) {
+	switch valueKind {
+	case reflect.Ptr:
+		return unmarshalFieldPtr(val, field)
+	default:
+		return unmarshalFieldNonPtr(val, field)
 	}
-
-	fieldIValue := field.Addr().Interface()
-	unmarshaler, ok := fieldIValue.(bindMultipleUnmarshaler)
-	if !ok {
-		return false, nil
-	}
-	return true, unmarshaler.UnmarshalParams(values)
 }
 
-func unmarshalInputToField(valueKind reflect.Kind, val string, field reflect.Value) (bool, error) {
-	if valueKind == reflect.Ptr {
-		if field.IsNil() {
-			field.Set(reflect.New(field.Type().Elem()))
-		}
-		field = field.Elem()
-	}
-
+func unmarshalFieldNonPtr(value string, field reflect.Value) (bool, error) {
 	fieldIValue := field.Addr().Interface()
-	switch unmarshaler := fieldIValue.(type) {
-	case BindUnmarshaler:
-		return true, unmarshaler.UnmarshalParam(val)
-	case encoding.TextUnmarshaler:
-		return true, unmarshaler.UnmarshalText([]byte(val))
+	if unmarshaler, ok := fieldIValue.(BindUnmarshaler); ok {
+		return true, unmarshaler.UnmarshalParam(value)
+	}
+	if unmarshaler, ok := fieldIValue.(encoding.TextUnmarshaler); ok {
+		return true, unmarshaler.UnmarshalText([]byte(value))
 	}
 
 	return false, nil
 }
 
+func unmarshalFieldPtr(value string, field reflect.Value) (bool, error) {
+	if field.IsNil() {
+		// Initialize the pointer to a nil value
+		field.Set(reflect.New(field.Type().Elem()))
+	}
+	return unmarshalFieldNonPtr(value, field.Elem())
+}
+
 func setIntField(value string, bitSize int, field reflect.Value) error {
 	if value == "" {
 		value = "0"
@@ -417,50 +338,3 @@ func setFloatField(value string, bitSize int, field reflect.Value) error {
 	}
 	return err
 }
-
-var (
-	// NOT supported by bind as you can NOT check easily empty struct being actual file or not
-	multipartFileHeaderType = reflect.TypeOf(multipart.FileHeader{})
-	// supported by bind as you can check by nil value if file existed or not
-	multipartFileHeaderPointerType      = reflect.TypeOf(&multipart.FileHeader{})
-	multipartFileHeaderSliceType        = reflect.TypeOf([]multipart.FileHeader(nil))
-	multipartFileHeaderPointerSliceType = reflect.TypeOf([]*multipart.FileHeader(nil))
-)
-
-func isFieldMultipartFile(field reflect.Type) (bool, error) {
-	switch field {
-	case multipartFileHeaderPointerType,
-		multipartFileHeaderSliceType,
-		multipartFileHeaderPointerSliceType:
-		return true, nil
-	case multipartFileHeaderType:
-		return true, errors.New("binding to multipart.FileHeader struct is not supported, use pointer to struct")
-	default:
-		return false, nil
-	}
-}
-
-func setMultipartFileHeaderTypes(structField reflect.Value, inputFieldName string, files map[string][]*multipart.FileHeader) bool {
-	fileHeaders := files[inputFieldName]
-	if len(fileHeaders) == 0 {
-		return false
-	}
-
-	result := true
-	switch structField.Type() {
-	case multipartFileHeaderPointerSliceType:
-		structField.Set(reflect.ValueOf(fileHeaders))
-	case multipartFileHeaderSliceType:
-		headers := make([]multipart.FileHeader, len(fileHeaders))
-		for i, fileHeader := range fileHeaders {
-			headers[i] = *fileHeader
-		}
-		structField.Set(reflect.ValueOf(headers))
-	case multipartFileHeaderPointerType:
-		structField.Set(reflect.ValueOf(fileHeaders[0]))
-	default:
-		result = false
-	}
-
-	return result
-}
diff --git a/vendor/github.com/labstack/echo/v4/binder.go b/vendor/github.com/labstack/echo/v4/binder.go
index da15ae8..0900ce8 100644
--- a/vendor/github.com/labstack/echo/v4/binder.go
+++ b/vendor/github.com/labstack/echo/v4/binder.go
@@ -1,11 +1,6 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
-	"encoding"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -57,11 +52,8 @@ import (
 		* time
 		* duration
 		* BindUnmarshaler() interface
-		* TextUnmarshaler() interface
-		* JSONUnmarshaler() interface
 		* UnixTime() - converts unix time (integer) to time.Time
-		* UnixTimeMilli() - converts unix time with millisecond precision (integer) to time.Time
-		* UnixTimeNano() - converts unix time with nanosecond precision (integer) to time.Time
+		* UnixTimeNano() - converts unix time with nano second precision (integer) to time.Time
 		* CustomFunc() - callback function for your custom conversion logic. Signature `func(values []string) []error`
 */
 
@@ -69,9 +61,9 @@ import (
 type BindingError struct {
 	// Field is the field name where value binding failed
 	Field string `json:"field"`
-	*HTTPError
 	// Values of parameter that failed to bind.
 	Values []string `json:"-"`
+	*HTTPError
 }
 
 // NewBindingError creates new instance of binding error
@@ -94,15 +86,16 @@ func (be *BindingError) Error() string {
 
 // ValueBinder provides utility methods for binding query or path parameter to various Go built-in types
 type ValueBinder struct {
+	// failFast is flag for binding methods to return without attempting to bind when previous binding already failed
+	failFast bool
+	errors   []error
+
 	// ValueFunc is used to get single parameter (first) value from request
 	ValueFunc func(sourceParam string) string
 	// ValuesFunc is used to get all values for parameter from request. i.e. `/api/search?ids=1&ids=2`
 	ValuesFunc func(sourceParam string) []string
 	// ErrorFunc is used to create errors. Allows you to use your own error type, that for example marshals to your specific json response
 	ErrorFunc func(sourceParam string, values []string, message interface{}, internalError error) error
-	errors    []error
-	// failFast is flag for binding methods to return without attempting to bind when previous binding already failed
-	failFast bool
 }
 
 // QueryParamsBinder creates query parameter value binder
@@ -211,7 +204,7 @@ func (b *ValueBinder) CustomFunc(sourceParam string, customFunc func(values []st
 	return b.customFunc(sourceParam, customFunc, false)
 }
 
-// MustCustomFunc requires parameter values to exist to bind with Func. Returns error when value does not exist.
+// MustCustomFunc requires parameter values to exist to be bind with Func. Returns error when value does not exist.
 func (b *ValueBinder) MustCustomFunc(sourceParam string, customFunc func(values []string) []error) *ValueBinder {
 	return b.customFunc(sourceParam, customFunc, true)
 }
@@ -248,7 +241,7 @@ func (b *ValueBinder) String(sourceParam string, dest *string) *ValueBinder {
 	return b
 }
 
-// MustString requires parameter value to exist to bind to string variable. Returns error when value does not exist
+// MustString requires parameter value to exist to be bind to string variable. Returns error when value does not exist
 func (b *ValueBinder) MustString(sourceParam string, dest *string) *ValueBinder {
 	if b.failFast && b.errors != nil {
 		return b
@@ -277,7 +270,7 @@ func (b *ValueBinder) Strings(sourceParam string, dest *[]string) *ValueBinder {
 	return b
 }
 
-// MustStrings requires parameter values to exist to bind to slice of string variables. Returns error when value does not exist
+// MustStrings requires parameter values to exist to be bind to slice of string variables. Returns error when value does not exist
 func (b *ValueBinder) MustStrings(sourceParam string, dest *[]string) *ValueBinder {
 	if b.failFast && b.errors != nil {
 		return b
@@ -309,7 +302,7 @@ func (b *ValueBinder) BindUnmarshaler(sourceParam string, dest BindUnmarshaler)
 	return b
 }
 
-// MustBindUnmarshaler requires parameter value to exist to bind to destination implementing BindUnmarshaler interface.
+// MustBindUnmarshaler requires parameter value to exist to be bind to destination implementing BindUnmarshaler interface.
 // Returns error when value does not exist
 func (b *ValueBinder) MustBindUnmarshaler(sourceParam string, dest BindUnmarshaler) *ValueBinder {
 	if b.failFast && b.errors != nil {
@@ -328,85 +321,13 @@ func (b *ValueBinder) MustBindUnmarshaler(sourceParam string, dest BindUnmarshal
 	return b
 }
 
-// JSONUnmarshaler binds parameter to destination implementing json.Unmarshaler interface
-func (b *ValueBinder) JSONUnmarshaler(sourceParam string, dest json.Unmarshaler) *ValueBinder {
-	if b.failFast && b.errors != nil {
-		return b
-	}
-
-	tmp := b.ValueFunc(sourceParam)
-	if tmp == "" {
-		return b
-	}
-
-	if err := dest.UnmarshalJSON([]byte(tmp)); err != nil {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "failed to bind field value to json.Unmarshaler interface", err))
-	}
-	return b
-}
-
-// MustJSONUnmarshaler requires parameter value to exist to bind to destination implementing json.Unmarshaler interface.
-// Returns error when value does not exist
-func (b *ValueBinder) MustJSONUnmarshaler(sourceParam string, dest json.Unmarshaler) *ValueBinder {
-	if b.failFast && b.errors != nil {
-		return b
-	}
-
-	tmp := b.ValueFunc(sourceParam)
-	if tmp == "" {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "required field value is empty", nil))
-		return b
-	}
-
-	if err := dest.UnmarshalJSON([]byte(tmp)); err != nil {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "failed to bind field value to json.Unmarshaler interface", err))
-	}
-	return b
-}
-
-// TextUnmarshaler binds parameter to destination implementing encoding.TextUnmarshaler interface
-func (b *ValueBinder) TextUnmarshaler(sourceParam string, dest encoding.TextUnmarshaler) *ValueBinder {
-	if b.failFast && b.errors != nil {
-		return b
-	}
-
-	tmp := b.ValueFunc(sourceParam)
-	if tmp == "" {
-		return b
-	}
-
-	if err := dest.UnmarshalText([]byte(tmp)); err != nil {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "failed to bind field value to encoding.TextUnmarshaler interface", err))
-	}
-	return b
-}
-
-// MustTextUnmarshaler requires parameter value to exist to bind to destination implementing encoding.TextUnmarshaler interface.
-// Returns error when value does not exist
-func (b *ValueBinder) MustTextUnmarshaler(sourceParam string, dest encoding.TextUnmarshaler) *ValueBinder {
-	if b.failFast && b.errors != nil {
-		return b
-	}
-
-	tmp := b.ValueFunc(sourceParam)
-	if tmp == "" {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "required field value is empty", nil))
-		return b
-	}
-
-	if err := dest.UnmarshalText([]byte(tmp)); err != nil {
-		b.setError(b.ErrorFunc(sourceParam, []string{tmp}, "failed to bind field value to encoding.TextUnmarshaler interface", err))
-	}
-	return b
-}
-
 // BindWithDelimiter binds parameter to destination by suitable conversion function.
 // Delimiter is used before conversion to split parameter value to separate values
 func (b *ValueBinder) BindWithDelimiter(sourceParam string, dest interface{}, delimiter string) *ValueBinder {
 	return b.bindWithDelimiter(sourceParam, dest, delimiter, false)
 }
 
-// MustBindWithDelimiter requires parameter value to exist to bind destination by suitable conversion function.
+// MustBindWithDelimiter requires parameter value to exist to be bind destination by suitable conversion function.
 // Delimiter is used before conversion to split parameter value to separate values
 func (b *ValueBinder) MustBindWithDelimiter(sourceParam string, dest interface{}, delimiter string) *ValueBinder {
 	return b.bindWithDelimiter(sourceParam, dest, delimiter, true)
@@ -455,7 +376,7 @@ func (b *ValueBinder) Int64(sourceParam string, dest *int64) *ValueBinder {
 	return b.intValue(sourceParam, dest, 64, false)
 }
 
-// MustInt64 requires parameter value to exist to bind to int64 variable. Returns error when value does not exist
+// MustInt64 requires parameter value to exist to be bind to int64 variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt64(sourceParam string, dest *int64) *ValueBinder {
 	return b.intValue(sourceParam, dest, 64, true)
 }
@@ -465,7 +386,7 @@ func (b *ValueBinder) Int32(sourceParam string, dest *int32) *ValueBinder {
 	return b.intValue(sourceParam, dest, 32, false)
 }
 
-// MustInt32 requires parameter value to exist to bind to int32 variable. Returns error when value does not exist
+// MustInt32 requires parameter value to exist to be bind to int32 variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt32(sourceParam string, dest *int32) *ValueBinder {
 	return b.intValue(sourceParam, dest, 32, true)
 }
@@ -475,7 +396,7 @@ func (b *ValueBinder) Int16(sourceParam string, dest *int16) *ValueBinder {
 	return b.intValue(sourceParam, dest, 16, false)
 }
 
-// MustInt16 requires parameter value to exist to bind to int16 variable. Returns error when value does not exist
+// MustInt16 requires parameter value to exist to be bind to int16 variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt16(sourceParam string, dest *int16) *ValueBinder {
 	return b.intValue(sourceParam, dest, 16, true)
 }
@@ -485,7 +406,7 @@ func (b *ValueBinder) Int8(sourceParam string, dest *int8) *ValueBinder {
 	return b.intValue(sourceParam, dest, 8, false)
 }
 
-// MustInt8 requires parameter value to exist to bind to int8 variable. Returns error when value does not exist
+// MustInt8 requires parameter value to exist to be bind to int8 variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt8(sourceParam string, dest *int8) *ValueBinder {
 	return b.intValue(sourceParam, dest, 8, true)
 }
@@ -495,7 +416,7 @@ func (b *ValueBinder) Int(sourceParam string, dest *int) *ValueBinder {
 	return b.intValue(sourceParam, dest, 0, false)
 }
 
-// MustInt requires parameter value to exist to bind to int variable. Returns error when value does not exist
+// MustInt requires parameter value to exist to be bind to int variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt(sourceParam string, dest *int) *ValueBinder {
 	return b.intValue(sourceParam, dest, 0, true)
 }
@@ -623,7 +544,7 @@ func (b *ValueBinder) Int64s(sourceParam string, dest *[]int64) *ValueBinder {
 	return b.intsValue(sourceParam, dest, false)
 }
 
-// MustInt64s requires parameter value to exist to bind to int64 slice variable. Returns error when value does not exist
+// MustInt64s requires parameter value to exist to be bind to int64 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt64s(sourceParam string, dest *[]int64) *ValueBinder {
 	return b.intsValue(sourceParam, dest, true)
 }
@@ -633,7 +554,7 @@ func (b *ValueBinder) Int32s(sourceParam string, dest *[]int32) *ValueBinder {
 	return b.intsValue(sourceParam, dest, false)
 }
 
-// MustInt32s requires parameter value to exist to bind to int32 slice variable. Returns error when value does not exist
+// MustInt32s requires parameter value to exist to be bind to int32 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt32s(sourceParam string, dest *[]int32) *ValueBinder {
 	return b.intsValue(sourceParam, dest, true)
 }
@@ -643,7 +564,7 @@ func (b *ValueBinder) Int16s(sourceParam string, dest *[]int16) *ValueBinder {
 	return b.intsValue(sourceParam, dest, false)
 }
 
-// MustInt16s requires parameter value to exist to bind to int16 slice variable. Returns error when value does not exist
+// MustInt16s requires parameter value to exist to be bind to int16 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt16s(sourceParam string, dest *[]int16) *ValueBinder {
 	return b.intsValue(sourceParam, dest, true)
 }
@@ -653,7 +574,7 @@ func (b *ValueBinder) Int8s(sourceParam string, dest *[]int8) *ValueBinder {
 	return b.intsValue(sourceParam, dest, false)
 }
 
-// MustInt8s requires parameter value to exist to bind to int8 slice variable. Returns error when value does not exist
+// MustInt8s requires parameter value to exist to be bind to int8 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustInt8s(sourceParam string, dest *[]int8) *ValueBinder {
 	return b.intsValue(sourceParam, dest, true)
 }
@@ -663,7 +584,7 @@ func (b *ValueBinder) Ints(sourceParam string, dest *[]int) *ValueBinder {
 	return b.intsValue(sourceParam, dest, false)
 }
 
-// MustInts requires parameter value to exist to bind to int slice variable. Returns error when value does not exist
+// MustInts requires parameter value to exist to be bind to int slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustInts(sourceParam string, dest *[]int) *ValueBinder {
 	return b.intsValue(sourceParam, dest, true)
 }
@@ -673,7 +594,7 @@ func (b *ValueBinder) Uint64(sourceParam string, dest *uint64) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 64, false)
 }
 
-// MustUint64 requires parameter value to exist to bind to uint64 variable. Returns error when value does not exist
+// MustUint64 requires parameter value to exist to be bind to uint64 variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint64(sourceParam string, dest *uint64) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 64, true)
 }
@@ -683,7 +604,7 @@ func (b *ValueBinder) Uint32(sourceParam string, dest *uint32) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 32, false)
 }
 
-// MustUint32 requires parameter value to exist to bind to uint32 variable. Returns error when value does not exist
+// MustUint32 requires parameter value to exist to be bind to uint32 variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint32(sourceParam string, dest *uint32) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 32, true)
 }
@@ -693,7 +614,7 @@ func (b *ValueBinder) Uint16(sourceParam string, dest *uint16) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 16, false)
 }
 
-// MustUint16 requires parameter value to exist to bind to uint16 variable. Returns error when value does not exist
+// MustUint16 requires parameter value to exist to be bind to uint16 variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint16(sourceParam string, dest *uint16) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 16, true)
 }
@@ -703,7 +624,7 @@ func (b *ValueBinder) Uint8(sourceParam string, dest *uint8) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 8, false)
 }
 
-// MustUint8 requires parameter value to exist to bind to uint8 variable. Returns error when value does not exist
+// MustUint8 requires parameter value to exist to be bind to uint8 variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint8(sourceParam string, dest *uint8) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 8, true)
 }
@@ -713,7 +634,7 @@ func (b *ValueBinder) Byte(sourceParam string, dest *byte) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 8, false)
 }
 
-// MustByte requires parameter value to exist to bind to byte variable. Returns error when value does not exist
+// MustByte requires parameter value to exist to be bind to byte variable. Returns error when value does not exist
 func (b *ValueBinder) MustByte(sourceParam string, dest *byte) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 8, true)
 }
@@ -723,7 +644,7 @@ func (b *ValueBinder) Uint(sourceParam string, dest *uint) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 0, false)
 }
 
-// MustUint requires parameter value to exist to bind to uint variable. Returns error when value does not exist
+// MustUint requires parameter value to exist to be bind to uint variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint(sourceParam string, dest *uint) *ValueBinder {
 	return b.uintValue(sourceParam, dest, 0, true)
 }
@@ -851,7 +772,7 @@ func (b *ValueBinder) Uint64s(sourceParam string, dest *[]uint64) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, false)
 }
 
-// MustUint64s requires parameter value to exist to bind to uint64 slice variable. Returns error when value does not exist
+// MustUint64s requires parameter value to exist to be bind to uint64 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint64s(sourceParam string, dest *[]uint64) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, true)
 }
@@ -861,7 +782,7 @@ func (b *ValueBinder) Uint32s(sourceParam string, dest *[]uint32) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, false)
 }
 
-// MustUint32s requires parameter value to exist to bind to uint32 slice variable. Returns error when value does not exist
+// MustUint32s requires parameter value to exist to be bind to uint32 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint32s(sourceParam string, dest *[]uint32) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, true)
 }
@@ -871,7 +792,7 @@ func (b *ValueBinder) Uint16s(sourceParam string, dest *[]uint16) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, false)
 }
 
-// MustUint16s requires parameter value to exist to bind to uint16 slice variable. Returns error when value does not exist
+// MustUint16s requires parameter value to exist to be bind to uint16 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint16s(sourceParam string, dest *[]uint16) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, true)
 }
@@ -881,7 +802,7 @@ func (b *ValueBinder) Uint8s(sourceParam string, dest *[]uint8) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, false)
 }
 
-// MustUint8s requires parameter value to exist to bind to uint8 slice variable. Returns error when value does not exist
+// MustUint8s requires parameter value to exist to be bind to uint8 slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustUint8s(sourceParam string, dest *[]uint8) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, true)
 }
@@ -891,7 +812,7 @@ func (b *ValueBinder) Uints(sourceParam string, dest *[]uint) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, false)
 }
 
-// MustUints requires parameter value to exist to bind to uint slice variable. Returns error when value does not exist
+// MustUints requires parameter value to exist to be bind to uint slice variable. Returns error when value does not exist
 func (b *ValueBinder) MustUints(sourceParam string, dest *[]uint) *ValueBinder {
 	return b.uintsValue(sourceParam, dest, true)
 }
@@ -901,7 +822,7 @@ func (b *ValueBinder) Bool(sourceParam string, dest *bool) *ValueBinder {
 	return b.boolValue(sourceParam, dest, false)
 }
 
-// MustBool requires parameter value to exist to bind to bool variable. Returns error when value does not exist
+// MustBool requires parameter value to exist to be bind to bool variable. Returns error when value does not exist
 func (b *ValueBinder) MustBool(sourceParam string, dest *bool) *ValueBinder {
 	return b.boolValue(sourceParam, dest, true)
 }
@@ -966,7 +887,7 @@ func (b *ValueBinder) Bools(sourceParam string, dest *[]bool) *ValueBinder {
 	return b.boolsValue(sourceParam, dest, false)
 }
 
-// MustBools requires parameter values to exist to bind to slice of bool variables. Returns error when values does not exist
+// MustBools requires parameter values to exist to be bind to slice of bool variables. Returns error when values does not exist
 func (b *ValueBinder) MustBools(sourceParam string, dest *[]bool) *ValueBinder {
 	return b.boolsValue(sourceParam, dest, true)
 }
@@ -976,7 +897,7 @@ func (b *ValueBinder) Float64(sourceParam string, dest *float64) *ValueBinder {
 	return b.floatValue(sourceParam, dest, 64, false)
 }
 
-// MustFloat64 requires parameter value to exist to bind to float64 variable. Returns error when value does not exist
+// MustFloat64 requires parameter value to exist to be bind to float64 variable. Returns error when value does not exist
 func (b *ValueBinder) MustFloat64(sourceParam string, dest *float64) *ValueBinder {
 	return b.floatValue(sourceParam, dest, 64, true)
 }
@@ -986,7 +907,7 @@ func (b *ValueBinder) Float32(sourceParam string, dest *float32) *ValueBinder {
 	return b.floatValue(sourceParam, dest, 32, false)
 }
 
-// MustFloat32 requires parameter value to exist to bind to float32 variable. Returns error when value does not exist
+// MustFloat32 requires parameter value to exist to be bind to float32 variable. Returns error when value does not exist
 func (b *ValueBinder) MustFloat32(sourceParam string, dest *float32) *ValueBinder {
 	return b.floatValue(sourceParam, dest, 32, true)
 }
@@ -1071,7 +992,7 @@ func (b *ValueBinder) Float64s(sourceParam string, dest *[]float64) *ValueBinder
 	return b.floatsValue(sourceParam, dest, false)
 }
 
-// MustFloat64s requires parameter values to exist to bind to slice of float64 variables. Returns error when values does not exist
+// MustFloat64s requires parameter values to exist to be bind to slice of float64 variables. Returns error when values does not exist
 func (b *ValueBinder) MustFloat64s(sourceParam string, dest *[]float64) *ValueBinder {
 	return b.floatsValue(sourceParam, dest, true)
 }
@@ -1081,7 +1002,7 @@ func (b *ValueBinder) Float32s(sourceParam string, dest *[]float32) *ValueBinder
 	return b.floatsValue(sourceParam, dest, false)
 }
 
-// MustFloat32s requires parameter values to exist to bind to slice of float32 variables. Returns error when values does not exist
+// MustFloat32s requires parameter values to exist to be bind to slice of float32 variables. Returns error when values does not exist
 func (b *ValueBinder) MustFloat32s(sourceParam string, dest *[]float32) *ValueBinder {
 	return b.floatsValue(sourceParam, dest, true)
 }
@@ -1091,7 +1012,7 @@ func (b *ValueBinder) Time(sourceParam string, dest *time.Time, layout string) *
 	return b.time(sourceParam, dest, layout, false)
 }
 
-// MustTime requires parameter value to exist to bind to time.Time variable. Returns error when value does not exist
+// MustTime requires parameter value to exist to be bind to time.Time variable. Returns error when value does not exist
 func (b *ValueBinder) MustTime(sourceParam string, dest *time.Time, layout string) *ValueBinder {
 	return b.time(sourceParam, dest, layout, true)
 }
@@ -1122,7 +1043,7 @@ func (b *ValueBinder) Times(sourceParam string, dest *[]time.Time, layout string
 	return b.times(sourceParam, dest, layout, false)
 }
 
-// MustTimes requires parameter values to exist to bind to slice of time.Time variables. Returns error when values does not exist
+// MustTimes requires parameter values to exist to be bind to slice of time.Time variables. Returns error when values does not exist
 func (b *ValueBinder) MustTimes(sourceParam string, dest *[]time.Time, layout string) *ValueBinder {
 	return b.times(sourceParam, dest, layout, true)
 }
@@ -1163,7 +1084,7 @@ func (b *ValueBinder) Duration(sourceParam string, dest *time.Duration) *ValueBi
 	return b.duration(sourceParam, dest, false)
 }
 
-// MustDuration requires parameter value to exist to bind to time.Duration variable. Returns error when value does not exist
+// MustDuration requires parameter value to exist to be bind to time.Duration variable. Returns error when value does not exist
 func (b *ValueBinder) MustDuration(sourceParam string, dest *time.Duration) *ValueBinder {
 	return b.duration(sourceParam, dest, true)
 }
@@ -1194,7 +1115,7 @@ func (b *ValueBinder) Durations(sourceParam string, dest *[]time.Duration) *Valu
 	return b.durationsValue(sourceParam, dest, false)
 }
 
-// MustDurations requires parameter values to exist to bind to slice of time.Duration variables. Returns error when values does not exist
+// MustDurations requires parameter values to exist to be bind to slice of time.Duration variables. Returns error when values does not exist
 func (b *ValueBinder) MustDurations(sourceParam string, dest *[]time.Duration) *ValueBinder {
 	return b.durationsValue(sourceParam, dest, true)
 }
@@ -1238,57 +1159,36 @@ func (b *ValueBinder) durations(sourceParam string, values []string, dest *[]tim
 // Example: 1609180603 bind to 2020-12-28T18:36:43.000000000+00:00
 //
 // Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) UnixTime(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, false, time.Second)
+	return b.unixTime(sourceParam, dest, false, false)
 }
 
-// MustUnixTime requires parameter value to exist to bind to time.Duration variable (in local time corresponding
+// MustUnixTime requires parameter value to exist to be bind to time.Duration variable  (in local Time corresponding
 // to the given Unix time). Returns error when value does not exist.
 //
 // Example: 1609180603 bind to 2020-12-28T18:36:43.000000000+00:00
 //
 // Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) MustUnixTime(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, true, time.Second)
+	return b.unixTime(sourceParam, dest, true, false)
 }
 
-// UnixTimeMilli binds parameter to time.Time variable (in local time corresponding to the given Unix time in millisecond precision).
-//
-// Example: 1647184410140 bind to 2022-03-13T15:13:30.140000000+00:00
-//
-// Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-func (b *ValueBinder) UnixTimeMilli(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, false, time.Millisecond)
-}
-
-// MustUnixTimeMilli requires parameter value to exist to bind to time.Duration variable  (in local time corresponding
-// to the given Unix time in millisecond precision). Returns error when value does not exist.
-//
-// Example: 1647184410140 bind to 2022-03-13T15:13:30.140000000+00:00
-//
-// Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-func (b *ValueBinder) MustUnixTimeMilli(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, true, time.Millisecond)
-}
-
-// UnixTimeNano binds parameter to time.Time variable (in local time corresponding to the given Unix time in nanosecond precision).
+// UnixTimeNano binds parameter to time.Time variable (in local Time corresponding to the given Unix time in nano second precision).
 //
 // Example: 1609180603123456789 binds to 2020-12-28T18:36:43.123456789+00:00
 // Example:          1000000000 binds to 1970-01-01T00:00:01.000000000+00:00
 // Example:           999999999 binds to 1970-01-01T00:00:00.999999999+00:00
 //
 // Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-//   - Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
+//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//  * Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
 func (b *ValueBinder) UnixTimeNano(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, false, time.Nanosecond)
+	return b.unixTime(sourceParam, dest, false, true)
 }
 
-// MustUnixTimeNano requires parameter value to exist to bind to time.Duration variable  (in local Time corresponding
+// MustUnixTimeNano requires parameter value to exist to be bind to time.Duration variable  (in local Time corresponding
 // to the given Unix time value in nano second precision). Returns error when value does not exist.
 //
 // Example: 1609180603123456789 binds to 2020-12-28T18:36:43.123456789+00:00
@@ -1296,13 +1196,13 @@ func (b *ValueBinder) UnixTimeNano(sourceParam string, dest *time.Time) *ValueBi
 // Example:           999999999 binds to 1970-01-01T00:00:00.999999999+00:00
 //
 // Note:
-//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-//   - Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
+//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//  * Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
 func (b *ValueBinder) MustUnixTimeNano(sourceParam string, dest *time.Time) *ValueBinder {
-	return b.unixTime(sourceParam, dest, true, time.Nanosecond)
+	return b.unixTime(sourceParam, dest, true, true)
 }
 
-func (b *ValueBinder) unixTime(sourceParam string, dest *time.Time, valueMustExist bool, precision time.Duration) *ValueBinder {
+func (b *ValueBinder) unixTime(sourceParam string, dest *time.Time, valueMustExist bool, isNano bool) *ValueBinder {
 	if b.failFast && b.errors != nil {
 		return b
 	}
@@ -1321,13 +1221,10 @@ func (b *ValueBinder) unixTime(sourceParam string, dest *time.Time, valueMustExi
 		return b
 	}
 
-	switch precision {
-	case time.Second:
-		*dest = time.Unix(n, 0)
-	case time.Millisecond:
-		*dest = time.UnixMilli(n)
-	case time.Nanosecond:
+	if isNano {
 		*dest = time.Unix(0, n)
+	} else {
+		*dest = time.Unix(n, 0)
 	}
 	return b
 }
diff --git a/vendor/github.com/labstack/echo/v4/context.go b/vendor/github.com/labstack/echo/v4/context.go
index f5dd5a6..91ab6e4 100644
--- a/vendor/github.com/labstack/echo/v4/context.go
+++ b/vendor/github.com/labstack/echo/v4/context.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
@@ -12,226 +9,205 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 )
 
-// Context represents the context of the current HTTP request. It holds request and
-// response objects, path, path parameters, data and registered handler.
-type Context interface {
-	// Request returns `*http.Request`.
-	Request() *http.Request
+type (
+	// Context represents the context of the current HTTP request. It holds request and
+	// response objects, path, path parameters, data and registered handler.
+	Context interface {
+		// Request returns `*http.Request`.
+		Request() *http.Request
 
-	// SetRequest sets `*http.Request`.
-	SetRequest(r *http.Request)
+		// SetRequest sets `*http.Request`.
+		SetRequest(r *http.Request)
 
-	// SetResponse sets `*Response`.
-	SetResponse(r *Response)
+		// SetResponse sets `*Response`.
+		SetResponse(r *Response)
 
-	// Response returns `*Response`.
-	Response() *Response
+		// Response returns `*Response`.
+		Response() *Response
 
-	// IsTLS returns true if HTTP connection is TLS otherwise false.
-	IsTLS() bool
+		// IsTLS returns true if HTTP connection is TLS otherwise false.
+		IsTLS() bool
 
-	// IsWebSocket returns true if HTTP connection is WebSocket otherwise false.
-	IsWebSocket() bool
+		// IsWebSocket returns true if HTTP connection is WebSocket otherwise false.
+		IsWebSocket() bool
 
-	// Scheme returns the HTTP protocol scheme, `http` or `https`.
-	Scheme() string
+		// Scheme returns the HTTP protocol scheme, `http` or `https`.
+		Scheme() string
 
-	// RealIP returns the client's network address based on `X-Forwarded-For`
-	// or `X-Real-IP` request header.
-	// The behavior can be configured using `Echo#IPExtractor`.
-	RealIP() string
+		// RealIP returns the client's network address based on `X-Forwarded-For`
+		// or `X-Real-IP` request header.
+		// The behavior can be configured using `Echo#IPExtractor`.
+		RealIP() string
 
-	// Path returns the registered path for the handler.
-	Path() string
+		// Path returns the registered path for the handler.
+		Path() string
 
-	// SetPath sets the registered path for the handler.
-	SetPath(p string)
+		// SetPath sets the registered path for the handler.
+		SetPath(p string)
 
-	// Param returns path parameter by name.
-	Param(name string) string
+		// Param returns path parameter by name.
+		Param(name string) string
 
-	// ParamNames returns path parameter names.
-	ParamNames() []string
+		// ParamNames returns path parameter names.
+		ParamNames() []string
 
-	// SetParamNames sets path parameter names.
-	SetParamNames(names ...string)
+		// SetParamNames sets path parameter names.
+		SetParamNames(names ...string)
 
-	// ParamValues returns path parameter values.
-	ParamValues() []string
+		// ParamValues returns path parameter values.
+		ParamValues() []string
 
-	// SetParamValues sets path parameter values.
-	SetParamValues(values ...string)
+		// SetParamValues sets path parameter values.
+		SetParamValues(values ...string)
 
-	// QueryParam returns the query param for the provided name.
-	QueryParam(name string) string
+		// QueryParam returns the query param for the provided name.
+		QueryParam(name string) string
 
-	// QueryParams returns the query parameters as `url.Values`.
-	QueryParams() url.Values
+		// QueryParams returns the query parameters as `url.Values`.
+		QueryParams() url.Values
 
-	// QueryString returns the URL query string.
-	QueryString() string
+		// QueryString returns the URL query string.
+		QueryString() string
 
-	// FormValue returns the form field value for the provided name.
-	FormValue(name string) string
+		// FormValue returns the form field value for the provided name.
+		FormValue(name string) string
 
-	// FormParams returns the form parameters as `url.Values`.
-	FormParams() (url.Values, error)
+		// FormParams returns the form parameters as `url.Values`.
+		FormParams() (url.Values, error)
 
-	// FormFile returns the multipart form file for the provided name.
-	FormFile(name string) (*multipart.FileHeader, error)
+		// FormFile returns the multipart form file for the provided name.
+		FormFile(name string) (*multipart.FileHeader, error)
 
-	// MultipartForm returns the multipart form.
-	MultipartForm() (*multipart.Form, error)
+		// MultipartForm returns the multipart form.
+		MultipartForm() (*multipart.Form, error)
 
-	// Cookie returns the named cookie provided in the request.
-	Cookie(name string) (*http.Cookie, error)
+		// Cookie returns the named cookie provided in the request.
+		Cookie(name string) (*http.Cookie, error)
 
-	// SetCookie adds a `Set-Cookie` header in HTTP response.
-	SetCookie(cookie *http.Cookie)
+		// SetCookie adds a `Set-Cookie` header in HTTP response.
+		SetCookie(cookie *http.Cookie)
 
-	// Cookies returns the HTTP cookies sent with the request.
-	Cookies() []*http.Cookie
+		// Cookies returns the HTTP cookies sent with the request.
+		Cookies() []*http.Cookie
 
-	// Get retrieves data from the context.
-	Get(key string) interface{}
+		// Get retrieves data from the context.
+		Get(key string) interface{}
 
-	// Set saves data in the context.
-	Set(key string, val interface{})
+		// Set saves data in the context.
+		Set(key string, val interface{})
 
-	// Bind binds path params, query params and the request body into provided type `i`. The default binder
-	// binds body based on Content-Type header.
-	Bind(i interface{}) error
+		// Bind binds the request body into provided type `i`. The default binder
+		// does it based on Content-Type header.
+		Bind(i interface{}) error
 
-	// Validate validates provided `i`. It is usually called after `Context#Bind()`.
-	// Validator must be registered using `Echo#Validator`.
-	Validate(i interface{}) error
+		// Validate validates provided `i`. It is usually called after `Context#Bind()`.
+		// Validator must be registered using `Echo#Validator`.
+		Validate(i interface{}) error
 
-	// Render renders a template with data and sends a text/html response with status
-	// code. Renderer must be registered using `Echo.Renderer`.
-	Render(code int, name string, data interface{}) error
+		// Render renders a template with data and sends a text/html response with status
+		// code. Renderer must be registered using `Echo.Renderer`.
+		Render(code int, name string, data interface{}) error
 
-	// HTML sends an HTTP response with status code.
-	HTML(code int, html string) error
+		// HTML sends an HTTP response with status code.
+		HTML(code int, html string) error
 
-	// HTMLBlob sends an HTTP blob response with status code.
-	HTMLBlob(code int, b []byte) error
+		// HTMLBlob sends an HTTP blob response with status code.
+		HTMLBlob(code int, b []byte) error
 
-	// String sends a string response with status code.
-	String(code int, s string) error
+		// String sends a string response with status code.
+		String(code int, s string) error
 
-	// JSON sends a JSON response with status code.
-	JSON(code int, i interface{}) error
+		// JSON sends a JSON response with status code.
+		JSON(code int, i interface{}) error
 
-	// JSONPretty sends a pretty-print JSON with status code.
-	JSONPretty(code int, i interface{}, indent string) error
+		// JSONPretty sends a pretty-print JSON with status code.
+		JSONPretty(code int, i interface{}, indent string) error
 
-	// JSONBlob sends a JSON blob response with status code.
-	JSONBlob(code int, b []byte) error
+		// JSONBlob sends a JSON blob response with status code.
+		JSONBlob(code int, b []byte) error
 
-	// JSONP sends a JSONP response with status code. It uses `callback` to construct
-	// the JSONP payload.
-	JSONP(code int, callback string, i interface{}) error
+		// JSONP sends a JSONP response with status code. It uses `callback` to construct
+		// the JSONP payload.
+		JSONP(code int, callback string, i interface{}) error
 
-	// JSONPBlob sends a JSONP blob response with status code. It uses `callback`
-	// to construct the JSONP payload.
-	JSONPBlob(code int, callback string, b []byte) error
+		// JSONPBlob sends a JSONP blob response with status code. It uses `callback`
+		// to construct the JSONP payload.
+		JSONPBlob(code int, callback string, b []byte) error
 
-	// XML sends an XML response with status code.
-	XML(code int, i interface{}) error
+		// XML sends an XML response with status code.
+		XML(code int, i interface{}) error
 
-	// XMLPretty sends a pretty-print XML with status code.
-	XMLPretty(code int, i interface{}, indent string) error
+		// XMLPretty sends a pretty-print XML with status code.
+		XMLPretty(code int, i interface{}, indent string) error
 
-	// XMLBlob sends an XML blob response with status code.
-	XMLBlob(code int, b []byte) error
+		// XMLBlob sends an XML blob response with status code.
+		XMLBlob(code int, b []byte) error
 
-	// Blob sends a blob response with status code and content type.
-	Blob(code int, contentType string, b []byte) error
+		// Blob sends a blob response with status code and content type.
+		Blob(code int, contentType string, b []byte) error
 
-	// Stream sends a streaming response with status code and content type.
-	Stream(code int, contentType string, r io.Reader) error
+		// Stream sends a streaming response with status code and content type.
+		Stream(code int, contentType string, r io.Reader) error
 
-	// File sends a response with the content of the file.
-	File(file string) error
+		// File sends a response with the content of the file.
+		File(file string) error
 
-	// Attachment sends a response as attachment, prompting client to save the
-	// file.
-	Attachment(file string, name string) error
+		// Attachment sends a response as attachment, prompting client to save the
+		// file.
+		Attachment(file string, name string) error
 
-	// Inline sends a response as inline, opening the file in the browser.
-	Inline(file string, name string) error
+		// Inline sends a response as inline, opening the file in the browser.
+		Inline(file string, name string) error
 
-	// NoContent sends a response with no body and a status code.
-	NoContent(code int) error
+		// NoContent sends a response with no body and a status code.
+		NoContent(code int) error
 
-	// Redirect redirects the request to a provided URL with status code.
-	Redirect(code int, url string) error
+		// Redirect redirects the request to a provided URL with status code.
+		Redirect(code int, url string) error
 
-	// Error invokes the registered global HTTP error handler. Generally used by middleware.
-	// A side-effect of calling global error handler is that now Response has been committed (sent to the client) and
-	// middlewares up in chain can not change Response status code or Response body anymore.
-	//
-	// Avoid using this method in handlers as no middleware will be able to effectively handle errors after that.
-	Error(err error)
+		// Error invokes the registered HTTP error handler. Generally used by middleware.
+		Error(err error)
 
-	// Handler returns the matched handler by router.
-	Handler() HandlerFunc
+		// Handler returns the matched handler by router.
+		Handler() HandlerFunc
 
-	// SetHandler sets the matched handler by router.
-	SetHandler(h HandlerFunc)
+		// SetHandler sets the matched handler by router.
+		SetHandler(h HandlerFunc)
 
-	// Logger returns the `Logger` instance.
-	Logger() Logger
+		// Logger returns the `Logger` instance.
+		Logger() Logger
 
-	// SetLogger Set the logger
-	SetLogger(l Logger)
+		// Set the logger
+		SetLogger(l Logger)
 
-	// Echo returns the `Echo` instance.
-	Echo() *Echo
+		// Echo returns the `Echo` instance.
+		Echo() *Echo
 
-	// Reset resets the context after request completes. It must be called along
-	// with `Echo#AcquireContext()` and `Echo#ReleaseContext()`.
-	// See `Echo#ServeHTTP()`
-	Reset(r *http.Request, w http.ResponseWriter)
-}
+		// Reset resets the context after request completes. It must be called along
+		// with `Echo#AcquireContext()` and `Echo#ReleaseContext()`.
+		// See `Echo#ServeHTTP()`
+		Reset(r *http.Request, w http.ResponseWriter)
+	}
 
-type context struct {
-	logger   Logger
-	request  *http.Request
-	response *Response
-	query    url.Values
-	echo     *Echo
-
-	store Map
-	lock  sync.RWMutex
-
-	// following fields are set by Router
-	handler HandlerFunc
-
-	// path is route path that Router matched. It is empty string where there is no route match.
-	// Route registered with RouteNotFound is considered as a match and path therefore is not empty.
-	path string
-
-	// Usually echo.Echo is sizing pvalues but there could be user created middlewares that decide to
-	// overwrite parameter by calling SetParamNames + SetParamValues.
-	// When echo.Echo allocated that slice it length/capacity is tied to echo.Echo.maxParam value.
-	//
-	// It is important that pvalues size is always equal or bigger to pnames length.
-	pvalues []string
-
-	// pnames length is tied to param count for the matched route
-	pnames []string
-}
-
-const (
-	// ContextKeyHeaderAllow is set by Router for getting value for `Allow` header in later stages of handler call chain.
-	// Allow header is mandatory for status 405 (method not found) and useful for OPTIONS method requests.
-	// It is added to context only when Router does not find matching method handler for request.
-	ContextKeyHeaderAllow = "echo_header_allow"
+	context struct {
+		request  *http.Request
+		response *Response
+		path     string
+		pnames   []string
+		pvalues  []string
+		query    url.Values
+		handler  HandlerFunc
+		store    Map
+		echo     *Echo
+		logger   Logger
+		lock     sync.RWMutex
+	}
 )
 
 const (
@@ -301,16 +277,11 @@ func (c *context) RealIP() string {
 	if ip := c.request.Header.Get(HeaderXForwardedFor); ip != "" {
 		i := strings.IndexAny(ip, ",")
 		if i > 0 {
-			xffip := strings.TrimSpace(ip[:i])
-			xffip = strings.TrimPrefix(xffip, "[")
-			xffip = strings.TrimSuffix(xffip, "]")
-			return xffip
+			return strings.TrimSpace(ip[:i])
 		}
 		return ip
 	}
 	if ip := c.request.Header.Get(HeaderXRealIP); ip != "" {
-		ip = strings.TrimPrefix(ip, "[")
-		ip = strings.TrimSuffix(ip, "]")
 		return ip
 	}
 	ra, _, _ := net.SplitHostPort(c.request.RemoteAddr)
@@ -344,9 +315,13 @@ func (c *context) SetParamNames(names ...string) {
 	c.pnames = names
 
 	l := len(names)
+	if *c.echo.maxParam < l {
+		*c.echo.maxParam = l
+	}
+
 	if len(c.pvalues) < l {
 		// Keeping the old pvalues just for backward compatibility, but it sounds that doesn't make sense to keep them,
-		// probably those values will be overridden in a Context#SetParamValues
+		// probably those values will be overriden in a Context#SetParamValues
 		newPvalues := make([]string, l)
 		copy(newPvalues, c.pvalues)
 		c.pvalues = newPvalues
@@ -358,11 +333,11 @@ func (c *context) ParamValues() []string {
 }
 
 func (c *context) SetParamValues(values ...string) {
-	// NOTE: Don't just set c.pvalues = values, because it has to have length c.echo.maxParam (or bigger) at all times
+	// NOTE: Don't just set c.pvalues = values, because it has to have length c.echo.maxParam at all times
 	// It will brake the Router#Find code
 	limit := len(values)
-	if limit > len(c.pvalues) {
-		c.pvalues = make([]string, limit)
+	if limit > *c.echo.maxParam {
+		limit = *c.echo.maxParam
 	}
 	for i := 0; i < limit; i++ {
 		c.pvalues[i] = values[i]
@@ -500,7 +475,7 @@ func (c *context) jsonPBlob(code int, callback string, i interface{}) (err error
 }
 
 func (c *context) json(code int, i interface{}, indent string) error {
-	c.writeContentType(MIMEApplicationJSON)
+	c.writeContentType(MIMEApplicationJSONCharsetUTF8)
 	c.response.Status = code
 	return c.echo.JSONSerializer.Serialize(c, i, indent)
 }
@@ -518,7 +493,7 @@ func (c *context) JSONPretty(code int, i interface{}, indent string) (err error)
 }
 
 func (c *context) JSONBlob(code int, b []byte) (err error) {
-	return c.Blob(code, MIMEApplicationJSON, b)
+	return c.Blob(code, MIMEApplicationJSONCharsetUTF8, b)
 }
 
 func (c *context) JSONP(code int, callback string, i interface{}) (err error) {
@@ -587,6 +562,29 @@ func (c *context) Stream(code int, contentType string, r io.Reader) (err error)
 	return
 }
 
+func (c *context) File(file string) (err error) {
+	f, err := os.Open(file)
+	if err != nil {
+		return NotFoundHandler(c)
+	}
+	defer f.Close()
+
+	fi, _ := f.Stat()
+	if fi.IsDir() {
+		file = filepath.Join(file, indexPage)
+		f, err = os.Open(file)
+		if err != nil {
+			return NotFoundHandler(c)
+		}
+		defer f.Close()
+		if fi, err = f.Stat(); err != nil {
+			return
+		}
+	}
+	http.ServeContent(c.Response(), c.Request(), fi.Name(), fi.ModTime(), f)
+	return
+}
+
 func (c *context) Attachment(file, name string) error {
 	return c.contentDisposition(file, name, "attachment")
 }
@@ -595,10 +593,8 @@ func (c *context) Inline(file, name string) error {
 	return c.contentDisposition(file, name, "inline")
 }
 
-var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
-
 func (c *context) contentDisposition(file, name, dispositionType string) error {
-	c.response.Header().Set(HeaderContentDisposition, fmt.Sprintf(`%s; filename="%s"`, dispositionType, quoteEscaper.Replace(name)))
+	c.response.Header().Set(HeaderContentDisposition, fmt.Sprintf("%s; filename=%q", dispositionType, name))
 	return c.File(file)
 }
 
@@ -653,8 +649,8 @@ func (c *context) Reset(r *http.Request, w http.ResponseWriter) {
 	c.path = ""
 	c.pnames = nil
 	c.logger = nil
-	// NOTE: Don't reset because it has to have length c.echo.maxParam (or bigger) at all times
-	for i := 0; i < len(c.pvalues); i++ {
+	// NOTE: Don't reset because it has to have length c.echo.maxParam at all times
+	for i := 0; i < *c.echo.maxParam; i++ {
 		c.pvalues[i] = ""
 	}
 }
diff --git a/vendor/github.com/labstack/echo/v4/context_fs.go b/vendor/github.com/labstack/echo/v4/context_fs.go
deleted file mode 100644
index 1c25baf..0000000
--- a/vendor/github.com/labstack/echo/v4/context_fs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package echo
-
-import (
-	"errors"
-	"io"
-	"io/fs"
-	"net/http"
-	"path/filepath"
-)
-
-func (c *context) File(file string) error {
-	return fsFile(c, file, c.echo.Filesystem)
-}
-
-// FileFS serves file from given file system.
-//
-// When dealing with `embed.FS` use `fs := echo.MustSubFS(fs, "rootDirectory") to create sub fs which uses necessary
-// prefix for directory path. This is necessary as `//go:embed assets/images` embeds files with paths
-// including `assets/images` as their prefix.
-func (c *context) FileFS(file string, filesystem fs.FS) error {
-	return fsFile(c, file, filesystem)
-}
-
-func fsFile(c Context, file string, filesystem fs.FS) error {
-	f, err := filesystem.Open(file)
-	if err != nil {
-		return ErrNotFound
-	}
-	defer f.Close()
-
-	fi, _ := f.Stat()
-	if fi.IsDir() {
-		file = filepath.ToSlash(filepath.Join(file, indexPage)) // ToSlash is necessary for Windows. fs.Open and os.Open are different in that aspect.
-		f, err = filesystem.Open(file)
-		if err != nil {
-			return ErrNotFound
-		}
-		defer f.Close()
-		if fi, err = f.Stat(); err != nil {
-			return err
-		}
-	}
-	ff, ok := f.(io.ReadSeeker)
-	if !ok {
-		return errors.New("file does not implement io.ReadSeeker")
-	}
-	http.ServeContent(c.Response(), c.Request(), fi.Name(), fi.ModTime(), ff)
-	return nil
-}
diff --git a/vendor/github.com/labstack/echo/v4/echo.go b/vendor/github.com/labstack/echo/v4/echo.go
index ea6ba16..246a622 100644
--- a/vendor/github.com/labstack/echo/v4/echo.go
+++ b/vendor/github.com/labstack/echo/v4/echo.go
@@ -1,54 +1,55 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 /*
 Package echo implements high performance, minimalist Go web framework.
 
 Example:
 
-	package main
+  package main
 
-	import (
-	  "net/http"
+  import (
+    "net/http"
 
-	  "github.com/labstack/echo/v4"
-	  "github.com/labstack/echo/v4/middleware"
-	)
+    "github.com/labstack/echo/v4"
+    "github.com/labstack/echo/v4/middleware"
+  )
 
-	// Handler
-	func hello(c echo.Context) error {
-	  return c.String(http.StatusOK, "Hello, World!")
-	}
+  // Handler
+  func hello(c echo.Context) error {
+    return c.String(http.StatusOK, "Hello, World!")
+  }
 
-	func main() {
-	  // Echo instance
-	  e := echo.New()
+  func main() {
+    // Echo instance
+    e := echo.New()
 
-	  // Middleware
-	  e.Use(middleware.Logger())
-	  e.Use(middleware.Recover())
+    // Middleware
+    e.Use(middleware.Logger())
+    e.Use(middleware.Recover())
 
-	  // Routes
-	  e.GET("/", hello)
+    // Routes
+    e.GET("/", hello)
 
-	  // Start server
-	  e.Logger.Fatal(e.Start(":1323"))
-	}
+    // Start server
+    e.Logger.Fatal(e.Start(":1323"))
+  }
 
 Learn more at https://echo.labstack.com
 */
 package echo
 
 import (
+	"bytes"
 	stdContext "context"
 	"crypto/tls"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
 	stdLog "log"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
+	"path/filepath"
 	"reflect"
 	"runtime"
 	"sync"
@@ -62,90 +63,86 @@ import (
 	"golang.org/x/net/http2/h2c"
 )
 
-// Echo is the top-level framework instance.
-//
-// Goroutine safety: Do not mutate Echo instance fields after server has started. Accessing these
-// fields from handlers/middlewares and changing field values at the same time leads to data-races.
-// Adding new routes after the server has been started is also not safe!
-type Echo struct {
-	filesystem
-	common
-	// startupMutex is mutex to lock Echo instance access during server configuration and startup. Useful for to get
-	// listener address info (on which interface/port was listener bound) without having data races.
-	startupMutex sync.RWMutex
-	colorer      *color.Color
+type (
+	// Echo is the top-level framework instance.
+	Echo struct {
+		common
+		// startupMutex is mutex to lock Echo instance access during server configuration and startup. Useful for to get
+		// listener address info (on which interface/port was listener binded) without having data races.
+		startupMutex     sync.RWMutex
+		StdLogger        *stdLog.Logger
+		colorer          *color.Color
+		premiddleware    []MiddlewareFunc
+		middleware       []MiddlewareFunc
+		maxParam         *int
+		router           *Router
+		routers          map[string]*Router
+		notFoundHandler  HandlerFunc
+		pool             sync.Pool
+		Server           *http.Server
+		TLSServer        *http.Server
+		Listener         net.Listener
+		TLSListener      net.Listener
+		AutoTLSManager   autocert.Manager
+		DisableHTTP2     bool
+		Debug            bool
+		HideBanner       bool
+		HidePort         bool
+		HTTPErrorHandler HTTPErrorHandler
+		Binder           Binder
+		JSONSerializer   JSONSerializer
+		Validator        Validator
+		Renderer         Renderer
+		Logger           Logger
+		IPExtractor      IPExtractor
+		ListenerNetwork  string
+	}
 
-	// premiddleware are middlewares that are run before routing is done. In case a pre-middleware returns
-	// an error the router is not executed and the request will end up in the global error handler.
-	premiddleware []MiddlewareFunc
-	middleware    []MiddlewareFunc
-	maxParam      *int
-	router        *Router
-	routers       map[string]*Router
-	pool          sync.Pool
+	// Route contains a handler and information for matching against requests.
+	Route struct {
+		Method string `json:"method"`
+		Path   string `json:"path"`
+		Name   string `json:"name"`
+	}
 
-	StdLogger        *stdLog.Logger
-	Server           *http.Server
-	TLSServer        *http.Server
-	Listener         net.Listener
-	TLSListener      net.Listener
-	AutoTLSManager   autocert.Manager
-	HTTPErrorHandler HTTPErrorHandler
-	Binder           Binder
-	JSONSerializer   JSONSerializer
-	Validator        Validator
-	Renderer         Renderer
-	Logger           Logger
-	IPExtractor      IPExtractor
-	ListenerNetwork  string
+	// HTTPError represents an error that occurred while handling a request.
+	HTTPError struct {
+		Code     int         `json:"-"`
+		Message  interface{} `json:"message"`
+		Internal error       `json:"-"` // Stores the error returned by an external dependency
+	}
 
-	// OnAddRouteHandler is called when Echo adds new route to specific host router.
-	OnAddRouteHandler func(host string, route Route, handler HandlerFunc, middleware []MiddlewareFunc)
-	DisableHTTP2      bool
-	Debug             bool
-	HideBanner        bool
-	HidePort          bool
-}
+	// MiddlewareFunc defines a function to process middleware.
+	MiddlewareFunc func(HandlerFunc) HandlerFunc
 
-// Route contains a handler and information for matching against requests.
-type Route struct {
-	Method string `json:"method"`
-	Path   string `json:"path"`
-	Name   string `json:"name"`
-}
+	// HandlerFunc defines a function to serve HTTP requests.
+	HandlerFunc func(Context) error
 
-// HTTPError represents an error that occurred while handling a request.
-type HTTPError struct {
-	Internal error       `json:"-"` // Stores the error returned by an external dependency
-	Message  interface{} `json:"message"`
-	Code     int         `json:"-"`
-}
+	// HTTPErrorHandler is a centralized HTTP error handler.
+	HTTPErrorHandler func(error, Context)
 
-// MiddlewareFunc defines a function to process middleware.
-type MiddlewareFunc func(next HandlerFunc) HandlerFunc
+	// Validator is the interface that wraps the Validate function.
+	Validator interface {
+		Validate(i interface{}) error
+	}
 
-// HandlerFunc defines a function to serve HTTP requests.
-type HandlerFunc func(c Context) error
+	// JSONSerializer is the interface that encodes and decodes JSON to and from interfaces.
+	JSONSerializer interface {
+		Serialize(c Context, i interface{}, indent string) error
+		Deserialize(c Context, i interface{}) error
+	}
 
-// HTTPErrorHandler is a centralized HTTP error handler.
-type HTTPErrorHandler func(err error, c Context)
+	// Renderer is the interface that wraps the Render function.
+	Renderer interface {
+		Render(io.Writer, string, interface{}, Context) error
+	}
 
-// Validator is the interface that wraps the Validate function.
-type Validator interface {
-	Validate(i interface{}) error
-}
+	// Map defines a generic map of type `map[string]interface{}`.
+	Map map[string]interface{}
 
-// JSONSerializer is the interface that encodes and decodes JSON to and from interfaces.
-type JSONSerializer interface {
-	Serialize(c Context, i interface{}, indent string) error
-	Deserialize(c Context, i interface{}) error
-}
-
-// Map defines a generic map of type `map[string]interface{}`.
-type Map map[string]interface{}
-
-// Common struct for Echo & Group.
-type common struct{}
+	// Common struct for Echo & Group.
+	common struct{}
+)
 
 // HTTP methods
 // NOTE: Deprecated, please use the stdlib constants directly instead.
@@ -164,12 +161,7 @@ const (
 
 // MIME types
 const (
-	// MIMEApplicationJSON JavaScript Object Notation (JSON) https://www.rfc-editor.org/rfc/rfc8259
-	MIMEApplicationJSON = "application/json"
-	// Deprecated: Please use MIMEApplicationJSON instead. JSON should be encoded using UTF-8 by default.
-	// No "charset" parameter is defined for this registration.
-	// Adding one really has no effect on compliant recipients.
-	// See RFC 8259, section 8.1. https://datatracker.ietf.org/doc/html/rfc8259#section-8.1
+	MIMEApplicationJSON                  = "application/json"
 	MIMEApplicationJSONCharsetUTF8       = MIMEApplicationJSON + "; " + charsetUTF8
 	MIMEApplicationJavaScript            = "application/javascript"
 	MIMEApplicationJavaScriptCharsetUTF8 = MIMEApplicationJavaScript + "; " + charsetUTF8
@@ -194,18 +186,12 @@ const (
 	PROPFIND = "PROPFIND"
 	// REPORT Method can be used to get information about a resource, see rfc 3253
 	REPORT = "REPORT"
-	// RouteNotFound is special method type for routes handling "route not found" (404) cases
-	RouteNotFound = "echo_route_not_found"
 )
 
 // Headers
 const (
-	HeaderAccept         = "Accept"
-	HeaderAcceptEncoding = "Accept-Encoding"
-	// HeaderAllow is the name of the "Allow" header field used to list the set of methods
-	// advertised as supported by the target resource. Returning an Allow header is mandatory
-	// for status 405 (method not found) and useful for the OPTIONS method in responses.
-	// See RFC 7231: https://datatracker.ietf.org/doc/html/rfc7231#section-7.4.1
+	HeaderAccept              = "Accept"
+	HeaderAcceptEncoding      = "Accept-Encoding"
 	HeaderAllow               = "Allow"
 	HeaderAuthorization       = "Authorization"
 	HeaderContentDisposition  = "Content-Disposition"
@@ -217,7 +203,6 @@ const (
 	HeaderIfModifiedSince     = "If-Modified-Since"
 	HeaderLastModified        = "Last-Modified"
 	HeaderLocation            = "Location"
-	HeaderRetryAfter          = "Retry-After"
 	HeaderUpgrade             = "Upgrade"
 	HeaderVary                = "Vary"
 	HeaderWWWAuthenticate     = "WWW-Authenticate"
@@ -227,14 +212,11 @@ const (
 	HeaderXForwardedSsl       = "X-Forwarded-Ssl"
 	HeaderXUrlScheme          = "X-Url-Scheme"
 	HeaderXHTTPMethodOverride = "X-HTTP-Method-Override"
-	HeaderXRealIP             = "X-Real-Ip"
-	HeaderXRequestID          = "X-Request-Id"
-	HeaderXCorrelationID      = "X-Correlation-Id"
+	HeaderXRealIP             = "X-Real-IP"
+	HeaderXRequestID          = "X-Request-ID"
 	HeaderXRequestedWith      = "X-Requested-With"
 	HeaderServer              = "Server"
 	HeaderOrigin              = "Origin"
-	HeaderCacheControl        = "Cache-Control"
-	HeaderConnection          = "Connection"
 
 	// Access control
 	HeaderAccessControlRequestMethod    = "Access-Control-Request-Method"
@@ -259,7 +241,7 @@ const (
 
 const (
 	// Version of Echo
-	Version = "4.13.4"
+	Version = "4.5.0"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
@@ -274,95 +256,60 @@ ____________________________________O/_______
 `
 )
 
-var methods = [...]string{
-	http.MethodConnect,
-	http.MethodDelete,
-	http.MethodGet,
-	http.MethodHead,
-	http.MethodOptions,
-	http.MethodPatch,
-	http.MethodPost,
-	PROPFIND,
-	http.MethodPut,
-	http.MethodTrace,
-	REPORT,
-}
+var (
+	methods = [...]string{
+		http.MethodConnect,
+		http.MethodDelete,
+		http.MethodGet,
+		http.MethodHead,
+		http.MethodOptions,
+		http.MethodPatch,
+		http.MethodPost,
+		PROPFIND,
+		http.MethodPut,
+		http.MethodTrace,
+		REPORT,
+	}
+)
 
 // Errors
 var (
-	ErrBadRequest                    = NewHTTPError(http.StatusBadRequest)                    // HTTP 400 Bad Request
-	ErrUnauthorized                  = NewHTTPError(http.StatusUnauthorized)                  // HTTP 401 Unauthorized
-	ErrPaymentRequired               = NewHTTPError(http.StatusPaymentRequired)               // HTTP 402 Payment Required
-	ErrForbidden                     = NewHTTPError(http.StatusForbidden)                     // HTTP 403 Forbidden
-	ErrNotFound                      = NewHTTPError(http.StatusNotFound)                      // HTTP 404 Not Found
-	ErrMethodNotAllowed              = NewHTTPError(http.StatusMethodNotAllowed)              // HTTP 405 Method Not Allowed
-	ErrNotAcceptable                 = NewHTTPError(http.StatusNotAcceptable)                 // HTTP 406 Not Acceptable
-	ErrProxyAuthRequired             = NewHTTPError(http.StatusProxyAuthRequired)             // HTTP 407 Proxy AuthRequired
-	ErrRequestTimeout                = NewHTTPError(http.StatusRequestTimeout)                // HTTP 408 Request Timeout
-	ErrConflict                      = NewHTTPError(http.StatusConflict)                      // HTTP 409 Conflict
-	ErrGone                          = NewHTTPError(http.StatusGone)                          // HTTP 410 Gone
-	ErrLengthRequired                = NewHTTPError(http.StatusLengthRequired)                // HTTP 411 Length Required
-	ErrPreconditionFailed            = NewHTTPError(http.StatusPreconditionFailed)            // HTTP 412 Precondition Failed
-	ErrStatusRequestEntityTooLarge   = NewHTTPError(http.StatusRequestEntityTooLarge)         // HTTP 413 Payload Too Large
-	ErrRequestURITooLong             = NewHTTPError(http.StatusRequestURITooLong)             // HTTP 414 URI Too Long
-	ErrUnsupportedMediaType          = NewHTTPError(http.StatusUnsupportedMediaType)          // HTTP 415 Unsupported Media Type
-	ErrRequestedRangeNotSatisfiable  = NewHTTPError(http.StatusRequestedRangeNotSatisfiable)  // HTTP 416 Range Not Satisfiable
-	ErrExpectationFailed             = NewHTTPError(http.StatusExpectationFailed)             // HTTP 417 Expectation Failed
-	ErrTeapot                        = NewHTTPError(http.StatusTeapot)                        // HTTP 418 I'm a teapot
-	ErrMisdirectedRequest            = NewHTTPError(http.StatusMisdirectedRequest)            // HTTP 421 Misdirected Request
-	ErrUnprocessableEntity           = NewHTTPError(http.StatusUnprocessableEntity)           // HTTP 422 Unprocessable Entity
-	ErrLocked                        = NewHTTPError(http.StatusLocked)                        // HTTP 423 Locked
-	ErrFailedDependency              = NewHTTPError(http.StatusFailedDependency)              // HTTP 424 Failed Dependency
-	ErrTooEarly                      = NewHTTPError(http.StatusTooEarly)                      // HTTP 425 Too Early
-	ErrUpgradeRequired               = NewHTTPError(http.StatusUpgradeRequired)               // HTTP 426 Upgrade Required
-	ErrPreconditionRequired          = NewHTTPError(http.StatusPreconditionRequired)          // HTTP 428 Precondition Required
-	ErrTooManyRequests               = NewHTTPError(http.StatusTooManyRequests)               // HTTP 429 Too Many Requests
-	ErrRequestHeaderFieldsTooLarge   = NewHTTPError(http.StatusRequestHeaderFieldsTooLarge)   // HTTP 431 Request Header Fields Too Large
-	ErrUnavailableForLegalReasons    = NewHTTPError(http.StatusUnavailableForLegalReasons)    // HTTP 451 Unavailable For Legal Reasons
-	ErrInternalServerError           = NewHTTPError(http.StatusInternalServerError)           // HTTP 500 Internal Server Error
-	ErrNotImplemented                = NewHTTPError(http.StatusNotImplemented)                // HTTP 501 Not Implemented
-	ErrBadGateway                    = NewHTTPError(http.StatusBadGateway)                    // HTTP 502 Bad Gateway
-	ErrServiceUnavailable            = NewHTTPError(http.StatusServiceUnavailable)            // HTTP 503 Service Unavailable
-	ErrGatewayTimeout                = NewHTTPError(http.StatusGatewayTimeout)                // HTTP 504 Gateway Timeout
-	ErrHTTPVersionNotSupported       = NewHTTPError(http.StatusHTTPVersionNotSupported)       // HTTP 505 HTTP Version Not Supported
-	ErrVariantAlsoNegotiates         = NewHTTPError(http.StatusVariantAlsoNegotiates)         // HTTP 506 Variant Also Negotiates
-	ErrInsufficientStorage           = NewHTTPError(http.StatusInsufficientStorage)           // HTTP 507 Insufficient Storage
-	ErrLoopDetected                  = NewHTTPError(http.StatusLoopDetected)                  // HTTP 508 Loop Detected
-	ErrNotExtended                   = NewHTTPError(http.StatusNotExtended)                   // HTTP 510 Not Extended
-	ErrNetworkAuthenticationRequired = NewHTTPError(http.StatusNetworkAuthenticationRequired) // HTTP 511 Network Authentication Required
-
-	ErrValidatorNotRegistered = errors.New("validator not registered")
-	ErrRendererNotRegistered  = errors.New("renderer not registered")
-	ErrInvalidRedirectCode    = errors.New("invalid redirect status code")
-	ErrCookieNotFound         = errors.New("cookie not found")
-	ErrInvalidCertOrKeyType   = errors.New("invalid cert or key type, must be string or []byte")
-	ErrInvalidListenerNetwork = errors.New("invalid listener network")
+	ErrUnsupportedMediaType        = NewHTTPError(http.StatusUnsupportedMediaType)
+	ErrNotFound                    = NewHTTPError(http.StatusNotFound)
+	ErrUnauthorized                = NewHTTPError(http.StatusUnauthorized)
+	ErrForbidden                   = NewHTTPError(http.StatusForbidden)
+	ErrMethodNotAllowed            = NewHTTPError(http.StatusMethodNotAllowed)
+	ErrStatusRequestEntityTooLarge = NewHTTPError(http.StatusRequestEntityTooLarge)
+	ErrTooManyRequests             = NewHTTPError(http.StatusTooManyRequests)
+	ErrBadRequest                  = NewHTTPError(http.StatusBadRequest)
+	ErrBadGateway                  = NewHTTPError(http.StatusBadGateway)
+	ErrInternalServerError         = NewHTTPError(http.StatusInternalServerError)
+	ErrRequestTimeout              = NewHTTPError(http.StatusRequestTimeout)
+	ErrServiceUnavailable          = NewHTTPError(http.StatusServiceUnavailable)
+	ErrValidatorNotRegistered      = errors.New("validator not registered")
+	ErrRendererNotRegistered       = errors.New("renderer not registered")
+	ErrInvalidRedirectCode         = errors.New("invalid redirect status code")
+	ErrCookieNotFound              = errors.New("cookie not found")
+	ErrInvalidCertOrKeyType        = errors.New("invalid cert or key type, must be string or []byte")
+	ErrInvalidListenerNetwork      = errors.New("invalid listener network")
 )
 
-// NotFoundHandler is the handler that router uses in case there was no matching route found. Returns an error that results
-// HTTP 404 status code.
-var NotFoundHandler = func(c Context) error {
-	return ErrNotFound
-}
-
-// MethodNotAllowedHandler is the handler thar router uses in case there was no matching route found but there was
-// another matching routes for that requested URL. Returns an error that results HTTP 405 Method Not Allowed status code.
-var MethodNotAllowedHandler = func(c Context) error {
-	// See RFC 7231 section 7.4.1: An origin server MUST generate an Allow field in a 405 (Method Not Allowed)
-	// response and MAY do so in any other response. For disabled resources an empty Allow header may be returned
-	routerAllowMethods, ok := c.Get(ContextKeyHeaderAllow).(string)
-	if ok && routerAllowMethods != "" {
-		c.Response().Header().Set(HeaderAllow, routerAllowMethods)
+// Error handlers
+var (
+	NotFoundHandler = func(c Context) error {
+		return ErrNotFound
 	}
-	return ErrMethodNotAllowed
-}
+
+	MethodNotAllowedHandler = func(c Context) error {
+		return ErrMethodNotAllowed
+	}
+)
 
 // New creates an instance of Echo.
 func New() (e *Echo) {
 	e = &Echo{
-		filesystem: createFilesystem(),
-		Server:     new(http.Server),
-		TLSServer:  new(http.Server),
+		Server:    new(http.Server),
+		TLSServer: new(http.Server),
 		AutoTLSManager: autocert.Manager{
 			Prompt: autocert.AcceptTOS,
 		},
@@ -410,17 +357,7 @@ func (e *Echo) Routers() map[string]*Router {
 
 // DefaultHTTPErrorHandler is the default HTTP error handler. It sends a JSON response
 // with status code.
-//
-// NOTE: In case errors happens in middleware call-chain that is returning from handler (which did not return an error).
-// When handler has already sent response (ala c.JSON()) and there is error in middleware that is returning from
-// handler. Then the error that global error handler received will be ignored because we have already "committed" the
-// response and status code header has been sent to the client.
 func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
-
-	if c.Response().Committed {
-		return
-	}
-
 	he, ok := err.(*HTTPError)
 	if ok {
 		if he.Internal != nil {
@@ -438,28 +375,24 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
 	// Issue #1426
 	code := he.Code
 	message := he.Message
-
-	switch m := he.Message.(type) {
-	case string:
+	if m, ok := he.Message.(string); ok {
 		if e.Debug {
 			message = Map{"message": m, "error": err.Error()}
 		} else {
 			message = Map{"message": m}
 		}
-	case json.Marshaler:
-		// do nothing - this type knows how to format itself to JSON
-	case error:
-		message = Map{"message": m.Error()}
 	}
 
 	// Send response
-	if c.Request().Method == http.MethodHead { // Issue #608
-		err = c.NoContent(he.Code)
-	} else {
-		err = c.JSON(code, message)
-	}
-	if err != nil {
-		e.Logger.Error(err)
+	if !c.Response().Committed {
+		if c.Request().Method == http.MethodHead { // Issue #608
+			err = c.NoContent(he.Code)
+		} else {
+			err = c.JSON(code, message)
+		}
+		if err != nil {
+			e.Logger.Error(err)
+		}
 	}
 }
 
@@ -527,21 +460,8 @@ func (e *Echo) TRACE(path string, h HandlerFunc, m ...MiddlewareFunc) *Route {
 	return e.Add(http.MethodTrace, path, h, m...)
 }
 
-// RouteNotFound registers a special-case route which is executed when no other route is found (i.e. HTTP 404 cases)
-// for current request URL.
-// Path supports static and named/any parameters just like other http method is defined. Generally path is ended with
-// wildcard/match-any character (`/*`, `/download/*` etc).
-//
-// Example: `e.RouteNotFound("/*", func(c echo.Context) error { return c.NoContent(http.StatusNotFound) })`
-func (e *Echo) RouteNotFound(path string, h HandlerFunc, m ...MiddlewareFunc) *Route {
-	return e.Add(RouteNotFound, path, h, m...)
-}
-
-// Any registers a new route for all HTTP methods (supported by Echo) and path with matching handler
+// Any registers a new route for all HTTP methods and path with matching handler
 // in the router with optional route-level middleware.
-//
-// Note: this method only adds specific set of supported HTTP methods as handler and is not true
-// "catch-any-arbitrary-method" way of matching requests.
 func (e *Echo) Any(path string, handler HandlerFunc, middleware ...MiddlewareFunc) []*Route {
 	routes := make([]*Route, len(methods))
 	for i, m := range methods {
@@ -560,6 +480,50 @@ func (e *Echo) Match(methods []string, path string, handler HandlerFunc, middlew
 	return routes
 }
 
+// Static registers a new route with path prefix to serve static files from the
+// provided root directory.
+func (e *Echo) Static(prefix, root string) *Route {
+	if root == "" {
+		root = "." // For security we want to restrict to CWD.
+	}
+	return e.static(prefix, root, e.GET)
+}
+
+func (common) static(prefix, root string, get func(string, HandlerFunc, ...MiddlewareFunc) *Route) *Route {
+	h := func(c Context) error {
+		p, err := url.PathUnescape(c.Param("*"))
+		if err != nil {
+			return err
+		}
+
+		name := filepath.Join(root, filepath.Clean("/"+p)) // "/"+ for security
+		fi, err := os.Stat(name)
+		if err != nil {
+			// The access path does not exist
+			return NotFoundHandler(c)
+		}
+
+		// If the request is for a directory and does not end with "/"
+		p = c.Request().URL.Path // path must not be empty.
+		if fi.IsDir() && p[len(p)-1] != '/' {
+			// Redirect to ends with "/"
+			return c.Redirect(http.StatusMovedPermanently, p+"/")
+		}
+		return c.File(name)
+	}
+	// Handle added routes based on trailing slash:
+	// 	/prefix  => exact route "/prefix" + any route "/prefix/*"
+	// 	/prefix/ => only any route "/prefix/*"
+	if prefix != "" {
+		if prefix[len(prefix)-1] == '/' {
+			// Only add any route for intentional trailing slash
+			return get(prefix+"*", h)
+		}
+		get(prefix, h)
+	}
+	return get(prefix+"/*", h)
+}
+
 func (common) file(path, file string, get func(string, HandlerFunc, ...MiddlewareFunc) *Route,
 	m ...MiddlewareFunc) *Route {
 	return get(path, func(c Context) error {
@@ -572,20 +536,20 @@ func (e *Echo) File(path, file string, m ...MiddlewareFunc) *Route {
 	return e.file(path, file, e.GET, m...)
 }
 
-func (e *Echo) add(host, method, path string, handler HandlerFunc, middlewares ...MiddlewareFunc) *Route {
-	router := e.findRouter(host)
-	//FIXME: when handler+middleware are both nil ... make it behave like handler removal
+func (e *Echo) add(host, method, path string, handler HandlerFunc, middleware ...MiddlewareFunc) *Route {
 	name := handlerName(handler)
-	route := router.add(method, path, name, func(c Context) error {
-		h := applyMiddleware(handler, middlewares...)
+	router := e.findRouter(host)
+	router.Add(method, path, func(c Context) error {
+		h := applyMiddleware(handler, middleware...)
 		return h(c)
 	})
-
-	if e.OnAddRouteHandler != nil {
-		e.OnAddRouteHandler(host, *route, handler, middlewares)
+	r := &Route{
+		Method: method,
+		Path:   path,
+		Name:   name,
 	}
-
-	return route
+	e.router.routes[method+path] = r
+	return r
 }
 
 // Add registers a new route for an HTTP method and path with matching handler
@@ -609,7 +573,7 @@ func (e *Echo) Group(prefix string, m ...MiddlewareFunc) (g *Group) {
 	return
 }
 
-// URI generates an URI from handler.
+// URI generates a URI from handler.
 func (e *Echo) URI(handler HandlerFunc, params ...interface{}) string {
 	name := handlerName(handler)
 	return e.Reverse(name, params...)
@@ -620,15 +584,37 @@ func (e *Echo) URL(h HandlerFunc, params ...interface{}) string {
 	return e.URI(h, params...)
 }
 
-// Reverse generates a URL from route name and provided parameters.
+// Reverse generates an URL from route name and provided parameters.
 func (e *Echo) Reverse(name string, params ...interface{}) string {
-	return e.router.Reverse(name, params...)
+	uri := new(bytes.Buffer)
+	ln := len(params)
+	n := 0
+	for _, r := range e.router.routes {
+		if r.Name == name {
+			for i, l := 0, len(r.Path); i < l; i++ {
+				if (r.Path[i] == ':' || r.Path[i] == '*') && n < ln {
+					for ; i < l && r.Path[i] != '/'; i++ {
+					}
+					uri.WriteString(fmt.Sprintf("%v", params[n]))
+					n++
+				}
+				if i < l {
+					uri.WriteByte(r.Path[i])
+				}
+			}
+			break
+		}
+	}
+	return uri.String()
 }
 
-// Routes returns the registered routes for default router.
-// In case when Echo serves multiple hosts/domains use `e.Routers()["domain2.site"].Routes()` to get specific host routes.
+// Routes returns the registered routes.
 func (e *Echo) Routes() []*Route {
-	return e.router.Routes()
+	routes := make([]*Route, 0, len(e.router.routes))
+	for _, v := range e.router.routes {
+		routes = append(routes, v)
+	}
+	return routes
 }
 
 // AcquireContext returns an empty `Context` instance from the pool.
@@ -648,7 +634,7 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Acquire context
 	c := e.pool.Get().(*context)
 	c.Reset(r, w)
-	var h HandlerFunc
+	h := NotFoundHandler
 
 	if e.premiddleware == nil {
 		e.findRouter(r.Host).Find(r.Method, GetPath(r), c)
@@ -722,7 +708,7 @@ func (e *Echo) StartTLS(address string, certFile, keyFile interface{}) (err erro
 func filepathOrContent(fileOrContent interface{}) (content []byte, err error) {
 	switch v := fileOrContent.(type) {
 	case string:
-		return os.ReadFile(v)
+		return ioutil.ReadFile(v)
 	case []byte:
 		return v, nil
 	default:
@@ -770,7 +756,7 @@ func (e *Echo) StartServer(s *http.Server) (err error) {
 	return s.Serve(e.Listener)
 }
 
-func (e *Echo) configureServer(s *http.Server) error {
+func (e *Echo) configureServer(s *http.Server) (err error) {
 	// Setup
 	e.colorer.SetOutput(e.Logger.Output())
 	s.ErrorLog = e.StdLogger
@@ -785,11 +771,10 @@ func (e *Echo) configureServer(s *http.Server) error {
 
 	if s.TLSConfig == nil {
 		if e.Listener == nil {
-			l, err := newListener(s.Addr, e.ListenerNetwork)
+			e.Listener, err = newListener(s.Addr, e.ListenerNetwork)
 			if err != nil {
 				return err
 			}
-			e.Listener = l
 		}
 		if !e.HidePort {
 			e.colorer.Printf("⇨ http server started on %s\n", e.colorer.Green(e.Listener.Addr()))
@@ -830,7 +815,7 @@ func (e *Echo) TLSListenerAddr() net.Addr {
 }
 
 // StartH2CServer starts a custom http/2 server with h2c (HTTP/2 Cleartext).
-func (e *Echo) StartH2CServer(address string, h2s *http2.Server) error {
+func (e *Echo) StartH2CServer(address string, h2s *http2.Server) (err error) {
 	e.startupMutex.Lock()
 	// Setup
 	s := e.Server
@@ -847,12 +832,11 @@ func (e *Echo) StartH2CServer(address string, h2s *http2.Server) error {
 	}
 
 	if e.Listener == nil {
-		l, err := newListener(s.Addr, e.ListenerNetwork)
+		e.Listener, err = newListener(s.Addr, e.ListenerNetwork)
 		if err != nil {
 			e.startupMutex.Unlock()
 			return err
 		}
-		e.Listener = l
 	}
 	if !e.HidePort {
 		e.colorer.Printf("⇨ http server started on %s\n", e.colorer.Green(e.Listener.Addr()))
@@ -906,15 +890,6 @@ func (he *HTTPError) SetInternal(err error) *HTTPError {
 	return he
 }
 
-// WithInternal returns clone of HTTPError with err set to HTTPError.Internal field
-func (he *HTTPError) WithInternal(err error) *HTTPError {
-	return &HTTPError{
-		Code:     he.Code,
-		Message:  he.Message,
-		Internal: err,
-	}
-}
-
 // Unwrap satisfies the Go 1.13 error wrapper interface.
 func (he *HTTPError) Unwrap() error {
 	return he.Internal
@@ -944,8 +919,8 @@ func WrapMiddleware(m func(http.Handler) http.Handler) MiddlewareFunc {
 
 // GetPath returns RawPath, if it's empty returns Path from URL
 // Difference between RawPath and Path is:
-//   - Path is where request path is stored. Value is stored in decoded form: /%47%6f%2f becomes /Go/.
-//   - RawPath is an optional field which only gets set if the default encoding is different from Path.
+//  * Path is where request path is stored. Value is stored in decoded form: /%47%6f%2f becomes /Go/.
+//  * RawPath is an optional field which only gets set if the default encoding is different from Path.
 func GetPath(r *http.Request) string {
 	path := r.URL.RawPath
 	if path == "" {
diff --git a/vendor/github.com/labstack/echo/v4/echo_fs.go b/vendor/github.com/labstack/echo/v4/echo_fs.go
deleted file mode 100644
index 0ffc4b0..0000000
--- a/vendor/github.com/labstack/echo/v4/echo_fs.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package echo
-
-import (
-	"fmt"
-	"io/fs"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-type filesystem struct {
-	// Filesystem is file system used by Static and File handlers to access files.
-	// Defaults to os.DirFS(".")
-	//
-	// When dealing with `embed.FS` use `fs := echo.MustSubFS(fs, "rootDirectory") to create sub fs which uses necessary
-	// prefix for directory path. This is necessary as `//go:embed assets/images` embeds files with paths
-	// including `assets/images` as their prefix.
-	Filesystem fs.FS
-}
-
-func createFilesystem() filesystem {
-	return filesystem{
-		Filesystem: newDefaultFS(),
-	}
-}
-
-// Static registers a new route with path prefix to serve static files from the provided root directory.
-func (e *Echo) Static(pathPrefix, fsRoot string) *Route {
-	subFs := MustSubFS(e.Filesystem, fsRoot)
-	return e.Add(
-		http.MethodGet,
-		pathPrefix+"*",
-		StaticDirectoryHandler(subFs, false),
-	)
-}
-
-// StaticFS registers a new route with path prefix to serve static files from the provided file system.
-//
-// When dealing with `embed.FS` use `fs := echo.MustSubFS(fs, "rootDirectory") to create sub fs which uses necessary
-// prefix for directory path. This is necessary as `//go:embed assets/images` embeds files with paths
-// including `assets/images` as their prefix.
-func (e *Echo) StaticFS(pathPrefix string, filesystem fs.FS) *Route {
-	return e.Add(
-		http.MethodGet,
-		pathPrefix+"*",
-		StaticDirectoryHandler(filesystem, false),
-	)
-}
-
-// StaticDirectoryHandler creates handler function to serve files from provided file system
-// When disablePathUnescaping is set then file name from path is not unescaped and is served as is.
-func StaticDirectoryHandler(fileSystem fs.FS, disablePathUnescaping bool) HandlerFunc {
-	return func(c Context) error {
-		p := c.Param("*")
-		if !disablePathUnescaping { // when router is already unescaping we do not want to do is twice
-			tmpPath, err := url.PathUnescape(p)
-			if err != nil {
-				return fmt.Errorf("failed to unescape path variable: %w", err)
-			}
-			p = tmpPath
-		}
-
-		// fs.FS.Open() already assumes that file names are relative to FS root path and considers name with prefix `/` as invalid
-		name := filepath.ToSlash(filepath.Clean(strings.TrimPrefix(p, "/")))
-		fi, err := fs.Stat(fileSystem, name)
-		if err != nil {
-			return ErrNotFound
-		}
-
-		// If the request is for a directory and does not end with "/"
-		p = c.Request().URL.Path // path must not be empty.
-		if fi.IsDir() && len(p) > 0 && p[len(p)-1] != '/' {
-			// Redirect to ends with "/"
-			return c.Redirect(http.StatusMovedPermanently, sanitizeURI(p+"/"))
-		}
-		return fsFile(c, name, fileSystem)
-	}
-}
-
-// FileFS registers a new route with path to serve file from the provided file system.
-func (e *Echo) FileFS(path, file string, filesystem fs.FS, m ...MiddlewareFunc) *Route {
-	return e.GET(path, StaticFileHandler(file, filesystem), m...)
-}
-
-// StaticFileHandler creates handler function to serve file from provided file system
-func StaticFileHandler(file string, filesystem fs.FS) HandlerFunc {
-	return func(c Context) error {
-		return fsFile(c, file, filesystem)
-	}
-}
-
-// defaultFS exists to preserve pre v4.7.0 behaviour where files were open by `os.Open`.
-// v4.7 introduced `echo.Filesystem` field which is Go1.16+ `fs.Fs` interface.
-// Difference between `os.Open` and `fs.Open` is that FS does not allow opening path that start with `.`, `..` or `/`
-// etc. For example previously you could have `../images` in your application but `fs := os.DirFS("./")` would not
-// allow you to use `fs.Open("../images")` and this would break all old applications that rely on being able to
-// traverse up from current executable run path.
-// NB: private because you really should use fs.FS implementation instances
-type defaultFS struct {
-	fs     fs.FS
-	prefix string
-}
-
-func newDefaultFS() *defaultFS {
-	dir, _ := os.Getwd()
-	return &defaultFS{
-		prefix: dir,
-		fs:     nil,
-	}
-}
-
-func (fs defaultFS) Open(name string) (fs.File, error) {
-	if fs.fs == nil {
-		return os.Open(name)
-	}
-	return fs.fs.Open(name)
-}
-
-func subFS(currentFs fs.FS, root string) (fs.FS, error) {
-	root = filepath.ToSlash(filepath.Clean(root)) // note: fs.FS operates only with slashes. `ToSlash` is necessary for Windows
-	if dFS, ok := currentFs.(*defaultFS); ok {
-		// we need to make exception for `defaultFS` instances as it interprets root prefix differently from fs.FS.
-		// fs.Fs.Open does not like relative paths ("./", "../") and absolute paths at all but prior echo.Filesystem we
-		// were able to use paths like `./myfile.log`, `/etc/hosts` and these would work fine with `os.Open` but not with fs.Fs
-		if !filepath.IsAbs(root) {
-			root = filepath.Join(dFS.prefix, root)
-		}
-		return &defaultFS{
-			prefix: root,
-			fs:     os.DirFS(root),
-		}, nil
-	}
-	return fs.Sub(currentFs, root)
-}
-
-// MustSubFS creates sub FS from current filesystem or panic on failure.
-// Panic happens when `fsRoot` contains invalid path according to `fs.ValidPath` rules.
-//
-// MustSubFS is helpful when dealing with `embed.FS` because for example `//go:embed assets/images` embeds files with
-// paths including `assets/images` as their prefix. In that case use `fs := echo.MustSubFS(fs, "rootDirectory") to
-// create sub fs which uses necessary prefix for directory path.
-func MustSubFS(currentFs fs.FS, fsRoot string) fs.FS {
-	subFs, err := subFS(currentFs, fsRoot)
-	if err != nil {
-		panic(fmt.Errorf("can not create sub FS, invalid root given, err: %w", err))
-	}
-	return subFs
-}
-
-func sanitizeURI(uri string) string {
-	// double slash `\\`, `//` or even `\/` is absolute uri for browsers and by redirecting request to that uri
-	// we are vulnerable to open redirect attack. so replace all slashes from the beginning with single slash
-	if len(uri) > 1 && (uri[0] == '\\' || uri[0] == '/') && (uri[1] == '\\' || uri[1] == '/') {
-		uri = "/" + strings.TrimLeft(uri, `/\`)
-	}
-	return uri
-}
diff --git a/vendor/github.com/labstack/echo/v4/group.go b/vendor/github.com/labstack/echo/v4/group.go
index cb37b12..426bef9 100644
--- a/vendor/github.com/labstack/echo/v4/group.go
+++ b/vendor/github.com/labstack/echo/v4/group.go
@@ -1,22 +1,21 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
 	"net/http"
 )
 
-// Group is a set of sub-routes for a specified route. It can be used for inner
-// routes that share a common middleware or functionality that should be separate
-// from the parent echo instance while still inheriting from it.
-type Group struct {
-	common
-	host       string
-	prefix     string
-	echo       *Echo
-	middleware []MiddlewareFunc
-}
+type (
+	// Group is a set of sub-routes for a specified route. It can be used for inner
+	// routes that share a common middleware or functionality that should be separate
+	// from the parent echo instance while still inheriting from it.
+	Group struct {
+		common
+		host       string
+		prefix     string
+		middleware []MiddlewareFunc
+		echo       *Echo
+	}
+)
 
 // Use implements `Echo#Use()` for sub-routes within the Group.
 func (g *Group) Use(middleware ...MiddlewareFunc) {
@@ -24,12 +23,10 @@ func (g *Group) Use(middleware ...MiddlewareFunc) {
 	if len(g.middleware) == 0 {
 		return
 	}
-	// group level middlewares are different from Echo `Pre` and `Use` middlewares (those are global). Group level middlewares
-	// are only executed if they are added to the Router with route.
-	// So we register catch all route (404 is a safe way to emulate route match) for this group and now during routing the
-	// Router would find route to match our request path and therefore guarantee the middleware(s) will get executed.
-	g.RouteNotFound("", NotFoundHandler)
-	g.RouteNotFound("/*", NotFoundHandler)
+	// Allow all requests to reach the group as they might get dropped if router
+	// doesn't find a match, making none of the group middleware process.
+	g.Any("", NotFoundHandler)
+	g.Any("/*", NotFoundHandler)
 }
 
 // CONNECT implements `Echo#CONNECT()` for sub-routes within the Group.
@@ -105,18 +102,16 @@ func (g *Group) Group(prefix string, middleware ...MiddlewareFunc) (sg *Group) {
 	return
 }
 
+// Static implements `Echo#Static()` for sub-routes within the Group.
+func (g *Group) Static(prefix, root string) {
+	g.static(prefix, root, g.GET)
+}
+
 // File implements `Echo#File()` for sub-routes within the Group.
 func (g *Group) File(path, file string) {
 	g.file(path, file, g.GET)
 }
 
-// RouteNotFound implements `Echo#RouteNotFound()` for sub-routes within the Group.
-//
-// Example: `g.RouteNotFound("/*", func(c echo.Context) error { return c.NoContent(http.StatusNotFound) })`
-func (g *Group) RouteNotFound(path string, h HandlerFunc, m ...MiddlewareFunc) *Route {
-	return g.Add(RouteNotFound, path, h, m...)
-}
-
 // Add implements `Echo#Add()` for sub-routes within the Group.
 func (g *Group) Add(method, path string, handler HandlerFunc, middleware ...MiddlewareFunc) *Route {
 	// Combine into a new slice to avoid accidentally passing the same slice for
diff --git a/vendor/github.com/labstack/echo/v4/group_fs.go b/vendor/github.com/labstack/echo/v4/group_fs.go
deleted file mode 100644
index c1b7ec2..0000000
--- a/vendor/github.com/labstack/echo/v4/group_fs.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package echo
-
-import (
-	"io/fs"
-	"net/http"
-)
-
-// Static implements `Echo#Static()` for sub-routes within the Group.
-func (g *Group) Static(pathPrefix, fsRoot string) {
-	subFs := MustSubFS(g.echo.Filesystem, fsRoot)
-	g.StaticFS(pathPrefix, subFs)
-}
-
-// StaticFS implements `Echo#StaticFS()` for sub-routes within the Group.
-//
-// When dealing with `embed.FS` use `fs := echo.MustSubFS(fs, "rootDirectory") to create sub fs which uses necessary
-// prefix for directory path. This is necessary as `//go:embed assets/images` embeds files with paths
-// including `assets/images` as their prefix.
-func (g *Group) StaticFS(pathPrefix string, filesystem fs.FS) {
-	g.Add(
-		http.MethodGet,
-		pathPrefix+"*",
-		StaticDirectoryHandler(filesystem, false),
-	)
-}
-
-// FileFS implements `Echo#FileFS()` for sub-routes within the Group.
-func (g *Group) FileFS(path, file string, filesystem fs.FS, m ...MiddlewareFunc) *Route {
-	return g.GET(path, StaticFileHandler(file, filesystem), m...)
-}
diff --git a/vendor/github.com/labstack/echo/v4/ip.go b/vendor/github.com/labstack/echo/v4/ip.go
index 6ed1d11..39cb421 100644
--- a/vendor/github.com/labstack/echo/v4/ip.go
+++ b/vendor/github.com/labstack/echo/v4/ip.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
@@ -9,135 +6,11 @@ import (
 	"strings"
 )
 
-/**
-By: https://github.com/tmshn (See: https://github.com/labstack/echo/pull/1478 , https://github.com/labstack/echox/pull/134 )
-Source: https://echo.labstack.com/guide/ip-address/
-
-IP address plays fundamental role in HTTP; it's used for access control, auditing, geo-based access analysis and more.
-Echo provides handy method [`Context#RealIP()`](https://godoc.org/github.com/labstack/echo#Context) for that.
-
-However, it is not trivial to retrieve the _real_ IP address from requests especially when you put L7 proxies before the application.
-In such situation, _real_ IP needs to be relayed on HTTP layer from proxies to your app, but you must not trust HTTP headers unconditionally.
-Otherwise, you might give someone a chance of deceiving you. **A security risk!**
-
-To retrieve IP address reliably/securely, you must let your application be aware of the entire architecture of your infrastructure.
-In Echo, this can be done by configuring `Echo#IPExtractor` appropriately.
-This guides show you why and how.
-
-> Note: if you don't set `Echo#IPExtractor` explicitly, Echo fallback to legacy behavior, which is not a good choice.
-
-Let's start from two questions to know the right direction:
-
-1. Do you put any HTTP (L7) proxy in front of the application?
-    - It includes both cloud solutions (such as AWS ALB or GCP HTTP LB) and OSS ones (such as Nginx, Envoy or Istio ingress gateway).
-2. If yes, what HTTP header do your proxies use to pass client IP to the application?
-
-## Case 1. With no proxy
-
-If you put no proxy (e.g.: directory facing to the internet), all you need to (and have to) see is IP address from network layer.
-Any HTTP header is untrustable because the clients have full control what headers to be set.
-
-In this case, use `echo.ExtractIPDirect()`.
-
-```go
-e.IPExtractor = echo.ExtractIPDirect()
-```
-
-## Case 2. With proxies using `X-Forwarded-For` header
-
-[`X-Forwared-For` (XFF)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For) is the popular header
-to relay clients' IP addresses.
-At each hop on the proxies, they append the request IP address at the end of the header.
-
-Following example diagram illustrates this behavior.
-
-```text
-┌──────────�            ┌──────────�            ┌──────────�            ┌──────────�
-│ "Origin" │───────────>│ Proxy 1  │───────────>│ Proxy 2  │───────────>│ Your app │
-│ (IP: a)  │            │ (IP: b)  │            │ (IP: c)  │            │          │
-└──────────┘            └──────────┘            └──────────┘            └──────────┘
-
-Case 1.
-XFF:  ""                    "a"                     "a, b"
-                                                    ~~~~~~
-Case 2.
-XFF:  "x"                   "x, a"                  "x, a, b"
-                                                    ~~~~~~~~~
-                                                    ↑ What your app will see
-```
-
-In this case, use **first _untrustable_ IP reading from right**. Never use first one reading from left, as it is
-configurable by client. Here "trustable" means "you are sure the IP address belongs to your infrastructure".
-In above example, if `b` and `c` are trustable, the IP address of the client is `a` for both cases, never be `x`.
-
-In Echo, use `ExtractIPFromXFFHeader(...TrustOption)`.
-
-```go
-e.IPExtractor = echo.ExtractIPFromXFFHeader()
-```
-
-By default, it trusts internal IP addresses (loopback, link-local unicast, private-use and unique local address
-from [RFC6890](https://tools.ietf.org/html/rfc6890), [RFC4291](https://tools.ietf.org/html/rfc4291) and
-[RFC4193](https://tools.ietf.org/html/rfc4193)).
-To control this behavior, use [`TrustOption`](https://godoc.org/github.com/labstack/echo#TrustOption)s.
-
-E.g.:
-
-```go
-e.IPExtractor = echo.ExtractIPFromXFFHeader(
-	TrustLinkLocal(false),
-	TrustIPRanges(lbIPRange),
-)
-```
-
-- Ref: https://godoc.org/github.com/labstack/echo#TrustOption
-
-## Case 3. With proxies using `X-Real-IP` header
-
-`X-Real-IP` is another HTTP header to relay clients' IP addresses, but it carries only one address unlike XFF.
-
-If your proxies set this header, use `ExtractIPFromRealIPHeader(...TrustOption)`.
-
-```go
-e.IPExtractor = echo.ExtractIPFromRealIPHeader()
-```
-
-Again, it trusts internal IP addresses by default (loopback, link-local unicast, private-use and unique local address
-from [RFC6890](https://tools.ietf.org/html/rfc6890), [RFC4291](https://tools.ietf.org/html/rfc4291) and
-[RFC4193](https://tools.ietf.org/html/rfc4193)).
-To control this behavior, use [`TrustOption`](https://godoc.org/github.com/labstack/echo#TrustOption)s.
-
-- Ref: https://godoc.org/github.com/labstack/echo#TrustOption
-
-> **Never forget** to configure the outermost proxy (i.e.; at the edge of your infrastructure) **not to pass through incoming headers**.
-> Otherwise there is a chance of fraud, as it is what clients can control.
-
-## About default behavior
-
-In default behavior, Echo sees all of first XFF header, X-Real-IP header and IP from network layer.
-
-As you might already notice, after reading this article, this is not good.
-Sole reason this is default is just backward compatibility.
-
-## Private IP ranges
-
-See: https://en.wikipedia.org/wiki/Private_network
-
-Private IPv4 address ranges (RFC 1918):
-* 10.0.0.0 – 10.255.255.255 (24-bit block)
-* 172.16.0.0 – 172.31.255.255 (20-bit block)
-* 192.168.0.0 – 192.168.255.255 (16-bit block)
-
-Private IPv6 address ranges:
-* fc00::/7 address block = RFC 4193 Unique Local Addresses (ULA)
-
-*/
-
 type ipChecker struct {
-	trustExtraRanges []*net.IPNet
 	trustLoopback    bool
 	trustLinkLocal   bool
 	trustPrivateNet  bool
+	trustExtraRanges []*net.IPNet
 }
 
 // TrustOption is config for which IP address to trust
@@ -179,7 +52,6 @@ func newIPChecker(configs []TrustOption) *ipChecker {
 	return checker
 }
 
-// Go1.16+ added `ip.IsPrivate()` but until that use this implementation
 func isPrivateIPRange(ip net.IP) bool {
 	if ip4 := ip.To4(); ip4 != nil {
 		return ip4[0] == 10 ||
@@ -215,12 +87,10 @@ type IPExtractor func(*http.Request) string
 // ExtractIPDirect extracts IP address using actual IP address.
 // Use this if your server faces to internet directory (i.e.: uses no proxy).
 func ExtractIPDirect() IPExtractor {
-	return extractIP
-}
-
-func extractIP(req *http.Request) string {
-	ra, _, _ := net.SplitHostPort(req.RemoteAddr)
-	return ra
+	return func(req *http.Request) string {
+		ra, _, _ := net.SplitHostPort(req.RemoteAddr)
+		return ra
+	}
 }
 
 // ExtractIPFromRealIPHeader extracts IP address using x-real-ip header.
@@ -228,20 +98,13 @@ func extractIP(req *http.Request) string {
 func ExtractIPFromRealIPHeader(options ...TrustOption) IPExtractor {
 	checker := newIPChecker(options)
 	return func(req *http.Request) string {
-		directIP := extractIP(req)
+		directIP := ExtractIPDirect()(req)
 		realIP := req.Header.Get(HeaderXRealIP)
-		if realIP == "" {
-			return directIP
-		}
-
-		if checker.trust(net.ParseIP(directIP)) {
-			realIP = strings.TrimPrefix(realIP, "[")
-			realIP = strings.TrimSuffix(realIP, "]")
-			if rIP := net.ParseIP(realIP); rIP != nil {
+		if realIP != "" {
+			if ip := net.ParseIP(directIP); ip != nil && checker.trust(ip) {
 				return realIP
 			}
 		}
-
 		return directIP
 	}
 }
@@ -252,17 +115,14 @@ func ExtractIPFromRealIPHeader(options ...TrustOption) IPExtractor {
 func ExtractIPFromXFFHeader(options ...TrustOption) IPExtractor {
 	checker := newIPChecker(options)
 	return func(req *http.Request) string {
-		directIP := extractIP(req)
+		directIP := ExtractIPDirect()(req)
 		xffs := req.Header[HeaderXForwardedFor]
 		if len(xffs) == 0 {
 			return directIP
 		}
 		ips := append(strings.Split(strings.Join(xffs, ","), ","), directIP)
 		for i := len(ips) - 1; i >= 0; i-- {
-			ips[i] = strings.TrimSpace(ips[i])
-			ips[i] = strings.TrimPrefix(ips[i], "[")
-			ips[i] = strings.TrimSuffix(ips[i], "]")
-			ip := net.ParseIP(ips[i])
+			ip := net.ParseIP(strings.TrimSpace(ips[i]))
 			if ip == nil {
 				// Unable to parse IP; cannot trust entire records
 				return directIP
diff --git a/vendor/github.com/labstack/echo/v4/json.go b/vendor/github.com/labstack/echo/v4/json.go
index 6da0aaf..16b2d05 100644
--- a/vendor/github.com/labstack/echo/v4/json.go
+++ b/vendor/github.com/labstack/echo/v4/json.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
diff --git a/vendor/github.com/labstack/echo/v4/log.go b/vendor/github.com/labstack/echo/v4/log.go
index 0acd9ff..3f8de59 100644
--- a/vendor/github.com/labstack/echo/v4/log.go
+++ b/vendor/github.com/labstack/echo/v4/log.go
@@ -1,41 +1,41 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
-	"github.com/labstack/gommon/log"
 	"io"
+
+	"github.com/labstack/gommon/log"
 )
 
-// Logger defines the logging interface.
-type Logger interface {
-	Output() io.Writer
-	SetOutput(w io.Writer)
-	Prefix() string
-	SetPrefix(p string)
-	Level() log.Lvl
-	SetLevel(v log.Lvl)
-	SetHeader(h string)
-	Print(i ...interface{})
-	Printf(format string, args ...interface{})
-	Printj(j log.JSON)
-	Debug(i ...interface{})
-	Debugf(format string, args ...interface{})
-	Debugj(j log.JSON)
-	Info(i ...interface{})
-	Infof(format string, args ...interface{})
-	Infoj(j log.JSON)
-	Warn(i ...interface{})
-	Warnf(format string, args ...interface{})
-	Warnj(j log.JSON)
-	Error(i ...interface{})
-	Errorf(format string, args ...interface{})
-	Errorj(j log.JSON)
-	Fatal(i ...interface{})
-	Fatalj(j log.JSON)
-	Fatalf(format string, args ...interface{})
-	Panic(i ...interface{})
-	Panicj(j log.JSON)
-	Panicf(format string, args ...interface{})
-}
+type (
+	// Logger defines the logging interface.
+	Logger interface {
+		Output() io.Writer
+		SetOutput(w io.Writer)
+		Prefix() string
+		SetPrefix(p string)
+		Level() log.Lvl
+		SetLevel(v log.Lvl)
+		SetHeader(h string)
+		Print(i ...interface{})
+		Printf(format string, args ...interface{})
+		Printj(j log.JSON)
+		Debug(i ...interface{})
+		Debugf(format string, args ...interface{})
+		Debugj(j log.JSON)
+		Info(i ...interface{})
+		Infof(format string, args ...interface{})
+		Infoj(j log.JSON)
+		Warn(i ...interface{})
+		Warnf(format string, args ...interface{})
+		Warnj(j log.JSON)
+		Error(i ...interface{})
+		Errorf(format string, args ...interface{})
+		Errorj(j log.JSON)
+		Fatal(i ...interface{})
+		Fatalj(j log.JSON)
+		Fatalf(format string, args ...interface{})
+		Panic(i ...interface{})
+		Panicj(j log.JSON)
+		Panicf(format string, args ...interface{})
+	}
+)
diff --git a/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go b/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
index 9285f29..8cf1ed9 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
@@ -1,46 +1,44 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"encoding/base64"
-	"net/http"
 	"strconv"
 	"strings"
 
 	"github.com/labstack/echo/v4"
 )
 
-// BasicAuthConfig defines the config for BasicAuth middleware.
-type BasicAuthConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// BasicAuthConfig defines the config for BasicAuth middleware.
+	BasicAuthConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Validator is a function to validate BasicAuth credentials.
-	// Required.
-	Validator BasicAuthValidator
+		// Validator is a function to validate BasicAuth credentials.
+		// Required.
+		Validator BasicAuthValidator
 
-	// Realm is a string to define realm attribute of BasicAuth.
-	// Default value "Restricted".
-	Realm string
-}
+		// Realm is a string to define realm attribute of BasicAuth.
+		// Default value "Restricted".
+		Realm string
+	}
 
-// BasicAuthValidator defines a function to validate BasicAuth credentials.
-// The function should return a boolean indicating whether the credentials are valid,
-// and an error if any error occurs during the validation process.
-type BasicAuthValidator func(string, string, echo.Context) (bool, error)
+	// BasicAuthValidator defines a function to validate BasicAuth credentials.
+	BasicAuthValidator func(string, string, echo.Context) (bool, error)
+)
 
 const (
 	basic        = "basic"
 	defaultRealm = "Restricted"
 )
 
-// DefaultBasicAuthConfig is the default BasicAuth middleware config.
-var DefaultBasicAuthConfig = BasicAuthConfig{
-	Skipper: DefaultSkipper,
-	Realm:   defaultRealm,
-}
+var (
+	// DefaultBasicAuthConfig is the default BasicAuth middleware config.
+	DefaultBasicAuthConfig = BasicAuthConfig{
+		Skipper: DefaultSkipper,
+		Realm:   defaultRealm,
+	}
+)
 
 // BasicAuth returns an BasicAuth middleware.
 //
@@ -76,13 +74,10 @@ func BasicAuthWithConfig(config BasicAuthConfig) echo.MiddlewareFunc {
 			l := len(basic)
 
 			if len(auth) > l+1 && strings.EqualFold(auth[:l], basic) {
-				// Invalid base64 shouldn't be treated as error
-				// instead should be treated as invalid client input
 				b, err := base64.StdEncoding.DecodeString(auth[l+1:])
 				if err != nil {
-					return echo.NewHTTPError(http.StatusBadRequest).SetInternal(err)
+					return err
 				}
-
 				cred := string(b)
 				for i := 0; i < len(cred); i++ {
 					if cred[i] == ':' {
diff --git a/vendor/github.com/labstack/echo/v4/middleware/body_dump.go b/vendor/github.com/labstack/echo/v4/middleware/body_dump.go
index e4119ec..ebd0d0a 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/body_dump.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/body_dump.go
@@ -1,41 +1,42 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 
 	"github.com/labstack/echo/v4"
 )
 
-// BodyDumpConfig defines the config for BodyDump middleware.
-type BodyDumpConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// BodyDumpConfig defines the config for BodyDump middleware.
+	BodyDumpConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Handler receives request and response payload.
-	// Required.
-	Handler BodyDumpHandler
-}
+		// Handler receives request and response payload.
+		// Required.
+		Handler BodyDumpHandler
+	}
 
-// BodyDumpHandler receives the request and response payload.
-type BodyDumpHandler func(echo.Context, []byte, []byte)
+	// BodyDumpHandler receives the request and response payload.
+	BodyDumpHandler func(echo.Context, []byte, []byte)
 
-type bodyDumpResponseWriter struct {
-	io.Writer
-	http.ResponseWriter
-}
+	bodyDumpResponseWriter struct {
+		io.Writer
+		http.ResponseWriter
+	}
+)
 
-// DefaultBodyDumpConfig is the default BodyDump middleware config.
-var DefaultBodyDumpConfig = BodyDumpConfig{
-	Skipper: DefaultSkipper,
-}
+var (
+	// DefaultBodyDumpConfig is the default BodyDump middleware config.
+	DefaultBodyDumpConfig = BodyDumpConfig{
+		Skipper: DefaultSkipper,
+	}
+)
 
 // BodyDump returns a BodyDump middleware.
 //
@@ -67,9 +68,9 @@ func BodyDumpWithConfig(config BodyDumpConfig) echo.MiddlewareFunc {
 			// Request
 			reqBody := []byte{}
 			if c.Request().Body != nil { // Read
-				reqBody, _ = io.ReadAll(c.Request().Body)
+				reqBody, _ = ioutil.ReadAll(c.Request().Body)
 			}
-			c.Request().Body = io.NopCloser(bytes.NewBuffer(reqBody)) // Reset
+			c.Request().Body = ioutil.NopCloser(bytes.NewBuffer(reqBody)) // Reset
 
 			// Response
 			resBody := new(bytes.Buffer)
@@ -98,16 +99,9 @@ func (w *bodyDumpResponseWriter) Write(b []byte) (int, error) {
 }
 
 func (w *bodyDumpResponseWriter) Flush() {
-	err := http.NewResponseController(w.ResponseWriter).Flush()
-	if err != nil && errors.Is(err, http.ErrNotSupported) {
-		panic(errors.New("response writer flushing is not supported"))
-	}
+	w.ResponseWriter.(http.Flusher).Flush()
 }
 
 func (w *bodyDumpResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	return http.NewResponseController(w.ResponseWriter).Hijack()
-}
-
-func (w *bodyDumpResponseWriter) Unwrap() http.ResponseWriter {
-	return w.ResponseWriter
+	return w.ResponseWriter.(http.Hijacker).Hijack()
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/body_limit.go b/vendor/github.com/labstack/echo/v4/middleware/body_limit.go
index 7d3c665..b436bd5 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/body_limit.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/body_limit.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -12,27 +9,32 @@ import (
 	"github.com/labstack/gommon/bytes"
 )
 
-// BodyLimitConfig defines the config for BodyLimit middleware.
-type BodyLimitConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// BodyLimitConfig defines the config for BodyLimit middleware.
+	BodyLimitConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Maximum allowed size for a request body, it can be specified
-	// as `4x` or `4xB`, where x is one of the multiple from K, M, G, T or P.
-	Limit string `yaml:"limit"`
-	limit int64
-}
+		// Maximum allowed size for a request body, it can be specified
+		// as `4x` or `4xB`, where x is one of the multiple from K, M, G, T or P.
+		Limit string `yaml:"limit"`
+		limit int64
+	}
 
-type limitedReader struct {
-	BodyLimitConfig
-	reader io.ReadCloser
-	read   int64
-}
+	limitedReader struct {
+		BodyLimitConfig
+		reader  io.ReadCloser
+		read    int64
+		context echo.Context
+	}
+)
 
-// DefaultBodyLimitConfig is the default BodyLimit middleware config.
-var DefaultBodyLimitConfig = BodyLimitConfig{
-	Skipper: DefaultSkipper,
-}
+var (
+	// DefaultBodyLimitConfig is the default BodyLimit middleware config.
+	DefaultBodyLimitConfig = BodyLimitConfig{
+		Skipper: DefaultSkipper,
+	}
+)
 
 // BodyLimit returns a BodyLimit middleware.
 //
@@ -78,7 +80,7 @@ func BodyLimitWithConfig(config BodyLimitConfig) echo.MiddlewareFunc {
 
 			// Based on content read
 			r := pool.Get().(*limitedReader)
-			r.Reset(req.Body)
+			r.Reset(req.Body, c)
 			defer pool.Put(r)
 			req.Body = r
 
@@ -100,8 +102,9 @@ func (r *limitedReader) Close() error {
 	return r.reader.Close()
 }
 
-func (r *limitedReader) Reset(reader io.ReadCloser) {
+func (r *limitedReader) Reset(reader io.ReadCloser, context echo.Context) {
 	r.reader = reader
+	r.context = context
 	r.read = 0
 }
 
diff --git a/vendor/github.com/labstack/echo/v4/middleware/compress.go b/vendor/github.com/labstack/echo/v4/middleware/compress.go
index 012b76b..6ae1974 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/compress.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/compress.go
@@ -1,13 +1,10 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"bufio"
-	"bytes"
 	"compress/gzip"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"strings"
@@ -16,50 +13,34 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// GzipConfig defines the config for Gzip middleware.
-type GzipConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// GzipConfig defines the config for Gzip middleware.
+	GzipConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Gzip compression level.
-	// Optional. Default value -1.
-	Level int `yaml:"level"`
+		// Gzip compression level.
+		// Optional. Default value -1.
+		Level int `yaml:"level"`
+	}
 
-	// Length threshold before gzip compression is applied.
-	// Optional. Default value 0.
-	//
-	// Most of the time you will not need to change the default. Compressing
-	// a short response might increase the transmitted data because of the
-	// gzip format overhead. Compressing the response will also consume CPU
-	// and time on the server and the client (for decompressing). Depending on
-	// your use case such a threshold might be useful.
-	//
-	// See also:
-	// https://webmasters.stackexchange.com/questions/31750/what-is-recommended-minimum-object-size-for-gzip-performance-benefits
-	MinLength int
-}
-
-type gzipResponseWriter struct {
-	io.Writer
-	http.ResponseWriter
-	wroteHeader       bool
-	wroteBody         bool
-	minLength         int
-	minLengthExceeded bool
-	buffer            *bytes.Buffer
-	code              int
-}
+	gzipResponseWriter struct {
+		io.Writer
+		http.ResponseWriter
+	}
+)
 
 const (
 	gzipScheme = "gzip"
 )
 
-// DefaultGzipConfig is the default Gzip middleware config.
-var DefaultGzipConfig = GzipConfig{
-	Skipper:   DefaultSkipper,
-	Level:     -1,
-	MinLength: 0,
-}
+var (
+	// DefaultGzipConfig is the default Gzip middleware config.
+	DefaultGzipConfig = GzipConfig{
+		Skipper: DefaultSkipper,
+		Level:   -1,
+	}
+)
 
 // Gzip returns a middleware which compresses HTTP response using gzip compression
 // scheme.
@@ -77,12 +58,8 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 	if config.Level == 0 {
 		config.Level = DefaultGzipConfig.Level
 	}
-	if config.MinLength < 0 {
-		config.MinLength = DefaultGzipConfig.MinLength
-	}
 
 	pool := gzipCompressPool(config)
-	bpool := bufferPool()
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -93,6 +70,7 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 			res := c.Response()
 			res.Header().Add(echo.HeaderVary, echo.HeaderAcceptEncoding)
 			if strings.Contains(c.Request().Header.Get(echo.HeaderAcceptEncoding), gzipScheme) {
+				res.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
 				i := pool.Get()
 				w, ok := i.(*gzip.Writer)
 				if !ok {
@@ -100,40 +78,21 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 				}
 				rw := res.Writer
 				w.Reset(rw)
-
-				buf := bpool.Get().(*bytes.Buffer)
-				buf.Reset()
-
-				grw := &gzipResponseWriter{Writer: w, ResponseWriter: rw, minLength: config.MinLength, buffer: buf}
 				defer func() {
-					// There are different reasons for cases when we have not yet written response to the client and now need to do so.
-					// a) handler response had only response code and no response body (ala 404 or redirects etc). Response code need to be written now.
-					// b) body is shorter than our minimum length threshold and being buffered currently and needs to be written
-					if !grw.wroteBody {
+					if res.Size == 0 {
 						if res.Header().Get(echo.HeaderContentEncoding) == gzipScheme {
 							res.Header().Del(echo.HeaderContentEncoding)
 						}
-						if grw.wroteHeader {
-							rw.WriteHeader(grw.code)
-						}
 						// We have to reset response to it's pristine state when
 						// nothing is written to body or error is returned.
 						// See issue #424, #407.
 						res.Writer = rw
-						w.Reset(io.Discard)
-					} else if !grw.minLengthExceeded {
-						// Write uncompressed response
-						res.Writer = rw
-						if grw.wroteHeader {
-							grw.ResponseWriter.WriteHeader(grw.code)
-						}
-						grw.buffer.WriteTo(rw)
-						w.Reset(io.Discard)
+						w.Reset(ioutil.Discard)
 					}
 					w.Close()
-					bpool.Put(buf)
 					pool.Put(w)
 				}()
+				grw := &gzipResponseWriter{Writer: w, ResponseWriter: rw}
 				res.Writer = grw
 			}
 			return next(c)
@@ -142,63 +101,29 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 }
 
 func (w *gzipResponseWriter) WriteHeader(code int) {
+	if code == http.StatusNoContent { // Issue #489
+		w.ResponseWriter.Header().Del(echo.HeaderContentEncoding)
+	}
 	w.Header().Del(echo.HeaderContentLength) // Issue #444
-
-	w.wroteHeader = true
-
-	// Delay writing of the header until we know if we'll actually compress the response
-	w.code = code
+	w.ResponseWriter.WriteHeader(code)
 }
 
 func (w *gzipResponseWriter) Write(b []byte) (int, error) {
 	if w.Header().Get(echo.HeaderContentType) == "" {
 		w.Header().Set(echo.HeaderContentType, http.DetectContentType(b))
 	}
-	w.wroteBody = true
-
-	if !w.minLengthExceeded {
-		n, err := w.buffer.Write(b)
-
-		if w.buffer.Len() >= w.minLength {
-			w.minLengthExceeded = true
-
-			// The minimum length is exceeded, add Content-Encoding header and write the header
-			w.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
-			if w.wroteHeader {
-				w.ResponseWriter.WriteHeader(w.code)
-			}
-
-			return w.Writer.Write(w.buffer.Bytes())
-		}
-
-		return n, err
-	}
-
 	return w.Writer.Write(b)
 }
 
 func (w *gzipResponseWriter) Flush() {
-	if !w.minLengthExceeded {
-		// Enforce compression because we will not know how much more data will come
-		w.minLengthExceeded = true
-		w.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
-		if w.wroteHeader {
-			w.ResponseWriter.WriteHeader(w.code)
-		}
-
-		w.Writer.Write(w.buffer.Bytes())
-	}
-
 	w.Writer.(*gzip.Writer).Flush()
-	_ = http.NewResponseController(w.ResponseWriter).Flush()
-}
-
-func (w *gzipResponseWriter) Unwrap() http.ResponseWriter {
-	return w.ResponseWriter
+	if flusher, ok := w.ResponseWriter.(http.Flusher); ok {
+		flusher.Flush()
+	}
 }
 
 func (w *gzipResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	return http.NewResponseController(w.ResponseWriter).Hijack()
+	return w.ResponseWriter.(http.Hijacker).Hijack()
 }
 
 func (w *gzipResponseWriter) Push(target string, opts *http.PushOptions) error {
@@ -211,7 +136,7 @@ func (w *gzipResponseWriter) Push(target string, opts *http.PushOptions) error {
 func gzipCompressPool(config GzipConfig) sync.Pool {
 	return sync.Pool{
 		New: func() interface{} {
-			w, err := gzip.NewWriterLevel(io.Discard, config.Level)
+			w, err := gzip.NewWriterLevel(ioutil.Discard, config.Level)
 			if err != nil {
 				return err
 			}
@@ -219,12 +144,3 @@ func gzipCompressPool(config GzipConfig) sync.Pool {
 		},
 	}
 }
-
-func bufferPool() sync.Pool {
-	return sync.Pool{
-		New: func() interface{} {
-			b := &bytes.Buffer{}
-			return b
-		},
-	}
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go b/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go
deleted file mode 100644
index e67173f..0000000
--- a/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package middleware
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/labstack/echo/v4"
-)
-
-// ContextTimeoutConfig defines the config for ContextTimeout middleware.
-type ContextTimeoutConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
-
-	// ErrorHandler is a function when error aries in middleware execution.
-	ErrorHandler func(err error, c echo.Context) error
-
-	// Timeout configures a timeout for the middleware, defaults to 0 for no timeout
-	Timeout time.Duration
-}
-
-// ContextTimeout returns a middleware which returns error (503 Service Unavailable error) to client
-// when underlying method returns context.DeadlineExceeded error.
-func ContextTimeout(timeout time.Duration) echo.MiddlewareFunc {
-	return ContextTimeoutWithConfig(ContextTimeoutConfig{Timeout: timeout})
-}
-
-// ContextTimeoutWithConfig returns a Timeout middleware with config.
-func ContextTimeoutWithConfig(config ContextTimeoutConfig) echo.MiddlewareFunc {
-	mw, err := config.ToMiddleware()
-	if err != nil {
-		panic(err)
-	}
-	return mw
-}
-
-// ToMiddleware converts Config to middleware.
-func (config ContextTimeoutConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
-	if config.Timeout == 0 {
-		return nil, errors.New("timeout must be set")
-	}
-	if config.Skipper == nil {
-		config.Skipper = DefaultSkipper
-	}
-	if config.ErrorHandler == nil {
-		config.ErrorHandler = func(err error, c echo.Context) error {
-			if err != nil && errors.Is(err, context.DeadlineExceeded) {
-				return echo.ErrServiceUnavailable.WithInternal(err)
-			}
-			return err
-		}
-	}
-
-	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) error {
-			if config.Skipper(c) {
-				return next(c)
-			}
-
-			timeoutContext, cancel := context.WithTimeout(c.Request().Context(), config.Timeout)
-			defer cancel()
-
-			c.SetRequest(c.Request().WithContext(timeoutContext))
-
-			if err := next(c); err != nil {
-				return config.ErrorHandler(err, c)
-			}
-			return nil
-		}
-	}, nil
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/cors.go b/vendor/github.com/labstack/echo/v4/middleware/cors.go
index a1f4453..d6ef896 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/cors.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/cors.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -12,127 +9,69 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// CORSConfig defines the config for CORS middleware.
-type CORSConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// CORSConfig defines the config for CORS middleware.
+	CORSConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// AllowOrigins determines the value of the Access-Control-Allow-Origin
-	// response header.  This header defines a list of origins that may access the
-	// resource.  The wildcard characters '*' and '?' are supported and are
-	// converted to regex fragments '.*' and '.' accordingly.
-	//
-	// Security: use extreme caution when handling the origin, and carefully
-	// validate any logic. Remember that attackers may register hostile domain names.
-	// See https://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html
-	//
-	// Optional. Default value []string{"*"}.
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
-	AllowOrigins []string `yaml:"allow_origins"`
+		// AllowOrigin defines a list of origins that may access the resource.
+		// Optional. Default value []string{"*"}.
+		AllowOrigins []string `yaml:"allow_origins"`
 
-	// AllowOriginFunc is a custom function to validate the origin. It takes the
-	// origin as an argument and returns true if allowed or false otherwise. If
-	// an error is returned, it is returned by the handler. If this option is
-	// set, AllowOrigins is ignored.
-	//
-	// Security: use extreme caution when handling the origin, and carefully
-	// validate any logic. Remember that attackers may register hostile domain names.
-	// See https://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html
-	//
-	// Optional.
-	AllowOriginFunc func(origin string) (bool, error) `yaml:"-"`
+		// AllowOriginFunc is a custom function to validate the origin. It takes the
+		// origin as an argument and returns true if allowed or false otherwise. If
+		// an error is returned, it is returned by the handler. If this option is
+		// set, AllowOrigins is ignored.
+		// Optional.
+		AllowOriginFunc func(origin string) (bool, error) `yaml:"allow_origin_func"`
 
-	// AllowMethods determines the value of the Access-Control-Allow-Methods
-	// response header.  This header specified the list of methods allowed when
-	// accessing the resource.  This is used in response to a preflight request.
-	//
-	// Optional. Default value DefaultCORSConfig.AllowMethods.
-	// If `allowMethods` is left empty, this middleware will fill for preflight
-	// request `Access-Control-Allow-Methods` header value
-	// from `Allow` header that echo.Router set into context.
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
-	AllowMethods []string `yaml:"allow_methods"`
+		// AllowMethods defines a list methods allowed when accessing the resource.
+		// This is used in response to a preflight request.
+		// Optional. Default value DefaultCORSConfig.AllowMethods.
+		AllowMethods []string `yaml:"allow_methods"`
 
-	// AllowHeaders determines the value of the Access-Control-Allow-Headers
-	// response header.  This header is used in response to a preflight request to
-	// indicate which HTTP headers can be used when making the actual request.
-	//
-	// Optional. Default value []string{}.
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
-	AllowHeaders []string `yaml:"allow_headers"`
+		// AllowHeaders defines a list of request headers that can be used when
+		// making the actual request. This is in response to a preflight request.
+		// Optional. Default value []string{}.
+		AllowHeaders []string `yaml:"allow_headers"`
 
-	// AllowCredentials determines the value of the
-	// Access-Control-Allow-Credentials response header.  This header indicates
-	// whether or not the response to the request can be exposed when the
-	// credentials mode (Request.credentials) is true. When used as part of a
-	// response to a preflight request, this indicates whether or not the actual
-	// request can be made using credentials.  See also
-	// [MDN: Access-Control-Allow-Credentials].
-	//
-	// Optional. Default value false, in which case the header is not set.
-	//
-	// Security: avoid using `AllowCredentials = true` with `AllowOrigins = *`.
-	// See "Exploiting CORS misconfigurations for Bitcoins and bounties",
-	// https://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
-	AllowCredentials bool `yaml:"allow_credentials"`
+		// AllowCredentials indicates whether or not the response to the request
+		// can be exposed when the credentials flag is true. When used as part of
+		// a response to a preflight request, this indicates whether or not the
+		// actual request can be made using credentials.
+		// Optional. Default value false.
+		AllowCredentials bool `yaml:"allow_credentials"`
 
-	// UnsafeWildcardOriginWithAllowCredentials UNSAFE/INSECURE: allows wildcard '*' origin to be used with AllowCredentials
-	// flag. In that case we consider any origin allowed and send it back to the client with `Access-Control-Allow-Origin` header.
-	//
-	// This is INSECURE and potentially leads to [cross-origin](https://portswigger.net/research/exploiting-cors-misconfigurations-for-bitcoins-and-bounties)
-	// attacks. See: https://github.com/labstack/echo/issues/2400 for discussion on the subject.
-	//
-	// Optional. Default value is false.
-	UnsafeWildcardOriginWithAllowCredentials bool `yaml:"unsafe_wildcard_origin_with_allow_credentials"`
+		// ExposeHeaders defines a whitelist headers that clients are allowed to
+		// access.
+		// Optional. Default value []string{}.
+		ExposeHeaders []string `yaml:"expose_headers"`
 
-	// ExposeHeaders determines the value of Access-Control-Expose-Headers, which
-	// defines a list of headers that clients are allowed to access.
-	//
-	// Optional. Default value []string{}, in which case the header is not set.
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Header
-	ExposeHeaders []string `yaml:"expose_headers"`
+		// MaxAge indicates how long (in seconds) the results of a preflight request
+		// can be cached.
+		// Optional. Default value 0.
+		MaxAge int `yaml:"max_age"`
+	}
+)
 
-	// MaxAge determines the value of the Access-Control-Max-Age response header.
-	// This header indicates how long (in seconds) the results of a preflight
-	// request can be cached.
-	// The header is set only if MaxAge != 0, negative value sends "0" which instructs browsers not to cache that response.
-	//
-	// Optional. Default value 0 - meaning header is not sent.
-	//
-	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
-	MaxAge int `yaml:"max_age"`
-}
-
-// DefaultCORSConfig is the default CORS middleware config.
-var DefaultCORSConfig = CORSConfig{
-	Skipper:      DefaultSkipper,
-	AllowOrigins: []string{"*"},
-	AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodPut, http.MethodPatch, http.MethodPost, http.MethodDelete},
-}
+var (
+	// DefaultCORSConfig is the default CORS middleware config.
+	DefaultCORSConfig = CORSConfig{
+		Skipper:      DefaultSkipper,
+		AllowOrigins: []string{"*"},
+		AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodPut, http.MethodPatch, http.MethodPost, http.MethodDelete},
+	}
+)
 
 // CORS returns a Cross-Origin Resource Sharing (CORS) middleware.
-// See also [MDN: Cross-Origin Resource Sharing (CORS)].
-//
-// Security: Poorly configured CORS can compromise security because it allows
-// relaxation of the browser's Same-Origin policy.  See [Exploiting CORS
-// misconfigurations for Bitcoins and bounties] and [Portswigger: Cross-origin
-// resource sharing (CORS)] for more details.
-//
-// [MDN: Cross-Origin Resource Sharing (CORS)]: https://developer.mozilla.org/en/docs/Web/HTTP/Access_control_CORS
-// [Exploiting CORS misconfigurations for Bitcoins and bounties]: https://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html
-// [Portswigger: Cross-origin resource sharing (CORS)]: https://portswigger.net/web-security/cors
+// See: https://developer.mozilla.org/en/docs/Web/HTTP/Access_control_CORS
 func CORS() echo.MiddlewareFunc {
 	return CORSWithConfig(DefaultCORSConfig)
 }
 
 // CORSWithConfig returns a CORS middleware with config.
-// See: [CORS].
+// See: `CORS()`.
 func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 	// Defaults
 	if config.Skipper == nil {
@@ -141,41 +80,23 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 	if len(config.AllowOrigins) == 0 {
 		config.AllowOrigins = DefaultCORSConfig.AllowOrigins
 	}
-	hasCustomAllowMethods := true
 	if len(config.AllowMethods) == 0 {
-		hasCustomAllowMethods = false
 		config.AllowMethods = DefaultCORSConfig.AllowMethods
 	}
 
-	allowOriginPatterns := make([]*regexp.Regexp, 0, len(config.AllowOrigins))
+	allowOriginPatterns := []string{}
 	for _, origin := range config.AllowOrigins {
-		if origin == "*" {
-			continue // "*" is handled differently and does not need regexp
-		}
 		pattern := regexp.QuoteMeta(origin)
-		pattern = strings.ReplaceAll(pattern, "\\*", ".*")
-		pattern = strings.ReplaceAll(pattern, "\\?", ".")
+		pattern = strings.Replace(pattern, "\\*", ".*", -1)
+		pattern = strings.Replace(pattern, "\\?", ".", -1)
 		pattern = "^" + pattern + "$"
-
-		re, err := regexp.Compile(pattern)
-		if err != nil {
-			// this is to preserve previous behaviour - invalid patterns were just ignored.
-			// If we would turn this to panic, users with invalid patterns
-			// would have applications crashing in production due unrecovered panic.
-			// TODO: this should be turned to error/panic in `v5`
-			continue
-		}
-		allowOriginPatterns = append(allowOriginPatterns, re)
+		allowOriginPatterns = append(allowOriginPatterns, pattern)
 	}
 
 	allowMethods := strings.Join(config.AllowMethods, ",")
 	allowHeaders := strings.Join(config.AllowHeaders, ",")
 	exposeHeaders := strings.Join(config.ExposeHeaders, ",")
-
-	maxAge := "0"
-	if config.MaxAge > 0 {
-		maxAge = strconv.Itoa(config.MaxAge)
-	}
+	maxAge := strconv.Itoa(config.MaxAge)
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -188,28 +109,10 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			origin := req.Header.Get(echo.HeaderOrigin)
 			allowOrigin := ""
 
+			preflight := req.Method == http.MethodOptions
 			res.Header().Add(echo.HeaderVary, echo.HeaderOrigin)
 
-			// Preflight request is an OPTIONS request, using three HTTP request headers: Access-Control-Request-Method,
-			// Access-Control-Request-Headers, and the Origin header. See: https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-			// For simplicity we just consider method type and later `Origin` header.
-			preflight := req.Method == http.MethodOptions
-
-			// Although router adds special handler in case of OPTIONS method we avoid calling next for OPTIONS in this middleware
-			// as CORS requests do not have cookies / authentication headers by default, so we could get stuck in auth
-			// middlewares by calling next(c).
-			// But we still want to send `Allow` header as response in case of Non-CORS OPTIONS request as router default
-			// handler does.
-			routerAllowMethods := ""
-			if preflight {
-				tmpAllowMethods, ok := c.Get(echo.ContextKeyHeaderAllow).(string)
-				if ok && tmpAllowMethods != "" {
-					routerAllowMethods = tmpAllowMethods
-					c.Response().Header().Set(echo.HeaderAllow, routerAllowMethods)
-				}
-			}
-
-			// No Origin provided. This is (probably) not request from actual browser - proceed executing middleware chain
+			// No Origin provided
 			if origin == "" {
 				if !preflight {
 					return next(c)
@@ -228,7 +131,7 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			} else {
 				// Check allowed origins
 				for _, o := range config.AllowOrigins {
-					if o == "*" && config.AllowCredentials && config.UnsafeWildcardOriginWithAllowCredentials {
+					if o == "*" && config.AllowCredentials {
 						allowOrigin = origin
 						break
 					}
@@ -242,16 +145,20 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 					}
 				}
 
-				checkPatterns := false
-				if allowOrigin == "" {
-					// to avoid regex cost by invalid (long) domains (253 is domain name max limit)
-					if len(origin) <= (253+3+5) && strings.Contains(origin, "://") {
-						checkPatterns = true
-					}
-				}
-				if checkPatterns {
-					for _, re := range allowOriginPatterns {
-						if match := re.MatchString(origin); match {
+				// Check allowed origin patterns
+				for _, re := range allowOriginPatterns {
+					if allowOrigin == "" {
+						didx := strings.Index(origin, "://")
+						if didx == -1 {
+							continue
+						}
+						domAuth := origin[didx+3:]
+						// to avoid regex cost by invalid long domain
+						if len(domAuth) > 253 {
+							break
+						}
+
+						if match, _ := regexp.MatchString(re, origin); match {
 							allowOrigin = origin
 							break
 						}
@@ -267,13 +174,12 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 				return c.NoContent(http.StatusNoContent)
 			}
 
-			res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowOrigin)
-			if config.AllowCredentials {
-				res.Header().Set(echo.HeaderAccessControlAllowCredentials, "true")
-			}
-
 			// Simple request
 			if !preflight {
+				res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowOrigin)
+				if config.AllowCredentials {
+					res.Header().Set(echo.HeaderAccessControlAllowCredentials, "true")
+				}
 				if exposeHeaders != "" {
 					res.Header().Set(echo.HeaderAccessControlExposeHeaders, exposeHeaders)
 				}
@@ -283,13 +189,11 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			// Preflight request
 			res.Header().Add(echo.HeaderVary, echo.HeaderAccessControlRequestMethod)
 			res.Header().Add(echo.HeaderVary, echo.HeaderAccessControlRequestHeaders)
-
-			if !hasCustomAllowMethods && routerAllowMethods != "" {
-				res.Header().Set(echo.HeaderAccessControlAllowMethods, routerAllowMethods)
-			} else {
-				res.Header().Set(echo.HeaderAccessControlAllowMethods, allowMethods)
+			res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowOrigin)
+			res.Header().Set(echo.HeaderAccessControlAllowMethods, allowMethods)
+			if config.AllowCredentials {
+				res.Header().Set(echo.HeaderAccessControlAllowCredentials, "true")
 			}
-
 			if allowHeaders != "" {
 				res.Header().Set(echo.HeaderAccessControlAllowHeaders, allowHeaders)
 			} else {
@@ -298,7 +202,7 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 					res.Header().Set(echo.HeaderAccessControlAllowHeaders, h)
 				}
 			}
-			if config.MaxAge != 0 {
+			if config.MaxAge > 0 {
 				res.Header().Set(echo.HeaderAccessControlMaxAge, maxAge)
 			}
 			return c.NoContent(http.StatusNoContent)
diff --git a/vendor/github.com/labstack/echo/v4/middleware/csrf.go b/vendor/github.com/labstack/echo/v4/middleware/csrf.go
index 92f4019..7804997 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/csrf.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/csrf.go
@@ -1,88 +1,85 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"crypto/subtle"
+	"errors"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/labstack/echo/v4"
+	"github.com/labstack/gommon/random"
 )
 
-// CSRFConfig defines the config for CSRF middleware.
-type CSRFConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// CSRFConfig defines the config for CSRF middleware.
+	CSRFConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// TokenLength is the length of the generated token.
-	TokenLength uint8 `yaml:"token_length"`
-	// Optional. Default value 32.
+		// TokenLength is the length of the generated token.
+		TokenLength uint8 `yaml:"token_length"`
+		// Optional. Default value 32.
 
-	// TokenLookup is a string in the form of "<source>:<name>" or "<source>:<name>,<source>:<name>" that is used
-	// to extract token from the request.
-	// Optional. Default value "header:X-CSRF-Token".
-	// Possible values:
-	// - "header:<name>" or "header:<name>:<cut-prefix>"
-	// - "query:<name>"
-	// - "form:<name>"
-	// Multiple sources example:
-	// - "header:X-CSRF-Token,query:csrf"
-	TokenLookup string `yaml:"token_lookup"`
+		// TokenLookup is a string in the form of "<source>:<key>" that is used
+		// to extract token from the request.
+		// Optional. Default value "header:X-CSRF-Token".
+		// Possible values:
+		// - "header:<name>"
+		// - "form:<name>"
+		// - "query:<name>"
+		TokenLookup string `yaml:"token_lookup"`
 
-	// Context key to store generated CSRF token into context.
-	// Optional. Default value "csrf".
-	ContextKey string `yaml:"context_key"`
+		// Context key to store generated CSRF token into context.
+		// Optional. Default value "csrf".
+		ContextKey string `yaml:"context_key"`
 
-	// Name of the CSRF cookie. This cookie will store CSRF token.
-	// Optional. Default value "csrf".
-	CookieName string `yaml:"cookie_name"`
+		// Name of the CSRF cookie. This cookie will store CSRF token.
+		// Optional. Default value "csrf".
+		CookieName string `yaml:"cookie_name"`
 
-	// Domain of the CSRF cookie.
-	// Optional. Default value none.
-	CookieDomain string `yaml:"cookie_domain"`
+		// Domain of the CSRF cookie.
+		// Optional. Default value none.
+		CookieDomain string `yaml:"cookie_domain"`
 
-	// Path of the CSRF cookie.
-	// Optional. Default value none.
-	CookiePath string `yaml:"cookie_path"`
+		// Path of the CSRF cookie.
+		// Optional. Default value none.
+		CookiePath string `yaml:"cookie_path"`
 
-	// Max age (in seconds) of the CSRF cookie.
-	// Optional. Default value 86400 (24hr).
-	CookieMaxAge int `yaml:"cookie_max_age"`
+		// Max age (in seconds) of the CSRF cookie.
+		// Optional. Default value 86400 (24hr).
+		CookieMaxAge int `yaml:"cookie_max_age"`
 
-	// Indicates if CSRF cookie is secure.
-	// Optional. Default value false.
-	CookieSecure bool `yaml:"cookie_secure"`
+		// Indicates if CSRF cookie is secure.
+		// Optional. Default value false.
+		CookieSecure bool `yaml:"cookie_secure"`
 
-	// Indicates if CSRF cookie is HTTP only.
-	// Optional. Default value false.
-	CookieHTTPOnly bool `yaml:"cookie_http_only"`
+		// Indicates if CSRF cookie is HTTP only.
+		// Optional. Default value false.
+		CookieHTTPOnly bool `yaml:"cookie_http_only"`
 
-	// Indicates SameSite mode of the CSRF cookie.
-	// Optional. Default value SameSiteDefaultMode.
-	CookieSameSite http.SameSite `yaml:"cookie_same_site"`
+		// Indicates SameSite mode of the CSRF cookie.
+		// Optional. Default value SameSiteDefaultMode.
+		CookieSameSite http.SameSite `yaml:"cookie_same_site"`
+	}
 
-	// ErrorHandler defines a function which is executed for returning custom errors.
-	ErrorHandler CSRFErrorHandler
-}
+	// csrfTokenExtractor defines a function that takes `echo.Context` and returns
+	// either a token or an error.
+	csrfTokenExtractor func(echo.Context) (string, error)
+)
 
-// CSRFErrorHandler is a function which is executed for creating custom errors.
-type CSRFErrorHandler func(err error, c echo.Context) error
-
-// ErrCSRFInvalid is returned when CSRF check fails
-var ErrCSRFInvalid = echo.NewHTTPError(http.StatusForbidden, "invalid csrf token")
-
-// DefaultCSRFConfig is the default CSRF middleware config.
-var DefaultCSRFConfig = CSRFConfig{
-	Skipper:        DefaultSkipper,
-	TokenLength:    32,
-	TokenLookup:    "header:" + echo.HeaderXCSRFToken,
-	ContextKey:     "csrf",
-	CookieName:     "_csrf",
-	CookieMaxAge:   86400,
-	CookieSameSite: http.SameSiteDefaultMode,
-}
+var (
+	// DefaultCSRFConfig is the default CSRF middleware config.
+	DefaultCSRFConfig = CSRFConfig{
+		Skipper:        DefaultSkipper,
+		TokenLength:    32,
+		TokenLookup:    "header:" + echo.HeaderXCSRFToken,
+		ContextKey:     "csrf",
+		CookieName:     "_csrf",
+		CookieMaxAge:   86400,
+		CookieSameSite: http.SameSiteDefaultMode,
+	}
+)
 
 // CSRF returns a Cross-Site Request Forgery (CSRF) middleware.
 // See: https://en.wikipedia.org/wiki/Cross-site_request_forgery
@@ -101,7 +98,6 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 	if config.TokenLength == 0 {
 		config.TokenLength = DefaultCSRFConfig.TokenLength
 	}
-
 	if config.TokenLookup == "" {
 		config.TokenLookup = DefaultCSRFConfig.TokenLookup
 	}
@@ -118,9 +114,14 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 		config.CookieSecure = true
 	}
 
-	extractors, cErr := CreateExtractors(config.TokenLookup)
-	if cErr != nil {
-		panic(cErr)
+	// Initialize
+	parts := strings.Split(config.TokenLookup, ":")
+	extractor := csrfTokenFromHeader(parts[1])
+	switch parts[0] {
+	case "form":
+		extractor = csrfTokenFromForm(parts[1])
+	case "query":
+		extractor = csrfTokenFromQuery(parts[1])
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -129,58 +130,28 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 				return next(c)
 			}
 
+			req := c.Request()
+			k, err := c.Cookie(config.CookieName)
 			token := ""
-			if k, err := c.Cookie(config.CookieName); err != nil {
-				token = randomString(config.TokenLength)
+
+			// Generate token
+			if err != nil {
+				token = random.String(config.TokenLength)
 			} else {
-				token = k.Value // Reuse token
+				// Reuse token
+				token = k.Value
 			}
 
-			switch c.Request().Method {
+			switch req.Method {
 			case http.MethodGet, http.MethodHead, http.MethodOptions, http.MethodTrace:
 			default:
 				// Validate token only for requests which are not defined as 'safe' by RFC7231
-				var lastExtractorErr error
-				var lastTokenErr error
-			outer:
-				for _, extractor := range extractors {
-					clientTokens, err := extractor(c)
-					if err != nil {
-						lastExtractorErr = err
-						continue
-					}
-
-					for _, clientToken := range clientTokens {
-						if validateCSRFToken(token, clientToken) {
-							lastTokenErr = nil
-							lastExtractorErr = nil
-							break outer
-						}
-						lastTokenErr = ErrCSRFInvalid
-					}
+				clientToken, err := extractor(c)
+				if err != nil {
+					return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 				}
-				var finalErr error
-				if lastTokenErr != nil {
-					finalErr = lastTokenErr
-				} else if lastExtractorErr != nil {
-					// ugly part to preserve backwards compatible errors. someone could rely on them
-					if lastExtractorErr == errQueryExtractorValueMissing {
-						lastExtractorErr = echo.NewHTTPError(http.StatusBadRequest, "missing csrf token in the query string")
-					} else if lastExtractorErr == errFormExtractorValueMissing {
-						lastExtractorErr = echo.NewHTTPError(http.StatusBadRequest, "missing csrf token in the form parameter")
-					} else if lastExtractorErr == errHeaderExtractorValueMissing {
-						lastExtractorErr = echo.NewHTTPError(http.StatusBadRequest, "missing csrf token in request header")
-					} else {
-						lastExtractorErr = echo.NewHTTPError(http.StatusBadRequest, lastExtractorErr.Error())
-					}
-					finalErr = lastExtractorErr
-				}
-
-				if finalErr != nil {
-					if config.ErrorHandler != nil {
-						return config.ErrorHandler(finalErr, c)
-					}
-					return finalErr
+				if !validateCSRFToken(token, clientToken) {
+					return echo.NewHTTPError(http.StatusForbidden, "invalid csrf token")
 				}
 			}
 
@@ -213,6 +184,38 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 	}
 }
 
+// csrfTokenFromForm returns a `csrfTokenExtractor` that extracts token from the
+// provided request header.
+func csrfTokenFromHeader(header string) csrfTokenExtractor {
+	return func(c echo.Context) (string, error) {
+		return c.Request().Header.Get(header), nil
+	}
+}
+
+// csrfTokenFromForm returns a `csrfTokenExtractor` that extracts token from the
+// provided form parameter.
+func csrfTokenFromForm(param string) csrfTokenExtractor {
+	return func(c echo.Context) (string, error) {
+		token := c.FormValue(param)
+		if token == "" {
+			return "", errors.New("missing csrf token in the form parameter")
+		}
+		return token, nil
+	}
+}
+
+// csrfTokenFromQuery returns a `csrfTokenExtractor` that extracts token from the
+// provided query parameter.
+func csrfTokenFromQuery(param string) csrfTokenExtractor {
+	return func(c echo.Context) (string, error) {
+		token := c.QueryParam(param)
+		if token == "" {
+			return "", errors.New("missing csrf token in the query string")
+		}
+		return token, nil
+	}
+}
+
 func validateCSRFToken(token, clientToken string) bool {
 	return subtle.ConstantTimeCompare([]byte(token), []byte(clientToken)) == 1
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/decompress.go b/vendor/github.com/labstack/echo/v4/middleware/decompress.go
index 0c56176..c046359 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/decompress.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/decompress.go
@@ -1,27 +1,28 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
+	"bytes"
 	"compress/gzip"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"sync"
 
 	"github.com/labstack/echo/v4"
 )
 
-// DecompressConfig defines the config for Decompress middleware.
-type DecompressConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// DecompressConfig defines the config for Decompress middleware.
+	DecompressConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// GzipDecompressPool defines an interface to provide the sync.Pool used to create/store Gzip readers
-	GzipDecompressPool Decompressor
-}
+		// GzipDecompressPool defines an interface to provide the sync.Pool used to create/store Gzip readers
+		GzipDecompressPool Decompressor
+	}
+)
 
-// GZIPEncoding content-encoding header if set to "gzip", decompress body contents.
+//GZIPEncoding content-encoding header if set to "gzip", decompress body contents.
 const GZIPEncoding string = "gzip"
 
 // Decompressor is used to get the sync.Pool used by the middleware to get Gzip readers
@@ -29,26 +30,47 @@ type Decompressor interface {
 	gzipDecompressPool() sync.Pool
 }
 
-// DefaultDecompressConfig defines the config for decompress middleware
-var DefaultDecompressConfig = DecompressConfig{
-	Skipper:            DefaultSkipper,
-	GzipDecompressPool: &DefaultGzipDecompressPool{},
-}
+var (
+	//DefaultDecompressConfig defines the config for decompress middleware
+	DefaultDecompressConfig = DecompressConfig{
+		Skipper:            DefaultSkipper,
+		GzipDecompressPool: &DefaultGzipDecompressPool{},
+	}
+)
 
 // DefaultGzipDecompressPool is the default implementation of Decompressor interface
 type DefaultGzipDecompressPool struct {
 }
 
 func (d *DefaultGzipDecompressPool) gzipDecompressPool() sync.Pool {
-	return sync.Pool{New: func() interface{} { return new(gzip.Reader) }}
+	return sync.Pool{
+		New: func() interface{} {
+			// create with an empty reader (but with GZIP header)
+			w, err := gzip.NewWriterLevel(ioutil.Discard, gzip.BestSpeed)
+			if err != nil {
+				return err
+			}
+
+			b := new(bytes.Buffer)
+			w.Reset(b)
+			w.Flush()
+			w.Close()
+
+			r, err := gzip.NewReader(bytes.NewReader(b.Bytes()))
+			if err != nil {
+				return err
+			}
+			return r
+		},
+	}
 }
 
-// Decompress decompresses request body based if content encoding type is set to "gzip" with default config
+//Decompress decompresses request body based if content encoding type is set to "gzip" with default config
 func Decompress() echo.MiddlewareFunc {
 	return DecompressWithConfig(DefaultDecompressConfig)
 }
 
-// DecompressWithConfig decompresses request body based if content encoding type is set to "gzip" with config
+//DecompressWithConfig decompresses request body based if content encoding type is set to "gzip" with config
 func DecompressWithConfig(config DecompressConfig) echo.MiddlewareFunc {
 	// Defaults
 	if config.Skipper == nil {
@@ -60,38 +82,38 @@ func DecompressWithConfig(config DecompressConfig) echo.MiddlewareFunc {
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		pool := config.GzipDecompressPool.gzipDecompressPool()
-
 		return func(c echo.Context) error {
 			if config.Skipper(c) {
 				return next(c)
 			}
+			switch c.Request().Header.Get(echo.HeaderContentEncoding) {
+			case GZIPEncoding:
+				b := c.Request().Body
 
-			if c.Request().Header.Get(echo.HeaderContentEncoding) != GZIPEncoding {
-				return next(c)
-			}
-
-			i := pool.Get()
-			gr, ok := i.(*gzip.Reader)
-			if !ok || gr == nil {
-				return echo.NewHTTPError(http.StatusInternalServerError, i.(error).Error())
-			}
-			defer pool.Put(gr)
-
-			b := c.Request().Body
-			defer b.Close()
-
-			if err := gr.Reset(b); err != nil {
-				if err == io.EOF { //ignore if body is empty
-					return next(c)
+				i := pool.Get()
+				gr, ok := i.(*gzip.Reader)
+				if !ok {
+					return echo.NewHTTPError(http.StatusInternalServerError, i.(error).Error())
 				}
-				return err
+
+				if err := gr.Reset(b); err != nil {
+					pool.Put(gr)
+					if err == io.EOF { //ignore if body is empty
+						return next(c)
+					}
+					return err
+				}
+				var buf bytes.Buffer
+				io.Copy(&buf, gr)
+
+				gr.Close()
+				pool.Put(gr)
+
+				b.Close() // http.Request.Body is closed by the Server, but because we are replacing it, it must be closed here
+
+				r := ioutil.NopCloser(&buf)
+				c.Request().Body = r
 			}
-
-			// only Close gzip reader if it was set to a proper gzip source otherwise it will panic on close.
-			defer gr.Close()
-
-			c.Request().Body = gr
-
 			return next(c)
 		}
 	}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/extractor.go b/vendor/github.com/labstack/echo/v4/middleware/extractor.go
deleted file mode 100644
index 3f27414..0000000
--- a/vendor/github.com/labstack/echo/v4/middleware/extractor.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package middleware
-
-import (
-	"errors"
-	"fmt"
-	"github.com/labstack/echo/v4"
-	"net/textproto"
-	"strings"
-)
-
-const (
-	// extractorLimit is arbitrary number to limit values extractor can return. this limits possible resource exhaustion
-	// attack vector
-	extractorLimit = 20
-)
-
-var errHeaderExtractorValueMissing = errors.New("missing value in request header")
-var errHeaderExtractorValueInvalid = errors.New("invalid value in request header")
-var errQueryExtractorValueMissing = errors.New("missing value in the query string")
-var errParamExtractorValueMissing = errors.New("missing value in path params")
-var errCookieExtractorValueMissing = errors.New("missing value in cookies")
-var errFormExtractorValueMissing = errors.New("missing value in the form")
-
-// ValuesExtractor defines a function for extracting values (keys/tokens) from the given context.
-type ValuesExtractor func(c echo.Context) ([]string, error)
-
-// CreateExtractors creates ValuesExtractors from given lookups.
-// Lookups is a string in the form of "<source>:<name>" or "<source>:<name>,<source>:<name>" that is used
-// to extract key from the request.
-// Possible values:
-//   - "header:<name>" or "header:<name>:<cut-prefix>"
-//     `<cut-prefix>` is argument value to cut/trim prefix of the extracted value. This is useful if header
-//     value has static prefix like `Authorization: <auth-scheme> <authorisation-parameters>` where part that we
-//     want to cut is `<auth-scheme> ` note the space at the end.
-//     In case of basic authentication `Authorization: Basic <credentials>` prefix we want to remove is `Basic `.
-//   - "query:<name>"
-//   - "param:<name>"
-//   - "form:<name>"
-//   - "cookie:<name>"
-//
-// Multiple sources example:
-// - "header:Authorization,header:X-Api-Key"
-func CreateExtractors(lookups string) ([]ValuesExtractor, error) {
-	return createExtractors(lookups, "")
-}
-
-func createExtractors(lookups string, authScheme string) ([]ValuesExtractor, error) {
-	if lookups == "" {
-		return nil, nil
-	}
-	sources := strings.Split(lookups, ",")
-	var extractors = make([]ValuesExtractor, 0)
-	for _, source := range sources {
-		parts := strings.Split(source, ":")
-		if len(parts) < 2 {
-			return nil, fmt.Errorf("extractor source for lookup could not be split into needed parts: %v", source)
-		}
-
-		switch parts[0] {
-		case "query":
-			extractors = append(extractors, valuesFromQuery(parts[1]))
-		case "param":
-			extractors = append(extractors, valuesFromParam(parts[1]))
-		case "cookie":
-			extractors = append(extractors, valuesFromCookie(parts[1]))
-		case "form":
-			extractors = append(extractors, valuesFromForm(parts[1]))
-		case "header":
-			prefix := ""
-			if len(parts) > 2 {
-				prefix = parts[2]
-			} else if authScheme != "" && parts[1] == echo.HeaderAuthorization {
-				// backwards compatibility for JWT and KeyAuth:
-				// * we only apply this fix to Authorization as header we use and uses prefixes like "Bearer <token-value>" etc
-				// * previously header extractor assumed that auth-scheme/prefix had a space as suffix we need to retain that
-				//   behaviour for default values and Authorization header.
-				prefix = authScheme
-				if !strings.HasSuffix(prefix, " ") {
-					prefix += " "
-				}
-			}
-			extractors = append(extractors, valuesFromHeader(parts[1], prefix))
-		}
-	}
-	return extractors, nil
-}
-
-// valuesFromHeader returns a functions that extracts values from the request header.
-// valuePrefix is parameter to remove first part (prefix) of the extracted value. This is useful if header value has static
-// prefix like `Authorization: <auth-scheme> <authorisation-parameters>` where part that we want to remove is `<auth-scheme> `
-// note the space at the end. In case of basic authentication `Authorization: Basic <credentials>` prefix we want to remove
-// is `Basic `. In case of JWT tokens `Authorization: Bearer <token>` prefix is `Bearer `.
-// If prefix is left empty the whole value is returned.
-func valuesFromHeader(header string, valuePrefix string) ValuesExtractor {
-	prefixLen := len(valuePrefix)
-	// standard library parses http.Request header keys in canonical form but we may provide something else so fix this
-	header = textproto.CanonicalMIMEHeaderKey(header)
-	return func(c echo.Context) ([]string, error) {
-		values := c.Request().Header.Values(header)
-		if len(values) == 0 {
-			return nil, errHeaderExtractorValueMissing
-		}
-
-		result := make([]string, 0)
-		for i, value := range values {
-			if prefixLen == 0 {
-				result = append(result, value)
-				if i >= extractorLimit-1 {
-					break
-				}
-				continue
-			}
-			if len(value) > prefixLen && strings.EqualFold(value[:prefixLen], valuePrefix) {
-				result = append(result, value[prefixLen:])
-				if i >= extractorLimit-1 {
-					break
-				}
-			}
-		}
-
-		if len(result) == 0 {
-			if prefixLen > 0 {
-				return nil, errHeaderExtractorValueInvalid
-			}
-			return nil, errHeaderExtractorValueMissing
-		}
-		return result, nil
-	}
-}
-
-// valuesFromQuery returns a function that extracts values from the query string.
-func valuesFromQuery(param string) ValuesExtractor {
-	return func(c echo.Context) ([]string, error) {
-		result := c.QueryParams()[param]
-		if len(result) == 0 {
-			return nil, errQueryExtractorValueMissing
-		} else if len(result) > extractorLimit-1 {
-			result = result[:extractorLimit]
-		}
-		return result, nil
-	}
-}
-
-// valuesFromParam returns a function that extracts values from the url param string.
-func valuesFromParam(param string) ValuesExtractor {
-	return func(c echo.Context) ([]string, error) {
-		result := make([]string, 0)
-		paramVales := c.ParamValues()
-		for i, p := range c.ParamNames() {
-			if param == p {
-				result = append(result, paramVales[i])
-				if i >= extractorLimit-1 {
-					break
-				}
-			}
-		}
-		if len(result) == 0 {
-			return nil, errParamExtractorValueMissing
-		}
-		return result, nil
-	}
-}
-
-// valuesFromCookie returns a function that extracts values from the named cookie.
-func valuesFromCookie(name string) ValuesExtractor {
-	return func(c echo.Context) ([]string, error) {
-		cookies := c.Cookies()
-		if len(cookies) == 0 {
-			return nil, errCookieExtractorValueMissing
-		}
-
-		result := make([]string, 0)
-		for i, cookie := range cookies {
-			if name == cookie.Name {
-				result = append(result, cookie.Value)
-				if i >= extractorLimit-1 {
-					break
-				}
-			}
-		}
-		if len(result) == 0 {
-			return nil, errCookieExtractorValueMissing
-		}
-		return result, nil
-	}
-}
-
-// valuesFromForm returns a function that extracts values from the form field.
-func valuesFromForm(name string) ValuesExtractor {
-	return func(c echo.Context) ([]string, error) {
-		if c.Request().Form == nil {
-			_ = c.Request().ParseMultipartForm(32 << 20) // same what `c.Request().FormValue(name)` does
-		}
-		values := c.Request().Form[name]
-		if len(values) == 0 {
-			return nil, errFormExtractorValueMissing
-		}
-		if len(values) > extractorLimit-1 {
-			values = values[:extractorLimit]
-		}
-		result := append([]string{}, values...)
-		return result, nil
-	}
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/jwt.go b/vendor/github.com/labstack/echo/v4/middleware/jwt.go
new file mode 100644
index 0000000..c2e7c06
--- /dev/null
+++ b/vendor/github.com/labstack/echo/v4/middleware/jwt.go
@@ -0,0 +1,347 @@
+// +build go1.15
+
+package middleware
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"reflect"
+	"strings"
+
+	"github.com/golang-jwt/jwt"
+	"github.com/labstack/echo/v4"
+)
+
+type (
+	// JWTConfig defines the config for JWT middleware.
+	JWTConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
+
+		// BeforeFunc defines a function which is executed just before the middleware.
+		BeforeFunc BeforeFunc
+
+		// SuccessHandler defines a function which is executed for a valid token.
+		SuccessHandler JWTSuccessHandler
+
+		// ErrorHandler defines a function which is executed for an invalid token.
+		// It may be used to define a custom JWT error.
+		ErrorHandler JWTErrorHandler
+
+		// ErrorHandlerWithContext is almost identical to ErrorHandler, but it's passed the current context.
+		ErrorHandlerWithContext JWTErrorHandlerWithContext
+
+		// Signing key to validate token.
+		// This is one of the three options to provide a token validation key.
+		// The order of precedence is a user-defined KeyFunc, SigningKeys and SigningKey.
+		// Required if neither user-defined KeyFunc nor SigningKeys is provided.
+		SigningKey interface{}
+
+		// Map of signing keys to validate token with kid field usage.
+		// This is one of the three options to provide a token validation key.
+		// The order of precedence is a user-defined KeyFunc, SigningKeys and SigningKey.
+		// Required if neither user-defined KeyFunc nor SigningKey is provided.
+		SigningKeys map[string]interface{}
+
+		// Signing method used to check the token's signing algorithm.
+		// Optional. Default value HS256.
+		SigningMethod string
+
+		// Context key to store user information from the token into context.
+		// Optional. Default value "user".
+		ContextKey string
+
+		// Claims are extendable claims data defining token content. Used by default ParseTokenFunc implementation.
+		// Not used if custom ParseTokenFunc is set.
+		// Optional. Default value jwt.MapClaims
+		Claims jwt.Claims
+
+		// TokenLookup is a string in the form of "<source>:<name>" or "<source>:<name>,<source>:<name>" that is used
+		// to extract token from the request.
+		// Optional. Default value "header:Authorization".
+		// Possible values:
+		// - "header:<name>"
+		// - "query:<name>"
+		// - "param:<name>"
+		// - "cookie:<name>"
+		// - "form:<name>"
+		// Multiply sources example:
+		// - "header: Authorization,cookie: myowncookie"
+
+		TokenLookup string
+
+		// AuthScheme to be used in the Authorization header.
+		// Optional. Default value "Bearer".
+		AuthScheme string
+
+		// KeyFunc defines a user-defined function that supplies the public key for a token validation.
+		// The function shall take care of verifying the signing algorithm and selecting the proper key.
+		// A user-defined KeyFunc can be useful if tokens are issued by an external party.
+		// Used by default ParseTokenFunc implementation.
+		//
+		// When a user-defined KeyFunc is provided, SigningKey, SigningKeys, and SigningMethod are ignored.
+		// This is one of the three options to provide a token validation key.
+		// The order of precedence is a user-defined KeyFunc, SigningKeys and SigningKey.
+		// Required if neither SigningKeys nor SigningKey is provided.
+		// Not used if custom ParseTokenFunc is set.
+		// Default to an internal implementation verifying the signing algorithm and selecting the proper key.
+		KeyFunc jwt.Keyfunc
+
+		// ParseTokenFunc defines a user-defined function that parses token from given auth. Returns an error when token
+		// parsing fails or parsed token is invalid.
+		// Defaults to implementation using `github.com/golang-jwt/jwt` as JWT implementation library
+		ParseTokenFunc func(auth string, c echo.Context) (interface{}, error)
+	}
+
+	// JWTSuccessHandler defines a function which is executed for a valid token.
+	JWTSuccessHandler func(echo.Context)
+
+	// JWTErrorHandler defines a function which is executed for an invalid token.
+	JWTErrorHandler func(error) error
+
+	// JWTErrorHandlerWithContext is almost identical to JWTErrorHandler, but it's passed the current context.
+	JWTErrorHandlerWithContext func(error, echo.Context) error
+
+	jwtExtractor func(echo.Context) (string, error)
+)
+
+// Algorithms
+const (
+	AlgorithmHS256 = "HS256"
+)
+
+// Errors
+var (
+	ErrJWTMissing = echo.NewHTTPError(http.StatusBadRequest, "missing or malformed jwt")
+	ErrJWTInvalid = echo.NewHTTPError(http.StatusUnauthorized, "invalid or expired jwt")
+)
+
+var (
+	// DefaultJWTConfig is the default JWT auth middleware config.
+	DefaultJWTConfig = JWTConfig{
+		Skipper:       DefaultSkipper,
+		SigningMethod: AlgorithmHS256,
+		ContextKey:    "user",
+		TokenLookup:   "header:" + echo.HeaderAuthorization,
+		AuthScheme:    "Bearer",
+		Claims:        jwt.MapClaims{},
+		KeyFunc:       nil,
+	}
+)
+
+// JWT returns a JSON Web Token (JWT) auth middleware.
+//
+// For valid token, it sets the user in context and calls next handler.
+// For invalid token, it returns "401 - Unauthorized" error.
+// For missing token, it returns "400 - Bad Request" error.
+//
+// See: https://jwt.io/introduction
+// See `JWTConfig.TokenLookup`
+func JWT(key interface{}) echo.MiddlewareFunc {
+	c := DefaultJWTConfig
+	c.SigningKey = key
+	return JWTWithConfig(c)
+}
+
+// JWTWithConfig returns a JWT auth middleware with config.
+// See: `JWT()`.
+func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
+	// Defaults
+	if config.Skipper == nil {
+		config.Skipper = DefaultJWTConfig.Skipper
+	}
+	if config.SigningKey == nil && len(config.SigningKeys) == 0 && config.KeyFunc == nil && config.ParseTokenFunc == nil {
+		panic("echo: jwt middleware requires signing key")
+	}
+	if config.SigningMethod == "" {
+		config.SigningMethod = DefaultJWTConfig.SigningMethod
+	}
+	if config.ContextKey == "" {
+		config.ContextKey = DefaultJWTConfig.ContextKey
+	}
+	if config.Claims == nil {
+		config.Claims = DefaultJWTConfig.Claims
+	}
+	if config.TokenLookup == "" {
+		config.TokenLookup = DefaultJWTConfig.TokenLookup
+	}
+	if config.AuthScheme == "" {
+		config.AuthScheme = DefaultJWTConfig.AuthScheme
+	}
+	if config.KeyFunc == nil {
+		config.KeyFunc = config.defaultKeyFunc
+	}
+	if config.ParseTokenFunc == nil {
+		config.ParseTokenFunc = config.defaultParseToken
+	}
+
+	// Initialize
+	// Split sources
+	sources := strings.Split(config.TokenLookup, ",")
+	var extractors []jwtExtractor
+	for _, source := range sources {
+		parts := strings.Split(source, ":")
+
+		switch parts[0] {
+		case "query":
+			extractors = append(extractors, jwtFromQuery(parts[1]))
+		case "param":
+			extractors = append(extractors, jwtFromParam(parts[1]))
+		case "cookie":
+			extractors = append(extractors, jwtFromCookie(parts[1]))
+		case "form":
+			extractors = append(extractors, jwtFromForm(parts[1]))
+		case "header":
+			extractors = append(extractors, jwtFromHeader(parts[1], config.AuthScheme))
+		}
+	}
+
+	return func(next echo.HandlerFunc) echo.HandlerFunc {
+		return func(c echo.Context) error {
+			if config.Skipper(c) {
+				return next(c)
+			}
+
+			if config.BeforeFunc != nil {
+				config.BeforeFunc(c)
+			}
+			var auth string
+			var err error
+			for _, extractor := range extractors {
+				// Extract token from extractor, if it's not fail break the loop and
+				// set auth
+				auth, err = extractor(c)
+				if err == nil {
+					break
+				}
+			}
+			// If none of extractor has a token, handle error
+			if err != nil {
+				if config.ErrorHandler != nil {
+					return config.ErrorHandler(err)
+				}
+
+				if config.ErrorHandlerWithContext != nil {
+					return config.ErrorHandlerWithContext(err, c)
+				}
+				return err
+			}
+
+			token, err := config.ParseTokenFunc(auth, c)
+			if err == nil {
+				// Store user information from token into context.
+				c.Set(config.ContextKey, token)
+				if config.SuccessHandler != nil {
+					config.SuccessHandler(c)
+				}
+				return next(c)
+			}
+			if config.ErrorHandler != nil {
+				return config.ErrorHandler(err)
+			}
+			if config.ErrorHandlerWithContext != nil {
+				return config.ErrorHandlerWithContext(err, c)
+			}
+			return &echo.HTTPError{
+				Code:     ErrJWTInvalid.Code,
+				Message:  ErrJWTInvalid.Message,
+				Internal: err,
+			}
+		}
+	}
+}
+
+func (config *JWTConfig) defaultParseToken(auth string, c echo.Context) (interface{}, error) {
+	token := new(jwt.Token)
+	var err error
+	// Issue #647, #656
+	if _, ok := config.Claims.(jwt.MapClaims); ok {
+		token, err = jwt.Parse(auth, config.KeyFunc)
+	} else {
+		t := reflect.ValueOf(config.Claims).Type().Elem()
+		claims := reflect.New(t).Interface().(jwt.Claims)
+		token, err = jwt.ParseWithClaims(auth, claims, config.KeyFunc)
+	}
+	if err != nil {
+		return nil, err
+	}
+	if !token.Valid {
+		return nil, errors.New("invalid token")
+	}
+	return token, nil
+}
+
+// defaultKeyFunc returns a signing key of the given token.
+func (config *JWTConfig) defaultKeyFunc(t *jwt.Token) (interface{}, error) {
+	// Check the signing method
+	if t.Method.Alg() != config.SigningMethod {
+		return nil, fmt.Errorf("unexpected jwt signing method=%v", t.Header["alg"])
+	}
+	if len(config.SigningKeys) > 0 {
+		if kid, ok := t.Header["kid"].(string); ok {
+			if key, ok := config.SigningKeys[kid]; ok {
+				return key, nil
+			}
+		}
+		return nil, fmt.Errorf("unexpected jwt key id=%v", t.Header["kid"])
+	}
+
+	return config.SigningKey, nil
+}
+
+// jwtFromHeader returns a `jwtExtractor` that extracts token from the request header.
+func jwtFromHeader(header string, authScheme string) jwtExtractor {
+	return func(c echo.Context) (string, error) {
+		auth := c.Request().Header.Get(header)
+		l := len(authScheme)
+		if len(auth) > l+1 && auth[:l] == authScheme {
+			return auth[l+1:], nil
+		}
+		return "", ErrJWTMissing
+	}
+}
+
+// jwtFromQuery returns a `jwtExtractor` that extracts token from the query string.
+func jwtFromQuery(param string) jwtExtractor {
+	return func(c echo.Context) (string, error) {
+		token := c.QueryParam(param)
+		if token == "" {
+			return "", ErrJWTMissing
+		}
+		return token, nil
+	}
+}
+
+// jwtFromParam returns a `jwtExtractor` that extracts token from the url param string.
+func jwtFromParam(param string) jwtExtractor {
+	return func(c echo.Context) (string, error) {
+		token := c.Param(param)
+		if token == "" {
+			return "", ErrJWTMissing
+		}
+		return token, nil
+	}
+}
+
+// jwtFromCookie returns a `jwtExtractor` that extracts token from the named cookie.
+func jwtFromCookie(name string) jwtExtractor {
+	return func(c echo.Context) (string, error) {
+		cookie, err := c.Cookie(name)
+		if err != nil {
+			return "", ErrJWTMissing
+		}
+		return cookie.Value, nil
+	}
+}
+
+// jwtFromForm returns a `jwtExtractor` that extracts token from the form field.
+func jwtFromForm(name string) jwtExtractor {
+	return func(c echo.Context) (string, error) {
+		field := c.FormValue(name)
+		if field == "" {
+			return "", ErrJWTMissing
+		}
+		return field, nil
+	}
+}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/key_auth.go b/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
index 79bee20..fd169aa 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
@@ -1,82 +1,58 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"errors"
-	"github.com/labstack/echo/v4"
 	"net/http"
+	"strings"
+
+	"github.com/labstack/echo/v4"
 )
 
-// KeyAuthConfig defines the config for KeyAuth middleware.
-type KeyAuthConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// KeyAuthConfig defines the config for KeyAuth middleware.
+	KeyAuthConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// KeyLookup is a string in the form of "<source>:<name>" or "<source>:<name>,<source>:<name>" that is used
-	// to extract key from the request.
-	// Optional. Default value "header:Authorization".
-	// Possible values:
-	// - "header:<name>" or "header:<name>:<cut-prefix>"
-	// 			`<cut-prefix>` is argument value to cut/trim prefix of the extracted value. This is useful if header
-	//			value has static prefix like `Authorization: <auth-scheme> <authorisation-parameters>` where part that we
-	//			want to cut is `<auth-scheme> ` note the space at the end.
-	//			In case of basic authentication `Authorization: Basic <credentials>` prefix we want to remove is `Basic `.
-	// - "query:<name>"
-	// - "form:<name>"
-	// - "cookie:<name>"
-	// Multiple sources example:
-	// - "header:Authorization,header:X-Api-Key"
-	KeyLookup string
+		// KeyLookup is a string in the form of "<source>:<name>" that is used
+		// to extract key from the request.
+		// Optional. Default value "header:Authorization".
+		// Possible values:
+		// - "header:<name>"
+		// - "query:<name>"
+		// - "form:<name>"
+		KeyLookup string `yaml:"key_lookup"`
 
-	// AuthScheme to be used in the Authorization header.
-	// Optional. Default value "Bearer".
-	AuthScheme string
+		// AuthScheme to be used in the Authorization header.
+		// Optional. Default value "Bearer".
+		AuthScheme string
 
-	// Validator is a function to validate key.
-	// Required.
-	Validator KeyAuthValidator
+		// Validator is a function to validate key.
+		// Required.
+		Validator KeyAuthValidator
 
-	// ErrorHandler defines a function which is executed for an invalid key.
-	// It may be used to define a custom error.
-	ErrorHandler KeyAuthErrorHandler
+		// ErrorHandler defines a function which is executed for an invalid key.
+		// It may be used to define a custom error.
+		ErrorHandler KeyAuthErrorHandler
+	}
 
-	// ContinueOnIgnoredError allows the next middleware/handler to be called when ErrorHandler decides to
-	// ignore the error (by returning `nil`).
-	// This is useful when parts of your site/api allow public access and some authorized routes provide extra functionality.
-	// In that case you can use ErrorHandler to set a default public key auth value in the request context
-	// and continue. Some logic down the remaining execution chain needs to check that (public) key auth value then.
-	ContinueOnIgnoredError bool
-}
+	// KeyAuthValidator defines a function to validate KeyAuth credentials.
+	KeyAuthValidator func(string, echo.Context) (bool, error)
 
-// KeyAuthValidator defines a function to validate KeyAuth credentials.
-type KeyAuthValidator func(auth string, c echo.Context) (bool, error)
+	keyExtractor func(echo.Context) (string, error)
 
-// KeyAuthErrorHandler defines a function which is executed for an invalid key.
-type KeyAuthErrorHandler func(err error, c echo.Context) error
+	// KeyAuthErrorHandler defines a function which is executed for an invalid key.
+	KeyAuthErrorHandler func(error, echo.Context) error
+)
 
-// ErrKeyAuthMissing is error type when KeyAuth middleware is unable to extract value from lookups
-type ErrKeyAuthMissing struct {
-	Err error
-}
-
-// DefaultKeyAuthConfig is the default KeyAuth middleware config.
-var DefaultKeyAuthConfig = KeyAuthConfig{
-	Skipper:    DefaultSkipper,
-	KeyLookup:  "header:" + echo.HeaderAuthorization,
-	AuthScheme: "Bearer",
-}
-
-// Error returns errors text
-func (e *ErrKeyAuthMissing) Error() string {
-	return e.Err.Error()
-}
-
-// Unwrap unwraps error
-func (e *ErrKeyAuthMissing) Unwrap() error {
-	return e.Err
-}
+var (
+	// DefaultKeyAuthConfig is the default KeyAuth middleware config.
+	DefaultKeyAuthConfig = KeyAuthConfig{
+		Skipper:    DefaultSkipper,
+		KeyLookup:  "header:" + echo.HeaderAuthorization,
+		AuthScheme: "Bearer",
+	}
+)
 
 // KeyAuth returns an KeyAuth middleware.
 //
@@ -107,9 +83,14 @@ func KeyAuthWithConfig(config KeyAuthConfig) echo.MiddlewareFunc {
 		panic("echo: key-auth middleware requires a validator function")
 	}
 
-	extractors, cErr := createExtractors(config.KeyLookup, config.AuthScheme)
-	if cErr != nil {
-		panic(cErr)
+	// Initialize
+	parts := strings.Split(config.KeyLookup, ":")
+	extractor := keyFromHeader(parts[1], config.AuthScheme)
+	switch parts[0] {
+	case "query":
+		extractor = keyFromQuery(parts[1])
+	case "form":
+		extractor = keyFromForm(parts[1])
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -118,62 +99,68 @@ func KeyAuthWithConfig(config KeyAuthConfig) echo.MiddlewareFunc {
 				return next(c)
 			}
 
-			var lastExtractorErr error
-			var lastValidatorErr error
-			for _, extractor := range extractors {
-				keys, err := extractor(c)
-				if err != nil {
-					lastExtractorErr = err
-					continue
-				}
-				for _, key := range keys {
-					valid, err := config.Validator(key, c)
-					if err != nil {
-						lastValidatorErr = err
-						continue
-					}
-					if valid {
-						return next(c)
-					}
-					lastValidatorErr = errors.New("invalid key")
+			// Extract and verify key
+			key, err := extractor(c)
+			if err != nil {
+				if config.ErrorHandler != nil {
+					return config.ErrorHandler(err, c)
 				}
+				return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 			}
-
-			// we are here only when we did not successfully extract and validate any of keys
-			err := lastValidatorErr
-			if err == nil { // prioritize validator errors over extracting errors
-				// ugly part to preserve backwards compatible errors. someone could rely on them
-				if lastExtractorErr == errQueryExtractorValueMissing {
-					err = errors.New("missing key in the query string")
-				} else if lastExtractorErr == errCookieExtractorValueMissing {
-					err = errors.New("missing key in cookies")
-				} else if lastExtractorErr == errFormExtractorValueMissing {
-					err = errors.New("missing key in the form")
-				} else if lastExtractorErr == errHeaderExtractorValueMissing {
-					err = errors.New("missing key in request header")
-				} else if lastExtractorErr == errHeaderExtractorValueInvalid {
-					err = errors.New("invalid key in the request header")
-				} else {
-					err = lastExtractorErr
+			valid, err := config.Validator(key, c)
+			if err != nil {
+				if config.ErrorHandler != nil {
+					return config.ErrorHandler(err, c)
 				}
-				err = &ErrKeyAuthMissing{Err: err}
-			}
-
-			if config.ErrorHandler != nil {
-				tmpErr := config.ErrorHandler(err, c)
-				if config.ContinueOnIgnoredError && tmpErr == nil {
-					return next(c)
-				}
-				return tmpErr
-			}
-			if lastValidatorErr != nil { // prioritize validator errors over extracting errors
 				return &echo.HTTPError{
 					Code:     http.StatusUnauthorized,
-					Message:  "Unauthorized",
-					Internal: lastValidatorErr,
+					Message:  "invalid key",
+					Internal: err,
 				}
+			} else if valid {
+				return next(c)
 			}
-			return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+			return echo.ErrUnauthorized
 		}
 	}
 }
+
+// keyFromHeader returns a `keyExtractor` that extracts key from the request header.
+func keyFromHeader(header string, authScheme string) keyExtractor {
+	return func(c echo.Context) (string, error) {
+		auth := c.Request().Header.Get(header)
+		if auth == "" {
+			return "", errors.New("missing key in request header")
+		}
+		if header == echo.HeaderAuthorization {
+			l := len(authScheme)
+			if len(auth) > l+1 && auth[:l] == authScheme {
+				return auth[l+1:], nil
+			}
+			return "", errors.New("invalid key in the request header")
+		}
+		return auth, nil
+	}
+}
+
+// keyFromQuery returns a `keyExtractor` that extracts key from the query string.
+func keyFromQuery(param string) keyExtractor {
+	return func(c echo.Context) (string, error) {
+		key := c.QueryParam(param)
+		if key == "" {
+			return "", errors.New("missing key in the query string")
+		}
+		return key, nil
+	}
+}
+
+// keyFromForm returns a `keyExtractor` that extracts key from the form.
+func keyFromForm(param string) keyExtractor {
+	return func(c echo.Context) (string, error) {
+		key := c.FormValue(param)
+		if key == "" {
+			return "", errors.New("missing key in the form")
+		}
+		return key, nil
+	}
+}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/logger.go b/vendor/github.com/labstack/echo/v4/middleware/logger.go
index 910fce8..9baac47 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/logger.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/logger.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -17,73 +14,68 @@ import (
 	"github.com/valyala/fasttemplate"
 )
 
-// LoggerConfig defines the config for Logger middleware.
-type LoggerConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// LoggerConfig defines the config for Logger middleware.
+	LoggerConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Tags to construct the logger format.
-	//
-	// - time_unix
-	// - time_unix_milli
-	// - time_unix_micro
-	// - time_unix_nano
-	// - time_rfc3339
-	// - time_rfc3339_nano
-	// - time_custom
-	// - id (Request ID)
-	// - remote_ip
-	// - uri
-	// - host
-	// - method
-	// - path
-	// - route
-	// - protocol
-	// - referer
-	// - user_agent
-	// - status
-	// - error
-	// - latency (In nanoseconds)
-	// - latency_human (Human readable)
-	// - bytes_in (Bytes received)
-	// - bytes_out (Bytes sent)
-	// - header:<NAME>
-	// - query:<NAME>
-	// - form:<NAME>
-	// - custom (see CustomTagFunc field)
-	//
-	// Example "${remote_ip} ${status}"
-	//
-	// Optional. Default value DefaultLoggerConfig.Format.
-	Format string `yaml:"format"`
+		// Tags to construct the logger format.
+		//
+		// - time_unix
+		// - time_unix_nano
+		// - time_rfc3339
+		// - time_rfc3339_nano
+		// - time_custom
+		// - id (Request ID)
+		// - remote_ip
+		// - uri
+		// - host
+		// - method
+		// - path
+		// - protocol
+		// - referer
+		// - user_agent
+		// - status
+		// - error
+		// - latency (In nanoseconds)
+		// - latency_human (Human readable)
+		// - bytes_in (Bytes received)
+		// - bytes_out (Bytes sent)
+		// - header:<NAME>
+		// - query:<NAME>
+		// - form:<NAME>
+		//
+		// Example "${remote_ip} ${status}"
+		//
+		// Optional. Default value DefaultLoggerConfig.Format.
+		Format string `yaml:"format"`
 
-	// Optional. Default value DefaultLoggerConfig.CustomTimeFormat.
-	CustomTimeFormat string `yaml:"custom_time_format"`
+		// Optional. Default value DefaultLoggerConfig.CustomTimeFormat.
+		CustomTimeFormat string `yaml:"custom_time_format"`
 
-	// CustomTagFunc is function called for `${custom}` tag to output user implemented text by writing it to buf.
-	// Make sure that outputted text creates valid JSON string with other logged tags.
-	// Optional.
-	CustomTagFunc func(c echo.Context, buf *bytes.Buffer) (int, error)
+		// Output is a writer where logs in JSON format are written.
+		// Optional. Default value os.Stdout.
+		Output io.Writer
 
-	// Output is a writer where logs in JSON format are written.
-	// Optional. Default value os.Stdout.
-	Output io.Writer
+		template *fasttemplate.Template
+		colorer  *color.Color
+		pool     *sync.Pool
+	}
+)
 
-	template *fasttemplate.Template
-	colorer  *color.Color
-	pool     *sync.Pool
-}
-
-// DefaultLoggerConfig is the default Logger middleware config.
-var DefaultLoggerConfig = LoggerConfig{
-	Skipper: DefaultSkipper,
-	Format: `{"time":"${time_rfc3339_nano}","id":"${id}","remote_ip":"${remote_ip}",` +
-		`"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` +
-		`"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` +
-		`,"bytes_in":${bytes_in},"bytes_out":${bytes_out}}` + "\n",
-	CustomTimeFormat: "2006-01-02 15:04:05.00000",
-	colorer:          color.New(),
-}
+var (
+	// DefaultLoggerConfig is the default Logger middleware config.
+	DefaultLoggerConfig = LoggerConfig{
+		Skipper: DefaultSkipper,
+		Format: `{"time":"${time_rfc3339_nano}","id":"${id}","remote_ip":"${remote_ip}",` +
+			`"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` +
+			`"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` +
+			`,"bytes_in":${bytes_in},"bytes_out":${bytes_out}}` + "\n",
+		CustomTimeFormat: "2006-01-02 15:04:05.00000",
+		colorer:          color.New(),
+	}
+)
 
 // Logger returns a middleware that logs HTTP requests.
 func Logger() echo.MiddlewareFunc {
@@ -132,19 +124,8 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 
 			if _, err = config.template.ExecuteFunc(buf, func(w io.Writer, tag string) (int, error) {
 				switch tag {
-				case "custom":
-					if config.CustomTagFunc == nil {
-						return 0, nil
-					}
-					return config.CustomTagFunc(c, buf)
 				case "time_unix":
 					return buf.WriteString(strconv.FormatInt(time.Now().Unix(), 10))
-				case "time_unix_milli":
-					// go 1.17 or later, it supports time#UnixMilli()
-					return buf.WriteString(strconv.FormatInt(time.Now().UnixNano()/1000000, 10))
-				case "time_unix_micro":
-					// go 1.17 or later, it supports time#UnixMicro()
-					return buf.WriteString(strconv.FormatInt(time.Now().UnixNano()/1000, 10))
 				case "time_unix_nano":
 					return buf.WriteString(strconv.FormatInt(time.Now().UnixNano(), 10))
 				case "time_rfc3339":
@@ -173,8 +154,6 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 						p = "/"
 					}
 					return buf.WriteString(p)
-				case "route":
-					return buf.WriteString(c.Path())
 				case "protocol":
 					return buf.WriteString(req.Proto)
 				case "referer":
diff --git a/vendor/github.com/labstack/echo/v4/middleware/method_override.go b/vendor/github.com/labstack/echo/v4/middleware/method_override.go
index 3991e10..92b14d2 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/method_override.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/method_override.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -9,24 +6,28 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// MethodOverrideConfig defines the config for MethodOverride middleware.
-type MethodOverrideConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// MethodOverrideConfig defines the config for MethodOverride middleware.
+	MethodOverrideConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Getter is a function that gets overridden method from the request.
-	// Optional. Default values MethodFromHeader(echo.HeaderXHTTPMethodOverride).
-	Getter MethodOverrideGetter
-}
+		// Getter is a function that gets overridden method from the request.
+		// Optional. Default values MethodFromHeader(echo.HeaderXHTTPMethodOverride).
+		Getter MethodOverrideGetter
+	}
 
-// MethodOverrideGetter is a function that gets overridden method from the request
-type MethodOverrideGetter func(echo.Context) string
+	// MethodOverrideGetter is a function that gets overridden method from the request
+	MethodOverrideGetter func(echo.Context) string
+)
 
-// DefaultMethodOverrideConfig is the default MethodOverride middleware config.
-var DefaultMethodOverrideConfig = MethodOverrideConfig{
-	Skipper: DefaultSkipper,
-	Getter:  MethodFromHeader(echo.HeaderXHTTPMethodOverride),
-}
+var (
+	// DefaultMethodOverrideConfig is the default MethodOverride middleware config.
+	DefaultMethodOverrideConfig = MethodOverrideConfig{
+		Skipper: DefaultSkipper,
+		Getter:  MethodFromHeader(echo.HeaderXHTTPMethodOverride),
+	}
+)
 
 // MethodOverride returns a MethodOverride middleware.
 // MethodOverride  middleware checks for the overridden method from the request and
diff --git a/vendor/github.com/labstack/echo/v4/middleware/middleware.go b/vendor/github.com/labstack/echo/v4/middleware/middleware.go
index 6f33cc5..a7ad73a 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/middleware.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/middleware.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -12,12 +9,14 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// Skipper defines a function to skip middleware. Returning true skips processing
-// the middleware.
-type Skipper func(c echo.Context) bool
+type (
+	// Skipper defines a function to skip middleware. Returning true skips processing
+	// the middleware.
+	Skipper func(echo.Context) bool
 
-// BeforeFunc defines a function which is executed just before the middleware.
-type BeforeFunc func(c echo.Context)
+	// BeforeFunc defines a function which is executed just before the middleware.
+	BeforeFunc func(echo.Context)
+)
 
 func captureTokens(pattern *regexp.Regexp, input string) *strings.Replacer {
 	groups := pattern.FindAllStringSubmatch(input, -1)
@@ -39,9 +38,9 @@ func rewriteRulesRegex(rewrite map[string]string) map[*regexp.Regexp]string {
 	rulesRegex := map[*regexp.Regexp]string{}
 	for k, v := range rewrite {
 		k = regexp.QuoteMeta(k)
-		k = strings.ReplaceAll(k, `\*`, "(.*?)")
+		k = strings.Replace(k, `\*`, "(.*?)", -1)
 		if strings.HasPrefix(k, `\^`) {
-			k = strings.ReplaceAll(k, `\^`, "^")
+			k = strings.Replace(k, `\^`, "^", -1)
 		}
 		k = k + "$"
 		rulesRegex[regexp.MustCompile(k)] = v
@@ -54,7 +53,7 @@ func rewriteURL(rewriteRegex map[*regexp.Regexp]string, req *http.Request) error
 		return nil
 	}
 
-	// Depending on how HTTP request is sent RequestURI could contain Scheme://Host/path or be just /path.
+	// Depending how HTTP request is sent RequestURI could contain Scheme://Host/path or be just /path.
 	// We only want to use path part for rewriting and therefore trim prefix if it exists
 	rawURI := req.RequestURI
 	if rawURI != "" && rawURI[0] != '/' {
diff --git a/vendor/github.com/labstack/echo/v4/middleware/proxy.go b/vendor/github.com/labstack/echo/v4/middleware/proxy.go
index 2744bc4..6cfd673 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/proxy.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/proxy.go
@@ -1,11 +1,7 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"io"
 	"math/rand"
@@ -16,6 +12,7 @@ import (
 	"regexp"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/labstack/echo/v4"
@@ -23,146 +20,104 @@ import (
 
 // TODO: Handle TLS proxy
 
-// ProxyConfig defines the config for Proxy middleware.
-type ProxyConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// ProxyConfig defines the config for Proxy middleware.
+	ProxyConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Balancer defines a load balancing technique.
-	// Required.
-	Balancer ProxyBalancer
+		// Balancer defines a load balancing technique.
+		// Required.
+		Balancer ProxyBalancer
 
-	// RetryCount defines the number of times a failed proxied request should be retried
-	// using the next available ProxyTarget. Defaults to 0, meaning requests are never retried.
-	RetryCount int
+		// Rewrite defines URL path rewrite rules. The values captured in asterisk can be
+		// retrieved by index e.g. $1, $2 and so on.
+		// Examples:
+		// "/old":              "/new",
+		// "/api/*":            "/$1",
+		// "/js/*":             "/public/javascripts/$1",
+		// "/users/*/orders/*": "/user/$1/order/$2",
+		Rewrite map[string]string
 
-	// RetryFilter defines a function used to determine if a failed request to a
-	// ProxyTarget should be retried. The RetryFilter will only be called when the number
-	// of previous retries is less than RetryCount. If the function returns true, the
-	// request will be retried. The provided error indicates the reason for the request
-	// failure. When the ProxyTarget is unavailable, the error will be an instance of
-	// echo.HTTPError with a Code of http.StatusBadGateway. In all other cases, the error
-	// will indicate an internal error in the Proxy middleware. When a RetryFilter is not
-	// specified, all requests that fail with http.StatusBadGateway will be retried. A custom
-	// RetryFilter can be provided to only retry specific requests. Note that RetryFilter is
-	// only called when the request to the target fails, or an internal error in the Proxy
-	// middleware has occurred. Successful requests that return a non-200 response code cannot
-	// be retried.
-	RetryFilter func(c echo.Context, e error) bool
+		// RegexRewrite defines rewrite rules using regexp.Rexexp with captures
+		// Every capture group in the values can be retrieved by index e.g. $1, $2 and so on.
+		// Example:
+		// "^/old/[0.9]+/":     "/new",
+		// "^/api/.+?/(.*)":    "/v2/$1",
+		RegexRewrite map[*regexp.Regexp]string
 
-	// ErrorHandler defines a function which can be used to return custom errors from
-	// the Proxy middleware. ErrorHandler is only invoked when there has been
-	// either an internal error in the Proxy middleware or the ProxyTarget is
-	// unavailable. Due to the way requests are proxied, ErrorHandler is not invoked
-	// when a ProxyTarget returns a non-200 response. In these cases, the response
-	// is already written so errors cannot be modified. ErrorHandler is only
-	// invoked after all retry attempts have been exhausted.
-	ErrorHandler func(c echo.Context, err error) error
+		// Context key to store selected ProxyTarget into context.
+		// Optional. Default value "target".
+		ContextKey string
 
-	// Rewrite defines URL path rewrite rules. The values captured in asterisk can be
-	// retrieved by index e.g. $1, $2 and so on.
-	// Examples:
-	// "/old":              "/new",
-	// "/api/*":            "/$1",
-	// "/js/*":             "/public/javascripts/$1",
-	// "/users/*/orders/*": "/user/$1/order/$2",
-	Rewrite map[string]string
+		// To customize the transport to remote.
+		// Examples: If custom TLS certificates are required.
+		Transport http.RoundTripper
 
-	// RegexRewrite defines rewrite rules using regexp.Rexexp with captures
-	// Every capture group in the values can be retrieved by index e.g. $1, $2 and so on.
-	// Example:
-	// "^/old/[0.9]+/":     "/new",
-	// "^/api/.+?/(.*)":    "/v2/$1",
-	RegexRewrite map[*regexp.Regexp]string
-
-	// Context key to store selected ProxyTarget into context.
-	// Optional. Default value "target".
-	ContextKey string
-
-	// To customize the transport to remote.
-	// Examples: If custom TLS certificates are required.
-	Transport http.RoundTripper
-
-	// ModifyResponse defines function to modify response from ProxyTarget.
-	ModifyResponse func(*http.Response) error
-}
-
-// ProxyTarget defines the upstream target.
-type ProxyTarget struct {
-	Name string
-	URL  *url.URL
-	Meta echo.Map
-}
-
-// ProxyBalancer defines an interface to implement a load balancing technique.
-type ProxyBalancer interface {
-	AddTarget(*ProxyTarget) bool
-	RemoveTarget(string) bool
-	Next(echo.Context) *ProxyTarget
-}
-
-// TargetProvider defines an interface that gives the opportunity for balancer
-// to return custom errors when selecting target.
-type TargetProvider interface {
-	NextTarget(echo.Context) (*ProxyTarget, error)
-}
-
-type commonBalancer struct {
-	targets []*ProxyTarget
-	mutex   sync.Mutex
-}
-
-// RandomBalancer implements a random load balancing technique.
-type randomBalancer struct {
-	commonBalancer
-	random *rand.Rand
-}
-
-// RoundRobinBalancer implements a round-robin load balancing technique.
-type roundRobinBalancer struct {
-	commonBalancer
-	// tracking the index on `targets` slice for the next `*ProxyTarget` to be used
-	i int
-}
-
-// DefaultProxyConfig is the default Proxy middleware config.
-var DefaultProxyConfig = ProxyConfig{
-	Skipper:    DefaultSkipper,
-	ContextKey: "target",
-}
-
-func proxyRaw(t *ProxyTarget, c echo.Context, config ProxyConfig) http.Handler {
-	var dialFunc func(ctx context.Context, network, addr string) (net.Conn, error)
-	if transport, ok := config.Transport.(*http.Transport); ok {
-		if transport.TLSClientConfig != nil {
-			d := tls.Dialer{
-				Config: transport.TLSClientConfig,
-			}
-			dialFunc = d.DialContext
-		}
-	}
-	if dialFunc == nil {
-		var d net.Dialer
-		dialFunc = d.DialContext
+		// ModifyResponse defines function to modify response from ProxyTarget.
+		ModifyResponse func(*http.Response) error
 	}
 
+	// ProxyTarget defines the upstream target.
+	ProxyTarget struct {
+		Name string
+		URL  *url.URL
+		Meta echo.Map
+	}
+
+	// ProxyBalancer defines an interface to implement a load balancing technique.
+	ProxyBalancer interface {
+		AddTarget(*ProxyTarget) bool
+		RemoveTarget(string) bool
+		Next(echo.Context) *ProxyTarget
+	}
+
+	commonBalancer struct {
+		targets []*ProxyTarget
+		mutex   sync.RWMutex
+	}
+
+	// RandomBalancer implements a random load balancing technique.
+	randomBalancer struct {
+		*commonBalancer
+		random *rand.Rand
+	}
+
+	// RoundRobinBalancer implements a round-robin load balancing technique.
+	roundRobinBalancer struct {
+		*commonBalancer
+		i uint32
+	}
+)
+
+var (
+	// DefaultProxyConfig is the default Proxy middleware config.
+	DefaultProxyConfig = ProxyConfig{
+		Skipper:    DefaultSkipper,
+		ContextKey: "target",
+	}
+)
+
+func proxyRaw(t *ProxyTarget, c echo.Context) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		in, _, err := c.Response().Hijack()
 		if err != nil {
-			c.Set("_error", fmt.Errorf("proxy raw, hijack error=%w, url=%s", err, t.URL))
+			c.Set("_error", fmt.Sprintf("proxy raw, hijack error=%v, url=%s", t.URL, err))
 			return
 		}
 		defer in.Close()
-		out, err := dialFunc(c.Request().Context(), "tcp", t.URL.Host)
+
+		out, err := net.Dial("tcp", t.URL.Host)
 		if err != nil {
-			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, dial error=%v, url=%s", err, t.URL)))
+			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, dial error=%v, url=%s", t.URL, err)))
 			return
 		}
+		defer out.Close()
 
 		// Write header
 		err = r.Write(out)
 		if err != nil {
-			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, request header copy error=%v, url=%s", err, t.URL)))
+			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, request header copy error=%v, url=%s", t.URL, err)))
 			return
 		}
 
@@ -176,44 +131,39 @@ func proxyRaw(t *ProxyTarget, c echo.Context, config ProxyConfig) http.Handler {
 		go cp(in, out)
 		err = <-errCh
 		if err != nil && err != io.EOF {
-			c.Set("_error", fmt.Errorf("proxy raw, copy body error=%w, url=%s", err, t.URL))
+			c.Set("_error", fmt.Errorf("proxy raw, copy body error=%v, url=%s", t.URL, err))
 		}
 	})
 }
 
 // NewRandomBalancer returns a random proxy balancer.
 func NewRandomBalancer(targets []*ProxyTarget) ProxyBalancer {
-	b := randomBalancer{}
+	b := &randomBalancer{commonBalancer: new(commonBalancer)}
 	b.targets = targets
-	b.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
-	return &b
+	return b
 }
 
 // NewRoundRobinBalancer returns a round-robin proxy balancer.
 func NewRoundRobinBalancer(targets []*ProxyTarget) ProxyBalancer {
-	b := roundRobinBalancer{}
+	b := &roundRobinBalancer{commonBalancer: new(commonBalancer)}
 	b.targets = targets
-	return &b
+	return b
 }
 
-// AddTarget adds an upstream target to the list and returns `true`.
-//
-// However, if a target with the same name already exists then the operation is aborted returning `false`.
+// AddTarget adds an upstream target to the list.
 func (b *commonBalancer) AddTarget(target *ProxyTarget) bool {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
 	for _, t := range b.targets {
 		if t.Name == target.Name {
 			return false
 		}
 	}
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
 	b.targets = append(b.targets, target)
 	return true
 }
 
-// RemoveTarget removes an upstream target from the list by name.
-//
-// Returns `true` on success, `false` if no target with the name is found.
+// RemoveTarget removes an upstream target from the list.
 func (b *commonBalancer) RemoveTarget(name string) bool {
 	b.mutex.Lock()
 	defer b.mutex.Unlock()
@@ -227,58 +177,21 @@ func (b *commonBalancer) RemoveTarget(name string) bool {
 }
 
 // Next randomly returns an upstream target.
-//
-// Note: `nil` is returned in case upstream target list is empty.
 func (b *randomBalancer) Next(c echo.Context) *ProxyTarget {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-	if len(b.targets) == 0 {
-		return nil
-	} else if len(b.targets) == 1 {
-		return b.targets[0]
+	if b.random == nil {
+		b.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
 	}
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
 	return b.targets[b.random.Intn(len(b.targets))]
 }
 
-// Next returns an upstream target using round-robin technique. In the case
-// where a previously failed request is being retried, the round-robin
-// balancer will attempt to use the next target relative to the original
-// request. If the list of targets held by the balancer is modified while a
-// failed request is being retried, it is possible that the balancer will
-// return the original failed target.
-//
-// Note: `nil` is returned in case upstream target list is empty.
+// Next returns an upstream target using round-robin technique.
 func (b *roundRobinBalancer) Next(c echo.Context) *ProxyTarget {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-	if len(b.targets) == 0 {
-		return nil
-	} else if len(b.targets) == 1 {
-		return b.targets[0]
-	}
-
-	var i int
-	const lastIdxKey = "_round_robin_last_index"
-	// This request is a retry, start from the index of the previous
-	// target to ensure we don't attempt to retry the request with
-	// the same failed target
-	if c.Get(lastIdxKey) != nil {
-		i = c.Get(lastIdxKey).(int)
-		i++
-		if i >= len(b.targets) {
-			i = 0
-		}
-	} else {
-		// This is a first time request, use the global index
-		if b.i >= len(b.targets) {
-			b.i = 0
-		}
-		i = b.i
-		b.i++
-	}
-
-	c.Set(lastIdxKey, i)
-	return b.targets[i]
+	b.i = b.i % uint32(len(b.targets))
+	t := b.targets[b.i]
+	atomic.AddUint32(&b.i, 1)
+	return t
 }
 
 // Proxy returns a Proxy middleware.
@@ -293,26 +206,14 @@ func Proxy(balancer ProxyBalancer) echo.MiddlewareFunc {
 // ProxyWithConfig returns a Proxy middleware with config.
 // See: `Proxy()`
 func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
-	if config.Balancer == nil {
-		panic("echo: proxy middleware requires balancer")
-	}
 	// Defaults
 	if config.Skipper == nil {
 		config.Skipper = DefaultProxyConfig.Skipper
 	}
-	if config.RetryFilter == nil {
-		config.RetryFilter = func(c echo.Context, e error) bool {
-			if httpErr, ok := e.(*echo.HTTPError); ok {
-				return httpErr.Code == http.StatusBadGateway
-			}
-			return false
-		}
-	}
-	if config.ErrorHandler == nil {
-		config.ErrorHandler = func(c echo.Context, err error) error {
-			return err
-		}
+	if config.Balancer == nil {
+		panic("echo: proxy middleware requires balancer")
 	}
+
 	if config.Rewrite != nil {
 		if config.RegexRewrite == nil {
 			config.RegexRewrite = make(map[*regexp.Regexp]string)
@@ -322,18 +223,19 @@ func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
 		}
 	}
 
-	provider, isTargetProvider := config.Balancer.(TargetProvider)
-
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) error {
+		return func(c echo.Context) (err error) {
 			if config.Skipper(c) {
 				return next(c)
 			}
 
 			req := c.Request()
 			res := c.Response()
+			tgt := config.Balancer.Next(c)
+			c.Set(config.ContextKey, tgt)
+
 			if err := rewriteURL(config.RegexRewrite, req); err != nil {
-				return config.ErrorHandler(c, err)
+				return err
 			}
 
 			// Fix header
@@ -349,52 +251,19 @@ func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
 				req.Header.Set(echo.HeaderXForwardedFor, c.RealIP())
 			}
 
-			retries := config.RetryCount
-			for {
-				var tgt *ProxyTarget
-				var err error
-				if isTargetProvider {
-					tgt, err = provider.NextTarget(c)
-					if err != nil {
-						return config.ErrorHandler(c, err)
-					}
-				} else {
-					tgt = config.Balancer.Next(c)
-				}
-
-				c.Set(config.ContextKey, tgt)
-
-				//If retrying a failed request, clear any previous errors from
-				//context here so that balancers have the option to check for
-				//errors that occurred using previous target
-				if retries < config.RetryCount {
-					c.Set("_error", nil)
-				}
-
-				// This is needed for ProxyConfig.ModifyResponse and/or ProxyConfig.Transport to be able to process the Request
-				// that Balancer may have replaced with c.SetRequest.
-				req = c.Request()
-
-				// Proxy
-				switch {
-				case c.IsWebSocket():
-					proxyRaw(tgt, c, config).ServeHTTP(res, req)
-				default: // even SSE requests
-					proxyHTTP(tgt, c, config).ServeHTTP(res, req)
-				}
-
-				err, hasError := c.Get("_error").(error)
-				if !hasError {
-					return nil
-				}
-
-				retry := retries > 0 && config.RetryFilter(c, err)
-				if !retry {
-					return config.ErrorHandler(c, err)
-				}
-
-				retries--
+			// Proxy
+			switch {
+			case c.IsWebSocket():
+				proxyRaw(tgt, c).ServeHTTP(res, req)
+			case req.Header.Get(echo.HeaderAccept) == "text/event-stream":
+			default:
+				proxyHTTP(tgt, c, config).ServeHTTP(res, req)
 			}
+			if e, ok := c.Get("_error").(error); ok {
+				err = e
+			}
+
+			return
 		}
 	}
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go b/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
index 70b89b0..0291eb4 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -12,34 +9,39 @@ import (
 	"golang.org/x/time/rate"
 )
 
-// RateLimiterStore is the interface to be implemented by custom stores.
-type RateLimiterStore interface {
-	// Stores for the rate limiter have to implement the Allow method
-	Allow(identifier string) (bool, error)
-}
+type (
+	// RateLimiterStore is the interface to be implemented by custom stores.
+	RateLimiterStore interface {
+		// Stores for the rate limiter have to implement the Allow method
+		Allow(identifier string) (bool, error)
+	}
+)
 
-// RateLimiterConfig defines the configuration for the rate limiter
-type RateLimiterConfig struct {
-	Skipper    Skipper
-	BeforeFunc BeforeFunc
-	// IdentifierExtractor uses echo.Context to extract the identifier for a visitor
-	IdentifierExtractor Extractor
-	// Store defines a store for the rate limiter
-	Store RateLimiterStore
-	// ErrorHandler provides a handler to be called when IdentifierExtractor returns an error
-	ErrorHandler func(context echo.Context, err error) error
-	// DenyHandler provides a handler to be called when RateLimiter denies access
-	DenyHandler func(context echo.Context, identifier string, err error) error
-}
+type (
+	// RateLimiterConfig defines the configuration for the rate limiter
+	RateLimiterConfig struct {
+		Skipper    Skipper
+		BeforeFunc BeforeFunc
+		// IdentifierExtractor uses echo.Context to extract the identifier for a visitor
+		IdentifierExtractor Extractor
+		// Store defines a store for the rate limiter
+		Store RateLimiterStore
+		// ErrorHandler provides a handler to be called when IdentifierExtractor returns an error
+		ErrorHandler func(context echo.Context, err error) error
+		// DenyHandler provides a handler to be called when RateLimiter denies access
+		DenyHandler func(context echo.Context, identifier string, err error) error
+	}
+	// Extractor is used to extract data from echo.Context
+	Extractor func(context echo.Context) (string, error)
+)
 
-// Extractor is used to extract data from echo.Context
-type Extractor func(context echo.Context) (string, error)
-
-// ErrRateLimitExceeded denotes an error raised when rate limit is exceeded
-var ErrRateLimitExceeded = echo.NewHTTPError(http.StatusTooManyRequests, "rate limit exceeded")
-
-// ErrExtractorError denotes an error raised when extractor function is unsuccessful
-var ErrExtractorError = echo.NewHTTPError(http.StatusForbidden, "error while extracting identifier")
+// errors
+var (
+	// ErrRateLimitExceeded denotes an error raised when rate limit is exceeded
+	ErrRateLimitExceeded = echo.NewHTTPError(http.StatusTooManyRequests, "rate limit exceeded")
+	// ErrExtractorError denotes an error raised when extractor function is unsuccessful
+	ErrExtractorError = echo.NewHTTPError(http.StatusForbidden, "error while extracting identifier")
+)
 
 // DefaultRateLimiterConfig defines default values for RateLimiterConfig
 var DefaultRateLimiterConfig = RateLimiterConfig{
@@ -148,37 +150,32 @@ func RateLimiterWithConfig(config RateLimiterConfig) echo.MiddlewareFunc {
 	}
 }
 
-// RateLimiterMemoryStore is the built-in store implementation for RateLimiter
-type RateLimiterMemoryStore struct {
-	visitors map[string]*Visitor
-	mutex    sync.Mutex
-	rate     rate.Limit // for more info check out Limiter docs - https://pkg.go.dev/golang.org/x/time/rate#Limit.
-
-	burst       int
-	expiresIn   time.Duration
-	lastCleanup time.Time
-
-	timeNow func() time.Time
-}
-
-// Visitor signifies a unique user's limiter details
-type Visitor struct {
-	*rate.Limiter
-	lastSeen time.Time
-}
+type (
+	// RateLimiterMemoryStore is the built-in store implementation for RateLimiter
+	RateLimiterMemoryStore struct {
+		visitors    map[string]*Visitor
+		mutex       sync.Mutex
+		rate        rate.Limit
+		burst       int
+		expiresIn   time.Duration
+		lastCleanup time.Time
+	}
+	// Visitor signifies a unique user's limiter details
+	Visitor struct {
+		*rate.Limiter
+		lastSeen time.Time
+	}
+)
 
 /*
 NewRateLimiterMemoryStore returns an instance of RateLimiterMemoryStore with
-the provided rate (as req/s).
-for more info check out Limiter docs - https://pkg.go.dev/golang.org/x/time/rate#Limit.
-
+the provided rate (as req/s). The provided rate less than 1 will be treated as zero.
 Burst and ExpiresIn will be set to default values.
 
-Note that if the provided rate is a float number and Burst is zero, Burst will be treated as the rounded down value of the rate.
-
 Example (with 20 requests/sec):
 
 	limiterStore := middleware.NewRateLimiterMemoryStore(20)
+
 */
 func NewRateLimiterMemoryStore(rate rate.Limit) (store *RateLimiterMemoryStore) {
 	return NewRateLimiterMemoryStoreWithConfig(RateLimiterMemoryStoreConfig{
@@ -188,10 +185,10 @@ func NewRateLimiterMemoryStore(rate rate.Limit) (store *RateLimiterMemoryStore)
 
 /*
 NewRateLimiterMemoryStoreWithConfig returns an instance of RateLimiterMemoryStore
-with the provided configuration. Rate must be provided. Burst will be set to the rounded down value of
+with the provided configuration. Rate must be provided. Burst will be set to the value of
 the configured rate if not provided or set to 0.
 
-The built-in memory store is usually capable for modest loads. For higher loads other
+The build-in memory store is usually capable for modest loads. For higher loads other
 store implementations should be considered.
 
 Characteristics:
@@ -202,7 +199,7 @@ Characteristics:
 Example:
 
 	limiterStore := middleware.NewRateLimiterMemoryStoreWithConfig(
-		middleware.RateLimiterMemoryStoreConfig{Rate: 50, Burst: 200, ExpiresIn: 5 * time.Minute},
+		middleware.RateLimiterMemoryStoreConfig{Rate: 50, Burst: 200, ExpiresIn: 5 * time.Minutes},
 	)
 */
 func NewRateLimiterMemoryStoreWithConfig(config RateLimiterMemoryStoreConfig) (store *RateLimiterMemoryStore) {
@@ -218,15 +215,14 @@ func NewRateLimiterMemoryStoreWithConfig(config RateLimiterMemoryStoreConfig) (s
 		store.burst = int(config.Rate)
 	}
 	store.visitors = make(map[string]*Visitor)
-	store.timeNow = time.Now
-	store.lastCleanup = store.timeNow()
+	store.lastCleanup = now()
 	return
 }
 
 // RateLimiterMemoryStoreConfig represents configuration for RateLimiterMemoryStore
 type RateLimiterMemoryStoreConfig struct {
-	Rate      rate.Limit    // Rate of requests allowed to pass as req/s. For more info check out Limiter docs - https://pkg.go.dev/golang.org/x/time/rate#Limit.
-	Burst     int           // Burst is maximum number of requests to pass at the same moment. It additionally allows a number of requests to pass when rate limit is reached.
+	Rate      rate.Limit    // Rate of requests allowed to pass as req/s
+	Burst     int           // Burst additionally allows a number of requests to pass when rate limit is reached
 	ExpiresIn time.Duration // ExpiresIn is the duration after that a rate limiter is cleaned up
 }
 
@@ -244,13 +240,12 @@ func (store *RateLimiterMemoryStore) Allow(identifier string) (bool, error) {
 		limiter.Limiter = rate.NewLimiter(store.rate, store.burst)
 		store.visitors[identifier] = limiter
 	}
-	now := store.timeNow()
-	limiter.lastSeen = now
-	if now.Sub(store.lastCleanup) > store.expiresIn {
+	limiter.lastSeen = now()
+	if now().Sub(store.lastCleanup) > store.expiresIn {
 		store.cleanupStaleVisitors()
 	}
 	store.mutex.Unlock()
-	return limiter.AllowN(store.timeNow(), 1), nil
+	return limiter.AllowN(now(), 1), nil
 }
 
 /*
@@ -259,9 +254,14 @@ of users who haven't visited again after the configured expiry time has elapsed
 */
 func (store *RateLimiterMemoryStore) cleanupStaleVisitors() {
 	for id, visitor := range store.visitors {
-		if store.timeNow().Sub(visitor.lastSeen) > store.expiresIn {
+		if now().Sub(visitor.lastSeen) > store.expiresIn {
 			delete(store.visitors, id)
 		}
 	}
-	store.lastCleanup = store.timeNow()
+	store.lastCleanup = now()
 }
+
+/*
+actual time method which is mocked in test file
+*/
+var now = time.Now
diff --git a/vendor/github.com/labstack/echo/v4/middleware/recover.go b/vendor/github.com/labstack/echo/v4/middleware/recover.go
index e6a5940..0dbe740 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/recover.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/recover.go
@@ -1,63 +1,48 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"fmt"
-	"net/http"
 	"runtime"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
 )
 
-// LogErrorFunc defines a function for custom logging in the middleware.
-type LogErrorFunc func(c echo.Context, err error, stack []byte) error
+type (
+	// RecoverConfig defines the config for Recover middleware.
+	RecoverConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-// RecoverConfig defines the config for Recover middleware.
-type RecoverConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+		// Size of the stack to be printed.
+		// Optional. Default value 4KB.
+		StackSize int `yaml:"stack_size"`
 
-	// Size of the stack to be printed.
-	// Optional. Default value 4KB.
-	StackSize int `yaml:"stack_size"`
+		// DisableStackAll disables formatting stack traces of all other goroutines
+		// into buffer after the trace for the current goroutine.
+		// Optional. Default value false.
+		DisableStackAll bool `yaml:"disable_stack_all"`
 
-	// DisableStackAll disables formatting stack traces of all other goroutines
-	// into buffer after the trace for the current goroutine.
-	// Optional. Default value false.
-	DisableStackAll bool `yaml:"disable_stack_all"`
+		// DisablePrintStack disables printing stack trace.
+		// Optional. Default value as false.
+		DisablePrintStack bool `yaml:"disable_print_stack"`
 
-	// DisablePrintStack disables printing stack trace.
-	// Optional. Default value as false.
-	DisablePrintStack bool `yaml:"disable_print_stack"`
+		// LogLevel is log level to printing stack trace.
+		// Optional. Default value 0 (Print).
+		LogLevel log.Lvl
+	}
+)
 
-	// LogLevel is log level to printing stack trace.
-	// Optional. Default value 0 (Print).
-	LogLevel log.Lvl
-
-	// LogErrorFunc defines a function for custom logging in the middleware.
-	// If it's set you don't need to provide LogLevel for config.
-	// If this function returns nil, the centralized HTTPErrorHandler will not be called.
-	LogErrorFunc LogErrorFunc
-
-	// DisableErrorHandler disables the call to centralized HTTPErrorHandler.
-	// The recovered error is then passed back to upstream middleware, instead of swallowing the error.
-	// Optional. Default value false.
-	DisableErrorHandler bool `yaml:"disable_error_handler"`
-}
-
-// DefaultRecoverConfig is the default Recover middleware config.
-var DefaultRecoverConfig = RecoverConfig{
-	Skipper:             DefaultSkipper,
-	StackSize:           4 << 10, // 4 KB
-	DisableStackAll:     false,
-	DisablePrintStack:   false,
-	LogLevel:            0,
-	LogErrorFunc:        nil,
-	DisableErrorHandler: false,
-}
+var (
+	// DefaultRecoverConfig is the default Recover middleware config.
+	DefaultRecoverConfig = RecoverConfig{
+		Skipper:           DefaultSkipper,
+		StackSize:         4 << 10, // 4 KB
+		DisableStackAll:   false,
+		DisablePrintStack: false,
+		LogLevel:          0,
+	}
+)
 
 // Recover returns a middleware which recovers from panics anywhere in the chain
 // and handles the control to the centralized HTTPErrorHandler.
@@ -77,32 +62,20 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) (returnErr error) {
+		return func(c echo.Context) error {
 			if config.Skipper(c) {
 				return next(c)
 			}
 
 			defer func() {
 				if r := recover(); r != nil {
-					if r == http.ErrAbortHandler {
-						panic(r)
-					}
 					err, ok := r.(error)
 					if !ok {
 						err = fmt.Errorf("%v", r)
 					}
-					var stack []byte
-					var length int
-
+					stack := make([]byte, config.StackSize)
+					length := runtime.Stack(stack, !config.DisableStackAll)
 					if !config.DisablePrintStack {
-						stack = make([]byte, config.StackSize)
-						length = runtime.Stack(stack, !config.DisableStackAll)
-						stack = stack[:length]
-					}
-
-					if config.LogErrorFunc != nil {
-						err = config.LogErrorFunc(c, err, stack)
-					} else if !config.DisablePrintStack {
 						msg := fmt.Sprintf("[PANIC RECOVER] %v %s\n", err, stack[:length])
 						switch config.LogLevel {
 						case log.DEBUG:
@@ -119,12 +92,7 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 							c.Logger().Print(msg)
 						}
 					}
-
-					if err != nil && !config.DisableErrorHandler {
-						c.Error(err)
-					} else {
-						returnErr = err
-					}
+					c.Error(err)
 				}
 			}()
 			return next(c)
diff --git a/vendor/github.com/labstack/echo/v4/middleware/redirect.go b/vendor/github.com/labstack/echo/v4/middleware/redirect.go
index b772ac1..13877db 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/redirect.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/redirect.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
diff --git a/vendor/github.com/labstack/echo/v4/middleware/request_id.go b/vendor/github.com/labstack/echo/v4/middleware/request_id.go
index 14bd4fd..b0baeeb 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/request_id.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/request_id.go
@@ -1,34 +1,32 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"github.com/labstack/echo/v4"
+	"github.com/labstack/gommon/random"
 )
 
-// RequestIDConfig defines the config for RequestID middleware.
-type RequestIDConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// RequestIDConfig defines the config for RequestID middleware.
+	RequestIDConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Generator defines a function to generate an ID.
-	// Optional. Defaults to generator for random string of length 32.
-	Generator func() string
+		// Generator defines a function to generate an ID.
+		// Optional. Default value random.String(32).
+		Generator func() string
 
-	// RequestIDHandler defines a function which is executed for a request id.
-	RequestIDHandler func(echo.Context, string)
+		// RequestIDHandler defines a function which is executed for a request id.
+		RequestIDHandler func(echo.Context, string)
+	}
+)
 
-	// TargetHeader defines what header to look for to populate the id
-	TargetHeader string
-}
-
-// DefaultRequestIDConfig is the default RequestID middleware config.
-var DefaultRequestIDConfig = RequestIDConfig{
-	Skipper:      DefaultSkipper,
-	Generator:    generator,
-	TargetHeader: echo.HeaderXRequestID,
-}
+var (
+	// DefaultRequestIDConfig is the default RequestID middleware config.
+	DefaultRequestIDConfig = RequestIDConfig{
+		Skipper:   DefaultSkipper,
+		Generator: generator,
+	}
+)
 
 // RequestID returns a X-Request-ID middleware.
 func RequestID() echo.MiddlewareFunc {
@@ -44,9 +42,6 @@ func RequestIDWithConfig(config RequestIDConfig) echo.MiddlewareFunc {
 	if config.Generator == nil {
 		config.Generator = generator
 	}
-	if config.TargetHeader == "" {
-		config.TargetHeader = echo.HeaderXRequestID
-	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -56,11 +51,11 @@ func RequestIDWithConfig(config RequestIDConfig) echo.MiddlewareFunc {
 
 			req := c.Request()
 			res := c.Response()
-			rid := req.Header.Get(config.TargetHeader)
+			rid := req.Header.Get(echo.HeaderXRequestID)
 			if rid == "" {
 				rid = config.Generator()
 			}
-			res.Header().Set(config.TargetHeader, rid)
+			res.Header().Set(echo.HeaderXRequestID, rid)
 			if config.RequestIDHandler != nil {
 				config.RequestIDHandler(c, rid)
 			}
@@ -71,5 +66,5 @@ func RequestIDWithConfig(config RequestIDConfig) echo.MiddlewareFunc {
 }
 
 func generator() string {
-	return randomString(32)
+	return random.String(32)
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/request_logger.go b/vendor/github.com/labstack/echo/v4/middleware/request_logger.go
deleted file mode 100644
index 7c18200..0000000
--- a/vendor/github.com/labstack/echo/v4/middleware/request_logger.go
+++ /dev/null
@@ -1,391 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package middleware
-
-import (
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/labstack/echo/v4"
-)
-
-// Example for `slog` https://pkg.go.dev/log/slog
-// 	logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
-//	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-//		LogStatus:   true,
-//		LogURI:      true,
-//		LogError:    true,
-//		HandleError: true, // forwards error to the global error handler, so it can decide appropriate status code
-//		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-//			if v.Error == nil {
-//				logger.LogAttrs(context.Background(), slog.LevelInfo, "REQUEST",
-//					slog.String("uri", v.URI),
-//					slog.Int("status", v.Status),
-//				)
-//			} else {
-//				logger.LogAttrs(context.Background(), slog.LevelError, "REQUEST_ERROR",
-//					slog.String("uri", v.URI),
-//					slog.Int("status", v.Status),
-//					slog.String("err", v.Error.Error()),
-//				)
-//			}
-//			return nil
-//		},
-//	}))
-//
-// Example for `fmt.Printf`
-// 	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-//		LogStatus:   true,
-//		LogURI:      true,
-//		LogError:    true,
-//		HandleError: true, // forwards error to the global error handler, so it can decide appropriate status code
-//		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-//			if v.Error == nil {
-//				fmt.Printf("REQUEST: uri: %v, status: %v\n", v.URI, v.Status)
-//			} else {
-//				fmt.Printf("REQUEST_ERROR: uri: %v, status: %v, err: %v\n", v.URI, v.Status, v.Error)
-//			}
-//			return nil
-//		},
-//	}))
-//
-// Example for Zerolog (https://github.com/rs/zerolog)
-// 	logger := zerolog.New(os.Stdout)
-//	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-//		LogURI:      true,
-//		LogStatus:   true,
-//		LogError:    true,
-//		HandleError: true, // forwards error to the global error handler, so it can decide appropriate status code
-//		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-//			if v.Error == nil {
-//				logger.Info().
-//					Str("URI", v.URI).
-//					Int("status", v.Status).
-//					Msg("request")
-//			} else {
-//				logger.Error().
-//					Err(v.Error).
-//					Str("URI", v.URI).
-//					Int("status", v.Status).
-//					Msg("request error")
-//			}
-//			return nil
-//		},
-//	}))
-//
-// Example for Zap (https://github.com/uber-go/zap)
-// 	logger, _ := zap.NewProduction()
-//	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-//		LogURI:      true,
-//		LogStatus:   true,
-//		LogError:    true,
-//		HandleError: true, // forwards error to the global error handler, so it can decide appropriate status code
-//		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-//			if v.Error == nil {
-//				logger.Info("request",
-//					zap.String("URI", v.URI),
-//					zap.Int("status", v.Status),
-//				)
-//			} else {
-//				logger.Error("request error",
-//					zap.String("URI", v.URI),
-//					zap.Int("status", v.Status),
-//					zap.Error(v.Error),
-//				)
-//			}
-//			return nil
-//		},
-//	}))
-//
-// Example for Logrus (https://github.com/sirupsen/logrus)
-//  log := logrus.New()
-//	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-//		LogURI:      true,
-//		LogStatus:   true,
-//		LogError:    true,
-//		HandleError: true, // forwards error to the global error handler, so it can decide appropriate status code
-//		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-//			if v.Error == nil {
-//				log.WithFields(logrus.Fields{
-//					"URI":    v.URI,
-//					"status": v.Status,
-//				}).Info("request")
-//			} else {
-//				log.WithFields(logrus.Fields{
-//					"URI":    v.URI,
-//					"status": v.Status,
-//					"error":  v.Error,
-//				}).Error("request error")
-//			}
-//			return nil
-//		},
-//	}))
-
-// RequestLoggerConfig is configuration for Request Logger middleware.
-type RequestLoggerConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
-
-	// BeforeNextFunc defines a function that is called before next middleware or handler is called in chain.
-	BeforeNextFunc func(c echo.Context)
-	// LogValuesFunc defines a function that is called with values extracted by logger from request/response.
-	// Mandatory.
-	LogValuesFunc func(c echo.Context, v RequestLoggerValues) error
-
-	// HandleError instructs logger to call global error handler when next middleware/handler returns an error.
-	// This is useful when you have custom error handler that can decide to use different status codes.
-	//
-	// A side-effect of calling global error handler is that now Response has been committed and sent to the client
-	// and middlewares up in chain can not change Response status code or response body.
-	HandleError bool
-
-	// LogLatency instructs logger to record duration it took to execute rest of the handler chain (next(c) call).
-	LogLatency bool
-	// LogProtocol instructs logger to extract request protocol (i.e. `HTTP/1.1` or `HTTP/2`)
-	LogProtocol bool
-	// LogRemoteIP instructs logger to extract request remote IP. See `echo.Context.RealIP()` for implementation details.
-	LogRemoteIP bool
-	// LogHost instructs logger to extract request host value (i.e. `example.com`)
-	LogHost bool
-	// LogMethod instructs logger to extract request method value (i.e. `GET` etc)
-	LogMethod bool
-	// LogURI instructs logger to extract request URI (i.e. `/list?lang=en&page=1`)
-	LogURI bool
-	// LogURIPath instructs logger to extract request URI path part (i.e. `/list`)
-	LogURIPath bool
-	// LogRoutePath instructs logger to extract route path part to which request was matched to (i.e. `/user/:id`)
-	LogRoutePath bool
-	// LogRequestID instructs logger to extract request ID from request `X-Request-ID` header or response if request did not have value.
-	LogRequestID bool
-	// LogReferer instructs logger to extract request referer values.
-	LogReferer bool
-	// LogUserAgent instructs logger to extract request user agent values.
-	LogUserAgent bool
-	// LogStatus instructs logger to extract response status code. If handler chain returns an echo.HTTPError,
-	// the status code is extracted from the echo.HTTPError returned
-	LogStatus bool
-	// LogError instructs logger to extract error returned from executed handler chain.
-	LogError bool
-	// LogContentLength instructs logger to extract content length header value. Note: this value could be different from
-	// actual request body size as it could be spoofed etc.
-	LogContentLength bool
-	// LogResponseSize instructs logger to extract response content length value. Note: when used with Gzip middleware
-	// this value may not be always correct.
-	LogResponseSize bool
-	// LogHeaders instructs logger to extract given list of headers from request. Note: request can contain more than
-	// one header with same value so slice of values is been logger for each given header.
-	//
-	// Note: header values are converted to canonical form with http.CanonicalHeaderKey as this how request parser converts header
-	// names to. For example, the canonical key for "accept-encoding" is "Accept-Encoding".
-	LogHeaders []string
-	// LogQueryParams instructs logger to extract given list of query parameters from request URI. Note: request can
-	// contain more than one query parameter with same name so slice of values is been logger for each given query param name.
-	LogQueryParams []string
-	// LogFormValues instructs logger to extract given list of form values from request body+URI. Note: request can
-	// contain more than one form value with same name so slice of values is been logger for each given form value name.
-	LogFormValues []string
-
-	timeNow func() time.Time
-}
-
-// RequestLoggerValues contains extracted values from logger.
-type RequestLoggerValues struct {
-	// StartTime is time recorded before next middleware/handler is executed.
-	StartTime time.Time
-	// Latency is duration it took to execute rest of the handler chain (next(c) call).
-	Latency time.Duration
-	// Protocol is request protocol (i.e. `HTTP/1.1` or `HTTP/2`)
-	Protocol string
-	// RemoteIP is request remote IP. See `echo.Context.RealIP()` for implementation details.
-	RemoteIP string
-	// Host is request host value (i.e. `example.com`)
-	Host string
-	// Method is request method value (i.e. `GET` etc)
-	Method string
-	// URI is request URI (i.e. `/list?lang=en&page=1`)
-	URI string
-	// URIPath is request URI path part (i.e. `/list`)
-	URIPath string
-	// RoutePath is route path part to which request was matched to (i.e. `/user/:id`)
-	RoutePath string
-	// RequestID is request ID from request `X-Request-ID` header or response if request did not have value.
-	RequestID string
-	// Referer is request referer values.
-	Referer string
-	// UserAgent is request user agent values.
-	UserAgent string
-	// Status is response status code. Then handler returns an echo.HTTPError then code from there.
-	Status int
-	// Error is error returned from executed handler chain.
-	Error error
-	// ContentLength is content length header value. Note: this value could be different from actual request body size
-	// as it could be spoofed etc.
-	ContentLength string
-	// ResponseSize is response content length value. Note: when used with Gzip middleware this value may not be always correct.
-	ResponseSize int64
-	// Headers are list of headers from request. Note: request can contain more than one header with same value so slice
-	// of values is been logger for each given header.
-	// Note: header values are converted to canonical form with http.CanonicalHeaderKey as this how request parser converts header
-	// names to. For example, the canonical key for "accept-encoding" is "Accept-Encoding".
-	Headers map[string][]string
-	// QueryParams are list of query parameters from request URI. Note: request can contain more than one query parameter
-	// with same name so slice of values is been logger for each given query param name.
-	QueryParams map[string][]string
-	// FormValues are list of form values from request body+URI. Note: request can contain more than one form value with
-	// same name so slice of values is been logger for each given form value name.
-	FormValues map[string][]string
-}
-
-// RequestLoggerWithConfig returns a RequestLogger middleware with config.
-func RequestLoggerWithConfig(config RequestLoggerConfig) echo.MiddlewareFunc {
-	mw, err := config.ToMiddleware()
-	if err != nil {
-		panic(err)
-	}
-	return mw
-}
-
-// ToMiddleware converts RequestLoggerConfig into middleware or returns an error for invalid configuration.
-func (config RequestLoggerConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
-	if config.Skipper == nil {
-		config.Skipper = DefaultSkipper
-	}
-	now := time.Now
-	if config.timeNow != nil {
-		now = config.timeNow
-	}
-
-	if config.LogValuesFunc == nil {
-		return nil, errors.New("missing LogValuesFunc callback function for request logger middleware")
-	}
-
-	logHeaders := len(config.LogHeaders) > 0
-	headers := append([]string(nil), config.LogHeaders...)
-	for i, v := range headers {
-		headers[i] = http.CanonicalHeaderKey(v)
-	}
-
-	logQueryParams := len(config.LogQueryParams) > 0
-	logFormValues := len(config.LogFormValues) > 0
-
-	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) error {
-			if config.Skipper(c) {
-				return next(c)
-			}
-
-			req := c.Request()
-			res := c.Response()
-			start := now()
-
-			if config.BeforeNextFunc != nil {
-				config.BeforeNextFunc(c)
-			}
-			err := next(c)
-			if err != nil && config.HandleError {
-				c.Error(err)
-			}
-
-			v := RequestLoggerValues{
-				StartTime: start,
-			}
-			if config.LogLatency {
-				v.Latency = now().Sub(start)
-			}
-			if config.LogProtocol {
-				v.Protocol = req.Proto
-			}
-			if config.LogRemoteIP {
-				v.RemoteIP = c.RealIP()
-			}
-			if config.LogHost {
-				v.Host = req.Host
-			}
-			if config.LogMethod {
-				v.Method = req.Method
-			}
-			if config.LogURI {
-				v.URI = req.RequestURI
-			}
-			if config.LogURIPath {
-				p := req.URL.Path
-				if p == "" {
-					p = "/"
-				}
-				v.URIPath = p
-			}
-			if config.LogRoutePath {
-				v.RoutePath = c.Path()
-			}
-			if config.LogRequestID {
-				id := req.Header.Get(echo.HeaderXRequestID)
-				if id == "" {
-					id = res.Header().Get(echo.HeaderXRequestID)
-				}
-				v.RequestID = id
-			}
-			if config.LogReferer {
-				v.Referer = req.Referer()
-			}
-			if config.LogUserAgent {
-				v.UserAgent = req.UserAgent()
-			}
-			if config.LogStatus {
-				v.Status = res.Status
-				if err != nil && !config.HandleError {
-					//  this block should not be executed in case of HandleError=true as the global error handler will decide
-					//  the status code. In that case status code could be different from what err contains.
-					var httpErr *echo.HTTPError
-					if errors.As(err, &httpErr) {
-						v.Status = httpErr.Code
-					}
-				}
-			}
-			if config.LogError && err != nil {
-				v.Error = err
-			}
-			if config.LogContentLength {
-				v.ContentLength = req.Header.Get(echo.HeaderContentLength)
-			}
-			if config.LogResponseSize {
-				v.ResponseSize = res.Size
-			}
-			if logHeaders {
-				v.Headers = map[string][]string{}
-				for _, header := range headers {
-					if values, ok := req.Header[header]; ok {
-						v.Headers[header] = values
-					}
-				}
-			}
-			if logQueryParams {
-				queryParams := c.QueryParams()
-				v.QueryParams = map[string][]string{}
-				for _, param := range config.LogQueryParams {
-					if values, ok := queryParams[param]; ok {
-						v.QueryParams[param] = values
-					}
-				}
-			}
-			if logFormValues {
-				v.FormValues = map[string][]string{}
-				for _, formValue := range config.LogFormValues {
-					if values, ok := req.Form[formValue]; ok {
-						v.FormValues[formValue] = values
-					}
-				}
-			}
-
-			if errOnLog := config.LogValuesFunc(c, v); errOnLog != nil {
-				return errOnLog
-			}
-
-			// in case of HandleError=true we are returning the error that we already have handled with global error handler
-			// this is deliberate as this error could be useful for upstream middlewares and default global error handler
-			// will ignore that error when it bubbles up in middleware chain.
-			return err
-		}
-	}, nil
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/rewrite.go b/vendor/github.com/labstack/echo/v4/middleware/rewrite.go
index 4c19cc1..e5b0a6b 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/rewrite.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/rewrite.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -9,33 +6,37 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// RewriteConfig defines the config for Rewrite middleware.
-type RewriteConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// RewriteConfig defines the config for Rewrite middleware.
+	RewriteConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Rules defines the URL path rewrite rules. The values captured in asterisk can be
-	// retrieved by index e.g. $1, $2 and so on.
-	// Example:
-	// "/old":              "/new",
-	// "/api/*":            "/$1",
-	// "/js/*":             "/public/javascripts/$1",
-	// "/users/*/orders/*": "/user/$1/order/$2",
-	// Required.
-	Rules map[string]string `yaml:"rules"`
+		// Rules defines the URL path rewrite rules. The values captured in asterisk can be
+		// retrieved by index e.g. $1, $2 and so on.
+		// Example:
+		// "/old":              "/new",
+		// "/api/*":            "/$1",
+		// "/js/*":             "/public/javascripts/$1",
+		// "/users/*/orders/*": "/user/$1/order/$2",
+		// Required.
+		Rules map[string]string `yaml:"rules"`
 
-	// RegexRules defines the URL path rewrite rules using regexp.Rexexp with captures
-	// Every capture group in the values can be retrieved by index e.g. $1, $2 and so on.
-	// Example:
-	// "^/old/[0.9]+/":     "/new",
-	// "^/api/.+?/(.*)":     "/v2/$1",
-	RegexRules map[*regexp.Regexp]string `yaml:"-"`
-}
+		// RegexRules defines the URL path rewrite rules using regexp.Rexexp with captures
+		// Every capture group in the values can be retrieved by index e.g. $1, $2 and so on.
+		// Example:
+		// "^/old/[0.9]+/":     "/new",
+		// "^/api/.+?/(.*)":     "/v2/$1",
+		RegexRules map[*regexp.Regexp]string `yaml:"regex_rules"`
+	}
+)
 
-// DefaultRewriteConfig is the default Rewrite middleware config.
-var DefaultRewriteConfig = RewriteConfig{
-	Skipper: DefaultSkipper,
-}
+var (
+	// DefaultRewriteConfig is the default Rewrite middleware config.
+	DefaultRewriteConfig = RewriteConfig{
+		Skipper: DefaultSkipper,
+	}
+)
 
 // Rewrite returns a Rewrite middleware.
 //
diff --git a/vendor/github.com/labstack/echo/v4/middleware/secure.go b/vendor/github.com/labstack/echo/v4/middleware/secure.go
index c904abf..6c40517 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/secure.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/secure.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -9,80 +6,84 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// SecureConfig defines the config for Secure middleware.
-type SecureConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// SecureConfig defines the config for Secure middleware.
+	SecureConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// XSSProtection provides protection against cross-site scripting attack (XSS)
-	// by setting the `X-XSS-Protection` header.
-	// Optional. Default value "1; mode=block".
-	XSSProtection string `yaml:"xss_protection"`
+		// XSSProtection provides protection against cross-site scripting attack (XSS)
+		// by setting the `X-XSS-Protection` header.
+		// Optional. Default value "1; mode=block".
+		XSSProtection string `yaml:"xss_protection"`
 
-	// ContentTypeNosniff provides protection against overriding Content-Type
-	// header by setting the `X-Content-Type-Options` header.
-	// Optional. Default value "nosniff".
-	ContentTypeNosniff string `yaml:"content_type_nosniff"`
+		// ContentTypeNosniff provides protection against overriding Content-Type
+		// header by setting the `X-Content-Type-Options` header.
+		// Optional. Default value "nosniff".
+		ContentTypeNosniff string `yaml:"content_type_nosniff"`
 
-	// XFrameOptions can be used to indicate whether or not a browser should
-	// be allowed to render a page in a <frame>, <iframe> or <object> .
-	// Sites can use this to avoid clickjacking attacks, by ensuring that their
-	// content is not embedded into other sites.provides protection against
-	// clickjacking.
-	// Optional. Default value "SAMEORIGIN".
-	// Possible values:
-	// - "SAMEORIGIN" - The page can only be displayed in a frame on the same origin as the page itself.
-	// - "DENY" - The page cannot be displayed in a frame, regardless of the site attempting to do so.
-	// - "ALLOW-FROM uri" - The page can only be displayed in a frame on the specified origin.
-	XFrameOptions string `yaml:"x_frame_options"`
+		// XFrameOptions can be used to indicate whether or not a browser should
+		// be allowed to render a page in a <frame>, <iframe> or <object> .
+		// Sites can use this to avoid clickjacking attacks, by ensuring that their
+		// content is not embedded into other sites.provides protection against
+		// clickjacking.
+		// Optional. Default value "SAMEORIGIN".
+		// Possible values:
+		// - "SAMEORIGIN" - The page can only be displayed in a frame on the same origin as the page itself.
+		// - "DENY" - The page cannot be displayed in a frame, regardless of the site attempting to do so.
+		// - "ALLOW-FROM uri" - The page can only be displayed in a frame on the specified origin.
+		XFrameOptions string `yaml:"x_frame_options"`
 
-	// HSTSMaxAge sets the `Strict-Transport-Security` header to indicate how
-	// long (in seconds) browsers should remember that this site is only to
-	// be accessed using HTTPS. This reduces your exposure to some SSL-stripping
-	// man-in-the-middle (MITM) attacks.
-	// Optional. Default value 0.
-	HSTSMaxAge int `yaml:"hsts_max_age"`
+		// HSTSMaxAge sets the `Strict-Transport-Security` header to indicate how
+		// long (in seconds) browsers should remember that this site is only to
+		// be accessed using HTTPS. This reduces your exposure to some SSL-stripping
+		// man-in-the-middle (MITM) attacks.
+		// Optional. Default value 0.
+		HSTSMaxAge int `yaml:"hsts_max_age"`
 
-	// HSTSExcludeSubdomains won't include subdomains tag in the `Strict Transport Security`
-	// header, excluding all subdomains from security policy. It has no effect
-	// unless HSTSMaxAge is set to a non-zero value.
-	// Optional. Default value false.
-	HSTSExcludeSubdomains bool `yaml:"hsts_exclude_subdomains"`
+		// HSTSExcludeSubdomains won't include subdomains tag in the `Strict Transport Security`
+		// header, excluding all subdomains from security policy. It has no effect
+		// unless HSTSMaxAge is set to a non-zero value.
+		// Optional. Default value false.
+		HSTSExcludeSubdomains bool `yaml:"hsts_exclude_subdomains"`
 
-	// ContentSecurityPolicy sets the `Content-Security-Policy` header providing
-	// security against cross-site scripting (XSS), clickjacking and other code
-	// injection attacks resulting from execution of malicious content in the
-	// trusted web page context.
-	// Optional. Default value "".
-	ContentSecurityPolicy string `yaml:"content_security_policy"`
+		// ContentSecurityPolicy sets the `Content-Security-Policy` header providing
+		// security against cross-site scripting (XSS), clickjacking and other code
+		// injection attacks resulting from execution of malicious content in the
+		// trusted web page context.
+		// Optional. Default value "".
+		ContentSecurityPolicy string `yaml:"content_security_policy"`
 
-	// CSPReportOnly would use the `Content-Security-Policy-Report-Only` header instead
-	// of the `Content-Security-Policy` header. This allows iterative updates of the
-	// content security policy by only reporting the violations that would
-	// have occurred instead of blocking the resource.
-	// Optional. Default value false.
-	CSPReportOnly bool `yaml:"csp_report_only"`
+		// CSPReportOnly would use the `Content-Security-Policy-Report-Only` header instead
+		// of the `Content-Security-Policy` header. This allows iterative updates of the
+		// content security policy by only reporting the violations that would
+		// have occurred instead of blocking the resource.
+		// Optional. Default value false.
+		CSPReportOnly bool `yaml:"csp_report_only"`
 
-	// HSTSPreloadEnabled will add the preload tag in the `Strict Transport Security`
-	// header, which enables the domain to be included in the HSTS preload list
-	// maintained by Chrome (and used by Firefox and Safari): https://hstspreload.org/
-	// Optional.  Default value false.
-	HSTSPreloadEnabled bool `yaml:"hsts_preload_enabled"`
+		// HSTSPreloadEnabled will add the preload tag in the `Strict Transport Security`
+		// header, which enables the domain to be included in the HSTS preload list
+		// maintained by Chrome (and used by Firefox and Safari): https://hstspreload.org/
+		// Optional.  Default value false.
+		HSTSPreloadEnabled bool `yaml:"hsts_preload_enabled"`
 
-	// ReferrerPolicy sets the `Referrer-Policy` header providing security against
-	// leaking potentially sensitive request paths to third parties.
-	// Optional. Default value "".
-	ReferrerPolicy string `yaml:"referrer_policy"`
-}
+		// ReferrerPolicy sets the `Referrer-Policy` header providing security against
+		// leaking potentially sensitive request paths to third parties.
+		// Optional. Default value "".
+		ReferrerPolicy string `yaml:"referrer_policy"`
+	}
+)
 
-// DefaultSecureConfig is the default Secure middleware config.
-var DefaultSecureConfig = SecureConfig{
-	Skipper:            DefaultSkipper,
-	XSSProtection:      "1; mode=block",
-	ContentTypeNosniff: "nosniff",
-	XFrameOptions:      "SAMEORIGIN",
-	HSTSPreloadEnabled: false,
-}
+var (
+	// DefaultSecureConfig is the default Secure middleware config.
+	DefaultSecureConfig = SecureConfig{
+		Skipper:            DefaultSkipper,
+		XSSProtection:      "1; mode=block",
+		ContentTypeNosniff: "nosniff",
+		XFrameOptions:      "SAMEORIGIN",
+		HSTSPreloadEnabled: false,
+	}
+)
 
 // Secure returns a Secure middleware.
 // Secure middleware provides protection against cross-site scripting (XSS) attack,
diff --git a/vendor/github.com/labstack/echo/v4/middleware/slash.go b/vendor/github.com/labstack/echo/v4/middleware/slash.go
index 53b3052..4188675 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/slash.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/slash.go
@@ -1,6 +1,3 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
@@ -9,20 +6,24 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// TrailingSlashConfig defines the config for TrailingSlash middleware.
-type TrailingSlashConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// TrailingSlashConfig defines the config for TrailingSlash middleware.
+	TrailingSlashConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Status code to be used when redirecting the request.
-	// Optional, but when provided the request is redirected using this code.
-	RedirectCode int `yaml:"redirect_code"`
-}
+		// Status code to be used when redirecting the request.
+		// Optional, but when provided the request is redirected using this code.
+		RedirectCode int `yaml:"redirect_code"`
+	}
+)
 
-// DefaultTrailingSlashConfig is the default TrailingSlash middleware config.
-var DefaultTrailingSlashConfig = TrailingSlashConfig{
-	Skipper: DefaultSkipper,
-}
+var (
+	// DefaultTrailingSlashConfig is the default TrailingSlash middleware config.
+	DefaultTrailingSlashConfig = TrailingSlashConfig{
+		Skipper: DefaultSkipper,
+	}
+)
 
 // AddTrailingSlash returns a root level (before router) middleware which adds a
 // trailing slash to the request `URL#Path`.
@@ -32,7 +33,7 @@ func AddTrailingSlash() echo.MiddlewareFunc {
 	return AddTrailingSlashWithConfig(DefaultTrailingSlashConfig)
 }
 
-// AddTrailingSlashWithConfig returns an AddTrailingSlash middleware with config.
+// AddTrailingSlashWithConfig returns a AddTrailingSlash middleware with config.
 // See `AddTrailingSlash()`.
 func AddTrailingSlashWithConfig(config TrailingSlashConfig) echo.MiddlewareFunc {
 	// Defaults
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static.go b/vendor/github.com/labstack/echo/v4/middleware/static.go
index 1016f1b..0106f7c 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/static.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/static.go
@@ -1,54 +1,53 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
-	"errors"
 	"fmt"
 	"html/template"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/bytes"
 )
 
-// StaticConfig defines the config for Static middleware.
-type StaticConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+type (
+	// StaticConfig defines the config for Static middleware.
+	StaticConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-	// Root directory from where the static content is served.
-	// Required.
-	Root string `yaml:"root"`
+		// Root directory from where the static content is served.
+		// Required.
+		Root string `yaml:"root"`
 
-	// Index file for serving a directory.
-	// Optional. Default value "index.html".
-	Index string `yaml:"index"`
+		// Index file for serving a directory.
+		// Optional. Default value "index.html".
+		Index string `yaml:"index"`
 
-	// Enable HTML5 mode by forwarding all not-found requests to root so that
-	// SPA (single-page application) can handle the routing.
-	// Optional. Default value false.
-	HTML5 bool `yaml:"html5"`
+		// Enable HTML5 mode by forwarding all not-found requests to root so that
+		// SPA (single-page application) can handle the routing.
+		// Optional. Default value false.
+		HTML5 bool `yaml:"html5"`
 
-	// Enable directory browsing.
-	// Optional. Default value false.
-	Browse bool `yaml:"browse"`
+		// Enable directory browsing.
+		// Optional. Default value false.
+		Browse bool `yaml:"browse"`
 
-	// Enable ignoring of the base of the URL path.
-	// Example: when assigning a static middleware to a non root path group,
-	// the filesystem path is not doubled
-	// Optional. Default value false.
-	IgnoreBase bool `yaml:"ignoreBase"`
+		// Enable ignoring of the base of the URL path.
+		// Example: when assigning a static middleware to a non root path group,
+		// the filesystem path is not doubled
+		// Optional. Default value false.
+		IgnoreBase bool `yaml:"ignoreBase"`
 
-	// Filesystem provides access to the static content.
-	// Optional. Defaults to http.Dir(config.Root)
-	Filesystem http.FileSystem `yaml:"-"`
-}
+		// Filesystem provides access to the static content.
+		// Optional. Defaults to http.Dir(config.Root)
+		Filesystem http.FileSystem `yaml:"-"`
+	}
+)
 
 const html = `
 <!DOCTYPE html>
@@ -122,11 +121,13 @@ const html = `
 </html>
 `
 
-// DefaultStaticConfig is the default Static middleware config.
-var DefaultStaticConfig = StaticConfig{
-	Skipper: DefaultSkipper,
-	Index:   "index.html",
-}
+var (
+	// DefaultStaticConfig is the default Static middleware config.
+	DefaultStaticConfig = StaticConfig{
+		Skipper: DefaultSkipper,
+		Index:   "index.html",
+	}
+)
 
 // Static returns a Static middleware to serves static content from the provided
 // root directory.
@@ -155,9 +156,9 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 	}
 
 	// Index template
-	t, tErr := template.New("index").Parse(html)
-	if tErr != nil {
-		panic(fmt.Errorf("echo: %w", tErr))
+	t, err := template.New("index").Parse(html)
+	if err != nil {
+		panic(fmt.Sprintf("echo: %v", err))
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -174,7 +175,7 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 			if err != nil {
 				return
 			}
-			name := path.Join(config.Root, path.Clean("/"+p)) // "/"+ for security
+			name := filepath.Join(config.Root, filepath.Clean("/"+p)) // "/"+ for security
 
 			if config.IgnoreBase {
 				routePath := path.Base(strings.TrimRight(c.Path(), "/*"))
@@ -185,24 +186,22 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 				}
 			}
 
-			file, err := config.Filesystem.Open(name)
+			file, err := openFile(config.Filesystem, name)
 			if err != nil {
-				if !isIgnorableOpenFileError(err) {
+				if !os.IsNotExist(err) {
 					return err
 				}
 
-				// file with that path did not exist, so we continue down in middleware/handler chain, hoping that we end up in
-				// handler that is meant to handle this request
 				if err = next(c); err == nil {
 					return err
 				}
 
-				var he *echo.HTTPError
-				if !(errors.As(err, &he) && config.HTML5 && he.Code == http.StatusNotFound) {
+				he, ok := err.(*echo.HTTPError)
+				if !(ok && config.HTML5 && he.Code == http.StatusNotFound) {
 					return err
 				}
 
-				file, err = config.Filesystem.Open(path.Join(config.Root, config.Index))
+				file, err = openFile(config.Filesystem, filepath.Join(config.Root, config.Index))
 				if err != nil {
 					return err
 				}
@@ -216,13 +215,15 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 			}
 
 			if info.IsDir() {
-				index, err := config.Filesystem.Open(path.Join(name, config.Index))
+				index, err := openFile(config.Filesystem, filepath.Join(name, config.Index))
 				if err != nil {
 					if config.Browse {
 						return listDir(t, name, file, c.Response())
 					}
 
-					return next(c)
+					if os.IsNotExist(err) {
+						return next(c)
+					}
 				}
 
 				defer index.Close()
@@ -240,6 +241,11 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 	}
 }
 
+func openFile(fs http.FileSystem, name string) (http.File, error) {
+	pathWithSlashes := filepath.ToSlash(name)
+	return fs.Open(pathWithSlashes)
+}
+
 func serveFile(c echo.Context, file http.File, info os.FileInfo) error {
 	http.ServeContent(c.Response(), c.Request(), info.Name(), info.ModTime(), file)
 	return nil
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static_other.go b/vendor/github.com/labstack/echo/v4/middleware/static_other.go
deleted file mode 100644
index 35dbfb3..0000000
--- a/vendor/github.com/labstack/echo/v4/middleware/static_other.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-//go:build !windows
-
-package middleware
-
-import (
-	"os"
-)
-
-// We ignore these errors as there could be handler that matches request path.
-func isIgnorableOpenFileError(err error) bool {
-	return os.IsNotExist(err)
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static_windows.go b/vendor/github.com/labstack/echo/v4/middleware/static_windows.go
deleted file mode 100644
index e294020..0000000
--- a/vendor/github.com/labstack/echo/v4/middleware/static_windows.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
-package middleware
-
-import (
-	"os"
-)
-
-// We ignore these errors as there could be handler that matches request path.
-//
-// As of Go 1.20 filepath.Clean has different behaviour on OS related filesystems so we need to use path.Clean
-// on Windows which has some caveats. The Open methods might return different errors than earlier versions and
-// as of 1.20 path checks are more strict on the provided path and considers [UNC](https://en.wikipedia.org/wiki/Path_(computing)#UNC)
-// paths with missing host etc parts as invalid. Previously it would result you `fs.ErrNotExist`.
-//
-// For 1.20@Windows we need to treat those errors the same as `fs.ErrNotExists` so we can continue handling
-// errors in the middleware/handler chain. Otherwise we might end up with status 500 instead of finding a route
-// or return 404 not found.
-func isIgnorableOpenFileError(err error) bool {
-	if os.IsNotExist(err) {
-		return true
-	}
-	errTxt := err.Error()
-	return errTxt == "http: invalid or unsafe file path" || errTxt == "invalid path"
-}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/timeout.go b/vendor/github.com/labstack/echo/v4/middleware/timeout.go
index c2aebef..7311365 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/timeout.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/timeout.go
@@ -1,91 +1,45 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
 	"context"
-	"github.com/labstack/echo/v4"
 	"net/http"
-	"sync"
 	"time"
+
+	"github.com/labstack/echo/v4"
 )
 
-// ---------------------------------------------------------------------------------------------------------------
-// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-// WARNING: Timeout middleware causes more problems than it solves.
-// WARNING: This middleware should be first middleware as it messes with request Writer and could cause data race if
-// 					it is in other position
-//
-// Depending on out requirements you could be better of setting timeout to context and
-// check its deadline from handler.
-//
-// For example: create middleware to set timeout to context
-// func RequestTimeout(timeout time.Duration) echo.MiddlewareFunc {
-//	return func(next echo.HandlerFunc) echo.HandlerFunc {
-//		return func(c echo.Context) error {
-//			timeoutCtx, cancel := context.WithTimeout(c.Request().Context(), timeout)
-//			c.SetRequest(c.Request().WithContext(timeoutCtx))
-//			defer cancel()
-//			return next(c)
-//		}
-//	}
-//}
-//
-// Create handler that checks for context deadline and runs actual task in separate coroutine
-// Note: separate coroutine may not be even if you do not want to process continue executing and
-// just want to stop long-running handler to stop and you are using "context aware" methods (ala db queries with ctx)
-// 	e.GET("/", func(c echo.Context) error {
-//
-//		doneCh := make(chan error)
-//		go func(ctx context.Context) {
-//			doneCh <- myPossiblyLongRunningBackgroundTaskWithCtx(ctx)
-//		}(c.Request().Context())
-//
-//		select { // wait for task to finish or context to timeout/cancelled
-//		case err := <-doneCh:
-//			if err != nil {
-//				return err
-//			}
-//			return c.String(http.StatusOK, "OK")
-//		case <-c.Request().Context().Done():
-//			if c.Request().Context().Err() == context.DeadlineExceeded {
-//				return c.String(http.StatusServiceUnavailable, "timeout")
-//			}
-//			return c.Request().Context().Err()
-//		}
-//
-//	})
-//
+type (
+	// TimeoutConfig defines the config for Timeout middleware.
+	TimeoutConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
 
-// TimeoutConfig defines the config for Timeout middleware.
-type TimeoutConfig struct {
-	// Skipper defines a function to skip middleware.
-	Skipper Skipper
+		// ErrorMessage is written to response on timeout in addition to http.StatusServiceUnavailable (503) status code
+		// It can be used to define a custom timeout error message
+		ErrorMessage string
 
-	// ErrorMessage is written to response on timeout in addition to http.StatusServiceUnavailable (503) status code
-	// It can be used to define a custom timeout error message
-	ErrorMessage string
+		// OnTimeoutRouteErrorHandler is an error handler that is executed for error that was returned from wrapped route after
+		// request timeouted and we already had sent the error code (503) and message response to the client.
+		// NB: do not write headers/body inside this handler. The response has already been sent to the client and response writer
+		// will not accept anything no more. If you want to know what actual route middleware timeouted use `c.Path()`
+		OnTimeoutRouteErrorHandler func(err error, c echo.Context)
 
-	// OnTimeoutRouteErrorHandler is an error handler that is executed for error that was returned from wrapped route after
-	// request timeouted and we already had sent the error code (503) and message response to the client.
-	// NB: do not write headers/body inside this handler. The response has already been sent to the client and response writer
-	// will not accept anything no more. If you want to know what actual route middleware timeouted use `c.Path()`
-	OnTimeoutRouteErrorHandler func(err error, c echo.Context)
+		// Timeout configures a timeout for the middleware, defaults to 0 for no timeout
+		// NOTE: when difference between timeout duration and handler execution time is almost the same (in range of 100microseconds)
+		// the result of timeout does not seem to be reliable - could respond timeout, could respond handler output
+		// difference over 500microseconds (0.5millisecond) response seems to be reliable
+		Timeout time.Duration
+	}
+)
 
-	// Timeout configures a timeout for the middleware, defaults to 0 for no timeout
-	// NOTE: when difference between timeout duration and handler execution time is almost the same (in range of 100microseconds)
-	// the result of timeout does not seem to be reliable - could respond timeout, could respond handler output
-	// difference over 500microseconds (0.5millisecond) response seems to be reliable
-	Timeout time.Duration
-}
-
-// DefaultTimeoutConfig is the default Timeout middleware config.
-var DefaultTimeoutConfig = TimeoutConfig{
-	Skipper:      DefaultSkipper,
-	Timeout:      0,
-	ErrorMessage: "",
-}
+var (
+	// DefaultTimeoutConfig is the default Timeout middleware config.
+	DefaultTimeoutConfig = TimeoutConfig{
+		Skipper:      DefaultSkipper,
+		Timeout:      0,
+		ErrorMessage: "",
+	}
+)
 
 // Timeout returns a middleware which returns error (503 Service Unavailable error) to client immediately when handler
 // call runs for longer than its time limit. NB: timeout does not stop handler execution.
@@ -93,17 +47,10 @@ func Timeout() echo.MiddlewareFunc {
 	return TimeoutWithConfig(DefaultTimeoutConfig)
 }
 
-// TimeoutWithConfig returns a Timeout middleware with config or panics on invalid configuration.
+// TimeoutWithConfig returns a Timeout middleware with config.
+// See: `Timeout()`.
 func TimeoutWithConfig(config TimeoutConfig) echo.MiddlewareFunc {
-	mw, err := config.ToMiddleware()
-	if err != nil {
-		panic(err)
-	}
-	return mw
-}
-
-// ToMiddleware converts Config to middleware or returns an error for invalid configuration
-func (config TimeoutConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
+	// Defaults
 	if config.Skipper == nil {
 		config.Skipper = DefaultTimeoutConfig.Skipper
 	}
@@ -114,29 +61,26 @@ func (config TimeoutConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
 				return next(c)
 			}
 
-			errChan := make(chan error, 1)
 			handlerWrapper := echoHandlerFuncWrapper{
-				writer:     &ignorableWriter{ResponseWriter: c.Response().Writer},
 				ctx:        c,
 				handler:    next,
-				errChan:    errChan,
+				errChan:    make(chan error, 1),
 				errHandler: config.OnTimeoutRouteErrorHandler,
 			}
 			handler := http.TimeoutHandler(handlerWrapper, config.Timeout, config.ErrorMessage)
-			handler.ServeHTTP(handlerWrapper.writer, c.Request())
+			handler.ServeHTTP(c.Response().Writer, c.Request())
 
 			select {
-			case err := <-errChan:
+			case err := <-handlerWrapper.errChan:
 				return err
 			default:
 				return nil
 			}
 		}
-	}, nil
+	}
 }
 
 type echoHandlerFuncWrapper struct {
-	writer     *ignorableWriter
 	ctx        echo.Context
 	handler    echo.HandlerFunc
 	errHandler func(err error, c echo.Context)
@@ -169,53 +113,16 @@ func (t echoHandlerFuncWrapper) ServeHTTP(rw http.ResponseWriter, r *http.Reques
 		}
 		return // on timeout we can not send handler error to client because `http.TimeoutHandler` has already sent headers
 	}
-	if err != nil {
-		// This is needed as `http.TimeoutHandler` will write status code by itself on error and after that our tries to write
-		// status code will not work anymore as Echo.Response thinks it has been already "committed" and further writes
-		// create errors in log about `superfluous response.WriteHeader call from`
-		t.writer.Ignore(true)
-		t.ctx.Response().Writer = originalWriter // make sure we restore writer before we signal original coroutine about the error
-		// we pass error from handler to middlewares up in handler chain to act on it if needed.
-		t.errChan <- err
-		return
-	}
 	// we restore original writer only for cases we did not timeout. On timeout we have already sent response to client
 	// and should not anymore send additional headers/data
 	// so on timeout writer stays what http.TimeoutHandler uses and prevents writing headers/body
 	t.ctx.Response().Writer = originalWriter
-}
-
-// ignorableWriter is ResponseWriter implementations that allows us to mark writer to ignore further write calls. This
-// is handy in cases when you do not have direct control of code being executed (3rd party middleware) but want to make
-// sure that external code will not be able to write response to the client.
-// Writer is coroutine safe for writes.
-type ignorableWriter struct {
-	http.ResponseWriter
-
-	lock         sync.Mutex
-	ignoreWrites bool
-}
-
-func (w *ignorableWriter) Ignore(ignore bool) {
-	w.lock.Lock()
-	w.ignoreWrites = ignore
-	w.lock.Unlock()
-}
-
-func (w *ignorableWriter) WriteHeader(code int) {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	if w.ignoreWrites {
-		return
+	if err != nil {
+		// call global error handler to write error to the client. This is needed or `http.TimeoutHandler` will send status code by itself
+		// and after that our tries to write status code will not work anymore
+		t.ctx.Error(err)
+		// we pass error from handler to middlewares up in handler chain to act on it if needed. But this means that
+		// global error handler is probably be called twice as `t.ctx.Error` already does that.
+		t.errChan <- err
 	}
-	w.ResponseWriter.WriteHeader(code)
-}
-
-func (w *ignorableWriter) Write(b []byte) (int, error) {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	if w.ignoreWrites {
-		return len(b), nil
-	}
-	return w.ResponseWriter.Write(b)
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/util.go b/vendor/github.com/labstack/echo/v4/middleware/util.go
index 09428eb..ab951a0 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/util.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/util.go
@@ -1,14 +1,7 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package middleware
 
 import (
-	"bufio"
-	"crypto/rand"
-	"io"
 	"strings"
-	"sync"
 )
 
 func matchScheme(domain, pattern string) bool {
@@ -59,45 +52,3 @@ func matchSubdomain(domain, pattern string) bool {
 	}
 	return false
 }
-
-// https://tip.golang.org/doc/go1.19#:~:text=Read%20no%20longer%20buffers%20random%20data%20obtained%20from%20the%20operating%20system%20between%20calls
-var randomReaderPool = sync.Pool{New: func() interface{} {
-	return bufio.NewReader(rand.Reader)
-}}
-
-const randomStringCharset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-const randomStringCharsetLen = 52 // len(randomStringCharset)
-const randomStringMaxByte = 255 - (256 % randomStringCharsetLen)
-
-func randomString(length uint8) string {
-	reader := randomReaderPool.Get().(*bufio.Reader)
-	defer randomReaderPool.Put(reader)
-
-	b := make([]byte, length)
-	r := make([]byte, length+(length/4)) // perf: avoid read from rand.Reader many times
-	var i uint8 = 0
-
-	// security note:
-	// we can't just simply do b[i]=randomStringCharset[rb%len(randomStringCharset)],
-	// len(len(randomStringCharset)) is 52, and rb is [0, 255], 256 = 52 * 4 + 48.
-	// make the first 48 characters more possibly to be generated then others.
-	// So we have to skip bytes when rb > randomStringMaxByte
-
-	for {
-		_, err := io.ReadFull(reader, r)
-		if err != nil {
-			panic("unexpected error happened when reading from bufio.NewReader(crypto/rand.Reader)")
-		}
-		for _, rb := range r {
-			if rb > randomStringMaxByte {
-				// Skip this number to avoid bias.
-				continue
-			}
-			b[i] = randomStringCharset[rb%randomStringCharsetLen]
-			i++
-			if i == length {
-				return string(b)
-			}
-		}
-	}
-}
diff --git a/vendor/github.com/labstack/echo/v4/renderer.go b/vendor/github.com/labstack/echo/v4/renderer.go
deleted file mode 100644
index 44e038f..0000000
--- a/vendor/github.com/labstack/echo/v4/renderer.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package echo
-
-import "io"
-
-// Renderer is the interface that wraps the Render function.
-type Renderer interface {
-	Render(io.Writer, string, interface{}, Context) error
-}
-
-// TemplateRenderer is helper to ease creating renderers for `html/template` and `text/template` packages.
-// Example usage:
-//
-//		e.Renderer = &echo.TemplateRenderer{
-//			Template: template.Must(template.ParseGlob("templates/*.html")),
-//		}
-//
-//	  e.Renderer = &echo.TemplateRenderer{
-//			Template: template.Must(template.New("hello").Parse("Hello, {{.}}!")),
-//		}
-type TemplateRenderer struct {
-	Template interface {
-		ExecuteTemplate(wr io.Writer, name string, data any) error
-	}
-}
-
-// Render renders the template with given data.
-func (t *TemplateRenderer) Render(w io.Writer, name string, data interface{}, c Context) error {
-	return t.Template.ExecuteTemplate(w, name, data)
-}
diff --git a/vendor/github.com/labstack/echo/v4/response.go b/vendor/github.com/labstack/echo/v4/response.go
index 0f17453..84f7c9e 100644
--- a/vendor/github.com/labstack/echo/v4/response.go
+++ b/vendor/github.com/labstack/echo/v4/response.go
@@ -1,27 +1,25 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
 	"bufio"
-	"errors"
 	"net"
 	"net/http"
 )
 
-// Response wraps an http.ResponseWriter and implements its interface to be used
-// by an HTTP handler to construct an HTTP response.
-// See: https://golang.org/pkg/net/http/#ResponseWriter
-type Response struct {
-	Writer      http.ResponseWriter
-	echo        *Echo
-	beforeFuncs []func()
-	afterFuncs  []func()
-	Status      int
-	Size        int64
-	Committed   bool
-}
+type (
+	// Response wraps an http.ResponseWriter and implements its interface to be used
+	// by an HTTP handler to construct an HTTP response.
+	// See: https://golang.org/pkg/net/http/#ResponseWriter
+	Response struct {
+		echo        *Echo
+		beforeFuncs []func()
+		afterFuncs  []func()
+		Writer      http.ResponseWriter
+		Status      int
+		Size        int64
+		Committed   bool
+	}
+)
 
 // NewResponse creates a new instance of Response.
 func NewResponse(w http.ResponseWriter, e *Echo) (r *Response) {
@@ -86,24 +84,14 @@ func (r *Response) Write(b []byte) (n int, err error) {
 // buffered data to the client.
 // See [http.Flusher](https://golang.org/pkg/net/http/#Flusher)
 func (r *Response) Flush() {
-	err := http.NewResponseController(r.Writer).Flush()
-	if err != nil && errors.Is(err, http.ErrNotSupported) {
-		panic(errors.New("response writer flushing is not supported"))
-	}
+	r.Writer.(http.Flusher).Flush()
 }
 
 // Hijack implements the http.Hijacker interface to allow an HTTP handler to
 // take over the connection.
 // See [http.Hijacker](https://golang.org/pkg/net/http/#Hijacker)
 func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	return http.NewResponseController(r.Writer).Hijack()
-}
-
-// Unwrap returns the original http.ResponseWriter.
-// ResponseController can be used to access the original http.ResponseWriter.
-// See [https://go.dev/blog/go1.20]
-func (r *Response) Unwrap() http.ResponseWriter {
-	return r.Writer
+	return r.Writer.(http.Hijacker).Hijack()
 }
 
 func (r *Response) reset(w http.ResponseWriter) {
diff --git a/vendor/github.com/labstack/echo/v4/router.go b/vendor/github.com/labstack/echo/v4/router.go
index 49b5696..5b2474b 100644
--- a/vendor/github.com/labstack/echo/v4/router.go
+++ b/vendor/github.com/labstack/echo/v4/router.go
@@ -1,65 +1,49 @@
-// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: © 2015 LabStack LLC and Echo contributors
-
 package echo
 
 import (
-	"bytes"
-	"fmt"
 	"net/http"
 )
 
-// Router is the registry of all registered routes for an `Echo` instance for
-// request matching and URL path parameter parsing.
-type Router struct {
-	tree   *node
-	routes map[string]*Route
-	echo   *Echo
-}
-
-type node struct {
-	methods    *routeMethods
-	parent     *node
-	paramChild *node
-	anyChild   *node
-	// notFoundHandler is handler registered with RouteNotFound method and is executed for 404 cases
-	notFoundHandler *routeMethod
-	prefix          string
-	originalPath    string
-	staticChildren  children
-	paramsCount     int
-	label           byte
-	kind            kind
-	// isLeaf indicates that node does not have child routes
-	isLeaf bool
-	// isHandler indicates that node has at least one handler registered to it
-	isHandler bool
-}
-
-type kind uint8
-type children []*node
-
-type routeMethod struct {
-	handler HandlerFunc
-	ppath   string
-	pnames  []string
-}
-
-type routeMethods struct {
-	connect     *routeMethod
-	delete      *routeMethod
-	get         *routeMethod
-	head        *routeMethod
-	options     *routeMethod
-	patch       *routeMethod
-	post        *routeMethod
-	propfind    *routeMethod
-	put         *routeMethod
-	trace       *routeMethod
-	report      *routeMethod
-	anyOther    map[string]*routeMethod
-	allowHeader string
-}
+type (
+	// Router is the registry of all registered routes for an `Echo` instance for
+	// request matching and URL path parameter parsing.
+	Router struct {
+		tree   *node
+		routes map[string]*Route
+		echo   *Echo
+	}
+	node struct {
+		kind           kind
+		label          byte
+		prefix         string
+		parent         *node
+		staticChildren children
+		ppath          string
+		pnames         []string
+		methodHandler  *methodHandler
+		paramChild     *node
+		anyChild       *node
+		// isLeaf indicates that node does not have child routes
+		isLeaf bool
+		// isHandler indicates that node has at least one handler registered to it
+		isHandler bool
+	}
+	kind          uint8
+	children      []*node
+	methodHandler struct {
+		connect  HandlerFunc
+		delete   HandlerFunc
+		get      HandlerFunc
+		head     HandlerFunc
+		options  HandlerFunc
+		patch    HandlerFunc
+		post     HandlerFunc
+		propfind HandlerFunc
+		put      HandlerFunc
+		trace    HandlerFunc
+		report   HandlerFunc
+	}
+)
 
 const (
 	staticKind kind = iota
@@ -70,7 +54,7 @@ const (
 	anyLabel   = byte('*')
 )
 
-func (m *routeMethods) isHandler() bool {
+func (m *methodHandler) isHandler() bool {
 	return m.connect != nil ||
 		m.delete != nil ||
 		m.get != nil ||
@@ -81,138 +65,29 @@ func (m *routeMethods) isHandler() bool {
 		m.propfind != nil ||
 		m.put != nil ||
 		m.trace != nil ||
-		m.report != nil ||
-		len(m.anyOther) != 0
-	// RouteNotFound/404 is not considered as a handler
-}
-
-func (m *routeMethods) updateAllowHeader() {
-	buf := new(bytes.Buffer)
-	buf.WriteString(http.MethodOptions)
-
-	if m.connect != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodConnect)
-	}
-	if m.delete != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodDelete)
-	}
-	if m.get != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodGet)
-	}
-	if m.head != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodHead)
-	}
-	if m.patch != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodPatch)
-	}
-	if m.post != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodPost)
-	}
-	if m.propfind != nil {
-		buf.WriteString(", PROPFIND")
-	}
-	if m.put != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodPut)
-	}
-	if m.trace != nil {
-		buf.WriteString(", ")
-		buf.WriteString(http.MethodTrace)
-	}
-	if m.report != nil {
-		buf.WriteString(", REPORT")
-	}
-	for method := range m.anyOther { // for simplicity, we use map and therefore order is not deterministic here
-		buf.WriteString(", ")
-		buf.WriteString(method)
-	}
-	m.allowHeader = buf.String()
+		m.report != nil
 }
 
 // NewRouter returns a new Router instance.
 func NewRouter(e *Echo) *Router {
 	return &Router{
 		tree: &node{
-			methods: new(routeMethods),
+			methodHandler: new(methodHandler),
 		},
 		routes: map[string]*Route{},
 		echo:   e,
 	}
 }
 
-// Routes returns the registered routes.
-func (r *Router) Routes() []*Route {
-	routes := make([]*Route, 0, len(r.routes))
-	for _, v := range r.routes {
-		routes = append(routes, v)
-	}
-	return routes
-}
-
-// Reverse generates a URL from route name and provided parameters.
-func (r *Router) Reverse(name string, params ...interface{}) string {
-	uri := new(bytes.Buffer)
-	ln := len(params)
-	n := 0
-	for _, route := range r.routes {
-		if route.Name == name {
-			for i, l := 0, len(route.Path); i < l; i++ {
-				hasBackslash := route.Path[i] == '\\'
-				if hasBackslash && i+1 < l && route.Path[i+1] == ':' {
-					i++ // backslash before colon escapes that colon. in that case skip backslash
-				}
-				if n < ln && (route.Path[i] == '*' || (!hasBackslash && route.Path[i] == ':')) {
-					// in case of `*` wildcard or `:` (unescaped colon) param we replace everything till next slash or end of path
-					for ; i < l && route.Path[i] != '/'; i++ {
-					}
-					uri.WriteString(fmt.Sprintf("%v", params[n]))
-					n++
-				}
-				if i < l {
-					uri.WriteByte(route.Path[i])
-				}
-			}
-			break
-		}
-	}
-	return uri.String()
-}
-
-func normalizePathSlash(path string) string {
-	if path == "" {
-		path = "/"
-	} else if path[0] != '/' {
-		path = "/" + path
-	}
-	return path
-}
-
-func (r *Router) add(method, path, name string, h HandlerFunc) *Route {
-	path = normalizePathSlash(path)
-	r.insert(method, path, h)
-
-	route := &Route{
-		Method: method,
-		Path:   path,
-		Name:   name,
-	}
-	r.routes[method+path] = route
-	return route
-}
-
 // Add registers a new route for method and path with matching handler.
 func (r *Router) Add(method, path string, h HandlerFunc) {
-	r.insert(method, normalizePathSlash(path), h)
-}
-
-func (r *Router) insert(method, path string, h HandlerFunc) {
-	path = normalizePathSlash(path)
+	// Validate path
+	if path == "" {
+		path = "/"
+	}
+	if path[0] != '/' {
+		path = "/" + path
+	}
 	pnames := []string{} // Param names
 	ppath := path        // Pristine path
 
@@ -223,15 +98,9 @@ func (r *Router) insert(method, path string, h HandlerFunc) {
 
 	for i, lcpIndex := 0, len(path); i < lcpIndex; i++ {
 		if path[i] == ':' {
-			if i > 0 && path[i-1] == '\\' {
-				path = path[:i-1] + path[i:]
-				i--
-				lcpIndex--
-				continue
-			}
 			j := i + 1
 
-			r.insertNode(method, path[:i], staticKind, routeMethod{})
+			r.insert(method, path[:i], nil, staticKind, "", nil)
 			for ; i < lcpIndex && path[i] != '/'; i++ {
 			}
 
@@ -241,23 +110,23 @@ func (r *Router) insert(method, path string, h HandlerFunc) {
 
 			if i == lcpIndex {
 				// path node is last fragment of route path. ie. `/users/:id`
-				r.insertNode(method, path[:i], paramKind, routeMethod{ppath: ppath, pnames: pnames, handler: h})
+				r.insert(method, path[:i], h, paramKind, ppath, pnames)
 			} else {
-				r.insertNode(method, path[:i], paramKind, routeMethod{})
+				r.insert(method, path[:i], nil, paramKind, "", nil)
 			}
 		} else if path[i] == '*' {
-			r.insertNode(method, path[:i], staticKind, routeMethod{})
+			r.insert(method, path[:i], nil, staticKind, "", nil)
 			pnames = append(pnames, "*")
-			r.insertNode(method, path[:i+1], anyKind, routeMethod{ppath: ppath, pnames: pnames, handler: h})
+			r.insert(method, path[:i+1], h, anyKind, ppath, pnames)
 		}
 	}
 
-	r.insertNode(method, path, staticKind, routeMethod{ppath: ppath, pnames: pnames, handler: h})
+	r.insert(method, path, h, staticKind, ppath, pnames)
 }
 
-func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
+func (r *Router) insert(method, path string, h HandlerFunc, t kind, ppath string, pnames []string) {
 	// Adjust max param
-	paramLen := len(rm.pnames)
+	paramLen := len(pnames)
 	if *r.echo.maxParam < paramLen {
 		*r.echo.maxParam = paramLen
 	}
@@ -285,31 +154,25 @@ func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
 			// At root node
 			currentNode.label = search[0]
 			currentNode.prefix = search
-			if rm.handler != nil {
+			if h != nil {
 				currentNode.kind = t
-				currentNode.addMethod(method, &rm)
-				currentNode.paramsCount = len(rm.pnames)
-				currentNode.originalPath = rm.ppath
+				currentNode.addHandler(method, h)
+				currentNode.ppath = ppath
+				currentNode.pnames = pnames
 			}
 			currentNode.isLeaf = currentNode.staticChildren == nil && currentNode.paramChild == nil && currentNode.anyChild == nil
 		} else if lcpLen < prefixLen {
-			// Split node into two before we insert new node.
-			// This happens when we are inserting path that is submatch of any existing inserted paths.
-			// For example, we have node `/test` and now are about to insert `/te/*`. In that case
-			// 1. overlapping part is `/te` that is used as parent node
-			// 2. `st` is part from existing node that is not matching - it gets its own node (child to `/te`)
-			// 3. `/*` is the new part we are about to insert (child to `/te`)
+			// Split node
 			n := newNode(
 				currentNode.kind,
 				currentNode.prefix[lcpLen:],
 				currentNode,
 				currentNode.staticChildren,
-				currentNode.originalPath,
-				currentNode.methods,
-				currentNode.paramsCount,
+				currentNode.methodHandler,
+				currentNode.ppath,
+				currentNode.pnames,
 				currentNode.paramChild,
 				currentNode.anyChild,
-				currentNode.notFoundHandler,
 			)
 			// Update parent path for all children to new node
 			for _, child := range currentNode.staticChildren {
@@ -327,14 +190,13 @@ func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
 			currentNode.label = currentNode.prefix[0]
 			currentNode.prefix = currentNode.prefix[:lcpLen]
 			currentNode.staticChildren = nil
-			currentNode.originalPath = ""
-			currentNode.methods = new(routeMethods)
-			currentNode.paramsCount = 0
+			currentNode.methodHandler = new(methodHandler)
+			currentNode.ppath = ""
+			currentNode.pnames = nil
 			currentNode.paramChild = nil
 			currentNode.anyChild = nil
 			currentNode.isLeaf = false
 			currentNode.isHandler = false
-			currentNode.notFoundHandler = nil
 
 			// Only Static children could reach here
 			currentNode.addStaticChild(n)
@@ -342,19 +204,13 @@ func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
 			if lcpLen == searchLen {
 				// At parent node
 				currentNode.kind = t
-				if rm.handler != nil {
-					currentNode.addMethod(method, &rm)
-					currentNode.paramsCount = len(rm.pnames)
-					currentNode.originalPath = rm.ppath
-				}
+				currentNode.addHandler(method, h)
+				currentNode.ppath = ppath
+				currentNode.pnames = pnames
 			} else {
 				// Create child node
-				n = newNode(t, search[lcpLen:], currentNode, nil, "", new(routeMethods), 0, nil, nil, nil)
-				if rm.handler != nil {
-					n.addMethod(method, &rm)
-					n.paramsCount = len(rm.pnames)
-					n.originalPath = rm.ppath
-				}
+				n = newNode(t, search[lcpLen:], currentNode, nil, new(methodHandler), ppath, pnames, nil, nil)
+				n.addHandler(method, h)
 				// Only Static children could reach here
 				currentNode.addStaticChild(n)
 			}
@@ -368,12 +224,8 @@ func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
 				continue
 			}
 			// Create child node
-			n := newNode(t, search, currentNode, nil, rm.ppath, new(routeMethods), 0, nil, nil, nil)
-			if rm.handler != nil {
-				n.addMethod(method, &rm)
-				n.paramsCount = len(rm.pnames)
-			}
-
+			n := newNode(t, search, currentNode, nil, new(methodHandler), ppath, pnames, nil, nil)
+			n.addHandler(method, h)
 			switch t {
 			case staticKind:
 				currentNode.addStaticChild(n)
@@ -385,42 +237,32 @@ func (r *Router) insertNode(method, path string, t kind, rm routeMethod) {
 			currentNode.isLeaf = currentNode.staticChildren == nil && currentNode.paramChild == nil && currentNode.anyChild == nil
 		} else {
 			// Node already exists
-			if rm.handler != nil {
-				currentNode.addMethod(method, &rm)
-				currentNode.paramsCount = len(rm.pnames)
-				currentNode.originalPath = rm.ppath
+			if h != nil {
+				currentNode.addHandler(method, h)
+				currentNode.ppath = ppath
+				if len(currentNode.pnames) == 0 { // Issue #729
+					currentNode.pnames = pnames
+				}
 			}
 		}
 		return
 	}
 }
 
-func newNode(
-	t kind,
-	pre string,
-	p *node,
-	sc children,
-	originalPath string,
-	methods *routeMethods,
-	paramsCount int,
-	paramChildren,
-	anyChildren *node,
-	notFoundHandler *routeMethod,
-) *node {
+func newNode(t kind, pre string, p *node, sc children, mh *methodHandler, ppath string, pnames []string, paramChildren, anyChildren *node) *node {
 	return &node{
-		kind:            t,
-		label:           pre[0],
-		prefix:          pre,
-		parent:          p,
-		staticChildren:  sc,
-		originalPath:    originalPath,
-		methods:         methods,
-		paramsCount:     paramsCount,
-		paramChild:      paramChildren,
-		anyChild:        anyChildren,
-		isLeaf:          sc == nil && paramChildren == nil && anyChildren == nil,
-		isHandler:       methods.isHandler(),
-		notFoundHandler: notFoundHandler,
+		kind:           t,
+		label:          pre[0],
+		prefix:         pre,
+		parent:         p,
+		staticChildren: sc,
+		ppath:          ppath,
+		pnames:         pnames,
+		methodHandler:  mh,
+		paramChild:     paramChildren,
+		anyChild:       anyChildren,
+		isLeaf:         sc == nil && paramChildren == nil && anyChildren == nil,
+		isHandler:      mh.isHandler(),
 	}
 }
 
@@ -438,8 +280,10 @@ func (n *node) findStaticChild(l byte) *node {
 }
 
 func (n *node) findChildWithLabel(l byte) *node {
-	if c := n.findStaticChild(l); c != nil {
-		return c
+	for _, c := range n.staticChildren {
+		if c.label == l {
+			return c
+		}
 	}
 	if l == paramLabel {
 		return n.paramChild
@@ -450,85 +294,75 @@ func (n *node) findChildWithLabel(l byte) *node {
 	return nil
 }
 
-func (n *node) addMethod(method string, h *routeMethod) {
+func (n *node) addHandler(method string, h HandlerFunc) {
 	switch method {
 	case http.MethodConnect:
-		n.methods.connect = h
+		n.methodHandler.connect = h
 	case http.MethodDelete:
-		n.methods.delete = h
+		n.methodHandler.delete = h
 	case http.MethodGet:
-		n.methods.get = h
+		n.methodHandler.get = h
 	case http.MethodHead:
-		n.methods.head = h
+		n.methodHandler.head = h
 	case http.MethodOptions:
-		n.methods.options = h
+		n.methodHandler.options = h
 	case http.MethodPatch:
-		n.methods.patch = h
+		n.methodHandler.patch = h
 	case http.MethodPost:
-		n.methods.post = h
+		n.methodHandler.post = h
 	case PROPFIND:
-		n.methods.propfind = h
+		n.methodHandler.propfind = h
 	case http.MethodPut:
-		n.methods.put = h
+		n.methodHandler.put = h
 	case http.MethodTrace:
-		n.methods.trace = h
+		n.methodHandler.trace = h
 	case REPORT:
-		n.methods.report = h
-	case RouteNotFound:
-		n.notFoundHandler = h
-		return // RouteNotFound/404 is not considered as a handler so no further logic needs to be executed
+		n.methodHandler.report = h
+	}
+
+	if h != nil {
+		n.isHandler = true
+	} else {
+		n.isHandler = n.methodHandler.isHandler()
+	}
+}
+
+func (n *node) findHandler(method string) HandlerFunc {
+	switch method {
+	case http.MethodConnect:
+		return n.methodHandler.connect
+	case http.MethodDelete:
+		return n.methodHandler.delete
+	case http.MethodGet:
+		return n.methodHandler.get
+	case http.MethodHead:
+		return n.methodHandler.head
+	case http.MethodOptions:
+		return n.methodHandler.options
+	case http.MethodPatch:
+		return n.methodHandler.patch
+	case http.MethodPost:
+		return n.methodHandler.post
+	case PROPFIND:
+		return n.methodHandler.propfind
+	case http.MethodPut:
+		return n.methodHandler.put
+	case http.MethodTrace:
+		return n.methodHandler.trace
+	case REPORT:
+		return n.methodHandler.report
 	default:
-		if n.methods.anyOther == nil {
-			n.methods.anyOther = make(map[string]*routeMethod)
-		}
-		if h.handler == nil {
-			delete(n.methods.anyOther, method)
-		} else {
-			n.methods.anyOther[method] = h
-		}
-	}
-
-	n.methods.updateAllowHeader()
-	n.isHandler = true
-}
-
-func (n *node) findMethod(method string) *routeMethod {
-	switch method {
-	case http.MethodConnect:
-		return n.methods.connect
-	case http.MethodDelete:
-		return n.methods.delete
-	case http.MethodGet:
-		return n.methods.get
-	case http.MethodHead:
-		return n.methods.head
-	case http.MethodOptions:
-		return n.methods.options
-	case http.MethodPatch:
-		return n.methods.patch
-	case http.MethodPost:
-		return n.methods.post
-	case PROPFIND:
-		return n.methods.propfind
-	case http.MethodPut:
-		return n.methods.put
-	case http.MethodTrace:
-		return n.methods.trace
-	case REPORT:
-		return n.methods.report
-	default: // RouteNotFound/404 is not considered as a handler
-		return n.methods.anyOther[method]
+		return nil
 	}
 }
 
-func optionsMethodHandler(allowMethods string) func(c Context) error {
-	return func(c Context) error {
-		// Note: we are not handling most of the CORS headers here. CORS is handled by CORS middleware
-		// 'OPTIONS' method RFC: https://httpwg.org/specs/rfc7231.html#OPTIONS
-		// 'Allow' header RFC: https://datatracker.ietf.org/doc/html/rfc7231#section-7.4.1
-		c.Response().Header().Add(HeaderAllow, allowMethods)
-		return c.NoContent(http.StatusNoContent)
+func (n *node) checkMethodNotAllowed() HandlerFunc {
+	for _, m := range methods {
+		if h := n.findHandler(m); h != nil {
+			return MethodNotAllowedHandler
+		}
 	}
+	return NotFoundHandler
 }
 
 // Find lookup a handler registered for method and path. It also parses URL for path
@@ -541,11 +375,12 @@ func optionsMethodHandler(allowMethods string) func(c Context) error {
 // - Return it `Echo#ReleaseContext()`.
 func (r *Router) Find(method, path string, c Context) {
 	ctx := c.(*context)
+	ctx.path = path
 	currentNode := r.tree // Current node as root
 
 	var (
 		previousBestMatchNode *node
-		matchedRouteMethod    *routeMethod
+		matchedHandler        HandlerFunc
 		// search stores the remaining path to check for match. By each iteration we move from start of path to end of the path
 		// and search value gets shorter and shorter.
 		search      = path
@@ -618,7 +453,7 @@ func (r *Router) Find(method, path string, c Context) {
 			// No matching prefix, let's backtrack to the first possible alternative node of the decision path
 			nk, ok := backtrackToNextNodeKind(staticKind)
 			if !ok {
-				return // No other possibilities on the decision path, handler will be whatever context is reset to.
+				return // No other possibilities on the decision path
 			} else if nk == paramKind {
 				goto Param
 				// NOTE: this case (backtracking from static node to previous any node) can not happen by current any matching logic. Any node is end of search currently
@@ -634,21 +469,15 @@ func (r *Router) Find(method, path string, c Context) {
 		search = search[lcpLen:]
 		searchIndex = searchIndex + lcpLen
 
-		// Finish routing if is no request path remaining to search
-		if search == "" {
-			// in case of node that is handler we have exact method type match or something for 405 to use
-			if currentNode.isHandler {
-				// check if current node has handler registered for http method we are looking for. we store currentNode as
-				// best matching in case we do no find no more routes matching this path+method
-				if previousBestMatchNode == nil {
-					previousBestMatchNode = currentNode
-				}
-				if h := currentNode.findMethod(method); h != nil {
-					matchedRouteMethod = h
-					break
-				}
-			} else if currentNode.notFoundHandler != nil {
-				matchedRouteMethod = currentNode.notFoundHandler
+		// Finish routing if no remaining search and we are on a node with handler and matching method type
+		if search == "" && currentNode.isHandler {
+			// check if current node has handler registered for http method we are looking for. we store currentNode as
+			// best matching in case we do no find no more routes matching this path+method
+			if previousBestMatchNode == nil {
+				previousBestMatchNode = currentNode
+			}
+			if h := currentNode.findHandler(method); h != nil {
+				matchedHandler = h
 				break
 			}
 		}
@@ -668,8 +497,7 @@ func (r *Router) Find(method, path string, c Context) {
 			i := 0
 			l := len(search)
 			if currentNode.isLeaf {
-				// when param node does not have any children (path param is last piece of route path) then param node should
-				// act similarly to any node - consider all remaining search as match
+				// when param node does not have any children then param node should act similarly to any node - consider all remaining search as match
 				i = l
 			} else {
 				for ; i < l && search[i] != '/'; i++ {
@@ -688,23 +516,19 @@ func (r *Router) Find(method, path string, c Context) {
 		if child := currentNode.anyChild; child != nil {
 			// If any node is found, use remaining path for paramValues
 			currentNode = child
-			paramValues[currentNode.paramsCount-1] = search
-
+			paramValues[len(currentNode.pnames)-1] = search
 			// update indexes/search in case we need to backtrack when no handler match is found
 			paramIndex++
 			searchIndex += +len(search)
 			search = ""
 
-			if h := currentNode.findMethod(method); h != nil {
-				matchedRouteMethod = h
-				break
-			}
-			// we store currentNode as best matching in case we do not find more routes matching this path+method. Needed for 405
+			// check if current node has handler registered for http method we are looking for. we store currentNode as
+			// best matching in case we do no find no more routes matching this path+method
 			if previousBestMatchNode == nil {
 				previousBestMatchNode = currentNode
 			}
-			if currentNode.notFoundHandler != nil {
-				matchedRouteMethod = currentNode.notFoundHandler
+			if h := currentNode.findHandler(method); h != nil {
+				matchedHandler = h
 				break
 			}
 		}
@@ -727,34 +551,16 @@ func (r *Router) Find(method, path string, c Context) {
 		return // nothing matched at all
 	}
 
-	// matchedHandler could be method+path handler that we matched or notFoundHandler from node with matching path
-	// user provided not found (404) handler has priority over generic method not found (405) handler or global 404 handler
-	var rPath string
-	var rPNames []string
-	if matchedRouteMethod != nil {
-		rPath = matchedRouteMethod.ppath
-		rPNames = matchedRouteMethod.pnames
-		ctx.handler = matchedRouteMethod.handler
+	if matchedHandler != nil {
+		ctx.handler = matchedHandler
 	} else {
 		// use previous match as basis. although we have no matching handler we have path match.
 		// so we can send http.StatusMethodNotAllowed (405) instead of http.StatusNotFound (404)
 		currentNode = previousBestMatchNode
-
-		rPath = currentNode.originalPath
-		rPNames = nil // no params here
-		ctx.handler = NotFoundHandler
-		if currentNode.notFoundHandler != nil {
-			rPath = currentNode.notFoundHandler.ppath
-			rPNames = currentNode.notFoundHandler.pnames
-			ctx.handler = currentNode.notFoundHandler.handler
-		} else if currentNode.isHandler {
-			ctx.Set(ContextKeyHeaderAllow, currentNode.methods.allowHeader)
-			ctx.handler = MethodNotAllowedHandler
-			if method == http.MethodOptions {
-				ctx.handler = optionsMethodHandler(currentNode.methods.allowHeader)
-			}
-		}
+		ctx.handler = currentNode.checkMethodNotAllowed()
 	}
-	ctx.path = rPath
-	ctx.pnames = rPNames
+	ctx.path = currentNode.ppath
+	ctx.pnames = currentNode.pnames
+
+	return
 }
diff --git a/vendor/github.com/labstack/gommon/bytes/bytes.go b/vendor/github.com/labstack/gommon/bytes/bytes.go
index b07e31c..2f6bcec 100644
--- a/vendor/github.com/labstack/gommon/bytes/bytes.go
+++ b/vendor/github.com/labstack/gommon/bytes/bytes.go
@@ -12,31 +12,19 @@ type (
 	Bytes struct{}
 )
 
-// binary units (IEC 60027)
 const (
 	_ = 1.0 << (10 * iota) // ignore first value by assigning to blank identifier
-	KiB
-	MiB
-	GiB
-	TiB
-	PiB
-	EiB
-)
-
-// decimal units (SI international system of units)
-const (
-	KB = 1000
-	MB = KB * 1000
-	GB = MB * 1000
-	TB = GB * 1000
-	PB = TB * 1000
-	EB = PB * 1000
+	KB
+	MB
+	GB
+	TB
+	PB
+	EB
 )
 
 var (
-	patternBinary  = regexp.MustCompile(`(?i)^(-?\d+(?:\.\d+)?)\s?([KMGTPE]iB?)$`)
-	patternDecimal = regexp.MustCompile(`(?i)^(-?\d+(?:\.\d+)?)\s?([KMGTPE]B?|B?)$`)
-	global         = New()
+	pattern = regexp.MustCompile(`(?i)^(-?\d+(?:\.\d+)?)\s?([KMGTPE]B?|B?)$`)
+	global  = New()
 )
 
 // New creates a Bytes instance.
@@ -44,97 +32,44 @@ func New() *Bytes {
 	return &Bytes{}
 }
 
-// Format formats bytes integer to human readable string according to IEC 60027.
+// Format formats bytes integer to human readable string.
 // For example, 31323 bytes will return 30.59KB.
-func (b *Bytes) Format(value int64) string {
-	return b.FormatBinary(value)
-}
-
-// FormatBinary formats bytes integer to human readable string according to IEC 60027.
-// For example, 31323 bytes will return 30.59KB.
-func (*Bytes) FormatBinary(value int64) string {
+func (*Bytes) Format(b int64) string {
 	multiple := ""
-	val := float64(value)
+	value := float64(b)
 
 	switch {
-	case value >= EiB:
-		val /= EiB
-		multiple = "EiB"
-	case value >= PiB:
-		val /= PiB
-		multiple = "PiB"
-	case value >= TiB:
-		val /= TiB
-		multiple = "TiB"
-	case value >= GiB:
-		val /= GiB
-		multiple = "GiB"
-	case value >= MiB:
-		val /= MiB
-		multiple = "MiB"
-	case value >= KiB:
-		val /= KiB
-		multiple = "KiB"
-	case value == 0:
-		return "0"
-	default:
-		return strconv.FormatInt(value, 10) + "B"
-	}
-
-	return fmt.Sprintf("%.2f%s", val, multiple)
-}
-
-// FormatDecimal formats bytes integer to human readable string according to SI international system of units.
-// For example, 31323 bytes will return 31.32KB.
-func (*Bytes) FormatDecimal(value int64) string {
-	multiple := ""
-	val := float64(value)
-
-	switch {
-	case value >= EB:
-		val /= EB
+	case b >= EB:
+		value /= EB
 		multiple = "EB"
-	case value >= PB:
-		val /= PB
+	case b >= PB:
+		value /= PB
 		multiple = "PB"
-	case value >= TB:
-		val /= TB
+	case b >= TB:
+		value /= TB
 		multiple = "TB"
-	case value >= GB:
-		val /= GB
+	case b >= GB:
+		value /= GB
 		multiple = "GB"
-	case value >= MB:
-		val /= MB
+	case b >= MB:
+		value /= MB
 		multiple = "MB"
-	case value >= KB:
-		val /= KB
+	case b >= KB:
+		value /= KB
 		multiple = "KB"
-	case value == 0:
+	case b == 0:
 		return "0"
 	default:
-		return strconv.FormatInt(value, 10) + "B"
+		return strconv.FormatInt(b, 10) + "B"
 	}
 
-	return fmt.Sprintf("%.2f%s", val, multiple)
+	return fmt.Sprintf("%.2f%s", value, multiple)
 }
 
 // Parse parses human readable bytes string to bytes integer.
-// For example, 6GiB (6Gi is also valid) will return 6442450944, and
-// 6GB (6G is also valid) will return 6000000000.
-func (b *Bytes) Parse(value string) (int64, error) {
-
-	i, err := b.ParseBinary(value)
-	if err == nil {
-		return i, err
-	}
-
-	return b.ParseDecimal(value)
-}
-
-// ParseBinary parses human readable bytes string to bytes integer.
-// For example, 6GiB (6Gi is also valid) will return 6442450944.
-func (*Bytes) ParseBinary(value string) (i int64, err error) {
-	parts := patternBinary.FindStringSubmatch(value)
+// For example, 6GB (6G is also valid) will return 6442450944.
+func (*Bytes) Parse(value string) (i int64, err error) {
+	parts := pattern.FindStringSubmatch(value)
 	if len(parts) < 3 {
 		return 0, fmt.Errorf("error parsing value=%s", value)
 	}
@@ -146,38 +81,8 @@ func (*Bytes) ParseBinary(value string) (i int64, err error) {
 	}
 
 	switch multiple {
-	case "KI", "KIB":
-		return int64(bytes * KiB), nil
-	case "MI", "MIB":
-		return int64(bytes * MiB), nil
-	case "GI", "GIB":
-		return int64(bytes * GiB), nil
-	case "TI", "TIB":
-		return int64(bytes * TiB), nil
-	case "PI", "PIB":
-		return int64(bytes * PiB), nil
-	case "EI", "EIB":
-		return int64(bytes * EiB), nil
 	default:
 		return int64(bytes), nil
-	}
-}
-
-// ParseDecimal parses human readable bytes string to bytes integer.
-// For example, 6GB (6G is also valid) will return 6000000000.
-func (*Bytes) ParseDecimal(value string) (i int64, err error) {
-	parts := patternDecimal.FindStringSubmatch(value)
-	if len(parts) < 3 {
-		return 0, fmt.Errorf("error parsing value=%s", value)
-	}
-	bytesString := parts[1]
-	multiple := strings.ToUpper(parts[2])
-	bytes, err := strconv.ParseFloat(bytesString, 64)
-	if err != nil {
-		return
-	}
-
-	switch multiple {
 	case "K", "KB":
 		return int64(bytes * KB), nil
 	case "M", "MB":
@@ -190,27 +95,15 @@ func (*Bytes) ParseDecimal(value string) (i int64, err error) {
 		return int64(bytes * PB), nil
 	case "E", "EB":
 		return int64(bytes * EB), nil
-	default:
-		return int64(bytes), nil
 	}
 }
 
 // Format wraps global Bytes's Format function.
-func Format(value int64) string {
-	return global.Format(value)
-}
-
-// FormatBinary wraps global Bytes's FormatBinary function.
-func FormatBinary(value int64) string {
-	return global.FormatBinary(value)
-}
-
-// FormatDecimal wraps global Bytes's FormatDecimal function.
-func FormatDecimal(value int64) string {
-	return global.FormatDecimal(value)
+func Format(b int64) string {
+	return global.Format(b)
 }
 
 // Parse wraps global Bytes's Parse function.
-func Parse(value string) (int64, error) {
-	return global.Parse(value)
+func Parse(val string) (int64, error) {
+	return global.Parse(val)
 }
diff --git a/vendor/github.com/labstack/gommon/log/log.go b/vendor/github.com/labstack/gommon/log/log.go
index 25f719a..06fa37e 100644
--- a/vendor/github.com/labstack/gommon/log/log.go
+++ b/vendor/github.com/labstack/gommon/log/log.go
@@ -391,7 +391,7 @@ func (l *Logger) log(level Lvl, format string, args ...interface{}) {
 		if err == nil {
 			s := buf.String()
 			i := buf.Len() - 1
-			if i >= 0 && s[i] == '}' {
+			if s[i] == '}' {
 				// JSON header
 				buf.Truncate(i)
 				buf.WriteByte(',')
@@ -404,9 +404,7 @@ func (l *Logger) log(level Lvl, format string, args ...interface{}) {
 				}
 			} else {
 				// Text header
-				if len(s) > 0 {
-					buf.WriteByte(' ')
-				}
+				buf.WriteByte(' ')
 				buf.WriteString(message)
 			}
 			buf.WriteByte('\n')
diff --git a/vendor/github.com/labstack/gommon/random/random.go b/vendor/github.com/labstack/gommon/random/random.go
new file mode 100644
index 0000000..482d052
--- /dev/null
+++ b/vendor/github.com/labstack/gommon/random/random.go
@@ -0,0 +1,48 @@
+package random
+
+import (
+	"math/rand"
+	"strings"
+	"time"
+)
+
+type (
+	Random struct {
+	}
+)
+
+// Charsets
+const (
+	Uppercase    = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	Lowercase    = "abcdefghijklmnopqrstuvwxyz"
+	Alphabetic   = Uppercase + Lowercase
+	Numeric      = "0123456789"
+	Alphanumeric = Alphabetic + Numeric
+	Symbols      = "`" + `~!@#$%^&*()-_+={}[]|\;:"<>,./?`
+	Hex          = Numeric + "abcdef"
+)
+
+var (
+	global = New()
+)
+
+func New() *Random {
+	rand.Seed(time.Now().UnixNano())
+	return new(Random)
+}
+
+func (r *Random) String(length uint8, charsets ...string) string {
+	charset := strings.Join(charsets, "")
+	if charset == "" {
+		charset = Alphanumeric
+	}
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[rand.Int63()%int64(len(charset))]
+	}
+	return string(b)
+}
+
+func String(length uint8, charsets ...string) string {
+	return global.String(length, charsets...)
+}
diff --git a/vendor/github.com/lib/pq/array.go b/vendor/github.com/lib/pq/array.go
index 39c8f7e..7806a31 100644
--- a/vendor/github.com/lib/pq/array.go
+++ b/vendor/github.com/lib/pq/array.go
@@ -587,8 +587,8 @@ func (a *Int32Array) scanBytes(src []byte) error {
 	} else {
 		b := make(Int32Array, len(elems))
 		for i, v := range elems {
-			x, err := strconv.ParseInt(string(v), 10, 32)
-			if err != nil {
+			var x int
+			if x, err = strconv.Atoi(string(v)); err != nil {
 				return fmt.Errorf("pq: parsing array element index %d: %v", i, err)
 			}
 			b[i] = int32(x)
diff --git a/vendor/github.com/lib/pq/conn.go b/vendor/github.com/lib/pq/conn.go
index da4ff9d..8e445f3 100644
--- a/vendor/github.com/lib/pq/conn.go
+++ b/vendor/github.com/lib/pq/conn.go
@@ -2,7 +2,6 @@ package pq
 
 import (
 	"bufio"
-	"bytes"
 	"context"
 	"crypto/md5"
 	"crypto/sha256"
@@ -19,7 +18,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
+	"sync/atomic"
 	"time"
 	"unicode"
 
@@ -32,10 +31,8 @@ var (
 	ErrNotSupported              = errors.New("pq: Unsupported command")
 	ErrInFailedTransaction       = errors.New("pq: Could not complete operation in a failed transaction")
 	ErrSSLNotSupported           = errors.New("pq: SSL is not enabled on the server")
-	ErrSSLKeyUnknownOwnership    = errors.New("pq: Could not get owner information for private key, may not be properly protected")
-	ErrSSLKeyHasWorldPermissions = errors.New("pq: Private key has world access. Permissions should be u=rw,g=r (0640) if owned by root, or u=rw (0600), or less")
-
-	ErrCouldNotDetectUsername = errors.New("pq: Could not detect default username. Please provide one explicitly")
+	ErrSSLKeyHasWorldPermissions = errors.New("pq: Private key file has group or world access. Permissions should be u=rw (0600) or less")
+	ErrCouldNotDetectUsername    = errors.New("pq: Could not detect default username. Please provide one explicitly")
 
 	errUnexpectedReady = errors.New("unexpected ReadyForQuery")
 	errNoRowsAffected  = errors.New("no RowsAffected available after the empty statement")
@@ -113,9 +110,7 @@ type defaultDialer struct {
 func (d defaultDialer) Dial(network, address string) (net.Conn, error) {
 	return d.d.Dial(network, address)
 }
-func (d defaultDialer) DialTimeout(
-	network, address string, timeout time.Duration,
-) (net.Conn, error) {
+func (d defaultDialer) DialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	return d.DialContext(ctx, network, address)
@@ -145,10 +140,9 @@ type conn struct {
 	saveMessageType   byte
 	saveMessageBuffer []byte
 
-	// If an error is set, this connection is bad and all public-facing
-	// functions should return the appropriate error by calling get()
-	// (ErrBadConn) or getForNext().
-	err syncErr
+	// If true, this connection is bad and all public-facing functions should
+	// return ErrBadConn.
+	bad *atomic.Value
 
 	// If set, this connection should never use the binary format when
 	// receiving query results from prepared statements.  Only provided for
@@ -172,40 +166,6 @@ type conn struct {
 	gss GSS
 }
 
-type syncErr struct {
-	err error
-	sync.Mutex
-}
-
-// Return ErrBadConn if connection is bad.
-func (e *syncErr) get() error {
-	e.Lock()
-	defer e.Unlock()
-	if e.err != nil {
-		return driver.ErrBadConn
-	}
-	return nil
-}
-
-// Return the error set on the connection. Currently only used by rows.Next.
-func (e *syncErr) getForNext() error {
-	e.Lock()
-	defer e.Unlock()
-	return e.err
-}
-
-// Set error, only if it isn't set yet.
-func (e *syncErr) set(err error) {
-	if err == nil {
-		panic("attempt to set nil err")
-	}
-	e.Lock()
-	defer e.Unlock()
-	if e.err == nil {
-		e.err = err
-	}
-}
-
 // Handle driver-side settings in parsed connection string.
 func (cn *conn) handleDriverSettings(o values) (err error) {
 	boolSetting := func(key string, val *bool) error {
@@ -263,56 +223,47 @@ func (cn *conn) handlePgpass(o values) {
 	}
 	defer file.Close()
 	scanner := bufio.NewScanner(io.Reader(file))
-	// From: https://github.com/tg/pgpass/blob/master/reader.go
-	for scanner.Scan() {
-		if scanText(scanner.Text(), o) {
-			break
-		}
-	}
-}
-
-// GetFields is a helper function for scanText.
-func getFields(s string) []string {
-	fs := make([]string, 0, 5)
-	f := make([]rune, 0, len(s))
-
-	var esc bool
-	for _, c := range s {
-		switch {
-		case esc:
-			f = append(f, c)
-			esc = false
-		case c == '\\':
-			esc = true
-		case c == ':':
-			fs = append(fs, string(f))
-			f = f[:0]
-		default:
-			f = append(f, c)
-		}
-	}
-	return append(fs, string(f))
-}
-
-// ScanText assists HandlePgpass in it's objective.
-func scanText(line string, o values) bool {
 	hostname := o["host"]
 	ntw, _ := network(o)
 	port := o["port"]
 	db := o["dbname"]
 	username := o["user"]
-	if len(line) == 0 || line[0] == '#' {
-		return false
+	// From: https://github.com/tg/pgpass/blob/master/reader.go
+	getFields := func(s string) []string {
+		fs := make([]string, 0, 5)
+		f := make([]rune, 0, len(s))
+
+		var esc bool
+		for _, c := range s {
+			switch {
+			case esc:
+				f = append(f, c)
+				esc = false
+			case c == '\\':
+				esc = true
+			case c == ':':
+				fs = append(fs, string(f))
+				f = f[:0]
+			default:
+				f = append(f, c)
+			}
+		}
+		return append(fs, string(f))
 	}
-	split := getFields(line)
-	if len(split) != 5 {
-		return false
+	for scanner.Scan() {
+		line := scanner.Text()
+		if len(line) == 0 || line[0] == '#' {
+			continue
+		}
+		split := getFields(line)
+		if len(split) != 5 {
+			continue
+		}
+		if (split[0] == "*" || split[0] == hostname || (split[0] == "localhost" && (hostname == "" || ntw == "unix"))) && (split[1] == "*" || split[1] == port) && (split[2] == "*" || split[2] == db) && (split[3] == "*" || split[3] == username) {
+			o["password"] = split[4]
+			return
+		}
 	}
-	if (split[0] == "*" || split[0] == hostname || (split[0] == "localhost" && (hostname == "" || ntw == "unix"))) && (split[1] == "*" || split[1] == port) && (split[2] == "*" || split[2] == db) && (split[3] == "*" || split[3] == username) {
-		o["password"] = split[4]
-		return true
-	}
-	return false
 }
 
 func (cn *conn) writeBuf(b byte) *writeBuf {
@@ -336,7 +287,7 @@ func DialOpen(d Dialer, dsn string) (_ driver.Conn, err error) {
 	if err != nil {
 		return nil, err
 	}
-	c.Dialer(d)
+	c.dialer = d
 	return c.open(context.Background())
 }
 
@@ -355,9 +306,12 @@ func (c *Connector) open(ctx context.Context) (cn *conn, err error) {
 		o[k] = v
 	}
 
+	bad := &atomic.Value{}
+	bad.Store(false)
 	cn = &conn{
 		opts:   o,
 		dialer: c.dialer,
+		bad:    bad,
 	}
 	err = cn.handleDriverSettings(o)
 	if err != nil {
@@ -562,9 +516,22 @@ func (cn *conn) isInTransaction() bool {
 		cn.txnStatus == txnStatusInFailedTransaction
 }
 
+func (cn *conn) setBad() {
+	if cn.bad != nil {
+		cn.bad.Store(true)
+	}
+}
+
+func (cn *conn) getBad() bool {
+	if cn.bad != nil {
+		return cn.bad.Load().(bool)
+	}
+	return false
+}
+
 func (cn *conn) checkIsInTransaction(intxn bool) {
 	if cn.isInTransaction() != intxn {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected transaction status %v", cn.txnStatus)
 	}
 }
@@ -574,8 +541,8 @@ func (cn *conn) Begin() (_ driver.Tx, err error) {
 }
 
 func (cn *conn) begin(mode string) (_ driver.Tx, err error) {
-	if err := cn.err.get(); err != nil {
-		return nil, err
+	if cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer cn.errRecover(&err)
 
@@ -585,11 +552,11 @@ func (cn *conn) begin(mode string) (_ driver.Tx, err error) {
 		return nil, err
 	}
 	if commandTag != "BEGIN" {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		return nil, fmt.Errorf("unexpected command tag %s", commandTag)
 	}
 	if cn.txnStatus != txnStatusIdleInTransaction {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		return nil, fmt.Errorf("unexpected transaction status %v", cn.txnStatus)
 	}
 	return cn, nil
@@ -603,8 +570,8 @@ func (cn *conn) closeTxn() {
 
 func (cn *conn) Commit() (err error) {
 	defer cn.closeTxn()
-	if err := cn.err.get(); err != nil {
-		return err
+	if cn.getBad() {
+		return driver.ErrBadConn
 	}
 	defer cn.errRecover(&err)
 
@@ -625,12 +592,12 @@ func (cn *conn) Commit() (err error) {
 	_, commandTag, err := cn.simpleExec("COMMIT")
 	if err != nil {
 		if cn.isInTransaction() {
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 		}
 		return err
 	}
 	if commandTag != "COMMIT" {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		return fmt.Errorf("unexpected command tag %s", commandTag)
 	}
 	cn.checkIsInTransaction(false)
@@ -639,8 +606,8 @@ func (cn *conn) Commit() (err error) {
 
 func (cn *conn) Rollback() (err error) {
 	defer cn.closeTxn()
-	if err := cn.err.get(); err != nil {
-		return err
+	if cn.getBad() {
+		return driver.ErrBadConn
 	}
 	defer cn.errRecover(&err)
 	return cn.rollback()
@@ -651,7 +618,7 @@ func (cn *conn) rollback() (err error) {
 	_, commandTag, err := cn.simpleExec("ROLLBACK")
 	if err != nil {
 		if cn.isInTransaction() {
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 		}
 		return err
 	}
@@ -691,7 +658,7 @@ func (cn *conn) simpleExec(q string) (res driver.Result, commandTag string, err
 		case 'T', 'D':
 			// ignore any results
 		default:
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unknown response for simple query: %q", t)
 		}
 	}
@@ -713,7 +680,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) {
 			// the user can close, though, to avoid connections from being
 			// leaked.  A "rows" with done=true works fine for that purpose.
 			if err != nil {
-				cn.err.set(driver.ErrBadConn)
+				cn.setBad()
 				errorf("unexpected message %q in simple query execution", t)
 			}
 			if res == nil {
@@ -740,7 +707,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) {
 			err = parseError(r)
 		case 'D':
 			if res == nil {
-				cn.err.set(driver.ErrBadConn)
+				cn.setBad()
 				errorf("unexpected DataRow in simple query execution")
 			}
 			// the query didn't fail; kick off to Next
@@ -755,7 +722,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) {
 			// To work around a bug in QueryRow in Go 1.2 and earlier, wait
 			// until the first DataRow has been received.
 		default:
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unknown response for simple query: %q", t)
 		}
 	}
@@ -777,9 +744,7 @@ func (noRows) RowsAffected() (int64, error) {
 
 // Decides which column formats to use for a prepared statement.  The input is
 // an array of type oids, one element per result column.
-func decideColumnFormats(
-	colTyps []fieldDesc, forceText bool,
-) (colFmts []format, colFmtData []byte) {
+func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format, colFmtData []byte) {
 	if len(colTyps) == 0 {
 		return nil, colFmtDataAllText
 	}
@@ -850,8 +815,8 @@ func (cn *conn) prepareTo(q, stmtName string) *stmt {
 }
 
 func (cn *conn) Prepare(q string) (_ driver.Stmt, err error) {
-	if err := cn.err.get(); err != nil {
-		return nil, err
+	if cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer cn.errRecover(&err)
 
@@ -889,8 +854,8 @@ func (cn *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
 }
 
 func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) {
-	if err := cn.err.get(); err != nil {
-		return nil, err
+	if cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	if cn.inCopy {
 		return nil, errCopyInProgress
@@ -923,8 +888,8 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) {
 
 // Implement the optional "Execer" interface for one-shot queries
 func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err error) {
-	if err := cn.err.get(); err != nil {
-		return nil, err
+	if cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer cn.errRecover(&err)
 
@@ -995,7 +960,7 @@ func (cn *conn) sendSimpleMessage(typ byte) (err error) {
 // the message yourself.
 func (cn *conn) saveMessage(typ byte, buf *readBuf) {
 	if cn.saveMessageType != 0 {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected saveMessageType %d", cn.saveMessageType)
 	}
 	cn.saveMessageType = typ
@@ -1141,7 +1106,7 @@ func isDriverSetting(key string) bool {
 		return true
 	case "password":
 		return true
-	case "sslmode", "sslcert", "sslkey", "sslrootcert", "sslinline", "sslsni":
+	case "sslmode", "sslcert", "sslkey", "sslrootcert", "sslinline":
 		return true
 	case "fallback_application_name":
 		return true
@@ -1365,8 +1330,8 @@ func (st *stmt) Close() (err error) {
 	if st.closed {
 		return nil
 	}
-	if err := st.cn.err.get(); err != nil {
-		return err
+	if st.cn.getBad() {
+		return driver.ErrBadConn
 	}
 	defer st.cn.errRecover(&err)
 
@@ -1379,14 +1344,14 @@ func (st *stmt) Close() (err error) {
 
 	t, _ := st.cn.recv1()
 	if t != '3' {
-		st.cn.err.set(driver.ErrBadConn)
+		st.cn.setBad()
 		errorf("unexpected close response: %q", t)
 	}
 	st.closed = true
 
 	t, r := st.cn.recv1()
 	if t != 'Z' {
-		st.cn.err.set(driver.ErrBadConn)
+		st.cn.setBad()
 		errorf("expected ready for query, but got: %q", t)
 	}
 	st.cn.processReadyForQuery(r)
@@ -1399,8 +1364,8 @@ func (st *stmt) Query(v []driver.Value) (r driver.Rows, err error) {
 }
 
 func (st *stmt) query(v []driver.Value) (r *rows, err error) {
-	if err := st.cn.err.get(); err != nil {
-		return nil, err
+	if st.cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer st.cn.errRecover(&err)
 
@@ -1412,8 +1377,8 @@ func (st *stmt) query(v []driver.Value) (r *rows, err error) {
 }
 
 func (st *stmt) Exec(v []driver.Value) (res driver.Result, err error) {
-	if err := st.cn.err.get(); err != nil {
-		return nil, err
+	if st.cn.getBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer st.cn.errRecover(&err)
 
@@ -1499,7 +1464,7 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) {
 	if affectedRows == nil && strings.HasPrefix(commandTag, "INSERT ") {
 		parts := strings.Split(commandTag, " ")
 		if len(parts) != 3 {
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unexpected INSERT command tag %s", commandTag)
 		}
 		affectedRows = &parts[len(parts)-1]
@@ -1511,7 +1476,7 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) {
 	}
 	n, err := strconv.ParseInt(*affectedRows, 10, 64)
 	if err != nil {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("could not parse commandTag: %s", err)
 	}
 	return driver.RowsAffected(n), commandTag
@@ -1578,8 +1543,8 @@ func (rs *rows) Next(dest []driver.Value) (err error) {
 	}
 
 	conn := rs.cn
-	if err := conn.err.getForNext(); err != nil {
-		return err
+	if conn.getBad() {
+		return driver.ErrBadConn
 	}
 	defer conn.errRecover(&err)
 
@@ -1603,7 +1568,7 @@ func (rs *rows) Next(dest []driver.Value) (err error) {
 		case 'D':
 			n := rs.rb.int16()
 			if err != nil {
-				conn.err.set(driver.ErrBadConn)
+				conn.setBad()
 				errorf("unexpected DataRow after error %s", err)
 			}
 			if n < len(dest) {
@@ -1645,10 +1610,10 @@ func (rs *rows) NextResultSet() error {
 // QuoteIdentifier quotes an "identifier" (e.g. a table or a column name) to be
 // used as part of an SQL statement.  For example:
 //
-//	tblname := "my_table"
-//	data := "my_data"
-//	quoted := pq.QuoteIdentifier(tblname)
-//	err := db.Exec(fmt.Sprintf("INSERT INTO %s VALUES ($1)", quoted), data)
+//    tblname := "my_table"
+//    data := "my_data"
+//    quoted := pq.QuoteIdentifier(tblname)
+//    err := db.Exec(fmt.Sprintf("INSERT INTO %s VALUES ($1)", quoted), data)
 //
 // Any double quotes in name will be escaped.  The quoted identifier will be
 // case sensitive when used in a query.  If the input string contains a zero
@@ -1661,24 +1626,12 @@ func QuoteIdentifier(name string) string {
 	return `"` + strings.Replace(name, `"`, `""`, -1) + `"`
 }
 
-// BufferQuoteIdentifier satisfies the same purpose as QuoteIdentifier, but backed by a
-// byte buffer.
-func BufferQuoteIdentifier(name string, buffer *bytes.Buffer) {
-	end := strings.IndexRune(name, 0)
-	if end > -1 {
-		name = name[:end]
-	}
-	buffer.WriteRune('"')
-	buffer.WriteString(strings.Replace(name, `"`, `""`, -1))
-	buffer.WriteRune('"')
-}
-
 // QuoteLiteral quotes a 'literal' (e.g. a parameter, often used to pass literal
 // to DDL and other statements that do not accept parameters) to be used as part
 // of an SQL statement.  For example:
 //
-//	exp_date := pq.QuoteLiteral("2023-01-05 15:00:00Z")
-//	err := db.Exec(fmt.Sprintf("CREATE ROLE my_user VALID UNTIL %s", exp_date))
+//    exp_date := pq.QuoteLiteral("2023-01-05 15:00:00Z")
+//    err := db.Exec(fmt.Sprintf("CREATE ROLE my_user VALID UNTIL %s", exp_date))
 //
 // Any single quotes in name will be escaped. Any backslashes (i.e. "\") will be
 // replaced by two backslashes (i.e. "\\") and the C-style escape identifier
@@ -1809,7 +1762,7 @@ func (cn *conn) readReadyForQuery() {
 		cn.processReadyForQuery(r)
 		return
 	default:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected message %q; expected ReadyForQuery", t)
 	}
 }
@@ -1829,16 +1782,12 @@ func (cn *conn) readParseResponse() {
 		cn.readReadyForQuery()
 		panic(err)
 	default:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected Parse response %q", t)
 	}
 }
 
-func (cn *conn) readStatementDescribeResponse() (
-	paramTyps []oid.Oid,
-	colNames []string,
-	colTyps []fieldDesc,
-) {
+func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames []string, colTyps []fieldDesc) {
 	for {
 		t, r := cn.recv1()
 		switch t {
@@ -1858,7 +1807,7 @@ func (cn *conn) readStatementDescribeResponse() (
 			cn.readReadyForQuery()
 			panic(err)
 		default:
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unexpected Describe statement response %q", t)
 		}
 	}
@@ -1876,7 +1825,7 @@ func (cn *conn) readPortalDescribeResponse() rowsHeader {
 		cn.readReadyForQuery()
 		panic(err)
 	default:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected Describe response %q", t)
 	}
 	panic("not reached")
@@ -1892,7 +1841,7 @@ func (cn *conn) readBindResponse() {
 		cn.readReadyForQuery()
 		panic(err)
 	default:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		errorf("unexpected Bind response %q", t)
 	}
 }
@@ -1919,22 +1868,20 @@ func (cn *conn) postExecuteWorkaround() {
 			cn.saveMessage(t, r)
 			return
 		default:
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unexpected message during extended query execution: %q", t)
 		}
 	}
 }
 
 // Only for Exec(), since we ignore the returned data
-func (cn *conn) readExecuteResponse(
-	protocolState string,
-) (res driver.Result, commandTag string, err error) {
+func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, commandTag string, err error) {
 	for {
 		t, r := cn.recv1()
 		switch t {
 		case 'C':
 			if err != nil {
-				cn.err.set(driver.ErrBadConn)
+				cn.setBad()
 				errorf("unexpected CommandComplete after error %s", err)
 			}
 			res, commandTag = cn.parseComplete(r.string())
@@ -1948,7 +1895,7 @@ func (cn *conn) readExecuteResponse(
 			err = parseError(r)
 		case 'T', 'D', 'I':
 			if err != nil {
-				cn.err.set(driver.ErrBadConn)
+				cn.setBad()
 				errorf("unexpected %q after error %s", t, err)
 			}
 			if t == 'I' {
@@ -1956,7 +1903,7 @@ func (cn *conn) readExecuteResponse(
 			}
 			// ignore any results
 		default:
-			cn.err.set(driver.ErrBadConn)
+			cn.setBad()
 			errorf("unknown %s response: %q", protocolState, t)
 		}
 	}
@@ -2052,8 +1999,6 @@ func parseEnviron(env []string) (out map[string]string) {
 			accrue("sslkey")
 		case "PGSSLROOTCERT":
 			accrue("sslrootcert")
-		case "PGSSLSNI":
-			accrue("sslsni")
 		case "PGREQUIRESSL", "PGSSLCRL":
 			unsupported()
 		case "PGREQUIREPEER":
@@ -2094,19 +2039,3 @@ func alnumLowerASCII(ch rune) rune {
 	}
 	return -1 // discard
 }
-
-// The database/sql/driver package says:
-// All Conn implementations should implement the following interfaces: Pinger, SessionResetter, and Validator.
-var _ driver.Pinger = &conn{}
-var _ driver.SessionResetter = &conn{}
-
-func (cn *conn) ResetSession(ctx context.Context) error {
-	// Ensure bad connections are reported: From database/sql/driver:
-	// If a connection is never returned to the connection pool but immediately reused, then
-	// ResetSession is called prior to reuse but IsValid is not called.
-	return cn.err.get()
-}
-
-func (cn *conn) IsValid() bool {
-	return cn.err.get() == nil
-}
diff --git a/vendor/github.com/lib/pq/conn_go115.go b/vendor/github.com/lib/pq/conn_go115.go
deleted file mode 100644
index f4ef030..0000000
--- a/vendor/github.com/lib/pq/conn_go115.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build go1.15
-// +build go1.15
-
-package pq
-
-import "database/sql/driver"
-
-var _ driver.Validator = &conn{}
diff --git a/vendor/github.com/lib/pq/conn_go18.go b/vendor/github.com/lib/pq/conn_go18.go
index 63d4ca6..3c83082 100644
--- a/vendor/github.com/lib/pq/conn_go18.go
+++ b/vendor/github.com/lib/pq/conn_go18.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"sync/atomic"
 	"time"
 )
 
@@ -114,7 +115,7 @@ func (cn *conn) watchCancel(ctx context.Context) func() {
 				}
 
 				// Set the connection state to bad so it does not get reused.
-				cn.err.set(ctx.Err())
+				cn.setBad()
 
 				// At this point the function level context is canceled,
 				// so it must not be used for the additional network
@@ -130,7 +131,7 @@ func (cn *conn) watchCancel(ctx context.Context) func() {
 		return func() {
 			select {
 			case <-finished:
-				cn.err.set(ctx.Err())
+				cn.setBad()
 				cn.Close()
 			case finished <- struct{}{}:
 			}
@@ -156,8 +157,11 @@ func (cn *conn) cancel(ctx context.Context) error {
 	defer c.Close()
 
 	{
+		bad := &atomic.Value{}
+		bad.Store(false)
 		can := conn{
-			c: c,
+			c:   c,
+			bad: bad,
 		}
 		err = can.ssl(o)
 		if err != nil {
diff --git a/vendor/github.com/lib/pq/connector.go b/vendor/github.com/lib/pq/connector.go
index 1145e12..d7d4726 100644
--- a/vendor/github.com/lib/pq/connector.go
+++ b/vendor/github.com/lib/pq/connector.go
@@ -27,11 +27,6 @@ func (c *Connector) Connect(ctx context.Context) (driver.Conn, error) {
 	return c.open(ctx)
 }
 
-// Dialer allows change the dialer used to open connections.
-func (c *Connector) Dialer(dialer Dialer) {
-	c.dialer = dialer
-}
-
 // Driver returns the underlying driver of this Connector.
 func (c *Connector) Driver() driver.Driver {
 	return &Driver{}
diff --git a/vendor/github.com/lib/pq/copy.go b/vendor/github.com/lib/pq/copy.go
index a8f16b2..bb3cbd7 100644
--- a/vendor/github.com/lib/pq/copy.go
+++ b/vendor/github.com/lib/pq/copy.go
@@ -1,8 +1,6 @@
 package pq
 
 import (
-	"bytes"
-	"context"
 	"database/sql/driver"
 	"encoding/binary"
 	"errors"
@@ -21,35 +19,29 @@ var (
 // CopyIn creates a COPY FROM statement which can be prepared with
 // Tx.Prepare().  The target table should be visible in search_path.
 func CopyIn(table string, columns ...string) string {
-	buffer := bytes.NewBufferString("COPY ")
-	BufferQuoteIdentifier(table, buffer)
-	buffer.WriteString(" (")
-	makeStmt(buffer, columns...)
-	return buffer.String()
-}
-
-// MakeStmt makes the stmt string for CopyIn and CopyInSchema.
-func makeStmt(buffer *bytes.Buffer, columns ...string) {
-	//s := bytes.NewBufferString()
+	stmt := "COPY " + QuoteIdentifier(table) + " ("
 	for i, col := range columns {
 		if i != 0 {
-			buffer.WriteString(", ")
+			stmt += ", "
 		}
-		BufferQuoteIdentifier(col, buffer)
+		stmt += QuoteIdentifier(col)
 	}
-	buffer.WriteString(") FROM STDIN")
+	stmt += ") FROM STDIN"
+	return stmt
 }
 
 // CopyInSchema creates a COPY FROM statement which can be prepared with
 // Tx.Prepare().
 func CopyInSchema(schema, table string, columns ...string) string {
-	buffer := bytes.NewBufferString("COPY ")
-	BufferQuoteIdentifier(schema, buffer)
-	buffer.WriteRune('.')
-	BufferQuoteIdentifier(table, buffer)
-	buffer.WriteString(" (")
-	makeStmt(buffer, columns...)
-	return buffer.String()
+	stmt := "COPY " + QuoteIdentifier(schema) + "." + QuoteIdentifier(table) + " ("
+	for i, col := range columns {
+		if i != 0 {
+			stmt += ", "
+		}
+		stmt += QuoteIdentifier(col)
+	}
+	stmt += ") FROM STDIN"
+	return stmt
 }
 
 type copyin struct {
@@ -57,14 +49,12 @@ type copyin struct {
 	buffer  []byte
 	rowData chan []byte
 	done    chan bool
+	driver.Result
 
 	closed bool
 
-	mu struct {
-		sync.Mutex
-		err error
-		driver.Result
-	}
+	sync.Mutex // guards err
+	err        error
 }
 
 const ciBufferSize = 64 * 1024
@@ -108,13 +98,13 @@ awaitCopyInResponse:
 			err = parseError(r)
 		case 'Z':
 			if err == nil {
-				ci.setBad(driver.ErrBadConn)
+				ci.setBad()
 				errorf("unexpected ReadyForQuery in response to COPY")
 			}
 			cn.processReadyForQuery(r)
 			return nil, err
 		default:
-			ci.setBad(driver.ErrBadConn)
+			ci.setBad()
 			errorf("unknown response for copy query: %q", t)
 		}
 	}
@@ -133,7 +123,7 @@ awaitCopyInResponse:
 			cn.processReadyForQuery(r)
 			return nil, err
 		default:
-			ci.setBad(driver.ErrBadConn)
+			ci.setBad()
 			errorf("unknown response for CopyFail: %q", t)
 		}
 	}
@@ -154,7 +144,7 @@ func (ci *copyin) resploop() {
 		var r readBuf
 		t, err := ci.cn.recvMessage(&r)
 		if err != nil {
-			ci.setBad(driver.ErrBadConn)
+			ci.setBad()
 			ci.setError(err)
 			ci.done <- true
 			return
@@ -176,7 +166,7 @@ func (ci *copyin) resploop() {
 			err := parseError(&r)
 			ci.setError(err)
 		default:
-			ci.setBad(driver.ErrBadConn)
+			ci.setBad()
 			ci.setError(fmt.Errorf("unknown response during CopyIn: %q", t))
 			ci.done <- true
 			return
@@ -184,41 +174,46 @@ func (ci *copyin) resploop() {
 	}
 }
 
-func (ci *copyin) setBad(err error) {
-	ci.cn.err.set(err)
+func (ci *copyin) setBad() {
+	ci.Lock()
+	ci.cn.setBad()
+	ci.Unlock()
 }
 
-func (ci *copyin) getBad() error {
-	return ci.cn.err.get()
+func (ci *copyin) isBad() bool {
+	ci.Lock()
+	b := ci.cn.getBad()
+	ci.Unlock()
+	return b
 }
 
-func (ci *copyin) err() error {
-	ci.mu.Lock()
-	err := ci.mu.err
-	ci.mu.Unlock()
-	return err
+func (ci *copyin) isErrorSet() bool {
+	ci.Lock()
+	isSet := (ci.err != nil)
+	ci.Unlock()
+	return isSet
 }
 
 // setError() sets ci.err if one has not been set already.  Caller must not be
 // holding ci.Mutex.
 func (ci *copyin) setError(err error) {
-	ci.mu.Lock()
-	if ci.mu.err == nil {
-		ci.mu.err = err
+	ci.Lock()
+	if ci.err == nil {
+		ci.err = err
 	}
-	ci.mu.Unlock()
+	ci.Unlock()
 }
 
 func (ci *copyin) setResult(result driver.Result) {
-	ci.mu.Lock()
-	ci.mu.Result = result
-	ci.mu.Unlock()
+	ci.Lock()
+	ci.Result = result
+	ci.Unlock()
 }
 
 func (ci *copyin) getResult() driver.Result {
-	ci.mu.Lock()
-	result := ci.mu.Result
-	ci.mu.Unlock()
+	ci.Lock()
+	result := ci.Result
+	ci.Unlock()
 	if result == nil {
 		return driver.RowsAffected(0)
 	}
@@ -245,13 +240,13 @@ func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) {
 		return nil, errCopyInClosed
 	}
 
-	if err := ci.getBad(); err != nil {
-		return nil, err
+	if ci.isBad() {
+		return nil, driver.ErrBadConn
 	}
 	defer ci.cn.errRecover(&err)
 
-	if err := ci.err(); err != nil {
-		return nil, err
+	if ci.isErrorSet() {
+		return nil, ci.err
 	}
 
 	if len(v) == 0 {
@@ -281,51 +276,14 @@ func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) {
 	return driver.RowsAffected(0), nil
 }
 
-// CopyData inserts a raw string into the COPY stream. The insert is
-// asynchronous and CopyData can return errors from previous CopyData calls to
-// the same COPY stmt.
-//
-// You need to call Exec(nil) to sync the COPY stream and to get any
-// errors from pending data, since Stmt.Close() doesn't return errors
-// to the user.
-func (ci *copyin) CopyData(ctx context.Context, line string) (r driver.Result, err error) {
-	if ci.closed {
-		return nil, errCopyInClosed
-	}
-
-	if finish := ci.cn.watchCancel(ctx); finish != nil {
-		defer finish()
-	}
-
-	if err := ci.getBad(); err != nil {
-		return nil, err
-	}
-	defer ci.cn.errRecover(&err)
-
-	if err := ci.err(); err != nil {
-		return nil, err
-	}
-
-	ci.buffer = append(ci.buffer, []byte(line)...)
-	ci.buffer = append(ci.buffer, '\n')
-
-	if len(ci.buffer) > ciBufferFlushSize {
-		ci.flush(ci.buffer)
-		// reset buffer, keep bytes for message identifier and length
-		ci.buffer = ci.buffer[:5]
-	}
-
-	return driver.RowsAffected(0), nil
-}
-
 func (ci *copyin) Close() (err error) {
 	if ci.closed { // Don't do anything, we're already closed
 		return nil
 	}
 	ci.closed = true
 
-	if err := ci.getBad(); err != nil {
-		return err
+	if ci.isBad() {
+		return driver.ErrBadConn
 	}
 	defer ci.cn.errRecover(&err)
 
@@ -341,7 +299,8 @@ func (ci *copyin) Close() (err error) {
 	<-ci.done
 	ci.cn.inCopy = false
 
-	if err := ci.err(); err != nil {
+	if ci.isErrorSet() {
+		err = ci.err
 		return err
 	}
 	return nil
diff --git a/vendor/github.com/lib/pq/encode.go b/vendor/github.com/lib/pq/encode.go
index bffe609..51c143e 100644
--- a/vendor/github.com/lib/pq/encode.go
+++ b/vendor/github.com/lib/pq/encode.go
@@ -422,7 +422,7 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro
 
 	if remainderIdx < len(str) && str[remainderIdx] == '.' {
 		fracStart := remainderIdx + 1
-		fracOff := strings.IndexAny(str[fracStart:], "-+Z ")
+		fracOff := strings.IndexAny(str[fracStart:], "-+ ")
 		if fracOff < 0 {
 			fracOff = len(str) - fracStart
 		}
@@ -432,7 +432,7 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro
 		remainderIdx += fracOff + 1
 	}
 	if tzStart := remainderIdx; tzStart < len(str) && (str[tzStart] == '-' || str[tzStart] == '+') {
-		// time zone separator is always '-' or '+' or 'Z' (UTC is +00)
+		// time zone separator is always '-' or '+' (UTC is +00)
 		var tzSign int
 		switch c := str[tzStart]; c {
 		case '-':
@@ -454,11 +454,7 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro
 			remainderIdx += 3
 		}
 		tzOff = tzSign * ((tzHours * 60 * 60) + (tzMin * 60) + tzSec)
-	} else if tzStart < len(str) && str[tzStart] == 'Z' {
-		// time zone Z separator indicates UTC is +00
-		remainderIdx += 1
 	}
-
 	var isoYear int
 
 	if isBC {
@@ -563,7 +559,7 @@ func parseBytea(s []byte) (result []byte, err error) {
 				if len(s) < 4 {
 					return nil, fmt.Errorf("invalid bytea sequence %v", s)
 				}
-				r, err := strconv.ParseUint(string(s[1:4]), 8, 8)
+				r, err := strconv.ParseInt(string(s[1:4]), 8, 9)
 				if err != nil {
 					return nil, fmt.Errorf("could not parse bytea value: %s", err.Error())
 				}
diff --git a/vendor/github.com/lib/pq/error.go b/vendor/github.com/lib/pq/error.go
index f67c5a5..b0f5375 100644
--- a/vendor/github.com/lib/pq/error.go
+++ b/vendor/github.com/lib/pq/error.go
@@ -402,11 +402,6 @@ func (err *Error) Fatal() bool {
 	return err.Severity == Efatal
 }
 
-// SQLState returns the SQLState of the error.
-func (err *Error) SQLState() string {
-	return string(err.Code)
-}
-
 // Get implements the legacy PGError interface. New code should use the fields
 // of the Error struct directly.
 func (err *Error) Get(k byte) (v string) {
@@ -449,7 +444,7 @@ func (err *Error) Get(k byte) (v string) {
 	return ""
 }
 
-func (err *Error) Error() string {
+func (err Error) Error() string {
 	return "pq: " + err.Message
 }
 
@@ -489,7 +484,7 @@ func (cn *conn) errRecover(err *error) {
 	case nil:
 		// Do nothing
 	case runtime.Error:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		panic(v)
 	case *Error:
 		if v.Fatal() {
@@ -498,10 +493,10 @@ func (cn *conn) errRecover(err *error) {
 			*err = v
 		}
 	case *net.OpError:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		*err = v
 	case *safeRetryError:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		*err = driver.ErrBadConn
 	case error:
 		if v == io.EOF || v.Error() == "remote error: handshake failure" {
@@ -511,13 +506,13 @@ func (cn *conn) errRecover(err *error) {
 		}
 
 	default:
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 		panic(fmt.Sprintf("unknown error: %#v", e))
 	}
 
 	// Any time we return ErrBadConn, we need to remember it since *Tx doesn't
 	// mark the connection bad in database/sql.
 	if *err == driver.ErrBadConn {
-		cn.err.set(driver.ErrBadConn)
+		cn.setBad()
 	}
 }
diff --git a/vendor/github.com/lib/pq/ssl.go b/vendor/github.com/lib/pq/ssl.go
index 36b61ba..e5eb928 100644
--- a/vendor/github.com/lib/pq/ssl.go
+++ b/vendor/github.com/lib/pq/ssl.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/user"
 	"path/filepath"
-	"strings"
 )
 
 // ssl generates a function to upgrade a net.Conn based on the "sslmode" and
@@ -51,16 +50,6 @@ func ssl(o values) (func(net.Conn) (net.Conn, error), error) {
 		return nil, fmterrorf(`unsupported sslmode %q; only "require" (default), "verify-full", "verify-ca", and "disable" supported`, mode)
 	}
 
-	// Set Server Name Indication (SNI), if enabled by connection parameters.
-	// By default SNI is on, any value which is not starting with "1" disables
-	// SNI -- that is the same check vanilla libpq uses.
-	if sslsni := o["sslsni"]; sslsni == "" || strings.HasPrefix(sslsni, "1") {
-		// RFC 6066 asks to not set SNI if the host is a literal IP address (IPv4
-		// or IPv6). This check is coded already crypto.tls.hostnameInSNI, so
-		// just always set ServerName here and let crypto/tls do the filtering.
-		tlsConf.ServerName = o["host"]
-	}
-
 	err := sslClientCertificates(&tlsConf, o)
 	if err != nil {
 		return nil, err
diff --git a/vendor/github.com/lib/pq/ssl_permissions.go b/vendor/github.com/lib/pq/ssl_permissions.go
index d587f10..014af6a 100644
--- a/vendor/github.com/lib/pq/ssl_permissions.go
+++ b/vendor/github.com/lib/pq/ssl_permissions.go
@@ -3,28 +3,7 @@
 
 package pq
 
-import (
-	"errors"
-	"os"
-	"syscall"
-)
-
-const (
-	rootUserID = uint32(0)
-
-	// The maximum permissions that a private key file owned by a regular user
-	// is allowed to have. This translates to u=rw.
-	maxUserOwnedKeyPermissions os.FileMode = 0600
-
-	// The maximum permissions that a private key file owned by root is allowed
-	// to have. This translates to u=rw,g=r.
-	maxRootOwnedKeyPermissions os.FileMode = 0640
-)
-
-var (
-	errSSLKeyHasUnacceptableUserPermissions = errors.New("permissions for files not owned by root should be u=rw (0600) or less")
-	errSSLKeyHasUnacceptableRootPermissions = errors.New("permissions for root owned files should be u=rw,g=r (0640) or less")
-)
+import "os"
 
 // sslKeyPermissions checks the permissions on user-supplied ssl key files.
 // The key file should have very little access.
@@ -35,59 +14,8 @@ func sslKeyPermissions(sslkey string) error {
 	if err != nil {
 		return err
 	}
-
-	err = hasCorrectPermissions(info)
-
-	// return ErrSSLKeyHasWorldPermissions for backwards compatability with
-	// existing code.
-	if err == errSSLKeyHasUnacceptableUserPermissions || err == errSSLKeyHasUnacceptableRootPermissions {
-		err = ErrSSLKeyHasWorldPermissions
+	if info.Mode().Perm()&0077 != 0 {
+		return ErrSSLKeyHasWorldPermissions
 	}
-	return err
-}
-
-// hasCorrectPermissions checks the file info (and the unix-specific stat_t
-// output) to verify that the permissions on the file are correct.
-//
-// If the file is owned by the same user the process is running as,
-// the file should only have 0600 (u=rw). If the file is owned by root,
-// and the group matches the group that the process is running in, the
-// permissions cannot be more than 0640 (u=rw,g=r). The file should
-// never have world permissions.
-//
-// Returns an error when the permission check fails.
-func hasCorrectPermissions(info os.FileInfo) error {
-	// if file's permission matches 0600, allow access.
-	userPermissionMask := (os.FileMode(0777) ^ maxUserOwnedKeyPermissions)
-
-	// regardless of if we're running as root or not, 0600 is acceptable,
-	// so we return if we match the regular user permission mask.
-	if info.Mode().Perm()&userPermissionMask == 0 {
-		return nil
-	}
-
-	// We need to pull the Unix file information to get the file's owner.
-	// If we can't access it, there's some sort of operating system level error
-	// and we should fail rather than attempting to use faulty information.
-	sysInfo := info.Sys()
-	if sysInfo == nil {
-		return ErrSSLKeyUnknownOwnership
-	}
-
-	unixStat, ok := sysInfo.(*syscall.Stat_t)
-	if !ok {
-		return ErrSSLKeyUnknownOwnership
-	}
-
-	// if the file is owned by root, we allow 0640 (u=rw,g=r) to match what
-	// Postgres does.
-	if unixStat.Uid == rootUserID {
-		rootPermissionMask := (os.FileMode(0777) ^ maxRootOwnedKeyPermissions)
-		if info.Mode().Perm()&rootPermissionMask != 0 {
-			return errSSLKeyHasUnacceptableRootPermissions
-		}
-		return nil
-	}
-
-	return errSSLKeyHasUnacceptableUserPermissions
+	return nil
 }
diff --git a/vendor/github.com/lib/pq/user_posix.go b/vendor/github.com/lib/pq/user_posix.go
index 5f2d439..227a948 100644
--- a/vendor/github.com/lib/pq/user_posix.go
+++ b/vendor/github.com/lib/pq/user_posix.go
@@ -1,7 +1,7 @@
 // Package pq is a pure Go Postgres driver for the database/sql package.
 
-//go:build aix || darwin || dragonfly || freebsd || (linux && !android) || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos
-// +build aix darwin dragonfly freebsd linux,!android nacl netbsd openbsd plan9 solaris rumprun illumos
+//go:build aix || darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris rumprun illumos
 
 package pq
 
diff --git a/vendor/github.com/mattn/go-colorable/.travis.yml b/vendor/github.com/mattn/go-colorable/.travis.yml
new file mode 100644
index 0000000..7942c56
--- /dev/null
+++ b/vendor/github.com/mattn/go-colorable/.travis.yml
@@ -0,0 +1,15 @@
+language: go
+sudo: false
+go:
+  - 1.13.x
+  - tip
+
+before_install:
+  - go get -t -v ./...
+
+script:
+  - ./go.test.sh
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
diff --git a/vendor/github.com/mattn/go-colorable/README.md b/vendor/github.com/mattn/go-colorable/README.md
index ca04837..e055952 100644
--- a/vendor/github.com/mattn/go-colorable/README.md
+++ b/vendor/github.com/mattn/go-colorable/README.md
@@ -1,6 +1,6 @@
 # go-colorable
 
-[![Build Status](https://github.com/mattn/go-colorable/workflows/test/badge.svg)](https://github.com/mattn/go-colorable/actions?query=workflow%3Atest)
+[![Build Status](https://travis-ci.org/mattn/go-colorable.svg?branch=master)](https://travis-ci.org/mattn/go-colorable)
 [![Codecov](https://codecov.io/gh/mattn/go-colorable/branch/master/graph/badge.svg)](https://codecov.io/gh/mattn/go-colorable)
 [![GoDoc](https://godoc.org/github.com/mattn/go-colorable?status.svg)](http://godoc.org/github.com/mattn/go-colorable)
 [![Go Report Card](https://goreportcard.com/badge/mattn/go-colorable)](https://goreportcard.com/report/mattn/go-colorable)
diff --git a/vendor/github.com/mattn/go-colorable/colorable_appengine.go b/vendor/github.com/mattn/go-colorable/colorable_appengine.go
new file mode 100644
index 0000000..1f7806f
--- /dev/null
+++ b/vendor/github.com/mattn/go-colorable/colorable_appengine.go
@@ -0,0 +1,37 @@
+// +build appengine
+
+package colorable
+
+import (
+	"io"
+	"os"
+
+	_ "github.com/mattn/go-isatty"
+)
+
+// NewColorable returns new instance of Writer which handles escape sequence.
+func NewColorable(file *os.File) io.Writer {
+	if file == nil {
+		panic("nil passed instead of *os.File to NewColorable()")
+	}
+
+	return file
+}
+
+// NewColorableStdout returns new instance of Writer which handles escape sequence for stdout.
+func NewColorableStdout() io.Writer {
+	return os.Stdout
+}
+
+// NewColorableStderr returns new instance of Writer which handles escape sequence for stderr.
+func NewColorableStderr() io.Writer {
+	return os.Stderr
+}
+
+// EnableColorsStdout enable colors if possible.
+func EnableColorsStdout(enabled *bool) func() {
+	if enabled != nil {
+		*enabled = true
+	}
+	return func() {}
+}
diff --git a/vendor/github.com/mattn/go-colorable/colorable_others.go b/vendor/github.com/mattn/go-colorable/colorable_others.go
index c1a78aa..08cbd1e 100644
--- a/vendor/github.com/mattn/go-colorable/colorable_others.go
+++ b/vendor/github.com/mattn/go-colorable/colorable_others.go
@@ -1,5 +1,5 @@
-//go:build !windows || appengine
-// +build !windows appengine
+// +build !windows
+// +build !appengine
 
 package colorable
 
diff --git a/vendor/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go
index 2df7b85..41215d7 100644
--- a/vendor/github.com/mattn/go-colorable/colorable_windows.go
+++ b/vendor/github.com/mattn/go-colorable/colorable_windows.go
@@ -1,5 +1,5 @@
-//go:build windows && !appengine
-// +build windows,!appengine
+// +build windows
+// +build !appengine
 
 package colorable
 
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	syscall "golang.org/x/sys/windows"
+	"syscall"
 	"unsafe"
 
 	"github.com/mattn/go-isatty"
@@ -73,7 +73,7 @@ type consoleCursorInfo struct {
 }
 
 var (
-	kernel32                       = syscall.NewLazySystemDLL("kernel32.dll")
+	kernel32                       = syscall.NewLazyDLL("kernel32.dll")
 	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
 	procSetConsoleTextAttribute    = kernel32.NewProc("SetConsoleTextAttribute")
 	procSetConsoleCursorPosition   = kernel32.NewProc("SetConsoleCursorPosition")
@@ -87,8 +87,8 @@ var (
 	procCreateConsoleScreenBuffer  = kernel32.NewProc("CreateConsoleScreenBuffer")
 )
 
-// writer provides colorable Writer to the console
-type writer struct {
+// Writer provides colorable Writer to the console
+type Writer struct {
 	out       io.Writer
 	handle    syscall.Handle
 	althandle syscall.Handle
@@ -98,7 +98,7 @@ type writer struct {
 	mutex     sync.Mutex
 }
 
-// NewColorable returns new instance of writer which handles escape sequence from File.
+// NewColorable returns new instance of Writer which handles escape sequence from File.
 func NewColorable(file *os.File) io.Writer {
 	if file == nil {
 		panic("nil passed instead of *os.File to NewColorable()")
@@ -112,17 +112,17 @@ func NewColorable(file *os.File) io.Writer {
 		var csbi consoleScreenBufferInfo
 		handle := syscall.Handle(file.Fd())
 		procGetConsoleScreenBufferInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&csbi)))
-		return &writer{out: file, handle: handle, oldattr: csbi.attributes, oldpos: coord{0, 0}}
+		return &Writer{out: file, handle: handle, oldattr: csbi.attributes, oldpos: coord{0, 0}}
 	}
 	return file
 }
 
-// NewColorableStdout returns new instance of writer which handles escape sequence for stdout.
+// NewColorableStdout returns new instance of Writer which handles escape sequence for stdout.
 func NewColorableStdout() io.Writer {
 	return NewColorable(os.Stdout)
 }
 
-// NewColorableStderr returns new instance of writer which handles escape sequence for stderr.
+// NewColorableStderr returns new instance of Writer which handles escape sequence for stderr.
 func NewColorableStderr() io.Writer {
 	return NewColorable(os.Stderr)
 }
@@ -434,7 +434,7 @@ func atoiWithDefault(s string, def int) (int, error) {
 }
 
 // Write writes data on console
-func (w *writer) Write(data []byte) (n int, err error) {
+func (w *Writer) Write(data []byte) (n int, err error) {
 	w.mutex.Lock()
 	defer w.mutex.Unlock()
 	var csbi consoleScreenBufferInfo
@@ -452,22 +452,18 @@ func (w *writer) Write(data []byte) (n int, err error) {
 	} else {
 		er = bytes.NewReader(data)
 	}
-	var plaintext bytes.Buffer
+	var bw [1]byte
 loop:
 	for {
 		c1, err := er.ReadByte()
 		if err != nil {
-			plaintext.WriteTo(w.out)
 			break loop
 		}
 		if c1 != 0x1b {
-			plaintext.WriteByte(c1)
+			bw[0] = c1
+			w.out.Write(bw[:])
 			continue
 		}
-		_, err = plaintext.WriteTo(w.out)
-		if err != nil {
-			break loop
-		}
 		c2, err := er.ReadByte()
 		if err != nil {
 			break loop
@@ -560,7 +556,7 @@ loop:
 			}
 			procSetConsoleCursorPosition.Call(uintptr(handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
 		case 'E':
-			n, err = atoiWithDefault(buf.String(), 1)
+			n, err = strconv.Atoi(buf.String())
 			if err != nil {
 				continue
 			}
@@ -569,7 +565,7 @@ loop:
 			csbi.cursorPosition.y += short(n)
 			procSetConsoleCursorPosition.Call(uintptr(handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
 		case 'F':
-			n, err = atoiWithDefault(buf.String(), 1)
+			n, err = strconv.Atoi(buf.String())
 			if err != nil {
 				continue
 			}
diff --git a/vendor/github.com/mattn/go-colorable/noncolorable.go b/vendor/github.com/mattn/go-colorable/noncolorable.go
index 05d6f74..95f2c6b 100644
--- a/vendor/github.com/mattn/go-colorable/noncolorable.go
+++ b/vendor/github.com/mattn/go-colorable/noncolorable.go
@@ -18,22 +18,18 @@ func NewNonColorable(w io.Writer) io.Writer {
 // Write writes data on console
 func (w *NonColorable) Write(data []byte) (n int, err error) {
 	er := bytes.NewReader(data)
-	var plaintext bytes.Buffer
+	var bw [1]byte
 loop:
 	for {
 		c1, err := er.ReadByte()
 		if err != nil {
-			plaintext.WriteTo(w.out)
 			break loop
 		}
 		if c1 != 0x1b {
-			plaintext.WriteByte(c1)
+			bw[0] = c1
+			w.out.Write(bw[:])
 			continue
 		}
-		_, err = plaintext.WriteTo(w.out)
-		if err != nil {
-			break loop
-		}
 		c2, err := er.ReadByte()
 		if err != nil {
 			break loop
@@ -42,6 +38,7 @@ loop:
 			continue
 		}
 
+		var buf bytes.Buffer
 		for {
 			c, err := er.ReadByte()
 			if err != nil {
@@ -50,6 +47,7 @@ loop:
 			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
 				break
 			}
+			buf.Write([]byte(string(c)))
 		}
 	}
 
diff --git a/vendor/github.com/mattn/go-isatty/.travis.yml b/vendor/github.com/mattn/go-isatty/.travis.yml
new file mode 100644
index 0000000..604314d
--- /dev/null
+++ b/vendor/github.com/mattn/go-isatty/.travis.yml
@@ -0,0 +1,14 @@
+language: go
+sudo: false
+go:
+  - 1.13.x
+  - tip
+
+before_install:
+  - go get -t -v ./...
+
+script:
+  - ./go.test.sh
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
index d0ea68f..711f288 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
@@ -1,7 +1,5 @@
-//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) && !appengine && !tinygo
-// +build darwin freebsd openbsd netbsd dragonfly hurd
+// +build darwin freebsd openbsd netbsd dragonfly
 // +build !appengine
-// +build !tinygo
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go
index 7402e06..3eba4cb 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_others.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_others.go
@@ -1,6 +1,4 @@
-//go:build (appengine || js || nacl || tinygo || wasm) && !windows
-// +build appengine js nacl tinygo wasm
-// +build !windows
+// +build appengine js nacl wasm
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_plan9.go b/vendor/github.com/mattn/go-isatty/isatty_plan9.go
index bae7f9b..c5b6e0c 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_plan9.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_plan9.go
@@ -1,4 +1,3 @@
-//go:build plan9
 // +build plan9
 
 package isatty
diff --git a/vendor/github.com/mattn/go-isatty/isatty_solaris.go b/vendor/github.com/mattn/go-isatty/isatty_solaris.go
index 0c3acf2..3010670 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_solaris.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_solaris.go
@@ -1,5 +1,5 @@
-//go:build solaris && !appengine
-// +build solaris,!appengine
+// +build solaris
+// +build !appengine
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
index 0337d8c..4e7b850 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
@@ -1,7 +1,5 @@
-//go:build (linux || aix || zos) && !appengine && !tinygo
 // +build linux aix zos
 // +build !appengine
-// +build !tinygo
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_windows.go b/vendor/github.com/mattn/go-isatty/isatty_windows.go
index 8e3c991..1fa8691 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_windows.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_windows.go
@@ -1,5 +1,5 @@
-//go:build windows && !appengine
-// +build windows,!appengine
+// +build windows
+// +build !appengine
 
 package isatty
 
@@ -76,7 +76,7 @@ func isCygwinPipeName(name string) bool {
 }
 
 // getFileNameByHandle use the undocomented ntdll NtQueryObject to get file full name from file handler
-// since GetFileInformationByHandleEx is not available under windows Vista and still some old fashion
+// since GetFileInformationByHandleEx is not avilable under windows Vista and still some old fashion
 // guys are using Windows XP, this is a workaround for those guys, it will also work on system from
 // Windows vista to 10
 // see https://stackoverflow.com/a/18792477 for details
diff --git a/vendor/github.com/miekg/dns/LICENSE b/vendor/github.com/miekg/dns/LICENSE
index 852ab9c..55f12ab 100644
--- a/vendor/github.com/miekg/dns/LICENSE
+++ b/vendor/github.com/miekg/dns/LICENSE
@@ -1,29 +1,30 @@
-BSD 3-Clause License
-
-Copyright (c) 2009, The Go Authors. Extensions copyright (c) 2011, Miek Gieben. 
-All rights reserved.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+As this is fork of the official Go code the same license applies.
+Extensions of the original work are copyright (c) 2011 Miek Gieben
diff --git a/vendor/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
index 54471f5..d5b78ef 100644
--- a/vendor/github.com/miekg/dns/README.md
+++ b/vendor/github.com/miekg/dns/README.md
@@ -73,20 +73,7 @@ A not-so-up-to-date-list-that-may-be-actually-current:
 * https://github.com/bodgit/tsig
 * https://github.com/v2fly/v2ray-core (test only)
 * https://kuma.io/
-* https://www.misaka.io/services/dns
-* https://ping.sx/dig
-* https://fleetdeck.io/
-* https://github.com/markdingo/autoreverse
-* https://github.com/slackhq/nebula
-* https://addr.tools/
-* https://dnscheck.tools/
-* https://github.com/egbakou/domainverifier
-* https://github.com/semihalev/sdns
-* https://github.com/wintbiit/NineDNS
-* https://linuxcontainers.org/incus/
-* https://ifconfig.es
-* https://github.com/zmap/zdns
-* https://framagit.org/bortzmeyer/check-soa
+
 
 Send pull request if you want to be listed here.
 
@@ -129,7 +116,6 @@ Example programs can be found in the `github.com/miekg/exdns` repository.
 *all of them*
 
 * 103{4,5} - DNS standard
-* 1183 - ISDN, X25 and other deprecated records
 * 1348 - NSAP record (removed the record)
 * 1982 - Serial Arithmetic
 * 1876 - LOC record
@@ -149,9 +135,7 @@ Example programs can be found in the `github.com/miekg/exdns` repository.
 * 3225 - DO bit (DNSSEC OK)
 * 340{1,2,3} - NAPTR record
 * 3445 - Limiting the scope of (DNS)KEY
-* 3596 - AAAA record
 * 3597 - Unknown RRs
-* 4025 - A Method for Storing IPsec Keying Material in DNS
 * 403{3,4,5} - DNSSEC + validation functions
 * 4255 - SSHFP record
 * 4343 - Case insensitivity
@@ -185,18 +169,10 @@ Example programs can be found in the `github.com/miekg/exdns` repository.
 * 7871 - EDNS0 Client Subnet
 * 7873 - Domain Name System (DNS) Cookies
 * 8080 - EdDSA for DNSSEC
-* 8490 - DNS Stateful Operations
 * 8499 - DNS Terminology
 * 8659 - DNS Certification Authority Authorization (CAA) Resource Record
-* 8777 - DNS Reverse IP Automatic Multicast Tunneling (AMT) Discovery
 * 8914 - Extended DNS Errors
 * 8976 - Message Digest for DNS Zones (ZONEMD RR)
-* 9460 - Service Binding and Parameter Specification via the DNS
-* 9461 - Service Binding Mapping for DNS Servers
-* 9462 - Discovery of Designated Resolvers
-* 9460 - SVCB and HTTPS Records
-* 9606 - DNS Resolver Information
-* Draft - Compact Denial of Existence in DNSSEC
 
 ## Loosely Based Upon
 
diff --git a/vendor/github.com/miekg/dns/acceptfunc.go b/vendor/github.com/miekg/dns/acceptfunc.go
index 1a59a85..3f29a48 100644
--- a/vendor/github.com/miekg/dns/acceptfunc.go
+++ b/vendor/github.com/miekg/dns/acceptfunc.go
@@ -10,13 +10,16 @@ type MsgAcceptFunc func(dh Header) MsgAcceptAction
 //
 // * opcode isn't OpcodeQuery or OpcodeNotify
 //
-// * does not have exactly 1 question in the question section
+// * Zero bit isn't zero
+//
+// * has more than 1 question in the question section
 //
 // * has more than 1 RR in the Answer section
 //
 // * has more than 0 RRs in the Authority section
 //
 // * has more than 2 RRs in the Additional section
+//
 var DefaultMsgAcceptFunc MsgAcceptFunc = defaultMsgAcceptFunc
 
 // MsgAcceptAction represents the action to be taken.
diff --git a/vendor/github.com/miekg/dns/client.go b/vendor/github.com/miekg/dns/client.go
index 9549fa9..f907698 100644
--- a/vendor/github.com/miekg/dns/client.go
+++ b/vendor/github.com/miekg/dns/client.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/binary"
+	"fmt"
 	"io"
 	"net"
 	"strings"
@@ -17,18 +18,6 @@ const (
 	tcpIdleTimeout time.Duration = 8 * time.Second
 )
 
-func isPacketConn(c net.Conn) bool {
-	if _, ok := c.(net.PacketConn); !ok {
-		return false
-	}
-
-	if ua, ok := c.LocalAddr().(*net.UnixAddr); ok {
-		return ua.Net == "unixgram" || ua.Net == "unixpacket"
-	}
-
-	return true
-}
-
 // A Conn represents a connection to a DNS server.
 type Conn struct {
 	net.Conn                         // a net.Conn holding the connection
@@ -38,14 +27,6 @@ type Conn struct {
 	tsigRequestMAC string
 }
 
-func (co *Conn) tsigProvider() TsigProvider {
-	if co.TsigProvider != nil {
-		return co.TsigProvider
-	}
-	// tsigSecretProvider will return ErrSecret if co.TsigSecret is nil.
-	return tsigSecretProvider(co.TsigSecret)
-}
-
 // A Client defines parameters for a DNS client.
 type Client struct {
 	Net       string      // if "tcp" or "tcp-tls" (DNS over TLS) a TCP query will be initiated, otherwise an UDP one (default is "" for UDP)
@@ -55,20 +36,14 @@ type Client struct {
 	// Timeout is a cumulative timeout for dial, write and read, defaults to 0 (disabled) - overrides DialTimeout, ReadTimeout,
 	// WriteTimeout when non-zero. Can be overridden with net.Dialer.Timeout (see Client.ExchangeWithDialer and
 	// Client.Dialer) or context.Context.Deadline (see ExchangeContext)
-	Timeout      time.Duration
-	DialTimeout  time.Duration     // net.DialTimeout, defaults to 2 seconds, or net.Dialer.Timeout if expiring earlier - overridden by Timeout when that value is non-zero
-	ReadTimeout  time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
-	WriteTimeout time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
-	TsigSecret   map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
-	TsigProvider TsigProvider      // An implementation of the TsigProvider interface. If defined it replaces TsigSecret and is used for all TSIG operations.
-
-	// SingleInflight previously serialised multiple concurrent queries for the
-	// same Qname, Qtype and Qclass to ensure only one would be in flight at a
-	// time.
-	//
-	// Deprecated: This is a no-op. Callers should implement their own in flight
-	// query caching if needed. See github.com/miekg/dns/issues/1449.
-	SingleInflight bool
+	Timeout        time.Duration
+	DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds, or net.Dialer.Timeout if expiring earlier - overridden by Timeout when that value is non-zero
+	ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+	WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+	TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
+	TsigProvider   TsigProvider      // An implementation of the TsigProvider interface. If defined it replaces TsigSecret and is used for all TSIG operations.
+	SingleInflight bool              // if true suppress multiple outstanding queries for the same Qname, Qtype and Qclass
+	group          singleflight
 }
 
 // Exchange performs a synchronous UDP query. It sends the message m to the address
@@ -107,11 +82,6 @@ func (c *Client) writeTimeout() time.Duration {
 
 // Dial connects to the address on the named network.
 func (c *Client) Dial(address string) (conn *Conn, err error) {
-	return c.DialContext(context.Background(), address)
-}
-
-// DialContext connects to the address on the named network, with a context.Context.
-func (c *Client) DialContext(ctx context.Context, address string) (conn *Conn, err error) {
 	// create a new dialer with the appropriate timeout
 	var d net.Dialer
 	if c.Dialer == nil {
@@ -131,13 +101,9 @@ func (c *Client) DialContext(ctx context.Context, address string) (conn *Conn, e
 	if useTLS {
 		network = strings.TrimSuffix(network, "-tls")
 
-		tlsDialer := tls.Dialer{
-			NetDialer: &d,
-			Config:    c.TLSConfig,
-		}
-		conn.Conn, err = tlsDialer.DialContext(ctx, network, address)
+		conn.Conn, err = tls.DialWithDialer(&d, network, address, c.TLSConfig)
 	} else {
-		conn.Conn, err = d.DialContext(ctx, network, address)
+		conn.Conn, err = d.Dial(network, address)
 	}
 	if err != nil {
 		return nil, err
@@ -173,23 +139,34 @@ func (c *Client) Exchange(m *Msg, address string) (r *Msg, rtt time.Duration, er
 // ExchangeWithConn has the same behavior as Exchange, just with a predetermined connection
 // that will be used instead of creating a new one.
 // Usage pattern with a *dns.Client:
-//
 //	c := new(dns.Client)
 //	// connection management logic goes here
 //
 //	conn := c.Dial(address)
 //	in, rtt, err := c.ExchangeWithConn(message, conn)
 //
-// This allows users of the library to implement their own connection management,
-// as opposed to Exchange, which will always use new connections and incur the added overhead
-// that entails when using "tcp" and especially "tcp-tls" clients.
+//  This allows users of the library to implement their own connection management,
+//  as opposed to Exchange, which will always use new connections and incur the added overhead
+//  that entails when using "tcp" and especially "tcp-tls" clients.
 func (c *Client) ExchangeWithConn(m *Msg, conn *Conn) (r *Msg, rtt time.Duration, err error) {
-	return c.ExchangeWithConnContext(context.Background(), m, conn)
+	if !c.SingleInflight {
+		return c.exchange(m, conn)
+	}
+
+	q := m.Question[0]
+	key := fmt.Sprintf("%s:%d:%d", q.Name, q.Qtype, q.Qclass)
+	r, rtt, err, shared := c.group.Do(key, func() (*Msg, time.Duration, error) {
+		return c.exchange(m, conn)
+	})
+	if r != nil && shared {
+		r = r.Copy()
+	}
+
+	return r, rtt, err
 }
 
-// ExchangeWithConnContext has the same behaviour as ExchangeWithConn and
-// additionally obeys deadlines from the passed Context.
-func (c *Client) ExchangeWithConnContext(ctx context.Context, m *Msg, co *Conn) (r *Msg, rtt time.Duration, err error) {
+func (c *Client) exchange(m *Msg, co *Conn) (r *Msg, rtt time.Duration, err error) {
+
 	opt := m.IsEdns0()
 	// If EDNS0 is used use that for size.
 	if opt != nil && opt.UDPSize() >= MinMsgSize {
@@ -200,28 +177,16 @@ func (c *Client) ExchangeWithConnContext(ctx context.Context, m *Msg, co *Conn)
 		co.UDPSize = c.UDPSize
 	}
 
-	// write with the appropriate write timeout
-	t := time.Now()
-	writeDeadline := t.Add(c.getTimeoutForRequest(c.writeTimeout()))
-	readDeadline := t.Add(c.getTimeoutForRequest(c.readTimeout()))
-	if deadline, ok := ctx.Deadline(); ok {
-		if deadline.Before(writeDeadline) {
-			writeDeadline = deadline
-		}
-		if deadline.Before(readDeadline) {
-			readDeadline = deadline
-		}
-	}
-	co.SetWriteDeadline(writeDeadline)
-	co.SetReadDeadline(readDeadline)
-
 	co.TsigSecret, co.TsigProvider = c.TsigSecret, c.TsigProvider
-
+	t := time.Now()
+	// write with the appropriate write timeout
+	co.SetWriteDeadline(t.Add(c.getTimeoutForRequest(c.writeTimeout())))
 	if err = co.WriteMsg(m); err != nil {
 		return nil, 0, err
 	}
 
-	if isPacketConn(co.Conn) {
+	co.SetReadDeadline(time.Now().Add(c.getTimeoutForRequest(c.readTimeout())))
+	if _, ok := co.Conn.(net.PacketConn); ok {
 		for {
 			r, err = co.ReadMsg()
 			// Ignore replies with mismatched IDs because they might be
@@ -259,8 +224,15 @@ func (co *Conn) ReadMsg() (*Msg, error) {
 		return m, err
 	}
 	if t := m.IsTsig(); t != nil {
-		// Need to work on the original message p, as that was used to calculate the tsig.
-		err = TsigVerifyWithProvider(p, co.tsigProvider(), co.tsigRequestMAC, false)
+		if co.TsigProvider != nil {
+			err = tsigVerifyProvider(p, co.TsigProvider, co.tsigRequestMAC, false)
+		} else {
+			if _, ok := co.TsigSecret[t.Hdr.Name]; !ok {
+				return m, ErrSecret
+			}
+			// Need to work on the original message p, as that was used to calculate the tsig.
+			err = TsigVerify(p, co.TsigSecret[t.Hdr.Name], co.tsigRequestMAC, false)
+		}
 	}
 	return m, err
 }
@@ -275,7 +247,7 @@ func (co *Conn) ReadMsgHeader(hdr *Header) ([]byte, error) {
 		err error
 	)
 
-	if isPacketConn(co.Conn) {
+	if _, ok := co.Conn.(net.PacketConn); ok {
 		if co.UDPSize > MinMsgSize {
 			p = make([]byte, co.UDPSize)
 		} else {
@@ -315,7 +287,7 @@ func (co *Conn) Read(p []byte) (n int, err error) {
 		return 0, ErrConnEmpty
 	}
 
-	if isPacketConn(co.Conn) {
+	if _, ok := co.Conn.(net.PacketConn); ok {
 		// UDP connection
 		return co.Conn.Read(p)
 	}
@@ -337,8 +309,17 @@ func (co *Conn) Read(p []byte) (n int, err error) {
 func (co *Conn) WriteMsg(m *Msg) (err error) {
 	var out []byte
 	if t := m.IsTsig(); t != nil {
-		// Set tsigRequestMAC for the next read, although only used in zone transfers.
-		out, co.tsigRequestMAC, err = TsigGenerateWithProvider(m, co.tsigProvider(), co.tsigRequestMAC, false)
+		mac := ""
+		if co.TsigProvider != nil {
+			out, mac, err = tsigGenerateProvider(m, co.TsigProvider, co.tsigRequestMAC, false)
+		} else {
+			if _, ok := co.TsigSecret[t.Hdr.Name]; !ok {
+				return ErrSecret
+			}
+			out, mac, err = TsigGenerate(m, co.TsigSecret[t.Hdr.Name], co.tsigRequestMAC, false)
+		}
+		// Set for the next read, although only used in zone transfers
+		co.tsigRequestMAC = mac
 	} else {
 		out, err = m.Pack()
 	}
@@ -355,7 +336,7 @@ func (co *Conn) Write(p []byte) (int, error) {
 		return 0, &Error{err: "message too large"}
 	}
 
-	if isPacketConn(co.Conn) {
+	if _, ok := co.Conn.(net.PacketConn); ok {
 		return co.Conn.Write(p)
 	}
 
@@ -411,6 +392,7 @@ func ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, err error)
 //	co.WriteMsg(m)
 //	in, _  := co.ReadMsg()
 //	co.Close()
+//
 func ExchangeConn(c net.Conn, m *Msg) (r *Msg, err error) {
 	println("dns: ExchangeConn: this function is deprecated")
 	co := new(Conn)
@@ -453,11 +435,15 @@ func DialTimeoutWithTLS(network, address string, tlsConfig *tls.Config, timeout
 // context, if present. If there is both a context deadline and a configured
 // timeout on the client, the earliest of the two takes effect.
 func (c *Client) ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
-	conn, err := c.DialContext(ctx, a)
-	if err != nil {
-		return nil, 0, err
+	var timeout time.Duration
+	if deadline, ok := ctx.Deadline(); !ok {
+		timeout = 0
+	} else {
+		timeout = time.Until(deadline)
 	}
-	defer conn.Close()
-
-	return c.ExchangeWithConnContext(ctx, m, conn)
+	// not passing the context to the underlying calls, as the API does not support
+	// context. For timeouts you should set up Client.Dialer and call Client.Exchange.
+	// TODO(tmthrgd,miekg): this is a race condition.
+	c.Dialer = &net.Dialer{Timeout: timeout}
+	return c.Exchange(m, a)
 }
diff --git a/vendor/github.com/miekg/dns/clientconfig.go b/vendor/github.com/miekg/dns/clientconfig.go
index d00ac62..e11b630 100644
--- a/vendor/github.com/miekg/dns/clientconfig.go
+++ b/vendor/github.com/miekg/dns/clientconfig.go
@@ -68,7 +68,7 @@ func ClientConfigFromReader(resolvconf io.Reader) (*ClientConfig, error) {
 			}
 
 		case "search": // set search path to given servers
-			c.Search = cloneSlice(f[1:])
+			c.Search = append([]string(nil), f[1:]...)
 
 		case "options": // magic options
 			for _, s := range f[1:] {
diff --git a/vendor/github.com/miekg/dns/defaults.go b/vendor/github.com/miekg/dns/defaults.go
index 68e766c..d47b0b1 100644
--- a/vendor/github.com/miekg/dns/defaults.go
+++ b/vendor/github.com/miekg/dns/defaults.go
@@ -22,7 +22,8 @@ func (dns *Msg) SetReply(request *Msg) *Msg {
 	}
 	dns.Rcode = RcodeSuccess
 	if len(request.Question) > 0 {
-		dns.Question = []Question{request.Question[0]}
+		dns.Question = make([]Question, 1)
+		dns.Question[0] = request.Question[0]
 	}
 	return dns
 }
@@ -198,18 +199,16 @@ func IsDomainName(s string) (labels int, ok bool) {
 		off    int
 		begin  int
 		wasDot bool
-		escape bool
 	)
 	for i := 0; i < len(s); i++ {
 		switch s[i] {
 		case '\\':
-			escape = !escape
 			if off+1 > lenmsg {
 				return labels, false
 			}
 
 			// check for \DDD
-			if isDDD(s[i+1:]) {
+			if i+3 < len(s) && isDigit(s[i+1]) && isDigit(s[i+2]) && isDigit(s[i+3]) {
 				i += 3
 				begin += 3
 			} else {
@@ -219,12 +218,6 @@ func IsDomainName(s string) (labels int, ok bool) {
 
 			wasDot = false
 		case '.':
-			escape = false
-			if i == 0 && len(s) > 1 {
-				// leading dots are not legal except for the root zone
-				return labels, false
-			}
-
 			if wasDot {
 				// two dots back to back is not legal
 				return labels, false
@@ -246,13 +239,10 @@ func IsDomainName(s string) (labels int, ok bool) {
 			labels++
 			begin = i + 1
 		default:
-			escape = false
 			wasDot = false
 		}
 	}
-	if escape {
-		return labels, false
-	}
+
 	return labels, true
 }
 
@@ -277,39 +267,40 @@ func IsMsg(buf []byte) error {
 
 // IsFqdn checks if a domain name is fully qualified.
 func IsFqdn(s string) bool {
-	// Check for (and remove) a trailing dot, returning if there isn't one.
-	if s == "" || s[len(s)-1] != '.' {
+	s2 := strings.TrimSuffix(s, ".")
+	if s == s2 {
 		return false
 	}
-	s = s[:len(s)-1]
 
-	// If we don't have an escape sequence before the final dot, we know it's
-	// fully qualified and can return here.
-	if s == "" || s[len(s)-1] != '\\' {
-		return true
-	}
-
-	// Otherwise we have to check if the dot is escaped or not by checking if
-	// there are an odd or even number of escape sequences before the dot.
-	i := strings.LastIndexFunc(s, func(r rune) bool {
+	i := strings.LastIndexFunc(s2, func(r rune) bool {
 		return r != '\\'
 	})
-	return (len(s)-i)%2 != 0
+
+	// Test whether we have an even number of escape sequences before
+	// the dot or none.
+	return (len(s2)-i)%2 != 0
 }
 
-// IsRRset reports whether a set of RRs is a valid RRset as defined by RFC 2181.
-// This means the RRs need to have the same type, name, and class.
+// IsRRset checks if a set of RRs is a valid RRset as defined by RFC 2181.
+// This means the RRs need to have the same type, name, and class. Returns true
+// if the RR set is valid, otherwise false.
 func IsRRset(rrset []RR) bool {
 	if len(rrset) == 0 {
 		return false
 	}
+	if len(rrset) == 1 {
+		return true
+	}
+	rrHeader := rrset[0].Header()
+	rrType := rrHeader.Rrtype
+	rrClass := rrHeader.Class
+	rrName := rrHeader.Name
 
-	baseH := rrset[0].Header()
 	for _, rr := range rrset[1:] {
-		curH := rr.Header()
-		if curH.Rrtype != baseH.Rrtype || curH.Class != baseH.Class || curH.Name != baseH.Name {
+		curRRHeader := rr.Header()
+		if curRRHeader.Rrtype != rrType || curRRHeader.Class != rrClass || curRRHeader.Name != rrName {
 			// Mismatch between the records, so this is not a valid rrset for
-			// signing/verifying
+			//signing/verifying
 			return false
 		}
 	}
@@ -327,15 +318,9 @@ func Fqdn(s string) string {
 }
 
 // CanonicalName returns the domain name in canonical form. A name in canonical
-// form is lowercase and fully qualified. Only US-ASCII letters are affected. See
-// Section 6.2 in RFC 4034.
+// form is lowercase and fully qualified. See Section 6.2 in RFC 4034.
 func CanonicalName(s string) string {
-	return strings.Map(func(r rune) rune {
-		if r >= 'A' && r <= 'Z' {
-			r += 'a' - 'A'
-		}
-		return r
-	}, Fqdn(s))
+	return strings.ToLower(Fqdn(s))
 }
 
 // Copied from the official Go code.
diff --git a/vendor/github.com/miekg/dns/dnssec.go b/vendor/github.com/miekg/dns/dnssec.go
index ffdafce..8539aae 100644
--- a/vendor/github.com/miekg/dns/dnssec.go
+++ b/vendor/github.com/miekg/dns/dnssec.go
@@ -65,9 +65,6 @@ var AlgorithmToString = map[uint8]string{
 }
 
 // AlgorithmToHash is a map of algorithm crypto hash IDs to crypto.Hash's.
-// For newer algorithm that do their own hashing (i.e. ED25519) the returned value
-// is 0, implying no (external) hashing should occur. The non-exported identityHash is then
-// used.
 var AlgorithmToHash = map[uint8]crypto.Hash{
 	RSAMD5:           crypto.MD5, // Deprecated in RFC 6725
 	DSA:              crypto.SHA1,
@@ -77,7 +74,7 @@ var AlgorithmToHash = map[uint8]crypto.Hash{
 	ECDSAP256SHA256:  crypto.SHA256,
 	ECDSAP384SHA384:  crypto.SHA384,
 	RSASHA512:        crypto.SHA512,
-	ED25519:          0,
+	ED25519:          crypto.Hash(0),
 }
 
 // DNSSEC hashing algorithm codes.
@@ -128,6 +125,10 @@ type dnskeyWireFmt struct {
 	/* Nothing is left out */
 }
 
+func divRoundUp(a, b int) int {
+	return (a + b - 1) / b
+}
+
 // KeyTag calculates the keytag (or key-id) of the DNSKEY.
 func (k *DNSKEY) KeyTag() uint16 {
 	if k == nil {
@@ -136,12 +137,12 @@ func (k *DNSKEY) KeyTag() uint16 {
 	var keytag int
 	switch k.Algorithm {
 	case RSAMD5:
+		// Look at the bottom two bytes of the modules, which the last
+		// item in the pubkey.
 		// This algorithm has been deprecated, but keep this key-tag calculation.
-		// Look at the bottom two bytes of the modules, which the last item in the pubkey.
-		// See https://www.rfc-editor.org/errata/eid193 .
 		modulus, _ := fromBase64([]byte(k.PublicKey))
 		if len(modulus) > 1 {
-			x := binary.BigEndian.Uint16(modulus[len(modulus)-3:])
+			x := binary.BigEndian.Uint16(modulus[len(modulus)-2:])
 			keytag = int(x)
 		}
 	default:
@@ -250,6 +251,14 @@ func (d *DS) ToCDS() *CDS {
 // zero, it is used as-is, otherwise the TTL of the RRset is used as the
 // OrigTTL.
 func (rr *RRSIG) Sign(k crypto.Signer, rrset []RR) error {
+	if k == nil {
+		return ErrPrivKey
+	}
+	// s.Inception and s.Expiration may be 0 (rollover etc.), the rest must be set
+	if rr.KeyTag == 0 || len(rr.SignerName) == 0 || rr.Algorithm == 0 {
+		return ErrKey
+	}
+
 	h0 := rrset[0].Header()
 	rr.Hdr.Rrtype = TypeRRSIG
 	rr.Hdr.Name = h0.Name
@@ -264,18 +273,6 @@ func (rr *RRSIG) Sign(k crypto.Signer, rrset []RR) error {
 		rr.Labels-- // wildcard, remove from label count
 	}
 
-	return rr.signAsIs(k, rrset)
-}
-
-func (rr *RRSIG) signAsIs(k crypto.Signer, rrset []RR) error {
-	if k == nil {
-		return ErrPrivKey
-	}
-	// s.Inception and s.Expiration may be 0 (rollover etc.), the rest must be set
-	if rr.KeyTag == 0 || len(rr.SignerName) == 0 || rr.Algorithm == 0 {
-		return ErrKey
-	}
-
 	sigwire := new(rrsigWireFmt)
 	sigwire.TypeCovered = rr.TypeCovered
 	sigwire.Algorithm = rr.Algorithm
@@ -299,20 +296,35 @@ func (rr *RRSIG) signAsIs(k crypto.Signer, rrset []RR) error {
 		return err
 	}
 
-	h, cryptohash, err := hashFromAlgorithm(rr.Algorithm)
-	if err != nil {
-		return err
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return ErrAlg
 	}
 
 	switch rr.Algorithm {
+	case ED25519:
+		// ed25519 signs the raw message and performs hashing internally.
+		// All other supported signature schemes operate over the pre-hashed
+		// message, and thus ed25519 must be handled separately here.
+		//
+		// The raw message is passed directly into sign and crypto.Hash(0) is
+		// used to signal to the crypto.Signer that the data has not been hashed.
+		signature, err := sign(k, append(signdata, wire...), crypto.Hash(0), rr.Algorithm)
+		if err != nil {
+			return err
+		}
+
+		rr.Signature = toBase64(signature)
+		return nil
 	case RSAMD5, DSA, DSANSEC3SHA1:
 		// See RFC 6944.
 		return ErrAlg
 	default:
+		h := hash.New()
 		h.Write(signdata)
 		h.Write(wire)
 
-		signature, err := sign(k, h.Sum(nil), cryptohash, rr.Algorithm)
+		signature, err := sign(k, h.Sum(nil), hash, rr.Algorithm)
 		if err != nil {
 			return err
 		}
@@ -329,7 +341,7 @@ func sign(k crypto.Signer, hashed []byte, hash crypto.Hash, alg uint8) ([]byte,
 	}
 
 	switch alg {
-	case RSASHA1, RSASHA1NSEC3SHA1, RSASHA256, RSASHA512, ED25519:
+	case RSASHA1, RSASHA1NSEC3SHA1, RSASHA256, RSASHA512:
 		return signature, nil
 	case ECDSAP256SHA256, ECDSAP384SHA384:
 		ecdsaSignature := &struct {
@@ -350,6 +362,8 @@ func sign(k crypto.Signer, hashed []byte, hash crypto.Hash, alg uint8) ([]byte,
 		signature := intToBytes(ecdsaSignature.R, intlen)
 		signature = append(signature, intToBytes(ecdsaSignature.S, intlen)...)
 		return signature, nil
+	case ED25519:
+		return signature, nil
 	default:
 		return nil, ErrAlg
 	}
@@ -374,12 +388,9 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 	if rr.Algorithm != k.Algorithm {
 		return ErrKey
 	}
-
-	signerName := CanonicalName(rr.SignerName)
-	if !equal(signerName, k.Hdr.Name) {
+	if !strings.EqualFold(rr.SignerName, k.Hdr.Name) {
 		return ErrKey
 	}
-
 	if k.Protocol != 3 {
 		return ErrKey
 	}
@@ -391,18 +402,9 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 	}
 
 	// IsRRset checked that we have at least one RR and that the RRs in
-	// the set have consistent type, class, and name. Also check that type,
-	// class and name matches the RRSIG record.
-	// Also checks RFC 4035 5.3.1 the number of labels in the RRset owner
-	// name MUST be greater than or equal to the value in the RRSIG RR's Labels field.
-	// RFC 4035 5.3.1 Signer's Name MUST be the name of the zone that [contains the RRset].
-	// Since we don't have SOA info, checking suffix may be the best we can do...?
-	if h0 := rrset[0].Header(); h0.Class != rr.Hdr.Class ||
-		h0.Rrtype != rr.TypeCovered ||
-		uint8(CountLabel(h0.Name)) < rr.Labels ||
-		!equal(h0.Name, rr.Hdr.Name) ||
-		!strings.HasSuffix(CanonicalName(h0.Name), signerName) {
-
+	// the set have consistent type, class, and name. Also check that type and
+	// class matches the RRSIG record.
+	if h0 := rrset[0].Header(); h0.Class != rr.Hdr.Class || h0.Rrtype != rr.TypeCovered {
 		return ErrRRset
 	}
 
@@ -416,7 +418,7 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 	sigwire.Expiration = rr.Expiration
 	sigwire.Inception = rr.Inception
 	sigwire.KeyTag = rr.KeyTag
-	sigwire.SignerName = signerName
+	sigwire.SignerName = CanonicalName(rr.SignerName)
 	// Create the desired binary blob
 	signeddata := make([]byte, DefaultMsgSize)
 	n, err := packSigWire(sigwire, signeddata)
@@ -429,15 +431,15 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 		return err
 	}
 
-	sigbuf := rr.sigBuf() // Get the binary signature data
-	// TODO(miek)
-	// remove the domain name and assume its ours?
-	// if rr.Algorithm == PRIVATEDNS { // PRIVATEOID
-	// }
+	sigbuf := rr.sigBuf()           // Get the binary signature data
+	if rr.Algorithm == PRIVATEDNS { // PRIVATEOID
+		// TODO(miek)
+		// remove the domain name and assume its ours?
+	}
 
-	h, cryptohash, err := hashFromAlgorithm(rr.Algorithm)
-	if err != nil {
-		return err
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return ErrAlg
 	}
 
 	switch rr.Algorithm {
@@ -448,9 +450,10 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 			return ErrKey
 		}
 
+		h := hash.New()
 		h.Write(signeddata)
 		h.Write(wire)
-		return rsa.VerifyPKCS1v15(pubkey, cryptohash, h.Sum(nil), sigbuf)
+		return rsa.VerifyPKCS1v15(pubkey, hash, h.Sum(nil), sigbuf)
 
 	case ECDSAP256SHA256, ECDSAP384SHA384:
 		pubkey := k.publicKeyECDSA()
@@ -462,6 +465,7 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
 		r := new(big.Int).SetBytes(sigbuf[:len(sigbuf)/2])
 		s := new(big.Int).SetBytes(sigbuf[len(sigbuf)/2:])
 
+		h := hash.New()
 		h.Write(signeddata)
 		h.Write(wire)
 		if ecdsa.Verify(pubkey, h.Sum(nil), r, s) {
diff --git a/vendor/github.com/miekg/dns/dnssec_keyscan.go b/vendor/github.com/miekg/dns/dnssec_keyscan.go
index 9c9972d..f796581 100644
--- a/vendor/github.com/miekg/dns/dnssec_keyscan.go
+++ b/vendor/github.com/miekg/dns/dnssec_keyscan.go
@@ -37,8 +37,7 @@ func (k *DNSKEY) ReadPrivateKey(q io.Reader, file string) (crypto.PrivateKey, er
 		return nil, ErrPrivKey
 	}
 	// TODO(mg): check if the pubkey matches the private key
-	algoStr, _, _ := strings.Cut(m["algorithm"], " ")
-	algo, err := strconv.ParseUint(algoStr, 10, 8)
+	algo, err := strconv.ParseUint(strings.SplitN(m["algorithm"], " ", 2)[0], 10, 8)
 	if err != nil {
 		return nil, ErrPrivKey
 	}
@@ -160,7 +159,7 @@ func parseKey(r io.Reader, file string) (map[string]string, error) {
 			k = l.token
 		case zValue:
 			if k == "" {
-				return nil, &ParseError{file: file, err: "no private key seen", lex: l}
+				return nil, &ParseError{file, "no private key seen", l}
 			}
 
 			m[strings.ToLower(k)] = l.token
diff --git a/vendor/github.com/miekg/dns/doc.go b/vendor/github.com/miekg/dns/doc.go
index 586ab69..5c83f82 100644
--- a/vendor/github.com/miekg/dns/doc.go
+++ b/vendor/github.com/miekg/dns/doc.go
@@ -13,28 +13,28 @@ names in a message will result in a packing failure.
 Resource records are native types. They are not stored in wire format. Basic
 usage pattern for creating a new resource record:
 
-	r := new(dns.MX)
-	r.Hdr = dns.RR_Header{Name: "miek.nl.", Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: 3600}
-	r.Preference = 10
-	r.Mx = "mx.miek.nl."
+     r := new(dns.MX)
+     r.Hdr = dns.RR_Header{Name: "miek.nl.", Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: 3600}
+     r.Preference = 10
+     r.Mx = "mx.miek.nl."
 
 Or directly from a string:
 
-	mx, err := dns.NewRR("miek.nl. 3600 IN MX 10 mx.miek.nl.")
+     mx, err := dns.NewRR("miek.nl. 3600 IN MX 10 mx.miek.nl.")
 
 Or when the default origin (.) and TTL (3600) and class (IN) suit you:
 
-	mx, err := dns.NewRR("miek.nl MX 10 mx.miek.nl")
+     mx, err := dns.NewRR("miek.nl MX 10 mx.miek.nl")
 
 Or even:
 
-	mx, err := dns.NewRR("$ORIGIN nl.\nmiek 1H IN MX 10 mx.miek")
+     mx, err := dns.NewRR("$ORIGIN nl.\nmiek 1H IN MX 10 mx.miek")
 
 In the DNS messages are exchanged, these messages contain resource records
 (sets). Use pattern for creating a message:
 
-	m := new(dns.Msg)
-	m.SetQuestion("miek.nl.", dns.TypeMX)
+     m := new(dns.Msg)
+     m.SetQuestion("miek.nl.", dns.TypeMX)
 
 Or when not certain if the domain name is fully qualified:
 
@@ -45,17 +45,17 @@ records for the miek.nl. zone.
 
 The following is slightly more verbose, but more flexible:
 
-	m1 := new(dns.Msg)
-	m1.Id = dns.Id()
-	m1.RecursionDesired = true
-	m1.Question = make([]dns.Question, 1)
-	m1.Question[0] = dns.Question{"miek.nl.", dns.TypeMX, dns.ClassINET}
+     m1 := new(dns.Msg)
+     m1.Id = dns.Id()
+     m1.RecursionDesired = true
+     m1.Question = make([]dns.Question, 1)
+     m1.Question[0] = dns.Question{"miek.nl.", dns.TypeMX, dns.ClassINET}
 
 After creating a message it can be sent. Basic use pattern for synchronous
 querying the DNS at a server configured on 127.0.0.1 and port 53:
 
-	c := new(dns.Client)
-	in, rtt, err := c.Exchange(m1, "127.0.0.1:53")
+     c := new(dns.Client)
+     in, rtt, err := c.Exchange(m1, "127.0.0.1:53")
 
 Suppressing multiple outstanding queries (with the same question, type and
 class) is as easy as setting:
@@ -72,7 +72,7 @@ and port to use for the connection:
 		Port: 12345,
 		Zone: "",
 	}
-	c.Dialer = &net.Dialer{
+	c.Dialer := &net.Dialer{
 		Timeout: 200 * time.Millisecond,
 		LocalAddr: &laddr,
 	}
@@ -96,7 +96,7 @@ the Answer section:
 		// do something with t.Txt
 	}
 
-# Domain Name and TXT Character String Representations
+Domain Name and TXT Character String Representations
 
 Both domain names and TXT character strings are converted to presentation form
 both when unpacked and when converted to strings.
@@ -108,7 +108,7 @@ be escaped. Bytes below 32 and above 127 will be converted to \DDD form.
 For domain names, in addition to the above rules brackets, periods, spaces,
 semicolons and the at symbol are escaped.
 
-# DNSSEC
+DNSSEC
 
 DNSSEC (DNS Security Extension) adds a layer of security to the DNS. It uses
 public key cryptography to sign resource records. The public keys are stored in
@@ -117,12 +117,12 @@ DNSKEY records and the signatures in RRSIG records.
 Requesting DNSSEC information for a zone is done by adding the DO (DNSSEC OK)
 bit to a request.
 
-	m := new(dns.Msg)
-	m.SetEdns0(4096, true)
+     m := new(dns.Msg)
+     m.SetEdns0(4096, true)
 
 Signature generation, signature verification and key generation are all supported.
 
-# DYNAMIC UPDATES
+DYNAMIC UPDATES
 
 Dynamic updates reuses the DNS message format, but renames three of the
 sections. Question is Zone, Answer is Prerequisite, Authority is Update, only
@@ -133,30 +133,30 @@ certain resource records or names in a zone to specify if resource records
 should be added or removed. The table from RFC 2136 supplemented with the Go
 DNS function shows which functions exist to specify the prerequisites.
 
-	3.2.4 - Table Of Metavalues Used In Prerequisite Section
+ 3.2.4 - Table Of Metavalues Used In Prerequisite Section
 
-	 CLASS    TYPE     RDATA    Meaning                    Function
-	 --------------------------------------------------------------
-	 ANY      ANY      empty    Name is in use             dns.NameUsed
-	 ANY      rrset    empty    RRset exists (value indep) dns.RRsetUsed
-	 NONE     ANY      empty    Name is not in use         dns.NameNotUsed
-	 NONE     rrset    empty    RRset does not exist       dns.RRsetNotUsed
-	 zone     rrset    rr       RRset exists (value dep)   dns.Used
+  CLASS    TYPE     RDATA    Meaning                    Function
+  --------------------------------------------------------------
+  ANY      ANY      empty    Name is in use             dns.NameUsed
+  ANY      rrset    empty    RRset exists (value indep) dns.RRsetUsed
+  NONE     ANY      empty    Name is not in use         dns.NameNotUsed
+  NONE     rrset    empty    RRset does not exist       dns.RRsetNotUsed
+  zone     rrset    rr       RRset exists (value dep)   dns.Used
 
 The prerequisite section can also be left empty. If you have decided on the
 prerequisites you can tell what RRs should be added or deleted. The next table
 shows the options you have and what functions to call.
 
-	3.4.2.6 - Table Of Metavalues Used In Update Section
+ 3.4.2.6 - Table Of Metavalues Used In Update Section
 
-	 CLASS    TYPE     RDATA    Meaning                     Function
-	 ---------------------------------------------------------------
-	 ANY      ANY      empty    Delete all RRsets from name dns.RemoveName
-	 ANY      rrset    empty    Delete an RRset             dns.RemoveRRset
-	 NONE     rrset    rr       Delete an RR from RRset     dns.Remove
-	 zone     rrset    rr       Add to an RRset             dns.Insert
+  CLASS    TYPE     RDATA    Meaning                     Function
+  ---------------------------------------------------------------
+  ANY      ANY      empty    Delete all RRsets from name dns.RemoveName
+  ANY      rrset    empty    Delete an RRset             dns.RemoveRRset
+  NONE     rrset    rr       Delete an RR from RRset     dns.Remove
+  zone     rrset    rr       Add to an RRset             dns.Insert
 
-# TRANSACTION SIGNATURE
+TRANSACTION SIGNATURE
 
 An TSIG or transaction signature adds a HMAC TSIG record to each message sent.
 The supported algorithms include: HmacSHA1, HmacSHA256 and HmacSHA512.
@@ -239,7 +239,7 @@ Basic use pattern validating and replying to a message that has TSIG set.
 		w.WriteMsg(m)
 	}
 
-# PRIVATE RRS
+PRIVATE RRS
 
 RFC 6895 sets aside a range of type codes for private use. This range is 65,280
 - 65,534 (0xFF00 - 0xFFFE). When experimenting with new Resource Records these
@@ -248,10 +248,10 @@ can be used, before requesting an official type code from IANA.
 See https://miek.nl/2014/september/21/idn-and-private-rr-in-go-dns/ for more
 information.
 
-# EDNS0
+EDNS0
 
 EDNS0 is an extension mechanism for the DNS defined in RFC 2671 and updated by
-RFC 6891. It defines a new RR type, the OPT RR, which is then completely
+RFC 6891. It defines an new RR type, the OPT RR, which is then completely
 abused.
 
 Basic use pattern for creating an (empty) OPT RR:
@@ -279,9 +279,9 @@ SIG(0)
 
 From RFC 2931:
 
-	SIG(0) provides protection for DNS transactions and requests ....
-	... protection for glue records, DNS requests, protection for message headers
-	on requests and responses, and protection of the overall integrity of a response.
+    SIG(0) provides protection for DNS transactions and requests ....
+    ... protection for glue records, DNS requests, protection for message headers
+    on requests and responses, and protection of the overall integrity of a response.
 
 It works like TSIG, except that SIG(0) uses public key cryptography, instead of
 the shared secret approach in TSIG. Supported algorithms: ECDSAP256SHA256,
diff --git a/vendor/github.com/miekg/dns/edns.go b/vendor/github.com/miekg/dns/edns.go
index 91793b9..c918178 100644
--- a/vendor/github.com/miekg/dns/edns.go
+++ b/vendor/github.com/miekg/dns/edns.go
@@ -14,7 +14,6 @@ const (
 	EDNS0LLQ          = 0x1     // long lived queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
 	EDNS0UL           = 0x2     // update lease draft: http://files.dns-sd.org/draft-sekar-dns-ul.txt
 	EDNS0NSID         = 0x3     // nsid (See RFC 5001)
-	EDNS0ESU          = 0x4     // ENUM Source-URI draft: https://datatracker.ietf.org/doc/html/draft-kaplan-enum-source-uri-00
 	EDNS0DAU          = 0x5     // DNSSEC Algorithm Understood
 	EDNS0DHU          = 0x6     // DS Hash Understood
 	EDNS0N3U          = 0x7     // NSEC3 Hash Understood
@@ -27,7 +26,6 @@ const (
 	EDNS0LOCALSTART   = 0xFDE9  // Beginning of range reserved for local/experimental use (See RFC 6891)
 	EDNS0LOCALEND     = 0xFFFE  // End of range reserved for local/experimental use (See RFC 6891)
 	_DO               = 1 << 15 // DNSSEC OK
-	_CO               = 1 << 14 // Compact Answers OK
 )
 
 // makeDataOpt is used to unpack the EDNS0 option(s) from a message.
@@ -58,8 +56,6 @@ func makeDataOpt(code uint16) EDNS0 {
 		return new(EDNS0_PADDING)
 	case EDNS0EDE:
 		return new(EDNS0_EDE)
-	case EDNS0ESU:
-		return new(EDNS0_ESU)
 	default:
 		e := new(EDNS0_LOCAL)
 		e.Code = code
@@ -67,7 +63,8 @@ func makeDataOpt(code uint16) EDNS0 {
 	}
 }
 
-// OPT is the EDNS0 RR appended to messages to convey extra (meta) information. See RFC 6891.
+// OPT is the EDNS0 RR appended to messages to convey extra (meta) information.
+// See RFC 6891.
 type OPT struct {
 	Hdr    RR_Header
 	Option []EDNS0 `dns:"opt"`
@@ -76,16 +73,9 @@ type OPT struct {
 func (rr *OPT) String() string {
 	s := "\n;; OPT PSEUDOSECTION:\n; EDNS: version " + strconv.Itoa(int(rr.Version())) + "; "
 	if rr.Do() {
-		if rr.Co() {
-			s += "flags: do, co; "
-		} else {
-			s += "flags: do; "
-		}
+		s += "flags: do; "
 	} else {
-		s += "flags:; "
-	}
-	if rr.Hdr.Ttl&0x7FFF != 0 {
-		s += fmt.Sprintf("MBZ: 0x%04x, ", rr.Hdr.Ttl&0x7FFF)
+		s += "flags: ; "
 	}
 	s += "udp: " + strconv.Itoa(int(rr.UDPSize()))
 
@@ -105,10 +95,6 @@ func (rr *OPT) String() string {
 			s += "\n; SUBNET: " + o.String()
 		case *EDNS0_COOKIE:
 			s += "\n; COOKIE: " + o.String()
-		case *EDNS0_EXPIRE:
-			s += "\n; EXPIRE: " + o.String()
-		case *EDNS0_TCP_KEEPALIVE:
-			s += "\n; KEEPALIVE: " + o.String()
 		case *EDNS0_UL:
 			s += "\n; UPDATE LEASE: " + o.String()
 		case *EDNS0_LLQ:
@@ -125,8 +111,6 @@ func (rr *OPT) String() string {
 			s += "\n; PADDING: " + o.String()
 		case *EDNS0_EDE:
 			s += "\n; EDE: " + o.String()
-		case *EDNS0_ESU:
-			s += "\n; ESU: " + o.String()
 		}
 	}
 	return s
@@ -148,6 +132,8 @@ func (*OPT) parse(c *zlexer, origin string) *ParseError {
 
 func (rr *OPT) isDuplicate(r2 RR) bool { return false }
 
+// return the old value -> delete SetVersion?
+
 // Version returns the EDNS version used. Only zero is defined.
 func (rr *OPT) Version() uint8 {
 	return uint8(rr.Hdr.Ttl & 0x00FF0000 >> 16)
@@ -187,7 +173,7 @@ func (rr *OPT) Do() bool {
 
 // SetDo sets the DO (DNSSEC OK) bit.
 // If we pass an argument, set the DO bit to that value.
-// It is possible to pass 2 or more arguments, but they will be ignored.
+// It is possible to pass 2 or more arguments. Any arguments after the 1st is silently ignored.
 func (rr *OPT) SetDo(do ...bool) {
 	if len(do) == 1 {
 		if do[0] {
@@ -200,34 +186,14 @@ func (rr *OPT) SetDo(do ...bool) {
 	}
 }
 
-// Co returns the value of the CO (Compact Answers OK) bit.
-func (rr *OPT) Co() bool {
-	return rr.Hdr.Ttl&_CO == _CO
-}
-
-// SetCo sets the CO (Compact Answers OK) bit.
-// If we pass an argument, set the CO bit to that value.
-// It is possible to pass 2 or more arguments, but they will be ignored.
-func (rr *OPT) SetCo(co ...bool) {
-	if len(co) == 1 {
-		if co[0] {
-			rr.Hdr.Ttl |= _CO
-		} else {
-			rr.Hdr.Ttl &^= _CO
-		}
-	} else {
-		rr.Hdr.Ttl |= _CO
-	}
-}
-
-// Z returns the Z part of the OPT RR as a uint16 with only the 14 least significant bits used.
+// Z returns the Z part of the OPT RR as a uint16 with only the 15 least significant bits used.
 func (rr *OPT) Z() uint16 {
-	return uint16(rr.Hdr.Ttl & 0x3FFF)
+	return uint16(rr.Hdr.Ttl & 0x7FFF)
 }
 
-// SetZ sets the Z part of the OPT RR, note only the 14 least significant bits of z are used.
+// SetZ sets the Z part of the OPT RR, note only the 15 least significant bits of z are used.
 func (rr *OPT) SetZ(z uint16) {
-	rr.Hdr.Ttl = rr.Hdr.Ttl&^0x3FFF | uint32(z&0x3FFF)
+	rr.Hdr.Ttl = rr.Hdr.Ttl&^0x7FFF | uint32(z&0x7FFF)
 }
 
 // EDNS0 defines an EDNS0 Option. An OPT RR can have multiple options appended to it.
@@ -258,8 +224,8 @@ type EDNS0 interface {
 //	e.Nsid = "AA"
 //	o.Option = append(o.Option, e)
 type EDNS0_NSID struct {
-	Code uint16 // always EDNS0NSID
-	Nsid string // string needs to be hex encoded
+	Code uint16 // Always EDNS0NSID
+	Nsid string // This string needs to be hex encoded
 }
 
 func (e *EDNS0_NSID) pack() ([]byte, error) {
@@ -285,7 +251,7 @@ func (e *EDNS0_NSID) copy() EDNS0           { return &EDNS0_NSID{e.Code, e.Nsid}
 //	o.Hdr.Name = "."
 //	o.Hdr.Rrtype = dns.TypeOPT
 //	e := new(dns.EDNS0_SUBNET)
-//	e.Code = dns.EDNS0SUBNET // by default this is filled in through unpacking OPT packets (unpackDataOpt)
+//	e.Code = dns.EDNS0SUBNET
 //	e.Family = 1	// 1 for IPv4 source address, 2 for IPv6
 //	e.SourceNetmask = 32	// 32 for IPV4, 128 for IPv6
 //	e.SourceScope = 0
@@ -297,7 +263,7 @@ func (e *EDNS0_NSID) copy() EDNS0           { return &EDNS0_NSID{e.Code, e.Nsid}
 // When packing it will apply SourceNetmask. If you need more advanced logic,
 // patches welcome and good luck.
 type EDNS0_SUBNET struct {
-	Code          uint16 // always EDNS0SUBNET
+	Code          uint16 // Always EDNS0SUBNET
 	Family        uint16 // 1 for IP, 2 for IP6
 	SourceNetmask uint8
 	SourceScope   uint8
@@ -421,8 +387,8 @@ func (e *EDNS0_SUBNET) copy() EDNS0 {
 //
 // There is no guarantee that the Cookie string has a specific length.
 type EDNS0_COOKIE struct {
-	Code   uint16 // always EDNS0COOKIE
-	Cookie string // hex encoded cookie data
+	Code   uint16 // Always EDNS0COOKIE
+	Cookie string // Hex-encoded cookie data
 }
 
 func (e *EDNS0_COOKIE) pack() ([]byte, error) {
@@ -452,7 +418,7 @@ func (e *EDNS0_COOKIE) copy() EDNS0           { return &EDNS0_COOKIE{e.Code, e.C
 //	e.Lease = 120 // in seconds
 //	o.Option = append(o.Option, e)
 type EDNS0_UL struct {
-	Code     uint16 // always EDNS0UL
+	Code     uint16 // Always EDNS0UL
 	Lease    uint32
 	KeyLease uint32
 }
@@ -491,7 +457,7 @@ func (e *EDNS0_UL) unpack(b []byte) error {
 // EDNS0_LLQ stands for Long Lived Queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
 // Implemented for completeness, as the EDNS0 type code is assigned.
 type EDNS0_LLQ struct {
-	Code      uint16 // always EDNS0LLQ
+	Code      uint16 // Always EDNS0LLQ
 	Version   uint16
 	Opcode    uint16
 	Error     uint16
@@ -530,21 +496,20 @@ func (e *EDNS0_LLQ) String() string {
 		" " + strconv.FormatUint(uint64(e.LeaseLife), 10)
 	return s
 }
-
 func (e *EDNS0_LLQ) copy() EDNS0 {
 	return &EDNS0_LLQ{e.Code, e.Version, e.Opcode, e.Error, e.Id, e.LeaseLife}
 }
 
 // EDNS0_DAU implements the EDNS0 "DNSSEC Algorithm Understood" option. See RFC 6975.
 type EDNS0_DAU struct {
-	Code    uint16 // always EDNS0DAU
+	Code    uint16 // Always EDNS0DAU
 	AlgCode []uint8
 }
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_DAU) Option() uint16        { return EDNS0DAU }
-func (e *EDNS0_DAU) pack() ([]byte, error) { return cloneSlice(e.AlgCode), nil }
-func (e *EDNS0_DAU) unpack(b []byte) error { e.AlgCode = cloneSlice(b); return nil }
+func (e *EDNS0_DAU) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_DAU) unpack(b []byte) error { e.AlgCode = b; return nil }
 
 func (e *EDNS0_DAU) String() string {
 	s := ""
@@ -561,14 +526,14 @@ func (e *EDNS0_DAU) copy() EDNS0 { return &EDNS0_DAU{e.Code, e.AlgCode} }
 
 // EDNS0_DHU implements the EDNS0 "DS Hash Understood" option. See RFC 6975.
 type EDNS0_DHU struct {
-	Code    uint16 // always EDNS0DHU
+	Code    uint16 // Always EDNS0DHU
 	AlgCode []uint8
 }
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_DHU) Option() uint16        { return EDNS0DHU }
-func (e *EDNS0_DHU) pack() ([]byte, error) { return cloneSlice(e.AlgCode), nil }
-func (e *EDNS0_DHU) unpack(b []byte) error { e.AlgCode = cloneSlice(b); return nil }
+func (e *EDNS0_DHU) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_DHU) unpack(b []byte) error { e.AlgCode = b; return nil }
 
 func (e *EDNS0_DHU) String() string {
 	s := ""
@@ -585,14 +550,14 @@ func (e *EDNS0_DHU) copy() EDNS0 { return &EDNS0_DHU{e.Code, e.AlgCode} }
 
 // EDNS0_N3U implements the EDNS0 "NSEC3 Hash Understood" option. See RFC 6975.
 type EDNS0_N3U struct {
-	Code    uint16 // always EDNS0N3U
+	Code    uint16 // Always EDNS0N3U
 	AlgCode []uint8
 }
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_N3U) Option() uint16        { return EDNS0N3U }
-func (e *EDNS0_N3U) pack() ([]byte, error) { return cloneSlice(e.AlgCode), nil }
-func (e *EDNS0_N3U) unpack(b []byte) error { e.AlgCode = cloneSlice(b); return nil }
+func (e *EDNS0_N3U) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_N3U) unpack(b []byte) error { e.AlgCode = b; return nil }
 
 func (e *EDNS0_N3U) String() string {
 	// Re-use the hash map
@@ -610,19 +575,16 @@ func (e *EDNS0_N3U) copy() EDNS0 { return &EDNS0_N3U{e.Code, e.AlgCode} }
 
 // EDNS0_EXPIRE implements the EDNS0 option as described in RFC 7314.
 type EDNS0_EXPIRE struct {
-	Code   uint16 // always EDNS0EXPIRE
+	Code   uint16 // Always EDNS0EXPIRE
 	Expire uint32
-	Empty  bool // Empty is used to signal an empty Expire option in a backwards compatible way, it's not used on the wire.
 }
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_EXPIRE) Option() uint16 { return EDNS0EXPIRE }
-func (e *EDNS0_EXPIRE) copy() EDNS0    { return &EDNS0_EXPIRE{e.Code, e.Expire, e.Empty} }
+func (e *EDNS0_EXPIRE) String() string { return strconv.FormatUint(uint64(e.Expire), 10) }
+func (e *EDNS0_EXPIRE) copy() EDNS0    { return &EDNS0_EXPIRE{e.Code, e.Expire} }
 
 func (e *EDNS0_EXPIRE) pack() ([]byte, error) {
-	if e.Empty {
-		return []byte{}, nil
-	}
 	b := make([]byte, 4)
 	binary.BigEndian.PutUint32(b, e.Expire)
 	return b, nil
@@ -631,24 +593,15 @@ func (e *EDNS0_EXPIRE) pack() ([]byte, error) {
 func (e *EDNS0_EXPIRE) unpack(b []byte) error {
 	if len(b) == 0 {
 		// zero-length EXPIRE query, see RFC 7314 Section 2
-		e.Empty = true
 		return nil
 	}
 	if len(b) < 4 {
 		return ErrBuf
 	}
 	e.Expire = binary.BigEndian.Uint32(b)
-	e.Empty = false
 	return nil
 }
 
-func (e *EDNS0_EXPIRE) String() (s string) {
-	if e.Empty {
-		return ""
-	}
-	return strconv.FormatUint(uint64(e.Expire), 10)
-}
-
 // The EDNS0_LOCAL option is used for local/experimental purposes. The option
 // code is recommended to be within the range [EDNS0LOCALSTART, EDNS0LOCALEND]
 // (RFC6891), although any unassigned code can actually be used.  The content of
@@ -669,73 +622,87 @@ type EDNS0_LOCAL struct {
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_LOCAL) Option() uint16 { return e.Code }
-
 func (e *EDNS0_LOCAL) String() string {
 	return strconv.FormatInt(int64(e.Code), 10) + ":0x" + hex.EncodeToString(e.Data)
 }
-
 func (e *EDNS0_LOCAL) copy() EDNS0 {
-	return &EDNS0_LOCAL{e.Code, cloneSlice(e.Data)}
+	b := make([]byte, len(e.Data))
+	copy(b, e.Data)
+	return &EDNS0_LOCAL{e.Code, b}
 }
 
 func (e *EDNS0_LOCAL) pack() ([]byte, error) {
-	return cloneSlice(e.Data), nil
+	b := make([]byte, len(e.Data))
+	copied := copy(b, e.Data)
+	if copied != len(e.Data) {
+		return nil, ErrBuf
+	}
+	return b, nil
 }
 
 func (e *EDNS0_LOCAL) unpack(b []byte) error {
-	e.Data = cloneSlice(b)
+	e.Data = make([]byte, len(b))
+	copied := copy(e.Data, b)
+	if copied != len(b) {
+		return ErrBuf
+	}
 	return nil
 }
 
 // EDNS0_TCP_KEEPALIVE is an EDNS0 option that instructs the server to keep
 // the TCP connection alive. See RFC 7828.
 type EDNS0_TCP_KEEPALIVE struct {
-	Code uint16 // always EDNSTCPKEEPALIVE
-
-	// Timeout is an idle timeout value for the TCP connection, specified in
-	// units of 100 milliseconds, encoded in network byte order. If set to 0,
-	// pack will return a nil slice.
-	Timeout uint16
-
-	// Length is the option's length.
-	// Deprecated: this field is deprecated and is always equal to 0.
-	Length uint16
+	Code    uint16 // Always EDNSTCPKEEPALIVE
+	Length  uint16 // the value 0 if the TIMEOUT is omitted, the value 2 if it is present;
+	Timeout uint16 // an idle timeout value for the TCP connection, specified in units of 100 milliseconds, encoded in network byte order.
 }
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_TCP_KEEPALIVE) Option() uint16 { return EDNS0TCPKEEPALIVE }
 
 func (e *EDNS0_TCP_KEEPALIVE) pack() ([]byte, error) {
-	if e.Timeout > 0 {
-		b := make([]byte, 2)
-		binary.BigEndian.PutUint16(b, e.Timeout)
-		return b, nil
+	if e.Timeout != 0 && e.Length != 2 {
+		return nil, errors.New("dns: timeout specified but length is not 2")
 	}
-	return nil, nil
+	if e.Timeout == 0 && e.Length != 0 {
+		return nil, errors.New("dns: timeout not specified but length is not 0")
+	}
+	b := make([]byte, 4+e.Length)
+	binary.BigEndian.PutUint16(b[0:], e.Code)
+	binary.BigEndian.PutUint16(b[2:], e.Length)
+	if e.Length == 2 {
+		binary.BigEndian.PutUint16(b[4:], e.Timeout)
+	}
+	return b, nil
 }
 
 func (e *EDNS0_TCP_KEEPALIVE) unpack(b []byte) error {
-	switch len(b) {
-	case 0:
-	case 2:
-		e.Timeout = binary.BigEndian.Uint16(b)
-	default:
-		return fmt.Errorf("dns: length mismatch, want 0/2 but got %d", len(b))
+	if len(b) < 4 {
+		return ErrBuf
+	}
+	e.Length = binary.BigEndian.Uint16(b[2:4])
+	if e.Length != 0 && e.Length != 2 {
+		return errors.New("dns: length mismatch, want 0/2 but got " + strconv.FormatUint(uint64(e.Length), 10))
+	}
+	if e.Length == 2 {
+		if len(b) < 6 {
+			return ErrBuf
+		}
+		e.Timeout = binary.BigEndian.Uint16(b[4:6])
 	}
 	return nil
 }
 
-func (e *EDNS0_TCP_KEEPALIVE) String() string {
-	s := "use tcp keep-alive"
-	if e.Timeout == 0 {
+func (e *EDNS0_TCP_KEEPALIVE) String() (s string) {
+	s = "use tcp keep-alive"
+	if e.Length == 0 {
 		s += ", timeout omitted"
 	} else {
 		s += fmt.Sprintf(", timeout %dms", e.Timeout*100)
 	}
-	return s
+	return
 }
-
-func (e *EDNS0_TCP_KEEPALIVE) copy() EDNS0 { return &EDNS0_TCP_KEEPALIVE{e.Code, e.Timeout, e.Length} }
+func (e *EDNS0_TCP_KEEPALIVE) copy() EDNS0 { return &EDNS0_TCP_KEEPALIVE{e.Code, e.Length, e.Timeout} }
 
 // EDNS0_PADDING option is used to add padding to a request/response. The default
 // value of padding SHOULD be 0x0 but other values MAY be used, for instance if
@@ -746,10 +713,14 @@ type EDNS0_PADDING struct {
 
 // Option implements the EDNS0 interface.
 func (e *EDNS0_PADDING) Option() uint16        { return EDNS0PADDING }
-func (e *EDNS0_PADDING) pack() ([]byte, error) { return cloneSlice(e.Padding), nil }
-func (e *EDNS0_PADDING) unpack(b []byte) error { e.Padding = cloneSlice(b); return nil }
+func (e *EDNS0_PADDING) pack() ([]byte, error) { return e.Padding, nil }
+func (e *EDNS0_PADDING) unpack(b []byte) error { e.Padding = b; return nil }
 func (e *EDNS0_PADDING) String() string        { return fmt.Sprintf("%0X", e.Padding) }
-func (e *EDNS0_PADDING) copy() EDNS0           { return &EDNS0_PADDING{cloneSlice(e.Padding)} }
+func (e *EDNS0_PADDING) copy() EDNS0 {
+	b := make([]byte, len(e.Padding))
+	copy(b, e.Padding)
+	return &EDNS0_PADDING{b}
+}
 
 // Extended DNS Error Codes (RFC 8914).
 const (
@@ -778,48 +749,36 @@ const (
 	ExtendedErrorCodeNoReachableAuthority
 	ExtendedErrorCodeNetworkError
 	ExtendedErrorCodeInvalidData
-	ExtendedErrorCodeSignatureExpiredBeforeValid
-	ExtendedErrorCodeTooEarly
-	ExtendedErrorCodeUnsupportedNSEC3IterValue
-	ExtendedErrorCodeUnableToConformToPolicy
-	ExtendedErrorCodeSynthesized
-	ExtendedErrorCodeInvalidQueryType
 )
 
 // ExtendedErrorCodeToString maps extended error info codes to a human readable
 // description.
 var ExtendedErrorCodeToString = map[uint16]string{
-	ExtendedErrorCodeOther:                       "Other",
-	ExtendedErrorCodeUnsupportedDNSKEYAlgorithm:  "Unsupported DNSKEY Algorithm",
-	ExtendedErrorCodeUnsupportedDSDigestType:     "Unsupported DS Digest Type",
-	ExtendedErrorCodeStaleAnswer:                 "Stale Answer",
-	ExtendedErrorCodeForgedAnswer:                "Forged Answer",
-	ExtendedErrorCodeDNSSECIndeterminate:         "DNSSEC Indeterminate",
-	ExtendedErrorCodeDNSBogus:                    "DNSSEC Bogus",
-	ExtendedErrorCodeSignatureExpired:            "Signature Expired",
-	ExtendedErrorCodeSignatureNotYetValid:        "Signature Not Yet Valid",
-	ExtendedErrorCodeDNSKEYMissing:               "DNSKEY Missing",
-	ExtendedErrorCodeRRSIGsMissing:               "RRSIGs Missing",
-	ExtendedErrorCodeNoZoneKeyBitSet:             "No Zone Key Bit Set",
-	ExtendedErrorCodeNSECMissing:                 "NSEC Missing",
-	ExtendedErrorCodeCachedError:                 "Cached Error",
-	ExtendedErrorCodeNotReady:                    "Not Ready",
-	ExtendedErrorCodeBlocked:                     "Blocked",
-	ExtendedErrorCodeCensored:                    "Censored",
-	ExtendedErrorCodeFiltered:                    "Filtered",
-	ExtendedErrorCodeProhibited:                  "Prohibited",
-	ExtendedErrorCodeStaleNXDOMAINAnswer:         "Stale NXDOMAIN Answer",
-	ExtendedErrorCodeNotAuthoritative:            "Not Authoritative",
-	ExtendedErrorCodeNotSupported:                "Not Supported",
-	ExtendedErrorCodeNoReachableAuthority:        "No Reachable Authority",
-	ExtendedErrorCodeNetworkError:                "Network Error",
-	ExtendedErrorCodeInvalidData:                 "Invalid Data",
-	ExtendedErrorCodeSignatureExpiredBeforeValid: "Signature Expired Before Valid",
-	ExtendedErrorCodeTooEarly:                    "Too Early",
-	ExtendedErrorCodeUnsupportedNSEC3IterValue:   "Unsupported NSEC3 Iterations Value",
-	ExtendedErrorCodeUnableToConformToPolicy:     "Unable To Conform To Policy",
-	ExtendedErrorCodeSynthesized:                 "Synthesized",
-	ExtendedErrorCodeInvalidQueryType:            "Invalid Query Type",
+	ExtendedErrorCodeOther:                      "Other",
+	ExtendedErrorCodeUnsupportedDNSKEYAlgorithm: "Unsupported DNSKEY Algorithm",
+	ExtendedErrorCodeUnsupportedDSDigestType:    "Unsupported DS Digest Type",
+	ExtendedErrorCodeStaleAnswer:                "Stale Answer",
+	ExtendedErrorCodeForgedAnswer:               "Forged Answer",
+	ExtendedErrorCodeDNSSECIndeterminate:        "DNSSEC Indeterminate",
+	ExtendedErrorCodeDNSBogus:                   "DNSSEC Bogus",
+	ExtendedErrorCodeSignatureExpired:           "Signature Expired",
+	ExtendedErrorCodeSignatureNotYetValid:       "Signature Not Yet Valid",
+	ExtendedErrorCodeDNSKEYMissing:              "DNSKEY Missing",
+	ExtendedErrorCodeRRSIGsMissing:              "RRSIGs Missing",
+	ExtendedErrorCodeNoZoneKeyBitSet:            "No Zone Key Bit Set",
+	ExtendedErrorCodeNSECMissing:                "NSEC Missing",
+	ExtendedErrorCodeCachedError:                "Cached Error",
+	ExtendedErrorCodeNotReady:                   "Not Ready",
+	ExtendedErrorCodeBlocked:                    "Blocked",
+	ExtendedErrorCodeCensored:                   "Censored",
+	ExtendedErrorCodeFiltered:                   "Filtered",
+	ExtendedErrorCodeProhibited:                 "Prohibited",
+	ExtendedErrorCodeStaleNXDOMAINAnswer:        "Stale NXDOMAIN Answer",
+	ExtendedErrorCodeNotAuthoritative:           "Not Authoritative",
+	ExtendedErrorCodeNotSupported:               "Not Supported",
+	ExtendedErrorCodeNoReachableAuthority:       "No Reachable Authority",
+	ExtendedErrorCodeNetworkError:               "Network Error",
+	ExtendedErrorCodeInvalidData:                "Invalid Data",
 }
 
 // StringToExtendedErrorCode is a map from human readable descriptions to
@@ -848,7 +807,7 @@ func (e *EDNS0_EDE) String() string {
 func (e *EDNS0_EDE) pack() ([]byte, error) {
 	b := make([]byte, 2+len(e.ExtraText))
 	binary.BigEndian.PutUint16(b[0:], e.InfoCode)
-	copy(b[2:], e.ExtraText)
+	copy(b[2:], []byte(e.ExtraText))
 	return b, nil
 }
 
@@ -860,18 +819,3 @@ func (e *EDNS0_EDE) unpack(b []byte) error {
 	e.ExtraText = string(b[2:])
 	return nil
 }
-
-// The EDNS0_ESU option for ENUM Source-URI Extension.
-type EDNS0_ESU struct {
-	Code uint16 // always EDNS0ESU
-	Uri  string
-}
-
-func (e *EDNS0_ESU) Option() uint16        { return EDNS0ESU }
-func (e *EDNS0_ESU) String() string        { return e.Uri }
-func (e *EDNS0_ESU) copy() EDNS0           { return &EDNS0_ESU{e.Code, e.Uri} }
-func (e *EDNS0_ESU) pack() ([]byte, error) { return []byte(e.Uri), nil }
-func (e *EDNS0_ESU) unpack(b []byte) error {
-	e.Uri = string(b)
-	return nil
-}
diff --git a/vendor/github.com/miekg/dns/fuzz.go b/vendor/github.com/miekg/dns/fuzz.go
index 505ae43..57410ac 100644
--- a/vendor/github.com/miekg/dns/fuzz.go
+++ b/vendor/github.com/miekg/dns/fuzz.go
@@ -1,4 +1,3 @@
-//go:build fuzz
 // +build fuzz
 
 package dns
diff --git a/vendor/github.com/miekg/dns/generate.go b/vendor/github.com/miekg/dns/generate.go
index a81d2bc..ac8df34 100644
--- a/vendor/github.com/miekg/dns/generate.go
+++ b/vendor/github.com/miekg/dns/generate.go
@@ -35,17 +35,17 @@ func (zp *ZoneParser) generate(l lex) (RR, bool) {
 		token = token[:i]
 	}
 
-	startStr, endStr, ok := strings.Cut(token, "-")
-	if !ok {
+	sx := strings.SplitN(token, "-", 2)
+	if len(sx) != 2 {
 		return zp.setParseError("bad start-stop in $GENERATE range", l)
 	}
 
-	start, err := strconv.ParseInt(startStr, 10, 64)
+	start, err := strconv.ParseInt(sx[0], 10, 64)
 	if err != nil {
 		return zp.setParseError("bad start in $GENERATE range", l)
 	}
 
-	end, err := strconv.ParseInt(endStr, 10, 64)
+	end, err := strconv.ParseInt(sx[1], 10, 64)
 	if err != nil {
 		return zp.setParseError("bad stop in $GENERATE range", l)
 	}
@@ -54,7 +54,7 @@ func (zp *ZoneParser) generate(l lex) (RR, bool) {
 	}
 
 	// _BLANK
-	l, ok = zp.c.Next()
+	l, ok := zp.c.Next()
 	if !ok || l.value != zBlank {
 		return zp.setParseError("garbage after $GENERATE range", l)
 	}
@@ -116,7 +116,7 @@ func (r *generateReader) parseError(msg string, end int) *ParseError {
 	l.token = r.s[r.si-1 : end]
 	l.column += r.si // l.column starts one zBLANK before r.s
 
-	return &ParseError{file: r.file, err: msg, lex: l}
+	return &ParseError{r.file, msg, l}
 }
 
 func (r *generateReader) Read(p []byte) (int, error) {
@@ -211,16 +211,15 @@ func (r *generateReader) ReadByte() (byte, error) {
 func modToPrintf(s string) (string, int64, string) {
 	// Modifier is { offset [ ,width [ ,base ] ] } - provide default
 	// values for optional width and type, if necessary.
-	offStr, s, ok0 := strings.Cut(s, ",")
-	widthStr, s, ok1 := strings.Cut(s, ",")
-	base, _, ok2 := strings.Cut(s, ",")
-	if !ok0 {
-		widthStr = "0"
-	}
-	if !ok1 {
-		base = "d"
-	}
-	if ok2 {
+	var offStr, widthStr, base string
+	switch xs := strings.Split(s, ","); len(xs) {
+	case 1:
+		offStr, widthStr, base = xs[0], "0", "d"
+	case 2:
+		offStr, widthStr, base = xs[0], xs[1], "d"
+	case 3:
+		offStr, widthStr, base = xs[0], xs[1], xs[2]
+	default:
 		return "", 0, "bad modifier in $GENERATE"
 	}
 
@@ -235,8 +234,8 @@ func modToPrintf(s string) (string, int64, string) {
 		return "", 0, "bad offset in $GENERATE"
 	}
 
-	width, err := strconv.ParseUint(widthStr, 10, 8)
-	if err != nil {
+	width, err := strconv.ParseInt(widthStr, 10, 64)
+	if err != nil || width < 0 || width > 255 {
 		return "", 0, "bad width in $GENERATE"
 	}
 
diff --git a/vendor/github.com/miekg/dns/hash.go b/vendor/github.com/miekg/dns/hash.go
deleted file mode 100644
index 7d4183e..0000000
--- a/vendor/github.com/miekg/dns/hash.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"crypto"
-	"hash"
-)
-
-// identityHash will not hash, it only buffers the data written into it and returns it as-is.
-type identityHash struct {
-	b *bytes.Buffer
-}
-
-// Implement the hash.Hash interface.
-
-func (i identityHash) Write(b []byte) (int, error) { return i.b.Write(b) }
-func (i identityHash) Size() int                   { return i.b.Len() }
-func (i identityHash) BlockSize() int              { return 1024 }
-func (i identityHash) Reset()                      { i.b.Reset() }
-func (i identityHash) Sum(b []byte) []byte         { return append(b, i.b.Bytes()...) }
-
-func hashFromAlgorithm(alg uint8) (hash.Hash, crypto.Hash, error) {
-	hashnumber, ok := AlgorithmToHash[alg]
-	if !ok {
-		return nil, 0, ErrAlg
-	}
-	if hashnumber == 0 {
-		return identityHash{b: &bytes.Buffer{}}, hashnumber, nil
-	}
-	return hashnumber.New(), hashnumber, nil
-}
diff --git a/vendor/github.com/miekg/dns/labels.go b/vendor/github.com/miekg/dns/labels.go
index cd498d2..f9faacf 100644
--- a/vendor/github.com/miekg/dns/labels.go
+++ b/vendor/github.com/miekg/dns/labels.go
@@ -122,7 +122,7 @@ func Split(s string) []int {
 }
 
 // NextLabel returns the index of the start of the next label in the
-// string s starting at offset. A negative offset will cause a panic.
+// string s starting at offset.
 // The bool end is true when the end of the string has been reached.
 // Also see PrevLabel.
 func NextLabel(s string, offset int) (i int, end bool) {
diff --git a/vendor/github.com/miekg/dns/listen_no_reuseport.go b/vendor/github.com/miekg/dns/listen_no_reuseport.go
new file mode 100644
index 0000000..b920141
--- /dev/null
+++ b/vendor/github.com/miekg/dns/listen_no_reuseport.go
@@ -0,0 +1,23 @@
+// +build !go1.11 !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd
+
+package dns
+
+import "net"
+
+const supportsReusePort = false
+
+func listenTCP(network, addr string, reuseport bool) (net.Listener, error) {
+	if reuseport {
+		// TODO(tmthrgd): return an error?
+	}
+
+	return net.Listen(network, addr)
+}
+
+func listenUDP(network, addr string, reuseport bool) (net.PacketConn, error) {
+	if reuseport {
+		// TODO(tmthrgd): return an error?
+	}
+
+	return net.ListenPacket(network, addr)
+}
diff --git a/vendor/github.com/miekg/dns/listen_no_socket_options.go b/vendor/github.com/miekg/dns/listen_no_socket_options.go
deleted file mode 100644
index 9e4010b..0000000
--- a/vendor/github.com/miekg/dns/listen_no_socket_options.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd
-// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd
-
-package dns
-
-import (
-	"fmt"
-	"net"
-)
-
-const (
-	supportsReusePort = false
-	supportsReuseAddr = false
-)
-
-func listenTCP(network, addr string, reuseport, reuseaddr bool) (net.Listener, error) {
-	if reuseport || reuseaddr {
-		// TODO(tmthrgd): return an error?
-	}
-
-	return net.Listen(network, addr)
-}
-
-func listenUDP(network, addr string, reuseport, reuseaddr bool) (net.PacketConn, error) {
-	if reuseport || reuseaddr {
-		// TODO(tmthrgd): return an error?
-	}
-
-	return net.ListenPacket(network, addr)
-}
-
-// this is just for test compatibility
-func checkReuseport(fd uintptr) (bool, error) {
-	return false, fmt.Errorf("not supported")
-}
-
-// this is just for test compatibility
-func checkReuseaddr(fd uintptr) (bool, error) {
-	return false, fmt.Errorf("not supported")
-}
diff --git a/vendor/github.com/miekg/dns/listen_reuseport.go b/vendor/github.com/miekg/dns/listen_reuseport.go
new file mode 100644
index 0000000..fad195c
--- /dev/null
+++ b/vendor/github.com/miekg/dns/listen_reuseport.go
@@ -0,0 +1,44 @@
+// +build go1.11
+// +build aix darwin dragonfly freebsd linux netbsd openbsd
+
+package dns
+
+import (
+	"context"
+	"net"
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
+
+const supportsReusePort = true
+
+func reuseportControl(network, address string, c syscall.RawConn) error {
+	var opErr error
+	err := c.Control(func(fd uintptr) {
+		opErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
+	})
+	if err != nil {
+		return err
+	}
+
+	return opErr
+}
+
+func listenTCP(network, addr string, reuseport bool) (net.Listener, error) {
+	var lc net.ListenConfig
+	if reuseport {
+		lc.Control = reuseportControl
+	}
+
+	return lc.Listen(context.Background(), network, addr)
+}
+
+func listenUDP(network, addr string, reuseport bool) (net.PacketConn, error) {
+	var lc net.ListenConfig
+	if reuseport {
+		lc.Control = reuseportControl
+	}
+
+	return lc.ListenPacket(context.Background(), network, addr)
+}
diff --git a/vendor/github.com/miekg/dns/listen_socket_options.go b/vendor/github.com/miekg/dns/listen_socket_options.go
deleted file mode 100644
index 35dfc94..0000000
--- a/vendor/github.com/miekg/dns/listen_socket_options.go
+++ /dev/null
@@ -1,97 +0,0 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
-
-package dns
-
-import (
-	"context"
-	"net"
-	"syscall"
-
-	"golang.org/x/sys/unix"
-)
-
-const supportsReusePort = true
-
-func reuseportControl(network, address string, c syscall.RawConn) error {
-	var opErr error
-	err := c.Control(func(fd uintptr) {
-		opErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
-	})
-	if err != nil {
-		return err
-	}
-
-	return opErr
-}
-
-const supportsReuseAddr = true
-
-func reuseaddrControl(network, address string, c syscall.RawConn) error {
-	var opErr error
-	err := c.Control(func(fd uintptr) {
-		opErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
-	})
-	if err != nil {
-		return err
-	}
-
-	return opErr
-}
-
-func reuseaddrandportControl(network, address string, c syscall.RawConn) error {
-	err := reuseaddrControl(network, address, c)
-	if err != nil {
-		return err
-	}
-
-	return reuseportControl(network, address, c)
-}
-
-// this is just for test compatibility
-func checkReuseport(fd uintptr) (bool, error) {
-	v, err := unix.GetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT)
-	if err != nil {
-		return false, err
-	}
-
-	return v == 1, nil
-}
-
-// this is just for test compatibility
-func checkReuseaddr(fd uintptr) (bool, error) {
-	v, err := unix.GetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR)
-	if err != nil {
-		return false, err
-	}
-
-	return v == 1, nil
-}
-
-func listenTCP(network, addr string, reuseport, reuseaddr bool) (net.Listener, error) {
-	var lc net.ListenConfig
-	switch {
-	case reuseaddr && reuseport:
-		lc.Control = reuseaddrandportControl
-	case reuseport:
-		lc.Control = reuseportControl
-	case reuseaddr:
-		lc.Control = reuseaddrControl
-	}
-
-	return lc.Listen(context.Background(), network, addr)
-}
-
-func listenUDP(network, addr string, reuseport, reuseaddr bool) (net.PacketConn, error) {
-	var lc net.ListenConfig
-	switch {
-	case reuseaddr && reuseport:
-		lc.Control = reuseaddrandportControl
-	case reuseport:
-		lc.Control = reuseportControl
-	case reuseaddr:
-		lc.Control = reuseaddrControl
-	}
-
-	return lc.ListenPacket(context.Background(), network, addr)
-}
diff --git a/vendor/github.com/miekg/dns/msg.go b/vendor/github.com/miekg/dns/msg.go
index d87b532..ead4b69 100644
--- a/vendor/github.com/miekg/dns/msg.go
+++ b/vendor/github.com/miekg/dns/msg.go
@@ -136,19 +136,18 @@ var OpcodeToString = map[int]string{
 
 // RcodeToString maps Rcodes to strings.
 var RcodeToString = map[int]string{
-	RcodeSuccess:                    "NOERROR",
-	RcodeFormatError:                "FORMERR",
-	RcodeServerFailure:              "SERVFAIL",
-	RcodeNameError:                  "NXDOMAIN",
-	RcodeNotImplemented:             "NOTIMP",
-	RcodeRefused:                    "REFUSED",
-	RcodeYXDomain:                   "YXDOMAIN", // See RFC 2136
-	RcodeYXRrset:                    "YXRRSET",
-	RcodeNXRrset:                    "NXRRSET",
-	RcodeNotAuth:                    "NOTAUTH",
-	RcodeNotZone:                    "NOTZONE",
-	RcodeStatefulTypeNotImplemented: "DSOTYPENI",
-	RcodeBadSig:                     "BADSIG", // Also known as RcodeBadVers, see RFC 6891
+	RcodeSuccess:        "NOERROR",
+	RcodeFormatError:    "FORMERR",
+	RcodeServerFailure:  "SERVFAIL",
+	RcodeNameError:      "NXDOMAIN",
+	RcodeNotImplemented: "NOTIMP",
+	RcodeRefused:        "REFUSED",
+	RcodeYXDomain:       "YXDOMAIN", // See RFC 2136
+	RcodeYXRrset:        "YXRRSET",
+	RcodeNXRrset:        "NXRRSET",
+	RcodeNotAuth:        "NOTAUTH",
+	RcodeNotZone:        "NOTZONE",
+	RcodeBadSig:         "BADSIG", // Also known as RcodeBadVers, see RFC 6891
 	//	RcodeBadVers:        "BADVERS",
 	RcodeBadKey:    "BADKEY",
 	RcodeBadTime:   "BADTIME",
@@ -253,7 +252,7 @@ loop:
 			}
 
 			// check for \DDD
-			if isDDD(bs[i+1:]) {
+			if i+3 < ls && isDigit(bs[i+1]) && isDigit(bs[i+2]) && isDigit(bs[i+3]) {
 				bs[i] = dddToByte(bs[i+1:])
 				copy(bs[i+1:ls-3], bs[i+4:])
 				ls -= 3
@@ -266,11 +265,6 @@ loop:
 
 			wasDot = false
 		case '.':
-			if i == 0 && len(s) > 1 {
-				// leading dots are not legal except for the root zone
-				return len(msg), ErrRdata
-			}
-
 			if wasDot {
 				// two dots back to back is not legal
 				return len(msg), ErrRdata
@@ -449,7 +443,7 @@ Loop:
 	return string(s), off1, nil
 }
 
-func packTxt(txt []string, msg []byte, offset int) (int, error) {
+func packTxt(txt []string, msg []byte, offset int, tmp []byte) (int, error) {
 	if len(txt) == 0 {
 		if offset >= len(msg) {
 			return offset, ErrBuf
@@ -459,7 +453,10 @@ func packTxt(txt []string, msg []byte, offset int) (int, error) {
 	}
 	var err error
 	for _, s := range txt {
-		offset, err = packTxtString(s, msg, offset)
+		if len(s) > len(tmp) {
+			return offset, ErrBuf
+		}
+		offset, err = packTxtString(s, msg, offset, tmp)
 		if err != nil {
 			return offset, err
 		}
@@ -467,30 +464,32 @@ func packTxt(txt []string, msg []byte, offset int) (int, error) {
 	return offset, nil
 }
 
-func packTxtString(s string, msg []byte, offset int) (int, error) {
+func packTxtString(s string, msg []byte, offset int, tmp []byte) (int, error) {
 	lenByteOffset := offset
-	if offset >= len(msg) || len(s) > 256*4+1 /* If all \DDD */ {
+	if offset >= len(msg) || len(s) > len(tmp) {
 		return offset, ErrBuf
 	}
 	offset++
-	for i := 0; i < len(s); i++ {
+	bs := tmp[:len(s)]
+	copy(bs, s)
+	for i := 0; i < len(bs); i++ {
 		if len(msg) <= offset {
 			return offset, ErrBuf
 		}
-		if s[i] == '\\' {
+		if bs[i] == '\\' {
 			i++
-			if i == len(s) {
+			if i == len(bs) {
 				break
 			}
 			// check for \DDD
-			if isDDD(s[i:]) {
-				msg[offset] = dddToByte(s[i:])
+			if i+2 < len(bs) && isDigit(bs[i]) && isDigit(bs[i+1]) && isDigit(bs[i+2]) {
+				msg[offset] = dddToByte(bs[i:])
 				i += 2
 			} else {
-				msg[offset] = s[i]
+				msg[offset] = bs[i]
 			}
 		} else {
-			msg[offset] = s[i]
+			msg[offset] = bs[i]
 		}
 		offset++
 	}
@@ -502,28 +501,30 @@ func packTxtString(s string, msg []byte, offset int) (int, error) {
 	return offset, nil
 }
 
-func packOctetString(s string, msg []byte, offset int) (int, error) {
-	if offset >= len(msg) || len(s) > 256*4+1 {
+func packOctetString(s string, msg []byte, offset int, tmp []byte) (int, error) {
+	if offset >= len(msg) || len(s) > len(tmp) {
 		return offset, ErrBuf
 	}
-	for i := 0; i < len(s); i++ {
+	bs := tmp[:len(s)]
+	copy(bs, s)
+	for i := 0; i < len(bs); i++ {
 		if len(msg) <= offset {
 			return offset, ErrBuf
 		}
-		if s[i] == '\\' {
+		if bs[i] == '\\' {
 			i++
-			if i == len(s) {
+			if i == len(bs) {
 				break
 			}
 			// check for \DDD
-			if isDDD(s[i:]) {
-				msg[offset] = dddToByte(s[i:])
+			if i+2 < len(bs) && isDigit(bs[i]) && isDigit(bs[i+1]) && isDigit(bs[i+2]) {
+				msg[offset] = dddToByte(bs[i:])
 				i += 2
 			} else {
-				msg[offset] = s[i]
+				msg[offset] = bs[i]
 			}
 		} else {
-			msg[offset] = s[i]
+			msg[offset] = bs[i]
 		}
 		offset++
 	}
@@ -545,11 +546,12 @@ func unpackTxt(msg []byte, off0 int) (ss []string, off int, err error) {
 // Helpers for dealing with escaped bytes
 func isDigit(b byte) bool { return b >= '0' && b <= '9' }
 
-func isDDD[T ~[]byte | ~string](s T) bool {
-	return len(s) >= 3 && isDigit(s[0]) && isDigit(s[1]) && isDigit(s[2])
+func dddToByte(s []byte) byte {
+	_ = s[2] // bounds check hint to compiler; see golang.org/issue/14808
+	return byte((s[0]-'0')*100 + (s[1]-'0')*10 + (s[2] - '0'))
 }
 
-func dddToByte[T ~[]byte | ~string](s T) byte {
+func dddStringToByte(s string) byte {
 	_ = s[2] // bounds check hint to compiler; see golang.org/issue/14808
 	return byte((s[0]-'0')*100 + (s[1]-'0')*10 + (s[2] - '0'))
 }
@@ -673,9 +675,9 @@ func unpackRRslice(l int, msg []byte, off int) (dst1 []RR, off1 int, err error)
 
 // Convert a MsgHdr to a string, with dig-like headers:
 //
-// ;; opcode: QUERY, status: NOERROR, id: 48404
+//;; opcode: QUERY, status: NOERROR, id: 48404
 //
-// ;; flags: qr aa rd ra;
+//;; flags: qr aa rd ra;
 func (h *MsgHdr) String() string {
 	if h == nil {
 		return "<nil> MsgHdr"
@@ -715,7 +717,7 @@ func (h *MsgHdr) String() string {
 	return s
 }
 
-// Pack packs a Msg: it is converted to wire format.
+// Pack packs a Msg: it is converted to to wire format.
 // If the dns.Compress is true the message will be in compressed wire format.
 func (dns *Msg) Pack() (msg []byte, err error) {
 	return dns.PackBuffer(nil)
@@ -859,7 +861,7 @@ func (dns *Msg) unpack(dh Header, msg []byte, off int) (err error) {
 	// The header counts might have been wrong so we need to update it
 	dh.Nscount = uint16(len(dns.Ns))
 	if err == nil {
-		dns.Extra, _, err = unpackRRslice(int(dh.Arcount), msg, off)
+		dns.Extra, off, err = unpackRRslice(int(dh.Arcount), msg, off)
 	}
 	// The header counts might have been wrong so we need to update it
 	dh.Arcount = uint16(len(dns.Extra))
@@ -869,12 +871,13 @@ func (dns *Msg) unpack(dh Header, msg []byte, off int) (err error) {
 		dns.Rcode |= opt.ExtendedRcode()
 	}
 
-	// TODO(miek) make this an error?
-	// use PackOpt to let people tell how detailed the error reporting should be?
-	// if off != len(msg) {
-	// 	// println("dns: extra bytes in dns packet", off, "<", len(msg))
-	// }
+	if off != len(msg) {
+		// TODO(miek) make this an error?
+		// use PackOpt to let people tell how detailed the error reporting should be?
+		// println("dns: extra bytes in dns packet", off, "<", len(msg))
+	}
 	return err
+
 }
 
 // Unpack unpacks a binary message to a Msg structure.
@@ -894,38 +897,18 @@ func (dns *Msg) String() string {
 		return "<nil> MsgHdr"
 	}
 	s := dns.MsgHdr.String() + " "
-	if dns.MsgHdr.Opcode == OpcodeUpdate {
-		s += "ZONE: " + strconv.Itoa(len(dns.Question)) + ", "
-		s += "PREREQ: " + strconv.Itoa(len(dns.Answer)) + ", "
-		s += "UPDATE: " + strconv.Itoa(len(dns.Ns)) + ", "
-		s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
-	} else {
-		s += "QUERY: " + strconv.Itoa(len(dns.Question)) + ", "
-		s += "ANSWER: " + strconv.Itoa(len(dns.Answer)) + ", "
-		s += "AUTHORITY: " + strconv.Itoa(len(dns.Ns)) + ", "
-		s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
-	}
-	opt := dns.IsEdns0()
-	if opt != nil {
-		// OPT PSEUDOSECTION
-		s += opt.String() + "\n"
-	}
+	s += "QUERY: " + strconv.Itoa(len(dns.Question)) + ", "
+	s += "ANSWER: " + strconv.Itoa(len(dns.Answer)) + ", "
+	s += "AUTHORITY: " + strconv.Itoa(len(dns.Ns)) + ", "
+	s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
 	if len(dns.Question) > 0 {
-		if dns.MsgHdr.Opcode == OpcodeUpdate {
-			s += "\n;; ZONE SECTION:\n"
-		} else {
-			s += "\n;; QUESTION SECTION:\n"
-		}
+		s += "\n;; QUESTION SECTION:\n"
 		for _, r := range dns.Question {
 			s += r.String() + "\n"
 		}
 	}
 	if len(dns.Answer) > 0 {
-		if dns.MsgHdr.Opcode == OpcodeUpdate {
-			s += "\n;; PREREQUISITE SECTION:\n"
-		} else {
-			s += "\n;; ANSWER SECTION:\n"
-		}
+		s += "\n;; ANSWER SECTION:\n"
 		for _, r := range dns.Answer {
 			if r != nil {
 				s += r.String() + "\n"
@@ -933,21 +916,17 @@ func (dns *Msg) String() string {
 		}
 	}
 	if len(dns.Ns) > 0 {
-		if dns.MsgHdr.Opcode == OpcodeUpdate {
-			s += "\n;; UPDATE SECTION:\n"
-		} else {
-			s += "\n;; AUTHORITY SECTION:\n"
-		}
+		s += "\n;; AUTHORITY SECTION:\n"
 		for _, r := range dns.Ns {
 			if r != nil {
 				s += r.String() + "\n"
 			}
 		}
 	}
-	if len(dns.Extra) > 0 && (opt == nil || len(dns.Extra) > 1) {
+	if len(dns.Extra) > 0 {
 		s += "\n;; ADDITIONAL SECTION:\n"
 		for _, r := range dns.Extra {
-			if r != nil && r.Header().Rrtype != TypeOPT {
+			if r != nil {
 				s += r.String() + "\n"
 			}
 		}
@@ -1035,7 +1014,7 @@ func escapedNameLen(s string) int {
 			continue
 		}
 
-		if isDDD(s[i+1:]) {
+		if i+3 < len(s) && isDigit(s[i+1]) && isDigit(s[i+2]) && isDigit(s[i+3]) {
 			nameLen -= 3
 			i += 3
 		} else {
@@ -1076,8 +1055,8 @@ func (dns *Msg) CopyTo(r1 *Msg) *Msg {
 	r1.Compress = dns.Compress
 
 	if len(dns.Question) > 0 {
-		// TODO(miek): Question is an immutable value, ok to do a shallow-copy
-		r1.Question = cloneSlice(dns.Question)
+		r1.Question = make([]Question, len(dns.Question))
+		copy(r1.Question, dns.Question) // TODO(miek): Question is an immutable value, ok to do a shallow-copy
 	}
 
 	rrArr := make([]RR, len(dns.Answer)+len(dns.Ns)+len(dns.Extra))
diff --git a/vendor/github.com/miekg/dns/msg_helpers.go b/vendor/github.com/miekg/dns/msg_helpers.go
index acec21f..5904927 100644
--- a/vendor/github.com/miekg/dns/msg_helpers.go
+++ b/vendor/github.com/miekg/dns/msg_helpers.go
@@ -20,7 +20,9 @@ func unpackDataA(msg []byte, off int) (net.IP, int, error) {
 	if off+net.IPv4len > len(msg) {
 		return nil, len(msg), &Error{err: "overflow unpacking a"}
 	}
-	return cloneSlice(msg[off : off+net.IPv4len]), off + net.IPv4len, nil
+	a := append(make(net.IP, 0, net.IPv4len), msg[off:off+net.IPv4len]...)
+	off += net.IPv4len
+	return a, off, nil
 }
 
 func packDataA(a net.IP, msg []byte, off int) (int, error) {
@@ -45,7 +47,9 @@ func unpackDataAAAA(msg []byte, off int) (net.IP, int, error) {
 	if off+net.IPv6len > len(msg) {
 		return nil, len(msg), &Error{err: "overflow unpacking aaaa"}
 	}
-	return cloneSlice(msg[off : off+net.IPv6len]), off + net.IPv6len, nil
+	aaaa := append(make(net.IP, 0, net.IPv6len), msg[off:off+net.IPv6len]...)
+	off += net.IPv6len
+	return aaaa, off, nil
 }
 
 func packDataAAAA(aaaa net.IP, msg []byte, off int) (int, error) {
@@ -295,7 +299,8 @@ func unpackString(msg []byte, off int) (string, int, error) {
 }
 
 func packString(s string, msg []byte, off int) (int, error) {
-	off, err := packTxtString(s, msg, off)
+	txtTmp := make([]byte, 256*4+1)
+	off, err := packTxtString(s, msg, off, txtTmp)
 	if err != nil {
 		return len(msg), err
 	}
@@ -397,7 +402,8 @@ func unpackStringTxt(msg []byte, off int) ([]string, int, error) {
 }
 
 func packStringTxt(s []string, msg []byte, off int) (int, error) {
-	off, err := packTxt(s, msg, off)
+	txtTmp := make([]byte, 256*4+1) // If the whole string consists out of \DDD we need this many.
+	off, err := packTxt(s, msg, off, txtTmp)
 	if err != nil {
 		return len(msg), err
 	}
@@ -406,24 +412,29 @@ func packStringTxt(s []string, msg []byte, off int) (int, error) {
 
 func unpackDataOpt(msg []byte, off int) ([]EDNS0, int, error) {
 	var edns []EDNS0
-	for off < len(msg) {
-		if off+4 > len(msg) {
-			return nil, len(msg), &Error{err: "overflow unpacking opt"}
-		}
-		code := binary.BigEndian.Uint16(msg[off:])
-		off += 2
-		optlen := binary.BigEndian.Uint16(msg[off:])
-		off += 2
-		if off+int(optlen) > len(msg) {
-			return nil, len(msg), &Error{err: "overflow unpacking opt"}
-		}
-		opt := makeDataOpt(code)
-		if err := opt.unpack(msg[off : off+int(optlen)]); err != nil {
-			return nil, len(msg), err
-		}
-		edns = append(edns, opt)
-		off += int(optlen)
+Option:
+	var code uint16
+	if off+4 > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking opt"}
 	}
+	code = binary.BigEndian.Uint16(msg[off:])
+	off += 2
+	optlen := binary.BigEndian.Uint16(msg[off:])
+	off += 2
+	if off+int(optlen) > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking opt"}
+	}
+	e := makeDataOpt(code)
+	if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+		return nil, len(msg), err
+	}
+	edns = append(edns, e)
+	off += int(optlen)
+
+	if off < len(msg) {
+		goto Option
+	}
+
 	return edns, off, nil
 }
 
@@ -452,7 +463,8 @@ func unpackStringOctet(msg []byte, off int) (string, int, error) {
 }
 
 func packStringOctet(s string, msg []byte, off int) (int, error) {
-	off, err := packOctetString(s, msg, off)
+	txtTmp := make([]byte, 256*4+1)
+	off, err := packOctetString(s, msg, off, txtTmp)
 	if err != nil {
 		return len(msg), err
 	}
@@ -464,7 +476,7 @@ func unpackDataNsec(msg []byte, off int) ([]uint16, int, error) {
 	length, window, lastwindow := 0, 0, -1
 	for off < len(msg) {
 		if off+2 > len(msg) {
-			return nsec, len(msg), &Error{err: "overflow unpacking NSEC(3)"}
+			return nsec, len(msg), &Error{err: "overflow unpacking nsecx"}
 		}
 		window = int(msg[off])
 		length = int(msg[off+1])
@@ -472,17 +484,17 @@ func unpackDataNsec(msg []byte, off int) ([]uint16, int, error) {
 		if window <= lastwindow {
 			// RFC 4034: Blocks are present in the NSEC RR RDATA in
 			// increasing numerical order.
-			return nsec, len(msg), &Error{err: "out of order NSEC(3) block in type bitmap"}
+			return nsec, len(msg), &Error{err: "out of order NSEC block"}
 		}
 		if length == 0 {
 			// RFC 4034: Blocks with no types present MUST NOT be included.
-			return nsec, len(msg), &Error{err: "empty NSEC(3) block in type bitmap"}
+			return nsec, len(msg), &Error{err: "empty NSEC block"}
 		}
 		if length > 32 {
-			return nsec, len(msg), &Error{err: "NSEC(3) block too long in type bitmap"}
+			return nsec, len(msg), &Error{err: "NSEC block too long"}
 		}
 		if off+length > len(msg) {
-			return nsec, len(msg), &Error{err: "overflowing NSEC(3) block in type bitmap"}
+			return nsec, len(msg), &Error{err: "overflowing NSEC block"}
 		}
 
 		// Walk the bytes in the window and extract the type bits
@@ -546,16 +558,6 @@ func packDataNsec(bitmap []uint16, msg []byte, off int) (int, error) {
 	if len(bitmap) == 0 {
 		return off, nil
 	}
-	if off > len(msg) {
-		return off, &Error{err: "overflow packing nsec"}
-	}
-	toZero := msg[off:]
-	if maxLen := typeBitMapLen(bitmap); maxLen < len(toZero) {
-		toZero = toZero[:maxLen]
-	}
-	for i := range toZero {
-		toZero[i] = 0
-	}
 	var lastwindow, lastlength uint16
 	for _, t := range bitmap {
 		window := t / 256
@@ -613,7 +615,7 @@ func unpackDataSVCB(msg []byte, off int) ([]SVCBKeyValue, int, error) {
 }
 
 func packDataSVCB(pairs []SVCBKeyValue, msg []byte, off int) (int, error) {
-	pairs = cloneSlice(pairs)
+	pairs = append([]SVCBKeyValue(nil), pairs...)
 	sort.Slice(pairs, func(i, j int) bool {
 		return pairs[i].Key() < pairs[j].Key()
 	})
@@ -779,8 +781,6 @@ func unpackDataAplPrefix(msg []byte, off int) (APLPrefix, int, error) {
 	if off+afdlen > len(msg) {
 		return APLPrefix{}, len(msg), &Error{err: "overflow unpacking APL address"}
 	}
-
-	// Address MUST NOT contain trailing zero bytes per RFC3123 Sections 4.1 and 4.2.
 	off += copy(ip, msg[off:off+afdlen])
 	if afdlen > 0 {
 		last := ip[afdlen-1]
@@ -792,43 +792,13 @@ func unpackDataAplPrefix(msg []byte, off int) (APLPrefix, int, error) {
 		IP:   ip,
 		Mask: net.CIDRMask(int(prefix), 8*len(ip)),
 	}
+	network := ipnet.IP.Mask(ipnet.Mask)
+	if !network.Equal(ipnet.IP) {
+		return APLPrefix{}, len(msg), &Error{err: "invalid APL address length"}
+	}
 
 	return APLPrefix{
 		Negation: (nlen & 0x80) != 0,
 		Network:  ipnet,
 	}, off, nil
 }
-
-func unpackIPSECGateway(msg []byte, off int, gatewayType uint8) (net.IP, string, int, error) {
-	var retAddr net.IP
-	var retString string
-	var err error
-
-	switch gatewayType {
-	case IPSECGatewayNone: // do nothing
-	case IPSECGatewayIPv4:
-		retAddr, off, err = unpackDataA(msg, off)
-	case IPSECGatewayIPv6:
-		retAddr, off, err = unpackDataAAAA(msg, off)
-	case IPSECGatewayHost:
-		retString, off, err = UnpackDomainName(msg, off)
-	}
-
-	return retAddr, retString, off, err
-}
-
-func packIPSECGateway(gatewayAddr net.IP, gatewayString string, msg []byte, off int, gatewayType uint8, compression compressionMap, compress bool) (int, error) {
-	var err error
-
-	switch gatewayType {
-	case IPSECGatewayNone: // do nothing
-	case IPSECGatewayIPv4:
-		off, err = packDataA(gatewayAddr, msg, off)
-	case IPSECGatewayIPv6:
-		off, err = packDataAAAA(gatewayAddr, msg, off)
-	case IPSECGatewayHost:
-		off, err = packDomainName(gatewayString, msg, off, compression, compress)
-	}
-
-	return off, err
-}
diff --git a/vendor/github.com/miekg/dns/privaterr.go b/vendor/github.com/miekg/dns/privaterr.go
index 350ea5a..d256b65 100644
--- a/vendor/github.com/miekg/dns/privaterr.go
+++ b/vendor/github.com/miekg/dns/privaterr.go
@@ -84,7 +84,7 @@ Fetch:
 
 	err := r.Data.Parse(text)
 	if err != nil {
-		return &ParseError{wrappedErr: err, lex: l}
+		return &ParseError{"", err.Error(), l}
 	}
 
 	return nil
diff --git a/vendor/github.com/miekg/dns/reverse.go b/vendor/github.com/miekg/dns/reverse.go
index 6f5b3ea..28151af 100644
--- a/vendor/github.com/miekg/dns/reverse.go
+++ b/vendor/github.com/miekg/dns/reverse.go
@@ -23,12 +23,9 @@ var StringToAlgorithm = reverseInt8(AlgorithmToString)
 // StringToHash is a map of names to hash IDs.
 var StringToHash = reverseInt8(HashToString)
 
-// StringToCertType is the reverse of CertTypeToString.
+// StringToCertType is the reverseof CertTypeToString.
 var StringToCertType = reverseInt16(CertTypeToString)
 
-// StringToStatefulType is the reverse of StatefulTypeToString.
-var StringToStatefulType = reverseInt16(StatefulTypeToString)
-
 // Reverse a map
 func reverseInt8(m map[uint8]string) map[string]uint8 {
 	n := make(map[string]uint8, len(m))
diff --git a/vendor/github.com/miekg/dns/scan.go b/vendor/github.com/miekg/dns/scan.go
index 31957b2..57be988 100644
--- a/vendor/github.com/miekg/dns/scan.go
+++ b/vendor/github.com/miekg/dns/scan.go
@@ -4,21 +4,19 @@ import (
 	"bufio"
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
 )
 
-const maxTok = 512 // Token buffer start size, and growth size amount.
+const maxTok = 2048 // Largest token we can return.
 
 // The maximum depth of $INCLUDE directives supported by the
 // ZoneParser API.
 const maxIncludeDepth = 7
 
-// Tokenize a RFC 1035 zone file. The tokenizer will normalize it:
+// Tokinize a RFC 1035 zone file. The tokenizer will normalize it:
 // * Add ownernames if they are left blank;
 // * Suppress sequences of spaces;
 // * Make each RR fit on one line (_NEWLINE is send as last)
@@ -66,26 +64,20 @@ const (
 // ParseError is a parsing error. It contains the parse error and the location in the io.Reader
 // where the error occurred.
 type ParseError struct {
-	file       string
-	err        string
-	wrappedErr error
-	lex        lex
+	file string
+	err  string
+	lex  lex
 }
 
 func (e *ParseError) Error() (s string) {
 	if e.file != "" {
 		s = e.file + ": "
 	}
-	if e.err == "" && e.wrappedErr != nil {
-		e.err = e.wrappedErr.Error()
-	}
 	s += "dns: " + e.err + ": " + strconv.QuoteToASCII(e.lex.token) + " at line: " +
 		strconv.Itoa(e.lex.line) + ":" + strconv.Itoa(e.lex.column)
 	return
 }
 
-func (e *ParseError) Unwrap() error { return e.wrappedErr }
-
 type lex struct {
 	token  string // text of the token
 	err    bool   // when true, token text has lexer error
@@ -101,15 +93,12 @@ type ttlState struct {
 	isByDirective bool   // isByDirective indicates whether ttl was set by a $TTL directive
 }
 
-// NewRR reads a string s and returns the first RR.
+// NewRR reads the RR contained in the string s. Only the first RR is returned.
 // If s contains no records, NewRR will return nil with no error.
 //
-// The class defaults to IN, TTL defaults to 3600, and
-// origin for resolving relative domain names defaults to the DNS root (.).
-// Full zone file syntax is supported, including directives like $TTL and $ORIGIN.
-// All fields of the returned RR are set from the read data, except RR.Header().Rdlength which is set to 0.
-// Is you need a partial resource record with no rdata - for instance - for dynamic updates, see the [ANY]
-// documentation.
+// The class defaults to IN and TTL defaults to 3600. The full zone file syntax
+// like $TTL, $ORIGIN, etc. is supported. All fields of the returned RR are
+// set, except RR.Header().Rdlength which is set to 0.
 func NewRR(s string) (RR, error) {
 	if len(s) > 0 && s[len(s)-1] != '\n' { // We need a closing newline
 		return ReadRR(strings.NewReader(s+"\n"), "")
@@ -179,9 +168,8 @@ type ZoneParser struct {
 	// sub is used to parse $INCLUDE files and $GENERATE directives.
 	// Next, by calling subNext, forwards the resulting RRs from this
 	// sub parser to the calling code.
-	sub  *ZoneParser
-	r    io.Reader
-	fsys fs.FS
+	sub    *ZoneParser
+	osFile *os.File
 
 	includeDepth uint8
 
@@ -200,7 +188,7 @@ func NewZoneParser(r io.Reader, origin, file string) *ZoneParser {
 	if origin != "" {
 		origin = Fqdn(origin)
 		if _, ok := IsDomainName(origin); !ok {
-			pe = &ParseError{file: file, err: "bad initial origin name"}
+			pe = &ParseError{file, "bad initial origin name", lex{}}
 		}
 	}
 
@@ -232,24 +220,6 @@ func (zp *ZoneParser) SetIncludeAllowed(v bool) {
 	zp.includeAllowed = v
 }
 
-// SetIncludeFS provides an [fs.FS] to use when looking for the target of
-// $INCLUDE directives.  ($INCLUDE must still be enabled separately by calling
-// [ZoneParser.SetIncludeAllowed].)  If fsys is nil, [os.Open] will be used.
-//
-// When fsys is an on-disk FS, the ability of $INCLUDE to reach files from
-// outside its root directory depends upon the FS implementation.  For
-// instance, [os.DirFS] will refuse to open paths like "../../etc/passwd",
-// however it will still follow links which may point anywhere on the system.
-//
-// FS paths are slash-separated on all systems, even Windows.  $INCLUDE paths
-// containing other characters such as backslash and colon may be accepted as
-// valid, but those characters will never be interpreted by an FS
-// implementation as path element separators.  See [fs.ValidPath] for more
-// details.
-func (zp *ZoneParser) SetIncludeFS(fsys fs.FS) {
-	zp.fsys = fsys
-}
-
 // Err returns the first non-EOF error that was encountered by the
 // ZoneParser.
 func (zp *ZoneParser) Err() error {
@@ -267,7 +237,7 @@ func (zp *ZoneParser) Err() error {
 }
 
 func (zp *ZoneParser) setParseError(err string, l lex) (RR, bool) {
-	zp.parseErr = &ParseError{file: zp.file, err: err, lex: l}
+	zp.parseErr = &ParseError{zp.file, err, l}
 	return nil, false
 }
 
@@ -290,11 +260,9 @@ func (zp *ZoneParser) subNext() (RR, bool) {
 		return rr, true
 	}
 
-	if zp.sub.r != nil {
-		if c, ok := zp.sub.r.(io.Closer); ok {
-			c.Close()
-		}
-		zp.sub.r = nil
+	if zp.sub.osFile != nil {
+		zp.sub.osFile.Close()
+		zp.sub.osFile = nil
 	}
 
 	if zp.sub.Err() != nil {
@@ -434,44 +402,24 @@ func (zp *ZoneParser) Next() (RR, bool) {
 
 			// Start with the new file
 			includePath := l.token
-			var r1 io.Reader
-			var e1 error
-			if zp.fsys != nil {
-				// fs.FS always uses / as separator, even on Windows, so use
-				// path instead of filepath here:
-				if !path.IsAbs(includePath) {
-					includePath = path.Join(path.Dir(zp.file), includePath)
-				}
-
-				// os.DirFS, and probably others, expect all paths to be
-				// relative, so clean the path and remove leading / if
-				// present:
-				includePath = strings.TrimLeft(path.Clean(includePath), "/")
-
-				r1, e1 = zp.fsys.Open(includePath)
-			} else {
-				if !filepath.IsAbs(includePath) {
-					includePath = filepath.Join(filepath.Dir(zp.file), includePath)
-				}
-				r1, e1 = os.Open(includePath)
+			if !filepath.IsAbs(includePath) {
+				includePath = filepath.Join(filepath.Dir(zp.file), includePath)
 			}
+
+			r1, e1 := os.Open(includePath)
 			if e1 != nil {
 				var as string
-				if includePath != l.token {
+				if !filepath.IsAbs(l.token) {
 					as = fmt.Sprintf(" as `%s'", includePath)
 				}
-				zp.parseErr = &ParseError{
-					file:       zp.file,
-					wrappedErr: fmt.Errorf("failed to open `%s'%s: %w", l.token, as, e1),
-					lex:        l,
-				}
-				return nil, false
+
+				msg := fmt.Sprintf("failed to open `%s'%s: %v", l.token, as, e1)
+				return zp.setParseError(msg, l)
 			}
 
 			zp.sub = NewZoneParser(r1, neworigin, includePath)
-			zp.sub.defttl, zp.sub.includeDepth, zp.sub.r = zp.defttl, zp.includeDepth+1, r1
+			zp.sub.defttl, zp.sub.includeDepth, zp.sub.osFile = zp.defttl, zp.includeDepth+1, r1
 			zp.sub.SetIncludeAllowed(true)
-			zp.sub.SetIncludeFS(zp.fsys)
 			return zp.subNext()
 		case zExpectDirTTLBl:
 			if l.value != zBlank {
@@ -657,6 +605,8 @@ func (zp *ZoneParser) Next() (RR, bool) {
 			if !isPrivate && zp.c.Peek().token == "" {
 				// This is a dynamic update rr.
 
+				// TODO(tmthrgd): Previously slurpRemainder was only called
+				// for certain RR types, which may have been important.
 				if err := slurpRemainder(zp.c); err != nil {
 					return zp.setParseError(err.err, err.lex)
 				}
@@ -815,8 +765,8 @@ func (zl *zlexer) Next() (lex, bool) {
 	}
 
 	var (
-		str = make([]byte, maxTok) // Hold string text
-		com = make([]byte, maxTok) // Hold comment text
+		str [maxTok]byte // Hold string text
+		com [maxTok]byte // Hold comment text
 
 		stri int // Offset in str (0 means empty)
 		comi int // Offset in com (0 means empty)
@@ -835,12 +785,14 @@ func (zl *zlexer) Next() (lex, bool) {
 		l.line, l.column = zl.line, zl.column
 
 		if stri >= len(str) {
-			// if buffer length is insufficient, increase it.
-			str = append(str[:], make([]byte, maxTok)...)
+			l.token = "token length insufficient for parsing"
+			l.err = true
+			return *l, true
 		}
 		if comi >= len(com) {
-			// if buffer length is insufficient, increase it.
-			com = append(com[:], make([]byte, maxTok)...)
+			l.token = "comment length insufficient for parsing"
+			l.err = true
+			return *l, true
 		}
 
 		switch x {
@@ -864,7 +816,7 @@ func (zl *zlexer) Next() (lex, bool) {
 			if stri == 0 {
 				// Space directly in the beginning, handled in the grammar
 			} else if zl.owner {
-				// If we have a string and it's the first, make it an owner
+				// If we have a string and its the first, make it an owner
 				l.value = zOwner
 				l.token = string(str[:stri])
 
@@ -1266,34 +1218,42 @@ func stringToCm(token string) (e, m uint8, ok bool) {
 	if token[len(token)-1] == 'M' || token[len(token)-1] == 'm' {
 		token = token[0 : len(token)-1]
 	}
-
-	var (
-		meters, cmeters, val int
-		err                  error
-	)
-	mStr, cmStr, hasCM := strings.Cut(token, ".")
-	if hasCM {
+	s := strings.SplitN(token, ".", 2)
+	var meters, cmeters, val int
+	var err error
+	switch len(s) {
+	case 2:
+		if cmeters, err = strconv.Atoi(s[1]); err != nil {
+			return
+		}
 		// There's no point in having more than 2 digits in this part, and would rather make the implementation complicated ('123' should be treated as '12').
 		// So we simply reject it.
 		// We also make sure the first character is a digit to reject '+-' signs.
-		cmeters, err = strconv.Atoi(cmStr)
-		if err != nil || len(cmStr) > 2 || cmStr[0] < '0' || cmStr[0] > '9' {
+		if len(s[1]) > 2 || s[1][0] < '0' || s[1][0] > '9' {
 			return
 		}
-		if len(cmStr) == 1 {
+		if len(s[1]) == 1 {
 			// 'nn.1' must be treated as 'nn-meters and 10cm, not 1cm.
 			cmeters *= 10
 		}
-	}
-	// This slightly ugly condition will allow omitting the 'meter' part, like .01 (meaning 0.01m = 1cm).
-	if !hasCM || mStr != "" {
-		meters, err = strconv.Atoi(mStr)
-		// RFC1876 states the max value is 90000000.00.  The latter two conditions enforce it.
-		if err != nil || mStr[0] < '0' || mStr[0] > '9' || meters > 90000000 || (meters == 90000000 && cmeters != 0) {
+		if s[0] == "" {
+			// This will allow omitting the 'meter' part, like .01 (meaning 0.01m = 1cm).
+			break
+		}
+		fallthrough
+	case 1:
+		if meters, err = strconv.Atoi(s[0]); err != nil {
 			return
 		}
+		// RFC1876 states the max value is 90000000.00.  The latter two conditions enforce it.
+		if s[0][0] < '0' || s[0][0] > '9' || meters > 90000000 || (meters == 90000000 && cmeters != 0) {
+			return
+		}
+	case 0:
+		// huh?
+		return 0, 0, false
 	}
-
+	ok = true
 	if meters > 0 {
 		e = 2
 		val = meters
@@ -1305,7 +1265,8 @@ func stringToCm(token string) (e, m uint8, ok bool) {
 		e++
 		val /= 10
 	}
-	return e, uint8(val), true
+	m = uint8(val)
+	return
 }
 
 func toAbsoluteName(name, origin string) (absolute string, ok bool) {
@@ -1318,13 +1279,6 @@ func toAbsoluteName(name, origin string) (absolute string, ok bool) {
 		return origin, true
 	}
 
-	// this can happen when we have a comment after a RR that has a domain, '...   MX 20 ; this is wrong'.
-	// technically a newline can be in a domain name, but this is clearly an error and the newline only shows
-	// because of the scanning and the comment.
-	if name == "\n" {
-		return "", false
-	}
-
 	// require a valid domain name
 	_, ok = IsDomainName(name)
 	if !ok || name == "" {
@@ -1385,12 +1339,12 @@ func slurpRemainder(c *zlexer) *ParseError {
 	case zBlank:
 		l, _ = c.Next()
 		if l.value != zNewline && l.value != zEOF {
-			return &ParseError{err: "garbage after rdata", lex: l}
+			return &ParseError{"", "garbage after rdata", l}
 		}
 	case zNewline:
 	case zEOF:
 	default:
-		return &ParseError{err: "garbage after rdata", lex: l}
+		return &ParseError{"", "garbage after rdata", l}
 	}
 	return nil
 }
@@ -1399,16 +1353,16 @@ func slurpRemainder(c *zlexer) *ParseError {
 // Used for NID and L64 record.
 func stringToNodeID(l lex) (uint64, *ParseError) {
 	if len(l.token) < 19 {
-		return 0, &ParseError{file: l.token, err: "bad NID/L64 NodeID/Locator64", lex: l}
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
 	}
 	// There must be three colons at fixes positions, if not its a parse error
 	if l.token[4] != ':' && l.token[9] != ':' && l.token[14] != ':' {
-		return 0, &ParseError{file: l.token, err: "bad NID/L64 NodeID/Locator64", lex: l}
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
 	}
 	s := l.token[0:4] + l.token[5:9] + l.token[10:14] + l.token[15:19]
 	u, err := strconv.ParseUint(s, 16, 64)
 	if err != nil {
-		return 0, &ParseError{file: l.token, err: "bad NID/L64 NodeID/Locator64", lex: l}
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
 	}
 	return u, nil
 }
diff --git a/vendor/github.com/miekg/dns/scan_rr.go b/vendor/github.com/miekg/dns/scan_rr.go
index ac885f6..e398484 100644
--- a/vendor/github.com/miekg/dns/scan_rr.go
+++ b/vendor/github.com/miekg/dns/scan_rr.go
@@ -1,9 +1,8 @@
 package dns
 
 import (
+	"bytes"
 	"encoding/base64"
-	"errors"
-	"fmt"
 	"net"
 	"strconv"
 	"strings"
@@ -12,23 +11,23 @@ import (
 // A remainder of the rdata with embedded spaces, return the parsed string (sans the spaces)
 // or an error
 func endingToString(c *zlexer, errstr string) (string, *ParseError) {
-	var s strings.Builder
+	var buffer bytes.Buffer
 	l, _ := c.Next() // zString
 	for l.value != zNewline && l.value != zEOF {
 		if l.err {
-			return s.String(), &ParseError{err: errstr, lex: l}
+			return buffer.String(), &ParseError{"", errstr, l}
 		}
 		switch l.value {
 		case zString:
-			s.WriteString(l.token)
+			buffer.WriteString(l.token)
 		case zBlank: // Ok
 		default:
-			return "", &ParseError{err: errstr, lex: l}
+			return "", &ParseError{"", errstr, l}
 		}
 		l, _ = c.Next()
 	}
 
-	return s.String(), nil
+	return buffer.String(), nil
 }
 
 // A remainder of the rdata with embedded spaces, split on unquoted whitespace
@@ -37,7 +36,7 @@ func endingToTxtSlice(c *zlexer, errstr string) ([]string, *ParseError) {
 	// Get the remaining data until we see a zNewline
 	l, _ := c.Next()
 	if l.err {
-		return nil, &ParseError{err: errstr, lex: l}
+		return nil, &ParseError{"", errstr, l}
 	}
 
 	// Build the slice
@@ -46,33 +45,34 @@ func endingToTxtSlice(c *zlexer, errstr string) ([]string, *ParseError) {
 	empty := false
 	for l.value != zNewline && l.value != zEOF {
 		if l.err {
-			return nil, &ParseError{err: errstr, lex: l}
+			return nil, &ParseError{"", errstr, l}
 		}
 		switch l.value {
 		case zString:
 			empty = false
-			// split up tokens that are larger than 255 into 255-chunks
-			sx := []string{}
-			p := 0
-			for {
-				i, ok := escapedStringOffset(l.token[p:], 255)
-				if !ok {
-					return nil, &ParseError{err: errstr, lex: l}
-				}
-				if i != -1 && p+i != len(l.token) {
-					sx = append(sx, l.token[p:p+i])
-				} else {
-					sx = append(sx, l.token[p:])
-					break
+			if len(l.token) > 255 {
+				// split up tokens that are larger than 255 into 255-chunks
+				sx := []string{}
+				p, i := 0, 255
+				for {
+					if i <= len(l.token) {
+						sx = append(sx, l.token[p:i])
+					} else {
+						sx = append(sx, l.token[p:])
+						break
 
+					}
+					p, i = p+255, i+255
 				}
-				p += i
+				s = append(s, sx...)
+				break
 			}
-			s = append(s, sx...)
+
+			s = append(s, l.token)
 		case zBlank:
 			if quote {
 				// zBlank can only be seen in between txt parts.
-				return nil, &ParseError{err: errstr, lex: l}
+				return nil, &ParseError{"", errstr, l}
 			}
 		case zQuote:
 			if empty && quote {
@@ -81,13 +81,13 @@ func endingToTxtSlice(c *zlexer, errstr string) ([]string, *ParseError) {
 			quote = !quote
 			empty = true
 		default:
-			return nil, &ParseError{err: errstr, lex: l}
+			return nil, &ParseError{"", errstr, l}
 		}
 		l, _ = c.Next()
 	}
 
 	if quote {
-		return nil, &ParseError{err: errstr, lex: l}
+		return nil, &ParseError{"", errstr, l}
 	}
 
 	return s, nil
@@ -102,7 +102,7 @@ func (rr *A) parse(c *zlexer, o string) *ParseError {
 	// IPv4.
 	isIPv4 := !strings.Contains(l.token, ":")
 	if rr.A == nil || !isIPv4 || l.err {
-		return &ParseError{err: "bad A A", lex: l}
+		return &ParseError{"", "bad A A", l}
 	}
 	return slurpRemainder(c)
 }
@@ -114,7 +114,7 @@ func (rr *AAAA) parse(c *zlexer, o string) *ParseError {
 	// addresses cannot include ":".
 	isIPv6 := strings.Contains(l.token, ":")
 	if rr.AAAA == nil || !isIPv6 || l.err {
-		return &ParseError{err: "bad AAAA AAAA", lex: l}
+		return &ParseError{"", "bad AAAA AAAA", l}
 	}
 	return slurpRemainder(c)
 }
@@ -123,7 +123,7 @@ func (rr *NS) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad NS Ns", lex: l}
+		return &ParseError{"", "bad NS Ns", l}
 	}
 	rr.Ns = name
 	return slurpRemainder(c)
@@ -133,7 +133,7 @@ func (rr *PTR) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad PTR Ptr", lex: l}
+		return &ParseError{"", "bad PTR Ptr", l}
 	}
 	rr.Ptr = name
 	return slurpRemainder(c)
@@ -143,7 +143,7 @@ func (rr *NSAPPTR) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad NSAP-PTR Ptr", lex: l}
+		return &ParseError{"", "bad NSAP-PTR Ptr", l}
 	}
 	rr.Ptr = name
 	return slurpRemainder(c)
@@ -153,7 +153,7 @@ func (rr *RP) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	mbox, mboxOk := toAbsoluteName(l.token, o)
 	if l.err || !mboxOk {
-		return &ParseError{err: "bad RP Mbox", lex: l}
+		return &ParseError{"", "bad RP Mbox", l}
 	}
 	rr.Mbox = mbox
 
@@ -163,7 +163,7 @@ func (rr *RP) parse(c *zlexer, o string) *ParseError {
 
 	txt, txtOk := toAbsoluteName(l.token, o)
 	if l.err || !txtOk {
-		return &ParseError{err: "bad RP Txt", lex: l}
+		return &ParseError{"", "bad RP Txt", l}
 	}
 	rr.Txt = txt
 
@@ -174,7 +174,7 @@ func (rr *MR) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MR Mr", lex: l}
+		return &ParseError{"", "bad MR Mr", l}
 	}
 	rr.Mr = name
 	return slurpRemainder(c)
@@ -184,7 +184,7 @@ func (rr *MB) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MB Mb", lex: l}
+		return &ParseError{"", "bad MB Mb", l}
 	}
 	rr.Mb = name
 	return slurpRemainder(c)
@@ -194,7 +194,7 @@ func (rr *MG) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MG Mg", lex: l}
+		return &ParseError{"", "bad MG Mg", l}
 	}
 	rr.Mg = name
 	return slurpRemainder(c)
@@ -219,29 +219,6 @@ func (rr *HINFO) parse(c *zlexer, o string) *ParseError {
 
 	rr.Cpu = chunks[0]
 	rr.Os = strings.Join(chunks[1:], " ")
-	return nil
-}
-
-// according to RFC 1183 the parsing is identical to HINFO, so just use that code.
-func (rr *ISDN) parse(c *zlexer, o string) *ParseError {
-	chunks, e := endingToTxtSlice(c, "bad ISDN Fields")
-	if e != nil {
-		return e
-	}
-
-	if ln := len(chunks); ln == 0 {
-		return nil
-	} else if ln == 1 {
-		// Can we split it?
-		if out := strings.Fields(chunks[0]); len(out) > 1 {
-			chunks = out
-		} else {
-			chunks = append(chunks, "")
-		}
-	}
-
-	rr.Address = chunks[0]
-	rr.SubAddress = strings.Join(chunks[1:], " ")
 
 	return nil
 }
@@ -250,7 +227,7 @@ func (rr *MINFO) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	rmail, rmailOk := toAbsoluteName(l.token, o)
 	if l.err || !rmailOk {
-		return &ParseError{err: "bad MINFO Rmail", lex: l}
+		return &ParseError{"", "bad MINFO Rmail", l}
 	}
 	rr.Rmail = rmail
 
@@ -260,7 +237,7 @@ func (rr *MINFO) parse(c *zlexer, o string) *ParseError {
 
 	email, emailOk := toAbsoluteName(l.token, o)
 	if l.err || !emailOk {
-		return &ParseError{err: "bad MINFO Email", lex: l}
+		return &ParseError{"", "bad MINFO Email", l}
 	}
 	rr.Email = email
 
@@ -271,7 +248,7 @@ func (rr *MF) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MF Mf", lex: l}
+		return &ParseError{"", "bad MF Mf", l}
 	}
 	rr.Mf = name
 	return slurpRemainder(c)
@@ -281,7 +258,7 @@ func (rr *MD) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MD Md", lex: l}
+		return &ParseError{"", "bad MD Md", l}
 	}
 	rr.Md = name
 	return slurpRemainder(c)
@@ -291,7 +268,7 @@ func (rr *MX) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad MX Pref", lex: l}
+		return &ParseError{"", "bad MX Pref", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -301,7 +278,7 @@ func (rr *MX) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad MX Mx", lex: l}
+		return &ParseError{"", "bad MX Mx", l}
 	}
 	rr.Mx = name
 
@@ -312,7 +289,7 @@ func (rr *RT) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil {
-		return &ParseError{err: "bad RT Preference", lex: l}
+		return &ParseError{"", "bad RT Preference", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -322,7 +299,7 @@ func (rr *RT) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad RT Host", lex: l}
+		return &ParseError{"", "bad RT Host", l}
 	}
 	rr.Host = name
 
@@ -333,7 +310,7 @@ func (rr *AFSDB) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad AFSDB Subtype", lex: l}
+		return &ParseError{"", "bad AFSDB Subtype", l}
 	}
 	rr.Subtype = uint16(i)
 
@@ -343,7 +320,7 @@ func (rr *AFSDB) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad AFSDB Hostname", lex: l}
+		return &ParseError{"", "bad AFSDB Hostname", l}
 	}
 	rr.Hostname = name
 	return slurpRemainder(c)
@@ -352,7 +329,7 @@ func (rr *AFSDB) parse(c *zlexer, o string) *ParseError {
 func (rr *X25) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	if l.err {
-		return &ParseError{err: "bad X25 PSDNAddress", lex: l}
+		return &ParseError{"", "bad X25 PSDNAddress", l}
 	}
 	rr.PSDNAddress = l.token
 	return slurpRemainder(c)
@@ -362,7 +339,7 @@ func (rr *KX) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad KX Pref", lex: l}
+		return &ParseError{"", "bad KX Pref", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -372,7 +349,7 @@ func (rr *KX) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad KX Exchanger", lex: l}
+		return &ParseError{"", "bad KX Exchanger", l}
 	}
 	rr.Exchanger = name
 	return slurpRemainder(c)
@@ -382,7 +359,7 @@ func (rr *CNAME) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad CNAME Target", lex: l}
+		return &ParseError{"", "bad CNAME Target", l}
 	}
 	rr.Target = name
 	return slurpRemainder(c)
@@ -392,7 +369,7 @@ func (rr *DNAME) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad DNAME Target", lex: l}
+		return &ParseError{"", "bad DNAME Target", l}
 	}
 	rr.Target = name
 	return slurpRemainder(c)
@@ -402,7 +379,7 @@ func (rr *SOA) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	ns, nsOk := toAbsoluteName(l.token, o)
 	if l.err || !nsOk {
-		return &ParseError{err: "bad SOA Ns", lex: l}
+		return &ParseError{"", "bad SOA Ns", l}
 	}
 	rr.Ns = ns
 
@@ -412,7 +389,7 @@ func (rr *SOA) parse(c *zlexer, o string) *ParseError {
 
 	mbox, mboxOk := toAbsoluteName(l.token, o)
 	if l.err || !mboxOk {
-		return &ParseError{err: "bad SOA Mbox", lex: l}
+		return &ParseError{"", "bad SOA Mbox", l}
 	}
 	rr.Mbox = mbox
 
@@ -425,16 +402,16 @@ func (rr *SOA) parse(c *zlexer, o string) *ParseError {
 	for i := 0; i < 5; i++ {
 		l, _ = c.Next()
 		if l.err {
-			return &ParseError{err: "bad SOA zone parameter", lex: l}
+			return &ParseError{"", "bad SOA zone parameter", l}
 		}
 		if j, err := strconv.ParseUint(l.token, 10, 32); err != nil {
 			if i == 0 {
 				// Serial must be a number
-				return &ParseError{err: "bad SOA zone parameter", lex: l}
+				return &ParseError{"", "bad SOA zone parameter", l}
 			}
 			// We allow other fields to be unitful duration strings
 			if v, ok = stringToTTL(l.token); !ok {
-				return &ParseError{err: "bad SOA zone parameter", lex: l}
+				return &ParseError{"", "bad SOA zone parameter", l}
 
 			}
 		} else {
@@ -464,7 +441,7 @@ func (rr *SRV) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad SRV Priority", lex: l}
+		return &ParseError{"", "bad SRV Priority", l}
 	}
 	rr.Priority = uint16(i)
 
@@ -472,7 +449,7 @@ func (rr *SRV) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next() // zString
 	i, e1 := strconv.ParseUint(l.token, 10, 16)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad SRV Weight", lex: l}
+		return &ParseError{"", "bad SRV Weight", l}
 	}
 	rr.Weight = uint16(i)
 
@@ -480,7 +457,7 @@ func (rr *SRV) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next() // zString
 	i, e2 := strconv.ParseUint(l.token, 10, 16)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad SRV Port", lex: l}
+		return &ParseError{"", "bad SRV Port", l}
 	}
 	rr.Port = uint16(i)
 
@@ -490,7 +467,7 @@ func (rr *SRV) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad SRV Target", lex: l}
+		return &ParseError{"", "bad SRV Target", l}
 	}
 	rr.Target = name
 	return slurpRemainder(c)
@@ -500,7 +477,7 @@ func (rr *NAPTR) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad NAPTR Order", lex: l}
+		return &ParseError{"", "bad NAPTR Order", l}
 	}
 	rr.Order = uint16(i)
 
@@ -508,7 +485,7 @@ func (rr *NAPTR) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next() // zString
 	i, e1 := strconv.ParseUint(l.token, 10, 16)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad NAPTR Preference", lex: l}
+		return &ParseError{"", "bad NAPTR Preference", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -516,57 +493,57 @@ func (rr *NAPTR) parse(c *zlexer, o string) *ParseError {
 	c.Next()        // zBlank
 	l, _ = c.Next() // _QUOTE
 	if l.value != zQuote {
-		return &ParseError{err: "bad NAPTR Flags", lex: l}
+		return &ParseError{"", "bad NAPTR Flags", l}
 	}
 	l, _ = c.Next() // Either String or Quote
 	if l.value == zString {
 		rr.Flags = l.token
 		l, _ = c.Next() // _QUOTE
 		if l.value != zQuote {
-			return &ParseError{err: "bad NAPTR Flags", lex: l}
+			return &ParseError{"", "bad NAPTR Flags", l}
 		}
 	} else if l.value == zQuote {
 		rr.Flags = ""
 	} else {
-		return &ParseError{err: "bad NAPTR Flags", lex: l}
+		return &ParseError{"", "bad NAPTR Flags", l}
 	}
 
 	// Service
 	c.Next()        // zBlank
 	l, _ = c.Next() // _QUOTE
 	if l.value != zQuote {
-		return &ParseError{err: "bad NAPTR Service", lex: l}
+		return &ParseError{"", "bad NAPTR Service", l}
 	}
 	l, _ = c.Next() // Either String or Quote
 	if l.value == zString {
 		rr.Service = l.token
 		l, _ = c.Next() // _QUOTE
 		if l.value != zQuote {
-			return &ParseError{err: "bad NAPTR Service", lex: l}
+			return &ParseError{"", "bad NAPTR Service", l}
 		}
 	} else if l.value == zQuote {
 		rr.Service = ""
 	} else {
-		return &ParseError{err: "bad NAPTR Service", lex: l}
+		return &ParseError{"", "bad NAPTR Service", l}
 	}
 
 	// Regexp
 	c.Next()        // zBlank
 	l, _ = c.Next() // _QUOTE
 	if l.value != zQuote {
-		return &ParseError{err: "bad NAPTR Regexp", lex: l}
+		return &ParseError{"", "bad NAPTR Regexp", l}
 	}
 	l, _ = c.Next() // Either String or Quote
 	if l.value == zString {
 		rr.Regexp = l.token
 		l, _ = c.Next() // _QUOTE
 		if l.value != zQuote {
-			return &ParseError{err: "bad NAPTR Regexp", lex: l}
+			return &ParseError{"", "bad NAPTR Regexp", l}
 		}
 	} else if l.value == zQuote {
 		rr.Regexp = ""
 	} else {
-		return &ParseError{err: "bad NAPTR Regexp", lex: l}
+		return &ParseError{"", "bad NAPTR Regexp", l}
 	}
 
 	// After quote no space??
@@ -576,7 +553,7 @@ func (rr *NAPTR) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad NAPTR Replacement", lex: l}
+		return &ParseError{"", "bad NAPTR Replacement", l}
 	}
 	rr.Replacement = name
 	return slurpRemainder(c)
@@ -586,7 +563,7 @@ func (rr *TALINK) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	previousName, previousNameOk := toAbsoluteName(l.token, o)
 	if l.err || !previousNameOk {
-		return &ParseError{err: "bad TALINK PreviousName", lex: l}
+		return &ParseError{"", "bad TALINK PreviousName", l}
 	}
 	rr.PreviousName = previousName
 
@@ -596,7 +573,7 @@ func (rr *TALINK) parse(c *zlexer, o string) *ParseError {
 
 	nextName, nextNameOk := toAbsoluteName(l.token, o)
 	if l.err || !nextNameOk {
-		return &ParseError{err: "bad TALINK NextName", lex: l}
+		return &ParseError{"", "bad TALINK NextName", l}
 	}
 	rr.NextName = nextName
 
@@ -614,7 +591,7 @@ func (rr *LOC) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 32)
 	if e != nil || l.err || i > 90 {
-		return &ParseError{err: "bad LOC Latitude", lex: l}
+		return &ParseError{"", "bad LOC Latitude", l}
 	}
 	rr.Latitude = 1000 * 60 * 60 * uint32(i)
 
@@ -625,7 +602,7 @@ func (rr *LOC) parse(c *zlexer, o string) *ParseError {
 		goto East
 	}
 	if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err || i > 59 {
-		return &ParseError{err: "bad LOC Latitude minutes", lex: l}
+		return &ParseError{"", "bad LOC Latitude minutes", l}
 	} else {
 		rr.Latitude += 1000 * 60 * uint32(i)
 	}
@@ -633,7 +610,7 @@ func (rr *LOC) parse(c *zlexer, o string) *ParseError {
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if i, err := strconv.ParseFloat(l.token, 64); err != nil || l.err || i < 0 || i >= 60 {
-		return &ParseError{err: "bad LOC Latitude seconds", lex: l}
+		return &ParseError{"", "bad LOC Latitude seconds", l}
 	} else {
 		rr.Latitude += uint32(1000 * i)
 	}
@@ -644,14 +621,14 @@ func (rr *LOC) parse(c *zlexer, o string) *ParseError {
 		goto East
 	}
 	// If still alive, flag an error
-	return &ParseError{err: "bad LOC Latitude North/South", lex: l}
+	return &ParseError{"", "bad LOC Latitude North/South", l}
 
 East:
 	// East
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err || i > 180 {
-		return &ParseError{err: "bad LOC Longitude", lex: l}
+		return &ParseError{"", "bad LOC Longitude", l}
 	} else {
 		rr.Longitude = 1000 * 60 * 60 * uint32(i)
 	}
@@ -662,14 +639,14 @@ East:
 		goto Altitude
 	}
 	if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err || i > 59 {
-		return &ParseError{err: "bad LOC Longitude minutes", lex: l}
+		return &ParseError{"", "bad LOC Longitude minutes", l}
 	} else {
 		rr.Longitude += 1000 * 60 * uint32(i)
 	}
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if i, err := strconv.ParseFloat(l.token, 64); err != nil || l.err || i < 0 || i >= 60 {
-		return &ParseError{err: "bad LOC Longitude seconds", lex: l}
+		return &ParseError{"", "bad LOC Longitude seconds", l}
 	} else {
 		rr.Longitude += uint32(1000 * i)
 	}
@@ -680,19 +657,19 @@ East:
 		goto Altitude
 	}
 	// If still alive, flag an error
-	return &ParseError{err: "bad LOC Longitude East/West", lex: l}
+	return &ParseError{"", "bad LOC Longitude East/West", l}
 
 Altitude:
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if l.token == "" || l.err {
-		return &ParseError{err: "bad LOC Altitude", lex: l}
+		return &ParseError{"", "bad LOC Altitude", l}
 	}
 	if l.token[len(l.token)-1] == 'M' || l.token[len(l.token)-1] == 'm' {
 		l.token = l.token[0 : len(l.token)-1]
 	}
 	if i, err := strconv.ParseFloat(l.token, 64); err != nil {
-		return &ParseError{err: "bad LOC Altitude", lex: l}
+		return &ParseError{"", "bad LOC Altitude", l}
 	} else {
 		rr.Altitude = uint32(i*100.0 + 10000000.0 + 0.5)
 	}
@@ -707,19 +684,19 @@ Altitude:
 			case 0: // Size
 				exp, m, ok := stringToCm(l.token)
 				if !ok {
-					return &ParseError{err: "bad LOC Size", lex: l}
+					return &ParseError{"", "bad LOC Size", l}
 				}
 				rr.Size = exp&0x0f | m<<4&0xf0
 			case 1: // HorizPre
 				exp, m, ok := stringToCm(l.token)
 				if !ok {
-					return &ParseError{err: "bad LOC HorizPre", lex: l}
+					return &ParseError{"", "bad LOC HorizPre", l}
 				}
 				rr.HorizPre = exp&0x0f | m<<4&0xf0
 			case 2: // VertPre
 				exp, m, ok := stringToCm(l.token)
 				if !ok {
-					return &ParseError{err: "bad LOC VertPre", lex: l}
+					return &ParseError{"", "bad LOC VertPre", l}
 				}
 				rr.VertPre = exp&0x0f | m<<4&0xf0
 			}
@@ -727,7 +704,7 @@ Altitude:
 		case zBlank:
 			// Ok
 		default:
-			return &ParseError{err: "bad LOC Size, HorizPre or VertPre", lex: l}
+			return &ParseError{"", "bad LOC Size, HorizPre or VertPre", l}
 		}
 		l, _ = c.Next()
 	}
@@ -739,14 +716,14 @@ func (rr *HIP) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad HIP PublicKeyAlgorithm", lex: l}
+		return &ParseError{"", "bad HIP PublicKeyAlgorithm", l}
 	}
 	rr.PublicKeyAlgorithm = uint8(i)
 
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	if l.token == "" || l.err {
-		return &ParseError{err: "bad HIP Hit", lex: l}
+		return &ParseError{"", "bad HIP Hit", l}
 	}
 	rr.Hit = l.token // This can not contain spaces, see RFC 5205 Section 6.
 	rr.HitLength = uint8(len(rr.Hit)) / 2
@@ -754,12 +731,12 @@ func (rr *HIP) parse(c *zlexer, o string) *ParseError {
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	if l.token == "" || l.err {
-		return &ParseError{err: "bad HIP PublicKey", lex: l}
+		return &ParseError{"", "bad HIP PublicKey", l}
 	}
 	rr.PublicKey = l.token // This cannot contain spaces
 	decodedPK, decodedPKerr := base64.StdEncoding.DecodeString(rr.PublicKey)
 	if decodedPKerr != nil {
-		return &ParseError{err: "bad HIP PublicKey", lex: l}
+		return &ParseError{"", "bad HIP PublicKey", l}
 	}
 	rr.PublicKeyLength = uint16(len(decodedPK))
 
@@ -771,13 +748,13 @@ func (rr *HIP) parse(c *zlexer, o string) *ParseError {
 		case zString:
 			name, nameOk := toAbsoluteName(l.token, o)
 			if l.err || !nameOk {
-				return &ParseError{err: "bad HIP RendezvousServers", lex: l}
+				return &ParseError{"", "bad HIP RendezvousServers", l}
 			}
 			xs = append(xs, name)
 		case zBlank:
 			// Ok
 		default:
-			return &ParseError{err: "bad HIP RendezvousServers", lex: l}
+			return &ParseError{"", "bad HIP RendezvousServers", l}
 		}
 		l, _ = c.Next()
 	}
@@ -791,7 +768,7 @@ func (rr *CERT) parse(c *zlexer, o string) *ParseError {
 	if v, ok := StringToCertType[l.token]; ok {
 		rr.Type = v
 	} else if i, err := strconv.ParseUint(l.token, 10, 16); err != nil {
-		return &ParseError{err: "bad CERT Type", lex: l}
+		return &ParseError{"", "bad CERT Type", l}
 	} else {
 		rr.Type = uint16(i)
 	}
@@ -799,7 +776,7 @@ func (rr *CERT) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next() // zString
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad CERT KeyTag", lex: l}
+		return &ParseError{"", "bad CERT KeyTag", l}
 	}
 	rr.KeyTag = uint16(i)
 	c.Next()        // zBlank
@@ -807,7 +784,7 @@ func (rr *CERT) parse(c *zlexer, o string) *ParseError {
 	if v, ok := StringToAlgorithm[l.token]; ok {
 		rr.Algorithm = v
 	} else if i, err := strconv.ParseUint(l.token, 10, 8); err != nil {
-		return &ParseError{err: "bad CERT Algorithm", lex: l}
+		return &ParseError{"", "bad CERT Algorithm", l}
 	} else {
 		rr.Algorithm = uint8(i)
 	}
@@ -833,7 +810,7 @@ func (rr *CSYNC) parse(c *zlexer, o string) *ParseError {
 	j, e := strconv.ParseUint(l.token, 10, 32)
 	if e != nil {
 		// Serial must be a number
-		return &ParseError{err: "bad CSYNC serial", lex: l}
+		return &ParseError{"", "bad CSYNC serial", l}
 	}
 	rr.Serial = uint32(j)
 
@@ -843,7 +820,7 @@ func (rr *CSYNC) parse(c *zlexer, o string) *ParseError {
 	j, e1 := strconv.ParseUint(l.token, 10, 16)
 	if e1 != nil {
 		// Serial must be a number
-		return &ParseError{err: "bad CSYNC flags", lex: l}
+		return &ParseError{"", "bad CSYNC flags", l}
 	}
 	rr.Flags = uint16(j)
 
@@ -861,12 +838,12 @@ func (rr *CSYNC) parse(c *zlexer, o string) *ParseError {
 			tokenUpper := strings.ToUpper(l.token)
 			if k, ok = StringToType[tokenUpper]; !ok {
 				if k, ok = typeToInt(l.token); !ok {
-					return &ParseError{err: "bad CSYNC TypeBitMap", lex: l}
+					return &ParseError{"", "bad CSYNC TypeBitMap", l}
 				}
 			}
 			rr.TypeBitMap = append(rr.TypeBitMap, k)
 		default:
-			return &ParseError{err: "bad CSYNC TypeBitMap", lex: l}
+			return &ParseError{"", "bad CSYNC TypeBitMap", l}
 		}
 		l, _ = c.Next()
 	}
@@ -877,7 +854,7 @@ func (rr *ZONEMD) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 32)
 	if e != nil || l.err {
-		return &ParseError{err: "bad ZONEMD Serial", lex: l}
+		return &ParseError{"", "bad ZONEMD Serial", l}
 	}
 	rr.Serial = uint32(i)
 
@@ -885,7 +862,7 @@ func (rr *ZONEMD) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad ZONEMD Scheme", lex: l}
+		return &ParseError{"", "bad ZONEMD Scheme", l}
 	}
 	rr.Scheme = uint8(i)
 
@@ -893,7 +870,7 @@ func (rr *ZONEMD) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, err := strconv.ParseUint(l.token, 10, 8)
 	if err != nil || l.err {
-		return &ParseError{err: "bad ZONEMD Hash Algorithm", lex: l}
+		return &ParseError{"", "bad ZONEMD Hash Algorithm", l}
 	}
 	rr.Hash = uint8(i)
 
@@ -914,11 +891,11 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 		if strings.HasPrefix(tokenUpper, "TYPE") {
 			t, ok = typeToInt(l.token)
 			if !ok {
-				return &ParseError{err: "bad RRSIG Typecovered", lex: l}
+				return &ParseError{"", "bad RRSIG Typecovered", l}
 			}
 			rr.TypeCovered = t
 		} else {
-			return &ParseError{err: "bad RRSIG Typecovered", lex: l}
+			return &ParseError{"", "bad RRSIG Typecovered", l}
 		}
 	} else {
 		rr.TypeCovered = t
@@ -926,24 +903,17 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 
 	c.Next() // zBlank
 	l, _ = c.Next()
-	if l.err {
-		return &ParseError{err: "bad RRSIG Algorithm", lex: l}
-	}
 	i, e := strconv.ParseUint(l.token, 10, 8)
-	rr.Algorithm = uint8(i) // if 0 we'll check the mnemonic in the if
-	if e != nil {
-		v, ok := StringToAlgorithm[l.token]
-		if !ok {
-			return &ParseError{err: "bad RRSIG Algorithm", lex: l}
-		}
-		rr.Algorithm = v
+	if e != nil || l.err {
+		return &ParseError{"", "bad RRSIG Algorithm", l}
 	}
+	rr.Algorithm = uint8(i)
 
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad RRSIG Labels", lex: l}
+		return &ParseError{"", "bad RRSIG Labels", l}
 	}
 	rr.Labels = uint8(i)
 
@@ -951,7 +921,7 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e2 := strconv.ParseUint(l.token, 10, 32)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad RRSIG OrigTtl", lex: l}
+		return &ParseError{"", "bad RRSIG OrigTtl", l}
 	}
 	rr.OrigTtl = uint32(i)
 
@@ -962,7 +932,7 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 		if i, err := strconv.ParseUint(l.token, 10, 32); err == nil {
 			rr.Expiration = uint32(i)
 		} else {
-			return &ParseError{err: "bad RRSIG Expiration", lex: l}
+			return &ParseError{"", "bad RRSIG Expiration", l}
 		}
 	} else {
 		rr.Expiration = i
@@ -974,7 +944,7 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 		if i, err := strconv.ParseUint(l.token, 10, 32); err == nil {
 			rr.Inception = uint32(i)
 		} else {
-			return &ParseError{err: "bad RRSIG Inception", lex: l}
+			return &ParseError{"", "bad RRSIG Inception", l}
 		}
 	} else {
 		rr.Inception = i
@@ -984,7 +954,7 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e3 := strconv.ParseUint(l.token, 10, 16)
 	if e3 != nil || l.err {
-		return &ParseError{err: "bad RRSIG KeyTag", lex: l}
+		return &ParseError{"", "bad RRSIG KeyTag", l}
 	}
 	rr.KeyTag = uint16(i)
 
@@ -993,7 +963,7 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 	rr.SignerName = l.token
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad RRSIG SignerName", lex: l}
+		return &ParseError{"", "bad RRSIG SignerName", l}
 	}
 	rr.SignerName = name
 
@@ -1006,13 +976,11 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
 	return nil
 }
 
-func (rr *NXT) parse(c *zlexer, o string) *ParseError { return rr.NSEC.parse(c, o) }
-
 func (rr *NSEC) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad NSEC NextDomain", lex: l}
+		return &ParseError{"", "bad NSEC NextDomain", l}
 	}
 	rr.NextDomain = name
 
@@ -1030,12 +998,12 @@ func (rr *NSEC) parse(c *zlexer, o string) *ParseError {
 			tokenUpper := strings.ToUpper(l.token)
 			if k, ok = StringToType[tokenUpper]; !ok {
 				if k, ok = typeToInt(l.token); !ok {
-					return &ParseError{err: "bad NSEC TypeBitMap", lex: l}
+					return &ParseError{"", "bad NSEC TypeBitMap", l}
 				}
 			}
 			rr.TypeBitMap = append(rr.TypeBitMap, k)
 		default:
-			return &ParseError{err: "bad NSEC TypeBitMap", lex: l}
+			return &ParseError{"", "bad NSEC TypeBitMap", l}
 		}
 		l, _ = c.Next()
 	}
@@ -1046,27 +1014,27 @@ func (rr *NSEC3) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad NSEC3 Hash", lex: l}
+		return &ParseError{"", "bad NSEC3 Hash", l}
 	}
 	rr.Hash = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad NSEC3 Flags", lex: l}
+		return &ParseError{"", "bad NSEC3 Flags", l}
 	}
 	rr.Flags = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e2 := strconv.ParseUint(l.token, 10, 16)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad NSEC3 Iterations", lex: l}
+		return &ParseError{"", "bad NSEC3 Iterations", l}
 	}
 	rr.Iterations = uint16(i)
 	c.Next()
 	l, _ = c.Next()
 	if l.token == "" || l.err {
-		return &ParseError{err: "bad NSEC3 Salt", lex: l}
+		return &ParseError{"", "bad NSEC3 Salt", l}
 	}
 	if l.token != "-" {
 		rr.SaltLength = uint8(len(l.token)) / 2
@@ -1076,7 +1044,7 @@ func (rr *NSEC3) parse(c *zlexer, o string) *ParseError {
 	c.Next()
 	l, _ = c.Next()
 	if l.token == "" || l.err {
-		return &ParseError{err: "bad NSEC3 NextDomain", lex: l}
+		return &ParseError{"", "bad NSEC3 NextDomain", l}
 	}
 	rr.HashLength = 20 // Fix for NSEC3 (sha1 160 bits)
 	rr.NextDomain = l.token
@@ -1095,12 +1063,12 @@ func (rr *NSEC3) parse(c *zlexer, o string) *ParseError {
 			tokenUpper := strings.ToUpper(l.token)
 			if k, ok = StringToType[tokenUpper]; !ok {
 				if k, ok = typeToInt(l.token); !ok {
-					return &ParseError{err: "bad NSEC3 TypeBitMap", lex: l}
+					return &ParseError{"", "bad NSEC3 TypeBitMap", l}
 				}
 			}
 			rr.TypeBitMap = append(rr.TypeBitMap, k)
 		default:
-			return &ParseError{err: "bad NSEC3 TypeBitMap", lex: l}
+			return &ParseError{"", "bad NSEC3 TypeBitMap", l}
 		}
 		l, _ = c.Next()
 	}
@@ -1111,21 +1079,21 @@ func (rr *NSEC3PARAM) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad NSEC3PARAM Hash", lex: l}
+		return &ParseError{"", "bad NSEC3PARAM Hash", l}
 	}
 	rr.Hash = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad NSEC3PARAM Flags", lex: l}
+		return &ParseError{"", "bad NSEC3PARAM Flags", l}
 	}
 	rr.Flags = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e2 := strconv.ParseUint(l.token, 10, 16)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad NSEC3PARAM Iterations", lex: l}
+		return &ParseError{"", "bad NSEC3PARAM Iterations", l}
 	}
 	rr.Iterations = uint16(i)
 	c.Next()
@@ -1140,7 +1108,7 @@ func (rr *NSEC3PARAM) parse(c *zlexer, o string) *ParseError {
 func (rr *EUI48) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	if len(l.token) != 17 || l.err {
-		return &ParseError{err: "bad EUI48 Address", lex: l}
+		return &ParseError{"", "bad EUI48 Address", l}
 	}
 	addr := make([]byte, 12)
 	dash := 0
@@ -1149,7 +1117,7 @@ func (rr *EUI48) parse(c *zlexer, o string) *ParseError {
 		addr[i+1] = l.token[i+1+dash]
 		dash++
 		if l.token[i+1+dash] != '-' {
-			return &ParseError{err: "bad EUI48 Address", lex: l}
+			return &ParseError{"", "bad EUI48 Address", l}
 		}
 	}
 	addr[10] = l.token[15]
@@ -1157,7 +1125,7 @@ func (rr *EUI48) parse(c *zlexer, o string) *ParseError {
 
 	i, e := strconv.ParseUint(string(addr), 16, 48)
 	if e != nil {
-		return &ParseError{err: "bad EUI48 Address", lex: l}
+		return &ParseError{"", "bad EUI48 Address", l}
 	}
 	rr.Address = i
 	return slurpRemainder(c)
@@ -1166,7 +1134,7 @@ func (rr *EUI48) parse(c *zlexer, o string) *ParseError {
 func (rr *EUI64) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	if len(l.token) != 23 || l.err {
-		return &ParseError{err: "bad EUI64 Address", lex: l}
+		return &ParseError{"", "bad EUI64 Address", l}
 	}
 	addr := make([]byte, 16)
 	dash := 0
@@ -1175,7 +1143,7 @@ func (rr *EUI64) parse(c *zlexer, o string) *ParseError {
 		addr[i+1] = l.token[i+1+dash]
 		dash++
 		if l.token[i+1+dash] != '-' {
-			return &ParseError{err: "bad EUI64 Address", lex: l}
+			return &ParseError{"", "bad EUI64 Address", l}
 		}
 	}
 	addr[14] = l.token[21]
@@ -1183,7 +1151,7 @@ func (rr *EUI64) parse(c *zlexer, o string) *ParseError {
 
 	i, e := strconv.ParseUint(string(addr), 16, 64)
 	if e != nil {
-		return &ParseError{err: "bad EUI68 Address", lex: l}
+		return &ParseError{"", "bad EUI68 Address", l}
 	}
 	rr.Address = i
 	return slurpRemainder(c)
@@ -1193,14 +1161,14 @@ func (rr *SSHFP) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad SSHFP Algorithm", lex: l}
+		return &ParseError{"", "bad SSHFP Algorithm", l}
 	}
 	rr.Algorithm = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad SSHFP Type", lex: l}
+		return &ParseError{"", "bad SSHFP Type", l}
 	}
 	rr.Type = uint8(i)
 	c.Next() // zBlank
@@ -1216,21 +1184,21 @@ func (rr *DNSKEY) parseDNSKEY(c *zlexer, o, typ string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad " + typ + " Flags", lex: l}
+		return &ParseError{"", "bad " + typ + " Flags", l}
 	}
 	rr.Flags = uint16(i)
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad " + typ + " Protocol", lex: l}
+		return &ParseError{"", "bad " + typ + " Protocol", l}
 	}
 	rr.Protocol = uint8(i)
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	i, e2 := strconv.ParseUint(l.token, 10, 8)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad " + typ + " Algorithm", lex: l}
+		return &ParseError{"", "bad " + typ + " Algorithm", l}
 	}
 	rr.Algorithm = uint8(i)
 	s, e3 := endingToString(c, "bad "+typ+" PublicKey")
@@ -1248,136 +1216,25 @@ func (rr *DS) parse(c *zlexer, o string) *ParseError      { return rr.parseDS(c,
 func (rr *DLV) parse(c *zlexer, o string) *ParseError     { return rr.parseDS(c, o, "DLV") }
 func (rr *CDS) parse(c *zlexer, o string) *ParseError     { return rr.parseDS(c, o, "CDS") }
 
-func (rr *IPSECKEY) parse(c *zlexer, o string) *ParseError {
-	l, _ := c.Next()
-	num, err := strconv.ParseUint(l.token, 10, 8)
-	if err != nil || l.err {
-		return &ParseError{err: "bad IPSECKEY value", lex: l}
-	}
-	rr.Precedence = uint8(num)
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	num, err = strconv.ParseUint(l.token, 10, 8)
-	if err != nil || l.err {
-		return &ParseError{err: "bad IPSECKEY value", lex: l}
-	}
-	rr.GatewayType = uint8(num)
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	num, err = strconv.ParseUint(l.token, 10, 8)
-	if err != nil || l.err {
-		return &ParseError{err: "bad IPSECKEY value", lex: l}
-	}
-	rr.Algorithm = uint8(num)
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	if l.err {
-		return &ParseError{err: "bad IPSECKEY gateway", lex: l}
-	}
-
-	rr.GatewayAddr, rr.GatewayHost, err = parseAddrHostUnion(l.token, o, rr.GatewayType)
-	if err != nil {
-		return &ParseError{wrappedErr: fmt.Errorf("IPSECKEY %w", err), lex: l}
-	}
-
-	c.Next() // zBlank
-
-	s, pErr := endingToString(c, "bad IPSECKEY PublicKey")
-	if pErr != nil {
-		return pErr
-	}
-	rr.PublicKey = s
-	return slurpRemainder(c)
-}
-
-func (rr *AMTRELAY) parse(c *zlexer, o string) *ParseError {
-	l, _ := c.Next()
-	num, err := strconv.ParseUint(l.token, 10, 8)
-	if err != nil || l.err {
-		return &ParseError{err: "bad AMTRELAY value", lex: l}
-	}
-	rr.Precedence = uint8(num)
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	if l.err || !(l.token == "0" || l.token == "1") {
-		return &ParseError{err: "bad discovery value", lex: l}
-	}
-	if l.token == "1" {
-		rr.GatewayType = 0x80
-	}
-
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	num, err = strconv.ParseUint(l.token, 10, 8)
-	if err != nil || l.err {
-		return &ParseError{err: "bad AMTRELAY value", lex: l}
-	}
-	rr.GatewayType |= uint8(num)
-	c.Next() // zBlank
-
-	l, _ = c.Next()
-	if l.err {
-		return &ParseError{err: "bad AMTRELAY gateway", lex: l}
-	}
-
-	rr.GatewayAddr, rr.GatewayHost, err = parseAddrHostUnion(l.token, o, rr.GatewayType&0x7f)
-	if err != nil {
-		return &ParseError{wrappedErr: fmt.Errorf("AMTRELAY %w", err), lex: l}
-	}
-
-	return slurpRemainder(c)
-}
-
-// same constants and parsing between IPSECKEY and AMTRELAY
-func parseAddrHostUnion(token, o string, gatewayType uint8) (addr net.IP, host string, err error) {
-	switch gatewayType {
-	case IPSECGatewayNone:
-		if token != "." {
-			return addr, host, errors.New("gateway type none with gateway set")
-		}
-	case IPSECGatewayIPv4, IPSECGatewayIPv6:
-		addr = net.ParseIP(token)
-		if addr == nil {
-			return addr, host, errors.New("gateway IP invalid")
-		}
-		if (addr.To4() == nil) == (gatewayType == IPSECGatewayIPv4) {
-			return addr, host, errors.New("gateway IP family mismatch")
-		}
-	case IPSECGatewayHost:
-		var ok bool
-		host, ok = toAbsoluteName(token, o)
-		if !ok {
-			return addr, host, errors.New("invalid gateway host")
-		}
-	}
-
-	return addr, host, nil
-}
-
 func (rr *RKEY) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad RKEY Flags", lex: l}
+		return &ParseError{"", "bad RKEY Flags", l}
 	}
 	rr.Flags = uint16(i)
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad RKEY Protocol", lex: l}
+		return &ParseError{"", "bad RKEY Protocol", l}
 	}
 	rr.Protocol = uint8(i)
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	i, e2 := strconv.ParseUint(l.token, 10, 8)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad RKEY Algorithm", lex: l}
+		return &ParseError{"", "bad RKEY Algorithm", l}
 	}
 	rr.Algorithm = uint8(i)
 	s, e3 := endingToString(c, "bad RKEY PublicKey")
@@ -1410,21 +1267,21 @@ func (rr *GPOS) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	_, e := strconv.ParseFloat(l.token, 64)
 	if e != nil || l.err {
-		return &ParseError{err: "bad GPOS Longitude", lex: l}
+		return &ParseError{"", "bad GPOS Longitude", l}
 	}
 	rr.Longitude = l.token
 	c.Next() // zBlank
 	l, _ = c.Next()
 	_, e1 := strconv.ParseFloat(l.token, 64)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad GPOS Latitude", lex: l}
+		return &ParseError{"", "bad GPOS Latitude", l}
 	}
 	rr.Latitude = l.token
 	c.Next() // zBlank
 	l, _ = c.Next()
 	_, e2 := strconv.ParseFloat(l.token, 64)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad GPOS Altitude", lex: l}
+		return &ParseError{"", "bad GPOS Altitude", l}
 	}
 	rr.Altitude = l.token
 	return slurpRemainder(c)
@@ -1434,7 +1291,7 @@ func (rr *DS) parseDS(c *zlexer, o, typ string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad " + typ + " KeyTag", lex: l}
+		return &ParseError{"", "bad " + typ + " KeyTag", l}
 	}
 	rr.KeyTag = uint16(i)
 	c.Next() // zBlank
@@ -1443,7 +1300,7 @@ func (rr *DS) parseDS(c *zlexer, o, typ string) *ParseError {
 		tokenUpper := strings.ToUpper(l.token)
 		i, ok := StringToAlgorithm[tokenUpper]
 		if !ok || l.err {
-			return &ParseError{err: "bad " + typ + " Algorithm", lex: l}
+			return &ParseError{"", "bad " + typ + " Algorithm", l}
 		}
 		rr.Algorithm = i
 	} else {
@@ -1453,7 +1310,7 @@ func (rr *DS) parseDS(c *zlexer, o, typ string) *ParseError {
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad " + typ + " DigestType", lex: l}
+		return &ParseError{"", "bad " + typ + " DigestType", l}
 	}
 	rr.DigestType = uint8(i)
 	s, e2 := endingToString(c, "bad "+typ+" Digest")
@@ -1468,7 +1325,7 @@ func (rr *TA) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad TA KeyTag", lex: l}
+		return &ParseError{"", "bad TA KeyTag", l}
 	}
 	rr.KeyTag = uint16(i)
 	c.Next() // zBlank
@@ -1477,7 +1334,7 @@ func (rr *TA) parse(c *zlexer, o string) *ParseError {
 		tokenUpper := strings.ToUpper(l.token)
 		i, ok := StringToAlgorithm[tokenUpper]
 		if !ok || l.err {
-			return &ParseError{err: "bad TA Algorithm", lex: l}
+			return &ParseError{"", "bad TA Algorithm", l}
 		}
 		rr.Algorithm = i
 	} else {
@@ -1487,7 +1344,7 @@ func (rr *TA) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad TA DigestType", lex: l}
+		return &ParseError{"", "bad TA DigestType", l}
 	}
 	rr.DigestType = uint8(i)
 	s, e2 := endingToString(c, "bad TA Digest")
@@ -1502,21 +1359,21 @@ func (rr *TLSA) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad TLSA Usage", lex: l}
+		return &ParseError{"", "bad TLSA Usage", l}
 	}
 	rr.Usage = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad TLSA Selector", lex: l}
+		return &ParseError{"", "bad TLSA Selector", l}
 	}
 	rr.Selector = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e2 := strconv.ParseUint(l.token, 10, 8)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad TLSA MatchingType", lex: l}
+		return &ParseError{"", "bad TLSA MatchingType", l}
 	}
 	rr.MatchingType = uint8(i)
 	// So this needs be e2 (i.e. different than e), because...??t
@@ -1532,21 +1389,21 @@ func (rr *SMIMEA) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad SMIMEA Usage", lex: l}
+		return &ParseError{"", "bad SMIMEA Usage", l}
 	}
 	rr.Usage = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad SMIMEA Selector", lex: l}
+		return &ParseError{"", "bad SMIMEA Selector", l}
 	}
 	rr.Selector = uint8(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e2 := strconv.ParseUint(l.token, 10, 8)
 	if e2 != nil || l.err {
-		return &ParseError{err: "bad SMIMEA MatchingType", lex: l}
+		return &ParseError{"", "bad SMIMEA MatchingType", l}
 	}
 	rr.MatchingType = uint8(i)
 	// So this needs be e2 (i.e. different than e), because...??t
@@ -1561,14 +1418,14 @@ func (rr *SMIMEA) parse(c *zlexer, o string) *ParseError {
 func (rr *RFC3597) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	if l.token != "\\#" {
-		return &ParseError{err: "bad RFC3597 Rdata", lex: l}
+		return &ParseError{"", "bad RFC3597 Rdata", l}
 	}
 
 	c.Next() // zBlank
 	l, _ = c.Next()
 	rdlength, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad RFC3597 Rdata ", lex: l}
+		return &ParseError{"", "bad RFC3597 Rdata ", l}
 	}
 
 	s, e1 := endingToString(c, "bad RFC3597 Rdata")
@@ -1576,7 +1433,7 @@ func (rr *RFC3597) parse(c *zlexer, o string) *ParseError {
 		return e1
 	}
 	if int(rdlength)*2 != len(s) {
-		return &ParseError{err: "bad RFC3597 Rdata", lex: l}
+		return &ParseError{"", "bad RFC3597 Rdata", l}
 	}
 	rr.Rdata = s
 	return nil
@@ -1620,28 +1477,18 @@ func (rr *NINFO) parse(c *zlexer, o string) *ParseError {
 	return nil
 }
 
-// Uses the same format as TXT
-func (rr *RESINFO) parse(c *zlexer, o string) *ParseError {
-	s, e := endingToTxtSlice(c, "bad RESINFO Resinfo")
-	if e != nil {
-		return e
-	}
-	rr.Txt = s
-	return nil
-}
-
 func (rr *URI) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad URI Priority", lex: l}
+		return &ParseError{"", "bad URI Priority", l}
 	}
 	rr.Priority = uint16(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 16)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad URI Weight", lex: l}
+		return &ParseError{"", "bad URI Weight", l}
 	}
 	rr.Weight = uint16(i)
 
@@ -1651,7 +1498,7 @@ func (rr *URI) parse(c *zlexer, o string) *ParseError {
 		return e2
 	}
 	if len(s) != 1 {
-		return &ParseError{err: "bad URI Target", lex: l}
+		return &ParseError{"", "bad URI Target", l}
 	}
 	rr.Target = s[0]
 	return nil
@@ -1671,7 +1518,7 @@ func (rr *NID) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad NID Preference", lex: l}
+		return &ParseError{"", "bad NID Preference", l}
 	}
 	rr.Preference = uint16(i)
 	c.Next()        // zBlank
@@ -1688,14 +1535,14 @@ func (rr *L32) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad L32 Preference", lex: l}
+		return &ParseError{"", "bad L32 Preference", l}
 	}
 	rr.Preference = uint16(i)
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	rr.Locator32 = net.ParseIP(l.token)
 	if rr.Locator32 == nil || l.err {
-		return &ParseError{err: "bad L32 Locator", lex: l}
+		return &ParseError{"", "bad L32 Locator", l}
 	}
 	return slurpRemainder(c)
 }
@@ -1704,7 +1551,7 @@ func (rr *LP) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad LP Preference", lex: l}
+		return &ParseError{"", "bad LP Preference", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -1713,7 +1560,7 @@ func (rr *LP) parse(c *zlexer, o string) *ParseError {
 	rr.Fqdn = l.token
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{err: "bad LP Fqdn", lex: l}
+		return &ParseError{"", "bad LP Fqdn", l}
 	}
 	rr.Fqdn = name
 	return slurpRemainder(c)
@@ -1723,7 +1570,7 @@ func (rr *L64) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad L64 Preference", lex: l}
+		return &ParseError{"", "bad L64 Preference", l}
 	}
 	rr.Preference = uint16(i)
 	c.Next()        // zBlank
@@ -1740,7 +1587,7 @@ func (rr *UID) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 32)
 	if e != nil || l.err {
-		return &ParseError{err: "bad UID Uid", lex: l}
+		return &ParseError{"", "bad UID Uid", l}
 	}
 	rr.Uid = uint32(i)
 	return slurpRemainder(c)
@@ -1750,7 +1597,7 @@ func (rr *GID) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 32)
 	if e != nil || l.err {
-		return &ParseError{err: "bad GID Gid", lex: l}
+		return &ParseError{"", "bad GID Gid", l}
 	}
 	rr.Gid = uint32(i)
 	return slurpRemainder(c)
@@ -1772,7 +1619,7 @@ func (rr *PX) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{err: "bad PX Preference", lex: l}
+		return &ParseError{"", "bad PX Preference", l}
 	}
 	rr.Preference = uint16(i)
 
@@ -1781,7 +1628,7 @@ func (rr *PX) parse(c *zlexer, o string) *ParseError {
 	rr.Map822 = l.token
 	map822, map822Ok := toAbsoluteName(l.token, o)
 	if l.err || !map822Ok {
-		return &ParseError{err: "bad PX Map822", lex: l}
+		return &ParseError{"", "bad PX Map822", l}
 	}
 	rr.Map822 = map822
 
@@ -1790,7 +1637,7 @@ func (rr *PX) parse(c *zlexer, o string) *ParseError {
 	rr.Mapx400 = l.token
 	mapx400, mapx400Ok := toAbsoluteName(l.token, o)
 	if l.err || !mapx400Ok {
-		return &ParseError{err: "bad PX Mapx400", lex: l}
+		return &ParseError{"", "bad PX Mapx400", l}
 	}
 	rr.Mapx400 = mapx400
 	return slurpRemainder(c)
@@ -1800,14 +1647,14 @@ func (rr *CAA) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad CAA Flag", lex: l}
+		return &ParseError{"", "bad CAA Flag", l}
 	}
 	rr.Flag = uint8(i)
 
 	c.Next()        // zBlank
 	l, _ = c.Next() // zString
 	if l.value != zString {
-		return &ParseError{err: "bad CAA Tag", lex: l}
+		return &ParseError{"", "bad CAA Tag", l}
 	}
 	rr.Tag = l.token
 
@@ -1817,7 +1664,7 @@ func (rr *CAA) parse(c *zlexer, o string) *ParseError {
 		return e1
 	}
 	if len(s) != 1 {
-		return &ParseError{err: "bad CAA Value", lex: l}
+		return &ParseError{"", "bad CAA Value", l}
 	}
 	rr.Value = s[0]
 	return nil
@@ -1828,7 +1675,7 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
 
 	// Algorithm
 	if l.value != zString {
-		return &ParseError{err: "bad TKEY algorithm", lex: l}
+		return &ParseError{"", "bad TKEY algorithm", l}
 	}
 	rr.Algorithm = l.token
 	c.Next() // zBlank
@@ -1837,13 +1684,13 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 8)
 	if e != nil || l.err {
-		return &ParseError{err: "bad TKEY key length", lex: l}
+		return &ParseError{"", "bad TKEY key length", l}
 	}
 	rr.KeySize = uint16(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if l.value != zString {
-		return &ParseError{err: "bad TKEY key", lex: l}
+		return &ParseError{"", "bad TKEY key", l}
 	}
 	rr.Key = l.token
 	c.Next() // zBlank
@@ -1852,13 +1699,13 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
 	l, _ = c.Next()
 	i, e1 := strconv.ParseUint(l.token, 10, 8)
 	if e1 != nil || l.err {
-		return &ParseError{err: "bad TKEY otherdata length", lex: l}
+		return &ParseError{"", "bad TKEY otherdata length", l}
 	}
 	rr.OtherLen = uint16(i)
 	c.Next() // zBlank
 	l, _ = c.Next()
 	if l.value != zString {
-		return &ParseError{err: "bad TKEY otherday", lex: l}
+		return &ParseError{"", "bad TKEY otherday", l}
 	}
 	rr.OtherData = l.token
 	return nil
@@ -1876,14 +1723,14 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
 			continue
 		}
 		if l.value != zString {
-			return &ParseError{err: "unexpected APL field", lex: l}
+			return &ParseError{"", "unexpected APL field", l}
 		}
 
 		// Expected format: [!]afi:address/prefix
 
 		colon := strings.IndexByte(l.token, ':')
 		if colon == -1 {
-			return &ParseError{err: "missing colon in APL field", lex: l}
+			return &ParseError{"", "missing colon in APL field", l}
 		}
 
 		family, cidr := l.token[:colon], l.token[colon+1:]
@@ -1896,7 +1743,7 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
 
 		afi, e := strconv.ParseUint(family, 10, 16)
 		if e != nil {
-			return &ParseError{wrappedErr: fmt.Errorf("failed to parse APL family: %w", e), lex: l}
+			return &ParseError{"", "failed to parse APL family: " + e.Error(), l}
 		}
 		var addrLen int
 		switch afi {
@@ -1905,19 +1752,19 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
 		case 2:
 			addrLen = net.IPv6len
 		default:
-			return &ParseError{err: "unrecognized APL family", lex: l}
+			return &ParseError{"", "unrecognized APL family", l}
 		}
 
 		ip, subnet, e1 := net.ParseCIDR(cidr)
 		if e1 != nil {
-			return &ParseError{wrappedErr: fmt.Errorf("failed to parse APL address: %w", e1), lex: l}
+			return &ParseError{"", "failed to parse APL address: " + e1.Error(), l}
 		}
 		if !ip.Equal(subnet.IP) {
-			return &ParseError{err: "extra bits in APL address", lex: l}
+			return &ParseError{"", "extra bits in APL address", l}
 		}
 
 		if len(subnet.IP) != addrLen {
-			return &ParseError{err: "address mismatch with the APL family", lex: l}
+			return &ParseError{"", "address mismatch with the APL family", l}
 		}
 
 		prefixes = append(prefixes, APLPrefix{
@@ -1929,39 +1776,3 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
 	rr.Prefixes = prefixes
 	return nil
 }
-
-// escapedStringOffset finds the offset within a string (which may contain escape
-// sequences) that corresponds to a certain byte offset. If the input offset is
-// out of bounds, -1 is returned (which is *not* considered an error).
-func escapedStringOffset(s string, desiredByteOffset int) (int, bool) {
-	if desiredByteOffset == 0 {
-		return 0, true
-	}
-
-	currentByteOffset, i := 0, 0
-
-	for i < len(s) {
-		currentByteOffset += 1
-
-		// Skip escape sequences
-		if s[i] != '\\' {
-			// Single plain byte, not an escape sequence.
-			i++
-		} else if isDDD(s[i+1:]) {
-			// Skip backslash and DDD.
-			i += 4
-		} else if len(s[i+1:]) < 1 {
-			// No character following the backslash; that's an error.
-			return 0, false
-		} else {
-			// Skip backslash and following byte.
-			i += 2
-		}
-
-		if currentByteOffset >= desiredByteOffset {
-			return i, true
-		}
-	}
-
-	return -1, true
-}
diff --git a/vendor/github.com/miekg/dns/server.go b/vendor/github.com/miekg/dns/server.go
index b04d370..b2a63bd 100644
--- a/vendor/github.com/miekg/dns/server.go
+++ b/vendor/github.com/miekg/dns/server.go
@@ -18,7 +18,7 @@ import (
 const maxTCPQueries = 128
 
 // aLongTimeAgo is a non-zero time, far in the past, used for
-// immediate cancellation of network operations.
+// immediate cancelation of network operations.
 var aLongTimeAgo = time.Unix(1, 0)
 
 // Handler is implemented by any value that implements ServeDNS.
@@ -71,12 +71,12 @@ type response struct {
 	tsigTimersOnly bool
 	tsigStatus     error
 	tsigRequestMAC string
-	tsigProvider   TsigProvider
-	udp            net.PacketConn // i/o connection if UDP was used
-	tcp            net.Conn       // i/o connection if TCP was used
-	udpSession     *SessionUDP    // oob data to get egress interface right
-	pcSession      net.Addr       // address to use when writing to a generic net.PacketConn
-	writer         Writer         // writer to output the raw DNS bits
+	tsigSecret     map[string]string // the tsig secrets
+	udp            net.PacketConn    // i/o connection if UDP was used
+	tcp            net.Conn          // i/o connection if TCP was used
+	udpSession     *SessionUDP       // oob data to get egress interface right
+	pcSession      net.Addr          // address to use when writing to a generic net.PacketConn
+	writer         Writer            // writer to output the raw DNS bits
 }
 
 // handleRefused returns a HandlerFunc that returns REFUSED for every request it gets.
@@ -188,14 +188,6 @@ type DecorateReader func(Reader) Reader
 // Implementations should never return a nil Writer.
 type DecorateWriter func(Writer) Writer
 
-// MsgInvalidFunc is a listener hook for observing incoming messages that were discarded
-// because they could not be parsed.
-// Every message that is read by a Reader will eventually be provided to the Handler,
-// rejected (or ignored) by the MsgAcceptFunc, or passed to this function.
-type MsgInvalidFunc func(m []byte, err error)
-
-func DefaultMsgInvalidFunc(m []byte, err error) {}
-
 // A Server defines parameters for running an DNS server.
 type Server struct {
 	// Address to listen on, ":dns" if empty.
@@ -219,31 +211,22 @@ type Server struct {
 	WriteTimeout time.Duration
 	// TCP idle timeout for multiple queries, if nil, defaults to 8 * time.Second (RFC 5966).
 	IdleTimeout func() time.Duration
-	// An implementation of the TsigProvider interface. If defined it replaces TsigSecret and is used for all TSIG operations.
-	TsigProvider TsigProvider
 	// Secret(s) for Tsig map[<zonename>]<base64 secret>. The zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2).
 	TsigSecret map[string]string
 	// If NotifyStartedFunc is set it is called once the server has started listening.
 	NotifyStartedFunc func()
 	// DecorateReader is optional, allows customization of the process that reads raw DNS messages.
-	// The decorated reader must not mutate the data read from the conn.
 	DecorateReader DecorateReader
 	// DecorateWriter is optional, allows customization of the process that writes raw DNS messages.
 	DecorateWriter DecorateWriter
 	// Maximum number of TCP queries before we close the socket. Default is maxTCPQueries (unlimited if -1).
 	MaxTCPQueries int
 	// Whether to set the SO_REUSEPORT socket option, allowing multiple listeners to be bound to a single address.
-	// It is only supported on certain GOOSes and when using ListenAndServe.
+	// It is only supported on go1.11+ and when using ListenAndServe.
 	ReusePort bool
-	// Whether to set the SO_REUSEADDR socket option, allowing multiple listeners to be bound to a single address.
-	// Crucially this allows binding when an existing server is listening on `0.0.0.0` or `::`.
-	// It is only supported on certain GOOSes and when using ListenAndServe.
-	ReuseAddr bool
 	// AcceptMsgFunc will check the incoming message and will reject it early in the process.
 	// By default DefaultMsgAcceptFunc will be used.
 	MsgAcceptFunc MsgAcceptFunc
-	// MsgInvalidFunc is optional, will be called if a message is received but cannot be parsed.
-	MsgInvalidFunc MsgInvalidFunc
 
 	// Shutdown handling
 	lock     sync.RWMutex
@@ -255,16 +238,6 @@ type Server struct {
 	udpPool sync.Pool
 }
 
-func (srv *Server) tsigProvider() TsigProvider {
-	if srv.TsigProvider != nil {
-		return srv.TsigProvider
-	}
-	if srv.TsigSecret != nil {
-		return tsigSecretProvider(srv.TsigSecret)
-	}
-	return nil
-}
-
 func (srv *Server) isStarted() bool {
 	srv.lock.RLock()
 	started := srv.started
@@ -288,9 +261,6 @@ func (srv *Server) init() {
 	if srv.MsgAcceptFunc == nil {
 		srv.MsgAcceptFunc = DefaultMsgAcceptFunc
 	}
-	if srv.MsgInvalidFunc == nil {
-		srv.MsgInvalidFunc = DefaultMsgInvalidFunc
-	}
 	if srv.Handler == nil {
 		srv.Handler = DefaultServeMux
 	}
@@ -322,7 +292,7 @@ func (srv *Server) ListenAndServe() error {
 
 	switch srv.Net {
 	case "tcp", "tcp4", "tcp6":
-		l, err := listenTCP(srv.Net, addr, srv.ReusePort, srv.ReuseAddr)
+		l, err := listenTCP(srv.Net, addr, srv.ReusePort)
 		if err != nil {
 			return err
 		}
@@ -335,7 +305,7 @@ func (srv *Server) ListenAndServe() error {
 			return errors.New("dns: neither Certificates nor GetCertificate set in Config")
 		}
 		network := strings.TrimSuffix(srv.Net, "-tls")
-		l, err := listenTCP(network, addr, srv.ReusePort, srv.ReuseAddr)
+		l, err := listenTCP(network, addr, srv.ReusePort)
 		if err != nil {
 			return err
 		}
@@ -345,7 +315,7 @@ func (srv *Server) ListenAndServe() error {
 		unlock()
 		return srv.serveTCP(l)
 	case "udp", "udp4", "udp6":
-		l, err := listenUDP(srv.Net, addr, srv.ReusePort, srv.ReuseAddr)
+		l, err := listenUDP(srv.Net, addr, srv.ReusePort)
 		if err != nil {
 			return err
 		}
@@ -545,7 +515,6 @@ func (srv *Server) serveUDP(l net.PacketConn) error {
 			if cap(m) == srv.UDPSize {
 				srv.udpPool.Put(m[:srv.UDPSize])
 			}
-			srv.MsgInvalidFunc(m, ErrShortRead)
 			continue
 		}
 		wg.Add(1)
@@ -557,7 +526,7 @@ func (srv *Server) serveUDP(l net.PacketConn) error {
 
 // Serve a new TCP connection.
 func (srv *Server) serveTCPConn(wg *sync.WaitGroup, rw net.Conn) {
-	w := &response{tsigProvider: srv.tsigProvider(), tcp: rw}
+	w := &response{tsigSecret: srv.TsigSecret, tcp: rw}
 	if srv.DecorateWriter != nil {
 		w.writer = srv.DecorateWriter(w)
 	} else {
@@ -612,7 +581,7 @@ func (srv *Server) serveTCPConn(wg *sync.WaitGroup, rw net.Conn) {
 
 // Serve a new UDP request.
 func (srv *Server) serveUDPPacket(wg *sync.WaitGroup, m []byte, u net.PacketConn, udpSession *SessionUDP, pcSession net.Addr) {
-	w := &response{tsigProvider: srv.tsigProvider(), udp: u, udpSession: udpSession, pcSession: pcSession}
+	w := &response{tsigSecret: srv.TsigSecret, udp: u, udpSession: udpSession, pcSession: pcSession}
 	if srv.DecorateWriter != nil {
 		w.writer = srv.DecorateWriter(w)
 	} else {
@@ -626,7 +595,6 @@ func (srv *Server) serveUDPPacket(wg *sync.WaitGroup, m []byte, u net.PacketConn
 func (srv *Server) serveDNS(m []byte, w *response) {
 	dh, off, err := unpackMsgHdr(m, 0)
 	if err != nil {
-		srv.MsgInvalidFunc(m, err)
 		// Let client hang, they are sending crap; any reply can be used to amplify.
 		return
 	}
@@ -636,12 +604,10 @@ func (srv *Server) serveDNS(m []byte, w *response) {
 
 	switch action := srv.MsgAcceptFunc(dh); action {
 	case MsgAccept:
-		err := req.unpack(dh, m, off)
-		if err == nil {
+		if req.unpack(dh, m, off) == nil {
 			break
 		}
 
-		srv.MsgInvalidFunc(m, err)
 		fallthrough
 	case MsgReject, MsgRejectNotImplemented:
 		opcode := req.Opcode
@@ -666,11 +632,15 @@ func (srv *Server) serveDNS(m []byte, w *response) {
 	}
 
 	w.tsigStatus = nil
-	if w.tsigProvider != nil {
+	if w.tsigSecret != nil {
 		if t := req.IsTsig(); t != nil {
-			w.tsigStatus = TsigVerifyWithProvider(m, w.tsigProvider, "", false)
+			if secret, ok := w.tsigSecret[t.Hdr.Name]; ok {
+				w.tsigStatus = TsigVerify(m, secret, "", false)
+			} else {
+				w.tsigStatus = ErrSecret
+			}
 			w.tsigTimersOnly = false
-			w.tsigRequestMAC = t.MAC
+			w.tsigRequestMAC = req.Extra[len(req.Extra)-1].(*TSIG).MAC
 		}
 	}
 
@@ -748,9 +718,9 @@ func (w *response) WriteMsg(m *Msg) (err error) {
 	}
 
 	var data []byte
-	if w.tsigProvider != nil { // if no provider, dont check for the tsig (which is a longer check)
+	if w.tsigSecret != nil { // if no secrets, dont check for the tsig (which is a longer check)
 		if t := m.IsTsig(); t != nil {
-			data, w.tsigRequestMAC, err = TsigGenerateWithProvider(m, w.tsigProvider, w.tsigRequestMAC, w.tsigTimersOnly)
+			data, w.tsigRequestMAC, err = TsigGenerate(m, w.tsigSecret[t.Hdr.Name], w.tsigRequestMAC, w.tsigTimersOnly)
 			if err != nil {
 				return err
 			}
diff --git a/vendor/github.com/miekg/dns/sig0.go b/vendor/github.com/miekg/dns/sig0.go
index 057bb57..e781c9b 100644
--- a/vendor/github.com/miekg/dns/sig0.go
+++ b/vendor/github.com/miekg/dns/sig0.go
@@ -3,10 +3,10 @@ package dns
 import (
 	"crypto"
 	"crypto/ecdsa"
-	"crypto/ed25519"
 	"crypto/rsa"
 	"encoding/binary"
 	"math/big"
+	"strings"
 	"time"
 )
 
@@ -38,17 +38,18 @@ func (rr *SIG) Sign(k crypto.Signer, m *Msg) ([]byte, error) {
 	}
 	buf = buf[:off:cap(buf)]
 
-	h, cryptohash, err := hashFromAlgorithm(rr.Algorithm)
-	if err != nil {
-		return nil, err
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return nil, ErrAlg
 	}
 
+	hasher := hash.New()
 	// Write SIG rdata
-	h.Write(buf[len(mbuf)+1+2+2+4+2:])
+	hasher.Write(buf[len(mbuf)+1+2+2+4+2:])
 	// Write message
-	h.Write(buf[:len(mbuf)])
+	hasher.Write(buf[:len(mbuf)])
 
-	signature, err := sign(k, h.Sum(nil), cryptohash, rr.Algorithm)
+	signature, err := sign(k, hasher.Sum(nil), hash, rr.Algorithm)
 	if err != nil {
 		return nil, err
 	}
@@ -81,10 +82,20 @@ func (rr *SIG) Verify(k *KEY, buf []byte) error {
 		return ErrKey
 	}
 
-	h, cryptohash, err := hashFromAlgorithm(rr.Algorithm)
-	if err != nil {
-		return err
+	var hash crypto.Hash
+	switch rr.Algorithm {
+	case RSASHA1:
+		hash = crypto.SHA1
+	case RSASHA256, ECDSAP256SHA256:
+		hash = crypto.SHA256
+	case ECDSAP384SHA384:
+		hash = crypto.SHA384
+	case RSASHA512:
+		hash = crypto.SHA512
+	default:
+		return ErrAlg
 	}
+	hasher := hash.New()
 
 	buflen := len(buf)
 	qdc := binary.BigEndian.Uint16(buf[4:])
@@ -92,6 +103,7 @@ func (rr *SIG) Verify(k *KEY, buf []byte) error {
 	auc := binary.BigEndian.Uint16(buf[8:])
 	adc := binary.BigEndian.Uint16(buf[10:])
 	offset := headerSize
+	var err error
 	for i := uint16(0); i < qdc && offset < buflen; i++ {
 		_, offset, err = UnpackDomainName(buf, offset)
 		if err != nil {
@@ -150,25 +162,25 @@ func (rr *SIG) Verify(k *KEY, buf []byte) error {
 	}
 	// If key has come from the DNS name compression might
 	// have mangled the case of the name
-	if !equal(signername, k.Header().Name) {
+	if !strings.EqualFold(signername, k.Header().Name) {
 		return &Error{err: "signer name doesn't match key name"}
 	}
 	sigend := offset
-	h.Write(buf[sigstart:sigend])
-	h.Write(buf[:10])
-	h.Write([]byte{
+	hasher.Write(buf[sigstart:sigend])
+	hasher.Write(buf[:10])
+	hasher.Write([]byte{
 		byte((adc - 1) << 8),
 		byte(adc - 1),
 	})
-	h.Write(buf[12:bodyend])
+	hasher.Write(buf[12:bodyend])
 
-	hashed := h.Sum(nil)
+	hashed := hasher.Sum(nil)
 	sig := buf[sigend:]
 	switch k.Algorithm {
 	case RSASHA1, RSASHA256, RSASHA512:
 		pk := k.publicKeyRSA()
 		if pk != nil {
-			return rsa.VerifyPKCS1v15(pk, cryptohash, hashed, sig)
+			return rsa.VerifyPKCS1v15(pk, hash, hashed, sig)
 		}
 	case ECDSAP256SHA256, ECDSAP384SHA384:
 		pk := k.publicKeyECDSA()
@@ -180,14 +192,6 @@ func (rr *SIG) Verify(k *KEY, buf []byte) error {
 			}
 			return ErrSig
 		}
-	case ED25519:
-		pk := k.publicKeyED25519()
-		if pk != nil {
-			if ed25519.Verify(pk, hashed, sig) {
-				return nil
-			}
-			return ErrSig
-		}
 	}
 	return ErrKeyAlg
 }
diff --git a/vendor/github.com/miekg/dns/singleinflight.go b/vendor/github.com/miekg/dns/singleinflight.go
new file mode 100644
index 0000000..febcc30
--- /dev/null
+++ b/vendor/github.com/miekg/dns/singleinflight.go
@@ -0,0 +1,61 @@
+// Copyright 2013 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Adapted for dns package usage by Miek Gieben.
+
+package dns
+
+import "sync"
+import "time"
+
+// call is an in-flight or completed singleflight.Do call
+type call struct {
+	wg   sync.WaitGroup
+	val  *Msg
+	rtt  time.Duration
+	err  error
+	dups int
+}
+
+// singleflight represents a class of work and forms a namespace in
+// which units of work can be executed with duplicate suppression.
+type singleflight struct {
+	sync.Mutex                  // protects m
+	m          map[string]*call // lazily initialized
+
+	dontDeleteForTesting bool // this is only to be used by TestConcurrentExchanges
+}
+
+// Do executes and returns the results of the given function, making
+// sure that only one execution is in-flight for a given key at a
+// time. If a duplicate comes in, the duplicate caller waits for the
+// original to complete and receives the same results.
+// The return value shared indicates whether v was given to multiple callers.
+func (g *singleflight) Do(key string, fn func() (*Msg, time.Duration, error)) (v *Msg, rtt time.Duration, err error, shared bool) {
+	g.Lock()
+	if g.m == nil {
+		g.m = make(map[string]*call)
+	}
+	if c, ok := g.m[key]; ok {
+		c.dups++
+		g.Unlock()
+		c.wg.Wait()
+		return c.val, c.rtt, c.err, true
+	}
+	c := new(call)
+	c.wg.Add(1)
+	g.m[key] = c
+	g.Unlock()
+
+	c.val, c.rtt, c.err = fn()
+	c.wg.Done()
+
+	if !g.dontDeleteForTesting {
+		g.Lock()
+		delete(g.m, key)
+		g.Unlock()
+	}
+
+	return c.val, c.rtt, c.err, c.dups > 0
+}
diff --git a/vendor/github.com/miekg/dns/svcb.go b/vendor/github.com/miekg/dns/svcb.go
index d1baeea..3344253 100644
--- a/vendor/github.com/miekg/dns/svcb.go
+++ b/vendor/github.com/miekg/dns/svcb.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
-	"fmt"
 	"net"
 	"sort"
 	"strconv"
@@ -14,19 +13,16 @@ import (
 // SVCBKey is the type of the keys used in the SVCB RR.
 type SVCBKey uint16
 
-// Keys defined in rfc9460
+// Keys defined in draft-ietf-dnsop-svcb-https-01 Section 12.3.2.
 const (
-	SVCB_MANDATORY SVCBKey = iota
-	SVCB_ALPN
-	SVCB_NO_DEFAULT_ALPN
-	SVCB_PORT
-	SVCB_IPV4HINT
-	SVCB_ECHCONFIG
-	SVCB_IPV6HINT
-	SVCB_DOHPATH // rfc9461 Section 5
-	SVCB_OHTTP   // rfc9540 Section 8
-
-	svcb_RESERVED SVCBKey = 65535
+	SVCB_MANDATORY       SVCBKey = 0
+	SVCB_ALPN            SVCBKey = 1
+	SVCB_NO_DEFAULT_ALPN SVCBKey = 2
+	SVCB_PORT            SVCBKey = 3
+	SVCB_IPV4HINT        SVCBKey = 4
+	SVCB_ECHCONFIG       SVCBKey = 5
+	SVCB_IPV6HINT        SVCBKey = 6
+	svcb_RESERVED        SVCBKey = 65535
 )
 
 var svcbKeyToStringMap = map[SVCBKey]string{
@@ -35,10 +31,8 @@ var svcbKeyToStringMap = map[SVCBKey]string{
 	SVCB_NO_DEFAULT_ALPN: "no-default-alpn",
 	SVCB_PORT:            "port",
 	SVCB_IPV4HINT:        "ipv4hint",
-	SVCB_ECHCONFIG:       "ech",
+	SVCB_ECHCONFIG:       "echconfig",
 	SVCB_IPV6HINT:        "ipv6hint",
-	SVCB_DOHPATH:         "dohpath",
-	SVCB_OHTTP:           "ohttp",
 }
 
 var svcbStringToKeyMap = reverseSVCBKeyMap(svcbKeyToStringMap)
@@ -87,7 +81,7 @@ func (rr *SVCB) parse(c *zlexer, o string) *ParseError {
 	l, _ := c.Next()
 	i, e := strconv.ParseUint(l.token, 10, 16)
 	if e != nil || l.err {
-		return &ParseError{file: l.token, err: "bad SVCB priority", lex: l}
+		return &ParseError{l.token, "bad SVCB priority", l}
 	}
 	rr.Priority = uint16(i)
 
@@ -97,7 +91,7 @@ func (rr *SVCB) parse(c *zlexer, o string) *ParseError {
 
 	name, nameOk := toAbsoluteName(l.token, o)
 	if l.err || !nameOk {
-		return &ParseError{file: l.token, err: "bad SVCB Target", lex: l}
+		return &ParseError{l.token, "bad SVCB Target", l}
 	}
 	rr.Target = name
 
@@ -113,7 +107,7 @@ func (rr *SVCB) parse(c *zlexer, o string) *ParseError {
 			if !canHaveNextKey {
 				// The key we can now read was probably meant to be
 				// a part of the last value.
-				return &ParseError{file: l.token, err: "bad SVCB value quotation", lex: l}
+				return &ParseError{l.token, "bad SVCB value quotation", l}
 			}
 
 			// In key=value pairs, value does not have to be quoted unless value
@@ -126,7 +120,7 @@ func (rr *SVCB) parse(c *zlexer, o string) *ParseError {
 				// Key with no value and no equality sign
 				key = l.token
 			} else if idx == 0 {
-				return &ParseError{file: l.token, err: "bad SVCB key", lex: l}
+				return &ParseError{l.token, "bad SVCB key", l}
 			} else {
 				key, value = l.token[:idx], l.token[idx+1:]
 
@@ -146,41 +140,37 @@ func (rr *SVCB) parse(c *zlexer, o string) *ParseError {
 							value = l.token
 							l, _ = c.Next()
 							if l.value != zQuote {
-								return &ParseError{file: l.token, err: "SVCB unterminated value", lex: l}
+								return &ParseError{l.token, "SVCB unterminated value", l}
 							}
 						case zQuote:
 							// There's nothing in double quotes.
 						default:
-							return &ParseError{file: l.token, err: "bad SVCB value", lex: l}
+							return &ParseError{l.token, "bad SVCB value", l}
 						}
 					}
 				}
 			}
 			kv := makeSVCBKeyValue(svcbStringToKey(key))
 			if kv == nil {
-				return &ParseError{file: l.token, err: "bad SVCB key", lex: l}
+				return &ParseError{l.token, "bad SVCB key", l}
 			}
 			if err := kv.parse(value); err != nil {
-				return &ParseError{file: l.token, wrappedErr: err, lex: l}
+				return &ParseError{l.token, err.Error(), l}
 			}
 			xs = append(xs, kv)
 		case zQuote:
-			return &ParseError{file: l.token, err: "SVCB key can't contain double quotes", lex: l}
+			return &ParseError{l.token, "SVCB key can't contain double quotes", l}
 		case zBlank:
 			canHaveNextKey = true
 		default:
-			return &ParseError{file: l.token, err: "bad SVCB values", lex: l}
+			return &ParseError{l.token, "bad SVCB values", l}
 		}
 		l, _ = c.Next()
 	}
-
-	// "In AliasMode, records SHOULD NOT include any SvcParams, and recipients MUST
-	// ignore any SvcParams that are present."
-	// However, we don't check rr.Priority == 0 && len(xs) > 0 here
-	// It is the responsibility of the user of the library to check this.
-	// This is to encourage the fixing of the source of this error.
-
 	rr.Value = xs
+	if rr.Priority == 0 && len(xs) > 0 {
+		return &ParseError{l.token, "SVCB aliasform can't have values", l}
+	}
 	return nil
 }
 
@@ -201,10 +191,6 @@ func makeSVCBKeyValue(key SVCBKey) SVCBKeyValue {
 		return new(SVCBECHConfig)
 	case SVCB_IPV6HINT:
 		return new(SVCBIPv6Hint)
-	case SVCB_DOHPATH:
-		return new(SVCBDoHPath)
-	case SVCB_OHTTP:
-		return new(SVCBOhttp)
 	case svcb_RESERVED:
 		return nil
 	default:
@@ -214,15 +200,15 @@ func makeSVCBKeyValue(key SVCBKey) SVCBKeyValue {
 	}
 }
 
-// SVCB RR. See RFC 9460.
+// SVCB RR. See RFC xxxx (https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-01).
 type SVCB struct {
 	Hdr      RR_Header
-	Priority uint16         // If zero, Value must be empty or discarded by the user of this library
+	Priority uint16
 	Target   string         `dns:"domain-name"`
-	Value    []SVCBKeyValue `dns:"pairs"`
+	Value    []SVCBKeyValue `dns:"pairs"` // Value must be empty if Priority is zero.
 }
 
-// HTTPS RR. See RFC 9460. Everything valid for SVCB applies to HTTPS as well.
+// HTTPS RR. Everything valid for SVCB applies to HTTPS as well.
 // Except that the HTTPS record is intended for use with the HTTP and HTTPS protocols.
 type HTTPS struct {
 	SVCB
@@ -249,29 +235,15 @@ type SVCBKeyValue interface {
 }
 
 // SVCBMandatory pair adds to required keys that must be interpreted for the RR
-// to be functional. If ignored, the whole RRSet must be ignored.
-// "port" and "no-default-alpn" are mandatory by default if present,
-// so they shouldn't be included here.
-//
-// It is incumbent upon the user of this library to reject the RRSet if
-// or avoid constructing such an RRSet that:
-// - "mandatory" is included as one of the keys of mandatory
-// - no key is listed multiple times in mandatory
-// - all keys listed in mandatory are present
-// - escape sequences are not used in mandatory
-// - mandatory, when present, lists at least one key
-//
+// to be functional.
 // Basic use pattern for creating a mandatory option:
 //
 //	s := &dns.SVCB{Hdr: dns.RR_Header{Name: ".", Rrtype: dns.TypeSVCB, Class: dns.ClassINET}}
 //	e := new(dns.SVCBMandatory)
-//	e.Code = []uint16{dns.SVCB_ALPN}
+//	e.Code = []uint16{65403}
 //	s.Value = append(s.Value, e)
-//	t := new(dns.SVCBAlpn)
-//	t.Alpn = []string{"xmpp-client"}
-//	s.Value = append(s.Value, t)
 type SVCBMandatory struct {
-	Code []SVCBKey
+	Code []SVCBKey // Must not include mandatory
 }
 
 func (*SVCBMandatory) Key() SVCBKey { return SVCB_MANDATORY }
@@ -285,7 +257,7 @@ func (s *SVCBMandatory) String() string {
 }
 
 func (s *SVCBMandatory) pack() ([]byte, error) {
-	codes := cloneSlice(s.Code)
+	codes := append([]SVCBKey(nil), s.Code...)
 	sort.Slice(codes, func(i, j int) bool {
 		return codes[i] < codes[j]
 	})
@@ -310,11 +282,10 @@ func (s *SVCBMandatory) unpack(b []byte) error {
 }
 
 func (s *SVCBMandatory) parse(b string) error {
-	codes := make([]SVCBKey, 0, strings.Count(b, ",")+1)
-	for len(b) > 0 {
-		var key string
-		key, b, _ = strings.Cut(b, ",")
-		codes = append(codes, svcbStringToKey(key))
+	str := strings.Split(b, ",")
+	codes := make([]SVCBKey, 0, len(str))
+	for _, e := range str {
+		codes = append(codes, svcbStringToKey(e))
 	}
 	s.Code = codes
 	return nil
@@ -325,12 +296,13 @@ func (s *SVCBMandatory) len() int {
 }
 
 func (s *SVCBMandatory) copy() SVCBKeyValue {
-	return &SVCBMandatory{cloneSlice(s.Code)}
+	return &SVCBMandatory{
+		append([]SVCBKey(nil), s.Code...),
+	}
 }
 
 // SVCBAlpn pair is used to list supported connection protocols.
-// The user of this library must ensure that at least one protocol is listed when alpn is present.
-// Protocol IDs can be found at:
+// Protocol ids can be found at:
 // https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
 // Basic use pattern for creating an alpn option:
 //
@@ -338,57 +310,13 @@ func (s *SVCBMandatory) copy() SVCBKeyValue {
 //	h.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeHTTPS, Class: dns.ClassINET}
 //	e := new(dns.SVCBAlpn)
 //	e.Alpn = []string{"h2", "http/1.1"}
-//	h.Value = append(h.Value, e)
+//	h.Value = append(o.Value, e)
 type SVCBAlpn struct {
 	Alpn []string
 }
 
-func (*SVCBAlpn) Key() SVCBKey { return SVCB_ALPN }
-
-func (s *SVCBAlpn) String() string {
-	// An ALPN value is a comma-separated list of values, each of which can be
-	// an arbitrary binary value. In order to allow parsing, the comma and
-	// backslash characters are themselves escaped.
-	//
-	// However, this escaping is done in addition to the normal escaping which
-	// happens in zone files, meaning that these values must be
-	// double-escaped. This looks terrible, so if you see a never-ending
-	// sequence of backslash in a zone file this may be why.
-	//
-	// https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-08#appendix-A.1
-	var str strings.Builder
-	for i, alpn := range s.Alpn {
-		// 4*len(alpn) is the worst case where we escape every character in the alpn as \123, plus 1 byte for the ',' separating the alpn from others
-		str.Grow(4*len(alpn) + 1)
-		if i > 0 {
-			str.WriteByte(',')
-		}
-		for j := 0; j < len(alpn); j++ {
-			e := alpn[j]
-			if ' ' > e || e > '~' {
-				str.WriteString(escapeByte(e))
-				continue
-			}
-			switch e {
-			// We escape a few characters which may confuse humans or parsers.
-			case '"', ';', ' ':
-				str.WriteByte('\\')
-				str.WriteByte(e)
-			// The comma and backslash characters themselves must be
-			// doubly-escaped. We use `\\` for the first backslash and
-			// the escaped numeric value for the other value. We especially
-			// don't want a comma in the output.
-			case ',':
-				str.WriteString(`\\\044`)
-			case '\\':
-				str.WriteString(`\\\092`)
-			default:
-				str.WriteByte(e)
-			}
-		}
-	}
-	return str.String()
-}
+func (*SVCBAlpn) Key() SVCBKey     { return SVCB_ALPN }
+func (s *SVCBAlpn) String() string { return strings.Join(s.Alpn, ",") }
 
 func (s *SVCBAlpn) pack() ([]byte, error) {
 	// Liberally estimate the size of an alpn as 10 octets
@@ -423,47 +351,7 @@ func (s *SVCBAlpn) unpack(b []byte) error {
 }
 
 func (s *SVCBAlpn) parse(b string) error {
-	if len(b) == 0 {
-		s.Alpn = []string{}
-		return nil
-	}
-
-	alpn := []string{}
-	a := []byte{}
-	for p := 0; p < len(b); {
-		c, q := nextByte(b, p)
-		if q == 0 {
-			return errors.New("dns: svcbalpn: unterminated escape")
-		}
-		p += q
-		// If we find a comma, we have finished reading an alpn.
-		if c == ',' {
-			if len(a) == 0 {
-				return errors.New("dns: svcbalpn: empty protocol identifier")
-			}
-			alpn = append(alpn, string(a))
-			a = []byte{}
-			continue
-		}
-		// If it's a backslash, we need to handle a comma-separated list.
-		if c == '\\' {
-			dc, dq := nextByte(b, p)
-			if dq == 0 {
-				return errors.New("dns: svcbalpn: unterminated escape decoding comma-separated list")
-			}
-			if dc != '\\' && dc != ',' {
-				return errors.New("dns: svcbalpn: bad escaped character decoding comma-separated list")
-			}
-			p += dq
-			c = dc
-		}
-		a = append(a, c)
-	}
-	// Add the final alpn.
-	if len(a) == 0 {
-		return errors.New("dns: svcbalpn: last protocol identifier empty")
-	}
-	s.Alpn = append(alpn, string(a))
+	s.Alpn = strings.Split(b, ",")
 	return nil
 }
 
@@ -476,17 +364,15 @@ func (s *SVCBAlpn) len() int {
 }
 
 func (s *SVCBAlpn) copy() SVCBKeyValue {
-	return &SVCBAlpn{cloneSlice(s.Alpn)}
+	return &SVCBAlpn{
+		append([]string(nil), s.Alpn...),
+	}
 }
 
 // SVCBNoDefaultAlpn pair signifies no support for default connection protocols.
-// Should be used in conjunction with alpn.
 // Basic use pattern for creating a no-default-alpn option:
 //
 //	s := &dns.SVCB{Hdr: dns.RR_Header{Name: ".", Rrtype: dns.TypeSVCB, Class: dns.ClassINET}}
-//	t := new(dns.SVCBAlpn)
-//	t.Alpn = []string{"xmpp-client"}
-//	s.Value = append(s.Value, t)
 //	e := new(dns.SVCBNoDefaultAlpn)
 //	s.Value = append(s.Value, e)
 type SVCBNoDefaultAlpn struct{}
@@ -499,14 +385,14 @@ func (*SVCBNoDefaultAlpn) len() int              { return 0 }
 
 func (*SVCBNoDefaultAlpn) unpack(b []byte) error {
 	if len(b) != 0 {
-		return errors.New("dns: svcbnodefaultalpn: no-default-alpn must have no value")
+		return errors.New("dns: svcbnodefaultalpn: no_default_alpn must have no value")
 	}
 	return nil
 }
 
 func (*SVCBNoDefaultAlpn) parse(b string) error {
 	if b != "" {
-		return errors.New("dns: svcbnodefaultalpn: no-default-alpn must have no value")
+		return errors.New("dns: svcbnodefaultalpn: no_default_alpn must have no value")
 	}
 	return nil
 }
@@ -556,15 +442,15 @@ func (s *SVCBPort) parse(b string) error {
 // to the hinted IP address may be terminated and a new connection may be opened.
 // Basic use pattern for creating an ipv4hint option:
 //
-//		h := new(dns.HTTPS)
-//		h.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeHTTPS, Class: dns.ClassINET}
-//		e := new(dns.SVCBIPv4Hint)
-//		e.Hint = []net.IP{net.IPv4(1,1,1,1).To4()}
+//	h := new(dns.HTTPS)
+//	h.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeHTTPS, Class: dns.ClassINET}
+//	e := new(dns.SVCBIPv4Hint)
+//	e.Hint = []net.IP{net.IPv4(1,1,1,1).To4()}
 //
-//	 Or
+//  Or
 //
-//		e.Hint = []net.IP{net.ParseIP("1.1.1.1").To4()}
-//		h.Value = append(h.Value, e)
+//	e.Hint = []net.IP{net.ParseIP("1.1.1.1").To4()}
+//	h.Value = append(h.Value, e)
 type SVCBIPv4Hint struct {
 	Hint []net.IP
 }
@@ -588,7 +474,6 @@ func (s *SVCBIPv4Hint) unpack(b []byte) error {
 	if len(b) == 0 || len(b)%4 != 0 {
 		return errors.New("dns: svcbipv4hint: ipv4 address byte array length is not a multiple of 4")
 	}
-	b = cloneSlice(b)
 	x := make([]net.IP, 0, len(b)/4)
 	for i := 0; i < len(b); i += 4 {
 		x = append(x, net.IP(b[i:i+4]))
@@ -610,37 +495,35 @@ func (s *SVCBIPv4Hint) String() string {
 }
 
 func (s *SVCBIPv4Hint) parse(b string) error {
-	if b == "" {
-		return errors.New("dns: svcbipv4hint: empty hint")
-	}
 	if strings.Contains(b, ":") {
 		return errors.New("dns: svcbipv4hint: expected ipv4, got ipv6")
 	}
-
-	hint := make([]net.IP, 0, strings.Count(b, ",")+1)
-	for len(b) > 0 {
-		var e string
-		e, b, _ = strings.Cut(b, ",")
+	str := strings.Split(b, ",")
+	dst := make([]net.IP, len(str))
+	for i, e := range str {
 		ip := net.ParseIP(e).To4()
 		if ip == nil {
 			return errors.New("dns: svcbipv4hint: bad ip")
 		}
-		hint = append(hint, ip)
+		dst[i] = ip
 	}
-	s.Hint = hint
+	s.Hint = dst
 	return nil
 }
 
 func (s *SVCBIPv4Hint) copy() SVCBKeyValue {
 	hint := make([]net.IP, len(s.Hint))
 	for i, ip := range s.Hint {
-		hint[i] = cloneSlice(ip)
+		hint[i] = copyIP(ip)
+	}
+
+	return &SVCBIPv4Hint{
+		Hint: hint,
 	}
-	return &SVCBIPv4Hint{Hint: hint}
 }
 
 // SVCBECHConfig pair contains the ECHConfig structure defined in draft-ietf-tls-esni [RFC xxxx].
-// Basic use pattern for creating an ech option:
+// Basic use pattern for creating an echconfig option:
 //
 //	h := new(dns.HTTPS)
 //	h.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeHTTPS, Class: dns.ClassINET}
@@ -648,7 +531,7 @@ func (s *SVCBIPv4Hint) copy() SVCBKeyValue {
 //	e.ECH = []byte{0xfe, 0x08, ...}
 //	h.Value = append(h.Value, e)
 type SVCBECHConfig struct {
-	ECH []byte // Specifically ECHConfigList including the redundant length prefix
+	ECH []byte
 }
 
 func (*SVCBECHConfig) Key() SVCBKey     { return SVCB_ECHCONFIG }
@@ -656,22 +539,23 @@ func (s *SVCBECHConfig) String() string { return toBase64(s.ECH) }
 func (s *SVCBECHConfig) len() int       { return len(s.ECH) }
 
 func (s *SVCBECHConfig) pack() ([]byte, error) {
-	return cloneSlice(s.ECH), nil
+	return append([]byte(nil), s.ECH...), nil
 }
 
 func (s *SVCBECHConfig) copy() SVCBKeyValue {
-	return &SVCBECHConfig{cloneSlice(s.ECH)}
+	return &SVCBECHConfig{
+		append([]byte(nil), s.ECH...),
+	}
 }
 
 func (s *SVCBECHConfig) unpack(b []byte) error {
-	s.ECH = cloneSlice(b)
+	s.ECH = append([]byte(nil), b...)
 	return nil
 }
-
 func (s *SVCBECHConfig) parse(b string) error {
 	x, err := fromBase64([]byte(b))
 	if err != nil {
-		return errors.New("dns: svcbech: bad base64 ech")
+		return errors.New("dns: svcbechconfig: bad base64 echconfig")
 	}
 	s.ECH = x
 	return nil
@@ -710,7 +594,6 @@ func (s *SVCBIPv6Hint) unpack(b []byte) error {
 	if len(b) == 0 || len(b)%16 != 0 {
 		return errors.New("dns: svcbipv6hint: ipv6 address byte array length not a multiple of 16")
 	}
-	b = cloneSlice(b)
 	x := make([]net.IP, 0, len(b)/16)
 	for i := 0; i < len(b); i += 16 {
 		ip := net.IP(b[i : i+16])
@@ -735,119 +618,31 @@ func (s *SVCBIPv6Hint) String() string {
 }
 
 func (s *SVCBIPv6Hint) parse(b string) error {
-	if b == "" {
-		return errors.New("dns: svcbipv6hint: empty hint")
+	if strings.Contains(b, ".") {
+		return errors.New("dns: svcbipv6hint: expected ipv6, got ipv4")
 	}
-
-	hint := make([]net.IP, 0, strings.Count(b, ",")+1)
-	for len(b) > 0 {
-		var e string
-		e, b, _ = strings.Cut(b, ",")
+	str := strings.Split(b, ",")
+	dst := make([]net.IP, len(str))
+	for i, e := range str {
 		ip := net.ParseIP(e)
 		if ip == nil {
 			return errors.New("dns: svcbipv6hint: bad ip")
 		}
-		if ip.To4() != nil {
-			return errors.New("dns: svcbipv6hint: expected ipv6, got ipv4-mapped-ipv6")
-		}
-		hint = append(hint, ip)
+		dst[i] = ip
 	}
-	s.Hint = hint
+	s.Hint = dst
 	return nil
 }
 
 func (s *SVCBIPv6Hint) copy() SVCBKeyValue {
 	hint := make([]net.IP, len(s.Hint))
 	for i, ip := range s.Hint {
-		hint[i] = cloneSlice(ip)
+		hint[i] = copyIP(ip)
 	}
-	return &SVCBIPv6Hint{Hint: hint}
-}
 
-// SVCBDoHPath pair is used to indicate the URI template that the
-// clients may use to construct a DNS over HTTPS URI.
-//
-// See RFC 9461 (https://datatracker.ietf.org/doc/html/rfc9461)
-// and RFC 9462 (https://datatracker.ietf.org/doc/html/rfc9462).
-//
-// A basic example of using the dohpath option together with the alpn
-// option to indicate support for DNS over HTTPS on a certain path:
-//
-//	s := new(dns.SVCB)
-//	s.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeSVCB, Class: dns.ClassINET}
-//	e := new(dns.SVCBAlpn)
-//	e.Alpn = []string{"h2", "h3"}
-//	p := new(dns.SVCBDoHPath)
-//	p.Template = "/dns-query{?dns}"
-//	s.Value = append(s.Value, e, p)
-//
-// The parsing currently doesn't validate that Template is a valid
-// RFC 6570 URI template.
-type SVCBDoHPath struct {
-	Template string
-}
-
-func (*SVCBDoHPath) Key() SVCBKey            { return SVCB_DOHPATH }
-func (s *SVCBDoHPath) String() string        { return svcbParamToStr([]byte(s.Template)) }
-func (s *SVCBDoHPath) len() int              { return len(s.Template) }
-func (s *SVCBDoHPath) pack() ([]byte, error) { return []byte(s.Template), nil }
-
-func (s *SVCBDoHPath) unpack(b []byte) error {
-	s.Template = string(b)
-	return nil
-}
-
-func (s *SVCBDoHPath) parse(b string) error {
-	template, err := svcbParseParam(b)
-	if err != nil {
-		return fmt.Errorf("dns: svcbdohpath: %w", err)
+	return &SVCBIPv6Hint{
+		Hint: hint,
 	}
-	s.Template = string(template)
-	return nil
-}
-
-func (s *SVCBDoHPath) copy() SVCBKeyValue {
-	return &SVCBDoHPath{
-		Template: s.Template,
-	}
-}
-
-// The "ohttp" SvcParamKey is used to indicate that a service described in a SVCB RR
-// can be accessed as a target using an associated gateway.
-// Both the presentation and wire-format values for the "ohttp" parameter MUST be empty.
-//
-// See RFC 9460 (https://datatracker.ietf.org/doc/html/rfc9460/)
-// and RFC 9230 (https://datatracker.ietf.org/doc/html/rfc9230/)
-//
-// A basic example of using the dohpath option together with the alpn
-// option to indicate support for DNS over HTTPS on a certain path:
-//
-//	s := new(dns.SVCB)
-//	s.Hdr = dns.RR_Header{Name: ".", Rrtype: dns.TypeSVCB, Class: dns.ClassINET}
-//	e := new(dns.SVCBAlpn)
-//	e.Alpn = []string{"h2", "h3"}
-//	p := new(dns.SVCBOhttp)
-//	s.Value = append(s.Value, e, p)
-type SVCBOhttp struct{}
-
-func (*SVCBOhttp) Key() SVCBKey          { return SVCB_OHTTP }
-func (*SVCBOhttp) copy() SVCBKeyValue    { return &SVCBOhttp{} }
-func (*SVCBOhttp) pack() ([]byte, error) { return []byte{}, nil }
-func (*SVCBOhttp) String() string        { return "" }
-func (*SVCBOhttp) len() int              { return 0 }
-
-func (*SVCBOhttp) unpack(b []byte) error {
-	if len(b) != 0 {
-		return errors.New("dns: svcbotthp: svcbotthp must have no value")
-	}
-	return nil
-}
-
-func (*SVCBOhttp) parse(b string) error {
-	if b != "" {
-		return errors.New("dns: svcbotthp: svcbotthp must have no value")
-	}
-	return nil
 }
 
 // SVCBLocal pair is intended for experimental/private use. The key is recommended
@@ -866,63 +661,18 @@ type SVCBLocal struct {
 }
 
 func (s *SVCBLocal) Key() SVCBKey          { return s.KeyCode }
-func (s *SVCBLocal) String() string        { return svcbParamToStr(s.Data) }
-func (s *SVCBLocal) pack() ([]byte, error) { return cloneSlice(s.Data), nil }
+func (s *SVCBLocal) pack() ([]byte, error) { return append([]byte(nil), s.Data...), nil }
 func (s *SVCBLocal) len() int              { return len(s.Data) }
 
 func (s *SVCBLocal) unpack(b []byte) error {
-	s.Data = cloneSlice(b)
+	s.Data = append([]byte(nil), b...)
 	return nil
 }
 
-func (s *SVCBLocal) parse(b string) error {
-	data, err := svcbParseParam(b)
-	if err != nil {
-		return fmt.Errorf("dns: svcblocal: svcb private/experimental key %w", err)
-	}
-	s.Data = data
-	return nil
-}
-
-func (s *SVCBLocal) copy() SVCBKeyValue {
-	return &SVCBLocal{s.KeyCode, cloneSlice(s.Data)}
-}
-
-func (rr *SVCB) String() string {
-	s := rr.Hdr.String() +
-		strconv.Itoa(int(rr.Priority)) + " " +
-		sprintName(rr.Target)
-	for _, e := range rr.Value {
-		s += " " + e.Key().String() + "=\"" + e.String() + "\""
-	}
-	return s
-}
-
-// areSVCBPairArraysEqual checks if SVCBKeyValue arrays are equal after sorting their
-// copies. arrA and arrB have equal lengths, otherwise zduplicate.go wouldn't call this function.
-func areSVCBPairArraysEqual(a []SVCBKeyValue, b []SVCBKeyValue) bool {
-	a = cloneSlice(a)
-	b = cloneSlice(b)
-	sort.Slice(a, func(i, j int) bool { return a[i].Key() < a[j].Key() })
-	sort.Slice(b, func(i, j int) bool { return b[i].Key() < b[j].Key() })
-	for i, e := range a {
-		if e.Key() != b[i].Key() {
-			return false
-		}
-		b1, err1 := e.pack()
-		b2, err2 := b[i].pack()
-		if err1 != nil || err2 != nil || !bytes.Equal(b1, b2) {
-			return false
-		}
-	}
-	return true
-}
-
-// svcbParamStr converts the value of an SVCB parameter into a DNS presentation-format string.
-func svcbParamToStr(s []byte) string {
+func (s *SVCBLocal) String() string {
 	var str strings.Builder
-	str.Grow(4 * len(s))
-	for _, e := range s {
+	str.Grow(4 * len(s.Data))
+	for _, e := range s.Data {
 		if ' ' <= e && e <= '~' {
 			switch e {
 			case '"', ';', ' ', '\\':
@@ -938,8 +688,7 @@ func svcbParamToStr(s []byte) string {
 	return str.String()
 }
 
-// svcbParseParam parses a DNS presentation-format string into an SVCB parameter value.
-func svcbParseParam(b string) ([]byte, error) {
+func (s *SVCBLocal) parse(b string) error {
 	data := make([]byte, 0, len(b))
 	for i := 0; i < len(b); {
 		if b[i] != '\\' {
@@ -948,7 +697,7 @@ func svcbParseParam(b string) ([]byte, error) {
 			continue
 		}
 		if i+1 == len(b) {
-			return nil, errors.New("escape unterminated")
+			return errors.New("dns: svcblocal: svcb private/experimental key escape unterminated")
 		}
 		if isDigit(b[i+1]) {
 			if i+3 < len(b) && isDigit(b[i+2]) && isDigit(b[i+3]) {
@@ -959,11 +708,48 @@ func svcbParseParam(b string) ([]byte, error) {
 					continue
 				}
 			}
-			return nil, errors.New("bad escaped octet")
+			return errors.New("dns: svcblocal: svcb private/experimental key bad escaped octet")
 		} else {
 			data = append(data, b[i+1])
 			i += 2
 		}
 	}
-	return data, nil
+	s.Data = data
+	return nil
+}
+
+func (s *SVCBLocal) copy() SVCBKeyValue {
+	return &SVCBLocal{s.KeyCode,
+		append([]byte(nil), s.Data...),
+	}
+}
+
+func (rr *SVCB) String() string {
+	s := rr.Hdr.String() +
+		strconv.Itoa(int(rr.Priority)) + " " +
+		sprintName(rr.Target)
+	for _, e := range rr.Value {
+		s += " " + e.Key().String() + "=\"" + e.String() + "\""
+	}
+	return s
+}
+
+// areSVCBPairArraysEqual checks if SVCBKeyValue arrays are equal after sorting their
+// copies. arrA and arrB have equal lengths, otherwise zduplicate.go wouldn't call this function.
+func areSVCBPairArraysEqual(a []SVCBKeyValue, b []SVCBKeyValue) bool {
+	a = append([]SVCBKeyValue(nil), a...)
+	b = append([]SVCBKeyValue(nil), b...)
+	sort.Slice(a, func(i, j int) bool { return a[i].Key() < a[j].Key() })
+	sort.Slice(b, func(i, j int) bool { return b[i].Key() < b[j].Key() })
+	for i, e := range a {
+		if e.Key() != b[i].Key() {
+			return false
+		}
+		b1, err1 := e.pack()
+		b2, err2 := b[i].pack()
+		if err1 != nil || err2 != nil || !bytes.Equal(b1, b2) {
+			return false
+		}
+	}
+	return true
 }
diff --git a/vendor/github.com/miekg/dns/tools.go b/vendor/github.com/miekg/dns/tools.go
deleted file mode 100644
index ccf8f6b..0000000
--- a/vendor/github.com/miekg/dns/tools.go
+++ /dev/null
@@ -1,10 +0,0 @@
-//go:build tools
-// +build tools
-
-// We include our tool dependencies for `go generate` here to ensure they're
-// properly tracked by the go tool. See the Go Wiki for the rationale behind this:
-// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module.
-
-package dns
-
-import _ "golang.org/x/tools/go/packages"
diff --git a/vendor/github.com/miekg/dns/tsig.go b/vendor/github.com/miekg/dns/tsig.go
index debfe2d..b49562d 100644
--- a/vendor/github.com/miekg/dns/tsig.go
+++ b/vendor/github.com/miekg/dns/tsig.go
@@ -74,24 +74,6 @@ func (key tsigHMACProvider) Verify(msg []byte, t *TSIG) error {
 	return nil
 }
 
-type tsigSecretProvider map[string]string
-
-func (ts tsigSecretProvider) Generate(msg []byte, t *TSIG) ([]byte, error) {
-	key, ok := ts[t.Hdr.Name]
-	if !ok {
-		return nil, ErrSecret
-	}
-	return tsigHMACProvider(key).Generate(msg, t)
-}
-
-func (ts tsigSecretProvider) Verify(msg []byte, t *TSIG) error {
-	key, ok := ts[t.Hdr.Name]
-	if !ok {
-		return ErrSecret
-	}
-	return tsigHMACProvider(key).Verify(msg, t)
-}
-
 // TSIG is the RR the holds the transaction signature of a message.
 // See RFC 2845 and RFC 4635.
 type TSIG struct {
@@ -158,17 +140,18 @@ type timerWireFmt struct {
 }
 
 // TsigGenerate fills out the TSIG record attached to the message.
-// The message should contain a "stub" TSIG RR with the algorithm, key name
-// (owner name of the RR), time fudge (defaults to 300 seconds) and the current
-// time The TSIG MAC is saved in that Tsig RR. When TsigGenerate is called for
-// the first time requestMAC should be set to the empty string and timersOnly to
-// false.
+// The message should contain
+// a "stub" TSIG RR with the algorithm, key name (owner name of the RR),
+// time fudge (defaults to 300 seconds) and the current time
+// The TSIG MAC is saved in that Tsig RR.
+// When TsigGenerate is called for the first time requestMAC is set to the empty string and
+// timersOnly is false.
+// If something goes wrong an error is returned, otherwise it is nil.
 func TsigGenerate(m *Msg, secret, requestMAC string, timersOnly bool) ([]byte, string, error) {
-	return TsigGenerateWithProvider(m, tsigHMACProvider(secret), requestMAC, timersOnly)
+	return tsigGenerateProvider(m, tsigHMACProvider(secret), requestMAC, timersOnly)
 }
 
-// TsigGenerateWithProvider is similar to TsigGenerate, but allows for a custom TsigProvider.
-func TsigGenerateWithProvider(m *Msg, provider TsigProvider, requestMAC string, timersOnly bool) ([]byte, string, error) {
+func tsigGenerateProvider(m *Msg, provider TsigProvider, requestMAC string, timersOnly bool) ([]byte, string, error) {
 	if m.IsTsig() == nil {
 		panic("dns: TSIG not last RR in additional")
 	}
@@ -179,29 +162,20 @@ func TsigGenerateWithProvider(m *Msg, provider TsigProvider, requestMAC string,
 	if err != nil {
 		return nil, "", err
 	}
-
 	buf, err := tsigBuffer(mbuf, rr, requestMAC, timersOnly)
 	if err != nil {
 		return nil, "", err
 	}
 
 	t := new(TSIG)
-	// Copy all TSIG fields except MAC, its size, and time signed which are filled when signing.
+	// Copy all TSIG fields except MAC and its size, which are filled using the computed digest.
 	*t = *rr
-	t.TimeSigned = 0
-	t.MAC = ""
-	t.MACSize = 0
-
-	// Sign unless there is a key or MAC validation error (RFC 8945 5.3.2)
-	if rr.Error != RcodeBadKey && rr.Error != RcodeBadSig {
-		mac, err := provider.Generate(buf, rr)
-		if err != nil {
-			return nil, "", err
-		}
-		t.TimeSigned = rr.TimeSigned
-		t.MAC = hex.EncodeToString(mac)
-		t.MACSize = uint16(len(t.MAC) / 2) // Size is half!
+	mac, err := provider.Generate(buf, rr)
+	if err != nil {
+		return nil, "", err
 	}
+	t.MAC = hex.EncodeToString(mac)
+	t.MACSize = uint16(len(t.MAC) / 2) // Size is half!
 
 	tbuf := make([]byte, Len(t))
 	off, err := PackRR(t, tbuf, 0, nil, false)
@@ -215,15 +189,14 @@ func TsigGenerateWithProvider(m *Msg, provider TsigProvider, requestMAC string,
 	return mbuf, t.MAC, nil
 }
 
-// TsigVerify verifies the TSIG on a message. If the signature does not
-// validate the returned error contains the cause. If the signature is OK, the
-// error is nil.
+// TsigVerify verifies the TSIG on a message.
+// If the signature does not validate err contains the
+// error, otherwise it is nil.
 func TsigVerify(msg []byte, secret, requestMAC string, timersOnly bool) error {
 	return tsigVerify(msg, tsigHMACProvider(secret), requestMAC, timersOnly, uint64(time.Now().Unix()))
 }
 
-// TsigVerifyWithProvider is similar to TsigVerify, but allows for a custom TsigProvider.
-func TsigVerifyWithProvider(msg []byte, provider TsigProvider, requestMAC string, timersOnly bool) error {
+func tsigVerifyProvider(msg []byte, provider TsigProvider, requestMAC string, timersOnly bool) error {
 	return tsigVerify(msg, provider, requestMAC, timersOnly, uint64(time.Now().Unix()))
 }
 
diff --git a/vendor/github.com/miekg/dns/types.go b/vendor/github.com/miekg/dns/types.go
index f5067cd..d9becb6 100644
--- a/vendor/github.com/miekg/dns/types.go
+++ b/vendor/github.com/miekg/dns/types.go
@@ -65,7 +65,6 @@ const (
 	TypeAPL        uint16 = 42
 	TypeDS         uint16 = 43
 	TypeSSHFP      uint16 = 44
-	TypeIPSECKEY   uint16 = 45
 	TypeRRSIG      uint16 = 46
 	TypeNSEC       uint16 = 47
 	TypeDNSKEY     uint16 = 48
@@ -96,12 +95,9 @@ const (
 	TypeLP         uint16 = 107
 	TypeEUI48      uint16 = 108
 	TypeEUI64      uint16 = 109
-	TypeNXNAME     uint16 = 128
 	TypeURI        uint16 = 256
 	TypeCAA        uint16 = 257
 	TypeAVC        uint16 = 258
-	TypeAMTRELAY   uint16 = 260
-	TypeRESINFO    uint16 = 261
 
 	TypeTKEY uint16 = 249
 	TypeTSIG uint16 = 250
@@ -126,35 +122,33 @@ const (
 	ClassANY    = 255
 
 	// Message Response Codes, see https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml
-	RcodeSuccess                    = 0  // NoError   - No Error                          [DNS]
-	RcodeFormatError                = 1  // FormErr   - Format Error                      [DNS]
-	RcodeServerFailure              = 2  // ServFail  - Server Failure                    [DNS]
-	RcodeNameError                  = 3  // NXDomain  - Non-Existent Domain               [DNS]
-	RcodeNotImplemented             = 4  // NotImp    - Not Implemented                   [DNS]
-	RcodeRefused                    = 5  // Refused   - Query Refused                     [DNS]
-	RcodeYXDomain                   = 6  // YXDomain  - Name Exists when it should not    [DNS Update]
-	RcodeYXRrset                    = 7  // YXRRSet   - RR Set Exists when it should not  [DNS Update]
-	RcodeNXRrset                    = 8  // NXRRSet   - RR Set that should exist does not [DNS Update]
-	RcodeNotAuth                    = 9  // NotAuth   - Server Not Authoritative for zone [DNS Update]
-	RcodeNotZone                    = 10 // NotZone   - Name not contained in zone        [DNS Update/TSIG]
-	RcodeStatefulTypeNotImplemented = 11 // DSOTypeNI - DSO-TYPE not implemented          [DNS Stateful Operations] https://www.rfc-editor.org/rfc/rfc8490.html#section-10.2
-	RcodeBadSig                     = 16 // BADSIG    - TSIG Signature Failure            [TSIG]  https://www.rfc-editor.org/rfc/rfc6895.html#section-2.3
-	RcodeBadVers                    = 16 // BADVERS   - Bad OPT Version                   [EDNS0] https://www.rfc-editor.org/rfc/rfc6895.html#section-2.3
-	RcodeBadKey                     = 17 // BADKEY    - Key not recognized                [TSIG]
-	RcodeBadTime                    = 18 // BADTIME   - Signature out of time window      [TSIG]
-	RcodeBadMode                    = 19 // BADMODE   - Bad TKEY Mode                     [TKEY]
-	RcodeBadName                    = 20 // BADNAME   - Duplicate key name                [TKEY]
-	RcodeBadAlg                     = 21 // BADALG    - Algorithm not supported           [TKEY]
-	RcodeBadTrunc                   = 22 // BADTRUNC  - Bad Truncation                    [TSIG]
-	RcodeBadCookie                  = 23 // BADCOOKIE - Bad/missing Server Cookie         [DNS Cookies]
+	RcodeSuccess        = 0  // NoError   - No Error                          [DNS]
+	RcodeFormatError    = 1  // FormErr   - Format Error                      [DNS]
+	RcodeServerFailure  = 2  // ServFail  - Server Failure                    [DNS]
+	RcodeNameError      = 3  // NXDomain  - Non-Existent Domain               [DNS]
+	RcodeNotImplemented = 4  // NotImp    - Not Implemented                   [DNS]
+	RcodeRefused        = 5  // Refused   - Query Refused                     [DNS]
+	RcodeYXDomain       = 6  // YXDomain  - Name Exists when it should not    [DNS Update]
+	RcodeYXRrset        = 7  // YXRRSet   - RR Set Exists when it should not  [DNS Update]
+	RcodeNXRrset        = 8  // NXRRSet   - RR Set that should exist does not [DNS Update]
+	RcodeNotAuth        = 9  // NotAuth   - Server Not Authoritative for zone [DNS Update]
+	RcodeNotZone        = 10 // NotZone   - Name not contained in zone        [DNS Update/TSIG]
+	RcodeBadSig         = 16 // BADSIG    - TSIG Signature Failure            [TSIG]
+	RcodeBadVers        = 16 // BADVERS   - Bad OPT Version                   [EDNS0]
+	RcodeBadKey         = 17 // BADKEY    - Key not recognized                [TSIG]
+	RcodeBadTime        = 18 // BADTIME   - Signature out of time window      [TSIG]
+	RcodeBadMode        = 19 // BADMODE   - Bad TKEY Mode                     [TKEY]
+	RcodeBadName        = 20 // BADNAME   - Duplicate key name                [TKEY]
+	RcodeBadAlg         = 21 // BADALG    - Algorithm not supported           [TKEY]
+	RcodeBadTrunc       = 22 // BADTRUNC  - Bad Truncation                    [TSIG]
+	RcodeBadCookie      = 23 // BADCOOKIE - Bad/missing Server Cookie         [DNS Cookies]
 
 	// Message Opcodes. There is no 3.
-	OpcodeQuery    = 0
-	OpcodeIQuery   = 1
-	OpcodeStatus   = 2
-	OpcodeNotify   = 4
-	OpcodeUpdate   = 5
-	OpcodeStateful = 6
+	OpcodeQuery  = 0
+	OpcodeIQuery = 1
+	OpcodeStatus = 2
+	OpcodeNotify = 4
+	OpcodeUpdate = 5
 )
 
 // Used in ZONEMD https://tools.ietf.org/html/rfc8976
@@ -165,35 +159,6 @@ const (
 	ZoneMDHashAlgSHA512 = 2
 )
 
-// Used in IPSEC https://datatracker.ietf.org/doc/html/rfc4025#section-2.3
-const (
-	IPSECGatewayNone uint8 = iota
-	IPSECGatewayIPv4
-	IPSECGatewayIPv6
-	IPSECGatewayHost
-)
-
-// Used in AMTRELAY https://datatracker.ietf.org/doc/html/rfc8777#section-4.2.3
-const (
-	AMTRELAYNone = IPSECGatewayNone
-	AMTRELAYIPv4 = IPSECGatewayIPv4
-	AMTRELAYIPv6 = IPSECGatewayIPv6
-	AMTRELAYHost = IPSECGatewayHost
-)
-
-// Stateful types as defined in RFC 8490.
-const (
-	StatefulTypeKeepAlive uint16 = iota + 1
-	StatefulTypeRetryDelay
-	StatefulTypeEncryptionPadding
-)
-
-var StatefulTypeToString = map[uint16]string{
-	StatefulTypeKeepAlive:         "KeepAlive",
-	StatefulTypeRetryDelay:        "RetryDelay",
-	StatefulTypeEncryptionPadding: "EncryptionPadding",
-}
-
 // Header is the wire format for the DNS packet header.
 type Header struct {
 	Id                                 uint16
@@ -215,7 +180,7 @@ const (
 	_CD = 1 << 4  // checking disabled
 )
 
-// Various constants used in the LOC RR. See RFC 1876.
+// Various constants used in the LOC RR. See RFC 1887.
 const (
 	LOC_EQUATOR       = 1 << 31 // RFC 1876, Section 2.
 	LOC_PRIMEMERIDIAN = 1 << 31 // RFC 1876, Section 2.
@@ -253,9 +218,6 @@ var CertTypeToString = map[uint16]string{
 	CertOID:     "OID",
 }
 
-// Prefix for IPv4 encoded as IPv6 address
-const ipv4InIPv6Prefix = "::ffff:"
-
 //go:generate go run types_generate.go
 
 // Question holds a DNS question. Usually there is just one. While the
@@ -283,20 +245,11 @@ func (q *Question) String() (s string) {
 	return s
 }
 
-// ANY is a wild card record. See RFC 1035, Section 3.2.3. ANY is named "*" there.
-// The ANY records can be (ab)used to create resource records without any rdata, that
-// can be used in dynamic update requests. Basic use pattern:
-//
-//	a := &ANY{RR_Header{
-//		Name:   "example.org.",
-//		Rrtype: TypeA,
-//		Class:  ClassINET,
-//	}}
-//
-// Results in an A record without rdata.
+// ANY is a wild card record. See RFC 1035, Section 3.2.3. ANY
+// is named "*" there.
 type ANY struct {
 	Hdr RR_Header
-	// Does not have any rdata.
+	// Does not have any rdata
 }
 
 func (rr *ANY) String() string { return rr.Hdr.String() }
@@ -320,19 +273,6 @@ func (*NULL) parse(c *zlexer, origin string) *ParseError {
 	return &ParseError{err: "NULL records do not have a presentation format"}
 }
 
-// NXNAME is a meta record. See https://www.iana.org/go/draft-ietf-dnsop-compact-denial-of-existence-04
-// Reference: https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml
-type NXNAME struct {
-	Hdr RR_Header
-	// Does not have any rdata
-}
-
-func (rr *NXNAME) String() string { return rr.Hdr.String() }
-
-func (*NXNAME) parse(c *zlexer, origin string) *ParseError {
-	return &ParseError{err: "NXNAME records do not have a presentation format"}
-}
-
 // CNAME RR. See RFC 1034.
 type CNAME struct {
 	Hdr    RR_Header
@@ -441,17 +381,6 @@ func (rr *X25) String() string {
 	return rr.Hdr.String() + rr.PSDNAddress
 }
 
-// ISDN RR. See RFC 1183, Section 3.2.
-type ISDN struct {
-	Hdr        RR_Header
-	Address    string
-	SubAddress string
-}
-
-func (rr *ISDN) String() string {
-	return rr.Hdr.String() + sprintTxt([]string{rr.Address, rr.SubAddress})
-}
-
 // RT RR. See RFC 1183, Section 3.3.
 type RT struct {
 	Hdr        RR_Header
@@ -684,8 +613,8 @@ func nextByte(s string, offset int) (byte, int) {
 		return 0, 0
 	case 2, 3: // too short to be \ddd
 	default: // maybe \ddd
-		if isDDD(s[offset+1:]) {
-			return dddToByte(s[offset+1:]), 4
+		if isDigit(s[offset+1]) && isDigit(s[offset+2]) && isDigit(s[offset+3]) {
+			return dddStringToByte(s[offset+1:]), 4
 		}
 	}
 	// not \ddd, just an RFC 1035 "quoted" character
@@ -804,11 +733,6 @@ func (rr *AAAA) String() string {
 	if rr.AAAA == nil {
 		return rr.Hdr.String()
 	}
-
-	if rr.AAAA.To4() != nil {
-		return rr.Hdr.String() + ipv4InIPv6Prefix + rr.AAAA.String()
-	}
-
 	return rr.Hdr.String() + rr.AAAA.String()
 }
 
@@ -836,7 +760,7 @@ func (rr *GPOS) String() string {
 	return rr.Hdr.String() + rr.Longitude + " " + rr.Latitude + " " + rr.Altitude
 }
 
-// LOC RR. See RFC 1876.
+// LOC RR. See RFC RFC 1876.
 type LOC struct {
 	Hdr       RR_Header
 	Version   uint8
@@ -850,10 +774,7 @@ type LOC struct {
 
 // cmToM takes a cm value expressed in RFC 1876 SIZE mantissa/exponent
 // format and returns a string in m (two decimals for the cm).
-func cmToM(x uint8) string {
-	m := x & 0xf0 >> 4
-	e := x & 0x0f
-
+func cmToM(m, e uint8) string {
 	if e < 2 {
 		if e == 1 {
 			m *= 10
@@ -901,7 +822,7 @@ func (rr *LOC) String() string {
 	lon = lon % LOC_HOURS
 	s += fmt.Sprintf("%02d %02d %0.3f %s ", h, m, float64(lon)/1000, ew)
 
-	alt := float64(rr.Altitude) / 100
+	var alt = float64(rr.Altitude) / 100
 	alt -= LOC_ALTITUDEBASE
 	if rr.Altitude%100 != 0 {
 		s += fmt.Sprintf("%.2fm ", alt)
@@ -909,9 +830,10 @@ func (rr *LOC) String() string {
 		s += fmt.Sprintf("%.0fm ", alt)
 	}
 
-	s += cmToM(rr.Size) + "m "
-	s += cmToM(rr.HorizPre) + "m "
-	s += cmToM(rr.VertPre) + "m"
+	s += cmToM(rr.Size&0xf0>>4, rr.Size&0x0f) + "m "
+	s += cmToM(rr.HorizPre&0xf0>>4, rr.HorizPre&0x0f) + "m "
+	s += cmToM(rr.VertPre&0xf0>>4, rr.VertPre&0x0f) + "m"
+
 	return s
 }
 
@@ -948,11 +870,6 @@ func (rr *RRSIG) String() string {
 	return s
 }
 
-// NXT RR. See RFC 2535.
-type NXT struct {
-	NSEC
-}
-
 // NSEC RR. See RFC 4034 and RFC 3755.
 type NSEC struct {
 	Hdr        RR_Header
@@ -1037,7 +954,7 @@ func (rr *TALINK) String() string {
 		sprintName(rr.PreviousName) + " " + sprintName(rr.NextName)
 }
 
-// SSHFP RR. See RFC 4255.
+// SSHFP RR. See RFC RFC 4255.
 type SSHFP struct {
 	Hdr         RR_Header
 	Algorithm   uint8
@@ -1051,7 +968,7 @@ func (rr *SSHFP) String() string {
 		" " + strings.ToUpper(rr.FingerPrint)
 }
 
-// KEY RR. See RFC 2535.
+// KEY RR. See RFC RFC 2535.
 type KEY struct {
 	DNSKEY
 }
@@ -1077,69 +994,6 @@ func (rr *DNSKEY) String() string {
 		" " + rr.PublicKey
 }
 
-// IPSECKEY RR. See RFC 4025.
-type IPSECKEY struct {
-	Hdr         RR_Header
-	Precedence  uint8
-	GatewayType uint8
-	Algorithm   uint8
-	GatewayAddr net.IP `dns:"-"` // packing/unpacking/parsing/etc handled together with GatewayHost
-	GatewayHost string `dns:"ipsechost"`
-	PublicKey   string `dns:"base64"`
-}
-
-func (rr *IPSECKEY) String() string {
-	var gateway string
-	switch rr.GatewayType {
-	case IPSECGatewayIPv4, IPSECGatewayIPv6:
-		gateway = rr.GatewayAddr.String()
-	case IPSECGatewayHost:
-		gateway = rr.GatewayHost
-	case IPSECGatewayNone:
-		fallthrough
-	default:
-		gateway = "."
-	}
-
-	return rr.Hdr.String() + strconv.Itoa(int(rr.Precedence)) +
-		" " + strconv.Itoa(int(rr.GatewayType)) +
-		" " + strconv.Itoa(int(rr.Algorithm)) +
-		" " + gateway +
-		" " + rr.PublicKey
-}
-
-// AMTRELAY RR. See RFC 8777.
-type AMTRELAY struct {
-	Hdr         RR_Header
-	Precedence  uint8
-	GatewayType uint8  // discovery is packed in here at bit 0x80
-	GatewayAddr net.IP `dns:"-"` // packing/unpacking/parsing/etc handled together with GatewayHost
-	GatewayHost string `dns:"amtrelayhost"`
-}
-
-func (rr *AMTRELAY) String() string {
-	var gateway string
-	switch rr.GatewayType & 0x7f {
-	case AMTRELAYIPv4, AMTRELAYIPv6:
-		gateway = rr.GatewayAddr.String()
-	case AMTRELAYHost:
-		gateway = rr.GatewayHost
-	case AMTRELAYNone:
-		fallthrough
-	default:
-		gateway = "."
-	}
-	boolS := "0"
-	if rr.GatewayType&0x80 == 0x80 {
-		boolS = "1"
-	}
-
-	return rr.Hdr.String() + strconv.Itoa(int(rr.Precedence)) +
-		" " + boolS +
-		" " + strconv.Itoa(int(rr.GatewayType&0x7f)) +
-		" " + gateway
-}
-
 // RKEY RR. See https://www.iana.org/assignments/dns-parameters/RKEY/rkey-completed-template.
 type RKEY struct {
 	Hdr       RR_Header
@@ -1361,7 +1215,7 @@ type NINFO struct {
 
 func (rr *NINFO) String() string { return rr.Hdr.String() + sprintTxt(rr.ZSData) }
 
-// NID RR. See RFC 6742.
+// NID RR. See RFC RFC 6742.
 type NID struct {
 	Hdr        RR_Header
 	Preference uint16
@@ -1533,15 +1387,6 @@ func (rr *ZONEMD) String() string {
 		" " + rr.Digest
 }
 
-// RESINFO RR. See RFC 9606.
-
-type RESINFO struct {
-	Hdr RR_Header
-	Txt []string `dns:"txt"`
-}
-
-func (rr *RESINFO) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
-
 // APL RR. See RFC 3123.
 type APL struct {
 	Hdr      RR_Header
@@ -1589,7 +1434,7 @@ func (a *APLPrefix) str() string {
 	case net.IPv6len:
 		// add prefix for IPv4-mapped IPv6
 		if v4 := a.Network.IP.To4(); v4 != nil {
-			sb.WriteString(ipv4InIPv6Prefix)
+			sb.WriteString("::ffff:")
 		}
 		sb.WriteString(a.Network.IP.String())
 	}
@@ -1605,7 +1450,7 @@ func (a *APLPrefix) str() string {
 // equals reports whether two APL prefixes are identical.
 func (a *APLPrefix) equals(b *APLPrefix) bool {
 	return a.Negation == b.Negation &&
-		a.Network.IP.Equal(b.Network.IP) &&
+		bytes.Equal(a.Network.IP, b.Network.IP) &&
 		bytes.Equal(a.Network.Mask, b.Network.Mask)
 }
 
@@ -1673,19 +1518,21 @@ func euiToString(eui uint64, bits int) (hex string) {
 	return
 }
 
-// cloneSlice returns a shallow copy of s.
-func cloneSlice[E any, S ~[]E](s S) S {
-	if s == nil {
-		return nil
-	}
-	return append(S(nil), s...)
+// copyIP returns a copy of ip.
+func copyIP(ip net.IP) net.IP {
+	p := make(net.IP, len(ip))
+	copy(p, ip)
+	return p
 }
 
 // copyNet returns a copy of a subnet.
 func copyNet(n net.IPNet) net.IPNet {
+	m := make(net.IPMask, len(n.Mask))
+	copy(m, n.Mask)
+
 	return net.IPNet{
-		IP:   cloneSlice(n.IP),
-		Mask: cloneSlice(n.Mask),
+		IP:   copyIP(n.IP),
+		Mask: m,
 	}
 }
 
diff --git a/vendor/github.com/miekg/dns/udp.go b/vendor/github.com/miekg/dns/udp.go
index d226718..a4826ee 100644
--- a/vendor/github.com/miekg/dns/udp.go
+++ b/vendor/github.com/miekg/dns/udp.go
@@ -1,5 +1,4 @@
-//go:build !windows && !darwin
-// +build !windows,!darwin
+// +build !windows
 
 package dns
 
diff --git a/vendor/github.com/miekg/dns/udp_no_control.go b/vendor/github.com/miekg/dns/udp_windows.go
similarity index 75%
rename from vendor/github.com/miekg/dns/udp_no_control.go
rename to vendor/github.com/miekg/dns/udp_windows.go
index ca3d4a6..e7dd8ca 100644
--- a/vendor/github.com/miekg/dns/udp_no_control.go
+++ b/vendor/github.com/miekg/dns/udp_windows.go
@@ -1,10 +1,4 @@
-//go:build windows || darwin
-// +build windows darwin
-
-// TODO(tmthrgd): Remove this Windows-specific code if go.dev/issue/7175 and
-//   go.dev/issue/7174 are ever fixed.
-
-// NOTICE(stek29): darwin supports PKTINFO in sendmsg, but it unbinds sockets, see https://github.com/miekg/dns/issues/724
+// +build windows
 
 package dns
 
@@ -20,6 +14,7 @@ func (s *SessionUDP) RemoteAddr() net.Addr { return s.raddr }
 
 // ReadFromSessionUDP acts just like net.UDPConn.ReadFrom(), but returns a session object instead of a
 // net.UDPAddr.
+// TODO(fastest963): Once go1.10 is released, use ReadMsgUDP.
 func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
 	n, raddr, err := conn.ReadFrom(b)
 	if err != nil {
@@ -29,9 +24,12 @@ func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
 }
 
 // WriteToSessionUDP acts just like net.UDPConn.WriteTo(), but uses a *SessionUDP instead of a net.Addr.
+// TODO(fastest963): Once go1.10 is released, use WriteMsgUDP.
 func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
 	return conn.WriteTo(b, session.raddr)
 }
 
+// TODO(fastest963): Once go1.10 is released and we can use *MsgUDP methods
+// use the standard method in udp.go for these.
 func setUDPSocketOptions(*net.UDPConn) error { return nil }
 func parseDstFromOOB([]byte, net.IP) net.IP  { return nil }
diff --git a/vendor/github.com/miekg/dns/update.go b/vendor/github.com/miekg/dns/update.go
index 2fef146..69dd386 100644
--- a/vendor/github.com/miekg/dns/update.go
+++ b/vendor/github.com/miekg/dns/update.go
@@ -2,7 +2,6 @@ package dns
 
 // NameUsed sets the RRs in the prereq section to
 // "Name is in use" RRs. RFC 2136 section 2.4.4.
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) NameUsed(rr []RR) {
 	if u.Answer == nil {
 		u.Answer = make([]RR, 0, len(rr))
@@ -33,16 +32,13 @@ func (u *Msg) Used(rr []RR) {
 		u.Answer = make([]RR, 0, len(rr))
 	}
 	for _, r := range rr {
-		hdr := r.Header()
-		hdr.Class = u.Question[0].Qclass
-		hdr.Ttl = 0
+		r.Header().Class = u.Question[0].Qclass
 		u.Answer = append(u.Answer, r)
 	}
 }
 
 // RRsetUsed sets the RRs in the prereq section to
 // "RRset exists (value independent -- no rdata)" RRs. RFC 2136 section 2.4.1.
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) RRsetUsed(rr []RR) {
 	if u.Answer == nil {
 		u.Answer = make([]RR, 0, len(rr))
@@ -55,7 +51,6 @@ func (u *Msg) RRsetUsed(rr []RR) {
 
 // RRsetNotUsed sets the RRs in the prereq section to
 // "RRset does not exist" RRs. RFC 2136 section 2.4.3.
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) RRsetNotUsed(rr []RR) {
 	if u.Answer == nil {
 		u.Answer = make([]RR, 0, len(rr))
@@ -67,7 +62,6 @@ func (u *Msg) RRsetNotUsed(rr []RR) {
 }
 
 // Insert creates a dynamic update packet that adds an complete RRset, see RFC 2136 section 2.5.1.
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) Insert(rr []RR) {
 	if len(u.Question) == 0 {
 		panic("dns: empty question section")
@@ -82,7 +76,6 @@ func (u *Msg) Insert(rr []RR) {
 }
 
 // RemoveRRset creates a dynamic update packet that deletes an RRset, see RFC 2136 section 2.5.2.
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) RemoveRRset(rr []RR) {
 	if u.Ns == nil {
 		u.Ns = make([]RR, 0, len(rr))
@@ -94,7 +87,6 @@ func (u *Msg) RemoveRRset(rr []RR) {
 }
 
 // RemoveName creates a dynamic update packet that deletes all RRsets of a name, see RFC 2136 section 2.5.3
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) RemoveName(rr []RR) {
 	if u.Ns == nil {
 		u.Ns = make([]RR, 0, len(rr))
@@ -105,7 +97,6 @@ func (u *Msg) RemoveName(rr []RR) {
 }
 
 // Remove creates a dynamic update packet deletes RR from a RRSset, see RFC 2136 section 2.5.4
-// See [ANY] on how to make RRs without rdata.
 func (u *Msg) Remove(rr []RR) {
 	if u.Ns == nil {
 		u.Ns = make([]RR, 0, len(rr))
diff --git a/vendor/github.com/miekg/dns/version.go b/vendor/github.com/miekg/dns/version.go
index 936dc21..622c69a 100644
--- a/vendor/github.com/miekg/dns/version.go
+++ b/vendor/github.com/miekg/dns/version.go
@@ -3,7 +3,7 @@ package dns
 import "fmt"
 
 // Version is current version of this library.
-var Version = v{1, 1, 66}
+var Version = v{1, 1, 43}
 
 // v holds the version of this library.
 type v struct {
diff --git a/vendor/github.com/miekg/dns/xfr.go b/vendor/github.com/miekg/dns/xfr.go
index 97a6424..43970e6 100644
--- a/vendor/github.com/miekg/dns/xfr.go
+++ b/vendor/github.com/miekg/dns/xfr.go
@@ -1,7 +1,6 @@
 package dns
 
 import (
-	"crypto/tls"
 	"fmt"
 	"time"
 )
@@ -18,23 +17,11 @@ type Transfer struct {
 	DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds
 	ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds
 	WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds
-	TsigProvider   TsigProvider      // An implementation of the TsigProvider interface. If defined it replaces TsigSecret and is used for all TSIG operations.
 	TsigSecret     map[string]string // Secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
 	tsigTimersOnly bool
-	TLS            *tls.Config // TLS config. If Xfr over TLS will be attempted
 }
 
-func (t *Transfer) tsigProvider() TsigProvider {
-	if t.TsigProvider != nil {
-		return t.TsigProvider
-	}
-	if t.TsigSecret != nil {
-		return tsigSecretProvider(t.TsigSecret)
-	}
-	return nil
-}
-
-// TODO: Think we need to away to stop the transfer
+// Think we need to away to stop the transfer
 
 // In performs an incoming transfer with the server in a.
 // If you would like to set the source IP, or some other attribute
@@ -46,6 +33,7 @@ func (t *Transfer) tsigProvider() TsigProvider {
 //	dnscon := &dns.Conn{Conn:con}
 //	transfer = &dns.Transfer{Conn: dnscon}
 //	channel, err := transfer.In(message, master)
+//
 func (t *Transfer) In(q *Msg, a string) (env chan *Envelope, err error) {
 	switch q.Question[0].Qtype {
 	case TypeAXFR, TypeIXFR:
@@ -59,11 +47,7 @@ func (t *Transfer) In(q *Msg, a string) (env chan *Envelope, err error) {
 	}
 
 	if t.Conn == nil {
-		if t.TLS != nil {
-			t.Conn, err = DialTimeoutWithTLS("tcp-tls", a, t.TLS, timeout)
-		} else {
-			t.Conn, err = DialTimeout("tcp", a, timeout)
-		}
+		t.Conn, err = DialTimeout("tcp", a, timeout)
 		if err != nil {
 			return nil, err
 		}
@@ -86,13 +70,8 @@ func (t *Transfer) In(q *Msg, a string) (env chan *Envelope, err error) {
 
 func (t *Transfer) inAxfr(q *Msg, c chan *Envelope) {
 	first := true
-	defer func() {
-		// First close the connection, then the channel. This allows functions blocked on
-		// the channel to assume that the connection is closed and no further operations are
-		// pending when they resume.
-		t.Close()
-		close(c)
-	}()
+	defer t.Close()
+	defer close(c)
 	timeout := dnsTimeout
 	if t.ReadTimeout != 0 {
 		timeout = t.ReadTimeout
@@ -142,13 +121,8 @@ func (t *Transfer) inIxfr(q *Msg, c chan *Envelope) {
 	axfr := true
 	n := 0
 	qser := q.Ns[0].(*SOA).Serial
-	defer func() {
-		// First close the connection, then the channel. This allows functions blocked on
-		// the channel to assume that the connection is closed and no further operations are
-		// pending when they resume.
-		t.Close()
-		close(c)
-	}()
+	defer t.Close()
+	defer close(c)
 	timeout := dnsTimeout
 	if t.ReadTimeout != 0 {
 		timeout = t.ReadTimeout
@@ -188,7 +162,7 @@ func (t *Transfer) inIxfr(q *Msg, c chan *Envelope) {
 			if v, ok := rr.(*SOA); ok {
 				if v.Serial == serial {
 					n++
-					// quit if it's a full axfr or the servers' SOA is repeated the third time
+					// quit if it's a full axfr or the the servers' SOA is repeated the third time
 					if axfr && n == 2 || n == 3 {
 						c <- &Envelope{in.Answer, nil}
 						return
@@ -209,7 +183,6 @@ func (t *Transfer) inIxfr(q *Msg, c chan *Envelope) {
 //	ch := make(chan *dns.Envelope)
 //	tr := new(dns.Transfer)
 //	var wg sync.WaitGroup
-//	wg.Add(1)
 //	go func() {
 //		tr.Out(w, r, ch)
 //		wg.Done()
@@ -251,13 +224,13 @@ func (t *Transfer) ReadMsg() (*Msg, error) {
 	if err := m.Unpack(p); err != nil {
 		return nil, err
 	}
-
-	if tp := t.tsigProvider(); tp != nil {
-		// Need to work on the original message p, as that was used to calculate the tsig.
-		err = TsigVerifyWithProvider(p, tp, t.tsigRequestMAC, t.tsigTimersOnly)
-		if ts := m.IsTsig(); ts != nil {
-			t.tsigRequestMAC = ts.MAC
+	if ts := m.IsTsig(); ts != nil && t.TsigSecret != nil {
+		if _, ok := t.TsigSecret[ts.Hdr.Name]; !ok {
+			return m, ErrSecret
 		}
+		// Need to work on the original message p, as that was used to calculate the tsig.
+		err = TsigVerify(p, t.TsigSecret[ts.Hdr.Name], t.tsigRequestMAC, t.tsigTimersOnly)
+		t.tsigRequestMAC = ts.MAC
 	}
 	return m, err
 }
@@ -265,8 +238,11 @@ func (t *Transfer) ReadMsg() (*Msg, error) {
 // WriteMsg writes a message through the transfer connection t.
 func (t *Transfer) WriteMsg(m *Msg) (err error) {
 	var out []byte
-	if ts, tp := m.IsTsig(), t.tsigProvider(); ts != nil && tp != nil {
-		out, t.tsigRequestMAC, err = TsigGenerateWithProvider(m, tp, t.tsigRequestMAC, t.tsigTimersOnly)
+	if ts := m.IsTsig(); ts != nil && t.TsigSecret != nil {
+		if _, ok := t.TsigSecret[ts.Hdr.Name]; !ok {
+			return ErrSecret
+		}
+		out, t.tsigRequestMAC, err = TsigGenerate(m, t.TsigSecret[ts.Hdr.Name], t.tsigRequestMAC, t.tsigTimersOnly)
 	} else {
 		out, err = m.Pack()
 	}
diff --git a/vendor/github.com/miekg/dns/zduplicate.go b/vendor/github.com/miekg/dns/zduplicate.go
index ebd9e02..9eb1dac 100644
--- a/vendor/github.com/miekg/dns/zduplicate.go
+++ b/vendor/github.com/miekg/dns/zduplicate.go
@@ -43,32 +43,6 @@ func (r1 *AFSDB) isDuplicate(_r2 RR) bool {
 	return true
 }
 
-func (r1 *AMTRELAY) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*AMTRELAY)
-	if !ok {
-		return false
-	}
-	_ = r2
-	if r1.Precedence != r2.Precedence {
-		return false
-	}
-	if r1.GatewayType != r2.GatewayType {
-		return false
-	}
-	switch r1.GatewayType {
-	case IPSECGatewayIPv4, IPSECGatewayIPv6:
-		if !r1.GatewayAddr.Equal(r2.GatewayAddr) {
-			return false
-		}
-	case IPSECGatewayHost:
-		if !isDuplicateName(r1.GatewayHost, r2.GatewayHost) {
-			return false
-		}
-	}
-
-	return true
-}
-
 func (r1 *ANY) isDuplicate(_r2 RR) bool {
 	r2, ok := _r2.(*ANY)
 	if !ok {
@@ -449,53 +423,6 @@ func (r1 *HTTPS) isDuplicate(_r2 RR) bool {
 	return true
 }
 
-func (r1 *IPSECKEY) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*IPSECKEY)
-	if !ok {
-		return false
-	}
-	_ = r2
-	if r1.Precedence != r2.Precedence {
-		return false
-	}
-	if r1.GatewayType != r2.GatewayType {
-		return false
-	}
-	if r1.Algorithm != r2.Algorithm {
-		return false
-	}
-	switch r1.GatewayType {
-	case IPSECGatewayIPv4, IPSECGatewayIPv6:
-		if !r1.GatewayAddr.Equal(r2.GatewayAddr) {
-			return false
-		}
-	case IPSECGatewayHost:
-		if !isDuplicateName(r1.GatewayHost, r2.GatewayHost) {
-			return false
-		}
-	}
-
-	if r1.PublicKey != r2.PublicKey {
-		return false
-	}
-	return true
-}
-
-func (r1 *ISDN) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*ISDN)
-	if !ok {
-		return false
-	}
-	_ = r2
-	if r1.Address != r2.Address {
-		return false
-	}
-	if r1.SubAddress != r2.SubAddress {
-		return false
-	}
-	return true
-}
-
 func (r1 *KEY) isDuplicate(_r2 RR) bool {
 	r2, ok := _r2.(*KEY)
 	if !ok {
@@ -886,35 +813,6 @@ func (r1 *NULL) isDuplicate(_r2 RR) bool {
 	return true
 }
 
-func (r1 *NXNAME) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*NXNAME)
-	if !ok {
-		return false
-	}
-	_ = r2
-	return true
-}
-
-func (r1 *NXT) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*NXT)
-	if !ok {
-		return false
-	}
-	_ = r2
-	if !isDuplicateName(r1.NextDomain, r2.NextDomain) {
-		return false
-	}
-	if len(r1.TypeBitMap) != len(r2.TypeBitMap) {
-		return false
-	}
-	for i := 0; i < len(r1.TypeBitMap); i++ {
-		if r1.TypeBitMap[i] != r2.TypeBitMap[i] {
-			return false
-		}
-	}
-	return true
-}
-
 func (r1 *OPENPGPKEY) isDuplicate(_r2 RR) bool {
 	r2, ok := _r2.(*OPENPGPKEY)
 	if !ok {
@@ -957,23 +855,6 @@ func (r1 *PX) isDuplicate(_r2 RR) bool {
 	return true
 }
 
-func (r1 *RESINFO) isDuplicate(_r2 RR) bool {
-	r2, ok := _r2.(*RESINFO)
-	if !ok {
-		return false
-	}
-	_ = r2
-	if len(r1.Txt) != len(r2.Txt) {
-		return false
-	}
-	for i := 0; i < len(r1.Txt); i++ {
-		if r1.Txt[i] != r2.Txt[i] {
-			return false
-		}
-	}
-	return true
-}
-
 func (r1 *RFC3597) isDuplicate(_r2 RR) bool {
 	r2, ok := _r2.(*RFC3597)
 	if !ok {
diff --git a/vendor/github.com/miekg/dns/zmsg.go b/vendor/github.com/miekg/dns/zmsg.go
index cc09810..fc0822f 100644
--- a/vendor/github.com/miekg/dns/zmsg.go
+++ b/vendor/github.com/miekg/dns/zmsg.go
@@ -32,22 +32,6 @@ func (rr *AFSDB) pack(msg []byte, off int, compression compressionMap, compress
 	return off, nil
 }
 
-func (rr *AMTRELAY) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	off, err = packUint8(rr.Precedence, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packUint8(rr.GatewayType, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packIPSECGateway(rr.GatewayAddr, rr.GatewayHost, msg, off, rr.GatewayType, compression, false)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *ANY) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
 	return off, nil
 }
@@ -348,42 +332,6 @@ func (rr *HTTPS) pack(msg []byte, off int, compression compressionMap, compress
 	return off, nil
 }
 
-func (rr *IPSECKEY) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	off, err = packUint8(rr.Precedence, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packUint8(rr.GatewayType, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packUint8(rr.Algorithm, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packIPSECGateway(rr.GatewayAddr, rr.GatewayHost, msg, off, rr.GatewayType, compression, false)
-	if err != nil {
-		return off, err
-	}
-	off, err = packStringBase64(rr.PublicKey, msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
-func (rr *ISDN) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	off, err = packString(rr.Address, msg, off)
-	if err != nil {
-		return off, err
-	}
-	off, err = packString(rr.SubAddress, msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *KEY) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
 	off, err = packUint16(rr.Flags, msg, off)
 	if err != nil {
@@ -706,22 +654,6 @@ func (rr *NULL) pack(msg []byte, off int, compression compressionMap, compress b
 	return off, nil
 }
 
-func (rr *NXNAME) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	return off, nil
-}
-
-func (rr *NXT) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	off, err = packDomainName(rr.NextDomain, msg, off, compression, false)
-	if err != nil {
-		return off, err
-	}
-	off, err = packDataNsec(rr.TypeBitMap, msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *OPENPGPKEY) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
 	off, err = packStringBase64(rr.PublicKey, msg, off)
 	if err != nil {
@@ -762,14 +694,6 @@ func (rr *PX) pack(msg []byte, off int, compression compressionMap, compress boo
 	return off, nil
 }
 
-func (rr *RESINFO) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
-	off, err = packStringTxt(rr.Txt, msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *RFC3597) pack(msg []byte, off int, compression compressionMap, compress bool) (off1 int, err error) {
 	off, err = packStringHex(rr.Rdata, msg, off)
 	if err != nil {
@@ -1256,34 +1180,6 @@ func (rr *AFSDB) unpack(msg []byte, off int) (off1 int, err error) {
 	return off, nil
 }
 
-func (rr *AMTRELAY) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	rr.Precedence, off, err = unpackUint8(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.GatewayType, off, err = unpackUint8(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.GatewayAddr, rr.GatewayHost, off, err = unpackIPSECGateway(msg, off, rr.GatewayType)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *ANY) unpack(msg []byte, off int) (off1 int, err error) {
 	rdStart := off
 	_ = rdStart
@@ -1740,66 +1636,6 @@ func (rr *HTTPS) unpack(msg []byte, off int) (off1 int, err error) {
 	return off, nil
 }
 
-func (rr *IPSECKEY) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	rr.Precedence, off, err = unpackUint8(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.GatewayType, off, err = unpackUint8(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.Algorithm, off, err = unpackUint8(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.GatewayAddr, rr.GatewayHost, off, err = unpackIPSECGateway(msg, off, rr.GatewayType)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
-func (rr *ISDN) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	rr.Address, off, err = unpackString(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.SubAddress, off, err = unpackString(msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *KEY) unpack(msg []byte, off int) (off1 int, err error) {
 	rdStart := off
 	_ = rdStart
@@ -2278,31 +2114,6 @@ func (rr *NULL) unpack(msg []byte, off int) (off1 int, err error) {
 	return off, nil
 }
 
-func (rr *NXNAME) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	return off, nil
-}
-
-func (rr *NXT) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	rr.NextDomain, off, err = UnpackDomainName(msg, off)
-	if err != nil {
-		return off, err
-	}
-	if off == len(msg) {
-		return off, nil
-	}
-	rr.TypeBitMap, off, err = unpackDataNsec(msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *OPENPGPKEY) unpack(msg []byte, off int) (off1 int, err error) {
 	rdStart := off
 	_ = rdStart
@@ -2361,17 +2172,6 @@ func (rr *PX) unpack(msg []byte, off int) (off1 int, err error) {
 	return off, nil
 }
 
-func (rr *RESINFO) unpack(msg []byte, off int) (off1 int, err error) {
-	rdStart := off
-	_ = rdStart
-
-	rr.Txt, off, err = unpackStringTxt(msg, off)
-	if err != nil {
-		return off, err
-	}
-	return off, nil
-}
-
 func (rr *RFC3597) unpack(msg []byte, off int) (off1 int, err error) {
 	rdStart := off
 	_ = rdStart
diff --git a/vendor/github.com/miekg/dns/ztypes.go b/vendor/github.com/miekg/dns/ztypes.go
index cea79ae..5d060cf 100644
--- a/vendor/github.com/miekg/dns/ztypes.go
+++ b/vendor/github.com/miekg/dns/ztypes.go
@@ -12,7 +12,6 @@ var TypeToRR = map[uint16]func() RR{
 	TypeA:          func() RR { return new(A) },
 	TypeAAAA:       func() RR { return new(AAAA) },
 	TypeAFSDB:      func() RR { return new(AFSDB) },
-	TypeAMTRELAY:   func() RR { return new(AMTRELAY) },
 	TypeANY:        func() RR { return new(ANY) },
 	TypeAPL:        func() RR { return new(APL) },
 	TypeAVC:        func() RR { return new(AVC) },
@@ -35,8 +34,6 @@ var TypeToRR = map[uint16]func() RR{
 	TypeHINFO:      func() RR { return new(HINFO) },
 	TypeHIP:        func() RR { return new(HIP) },
 	TypeHTTPS:      func() RR { return new(HTTPS) },
-	TypeIPSECKEY:   func() RR { return new(IPSECKEY) },
-	TypeISDN:       func() RR { return new(ISDN) },
 	TypeKEY:        func() RR { return new(KEY) },
 	TypeKX:         func() RR { return new(KX) },
 	TypeL32:        func() RR { return new(L32) },
@@ -60,13 +57,10 @@ var TypeToRR = map[uint16]func() RR{
 	TypeNSEC3:      func() RR { return new(NSEC3) },
 	TypeNSEC3PARAM: func() RR { return new(NSEC3PARAM) },
 	TypeNULL:       func() RR { return new(NULL) },
-	TypeNXNAME:     func() RR { return new(NXNAME) },
-	TypeNXT:        func() RR { return new(NXT) },
 	TypeOPENPGPKEY: func() RR { return new(OPENPGPKEY) },
 	TypeOPT:        func() RR { return new(OPT) },
 	TypePTR:        func() RR { return new(PTR) },
 	TypePX:         func() RR { return new(PX) },
-	TypeRESINFO:    func() RR { return new(RESINFO) },
 	TypeRKEY:       func() RR { return new(RKEY) },
 	TypeRP:         func() RR { return new(RP) },
 	TypeRRSIG:      func() RR { return new(RRSIG) },
@@ -96,7 +90,6 @@ var TypeToString = map[uint16]string{
 	TypeA:          "A",
 	TypeAAAA:       "AAAA",
 	TypeAFSDB:      "AFSDB",
-	TypeAMTRELAY:   "AMTRELAY",
 	TypeANY:        "ANY",
 	TypeAPL:        "APL",
 	TypeATMA:       "ATMA",
@@ -121,7 +114,6 @@ var TypeToString = map[uint16]string{
 	TypeHINFO:      "HINFO",
 	TypeHIP:        "HIP",
 	TypeHTTPS:      "HTTPS",
-	TypeIPSECKEY:   "IPSECKEY",
 	TypeISDN:       "ISDN",
 	TypeIXFR:       "IXFR",
 	TypeKEY:        "KEY",
@@ -148,14 +140,12 @@ var TypeToString = map[uint16]string{
 	TypeNSEC3:      "NSEC3",
 	TypeNSEC3PARAM: "NSEC3PARAM",
 	TypeNULL:       "NULL",
-	TypeNXNAME:     "NXNAME",
 	TypeNXT:        "NXT",
 	TypeNone:       "None",
 	TypeOPENPGPKEY: "OPENPGPKEY",
 	TypeOPT:        "OPT",
 	TypePTR:        "PTR",
 	TypePX:         "PX",
-	TypeRESINFO:    "RESINFO",
 	TypeRKEY:       "RKEY",
 	TypeRP:         "RP",
 	TypeRRSIG:      "RRSIG",
@@ -186,7 +176,6 @@ var TypeToString = map[uint16]string{
 func (rr *A) Header() *RR_Header          { return &rr.Hdr }
 func (rr *AAAA) Header() *RR_Header       { return &rr.Hdr }
 func (rr *AFSDB) Header() *RR_Header      { return &rr.Hdr }
-func (rr *AMTRELAY) Header() *RR_Header   { return &rr.Hdr }
 func (rr *ANY) Header() *RR_Header        { return &rr.Hdr }
 func (rr *APL) Header() *RR_Header        { return &rr.Hdr }
 func (rr *AVC) Header() *RR_Header        { return &rr.Hdr }
@@ -209,8 +198,6 @@ func (rr *GPOS) Header() *RR_Header       { return &rr.Hdr }
 func (rr *HINFO) Header() *RR_Header      { return &rr.Hdr }
 func (rr *HIP) Header() *RR_Header        { return &rr.Hdr }
 func (rr *HTTPS) Header() *RR_Header      { return &rr.Hdr }
-func (rr *IPSECKEY) Header() *RR_Header   { return &rr.Hdr }
-func (rr *ISDN) Header() *RR_Header       { return &rr.Hdr }
 func (rr *KEY) Header() *RR_Header        { return &rr.Hdr }
 func (rr *KX) Header() *RR_Header         { return &rr.Hdr }
 func (rr *L32) Header() *RR_Header        { return &rr.Hdr }
@@ -234,13 +221,10 @@ func (rr *NSEC) Header() *RR_Header       { return &rr.Hdr }
 func (rr *NSEC3) Header() *RR_Header      { return &rr.Hdr }
 func (rr *NSEC3PARAM) Header() *RR_Header { return &rr.Hdr }
 func (rr *NULL) Header() *RR_Header       { return &rr.Hdr }
-func (rr *NXNAME) Header() *RR_Header     { return &rr.Hdr }
-func (rr *NXT) Header() *RR_Header        { return &rr.Hdr }
 func (rr *OPENPGPKEY) Header() *RR_Header { return &rr.Hdr }
 func (rr *OPT) Header() *RR_Header        { return &rr.Hdr }
 func (rr *PTR) Header() *RR_Header        { return &rr.Hdr }
 func (rr *PX) Header() *RR_Header         { return &rr.Hdr }
-func (rr *RESINFO) Header() *RR_Header    { return &rr.Hdr }
 func (rr *RFC3597) Header() *RR_Header    { return &rr.Hdr }
 func (rr *RKEY) Header() *RR_Header       { return &rr.Hdr }
 func (rr *RP) Header() *RR_Header         { return &rr.Hdr }
@@ -273,7 +257,6 @@ func (rr *A) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *AAAA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	if len(rr.AAAA) != 0 {
@@ -281,34 +264,16 @@ func (rr *AAAA) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *AFSDB) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Subtype
 	l += domainNameLen(rr.Hostname, off+l, compression, false)
 	return l
 }
-
-func (rr *AMTRELAY) len(off int, compression map[string]struct{}) int {
-	l := rr.Hdr.len(off, compression)
-	l++ // Precedence
-	l++ // GatewayType
-	switch rr.GatewayType {
-	case AMTRELAYIPv4:
-		l += net.IPv4len
-	case AMTRELAYIPv6:
-		l += net.IPv6len
-	case AMTRELAYHost:
-		l += len(rr.GatewayHost) + 1
-	}
-	return l
-}
-
 func (rr *ANY) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	return l
 }
-
 func (rr *APL) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	for _, x := range rr.Prefixes {
@@ -316,7 +281,6 @@ func (rr *APL) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *AVC) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	for _, x := range rr.Txt {
@@ -324,7 +288,6 @@ func (rr *AVC) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *CAA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++ // Flag
@@ -332,7 +295,6 @@ func (rr *CAA) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Value)
 	return l
 }
-
 func (rr *CERT) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Type
@@ -341,25 +303,21 @@ func (rr *CERT) len(off int, compression map[string]struct{}) int {
 	l += base64.StdEncoding.DecodedLen(len(rr.Certificate))
 	return l
 }
-
 func (rr *CNAME) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Target, off+l, compression, true)
 	return l
 }
-
 func (rr *DHCID) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += base64.StdEncoding.DecodedLen(len(rr.Digest))
 	return l
 }
-
 func (rr *DNAME) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Target, off+l, compression, false)
 	return l
 }
-
 func (rr *DNSKEY) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Flags
@@ -368,7 +326,6 @@ func (rr *DNSKEY) len(off int, compression map[string]struct{}) int {
 	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
 	return l
 }
-
 func (rr *DS) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // KeyTag
@@ -377,31 +334,26 @@ func (rr *DS) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Digest) / 2
 	return l
 }
-
 func (rr *EID) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Endpoint) / 2
 	return l
 }
-
 func (rr *EUI48) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 6 // Address
 	return l
 }
-
 func (rr *EUI64) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 8 // Address
 	return l
 }
-
 func (rr *GID) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 4 // Gid
 	return l
 }
-
 func (rr *GPOS) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Longitude) + 1
@@ -409,14 +361,12 @@ func (rr *GPOS) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Altitude) + 1
 	return l
 }
-
 func (rr *HINFO) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Cpu) + 1
 	l += len(rr.Os) + 1
 	return l
 }
-
 func (rr *HIP) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++    // HitLength
@@ -429,38 +379,12 @@ func (rr *HIP) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
-func (rr *IPSECKEY) len(off int, compression map[string]struct{}) int {
-	l := rr.Hdr.len(off, compression)
-	l++ // Precedence
-	l++ // GatewayType
-	l++ // Algorithm
-	switch rr.GatewayType {
-	case IPSECGatewayIPv4:
-		l += net.IPv4len
-	case IPSECGatewayIPv6:
-		l += net.IPv6len
-	case IPSECGatewayHost:
-		l += len(rr.GatewayHost) + 1
-	}
-	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
-	return l
-}
-
-func (rr *ISDN) len(off int, compression map[string]struct{}) int {
-	l := rr.Hdr.len(off, compression)
-	l += len(rr.Address) + 1
-	l += len(rr.SubAddress) + 1
-	return l
-}
-
 func (rr *KX) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += domainNameLen(rr.Exchanger, off+l, compression, false)
 	return l
 }
-
 func (rr *L32) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
@@ -469,14 +393,12 @@ func (rr *L32) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *L64) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += 8 // Locator64
 	return l
 }
-
 func (rr *LOC) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++    // Version
@@ -488,58 +410,49 @@ func (rr *LOC) len(off int, compression map[string]struct{}) int {
 	l += 4 // Altitude
 	return l
 }
-
 func (rr *LP) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += domainNameLen(rr.Fqdn, off+l, compression, false)
 	return l
 }
-
 func (rr *MB) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Mb, off+l, compression, true)
 	return l
 }
-
 func (rr *MD) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Md, off+l, compression, true)
 	return l
 }
-
 func (rr *MF) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Mf, off+l, compression, true)
 	return l
 }
-
 func (rr *MG) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Mg, off+l, compression, true)
 	return l
 }
-
 func (rr *MINFO) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Rmail, off+l, compression, true)
 	l += domainNameLen(rr.Email, off+l, compression, true)
 	return l
 }
-
 func (rr *MR) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Mr, off+l, compression, true)
 	return l
 }
-
 func (rr *MX) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += domainNameLen(rr.Mx, off+l, compression, true)
 	return l
 }
-
 func (rr *NAPTR) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Order
@@ -550,20 +463,17 @@ func (rr *NAPTR) len(off int, compression map[string]struct{}) int {
 	l += domainNameLen(rr.Replacement, off+l, compression, false)
 	return l
 }
-
 func (rr *NID) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += 8 // NodeID
 	return l
 }
-
 func (rr *NIMLOC) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Locator) / 2
 	return l
 }
-
 func (rr *NINFO) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	for _, x := range rr.ZSData {
@@ -571,19 +481,16 @@ func (rr *NINFO) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *NS) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Ns, off+l, compression, true)
 	return l
 }
-
 func (rr *NSAPPTR) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Ptr, off+l, compression, false)
 	return l
 }
-
 func (rr *NSEC3PARAM) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++    // Hash
@@ -593,30 +500,21 @@ func (rr *NSEC3PARAM) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Salt) / 2
 	return l
 }
-
 func (rr *NULL) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Data)
 	return l
 }
-
-func (rr *NXNAME) len(off int, compression map[string]struct{}) int {
-	l := rr.Hdr.len(off, compression)
-	return l
-}
-
 func (rr *OPENPGPKEY) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
 	return l
 }
-
 func (rr *PTR) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Ptr, off+l, compression, true)
 	return l
 }
-
 func (rr *PX) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
@@ -624,21 +522,11 @@ func (rr *PX) len(off int, compression map[string]struct{}) int {
 	l += domainNameLen(rr.Mapx400, off+l, compression, false)
 	return l
 }
-
-func (rr *RESINFO) len(off int, compression map[string]struct{}) int {
-	l := rr.Hdr.len(off, compression)
-	for _, x := range rr.Txt {
-		l += len(x) + 1
-	}
-	return l
-}
-
 func (rr *RFC3597) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Rdata) / 2
 	return l
 }
-
 func (rr *RKEY) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Flags
@@ -647,14 +535,12 @@ func (rr *RKEY) len(off int, compression map[string]struct{}) int {
 	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
 	return l
 }
-
 func (rr *RP) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Mbox, off+l, compression, false)
 	l += domainNameLen(rr.Txt, off+l, compression, false)
 	return l
 }
-
 func (rr *RRSIG) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // TypeCovered
@@ -668,14 +554,12 @@ func (rr *RRSIG) len(off int, compression map[string]struct{}) int {
 	l += base64.StdEncoding.DecodedLen(len(rr.Signature))
 	return l
 }
-
 func (rr *RT) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Preference
 	l += domainNameLen(rr.Host, off+l, compression, false)
 	return l
 }
-
 func (rr *SMIMEA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++ // Usage
@@ -684,7 +568,6 @@ func (rr *SMIMEA) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Certificate) / 2
 	return l
 }
-
 func (rr *SOA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Ns, off+l, compression, true)
@@ -696,7 +579,6 @@ func (rr *SOA) len(off int, compression map[string]struct{}) int {
 	l += 4 // Minttl
 	return l
 }
-
 func (rr *SPF) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	for _, x := range rr.Txt {
@@ -704,7 +586,6 @@ func (rr *SPF) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *SRV) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Priority
@@ -713,7 +594,6 @@ func (rr *SRV) len(off int, compression map[string]struct{}) int {
 	l += domainNameLen(rr.Target, off+l, compression, false)
 	return l
 }
-
 func (rr *SSHFP) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++ // Algorithm
@@ -721,7 +601,6 @@ func (rr *SSHFP) len(off int, compression map[string]struct{}) int {
 	l += len(rr.FingerPrint) / 2
 	return l
 }
-
 func (rr *SVCB) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Priority
@@ -731,7 +610,6 @@ func (rr *SVCB) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *TA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // KeyTag
@@ -740,14 +618,12 @@ func (rr *TA) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Digest) / 2
 	return l
 }
-
 func (rr *TALINK) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.PreviousName, off+l, compression, false)
 	l += domainNameLen(rr.NextName, off+l, compression, false)
 	return l
 }
-
 func (rr *TKEY) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Algorithm, off+l, compression, false)
@@ -761,7 +637,6 @@ func (rr *TKEY) len(off int, compression map[string]struct{}) int {
 	l += len(rr.OtherData) / 2
 	return l
 }
-
 func (rr *TLSA) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l++ // Usage
@@ -770,7 +645,6 @@ func (rr *TLSA) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Certificate) / 2
 	return l
 }
-
 func (rr *TSIG) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += domainNameLen(rr.Algorithm, off+l, compression, false)
@@ -784,7 +658,6 @@ func (rr *TSIG) len(off int, compression map[string]struct{}) int {
 	l += len(rr.OtherData) / 2
 	return l
 }
-
 func (rr *TXT) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	for _, x := range rr.Txt {
@@ -792,19 +665,16 @@ func (rr *TXT) len(off int, compression map[string]struct{}) int {
 	}
 	return l
 }
-
 func (rr *UID) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 4 // Uid
 	return l
 }
-
 func (rr *UINFO) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.Uinfo) + 1
 	return l
 }
-
 func (rr *URI) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 2 // Priority
@@ -812,13 +682,11 @@ func (rr *URI) len(off int, compression map[string]struct{}) int {
 	l += len(rr.Target)
 	return l
 }
-
 func (rr *X25) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += len(rr.PSDNAddress) + 1
 	return l
 }
-
 func (rr *ZONEMD) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
 	l += 4 // Serial
@@ -830,31 +698,17 @@ func (rr *ZONEMD) len(off int, compression map[string]struct{}) int {
 
 // copy() functions
 func (rr *A) copy() RR {
-	return &A{rr.Hdr, cloneSlice(rr.A)}
+	return &A{rr.Hdr, copyIP(rr.A)}
 }
-
 func (rr *AAAA) copy() RR {
-	return &AAAA{rr.Hdr, cloneSlice(rr.AAAA)}
+	return &AAAA{rr.Hdr, copyIP(rr.AAAA)}
 }
-
 func (rr *AFSDB) copy() RR {
 	return &AFSDB{rr.Hdr, rr.Subtype, rr.Hostname}
 }
-
-func (rr *AMTRELAY) copy() RR {
-	return &AMTRELAY{
-		rr.Hdr,
-		rr.Precedence,
-		rr.GatewayType,
-		cloneSlice(rr.GatewayAddr),
-		rr.GatewayHost,
-	}
-}
-
 func (rr *ANY) copy() RR {
 	return &ANY{rr.Hdr}
 }
-
 func (rr *APL) copy() RR {
 	Prefixes := make([]APLPrefix, len(rr.Prefixes))
 	for i, e := range rr.Prefixes {
@@ -862,282 +716,150 @@ func (rr *APL) copy() RR {
 	}
 	return &APL{rr.Hdr, Prefixes}
 }
-
 func (rr *AVC) copy() RR {
-	return &AVC{rr.Hdr, cloneSlice(rr.Txt)}
+	Txt := make([]string, len(rr.Txt))
+	copy(Txt, rr.Txt)
+	return &AVC{rr.Hdr, Txt}
 }
-
 func (rr *CAA) copy() RR {
-	return &CAA{
-		rr.Hdr,
-		rr.Flag,
-		rr.Tag,
-		rr.Value,
-	}
+	return &CAA{rr.Hdr, rr.Flag, rr.Tag, rr.Value}
 }
-
 func (rr *CDNSKEY) copy() RR {
 	return &CDNSKEY{*rr.DNSKEY.copy().(*DNSKEY)}
 }
-
 func (rr *CDS) copy() RR {
 	return &CDS{*rr.DS.copy().(*DS)}
 }
-
 func (rr *CERT) copy() RR {
-	return &CERT{
-		rr.Hdr,
-		rr.Type,
-		rr.KeyTag,
-		rr.Algorithm,
-		rr.Certificate,
-	}
+	return &CERT{rr.Hdr, rr.Type, rr.KeyTag, rr.Algorithm, rr.Certificate}
 }
-
 func (rr *CNAME) copy() RR {
 	return &CNAME{rr.Hdr, rr.Target}
 }
-
 func (rr *CSYNC) copy() RR {
-	return &CSYNC{
-		rr.Hdr,
-		rr.Serial,
-		rr.Flags,
-		cloneSlice(rr.TypeBitMap),
-	}
+	TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+	copy(TypeBitMap, rr.TypeBitMap)
+	return &CSYNC{rr.Hdr, rr.Serial, rr.Flags, TypeBitMap}
 }
-
 func (rr *DHCID) copy() RR {
 	return &DHCID{rr.Hdr, rr.Digest}
 }
-
 func (rr *DLV) copy() RR {
 	return &DLV{*rr.DS.copy().(*DS)}
 }
-
 func (rr *DNAME) copy() RR {
 	return &DNAME{rr.Hdr, rr.Target}
 }
-
 func (rr *DNSKEY) copy() RR {
-	return &DNSKEY{
-		rr.Hdr,
-		rr.Flags,
-		rr.Protocol,
-		rr.Algorithm,
-		rr.PublicKey,
-	}
+	return &DNSKEY{rr.Hdr, rr.Flags, rr.Protocol, rr.Algorithm, rr.PublicKey}
 }
-
 func (rr *DS) copy() RR {
-	return &DS{
-		rr.Hdr,
-		rr.KeyTag,
-		rr.Algorithm,
-		rr.DigestType,
-		rr.Digest,
-	}
+	return &DS{rr.Hdr, rr.KeyTag, rr.Algorithm, rr.DigestType, rr.Digest}
 }
-
 func (rr *EID) copy() RR {
 	return &EID{rr.Hdr, rr.Endpoint}
 }
-
 func (rr *EUI48) copy() RR {
 	return &EUI48{rr.Hdr, rr.Address}
 }
-
 func (rr *EUI64) copy() RR {
 	return &EUI64{rr.Hdr, rr.Address}
 }
-
 func (rr *GID) copy() RR {
 	return &GID{rr.Hdr, rr.Gid}
 }
-
 func (rr *GPOS) copy() RR {
-	return &GPOS{
-		rr.Hdr,
-		rr.Longitude,
-		rr.Latitude,
-		rr.Altitude,
-	}
+	return &GPOS{rr.Hdr, rr.Longitude, rr.Latitude, rr.Altitude}
 }
-
 func (rr *HINFO) copy() RR {
 	return &HINFO{rr.Hdr, rr.Cpu, rr.Os}
 }
-
 func (rr *HIP) copy() RR {
-	return &HIP{
-		rr.Hdr,
-		rr.HitLength,
-		rr.PublicKeyAlgorithm,
-		rr.PublicKeyLength,
-		rr.Hit,
-		rr.PublicKey,
-		cloneSlice(rr.RendezvousServers),
-	}
+	RendezvousServers := make([]string, len(rr.RendezvousServers))
+	copy(RendezvousServers, rr.RendezvousServers)
+	return &HIP{rr.Hdr, rr.HitLength, rr.PublicKeyAlgorithm, rr.PublicKeyLength, rr.Hit, rr.PublicKey, RendezvousServers}
 }
-
 func (rr *HTTPS) copy() RR {
 	return &HTTPS{*rr.SVCB.copy().(*SVCB)}
 }
-
-func (rr *IPSECKEY) copy() RR {
-	return &IPSECKEY{
-		rr.Hdr,
-		rr.Precedence,
-		rr.GatewayType,
-		rr.Algorithm,
-		cloneSlice(rr.GatewayAddr),
-		rr.GatewayHost,
-		rr.PublicKey,
-	}
-}
-
-func (rr *ISDN) copy() RR {
-	return &ISDN{rr.Hdr, rr.Address, rr.SubAddress}
-}
-
 func (rr *KEY) copy() RR {
 	return &KEY{*rr.DNSKEY.copy().(*DNSKEY)}
 }
-
 func (rr *KX) copy() RR {
 	return &KX{rr.Hdr, rr.Preference, rr.Exchanger}
 }
-
 func (rr *L32) copy() RR {
-	return &L32{rr.Hdr, rr.Preference, cloneSlice(rr.Locator32)}
+	return &L32{rr.Hdr, rr.Preference, copyIP(rr.Locator32)}
 }
-
 func (rr *L64) copy() RR {
 	return &L64{rr.Hdr, rr.Preference, rr.Locator64}
 }
-
 func (rr *LOC) copy() RR {
-	return &LOC{
-		rr.Hdr,
-		rr.Version,
-		rr.Size,
-		rr.HorizPre,
-		rr.VertPre,
-		rr.Latitude,
-		rr.Longitude,
-		rr.Altitude,
-	}
+	return &LOC{rr.Hdr, rr.Version, rr.Size, rr.HorizPre, rr.VertPre, rr.Latitude, rr.Longitude, rr.Altitude}
 }
-
 func (rr *LP) copy() RR {
 	return &LP{rr.Hdr, rr.Preference, rr.Fqdn}
 }
-
 func (rr *MB) copy() RR {
 	return &MB{rr.Hdr, rr.Mb}
 }
-
 func (rr *MD) copy() RR {
 	return &MD{rr.Hdr, rr.Md}
 }
-
 func (rr *MF) copy() RR {
 	return &MF{rr.Hdr, rr.Mf}
 }
-
 func (rr *MG) copy() RR {
 	return &MG{rr.Hdr, rr.Mg}
 }
-
 func (rr *MINFO) copy() RR {
 	return &MINFO{rr.Hdr, rr.Rmail, rr.Email}
 }
-
 func (rr *MR) copy() RR {
 	return &MR{rr.Hdr, rr.Mr}
 }
-
 func (rr *MX) copy() RR {
 	return &MX{rr.Hdr, rr.Preference, rr.Mx}
 }
-
 func (rr *NAPTR) copy() RR {
-	return &NAPTR{
-		rr.Hdr,
-		rr.Order,
-		rr.Preference,
-		rr.Flags,
-		rr.Service,
-		rr.Regexp,
-		rr.Replacement,
-	}
+	return &NAPTR{rr.Hdr, rr.Order, rr.Preference, rr.Flags, rr.Service, rr.Regexp, rr.Replacement}
 }
-
 func (rr *NID) copy() RR {
 	return &NID{rr.Hdr, rr.Preference, rr.NodeID}
 }
-
 func (rr *NIMLOC) copy() RR {
 	return &NIMLOC{rr.Hdr, rr.Locator}
 }
-
 func (rr *NINFO) copy() RR {
-	return &NINFO{rr.Hdr, cloneSlice(rr.ZSData)}
+	ZSData := make([]string, len(rr.ZSData))
+	copy(ZSData, rr.ZSData)
+	return &NINFO{rr.Hdr, ZSData}
 }
-
 func (rr *NS) copy() RR {
 	return &NS{rr.Hdr, rr.Ns}
 }
-
 func (rr *NSAPPTR) copy() RR {
 	return &NSAPPTR{rr.Hdr, rr.Ptr}
 }
-
 func (rr *NSEC) copy() RR {
-	return &NSEC{rr.Hdr, rr.NextDomain, cloneSlice(rr.TypeBitMap)}
+	TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+	copy(TypeBitMap, rr.TypeBitMap)
+	return &NSEC{rr.Hdr, rr.NextDomain, TypeBitMap}
 }
-
 func (rr *NSEC3) copy() RR {
-	return &NSEC3{
-		rr.Hdr,
-		rr.Hash,
-		rr.Flags,
-		rr.Iterations,
-		rr.SaltLength,
-		rr.Salt,
-		rr.HashLength,
-		rr.NextDomain,
-		cloneSlice(rr.TypeBitMap),
-	}
+	TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+	copy(TypeBitMap, rr.TypeBitMap)
+	return &NSEC3{rr.Hdr, rr.Hash, rr.Flags, rr.Iterations, rr.SaltLength, rr.Salt, rr.HashLength, rr.NextDomain, TypeBitMap}
 }
-
 func (rr *NSEC3PARAM) copy() RR {
-	return &NSEC3PARAM{
-		rr.Hdr,
-		rr.Hash,
-		rr.Flags,
-		rr.Iterations,
-		rr.SaltLength,
-		rr.Salt,
-	}
+	return &NSEC3PARAM{rr.Hdr, rr.Hash, rr.Flags, rr.Iterations, rr.SaltLength, rr.Salt}
 }
-
 func (rr *NULL) copy() RR {
 	return &NULL{rr.Hdr, rr.Data}
 }
-
-func (rr *NXNAME) copy() RR {
-	return &NXNAME{rr.Hdr}
-}
-
-func (rr *NXT) copy() RR {
-	return &NXT{*rr.NSEC.copy().(*NSEC)}
-}
-
 func (rr *OPENPGPKEY) copy() RR {
 	return &OPENPGPKEY{rr.Hdr, rr.PublicKey}
 }
-
 func (rr *OPT) copy() RR {
 	Option := make([]EDNS0, len(rr.Option))
 	for i, e := range rr.Option {
@@ -1145,209 +867,86 @@ func (rr *OPT) copy() RR {
 	}
 	return &OPT{rr.Hdr, Option}
 }
-
 func (rr *PTR) copy() RR {
 	return &PTR{rr.Hdr, rr.Ptr}
 }
-
 func (rr *PX) copy() RR {
-	return &PX{
-		rr.Hdr,
-		rr.Preference,
-		rr.Map822,
-		rr.Mapx400,
-	}
+	return &PX{rr.Hdr, rr.Preference, rr.Map822, rr.Mapx400}
 }
-
-func (rr *RESINFO) copy() RR {
-	return &RESINFO{rr.Hdr, cloneSlice(rr.Txt)}
-}
-
 func (rr *RFC3597) copy() RR {
 	return &RFC3597{rr.Hdr, rr.Rdata}
 }
-
 func (rr *RKEY) copy() RR {
-	return &RKEY{
-		rr.Hdr,
-		rr.Flags,
-		rr.Protocol,
-		rr.Algorithm,
-		rr.PublicKey,
-	}
+	return &RKEY{rr.Hdr, rr.Flags, rr.Protocol, rr.Algorithm, rr.PublicKey}
 }
-
 func (rr *RP) copy() RR {
 	return &RP{rr.Hdr, rr.Mbox, rr.Txt}
 }
-
 func (rr *RRSIG) copy() RR {
-	return &RRSIG{
-		rr.Hdr,
-		rr.TypeCovered,
-		rr.Algorithm,
-		rr.Labels,
-		rr.OrigTtl,
-		rr.Expiration,
-		rr.Inception,
-		rr.KeyTag,
-		rr.SignerName,
-		rr.Signature,
-	}
+	return &RRSIG{rr.Hdr, rr.TypeCovered, rr.Algorithm, rr.Labels, rr.OrigTtl, rr.Expiration, rr.Inception, rr.KeyTag, rr.SignerName, rr.Signature}
 }
-
 func (rr *RT) copy() RR {
 	return &RT{rr.Hdr, rr.Preference, rr.Host}
 }
-
 func (rr *SIG) copy() RR {
 	return &SIG{*rr.RRSIG.copy().(*RRSIG)}
 }
-
 func (rr *SMIMEA) copy() RR {
-	return &SMIMEA{
-		rr.Hdr,
-		rr.Usage,
-		rr.Selector,
-		rr.MatchingType,
-		rr.Certificate,
-	}
+	return &SMIMEA{rr.Hdr, rr.Usage, rr.Selector, rr.MatchingType, rr.Certificate}
 }
-
 func (rr *SOA) copy() RR {
-	return &SOA{
-		rr.Hdr,
-		rr.Ns,
-		rr.Mbox,
-		rr.Serial,
-		rr.Refresh,
-		rr.Retry,
-		rr.Expire,
-		rr.Minttl,
-	}
+	return &SOA{rr.Hdr, rr.Ns, rr.Mbox, rr.Serial, rr.Refresh, rr.Retry, rr.Expire, rr.Minttl}
 }
-
 func (rr *SPF) copy() RR {
-	return &SPF{rr.Hdr, cloneSlice(rr.Txt)}
+	Txt := make([]string, len(rr.Txt))
+	copy(Txt, rr.Txt)
+	return &SPF{rr.Hdr, Txt}
 }
-
 func (rr *SRV) copy() RR {
-	return &SRV{
-		rr.Hdr,
-		rr.Priority,
-		rr.Weight,
-		rr.Port,
-		rr.Target,
-	}
+	return &SRV{rr.Hdr, rr.Priority, rr.Weight, rr.Port, rr.Target}
 }
-
 func (rr *SSHFP) copy() RR {
-	return &SSHFP{
-		rr.Hdr,
-		rr.Algorithm,
-		rr.Type,
-		rr.FingerPrint,
-	}
+	return &SSHFP{rr.Hdr, rr.Algorithm, rr.Type, rr.FingerPrint}
 }
-
 func (rr *SVCB) copy() RR {
 	Value := make([]SVCBKeyValue, len(rr.Value))
 	for i, e := range rr.Value {
 		Value[i] = e.copy()
 	}
-	return &SVCB{
-		rr.Hdr,
-		rr.Priority,
-		rr.Target,
-		Value,
-	}
+	return &SVCB{rr.Hdr, rr.Priority, rr.Target, Value}
 }
-
 func (rr *TA) copy() RR {
-	return &TA{
-		rr.Hdr,
-		rr.KeyTag,
-		rr.Algorithm,
-		rr.DigestType,
-		rr.Digest,
-	}
+	return &TA{rr.Hdr, rr.KeyTag, rr.Algorithm, rr.DigestType, rr.Digest}
 }
-
 func (rr *TALINK) copy() RR {
 	return &TALINK{rr.Hdr, rr.PreviousName, rr.NextName}
 }
-
 func (rr *TKEY) copy() RR {
-	return &TKEY{
-		rr.Hdr,
-		rr.Algorithm,
-		rr.Inception,
-		rr.Expiration,
-		rr.Mode,
-		rr.Error,
-		rr.KeySize,
-		rr.Key,
-		rr.OtherLen,
-		rr.OtherData,
-	}
+	return &TKEY{rr.Hdr, rr.Algorithm, rr.Inception, rr.Expiration, rr.Mode, rr.Error, rr.KeySize, rr.Key, rr.OtherLen, rr.OtherData}
 }
-
 func (rr *TLSA) copy() RR {
-	return &TLSA{
-		rr.Hdr,
-		rr.Usage,
-		rr.Selector,
-		rr.MatchingType,
-		rr.Certificate,
-	}
+	return &TLSA{rr.Hdr, rr.Usage, rr.Selector, rr.MatchingType, rr.Certificate}
 }
-
 func (rr *TSIG) copy() RR {
-	return &TSIG{
-		rr.Hdr,
-		rr.Algorithm,
-		rr.TimeSigned,
-		rr.Fudge,
-		rr.MACSize,
-		rr.MAC,
-		rr.OrigId,
-		rr.Error,
-		rr.OtherLen,
-		rr.OtherData,
-	}
+	return &TSIG{rr.Hdr, rr.Algorithm, rr.TimeSigned, rr.Fudge, rr.MACSize, rr.MAC, rr.OrigId, rr.Error, rr.OtherLen, rr.OtherData}
 }
-
 func (rr *TXT) copy() RR {
-	return &TXT{rr.Hdr, cloneSlice(rr.Txt)}
+	Txt := make([]string, len(rr.Txt))
+	copy(Txt, rr.Txt)
+	return &TXT{rr.Hdr, Txt}
 }
-
 func (rr *UID) copy() RR {
 	return &UID{rr.Hdr, rr.Uid}
 }
-
 func (rr *UINFO) copy() RR {
 	return &UINFO{rr.Hdr, rr.Uinfo}
 }
-
 func (rr *URI) copy() RR {
-	return &URI{
-		rr.Hdr,
-		rr.Priority,
-		rr.Weight,
-		rr.Target,
-	}
+	return &URI{rr.Hdr, rr.Priority, rr.Weight, rr.Target}
 }
-
 func (rr *X25) copy() RR {
 	return &X25{rr.Hdr, rr.PSDNAddress}
 }
-
 func (rr *ZONEMD) copy() RR {
-	return &ZONEMD{
-		rr.Hdr,
-		rr.Serial,
-		rr.Scheme,
-		rr.Hash,
-		rr.Digest,
-	}
+	return &ZONEMD{rr.Hdr, rr.Serial, rr.Scheme, rr.Hash, rr.Digest}
 }
diff --git a/vendor/github.com/modern-go/reflect2/.travis.yml b/vendor/github.com/modern-go/reflect2/.travis.yml
index b097728..fbb4374 100644
--- a/vendor/github.com/modern-go/reflect2/.travis.yml
+++ b/vendor/github.com/modern-go/reflect2/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.9.x
+  - 1.8.x
   - 1.x
 
 before_install:
diff --git a/vendor/github.com/modern-go/reflect2/Gopkg.lock b/vendor/github.com/modern-go/reflect2/Gopkg.lock
index 10ef811..2a3a698 100644
--- a/vendor/github.com/modern-go/reflect2/Gopkg.lock
+++ b/vendor/github.com/modern-go/reflect2/Gopkg.lock
@@ -1,9 +1,15 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  name = "github.com/modern-go/concurrent"
+  packages = ["."]
+  revision = "e0a39a4cb4216ea8db28e22a69f4ec25610d513a"
+  version = "1.0.0"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  input-imports = []
+  inputs-digest = "daee8a88b3498b61c5640056665b8b9eea062006f5e596bbb6a3ed9119a11ec7"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/vendor/github.com/modern-go/reflect2/Gopkg.toml b/vendor/github.com/modern-go/reflect2/Gopkg.toml
index a9bc506..2f4f4db 100644
--- a/vendor/github.com/modern-go/reflect2/Gopkg.toml
+++ b/vendor/github.com/modern-go/reflect2/Gopkg.toml
@@ -26,6 +26,10 @@
 
 ignored = []
 
+[[constraint]]
+  name = "github.com/modern-go/concurrent"
+  version = "1.0.0"
+
 [prune]
   go-tests = true
   unused-packages = true
diff --git a/vendor/github.com/modern-go/reflect2/go_above_118.go b/vendor/github.com/modern-go/reflect2/go_above_118.go
deleted file mode 100644
index 2b4116f..0000000
--- a/vendor/github.com/modern-go/reflect2/go_above_118.go
+++ /dev/null
@@ -1,23 +0,0 @@
-//+build go1.18
-
-package reflect2
-
-import (
-	"unsafe"
-)
-
-// m escapes into the return value, but the caller of mapiterinit
-// doesn't let the return value escape.
-//go:noescape
-//go:linkname mapiterinit reflect.mapiterinit
-func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer, it *hiter)
-
-func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator {
-	var it hiter
-	mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj), &it)
-	return &UnsafeMapIterator{
-		hiter:      &it,
-		pKeyRType:  type2.pKeyRType,
-		pElemRType: type2.pElemRType,
-	}
-}
\ No newline at end of file
diff --git a/vendor/github.com/modern-go/reflect2/go_above_17.go b/vendor/github.com/modern-go/reflect2/go_above_17.go
new file mode 100644
index 0000000..5c1cea8
--- /dev/null
+++ b/vendor/github.com/modern-go/reflect2/go_above_17.go
@@ -0,0 +1,8 @@
+//+build go1.7
+
+package reflect2
+
+import "unsafe"
+
+//go:linkname resolveTypeOff reflect.resolveTypeOff
+func resolveTypeOff(rtype unsafe.Pointer, off int32) unsafe.Pointer
diff --git a/vendor/github.com/modern-go/reflect2/go_above_19.go b/vendor/github.com/modern-go/reflect2/go_above_19.go
index 974f768..c7e3b78 100644
--- a/vendor/github.com/modern-go/reflect2/go_above_19.go
+++ b/vendor/github.com/modern-go/reflect2/go_above_19.go
@@ -6,9 +6,6 @@ import (
 	"unsafe"
 )
 
-//go:linkname resolveTypeOff reflect.resolveTypeOff
-func resolveTypeOff(rtype unsafe.Pointer, off int32) unsafe.Pointer
-
 //go:linkname makemap reflect.makemap
 func makemap(rtype unsafe.Pointer, cap int) (m unsafe.Pointer)
 
diff --git a/vendor/github.com/modern-go/reflect2/go_below_118.go b/vendor/github.com/modern-go/reflect2/go_below_118.go
deleted file mode 100644
index 00003db..0000000
--- a/vendor/github.com/modern-go/reflect2/go_below_118.go
+++ /dev/null
@@ -1,21 +0,0 @@
-//+build !go1.18
-
-package reflect2
-
-import (
-	"unsafe"
-)
-
-// m escapes into the return value, but the caller of mapiterinit
-// doesn't let the return value escape.
-//go:noescape
-//go:linkname mapiterinit reflect.mapiterinit
-func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer) (val *hiter)
-
-func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator {
-	return &UnsafeMapIterator{
-		hiter:      mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj)),
-		pKeyRType:  type2.pKeyRType,
-		pElemRType: type2.pElemRType,
-	}
-}
\ No newline at end of file
diff --git a/vendor/github.com/modern-go/reflect2/go_below_17.go b/vendor/github.com/modern-go/reflect2/go_below_17.go
new file mode 100644
index 0000000..65a93c8
--- /dev/null
+++ b/vendor/github.com/modern-go/reflect2/go_below_17.go
@@ -0,0 +1,9 @@
+//+build !go1.7
+
+package reflect2
+
+import "unsafe"
+
+func resolveTypeOff(rtype unsafe.Pointer, off int32) unsafe.Pointer {
+	return nil
+}
diff --git a/vendor/github.com/modern-go/reflect2/go_below_19.go b/vendor/github.com/modern-go/reflect2/go_below_19.go
new file mode 100644
index 0000000..b050ef7
--- /dev/null
+++ b/vendor/github.com/modern-go/reflect2/go_below_19.go
@@ -0,0 +1,14 @@
+//+build !go1.9
+
+package reflect2
+
+import (
+	"unsafe"
+)
+
+//go:linkname makemap reflect.makemap
+func makemap(rtype unsafe.Pointer) (m unsafe.Pointer)
+
+func makeMapWithSize(rtype unsafe.Pointer, cap int) unsafe.Pointer {
+	return makemap(rtype)
+}
diff --git a/vendor/github.com/modern-go/reflect2/reflect2.go b/vendor/github.com/modern-go/reflect2/reflect2.go
index c43c8b9..63b49c7 100644
--- a/vendor/github.com/modern-go/reflect2/reflect2.go
+++ b/vendor/github.com/modern-go/reflect2/reflect2.go
@@ -1,9 +1,8 @@
 package reflect2
 
 import (
+	"github.com/modern-go/concurrent"
 	"reflect"
-	"runtime"
-	"sync"
 	"unsafe"
 )
 
@@ -131,13 +130,13 @@ var ConfigSafe = Config{UseSafeImplementation: true}.Froze()
 
 type frozenConfig struct {
 	useSafeImplementation bool
-	cache                 *sync.Map
+	cache                 *concurrent.Map
 }
 
 func (cfg Config) Froze() *frozenConfig {
 	return &frozenConfig{
 		useSafeImplementation: cfg.UseSafeImplementation,
-		cache:                 new(sync.Map),
+		cache: concurrent.NewMap(),
 	}
 }
 
@@ -289,12 +288,11 @@ func NoEscape(p unsafe.Pointer) unsafe.Pointer {
 }
 
 func UnsafeCastString(str string) []byte {
-	bytes := make([]byte, 0)
 	stringHeader := (*reflect.StringHeader)(unsafe.Pointer(&str))
-	sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&bytes))
-	sliceHeader.Data = stringHeader.Data
-	sliceHeader.Cap = stringHeader.Len
-	sliceHeader.Len = stringHeader.Len
-	runtime.KeepAlive(str)
-	return bytes
+	sliceHeader := &reflect.SliceHeader{
+		Data: stringHeader.Data,
+		Cap: stringHeader.Len,
+		Len: stringHeader.Len,
+	}
+	return *(*[]byte)(unsafe.Pointer(sliceHeader))
 }
diff --git a/vendor/github.com/modern-go/reflect2/test.sh b/vendor/github.com/modern-go/reflect2/test.sh
new file mode 100644
index 0000000..3d2b976
--- /dev/null
+++ b/vendor/github.com/modern-go/reflect2/test.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+echo "" > coverage.txt
+
+for d in $(go list github.com/modern-go/reflect2-tests/... | grep -v vendor); do
+    go test -coverprofile=profile.out -coverpkg=github.com/modern-go/reflect2 $d
+    if [ -f profile.out ]; then
+        cat profile.out >> coverage.txt
+        rm profile.out
+    fi
+done
diff --git a/vendor/github.com/modern-go/reflect2/type_map.go b/vendor/github.com/modern-go/reflect2/type_map.go
index 4b13c31..3acfb55 100644
--- a/vendor/github.com/modern-go/reflect2/type_map.go
+++ b/vendor/github.com/modern-go/reflect2/type_map.go
@@ -1,13 +1,17 @@
-// +build !gccgo
-
 package reflect2
 
 import (
 	"reflect"
+	"runtime"
+	"strings"
 	"sync"
 	"unsafe"
 )
 
+// typelinks1 for 1.5 ~ 1.6
+//go:linkname typelinks1 reflect.typelinks
+func typelinks1() [][]unsafe.Pointer
+
 // typelinks2 for 1.7 ~
 //go:linkname typelinks2 reflect.typelinks
 func typelinks2() (sections []unsafe.Pointer, offset [][]int32)
@@ -23,10 +27,49 @@ func discoverTypes() {
 	types = make(map[string]reflect.Type)
 	packages = make(map[string]map[string]reflect.Type)
 
-	loadGoTypes()
+	ver := runtime.Version()
+	if ver == "go1.5" || strings.HasPrefix(ver, "go1.5.") {
+		loadGo15Types()
+	} else if ver == "go1.6" || strings.HasPrefix(ver, "go1.6.") {
+		loadGo15Types()
+	} else {
+		loadGo17Types()
+	}
 }
 
-func loadGoTypes() {
+func loadGo15Types() {
+	var obj interface{} = reflect.TypeOf(0)
+	typePtrss := typelinks1()
+	for _, typePtrs := range typePtrss {
+		for _, typePtr := range typePtrs {
+			(*emptyInterface)(unsafe.Pointer(&obj)).word = typePtr
+			typ := obj.(reflect.Type)
+			if typ.Kind() == reflect.Ptr && typ.Elem().Kind() == reflect.Struct {
+				loadedType := typ.Elem()
+				pkgTypes := packages[loadedType.PkgPath()]
+				if pkgTypes == nil {
+					pkgTypes = map[string]reflect.Type{}
+					packages[loadedType.PkgPath()] = pkgTypes
+				}
+				types[loadedType.String()] = loadedType
+				pkgTypes[loadedType.Name()] = loadedType
+			}
+			if typ.Kind() == reflect.Slice && typ.Elem().Kind() == reflect.Ptr &&
+				typ.Elem().Elem().Kind() == reflect.Struct {
+				loadedType := typ.Elem().Elem()
+				pkgTypes := packages[loadedType.PkgPath()]
+				if pkgTypes == nil {
+					pkgTypes = map[string]reflect.Type{}
+					packages[loadedType.PkgPath()] = pkgTypes
+				}
+				types[loadedType.String()] = loadedType
+				pkgTypes[loadedType.Name()] = loadedType
+			}
+		}
+	}
+}
+
+func loadGo17Types() {
 	var obj interface{} = reflect.TypeOf(0)
 	sections, offset := typelinks2()
 	for i, offs := range offset {
diff --git a/vendor/github.com/modern-go/reflect2/unsafe_link.go b/vendor/github.com/modern-go/reflect2/unsafe_link.go
index b49f614..57229c8 100644
--- a/vendor/github.com/modern-go/reflect2/unsafe_link.go
+++ b/vendor/github.com/modern-go/reflect2/unsafe_link.go
@@ -19,12 +19,18 @@ func typedslicecopy(elemType unsafe.Pointer, dst, src sliceHeader) int
 
 //go:linkname mapassign reflect.mapassign
 //go:noescape
-func mapassign(rtype unsafe.Pointer, m unsafe.Pointer, key unsafe.Pointer, val unsafe.Pointer)
+func mapassign(rtype unsafe.Pointer, m unsafe.Pointer, key, val unsafe.Pointer)
 
 //go:linkname mapaccess reflect.mapaccess
 //go:noescape
 func mapaccess(rtype unsafe.Pointer, m unsafe.Pointer, key unsafe.Pointer) (val unsafe.Pointer)
 
+// m escapes into the return value, but the caller of mapiterinit
+// doesn't let the return value escape.
+//go:noescape
+//go:linkname mapiterinit reflect.mapiterinit
+func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer) *hiter
+
 //go:noescape
 //go:linkname mapiternext reflect.mapiternext
 func mapiternext(it *hiter)
@@ -36,21 +42,9 @@ func ifaceE2I(rtype unsafe.Pointer, src interface{}, dst unsafe.Pointer)
 // If you modify hiter, also change cmd/internal/gc/reflect.go to indicate
 // the layout of this structure.
 type hiter struct {
-	key         unsafe.Pointer
-	value       unsafe.Pointer
-	t           unsafe.Pointer
-	h           unsafe.Pointer
-	buckets     unsafe.Pointer
-	bptr        unsafe.Pointer
-	overflow    *[]unsafe.Pointer
-	oldoverflow *[]unsafe.Pointer
-	startBucket uintptr
-	offset      uint8
-	wrapped     bool
-	B           uint8
-	i           uint8
-	bucket      uintptr
-	checkBucket uintptr
+	key   unsafe.Pointer // Must be in first position.  Write nil to indicate iteration end (see cmd/internal/gc/range.go).
+	value unsafe.Pointer // Must be in second position (see cmd/internal/gc/range.go).
+	// rest fields are ignored
 }
 
 // add returns p+x.
diff --git a/vendor/github.com/modern-go/reflect2/unsafe_map.go b/vendor/github.com/modern-go/reflect2/unsafe_map.go
index 37872da..f2e76e6 100644
--- a/vendor/github.com/modern-go/reflect2/unsafe_map.go
+++ b/vendor/github.com/modern-go/reflect2/unsafe_map.go
@@ -107,6 +107,14 @@ func (type2 *UnsafeMapType) Iterate(obj interface{}) MapIterator {
 	return type2.UnsafeIterate(objEFace.data)
 }
 
+func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator {
+	return &UnsafeMapIterator{
+		hiter:      mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj)),
+		pKeyRType:  type2.pKeyRType,
+		pElemRType: type2.pElemRType,
+	}
+}
+
 type UnsafeMapIterator struct {
 	*hiter
 	pKeyRType  unsafe.Pointer
diff --git a/vendor/github.com/ovh/go-ovh/LICENSE b/vendor/github.com/ovh/go-ovh/LICENSE
index 7870f87..d847c8a 100644
--- a/vendor/github.com/ovh/go-ovh/LICENSE
+++ b/vendor/github.com/ovh/go-ovh/LICENSE
@@ -1,28 +1,26 @@
-BSD 3-Clause License
-
-Copyright (c) 2015-2025, OVH SAS
+Copyright (c) 2015-2017, OVH SAS.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  * Neither the name of OVH SAS nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY OVH SAS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL OVH SAS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/ovh/go-ovh/ovh/configuration.go b/vendor/github.com/ovh/go-ovh/ovh/configuration.go
index 6cca43b..4cc624d 100644
--- a/vendor/github.com/ovh/go-ovh/ovh/configuration.go
+++ b/vendor/github.com/ovh/go-ovh/ovh/configuration.go
@@ -1,84 +1,46 @@
 package ovh
 
 import (
-	"context"
-	"errors"
 	"fmt"
 	"os"
 	"os/user"
-	"runtime"
+	"path/filepath"
 	"strings"
 
-	"golang.org/x/oauth2/clientcredentials"
 	"gopkg.in/ini.v1"
 )
 
-var configPaths = []string{
-	// System wide configuration
-	"/etc/ovh.conf",
-	// Configuration in user's home
-	"~/.ovh.conf",
-	// Configuration in local folder
-	"./ovh.conf",
-}
+// Use variables for easier test overload
+var (
+	systemConfigPath = "/etc/ovh.conf"
+	userConfigPath   = "/.ovh.conf" // prefixed with homeDir
+	localConfigPath  = "./ovh.conf"
+)
 
-// currentUserHome attempts to get current user's home directory.
+// currentUserHome attempts to get current user's home directory
 func currentUserHome() (string, error) {
+	userHome := ""
 	usr, err := user.Current()
 	if err != nil {
 		// Fallback by trying to read $HOME
-		if userHome := os.Getenv("HOME"); userHome != "" {
-			return userHome, nil
+		userHome = os.Getenv("HOME")
+		if userHome != "" {
+			err = nil
 		}
-		return "", err
+	} else {
+		userHome = usr.HomeDir
 	}
-
-	return usr.HomeDir, nil
+	return userHome, nil
 }
 
-// configPaths returns configPaths, with ~/ prefix expanded.
-func expandConfigPaths() []interface{} {
-	paths := []interface{}{}
-
-	// Will be initialized on first use
-	var home string
-	var homeErr error
-
-	for _, path := range configPaths {
-		if strings.HasPrefix(path, "~/") {
-			// Find home if needed
-			if home == "" && homeErr == nil {
-				home, homeErr = currentUserHome()
-			}
-			// Ignore file in HOME if we cannot find it
-			if homeErr != nil {
-				continue
-			}
-
-			path = home + path[1:]
-		}
-
-		paths = append(paths, path)
+// appendConfigurationFile only if it exists. We need to do this because
+// ini package will fail to load configuration at all if a configuration
+// file is missing. This is racy, but better than always failing.
+func appendConfigurationFile(cfg *ini.File, path string) {
+	if file, err := os.Open(path); err == nil {
+		file.Close()
+		cfg.Append(path)
 	}
-
-	return paths
-}
-
-// loadINI builds a ini.File from the configuration paths provided in configPaths.
-// It's a helper for loadConfig.
-func loadINI() (*ini.File, error) {
-	// Don't try to load configuration from the
-	// filesystem when compiling for WebAssembly
-	if runtime.GOARCH == "wasm" && runtime.GOOS == "js" {
-		return ini.Empty(), nil
-	}
-
-	paths := expandConfigPaths()
-	if len(paths) == 0 {
-		return ini.Empty(), nil
-	}
-
-	return ini.LooseLoad(paths[0], paths[1:]...)
 }
 
 // loadConfig loads client configuration from params, environments or configuration
@@ -95,27 +57,23 @@ func loadINI() (*ini.File, error) {
 // - ./ovh.conf
 // - $HOME/.ovh.conf
 // - /etc/ovh.conf
+//
 func (c *Client) loadConfig(endpointName string) error {
-	if strings.HasSuffix(endpointName, "/") {
-		return fmt.Errorf("endpoint name cannot have a trailing slash")
-	}
-
 	// Load configuration files by order of increasing priority. All configuration
 	// files are optional. Only load file from user home if home could be resolve
-	cfg, err := loadINI()
-	if err != nil {
-		return fmt.Errorf("cannot load configuration: %w", err)
+	cfg := ini.Empty()
+	appendConfigurationFile(cfg, systemConfigPath)
+	if home, err := currentUserHome(); err == nil {
+		userConfigFullPath := filepath.Join(home, userConfigPath)
+		appendConfigurationFile(cfg, userConfigFullPath)
 	}
+	appendConfigurationFile(cfg, localConfigPath)
 
 	// Canonicalize configuration
 	if endpointName == "" {
 		endpointName = getConfigValue(cfg, "default", "endpoint", "ovh-eu")
 	}
 
-	if c.AccessToken == "" {
-		c.AccessToken = getConfigValue(cfg, endpointName, "access_token", "")
-	}
-
 	if c.AppKey == "" {
 		c.AppKey = getConfigValue(cfg, endpointName, "application_key", "")
 	}
@@ -128,41 +86,6 @@ func (c *Client) loadConfig(endpointName string) error {
 		c.ConsumerKey = getConfigValue(cfg, endpointName, "consumer_key", "")
 	}
 
-	if c.ClientID == "" {
-		c.ClientID = getConfigValue(cfg, endpointName, "client_id", "")
-	}
-
-	if c.ClientSecret == "" {
-		c.ClientSecret = getConfigValue(cfg, endpointName, "client_secret", "")
-	}
-
-	configuredAuthMethods := []string{}
-	if c.AppKey != "" || c.AppSecret != "" || c.ConsumerKey != "" {
-		configuredAuthMethods = append(configuredAuthMethods, "application_key/application_secret")
-	}
-	if c.ClientID != "" || c.ClientSecret != "" {
-		configuredAuthMethods = append(configuredAuthMethods, "client_id/client_secret")
-	}
-	if c.AccessToken != "" {
-		configuredAuthMethods = append(configuredAuthMethods, "access_token")
-	}
-
-	if len(configuredAuthMethods) > 1 {
-		return fmt.Errorf("can't use multiple authentication methods: %s", strings.Join(configuredAuthMethods, ", "))
-	}
-	if len(configuredAuthMethods) == 0 {
-		return errors.New(
-			"missing authentication information, you need to provide one of the following: application_key/application_secret, client_id/client_secret, or access_token",
-		)
-	}
-
-	if (c.ClientID != "") != (c.ClientSecret != "") {
-		return errors.New("invalid oauth2 config, both client_id and client_secret must be given")
-	}
-	if (c.AppKey != "") != (c.AppSecret != "") {
-		return errors.New("invalid authentication config, both application_key and application_secret must be given")
-	}
-
 	// Load real endpoint URL by name. If endpoint contains a '/', consider it as a URL
 	if strings.Contains(endpointName, "/") {
 		c.endpoint = endpointName
@@ -172,28 +95,19 @@ func (c *Client) loadConfig(endpointName string) error {
 
 	// If we still have no valid endpoint, AppKey or AppSecret, return an error
 	if c.endpoint == "" {
-		return fmt.Errorf("unknown endpoint '%s', consider checking 'Endpoints' list or using an URL", endpointName)
+		return fmt.Errorf("unknown endpoint '%s', consider checking 'Endpoints' list of using an URL", endpointName)
 	}
-
-	if c.ClientID != "" {
-		if _, ok := tokensURLs[c.endpoint]; !ok {
-			return fmt.Errorf("oauth2 authentication is not compatible with endpoint %q", c.endpoint)
-		}
-
-		conf := &clientcredentials.Config{
-			ClientID:     c.ClientID,
-			ClientSecret: c.ClientSecret,
-			TokenURL:     tokensURLs[c.endpoint],
-			Scopes:       []string{"all"},
-		}
-
-		c.oauth2TokenSource = conf.TokenSource(context.Background())
+	if c.AppKey == "" {
+		return fmt.Errorf("missing application key, please check your configuration or consult the documentation to create one")
+	}
+	if c.AppSecret == "" {
+		return fmt.Errorf("missing application secret, please check your configuration or consult the documentation to create one")
 	}
 
 	return nil
 }
 
-// getConfigValue returns the value of OVH_<NAME> or "name" value from "section". If
+// getConfigValue returns the value of OVH_<NAME> or ``name`` value from ``section``. If
 // the value could not be read from either env or any configuration files, return 'def'
 func getConfigValue(cfg *ini.File, section, name, def string) string {
 	// Attempt to load from environment
@@ -202,20 +116,12 @@ func getConfigValue(cfg *ini.File, section, name, def string) string {
 		return fromEnv
 	}
 
-	if !cfg.HasSection(section) {
-		return def
-	}
-
 	// Attempt to load from configuration
 	fromSection := cfg.Section(section)
 	if fromSection == nil {
 		return def
 	}
 
-	if !fromSection.HasKey(name) {
-		return def
-	}
-
 	fromSectionKey := fromSection.Key(name)
 	if fromSectionKey == nil {
 		return def
diff --git a/vendor/github.com/ovh/go-ovh/ovh/consumer_key.go b/vendor/github.com/ovh/go-ovh/ovh/consumer_key.go
index b32b801..7163755 100644
--- a/vendor/github.com/ovh/go-ovh/ovh/consumer_key.go
+++ b/vendor/github.com/ovh/go-ovh/ovh/consumer_key.go
@@ -83,6 +83,7 @@ func (ck *CkRequest) AddRules(methods []string, path string) {
 	for _, method := range methods {
 		ck.AddRule(method, path)
 	}
+
 }
 
 // AddRecursiveRules adds grant requests on "path" and "path/*", for all
diff --git a/vendor/github.com/ovh/go-ovh/ovh/error.go b/vendor/github.com/ovh/go-ovh/ovh/error.go
index 81f8fe3..35e3608 100644
--- a/vendor/github.com/ovh/go-ovh/ovh/error.go
+++ b/vendor/github.com/ovh/go-ovh/ovh/error.go
@@ -1,65 +1,17 @@
 package ovh
 
-import (
-	"fmt"
-	"strings"
-)
+import "fmt"
 
 // APIError represents an error that can occurred while calling the API.
 type APIError struct {
-	// Error class
-	Class string `json:"class,omitempty"`
 	// Error message.
-	Message string `json:"message"`
-	// Error details
-	Details map[string]string `json:"details,omitempty"`
+	Message string
 	// HTTP code.
 	Code int
 	// ID of the request
 	QueryID string
 }
 
-// Let's make sure that APIError always satisfies the fmt.Stringer and error interfaces
-var _ fmt.Stringer = APIError{}
-var _ error = APIError{}
-
-func (err APIError) Error() string {
-	var sb strings.Builder
-	sb.Grow(128)
-
-	// Base message
-	fmt.Fprint(&sb, "OVHcloud API error (status code ", err.Code, "): ")
-
-	// Append class if any
-	if err.Class != "" {
-		fmt.Fprint(&sb, err.Class, ": ")
-	}
-
-	// Catch missing IAM permissions, if any
-	var missingIAMActionsDetails []string
-	if missingAuthenticationActions, ok := err.Details["unauthorizedActionsByAuthentication"]; ok && missingAuthenticationActions != "" {
-		missingIAMActionsDetails = append(missingIAMActionsDetails, missingAuthenticationActions)
-	}
-	if missingIAMActions, ok := err.Details["unauthorizedActionsByIAM"]; ok && missingIAMActions != "" {
-		missingIAMActionsDetails = append(missingIAMActionsDetails, missingIAMActions)
-	}
-
-	message := err.Message
-	if len(missingIAMActionsDetails) > 0 {
-		message += fmt.Sprintf(" (missing IAM permissions: %s)", strings.Join(missingIAMActionsDetails, ", "))
-	}
-
-	// Real error message, quoted
-	fmt.Fprintf(&sb, "%q", message)
-
-	// QueryID if any
-	if err.QueryID != "" {
-		fmt.Fprint(&sb, " (X-OVH-Query-Id: ", err.QueryID, ")")
-	}
-
-	return sb.String()
-}
-
-func (err APIError) String() string {
-	return err.Error()
+func (err *APIError) Error() string {
+	return fmt.Sprintf("Error %d: %q", err.Code, err.Message)
 }
diff --git a/vendor/github.com/ovh/go-ovh/ovh/ovh.go b/vendor/github.com/ovh/go-ovh/ovh/ovh.go
index f9e2a94..9bccb20 100644
--- a/vendor/github.com/ovh/go-ovh/ovh/ovh.go
+++ b/vendor/github.com/ovh/go-ovh/ovh/ovh.go
@@ -10,19 +10,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"runtime"
 	"strconv"
-	"strings"
-	"sync/atomic"
+	"sync"
 	"time"
-
-	"golang.org/x/oauth2"
 )
 
-// getLocalTime is a function to be overwritten during the tests, it returns the time
-// on the the local machine
-var getLocalTime = time.Now
-
 // DefaultTimeout api requests after 180s
 const DefaultTimeout = 180 * time.Second
 
@@ -50,20 +42,11 @@ var Endpoints = map[string]string{
 
 // Errors
 var (
-	ErrAPIDown = errors.New("go-ovh: the OVH API is not reachable: failed to get /auth/time response")
-
-	tokensURLs = map[string]string{
-		OvhEU: "https://www.ovh.com/auth/oauth2/token",
-		OvhCA: "https://ca.ovh.com/auth/oauth2/token",
-		OvhUS: "https://us.ovhcloud.com/auth/oauth2/token",
-	}
+	ErrAPIDown = errors.New("go-vh: the OVH API is down, it does't respond to /time anymore")
 )
 
 // Client represents a client to call the OVH API
 type Client struct {
-	// AccessToken is a short-lived access token that we got from auth/oauth2/token endpoint.
-	AccessToken string
-
 	// Self generated tokens. Create one by visiting
 	// https://eu.api.ovh.com/createApp/
 	// AppKey holds the Application key
@@ -75,12 +58,8 @@ type Client struct {
 	// ConsumerKey holds the user/app specific token. It must have been validated before use.
 	ConsumerKey string
 
-	ClientID     string
-	ClientSecret string
-
 	// API endpoint
-	endpoint          string
-	oauth2TokenSource oauth2.TokenSource
+	endpoint string
 
 	// Client is the underlying HTTP client used to run the requests. It may be overloaded but a default one is instanciated in ``NewClient`` by default.
 	Client *http.Client
@@ -91,23 +70,22 @@ type Client struct {
 	// Ensures that the timeDelta function is only ran once
 	// sync.Once would consider init done, even in case of error
 	// hence a good old flag
-	timeDelta atomic.Value
-
-	// Timeout configures the maximum duration to wait for an API requests to complete
-	Timeout time.Duration
-
-	// UserAgent configures the user-agent indication that will be sent in the requests to OVHcloud API
-	UserAgent string
+	timeDeltaMutex *sync.Mutex
+	timeDeltaDone  bool
+	timeDelta      time.Duration
+	Timeout        time.Duration
 }
 
 // NewClient represents a new client to call the API
 func NewClient(endpoint, appKey, appSecret, consumerKey string) (*Client, error) {
 	client := Client{
-		AppKey:      appKey,
-		AppSecret:   appSecret,
-		ConsumerKey: consumerKey,
-		Client:      &http.Client{},
-		Timeout:     DefaultTimeout,
+		AppKey:         appKey,
+		AppSecret:      appSecret,
+		ConsumerKey:    consumerKey,
+		Client:         &http.Client{},
+		timeDeltaMutex: &sync.Mutex{},
+		timeDeltaDone:  false,
+		Timeout:        time.Duration(DefaultTimeout),
 	}
 
 	// Get and check the configuration
@@ -130,49 +108,6 @@ func NewDefaultClient() (*Client, error) {
 	return NewClient("", "", "", "")
 }
 
-func NewOAuth2Client(endpoint, clientID, clientSecret string) (*Client, error) {
-	client := Client{
-		ClientID:     clientID,
-		ClientSecret: clientSecret,
-		Client:       &http.Client{},
-		Timeout:      DefaultTimeout,
-	}
-
-	// Get and check the configuration
-	if err := client.loadConfig(endpoint); err != nil {
-		return nil, err
-	}
-	return &client, nil
-}
-
-func NewAccessTokenClient(endpoint, accessToken string) (*Client, error) {
-	client := Client{
-		AccessToken: accessToken,
-		Client:      &http.Client{},
-		Timeout:     DefaultTimeout,
-	}
-
-	// Get and check the configuration
-	if err := client.loadConfig(endpoint); err != nil {
-		return nil, err
-	}
-	return &client, nil
-}
-
-func (c *Client) Endpoint() string {
-	return c.endpoint
-}
-
-func (c *Client) SetEndpoint(endpoint string) error {
-	if strings.HasSuffix(endpoint, "/") {
-		return errors.New("endpoint name cannot have a trailing slash")
-	}
-
-	c.endpoint = endpoint
-
-	return nil
-}
-
 //
 // High level helpers
 //
@@ -279,22 +214,29 @@ func (c *Client) DeleteUnAuthWithContext(ctx context.Context, url string, resTyp
 	return c.CallAPIWithContext(ctx, "DELETE", url, nil, resType, false)
 }
 
-// timeDelta returns the time delta between the host and the remote API
+// timeDelta returns the time  delta between the host and the remote API
 func (c *Client) getTimeDelta() (time.Duration, error) {
-	d, ok := c.timeDelta.Load().(time.Duration)
-	if ok {
-		return d, nil
+
+	if !c.timeDeltaDone {
+		// Ensure only one thread is updating
+		c.timeDeltaMutex.Lock()
+
+		// Ensure that the mutex will be released on return
+		defer c.timeDeltaMutex.Unlock()
+
+		// Did we wait ? Maybe no more needed
+		if !c.timeDeltaDone {
+			ovhTime, err := c.getTime()
+			if err != nil {
+				return 0, err
+			}
+
+			c.timeDelta = time.Since(*ovhTime)
+			c.timeDeltaDone = true
+		}
 	}
 
-	ovhTime, err := c.getTime()
-	if err != nil {
-		return 0, err
-	}
-
-	d = getLocalTime().Sub(*ovhTime)
-	c.timeDelta.Store(d)
-
-	return d, nil
+	return c.timeDelta, nil
 }
 
 // getTime t returns time from for a given api client endpoint
@@ -310,15 +252,16 @@ func (c *Client) getTime() (*time.Time, error) {
 	return &serverTime, nil
 }
 
-// getTarget returns the URL to target given and endpoint and a path.
-// If the path starts with `/v1` or `/v2`, then remove the trailing `/1.0` from the endpoint.
-func getTarget(endpoint, path string) string {
-	// /1.0 + /v1/ or /1.0 + /v2/
-	if strings.HasSuffix(endpoint, "/1.0") && (strings.HasPrefix(path, "/v1/") || strings.HasPrefix(path, "/v2/")) {
-		return endpoint[:len(endpoint)-4] + path
-	}
+// getLocalTime is a function to be overwritten during the tests, it return the time
+// on the the local machine
+var getLocalTime = func() time.Time {
+	return time.Now()
+}
 
-	return endpoint + path
+// getEndpointForSignature is a function to be overwritten during the tests, it returns a
+// the endpoint
+var getEndpointForSignature = func(c *Client) string {
+	return c.endpoint
 }
 
 // NewRequest returns a new HTTP request
@@ -333,7 +276,7 @@ func (c *Client) NewRequest(method, path string, reqBody interface{}, needAuth b
 		}
 	}
 
-	target := getTarget(c.endpoint, path)
+	target := fmt.Sprintf("%s%s", c.endpoint, path)
 	req, err := http.NewRequest(method, target, bytes.NewReader(body))
 	if err != nil {
 		return nil, err
@@ -343,62 +286,38 @@ func (c *Client) NewRequest(method, path string, reqBody interface{}, needAuth b
 	if body != nil {
 		req.Header.Add("Content-Type", "application/json;charset=utf-8")
 	}
-	if c.AppKey != "" {
-		req.Header.Add("X-Ovh-Application", c.AppKey)
-	}
+	req.Header.Add("X-Ovh-Application", c.AppKey)
 	req.Header.Add("Accept", "application/json")
 
 	// Inject signature. Some methods do not need authentication, especially /time,
 	// /auth and some /order methods are actually broken if authenticated.
 	if needAuth {
-		if c.AppKey != "" {
-			timeDelta, err := c.TimeDelta()
-			if err != nil {
-				return nil, err
-			}
-
-			timestamp := getLocalTime().Add(-timeDelta).Unix()
-
-			req.Header.Add("X-Ovh-Timestamp", strconv.FormatInt(timestamp, 10))
-			req.Header.Add("X-Ovh-Consumer", c.ConsumerKey)
-
-			h := sha1.New()
-			h.Write([]byte(fmt.Sprintf("%s+%s+%s+%s+%s+%d",
-				c.AppSecret,
-				c.ConsumerKey,
-				method,
-				target,
-				body,
-				timestamp,
-			)))
-			req.Header.Add("X-Ovh-Signature", fmt.Sprintf("$1$%x", h.Sum(nil)))
-		} else if c.ClientID != "" {
-			token, err := c.oauth2TokenSource.Token()
-			if err != nil {
-				return nil, fmt.Errorf("failed to retrieve OAuth2 Access Token: %w", err)
-			}
-
-			req.Header.Set("Authorization", "Bearer "+token.AccessToken)
-		} else if c.AccessToken != "" {
-			req.Header.Set("Authorization", "Bearer "+c.AccessToken)
+		timeDelta, err := c.TimeDelta()
+		if err != nil {
+			return nil, err
 		}
+
+		timestamp := getLocalTime().Add(-timeDelta).Unix()
+
+		req.Header.Add("X-Ovh-Timestamp", strconv.FormatInt(timestamp, 10))
+		req.Header.Add("X-Ovh-Consumer", c.ConsumerKey)
+
+		h := sha1.New()
+		h.Write([]byte(fmt.Sprintf("%s+%s+%s+%s%s+%s+%d",
+			c.AppSecret,
+			c.ConsumerKey,
+			method,
+			getEndpointForSignature(c),
+			path,
+			body,
+			timestamp,
+		)))
+		req.Header.Add("X-Ovh-Signature", fmt.Sprintf("$1$%x", h.Sum(nil)))
 	}
 
 	// Send the request with requested timeout
 	c.Client.Timeout = c.Timeout
 
-	if c.UserAgent != "" {
-		// When running in a WebAssembly binary, let the caller set
-		// the user-agent freely to be able to use the browser's one.
-		if runtime.GOARCH == "wasm" && runtime.GOOS == "js" {
-			req.Header.Set("User-Agent", c.UserAgent)
-		} else {
-			req.Header.Set("User-Agent", "github.com/ovh/go-ovh ("+c.UserAgent+")")
-		}
-	} else {
-		req.Header.Set("User-Agent", "github.com/ovh/go-ovh")
-	}
-
 	return req, nil
 }
 
@@ -450,7 +369,7 @@ func (c *Client) CallAPI(method, path string, reqBody, resType interface{}, need
 // - full serialized request body
 // - server current time (takes time delta into account)
 //
-// Context is used by http.Client to handle context cancelation.
+// Context is used by http.Client to handle context cancelation
 //
 // Call will automatically assemble the target url from the endpoint
 // configured in the client instance and the path argument. If the reqBody
diff --git a/vendor/github.com/valyala/fasttemplate/template.go b/vendor/github.com/valyala/fasttemplate/template.go
index f2d3261..1862001 100644
--- a/vendor/github.com/valyala/fasttemplate/template.go
+++ b/vendor/github.com/valyala/fasttemplate/template.go
@@ -112,7 +112,8 @@ func ExecuteFuncString(template, startTag, endTag string, f TagFunc) string {
 // but when f returns an error, ExecuteFuncStringWithErr won't panic like ExecuteFuncString
 // it just returns an empty string and the error f returned
 func ExecuteFuncStringWithErr(template, startTag, endTag string, f TagFunc) (string, error) {
-	if n := bytes.Index(unsafeString2Bytes(template), unsafeString2Bytes(startTag)); n < 0 {
+	tagsCount := bytes.Count(unsafeString2Bytes(template), unsafeString2Bytes(startTag))
+	if tagsCount == 0 {
 		return template, nil
 	}
 
diff --git a/vendor/golang.org/x/crypto/AUTHORS b/vendor/golang.org/x/crypto/AUTHORS
new file mode 100644
index 0000000..2b00ddb
--- /dev/null
+++ b/vendor/golang.org/x/crypto/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at https://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/crypto/CONTRIBUTORS b/vendor/golang.org/x/crypto/CONTRIBUTORS
new file mode 100644
index 0000000..1fbd3e9
--- /dev/null
+++ b/vendor/golang.org/x/crypto/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at https://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
index 2a7cf70..6a66aea 100644
--- a/vendor/golang.org/x/crypto/LICENSE
+++ b/vendor/golang.org/x/crypto/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 The Go Authors.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google LLC nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/golang.org/x/crypto/acme/acme.go b/vendor/golang.org/x/crypto/acme/acme.go
index 6be00d1..174cfe8 100644
--- a/vendor/golang.org/x/crypto/acme/acme.go
+++ b/vendor/golang.org/x/crypto/acme/acme.go
@@ -3,20 +3,17 @@
 // license that can be found in the LICENSE file.
 
 // Package acme provides an implementation of the
-// Automatic Certificate Management Environment (ACME) spec,
-// most famously used by Let's Encrypt.
-//
-// The initial implementation of this package was based on an early version
-// of the spec. The current implementation supports only the modern
-// RFC 8555 but some of the old API surface remains for compatibility.
-// While code using the old API will still compile, it will return an error.
-// Note the deprecation comments to update your code.
-//
-// See https://tools.ietf.org/html/rfc8555 for the spec.
+// Automatic Certificate Management Environment (ACME) spec.
+// The intial implementation was based on ACME draft-02 and
+// is now being extended to comply with RFC 8555.
+// See https://tools.ietf.org/html/draft-ietf-acme-acme-02
+// and https://tools.ietf.org/html/rfc8555 for details.
 //
 // Most common scenarios will want to use autocert subdirectory instead,
 // which provides automatic access to certificates from Let's Encrypt
 // and any other ACME-based CA.
+//
+// This package is a work in progress and makes no API stability promises.
 package acme
 
 import (
@@ -31,9 +28,13 @@ import (
 	"crypto/x509/pkix"
 	"encoding/asn1"
 	"encoding/base64"
+	"encoding/hex"
 	"encoding/json"
+	"encoding/pem"
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
 	"math/big"
 	"net/http"
 	"strings"
@@ -71,22 +72,22 @@ const (
 )
 
 // Client is an ACME client.
-//
 // The only required field is Key. An example of creating a client with a new key
 // is as follows:
 //
-//	key, err := rsa.GenerateKey(rand.Reader, 2048)
-//	if err != nil {
-//		log.Fatal(err)
-//	}
-//	client := &Client{Key: key}
+// 	key, err := rsa.GenerateKey(rand.Reader, 2048)
+// 	if err != nil {
+// 		log.Fatal(err)
+// 	}
+// 	client := &Client{Key: key}
+//
 type Client struct {
 	// Key is the account key used to register with a CA and sign requests.
 	// Key.Public() must return a *rsa.PublicKey or *ecdsa.PublicKey.
 	//
 	// The following algorithms are supported:
 	// RS256, ES256, ES384 and ES512.
-	// See RFC 7518 for more details about the algorithms.
+	// See RFC7518 for more details about the algorithms.
 	Key crypto.Signer
 
 	// HTTPClient optionally specifies an HTTP client to use
@@ -124,9 +125,7 @@ type Client struct {
 
 	cacheMu sync.Mutex
 	dir     *Directory // cached result of Client's Discover method
-	// KID is the key identifier provided by the CA. If not provided it will be
-	// retrieved from the CA by making a call to the registration endpoint.
-	KID KeyID
+	kid     keyID      // cached Account.URI obtained from registerRFC or getAccountRFC
 
 	noncesMu sync.Mutex
 	nonces   map[string]struct{} // nonces collected from previous responses
@@ -141,22 +140,23 @@ type Client struct {
 //
 // When in pre-RFC mode or when c.getRegRFC responds with an error, accountKID
 // returns noKeyID.
-func (c *Client) accountKID(ctx context.Context) KeyID {
+func (c *Client) accountKID(ctx context.Context) keyID {
 	c.cacheMu.Lock()
 	defer c.cacheMu.Unlock()
-	if c.KID != noKeyID {
-		return c.KID
+	if !c.dir.rfcCompliant() {
+		return noKeyID
+	}
+	if c.kid != noKeyID {
+		return c.kid
 	}
 	a, err := c.getRegRFC(ctx)
 	if err != nil {
 		return noKeyID
 	}
-	c.KID = KeyID(a.URI)
-	return c.KID
+	c.kid = keyID(a.URI)
+	return c.kid
 }
 
-var errPreRFC = errors.New("acme: server does not support the RFC 8555 version of ACME")
-
 // Discover performs ACME server discovery using c.DirectoryURL.
 //
 // It caches successful result. So, subsequent calls will not result in
@@ -177,36 +177,53 @@ func (c *Client) Discover(ctx context.Context) (Directory, error) {
 	c.addNonce(res.Header)
 
 	var v struct {
-		Reg       string `json:"newAccount"`
-		Authz     string `json:"newAuthz"`
-		Order     string `json:"newOrder"`
-		Revoke    string `json:"revokeCert"`
-		Nonce     string `json:"newNonce"`
-		KeyChange string `json:"keyChange"`
-		Meta      struct {
-			Terms        string   `json:"termsOfService"`
-			Website      string   `json:"website"`
-			CAA          []string `json:"caaIdentities"`
-			ExternalAcct bool     `json:"externalAccountRequired"`
+		Reg          string `json:"new-reg"`
+		RegRFC       string `json:"newAccount"`
+		Authz        string `json:"new-authz"`
+		AuthzRFC     string `json:"newAuthz"`
+		OrderRFC     string `json:"newOrder"`
+		Cert         string `json:"new-cert"`
+		Revoke       string `json:"revoke-cert"`
+		RevokeRFC    string `json:"revokeCert"`
+		NonceRFC     string `json:"newNonce"`
+		KeyChangeRFC string `json:"keyChange"`
+		Meta         struct {
+			Terms           string   `json:"terms-of-service"`
+			TermsRFC        string   `json:"termsOfService"`
+			WebsiteRFC      string   `json:"website"`
+			CAA             []string `json:"caa-identities"`
+			CAARFC          []string `json:"caaIdentities"`
+			ExternalAcctRFC bool     `json:"externalAccountRequired"`
 		}
 	}
 	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
 		return Directory{}, err
 	}
-	if v.Order == "" {
-		return Directory{}, errPreRFC
+	if v.OrderRFC == "" {
+		// Non-RFC compliant ACME CA.
+		c.dir = &Directory{
+			RegURL:    v.Reg,
+			AuthzURL:  v.Authz,
+			CertURL:   v.Cert,
+			RevokeURL: v.Revoke,
+			Terms:     v.Meta.Terms,
+			Website:   v.Meta.WebsiteRFC,
+			CAA:       v.Meta.CAA,
+		}
+		return *c.dir, nil
 	}
+	// RFC compliant ACME CA.
 	c.dir = &Directory{
-		RegURL:                  v.Reg,
-		AuthzURL:                v.Authz,
-		OrderURL:                v.Order,
-		RevokeURL:               v.Revoke,
-		NonceURL:                v.Nonce,
-		KeyChangeURL:            v.KeyChange,
-		Terms:                   v.Meta.Terms,
-		Website:                 v.Meta.Website,
-		CAA:                     v.Meta.CAA,
-		ExternalAccountRequired: v.Meta.ExternalAcct,
+		RegURL:                  v.RegRFC,
+		AuthzURL:                v.AuthzRFC,
+		OrderURL:                v.OrderRFC,
+		RevokeURL:               v.RevokeRFC,
+		NonceURL:                v.NonceRFC,
+		KeyChangeURL:            v.KeyChangeRFC,
+		Terms:                   v.Meta.TermsRFC,
+		Website:                 v.Meta.WebsiteRFC,
+		CAA:                     v.Meta.CAARFC,
+		ExternalAccountRequired: v.Meta.ExternalAcctRFC,
 	}
 	return *c.dir, nil
 }
@@ -218,11 +235,55 @@ func (c *Client) directoryURL() string {
 	return LetsEncryptURL
 }
 
-// CreateCert was part of the old version of ACME. It is incompatible with RFC 8555.
+// CreateCert requests a new certificate using the Certificate Signing Request csr encoded in DER format.
+// It is incompatible with RFC 8555. Callers should use CreateOrderCert when interfacing
+// with an RFC-compliant CA.
 //
-// Deprecated: this was for the pre-RFC 8555 version of ACME. Callers should use CreateOrderCert.
+// The exp argument indicates the desired certificate validity duration. CA may issue a certificate
+// with a different duration.
+// If the bundle argument is true, the returned value will also contain the CA (issuer) certificate chain.
+//
+// In the case where CA server does not provide the issued certificate in the response,
+// CreateCert will poll certURL using c.FetchCert, which will result in additional round-trips.
+// In such a scenario, the caller can cancel the polling with ctx.
+//
+// CreateCert returns an error if the CA's response or chain was unreasonably large.
+// Callers are encouraged to parse the returned value to ensure the certificate is valid and has the expected features.
 func (c *Client) CreateCert(ctx context.Context, csr []byte, exp time.Duration, bundle bool) (der [][]byte, certURL string, err error) {
-	return nil, "", errPreRFC
+	if _, err := c.Discover(ctx); err != nil {
+		return nil, "", err
+	}
+
+	req := struct {
+		Resource  string `json:"resource"`
+		CSR       string `json:"csr"`
+		NotBefore string `json:"notBefore,omitempty"`
+		NotAfter  string `json:"notAfter,omitempty"`
+	}{
+		Resource: "new-cert",
+		CSR:      base64.RawURLEncoding.EncodeToString(csr),
+	}
+	now := timeNow()
+	req.NotBefore = now.Format(time.RFC3339)
+	if exp > 0 {
+		req.NotAfter = now.Add(exp).Format(time.RFC3339)
+	}
+
+	res, err := c.post(ctx, nil, c.dir.CertURL, req, wantStatus(http.StatusCreated))
+	if err != nil {
+		return nil, "", err
+	}
+	defer res.Body.Close()
+
+	curl := res.Header.Get("Location") // cert permanent URL
+	if res.ContentLength == 0 {
+		// no cert in the body; poll until we get it
+		cert, err := c.FetchCert(ctx, curl, bundle)
+		return cert, curl, err
+	}
+	// slurp issued cert and CA chain, if requested
+	cert, err := c.responseCert(ctx, res, bundle)
+	return cert, curl, err
 }
 
 // FetchCert retrieves already issued certificate from the given url, in DER format.
@@ -236,10 +297,20 @@ func (c *Client) CreateCert(ctx context.Context, csr []byte, exp time.Duration,
 // Callers are encouraged to parse the returned value to ensure the certificate is valid
 // and has expected features.
 func (c *Client) FetchCert(ctx context.Context, url string, bundle bool) ([][]byte, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
-	return c.fetchCertRFC(ctx, url, bundle)
+	if dir.rfcCompliant() {
+		return c.fetchCertRFC(ctx, url, bundle)
+	}
+
+	// Legacy non-authenticated GET request.
+	res, err := c.get(ctx, url, wantStatus(http.StatusOK))
+	if err != nil {
+		return nil, err
+	}
+	return c.responseCert(ctx, res, bundle)
 }
 
 // RevokeCert revokes a previously issued certificate cert, provided in DER format.
@@ -249,10 +320,30 @@ func (c *Client) FetchCert(ctx context.Context, url string, bundle bool) ([][]by
 // For instance, the key pair of the certificate may be authorized.
 // If the key is nil, c.Key is used instead.
 func (c *Client) RevokeCert(ctx context.Context, key crypto.Signer, cert []byte, reason CRLReasonCode) error {
-	if _, err := c.Discover(ctx); err != nil {
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return err
 	}
-	return c.revokeCertRFC(ctx, key, cert, reason)
+	if dir.rfcCompliant() {
+		return c.revokeCertRFC(ctx, key, cert, reason)
+	}
+
+	// Legacy CA.
+	body := &struct {
+		Resource string `json:"resource"`
+		Cert     string `json:"certificate"`
+		Reason   int    `json:"reason"`
+	}{
+		Resource: "revoke-cert",
+		Cert:     base64.RawURLEncoding.EncodeToString(cert),
+		Reason:   int(reason),
+	}
+	res, err := c.post(ctx, key, dir.RevokeURL, body, wantStatus(http.StatusOK))
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	return nil
 }
 
 // AcceptTOS always returns true to indicate the acceptance of a CA's Terms of Service
@@ -275,47 +366,75 @@ func (c *Client) Register(ctx context.Context, acct *Account, prompt func(tosURL
 	if c.Key == nil {
 		return nil, errors.New("acme: client.Key must be set to Register")
 	}
-	if _, err := c.Discover(ctx); err != nil {
+
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
-	return c.registerRFC(ctx, acct, prompt)
+	if dir.rfcCompliant() {
+		return c.registerRFC(ctx, acct, prompt)
+	}
+
+	// Legacy ACME draft registration flow.
+	a, err := c.doReg(ctx, dir.RegURL, "new-reg", acct)
+	if err != nil {
+		return nil, err
+	}
+	var accept bool
+	if a.CurrentTerms != "" && a.CurrentTerms != a.AgreedTerms {
+		accept = prompt(a.CurrentTerms)
+	}
+	if accept {
+		a.AgreedTerms = a.CurrentTerms
+		a, err = c.UpdateReg(ctx, a)
+	}
+	return a, err
 }
 
 // GetReg retrieves an existing account associated with c.Key.
 //
-// The url argument is a legacy artifact of the pre-RFC 8555 API
-// and is ignored.
+// The url argument is an Account URI used with pre-RFC 8555 CAs.
+// It is ignored when interfacing with an RFC-compliant CA.
 func (c *Client) GetReg(ctx context.Context, url string) (*Account, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
-	return c.getRegRFC(ctx)
+	if dir.rfcCompliant() {
+		return c.getRegRFC(ctx)
+	}
+
+	// Legacy CA.
+	a, err := c.doReg(ctx, url, "reg", nil)
+	if err != nil {
+		return nil, err
+	}
+	a.URI = url
+	return a, nil
 }
 
 // UpdateReg updates an existing registration.
 // It returns an updated account copy. The provided account is not modified.
 //
-// The account's URI is ignored and the account URL associated with
-// c.Key is used instead.
+// When interfacing with RFC-compliant CAs, a.URI is ignored and the account URL
+// associated with c.Key is used instead.
 func (c *Client) UpdateReg(ctx context.Context, acct *Account) (*Account, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
-	return c.updateRegRFC(ctx, acct)
-}
+	if dir.rfcCompliant() {
+		return c.updateRegRFC(ctx, acct)
+	}
 
-// AccountKeyRollover attempts to transition a client's account key to a new key.
-// On success client's Key is updated which is not concurrency safe.
-// On failure an error will be returned.
-// The new key is already registered with the ACME provider if the following is true:
-//   - error is of type acme.Error
-//   - StatusCode should be 409 (Conflict)
-//   - Location header will have the KID of the associated account
-//
-// More about account key rollover can be found at
-// https://tools.ietf.org/html/rfc8555#section-7.3.5.
-func (c *Client) AccountKeyRollover(ctx context.Context, newKey crypto.Signer) error {
-	return c.accountKeyRollover(ctx, newKey)
+	// Legacy CA.
+	uri := acct.URI
+	a, err := c.doReg(ctx, uri, "reg", acct)
+	if err != nil {
+		return nil, err
+	}
+	a.URI = uri
+	return a, nil
 }
 
 // Authorize performs the initial step in the pre-authorization flow,
@@ -351,10 +470,6 @@ func (c *Client) authorize(ctx context.Context, typ, val string) (*Authorization
 	if _, err := c.Discover(ctx); err != nil {
 		return nil, err
 	}
-	if c.dir.AuthzURL == "" {
-		// Pre-Authorization is unsupported
-		return nil, errPreAuthorizationNotSupported
-	}
 
 	type authzID struct {
 		Type  string `json:"type"`
@@ -388,11 +503,17 @@ func (c *Client) authorize(ctx context.Context, typ, val string) (*Authorization
 // If a caller needs to poll an authorization until its status is final,
 // see the WaitAuthorization method.
 func (c *Client) GetAuthorization(ctx context.Context, url string) (*Authorization, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
 
-	res, err := c.postAsGet(ctx, url, wantStatus(http.StatusOK))
+	var res *http.Response
+	if dir.rfcCompliant() {
+		res, err = c.postAsGet(ctx, url, wantStatus(http.StatusOK))
+	} else {
+		res, err = c.get(ctx, url, wantStatus(http.StatusOK, http.StatusAccepted))
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -414,6 +535,7 @@ func (c *Client) GetAuthorization(ctx context.Context, url string) (*Authorizati
 //
 // It does not revoke existing certificates.
 func (c *Client) RevokeAuthorization(ctx context.Context, url string) error {
+	// Required for c.accountKID() when in RFC mode.
 	if _, err := c.Discover(ctx); err != nil {
 		return err
 	}
@@ -443,11 +565,18 @@ func (c *Client) RevokeAuthorization(ctx context.Context, url string) error {
 // In all other cases WaitAuthorization returns an error.
 // If the Status is StatusInvalid, the returned error is of type *AuthorizationError.
 func (c *Client) WaitAuthorization(ctx context.Context, url string) (*Authorization, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	// Required for c.accountKID() when in RFC mode.
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
+	getfn := c.postAsGet
+	if !dir.rfcCompliant() {
+		getfn = c.get
+	}
+
 	for {
-		res, err := c.postAsGet(ctx, url, wantStatus(http.StatusOK, http.StatusAccepted))
+		res, err := getfn(ctx, url, wantStatus(http.StatusOK, http.StatusAccepted))
 		if err != nil {
 			return nil, err
 		}
@@ -469,7 +598,7 @@ func (c *Client) WaitAuthorization(ctx context.Context, url string) (*Authorizat
 		// while waiting for a final authorization status.
 		d := retryAfter(res.Header.Get("Retry-After"))
 		if d == 0 {
-			// Given that the fastest challenges TLS-ALPN and HTTP-01
+			// Given that the fastest challenges TLS-SNI and HTTP-01
 			// require a CA to make at least 1 network round trip
 			// and most likely persist a challenge state,
 			// this default delay seems reasonable.
@@ -490,11 +619,17 @@ func (c *Client) WaitAuthorization(ctx context.Context, url string) (*Authorizat
 //
 // A client typically polls a challenge status using this method.
 func (c *Client) GetChallenge(ctx context.Context, url string) (*Challenge, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	// Required for c.accountKID() when in RFC mode.
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
 
-	res, err := c.postAsGet(ctx, url, wantStatus(http.StatusOK, http.StatusAccepted))
+	getfn := c.postAsGet
+	if !dir.rfcCompliant() {
+		getfn = c.get
+	}
+	res, err := getfn(ctx, url, wantStatus(http.StatusOK, http.StatusAccepted))
 	if err != nil {
 		return nil, err
 	}
@@ -512,15 +647,29 @@ func (c *Client) GetChallenge(ctx context.Context, url string) (*Challenge, erro
 //
 // The server will then perform the validation asynchronously.
 func (c *Client) Accept(ctx context.Context, chal *Challenge) (*Challenge, error) {
-	if _, err := c.Discover(ctx); err != nil {
+	// Required for c.accountKID() when in RFC mode.
+	dir, err := c.Discover(ctx)
+	if err != nil {
 		return nil, err
 	}
 
-	payload := json.RawMessage("{}")
-	if len(chal.Payload) != 0 {
-		payload = chal.Payload
+	var req interface{} = json.RawMessage("{}") // RFC-compliant CA
+	if !dir.rfcCompliant() {
+		auth, err := keyAuth(c.Key.Public(), chal.Token)
+		if err != nil {
+			return nil, err
+		}
+		req = struct {
+			Resource string `json:"resource"`
+			Type     string `json:"type"`
+			Auth     string `json:"keyAuthorization"`
+		}{
+			Resource: "challenge",
+			Type:     chal.Type,
+			Auth:     auth,
+		}
 	}
-	res, err := c.post(ctx, nil, chal.URI, payload, wantStatus(
+	res, err := c.post(ctx, nil, chal.URI, req, wantStatus(
 		http.StatusOK,       // according to the spec
 		http.StatusAccepted, // Let's Encrypt: see https://goo.gl/WsJ7VT (acme-divergences.md)
 	))
@@ -570,21 +719,44 @@ func (c *Client) HTTP01ChallengePath(token string) string {
 }
 
 // TLSSNI01ChallengeCert creates a certificate for TLS-SNI-01 challenge response.
-// Always returns an error.
 //
-// Deprecated: This challenge type was only present in pre-standardized ACME
-// protocol drafts and is insecure for use in shared hosting environments.
-func (c *Client) TLSSNI01ChallengeCert(token string, opt ...CertOption) (tls.Certificate, string, error) {
-	return tls.Certificate{}, "", errPreRFC
+// Deprecated: This challenge type is unused in both draft-02 and RFC versions of ACME spec.
+func (c *Client) TLSSNI01ChallengeCert(token string, opt ...CertOption) (cert tls.Certificate, name string, err error) {
+	ka, err := keyAuth(c.Key.Public(), token)
+	if err != nil {
+		return tls.Certificate{}, "", err
+	}
+	b := sha256.Sum256([]byte(ka))
+	h := hex.EncodeToString(b[:])
+	name = fmt.Sprintf("%s.%s.acme.invalid", h[:32], h[32:])
+	cert, err = tlsChallengeCert([]string{name}, opt)
+	if err != nil {
+		return tls.Certificate{}, "", err
+	}
+	return cert, name, nil
 }
 
 // TLSSNI02ChallengeCert creates a certificate for TLS-SNI-02 challenge response.
-// Always returns an error.
 //
-// Deprecated: This challenge type was only present in pre-standardized ACME
-// protocol drafts and is insecure for use in shared hosting environments.
-func (c *Client) TLSSNI02ChallengeCert(token string, opt ...CertOption) (tls.Certificate, string, error) {
-	return tls.Certificate{}, "", errPreRFC
+// Deprecated: This challenge type is unused in both draft-02 and RFC versions of ACME spec.
+func (c *Client) TLSSNI02ChallengeCert(token string, opt ...CertOption) (cert tls.Certificate, name string, err error) {
+	b := sha256.Sum256([]byte(token))
+	h := hex.EncodeToString(b[:])
+	sanA := fmt.Sprintf("%s.%s.token.acme.invalid", h[:32], h[32:])
+
+	ka, err := keyAuth(c.Key.Public(), token)
+	if err != nil {
+		return tls.Certificate{}, "", err
+	}
+	b = sha256.Sum256([]byte(ka))
+	h = hex.EncodeToString(b[:])
+	sanB := fmt.Sprintf("%s.%s.ka.acme.invalid", h[:32], h[32:])
+
+	cert, err = tlsChallengeCert([]string{sanA, sanB}, opt)
+	if err != nil {
+		return tls.Certificate{}, "", err
+	}
+	return cert, sanA, nil
 }
 
 // TLSALPN01ChallengeCert creates a certificate for TLS-ALPN-01 challenge response.
@@ -633,6 +805,63 @@ func (c *Client) TLSALPN01ChallengeCert(token, domain string, opt ...CertOption)
 	return tlsChallengeCert([]string{domain}, newOpt)
 }
 
+// doReg sends all types of registration requests the old way (pre-RFC world).
+// The type of request is identified by typ argument, which is a "resource"
+// in the ACME spec terms.
+//
+// A non-nil acct argument indicates whether the intention is to mutate data
+// of the Account. Only Contact and Agreement of its fields are used
+// in such cases.
+func (c *Client) doReg(ctx context.Context, url string, typ string, acct *Account) (*Account, error) {
+	req := struct {
+		Resource  string   `json:"resource"`
+		Contact   []string `json:"contact,omitempty"`
+		Agreement string   `json:"agreement,omitempty"`
+	}{
+		Resource: typ,
+	}
+	if acct != nil {
+		req.Contact = acct.Contact
+		req.Agreement = acct.AgreedTerms
+	}
+	res, err := c.post(ctx, nil, url, req, wantStatus(
+		http.StatusOK,       // updates and deletes
+		http.StatusCreated,  // new account creation
+		http.StatusAccepted, // Let's Encrypt divergent implementation
+	))
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	var v struct {
+		Contact        []string
+		Agreement      string
+		Authorizations string
+		Certificates   string
+	}
+	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
+		return nil, fmt.Errorf("acme: invalid response: %v", err)
+	}
+	var tos string
+	if v := linkHeader(res.Header, "terms-of-service"); len(v) > 0 {
+		tos = v[0]
+	}
+	var authz string
+	if v := linkHeader(res.Header, "next"); len(v) > 0 {
+		authz = v[0]
+	}
+	return &Account{
+		URI:            res.Header.Get("Location"),
+		Contact:        v.Contact,
+		AgreedTerms:    v.Agreement,
+		CurrentTerms:   tos,
+		Authz:          authz,
+		Authorizations: v.Authorizations,
+		Certificates:   v.Certificates,
+	}, nil
+}
+
 // popNonce returns a nonce value previously stored with c.addNonce
 // or fetches a fresh one from c.dir.NonceURL.
 // If NonceURL is empty, it first tries c.directoryURL() and, failing that,
@@ -707,6 +936,78 @@ func nonceFromHeader(h http.Header) string {
 	return h.Get("Replay-Nonce")
 }
 
+func (c *Client) responseCert(ctx context.Context, res *http.Response, bundle bool) ([][]byte, error) {
+	b, err := ioutil.ReadAll(io.LimitReader(res.Body, maxCertSize+1))
+	if err != nil {
+		return nil, fmt.Errorf("acme: response stream: %v", err)
+	}
+	if len(b) > maxCertSize {
+		return nil, errors.New("acme: certificate is too big")
+	}
+	cert := [][]byte{b}
+	if !bundle {
+		return cert, nil
+	}
+
+	// Append CA chain cert(s).
+	// At least one is required according to the spec:
+	// https://tools.ietf.org/html/draft-ietf-acme-acme-03#section-6.3.1
+	up := linkHeader(res.Header, "up")
+	if len(up) == 0 {
+		return nil, errors.New("acme: rel=up link not found")
+	}
+	if len(up) > maxChainLen {
+		return nil, errors.New("acme: rel=up link is too large")
+	}
+	for _, url := range up {
+		cc, err := c.chainCert(ctx, url, 0)
+		if err != nil {
+			return nil, err
+		}
+		cert = append(cert, cc...)
+	}
+	return cert, nil
+}
+
+// chainCert fetches CA certificate chain recursively by following "up" links.
+// Each recursive call increments the depth by 1, resulting in an error
+// if the recursion level reaches maxChainLen.
+//
+// First chainCert call starts with depth of 0.
+func (c *Client) chainCert(ctx context.Context, url string, depth int) ([][]byte, error) {
+	if depth >= maxChainLen {
+		return nil, errors.New("acme: certificate chain is too deep")
+	}
+
+	res, err := c.get(ctx, url, wantStatus(http.StatusOK))
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+	b, err := ioutil.ReadAll(io.LimitReader(res.Body, maxCertSize+1))
+	if err != nil {
+		return nil, err
+	}
+	if len(b) > maxCertSize {
+		return nil, errors.New("acme: certificate is too big")
+	}
+	chain := [][]byte{b}
+
+	uplink := linkHeader(res.Header, "up")
+	if len(uplink) > maxChainLen {
+		return nil, errors.New("acme: certificate chain is too large")
+	}
+	for _, up := range uplink {
+		cc, err := c.chainCert(ctx, up, depth+1)
+		if err != nil {
+			return nil, err
+		}
+		chain = append(chain, cc...)
+	}
+
+	return chain, nil
+}
+
 // linkHeader returns URI-Reference values of all Link headers
 // with relation-type rel.
 // See https://tools.ietf.org/html/rfc5988#section-5 for details.
@@ -748,7 +1049,7 @@ func defaultTLSChallengeCertTemplate() *x509.Certificate {
 	}
 }
 
-// tlsChallengeCert creates a temporary certificate for TLS-ALPN challenges
+// tlsChallengeCert creates a temporary certificate for TLS-SNI challenges
 // with the given SANs and auto-generated public/private key pair.
 // The Subject Common Name is set to the first SAN to aid debugging.
 // To create a cert with a custom key pair, specify WithKey option.
@@ -791,5 +1092,11 @@ func tlsChallengeCert(san []string, opt []CertOption) (tls.Certificate, error) {
 	}, nil
 }
 
-// timeNow is time.Now, except in tests which can mess with it.
+// encodePEM returns b encoded as PEM with block of type typ.
+func encodePEM(typ string, b []byte) []byte {
+	pb := &pem.Block{Type: typ, Bytes: b}
+	return pem.EncodeToMemory(pb)
+}
+
+// timeNow is useful for testing for fixed current time.
 var timeNow = time.Now
diff --git a/vendor/golang.org/x/crypto/acme/autocert/autocert.go b/vendor/golang.org/x/crypto/acme/autocert/autocert.go
index ccd5b7e..c7fbc54 100644
--- a/vendor/golang.org/x/crypto/acme/autocert/autocert.go
+++ b/vendor/golang.org/x/crypto/acme/autocert/autocert.go
@@ -47,8 +47,6 @@ var createCertRetryAfter = time.Minute
 // pseudoRand is safe for concurrent use.
 var pseudoRand *lockedMathRand
 
-var errPreRFC = errors.New("autocert: ACME server doesn't support RFC 8555")
-
 func init() {
 	src := mathrand.NewSource(time.Now().UnixNano())
 	pseudoRand = &lockedMathRand{rnd: mathrand.New(src)}
@@ -170,11 +168,6 @@ type Manager struct {
 	// in the template's ExtraExtensions field as is.
 	ExtraExtensions []pkix.Extension
 
-	// ExternalAccountBinding optionally represents an arbitrary binding to an
-	// account of the CA to which the ACME server is tied.
-	// See RFC 8555, Section 7.3.4 for more details.
-	ExternalAccountBinding *acme.ExternalAccountBinding
-
 	clientMu sync.Mutex
 	client   *acme.Client // initialized by acmeClient method
 
@@ -292,10 +285,6 @@ func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate,
 	}
 
 	// regular domain
-	if err := m.hostPolicy()(ctx, name); err != nil {
-		return nil, err
-	}
-
 	ck := certKey{
 		domain: strings.TrimSuffix(name, "."), // golang.org/issue/18114
 		isRSA:  !supportsECDSA(hello),
@@ -309,6 +298,9 @@ func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate,
 	}
 
 	// first-time
+	if err := m.hostPolicy()(ctx, name); err != nil {
+		return nil, err
+	}
 	cert, err = m.createCert(ctx, ck)
 	if err != nil {
 		return nil, err
@@ -464,7 +456,7 @@ func (m *Manager) cert(ctx context.Context, ck certKey) (*tls.Certificate, error
 		leaf: cert.Leaf,
 	}
 	m.state[ck] = s
-	m.startRenew(ck, s.key, s.leaf.NotAfter)
+	go m.renew(ck, s.key, s.leaf.NotAfter)
 	return cert, nil
 }
 
@@ -590,9 +582,8 @@ func (m *Manager) createCert(ctx context.Context, ck certKey) (*tls.Certificate,
 	if err != nil {
 		// Remove the failed state after some time,
 		// making the manager call createCert again on the following TLS hello.
-		didRemove := testDidRemoveState // The lifetime of this timer is untracked, so copy mutable local state to avoid races.
 		time.AfterFunc(createCertRetryAfter, func() {
-			defer didRemove(ck)
+			defer testDidRemoveState(ck)
 			m.stateMu.Lock()
 			defer m.stateMu.Unlock()
 			// Verify the state hasn't changed and it's still invalid
@@ -610,7 +601,7 @@ func (m *Manager) createCert(ctx context.Context, ck certKey) (*tls.Certificate,
 	}
 	state.cert = der
 	state.leaf = leaf
-	m.startRenew(ck, state.key, state.leaf.NotAfter)
+	go m.renew(ck, state.key, state.leaf.NotAfter)
 	return state.tlscert()
 }
 
@@ -667,19 +658,31 @@ func (m *Manager) authorizedCert(ctx context.Context, key crypto.Signer, ck cert
 	if err != nil {
 		return nil, nil, err
 	}
-	if dir.OrderURL == "" {
-		return nil, nil, errPreRFC
-	}
 
-	o, err := m.verifyRFC(ctx, client, ck.domain)
-	if err != nil {
-		return nil, nil, err
+	var chain [][]byte
+	switch {
+	// Pre-RFC legacy CA.
+	case dir.OrderURL == "":
+		if err := m.verify(ctx, client, ck.domain); err != nil {
+			return nil, nil, err
+		}
+		der, _, err := client.CreateCert(ctx, csr, 0, true)
+		if err != nil {
+			return nil, nil, err
+		}
+		chain = der
+	// RFC 8555 compliant CA.
+	default:
+		o, err := m.verifyRFC(ctx, client, ck.domain)
+		if err != nil {
+			return nil, nil, err
+		}
+		der, _, err := client.CreateOrderCert(ctx, o.FinalizeURL, csr, true)
+		if err != nil {
+			return nil, nil, err
+		}
+		chain = der
 	}
-	chain, _, err := client.CreateOrderCert(ctx, o.FinalizeURL, csr, true)
-	if err != nil {
-		return nil, nil, err
-	}
-
 	leaf, err = validCert(ck, chain, key, m.now())
 	if err != nil {
 		return nil, nil, err
@@ -687,6 +690,69 @@ func (m *Manager) authorizedCert(ctx context.Context, key crypto.Signer, ck cert
 	return chain, leaf, nil
 }
 
+// verify runs the identifier (domain) pre-authorization flow for legacy CAs
+// using each applicable ACME challenge type.
+func (m *Manager) verify(ctx context.Context, client *acme.Client, domain string) error {
+	// Remove all hanging authorizations to reduce rate limit quotas
+	// after we're done.
+	var authzURLs []string
+	defer func() {
+		go m.deactivatePendingAuthz(authzURLs)
+	}()
+
+	// errs accumulates challenge failure errors, printed if all fail
+	errs := make(map[*acme.Challenge]error)
+	challengeTypes := m.supportedChallengeTypes()
+	var nextTyp int // challengeType index of the next challenge type to try
+	for {
+		// Start domain authorization and get the challenge.
+		authz, err := client.Authorize(ctx, domain)
+		if err != nil {
+			return err
+		}
+		authzURLs = append(authzURLs, authz.URI)
+		// No point in accepting challenges if the authorization status
+		// is in a final state.
+		switch authz.Status {
+		case acme.StatusValid:
+			return nil // already authorized
+		case acme.StatusInvalid:
+			return fmt.Errorf("acme/autocert: invalid authorization %q", authz.URI)
+		}
+
+		// Pick the next preferred challenge.
+		var chal *acme.Challenge
+		for chal == nil && nextTyp < len(challengeTypes) {
+			chal = pickChallenge(challengeTypes[nextTyp], authz.Challenges)
+			nextTyp++
+		}
+		if chal == nil {
+			errorMsg := fmt.Sprintf("acme/autocert: unable to authorize %q", domain)
+			for chal, err := range errs {
+				errorMsg += fmt.Sprintf("; challenge %q failed with error: %v", chal.Type, err)
+			}
+			return errors.New(errorMsg)
+		}
+		cleanup, err := m.fulfill(ctx, client, chal, domain)
+		if err != nil {
+			errs[chal] = err
+			continue
+		}
+		defer cleanup()
+		if _, err := client.Accept(ctx, chal); err != nil {
+			errs[chal] = err
+			continue
+		}
+
+		// A challenge is fulfilled and accepted: wait for the CA to validate.
+		if _, err := client.WaitAuthorization(ctx, authz.URI); err != nil {
+			errs[chal] = err
+			continue
+		}
+		return nil
+	}
+}
+
 // verifyRFC runs the identifier (domain) order-based authorization flow for RFC compliant CAs
 // using each applicable ACME challenge type.
 func (m *Manager) verifyRFC(ctx context.Context, client *acme.Client, domain string) (*acme.Order, error) {
@@ -900,7 +966,7 @@ func httpTokenCacheKey(tokenPath string) string {
 	return path.Base(tokenPath) + "+http-01"
 }
 
-// startRenew starts a cert renewal timer loop, one per domain.
+// renew starts a cert renewal timer loop, one per domain.
 //
 // The loop is scheduled in two cases:
 // - a cert was fetched from cache for the first time (wasn't in m.state)
@@ -908,7 +974,7 @@ func httpTokenCacheKey(tokenPath string) string {
 //
 // The key argument is a certificate private key.
 // The exp argument is the cert expiration time (NotAfter).
-func (m *Manager) startRenew(ck certKey, key crypto.Signer, exp time.Time) {
+func (m *Manager) renew(ck certKey, key crypto.Signer, exp time.Time) {
 	m.renewalMu.Lock()
 	defer m.renewalMu.Unlock()
 	if m.renewal[ck] != nil {
@@ -1002,7 +1068,7 @@ func (m *Manager) acmeClient(ctx context.Context) (*acme.Client, error) {
 	if m.Email != "" {
 		contact = []string{"mailto:" + m.Email}
 	}
-	a := &acme.Account{Contact: contact, ExternalAccountBinding: m.ExternalAccountBinding}
+	a := &acme.Account{Contact: contact}
 	_, err := client.Register(ctx, a, m.Prompt)
 	if err == nil || isAccountAlreadyExist(err) {
 		m.client = client
@@ -1134,10 +1200,6 @@ func validCert(ck certKey, der [][]byte, key crypto.Signer, now time.Time) (leaf
 	if err := leaf.VerifyHostname(ck.domain); err != nil {
 		return nil, err
 	}
-	// renew certificates revoked by Let's Encrypt in January 2022
-	if isRevokedLetsEncrypt(leaf) {
-		return nil, errors.New("acme/autocert: certificate was probably revoked by Let's Encrypt")
-	}
 	// ensure the leaf corresponds to the private key and matches the certKey type
 	switch pub := leaf.PublicKey.(type) {
 	case *rsa.PublicKey:
@@ -1168,18 +1230,6 @@ func validCert(ck certKey, der [][]byte, key crypto.Signer, now time.Time) (leaf
 	return leaf, nil
 }
 
-// https://community.letsencrypt.org/t/2022-01-25-issue-with-tls-alpn-01-validation-method/170450
-var letsEncryptFixDeployTime = time.Date(2022, time.January, 26, 00, 48, 0, 0, time.UTC)
-
-// isRevokedLetsEncrypt returns whether the certificate is likely to be part of
-// a batch of certificates revoked by Let's Encrypt in January 2022. This check
-// can be safely removed from May 2022.
-func isRevokedLetsEncrypt(cert *x509.Certificate) bool {
-	O := cert.Issuer.Organization
-	return len(O) == 1 && O[0] == "Let's Encrypt" &&
-		cert.NotBefore.Before(letsEncryptFixDeployTime)
-}
-
 type lockedMathRand struct {
 	sync.Mutex
 	rnd *mathrand.Rand
diff --git a/vendor/golang.org/x/crypto/acme/autocert/cache.go b/vendor/golang.org/x/crypto/acme/autocert/cache.go
index 758ab12..03f6302 100644
--- a/vendor/golang.org/x/crypto/acme/autocert/cache.go
+++ b/vendor/golang.org/x/crypto/acme/autocert/cache.go
@@ -7,6 +7,7 @@ package autocert
 import (
 	"context"
 	"errors"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -40,14 +41,14 @@ type DirCache string
 
 // Get reads a certificate data from the specified file name.
 func (d DirCache) Get(ctx context.Context, name string) ([]byte, error) {
-	name = filepath.Join(string(d), filepath.Clean("/"+name))
+	name = filepath.Join(string(d), name)
 	var (
 		data []byte
 		err  error
 		done = make(chan struct{})
 	)
 	go func() {
-		data, err = os.ReadFile(name)
+		data, err = ioutil.ReadFile(name)
 		close(done)
 	}()
 	select {
@@ -81,7 +82,7 @@ func (d DirCache) Put(ctx context.Context, name string, data []byte) error {
 		case <-ctx.Done():
 			// Don't overwrite the file if the context was canceled.
 		default:
-			newName := filepath.Join(string(d), filepath.Clean("/"+name))
+			newName := filepath.Join(string(d), name)
 			err = os.Rename(tmp, newName)
 		}
 	}()
@@ -95,7 +96,7 @@ func (d DirCache) Put(ctx context.Context, name string, data []byte) error {
 
 // Delete removes the specified file name.
 func (d DirCache) Delete(ctx context.Context, name string) error {
-	name = filepath.Join(string(d), filepath.Clean("/"+name))
+	name = filepath.Join(string(d), name)
 	var (
 		err  error
 		done = make(chan struct{})
@@ -118,7 +119,7 @@ func (d DirCache) Delete(ctx context.Context, name string) error {
 // writeTempFile writes b to a temporary file, closes the file and returns its path.
 func (d DirCache) writeTempFile(prefix string, b []byte) (name string, reterr error) {
 	// TempFile uses 0600 permissions
-	f, err := os.CreateTemp(string(d), prefix)
+	f, err := ioutil.TempFile(string(d), prefix)
 	if err != nil {
 		return "", err
 	}
diff --git a/vendor/golang.org/x/crypto/acme/autocert/listener.go b/vendor/golang.org/x/crypto/acme/autocert/listener.go
index 460133e..cb48609 100644
--- a/vendor/golang.org/x/crypto/acme/autocert/listener.go
+++ b/vendor/golang.org/x/crypto/acme/autocert/listener.go
@@ -10,6 +10,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"runtime"
 	"time"
 )
 
@@ -19,7 +20,7 @@ import (
 //
 // It enables one-line HTTPS servers:
 //
-//	log.Fatal(http.Serve(autocert.NewListener("example.com"), handler))
+//     log.Fatal(http.Serve(autocert.NewListener("example.com"), handler))
 //
 // NewListener is a convenience function for a common configuration.
 // More complex or custom configurations can use the autocert.Manager
@@ -123,13 +124,32 @@ func (ln *listener) Close() error {
 	return ln.tcpListener.Close()
 }
 
+func homeDir() string {
+	if runtime.GOOS == "windows" {
+		return os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
+	}
+	if h := os.Getenv("HOME"); h != "" {
+		return h
+	}
+	return "/"
+}
+
 func cacheDir() string {
 	const base = "golang-autocert"
-	cache, err := os.UserCacheDir()
-	if err != nil {
-		// Fall back to the root directory.
-		cache = "/.cache"
+	switch runtime.GOOS {
+	case "darwin":
+		return filepath.Join(homeDir(), "Library", "Caches", base)
+	case "windows":
+		for _, ev := range []string{"APPDATA", "CSIDL_APPDATA", "TEMP", "TMP"} {
+			if v := os.Getenv(ev); v != "" {
+				return filepath.Join(v, base)
+			}
+		}
+		// Worst case:
+		return filepath.Join(homeDir(), base)
 	}
-
-	return filepath.Join(cache, base)
+	if xdg := os.Getenv("XDG_CACHE_HOME"); xdg != "" {
+		return filepath.Join(xdg, base)
+	}
+	return filepath.Join(homeDir(), ".cache", base)
 }
diff --git a/vendor/golang.org/x/crypto/acme/autocert/renewal.go b/vendor/golang.org/x/crypto/acme/autocert/renewal.go
index 0df7da7..665f870 100644
--- a/vendor/golang.org/x/crypto/acme/autocert/renewal.go
+++ b/vendor/golang.org/x/crypto/acme/autocert/renewal.go
@@ -21,9 +21,8 @@ type domainRenewal struct {
 	ck  certKey
 	key crypto.Signer
 
-	timerMu    sync.Mutex
-	timer      *time.Timer
-	timerClose chan struct{} // if non-nil, renew closes this channel (and nils out the timer fields) instead of running
+	timerMu sync.Mutex
+	timer   *time.Timer
 }
 
 // start starts a cert renewal timer at the time
@@ -39,28 +38,16 @@ func (dr *domainRenewal) start(exp time.Time) {
 	dr.timer = time.AfterFunc(dr.next(exp), dr.renew)
 }
 
-// stop stops the cert renewal timer and waits for any in-flight calls to renew
-// to complete. If the timer is already stopped, calling stop is a noop.
+// stop stops the cert renewal timer.
+// If the timer is already stopped, calling stop is a noop.
 func (dr *domainRenewal) stop() {
 	dr.timerMu.Lock()
 	defer dr.timerMu.Unlock()
-	for {
-		if dr.timer == nil {
-			return
-		}
-		if dr.timer.Stop() {
-			dr.timer = nil
-			return
-		} else {
-			// dr.timer fired, and we acquired dr.timerMu before the renew callback did.
-			// (We know this because otherwise the renew callback would have reset dr.timer!)
-			timerClose := make(chan struct{})
-			dr.timerClose = timerClose
-			dr.timerMu.Unlock()
-			<-timerClose
-			dr.timerMu.Lock()
-		}
+	if dr.timer == nil {
+		return
 	}
+	dr.timer.Stop()
+	dr.timer = nil
 }
 
 // renew is called periodically by a timer.
@@ -68,9 +55,7 @@ func (dr *domainRenewal) stop() {
 func (dr *domainRenewal) renew() {
 	dr.timerMu.Lock()
 	defer dr.timerMu.Unlock()
-	if dr.timerClose != nil {
-		close(dr.timerClose)
-		dr.timer, dr.timerClose = nil, nil
+	if dr.timer == nil {
 		return
 	}
 
@@ -82,8 +67,8 @@ func (dr *domainRenewal) renew() {
 		next = renewJitter / 2
 		next += time.Duration(pseudoRand.int63n(int64(next)))
 	}
-	testDidRenewLoop(next, err)
 	dr.timer = time.AfterFunc(next, dr.renew)
+	testDidRenewLoop(next, err)
 }
 
 // updateState locks and replaces the relevant Manager.state item with the given
diff --git a/vendor/golang.org/x/crypto/acme/http.go b/vendor/golang.org/x/crypto/acme/http.go
index 8f29df5..2b4c1a1 100644
--- a/vendor/golang.org/x/crypto/acme/http.go
+++ b/vendor/golang.org/x/crypto/acme/http.go
@@ -12,10 +12,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"math/big"
 	"net/http"
-	"runtime/debug"
 	"strconv"
 	"strings"
 	"time"
@@ -66,7 +65,7 @@ func (c *Client) retryTimer() *retryTimer {
 // The n argument is always bounded between 1 and 30.
 // The returned value is always greater than 0.
 func defaultBackoff(n int, r *http.Request, res *http.Response) time.Duration {
-	const maxVal = 10 * time.Second
+	const max = 10 * time.Second
 	var jitter time.Duration
 	if x, err := rand.Int(rand.Reader, big.NewInt(1000)); err == nil {
 		// Set the minimum to 1ms to avoid a case where
@@ -86,7 +85,10 @@ func defaultBackoff(n int, r *http.Request, res *http.Response) time.Duration {
 		n = 30
 	}
 	d := time.Duration(1<<uint(n-1))*time.Second + jitter
-	return min(d, maxVal)
+	if d > max {
+		return max
+	}
+	return d
 }
 
 // retryAfter parses a Retry-After HTTP header value,
@@ -154,7 +156,7 @@ func (c *Client) get(ctx context.Context, url string, ok resOkay) (*http.Respons
 	}
 }
 
-// postAsGet is POST-as-GET, a replacement for GET in RFC 8555
+// postAsGet is POST-as-GET, a replacement for GET in RFC8555
 // as described in https://tools.ietf.org/html/rfc8555#section-6.3.
 // It makes a POST request in KID form with zero JWS payload.
 // See nopayload doc comments in jws.go.
@@ -269,27 +271,9 @@ func (c *Client) httpClient() *http.Client {
 }
 
 // packageVersion is the version of the module that contains this package, for
-// sending as part of the User-Agent header.
+// sending as part of the User-Agent header. It's set in version_go112.go.
 var packageVersion string
 
-func init() {
-	// Set packageVersion if the binary was built in modules mode and x/crypto
-	// was not replaced with a different module.
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return
-	}
-	for _, m := range info.Deps {
-		if m.Path != "golang.org/x/crypto" {
-			continue
-		}
-		if m.Replace == nil {
-			packageVersion = m.Version
-		}
-		break
-	}
-}
-
 // userAgent returns the User-Agent header value. It includes the package name,
 // the module version (if available), and the c.UserAgent value (if set).
 func (c *Client) userAgent() string {
@@ -326,7 +310,7 @@ func isRetriable(code int) bool {
 func responseError(resp *http.Response) error {
 	// don't care if ReadAll returns an error:
 	// json.Unmarshal will fail in that case anyway
-	b, _ := io.ReadAll(resp.Body)
+	b, _ := ioutil.ReadAll(resp.Body)
 	e := &wireError{Status: resp.StatusCode}
 	if err := json.Unmarshal(b, e); err != nil {
 		// this is not a regular error response:
diff --git a/vendor/golang.org/x/crypto/acme/jws.go b/vendor/golang.org/x/crypto/acme/jws.go
index 6850275..8c3ecce 100644
--- a/vendor/golang.org/x/crypto/acme/jws.go
+++ b/vendor/golang.org/x/crypto/acme/jws.go
@@ -20,12 +20,12 @@ import (
 	"math/big"
 )
 
-// KeyID is the account key identity provided by a CA during registration.
-type KeyID string
+// keyID is the account identity provided by a CA during registration.
+type keyID string
 
 // noKeyID indicates that jwsEncodeJSON should compute and use JWK instead of a KID.
 // See jwsEncodeJSON for details.
-const noKeyID = KeyID("")
+const noKeyID = keyID("")
 
 // noPayload indicates jwsEncodeJSON will encode zero-length octet string
 // in a JWS request. This is called POST-as-GET in RFC 8555 and is used to make
@@ -33,10 +33,6 @@ const noKeyID = KeyID("")
 // See https://tools.ietf.org/html/rfc8555#section-6.3 for more details.
 const noPayload = ""
 
-// noNonce indicates that the nonce should be omitted from the protected header.
-// See jwsEncodeJSON for details.
-const noNonce = ""
-
 // jsonWebSignature can be easily serialized into a JWS following
 // https://tools.ietf.org/html/rfc7515#section-3.2.
 type jsonWebSignature struct {
@@ -47,56 +43,32 @@ type jsonWebSignature struct {
 
 // jwsEncodeJSON signs claimset using provided key and a nonce.
 // The result is serialized in JSON format containing either kid or jwk
-// fields based on the provided KeyID value.
+// fields based on the provided keyID value.
 //
-// The claimset is marshalled using json.Marshal unless it is a string.
-// In which case it is inserted directly into the message.
-//
-// If kid is non-empty, its quoted value is inserted in the protected header
+// If kid is non-empty, its quoted value is inserted in the protected head
 // as "kid" field value. Otherwise, JWK is computed using jwkEncode and inserted
 // as "jwk" field value. The "jwk" and "kid" fields are mutually exclusive.
 //
-// If nonce is non-empty, its quoted value is inserted in the protected header.
-//
 // See https://tools.ietf.org/html/rfc7515#section-7.
-func jwsEncodeJSON(claimset interface{}, key crypto.Signer, kid KeyID, nonce, url string) ([]byte, error) {
-	if key == nil {
-		return nil, errors.New("nil key")
-	}
+func jwsEncodeJSON(claimset interface{}, key crypto.Signer, kid keyID, nonce, url string) ([]byte, error) {
 	alg, sha := jwsHasher(key.Public())
 	if alg == "" || !sha.Available() {
 		return nil, ErrUnsupportedKey
 	}
-	headers := struct {
-		Alg   string          `json:"alg"`
-		KID   string          `json:"kid,omitempty"`
-		JWK   json.RawMessage `json:"jwk,omitempty"`
-		Nonce string          `json:"nonce,omitempty"`
-		URL   string          `json:"url"`
-	}{
-		Alg:   alg,
-		Nonce: nonce,
-		URL:   url,
-	}
+	var phead string
 	switch kid {
 	case noKeyID:
 		jwk, err := jwkEncode(key.Public())
 		if err != nil {
 			return nil, err
 		}
-		headers.JWK = json.RawMessage(jwk)
+		phead = fmt.Sprintf(`{"alg":%q,"jwk":%s,"nonce":%q,"url":%q}`, alg, jwk, nonce, url)
 	default:
-		headers.KID = string(kid)
+		phead = fmt.Sprintf(`{"alg":%q,"kid":%q,"nonce":%q,"url":%q}`, alg, kid, nonce, url)
 	}
-	phJSON, err := json.Marshal(headers)
-	if err != nil {
-		return nil, err
-	}
-	phead := base64.RawURLEncoding.EncodeToString(phJSON)
+	phead = base64.RawURLEncoding.EncodeToString([]byte(phead))
 	var payload string
-	if val, ok := claimset.(string); ok {
-		payload = val
-	} else {
+	if claimset != noPayload {
 		cs, err := json.Marshal(claimset)
 		if err != nil {
 			return nil, err
diff --git a/vendor/golang.org/x/crypto/acme/rfc8555.go b/vendor/golang.org/x/crypto/acme/rfc8555.go
index 3152e53..073cee5 100644
--- a/vendor/golang.org/x/crypto/acme/rfc8555.go
+++ b/vendor/golang.org/x/crypto/acme/rfc8555.go
@@ -13,6 +13,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"time"
 )
@@ -23,9 +24,6 @@ import (
 //
 // It only works with CAs implementing RFC 8555.
 func (c *Client) DeactivateReg(ctx context.Context) error {
-	if _, err := c.Discover(ctx); err != nil { // required by c.accountKID
-		return err
-	}
 	url := string(c.accountKID(ctx))
 	if url == "" {
 		return ErrNoAccount
@@ -80,7 +78,7 @@ func (c *Client) registerRFC(ctx context.Context, acct *Account, prompt func(tos
 	}
 	// Cache Account URL even if we return an error to the caller.
 	// It is by all means a valid and usable "kid" value for future requests.
-	c.KID = KeyID(a.URI)
+	c.kid = keyID(a.URI)
 	if res.StatusCode == http.StatusOK {
 		return nil, ErrAccountAlreadyExists
 	}
@@ -117,7 +115,7 @@ func (c *Client) updateRegRFC(ctx context.Context, a *Account) (*Account, error)
 	return responseAccount(res)
 }
 
-// getRegRFC is equivalent to c.GetReg but for CAs implementing RFC 8555.
+// getGegRFC is equivalent to c.GetReg but for CAs implementing RFC 8555.
 // It expects c.Discover to have already been called.
 func (c *Client) getRegRFC(ctx context.Context) (*Account, error) {
 	req := json.RawMessage(`{"onlyReturnExisting": true}`)
@@ -150,42 +148,6 @@ func responseAccount(res *http.Response) (*Account, error) {
 	}, nil
 }
 
-// accountKeyRollover attempts to perform account key rollover.
-// On success it will change client.Key to the new key.
-func (c *Client) accountKeyRollover(ctx context.Context, newKey crypto.Signer) error {
-	dir, err := c.Discover(ctx) // Also required by c.accountKID
-	if err != nil {
-		return err
-	}
-	kid := c.accountKID(ctx)
-	if kid == noKeyID {
-		return ErrNoAccount
-	}
-	oldKey, err := jwkEncode(c.Key.Public())
-	if err != nil {
-		return err
-	}
-	payload := struct {
-		Account string          `json:"account"`
-		OldKey  json.RawMessage `json:"oldKey"`
-	}{
-		Account: string(kid),
-		OldKey:  json.RawMessage(oldKey),
-	}
-	inner, err := jwsEncodeJSON(payload, newKey, noKeyID, noNonce, dir.KeyChangeURL)
-	if err != nil {
-		return err
-	}
-
-	res, err := c.post(ctx, nil, dir.KeyChangeURL, base64.RawURLEncoding.EncodeToString(inner), wantStatus(http.StatusOK))
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	c.Key = newKey
-	return nil
-}
-
 // AuthorizeOrder initiates the order-based application for certificate issuance,
 // as opposed to pre-authorization in Authorize.
 // It is only supported by CAs implementing RFC 8555.
@@ -389,7 +351,7 @@ func (c *Client) fetchCertRFC(ctx context.Context, url string, bundle bool) ([][
 	// Get all the bytes up to a sane maximum.
 	// Account very roughly for base64 overhead.
 	const max = maxCertChainSize + maxCertChainSize/33
-	b, err := io.ReadAll(io.LimitReader(res.Body, max+1))
+	b, err := ioutil.ReadAll(io.LimitReader(res.Body, max+1))
 	if err != nil {
 		return nil, fmt.Errorf("acme: fetch cert response stream: %v", err)
 	}
@@ -448,29 +410,3 @@ func isAlreadyRevoked(err error) bool {
 	e, ok := err.(*Error)
 	return ok && e.ProblemType == "urn:ietf:params:acme:error:alreadyRevoked"
 }
-
-// ListCertAlternates retrieves any alternate certificate chain URLs for the
-// given certificate chain URL. These alternate URLs can be passed to FetchCert
-// in order to retrieve the alternate certificate chains.
-//
-// If there are no alternate issuer certificate chains, a nil slice will be
-// returned.
-func (c *Client) ListCertAlternates(ctx context.Context, url string) ([]string, error) {
-	if _, err := c.Discover(ctx); err != nil { // required by c.accountKID
-		return nil, err
-	}
-
-	res, err := c.postAsGet(ctx, url, wantStatus(http.StatusOK))
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	// We don't need the body but we need to discard it so we don't end up
-	// preventing keep-alive
-	if _, err := io.Copy(io.Discard, res.Body); err != nil {
-		return nil, fmt.Errorf("acme: cert alternates response stream: %v", err)
-	}
-	alts := linkHeader(res.Header, "alternate")
-	return alts, nil
-}
diff --git a/vendor/golang.org/x/crypto/acme/types.go b/vendor/golang.org/x/crypto/acme/types.go
index 640223c..eaae452 100644
--- a/vendor/golang.org/x/crypto/acme/types.go
+++ b/vendor/golang.org/x/crypto/acme/types.go
@@ -7,7 +7,6 @@ package acme
 import (
 	"crypto"
 	"crypto/x509"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -56,10 +55,6 @@ var (
 
 	// ErrNoAccount indicates that the Client's key has not been registered with the CA.
 	ErrNoAccount = errors.New("acme: account does not exist")
-
-	// errPreAuthorizationNotSupported indicates that the server does not
-	// support pre-authorization of identifiers.
-	errPreAuthorizationNotSupported = errors.New("acme: pre-authorization is not supported")
 )
 
 // A Subproblem describes an ACME subproblem as reported in an Error.
@@ -293,7 +288,7 @@ type Directory struct {
 	// KeyChangeURL allows to perform account key rollover flow.
 	KeyChangeURL string
 
-	// Terms is a URI identifying the current terms of service.
+	// Term is a URI identifying the current terms of service.
 	Terms string
 
 	// Website is an HTTP or HTTPS URL locating a website
@@ -302,7 +297,7 @@ type Directory struct {
 
 	// CAA consists of lowercase hostname elements, which the ACME server
 	// recognises as referring to itself for the purposes of CAA record validation
-	// as defined in RFC 6844.
+	// as defined in RFC6844.
 	CAA []string
 
 	// ExternalAccountRequired indicates that the CA requires for all account-related
@@ -310,6 +305,14 @@ type Directory struct {
 	ExternalAccountRequired bool
 }
 
+// rfcCompliant reports whether the ACME server implements RFC 8555.
+// Note that some servers may have incomplete RFC implementation
+// even if the returned value is true.
+// If rfcCompliant reports false, the server most likely implements draft-02.
+func (d *Directory) rfcCompliant() bool {
+	return d.OrderURL != ""
+}
+
 // Order represents a client's request for a certificate.
 // It tracks the request flow progress through to issuance.
 type Order struct {
@@ -445,7 +448,7 @@ func DomainIDs(names ...string) []AuthzID {
 
 // IPIDs creates a slice of AuthzID with "ip" identifier type.
 // Each element of addr is textual form of an address as defined
-// in RFC 1123 Section 2.1 for IPv4 and in RFC 5952 Section 4 for IPv6.
+// in RFC1123 Section 2.1 for IPv4 and in RFC5952 Section 4 for IPv6.
 func IPIDs(addr ...string) []AuthzID {
 	a := make([]AuthzID, len(addr))
 	for i, v := range addr {
@@ -532,16 +535,6 @@ type Challenge struct {
 	// when this challenge was used.
 	// The type of a non-nil value is *Error.
 	Error error
-
-	// Payload is the JSON-formatted payload that the client sends
-	// to the server to indicate it is ready to respond to the challenge.
-	// When unset, it defaults to an empty JSON object: {}.
-	// For most challenges, the client must not set Payload,
-	// see https://tools.ietf.org/html/rfc8555#section-7.5.1.
-	// Payload is used only for newer challenges (such as "device-attest-01")
-	// where the client must send additional data for the server to validate
-	// the challenge.
-	Payload json.RawMessage
 }
 
 // wireChallenge is ACME JSON challenge representation.
diff --git a/vendor/golang.org/x/crypto/acme/version_go112.go b/vendor/golang.org/x/crypto/acme/version_go112.go
new file mode 100644
index 0000000..b9efdb5
--- /dev/null
+++ b/vendor/golang.org/x/crypto/acme/version_go112.go
@@ -0,0 +1,28 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.12
+// +build go1.12
+
+package acme
+
+import "runtime/debug"
+
+func init() {
+	// Set packageVersion if the binary was built in modules mode and x/crypto
+	// was not replaced with a different module.
+	info, ok := debug.ReadBuildInfo()
+	if !ok {
+		return
+	}
+	for _, m := range info.Deps {
+		if m.Path != "golang.org/x/crypto" {
+			continue
+		}
+		if m.Replace == nil {
+			packageVersion = m.Version
+		}
+		break
+	}
+}
diff --git a/vendor/golang.org/x/crypto/ed25519/ed25519.go b/vendor/golang.org/x/crypto/ed25519/ed25519.go
new file mode 100644
index 0000000..71ad917
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/ed25519.go
@@ -0,0 +1,223 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// In Go 1.13, the ed25519 package was promoted to the standard library as
+// crypto/ed25519, and this package became a wrapper for the standard library one.
+//
+//go:build !go1.13
+// +build !go1.13
+
+// Package ed25519 implements the Ed25519 signature algorithm. See
+// https://ed25519.cr.yp.to/.
+//
+// These functions are also compatible with the “Ed25519� function defined in
+// RFC 8032. However, unlike RFC 8032's formulation, this package's private key
+// representation includes a public key suffix to make multiple signing
+// operations with the same key more efficient. This package refers to the RFC
+// 8032 private key as the “seed�.
+package ed25519
+
+// This code is a port of the public domain, “ref10� implementation of ed25519
+// from SUPERCOP.
+
+import (
+	"bytes"
+	"crypto"
+	cryptorand "crypto/rand"
+	"crypto/sha512"
+	"errors"
+	"io"
+	"strconv"
+
+	"golang.org/x/crypto/ed25519/internal/edwards25519"
+)
+
+const (
+	// PublicKeySize is the size, in bytes, of public keys as used in this package.
+	PublicKeySize = 32
+	// PrivateKeySize is the size, in bytes, of private keys as used in this package.
+	PrivateKeySize = 64
+	// SignatureSize is the size, in bytes, of signatures generated and verified by this package.
+	SignatureSize = 64
+	// SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032.
+	SeedSize = 32
+)
+
+// PublicKey is the type of Ed25519 public keys.
+type PublicKey []byte
+
+// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer.
+type PrivateKey []byte
+
+// Public returns the PublicKey corresponding to priv.
+func (priv PrivateKey) Public() crypto.PublicKey {
+	publicKey := make([]byte, PublicKeySize)
+	copy(publicKey, priv[32:])
+	return PublicKey(publicKey)
+}
+
+// Seed returns the private key seed corresponding to priv. It is provided for
+// interoperability with RFC 8032. RFC 8032's private keys correspond to seeds
+// in this package.
+func (priv PrivateKey) Seed() []byte {
+	seed := make([]byte, SeedSize)
+	copy(seed, priv[:32])
+	return seed
+}
+
+// Sign signs the given message with priv.
+// Ed25519 performs two passes over messages to be signed and therefore cannot
+// handle pre-hashed messages. Thus opts.HashFunc() must return zero to
+// indicate the message hasn't been hashed. This can be achieved by passing
+// crypto.Hash(0) as the value for opts.
+func (priv PrivateKey) Sign(rand io.Reader, message []byte, opts crypto.SignerOpts) (signature []byte, err error) {
+	if opts.HashFunc() != crypto.Hash(0) {
+		return nil, errors.New("ed25519: cannot sign hashed message")
+	}
+
+	return Sign(priv, message), nil
+}
+
+// GenerateKey generates a public/private key pair using entropy from rand.
+// If rand is nil, crypto/rand.Reader will be used.
+func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) {
+	if rand == nil {
+		rand = cryptorand.Reader
+	}
+
+	seed := make([]byte, SeedSize)
+	if _, err := io.ReadFull(rand, seed); err != nil {
+		return nil, nil, err
+	}
+
+	privateKey := NewKeyFromSeed(seed)
+	publicKey := make([]byte, PublicKeySize)
+	copy(publicKey, privateKey[32:])
+
+	return publicKey, privateKey, nil
+}
+
+// NewKeyFromSeed calculates a private key from a seed. It will panic if
+// len(seed) is not SeedSize. This function is provided for interoperability
+// with RFC 8032. RFC 8032's private keys correspond to seeds in this
+// package.
+func NewKeyFromSeed(seed []byte) PrivateKey {
+	if l := len(seed); l != SeedSize {
+		panic("ed25519: bad seed length: " + strconv.Itoa(l))
+	}
+
+	digest := sha512.Sum512(seed)
+	digest[0] &= 248
+	digest[31] &= 127
+	digest[31] |= 64
+
+	var A edwards25519.ExtendedGroupElement
+	var hBytes [32]byte
+	copy(hBytes[:], digest[:])
+	edwards25519.GeScalarMultBase(&A, &hBytes)
+	var publicKeyBytes [32]byte
+	A.ToBytes(&publicKeyBytes)
+
+	privateKey := make([]byte, PrivateKeySize)
+	copy(privateKey, seed)
+	copy(privateKey[32:], publicKeyBytes[:])
+
+	return privateKey
+}
+
+// Sign signs the message with privateKey and returns a signature. It will
+// panic if len(privateKey) is not PrivateKeySize.
+func Sign(privateKey PrivateKey, message []byte) []byte {
+	if l := len(privateKey); l != PrivateKeySize {
+		panic("ed25519: bad private key length: " + strconv.Itoa(l))
+	}
+
+	h := sha512.New()
+	h.Write(privateKey[:32])
+
+	var digest1, messageDigest, hramDigest [64]byte
+	var expandedSecretKey [32]byte
+	h.Sum(digest1[:0])
+	copy(expandedSecretKey[:], digest1[:])
+	expandedSecretKey[0] &= 248
+	expandedSecretKey[31] &= 63
+	expandedSecretKey[31] |= 64
+
+	h.Reset()
+	h.Write(digest1[32:])
+	h.Write(message)
+	h.Sum(messageDigest[:0])
+
+	var messageDigestReduced [32]byte
+	edwards25519.ScReduce(&messageDigestReduced, &messageDigest)
+	var R edwards25519.ExtendedGroupElement
+	edwards25519.GeScalarMultBase(&R, &messageDigestReduced)
+
+	var encodedR [32]byte
+	R.ToBytes(&encodedR)
+
+	h.Reset()
+	h.Write(encodedR[:])
+	h.Write(privateKey[32:])
+	h.Write(message)
+	h.Sum(hramDigest[:0])
+	var hramDigestReduced [32]byte
+	edwards25519.ScReduce(&hramDigestReduced, &hramDigest)
+
+	var s [32]byte
+	edwards25519.ScMulAdd(&s, &hramDigestReduced, &expandedSecretKey, &messageDigestReduced)
+
+	signature := make([]byte, SignatureSize)
+	copy(signature[:], encodedR[:])
+	copy(signature[32:], s[:])
+
+	return signature
+}
+
+// Verify reports whether sig is a valid signature of message by publicKey. It
+// will panic if len(publicKey) is not PublicKeySize.
+func Verify(publicKey PublicKey, message, sig []byte) bool {
+	if l := len(publicKey); l != PublicKeySize {
+		panic("ed25519: bad public key length: " + strconv.Itoa(l))
+	}
+
+	if len(sig) != SignatureSize || sig[63]&224 != 0 {
+		return false
+	}
+
+	var A edwards25519.ExtendedGroupElement
+	var publicKeyBytes [32]byte
+	copy(publicKeyBytes[:], publicKey)
+	if !A.FromBytes(&publicKeyBytes) {
+		return false
+	}
+	edwards25519.FeNeg(&A.X, &A.X)
+	edwards25519.FeNeg(&A.T, &A.T)
+
+	h := sha512.New()
+	h.Write(sig[:32])
+	h.Write(publicKey[:])
+	h.Write(message)
+	var digest [64]byte
+	h.Sum(digest[:0])
+
+	var hReduced [32]byte
+	edwards25519.ScReduce(&hReduced, &digest)
+
+	var R edwards25519.ProjectiveGroupElement
+	var s [32]byte
+	copy(s[:], sig[32:])
+
+	// https://tools.ietf.org/html/rfc8032#section-5.1.7 requires that s be in
+	// the range [0, order) in order to prevent signature malleability.
+	if !edwards25519.ScMinimal(&s) {
+		return false
+	}
+
+	edwards25519.GeDoubleScalarMultVartime(&R, &hReduced, &A, &s)
+
+	var checkR [32]byte
+	R.ToBytes(&checkR)
+	return bytes.Equal(sig[:32], checkR[:])
+}
diff --git a/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go b/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go
new file mode 100644
index 0000000..b5974dc
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go
@@ -0,0 +1,74 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.13
+// +build go1.13
+
+// Package ed25519 implements the Ed25519 signature algorithm. See
+// https://ed25519.cr.yp.to/.
+//
+// These functions are also compatible with the “Ed25519� function defined in
+// RFC 8032. However, unlike RFC 8032's formulation, this package's private key
+// representation includes a public key suffix to make multiple signing
+// operations with the same key more efficient. This package refers to the RFC
+// 8032 private key as the “seed�.
+//
+// Beginning with Go 1.13, the functionality of this package was moved to the
+// standard library as crypto/ed25519. This package only acts as a compatibility
+// wrapper.
+package ed25519
+
+import (
+	"crypto/ed25519"
+	"io"
+)
+
+const (
+	// PublicKeySize is the size, in bytes, of public keys as used in this package.
+	PublicKeySize = 32
+	// PrivateKeySize is the size, in bytes, of private keys as used in this package.
+	PrivateKeySize = 64
+	// SignatureSize is the size, in bytes, of signatures generated and verified by this package.
+	SignatureSize = 64
+	// SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032.
+	SeedSize = 32
+)
+
+// PublicKey is the type of Ed25519 public keys.
+//
+// This type is an alias for crypto/ed25519's PublicKey type.
+// See the crypto/ed25519 package for the methods on this type.
+type PublicKey = ed25519.PublicKey
+
+// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer.
+//
+// This type is an alias for crypto/ed25519's PrivateKey type.
+// See the crypto/ed25519 package for the methods on this type.
+type PrivateKey = ed25519.PrivateKey
+
+// GenerateKey generates a public/private key pair using entropy from rand.
+// If rand is nil, crypto/rand.Reader will be used.
+func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) {
+	return ed25519.GenerateKey(rand)
+}
+
+// NewKeyFromSeed calculates a private key from a seed. It will panic if
+// len(seed) is not SeedSize. This function is provided for interoperability
+// with RFC 8032. RFC 8032's private keys correspond to seeds in this
+// package.
+func NewKeyFromSeed(seed []byte) PrivateKey {
+	return ed25519.NewKeyFromSeed(seed)
+}
+
+// Sign signs the message with privateKey and returns a signature. It will
+// panic if len(privateKey) is not PrivateKeySize.
+func Sign(privateKey PrivateKey, message []byte) []byte {
+	return ed25519.Sign(privateKey, message)
+}
+
+// Verify reports whether sig is a valid signature of message by publicKey. It
+// will panic if len(publicKey) is not PublicKeySize.
+func Verify(publicKey PublicKey, message, sig []byte) bool {
+	return ed25519.Verify(publicKey, message, sig)
+}
diff --git a/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
new file mode 100644
index 0000000..e39f086
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
@@ -0,0 +1,1422 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package edwards25519
+
+// These values are from the public domain, “ref10� implementation of ed25519
+// from SUPERCOP.
+
+// d is a constant in the Edwards curve equation.
+var d = FieldElement{
+	-10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116,
+}
+
+// d2 is 2*d.
+var d2 = FieldElement{
+	-21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199,
+}
+
+// SqrtM1 is the square-root of -1 in the field.
+var SqrtM1 = FieldElement{
+	-32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482,
+}
+
+// A is a constant in the Montgomery-form of curve25519.
+var A = FieldElement{
+	486662, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+}
+
+// bi contains precomputed multiples of the base-point. See the Ed25519 paper
+// for a discussion about how these values are used.
+var bi = [8]PreComputedGroupElement{
+	{
+		FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
+		FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
+		FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
+	},
+	{
+		FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
+		FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
+		FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
+	},
+	{
+		FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
+		FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
+		FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
+	},
+	{
+		FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
+		FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
+		FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
+	},
+	{
+		FieldElement{-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877},
+		FieldElement{-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951},
+		FieldElement{4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784},
+	},
+	{
+		FieldElement{-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436},
+		FieldElement{25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918},
+		FieldElement{23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877},
+	},
+	{
+		FieldElement{-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800},
+		FieldElement{-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305},
+		FieldElement{-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300},
+	},
+	{
+		FieldElement{-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876},
+		FieldElement{-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619},
+		FieldElement{-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683},
+	},
+}
+
+// base contains precomputed multiples of the base-point. See the Ed25519 paper
+// for a discussion about how these values are used.
+var base = [32][8]PreComputedGroupElement{
+	{
+		{
+			FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
+			FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
+			FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
+		},
+		{
+			FieldElement{-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303},
+			FieldElement{-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081},
+			FieldElement{26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697},
+		},
+		{
+			FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
+			FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
+			FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
+		},
+		{
+			FieldElement{-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540},
+			FieldElement{23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397},
+			FieldElement{7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325},
+		},
+		{
+			FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
+			FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
+			FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
+		},
+		{
+			FieldElement{-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777},
+			FieldElement{-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737},
+			FieldElement{-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652},
+		},
+		{
+			FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
+			FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
+			FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
+		},
+		{
+			FieldElement{14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726},
+			FieldElement{-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955},
+			FieldElement{27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425},
+		},
+	},
+	{
+		{
+			FieldElement{-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171},
+			FieldElement{27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510},
+			FieldElement{17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660},
+		},
+		{
+			FieldElement{-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639},
+			FieldElement{29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963},
+			FieldElement{5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950},
+		},
+		{
+			FieldElement{-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568},
+			FieldElement{12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335},
+			FieldElement{25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628},
+		},
+		{
+			FieldElement{-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007},
+			FieldElement{-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772},
+			FieldElement{-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653},
+		},
+		{
+			FieldElement{2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567},
+			FieldElement{13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686},
+			FieldElement{21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372},
+		},
+		{
+			FieldElement{-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887},
+			FieldElement{-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954},
+			FieldElement{-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953},
+		},
+		{
+			FieldElement{24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833},
+			FieldElement{-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532},
+			FieldElement{-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876},
+		},
+		{
+			FieldElement{2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268},
+			FieldElement{33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214},
+			FieldElement{1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038},
+		},
+	},
+	{
+		{
+			FieldElement{6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800},
+			FieldElement{4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645},
+			FieldElement{-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664},
+		},
+		{
+			FieldElement{1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933},
+			FieldElement{-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182},
+			FieldElement{-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222},
+		},
+		{
+			FieldElement{-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991},
+			FieldElement{20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880},
+			FieldElement{9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092},
+		},
+		{
+			FieldElement{-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295},
+			FieldElement{19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788},
+			FieldElement{8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553},
+		},
+		{
+			FieldElement{-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026},
+			FieldElement{11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347},
+			FieldElement{-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033},
+		},
+		{
+			FieldElement{-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395},
+			FieldElement{-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278},
+			FieldElement{1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890},
+		},
+		{
+			FieldElement{32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995},
+			FieldElement{-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596},
+			FieldElement{-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891},
+		},
+		{
+			FieldElement{31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060},
+			FieldElement{11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608},
+			FieldElement{-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606},
+		},
+	},
+	{
+		{
+			FieldElement{7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389},
+			FieldElement{-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016},
+			FieldElement{-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341},
+		},
+		{
+			FieldElement{-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505},
+			FieldElement{14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553},
+			FieldElement{-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655},
+		},
+		{
+			FieldElement{15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220},
+			FieldElement{12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631},
+			FieldElement{-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099},
+		},
+		{
+			FieldElement{26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556},
+			FieldElement{14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749},
+			FieldElement{236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930},
+		},
+		{
+			FieldElement{1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391},
+			FieldElement{5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253},
+			FieldElement{20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066},
+		},
+		{
+			FieldElement{24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958},
+			FieldElement{-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082},
+			FieldElement{-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383},
+		},
+		{
+			FieldElement{-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521},
+			FieldElement{-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807},
+			FieldElement{23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948},
+		},
+		{
+			FieldElement{9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134},
+			FieldElement{-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455},
+			FieldElement{27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629},
+		},
+	},
+	{
+		{
+			FieldElement{-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069},
+			FieldElement{-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746},
+			FieldElement{24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919},
+		},
+		{
+			FieldElement{11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837},
+			FieldElement{8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906},
+			FieldElement{-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771},
+		},
+		{
+			FieldElement{-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817},
+			FieldElement{10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098},
+			FieldElement{10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409},
+		},
+		{
+			FieldElement{-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504},
+			FieldElement{-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727},
+			FieldElement{28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420},
+		},
+		{
+			FieldElement{-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003},
+			FieldElement{-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605},
+			FieldElement{-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384},
+		},
+		{
+			FieldElement{-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701},
+			FieldElement{-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683},
+			FieldElement{29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708},
+		},
+		{
+			FieldElement{-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563},
+			FieldElement{-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260},
+			FieldElement{-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387},
+		},
+		{
+			FieldElement{-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672},
+			FieldElement{23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686},
+			FieldElement{-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665},
+		},
+	},
+	{
+		{
+			FieldElement{11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182},
+			FieldElement{-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277},
+			FieldElement{14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628},
+		},
+		{
+			FieldElement{-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474},
+			FieldElement{-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539},
+			FieldElement{-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822},
+		},
+		{
+			FieldElement{-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970},
+			FieldElement{19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756},
+			FieldElement{-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508},
+		},
+		{
+			FieldElement{-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683},
+			FieldElement{-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655},
+			FieldElement{-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158},
+		},
+		{
+			FieldElement{-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125},
+			FieldElement{-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839},
+			FieldElement{-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664},
+		},
+		{
+			FieldElement{27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294},
+			FieldElement{-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899},
+			FieldElement{-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070},
+		},
+		{
+			FieldElement{3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294},
+			FieldElement{-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949},
+			FieldElement{-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083},
+		},
+		{
+			FieldElement{31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420},
+			FieldElement{-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940},
+			FieldElement{29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396},
+		},
+	},
+	{
+		{
+			FieldElement{-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567},
+			FieldElement{20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127},
+			FieldElement{-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294},
+		},
+		{
+			FieldElement{-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887},
+			FieldElement{22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964},
+			FieldElement{16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195},
+		},
+		{
+			FieldElement{9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244},
+			FieldElement{24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999},
+			FieldElement{-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762},
+		},
+		{
+			FieldElement{-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274},
+			FieldElement{-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236},
+			FieldElement{-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605},
+		},
+		{
+			FieldElement{-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761},
+			FieldElement{-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884},
+			FieldElement{-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482},
+		},
+		{
+			FieldElement{-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638},
+			FieldElement{-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490},
+			FieldElement{-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170},
+		},
+		{
+			FieldElement{5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736},
+			FieldElement{10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124},
+			FieldElement{-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392},
+		},
+		{
+			FieldElement{8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029},
+			FieldElement{6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048},
+			FieldElement{28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958},
+		},
+	},
+	{
+		{
+			FieldElement{24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593},
+			FieldElement{26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071},
+			FieldElement{-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692},
+		},
+		{
+			FieldElement{11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687},
+			FieldElement{-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441},
+			FieldElement{-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001},
+		},
+		{
+			FieldElement{-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460},
+			FieldElement{-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007},
+			FieldElement{-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762},
+		},
+		{
+			FieldElement{15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005},
+			FieldElement{-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674},
+			FieldElement{4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035},
+		},
+		{
+			FieldElement{7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590},
+			FieldElement{-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957},
+			FieldElement{-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812},
+		},
+		{
+			FieldElement{33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740},
+			FieldElement{-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122},
+			FieldElement{-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158},
+		},
+		{
+			FieldElement{8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885},
+			FieldElement{26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140},
+			FieldElement{19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857},
+		},
+		{
+			FieldElement{801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155},
+			FieldElement{19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260},
+			FieldElement{19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483},
+		},
+	},
+	{
+		{
+			FieldElement{-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677},
+			FieldElement{32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815},
+			FieldElement{22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751},
+		},
+		{
+			FieldElement{-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203},
+			FieldElement{-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208},
+			FieldElement{1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230},
+		},
+		{
+			FieldElement{16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850},
+			FieldElement{-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389},
+			FieldElement{-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968},
+		},
+		{
+			FieldElement{-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689},
+			FieldElement{14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880},
+			FieldElement{5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304},
+		},
+		{
+			FieldElement{30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632},
+			FieldElement{-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412},
+			FieldElement{20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566},
+		},
+		{
+			FieldElement{-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038},
+			FieldElement{-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232},
+			FieldElement{-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943},
+		},
+		{
+			FieldElement{17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856},
+			FieldElement{23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738},
+			FieldElement{15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971},
+		},
+		{
+			FieldElement{-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718},
+			FieldElement{-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697},
+			FieldElement{-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883},
+		},
+	},
+	{
+		{
+			FieldElement{5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912},
+			FieldElement{-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358},
+			FieldElement{3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849},
+		},
+		{
+			FieldElement{29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307},
+			FieldElement{-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977},
+			FieldElement{-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335},
+		},
+		{
+			FieldElement{-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644},
+			FieldElement{-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616},
+			FieldElement{-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735},
+		},
+		{
+			FieldElement{-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099},
+			FieldElement{29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341},
+			FieldElement{-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336},
+		},
+		{
+			FieldElement{-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646},
+			FieldElement{31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425},
+			FieldElement{-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388},
+		},
+		{
+			FieldElement{-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743},
+			FieldElement{-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822},
+			FieldElement{-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462},
+		},
+		{
+			FieldElement{18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985},
+			FieldElement{9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702},
+			FieldElement{-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797},
+		},
+		{
+			FieldElement{21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293},
+			FieldElement{27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100},
+			FieldElement{19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688},
+		},
+	},
+	{
+		{
+			FieldElement{12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186},
+			FieldElement{2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610},
+			FieldElement{-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707},
+		},
+		{
+			FieldElement{7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220},
+			FieldElement{915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025},
+			FieldElement{32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044},
+		},
+		{
+			FieldElement{32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992},
+			FieldElement{-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027},
+			FieldElement{21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197},
+		},
+		{
+			FieldElement{8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901},
+			FieldElement{31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952},
+			FieldElement{19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878},
+		},
+		{
+			FieldElement{-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390},
+			FieldElement{32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730},
+			FieldElement{2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730},
+		},
+		{
+			FieldElement{-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180},
+			FieldElement{-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272},
+			FieldElement{-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715},
+		},
+		{
+			FieldElement{-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970},
+			FieldElement{-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772},
+			FieldElement{-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865},
+		},
+		{
+			FieldElement{15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750},
+			FieldElement{20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373},
+			FieldElement{32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348},
+		},
+	},
+	{
+		{
+			FieldElement{9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144},
+			FieldElement{-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195},
+			FieldElement{5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086},
+		},
+		{
+			FieldElement{-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684},
+			FieldElement{-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518},
+			FieldElement{-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233},
+		},
+		{
+			FieldElement{-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793},
+			FieldElement{-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794},
+			FieldElement{580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435},
+		},
+		{
+			FieldElement{23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921},
+			FieldElement{13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518},
+			FieldElement{2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563},
+		},
+		{
+			FieldElement{14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278},
+			FieldElement{-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024},
+			FieldElement{4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030},
+		},
+		{
+			FieldElement{10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783},
+			FieldElement{27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717},
+			FieldElement{6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844},
+		},
+		{
+			FieldElement{14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333},
+			FieldElement{16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048},
+			FieldElement{22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760},
+		},
+		{
+			FieldElement{-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760},
+			FieldElement{-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757},
+			FieldElement{-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112},
+		},
+	},
+	{
+		{
+			FieldElement{-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468},
+			FieldElement{3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184},
+			FieldElement{10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289},
+		},
+		{
+			FieldElement{15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066},
+			FieldElement{24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882},
+			FieldElement{13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226},
+		},
+		{
+			FieldElement{16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101},
+			FieldElement{29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279},
+			FieldElement{-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811},
+		},
+		{
+			FieldElement{27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709},
+			FieldElement{20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714},
+			FieldElement{-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121},
+		},
+		{
+			FieldElement{9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464},
+			FieldElement{12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847},
+			FieldElement{13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400},
+		},
+		{
+			FieldElement{4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414},
+			FieldElement{-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158},
+			FieldElement{17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045},
+		},
+		{
+			FieldElement{-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415},
+			FieldElement{-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459},
+			FieldElement{-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079},
+		},
+		{
+			FieldElement{21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412},
+			FieldElement{-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743},
+			FieldElement{-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836},
+		},
+	},
+	{
+		{
+			FieldElement{12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022},
+			FieldElement{18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429},
+			FieldElement{-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065},
+		},
+		{
+			FieldElement{30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861},
+			FieldElement{10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000},
+			FieldElement{-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101},
+		},
+		{
+			FieldElement{32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815},
+			FieldElement{29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642},
+			FieldElement{10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966},
+		},
+		{
+			FieldElement{25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574},
+			FieldElement{-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742},
+			FieldElement{-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689},
+		},
+		{
+			FieldElement{12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020},
+			FieldElement{-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772},
+			FieldElement{3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982},
+		},
+		{
+			FieldElement{-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953},
+			FieldElement{-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218},
+			FieldElement{-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265},
+		},
+		{
+			FieldElement{29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073},
+			FieldElement{-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325},
+			FieldElement{-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798},
+		},
+		{
+			FieldElement{-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870},
+			FieldElement{-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863},
+			FieldElement{-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927},
+		},
+	},
+	{
+		{
+			FieldElement{-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267},
+			FieldElement{-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663},
+			FieldElement{22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862},
+		},
+		{
+			FieldElement{-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673},
+			FieldElement{15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943},
+			FieldElement{15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020},
+		},
+		{
+			FieldElement{-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238},
+			FieldElement{11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064},
+			FieldElement{14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795},
+		},
+		{
+			FieldElement{15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052},
+			FieldElement{-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904},
+			FieldElement{29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531},
+		},
+		{
+			FieldElement{-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979},
+			FieldElement{-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841},
+			FieldElement{10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431},
+		},
+		{
+			FieldElement{10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324},
+			FieldElement{-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940},
+			FieldElement{10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320},
+		},
+		{
+			FieldElement{-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184},
+			FieldElement{14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114},
+			FieldElement{30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878},
+		},
+		{
+			FieldElement{12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784},
+			FieldElement{-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091},
+			FieldElement{-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585},
+		},
+	},
+	{
+		{
+			FieldElement{-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208},
+			FieldElement{10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864},
+			FieldElement{17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661},
+		},
+		{
+			FieldElement{7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233},
+			FieldElement{26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212},
+			FieldElement{-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525},
+		},
+		{
+			FieldElement{-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068},
+			FieldElement{9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397},
+			FieldElement{-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988},
+		},
+		{
+			FieldElement{5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889},
+			FieldElement{32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038},
+			FieldElement{14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697},
+		},
+		{
+			FieldElement{20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875},
+			FieldElement{-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905},
+			FieldElement{-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656},
+		},
+		{
+			FieldElement{11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818},
+			FieldElement{27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714},
+			FieldElement{10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203},
+		},
+		{
+			FieldElement{20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931},
+			FieldElement{-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024},
+			FieldElement{-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084},
+		},
+		{
+			FieldElement{-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204},
+			FieldElement{20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817},
+			FieldElement{27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667},
+		},
+	},
+	{
+		{
+			FieldElement{11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504},
+			FieldElement{-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768},
+			FieldElement{-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255},
+		},
+		{
+			FieldElement{6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790},
+			FieldElement{1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438},
+			FieldElement{-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333},
+		},
+		{
+			FieldElement{17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971},
+			FieldElement{31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905},
+			FieldElement{29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409},
+		},
+		{
+			FieldElement{12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409},
+			FieldElement{6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499},
+			FieldElement{-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363},
+		},
+		{
+			FieldElement{28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664},
+			FieldElement{-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324},
+			FieldElement{-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940},
+		},
+		{
+			FieldElement{13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990},
+			FieldElement{-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914},
+			FieldElement{-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290},
+		},
+		{
+			FieldElement{24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257},
+			FieldElement{-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433},
+			FieldElement{-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236},
+		},
+		{
+			FieldElement{-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045},
+			FieldElement{11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093},
+			FieldElement{-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347},
+		},
+	},
+	{
+		{
+			FieldElement{-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191},
+			FieldElement{-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507},
+			FieldElement{-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906},
+		},
+		{
+			FieldElement{3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018},
+			FieldElement{-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109},
+			FieldElement{-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926},
+		},
+		{
+			FieldElement{-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528},
+			FieldElement{8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625},
+			FieldElement{-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286},
+		},
+		{
+			FieldElement{2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033},
+			FieldElement{27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866},
+			FieldElement{21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896},
+		},
+		{
+			FieldElement{30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075},
+			FieldElement{26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347},
+			FieldElement{-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437},
+		},
+		{
+			FieldElement{-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165},
+			FieldElement{-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588},
+			FieldElement{-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193},
+		},
+		{
+			FieldElement{-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017},
+			FieldElement{-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883},
+			FieldElement{21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961},
+		},
+		{
+			FieldElement{8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043},
+			FieldElement{29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663},
+			FieldElement{-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362},
+		},
+	},
+	{
+		{
+			FieldElement{-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860},
+			FieldElement{2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466},
+			FieldElement{-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063},
+		},
+		{
+			FieldElement{-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997},
+			FieldElement{-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295},
+			FieldElement{-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369},
+		},
+		{
+			FieldElement{9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385},
+			FieldElement{18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109},
+			FieldElement{2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906},
+		},
+		{
+			FieldElement{4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424},
+			FieldElement{-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185},
+			FieldElement{7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962},
+		},
+		{
+			FieldElement{-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325},
+			FieldElement{10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593},
+			FieldElement{696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404},
+		},
+		{
+			FieldElement{-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644},
+			FieldElement{17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801},
+			FieldElement{26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804},
+		},
+		{
+			FieldElement{-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884},
+			FieldElement{-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577},
+			FieldElement{-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849},
+		},
+		{
+			FieldElement{32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473},
+			FieldElement{-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644},
+			FieldElement{-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319},
+		},
+	},
+	{
+		{
+			FieldElement{-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599},
+			FieldElement{-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768},
+			FieldElement{-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084},
+		},
+		{
+			FieldElement{-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328},
+			FieldElement{-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369},
+			FieldElement{20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920},
+		},
+		{
+			FieldElement{12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815},
+			FieldElement{-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025},
+			FieldElement{-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397},
+		},
+		{
+			FieldElement{-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448},
+			FieldElement{6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981},
+			FieldElement{30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165},
+		},
+		{
+			FieldElement{32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501},
+			FieldElement{17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073},
+			FieldElement{-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861},
+		},
+		{
+			FieldElement{14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845},
+			FieldElement{-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211},
+			FieldElement{18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870},
+		},
+		{
+			FieldElement{10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096},
+			FieldElement{33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803},
+			FieldElement{-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168},
+		},
+		{
+			FieldElement{30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965},
+			FieldElement{-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505},
+			FieldElement{18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598},
+		},
+	},
+	{
+		{
+			FieldElement{5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782},
+			FieldElement{5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900},
+			FieldElement{-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479},
+		},
+		{
+			FieldElement{-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208},
+			FieldElement{8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232},
+			FieldElement{17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719},
+		},
+		{
+			FieldElement{16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271},
+			FieldElement{-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326},
+			FieldElement{-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132},
+		},
+		{
+			FieldElement{14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300},
+			FieldElement{8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570},
+			FieldElement{15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670},
+		},
+		{
+			FieldElement{-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994},
+			FieldElement{-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913},
+			FieldElement{31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317},
+		},
+		{
+			FieldElement{-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730},
+			FieldElement{842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096},
+			FieldElement{-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078},
+		},
+		{
+			FieldElement{-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411},
+			FieldElement{-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905},
+			FieldElement{-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654},
+		},
+		{
+			FieldElement{-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870},
+			FieldElement{-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498},
+			FieldElement{12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579},
+		},
+	},
+	{
+		{
+			FieldElement{14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677},
+			FieldElement{10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647},
+			FieldElement{-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743},
+		},
+		{
+			FieldElement{-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468},
+			FieldElement{21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375},
+			FieldElement{-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155},
+		},
+		{
+			FieldElement{6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725},
+			FieldElement{-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612},
+			FieldElement{-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943},
+		},
+		{
+			FieldElement{-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944},
+			FieldElement{30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928},
+			FieldElement{9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406},
+		},
+		{
+			FieldElement{22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139},
+			FieldElement{-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963},
+			FieldElement{-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693},
+		},
+		{
+			FieldElement{1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734},
+			FieldElement{-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680},
+			FieldElement{-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410},
+		},
+		{
+			FieldElement{-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931},
+			FieldElement{-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654},
+			FieldElement{22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710},
+		},
+		{
+			FieldElement{29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180},
+			FieldElement{-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684},
+			FieldElement{-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895},
+		},
+	},
+	{
+		{
+			FieldElement{22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501},
+			FieldElement{-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413},
+			FieldElement{6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880},
+		},
+		{
+			FieldElement{-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874},
+			FieldElement{22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962},
+			FieldElement{-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899},
+		},
+		{
+			FieldElement{21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152},
+			FieldElement{9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063},
+			FieldElement{7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080},
+		},
+		{
+			FieldElement{-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146},
+			FieldElement{-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183},
+			FieldElement{-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133},
+		},
+		{
+			FieldElement{-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421},
+			FieldElement{-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622},
+			FieldElement{-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197},
+		},
+		{
+			FieldElement{2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663},
+			FieldElement{31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753},
+			FieldElement{4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755},
+		},
+		{
+			FieldElement{-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862},
+			FieldElement{-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118},
+			FieldElement{26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171},
+		},
+		{
+			FieldElement{15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380},
+			FieldElement{16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824},
+			FieldElement{28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270},
+		},
+	},
+	{
+		{
+			FieldElement{-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438},
+			FieldElement{-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584},
+			FieldElement{-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562},
+		},
+		{
+			FieldElement{30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471},
+			FieldElement{18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610},
+			FieldElement{19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269},
+		},
+		{
+			FieldElement{-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650},
+			FieldElement{14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369},
+			FieldElement{19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461},
+		},
+		{
+			FieldElement{30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462},
+			FieldElement{-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793},
+			FieldElement{-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218},
+		},
+		{
+			FieldElement{-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226},
+			FieldElement{18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019},
+			FieldElement{-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037},
+		},
+		{
+			FieldElement{31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171},
+			FieldElement{-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132},
+			FieldElement{-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841},
+		},
+		{
+			FieldElement{21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181},
+			FieldElement{-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210},
+			FieldElement{-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040},
+		},
+		{
+			FieldElement{3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935},
+			FieldElement{24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105},
+			FieldElement{-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814},
+		},
+	},
+	{
+		{
+			FieldElement{793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852},
+			FieldElement{5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581},
+			FieldElement{-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646},
+		},
+		{
+			FieldElement{10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844},
+			FieldElement{10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025},
+			FieldElement{27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453},
+		},
+		{
+			FieldElement{-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068},
+			FieldElement{4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192},
+			FieldElement{-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921},
+		},
+		{
+			FieldElement{-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259},
+			FieldElement{-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426},
+			FieldElement{-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072},
+		},
+		{
+			FieldElement{-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305},
+			FieldElement{13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832},
+			FieldElement{28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943},
+		},
+		{
+			FieldElement{-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011},
+			FieldElement{24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447},
+			FieldElement{17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494},
+		},
+		{
+			FieldElement{-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245},
+			FieldElement{-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859},
+			FieldElement{28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915},
+		},
+		{
+			FieldElement{16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707},
+			FieldElement{10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848},
+			FieldElement{-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224},
+		},
+	},
+	{
+		{
+			FieldElement{-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391},
+			FieldElement{15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215},
+			FieldElement{-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101},
+		},
+		{
+			FieldElement{23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713},
+			FieldElement{21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849},
+			FieldElement{-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930},
+		},
+		{
+			FieldElement{-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940},
+			FieldElement{-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031},
+			FieldElement{-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404},
+		},
+		{
+			FieldElement{-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243},
+			FieldElement{-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116},
+			FieldElement{-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525},
+		},
+		{
+			FieldElement{-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509},
+			FieldElement{-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883},
+			FieldElement{15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865},
+		},
+		{
+			FieldElement{-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660},
+			FieldElement{4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273},
+			FieldElement{-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138},
+		},
+		{
+			FieldElement{-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560},
+			FieldElement{-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135},
+			FieldElement{2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941},
+		},
+		{
+			FieldElement{-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739},
+			FieldElement{18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756},
+			FieldElement{-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819},
+		},
+	},
+	{
+		{
+			FieldElement{-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347},
+			FieldElement{-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028},
+			FieldElement{21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075},
+		},
+		{
+			FieldElement{16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799},
+			FieldElement{-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609},
+			FieldElement{-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817},
+		},
+		{
+			FieldElement{-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989},
+			FieldElement{-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523},
+			FieldElement{4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278},
+		},
+		{
+			FieldElement{31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045},
+			FieldElement{19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377},
+			FieldElement{24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480},
+		},
+		{
+			FieldElement{17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016},
+			FieldElement{510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426},
+			FieldElement{18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525},
+		},
+		{
+			FieldElement{13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396},
+			FieldElement{9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080},
+			FieldElement{12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892},
+		},
+		{
+			FieldElement{15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275},
+			FieldElement{11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074},
+			FieldElement{20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140},
+		},
+		{
+			FieldElement{-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717},
+			FieldElement{-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101},
+			FieldElement{24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127},
+		},
+	},
+	{
+		{
+			FieldElement{-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632},
+			FieldElement{-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415},
+			FieldElement{-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160},
+		},
+		{
+			FieldElement{31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876},
+			FieldElement{22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625},
+			FieldElement{-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478},
+		},
+		{
+			FieldElement{27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164},
+			FieldElement{26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595},
+			FieldElement{-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248},
+		},
+		{
+			FieldElement{-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858},
+			FieldElement{15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193},
+			FieldElement{8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184},
+		},
+		{
+			FieldElement{-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942},
+			FieldElement{-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635},
+			FieldElement{21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948},
+		},
+		{
+			FieldElement{11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935},
+			FieldElement{-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415},
+			FieldElement{-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416},
+		},
+		{
+			FieldElement{-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018},
+			FieldElement{4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778},
+			FieldElement{366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659},
+		},
+		{
+			FieldElement{-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385},
+			FieldElement{18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503},
+			FieldElement{476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329},
+		},
+	},
+	{
+		{
+			FieldElement{20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056},
+			FieldElement{-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838},
+			FieldElement{24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948},
+		},
+		{
+			FieldElement{-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691},
+			FieldElement{-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118},
+			FieldElement{-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517},
+		},
+		{
+			FieldElement{-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269},
+			FieldElement{-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904},
+			FieldElement{-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589},
+		},
+		{
+			FieldElement{-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193},
+			FieldElement{-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910},
+			FieldElement{-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930},
+		},
+		{
+			FieldElement{-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667},
+			FieldElement{25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481},
+			FieldElement{-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876},
+		},
+		{
+			FieldElement{22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640},
+			FieldElement{-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278},
+			FieldElement{-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112},
+		},
+		{
+			FieldElement{26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272},
+			FieldElement{17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012},
+			FieldElement{-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221},
+		},
+		{
+			FieldElement{30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046},
+			FieldElement{13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345},
+			FieldElement{-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310},
+		},
+	},
+	{
+		{
+			FieldElement{19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937},
+			FieldElement{31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636},
+			FieldElement{-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008},
+		},
+		{
+			FieldElement{-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429},
+			FieldElement{-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576},
+			FieldElement{31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066},
+		},
+		{
+			FieldElement{-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490},
+			FieldElement{-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104},
+			FieldElement{33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053},
+		},
+		{
+			FieldElement{31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275},
+			FieldElement{-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511},
+			FieldElement{22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095},
+		},
+		{
+			FieldElement{-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439},
+			FieldElement{23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939},
+			FieldElement{-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424},
+		},
+		{
+			FieldElement{2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310},
+			FieldElement{3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608},
+			FieldElement{-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079},
+		},
+		{
+			FieldElement{-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101},
+			FieldElement{21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418},
+			FieldElement{18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576},
+		},
+		{
+			FieldElement{30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356},
+			FieldElement{9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996},
+			FieldElement{-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099},
+		},
+	},
+	{
+		{
+			FieldElement{-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728},
+			FieldElement{-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658},
+			FieldElement{-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242},
+		},
+		{
+			FieldElement{-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001},
+			FieldElement{-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766},
+			FieldElement{18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373},
+		},
+		{
+			FieldElement{26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458},
+			FieldElement{-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628},
+			FieldElement{-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657},
+		},
+		{
+			FieldElement{-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062},
+			FieldElement{25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616},
+			FieldElement{31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014},
+		},
+		{
+			FieldElement{24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383},
+			FieldElement{-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814},
+			FieldElement{-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718},
+		},
+		{
+			FieldElement{30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417},
+			FieldElement{2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222},
+			FieldElement{33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444},
+		},
+		{
+			FieldElement{-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597},
+			FieldElement{23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970},
+			FieldElement{1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799},
+		},
+		{
+			FieldElement{-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647},
+			FieldElement{13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511},
+			FieldElement{-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032},
+		},
+	},
+	{
+		{
+			FieldElement{9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834},
+			FieldElement{-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461},
+			FieldElement{29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062},
+		},
+		{
+			FieldElement{-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516},
+			FieldElement{-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547},
+			FieldElement{-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240},
+		},
+		{
+			FieldElement{-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038},
+			FieldElement{-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741},
+			FieldElement{16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103},
+		},
+		{
+			FieldElement{-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747},
+			FieldElement{-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323},
+			FieldElement{31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016},
+		},
+		{
+			FieldElement{-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373},
+			FieldElement{15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228},
+			FieldElement{-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141},
+		},
+		{
+			FieldElement{16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399},
+			FieldElement{11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831},
+			FieldElement{-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376},
+		},
+		{
+			FieldElement{-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313},
+			FieldElement{-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958},
+			FieldElement{-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577},
+		},
+		{
+			FieldElement{-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743},
+			FieldElement{29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684},
+			FieldElement{-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476},
+		},
+	},
+}
diff --git a/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
new file mode 100644
index 0000000..fd03c25
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
@@ -0,0 +1,1793 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package edwards25519
+
+import "encoding/binary"
+
+// This code is a port of the public domain, “ref10� implementation of ed25519
+// from SUPERCOP.
+
+// FieldElement represents an element of the field GF(2^255 - 19).  An element
+// t, entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
+// t[3]+2^102 t[4]+...+2^230 t[9].  Bounds on each t[i] vary depending on
+// context.
+type FieldElement [10]int32
+
+var zero FieldElement
+
+func FeZero(fe *FieldElement) {
+	copy(fe[:], zero[:])
+}
+
+func FeOne(fe *FieldElement) {
+	FeZero(fe)
+	fe[0] = 1
+}
+
+func FeAdd(dst, a, b *FieldElement) {
+	dst[0] = a[0] + b[0]
+	dst[1] = a[1] + b[1]
+	dst[2] = a[2] + b[2]
+	dst[3] = a[3] + b[3]
+	dst[4] = a[4] + b[4]
+	dst[5] = a[5] + b[5]
+	dst[6] = a[6] + b[6]
+	dst[7] = a[7] + b[7]
+	dst[8] = a[8] + b[8]
+	dst[9] = a[9] + b[9]
+}
+
+func FeSub(dst, a, b *FieldElement) {
+	dst[0] = a[0] - b[0]
+	dst[1] = a[1] - b[1]
+	dst[2] = a[2] - b[2]
+	dst[3] = a[3] - b[3]
+	dst[4] = a[4] - b[4]
+	dst[5] = a[5] - b[5]
+	dst[6] = a[6] - b[6]
+	dst[7] = a[7] - b[7]
+	dst[8] = a[8] - b[8]
+	dst[9] = a[9] - b[9]
+}
+
+func FeCopy(dst, src *FieldElement) {
+	copy(dst[:], src[:])
+}
+
+// Replace (f,g) with (g,g) if b == 1;
+// replace (f,g) with (f,g) if b == 0.
+//
+// Preconditions: b in {0,1}.
+func FeCMove(f, g *FieldElement, b int32) {
+	b = -b
+	f[0] ^= b & (f[0] ^ g[0])
+	f[1] ^= b & (f[1] ^ g[1])
+	f[2] ^= b & (f[2] ^ g[2])
+	f[3] ^= b & (f[3] ^ g[3])
+	f[4] ^= b & (f[4] ^ g[4])
+	f[5] ^= b & (f[5] ^ g[5])
+	f[6] ^= b & (f[6] ^ g[6])
+	f[7] ^= b & (f[7] ^ g[7])
+	f[8] ^= b & (f[8] ^ g[8])
+	f[9] ^= b & (f[9] ^ g[9])
+}
+
+func load3(in []byte) int64 {
+	var r int64
+	r = int64(in[0])
+	r |= int64(in[1]) << 8
+	r |= int64(in[2]) << 16
+	return r
+}
+
+func load4(in []byte) int64 {
+	var r int64
+	r = int64(in[0])
+	r |= int64(in[1]) << 8
+	r |= int64(in[2]) << 16
+	r |= int64(in[3]) << 24
+	return r
+}
+
+func FeFromBytes(dst *FieldElement, src *[32]byte) {
+	h0 := load4(src[:])
+	h1 := load3(src[4:]) << 6
+	h2 := load3(src[7:]) << 5
+	h3 := load3(src[10:]) << 3
+	h4 := load3(src[13:]) << 2
+	h5 := load4(src[16:])
+	h6 := load3(src[20:]) << 7
+	h7 := load3(src[23:]) << 5
+	h8 := load3(src[26:]) << 4
+	h9 := (load3(src[29:]) & 8388607) << 2
+
+	FeCombine(dst, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
+}
+
+// FeToBytes marshals h to s.
+// Preconditions:
+//   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+//
+// Write p=2^255-19; q=floor(h/p).
+// Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
+//
+// Proof:
+//   Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
+//   Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4.
+//
+//   Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
+//   Then 0<y<1.
+//
+//   Write r=h-pq.
+//   Have 0<=r<=p-1=2^255-20.
+//   Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
+//
+//   Write x=r+19(2^-255)r+y.
+//   Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
+//
+//   Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
+//   so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
+func FeToBytes(s *[32]byte, h *FieldElement) {
+	var carry [10]int32
+
+	q := (19*h[9] + (1 << 24)) >> 25
+	q = (h[0] + q) >> 26
+	q = (h[1] + q) >> 25
+	q = (h[2] + q) >> 26
+	q = (h[3] + q) >> 25
+	q = (h[4] + q) >> 26
+	q = (h[5] + q) >> 25
+	q = (h[6] + q) >> 26
+	q = (h[7] + q) >> 25
+	q = (h[8] + q) >> 26
+	q = (h[9] + q) >> 25
+
+	// Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20.
+	h[0] += 19 * q
+	// Goal: Output h-2^255 q, which is between 0 and 2^255-20.
+
+	carry[0] = h[0] >> 26
+	h[1] += carry[0]
+	h[0] -= carry[0] << 26
+	carry[1] = h[1] >> 25
+	h[2] += carry[1]
+	h[1] -= carry[1] << 25
+	carry[2] = h[2] >> 26
+	h[3] += carry[2]
+	h[2] -= carry[2] << 26
+	carry[3] = h[3] >> 25
+	h[4] += carry[3]
+	h[3] -= carry[3] << 25
+	carry[4] = h[4] >> 26
+	h[5] += carry[4]
+	h[4] -= carry[4] << 26
+	carry[5] = h[5] >> 25
+	h[6] += carry[5]
+	h[5] -= carry[5] << 25
+	carry[6] = h[6] >> 26
+	h[7] += carry[6]
+	h[6] -= carry[6] << 26
+	carry[7] = h[7] >> 25
+	h[8] += carry[7]
+	h[7] -= carry[7] << 25
+	carry[8] = h[8] >> 26
+	h[9] += carry[8]
+	h[8] -= carry[8] << 26
+	carry[9] = h[9] >> 25
+	h[9] -= carry[9] << 25
+	// h10 = carry9
+
+	// Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
+	// Have h[0]+...+2^230 h[9] between 0 and 2^255-1;
+	// evidently 2^255 h10-2^255 q = 0.
+	// Goal: Output h[0]+...+2^230 h[9].
+
+	s[0] = byte(h[0] >> 0)
+	s[1] = byte(h[0] >> 8)
+	s[2] = byte(h[0] >> 16)
+	s[3] = byte((h[0] >> 24) | (h[1] << 2))
+	s[4] = byte(h[1] >> 6)
+	s[5] = byte(h[1] >> 14)
+	s[6] = byte((h[1] >> 22) | (h[2] << 3))
+	s[7] = byte(h[2] >> 5)
+	s[8] = byte(h[2] >> 13)
+	s[9] = byte((h[2] >> 21) | (h[3] << 5))
+	s[10] = byte(h[3] >> 3)
+	s[11] = byte(h[3] >> 11)
+	s[12] = byte((h[3] >> 19) | (h[4] << 6))
+	s[13] = byte(h[4] >> 2)
+	s[14] = byte(h[4] >> 10)
+	s[15] = byte(h[4] >> 18)
+	s[16] = byte(h[5] >> 0)
+	s[17] = byte(h[5] >> 8)
+	s[18] = byte(h[5] >> 16)
+	s[19] = byte((h[5] >> 24) | (h[6] << 1))
+	s[20] = byte(h[6] >> 7)
+	s[21] = byte(h[6] >> 15)
+	s[22] = byte((h[6] >> 23) | (h[7] << 3))
+	s[23] = byte(h[7] >> 5)
+	s[24] = byte(h[7] >> 13)
+	s[25] = byte((h[7] >> 21) | (h[8] << 4))
+	s[26] = byte(h[8] >> 4)
+	s[27] = byte(h[8] >> 12)
+	s[28] = byte((h[8] >> 20) | (h[9] << 6))
+	s[29] = byte(h[9] >> 2)
+	s[30] = byte(h[9] >> 10)
+	s[31] = byte(h[9] >> 18)
+}
+
+func FeIsNegative(f *FieldElement) byte {
+	var s [32]byte
+	FeToBytes(&s, f)
+	return s[0] & 1
+}
+
+func FeIsNonZero(f *FieldElement) int32 {
+	var s [32]byte
+	FeToBytes(&s, f)
+	var x uint8
+	for _, b := range s {
+		x |= b
+	}
+	x |= x >> 4
+	x |= x >> 2
+	x |= x >> 1
+	return int32(x & 1)
+}
+
+// FeNeg sets h = -f
+//
+// Preconditions:
+//    |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+//
+// Postconditions:
+//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+func FeNeg(h, f *FieldElement) {
+	h[0] = -f[0]
+	h[1] = -f[1]
+	h[2] = -f[2]
+	h[3] = -f[3]
+	h[4] = -f[4]
+	h[5] = -f[5]
+	h[6] = -f[6]
+	h[7] = -f[7]
+	h[8] = -f[8]
+	h[9] = -f[9]
+}
+
+func FeCombine(h *FieldElement, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
+	var c0, c1, c2, c3, c4, c5, c6, c7, c8, c9 int64
+
+	/*
+	  |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38))
+	    i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8
+	  |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19))
+	    i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9
+	*/
+
+	c0 = (h0 + (1 << 25)) >> 26
+	h1 += c0
+	h0 -= c0 << 26
+	c4 = (h4 + (1 << 25)) >> 26
+	h5 += c4
+	h4 -= c4 << 26
+	/* |h0| <= 2^25 */
+	/* |h4| <= 2^25 */
+	/* |h1| <= 1.51*2^58 */
+	/* |h5| <= 1.51*2^58 */
+
+	c1 = (h1 + (1 << 24)) >> 25
+	h2 += c1
+	h1 -= c1 << 25
+	c5 = (h5 + (1 << 24)) >> 25
+	h6 += c5
+	h5 -= c5 << 25
+	/* |h1| <= 2^24; from now on fits into int32 */
+	/* |h5| <= 2^24; from now on fits into int32 */
+	/* |h2| <= 1.21*2^59 */
+	/* |h6| <= 1.21*2^59 */
+
+	c2 = (h2 + (1 << 25)) >> 26
+	h3 += c2
+	h2 -= c2 << 26
+	c6 = (h6 + (1 << 25)) >> 26
+	h7 += c6
+	h6 -= c6 << 26
+	/* |h2| <= 2^25; from now on fits into int32 unchanged */
+	/* |h6| <= 2^25; from now on fits into int32 unchanged */
+	/* |h3| <= 1.51*2^58 */
+	/* |h7| <= 1.51*2^58 */
+
+	c3 = (h3 + (1 << 24)) >> 25
+	h4 += c3
+	h3 -= c3 << 25
+	c7 = (h7 + (1 << 24)) >> 25
+	h8 += c7
+	h7 -= c7 << 25
+	/* |h3| <= 2^24; from now on fits into int32 unchanged */
+	/* |h7| <= 2^24; from now on fits into int32 unchanged */
+	/* |h4| <= 1.52*2^33 */
+	/* |h8| <= 1.52*2^33 */
+
+	c4 = (h4 + (1 << 25)) >> 26
+	h5 += c4
+	h4 -= c4 << 26
+	c8 = (h8 + (1 << 25)) >> 26
+	h9 += c8
+	h8 -= c8 << 26
+	/* |h4| <= 2^25; from now on fits into int32 unchanged */
+	/* |h8| <= 2^25; from now on fits into int32 unchanged */
+	/* |h5| <= 1.01*2^24 */
+	/* |h9| <= 1.51*2^58 */
+
+	c9 = (h9 + (1 << 24)) >> 25
+	h0 += c9 * 19
+	h9 -= c9 << 25
+	/* |h9| <= 2^24; from now on fits into int32 unchanged */
+	/* |h0| <= 1.8*2^37 */
+
+	c0 = (h0 + (1 << 25)) >> 26
+	h1 += c0
+	h0 -= c0 << 26
+	/* |h0| <= 2^25; from now on fits into int32 unchanged */
+	/* |h1| <= 1.01*2^24 */
+
+	h[0] = int32(h0)
+	h[1] = int32(h1)
+	h[2] = int32(h2)
+	h[3] = int32(h3)
+	h[4] = int32(h4)
+	h[5] = int32(h5)
+	h[6] = int32(h6)
+	h[7] = int32(h7)
+	h[8] = int32(h8)
+	h[9] = int32(h9)
+}
+
+// FeMul calculates h = f * g
+// Can overlap h with f or g.
+//
+// Preconditions:
+//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+//    |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+//
+// Postconditions:
+//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+//
+// Notes on implementation strategy:
+//
+// Using schoolbook multiplication.
+// Karatsuba would save a little in some cost models.
+//
+// Most multiplications by 2 and 19 are 32-bit precomputations;
+// cheaper than 64-bit postcomputations.
+//
+// There is one remaining multiplication by 19 in the carry chain;
+// one *19 precomputation can be merged into this,
+// but the resulting data flow is considerably less clean.
+//
+// There are 12 carries below.
+// 10 of them are 2-way parallelizable and vectorizable.
+// Can get away with 11 carries, but then data flow is much deeper.
+//
+// With tighter constraints on inputs, can squeeze carries into int32.
+func FeMul(h, f, g *FieldElement) {
+	f0 := int64(f[0])
+	f1 := int64(f[1])
+	f2 := int64(f[2])
+	f3 := int64(f[3])
+	f4 := int64(f[4])
+	f5 := int64(f[5])
+	f6 := int64(f[6])
+	f7 := int64(f[7])
+	f8 := int64(f[8])
+	f9 := int64(f[9])
+
+	f1_2 := int64(2 * f[1])
+	f3_2 := int64(2 * f[3])
+	f5_2 := int64(2 * f[5])
+	f7_2 := int64(2 * f[7])
+	f9_2 := int64(2 * f[9])
+
+	g0 := int64(g[0])
+	g1 := int64(g[1])
+	g2 := int64(g[2])
+	g3 := int64(g[3])
+	g4 := int64(g[4])
+	g5 := int64(g[5])
+	g6 := int64(g[6])
+	g7 := int64(g[7])
+	g8 := int64(g[8])
+	g9 := int64(g[9])
+
+	g1_19 := int64(19 * g[1]) /* 1.4*2^29 */
+	g2_19 := int64(19 * g[2]) /* 1.4*2^30; still ok */
+	g3_19 := int64(19 * g[3])
+	g4_19 := int64(19 * g[4])
+	g5_19 := int64(19 * g[5])
+	g6_19 := int64(19 * g[6])
+	g7_19 := int64(19 * g[7])
+	g8_19 := int64(19 * g[8])
+	g9_19 := int64(19 * g[9])
+
+	h0 := f0*g0 + f1_2*g9_19 + f2*g8_19 + f3_2*g7_19 + f4*g6_19 + f5_2*g5_19 + f6*g4_19 + f7_2*g3_19 + f8*g2_19 + f9_2*g1_19
+	h1 := f0*g1 + f1*g0 + f2*g9_19 + f3*g8_19 + f4*g7_19 + f5*g6_19 + f6*g5_19 + f7*g4_19 + f8*g3_19 + f9*g2_19
+	h2 := f0*g2 + f1_2*g1 + f2*g0 + f3_2*g9_19 + f4*g8_19 + f5_2*g7_19 + f6*g6_19 + f7_2*g5_19 + f8*g4_19 + f9_2*g3_19
+	h3 := f0*g3 + f1*g2 + f2*g1 + f3*g0 + f4*g9_19 + f5*g8_19 + f6*g7_19 + f7*g6_19 + f8*g5_19 + f9*g4_19
+	h4 := f0*g4 + f1_2*g3 + f2*g2 + f3_2*g1 + f4*g0 + f5_2*g9_19 + f6*g8_19 + f7_2*g7_19 + f8*g6_19 + f9_2*g5_19
+	h5 := f0*g5 + f1*g4 + f2*g3 + f3*g2 + f4*g1 + f5*g0 + f6*g9_19 + f7*g8_19 + f8*g7_19 + f9*g6_19
+	h6 := f0*g6 + f1_2*g5 + f2*g4 + f3_2*g3 + f4*g2 + f5_2*g1 + f6*g0 + f7_2*g9_19 + f8*g8_19 + f9_2*g7_19
+	h7 := f0*g7 + f1*g6 + f2*g5 + f3*g4 + f4*g3 + f5*g2 + f6*g1 + f7*g0 + f8*g9_19 + f9*g8_19
+	h8 := f0*g8 + f1_2*g7 + f2*g6 + f3_2*g5 + f4*g4 + f5_2*g3 + f6*g2 + f7_2*g1 + f8*g0 + f9_2*g9_19
+	h9 := f0*g9 + f1*g8 + f2*g7 + f3*g6 + f4*g5 + f5*g4 + f6*g3 + f7*g2 + f8*g1 + f9*g0
+
+	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
+}
+
+func feSquare(f *FieldElement) (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
+	f0 := int64(f[0])
+	f1 := int64(f[1])
+	f2 := int64(f[2])
+	f3 := int64(f[3])
+	f4 := int64(f[4])
+	f5 := int64(f[5])
+	f6 := int64(f[6])
+	f7 := int64(f[7])
+	f8 := int64(f[8])
+	f9 := int64(f[9])
+	f0_2 := int64(2 * f[0])
+	f1_2 := int64(2 * f[1])
+	f2_2 := int64(2 * f[2])
+	f3_2 := int64(2 * f[3])
+	f4_2 := int64(2 * f[4])
+	f5_2 := int64(2 * f[5])
+	f6_2 := int64(2 * f[6])
+	f7_2 := int64(2 * f[7])
+	f5_38 := 38 * f5 // 1.31*2^30
+	f6_19 := 19 * f6 // 1.31*2^30
+	f7_38 := 38 * f7 // 1.31*2^30
+	f8_19 := 19 * f8 // 1.31*2^30
+	f9_38 := 38 * f9 // 1.31*2^30
+
+	h0 = f0*f0 + f1_2*f9_38 + f2_2*f8_19 + f3_2*f7_38 + f4_2*f6_19 + f5*f5_38
+	h1 = f0_2*f1 + f2*f9_38 + f3_2*f8_19 + f4*f7_38 + f5_2*f6_19
+	h2 = f0_2*f2 + f1_2*f1 + f3_2*f9_38 + f4_2*f8_19 + f5_2*f7_38 + f6*f6_19
+	h3 = f0_2*f3 + f1_2*f2 + f4*f9_38 + f5_2*f8_19 + f6*f7_38
+	h4 = f0_2*f4 + f1_2*f3_2 + f2*f2 + f5_2*f9_38 + f6_2*f8_19 + f7*f7_38
+	h5 = f0_2*f5 + f1_2*f4 + f2_2*f3 + f6*f9_38 + f7_2*f8_19
+	h6 = f0_2*f6 + f1_2*f5_2 + f2_2*f4 + f3_2*f3 + f7_2*f9_38 + f8*f8_19
+	h7 = f0_2*f7 + f1_2*f6 + f2_2*f5 + f3_2*f4 + f8*f9_38
+	h8 = f0_2*f8 + f1_2*f7_2 + f2_2*f6 + f3_2*f5_2 + f4*f4 + f9*f9_38
+	h9 = f0_2*f9 + f1_2*f8 + f2_2*f7 + f3_2*f6 + f4_2*f5
+
+	return
+}
+
+// FeSquare calculates h = f*f. Can overlap h with f.
+//
+// Preconditions:
+//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+//
+// Postconditions:
+//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+func FeSquare(h, f *FieldElement) {
+	h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
+	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
+}
+
+// FeSquare2 sets h = 2 * f * f
+//
+// Can overlap h with f.
+//
+// Preconditions:
+//    |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
+//
+// Postconditions:
+//    |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
+// See fe_mul.c for discussion of implementation strategy.
+func FeSquare2(h, f *FieldElement) {
+	h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
+
+	h0 += h0
+	h1 += h1
+	h2 += h2
+	h3 += h3
+	h4 += h4
+	h5 += h5
+	h6 += h6
+	h7 += h7
+	h8 += h8
+	h9 += h9
+
+	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
+}
+
+func FeInvert(out, z *FieldElement) {
+	var t0, t1, t2, t3 FieldElement
+	var i int
+
+	FeSquare(&t0, z)        // 2^1
+	FeSquare(&t1, &t0)      // 2^2
+	for i = 1; i < 2; i++ { // 2^3
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t1, z, &t1)      // 2^3 + 2^0
+	FeMul(&t0, &t0, &t1)    // 2^3 + 2^1 + 2^0
+	FeSquare(&t2, &t0)      // 2^4 + 2^2 + 2^1
+	FeMul(&t1, &t1, &t2)    // 2^4 + 2^3 + 2^2 + 2^1 + 2^0
+	FeSquare(&t2, &t1)      // 5,4,3,2,1
+	for i = 1; i < 5; i++ { // 9,8,7,6,5
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t1, &t2, &t1)     // 9,8,7,6,5,4,3,2,1,0
+	FeSquare(&t2, &t1)       // 10..1
+	for i = 1; i < 10; i++ { // 19..10
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t2, &t2, &t1)     // 19..0
+	FeSquare(&t3, &t2)       // 20..1
+	for i = 1; i < 20; i++ { // 39..20
+		FeSquare(&t3, &t3)
+	}
+	FeMul(&t2, &t3, &t2)     // 39..0
+	FeSquare(&t2, &t2)       // 40..1
+	for i = 1; i < 10; i++ { // 49..10
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t1, &t2, &t1)     // 49..0
+	FeSquare(&t2, &t1)       // 50..1
+	for i = 1; i < 50; i++ { // 99..50
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t2, &t2, &t1)      // 99..0
+	FeSquare(&t3, &t2)        // 100..1
+	for i = 1; i < 100; i++ { // 199..100
+		FeSquare(&t3, &t3)
+	}
+	FeMul(&t2, &t3, &t2)     // 199..0
+	FeSquare(&t2, &t2)       // 200..1
+	for i = 1; i < 50; i++ { // 249..50
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t1, &t2, &t1)    // 249..0
+	FeSquare(&t1, &t1)      // 250..1
+	for i = 1; i < 5; i++ { // 254..5
+		FeSquare(&t1, &t1)
+	}
+	FeMul(out, &t1, &t0) // 254..5,3,1,0
+}
+
+func fePow22523(out, z *FieldElement) {
+	var t0, t1, t2 FieldElement
+	var i int
+
+	FeSquare(&t0, z)
+	for i = 1; i < 1; i++ {
+		FeSquare(&t0, &t0)
+	}
+	FeSquare(&t1, &t0)
+	for i = 1; i < 2; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t1, z, &t1)
+	FeMul(&t0, &t0, &t1)
+	FeSquare(&t0, &t0)
+	for i = 1; i < 1; i++ {
+		FeSquare(&t0, &t0)
+	}
+	FeMul(&t0, &t1, &t0)
+	FeSquare(&t1, &t0)
+	for i = 1; i < 5; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t0, &t1, &t0)
+	FeSquare(&t1, &t0)
+	for i = 1; i < 10; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t1, &t1, &t0)
+	FeSquare(&t2, &t1)
+	for i = 1; i < 20; i++ {
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t1, &t2, &t1)
+	FeSquare(&t1, &t1)
+	for i = 1; i < 10; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t0, &t1, &t0)
+	FeSquare(&t1, &t0)
+	for i = 1; i < 50; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t1, &t1, &t0)
+	FeSquare(&t2, &t1)
+	for i = 1; i < 100; i++ {
+		FeSquare(&t2, &t2)
+	}
+	FeMul(&t1, &t2, &t1)
+	FeSquare(&t1, &t1)
+	for i = 1; i < 50; i++ {
+		FeSquare(&t1, &t1)
+	}
+	FeMul(&t0, &t1, &t0)
+	FeSquare(&t0, &t0)
+	for i = 1; i < 2; i++ {
+		FeSquare(&t0, &t0)
+	}
+	FeMul(out, &t0, z)
+}
+
+// Group elements are members of the elliptic curve -x^2 + y^2 = 1 + d * x^2 *
+// y^2 where d = -121665/121666.
+//
+// Several representations are used:
+//   ProjectiveGroupElement: (X:Y:Z) satisfying x=X/Z, y=Y/Z
+//   ExtendedGroupElement: (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
+//   CompletedGroupElement: ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
+//   PreComputedGroupElement: (y+x,y-x,2dxy)
+
+type ProjectiveGroupElement struct {
+	X, Y, Z FieldElement
+}
+
+type ExtendedGroupElement struct {
+	X, Y, Z, T FieldElement
+}
+
+type CompletedGroupElement struct {
+	X, Y, Z, T FieldElement
+}
+
+type PreComputedGroupElement struct {
+	yPlusX, yMinusX, xy2d FieldElement
+}
+
+type CachedGroupElement struct {
+	yPlusX, yMinusX, Z, T2d FieldElement
+}
+
+func (p *ProjectiveGroupElement) Zero() {
+	FeZero(&p.X)
+	FeOne(&p.Y)
+	FeOne(&p.Z)
+}
+
+func (p *ProjectiveGroupElement) Double(r *CompletedGroupElement) {
+	var t0 FieldElement
+
+	FeSquare(&r.X, &p.X)
+	FeSquare(&r.Z, &p.Y)
+	FeSquare2(&r.T, &p.Z)
+	FeAdd(&r.Y, &p.X, &p.Y)
+	FeSquare(&t0, &r.Y)
+	FeAdd(&r.Y, &r.Z, &r.X)
+	FeSub(&r.Z, &r.Z, &r.X)
+	FeSub(&r.X, &t0, &r.Y)
+	FeSub(&r.T, &r.T, &r.Z)
+}
+
+func (p *ProjectiveGroupElement) ToBytes(s *[32]byte) {
+	var recip, x, y FieldElement
+
+	FeInvert(&recip, &p.Z)
+	FeMul(&x, &p.X, &recip)
+	FeMul(&y, &p.Y, &recip)
+	FeToBytes(s, &y)
+	s[31] ^= FeIsNegative(&x) << 7
+}
+
+func (p *ExtendedGroupElement) Zero() {
+	FeZero(&p.X)
+	FeOne(&p.Y)
+	FeOne(&p.Z)
+	FeZero(&p.T)
+}
+
+func (p *ExtendedGroupElement) Double(r *CompletedGroupElement) {
+	var q ProjectiveGroupElement
+	p.ToProjective(&q)
+	q.Double(r)
+}
+
+func (p *ExtendedGroupElement) ToCached(r *CachedGroupElement) {
+	FeAdd(&r.yPlusX, &p.Y, &p.X)
+	FeSub(&r.yMinusX, &p.Y, &p.X)
+	FeCopy(&r.Z, &p.Z)
+	FeMul(&r.T2d, &p.T, &d2)
+}
+
+func (p *ExtendedGroupElement) ToProjective(r *ProjectiveGroupElement) {
+	FeCopy(&r.X, &p.X)
+	FeCopy(&r.Y, &p.Y)
+	FeCopy(&r.Z, &p.Z)
+}
+
+func (p *ExtendedGroupElement) ToBytes(s *[32]byte) {
+	var recip, x, y FieldElement
+
+	FeInvert(&recip, &p.Z)
+	FeMul(&x, &p.X, &recip)
+	FeMul(&y, &p.Y, &recip)
+	FeToBytes(s, &y)
+	s[31] ^= FeIsNegative(&x) << 7
+}
+
+func (p *ExtendedGroupElement) FromBytes(s *[32]byte) bool {
+	var u, v, v3, vxx, check FieldElement
+
+	FeFromBytes(&p.Y, s)
+	FeOne(&p.Z)
+	FeSquare(&u, &p.Y)
+	FeMul(&v, &u, &d)
+	FeSub(&u, &u, &p.Z) // y = y^2-1
+	FeAdd(&v, &v, &p.Z) // v = dy^2+1
+
+	FeSquare(&v3, &v)
+	FeMul(&v3, &v3, &v) // v3 = v^3
+	FeSquare(&p.X, &v3)
+	FeMul(&p.X, &p.X, &v)
+	FeMul(&p.X, &p.X, &u) // x = uv^7
+
+	fePow22523(&p.X, &p.X) // x = (uv^7)^((q-5)/8)
+	FeMul(&p.X, &p.X, &v3)
+	FeMul(&p.X, &p.X, &u) // x = uv^3(uv^7)^((q-5)/8)
+
+	var tmpX, tmp2 [32]byte
+
+	FeSquare(&vxx, &p.X)
+	FeMul(&vxx, &vxx, &v)
+	FeSub(&check, &vxx, &u) // vx^2-u
+	if FeIsNonZero(&check) == 1 {
+		FeAdd(&check, &vxx, &u) // vx^2+u
+		if FeIsNonZero(&check) == 1 {
+			return false
+		}
+		FeMul(&p.X, &p.X, &SqrtM1)
+
+		FeToBytes(&tmpX, &p.X)
+		for i, v := range tmpX {
+			tmp2[31-i] = v
+		}
+	}
+
+	if FeIsNegative(&p.X) != (s[31] >> 7) {
+		FeNeg(&p.X, &p.X)
+	}
+
+	FeMul(&p.T, &p.X, &p.Y)
+	return true
+}
+
+func (p *CompletedGroupElement) ToProjective(r *ProjectiveGroupElement) {
+	FeMul(&r.X, &p.X, &p.T)
+	FeMul(&r.Y, &p.Y, &p.Z)
+	FeMul(&r.Z, &p.Z, &p.T)
+}
+
+func (p *CompletedGroupElement) ToExtended(r *ExtendedGroupElement) {
+	FeMul(&r.X, &p.X, &p.T)
+	FeMul(&r.Y, &p.Y, &p.Z)
+	FeMul(&r.Z, &p.Z, &p.T)
+	FeMul(&r.T, &p.X, &p.Y)
+}
+
+func (p *PreComputedGroupElement) Zero() {
+	FeOne(&p.yPlusX)
+	FeOne(&p.yMinusX)
+	FeZero(&p.xy2d)
+}
+
+func geAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
+	var t0 FieldElement
+
+	FeAdd(&r.X, &p.Y, &p.X)
+	FeSub(&r.Y, &p.Y, &p.X)
+	FeMul(&r.Z, &r.X, &q.yPlusX)
+	FeMul(&r.Y, &r.Y, &q.yMinusX)
+	FeMul(&r.T, &q.T2d, &p.T)
+	FeMul(&r.X, &p.Z, &q.Z)
+	FeAdd(&t0, &r.X, &r.X)
+	FeSub(&r.X, &r.Z, &r.Y)
+	FeAdd(&r.Y, &r.Z, &r.Y)
+	FeAdd(&r.Z, &t0, &r.T)
+	FeSub(&r.T, &t0, &r.T)
+}
+
+func geSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
+	var t0 FieldElement
+
+	FeAdd(&r.X, &p.Y, &p.X)
+	FeSub(&r.Y, &p.Y, &p.X)
+	FeMul(&r.Z, &r.X, &q.yMinusX)
+	FeMul(&r.Y, &r.Y, &q.yPlusX)
+	FeMul(&r.T, &q.T2d, &p.T)
+	FeMul(&r.X, &p.Z, &q.Z)
+	FeAdd(&t0, &r.X, &r.X)
+	FeSub(&r.X, &r.Z, &r.Y)
+	FeAdd(&r.Y, &r.Z, &r.Y)
+	FeSub(&r.Z, &t0, &r.T)
+	FeAdd(&r.T, &t0, &r.T)
+}
+
+func geMixedAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
+	var t0 FieldElement
+
+	FeAdd(&r.X, &p.Y, &p.X)
+	FeSub(&r.Y, &p.Y, &p.X)
+	FeMul(&r.Z, &r.X, &q.yPlusX)
+	FeMul(&r.Y, &r.Y, &q.yMinusX)
+	FeMul(&r.T, &q.xy2d, &p.T)
+	FeAdd(&t0, &p.Z, &p.Z)
+	FeSub(&r.X, &r.Z, &r.Y)
+	FeAdd(&r.Y, &r.Z, &r.Y)
+	FeAdd(&r.Z, &t0, &r.T)
+	FeSub(&r.T, &t0, &r.T)
+}
+
+func geMixedSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
+	var t0 FieldElement
+
+	FeAdd(&r.X, &p.Y, &p.X)
+	FeSub(&r.Y, &p.Y, &p.X)
+	FeMul(&r.Z, &r.X, &q.yMinusX)
+	FeMul(&r.Y, &r.Y, &q.yPlusX)
+	FeMul(&r.T, &q.xy2d, &p.T)
+	FeAdd(&t0, &p.Z, &p.Z)
+	FeSub(&r.X, &r.Z, &r.Y)
+	FeAdd(&r.Y, &r.Z, &r.Y)
+	FeSub(&r.Z, &t0, &r.T)
+	FeAdd(&r.T, &t0, &r.T)
+}
+
+func slide(r *[256]int8, a *[32]byte) {
+	for i := range r {
+		r[i] = int8(1 & (a[i>>3] >> uint(i&7)))
+	}
+
+	for i := range r {
+		if r[i] != 0 {
+			for b := 1; b <= 6 && i+b < 256; b++ {
+				if r[i+b] != 0 {
+					if r[i]+(r[i+b]<<uint(b)) <= 15 {
+						r[i] += r[i+b] << uint(b)
+						r[i+b] = 0
+					} else if r[i]-(r[i+b]<<uint(b)) >= -15 {
+						r[i] -= r[i+b] << uint(b)
+						for k := i + b; k < 256; k++ {
+							if r[k] == 0 {
+								r[k] = 1
+								break
+							}
+							r[k] = 0
+						}
+					} else {
+						break
+					}
+				}
+			}
+		}
+	}
+}
+
+// GeDoubleScalarMultVartime sets r = a*A + b*B
+// where a = a[0]+256*a[1]+...+256^31 a[31].
+// and b = b[0]+256*b[1]+...+256^31 b[31].
+// B is the Ed25519 base point (x,4/5) with x positive.
+func GeDoubleScalarMultVartime(r *ProjectiveGroupElement, a *[32]byte, A *ExtendedGroupElement, b *[32]byte) {
+	var aSlide, bSlide [256]int8
+	var Ai [8]CachedGroupElement // A,3A,5A,7A,9A,11A,13A,15A
+	var t CompletedGroupElement
+	var u, A2 ExtendedGroupElement
+	var i int
+
+	slide(&aSlide, a)
+	slide(&bSlide, b)
+
+	A.ToCached(&Ai[0])
+	A.Double(&t)
+	t.ToExtended(&A2)
+
+	for i := 0; i < 7; i++ {
+		geAdd(&t, &A2, &Ai[i])
+		t.ToExtended(&u)
+		u.ToCached(&Ai[i+1])
+	}
+
+	r.Zero()
+
+	for i = 255; i >= 0; i-- {
+		if aSlide[i] != 0 || bSlide[i] != 0 {
+			break
+		}
+	}
+
+	for ; i >= 0; i-- {
+		r.Double(&t)
+
+		if aSlide[i] > 0 {
+			t.ToExtended(&u)
+			geAdd(&t, &u, &Ai[aSlide[i]/2])
+		} else if aSlide[i] < 0 {
+			t.ToExtended(&u)
+			geSub(&t, &u, &Ai[(-aSlide[i])/2])
+		}
+
+		if bSlide[i] > 0 {
+			t.ToExtended(&u)
+			geMixedAdd(&t, &u, &bi[bSlide[i]/2])
+		} else if bSlide[i] < 0 {
+			t.ToExtended(&u)
+			geMixedSub(&t, &u, &bi[(-bSlide[i])/2])
+		}
+
+		t.ToProjective(r)
+	}
+}
+
+// equal returns 1 if b == c and 0 otherwise, assuming that b and c are
+// non-negative.
+func equal(b, c int32) int32 {
+	x := uint32(b ^ c)
+	x--
+	return int32(x >> 31)
+}
+
+// negative returns 1 if b < 0 and 0 otherwise.
+func negative(b int32) int32 {
+	return (b >> 31) & 1
+}
+
+func PreComputedGroupElementCMove(t, u *PreComputedGroupElement, b int32) {
+	FeCMove(&t.yPlusX, &u.yPlusX, b)
+	FeCMove(&t.yMinusX, &u.yMinusX, b)
+	FeCMove(&t.xy2d, &u.xy2d, b)
+}
+
+func selectPoint(t *PreComputedGroupElement, pos int32, b int32) {
+	var minusT PreComputedGroupElement
+	bNegative := negative(b)
+	bAbs := b - (((-bNegative) & b) << 1)
+
+	t.Zero()
+	for i := int32(0); i < 8; i++ {
+		PreComputedGroupElementCMove(t, &base[pos][i], equal(bAbs, i+1))
+	}
+	FeCopy(&minusT.yPlusX, &t.yMinusX)
+	FeCopy(&minusT.yMinusX, &t.yPlusX)
+	FeNeg(&minusT.xy2d, &t.xy2d)
+	PreComputedGroupElementCMove(t, &minusT, bNegative)
+}
+
+// GeScalarMultBase computes h = a*B, where
+//   a = a[0]+256*a[1]+...+256^31 a[31]
+//   B is the Ed25519 base point (x,4/5) with x positive.
+//
+// Preconditions:
+//   a[31] <= 127
+func GeScalarMultBase(h *ExtendedGroupElement, a *[32]byte) {
+	var e [64]int8
+
+	for i, v := range a {
+		e[2*i] = int8(v & 15)
+		e[2*i+1] = int8((v >> 4) & 15)
+	}
+
+	// each e[i] is between 0 and 15 and e[63] is between 0 and 7.
+
+	carry := int8(0)
+	for i := 0; i < 63; i++ {
+		e[i] += carry
+		carry = (e[i] + 8) >> 4
+		e[i] -= carry << 4
+	}
+	e[63] += carry
+	// each e[i] is between -8 and 8.
+
+	h.Zero()
+	var t PreComputedGroupElement
+	var r CompletedGroupElement
+	for i := int32(1); i < 64; i += 2 {
+		selectPoint(&t, i/2, int32(e[i]))
+		geMixedAdd(&r, h, &t)
+		r.ToExtended(h)
+	}
+
+	var s ProjectiveGroupElement
+
+	h.Double(&r)
+	r.ToProjective(&s)
+	s.Double(&r)
+	r.ToProjective(&s)
+	s.Double(&r)
+	r.ToProjective(&s)
+	s.Double(&r)
+	r.ToExtended(h)
+
+	for i := int32(0); i < 64; i += 2 {
+		selectPoint(&t, i/2, int32(e[i]))
+		geMixedAdd(&r, h, &t)
+		r.ToExtended(h)
+	}
+}
+
+// The scalars are GF(2^252 + 27742317777372353535851937790883648493).
+
+// Input:
+//   a[0]+256*a[1]+...+256^31*a[31] = a
+//   b[0]+256*b[1]+...+256^31*b[31] = b
+//   c[0]+256*c[1]+...+256^31*c[31] = c
+//
+// Output:
+//   s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l
+//   where l = 2^252 + 27742317777372353535851937790883648493.
+func ScMulAdd(s, a, b, c *[32]byte) {
+	a0 := 2097151 & load3(a[:])
+	a1 := 2097151 & (load4(a[2:]) >> 5)
+	a2 := 2097151 & (load3(a[5:]) >> 2)
+	a3 := 2097151 & (load4(a[7:]) >> 7)
+	a4 := 2097151 & (load4(a[10:]) >> 4)
+	a5 := 2097151 & (load3(a[13:]) >> 1)
+	a6 := 2097151 & (load4(a[15:]) >> 6)
+	a7 := 2097151 & (load3(a[18:]) >> 3)
+	a8 := 2097151 & load3(a[21:])
+	a9 := 2097151 & (load4(a[23:]) >> 5)
+	a10 := 2097151 & (load3(a[26:]) >> 2)
+	a11 := (load4(a[28:]) >> 7)
+	b0 := 2097151 & load3(b[:])
+	b1 := 2097151 & (load4(b[2:]) >> 5)
+	b2 := 2097151 & (load3(b[5:]) >> 2)
+	b3 := 2097151 & (load4(b[7:]) >> 7)
+	b4 := 2097151 & (load4(b[10:]) >> 4)
+	b5 := 2097151 & (load3(b[13:]) >> 1)
+	b6 := 2097151 & (load4(b[15:]) >> 6)
+	b7 := 2097151 & (load3(b[18:]) >> 3)
+	b8 := 2097151 & load3(b[21:])
+	b9 := 2097151 & (load4(b[23:]) >> 5)
+	b10 := 2097151 & (load3(b[26:]) >> 2)
+	b11 := (load4(b[28:]) >> 7)
+	c0 := 2097151 & load3(c[:])
+	c1 := 2097151 & (load4(c[2:]) >> 5)
+	c2 := 2097151 & (load3(c[5:]) >> 2)
+	c3 := 2097151 & (load4(c[7:]) >> 7)
+	c4 := 2097151 & (load4(c[10:]) >> 4)
+	c5 := 2097151 & (load3(c[13:]) >> 1)
+	c6 := 2097151 & (load4(c[15:]) >> 6)
+	c7 := 2097151 & (load3(c[18:]) >> 3)
+	c8 := 2097151 & load3(c[21:])
+	c9 := 2097151 & (load4(c[23:]) >> 5)
+	c10 := 2097151 & (load3(c[26:]) >> 2)
+	c11 := (load4(c[28:]) >> 7)
+	var carry [23]int64
+
+	s0 := c0 + a0*b0
+	s1 := c1 + a0*b1 + a1*b0
+	s2 := c2 + a0*b2 + a1*b1 + a2*b0
+	s3 := c3 + a0*b3 + a1*b2 + a2*b1 + a3*b0
+	s4 := c4 + a0*b4 + a1*b3 + a2*b2 + a3*b1 + a4*b0
+	s5 := c5 + a0*b5 + a1*b4 + a2*b3 + a3*b2 + a4*b1 + a5*b0
+	s6 := c6 + a0*b6 + a1*b5 + a2*b4 + a3*b3 + a4*b2 + a5*b1 + a6*b0
+	s7 := c7 + a0*b7 + a1*b6 + a2*b5 + a3*b4 + a4*b3 + a5*b2 + a6*b1 + a7*b0
+	s8 := c8 + a0*b8 + a1*b7 + a2*b6 + a3*b5 + a4*b4 + a5*b3 + a6*b2 + a7*b1 + a8*b0
+	s9 := c9 + a0*b9 + a1*b8 + a2*b7 + a3*b6 + a4*b5 + a5*b4 + a6*b3 + a7*b2 + a8*b1 + a9*b0
+	s10 := c10 + a0*b10 + a1*b9 + a2*b8 + a3*b7 + a4*b6 + a5*b5 + a6*b4 + a7*b3 + a8*b2 + a9*b1 + a10*b0
+	s11 := c11 + a0*b11 + a1*b10 + a2*b9 + a3*b8 + a4*b7 + a5*b6 + a6*b5 + a7*b4 + a8*b3 + a9*b2 + a10*b1 + a11*b0
+	s12 := a1*b11 + a2*b10 + a3*b9 + a4*b8 + a5*b7 + a6*b6 + a7*b5 + a8*b4 + a9*b3 + a10*b2 + a11*b1
+	s13 := a2*b11 + a3*b10 + a4*b9 + a5*b8 + a6*b7 + a7*b6 + a8*b5 + a9*b4 + a10*b3 + a11*b2
+	s14 := a3*b11 + a4*b10 + a5*b9 + a6*b8 + a7*b7 + a8*b6 + a9*b5 + a10*b4 + a11*b3
+	s15 := a4*b11 + a5*b10 + a6*b9 + a7*b8 + a8*b7 + a9*b6 + a10*b5 + a11*b4
+	s16 := a5*b11 + a6*b10 + a7*b9 + a8*b8 + a9*b7 + a10*b6 + a11*b5
+	s17 := a6*b11 + a7*b10 + a8*b9 + a9*b8 + a10*b7 + a11*b6
+	s18 := a7*b11 + a8*b10 + a9*b9 + a10*b8 + a11*b7
+	s19 := a8*b11 + a9*b10 + a10*b9 + a11*b8
+	s20 := a9*b11 + a10*b10 + a11*b9
+	s21 := a10*b11 + a11*b10
+	s22 := a11 * b11
+	s23 := int64(0)
+
+	carry[0] = (s0 + (1 << 20)) >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[2] = (s2 + (1 << 20)) >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[4] = (s4 + (1 << 20)) >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[6] = (s6 + (1 << 20)) >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[8] = (s8 + (1 << 20)) >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[10] = (s10 + (1 << 20)) >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+	carry[12] = (s12 + (1 << 20)) >> 21
+	s13 += carry[12]
+	s12 -= carry[12] << 21
+	carry[14] = (s14 + (1 << 20)) >> 21
+	s15 += carry[14]
+	s14 -= carry[14] << 21
+	carry[16] = (s16 + (1 << 20)) >> 21
+	s17 += carry[16]
+	s16 -= carry[16] << 21
+	carry[18] = (s18 + (1 << 20)) >> 21
+	s19 += carry[18]
+	s18 -= carry[18] << 21
+	carry[20] = (s20 + (1 << 20)) >> 21
+	s21 += carry[20]
+	s20 -= carry[20] << 21
+	carry[22] = (s22 + (1 << 20)) >> 21
+	s23 += carry[22]
+	s22 -= carry[22] << 21
+
+	carry[1] = (s1 + (1 << 20)) >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[3] = (s3 + (1 << 20)) >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[5] = (s5 + (1 << 20)) >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[7] = (s7 + (1 << 20)) >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[9] = (s9 + (1 << 20)) >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[11] = (s11 + (1 << 20)) >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+	carry[13] = (s13 + (1 << 20)) >> 21
+	s14 += carry[13]
+	s13 -= carry[13] << 21
+	carry[15] = (s15 + (1 << 20)) >> 21
+	s16 += carry[15]
+	s15 -= carry[15] << 21
+	carry[17] = (s17 + (1 << 20)) >> 21
+	s18 += carry[17]
+	s17 -= carry[17] << 21
+	carry[19] = (s19 + (1 << 20)) >> 21
+	s20 += carry[19]
+	s19 -= carry[19] << 21
+	carry[21] = (s21 + (1 << 20)) >> 21
+	s22 += carry[21]
+	s21 -= carry[21] << 21
+
+	s11 += s23 * 666643
+	s12 += s23 * 470296
+	s13 += s23 * 654183
+	s14 -= s23 * 997805
+	s15 += s23 * 136657
+	s16 -= s23 * 683901
+	s23 = 0
+
+	s10 += s22 * 666643
+	s11 += s22 * 470296
+	s12 += s22 * 654183
+	s13 -= s22 * 997805
+	s14 += s22 * 136657
+	s15 -= s22 * 683901
+	s22 = 0
+
+	s9 += s21 * 666643
+	s10 += s21 * 470296
+	s11 += s21 * 654183
+	s12 -= s21 * 997805
+	s13 += s21 * 136657
+	s14 -= s21 * 683901
+	s21 = 0
+
+	s8 += s20 * 666643
+	s9 += s20 * 470296
+	s10 += s20 * 654183
+	s11 -= s20 * 997805
+	s12 += s20 * 136657
+	s13 -= s20 * 683901
+	s20 = 0
+
+	s7 += s19 * 666643
+	s8 += s19 * 470296
+	s9 += s19 * 654183
+	s10 -= s19 * 997805
+	s11 += s19 * 136657
+	s12 -= s19 * 683901
+	s19 = 0
+
+	s6 += s18 * 666643
+	s7 += s18 * 470296
+	s8 += s18 * 654183
+	s9 -= s18 * 997805
+	s10 += s18 * 136657
+	s11 -= s18 * 683901
+	s18 = 0
+
+	carry[6] = (s6 + (1 << 20)) >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[8] = (s8 + (1 << 20)) >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[10] = (s10 + (1 << 20)) >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+	carry[12] = (s12 + (1 << 20)) >> 21
+	s13 += carry[12]
+	s12 -= carry[12] << 21
+	carry[14] = (s14 + (1 << 20)) >> 21
+	s15 += carry[14]
+	s14 -= carry[14] << 21
+	carry[16] = (s16 + (1 << 20)) >> 21
+	s17 += carry[16]
+	s16 -= carry[16] << 21
+
+	carry[7] = (s7 + (1 << 20)) >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[9] = (s9 + (1 << 20)) >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[11] = (s11 + (1 << 20)) >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+	carry[13] = (s13 + (1 << 20)) >> 21
+	s14 += carry[13]
+	s13 -= carry[13] << 21
+	carry[15] = (s15 + (1 << 20)) >> 21
+	s16 += carry[15]
+	s15 -= carry[15] << 21
+
+	s5 += s17 * 666643
+	s6 += s17 * 470296
+	s7 += s17 * 654183
+	s8 -= s17 * 997805
+	s9 += s17 * 136657
+	s10 -= s17 * 683901
+	s17 = 0
+
+	s4 += s16 * 666643
+	s5 += s16 * 470296
+	s6 += s16 * 654183
+	s7 -= s16 * 997805
+	s8 += s16 * 136657
+	s9 -= s16 * 683901
+	s16 = 0
+
+	s3 += s15 * 666643
+	s4 += s15 * 470296
+	s5 += s15 * 654183
+	s6 -= s15 * 997805
+	s7 += s15 * 136657
+	s8 -= s15 * 683901
+	s15 = 0
+
+	s2 += s14 * 666643
+	s3 += s14 * 470296
+	s4 += s14 * 654183
+	s5 -= s14 * 997805
+	s6 += s14 * 136657
+	s7 -= s14 * 683901
+	s14 = 0
+
+	s1 += s13 * 666643
+	s2 += s13 * 470296
+	s3 += s13 * 654183
+	s4 -= s13 * 997805
+	s5 += s13 * 136657
+	s6 -= s13 * 683901
+	s13 = 0
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = (s0 + (1 << 20)) >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[2] = (s2 + (1 << 20)) >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[4] = (s4 + (1 << 20)) >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[6] = (s6 + (1 << 20)) >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[8] = (s8 + (1 << 20)) >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[10] = (s10 + (1 << 20)) >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+
+	carry[1] = (s1 + (1 << 20)) >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[3] = (s3 + (1 << 20)) >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[5] = (s5 + (1 << 20)) >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[7] = (s7 + (1 << 20)) >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[9] = (s9 + (1 << 20)) >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[11] = (s11 + (1 << 20)) >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = s0 >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[1] = s1 >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[2] = s2 >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[3] = s3 >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[4] = s4 >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[5] = s5 >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[6] = s6 >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[7] = s7 >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[8] = s8 >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[9] = s9 >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[10] = s10 >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+	carry[11] = s11 >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = s0 >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[1] = s1 >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[2] = s2 >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[3] = s3 >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[4] = s4 >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[5] = s5 >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[6] = s6 >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[7] = s7 >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[8] = s8 >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[9] = s9 >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[10] = s10 >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+
+	s[0] = byte(s0 >> 0)
+	s[1] = byte(s0 >> 8)
+	s[2] = byte((s0 >> 16) | (s1 << 5))
+	s[3] = byte(s1 >> 3)
+	s[4] = byte(s1 >> 11)
+	s[5] = byte((s1 >> 19) | (s2 << 2))
+	s[6] = byte(s2 >> 6)
+	s[7] = byte((s2 >> 14) | (s3 << 7))
+	s[8] = byte(s3 >> 1)
+	s[9] = byte(s3 >> 9)
+	s[10] = byte((s3 >> 17) | (s4 << 4))
+	s[11] = byte(s4 >> 4)
+	s[12] = byte(s4 >> 12)
+	s[13] = byte((s4 >> 20) | (s5 << 1))
+	s[14] = byte(s5 >> 7)
+	s[15] = byte((s5 >> 15) | (s6 << 6))
+	s[16] = byte(s6 >> 2)
+	s[17] = byte(s6 >> 10)
+	s[18] = byte((s6 >> 18) | (s7 << 3))
+	s[19] = byte(s7 >> 5)
+	s[20] = byte(s7 >> 13)
+	s[21] = byte(s8 >> 0)
+	s[22] = byte(s8 >> 8)
+	s[23] = byte((s8 >> 16) | (s9 << 5))
+	s[24] = byte(s9 >> 3)
+	s[25] = byte(s9 >> 11)
+	s[26] = byte((s9 >> 19) | (s10 << 2))
+	s[27] = byte(s10 >> 6)
+	s[28] = byte((s10 >> 14) | (s11 << 7))
+	s[29] = byte(s11 >> 1)
+	s[30] = byte(s11 >> 9)
+	s[31] = byte(s11 >> 17)
+}
+
+// Input:
+//   s[0]+256*s[1]+...+256^63*s[63] = s
+//
+// Output:
+//   s[0]+256*s[1]+...+256^31*s[31] = s mod l
+//   where l = 2^252 + 27742317777372353535851937790883648493.
+func ScReduce(out *[32]byte, s *[64]byte) {
+	s0 := 2097151 & load3(s[:])
+	s1 := 2097151 & (load4(s[2:]) >> 5)
+	s2 := 2097151 & (load3(s[5:]) >> 2)
+	s3 := 2097151 & (load4(s[7:]) >> 7)
+	s4 := 2097151 & (load4(s[10:]) >> 4)
+	s5 := 2097151 & (load3(s[13:]) >> 1)
+	s6 := 2097151 & (load4(s[15:]) >> 6)
+	s7 := 2097151 & (load3(s[18:]) >> 3)
+	s8 := 2097151 & load3(s[21:])
+	s9 := 2097151 & (load4(s[23:]) >> 5)
+	s10 := 2097151 & (load3(s[26:]) >> 2)
+	s11 := 2097151 & (load4(s[28:]) >> 7)
+	s12 := 2097151 & (load4(s[31:]) >> 4)
+	s13 := 2097151 & (load3(s[34:]) >> 1)
+	s14 := 2097151 & (load4(s[36:]) >> 6)
+	s15 := 2097151 & (load3(s[39:]) >> 3)
+	s16 := 2097151 & load3(s[42:])
+	s17 := 2097151 & (load4(s[44:]) >> 5)
+	s18 := 2097151 & (load3(s[47:]) >> 2)
+	s19 := 2097151 & (load4(s[49:]) >> 7)
+	s20 := 2097151 & (load4(s[52:]) >> 4)
+	s21 := 2097151 & (load3(s[55:]) >> 1)
+	s22 := 2097151 & (load4(s[57:]) >> 6)
+	s23 := (load4(s[60:]) >> 3)
+
+	s11 += s23 * 666643
+	s12 += s23 * 470296
+	s13 += s23 * 654183
+	s14 -= s23 * 997805
+	s15 += s23 * 136657
+	s16 -= s23 * 683901
+	s23 = 0
+
+	s10 += s22 * 666643
+	s11 += s22 * 470296
+	s12 += s22 * 654183
+	s13 -= s22 * 997805
+	s14 += s22 * 136657
+	s15 -= s22 * 683901
+	s22 = 0
+
+	s9 += s21 * 666643
+	s10 += s21 * 470296
+	s11 += s21 * 654183
+	s12 -= s21 * 997805
+	s13 += s21 * 136657
+	s14 -= s21 * 683901
+	s21 = 0
+
+	s8 += s20 * 666643
+	s9 += s20 * 470296
+	s10 += s20 * 654183
+	s11 -= s20 * 997805
+	s12 += s20 * 136657
+	s13 -= s20 * 683901
+	s20 = 0
+
+	s7 += s19 * 666643
+	s8 += s19 * 470296
+	s9 += s19 * 654183
+	s10 -= s19 * 997805
+	s11 += s19 * 136657
+	s12 -= s19 * 683901
+	s19 = 0
+
+	s6 += s18 * 666643
+	s7 += s18 * 470296
+	s8 += s18 * 654183
+	s9 -= s18 * 997805
+	s10 += s18 * 136657
+	s11 -= s18 * 683901
+	s18 = 0
+
+	var carry [17]int64
+
+	carry[6] = (s6 + (1 << 20)) >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[8] = (s8 + (1 << 20)) >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[10] = (s10 + (1 << 20)) >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+	carry[12] = (s12 + (1 << 20)) >> 21
+	s13 += carry[12]
+	s12 -= carry[12] << 21
+	carry[14] = (s14 + (1 << 20)) >> 21
+	s15 += carry[14]
+	s14 -= carry[14] << 21
+	carry[16] = (s16 + (1 << 20)) >> 21
+	s17 += carry[16]
+	s16 -= carry[16] << 21
+
+	carry[7] = (s7 + (1 << 20)) >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[9] = (s9 + (1 << 20)) >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[11] = (s11 + (1 << 20)) >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+	carry[13] = (s13 + (1 << 20)) >> 21
+	s14 += carry[13]
+	s13 -= carry[13] << 21
+	carry[15] = (s15 + (1 << 20)) >> 21
+	s16 += carry[15]
+	s15 -= carry[15] << 21
+
+	s5 += s17 * 666643
+	s6 += s17 * 470296
+	s7 += s17 * 654183
+	s8 -= s17 * 997805
+	s9 += s17 * 136657
+	s10 -= s17 * 683901
+	s17 = 0
+
+	s4 += s16 * 666643
+	s5 += s16 * 470296
+	s6 += s16 * 654183
+	s7 -= s16 * 997805
+	s8 += s16 * 136657
+	s9 -= s16 * 683901
+	s16 = 0
+
+	s3 += s15 * 666643
+	s4 += s15 * 470296
+	s5 += s15 * 654183
+	s6 -= s15 * 997805
+	s7 += s15 * 136657
+	s8 -= s15 * 683901
+	s15 = 0
+
+	s2 += s14 * 666643
+	s3 += s14 * 470296
+	s4 += s14 * 654183
+	s5 -= s14 * 997805
+	s6 += s14 * 136657
+	s7 -= s14 * 683901
+	s14 = 0
+
+	s1 += s13 * 666643
+	s2 += s13 * 470296
+	s3 += s13 * 654183
+	s4 -= s13 * 997805
+	s5 += s13 * 136657
+	s6 -= s13 * 683901
+	s13 = 0
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = (s0 + (1 << 20)) >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[2] = (s2 + (1 << 20)) >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[4] = (s4 + (1 << 20)) >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[6] = (s6 + (1 << 20)) >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[8] = (s8 + (1 << 20)) >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[10] = (s10 + (1 << 20)) >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+
+	carry[1] = (s1 + (1 << 20)) >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[3] = (s3 + (1 << 20)) >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[5] = (s5 + (1 << 20)) >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[7] = (s7 + (1 << 20)) >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[9] = (s9 + (1 << 20)) >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[11] = (s11 + (1 << 20)) >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = s0 >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[1] = s1 >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[2] = s2 >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[3] = s3 >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[4] = s4 >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[5] = s5 >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[6] = s6 >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[7] = s7 >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[8] = s8 >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[9] = s9 >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[10] = s10 >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+	carry[11] = s11 >> 21
+	s12 += carry[11]
+	s11 -= carry[11] << 21
+
+	s0 += s12 * 666643
+	s1 += s12 * 470296
+	s2 += s12 * 654183
+	s3 -= s12 * 997805
+	s4 += s12 * 136657
+	s5 -= s12 * 683901
+	s12 = 0
+
+	carry[0] = s0 >> 21
+	s1 += carry[0]
+	s0 -= carry[0] << 21
+	carry[1] = s1 >> 21
+	s2 += carry[1]
+	s1 -= carry[1] << 21
+	carry[2] = s2 >> 21
+	s3 += carry[2]
+	s2 -= carry[2] << 21
+	carry[3] = s3 >> 21
+	s4 += carry[3]
+	s3 -= carry[3] << 21
+	carry[4] = s4 >> 21
+	s5 += carry[4]
+	s4 -= carry[4] << 21
+	carry[5] = s5 >> 21
+	s6 += carry[5]
+	s5 -= carry[5] << 21
+	carry[6] = s6 >> 21
+	s7 += carry[6]
+	s6 -= carry[6] << 21
+	carry[7] = s7 >> 21
+	s8 += carry[7]
+	s7 -= carry[7] << 21
+	carry[8] = s8 >> 21
+	s9 += carry[8]
+	s8 -= carry[8] << 21
+	carry[9] = s9 >> 21
+	s10 += carry[9]
+	s9 -= carry[9] << 21
+	carry[10] = s10 >> 21
+	s11 += carry[10]
+	s10 -= carry[10] << 21
+
+	out[0] = byte(s0 >> 0)
+	out[1] = byte(s0 >> 8)
+	out[2] = byte((s0 >> 16) | (s1 << 5))
+	out[3] = byte(s1 >> 3)
+	out[4] = byte(s1 >> 11)
+	out[5] = byte((s1 >> 19) | (s2 << 2))
+	out[6] = byte(s2 >> 6)
+	out[7] = byte((s2 >> 14) | (s3 << 7))
+	out[8] = byte(s3 >> 1)
+	out[9] = byte(s3 >> 9)
+	out[10] = byte((s3 >> 17) | (s4 << 4))
+	out[11] = byte(s4 >> 4)
+	out[12] = byte(s4 >> 12)
+	out[13] = byte((s4 >> 20) | (s5 << 1))
+	out[14] = byte(s5 >> 7)
+	out[15] = byte((s5 >> 15) | (s6 << 6))
+	out[16] = byte(s6 >> 2)
+	out[17] = byte(s6 >> 10)
+	out[18] = byte((s6 >> 18) | (s7 << 3))
+	out[19] = byte(s7 >> 5)
+	out[20] = byte(s7 >> 13)
+	out[21] = byte(s8 >> 0)
+	out[22] = byte(s8 >> 8)
+	out[23] = byte((s8 >> 16) | (s9 << 5))
+	out[24] = byte(s9 >> 3)
+	out[25] = byte(s9 >> 11)
+	out[26] = byte((s9 >> 19) | (s10 << 2))
+	out[27] = byte(s10 >> 6)
+	out[28] = byte((s10 >> 14) | (s11 << 7))
+	out[29] = byte(s11 >> 1)
+	out[30] = byte(s11 >> 9)
+	out[31] = byte(s11 >> 17)
+}
+
+// order is the order of Curve25519 in little-endian form.
+var order = [4]uint64{0x5812631a5cf5d3ed, 0x14def9dea2f79cd6, 0, 0x1000000000000000}
+
+// ScMinimal returns true if the given scalar is less than the order of the
+// curve.
+func ScMinimal(scalar *[32]byte) bool {
+	for i := 3; ; i-- {
+		v := binary.LittleEndian.Uint64(scalar[i*8:])
+		if v > order[i] {
+			return false
+		} else if v < order[i] {
+			break
+		} else if i == 0 {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/golang.org/x/crypto/ocsp/ocsp.go b/vendor/golang.org/x/crypto/ocsp/ocsp.go
index e6c645e..9d3fffa 100644
--- a/vendor/golang.org/x/crypto/ocsp/ocsp.go
+++ b/vendor/golang.org/x/crypto/ocsp/ocsp.go
@@ -5,7 +5,7 @@
 // Package ocsp parses OCSP responses as specified in RFC 2560. OCSP responses
 // are signed messages attesting to the validity of a certificate for a small
 // period of time. This is used to manage revocation for X.509 certificates.
-package ocsp
+package ocsp // import "golang.org/x/crypto/ocsp"
 
 import (
 	"crypto"
@@ -279,22 +279,21 @@ func getOIDFromHashAlgorithm(target crypto.Hash) asn1.ObjectIdentifier {
 
 // This is the exposed reflection of the internal OCSP structures.
 
-// The status values that can be expressed in OCSP. See RFC 6960.
-// These are used for the Response.Status field.
+// The status values that can be expressed in OCSP.  See RFC 6960.
 const (
 	// Good means that the certificate is valid.
-	Good = 0
+	Good = iota
 	// Revoked means that the certificate has been deliberately revoked.
-	Revoked = 1
+	Revoked
 	// Unknown means that the OCSP responder doesn't know about the certificate.
-	Unknown = 2
+	Unknown
 	// ServerFailed is unused and was never used (see
 	// https://go-review.googlesource.com/#/c/18944). ParseResponse will
 	// return a ResponseError when an error response is parsed.
-	ServerFailed = 3
+	ServerFailed
 )
 
-// The enumerated reasons for revoking a certificate. See RFC 5280.
+// The enumerated reasons for revoking a certificate.  See RFC 5280.
 const (
 	Unspecified          = 0
 	KeyCompromise        = 1
@@ -346,8 +345,6 @@ func (req *Request) Marshal() ([]byte, error) {
 // Response represents an OCSP response containing a single SingleResponse. See
 // RFC 6960.
 type Response struct {
-	Raw []byte
-
 	// Status is one of {Good, Revoked, Unknown}
 	Status                                        int
 	SerialNumber                                  *big.Int
@@ -521,7 +518,6 @@ func ParseResponseForCert(bytes []byte, cert, issuer *x509.Certificate) (*Respon
 	}
 
 	ret := &Response{
-		Raw:                bytes,
 		TBSResponseData:    basicResp.TBSResponseData.Raw,
 		Signature:          basicResp.Signature.RightAlign(),
 		SignatureAlgorithm: getSignatureAlgorithmFromOID(basicResp.SignatureAlgorithm.Algorithm),
@@ -672,7 +668,7 @@ func CreateRequest(cert, issuer *x509.Certificate, opts *RequestOptions) ([]byte
 // The responder cert is used to populate the responder's name field, and the
 // certificate itself is provided alongside the OCSP response signature.
 //
-// The issuer cert is used to populate the IssuerNameHash and IssuerKeyHash fields.
+// The issuer cert is used to puplate the IssuerNameHash and IssuerKeyHash fields.
 //
 // The template is used to populate the SerialNumber, Status, RevokedAt,
 // RevocationReason, ThisUpdate, and NextUpdate fields.
diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
index 28cd99c..593f653 100644
--- a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
+++ b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
@@ -16,7 +16,7 @@ Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To
 choose, you can pass the `New` functions from the different SHA packages to
 pbkdf2.Key.
 */
-package pbkdf2
+package pbkdf2 // import "golang.org/x/crypto/pbkdf2"
 
 import (
 	"crypto/hmac"
@@ -32,7 +32,7 @@ import (
 // can get a derived key for e.g. AES-256 (which needs a 32-byte key) by
 // doing:
 //
-//	dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
+// 	dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
 //
 // Remember to get a good random salt. At least 8 bytes is recommended by the
 // RFC.
diff --git a/vendor/golang.org/x/mod/LICENSE b/vendor/golang.org/x/mod/LICENSE
deleted file mode 100644
index 2a7cf70..0000000
--- a/vendor/golang.org/x/mod/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright 2009 The Go Authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google LLC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/mod/PATENTS b/vendor/golang.org/x/mod/PATENTS
deleted file mode 100644
index 7330990..0000000
--- a/vendor/golang.org/x/mod/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/mod/semver/semver.go b/vendor/golang.org/x/mod/semver/semver.go
deleted file mode 100644
index 628f8fd..0000000
--- a/vendor/golang.org/x/mod/semver/semver.go
+++ /dev/null
@@ -1,407 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package semver implements comparison of semantic version strings.
-// In this package, semantic version strings must begin with a leading "v",
-// as in "v1.0.0".
-//
-// The general form of a semantic version string accepted by this package is
-//
-//	vMAJOR[.MINOR[.PATCH[-PRERELEASE][+BUILD]]]
-//
-// where square brackets indicate optional parts of the syntax;
-// MAJOR, MINOR, and PATCH are decimal integers without extra leading zeros;
-// PRERELEASE and BUILD are each a series of non-empty dot-separated identifiers
-// using only alphanumeric characters and hyphens; and
-// all-numeric PRERELEASE identifiers must not have leading zeros.
-//
-// This package follows Semantic Versioning 2.0.0 (see semver.org)
-// with two exceptions. First, it requires the "v" prefix. Second, it recognizes
-// vMAJOR and vMAJOR.MINOR (with no prerelease or build suffixes)
-// as shorthands for vMAJOR.0.0 and vMAJOR.MINOR.0.
-package semver
-
-import (
-	"slices"
-	"strings"
-)
-
-// parsed returns the parsed form of a semantic version string.
-type parsed struct {
-	major      string
-	minor      string
-	patch      string
-	short      string
-	prerelease string
-	build      string
-}
-
-// IsValid reports whether v is a valid semantic version string.
-func IsValid(v string) bool {
-	_, ok := parse(v)
-	return ok
-}
-
-// Canonical returns the canonical formatting of the semantic version v.
-// It fills in any missing .MINOR or .PATCH and discards build metadata.
-// Two semantic versions compare equal only if their canonical formattings
-// are identical strings.
-// The canonical invalid semantic version is the empty string.
-func Canonical(v string) string {
-	p, ok := parse(v)
-	if !ok {
-		return ""
-	}
-	if p.build != "" {
-		return v[:len(v)-len(p.build)]
-	}
-	if p.short != "" {
-		return v + p.short
-	}
-	return v
-}
-
-// Major returns the major version prefix of the semantic version v.
-// For example, Major("v2.1.0") == "v2".
-// If v is an invalid semantic version string, Major returns the empty string.
-func Major(v string) string {
-	pv, ok := parse(v)
-	if !ok {
-		return ""
-	}
-	return v[:1+len(pv.major)]
-}
-
-// MajorMinor returns the major.minor version prefix of the semantic version v.
-// For example, MajorMinor("v2.1.0") == "v2.1".
-// If v is an invalid semantic version string, MajorMinor returns the empty string.
-func MajorMinor(v string) string {
-	pv, ok := parse(v)
-	if !ok {
-		return ""
-	}
-	i := 1 + len(pv.major)
-	if j := i + 1 + len(pv.minor); j <= len(v) && v[i] == '.' && v[i+1:j] == pv.minor {
-		return v[:j]
-	}
-	return v[:i] + "." + pv.minor
-}
-
-// Prerelease returns the prerelease suffix of the semantic version v.
-// For example, Prerelease("v2.1.0-pre+meta") == "-pre".
-// If v is an invalid semantic version string, Prerelease returns the empty string.
-func Prerelease(v string) string {
-	pv, ok := parse(v)
-	if !ok {
-		return ""
-	}
-	return pv.prerelease
-}
-
-// Build returns the build suffix of the semantic version v.
-// For example, Build("v2.1.0+meta") == "+meta".
-// If v is an invalid semantic version string, Build returns the empty string.
-func Build(v string) string {
-	pv, ok := parse(v)
-	if !ok {
-		return ""
-	}
-	return pv.build
-}
-
-// Compare returns an integer comparing two versions according to
-// semantic version precedence.
-// The result will be 0 if v == w, -1 if v < w, or +1 if v > w.
-//
-// An invalid semantic version string is considered less than a valid one.
-// All invalid semantic version strings compare equal to each other.
-func Compare(v, w string) int {
-	pv, ok1 := parse(v)
-	pw, ok2 := parse(w)
-	if !ok1 && !ok2 {
-		return 0
-	}
-	if !ok1 {
-		return -1
-	}
-	if !ok2 {
-		return +1
-	}
-	if c := compareInt(pv.major, pw.major); c != 0 {
-		return c
-	}
-	if c := compareInt(pv.minor, pw.minor); c != 0 {
-		return c
-	}
-	if c := compareInt(pv.patch, pw.patch); c != 0 {
-		return c
-	}
-	return comparePrerelease(pv.prerelease, pw.prerelease)
-}
-
-// Max canonicalizes its arguments and then returns the version string
-// that compares greater.
-//
-// Deprecated: use [Compare] instead. In most cases, returning a canonicalized
-// version is not expected or desired.
-func Max(v, w string) string {
-	v = Canonical(v)
-	w = Canonical(w)
-	if Compare(v, w) > 0 {
-		return v
-	}
-	return w
-}
-
-// ByVersion implements [sort.Interface] for sorting semantic version strings.
-type ByVersion []string
-
-func (vs ByVersion) Len() int           { return len(vs) }
-func (vs ByVersion) Swap(i, j int)      { vs[i], vs[j] = vs[j], vs[i] }
-func (vs ByVersion) Less(i, j int) bool { return compareVersion(vs[i], vs[j]) < 0 }
-
-// Sort sorts a list of semantic version strings using [Compare] and falls back
-// to use [strings.Compare] if both versions are considered equal.
-func Sort(list []string) {
-	slices.SortFunc(list, compareVersion)
-}
-
-func compareVersion(a, b string) int {
-	cmp := Compare(a, b)
-	if cmp != 0 {
-		return cmp
-	}
-	return strings.Compare(a, b)
-}
-
-func parse(v string) (p parsed, ok bool) {
-	if v == "" || v[0] != 'v' {
-		return
-	}
-	p.major, v, ok = parseInt(v[1:])
-	if !ok {
-		return
-	}
-	if v == "" {
-		p.minor = "0"
-		p.patch = "0"
-		p.short = ".0.0"
-		return
-	}
-	if v[0] != '.' {
-		ok = false
-		return
-	}
-	p.minor, v, ok = parseInt(v[1:])
-	if !ok {
-		return
-	}
-	if v == "" {
-		p.patch = "0"
-		p.short = ".0"
-		return
-	}
-	if v[0] != '.' {
-		ok = false
-		return
-	}
-	p.patch, v, ok = parseInt(v[1:])
-	if !ok {
-		return
-	}
-	if len(v) > 0 && v[0] == '-' {
-		p.prerelease, v, ok = parsePrerelease(v)
-		if !ok {
-			return
-		}
-	}
-	if len(v) > 0 && v[0] == '+' {
-		p.build, v, ok = parseBuild(v)
-		if !ok {
-			return
-		}
-	}
-	if v != "" {
-		ok = false
-		return
-	}
-	ok = true
-	return
-}
-
-func parseInt(v string) (t, rest string, ok bool) {
-	if v == "" {
-		return
-	}
-	if v[0] < '0' || '9' < v[0] {
-		return
-	}
-	i := 1
-	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
-		i++
-	}
-	if v[0] == '0' && i != 1 {
-		return
-	}
-	return v[:i], v[i:], true
-}
-
-func parsePrerelease(v string) (t, rest string, ok bool) {
-	// "A pre-release version MAY be denoted by appending a hyphen and
-	// a series of dot separated identifiers immediately following the patch version.
-	// Identifiers MUST comprise only ASCII alphanumerics and hyphen [0-9A-Za-z-].
-	// Identifiers MUST NOT be empty. Numeric identifiers MUST NOT include leading zeroes."
-	if v == "" || v[0] != '-' {
-		return
-	}
-	i := 1
-	start := 1
-	for i < len(v) && v[i] != '+' {
-		if !isIdentChar(v[i]) && v[i] != '.' {
-			return
-		}
-		if v[i] == '.' {
-			if start == i || isBadNum(v[start:i]) {
-				return
-			}
-			start = i + 1
-		}
-		i++
-	}
-	if start == i || isBadNum(v[start:i]) {
-		return
-	}
-	return v[:i], v[i:], true
-}
-
-func parseBuild(v string) (t, rest string, ok bool) {
-	if v == "" || v[0] != '+' {
-		return
-	}
-	i := 1
-	start := 1
-	for i < len(v) {
-		if !isIdentChar(v[i]) && v[i] != '.' {
-			return
-		}
-		if v[i] == '.' {
-			if start == i {
-				return
-			}
-			start = i + 1
-		}
-		i++
-	}
-	if start == i {
-		return
-	}
-	return v[:i], v[i:], true
-}
-
-func isIdentChar(c byte) bool {
-	return 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' || c == '-'
-}
-
-func isBadNum(v string) bool {
-	i := 0
-	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
-		i++
-	}
-	return i == len(v) && i > 1 && v[0] == '0'
-}
-
-func isNum(v string) bool {
-	i := 0
-	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
-		i++
-	}
-	return i == len(v)
-}
-
-func compareInt(x, y string) int {
-	if x == y {
-		return 0
-	}
-	if len(x) < len(y) {
-		return -1
-	}
-	if len(x) > len(y) {
-		return +1
-	}
-	if x < y {
-		return -1
-	} else {
-		return +1
-	}
-}
-
-func comparePrerelease(x, y string) int {
-	// "When major, minor, and patch are equal, a pre-release version has
-	// lower precedence than a normal version.
-	// Example: 1.0.0-alpha < 1.0.0.
-	// Precedence for two pre-release versions with the same major, minor,
-	// and patch version MUST be determined by comparing each dot separated
-	// identifier from left to right until a difference is found as follows:
-	// identifiers consisting of only digits are compared numerically and
-	// identifiers with letters or hyphens are compared lexically in ASCII
-	// sort order. Numeric identifiers always have lower precedence than
-	// non-numeric identifiers. A larger set of pre-release fields has a
-	// higher precedence than a smaller set, if all of the preceding
-	// identifiers are equal.
-	// Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta <
-	// 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0."
-	if x == y {
-		return 0
-	}
-	if x == "" {
-		return +1
-	}
-	if y == "" {
-		return -1
-	}
-	for x != "" && y != "" {
-		x = x[1:] // skip - or .
-		y = y[1:] // skip - or .
-		var dx, dy string
-		dx, x = nextIdent(x)
-		dy, y = nextIdent(y)
-		if dx != dy {
-			ix := isNum(dx)
-			iy := isNum(dy)
-			if ix != iy {
-				if ix {
-					return -1
-				} else {
-					return +1
-				}
-			}
-			if ix {
-				if len(dx) < len(dy) {
-					return -1
-				}
-				if len(dx) > len(dy) {
-					return +1
-				}
-			}
-			if dx < dy {
-				return -1
-			} else {
-				return +1
-			}
-		}
-	}
-	if x == "" {
-		return -1
-	} else {
-		return +1
-	}
-}
-
-func nextIdent(x string) (dx, rest string) {
-	i := 0
-	for i < len(x) && x[i] != '.' {
-		i++
-	}
-	return x[:i], x[i:]
-}
diff --git a/vendor/golang.org/x/net/AUTHORS b/vendor/golang.org/x/net/AUTHORS
new file mode 100644
index 0000000..15167cd
--- /dev/null
+++ b/vendor/golang.org/x/net/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/net/CONTRIBUTORS b/vendor/golang.org/x/net/CONTRIBUTORS
new file mode 100644
index 0000000..1c4577e
--- /dev/null
+++ b/vendor/golang.org/x/net/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE
index 2a7cf70..6a66aea 100644
--- a/vendor/golang.org/x/net/LICENSE
+++ b/vendor/golang.org/x/net/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 The Go Authors.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google LLC nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/golang.org/x/net/bpf/doc.go b/vendor/golang.org/x/net/bpf/doc.go
index 04ec1c8..ae62feb 100644
--- a/vendor/golang.org/x/net/bpf/doc.go
+++ b/vendor/golang.org/x/net/bpf/doc.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 /*
+
 Package bpf implements marshaling and unmarshaling of programs for the
 Berkeley Packet Filter virtual machine, and provides a Go implementation
 of the virtual machine.
@@ -20,7 +21,7 @@ access to kernel functions, and while conditional branches are
 allowed, they can only jump forwards, to guarantee that there are no
 infinite loops.
 
-# The virtual machine
+The virtual machine
 
 The BPF VM is an accumulator machine. Its main register, called
 register A, is an implicit source and destination in all arithmetic
@@ -49,7 +50,7 @@ to extensions, which are essentially calls to kernel utility
 functions. Currently, the only extensions supported by this package
 are the Linux packet filter extensions.
 
-# Examples
+Examples
 
 This packet filter selects all ARP packets.
 
@@ -76,5 +77,6 @@ This packet filter captures a random 1% sample of traffic.
 		// Ignore.
 		bpf.RetConstant{Val: 0},
 	})
+
 */
 package bpf // import "golang.org/x/net/bpf"
diff --git a/vendor/golang.org/x/net/bpf/vm_instructions.go b/vendor/golang.org/x/net/bpf/vm_instructions.go
index 0aa307c..cf8947c 100644
--- a/vendor/golang.org/x/net/bpf/vm_instructions.go
+++ b/vendor/golang.org/x/net/bpf/vm_instructions.go
@@ -94,7 +94,7 @@ func jumpIfCommon(cond JumpTest, skipTrue, skipFalse uint8, regA uint32, value u
 
 func loadAbsolute(ins LoadAbsolute, in []byte) (uint32, bool) {
 	offset := int(ins.Off)
-	size := ins.Size
+	size := int(ins.Size)
 
 	return loadCommon(in, offset, size)
 }
@@ -121,7 +121,7 @@ func loadExtension(ins LoadExtension, in []byte) uint32 {
 
 func loadIndirect(ins LoadIndirect, in []byte, regX uint32) (uint32, bool) {
 	offset := int(ins.Off) + int(regX)
-	size := ins.Size
+	size := int(ins.Size)
 
 	return loadCommon(in, offset, size)
 }
diff --git a/vendor/golang.org/x/net/http/httpguts/httplex.go b/vendor/golang.org/x/net/http/httpguts/httplex.go
index 9b4de94..c79aa73 100644
--- a/vendor/golang.org/x/net/http/httpguts/httplex.go
+++ b/vendor/golang.org/x/net/http/httpguts/httplex.go
@@ -12,7 +12,7 @@ import (
 	"golang.org/x/net/idna"
 )
 
-var isTokenTable = [256]bool{
+var isTokenTable = [127]bool{
 	'!':  true,
 	'#':  true,
 	'$':  true,
@@ -93,7 +93,12 @@ var isTokenTable = [256]bool{
 }
 
 func IsTokenRune(r rune) bool {
-	return r < utf8.RuneSelf && isTokenTable[byte(r)]
+	i := int(r)
+	return i < len(isTokenTable) && isTokenTable[i]
+}
+
+func isNotToken(r rune) bool {
+	return !IsTokenRune(r)
 }
 
 // HeaderValuesContainsToken reports whether any string in values
@@ -168,15 +173,13 @@ func tokenEqual(t1, t2 string) bool {
 
 // isLWS reports whether b is linear white space, according
 // to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
-//
-//	LWS            = [CRLF] 1*( SP | HT )
+//      LWS            = [CRLF] 1*( SP | HT )
 func isLWS(b byte) bool { return b == ' ' || b == '\t' }
 
 // isCTL reports whether b is a control byte, according
 // to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
-//
-//	CTL            = <any US-ASCII control character
-//	                 (octets 0 - 31) and DEL (127)>
+//      CTL            = <any US-ASCII control character
+//                       (octets 0 - 31) and DEL (127)>
 func isCTL(b byte) bool {
 	const del = 0x7f // a CTL
 	return b < ' ' || b == del
@@ -186,19 +189,18 @@ func isCTL(b byte) bool {
 // HTTP/2 imposes the additional restriction that uppercase ASCII
 // letters are not allowed.
 //
-// RFC 7230 says:
-//
-//	header-field   = field-name ":" OWS field-value OWS
-//	field-name     = token
-//	token          = 1*tchar
-//	tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
-//	        "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
+//  RFC 7230 says:
+//   header-field   = field-name ":" OWS field-value OWS
+//   field-name     = token
+//   token          = 1*tchar
+//   tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
+//           "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
 func ValidHeaderFieldName(v string) bool {
 	if len(v) == 0 {
 		return false
 	}
-	for i := 0; i < len(v); i++ {
-		if !isTokenTable[v[i]] {
+	for _, r := range v {
+		if !IsTokenRune(r) {
 			return false
 		}
 	}
@@ -265,28 +267,27 @@ var validHostByte = [256]bool{
 // ValidHeaderFieldValue reports whether v is a valid "field-value" according to
 // http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2 :
 //
-//	message-header = field-name ":" [ field-value ]
-//	field-value    = *( field-content | LWS )
-//	field-content  = <the OCTETs making up the field-value
-//	                 and consisting of either *TEXT or combinations
-//	                 of token, separators, and quoted-string>
+//        message-header = field-name ":" [ field-value ]
+//        field-value    = *( field-content | LWS )
+//        field-content  = <the OCTETs making up the field-value
+//                         and consisting of either *TEXT or combinations
+//                         of token, separators, and quoted-string>
 //
 // http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 :
 //
-//	TEXT           = <any OCTET except CTLs,
-//	                  but including LWS>
-//	LWS            = [CRLF] 1*( SP | HT )
-//	CTL            = <any US-ASCII control character
-//	                 (octets 0 - 31) and DEL (127)>
+//        TEXT           = <any OCTET except CTLs,
+//                          but including LWS>
+//        LWS            = [CRLF] 1*( SP | HT )
+//        CTL            = <any US-ASCII control character
+//                         (octets 0 - 31) and DEL (127)>
 //
 // RFC 7230 says:
-//
-//	field-value    = *( field-content / obs-fold )
-//	obj-fold       =  N/A to http2, and deprecated
-//	field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
-//	field-vchar    = VCHAR / obs-text
-//	obs-text       = %x80-FF
-//	VCHAR          = "any visible [USASCII] character"
+//  field-value    = *( field-content / obs-fold )
+//  obj-fold       =  N/A to http2, and deprecated
+//  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+//  field-vchar    = VCHAR / obs-text
+//  obs-text       = %x80-FF
+//  VCHAR          = "any visible [USASCII] character"
 //
 // http2 further says: "Similarly, HTTP/2 allows header field values
 // that are not valid. While most of the values that can be encoded
diff --git a/vendor/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile
new file mode 100644
index 0000000..8512245
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/Dockerfile
@@ -0,0 +1,51 @@
+#
+# This Dockerfile builds a recent curl with HTTP/2 client support, using
+# a recent nghttp2 build.
+#
+# See the Makefile for how to tag it. If Docker and that image is found, the
+# Go tests use this curl binary for integration tests.
+#
+
+FROM ubuntu:trusty
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y git-core build-essential wget
+
+RUN apt-get install -y --no-install-recommends \
+       autotools-dev libtool pkg-config zlib1g-dev \
+       libcunit1-dev libssl-dev libxml2-dev libevent-dev \
+       automake autoconf
+
+# The list of packages nghttp2 recommends for h2load:
+RUN apt-get install -y --no-install-recommends make binutils \
+        autoconf automake autotools-dev \
+        libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \
+        libev-dev libevent-dev libjansson-dev libjemalloc-dev \
+        cython python3.4-dev python-setuptools
+
+# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached:
+ENV NGHTTP2_VER 895da9a
+RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git
+
+WORKDIR /root/nghttp2
+RUN git reset --hard $NGHTTP2_VER
+RUN autoreconf -i
+RUN automake
+RUN autoconf
+RUN ./configure
+RUN make
+RUN make install
+
+WORKDIR /root
+RUN wget https://curl.se/download/curl-7.45.0.tar.gz
+RUN tar -zxvf curl-7.45.0.tar.gz
+WORKDIR /root/curl-7.45.0
+RUN ./configure --with-ssl --with-nghttp2=/usr/local
+RUN make
+RUN make install
+RUN ldconfig
+
+CMD ["-h"]
+ENTRYPOINT ["/usr/local/bin/curl"]
+
diff --git a/vendor/golang.org/x/net/http2/Makefile b/vendor/golang.org/x/net/http2/Makefile
new file mode 100644
index 0000000..55fd826
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/Makefile
@@ -0,0 +1,3 @@
+curlimage:
+	docker build -t gohttp2/curl .
+
diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go
index e81b73e..652bc11 100644
--- a/vendor/golang.org/x/net/http2/client_conn_pool.go
+++ b/vendor/golang.org/x/net/http2/client_conn_pool.go
@@ -8,20 +8,14 @@ package http2
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
-	"net"
 	"net/http"
 	"sync"
 )
 
 // ClientConnPool manages a pool of HTTP/2 client connections.
 type ClientConnPool interface {
-	// GetClientConn returns a specific HTTP/2 connection (usually
-	// a TLS-TCP connection) to an HTTP/2 server. On success, the
-	// returned ClientConn accounts for the upcoming RoundTrip
-	// call, so the caller should not omit it. If the caller needs
-	// to, ClientConn.RoundTrip can be called with a bogus
-	// new(http.Request) to release the stream reservation.
 	GetClientConn(req *http.Request, addr string) (*ClientConn, error)
 	MarkDead(*ClientConn)
 }
@@ -48,7 +42,7 @@ type clientConnPool struct {
 	conns        map[string][]*ClientConn // key is host:port
 	dialing      map[string]*dialCall     // currently in-flight dials
 	keys         map[*ClientConn][]string
-	addConnCalls map[string]*addConnCall // in-flight addConnIfNeeded calls
+	addConnCalls map[string]*addConnCall // in-flight addConnIfNeede calls
 }
 
 func (p *clientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
@@ -60,8 +54,28 @@ const (
 	noDialOnMiss = false
 )
 
+// shouldTraceGetConn reports whether getClientConn should call any
+// ClientTrace.GetConn hook associated with the http.Request.
+//
+// This complexity is needed to avoid double calls of the GetConn hook
+// during the back-and-forth between net/http and x/net/http2 (when the
+// net/http.Transport is upgraded to also speak http2), as well as support
+// the case where x/net/http2 is being used directly.
+func (p *clientConnPool) shouldTraceGetConn(st clientConnIdleState) bool {
+	// If our Transport wasn't made via ConfigureTransport, always
+	// trace the GetConn hook if provided, because that means the
+	// http2 package is being used directly and it's the one
+	// dialing, as opposed to net/http.
+	if _, ok := p.t.ConnPool.(noDialClientConnPool); !ok {
+		return true
+	}
+	// Otherwise, only use the GetConn hook if this connection has
+	// been used previously for other requests. For fresh
+	// connections, the net/http package does the dialing.
+	return !st.freshConn
+}
+
 func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
-	// TODO(dneil): Dial a new connection when t.DisableKeepAlives is set?
 	if isConnectionCloseRequest(req) && dialOnMiss {
 		// It gets its own connection.
 		traceGetConn(req, addr)
@@ -75,14 +89,10 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 	for {
 		p.mu.Lock()
 		for _, cc := range p.conns[addr] {
-			if cc.ReserveNewRequest() {
-				// When a connection is presented to us by the net/http package,
-				// the GetConn hook has already been called.
-				// Don't call it a second time here.
-				if !cc.getConnCalled {
+			if st := cc.idleState(); st.canTakeNewRequest {
+				if p.shouldTraceGetConn(st) {
 					traceGetConn(req, addr)
 				}
-				cc.getConnCalled = false
 				p.mu.Unlock()
 				return cc, nil
 			}
@@ -98,13 +108,7 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 		if shouldRetryDial(call, req) {
 			continue
 		}
-		cc, err := call.res, call.err
-		if err != nil {
-			return nil, err
-		}
-		if cc.ReserveNewRequest() {
-			return cc, nil
-		}
+		return call.res, call.err
 	}
 }
 
@@ -139,6 +143,7 @@ func (p *clientConnPool) getStartDialLocked(ctx context.Context, addr string) *d
 func (c *dialCall) dial(ctx context.Context, addr string) {
 	const singleUse = false // shared conn
 	c.res, c.err = c.p.t.dialClientConn(ctx, addr, singleUse)
+	close(c.done)
 
 	c.p.mu.Lock()
 	delete(c.p.dialing, addr)
@@ -146,8 +151,6 @@ func (c *dialCall) dial(ctx context.Context, addr string) {
 		c.p.addConnLocked(addr, c.res)
 	}
 	c.p.mu.Unlock()
-
-	close(c.done)
 }
 
 // addConnIfNeeded makes a NewClientConn out of c if a connection for key doesn't
@@ -158,7 +161,7 @@ func (c *dialCall) dial(ctx context.Context, addr string) {
 // This code decides which ones live or die.
 // The return value used is whether c was used.
 // c is never closed.
-func (p *clientConnPool) addConnIfNeeded(key string, t *Transport, c net.Conn) (used bool, err error) {
+func (p *clientConnPool) addConnIfNeeded(key string, t *Transport, c *tls.Conn) (used bool, err error) {
 	p.mu.Lock()
 	for _, cc := range p.conns[key] {
 		if cc.CanTakeNewRequest() {
@@ -194,15 +197,14 @@ type addConnCall struct {
 	err  error
 }
 
-func (c *addConnCall) run(t *Transport, key string, nc net.Conn) {
-	cc, err := t.NewClientConn(nc)
+func (c *addConnCall) run(t *Transport, key string, tc *tls.Conn) {
+	cc, err := t.NewClientConn(tc)
 
 	p := c.p
 	p.mu.Lock()
 	if err != nil {
 		c.err = err
 	} else {
-		cc.getConnCalled = true // already called by the net/http package
 		p.addConnLocked(key, cc)
 	}
 	delete(p.addConnCalls, key)
diff --git a/vendor/golang.org/x/net/http2/config.go b/vendor/golang.org/x/net/http2/config.go
deleted file mode 100644
index ca645d9..0000000
--- a/vendor/golang.org/x/net/http2/config.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"math"
-	"net/http"
-	"time"
-)
-
-// http2Config is a package-internal version of net/http.HTTP2Config.
-//
-// http.HTTP2Config was added in Go 1.24.
-// When running with a version of net/http that includes HTTP2Config,
-// we merge the configuration with the fields in Transport or Server
-// to produce an http2Config.
-//
-// Zero valued fields in http2Config are interpreted as in the
-// net/http.HTTPConfig documentation.
-//
-// Precedence order for reconciling configurations is:
-//
-//   - Use the net/http.{Server,Transport}.HTTP2Config value, when non-zero.
-//   - Otherwise use the http2.{Server.Transport} value.
-//   - If the resulting value is zero or out of range, use a default.
-type http2Config struct {
-	MaxConcurrentStreams         uint32
-	MaxDecoderHeaderTableSize    uint32
-	MaxEncoderHeaderTableSize    uint32
-	MaxReadFrameSize             uint32
-	MaxUploadBufferPerConnection int32
-	MaxUploadBufferPerStream     int32
-	SendPingTimeout              time.Duration
-	PingTimeout                  time.Duration
-	WriteByteTimeout             time.Duration
-	PermitProhibitedCipherSuites bool
-	CountError                   func(errType string)
-}
-
-// configFromServer merges configuration settings from
-// net/http.Server.HTTP2Config and http2.Server.
-func configFromServer(h1 *http.Server, h2 *Server) http2Config {
-	conf := http2Config{
-		MaxConcurrentStreams:         h2.MaxConcurrentStreams,
-		MaxEncoderHeaderTableSize:    h2.MaxEncoderHeaderTableSize,
-		MaxDecoderHeaderTableSize:    h2.MaxDecoderHeaderTableSize,
-		MaxReadFrameSize:             h2.MaxReadFrameSize,
-		MaxUploadBufferPerConnection: h2.MaxUploadBufferPerConnection,
-		MaxUploadBufferPerStream:     h2.MaxUploadBufferPerStream,
-		SendPingTimeout:              h2.ReadIdleTimeout,
-		PingTimeout:                  h2.PingTimeout,
-		WriteByteTimeout:             h2.WriteByteTimeout,
-		PermitProhibitedCipherSuites: h2.PermitProhibitedCipherSuites,
-		CountError:                   h2.CountError,
-	}
-	fillNetHTTPServerConfig(&conf, h1)
-	setConfigDefaults(&conf, true)
-	return conf
-}
-
-// configFromTransport merges configuration settings from h2 and h2.t1.HTTP2
-// (the net/http Transport).
-func configFromTransport(h2 *Transport) http2Config {
-	conf := http2Config{
-		MaxEncoderHeaderTableSize: h2.MaxEncoderHeaderTableSize,
-		MaxDecoderHeaderTableSize: h2.MaxDecoderHeaderTableSize,
-		MaxReadFrameSize:          h2.MaxReadFrameSize,
-		SendPingTimeout:           h2.ReadIdleTimeout,
-		PingTimeout:               h2.PingTimeout,
-		WriteByteTimeout:          h2.WriteByteTimeout,
-	}
-
-	// Unlike most config fields, where out-of-range values revert to the default,
-	// Transport.MaxReadFrameSize clips.
-	if conf.MaxReadFrameSize < minMaxFrameSize {
-		conf.MaxReadFrameSize = minMaxFrameSize
-	} else if conf.MaxReadFrameSize > maxFrameSize {
-		conf.MaxReadFrameSize = maxFrameSize
-	}
-
-	if h2.t1 != nil {
-		fillNetHTTPTransportConfig(&conf, h2.t1)
-	}
-	setConfigDefaults(&conf, false)
-	return conf
-}
-
-func setDefault[T ~int | ~int32 | ~uint32 | ~int64](v *T, minval, maxval, defval T) {
-	if *v < minval || *v > maxval {
-		*v = defval
-	}
-}
-
-func setConfigDefaults(conf *http2Config, server bool) {
-	setDefault(&conf.MaxConcurrentStreams, 1, math.MaxUint32, defaultMaxStreams)
-	setDefault(&conf.MaxEncoderHeaderTableSize, 1, math.MaxUint32, initialHeaderTableSize)
-	setDefault(&conf.MaxDecoderHeaderTableSize, 1, math.MaxUint32, initialHeaderTableSize)
-	if server {
-		setDefault(&conf.MaxUploadBufferPerConnection, initialWindowSize, math.MaxInt32, 1<<20)
-	} else {
-		setDefault(&conf.MaxUploadBufferPerConnection, initialWindowSize, math.MaxInt32, transportDefaultConnFlow)
-	}
-	if server {
-		setDefault(&conf.MaxUploadBufferPerStream, 1, math.MaxInt32, 1<<20)
-	} else {
-		setDefault(&conf.MaxUploadBufferPerStream, 1, math.MaxInt32, transportDefaultStreamFlow)
-	}
-	setDefault(&conf.MaxReadFrameSize, minMaxFrameSize, maxFrameSize, defaultMaxReadFrameSize)
-	setDefault(&conf.PingTimeout, 1, math.MaxInt64, 15*time.Second)
-}
-
-// adjustHTTP1MaxHeaderSize converts a limit in bytes on the size of an HTTP/1 header
-// to an HTTP/2 MAX_HEADER_LIST_SIZE value.
-func adjustHTTP1MaxHeaderSize(n int64) int64 {
-	// http2's count is in a slightly different unit and includes 32 bytes per pair.
-	// So, take the net/http.Server value and pad it up a bit, assuming 10 headers.
-	const perFieldOverhead = 32 // per http2 spec
-	const typicalHeaders = 10   // conservative
-	return n + typicalHeaders*perFieldOverhead
-}
diff --git a/vendor/golang.org/x/net/http2/config_go124.go b/vendor/golang.org/x/net/http2/config_go124.go
deleted file mode 100644
index 5b516c5..0000000
--- a/vendor/golang.org/x/net/http2/config_go124.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.24
-
-package http2
-
-import "net/http"
-
-// fillNetHTTPServerConfig sets fields in conf from srv.HTTP2.
-func fillNetHTTPServerConfig(conf *http2Config, srv *http.Server) {
-	fillNetHTTPConfig(conf, srv.HTTP2)
-}
-
-// fillNetHTTPTransportConfig sets fields in conf from tr.HTTP2.
-func fillNetHTTPTransportConfig(conf *http2Config, tr *http.Transport) {
-	fillNetHTTPConfig(conf, tr.HTTP2)
-}
-
-func fillNetHTTPConfig(conf *http2Config, h2 *http.HTTP2Config) {
-	if h2 == nil {
-		return
-	}
-	if h2.MaxConcurrentStreams != 0 {
-		conf.MaxConcurrentStreams = uint32(h2.MaxConcurrentStreams)
-	}
-	if h2.MaxEncoderHeaderTableSize != 0 {
-		conf.MaxEncoderHeaderTableSize = uint32(h2.MaxEncoderHeaderTableSize)
-	}
-	if h2.MaxDecoderHeaderTableSize != 0 {
-		conf.MaxDecoderHeaderTableSize = uint32(h2.MaxDecoderHeaderTableSize)
-	}
-	if h2.MaxConcurrentStreams != 0 {
-		conf.MaxConcurrentStreams = uint32(h2.MaxConcurrentStreams)
-	}
-	if h2.MaxReadFrameSize != 0 {
-		conf.MaxReadFrameSize = uint32(h2.MaxReadFrameSize)
-	}
-	if h2.MaxReceiveBufferPerConnection != 0 {
-		conf.MaxUploadBufferPerConnection = int32(h2.MaxReceiveBufferPerConnection)
-	}
-	if h2.MaxReceiveBufferPerStream != 0 {
-		conf.MaxUploadBufferPerStream = int32(h2.MaxReceiveBufferPerStream)
-	}
-	if h2.SendPingTimeout != 0 {
-		conf.SendPingTimeout = h2.SendPingTimeout
-	}
-	if h2.PingTimeout != 0 {
-		conf.PingTimeout = h2.PingTimeout
-	}
-	if h2.WriteByteTimeout != 0 {
-		conf.WriteByteTimeout = h2.WriteByteTimeout
-	}
-	if h2.PermitProhibitedCipherSuites {
-		conf.PermitProhibitedCipherSuites = true
-	}
-	if h2.CountError != nil {
-		conf.CountError = h2.CountError
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/config_pre_go124.go b/vendor/golang.org/x/net/http2/config_pre_go124.go
deleted file mode 100644
index 060fd6c..0000000
--- a/vendor/golang.org/x/net/http2/config_pre_go124.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.24
-
-package http2
-
-import "net/http"
-
-// Pre-Go 1.24 fallback.
-// The Server.HTTP2 and Transport.HTTP2 config fields were added in Go 1.24.
-
-func fillNetHTTPServerConfig(conf *http2Config, srv *http.Server) {}
-
-func fillNetHTTPTransportConfig(conf *http2Config, tr *http.Transport) {}
diff --git a/vendor/golang.org/x/net/http2/databuffer.go b/vendor/golang.org/x/net/http2/databuffer.go
index e6f55cb..a3067f8 100644
--- a/vendor/golang.org/x/net/http2/databuffer.go
+++ b/vendor/golang.org/x/net/http2/databuffer.go
@@ -20,44 +20,41 @@ import (
 // TODO: Benchmark to determine if the pools are necessary. The GC may have
 // improved enough that we can instead allocate chunks like this:
 // make([]byte, max(16<<10, expectedBytesRemaining))
-var dataChunkPools = [...]sync.Pool{
-	{New: func() interface{} { return new([1 << 10]byte) }},
-	{New: func() interface{} { return new([2 << 10]byte) }},
-	{New: func() interface{} { return new([4 << 10]byte) }},
-	{New: func() interface{} { return new([8 << 10]byte) }},
-	{New: func() interface{} { return new([16 << 10]byte) }},
-}
+var (
+	dataChunkSizeClasses = []int{
+		1 << 10,
+		2 << 10,
+		4 << 10,
+		8 << 10,
+		16 << 10,
+	}
+	dataChunkPools = [...]sync.Pool{
+		{New: func() interface{} { return make([]byte, 1<<10) }},
+		{New: func() interface{} { return make([]byte, 2<<10) }},
+		{New: func() interface{} { return make([]byte, 4<<10) }},
+		{New: func() interface{} { return make([]byte, 8<<10) }},
+		{New: func() interface{} { return make([]byte, 16<<10) }},
+	}
+)
 
 func getDataBufferChunk(size int64) []byte {
-	switch {
-	case size <= 1<<10:
-		return dataChunkPools[0].Get().(*[1 << 10]byte)[:]
-	case size <= 2<<10:
-		return dataChunkPools[1].Get().(*[2 << 10]byte)[:]
-	case size <= 4<<10:
-		return dataChunkPools[2].Get().(*[4 << 10]byte)[:]
-	case size <= 8<<10:
-		return dataChunkPools[3].Get().(*[8 << 10]byte)[:]
-	default:
-		return dataChunkPools[4].Get().(*[16 << 10]byte)[:]
+	i := 0
+	for ; i < len(dataChunkSizeClasses)-1; i++ {
+		if size <= int64(dataChunkSizeClasses[i]) {
+			break
+		}
 	}
+	return dataChunkPools[i].Get().([]byte)
 }
 
 func putDataBufferChunk(p []byte) {
-	switch len(p) {
-	case 1 << 10:
-		dataChunkPools[0].Put((*[1 << 10]byte)(p))
-	case 2 << 10:
-		dataChunkPools[1].Put((*[2 << 10]byte)(p))
-	case 4 << 10:
-		dataChunkPools[2].Put((*[4 << 10]byte)(p))
-	case 8 << 10:
-		dataChunkPools[3].Put((*[8 << 10]byte)(p))
-	case 16 << 10:
-		dataChunkPools[4].Put((*[16 << 10]byte)(p))
-	default:
-		panic(fmt.Sprintf("unexpected buffer len=%v", len(p)))
+	for i, n := range dataChunkSizeClasses {
+		if len(p) == n {
+			dataChunkPools[i].Put(p)
+			return
+		}
 	}
+	panic(fmt.Sprintf("unexpected buffer len=%v", len(p)))
 }
 
 // dataBuffer is an io.ReadWriter backed by a list of data chunks.
diff --git a/vendor/golang.org/x/net/http2/errors.go b/vendor/golang.org/x/net/http2/errors.go
index f2067da..c789fa3 100644
--- a/vendor/golang.org/x/net/http2/errors.go
+++ b/vendor/golang.org/x/net/http2/errors.go
@@ -53,13 +53,6 @@ func (e ErrCode) String() string {
 	return fmt.Sprintf("unknown error code 0x%x", uint32(e))
 }
 
-func (e ErrCode) stringToken() string {
-	if s, ok := errCodeName[e]; ok {
-		return s
-	}
-	return fmt.Sprintf("ERR_UNKNOWN_%d", uint32(e))
-}
-
 // ConnectionError is an error that results in the termination of the
 // entire connection.
 type ConnectionError ErrCode
@@ -136,7 +129,7 @@ func (e headerFieldNameError) Error() string {
 type headerFieldValueError string
 
 func (e headerFieldValueError) Error() string {
-	return fmt.Sprintf("invalid header field value for %q", string(e))
+	return fmt.Sprintf("invalid header field value %q", string(e))
 }
 
 var (
diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
index b7dbd18..b51f0e0 100644
--- a/vendor/golang.org/x/net/http2/flow.go
+++ b/vendor/golang.org/x/net/http2/flow.go
@@ -6,91 +6,23 @@
 
 package http2
 
-// inflowMinRefresh is the minimum number of bytes we'll send for a
-// flow control window update.
-const inflowMinRefresh = 4 << 10
-
-// inflow accounts for an inbound flow control window.
-// It tracks both the latest window sent to the peer (used for enforcement)
-// and the accumulated unsent window.
-type inflow struct {
-	avail  int32
-	unsent int32
-}
-
-// init sets the initial window.
-func (f *inflow) init(n int32) {
-	f.avail = n
-}
-
-// add adds n bytes to the window, with a maximum window size of max,
-// indicating that the peer can now send us more data.
-// For example, the user read from a {Request,Response} body and consumed
-// some of the buffered data, so the peer can now send more.
-// It returns the number of bytes to send in a WINDOW_UPDATE frame to the peer.
-// Window updates are accumulated and sent when the unsent capacity
-// is at least inflowMinRefresh or will at least double the peer's available window.
-func (f *inflow) add(n int) (connAdd int32) {
-	if n < 0 {
-		panic("negative update")
-	}
-	unsent := int64(f.unsent) + int64(n)
-	// "A sender MUST NOT allow a flow-control window to exceed 2^31-1 octets."
-	// RFC 7540 Section 6.9.1.
-	const maxWindow = 1<<31 - 1
-	if unsent+int64(f.avail) > maxWindow {
-		panic("flow control update exceeds maximum window size")
-	}
-	f.unsent = int32(unsent)
-	if f.unsent < inflowMinRefresh && f.unsent < f.avail {
-		// If there aren't at least inflowMinRefresh bytes of window to send,
-		// and this update won't at least double the window, buffer the update for later.
-		return 0
-	}
-	f.avail += f.unsent
-	f.unsent = 0
-	return int32(unsent)
-}
-
-// take attempts to take n bytes from the peer's flow control window.
-// It reports whether the window has available capacity.
-func (f *inflow) take(n uint32) bool {
-	if n > uint32(f.avail) {
-		return false
-	}
-	f.avail -= int32(n)
-	return true
-}
-
-// takeInflows attempts to take n bytes from two inflows,
-// typically connection-level and stream-level flows.
-// It reports whether both windows have available capacity.
-func takeInflows(f1, f2 *inflow, n uint32) bool {
-	if n > uint32(f1.avail) || n > uint32(f2.avail) {
-		return false
-	}
-	f1.avail -= int32(n)
-	f2.avail -= int32(n)
-	return true
-}
-
-// outflow is the outbound flow control window's size.
-type outflow struct {
+// flow is the flow control window's size.
+type flow struct {
 	_ incomparable
 
 	// n is the number of DATA bytes we're allowed to send.
-	// An outflow is kept both on a conn and a per-stream.
+	// A flow is kept both on a conn and a per-stream.
 	n int32
 
-	// conn points to the shared connection-level outflow that is
-	// shared by all streams on that conn. It is nil for the outflow
+	// conn points to the shared connection-level flow that is
+	// shared by all streams on that conn. It is nil for the flow
 	// that's on the conn directly.
-	conn *outflow
+	conn *flow
 }
 
-func (f *outflow) setConnFlow(cf *outflow) { f.conn = cf }
+func (f *flow) setConnFlow(cf *flow) { f.conn = cf }
 
-func (f *outflow) available() int32 {
+func (f *flow) available() int32 {
 	n := f.n
 	if f.conn != nil && f.conn.n < n {
 		n = f.conn.n
@@ -98,7 +30,7 @@ func (f *outflow) available() int32 {
 	return n
 }
 
-func (f *outflow) take(n int32) {
+func (f *flow) take(n int32) {
 	if n > f.available() {
 		panic("internal error: took too much")
 	}
@@ -110,7 +42,7 @@ func (f *outflow) take(n int32) {
 
 // add adds n bytes (positive or negative) to the flow control window.
 // It returns false if the sum would exceed 2^31-1.
-func (f *outflow) add(n int32) bool {
+func (f *flow) add(n int32) bool {
 	sum := f.n + n
 	if (sum > n) == (f.n > 0) {
 		f.n = sum
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index db3264d..b95d6f2 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -23,7 +23,7 @@ const frameHeaderLen = 9
 var padZeros = make([]byte, 255) // zeros for padding
 
 // A FrameType is a registered frame type as defined in
-// https://httpwg.org/specs/rfc7540.html#rfc.section.11.2
+// http://http2.github.io/http2-spec/#rfc.section.11.2
 type FrameType uint8
 
 const (
@@ -39,7 +39,7 @@ const (
 	FrameContinuation FrameType = 0x9
 )
 
-var frameNames = [...]string{
+var frameName = map[FrameType]string{
 	FrameData:         "DATA",
 	FrameHeaders:      "HEADERS",
 	FramePriority:     "PRIORITY",
@@ -53,10 +53,10 @@ var frameNames = [...]string{
 }
 
 func (t FrameType) String() string {
-	if int(t) < len(frameNames) {
-		return frameNames[t]
+	if s, ok := frameName[t]; ok {
+		return s
 	}
-	return fmt.Sprintf("UNKNOWN_FRAME_TYPE_%d", t)
+	return fmt.Sprintf("UNKNOWN_FRAME_TYPE_%d", uint8(t))
 }
 
 // Flags is a bitmask of HTTP/2 flags.
@@ -122,9 +122,9 @@ var flagName = map[FrameType]map[Flags]string{
 // a frameParser parses a frame given its FrameHeader and payload
 // bytes. The length of payload will always equal fh.Length (which
 // might be 0).
-type frameParser func(fc *frameCache, fh FrameHeader, countError func(string), payload []byte) (Frame, error)
+type frameParser func(fc *frameCache, fh FrameHeader, payload []byte) (Frame, error)
 
-var frameParsers = [...]frameParser{
+var frameParsers = map[FrameType]frameParser{
 	FrameData:         parseDataFrame,
 	FrameHeaders:      parseHeadersFrame,
 	FramePriority:     parsePriorityFrame,
@@ -138,15 +138,15 @@ var frameParsers = [...]frameParser{
 }
 
 func typeFrameParser(t FrameType) frameParser {
-	if int(t) < len(frameParsers) {
-		return frameParsers[t]
+	if f := frameParsers[t]; f != nil {
+		return f
 	}
 	return parseUnknownFrame
 }
 
 // A FrameHeader is the 9 byte header of all HTTP/2 frames.
 //
-// See https://httpwg.org/specs/rfc7540.html#FrameHeader
+// See http://http2.github.io/http2-spec/#FrameHeader
 type FrameHeader struct {
 	valid bool // caller can access []byte fields in the Frame
 
@@ -225,11 +225,6 @@ var fhBytes = sync.Pool{
 	},
 }
 
-func invalidHTTP1LookingFrameHeader() FrameHeader {
-	fh, _ := readFrameHeader(make([]byte, frameHeaderLen), strings.NewReader("HTTP/1.1 "))
-	return fh
-}
-
 // ReadFrameHeader reads 9 bytes from r and returns a FrameHeader.
 // Most users should use Framer.ReadFrame instead.
 func ReadFrameHeader(r io.Reader) (FrameHeader, error) {
@@ -272,11 +267,6 @@ type Framer struct {
 	lastFrame Frame
 	errDetail error
 
-	// countError is a non-nil func that's called on a frame parse
-	// error with some unique error path token. It's initialized
-	// from Transport.CountError or Server.CountError.
-	countError func(errToken string)
-
 	// lastHeaderStream is non-zero if the last frame was an
 	// unfinished HEADERS/CONTINUATION.
 	lastHeaderStream uint32
@@ -436,7 +426,6 @@ func NewFramer(w io.Writer, r io.Reader) *Framer {
 	fr := &Framer{
 		w:                 w,
 		r:                 r,
-		countError:        func(string) {},
 		logReads:          logFrameReads,
 		logWrites:         logFrameWrites,
 		debugReadLoggerf:  log.Printf,
@@ -495,9 +484,6 @@ func terminalReadFrameError(err error) bool {
 // returned error is ErrFrameTooLarge. Other errors may be of type
 // ConnectionError, StreamError, or anything else from the underlying
 // reader.
-//
-// If ReadFrame returns an error and a non-nil Frame, the Frame's StreamID
-// indicates the stream responsible for the error.
 func (fr *Framer) ReadFrame() (Frame, error) {
 	fr.errDetail = nil
 	if fr.lastFrame != nil {
@@ -508,19 +494,13 @@ func (fr *Framer) ReadFrame() (Frame, error) {
 		return nil, err
 	}
 	if fh.Length > fr.maxReadSize {
-		if fh == invalidHTTP1LookingFrameHeader() {
-			return nil, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", ErrFrameTooLarge)
-		}
 		return nil, ErrFrameTooLarge
 	}
 	payload := fr.getReadBuf(fh.Length)
 	if _, err := io.ReadFull(fr.r, payload); err != nil {
-		if fh == invalidHTTP1LookingFrameHeader() {
-			return nil, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", err)
-		}
 		return nil, err
 	}
-	f, err := typeFrameParser(fh.Type)(fr.frameCache, fh, fr.countError, payload)
+	f, err := typeFrameParser(fh.Type)(fr.frameCache, fh, payload)
 	if err != nil {
 		if ce, ok := err.(connError); ok {
 			return nil, fr.connError(ce.Code, ce.Reason)
@@ -589,7 +569,7 @@ func (fr *Framer) checkFrameOrder(f Frame) error {
 
 // A DataFrame conveys arbitrary, variable-length sequences of octets
 // associated with a stream.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.1
+// See http://http2.github.io/http2-spec/#rfc.section.6.1
 type DataFrame struct {
 	FrameHeader
 	data []byte
@@ -608,14 +588,13 @@ func (f *DataFrame) Data() []byte {
 	return f.data
 }
 
-func parseDataFrame(fc *frameCache, fh FrameHeader, countError func(string), payload []byte) (Frame, error) {
+func parseDataFrame(fc *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
 	if fh.StreamID == 0 {
 		// DATA frames MUST be associated with a stream. If a
 		// DATA frame is received whose stream identifier
 		// field is 0x0, the recipient MUST respond with a
 		// connection error (Section 5.4.1) of type
 		// PROTOCOL_ERROR.
-		countError("frame_data_stream_0")
 		return nil, connError{ErrCodeProtocol, "DATA frame with stream ID 0"}
 	}
 	f := fc.getDataFrame()
@@ -626,7 +605,6 @@ func parseDataFrame(fc *frameCache, fh FrameHeader, countError func(string), pay
 		var err error
 		payload, padSize, err = readByte(payload)
 		if err != nil {
-			countError("frame_data_pad_byte_short")
 			return nil, err
 		}
 	}
@@ -635,7 +613,6 @@ func parseDataFrame(fc *frameCache, fh FrameHeader, countError func(string), pay
 		// length of the frame payload, the recipient MUST
 		// treat this as a connection error.
 		// Filed: https://github.com/http2/http2-spec/issues/610
-		countError("frame_data_pad_too_big")
 		return nil, connError{ErrCodeProtocol, "pad size larger than data payload"}
 	}
 	f.data = payload[:len(payload)-int(padSize)]
@@ -676,15 +653,6 @@ func (f *Framer) WriteData(streamID uint32, endStream bool, data []byte) error {
 // It is the caller's responsibility not to violate the maximum frame size
 // and to not call other Write methods concurrently.
 func (f *Framer) WriteDataPadded(streamID uint32, endStream bool, data, pad []byte) error {
-	if err := f.startWriteDataPadded(streamID, endStream, data, pad); err != nil {
-		return err
-	}
-	return f.endWrite()
-}
-
-// startWriteDataPadded is WriteDataPadded, but only writes the frame to the Framer's internal buffer.
-// The caller should call endWrite to flush the frame to the underlying writer.
-func (f *Framer) startWriteDataPadded(streamID uint32, endStream bool, data, pad []byte) error {
 	if !validStreamID(streamID) && !f.AllowIllegalWrites {
 		return errStreamID
 	}
@@ -714,20 +682,20 @@ func (f *Framer) startWriteDataPadded(streamID uint32, endStream bool, data, pad
 	}
 	f.wbuf = append(f.wbuf, data...)
 	f.wbuf = append(f.wbuf, pad...)
-	return nil
+	return f.endWrite()
 }
 
 // A SettingsFrame conveys configuration parameters that affect how
 // endpoints communicate, such as preferences and constraints on peer
 // behavior.
 //
-// See https://httpwg.org/specs/rfc7540.html#SETTINGS
+// See http://http2.github.io/http2-spec/#SETTINGS
 type SettingsFrame struct {
 	FrameHeader
 	p []byte
 }
 
-func parseSettingsFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseSettingsFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	if fh.Flags.Has(FlagSettingsAck) && fh.Length > 0 {
 		// When this (ACK 0x1) bit is set, the payload of the
 		// SETTINGS frame MUST be empty. Receipt of a
@@ -735,7 +703,6 @@ func parseSettingsFrame(_ *frameCache, fh FrameHeader, countError func(string),
 		// field value other than 0 MUST be treated as a
 		// connection error (Section 5.4.1) of type
 		// FRAME_SIZE_ERROR.
-		countError("frame_settings_ack_with_length")
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	if fh.StreamID != 0 {
@@ -746,17 +713,14 @@ func parseSettingsFrame(_ *frameCache, fh FrameHeader, countError func(string),
 		// field is anything other than 0x0, the endpoint MUST
 		// respond with a connection error (Section 5.4.1) of
 		// type PROTOCOL_ERROR.
-		countError("frame_settings_has_stream")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	if len(p)%6 != 0 {
-		countError("frame_settings_mod_6")
 		// Expecting even number of 6 byte settings.
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	f := &SettingsFrame{FrameHeader: fh, p: p}
 	if v, ok := f.Value(SettingInitialWindowSize); ok && v > (1<<31)-1 {
-		countError("frame_settings_window_size_too_big")
 		// Values above the maximum flow control window size of 2^31 - 1 MUST
 		// be treated as a connection error (Section 5.4.1) of type
 		// FLOW_CONTROL_ERROR.
@@ -860,7 +824,7 @@ func (f *Framer) WriteSettingsAck() error {
 // A PingFrame is a mechanism for measuring a minimal round trip time
 // from the sender, as well as determining whether an idle connection
 // is still functional.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.7
+// See http://http2.github.io/http2-spec/#rfc.section.6.7
 type PingFrame struct {
 	FrameHeader
 	Data [8]byte
@@ -868,13 +832,11 @@ type PingFrame struct {
 
 func (f *PingFrame) IsAck() bool { return f.Flags.Has(FlagPingAck) }
 
-func parsePingFrame(_ *frameCache, fh FrameHeader, countError func(string), payload []byte) (Frame, error) {
+func parsePingFrame(_ *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
 	if len(payload) != 8 {
-		countError("frame_ping_length")
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	if fh.StreamID != 0 {
-		countError("frame_ping_has_stream")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	f := &PingFrame{FrameHeader: fh}
@@ -893,7 +855,7 @@ func (f *Framer) WritePing(ack bool, data [8]byte) error {
 }
 
 // A GoAwayFrame informs the remote peer to stop creating streams on this connection.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.8
+// See http://http2.github.io/http2-spec/#rfc.section.6.8
 type GoAwayFrame struct {
 	FrameHeader
 	LastStreamID uint32
@@ -910,13 +872,11 @@ func (f *GoAwayFrame) DebugData() []byte {
 	return f.debugData
 }
 
-func parseGoAwayFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseGoAwayFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	if fh.StreamID != 0 {
-		countError("frame_goaway_has_stream")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	if len(p) < 8 {
-		countError("frame_goaway_short")
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	return &GoAwayFrame{
@@ -952,20 +912,19 @@ func (f *UnknownFrame) Payload() []byte {
 	return f.p
 }
 
-func parseUnknownFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseUnknownFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	return &UnknownFrame{fh, p}, nil
 }
 
 // A WindowUpdateFrame is used to implement flow control.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.9
+// See http://http2.github.io/http2-spec/#rfc.section.6.9
 type WindowUpdateFrame struct {
 	FrameHeader
 	Increment uint32 // never read with high bit set
 }
 
-func parseWindowUpdateFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseWindowUpdateFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	if len(p) != 4 {
-		countError("frame_windowupdate_bad_len")
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	inc := binary.BigEndian.Uint32(p[:4]) & 0x7fffffff // mask off high reserved bit
@@ -977,10 +936,8 @@ func parseWindowUpdateFrame(_ *frameCache, fh FrameHeader, countError func(strin
 		// control window MUST be treated as a connection
 		// error (Section 5.4.1).
 		if fh.StreamID == 0 {
-			countError("frame_windowupdate_zero_inc_conn")
 			return nil, ConnectionError(ErrCodeProtocol)
 		}
-		countError("frame_windowupdate_zero_inc_stream")
 		return nil, streamError(fh.StreamID, ErrCodeProtocol)
 	}
 	return &WindowUpdateFrame{
@@ -1031,7 +988,7 @@ func (f *HeadersFrame) HasPriority() bool {
 	return f.FrameHeader.Flags.Has(FlagHeadersPriority)
 }
 
-func parseHeadersFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (_ Frame, err error) {
+func parseHeadersFrame(_ *frameCache, fh FrameHeader, p []byte) (_ Frame, err error) {
 	hf := &HeadersFrame{
 		FrameHeader: fh,
 	}
@@ -1040,13 +997,11 @@ func parseHeadersFrame(_ *frameCache, fh FrameHeader, countError func(string), p
 		// is received whose stream identifier field is 0x0, the recipient MUST
 		// respond with a connection error (Section 5.4.1) of type
 		// PROTOCOL_ERROR.
-		countError("frame_headers_zero_stream")
 		return nil, connError{ErrCodeProtocol, "HEADERS frame with stream ID 0"}
 	}
 	var padLength uint8
 	if fh.Flags.Has(FlagHeadersPadded) {
 		if p, padLength, err = readByte(p); err != nil {
-			countError("frame_headers_pad_short")
 			return
 		}
 	}
@@ -1054,19 +1009,16 @@ func parseHeadersFrame(_ *frameCache, fh FrameHeader, countError func(string), p
 		var v uint32
 		p, v, err = readUint32(p)
 		if err != nil {
-			countError("frame_headers_prio_short")
 			return nil, err
 		}
 		hf.Priority.StreamDep = v & 0x7fffffff
 		hf.Priority.Exclusive = (v != hf.Priority.StreamDep) // high bit was set
 		p, hf.Priority.Weight, err = readByte(p)
 		if err != nil {
-			countError("frame_headers_prio_weight_short")
 			return nil, err
 		}
 	}
 	if len(p)-int(padLength) < 0 {
-		countError("frame_headers_pad_too_big")
 		return nil, streamError(fh.StreamID, ErrCodeProtocol)
 	}
 	hf.headerFragBuf = p[:len(p)-int(padLength)]
@@ -1146,7 +1098,7 @@ func (f *Framer) WriteHeaders(p HeadersFrameParam) error {
 }
 
 // A PriorityFrame specifies the sender-advised priority of a stream.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.3
+// See http://http2.github.io/http2-spec/#rfc.section.6.3
 type PriorityFrame struct {
 	FrameHeader
 	PriorityParam
@@ -1173,13 +1125,11 @@ func (p PriorityParam) IsZero() bool {
 	return p == PriorityParam{}
 }
 
-func parsePriorityFrame(_ *frameCache, fh FrameHeader, countError func(string), payload []byte) (Frame, error) {
+func parsePriorityFrame(_ *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
 	if fh.StreamID == 0 {
-		countError("frame_priority_zero_stream")
 		return nil, connError{ErrCodeProtocol, "PRIORITY frame with stream ID 0"}
 	}
 	if len(payload) != 5 {
-		countError("frame_priority_bad_length")
 		return nil, connError{ErrCodeFrameSize, fmt.Sprintf("PRIORITY frame payload size was %d; want 5", len(payload))}
 	}
 	v := binary.BigEndian.Uint32(payload[:4])
@@ -1216,19 +1166,17 @@ func (f *Framer) WritePriority(streamID uint32, p PriorityParam) error {
 }
 
 // A RSTStreamFrame allows for abnormal termination of a stream.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.4
+// See http://http2.github.io/http2-spec/#rfc.section.6.4
 type RSTStreamFrame struct {
 	FrameHeader
 	ErrCode ErrCode
 }
 
-func parseRSTStreamFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseRSTStreamFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	if len(p) != 4 {
-		countError("frame_rststream_bad_len")
 		return nil, ConnectionError(ErrCodeFrameSize)
 	}
 	if fh.StreamID == 0 {
-		countError("frame_rststream_zero_stream")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	return &RSTStreamFrame{fh, ErrCode(binary.BigEndian.Uint32(p[:4]))}, nil
@@ -1248,15 +1196,14 @@ func (f *Framer) WriteRSTStream(streamID uint32, code ErrCode) error {
 }
 
 // A ContinuationFrame is used to continue a sequence of header block fragments.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.10
+// See http://http2.github.io/http2-spec/#rfc.section.6.10
 type ContinuationFrame struct {
 	FrameHeader
 	headerFragBuf []byte
 }
 
-func parseContinuationFrame(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (Frame, error) {
+func parseContinuationFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
 	if fh.StreamID == 0 {
-		countError("frame_continuation_zero_stream")
 		return nil, connError{ErrCodeProtocol, "CONTINUATION frame with stream ID 0"}
 	}
 	return &ContinuationFrame{fh, p}, nil
@@ -1289,7 +1236,7 @@ func (f *Framer) WriteContinuation(streamID uint32, endHeaders bool, headerBlock
 }
 
 // A PushPromiseFrame is used to initiate a server stream.
-// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.6
+// See http://http2.github.io/http2-spec/#rfc.section.6.6
 type PushPromiseFrame struct {
 	FrameHeader
 	PromiseID     uint32
@@ -1305,7 +1252,7 @@ func (f *PushPromiseFrame) HeadersEnded() bool {
 	return f.FrameHeader.Flags.Has(FlagPushPromiseEndHeaders)
 }
 
-func parsePushPromise(_ *frameCache, fh FrameHeader, countError func(string), p []byte) (_ Frame, err error) {
+func parsePushPromise(_ *frameCache, fh FrameHeader, p []byte) (_ Frame, err error) {
 	pp := &PushPromiseFrame{
 		FrameHeader: fh,
 	}
@@ -1316,7 +1263,6 @@ func parsePushPromise(_ *frameCache, fh FrameHeader, countError func(string), p
 		// with. If the stream identifier field specifies the value
 		// 0x0, a recipient MUST respond with a connection error
 		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		countError("frame_pushpromise_zero_stream")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	// The PUSH_PROMISE frame includes optional padding.
@@ -1324,21 +1270,18 @@ func parsePushPromise(_ *frameCache, fh FrameHeader, countError func(string), p
 	var padLength uint8
 	if fh.Flags.Has(FlagPushPromisePadded) {
 		if p, padLength, err = readByte(p); err != nil {
-			countError("frame_pushpromise_pad_short")
 			return
 		}
 	}
 
 	p, pp.PromiseID, err = readUint32(p)
 	if err != nil {
-		countError("frame_pushpromise_promiseid_short")
 		return
 	}
 	pp.PromiseID = pp.PromiseID & (1<<31 - 1)
 
 	if int(padLength) > len(p) {
 		// like the DATA frame, error out if padding is longer than the body.
-		countError("frame_pushpromise_pad_too_big")
 		return nil, ConnectionError(ErrCodeProtocol)
 	}
 	pp.headerFragBuf = p[:len(p)-int(padLength)]
@@ -1501,7 +1444,7 @@ func (mh *MetaHeadersFrame) checkPseudos() error {
 	pf := mh.PseudoFields()
 	for i, hf := range pf {
 		switch hf.Name {
-		case ":method", ":path", ":scheme", ":authority", ":protocol":
+		case ":method", ":path", ":scheme", ":authority":
 			isRequest = true
 		case ":status":
 			isResponse = true
@@ -1509,7 +1452,7 @@ func (mh *MetaHeadersFrame) checkPseudos() error {
 			return pseudoHeaderError(hf.Name)
 		}
 		// Check for duplicates.
-		// This would be a bad algorithm, but N is 5.
+		// This would be a bad algorithm, but N is 4.
 		// And this doesn't allocate.
 		for _, hf2 := range pf[:i] {
 			if hf.Name == hf2.Name {
@@ -1524,18 +1467,19 @@ func (mh *MetaHeadersFrame) checkPseudos() error {
 }
 
 func (fr *Framer) maxHeaderStringLen() int {
-	v := int(fr.maxHeaderListSize())
-	if v < 0 {
-		// If maxHeaderListSize overflows an int, use no limit (0).
-		return 0
+	v := fr.maxHeaderListSize()
+	if uint32(int(v)) == v {
+		return int(v)
 	}
-	return v
+	// They had a crazy big number for MaxHeaderBytes anyway,
+	// so give them unlimited header lengths:
+	return 0
 }
 
 // readMetaFrame returns 0 or more CONTINUATION frames from fr and
 // merge them into the provided hf and returns a MetaHeadersFrame
 // with the decoded hpack values.
-func (fr *Framer) readMetaFrame(hf *HeadersFrame) (Frame, error) {
+func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
 	if fr.AllowIllegalReads {
 		return nil, errors.New("illegal use of AllowIllegalReads with ReadMetaHeaders")
 	}
@@ -1554,8 +1498,7 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (Frame, error) {
 			fr.debugReadLoggerf("http2: decoded hpack field %+v", hf)
 		}
 		if !httpguts.ValidHeaderFieldValue(hf.Value) {
-			// Don't include the value in the error, because it may be sensitive.
-			invalid = headerFieldValueError(hf.Name)
+			invalid = headerFieldValueError(hf.Value)
 		}
 		isPseudo := strings.HasPrefix(hf.Name, ":")
 		if isPseudo {
@@ -1578,7 +1521,6 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (Frame, error) {
 		if size > remainSize {
 			hdec.SetEmitEnabled(false)
 			mh.Truncated = true
-			remainSize = 0
 			return
 		}
 		remainSize -= size
@@ -1591,38 +1533,8 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (Frame, error) {
 	var hc headersOrContinuation = hf
 	for {
 		frag := hc.HeaderBlockFragment()
-
-		// Avoid parsing large amounts of headers that we will then discard.
-		// If the sender exceeds the max header list size by too much,
-		// skip parsing the fragment and close the connection.
-		//
-		// "Too much" is either any CONTINUATION frame after we've already
-		// exceeded the max header list size (in which case remainSize is 0),
-		// or a frame whose encoded size is more than twice the remaining
-		// header list bytes we're willing to accept.
-		if int64(len(frag)) > int64(2*remainSize) {
-			if VerboseLogs {
-				log.Printf("http2: header list too large")
-			}
-			// It would be nice to send a RST_STREAM before sending the GOAWAY,
-			// but the structure of the server's frame writer makes this difficult.
-			return mh, ConnectionError(ErrCodeProtocol)
-		}
-
-		// Also close the connection after any CONTINUATION frame following an
-		// invalid header, since we stop tracking the size of the headers after
-		// an invalid one.
-		if invalid != nil {
-			if VerboseLogs {
-				log.Printf("http2: invalid header: %v", invalid)
-			}
-			// It would be nice to send a RST_STREAM before sending the GOAWAY,
-			// but the structure of the server's frame writer makes this difficult.
-			return mh, ConnectionError(ErrCodeProtocol)
-		}
-
 		if _, err := hdec.Write(frag); err != nil {
-			return mh, ConnectionError(ErrCodeCompression)
+			return nil, ConnectionError(ErrCodeCompression)
 		}
 
 		if hc.HeadersEnded() {
@@ -1639,7 +1551,7 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (Frame, error) {
 	mh.HeadersFrame.invalidate()
 
 	if err := hdec.Close(); err != nil {
-		return mh, ConnectionError(ErrCodeCompression)
+		return nil, ConnectionError(ErrCodeCompression)
 	}
 	if invalid != nil {
 		fr.errDetail = invalid
diff --git a/vendor/golang.org/x/net/http2/go111.go b/vendor/golang.org/x/net/http2/go111.go
new file mode 100644
index 0000000..5bf62b0
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go111.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.11
+// +build go1.11
+
+package http2
+
+import (
+	"net/http/httptrace"
+	"net/textproto"
+)
+
+func traceHasWroteHeaderField(trace *httptrace.ClientTrace) bool {
+	return trace != nil && trace.WroteHeaderField != nil
+}
+
+func traceWroteHeaderField(trace *httptrace.ClientTrace, k, v string) {
+	if trace != nil && trace.WroteHeaderField != nil {
+		trace.WroteHeaderField(k, []string{v})
+	}
+}
+
+func traceGot1xxResponseFunc(trace *httptrace.ClientTrace) func(int, textproto.MIMEHeader) error {
+	if trace != nil {
+		return trace.Got1xxResponse
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/go115.go b/vendor/golang.org/x/net/http2/go115.go
new file mode 100644
index 0000000..908af1a
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go115.go
@@ -0,0 +1,27 @@
+// Copyright 2021 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.15
+// +build go1.15
+
+package http2
+
+import (
+	"context"
+	"crypto/tls"
+)
+
+// dialTLSWithContext uses tls.Dialer, added in Go 1.15, to open a TLS
+// connection.
+func (t *Transport) dialTLSWithContext(ctx context.Context, network, addr string, cfg *tls.Config) (*tls.Conn, error) {
+	dialer := &tls.Dialer{
+		Config: cfg,
+	}
+	cn, err := dialer.DialContext(ctx, network, addr)
+	if err != nil {
+		return nil, err
+	}
+	tlsCn := cn.(*tls.Conn) // DialContext comment promises this will always succeed
+	return tlsCn, nil
+}
diff --git a/vendor/golang.org/x/net/http2/h2c/h2c.go b/vendor/golang.org/x/net/http2/h2c/h2c.go
index 19e9479..c0970d8 100644
--- a/vendor/golang.org/x/net/http2/h2c/h2c.go
+++ b/vendor/golang.org/x/net/http2/h2c/h2c.go
@@ -12,6 +12,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/base64"
+	"encoding/binary"
 	"errors"
 	"fmt"
 	"io"
@@ -24,6 +25,7 @@ import (
 
 	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
 )
 
 var (
@@ -44,7 +46,7 @@ func init() {
 // HTTP/1, but unlikely to occur in practice and (2) Upgrading from HTTP/1 to
 // h2c - this works by using the HTTP/1 Upgrade header to request an upgrade to
 // h2c. When either of those situations occur we hijack the HTTP/1 connection,
-// convert it to an HTTP/2 connection and pass the net.Conn to http2.ServeConn.
+// convert it to a HTTP/2 connection and pass the net.Conn to http2.ServeConn.
 type h2cHandler struct {
 	Handler http.Handler
 	s       *http2.Server
@@ -59,10 +61,6 @@ type h2cHandler struct {
 // Once a request is recognized as h2c, we hijack the connection and convert it
 // to an HTTP/2 connection which is understandable to s.ServeConn. (s.ServeConn
 // understands HTTP/2 except for the h2c part of it.)
-//
-// The first request on an h2c connection is read entirely into memory before
-// the Handler is called. To limit the memory consumed by this request, wrap
-// the result of NewHandler in an http.MaxBytesHandler.
 func NewHandler(h http.Handler, s *http2.Server) http.Handler {
 	return &h2cHandler{
 		Handler: h,
@@ -70,15 +68,6 @@ func NewHandler(h http.Handler, s *http2.Server) http.Handler {
 	}
 }
 
-// extractServer extracts existing http.Server instance from http.Request or create an empty http.Server
-func extractServer(r *http.Request) *http.Server {
-	server, ok := r.Context().Value(http.ServerContextKey).(*http.Server)
-	if ok {
-		return server
-	}
-	return new(http.Server)
-}
-
 // ServeHTTP implement the h2c support that is enabled by h2c.GetH2CHandler.
 func (s h2cHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Handle h2c with prior knowledge (RFC 7540 Section 3.4)
@@ -94,34 +83,24 @@ func (s h2cHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		defer conn.Close()
+
 		s.s.ServeConn(conn, &http2.ServeConnOpts{
-			Context:          r.Context(),
-			BaseConfig:       extractServer(r),
-			Handler:          s.Handler,
-			SawClientPreface: true,
+			Context: r.Context(),
+			Handler: s.Handler,
 		})
 		return
 	}
 	// Handle Upgrade to h2c (RFC 7540 Section 3.2)
-	if isH2CUpgrade(r.Header) {
-		conn, settings, err := h2cUpgrade(w, r)
-		if err != nil {
-			if http2VerboseLogs {
-				log.Printf("h2c: error h2c upgrade: %v", err)
-			}
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
+	if conn, err := h2cUpgrade(w, r); err == nil {
 		defer conn.Close()
+
 		s.s.ServeConn(conn, &http2.ServeConnOpts{
-			Context:        r.Context(),
-			BaseConfig:     extractServer(r),
-			Handler:        s.Handler,
-			UpgradeRequest: r,
-			Settings:       settings,
+			Context: r.Context(),
+			Handler: s.Handler,
 		})
 		return
 	}
+
 	s.Handler.ServeHTTP(w, r)
 	return
 }
@@ -132,10 +111,13 @@ func (s h2cHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // of the body, and reforward the client preface on the net.Conn this function
 // creates.
 func initH2CWithPriorKnowledge(w http.ResponseWriter) (net.Conn, error) {
-	rc := http.NewResponseController(w)
-	conn, rw, err := rc.Hijack()
+	hijacker, ok := w.(http.Hijacker)
+	if !ok {
+		panic("Hijack not supported.")
+	}
+	conn, rw, err := hijacker.Hijack()
 	if err != nil {
-		return nil, err
+		panic(fmt.Sprintf("Hijack failed: %v", err))
 	}
 
 	const expectedBody = "SM\r\n\r\n"
@@ -143,40 +125,249 @@ func initH2CWithPriorKnowledge(w http.ResponseWriter) (net.Conn, error) {
 	buf := make([]byte, len(expectedBody))
 	n, err := io.ReadFull(rw, buf)
 	if err != nil {
-		return nil, fmt.Errorf("h2c: error reading client preface: %s", err)
+		return nil, fmt.Errorf("could not read from the buffer: %s", err)
 	}
 
 	if string(buf[:n]) == expectedBody {
-		return newBufConn(conn, rw), nil
+		c := &rwConn{
+			Conn:      conn,
+			Reader:    io.MultiReader(strings.NewReader(http2.ClientPreface), rw),
+			BufWriter: rw.Writer,
+		}
+		return c, nil
 	}
 
 	conn.Close()
-	return nil, errors.New("h2c: invalid client preface")
+	if http2VerboseLogs {
+		log.Printf(
+			"h2c: missing the request body portion of the client preface. Wanted: %v Got: %v",
+			[]byte(expectedBody),
+			buf[0:n],
+		)
+	}
+	return nil, errors.New("invalid client preface")
+}
+
+// drainClientPreface reads a single instance of the HTTP/2 client preface from
+// the supplied reader.
+func drainClientPreface(r io.Reader) error {
+	var buf bytes.Buffer
+	prefaceLen := int64(len(http2.ClientPreface))
+	n, err := io.CopyN(&buf, r, prefaceLen)
+	if err != nil {
+		return err
+	}
+	if n != prefaceLen || buf.String() != http2.ClientPreface {
+		return fmt.Errorf("Client never sent: %s", http2.ClientPreface)
+	}
+	return nil
 }
 
 // h2cUpgrade establishes a h2c connection using the HTTP/1 upgrade (Section 3.2).
-func h2cUpgrade(w http.ResponseWriter, r *http.Request) (_ net.Conn, settings []byte, err error) {
-	settings, err = getH2Settings(r.Header)
-	if err != nil {
-		return nil, nil, err
+func h2cUpgrade(w http.ResponseWriter, r *http.Request) (net.Conn, error) {
+	if !isH2CUpgrade(r.Header) {
+		return nil, errors.New("non-conforming h2c headers")
 	}
 
-	body, err := io.ReadAll(r.Body)
+	// Initial bytes we put into conn to fool http2 server
+	initBytes, _, err := convertH1ReqToH2(r)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	r.Body = io.NopCloser(bytes.NewBuffer(body))
 
-	rc := http.NewResponseController(w)
-	conn, rw, err := rc.Hijack()
+	hijacker, ok := w.(http.Hijacker)
+	if !ok {
+		return nil, errors.New("hijack not supported.")
+	}
+	conn, rw, err := hijacker.Hijack()
 	if err != nil {
-		return nil, nil, err
+		return nil, fmt.Errorf("hijack failed: %v", err)
 	}
 
 	rw.Write([]byte("HTTP/1.1 101 Switching Protocols\r\n" +
 		"Connection: Upgrade\r\n" +
 		"Upgrade: h2c\r\n\r\n"))
-	return newBufConn(conn, rw), settings, nil
+	rw.Flush()
+
+	// A conforming client will now send an H2 client preface which need to drain
+	// since we already sent this.
+	if err := drainClientPreface(rw); err != nil {
+		return nil, err
+	}
+
+	c := &rwConn{
+		Conn:      conn,
+		Reader:    io.MultiReader(initBytes, rw),
+		BufWriter: newSettingsAckSwallowWriter(rw.Writer),
+	}
+	return c, nil
+}
+
+// convert the data contained in the HTTP/1 upgrade request into the HTTP/2
+// version in byte form.
+func convertH1ReqToH2(r *http.Request) (*bytes.Buffer, []http2.Setting, error) {
+	h2Bytes := bytes.NewBuffer([]byte((http2.ClientPreface)))
+	framer := http2.NewFramer(h2Bytes, nil)
+	settings, err := getH2Settings(r.Header)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if err := framer.WriteSettings(settings...); err != nil {
+		return nil, nil, err
+	}
+
+	headerBytes, err := getH2HeaderBytes(r, getMaxHeaderTableSize(settings))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	maxFrameSize := int(getMaxFrameSize(settings))
+	needOneHeader := len(headerBytes) < maxFrameSize
+	err = framer.WriteHeaders(http2.HeadersFrameParam{
+		StreamID:      1,
+		BlockFragment: headerBytes,
+		EndHeaders:    needOneHeader,
+	})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	for i := maxFrameSize; i < len(headerBytes); i += maxFrameSize {
+		if len(headerBytes)-i > maxFrameSize {
+			if err := framer.WriteContinuation(1,
+				false, // endHeaders
+				headerBytes[i:maxFrameSize]); err != nil {
+				return nil, nil, err
+			}
+		} else {
+			if err := framer.WriteContinuation(1,
+				true, // endHeaders
+				headerBytes[i:]); err != nil {
+				return nil, nil, err
+			}
+		}
+	}
+
+	return h2Bytes, settings, nil
+}
+
+// getMaxFrameSize returns the SETTINGS_MAX_FRAME_SIZE. If not present default
+// value is 16384 as specified by RFC 7540 Section 6.5.2.
+func getMaxFrameSize(settings []http2.Setting) uint32 {
+	for _, setting := range settings {
+		if setting.ID == http2.SettingMaxFrameSize {
+			return setting.Val
+		}
+	}
+	return 16384
+}
+
+// getMaxHeaderTableSize returns the SETTINGS_HEADER_TABLE_SIZE. If not present
+// default value is 4096 as specified by RFC 7540 Section 6.5.2.
+func getMaxHeaderTableSize(settings []http2.Setting) uint32 {
+	for _, setting := range settings {
+		if setting.ID == http2.SettingHeaderTableSize {
+			return setting.Val
+		}
+	}
+	return 4096
+}
+
+// bufWriter is a Writer interface that also has a Flush method.
+type bufWriter interface {
+	io.Writer
+	Flush() error
+}
+
+// rwConn implements net.Conn but overrides Read and Write so that reads and
+// writes are forwarded to the provided io.Reader and bufWriter.
+type rwConn struct {
+	net.Conn
+	io.Reader
+	BufWriter bufWriter
+}
+
+// Read forwards reads to the underlying Reader.
+func (c *rwConn) Read(p []byte) (int, error) {
+	return c.Reader.Read(p)
+}
+
+// Write forwards writes to the underlying bufWriter and immediately flushes.
+func (c *rwConn) Write(p []byte) (int, error) {
+	n, err := c.BufWriter.Write(p)
+	if err := c.BufWriter.Flush(); err != nil {
+		return 0, err
+	}
+	return n, err
+}
+
+// settingsAckSwallowWriter is a writer that normally forwards bytes to its
+// underlying Writer, but swallows the first SettingsAck frame that it sees.
+type settingsAckSwallowWriter struct {
+	Writer     *bufio.Writer
+	buf        []byte
+	didSwallow bool
+}
+
+// newSettingsAckSwallowWriter returns a new settingsAckSwallowWriter.
+func newSettingsAckSwallowWriter(w *bufio.Writer) *settingsAckSwallowWriter {
+	return &settingsAckSwallowWriter{
+		Writer:     w,
+		buf:        make([]byte, 0),
+		didSwallow: false,
+	}
+}
+
+// Write implements io.Writer interface. Normally forwards bytes to w.Writer,
+// except for the first Settings ACK frame that it sees.
+func (w *settingsAckSwallowWriter) Write(p []byte) (int, error) {
+	if !w.didSwallow {
+		w.buf = append(w.buf, p...)
+		// Process all the frames we have collected into w.buf
+		for {
+			// Append until we get full frame header which is 9 bytes
+			if len(w.buf) < 9 {
+				break
+			}
+			// Check if we have collected a whole frame.
+			fh, err := http2.ReadFrameHeader(bytes.NewBuffer(w.buf))
+			if err != nil {
+				// Corrupted frame, fail current Write
+				return 0, err
+			}
+			fSize := fh.Length + 9
+			if uint32(len(w.buf)) < fSize {
+				// Have not collected whole frame. Stop processing buf, and withhold on
+				// forward bytes to w.Writer until we get the full frame.
+				break
+			}
+
+			// We have now collected a whole frame.
+			if fh.Type == http2.FrameSettings && fh.Flags.Has(http2.FlagSettingsAck) {
+				// If Settings ACK frame, do not forward to underlying writer, remove
+				// bytes from w.buf, and record that we have swallowed Settings Ack
+				// frame.
+				w.didSwallow = true
+				w.buf = w.buf[fSize:]
+				continue
+			}
+
+			// Not settings ack frame. Forward bytes to w.Writer.
+			if _, err := w.Writer.Write(w.buf[:fSize]); err != nil {
+				// Couldn't forward bytes. Fail current Write.
+				return 0, err
+			}
+			w.buf = w.buf[fSize:]
+		}
+		return len(p), nil
+	}
+	return w.Writer.Write(p)
+}
+
+// Flush calls w.Writer.Flush.
+func (w *settingsAckSwallowWriter) Flush() error {
+	return w.Writer.Flush()
 }
 
 // isH2CUpgrade returns true if the header properly request an upgrade to h2c
@@ -186,8 +377,9 @@ func isH2CUpgrade(h http.Header) bool {
 		httpguts.HeaderValuesContainsToken(h[textproto.CanonicalMIMEHeaderKey("Connection")], "HTTP2-Settings")
 }
 
-// getH2Settings returns the settings in the HTTP2-Settings header.
-func getH2Settings(h http.Header) ([]byte, error) {
+// getH2Settings returns the []http2.Setting that are encoded in the
+// HTTP2-Settings header.
+func getH2Settings(h http.Header) ([]http2.Setting, error) {
 	vals, ok := h[textproto.CanonicalMIMEHeaderKey("HTTP2-Settings")]
 	if !ok {
 		return nil, errors.New("missing HTTP2-Settings header")
@@ -195,40 +387,115 @@ func getH2Settings(h http.Header) ([]byte, error) {
 	if len(vals) != 1 {
 		return nil, fmt.Errorf("expected 1 HTTP2-Settings. Got: %v", vals)
 	}
-	settings, err := base64.RawURLEncoding.DecodeString(vals[0])
+	settings, err := decodeSettings(vals[0])
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Invalid HTTP2-Settings: %q", vals[0])
 	}
 	return settings, nil
 }
 
-func newBufConn(conn net.Conn, rw *bufio.ReadWriter) net.Conn {
-	rw.Flush()
-	if rw.Reader.Buffered() == 0 {
-		// If there's no buffered data to be read,
-		// we can just discard the bufio.ReadWriter.
-		return conn
+// decodeSettings decodes the base64url header value of the HTTP2-Settings
+// header. RFC 7540 Section 3.2.1.
+func decodeSettings(headerVal string) ([]http2.Setting, error) {
+	b, err := base64.RawURLEncoding.DecodeString(headerVal)
+	if err != nil {
+		return nil, err
 	}
-	return &bufConn{conn, rw.Reader}
+	if len(b)%6 != 0 {
+		return nil, err
+	}
+	settings := make([]http2.Setting, 0)
+	for i := 0; i < len(b)/6; i++ {
+		settings = append(settings, http2.Setting{
+			ID:  http2.SettingID(binary.BigEndian.Uint16(b[i*6 : i*6+2])),
+			Val: binary.BigEndian.Uint32(b[i*6+2 : i*6+6]),
+		})
+	}
+
+	return settings, nil
 }
 
-// bufConn wraps a net.Conn, but reads drain the bufio.Reader first.
-type bufConn struct {
-	net.Conn
-	*bufio.Reader
+// getH2HeaderBytes return the headers in r a []bytes encoded by HPACK.
+func getH2HeaderBytes(r *http.Request, maxHeaderTableSize uint32) ([]byte, error) {
+	headerBytes := bytes.NewBuffer(nil)
+	hpackEnc := hpack.NewEncoder(headerBytes)
+	hpackEnc.SetMaxDynamicTableSize(maxHeaderTableSize)
+
+	// Section 8.1.2.3
+	err := hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":method",
+		Value: r.Method,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":scheme",
+		Value: "http",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":authority",
+		Value: r.Host,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	path := r.URL.Path
+	if r.URL.RawQuery != "" {
+		path = strings.Join([]string{path, r.URL.RawQuery}, "?")
+	}
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":path",
+		Value: path,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// TODO Implement Section 8.3
+
+	for header, values := range r.Header {
+		// Skip non h2 headers
+		if isNonH2Header(header) {
+			continue
+		}
+		for _, v := range values {
+			err := hpackEnc.WriteField(hpack.HeaderField{
+				Name:  strings.ToLower(header),
+				Value: v,
+			})
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+	return headerBytes.Bytes(), nil
 }
 
-func (c *bufConn) Read(p []byte) (int, error) {
-	if c.Reader == nil {
-		return c.Conn.Read(p)
-	}
-	n := c.Reader.Buffered()
-	if n == 0 {
-		c.Reader = nil
-		return c.Conn.Read(p)
-	}
-	if n < len(p) {
-		p = p[:n]
-	}
-	return c.Reader.Read(p)
+// Connection specific headers listed in RFC 7540 Section 8.1.2.2 that are not
+// suppose to be transferred to HTTP/2. The Http2-Settings header is skipped
+// since already use to create the HTTP/2 SETTINGS frame.
+var nonH2Headers = []string{
+	"Connection",
+	"Keep-Alive",
+	"Proxy-Connection",
+	"Transfer-Encoding",
+	"Upgrade",
+	"Http2-Settings",
+}
+
+// isNonH2Header returns true if header should not be transferred to HTTP/2.
+func isNonH2Header(header string) bool {
+	for _, nonH2h := range nonH2Headers {
+		if header == nonH2h {
+			return true
+		}
+	}
+	return false
 }
diff --git a/vendor/golang.org/x/net/internal/httpcommon/headermap.go b/vendor/golang.org/x/net/http2/headermap.go
similarity index 59%
rename from vendor/golang.org/x/net/internal/httpcommon/headermap.go
rename to vendor/golang.org/x/net/http2/headermap.go
index 92483d8..9e12941 100644
--- a/vendor/golang.org/x/net/internal/httpcommon/headermap.go
+++ b/vendor/golang.org/x/net/http2/headermap.go
@@ -1,11 +1,11 @@
-// Copyright 2025 The Go Authors. All rights reserved.
+// Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package httpcommon
+package http2
 
 import (
-	"net/textproto"
+	"net/http"
 	"sync"
 )
 
@@ -27,14 +27,7 @@ func buildCommonHeaderMaps() {
 		"accept-language",
 		"accept-ranges",
 		"age",
-		"access-control-allow-credentials",
-		"access-control-allow-headers",
-		"access-control-allow-methods",
 		"access-control-allow-origin",
-		"access-control-expose-headers",
-		"access-control-max-age",
-		"access-control-request-headers",
-		"access-control-request-method",
 		"allow",
 		"authorization",
 		"cache-control",
@@ -60,7 +53,6 @@ func buildCommonHeaderMaps() {
 		"link",
 		"location",
 		"max-forwards",
-		"origin",
 		"proxy-authenticate",
 		"proxy-authorization",
 		"range",
@@ -76,40 +68,20 @@ func buildCommonHeaderMaps() {
 		"vary",
 		"via",
 		"www-authenticate",
-		"x-forwarded-for",
-		"x-forwarded-proto",
 	}
 	commonLowerHeader = make(map[string]string, len(common))
 	commonCanonHeader = make(map[string]string, len(common))
 	for _, v := range common {
-		chk := textproto.CanonicalMIMEHeaderKey(v)
+		chk := http.CanonicalHeaderKey(v)
 		commonLowerHeader[chk] = v
 		commonCanonHeader[v] = chk
 	}
 }
 
-// LowerHeader returns the lowercase form of a header name,
-// used on the wire for HTTP/2 and HTTP/3 requests.
-func LowerHeader(v string) (lower string, ascii bool) {
+func lowerHeader(v string) (lower string, ascii bool) {
 	buildCommonHeaderMapsOnce()
 	if s, ok := commonLowerHeader[v]; ok {
 		return s, true
 	}
 	return asciiToLower(v)
 }
-
-// CanonicalHeader canonicalizes a header name. (For example, "host" becomes "Host".)
-func CanonicalHeader(v string) string {
-	buildCommonHeaderMapsOnce()
-	if s, ok := commonCanonHeader[v]; ok {
-		return s
-	}
-	return textproto.CanonicalMIMEHeaderKey(v)
-}
-
-// CachedCanonicalHeader returns the canonical form of a well-known header name.
-func CachedCanonicalHeader(v string) (string, bool) {
-	buildCommonHeaderMapsOnce()
-	s, ok := commonCanonHeader[v]
-	return s, ok
-}
diff --git a/vendor/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go
index 46219da..97f1783 100644
--- a/vendor/golang.org/x/net/http2/hpack/encode.go
+++ b/vendor/golang.org/x/net/http2/hpack/encode.go
@@ -116,11 +116,6 @@ func (e *Encoder) SetMaxDynamicTableSize(v uint32) {
 	e.dynTab.setMaxSize(v)
 }
 
-// MaxDynamicTableSize returns the current dynamic header table size.
-func (e *Encoder) MaxDynamicTableSize() (v uint32) {
-	return e.dynTab.maxSize
-}
-
 // SetMaxDynamicTableSizeLimit changes the maximum value that can be
 // specified in SetMaxDynamicTableSize to v. By default, it is set to
 // 4096, which is the same size of the default dynamic header table
@@ -196,7 +191,7 @@ func appendTableSize(dst []byte, v uint32) []byte {
 // bit prefix, to dst and returns the extended buffer.
 //
 // See
-// https://httpwg.org/specs/rfc7541.html#integer.representation
+// http://http2.github.io/http2-spec/compression.html#integer.representation
 func appendVarInt(dst []byte, n byte, i uint64) []byte {
 	k := uint64((1 << n) - 1)
 	if i < k {
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
index 7a1d976..85f18a2 100644
--- a/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
@@ -59,7 +59,7 @@ func (hf HeaderField) String() string {
 
 // Size returns the size of an entry per RFC 7541 section 4.1.
 func (hf HeaderField) Size() uint32 {
-	// https://httpwg.org/specs/rfc7541.html#rfc.section.4.1
+	// http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
 	// "The size of the dynamic table is the sum of the size of
 	// its entries. The size of an entry is the sum of its name's
 	// length in octets (as defined in Section 5.2), its value's
@@ -158,7 +158,7 @@ func (d *Decoder) SetAllowedMaxDynamicTableSize(v uint32) {
 }
 
 type dynamicTable struct {
-	// https://httpwg.org/specs/rfc7541.html#rfc.section.2.3.2
+	// http://http2.github.io/http2-spec/compression.html#rfc.section.2.3.2
 	table          headerFieldTable
 	size           uint32 // in bytes
 	maxSize        uint32 // current maxSize
@@ -211,7 +211,7 @@ func (d *Decoder) at(i uint64) (hf HeaderField, ok bool) {
 	return dt.ents[dt.len()-(int(i)-staticTable.len())], true
 }
 
-// DecodeFull decodes an entire block.
+// Decode decodes an entire block.
 //
 // TODO: remove this method and make it incremental later? This is
 // easier for debugging now.
@@ -307,27 +307,27 @@ func (d *Decoder) parseHeaderFieldRepr() error {
 	case b&128 != 0:
 		// Indexed representation.
 		// High bit set?
-		// https://httpwg.org/specs/rfc7541.html#rfc.section.6.1
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.1
 		return d.parseFieldIndexed()
 	case b&192 == 64:
 		// 6.2.1 Literal Header Field with Incremental Indexing
 		// 0b10xxxxxx: top two bits are 10
-		// https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.1
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.1
 		return d.parseFieldLiteral(6, indexedTrue)
 	case b&240 == 0:
 		// 6.2.2 Literal Header Field without Indexing
 		// 0b0000xxxx: top four bits are 0000
-		// https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.2
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.2
 		return d.parseFieldLiteral(4, indexedFalse)
 	case b&240 == 16:
 		// 6.2.3 Literal Header Field never Indexed
 		// 0b0001xxxx: top four bits are 0001
-		// https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.3
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.3
 		return d.parseFieldLiteral(4, indexedNever)
 	case b&224 == 32:
 		// 6.3 Dynamic Table Size Update
 		// Top three bits are '001'.
-		// https://httpwg.org/specs/rfc7541.html#rfc.section.6.3
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.3
 		return d.parseDynamicTableSizeUpdate()
 	}
 
@@ -359,7 +359,6 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
 
 	var hf HeaderField
 	wantStr := d.emitEnabled || it.indexed()
-	var undecodedName undecodedString
 	if nameIdx > 0 {
 		ihf, ok := d.at(nameIdx)
 		if !ok {
@@ -367,27 +366,15 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
 		}
 		hf.Name = ihf.Name
 	} else {
-		undecodedName, buf, err = d.readString(buf)
+		hf.Name, buf, err = d.readString(buf, wantStr)
 		if err != nil {
 			return err
 		}
 	}
-	undecodedValue, buf, err := d.readString(buf)
+	hf.Value, buf, err = d.readString(buf, wantStr)
 	if err != nil {
 		return err
 	}
-	if wantStr {
-		if nameIdx <= 0 {
-			hf.Name, err = d.decodeString(undecodedName)
-			if err != nil {
-				return err
-			}
-		}
-		hf.Value, err = d.decodeString(undecodedValue)
-		if err != nil {
-			return err
-		}
-	}
 	d.buf = buf
 	if it.indexed() {
 		d.dynTab.add(hf)
@@ -433,7 +420,7 @@ var errVarintOverflow = DecodingError{errors.New("varint integer overflow")}
 
 // readVarInt reads an unsigned variable length integer off the
 // beginning of p. n is the parameter as described in
-// https://httpwg.org/specs/rfc7541.html#rfc.section.5.1.
+// http://http2.github.io/http2-spec/compression.html#rfc.section.5.1.
 //
 // n must always be between 1 and 8.
 //
@@ -472,52 +459,46 @@ func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) {
 	return 0, origP, errNeedMore
 }
 
-// readString reads an hpack string from p.
+// readString decodes an hpack string from p.
 //
-// It returns a reference to the encoded string data to permit deferring decode costs
-// until after the caller verifies all data is present.
-func (d *Decoder) readString(p []byte) (u undecodedString, remain []byte, err error) {
+// wantStr is whether s will be used. If false, decompression and
+// []byte->string garbage are skipped if s will be ignored
+// anyway. This does mean that huffman decoding errors for non-indexed
+// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server
+// is returning an error anyway, and because they're not indexed, the error
+// won't affect the decoding state.
+func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) {
 	if len(p) == 0 {
-		return u, p, errNeedMore
+		return "", p, errNeedMore
 	}
 	isHuff := p[0]&128 != 0
 	strLen, p, err := readVarInt(7, p)
 	if err != nil {
-		return u, p, err
+		return "", p, err
 	}
 	if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) {
-		// Returning an error here means Huffman decoding errors
-		// for non-indexed strings past the maximum string length
-		// are ignored, but the server is returning an error anyway
-		// and because the string is not indexed the error will not
-		// affect the decoding state.
-		return u, nil, ErrStringLength
+		return "", nil, ErrStringLength
 	}
 	if uint64(len(p)) < strLen {
-		return u, p, errNeedMore
+		return "", p, errNeedMore
 	}
-	u.isHuff = isHuff
-	u.b = p[:strLen]
-	return u, p[strLen:], nil
-}
-
-type undecodedString struct {
-	isHuff bool
-	b      []byte
-}
-
-func (d *Decoder) decodeString(u undecodedString) (string, error) {
-	if !u.isHuff {
-		return string(u.b), nil
+	if !isHuff {
+		if wantStr {
+			s = string(p[:strLen])
+		}
+		return s, p[strLen:], nil
 	}
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset() // don't trust others
-	var s string
-	err := huffmanDecode(buf, d.maxStrLen, u.b)
-	if err == nil {
+
+	if wantStr {
+		buf := bufPool.Get().(*bytes.Buffer)
+		buf.Reset() // don't trust others
+		defer bufPool.Put(buf)
+		if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil {
+			buf.Reset()
+			return "", nil, err
+		}
 		s = buf.String()
+		buf.Reset() // be nice to GC
 	}
-	buf.Reset() // be nice to GC
-	bufPool.Put(buf)
-	return s, err
+	return s, p[strLen:], nil
 }
diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
index 20d083a..a1ab2f0 100644
--- a/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
@@ -140,79 +140,50 @@ func buildRootHuffmanNode() {
 		panic("unexpected size")
 	}
 	lazyRootHuffmanNode = newInternalNode()
-	// allocate a leaf node for each of the 256 symbols
-	leaves := new([256]node)
+	for i, code := range huffmanCodes {
+		addDecoderNode(byte(i), code, huffmanCodeLen[i])
+	}
+}
 
-	for sym, code := range huffmanCodes {
-		codeLen := huffmanCodeLen[sym]
-
-		cur := lazyRootHuffmanNode
-		for codeLen > 8 {
-			codeLen -= 8
-			i := uint8(code >> codeLen)
-			if cur.children[i] == nil {
-				cur.children[i] = newInternalNode()
-			}
-			cur = cur.children[i]
-		}
-		shift := 8 - codeLen
-		start, end := int(uint8(code<<shift)), int(1<<shift)
-
-		leaves[sym].sym = byte(sym)
-		leaves[sym].codeLen = codeLen
-		for i := start; i < start+end; i++ {
-			cur.children[i] = &leaves[sym]
+func addDecoderNode(sym byte, code uint32, codeLen uint8) {
+	cur := lazyRootHuffmanNode
+	for codeLen > 8 {
+		codeLen -= 8
+		i := uint8(code >> codeLen)
+		if cur.children[i] == nil {
+			cur.children[i] = newInternalNode()
 		}
+		cur = cur.children[i]
+	}
+	shift := 8 - codeLen
+	start, end := int(uint8(code<<shift)), int(1<<shift)
+	for i := start; i < start+end; i++ {
+		cur.children[i] = &node{sym: sym, codeLen: codeLen}
 	}
 }
 
 // AppendHuffmanString appends s, as encoded in Huffman codes, to dst
 // and returns the extended buffer.
 func AppendHuffmanString(dst []byte, s string) []byte {
-	// This relies on the maximum huffman code length being 30 (See tables.go huffmanCodeLen array)
-	// So if a uint64 buffer has less than 32 valid bits can always accommodate another huffmanCode.
-	var (
-		x uint64 // buffer
-		n uint   // number valid of bits present in x
-	)
+	rembits := uint8(8)
+
 	for i := 0; i < len(s); i++ {
-		c := s[i]
-		n += uint(huffmanCodeLen[c])
-		x <<= huffmanCodeLen[c] % 64
-		x |= uint64(huffmanCodes[c])
-		if n >= 32 {
-			n %= 32             // Normally would be -= 32 but %= 32 informs compiler 0 <= n <= 31 for upcoming shift
-			y := uint32(x >> n) // Compiler doesn't combine memory writes if y isn't uint32
-			dst = append(dst, byte(y>>24), byte(y>>16), byte(y>>8), byte(y))
+		if rembits == 8 {
+			dst = append(dst, 0)
 		}
+		dst, rembits = appendByteToHuffmanCode(dst, rembits, s[i])
 	}
-	// Add padding bits if necessary
-	if over := n % 8; over > 0 {
-		const (
-			eosCode    = 0x3fffffff
-			eosNBits   = 30
-			eosPadByte = eosCode >> (eosNBits - 8)
-		)
-		pad := 8 - over
-		x = (x << pad) | (eosPadByte >> over)
-		n += pad // 8 now divides into n exactly
+
+	if rembits < 8 {
+		// special EOS symbol
+		code := uint32(0x3fffffff)
+		nbits := uint8(30)
+
+		t := uint8(code >> (nbits - rembits))
+		dst[len(dst)-1] |= t
 	}
-	// n in (0, 8, 16, 24, 32)
-	switch n / 8 {
-	case 0:
-		return dst
-	case 1:
-		return append(dst, byte(x))
-	case 2:
-		y := uint16(x)
-		return append(dst, byte(y>>8), byte(y))
-	case 3:
-		y := uint16(x >> 8)
-		return append(dst, byte(y>>8), byte(y), byte(x))
-	}
-	//	case 4:
-	y := uint32(x)
-	return append(dst, byte(y>>24), byte(y>>16), byte(y>>8), byte(y))
+
+	return dst
 }
 
 // HuffmanEncodeLength returns the number of bytes required to encode
@@ -224,3 +195,35 @@ func HuffmanEncodeLength(s string) uint64 {
 	}
 	return (n + 7) / 8
 }
+
+// appendByteToHuffmanCode appends Huffman code for c to dst and
+// returns the extended buffer and the remaining bits in the last
+// element. The appending is not byte aligned and the remaining bits
+// in the last element of dst is given in rembits.
+func appendByteToHuffmanCode(dst []byte, rembits uint8, c byte) ([]byte, uint8) {
+	code := huffmanCodes[c]
+	nbits := huffmanCodeLen[c]
+
+	for {
+		if rembits > nbits {
+			t := uint8(code << (rembits - nbits))
+			dst[len(dst)-1] |= t
+			rembits -= nbits
+			break
+		}
+
+		t := uint8(code >> (nbits - rembits))
+		dst[len(dst)-1] |= t
+
+		nbits -= rembits
+		rembits = 8
+
+		if nbits == 0 {
+			break
+		}
+
+		dst = append(dst, 0)
+	}
+
+	return dst, rembits
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/static_table.go b/vendor/golang.org/x/net/http2/hpack/static_table.go
deleted file mode 100644
index 754a1eb..0000000
--- a/vendor/golang.org/x/net/http2/hpack/static_table.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// go generate gen.go
-// Code generated by the command above; DO NOT EDIT.
-
-package hpack
-
-var staticTable = &headerFieldTable{
-	evictCount: 0,
-	byName: map[string]uint64{
-		":authority":                  1,
-		":method":                     3,
-		":path":                       5,
-		":scheme":                     7,
-		":status":                     14,
-		"accept-charset":              15,
-		"accept-encoding":             16,
-		"accept-language":             17,
-		"accept-ranges":               18,
-		"accept":                      19,
-		"access-control-allow-origin": 20,
-		"age":                         21,
-		"allow":                       22,
-		"authorization":               23,
-		"cache-control":               24,
-		"content-disposition":         25,
-		"content-encoding":            26,
-		"content-language":            27,
-		"content-length":              28,
-		"content-location":            29,
-		"content-range":               30,
-		"content-type":                31,
-		"cookie":                      32,
-		"date":                        33,
-		"etag":                        34,
-		"expect":                      35,
-		"expires":                     36,
-		"from":                        37,
-		"host":                        38,
-		"if-match":                    39,
-		"if-modified-since":           40,
-		"if-none-match":               41,
-		"if-range":                    42,
-		"if-unmodified-since":         43,
-		"last-modified":               44,
-		"link":                        45,
-		"location":                    46,
-		"max-forwards":                47,
-		"proxy-authenticate":          48,
-		"proxy-authorization":         49,
-		"range":                       50,
-		"referer":                     51,
-		"refresh":                     52,
-		"retry-after":                 53,
-		"server":                      54,
-		"set-cookie":                  55,
-		"strict-transport-security":   56,
-		"transfer-encoding":           57,
-		"user-agent":                  58,
-		"vary":                        59,
-		"via":                         60,
-		"www-authenticate":            61,
-	},
-	byNameValue: map[pairNameValue]uint64{
-		{name: ":authority", value: ""}:                   1,
-		{name: ":method", value: "GET"}:                   2,
-		{name: ":method", value: "POST"}:                  3,
-		{name: ":path", value: "/"}:                       4,
-		{name: ":path", value: "/index.html"}:             5,
-		{name: ":scheme", value: "http"}:                  6,
-		{name: ":scheme", value: "https"}:                 7,
-		{name: ":status", value: "200"}:                   8,
-		{name: ":status", value: "204"}:                   9,
-		{name: ":status", value: "206"}:                   10,
-		{name: ":status", value: "304"}:                   11,
-		{name: ":status", value: "400"}:                   12,
-		{name: ":status", value: "404"}:                   13,
-		{name: ":status", value: "500"}:                   14,
-		{name: "accept-charset", value: ""}:               15,
-		{name: "accept-encoding", value: "gzip, deflate"}: 16,
-		{name: "accept-language", value: ""}:              17,
-		{name: "accept-ranges", value: ""}:                18,
-		{name: "accept", value: ""}:                       19,
-		{name: "access-control-allow-origin", value: ""}:  20,
-		{name: "age", value: ""}:                          21,
-		{name: "allow", value: ""}:                        22,
-		{name: "authorization", value: ""}:                23,
-		{name: "cache-control", value: ""}:                24,
-		{name: "content-disposition", value: ""}:          25,
-		{name: "content-encoding", value: ""}:             26,
-		{name: "content-language", value: ""}:             27,
-		{name: "content-length", value: ""}:               28,
-		{name: "content-location", value: ""}:             29,
-		{name: "content-range", value: ""}:                30,
-		{name: "content-type", value: ""}:                 31,
-		{name: "cookie", value: ""}:                       32,
-		{name: "date", value: ""}:                         33,
-		{name: "etag", value: ""}:                         34,
-		{name: "expect", value: ""}:                       35,
-		{name: "expires", value: ""}:                      36,
-		{name: "from", value: ""}:                         37,
-		{name: "host", value: ""}:                         38,
-		{name: "if-match", value: ""}:                     39,
-		{name: "if-modified-since", value: ""}:            40,
-		{name: "if-none-match", value: ""}:                41,
-		{name: "if-range", value: ""}:                     42,
-		{name: "if-unmodified-since", value: ""}:          43,
-		{name: "last-modified", value: ""}:                44,
-		{name: "link", value: ""}:                         45,
-		{name: "location", value: ""}:                     46,
-		{name: "max-forwards", value: ""}:                 47,
-		{name: "proxy-authenticate", value: ""}:           48,
-		{name: "proxy-authorization", value: ""}:          49,
-		{name: "range", value: ""}:                        50,
-		{name: "referer", value: ""}:                      51,
-		{name: "refresh", value: ""}:                      52,
-		{name: "retry-after", value: ""}:                  53,
-		{name: "server", value: ""}:                       54,
-		{name: "set-cookie", value: ""}:                   55,
-		{name: "strict-transport-security", value: ""}:    56,
-		{name: "transfer-encoding", value: ""}:            57,
-		{name: "user-agent", value: ""}:                   58,
-		{name: "vary", value: ""}:                         59,
-		{name: "via", value: ""}:                          60,
-		{name: "www-authenticate", value: ""}:             61,
-	},
-	ents: []HeaderField{
-		{Name: ":authority", Value: "", Sensitive: false},
-		{Name: ":method", Value: "GET", Sensitive: false},
-		{Name: ":method", Value: "POST", Sensitive: false},
-		{Name: ":path", Value: "/", Sensitive: false},
-		{Name: ":path", Value: "/index.html", Sensitive: false},
-		{Name: ":scheme", Value: "http", Sensitive: false},
-		{Name: ":scheme", Value: "https", Sensitive: false},
-		{Name: ":status", Value: "200", Sensitive: false},
-		{Name: ":status", Value: "204", Sensitive: false},
-		{Name: ":status", Value: "206", Sensitive: false},
-		{Name: ":status", Value: "304", Sensitive: false},
-		{Name: ":status", Value: "400", Sensitive: false},
-		{Name: ":status", Value: "404", Sensitive: false},
-		{Name: ":status", Value: "500", Sensitive: false},
-		{Name: "accept-charset", Value: "", Sensitive: false},
-		{Name: "accept-encoding", Value: "gzip, deflate", Sensitive: false},
-		{Name: "accept-language", Value: "", Sensitive: false},
-		{Name: "accept-ranges", Value: "", Sensitive: false},
-		{Name: "accept", Value: "", Sensitive: false},
-		{Name: "access-control-allow-origin", Value: "", Sensitive: false},
-		{Name: "age", Value: "", Sensitive: false},
-		{Name: "allow", Value: "", Sensitive: false},
-		{Name: "authorization", Value: "", Sensitive: false},
-		{Name: "cache-control", Value: "", Sensitive: false},
-		{Name: "content-disposition", Value: "", Sensitive: false},
-		{Name: "content-encoding", Value: "", Sensitive: false},
-		{Name: "content-language", Value: "", Sensitive: false},
-		{Name: "content-length", Value: "", Sensitive: false},
-		{Name: "content-location", Value: "", Sensitive: false},
-		{Name: "content-range", Value: "", Sensitive: false},
-		{Name: "content-type", Value: "", Sensitive: false},
-		{Name: "cookie", Value: "", Sensitive: false},
-		{Name: "date", Value: "", Sensitive: false},
-		{Name: "etag", Value: "", Sensitive: false},
-		{Name: "expect", Value: "", Sensitive: false},
-		{Name: "expires", Value: "", Sensitive: false},
-		{Name: "from", Value: "", Sensitive: false},
-		{Name: "host", Value: "", Sensitive: false},
-		{Name: "if-match", Value: "", Sensitive: false},
-		{Name: "if-modified-since", Value: "", Sensitive: false},
-		{Name: "if-none-match", Value: "", Sensitive: false},
-		{Name: "if-range", Value: "", Sensitive: false},
-		{Name: "if-unmodified-since", Value: "", Sensitive: false},
-		{Name: "last-modified", Value: "", Sensitive: false},
-		{Name: "link", Value: "", Sensitive: false},
-		{Name: "location", Value: "", Sensitive: false},
-		{Name: "max-forwards", Value: "", Sensitive: false},
-		{Name: "proxy-authenticate", Value: "", Sensitive: false},
-		{Name: "proxy-authorization", Value: "", Sensitive: false},
-		{Name: "range", Value: "", Sensitive: false},
-		{Name: "referer", Value: "", Sensitive: false},
-		{Name: "refresh", Value: "", Sensitive: false},
-		{Name: "retry-after", Value: "", Sensitive: false},
-		{Name: "server", Value: "", Sensitive: false},
-		{Name: "set-cookie", Value: "", Sensitive: false},
-		{Name: "strict-transport-security", Value: "", Sensitive: false},
-		{Name: "transfer-encoding", Value: "", Sensitive: false},
-		{Name: "user-agent", Value: "", Sensitive: false},
-		{Name: "vary", Value: "", Sensitive: false},
-		{Name: "via", Value: "", Sensitive: false},
-		{Name: "www-authenticate", Value: "", Sensitive: false},
-	},
-}
diff --git a/vendor/golang.org/x/net/http2/hpack/tables.go b/vendor/golang.org/x/net/http2/hpack/tables.go
index 8cbdf3f..a66cfbe 100644
--- a/vendor/golang.org/x/net/http2/hpack/tables.go
+++ b/vendor/golang.org/x/net/http2/hpack/tables.go
@@ -96,7 +96,8 @@ func (t *headerFieldTable) evictOldest(n int) {
 // meaning t.ents is reversed for dynamic tables. Hence, when t is a dynamic
 // table, the return value i actually refers to the entry t.ents[t.len()-i].
 //
-// All tables are assumed to be a dynamic tables except for the global staticTable.
+// All tables are assumed to be a dynamic tables except for the global
+// staticTable pointer.
 //
 // See Section 2.3.3.
 func (t *headerFieldTable) search(f HeaderField) (i uint64, nameValueMatch bool) {
@@ -124,6 +125,81 @@ func (t *headerFieldTable) idToIndex(id uint64) uint64 {
 	return k + 1
 }
 
+// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07#appendix-B
+var staticTable = newStaticTable()
+var staticTableEntries = [...]HeaderField{
+	{Name: ":authority"},
+	{Name: ":method", Value: "GET"},
+	{Name: ":method", Value: "POST"},
+	{Name: ":path", Value: "/"},
+	{Name: ":path", Value: "/index.html"},
+	{Name: ":scheme", Value: "http"},
+	{Name: ":scheme", Value: "https"},
+	{Name: ":status", Value: "200"},
+	{Name: ":status", Value: "204"},
+	{Name: ":status", Value: "206"},
+	{Name: ":status", Value: "304"},
+	{Name: ":status", Value: "400"},
+	{Name: ":status", Value: "404"},
+	{Name: ":status", Value: "500"},
+	{Name: "accept-charset"},
+	{Name: "accept-encoding", Value: "gzip, deflate"},
+	{Name: "accept-language"},
+	{Name: "accept-ranges"},
+	{Name: "accept"},
+	{Name: "access-control-allow-origin"},
+	{Name: "age"},
+	{Name: "allow"},
+	{Name: "authorization"},
+	{Name: "cache-control"},
+	{Name: "content-disposition"},
+	{Name: "content-encoding"},
+	{Name: "content-language"},
+	{Name: "content-length"},
+	{Name: "content-location"},
+	{Name: "content-range"},
+	{Name: "content-type"},
+	{Name: "cookie"},
+	{Name: "date"},
+	{Name: "etag"},
+	{Name: "expect"},
+	{Name: "expires"},
+	{Name: "from"},
+	{Name: "host"},
+	{Name: "if-match"},
+	{Name: "if-modified-since"},
+	{Name: "if-none-match"},
+	{Name: "if-range"},
+	{Name: "if-unmodified-since"},
+	{Name: "last-modified"},
+	{Name: "link"},
+	{Name: "location"},
+	{Name: "max-forwards"},
+	{Name: "proxy-authenticate"},
+	{Name: "proxy-authorization"},
+	{Name: "range"},
+	{Name: "referer"},
+	{Name: "refresh"},
+	{Name: "retry-after"},
+	{Name: "server"},
+	{Name: "set-cookie"},
+	{Name: "strict-transport-security"},
+	{Name: "transfer-encoding"},
+	{Name: "user-agent"},
+	{Name: "vary"},
+	{Name: "via"},
+	{Name: "www-authenticate"},
+}
+
+func newStaticTable() *headerFieldTable {
+	t := &headerFieldTable{}
+	t.init()
+	for _, e := range staticTableEntries[:] {
+		t.addEntry(e)
+	}
+	return t
+}
+
 var huffmanCodes = [256]uint32{
 	0x1ff8,
 	0x7fffd8,
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
index 6c18ea2..5571ccf 100644
--- a/vendor/golang.org/x/net/http2/http2.go
+++ b/vendor/golang.org/x/net/http2/http2.go
@@ -13,22 +13,20 @@
 // See https://http2.github.io/ for more information on HTTP/2.
 //
 // See https://http2.golang.org/ for a test server running this code.
+//
 package http2 // import "golang.org/x/net/http2"
 
 import (
 	"bufio"
-	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
-	"net"
+	"io"
 	"net/http"
 	"os"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
 	"golang.org/x/net/http/httpguts"
 )
@@ -38,15 +36,6 @@ var (
 	logFrameWrites bool
 	logFrameReads  bool
 	inTests        bool
-
-	// Enabling extended CONNECT by causes browsers to attempt to use
-	// WebSockets-over-HTTP/2. This results in problems when the server's websocket
-	// package doesn't support extended CONNECT.
-	//
-	// Disable extended CONNECT by default for now.
-	//
-	// Issue #71128.
-	disableExtendedConnectProtocol = true
 )
 
 func init() {
@@ -59,9 +48,6 @@ func init() {
 		logFrameWrites = true
 		logFrameReads = true
 	}
-	if strings.Contains(e, "http2xconnect=1") {
-		disableExtendedConnectProtocol = false
-	}
 }
 
 const (
@@ -70,14 +56,14 @@ const (
 	ClientPreface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
 	// SETTINGS_MAX_FRAME_SIZE default
-	// https://httpwg.org/specs/rfc7540.html#rfc.section.6.5.2
+	// http://http2.github.io/http2-spec/#rfc.section.6.5.2
 	initialMaxFrameSize = 16384
 
 	// NextProtoTLS is the NPN/ALPN protocol negotiated during
 	// HTTP/2's TLS setup.
 	NextProtoTLS = "h2"
 
-	// https://httpwg.org/specs/rfc7540.html#SettingValues
+	// http://http2.github.io/http2-spec/#SettingValues
 	initialHeaderTableSize = 4096
 
 	initialWindowSize = 65535 // 6.9.2 Initial Flow Control Window Size
@@ -126,7 +112,7 @@ func (st streamState) String() string {
 // Setting is a setting parameter: which setting it is, and its value.
 type Setting struct {
 	// ID is which setting is being set.
-	// See https://httpwg.org/specs/rfc7540.html#SettingFormat
+	// See http://http2.github.io/http2-spec/#SettingValues
 	ID SettingID
 
 	// Val is the value.
@@ -153,36 +139,30 @@ func (s Setting) Valid() error {
 		if s.Val < 16384 || s.Val > 1<<24-1 {
 			return ConnectionError(ErrCodeProtocol)
 		}
-	case SettingEnableConnectProtocol:
-		if s.Val != 1 && s.Val != 0 {
-			return ConnectionError(ErrCodeProtocol)
-		}
 	}
 	return nil
 }
 
 // A SettingID is an HTTP/2 setting as defined in
-// https://httpwg.org/specs/rfc7540.html#iana-settings
+// http://http2.github.io/http2-spec/#iana-settings
 type SettingID uint16
 
 const (
-	SettingHeaderTableSize       SettingID = 0x1
-	SettingEnablePush            SettingID = 0x2
-	SettingMaxConcurrentStreams  SettingID = 0x3
-	SettingInitialWindowSize     SettingID = 0x4
-	SettingMaxFrameSize          SettingID = 0x5
-	SettingMaxHeaderListSize     SettingID = 0x6
-	SettingEnableConnectProtocol SettingID = 0x8
+	SettingHeaderTableSize      SettingID = 0x1
+	SettingEnablePush           SettingID = 0x2
+	SettingMaxConcurrentStreams SettingID = 0x3
+	SettingInitialWindowSize    SettingID = 0x4
+	SettingMaxFrameSize         SettingID = 0x5
+	SettingMaxHeaderListSize    SettingID = 0x6
 )
 
 var settingName = map[SettingID]string{
-	SettingHeaderTableSize:       "HEADER_TABLE_SIZE",
-	SettingEnablePush:            "ENABLE_PUSH",
-	SettingMaxConcurrentStreams:  "MAX_CONCURRENT_STREAMS",
-	SettingInitialWindowSize:     "INITIAL_WINDOW_SIZE",
-	SettingMaxFrameSize:          "MAX_FRAME_SIZE",
-	SettingMaxHeaderListSize:     "MAX_HEADER_LIST_SIZE",
-	SettingEnableConnectProtocol: "ENABLE_CONNECT_PROTOCOL",
+	SettingHeaderTableSize:      "HEADER_TABLE_SIZE",
+	SettingEnablePush:           "ENABLE_PUSH",
+	SettingMaxConcurrentStreams: "MAX_CONCURRENT_STREAMS",
+	SettingInitialWindowSize:    "INITIAL_WINDOW_SIZE",
+	SettingMaxFrameSize:         "MAX_FRAME_SIZE",
+	SettingMaxHeaderListSize:    "MAX_HEADER_LIST_SIZE",
 }
 
 func (s SettingID) String() string {
@@ -196,11 +176,10 @@ func (s SettingID) String() string {
 // name (key). See httpguts.ValidHeaderName for the base rules.
 //
 // Further, http2 says:
-//
-//	"Just as in HTTP/1.x, header field names are strings of ASCII
-//	characters that are compared in a case-insensitive
-//	fashion. However, header field names MUST be converted to
-//	lowercase prior to their encoding in HTTP/2. "
+//   "Just as in HTTP/1.x, header field names are strings of ASCII
+//   characters that are compared in a case-insensitive
+//   fashion. However, header field names MUST be converted to
+//   lowercase prior to their encoding in HTTP/2. "
 func validWireHeaderFieldName(v string) bool {
 	if len(v) == 0 {
 		return false
@@ -231,6 +210,12 @@ type stringWriter interface {
 	WriteString(s string) (n int, err error)
 }
 
+// A gate lets two goroutines coordinate their activities.
+type gate chan struct{}
+
+func (g gate) Done() { g <- struct{}{} }
+func (g gate) Wait() { <-g }
+
 // A closeWaiter is like a sync.WaitGroup but only goes 1 to 0 (open to closed).
 type closeWaiter chan struct{}
 
@@ -256,19 +241,13 @@ func (cw closeWaiter) Wait() {
 // Its buffered writer is lazily allocated as needed, to minimize
 // idle memory usage with many connections.
 type bufferedWriter struct {
-	_           incomparable
-	group       synctestGroupInterface // immutable
-	conn        net.Conn               // immutable
-	bw          *bufio.Writer          // non-nil when data is buffered
-	byteTimeout time.Duration          // immutable, WriteByteTimeout
+	_  incomparable
+	w  io.Writer     // immutable
+	bw *bufio.Writer // non-nil when data is buffered
 }
 
-func newBufferedWriter(group synctestGroupInterface, conn net.Conn, timeout time.Duration) *bufferedWriter {
-	return &bufferedWriter{
-		group:       group,
-		conn:        conn,
-		byteTimeout: timeout,
-	}
+func newBufferedWriter(w io.Writer) *bufferedWriter {
+	return &bufferedWriter{w: w}
 }
 
 // bufWriterPoolBufferSize is the size of bufio.Writer's
@@ -295,7 +274,7 @@ func (w *bufferedWriter) Available() int {
 func (w *bufferedWriter) Write(p []byte) (n int, err error) {
 	if w.bw == nil {
 		bw := bufWriterPool.Get().(*bufio.Writer)
-		bw.Reset((*bufferedWriterTimeoutWriter)(w))
+		bw.Reset(w.w)
 		w.bw = bw
 	}
 	return w.bw.Write(p)
@@ -313,38 +292,6 @@ func (w *bufferedWriter) Flush() error {
 	return err
 }
 
-type bufferedWriterTimeoutWriter bufferedWriter
-
-func (w *bufferedWriterTimeoutWriter) Write(p []byte) (n int, err error) {
-	return writeWithByteTimeout(w.group, w.conn, w.byteTimeout, p)
-}
-
-// writeWithByteTimeout writes to conn.
-// If more than timeout passes without any bytes being written to the connection,
-// the write fails.
-func writeWithByteTimeout(group synctestGroupInterface, conn net.Conn, timeout time.Duration, p []byte) (n int, err error) {
-	if timeout <= 0 {
-		return conn.Write(p)
-	}
-	for {
-		var now time.Time
-		if group == nil {
-			now = time.Now()
-		} else {
-			now = group.Now()
-		}
-		conn.SetWriteDeadline(now.Add(timeout))
-		nn, err := conn.Write(p[n:])
-		n += nn
-		if n == len(p) || nn == 0 || !errors.Is(err, os.ErrDeadlineExceeded) {
-			// Either we finished the write, made no progress, or hit the deadline.
-			// Whichever it is, we're done now.
-			conn.SetWriteDeadline(time.Time{})
-			return n, err
-		}
-	}
-}
-
 func mustUint31(v int32) uint32 {
 	if v < 0 || v > 2147483647 {
 		panic("out of range")
@@ -415,18 +362,24 @@ func (s *sorter) SortStrings(ss []string) {
 	s.v = save
 }
 
+// validPseudoPath reports whether v is a valid :path pseudo-header
+// value. It must be either:
+//
+//     *) a non-empty string starting with '/'
+//     *) the string '*', for OPTIONS requests.
+//
+// For now this is only used a quick check for deciding when to clean
+// up Opaque URLs before sending requests from the Transport.
+// See golang.org/issue/16847
+//
+// We used to enforce that the path also didn't start with "//", but
+// Google's GFE accepts such paths and Chrome sends them, so ignore
+// that part of the spec. See golang.org/issue/19103.
+func validPseudoPath(v string) bool {
+	return (len(v) > 0 && v[0] == '/') || v == "*"
+}
+
 // incomparable is a zero-width, non-comparable type. Adding it to a struct
 // makes that struct also non-comparable, and generally doesn't add
 // any size (as long as it's first).
 type incomparable [0]func()
-
-// synctestGroupInterface is the methods of synctestGroup used by Server and Transport.
-// It's defined as an interface here to let us keep synctestGroup entirely test-only
-// and not a part of non-test builds.
-type synctestGroupInterface interface {
-	Join()
-	Now() time.Time
-	NewTimer(d time.Duration) timer
-	AfterFunc(d time.Duration, f func()) timer
-	ContextWithTimeout(ctx context.Context, d time.Duration) (context.Context, context.CancelFunc)
-}
diff --git a/vendor/golang.org/x/net/http2/not_go111.go b/vendor/golang.org/x/net/http2/not_go111.go
new file mode 100644
index 0000000..cc0baa8
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go111.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !go1.11
+// +build !go1.11
+
+package http2
+
+import (
+	"net/http/httptrace"
+	"net/textproto"
+)
+
+func traceHasWroteHeaderField(trace *httptrace.ClientTrace) bool { return false }
+
+func traceWroteHeaderField(trace *httptrace.ClientTrace, k, v string) {}
+
+func traceGot1xxResponseFunc(trace *httptrace.ClientTrace) func(int, textproto.MIMEHeader) error {
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/not_go115.go b/vendor/golang.org/x/net/http2/not_go115.go
new file mode 100644
index 0000000..e6c04cf
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go115.go
@@ -0,0 +1,31 @@
+// Copyright 2021 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !go1.15
+// +build !go1.15
+
+package http2
+
+import (
+	"context"
+	"crypto/tls"
+)
+
+// dialTLSWithContext opens a TLS connection.
+func (t *Transport) dialTLSWithContext(ctx context.Context, network, addr string, cfg *tls.Config) (*tls.Conn, error) {
+	cn, err := tls.Dial(network, addr, cfg)
+	if err != nil {
+		return nil, err
+	}
+	if err := cn.Handshake(); err != nil {
+		return nil, err
+	}
+	if cfg.InsecureSkipVerify {
+		return cn, nil
+	}
+	if err := cn.VerifyHostname(cfg.ServerName); err != nil {
+		return nil, err
+	}
+	return cn, nil
+}
diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go
index 3b9f06b..2a5399e 100644
--- a/vendor/golang.org/x/net/http2/pipe.go
+++ b/vendor/golang.org/x/net/http2/pipe.go
@@ -30,17 +30,6 @@ type pipeBuffer interface {
 	io.Reader
 }
 
-// setBuffer initializes the pipe buffer.
-// It has no effect if the pipe is already closed.
-func (p *pipe) setBuffer(b pipeBuffer) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.err != nil || p.breakErr != nil {
-		return
-	}
-	p.b = b
-}
-
 func (p *pipe) Len() int {
 	p.mu.Lock()
 	defer p.mu.Unlock()
@@ -77,10 +66,7 @@ func (p *pipe) Read(d []byte) (n int, err error) {
 	}
 }
 
-var (
-	errClosedPipeWrite        = errors.New("write on closed buffer")
-	errUninitializedPipeWrite = errors.New("write on uninitialized buffer")
-)
+var errClosedPipeWrite = errors.New("write on closed buffer")
 
 // Write copies bytes from p into the buffer and wakes a reader.
 // It is an error to write more data than the buffer can hold.
@@ -91,14 +77,12 @@ func (p *pipe) Write(d []byte) (n int, err error) {
 		p.c.L = &p.mu
 	}
 	defer p.c.Signal()
-	if p.err != nil || p.breakErr != nil {
+	if p.err != nil {
 		return 0, errClosedPipeWrite
 	}
-	// pipe.setBuffer is never invoked, leaving the buffer uninitialized.
-	// We shouldn't try to write to an uninitialized pipe,
-	// but returning an error is better than panicking.
-	if p.b == nil {
-		return 0, errUninitializedPipeWrite
+	if p.breakErr != nil {
+		p.unread += len(d)
+		return len(d), nil // discard when there is no reader
 	}
 	return p.b.Write(d)
 }
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index 51fca38..19e449c 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -29,7 +29,6 @@ import (
 	"bufio"
 	"bytes"
 	"context"
-	"crypto/rand"
 	"crypto/tls"
 	"errors"
 	"fmt"
@@ -50,18 +49,13 @@ import (
 
 	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/internal/httpcommon"
 )
 
 const (
-	prefaceTimeout        = 10 * time.Second
-	firstSettingsTimeout  = 2 * time.Second // should be in-flight with preface anyway
-	handlerChunkWriteSize = 4 << 10
-	defaultMaxStreams     = 250 // TODO: make this 100 as the GFE seems to?
-
-	// maxQueuedControlFrames is the maximum number of control frames like
-	// SETTINGS, PING and RST_STREAM that will be queued for writing before
-	// the connection is closed to prevent memory exhaustion attacks.
+	prefaceTimeout         = 10 * time.Second
+	firstSettingsTimeout   = 2 * time.Second // should be in-flight with preface anyway
+	handlerChunkWriteSize  = 4 << 10
+	defaultMaxStreams      = 250 // TODO: make this 100 as the GFE seems to?
 	maxQueuedControlFrames = 10000
 )
 
@@ -104,19 +98,6 @@ type Server struct {
 	// the HTTP/2 spec's recommendations.
 	MaxConcurrentStreams uint32
 
-	// MaxDecoderHeaderTableSize optionally specifies the http2
-	// SETTINGS_HEADER_TABLE_SIZE to send in the initial settings frame. It
-	// informs the remote endpoint of the maximum size of the header compression
-	// table used to decode header blocks, in octets. If zero, the default value
-	// of 4096 is used.
-	MaxDecoderHeaderTableSize uint32
-
-	// MaxEncoderHeaderTableSize optionally specifies an upper limit for the
-	// header compression table used for encoding request headers. Received
-	// SETTINGS_HEADER_TABLE_SIZE settings are capped at this limit. If zero,
-	// the default value of 4096 is used.
-	MaxEncoderHeaderTableSize uint32
-
 	// MaxReadFrameSize optionally specifies the largest frame
 	// this server is willing to read. A valid value is between
 	// 16k and 16M, inclusive. If zero or otherwise invalid, a
@@ -130,25 +111,8 @@ type Server struct {
 	// IdleTimeout specifies how long until idle clients should be
 	// closed with a GOAWAY frame. PING frames are not considered
 	// activity for the purposes of IdleTimeout.
-	// If zero or negative, there is no timeout.
 	IdleTimeout time.Duration
 
-	// ReadIdleTimeout is the timeout after which a health check using a ping
-	// frame will be carried out if no frame is received on the connection.
-	// If zero, no health check is performed.
-	ReadIdleTimeout time.Duration
-
-	// PingTimeout is the timeout after which the connection will be closed
-	// if a response to a ping is not received.
-	// If zero, a default of 15 seconds is used.
-	PingTimeout time.Duration
-
-	// WriteByteTimeout is the timeout after which a connection will be
-	// closed if no data can be written to it. The timeout begins when data is
-	// available to write, and is extended whenever any bytes are written.
-	// If zero or negative, there is no timeout.
-	WriteByteTimeout time.Duration
-
 	// MaxUploadBufferPerConnection is the size of the initial flow
 	// control window for each connections. The HTTP/2 spec does not
 	// allow this to be smaller than 65535 or larger than 2^32-1.
@@ -166,49 +130,47 @@ type Server struct {
 	// If nil, a default scheduler is chosen.
 	NewWriteScheduler func() WriteScheduler
 
-	// CountError, if non-nil, is called on HTTP/2 server errors.
-	// It's intended to increment a metric for monitoring, such
-	// as an expvar or Prometheus metric.
-	// The errType consists of only ASCII word characters.
-	CountError func(errType string)
-
 	// Internal state. This is a pointer (rather than embedded directly)
 	// so that we don't embed a Mutex in this struct, which will make the
 	// struct non-copyable, which might break some callers.
 	state *serverInternalState
-
-	// Synchronization group used for testing.
-	// Outside of tests, this is nil.
-	group synctestGroupInterface
 }
 
-func (s *Server) markNewGoroutine() {
-	if s.group != nil {
-		s.group.Join()
+func (s *Server) initialConnRecvWindowSize() int32 {
+	if s.MaxUploadBufferPerConnection > initialWindowSize {
+		return s.MaxUploadBufferPerConnection
 	}
+	return 1 << 20
 }
 
-func (s *Server) now() time.Time {
-	if s.group != nil {
-		return s.group.Now()
+func (s *Server) initialStreamRecvWindowSize() int32 {
+	if s.MaxUploadBufferPerStream > 0 {
+		return s.MaxUploadBufferPerStream
 	}
-	return time.Now()
+	return 1 << 20
 }
 
-// newTimer creates a new time.Timer, or a synthetic timer in tests.
-func (s *Server) newTimer(d time.Duration) timer {
-	if s.group != nil {
-		return s.group.NewTimer(d)
+func (s *Server) maxReadFrameSize() uint32 {
+	if v := s.MaxReadFrameSize; v >= minMaxFrameSize && v <= maxFrameSize {
+		return v
 	}
-	return timeTimer{time.NewTimer(d)}
+	return defaultMaxReadFrameSize
 }
 
-// afterFunc creates a new time.AfterFunc timer, or a synthetic timer in tests.
-func (s *Server) afterFunc(d time.Duration, f func()) timer {
-	if s.group != nil {
-		return s.group.AfterFunc(d, f)
+func (s *Server) maxConcurrentStreams() uint32 {
+	if v := s.MaxConcurrentStreams; v > 0 {
+		return v
 	}
-	return timeTimer{time.AfterFunc(d, f)}
+	return defaultMaxStreams
+}
+
+// maxQueuedControlFrames is the maximum number of control frames like
+// SETTINGS, PING and RST_STREAM that will be queued for writing before
+// the connection is closed to prevent memory exhaustion attacks.
+func (s *Server) maxQueuedControlFrames() int {
+	// TODO: if anybody asks, add a Server field, and remember to define the
+	// behavior of negative values.
+	return maxQueuedControlFrames
 }
 
 type serverInternalState struct {
@@ -307,7 +269,7 @@ func ConfigureServer(s *http.Server, conf *Server) error {
 	if s.TLSNextProto == nil {
 		s.TLSNextProto = map[string]func(*http.Server, *tls.Conn, http.Handler){}
 	}
-	protoHandler := func(hs *http.Server, c net.Conn, h http.Handler, sawClientPreface bool) {
+	protoHandler := func(hs *http.Server, c *tls.Conn, h http.Handler) {
 		if testHookOnConn != nil {
 			testHookOnConn()
 		}
@@ -324,31 +286,12 @@ func ConfigureServer(s *http.Server, conf *Server) error {
 			ctx = bc.BaseContext()
 		}
 		conf.ServeConn(c, &ServeConnOpts{
-			Context:          ctx,
-			Handler:          h,
-			BaseConfig:       hs,
-			SawClientPreface: sawClientPreface,
+			Context:    ctx,
+			Handler:    h,
+			BaseConfig: hs,
 		})
 	}
-	s.TLSNextProto[NextProtoTLS] = func(hs *http.Server, c *tls.Conn, h http.Handler) {
-		protoHandler(hs, c, h, false)
-	}
-	// The "unencrypted_http2" TLSNextProto key is used to pass off non-TLS HTTP/2 conns.
-	//
-	// A connection passed in this method has already had the HTTP/2 preface read from it.
-	s.TLSNextProto[nextProtoUnencryptedHTTP2] = func(hs *http.Server, c *tls.Conn, h http.Handler) {
-		nc, err := unencryptedNetConnFromTLSConn(c)
-		if err != nil {
-			if lg := hs.ErrorLog; lg != nil {
-				lg.Print(err)
-			} else {
-				log.Print(err)
-			}
-			go c.Close()
-			return
-		}
-		protoHandler(hs, nc, h, true)
-	}
+	s.TLSNextProto[NextProtoTLS] = protoHandler
 	return nil
 }
 
@@ -366,20 +309,6 @@ type ServeConnOpts struct {
 	// requests. If nil, BaseConfig.Handler is used. If BaseConfig
 	// or BaseConfig.Handler is nil, http.DefaultServeMux is used.
 	Handler http.Handler
-
-	// UpgradeRequest is an initial request received on a connection
-	// undergoing an h2c upgrade. The request body must have been
-	// completely read from the connection before calling ServeConn,
-	// and the 101 Switching Protocols response written.
-	UpgradeRequest *http.Request
-
-	// Settings is the decoded contents of the HTTP2-Settings header
-	// in an h2c upgrade request.
-	Settings []byte
-
-	// SawClientPreface is set if the HTTP/2 connection preface
-	// has already been read from the connection.
-	SawClientPreface bool
 }
 
 func (o *ServeConnOpts) context() context.Context {
@@ -423,22 +352,16 @@ func (o *ServeConnOpts) handler() http.Handler {
 //
 // The opts parameter is optional. If nil, default values are used.
 func (s *Server) ServeConn(c net.Conn, opts *ServeConnOpts) {
-	s.serveConn(c, opts, nil)
-}
-
-func (s *Server) serveConn(c net.Conn, opts *ServeConnOpts, newf func(*serverConn)) {
 	baseCtx, cancel := serverConnBaseContext(c, opts)
 	defer cancel()
 
-	http1srv := opts.baseConfig()
-	conf := configFromServer(http1srv, s)
 	sc := &serverConn{
 		srv:                         s,
-		hs:                          http1srv,
+		hs:                          opts.baseConfig(),
 		conn:                        c,
 		baseCtx:                     baseCtx,
 		remoteAddrStr:               c.RemoteAddr().String(),
-		bw:                          newBufferedWriter(s.group, c, conf.WriteByteTimeout),
+		bw:                          newBufferedWriter(c),
 		handler:                     opts.handler(),
 		streams:                     make(map[uint32]*stream),
 		readFrameCh:                 make(chan readFrameResult),
@@ -448,18 +371,12 @@ func (s *Server) serveConn(c net.Conn, opts *ServeConnOpts, newf func(*serverCon
 		bodyReadCh:                  make(chan bodyReadMsg),         // buffering doesn't matter either way
 		doneServing:                 make(chan struct{}),
 		clientMaxStreams:            math.MaxUint32, // Section 6.5.2: "Initially, there is no limit to this value"
-		advMaxStreams:               conf.MaxConcurrentStreams,
+		advMaxStreams:               s.maxConcurrentStreams(),
 		initialStreamSendWindowSize: initialWindowSize,
-		initialStreamRecvWindowSize: conf.MaxUploadBufferPerStream,
 		maxFrameSize:                initialMaxFrameSize,
-		pingTimeout:                 conf.PingTimeout,
-		countErrorFunc:              conf.CountError,
+		headerTableSize:             initialHeaderTableSize,
 		serveG:                      newGoroutineLock(),
 		pushEnabled:                 true,
-		sawClientPreface:            opts.SawClientPreface,
-	}
-	if newf != nil {
-		newf(sc)
 	}
 
 	s.state.registerConn(sc)
@@ -470,31 +387,27 @@ func (s *Server) serveConn(c net.Conn, opts *ServeConnOpts, newf func(*serverCon
 	// passes the connection off to us with the deadline already set.
 	// Write deadlines are set per stream in serverConn.newStream.
 	// Disarm the net.Conn write deadline here.
-	if sc.hs.WriteTimeout > 0 {
+	if sc.hs.WriteTimeout != 0 {
 		sc.conn.SetWriteDeadline(time.Time{})
 	}
 
 	if s.NewWriteScheduler != nil {
 		sc.writeSched = s.NewWriteScheduler()
 	} else {
-		sc.writeSched = newRoundRobinWriteScheduler()
+		sc.writeSched = NewRandomWriteScheduler()
 	}
 
 	// These start at the RFC-specified defaults. If there is a higher
 	// configured value for inflow, that will be updated when we send a
 	// WINDOW_UPDATE shortly after sending SETTINGS.
 	sc.flow.add(initialWindowSize)
-	sc.inflow.init(initialWindowSize)
+	sc.inflow.add(initialWindowSize)
 	sc.hpackEncoder = hpack.NewEncoder(&sc.headerWriteBuf)
-	sc.hpackEncoder.SetMaxDynamicTableSizeLimit(conf.MaxEncoderHeaderTableSize)
 
 	fr := NewFramer(sc.bw, c)
-	if conf.CountError != nil {
-		fr.countError = conf.CountError
-	}
-	fr.ReadMetaHeaders = hpack.NewDecoder(conf.MaxDecoderHeaderTableSize, nil)
+	fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
 	fr.MaxHeaderListSize = sc.maxHeaderListSize()
-	fr.SetMaxReadFrameSize(conf.MaxReadFrameSize)
+	fr.SetMaxReadFrameSize(s.maxReadFrameSize())
 	sc.framer = fr
 
 	if tc, ok := c.(connectionStater); ok {
@@ -527,7 +440,7 @@ func (s *Server) serveConn(c net.Conn, opts *ServeConnOpts, newf func(*serverCon
 			// So for now, do nothing here again.
 		}
 
-		if !conf.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
+		if !s.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
 			// "Endpoints MAY choose to generate a connection error
 			// (Section 5.4.1) of type INADEQUATE_SECURITY if one of
 			// the prohibited cipher suites are negotiated."
@@ -543,28 +456,10 @@ func (s *Server) serveConn(c net.Conn, opts *ServeConnOpts, newf func(*serverCon
 		}
 	}
 
-	if opts.Settings != nil {
-		fr := &SettingsFrame{
-			FrameHeader: FrameHeader{valid: true},
-			p:           opts.Settings,
-		}
-		if err := fr.ForeachSetting(sc.processSetting); err != nil {
-			sc.rejectConn(ErrCodeProtocol, "invalid settings")
-			return
-		}
-		opts.Settings = nil
-	}
-
 	if hook := testHookGetServerConn; hook != nil {
 		hook(sc)
 	}
-
-	if opts.UpgradeRequest != nil {
-		sc.upgradeRequest(opts.UpgradeRequest)
-		opts.UpgradeRequest = nil
-	}
-
-	sc.serve(conf)
+	sc.serve()
 }
 
 func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx context.Context, cancel func()) {
@@ -599,17 +494,15 @@ type serverConn struct {
 	wroteFrameCh     chan frameWriteResult  // from writeFrameAsync -> serve, tickles more frame writes
 	bodyReadCh       chan bodyReadMsg       // from handlers -> serve
 	serveMsgCh       chan interface{}       // misc messages & code to send to / run on the serve loop
-	flow             outflow                // conn-wide (not stream-specific) outbound flow control
-	inflow           inflow                 // conn-wide inbound flow control
+	flow             flow                   // conn-wide (not stream-specific) outbound flow control
+	inflow           flow                   // conn-wide inbound flow control
 	tlsState         *tls.ConnectionState   // shared by all handlers, like net/http
 	remoteAddrStr    string
 	writeSched       WriteScheduler
-	countErrorFunc   func(errType string)
 
 	// Everything following is owned by the serve loop; use serveG.check():
 	serveG                      goroutineLock // used to verify funcs are on serve()
 	pushEnabled                 bool
-	sawClientPreface            bool // preface has already been read, used in h2c upgrade
 	sawFirstSettings            bool // got the initial SETTINGS frame after the preface
 	needToSendSettingsAck       bool
 	unackedSettings             int    // how many SETTINGS have we sent without ACKs?
@@ -618,31 +511,23 @@ type serverConn struct {
 	advMaxStreams               uint32 // our SETTINGS_MAX_CONCURRENT_STREAMS advertised the client
 	curClientStreams            uint32 // number of open streams initiated by the client
 	curPushedStreams            uint32 // number of open streams initiated by server push
-	curHandlers                 uint32 // number of running handler goroutines
 	maxClientStreamID           uint32 // max ever seen from client (odd), or 0 if there have been no client requests
 	maxPushPromiseID            uint32 // ID of the last push promise (even), or 0 if there have been no pushes
 	streams                     map[uint32]*stream
-	unstartedHandlers           []unstartedHandler
 	initialStreamSendWindowSize int32
-	initialStreamRecvWindowSize int32
 	maxFrameSize                int32
+	headerTableSize             uint32
 	peerMaxHeaderListSize       uint32            // zero means unknown (default)
 	canonHeader                 map[string]string // http2-lower-case -> Go-Canonical-Case
-	canonHeaderKeysSize         int               // canonHeader keys size in bytes
 	writingFrame                bool              // started writing a frame (on serve goroutine or separate)
 	writingFrameAsync           bool              // started a frame on its own goroutine but haven't heard back on wroteFrameCh
 	needsFrameFlush             bool              // last frame write wasn't a flush
 	inGoAway                    bool              // we've started to or sent GOAWAY
 	inFrameScheduleLoop         bool              // whether we're in the scheduleFrameWrite loop
 	needToSendGoAway            bool              // we need to schedule a GOAWAY frame write
-	pingSent                    bool
-	sentPingData                [8]byte
 	goAwayCode                  ErrCode
-	shutdownTimer               timer // nil until used
-	idleTimer                   timer // nil if unused
-	readIdleTimeout             time.Duration
-	pingTimeout                 time.Duration
-	readIdleTimer               timer // nil if unused
+	shutdownTimer               *time.Timer // nil until used
+	idleTimer                   *time.Timer // nil if unused
 
 	// Owned by the writeFrameAsync goroutine:
 	headerWriteBuf bytes.Buffer
@@ -657,7 +542,11 @@ func (sc *serverConn) maxHeaderListSize() uint32 {
 	if n <= 0 {
 		n = http.DefaultMaxHeaderBytes
 	}
-	return uint32(adjustHTTP1MaxHeaderSize(int64(n)))
+	// http2's count is in a slightly different unit and includes 32 bytes per pair.
+	// So, take the net/http.Server value and pad it up a bit, assuming 10 headers.
+	const perFieldOverhead = 32 // per http2 spec
+	const typicalHeaders = 10   // conservative
+	return uint32(n + typicalHeaders*perFieldOverhead)
 }
 
 func (sc *serverConn) curOpenStreams() uint32 {
@@ -682,17 +571,15 @@ type stream struct {
 	cancelCtx func()
 
 	// owned by serverConn's serve loop:
-	bodyBytes        int64   // body bytes seen so far
-	declBodyBytes    int64   // or -1 if undeclared
-	flow             outflow // limits writing from Handler to client
-	inflow           inflow  // what the client is allowed to POST/etc to us
+	bodyBytes        int64 // body bytes seen so far
+	declBodyBytes    int64 // or -1 if undeclared
+	flow             flow  // limits writing from Handler to client
+	inflow           flow  // what the client is allowed to POST/etc to us
 	state            streamState
-	resetQueued      bool  // RST_STREAM queued for write; set by sc.resetStream
-	gotTrailerHeader bool  // HEADER frame for trailers was seen
-	wroteHeaders     bool  // whether we wrote headers (not status 100)
-	readDeadline     timer // nil if unused
-	writeDeadline    timer // nil if unused
-	closeErr         error // set before cw is closed
+	resetQueued      bool        // RST_STREAM queued for write; set by sc.resetStream
+	gotTrailerHeader bool        // HEADER frame for trailers was seen
+	wroteHeaders     bool        // whether we wrote headers (not status 100)
+	writeDeadline    *time.Timer // nil if unused
 
 	trailer    http.Header // accumulated trailers
 	reqTrailer http.Header // handler's Request.Trailer
@@ -770,7 +657,11 @@ func isClosedConnError(err error) bool {
 		return false
 	}
 
-	if errors.Is(err, net.ErrClosed) {
+	// TODO: remove this string search and be more like the Windows
+	// case below. That might involve modifying the standard library
+	// to return better error types.
+	str := err.Error()
+	if strings.Contains(str, "use of closed network connection") {
 		return true
 	}
 
@@ -804,16 +695,10 @@ func (sc *serverConn) condlogf(err error, format string, args ...interface{}) {
 	}
 }
 
-// maxCachedCanonicalHeadersKeysSize is an arbitrarily-chosen limit on the size
-// of the entries in the canonHeader cache.
-// This should be larger than the size of unique, uncommon header keys likely to
-// be sent by the peer, while not so high as to permit unreasonable memory usage
-// if the peer sends an unbounded number of unique header keys.
-const maxCachedCanonicalHeadersKeysSize = 2048
-
 func (sc *serverConn) canonicalHeader(v string) string {
 	sc.serveG.check()
-	cv, ok := httpcommon.CachedCanonicalHeader(v)
+	buildCommonHeaderMapsOnce()
+	cv, ok := commonCanonHeader[v]
 	if ok {
 		return cv
 	}
@@ -825,11 +710,7 @@ func (sc *serverConn) canonicalHeader(v string) string {
 		sc.canonHeader = make(map[string]string)
 	}
 	cv = http.CanonicalHeaderKey(v)
-	size := 100 + len(v)*2 // 100 bytes of map overhead + key + value
-	if sc.canonHeaderKeysSize+size <= maxCachedCanonicalHeadersKeysSize {
-		sc.canonHeader[v] = cv
-		sc.canonHeaderKeysSize += size
-	}
+	sc.canonHeader[v] = cv
 	return cv
 }
 
@@ -848,9 +729,8 @@ type readFrameResult struct {
 // consumer is done with the frame.
 // It's run on its own goroutine.
 func (sc *serverConn) readFrames() {
-	sc.srv.markNewGoroutine()
-	gate := make(chan struct{})
-	gateDone := func() { gate <- struct{}{} }
+	gate := make(gate)
+	gateDone := gate.Done
 	for {
 		f, err := sc.framer.ReadFrame()
 		select {
@@ -880,14 +760,8 @@ type frameWriteResult struct {
 // and then reports when it's done.
 // At most one goroutine can be running writeFrameAsync at a time per
 // serverConn.
-func (sc *serverConn) writeFrameAsync(wr FrameWriteRequest, wd *writeData) {
-	sc.srv.markNewGoroutine()
-	var err error
-	if wd == nil {
-		err = wr.write.writeFrame(sc)
-	} else {
-		err = sc.framer.endWrite()
-	}
+func (sc *serverConn) writeFrameAsync(wr FrameWriteRequest) {
+	err := wr.write.writeFrame(sc)
 	sc.wroteFrameCh <- frameWriteResult{wr: wr, err: err}
 }
 
@@ -920,7 +794,7 @@ func (sc *serverConn) notePanic() {
 	}
 }
 
-func (sc *serverConn) serve(conf http2Config) {
+func (sc *serverConn) serve() {
 	sc.serveG.check()
 	defer sc.notePanic()
 	defer sc.conn.Close()
@@ -932,24 +806,19 @@ func (sc *serverConn) serve(conf http2Config) {
 		sc.vlogf("http2: server connection from %v on %p", sc.conn.RemoteAddr(), sc.hs)
 	}
 
-	settings := writeSettings{
-		{SettingMaxFrameSize, conf.MaxReadFrameSize},
-		{SettingMaxConcurrentStreams, sc.advMaxStreams},
-		{SettingMaxHeaderListSize, sc.maxHeaderListSize()},
-		{SettingHeaderTableSize, conf.MaxDecoderHeaderTableSize},
-		{SettingInitialWindowSize, uint32(sc.initialStreamRecvWindowSize)},
-	}
-	if !disableExtendedConnectProtocol {
-		settings = append(settings, Setting{SettingEnableConnectProtocol, 1})
-	}
 	sc.writeFrame(FrameWriteRequest{
-		write: settings,
+		write: writeSettings{
+			{SettingMaxFrameSize, sc.srv.maxReadFrameSize()},
+			{SettingMaxConcurrentStreams, sc.advMaxStreams},
+			{SettingMaxHeaderListSize, sc.maxHeaderListSize()},
+			{SettingInitialWindowSize, uint32(sc.srv.initialStreamRecvWindowSize())},
+		},
 	})
 	sc.unackedSettings++
 
 	// Each connection starts with initialWindowSize inflow tokens.
 	// If a higher value is configured, we add more tokens.
-	if diff := conf.MaxUploadBufferPerConnection - initialWindowSize; diff > 0 {
+	if diff := sc.srv.initialConnRecvWindowSize() - initialWindowSize; diff > 0 {
 		sc.sendWindowUpdate(nil, int(diff))
 	}
 
@@ -964,23 +833,16 @@ func (sc *serverConn) serve(conf http2Config) {
 	sc.setConnState(http.StateActive)
 	sc.setConnState(http.StateIdle)
 
-	if sc.srv.IdleTimeout > 0 {
-		sc.idleTimer = sc.srv.afterFunc(sc.srv.IdleTimeout, sc.onIdleTimer)
+	if sc.srv.IdleTimeout != 0 {
+		sc.idleTimer = time.AfterFunc(sc.srv.IdleTimeout, sc.onIdleTimer)
 		defer sc.idleTimer.Stop()
 	}
 
-	if conf.SendPingTimeout > 0 {
-		sc.readIdleTimeout = conf.SendPingTimeout
-		sc.readIdleTimer = sc.srv.afterFunc(conf.SendPingTimeout, sc.onReadIdleTimer)
-		defer sc.readIdleTimer.Stop()
-	}
-
 	go sc.readFrames() // closed by defer sc.conn.Close above
 
-	settingsTimer := sc.srv.afterFunc(firstSettingsTimeout, sc.onSettingsTimer)
+	settingsTimer := time.AfterFunc(firstSettingsTimeout, sc.onSettingsTimer)
 	defer settingsTimer.Stop()
 
-	lastFrameTime := sc.srv.now()
 	loopNum := 0
 	for {
 		loopNum++
@@ -994,7 +856,6 @@ func (sc *serverConn) serve(conf http2Config) {
 		case res := <-sc.wroteFrameCh:
 			sc.wroteFrame(res)
 		case res := <-sc.readFrameCh:
-			lastFrameTime = sc.srv.now()
 			// Process any written frames before reading new frames from the client since a
 			// written frame could have triggered a new stream to be started.
 			if sc.writingFrameAsync {
@@ -1026,22 +887,16 @@ func (sc *serverConn) serve(conf http2Config) {
 				case idleTimerMsg:
 					sc.vlogf("connection is idle")
 					sc.goAway(ErrCodeNo)
-				case readIdleTimerMsg:
-					sc.handlePingTimer(lastFrameTime)
 				case shutdownTimerMsg:
 					sc.vlogf("GOAWAY close timer fired; closing conn from %v", sc.conn.RemoteAddr())
 					return
 				case gracefulShutdownMsg:
 					sc.startGracefulShutdownInternal()
-				case handlerDoneMsg:
-					sc.handlerDone()
 				default:
 					panic("unknown timer")
 				}
 			case *startPushRequest:
 				sc.startPush(v)
-			case func(*serverConn):
-				v(sc)
 			default:
 				panic(fmt.Sprintf("unexpected type %T", v))
 			}
@@ -1050,7 +905,7 @@ func (sc *serverConn) serve(conf http2Config) {
 		// If the peer is causing us to generate a lot of control frames,
 		// but not reading them from us, assume they are trying to make us
 		// run out of memory.
-		if sc.queuedControlFrames > maxQueuedControlFrames {
+		if sc.queuedControlFrames > sc.srv.maxQueuedControlFrames() {
 			sc.vlogf("http2: too many control frames in send queue, closing connection")
 			return
 		}
@@ -1066,33 +921,12 @@ func (sc *serverConn) serve(conf http2Config) {
 	}
 }
 
-func (sc *serverConn) handlePingTimer(lastFrameReadTime time.Time) {
-	if sc.pingSent {
-		sc.logf("timeout waiting for PING response")
-		if f := sc.countErrorFunc; f != nil {
-			f("conn_close_lost_ping")
-		}
-		sc.conn.Close()
-		return
+func (sc *serverConn) awaitGracefulShutdown(sharedCh <-chan struct{}, privateCh chan struct{}) {
+	select {
+	case <-sc.doneServing:
+	case <-sharedCh:
+		close(privateCh)
 	}
-
-	pingAt := lastFrameReadTime.Add(sc.readIdleTimeout)
-	now := sc.srv.now()
-	if pingAt.After(now) {
-		// We received frames since arming the ping timer.
-		// Reset it for the next possible timeout.
-		sc.readIdleTimer.Reset(pingAt.Sub(now))
-		return
-	}
-
-	sc.pingSent = true
-	// Ignore crypto/rand.Read errors: It generally can't fail, and worse case if it does
-	// is we send a PING frame containing 0s.
-	_, _ = rand.Read(sc.sentPingData[:])
-	sc.writeFrame(FrameWriteRequest{
-		write: &writePing{data: sc.sentPingData},
-	})
-	sc.readIdleTimer.Reset(sc.pingTimeout)
 }
 
 type serverMessage int
@@ -1101,15 +935,12 @@ type serverMessage int
 var (
 	settingsTimerMsg    = new(serverMessage)
 	idleTimerMsg        = new(serverMessage)
-	readIdleTimerMsg    = new(serverMessage)
 	shutdownTimerMsg    = new(serverMessage)
 	gracefulShutdownMsg = new(serverMessage)
-	handlerDoneMsg      = new(serverMessage)
 )
 
 func (sc *serverConn) onSettingsTimer() { sc.sendServeMsg(settingsTimerMsg) }
 func (sc *serverConn) onIdleTimer()     { sc.sendServeMsg(idleTimerMsg) }
-func (sc *serverConn) onReadIdleTimer() { sc.sendServeMsg(readIdleTimerMsg) }
 func (sc *serverConn) onShutdownTimer() { sc.sendServeMsg(shutdownTimerMsg) }
 
 func (sc *serverConn) sendServeMsg(msg interface{}) {
@@ -1126,9 +957,6 @@ var errPrefaceTimeout = errors.New("timeout waiting for client preface")
 // returns errPrefaceTimeout on timeout, or an error if the greeting
 // is invalid.
 func (sc *serverConn) readPreface() error {
-	if sc.sawClientPreface {
-		return nil
-	}
 	errc := make(chan error, 1)
 	go func() {
 		// Read the client preface
@@ -1141,10 +969,10 @@ func (sc *serverConn) readPreface() error {
 			errc <- nil
 		}
 	}()
-	timer := sc.srv.newTimer(prefaceTimeout) // TODO: configurable on *Server?
+	timer := time.NewTimer(prefaceTimeout) // TODO: configurable on *Server?
 	defer timer.Stop()
 	select {
-	case <-timer.C():
+	case <-timer.C:
 		return errPrefaceTimeout
 	case err := <-errc:
 		if err == nil {
@@ -1334,16 +1162,9 @@ func (sc *serverConn) startFrameWrite(wr FrameWriteRequest) {
 		sc.writingFrameAsync = false
 		err := wr.write.writeFrame(sc)
 		sc.wroteFrame(frameWriteResult{wr: wr, err: err})
-	} else if wd, ok := wr.write.(*writeData); ok {
-		// Encode the frame in the serve goroutine, to ensure we don't have
-		// any lingering asynchronous references to data passed to Write.
-		// See https://go.dev/issue/58446.
-		sc.framer.startWriteDataPadded(wd.streamID, wd.endStream, wd.p, nil)
-		sc.writingFrameAsync = true
-		go sc.writeFrameAsync(wr, wd)
 	} else {
 		sc.writingFrameAsync = true
-		go sc.writeFrameAsync(wr, nil)
+		go sc.writeFrameAsync(wr)
 	}
 }
 
@@ -1362,10 +1183,6 @@ func (sc *serverConn) wroteFrame(res frameWriteResult) {
 	sc.writingFrame = false
 	sc.writingFrameAsync = false
 
-	if res.err != nil {
-		sc.conn.Close()
-	}
-
 	wr := res.wr
 
 	if writeEndsStream(wr.write) {
@@ -1500,9 +1317,6 @@ func (sc *serverConn) startGracefulShutdownInternal() {
 func (sc *serverConn) goAway(code ErrCode) {
 	sc.serveG.check()
 	if sc.inGoAway {
-		if sc.goAwayCode == ErrCodeNo {
-			sc.goAwayCode = code
-		}
 		return
 	}
 	sc.inGoAway = true
@@ -1513,7 +1327,7 @@ func (sc *serverConn) goAway(code ErrCode) {
 
 func (sc *serverConn) shutDownIn(d time.Duration) {
 	sc.serveG.check()
-	sc.shutdownTimer = sc.srv.afterFunc(d, sc.onShutdownTimer)
+	sc.shutdownTimer = time.AfterFunc(d, sc.onShutdownTimer)
 }
 
 func (sc *serverConn) resetStream(se StreamError) {
@@ -1566,11 +1380,6 @@ func (sc *serverConn) processFrameFromReader(res readFrameResult) bool {
 		sc.goAway(ErrCodeFlowControl)
 		return true
 	case ConnectionError:
-		if res.f != nil {
-			if id := res.f.Header().StreamID; id > sc.maxClientStreamID {
-				sc.maxClientStreamID = id
-			}
-		}
 		sc.logf("http2: server connection error from %v: %v", sc.conn.RemoteAddr(), ev)
 		sc.goAway(ErrCode(ev))
 		return true // goAway will handle shutdown
@@ -1590,26 +1399,11 @@ func (sc *serverConn) processFrame(f Frame) error {
 	// First frame received must be SETTINGS.
 	if !sc.sawFirstSettings {
 		if _, ok := f.(*SettingsFrame); !ok {
-			return sc.countError("first_settings", ConnectionError(ErrCodeProtocol))
+			return ConnectionError(ErrCodeProtocol)
 		}
 		sc.sawFirstSettings = true
 	}
 
-	// Discard frames for streams initiated after the identified last
-	// stream sent in a GOAWAY, or all frames after sending an error.
-	// We still need to return connection-level flow control for DATA frames.
-	// RFC 9113 Section 6.8.
-	if sc.inGoAway && (sc.goAwayCode != ErrCodeNo || f.Header().StreamID > sc.maxClientStreamID) {
-
-		if f, ok := f.(*DataFrame); ok {
-			if !sc.inflow.take(f.Length) {
-				return sc.countError("data_flow", streamError(f.Header().StreamID, ErrCodeFlowControl))
-			}
-			sc.sendWindowUpdate(nil, int(f.Length)) // conn-level
-		}
-		return nil
-	}
-
 	switch f := f.(type) {
 	case *SettingsFrame:
 		return sc.processSettings(f)
@@ -1630,7 +1424,7 @@ func (sc *serverConn) processFrame(f Frame) error {
 	case *PushPromiseFrame:
 		// A client cannot push. Thus, servers MUST treat the receipt of a PUSH_PROMISE
 		// frame as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-		return sc.countError("push_promise", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	default:
 		sc.vlogf("http2: server ignoring frame: %v", f.Header())
 		return nil
@@ -1640,11 +1434,6 @@ func (sc *serverConn) processFrame(f Frame) error {
 func (sc *serverConn) processPing(f *PingFrame) error {
 	sc.serveG.check()
 	if f.IsAck() {
-		if sc.pingSent && sc.sentPingData == f.Data {
-			// This is a response to a PING we sent.
-			sc.pingSent = false
-			sc.readIdleTimer.Reset(sc.readIdleTimeout)
-		}
 		// 6.7 PING: " An endpoint MUST NOT respond to PING frames
 		// containing this flag."
 		return nil
@@ -1655,7 +1444,10 @@ func (sc *serverConn) processPing(f *PingFrame) error {
 		// identifier field value other than 0x0, the recipient MUST
 		// respond with a connection error (Section 5.4.1) of type
 		// PROTOCOL_ERROR."
-		return sc.countError("ping_on_stream", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
+	}
+	if sc.inGoAway && sc.goAwayCode != ErrCodeNo {
+		return nil
 	}
 	sc.writeFrame(FrameWriteRequest{write: writePingAck{f}})
 	return nil
@@ -1671,7 +1463,7 @@ func (sc *serverConn) processWindowUpdate(f *WindowUpdateFrame) error {
 			// or PRIORITY on a stream in this state MUST be
 			// treated as a connection error (Section 5.4.1) of
 			// type PROTOCOL_ERROR."
-			return sc.countError("stream_idle", ConnectionError(ErrCodeProtocol))
+			return ConnectionError(ErrCodeProtocol)
 		}
 		if st == nil {
 			// "WINDOW_UPDATE can be sent by a peer that has sent a
@@ -1682,7 +1474,7 @@ func (sc *serverConn) processWindowUpdate(f *WindowUpdateFrame) error {
 			return nil
 		}
 		if !st.flow.add(int32(f.Increment)) {
-			return sc.countError("bad_flow", streamError(f.StreamID, ErrCodeFlowControl))
+			return streamError(f.StreamID, ErrCodeFlowControl)
 		}
 	default: // connection-level flow control
 		if !sc.flow.add(int32(f.Increment)) {
@@ -1703,7 +1495,7 @@ func (sc *serverConn) processResetStream(f *RSTStreamFrame) error {
 		// identifying an idle stream is received, the
 		// recipient MUST treat this as a connection error
 		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return sc.countError("reset_idle_stream", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 	if st != nil {
 		st.cancelCtx()
@@ -1718,9 +1510,6 @@ func (sc *serverConn) closeStream(st *stream, err error) {
 		panic(fmt.Sprintf("invariant; can't close stream in state %v", st.state))
 	}
 	st.state = stateClosed
-	if st.readDeadline != nil {
-		st.readDeadline.Stop()
-	}
 	if st.writeDeadline != nil {
 		st.writeDeadline.Stop()
 	}
@@ -1732,7 +1521,7 @@ func (sc *serverConn) closeStream(st *stream, err error) {
 	delete(sc.streams, st.id)
 	if len(sc.streams) == 0 {
 		sc.setConnState(http.StateIdle)
-		if sc.srv.IdleTimeout > 0 && sc.idleTimer != nil {
+		if sc.srv.IdleTimeout != 0 {
 			sc.idleTimer.Reset(sc.srv.IdleTimeout)
 		}
 		if h1ServerKeepAlivesDisabled(sc.hs) {
@@ -1746,15 +1535,6 @@ func (sc *serverConn) closeStream(st *stream, err error) {
 
 		p.CloseWithError(err)
 	}
-	if e, ok := err.(StreamError); ok {
-		if e.Cause != nil {
-			err = e.Cause
-		} else {
-			err = errStreamClosed
-		}
-	}
-	st.closeErr = err
-	st.cancelCtx()
 	st.cw.Close() // signals Handler's CloseNotifier, unblocks writes, etc
 	sc.writeSched.CloseStream(st.id)
 }
@@ -1767,7 +1547,7 @@ func (sc *serverConn) processSettings(f *SettingsFrame) error {
 			// Why is the peer ACKing settings we never sent?
 			// The spec doesn't mention this case, but
 			// hang up on them anyway.
-			return sc.countError("ack_mystery", ConnectionError(ErrCodeProtocol))
+			return ConnectionError(ErrCodeProtocol)
 		}
 		return nil
 	}
@@ -1775,7 +1555,7 @@ func (sc *serverConn) processSettings(f *SettingsFrame) error {
 		// This isn't actually in the spec, but hang up on
 		// suspiciously large settings frames or those with
 		// duplicate entries.
-		return sc.countError("settings_big_or_dups", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 	if err := f.ForeachSetting(sc.processSetting); err != nil {
 		return err
@@ -1797,6 +1577,7 @@ func (sc *serverConn) processSetting(s Setting) error {
 	}
 	switch s.ID {
 	case SettingHeaderTableSize:
+		sc.headerTableSize = s.Val
 		sc.hpackEncoder.SetMaxDynamicTableSize(s.Val)
 	case SettingEnablePush:
 		sc.pushEnabled = s.Val != 0
@@ -1808,9 +1589,6 @@ func (sc *serverConn) processSetting(s Setting) error {
 		sc.maxFrameSize = int32(s.Val) // the maximum valid s.Val is < 2^31
 	case SettingMaxHeaderListSize:
 		sc.peerMaxHeaderListSize = s.Val
-	case SettingEnableConnectProtocol:
-		// Receipt of this parameter by a server does not
-		// have any impact
 	default:
 		// Unknown setting: "An endpoint that receives a SETTINGS
 		// frame with any unknown or unsupported identifier MUST
@@ -1844,7 +1622,7 @@ func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
 			// control window to exceed the maximum size as a
 			// connection error (Section 5.4.1) of type
 			// FLOW_CONTROL_ERROR."
-			return sc.countError("setting_win_size", ConnectionError(ErrCodeFlowControl))
+			return ConnectionError(ErrCodeFlowControl)
 		}
 	}
 	return nil
@@ -1853,6 +1631,16 @@ func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
 func (sc *serverConn) processData(f *DataFrame) error {
 	sc.serveG.check()
 	id := f.Header().StreamID
+	if sc.inGoAway && (sc.goAwayCode != ErrCodeNo || id > sc.maxClientStreamID) {
+		// Discard all DATA frames if the GOAWAY is due to an
+		// error, or:
+		//
+		// Section 6.8: After sending a GOAWAY frame, the sender
+		// can discard frames for streams initiated by the
+		// receiver with identifiers higher than the identified
+		// last stream.
+		return nil
+	}
 
 	data := f.Data()
 	state, st := sc.state(id)
@@ -1867,7 +1655,7 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		// or PRIORITY on a stream in this state MUST be
 		// treated as a connection error (Section 5.4.1) of
 		// type PROTOCOL_ERROR."
-		return sc.countError("data_on_idle", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 
 	// "If a DATA frame is received whose stream is not in "open"
@@ -1883,16 +1671,21 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		// But still enforce their connection-level flow control,
 		// and return any flow control bytes since we're not going
 		// to consume them.
-		if !sc.inflow.take(f.Length) {
-			return sc.countError("data_flow", streamError(id, ErrCodeFlowControl))
+		if sc.inflow.available() < int32(f.Length) {
+			return streamError(id, ErrCodeFlowControl)
 		}
+		// Deduct the flow control from inflow, since we're
+		// going to immediately add it back in
+		// sendWindowUpdate, which also schedules sending the
+		// frames.
+		sc.inflow.take(int32(f.Length))
 		sc.sendWindowUpdate(nil, int(f.Length)) // conn-level
 
 		if st != nil && st.resetQueued {
 			// Already have a stream error in flight. Don't send another.
 			return nil
 		}
-		return sc.countError("closed", streamError(id, ErrCodeStreamClosed))
+		return streamError(id, ErrCodeStreamClosed)
 	}
 	if st.body == nil {
 		panic("internal error: should have a body in this state")
@@ -1900,46 +1693,37 @@ func (sc *serverConn) processData(f *DataFrame) error {
 
 	// Sender sending more than they'd declared?
 	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
-		if !sc.inflow.take(f.Length) {
-			return sc.countError("data_flow", streamError(id, ErrCodeFlowControl))
-		}
-		sc.sendWindowUpdate(nil, int(f.Length)) // conn-level
-
 		st.body.CloseWithError(fmt.Errorf("sender tried to send more than declared Content-Length of %d bytes", st.declBodyBytes))
 		// RFC 7540, sec 8.1.2.6: A request or response is also malformed if the
 		// value of a content-length header field does not equal the sum of the
 		// DATA frame payload lengths that form the body.
-		return sc.countError("send_too_much", streamError(id, ErrCodeProtocol))
+		return streamError(id, ErrCodeProtocol)
 	}
 	if f.Length > 0 {
 		// Check whether the client has flow control quota.
-		if !takeInflows(&sc.inflow, &st.inflow, f.Length) {
-			return sc.countError("flow_on_data_length", streamError(id, ErrCodeFlowControl))
+		if st.inflow.available() < int32(f.Length) {
+			return streamError(id, ErrCodeFlowControl)
 		}
+		st.inflow.take(int32(f.Length))
 
 		if len(data) > 0 {
-			st.bodyBytes += int64(len(data))
 			wrote, err := st.body.Write(data)
 			if err != nil {
-				// The handler has closed the request body.
-				// Return the connection-level flow control for the discarded data,
-				// but not the stream-level flow control.
 				sc.sendWindowUpdate(nil, int(f.Length)-wrote)
-				return nil
+				return streamError(id, ErrCodeStreamClosed)
 			}
 			if wrote != len(data) {
 				panic("internal error: bad Writer")
 			}
+			st.bodyBytes += int64(len(data))
 		}
 
 		// Return any padded flow control now, since we won't
 		// refund it later on body reads.
-		// Call sendWindowUpdate even if there is no padding,
-		// to return buffered flow control credit if the sent
-		// window has shrunk.
-		pad := int32(f.Length) - int32(len(data))
-		sc.sendWindowUpdate32(nil, pad)
-		sc.sendWindowUpdate32(st, pad)
+		if pad := int32(f.Length) - int32(len(data)); pad > 0 {
+			sc.sendWindowUpdate32(nil, pad)
+			sc.sendWindowUpdate32(st, pad)
+		}
 	}
 	if f.StreamEnded() {
 		st.endStream()
@@ -1993,36 +1777,26 @@ func (st *stream) copyTrailersToHandlerRequest() {
 	}
 }
 
-// onReadTimeout is run on its own goroutine (from time.AfterFunc)
-// when the stream's ReadTimeout has fired.
-func (st *stream) onReadTimeout() {
-	if st.body != nil {
-		// Wrap the ErrDeadlineExceeded to avoid callers depending on us
-		// returning the bare error.
-		st.body.CloseWithError(fmt.Errorf("%w", os.ErrDeadlineExceeded))
-	}
-}
-
 // onWriteTimeout is run on its own goroutine (from time.AfterFunc)
 // when the stream's WriteTimeout has fired.
 func (st *stream) onWriteTimeout() {
-	st.sc.writeFrameFromHandler(FrameWriteRequest{write: StreamError{
-		StreamID: st.id,
-		Code:     ErrCodeInternal,
-		Cause:    os.ErrDeadlineExceeded,
-	}})
+	st.sc.writeFrameFromHandler(FrameWriteRequest{write: streamError(st.id, ErrCodeInternal)})
 }
 
 func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	sc.serveG.check()
 	id := f.StreamID
+	if sc.inGoAway {
+		// Ignore.
+		return nil
+	}
 	// http://tools.ietf.org/html/rfc7540#section-5.1.1
 	// Streams initiated by a client MUST use odd-numbered stream
 	// identifiers. [...] An endpoint that receives an unexpected
 	// stream identifier MUST respond with a connection error
 	// (Section 5.4.1) of type PROTOCOL_ERROR.
 	if id%2 != 1 {
-		return sc.countError("headers_even", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 	// A HEADERS frame can be used to create a new stream or
 	// send a trailer for an open one. If we already have a stream
@@ -2039,7 +1813,7 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 		// this state, it MUST respond with a stream error (Section 5.4.2) of
 		// type STREAM_CLOSED.
 		if st.state == stateHalfClosedRemote {
-			return sc.countError("headers_half_closed", streamError(id, ErrCodeStreamClosed))
+			return streamError(id, ErrCodeStreamClosed)
 		}
 		return st.processTrailerHeaders(f)
 	}
@@ -2050,7 +1824,7 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	// receives an unexpected stream identifier MUST respond with
 	// a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
 	if id <= sc.maxClientStreamID {
-		return sc.countError("stream_went_down", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 	sc.maxClientStreamID = id
 
@@ -2067,14 +1841,14 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	if sc.curClientStreams+1 > sc.advMaxStreams {
 		if sc.unackedSettings == 0 {
 			// They should know better.
-			return sc.countError("over_max_streams", streamError(id, ErrCodeProtocol))
+			return streamError(id, ErrCodeProtocol)
 		}
 		// Assume it's a network race, where they just haven't
 		// received our last SETTINGS update. But actually
 		// this can't happen yet, because we don't yet provide
 		// a way for users to adjust server parameters at
 		// runtime.
-		return sc.countError("over_max_streams_race", streamError(id, ErrCodeRefusedStream))
+		return streamError(id, ErrCodeRefusedStream)
 	}
 
 	initialState := stateOpen
@@ -2084,7 +1858,7 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	st := sc.newStream(id, 0, initialState)
 
 	if f.HasPriority() {
-		if err := sc.checkPriority(f.StreamID, f.Priority); err != nil {
+		if err := checkPriority(f.StreamID, f.Priority); err != nil {
 			return err
 		}
 		sc.writeSched.AdjustStream(st.id, f.Priority)
@@ -2116,51 +1890,27 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	// similar to how the http1 server works. Here it's
 	// technically more like the http1 Server's ReadHeaderTimeout
 	// (in Go 1.8), though. That's a more sane option anyway.
-	if sc.hs.ReadTimeout > 0 {
-		sc.conn.SetReadDeadline(time.Time{})
-		st.readDeadline = sc.srv.afterFunc(sc.hs.ReadTimeout, st.onReadTimeout)
-	}
-
-	return sc.scheduleHandler(id, rw, req, handler)
-}
-
-func (sc *serverConn) upgradeRequest(req *http.Request) {
-	sc.serveG.check()
-	id := uint32(1)
-	sc.maxClientStreamID = id
-	st := sc.newStream(id, 0, stateHalfClosedRemote)
-	st.reqTrailer = req.Trailer
-	if st.reqTrailer != nil {
-		st.trailer = make(http.Header)
-	}
-	rw := sc.newResponseWriter(st, req)
-
-	// Disable any read deadline set by the net/http package
-	// prior to the upgrade.
-	if sc.hs.ReadTimeout > 0 {
+	if sc.hs.ReadTimeout != 0 {
 		sc.conn.SetReadDeadline(time.Time{})
 	}
 
-	// This is the first request on the connection,
-	// so start the handler directly rather than going
-	// through scheduleHandler.
-	sc.curHandlers++
-	go sc.runHandler(rw, req, sc.handler.ServeHTTP)
+	go sc.runHandler(rw, req, handler)
+	return nil
 }
 
 func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
 	sc := st.sc
 	sc.serveG.check()
 	if st.gotTrailerHeader {
-		return sc.countError("dup_trailers", ConnectionError(ErrCodeProtocol))
+		return ConnectionError(ErrCodeProtocol)
 	}
 	st.gotTrailerHeader = true
 	if !f.StreamEnded() {
-		return sc.countError("trailers_not_ended", streamError(st.id, ErrCodeProtocol))
+		return streamError(st.id, ErrCodeProtocol)
 	}
 
 	if len(f.PseudoFields()) > 0 {
-		return sc.countError("trailers_pseudo", streamError(st.id, ErrCodeProtocol))
+		return streamError(st.id, ErrCodeProtocol)
 	}
 	if st.trailer != nil {
 		for _, hf := range f.RegularFields() {
@@ -2169,7 +1919,7 @@ func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
 				// TODO: send more details to the peer somehow. But http2 has
 				// no way to send debug data at a stream level. Discuss with
 				// HTTP folk.
-				return sc.countError("trailers_bogus", streamError(st.id, ErrCodeProtocol))
+				return streamError(st.id, ErrCodeProtocol)
 			}
 			st.trailer[key] = append(st.trailer[key], hf.Value)
 		}
@@ -2178,19 +1928,22 @@ func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
 	return nil
 }
 
-func (sc *serverConn) checkPriority(streamID uint32, p PriorityParam) error {
+func checkPriority(streamID uint32, p PriorityParam) error {
 	if streamID == p.StreamDep {
 		// Section 5.3.1: "A stream cannot depend on itself. An endpoint MUST treat
 		// this as a stream error (Section 5.4.2) of type PROTOCOL_ERROR."
 		// Section 5.3.3 says that a stream can depend on one of its dependencies,
 		// so it's only self-dependencies that are forbidden.
-		return sc.countError("priority", streamError(streamID, ErrCodeProtocol))
+		return streamError(streamID, ErrCodeProtocol)
 	}
 	return nil
 }
 
 func (sc *serverConn) processPriority(f *PriorityFrame) error {
-	if err := sc.checkPriority(f.StreamID, f.PriorityParam); err != nil {
+	if sc.inGoAway {
+		return nil
+	}
+	if err := checkPriority(f.StreamID, f.PriorityParam); err != nil {
 		return err
 	}
 	sc.writeSched.AdjustStream(f.StreamID, f.PriorityParam)
@@ -2214,9 +1967,10 @@ func (sc *serverConn) newStream(id, pusherID uint32, state streamState) *stream
 	st.cw.Init()
 	st.flow.conn = &sc.flow // link to conn-level counter
 	st.flow.add(sc.initialStreamSendWindowSize)
-	st.inflow.init(sc.initialStreamRecvWindowSize)
-	if sc.hs.WriteTimeout > 0 {
-		st.writeDeadline = sc.srv.afterFunc(sc.hs.WriteTimeout, st.onWriteTimeout)
+	st.inflow.conn = &sc.inflow // link to conn-level counter
+	st.inflow.add(sc.srv.initialStreamRecvWindowSize())
+	if sc.hs.WriteTimeout != 0 {
+		st.writeDeadline = time.AfterFunc(sc.hs.WriteTimeout, st.onWriteTimeout)
 	}
 
 	sc.streams[id] = st
@@ -2236,25 +1990,19 @@ func (sc *serverConn) newStream(id, pusherID uint32, state streamState) *stream
 func (sc *serverConn) newWriterAndRequest(st *stream, f *MetaHeadersFrame) (*responseWriter, *http.Request, error) {
 	sc.serveG.check()
 
-	rp := httpcommon.ServerRequestParam{
-		Method:    f.PseudoValue("method"),
-		Scheme:    f.PseudoValue("scheme"),
-		Authority: f.PseudoValue("authority"),
-		Path:      f.PseudoValue("path"),
-		Protocol:  f.PseudoValue("protocol"),
+	rp := requestParam{
+		method:    f.PseudoValue("method"),
+		scheme:    f.PseudoValue("scheme"),
+		authority: f.PseudoValue("authority"),
+		path:      f.PseudoValue("path"),
 	}
 
-	// extended connect is disabled, so we should not see :protocol
-	if disableExtendedConnectProtocol && rp.Protocol != "" {
-		return nil, nil, sc.countError("bad_connect", streamError(f.StreamID, ErrCodeProtocol))
-	}
-
-	isConnect := rp.Method == "CONNECT"
+	isConnect := rp.method == "CONNECT"
 	if isConnect {
-		if rp.Protocol == "" && (rp.Path != "" || rp.Scheme != "" || rp.Authority == "") {
-			return nil, nil, sc.countError("bad_connect", streamError(f.StreamID, ErrCodeProtocol))
+		if rp.path != "" || rp.scheme != "" || rp.authority == "" {
+			return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
 		}
-	} else if rp.Method == "" || rp.Path == "" || (rp.Scheme != "https" && rp.Scheme != "http") {
+	} else if rp.method == "" || rp.path == "" || (rp.scheme != "https" && rp.scheme != "http") {
 		// See 8.1.2.6 Malformed Requests and Responses:
 		//
 		// Malformed requests or responses that are detected
@@ -2265,28 +2013,29 @@ func (sc *serverConn) newWriterAndRequest(st *stream, f *MetaHeadersFrame) (*res
 		// "All HTTP/2 requests MUST include exactly one valid
 		// value for the :method, :scheme, and :path
 		// pseudo-header fields"
-		return nil, nil, sc.countError("bad_path_method", streamError(f.StreamID, ErrCodeProtocol))
+		return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
 	}
 
-	header := make(http.Header)
-	rp.Header = header
+	bodyOpen := !f.StreamEnded()
+	if rp.method == "HEAD" && bodyOpen {
+		// HEAD requests can't have bodies
+		return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
+	}
+
+	rp.header = make(http.Header)
 	for _, hf := range f.RegularFields() {
-		header.Add(sc.canonicalHeader(hf.Name), hf.Value)
+		rp.header.Add(sc.canonicalHeader(hf.Name), hf.Value)
 	}
-	if rp.Authority == "" {
-		rp.Authority = header.Get("Host")
-	}
-	if rp.Protocol != "" {
-		header.Set(":protocol", rp.Protocol)
+	if rp.authority == "" {
+		rp.authority = rp.header.Get("Host")
 	}
 
 	rw, req, err := sc.newWriterAndRequestNoBody(st, rp)
 	if err != nil {
 		return nil, nil, err
 	}
-	bodyOpen := !f.StreamEnded()
 	if bodyOpen {
-		if vv, ok := rp.Header["Content-Length"]; ok {
+		if vv, ok := rp.header["Content-Length"]; ok {
 			if cl, err := strconv.ParseUint(vv[0], 10, 63); err == nil {
 				req.ContentLength = int64(cl)
 			} else {
@@ -2302,43 +2051,83 @@ func (sc *serverConn) newWriterAndRequest(st *stream, f *MetaHeadersFrame) (*res
 	return rw, req, nil
 }
 
-func (sc *serverConn) newWriterAndRequestNoBody(st *stream, rp httpcommon.ServerRequestParam) (*responseWriter, *http.Request, error) {
+type requestParam struct {
+	method                  string
+	scheme, authority, path string
+	header                  http.Header
+}
+
+func (sc *serverConn) newWriterAndRequestNoBody(st *stream, rp requestParam) (*responseWriter, *http.Request, error) {
 	sc.serveG.check()
 
 	var tlsState *tls.ConnectionState // nil if not scheme https
-	if rp.Scheme == "https" {
+	if rp.scheme == "https" {
 		tlsState = sc.tlsState
 	}
 
-	res := httpcommon.NewServerRequest(rp)
-	if res.InvalidReason != "" {
-		return nil, nil, sc.countError(res.InvalidReason, streamError(st.id, ErrCodeProtocol))
+	needsContinue := rp.header.Get("Expect") == "100-continue"
+	if needsContinue {
+		rp.header.Del("Expect")
+	}
+	// Merge Cookie headers into one "; "-delimited value.
+	if cookies := rp.header["Cookie"]; len(cookies) > 1 {
+		rp.header.Set("Cookie", strings.Join(cookies, "; "))
+	}
+
+	// Setup Trailers
+	var trailer http.Header
+	for _, v := range rp.header["Trailer"] {
+		for _, key := range strings.Split(v, ",") {
+			key = http.CanonicalHeaderKey(textproto.TrimString(key))
+			switch key {
+			case "Transfer-Encoding", "Trailer", "Content-Length":
+				// Bogus. (copy of http1 rules)
+				// Ignore.
+			default:
+				if trailer == nil {
+					trailer = make(http.Header)
+				}
+				trailer[key] = nil
+			}
+		}
+	}
+	delete(rp.header, "Trailer")
+
+	var url_ *url.URL
+	var requestURI string
+	if rp.method == "CONNECT" {
+		url_ = &url.URL{Host: rp.authority}
+		requestURI = rp.authority // mimic HTTP/1 server behavior
+	} else {
+		var err error
+		url_, err = url.ParseRequestURI(rp.path)
+		if err != nil {
+			return nil, nil, streamError(st.id, ErrCodeProtocol)
+		}
+		requestURI = rp.path
 	}
 
 	body := &requestBody{
 		conn:          sc,
 		stream:        st,
-		needsContinue: res.NeedsContinue,
+		needsContinue: needsContinue,
 	}
-	req := (&http.Request{
-		Method:     rp.Method,
-		URL:        res.URL,
+	req := &http.Request{
+		Method:     rp.method,
+		URL:        url_,
 		RemoteAddr: sc.remoteAddrStr,
-		Header:     rp.Header,
-		RequestURI: res.RequestURI,
+		Header:     rp.header,
+		RequestURI: requestURI,
 		Proto:      "HTTP/2.0",
 		ProtoMajor: 2,
 		ProtoMinor: 0,
 		TLS:        tlsState,
-		Host:       rp.Authority,
+		Host:       rp.authority,
 		Body:       body,
-		Trailer:    res.Trailer,
-	}).WithContext(st.ctx)
-	rw := sc.newResponseWriter(st, req)
-	return rw, req, nil
-}
+		Trailer:    trailer,
+	}
+	req = req.WithContext(st.ctx)
 
-func (sc *serverConn) newResponseWriter(st *stream, req *http.Request) *responseWriter {
 	rws := responseWriterStatePool.Get().(*responseWriterState)
 	bwSave := rws.bw
 	*rws = responseWriterState{} // zero all the fields
@@ -2347,72 +2136,17 @@ func (sc *serverConn) newResponseWriter(st *stream, req *http.Request) *response
 	rws.bw.Reset(chunkWriter{rws})
 	rws.stream = st
 	rws.req = req
-	return &responseWriter{rws: rws}
-}
+	rws.body = body
 
-type unstartedHandler struct {
-	streamID uint32
-	rw       *responseWriter
-	req      *http.Request
-	handler  func(http.ResponseWriter, *http.Request)
-}
-
-// scheduleHandler starts a handler goroutine,
-// or schedules one to start as soon as an existing handler finishes.
-func (sc *serverConn) scheduleHandler(streamID uint32, rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) error {
-	sc.serveG.check()
-	maxHandlers := sc.advMaxStreams
-	if sc.curHandlers < maxHandlers {
-		sc.curHandlers++
-		go sc.runHandler(rw, req, handler)
-		return nil
-	}
-	if len(sc.unstartedHandlers) > int(4*sc.advMaxStreams) {
-		return sc.countError("too_many_early_resets", ConnectionError(ErrCodeEnhanceYourCalm))
-	}
-	sc.unstartedHandlers = append(sc.unstartedHandlers, unstartedHandler{
-		streamID: streamID,
-		rw:       rw,
-		req:      req,
-		handler:  handler,
-	})
-	return nil
-}
-
-func (sc *serverConn) handlerDone() {
-	sc.serveG.check()
-	sc.curHandlers--
-	i := 0
-	maxHandlers := sc.advMaxStreams
-	for ; i < len(sc.unstartedHandlers); i++ {
-		u := sc.unstartedHandlers[i]
-		if sc.streams[u.streamID] == nil {
-			// This stream was reset before its goroutine had a chance to start.
-			continue
-		}
-		if sc.curHandlers >= maxHandlers {
-			break
-		}
-		sc.curHandlers++
-		go sc.runHandler(u.rw, u.req, u.handler)
-		sc.unstartedHandlers[i] = unstartedHandler{} // don't retain references
-	}
-	sc.unstartedHandlers = sc.unstartedHandlers[i:]
-	if len(sc.unstartedHandlers) == 0 {
-		sc.unstartedHandlers = nil
-	}
+	rw := &responseWriter{rws: rws}
+	return rw, req, nil
 }
 
 // Run on its own goroutine.
 func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) {
-	sc.srv.markNewGoroutine()
-	defer sc.sendServeMsg(handlerDoneMsg)
 	didPanic := true
 	defer func() {
 		rw.rws.stream.cancelCtx()
-		if req.MultipartForm != nil {
-			req.MultipartForm.RemoveAll()
-		}
 		if didPanic {
 			e := recover()
 			sc.writeFrameFromHandler(FrameWriteRequest{
@@ -2516,28 +2250,47 @@ func (sc *serverConn) noteBodyRead(st *stream, n int) {
 }
 
 // st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate32(st *stream, n int32) {
-	sc.sendWindowUpdate(st, int(n))
+func (sc *serverConn) sendWindowUpdate(st *stream, n int) {
+	sc.serveG.check()
+	// "The legal range for the increment to the flow control
+	// window is 1 to 2^31-1 (2,147,483,647) octets."
+	// A Go Read call on 64-bit machines could in theory read
+	// a larger Read than this. Very unlikely, but we handle it here
+	// rather than elsewhere for now.
+	const maxUint31 = 1<<31 - 1
+	for n >= maxUint31 {
+		sc.sendWindowUpdate32(st, maxUint31)
+		n -= maxUint31
+	}
+	sc.sendWindowUpdate32(st, int32(n))
 }
 
 // st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate(st *stream, n int) {
+func (sc *serverConn) sendWindowUpdate32(st *stream, n int32) {
 	sc.serveG.check()
-	var streamID uint32
-	var send int32
-	if st == nil {
-		send = sc.inflow.add(n)
-	} else {
-		streamID = st.id
-		send = st.inflow.add(n)
-	}
-	if send == 0 {
+	if n == 0 {
 		return
 	}
+	if n < 0 {
+		panic("negative update")
+	}
+	var streamID uint32
+	if st != nil {
+		streamID = st.id
+	}
 	sc.writeFrame(FrameWriteRequest{
-		write:  writeWindowUpdate{streamID: streamID, n: uint32(send)},
+		write:  writeWindowUpdate{streamID: streamID, n: uint32(n)},
 		stream: st,
 	})
+	var ok bool
+	if st == nil {
+		ok = sc.inflow.add(n)
+	} else {
+		ok = st.inflow.add(n)
+	}
+	if !ok {
+		panic("internal error; sent too many window updates without decrements?")
+	}
 }
 
 // requestBody is the Handler's Request.Body type.
@@ -2546,18 +2299,17 @@ type requestBody struct {
 	_             incomparable
 	stream        *stream
 	conn          *serverConn
-	closeOnce     sync.Once // for use by Close only
-	sawEOF        bool      // for use by Read only
-	pipe          *pipe     // non-nil if we have an HTTP entity message body
-	needsContinue bool      // need to send a 100-continue
+	closed        bool  // for use by Close only
+	sawEOF        bool  // for use by Read only
+	pipe          *pipe // non-nil if we have a HTTP entity message body
+	needsContinue bool  // need to send a 100-continue
 }
 
 func (b *requestBody) Close() error {
-	b.closeOnce.Do(func() {
-		if b.pipe != nil {
-			b.pipe.BreakWithError(errClosedBody)
-		}
-	})
+	if b.pipe != nil && !b.closed {
+		b.pipe.BreakWithError(errClosedBody)
+	}
+	b.closed = true
 	return nil
 }
 
@@ -2601,6 +2353,7 @@ type responseWriterState struct {
 	// immutable within a request:
 	stream *stream
 	req    *http.Request
+	body   *requestBody // to close at end of request, if DATA frames didn't
 	conn   *serverConn
 
 	// TODO: adjust buffer writing sizes based on server config, frame size updates from peer, etc
@@ -2614,6 +2367,7 @@ type responseWriterState struct {
 	wroteHeader   bool        // WriteHeader called (explicitly or implicitly). Not necessarily sent to user yet.
 	sentHeader    bool        // have we sent the header frame?
 	handlerDone   bool        // handler has finished
+	dirty         bool        // a Write failed; don't reuse this responseWriterState
 
 	sentContentLen int64 // non-zero if handler set a Content-Length header
 	wroteBytes     int64
@@ -2624,15 +2378,7 @@ type responseWriterState struct {
 
 type chunkWriter struct{ rws *responseWriterState }
 
-func (cw chunkWriter) Write(p []byte) (n int, err error) {
-	n, err = cw.rws.writeChunk(p)
-	if err == errStreamClosed {
-		// If writing failed because the stream has been closed,
-		// return the reason it was closed.
-		err = cw.rws.stream.closeErr
-	}
-	return n, err
-}
+func (cw chunkWriter) Write(p []byte) (n int, err error) { return cw.rws.writeChunk(p) }
 
 func (rws *responseWriterState) hasTrailers() bool { return len(rws.trailers) > 0 }
 
@@ -2671,10 +2417,6 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 		rws.writeHeader(200)
 	}
 
-	if rws.handlerDone {
-		rws.promoteUndeclaredTrailers()
-	}
-
 	isHeadResp := rws.req.Method == "HEAD"
 	if !rws.sentHeader {
 		rws.sentHeader = true
@@ -2687,8 +2429,7 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 				clen = ""
 			}
 		}
-		_, hasContentLength := rws.snapHeader["Content-Length"]
-		if !hasContentLength && clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
+		if clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
 			clen = strconv.Itoa(len(p))
 		}
 		_, hasContentType := rws.snapHeader["Content-Type"]
@@ -2702,7 +2443,7 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 		var date string
 		if _, ok := rws.snapHeader["Date"]; !ok {
 			// TODO(bradfitz): be faster here, like net/http? measure.
-			date = rws.conn.srv.now().UTC().Format(http.TimeFormat)
+			date = time.Now().UTC().Format(http.TimeFormat)
 		}
 
 		for _, v := range rws.snapHeader["Trailer"] {
@@ -2733,6 +2474,7 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 			date:          date,
 		})
 		if err != nil {
+			rws.dirty = true
 			return 0, err
 		}
 		if endStream {
@@ -2746,6 +2488,10 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 		return 0, nil
 	}
 
+	if rws.handlerDone {
+		rws.promoteUndeclaredTrailers()
+	}
+
 	// only send trailers if they have actually been defined by the
 	// server handler.
 	hasNonemptyTrailers := rws.hasNonemptyTrailers()
@@ -2753,6 +2499,7 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 	if len(p) > 0 || endStream {
 		// only send a 0 byte DATA frame if we're ending the stream.
 		if err := rws.conn.writeDataFromHandler(rws.stream, p, endStream); err != nil {
+			rws.dirty = true
 			return 0, err
 		}
 	}
@@ -2764,6 +2511,9 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 			trailers:  rws.trailers,
 			endStream: true,
 		})
+		if err != nil {
+			rws.dirty = true
+		}
 		return len(p), err
 	}
 	return len(p), nil
@@ -2779,9 +2529,8 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 // prior to the headers being written. If the set of trailers is fixed
 // or known before the header is written, the normal Go trailers mechanism
 // is preferred:
-//
-//	https://golang.org/pkg/net/http/#ResponseWriter
-//	https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
+//    https://golang.org/pkg/net/http/#ResponseWriter
+//    https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
 const TrailerPrefix = "Trailer:"
 
 // promoteUndeclaredTrailers permits http.Handlers to set trailers
@@ -2822,90 +2571,23 @@ func (rws *responseWriterState) promoteUndeclaredTrailers() {
 	}
 }
 
-func (w *responseWriter) SetReadDeadline(deadline time.Time) error {
-	st := w.rws.stream
-	if !deadline.IsZero() && deadline.Before(w.rws.conn.srv.now()) {
-		// If we're setting a deadline in the past, reset the stream immediately
-		// so writes after SetWriteDeadline returns will fail.
-		st.onReadTimeout()
-		return nil
-	}
-	w.rws.conn.sendServeMsg(func(sc *serverConn) {
-		if st.readDeadline != nil {
-			if !st.readDeadline.Stop() {
-				// Deadline already exceeded, or stream has been closed.
-				return
-			}
-		}
-		if deadline.IsZero() {
-			st.readDeadline = nil
-		} else if st.readDeadline == nil {
-			st.readDeadline = sc.srv.afterFunc(deadline.Sub(sc.srv.now()), st.onReadTimeout)
-		} else {
-			st.readDeadline.Reset(deadline.Sub(sc.srv.now()))
-		}
-	})
-	return nil
-}
-
-func (w *responseWriter) SetWriteDeadline(deadline time.Time) error {
-	st := w.rws.stream
-	if !deadline.IsZero() && deadline.Before(w.rws.conn.srv.now()) {
-		// If we're setting a deadline in the past, reset the stream immediately
-		// so writes after SetWriteDeadline returns will fail.
-		st.onWriteTimeout()
-		return nil
-	}
-	w.rws.conn.sendServeMsg(func(sc *serverConn) {
-		if st.writeDeadline != nil {
-			if !st.writeDeadline.Stop() {
-				// Deadline already exceeded, or stream has been closed.
-				return
-			}
-		}
-		if deadline.IsZero() {
-			st.writeDeadline = nil
-		} else if st.writeDeadline == nil {
-			st.writeDeadline = sc.srv.afterFunc(deadline.Sub(sc.srv.now()), st.onWriteTimeout)
-		} else {
-			st.writeDeadline.Reset(deadline.Sub(sc.srv.now()))
-		}
-	})
-	return nil
-}
-
-func (w *responseWriter) EnableFullDuplex() error {
-	// We always support full duplex responses, so this is a no-op.
-	return nil
-}
-
 func (w *responseWriter) Flush() {
-	w.FlushError()
-}
-
-func (w *responseWriter) FlushError() error {
 	rws := w.rws
 	if rws == nil {
 		panic("Header called after Handler finished")
 	}
-	var err error
 	if rws.bw.Buffered() > 0 {
-		err = rws.bw.Flush()
+		if err := rws.bw.Flush(); err != nil {
+			// Ignore the error. The frame writer already knows.
+			return
+		}
 	} else {
 		// The bufio.Writer won't call chunkWriter.Write
-		// (writeChunk with zero bytes), so we have to do it
+		// (writeChunk with zero bytes, so we have to do it
 		// ourselves to force the HTTP response header and/or
 		// final DATA frame (with END_STREAM) to be sent.
-		_, err = chunkWriter{rws}.Write(nil)
-		if err == nil {
-			select {
-			case <-rws.stream.cw:
-				err = rws.stream.closeErr
-			default:
-			}
-		}
+		rws.writeChunk(nil)
 	}
-	return err
 }
 
 func (w *responseWriter) CloseNotify() <-chan bool {
@@ -2944,7 +2626,8 @@ func checkWriteHeaderCode(code int) {
 	// Issue 22880: require valid WriteHeader status codes.
 	// For now we only enforce that it's three digits.
 	// In the future we might block things over 599 (600 and above aren't defined
-	// at http://httpwg.org/specs/rfc7231.html#status.codes).
+	// at http://httpwg.org/specs/rfc7231.html#status.codes)
+	// and we might block under 200 (once we have more mature 1xx support).
 	// But for now any three digits.
 	//
 	// We used to send "HTTP/1.1 000 0" on the wire in responses but there's
@@ -2965,39 +2648,13 @@ func (w *responseWriter) WriteHeader(code int) {
 }
 
 func (rws *responseWriterState) writeHeader(code int) {
-	if rws.wroteHeader {
-		return
-	}
-
-	checkWriteHeaderCode(code)
-
-	// Handle informational headers
-	if code >= 100 && code <= 199 {
-		// Per RFC 8297 we must not clear the current header map
-		h := rws.handlerHeader
-
-		_, cl := h["Content-Length"]
-		_, te := h["Transfer-Encoding"]
-		if cl || te {
-			h = h.Clone()
-			h.Del("Content-Length")
-			h.Del("Transfer-Encoding")
+	if !rws.wroteHeader {
+		checkWriteHeaderCode(code)
+		rws.wroteHeader = true
+		rws.status = code
+		if len(rws.handlerHeader) > 0 {
+			rws.snapHeader = cloneHeader(rws.handlerHeader)
 		}
-
-		rws.conn.writeHeaders(rws.stream, &writeResHeaders{
-			streamID:    rws.stream.id,
-			httpResCode: code,
-			h:           h,
-			endStream:   rws.handlerDone && !rws.hasTrailers(),
-		})
-
-		return
-	}
-
-	rws.wroteHeader = true
-	rws.status = code
-	if len(rws.handlerHeader) > 0 {
-		rws.snapHeader = cloneHeader(rws.handlerHeader)
 	}
 }
 
@@ -3054,10 +2711,19 @@ func (w *responseWriter) write(lenData int, dataB []byte, dataS string) (n int,
 
 func (w *responseWriter) handlerDone() {
 	rws := w.rws
+	dirty := rws.dirty
 	rws.handlerDone = true
 	w.Flush()
 	w.rws = nil
-	responseWriterStatePool.Put(rws)
+	if !dirty {
+		// Only recycle the pool if all prior Write calls to
+		// the serverConn goroutine completed successfully. If
+		// they returned earlier due to resets from the peer
+		// there might still be write goroutines outstanding
+		// from the serverConn referencing the rws memory. See
+		// issue 20704.
+		responseWriterStatePool.Put(rws)
+	}
 }
 
 // Push errors.
@@ -3228,19 +2894,18 @@ func (sc *serverConn) startPush(msg *startPushRequest) {
 		// we start in "half closed (remote)" for simplicity.
 		// See further comments at the definition of stateHalfClosedRemote.
 		promised := sc.newStream(promisedID, msg.parent.id, stateHalfClosedRemote)
-		rw, req, err := sc.newWriterAndRequestNoBody(promised, httpcommon.ServerRequestParam{
-			Method:    msg.method,
-			Scheme:    msg.url.Scheme,
-			Authority: msg.url.Host,
-			Path:      msg.url.RequestURI(),
-			Header:    cloneHeader(msg.header), // clone since handler runs concurrently with writing the PUSH_PROMISE
+		rw, req, err := sc.newWriterAndRequestNoBody(promised, requestParam{
+			method:    msg.method,
+			scheme:    msg.url.Scheme,
+			authority: msg.url.Host,
+			path:      msg.url.RequestURI(),
+			header:    cloneHeader(msg.header), // clone since handler runs concurrently with writing the PUSH_PROMISE
 		})
 		if err != nil {
 			// Should not happen, since we've already validated msg.url.
 			panic(fmt.Sprintf("newWriterAndRequestNoBody(%+v): %v", msg.url, err))
 		}
 
-		sc.curHandlers++
 		go sc.runHandler(rw, req, sc.handler.ServeHTTP)
 		return promisedID, nil
 	}
@@ -3320,31 +2985,3 @@ func h1ServerKeepAlivesDisabled(hs *http.Server) bool {
 	}
 	return false
 }
-
-func (sc *serverConn) countError(name string, err error) error {
-	if sc == nil || sc.srv == nil {
-		return err
-	}
-	f := sc.countErrorFunc
-	if f == nil {
-		return err
-	}
-	var typ string
-	var code ErrCode
-	switch e := err.(type) {
-	case ConnectionError:
-		typ = "conn"
-		code = ErrCode(e)
-	case StreamError:
-		typ = "stream"
-		code = ErrCode(e.Code)
-	default:
-		return err
-	}
-	codeStr := errCodeName[code]
-	if codeStr == "" {
-		codeStr = strconv.Itoa(int(code))
-	}
-	f(fmt.Sprintf("%s_%s_%s", typ, codeStr, name))
-	return err
-}
diff --git a/vendor/golang.org/x/net/http2/timer.go b/vendor/golang.org/x/net/http2/timer.go
deleted file mode 100644
index 0b1c17b..0000000
--- a/vendor/golang.org/x/net/http2/timer.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-package http2
-
-import "time"
-
-// A timer is a time.Timer, as an interface which can be replaced in tests.
-type timer = interface {
-	C() <-chan time.Time
-	Reset(d time.Duration) bool
-	Stop() bool
-}
-
-// timeTimer adapts a time.Timer to the timer interface.
-type timeTimer struct {
-	*time.Timer
-}
-
-func (t timeTimer) C() <-chan time.Time { return t.Timer.C }
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index f26356b..dc31cfd 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -16,15 +16,15 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/fs"
+	"io/ioutil"
 	"log"
 	"math"
-	"math/bits"
 	mathrand "math/rand"
 	"net"
 	"net/http"
 	"net/http/httptrace"
 	"net/textproto"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -34,7 +34,6 @@ import (
 	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
 	"golang.org/x/net/idna"
-	"golang.org/x/net/internal/httpcommon"
 )
 
 const (
@@ -47,16 +46,11 @@ const (
 	// we buffer per stream.
 	transportDefaultStreamFlow = 4 << 20
 
+	// transportDefaultStreamMinRefresh is the minimum number of bytes we'll send
+	// a stream-level WINDOW_UPDATE for at a time.
+	transportDefaultStreamMinRefresh = 4 << 10
+
 	defaultUserAgent = "Go-http-client/2.0"
-
-	// initialMaxConcurrentStreams is a connections maxConcurrentStreams until
-	// it's received servers initial SETTINGS frame, which corresponds with the
-	// spec's minimum recommended value.
-	initialMaxConcurrentStreams = 100
-
-	// defaultMaxConcurrentStreams is a connections default maxConcurrentStreams
-	// if the server doesn't include one in its initial SETTINGS frame.
-	defaultMaxConcurrentStreams = 1000
 )
 
 // Transport is an HTTP/2 Transport.
@@ -64,23 +58,13 @@ const (
 // A Transport internally caches connections to servers. It is safe
 // for concurrent use by multiple goroutines.
 type Transport struct {
-	// DialTLSContext specifies an optional dial function with context for
-	// creating TLS connections for requests.
-	//
-	// If DialTLSContext and DialTLS is nil, tls.Dial is used.
-	//
-	// If the returned net.Conn has a ConnectionState method like tls.Conn,
-	// it will be used to set http.Response.TLS.
-	DialTLSContext func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error)
-
 	// DialTLS specifies an optional dial function for creating
 	// TLS connections for requests.
 	//
-	// If DialTLSContext and DialTLS is nil, tls.Dial is used.
+	// If DialTLS is nil, tls.Dial is used.
 	//
-	// Deprecated: Use DialTLSContext instead, which allows the transport
-	// to cancel dials as soon as they are no longer needed.
-	// If both are set, DialTLSContext takes priority.
+	// If the returned net.Conn has a ConnectionState method like tls.Conn,
+	// it will be used to set http.Response.TLS.
 	DialTLS func(network, addr string, cfg *tls.Config) (net.Conn, error)
 
 	// TLSClientConfig specifies the TLS configuration to use with
@@ -114,28 +98,6 @@ type Transport struct {
 	// to mean no limit.
 	MaxHeaderListSize uint32
 
-	// MaxReadFrameSize is the http2 SETTINGS_MAX_FRAME_SIZE to send in the
-	// initial settings frame. It is the size in bytes of the largest frame
-	// payload that the sender is willing to receive. If 0, no setting is
-	// sent, and the value is provided by the peer, which should be 16384
-	// according to the spec:
-	// https://datatracker.ietf.org/doc/html/rfc7540#section-6.5.2.
-	// Values are bounded in the range 16k to 16M.
-	MaxReadFrameSize uint32
-
-	// MaxDecoderHeaderTableSize optionally specifies the http2
-	// SETTINGS_HEADER_TABLE_SIZE to send in the initial settings frame. It
-	// informs the remote endpoint of the maximum size of the header compression
-	// table used to decode header blocks, in octets. If zero, the default value
-	// of 4096 is used.
-	MaxDecoderHeaderTableSize uint32
-
-	// MaxEncoderHeaderTableSize optionally specifies an upper limit for the
-	// header compression table used for encoding request headers. Received
-	// SETTINGS_HEADER_TABLE_SIZE settings are capped at this limit. If zero,
-	// the default value of 4096 is used.
-	MaxEncoderHeaderTableSize uint32
-
 	// StrictMaxConcurrentStreams controls whether the server's
 	// SETTINGS_MAX_CONCURRENT_STREAMS should be respected
 	// globally. If false, new TCP connections are created to the
@@ -146,12 +108,6 @@ type Transport struct {
 	// waiting for their turn.
 	StrictMaxConcurrentStreams bool
 
-	// IdleConnTimeout is the maximum amount of time an idle
-	// (keep-alive) connection will remain idle before closing
-	// itself.
-	// Zero means no limit.
-	IdleConnTimeout time.Duration
-
 	// ReadIdleTimeout is the timeout after which a health check using ping
 	// frame will be carried out if no frame is received on the connection.
 	// Note that a ping response will is considered a received frame, so if
@@ -165,17 +121,6 @@ type Transport struct {
 	// Defaults to 15s.
 	PingTimeout time.Duration
 
-	// WriteByteTimeout is the timeout after which the connection will be
-	// closed no data can be written to it. The timeout begins when data is
-	// available to write, and is extended whenever any bytes are written.
-	WriteByteTimeout time.Duration
-
-	// CountError, if non-nil, is called on HTTP/2 transport errors.
-	// It's intended to increment a metric for monitoring, such
-	// as an expvar or Prometheus metric.
-	// The errType consists of only ASCII word characters.
-	CountError func(errType string)
-
 	// t1, if non-nil, is the standard library Transport using
 	// this transport. Its settings are used (but not its
 	// RoundTrip method, etc).
@@ -183,83 +128,30 @@ type Transport struct {
 
 	connPoolOnce  sync.Once
 	connPoolOrDef ClientConnPool // non-nil version of ConnPool
-
-	*transportTestHooks
-}
-
-// Hook points used for testing.
-// Outside of tests, t.transportTestHooks is nil and these all have minimal implementations.
-// Inside tests, see the testSyncHooks function docs.
-
-type transportTestHooks struct {
-	newclientconn func(*ClientConn)
-	group         synctestGroupInterface
-}
-
-func (t *Transport) markNewGoroutine() {
-	if t != nil && t.transportTestHooks != nil {
-		t.transportTestHooks.group.Join()
-	}
-}
-
-func (t *Transport) now() time.Time {
-	if t != nil && t.transportTestHooks != nil {
-		return t.transportTestHooks.group.Now()
-	}
-	return time.Now()
-}
-
-func (t *Transport) timeSince(when time.Time) time.Duration {
-	if t != nil && t.transportTestHooks != nil {
-		return t.now().Sub(when)
-	}
-	return time.Since(when)
-}
-
-// newTimer creates a new time.Timer, or a synthetic timer in tests.
-func (t *Transport) newTimer(d time.Duration) timer {
-	if t.transportTestHooks != nil {
-		return t.transportTestHooks.group.NewTimer(d)
-	}
-	return timeTimer{time.NewTimer(d)}
-}
-
-// afterFunc creates a new time.AfterFunc timer, or a synthetic timer in tests.
-func (t *Transport) afterFunc(d time.Duration, f func()) timer {
-	if t.transportTestHooks != nil {
-		return t.transportTestHooks.group.AfterFunc(d, f)
-	}
-	return timeTimer{time.AfterFunc(d, f)}
-}
-
-func (t *Transport) contextWithTimeout(ctx context.Context, d time.Duration) (context.Context, context.CancelFunc) {
-	if t.transportTestHooks != nil {
-		return t.transportTestHooks.group.ContextWithTimeout(ctx, d)
-	}
-	return context.WithTimeout(ctx, d)
 }
 
 func (t *Transport) maxHeaderListSize() uint32 {
-	n := int64(t.MaxHeaderListSize)
-	if t.t1 != nil && t.t1.MaxResponseHeaderBytes != 0 {
-		n = t.t1.MaxResponseHeaderBytes
-		if n > 0 {
-			n = adjustHTTP1MaxHeaderSize(n)
-		}
-	}
-	if n <= 0 {
+	if t.MaxHeaderListSize == 0 {
 		return 10 << 20
 	}
-	if n >= 0xffffffff {
+	if t.MaxHeaderListSize == 0xffffffff {
 		return 0
 	}
-	return uint32(n)
+	return t.MaxHeaderListSize
 }
 
 func (t *Transport) disableCompression() bool {
 	return t.DisableCompression || (t.t1 != nil && t.t1.DisableCompression)
 }
 
+func (t *Transport) pingTimeout() time.Duration {
+	if t.PingTimeout == 0 {
+		return 15 * time.Second
+	}
+	return t.PingTimeout
+
+}
+
 // ConfigureTransport configures a net/http HTTP/1 Transport to use HTTP/2.
 // It returns an error if t1 has already been HTTP/2-enabled.
 //
@@ -295,8 +187,8 @@ func configureTransports(t1 *http.Transport) (*Transport, error) {
 	if !strSliceContains(t1.TLSClientConfig.NextProtos, "http/1.1") {
 		t1.TLSClientConfig.NextProtos = append(t1.TLSClientConfig.NextProtos, "http/1.1")
 	}
-	upgradeFn := func(scheme, authority string, c net.Conn) http.RoundTripper {
-		addr := authorityAddr(scheme, authority)
+	upgradeFn := func(authority string, c *tls.Conn) http.RoundTripper {
+		addr := authorityAddr("https", authority)
 		if used, err := connPool.addConnIfNeeded(addr, t2, c); err != nil {
 			go c.Close()
 			return erringRoundTripper{err}
@@ -307,37 +199,18 @@ func configureTransports(t1 *http.Transport) (*Transport, error) {
 			// was unknown)
 			go c.Close()
 		}
-		if scheme == "http" {
-			return (*unencryptedTransport)(t2)
-		}
 		return t2
 	}
-	if t1.TLSNextProto == nil {
-		t1.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper)
-	}
-	t1.TLSNextProto[NextProtoTLS] = func(authority string, c *tls.Conn) http.RoundTripper {
-		return upgradeFn("https", authority, c)
-	}
-	// The "unencrypted_http2" TLSNextProto key is used to pass off non-TLS HTTP/2 conns.
-	t1.TLSNextProto[nextProtoUnencryptedHTTP2] = func(authority string, c *tls.Conn) http.RoundTripper {
-		nc, err := unencryptedNetConnFromTLSConn(c)
-		if err != nil {
-			go c.Close()
-			return erringRoundTripper{err}
+	if m := t1.TLSNextProto; len(m) == 0 {
+		t1.TLSNextProto = map[string]func(string, *tls.Conn) http.RoundTripper{
+			"h2": upgradeFn,
 		}
-		return upgradeFn("http", authority, nc)
+	} else {
+		m["h2"] = upgradeFn
 	}
 	return t2, nil
 }
 
-// unencryptedTransport is a Transport with a RoundTrip method that
-// always permits http:// URLs.
-type unencryptedTransport Transport
-
-func (t *unencryptedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	return (*Transport)(t).RoundTripOpt(req, RoundTripOpt{allowHTTP: true})
-}
-
 func (t *Transport) connPool() ClientConnPool {
 	t.connPoolOnce.Do(t.initConnPool)
 	return t.connPoolOrDef
@@ -354,137 +227,104 @@ func (t *Transport) initConnPool() {
 // ClientConn is the state of a single HTTP/2 client connection to an
 // HTTP/2 server.
 type ClientConn struct {
-	t             *Transport
-	tconn         net.Conn             // usually *tls.Conn, except specialized impls
-	tlsState      *tls.ConnectionState // nil only for specialized impls
-	atomicReused  uint32               // whether conn is being reused; atomic
-	singleUse     bool                 // whether being used for a single http.Request
-	getConnCalled bool                 // used by clientConnPool
+	t         *Transport
+	tconn     net.Conn             // usually *tls.Conn, except specialized impls
+	tlsState  *tls.ConnectionState // nil only for specialized impls
+	reused    uint32               // whether conn is being reused; atomic
+	singleUse bool                 // whether being used for a single http.Request
 
 	// readLoop goroutine fields:
 	readerDone chan struct{} // closed on error
 	readerErr  error         // set before readerDone is closed
 
 	idleTimeout time.Duration // or 0 for never
-	idleTimer   timer
+	idleTimer   *time.Timer
 
-	mu               sync.Mutex // guards following
-	cond             *sync.Cond // hold mu; broadcast on flow/closed changes
-	flow             outflow    // our conn-level flow control quota (cs.outflow is per stream)
-	inflow           inflow     // peer's conn-level flow control
-	doNotReuse       bool       // whether conn is marked to not be reused for any future requests
-	closing          bool
-	closed           bool
-	closedOnIdle     bool                     // true if conn was closed for idleness
-	seenSettings     bool                     // true if we've seen a settings frame, false otherwise
-	seenSettingsChan chan struct{}            // closed when seenSettings is true or frame reading fails
-	wantSettingsAck  bool                     // we sent a SETTINGS frame and haven't heard back
-	goAway           *GoAwayFrame             // if non-nil, the GoAwayFrame we received
-	goAwayDebug      string                   // goAway frame's debug data, retained as a string
-	streams          map[uint32]*clientStream // client-initiated
-	streamsReserved  int                      // incr by ReserveNewRequest; decr on RoundTrip
-	nextStreamID     uint32
-	pendingRequests  int                       // requests blocked and waiting to be sent because len(streams) == maxConcurrentStreams
-	pings            map[[8]byte]chan struct{} // in flight ping data to notification channel
-	br               *bufio.Reader
-	lastActive       time.Time
-	lastIdle         time.Time // time last idle
-	// Settings from peer: (also guarded by wmu)
-	maxFrameSize                uint32
-	maxConcurrentStreams        uint32
-	peerMaxHeaderListSize       uint64
-	peerMaxHeaderTableSize      uint32
-	initialWindowSize           uint32
-	initialStreamRecvWindowSize int32
-	readIdleTimeout             time.Duration
-	pingTimeout                 time.Duration
-	extendedConnectAllowed      bool
+	mu              sync.Mutex // guards following
+	cond            *sync.Cond // hold mu; broadcast on flow/closed changes
+	flow            flow       // our conn-level flow control quota (cs.flow is per stream)
+	inflow          flow       // peer's conn-level flow control
+	doNotReuse      bool       // whether conn is marked to not be reused for any future requests
+	closing         bool
+	closed          bool
+	wantSettingsAck bool                     // we sent a SETTINGS frame and haven't heard back
+	goAway          *GoAwayFrame             // if non-nil, the GoAwayFrame we received
+	goAwayDebug     string                   // goAway frame's debug data, retained as a string
+	streams         map[uint32]*clientStream // client-initiated
+	nextStreamID    uint32
+	pendingRequests int                       // requests blocked and waiting to be sent because len(streams) == maxConcurrentStreams
+	pings           map[[8]byte]chan struct{} // in flight ping data to notification channel
+	bw              *bufio.Writer
+	br              *bufio.Reader
+	fr              *Framer
+	lastActive      time.Time
+	lastIdle        time.Time // time last idle
+	// Settings from peer: (also guarded by mu)
+	maxFrameSize          uint32
+	maxConcurrentStreams  uint32
+	peerMaxHeaderListSize uint64
+	initialWindowSize     uint32
 
-	// rstStreamPingsBlocked works around an unfortunate gRPC behavior.
-	// gRPC strictly limits the number of PING frames that it will receive.
-	// The default is two pings per two hours, but the limit resets every time
-	// the gRPC endpoint sends a HEADERS or DATA frame. See golang/go#70575.
-	//
-	// rstStreamPingsBlocked is set after receiving a response to a PING frame
-	// bundled with an RST_STREAM (see pendingResets below), and cleared after
-	// receiving a HEADERS or DATA frame.
-	rstStreamPingsBlocked bool
-
-	// pendingResets is the number of RST_STREAM frames we have sent to the peer,
-	// without confirming that the peer has received them. When we send a RST_STREAM,
-	// we bundle it with a PING frame, unless a PING is already in flight. We count
-	// the reset stream against the connection's concurrency limit until we get
-	// a PING response. This limits the number of requests we'll try to send to a
-	// completely unresponsive connection.
-	pendingResets int
-
-	// reqHeaderMu is a 1-element semaphore channel controlling access to sending new requests.
-	// Write to reqHeaderMu to lock it, read from it to unlock.
-	// Lock reqmu BEFORE mu or wmu.
-	reqHeaderMu chan struct{}
-
-	// wmu is held while writing.
-	// Acquire BEFORE mu when holding both, to avoid blocking mu on network writes.
-	// Only acquire both at the same time when changing peer settings.
-	wmu  sync.Mutex
-	bw   *bufio.Writer
-	fr   *Framer
-	werr error        // first write error that has occurred
 	hbuf bytes.Buffer // HPACK encoder writes into this
 	henc *hpack.Encoder
+
+	wmu  sync.Mutex // held while writing; acquire AFTER mu if holding both
+	werr error      // first write error that has occurred
 }
 
 // clientStream is the state for a single HTTP/2 stream. One of these
 // is created for each Transport.RoundTrip call.
 type clientStream struct {
-	cc *ClientConn
-
-	// Fields of Request that we may access even after the response body is closed.
-	ctx       context.Context
-	reqCancel <-chan struct{}
-
+	cc            *ClientConn
+	req           *http.Request
 	trace         *httptrace.ClientTrace // or nil
 	ID            uint32
+	resc          chan resAndError
 	bufPipe       pipe // buffered pipe with the flow-controlled response payload
+	startedWrite  bool // started request body write; guarded by cc.mu
 	requestedGzip bool
-	isHead        bool
+	on100         func() // optional code to run if get a 100 continue response
 
-	abortOnce sync.Once
-	abort     chan struct{} // closed to signal stream should end immediately
-	abortErr  error         // set if abort is closed
+	flow        flow  // guarded by cc.mu
+	inflow      flow  // guarded by cc.mu
+	bytesRemain int64 // -1 means unknown; owned by transportResponseBody.Read
+	readErr     error // sticky read error; owned by transportResponseBody.Read
+	stopReqBody error // if non-nil, stop writing req body; guarded by cc.mu
+	didReset    bool  // whether we sent a RST_STREAM to the server; guarded by cc.mu
 
-	peerClosed chan struct{} // closed when the peer sends an END_STREAM flag
-	donec      chan struct{} // closed after the stream is in the closed state
-	on100      chan struct{} // buffered; written to if a 100 is received
+	peerReset chan struct{} // closed on peer reset
+	resetErr  error         // populated before peerReset is closed
 
-	respHeaderRecv chan struct{}  // closed when headers are received
-	res            *http.Response // set if respHeaderRecv is closed
-
-	flow        outflow // guarded by cc.mu
-	inflow      inflow  // guarded by cc.mu
-	bytesRemain int64   // -1 means unknown; owned by transportResponseBody.Read
-	readErr     error   // sticky read error; owned by transportResponseBody.Read
-
-	reqBody              io.ReadCloser
-	reqBodyContentLength int64         // -1 means unknown
-	reqBodyClosed        chan struct{} // guarded by cc.mu; non-nil on Close, closed when done
-
-	// owned by writeRequest:
-	sentEndStream bool // sent an END_STREAM flag to the peer
-	sentHeaders   bool
+	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
 
 	// owned by clientConnReadLoop:
-	firstByte       bool  // got the first response byte
-	pastHeaders     bool  // got first MetaHeadersFrame (actual headers)
-	pastTrailers    bool  // got optional second MetaHeadersFrame (trailers)
-	readClosed      bool  // peer sent an END_STREAM flag
-	readAborted     bool  // read loop reset the stream
-	totalHeaderSize int64 // total size of 1xx headers seen
+	firstByte    bool  // got the first response byte
+	pastHeaders  bool  // got first MetaHeadersFrame (actual headers)
+	pastTrailers bool  // got optional second MetaHeadersFrame (trailers)
+	num1xx       uint8 // number of 1xx responses seen
 
 	trailer    http.Header  // accumulated trailers
 	resTrailer *http.Header // client's Response.Trailer
 }
 
+// awaitRequestCancel waits for the user to cancel a request or for the done
+// channel to be signaled. A non-nil error is returned only if the request was
+// canceled.
+func awaitRequestCancel(req *http.Request, done <-chan struct{}) error {
+	ctx := req.Context()
+	if req.Cancel == nil && ctx.Done() == nil {
+		return nil
+	}
+	select {
+	case <-req.Cancel:
+		return errRequestCanceled
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-done:
+		return nil
+	}
+}
+
 var got1xxFuncForTests func(int, textproto.MIMEHeader) error
 
 // get1xxTraceFunc returns the value of request's httptrace.ClientTrace.Got1xxResponse func,
@@ -496,64 +336,78 @@ func (cs *clientStream) get1xxTraceFunc() func(int, textproto.MIMEHeader) error
 	return traceGot1xxResponseFunc(cs.trace)
 }
 
-func (cs *clientStream) abortStream(err error) {
-	cs.cc.mu.Lock()
-	defer cs.cc.mu.Unlock()
-	cs.abortStreamLocked(err)
-}
-
-func (cs *clientStream) abortStreamLocked(err error) {
-	cs.abortOnce.Do(func() {
-		cs.abortErr = err
-		close(cs.abort)
-	})
-	if cs.reqBody != nil {
-		cs.closeReqBodyLocked()
-	}
-	// TODO(dneil): Clean up tests where cs.cc.cond is nil.
-	if cs.cc.cond != nil {
-		// Wake up writeRequestBody if it is waiting on flow control.
-		cs.cc.cond.Broadcast()
+// awaitRequestCancel waits for the user to cancel a request, its context to
+// expire, or for the request to be done (any way it might be removed from the
+// cc.streams map: peer reset, successful completion, TCP connection breakage,
+// etc). If the request is canceled, then cs will be canceled and closed.
+func (cs *clientStream) awaitRequestCancel(req *http.Request) {
+	if err := awaitRequestCancel(req, cs.done); err != nil {
+		cs.cancelStream()
+		cs.bufPipe.CloseWithError(err)
 	}
 }
 
-func (cs *clientStream) abortRequestBodyWrite() {
+func (cs *clientStream) cancelStream() {
+	cc := cs.cc
+	cc.mu.Lock()
+	didReset := cs.didReset
+	cs.didReset = true
+	cc.mu.Unlock()
+
+	if !didReset {
+		cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+		cc.forgetStreamID(cs.ID)
+	}
+}
+
+// checkResetOrDone reports any error sent in a RST_STREAM frame by the
+// server, or errStreamClosed if the stream is complete.
+func (cs *clientStream) checkResetOrDone() error {
+	select {
+	case <-cs.peerReset:
+		return cs.resetErr
+	case <-cs.done:
+		return errStreamClosed
+	default:
+		return nil
+	}
+}
+
+func (cs *clientStream) getStartedWrite() bool {
 	cc := cs.cc
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
-	if cs.reqBody != nil && cs.reqBodyClosed == nil {
-		cs.closeReqBodyLocked()
-		cc.cond.Broadcast()
-	}
+	return cs.startedWrite
 }
 
-func (cs *clientStream) closeReqBodyLocked() {
-	if cs.reqBodyClosed != nil {
-		return
+func (cs *clientStream) abortRequestBodyWrite(err error) {
+	if err == nil {
+		panic("nil error")
 	}
-	cs.reqBodyClosed = make(chan struct{})
-	reqBodyClosed := cs.reqBodyClosed
-	go func() {
-		cs.cc.t.markNewGoroutine()
-		cs.reqBody.Close()
-		close(reqBodyClosed)
-	}()
+	cc := cs.cc
+	cc.mu.Lock()
+	if cs.stopReqBody == nil {
+		cs.stopReqBody = err
+		if cs.req.Body != nil {
+			cs.req.Body.Close()
+		}
+		cc.cond.Broadcast()
+	}
+	cc.mu.Unlock()
 }
 
 type stickyErrWriter struct {
-	group   synctestGroupInterface
-	conn    net.Conn
-	timeout time.Duration
-	err     *error
+	w   io.Writer
+	err *error
 }
 
 func (sew stickyErrWriter) Write(p []byte) (n int, err error) {
 	if *sew.err != nil {
 		return 0, *sew.err
 	}
-	n, err = writeWithByteTimeout(sew.group, sew.conn, sew.timeout, p)
+	n, err = sew.w.Write(p)
 	*sew.err = err
-	return n, err
+	return
 }
 
 // noCachedConnError is the concrete type of ErrNoCachedConn, which
@@ -584,8 +438,6 @@ type RoundTripOpt struct {
 	// no cached connection is available, RoundTripOpt
 	// will return ErrNoCachedConn.
 	OnlyCachedConn bool
-
-	allowHTTP bool // allow http:// URLs
 }
 
 func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
@@ -597,14 +449,11 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 func authorityAddr(scheme string, authority string) (addr string) {
 	host, port, err := net.SplitHostPort(authority)
 	if err != nil { // authority didn't have a port
-		host = authority
-		port = ""
-	}
-	if port == "" { // authority's port was empty
 		port = "443"
 		if scheme == "http" {
 			port = "80"
 		}
+		host = authority
 	}
 	if a, err := idna.ToASCII(host); err == nil {
 		host = a
@@ -618,14 +467,7 @@ func authorityAddr(scheme string, authority string) (addr string) {
 
 // RoundTripOpt is like RoundTrip, but takes options.
 func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Response, error) {
-	switch req.URL.Scheme {
-	case "https":
-		// Always okay.
-	case "http":
-		if !t.AllowHTTP && !opt.allowHTTP {
-			return nil, errors.New("http2: unencrypted HTTP/2 not enabled")
-		}
-	default:
+	if !(req.URL.Scheme == "https" || (req.URL.Scheme == "http" && t.AllowHTTP)) {
 		return nil, errors.New("http2: unsupported scheme")
 	}
 
@@ -636,47 +478,25 @@ func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Res
 			t.vlogf("http2: Transport failed to get client conn for %s: %v", addr, err)
 			return nil, err
 		}
-		reused := !atomic.CompareAndSwapUint32(&cc.atomicReused, 0, 1)
+		reused := !atomic.CompareAndSwapUint32(&cc.reused, 0, 1)
 		traceGotConn(req, cc, reused)
-		res, err := cc.RoundTrip(req)
+		res, gotErrAfterReqBodyWrite, err := cc.roundTrip(req)
 		if err != nil && retry <= 6 {
-			roundTripErr := err
-			if req, err = shouldRetryRequest(req, err); err == nil {
+			if req, err = shouldRetryRequest(req, err, gotErrAfterReqBodyWrite); err == nil {
 				// After the first retry, do exponential backoff with 10% jitter.
 				if retry == 0 {
-					t.vlogf("RoundTrip retrying after failure: %v", roundTripErr)
 					continue
 				}
 				backoff := float64(uint(1) << (uint(retry) - 1))
 				backoff += backoff * (0.1 * mathrand.Float64())
-				d := time.Second * time.Duration(backoff)
-				tm := t.newTimer(d)
 				select {
-				case <-tm.C():
-					t.vlogf("RoundTrip retrying after failure: %v", roundTripErr)
+				case <-time.After(time.Second * time.Duration(backoff)):
 					continue
 				case <-req.Context().Done():
-					tm.Stop()
-					err = req.Context().Err()
+					return nil, req.Context().Err()
 				}
 			}
 		}
-		if err == errClientConnNotEstablished {
-			// This ClientConn was created recently,
-			// this is the first request to use it,
-			// and the connection is closed and not usable.
-			//
-			// In this state, cc.idleTimer will remove the conn from the pool
-			// when it fires. Stop the timer and remove it here so future requests
-			// won't try to use this connection.
-			//
-			// If the timer has already fired and we're racing it, the redundant
-			// call to MarkDead is harmless.
-			if cc.idleTimer != nil {
-				cc.idleTimer.Stop()
-			}
-			t.connPool().MarkDead(cc)
-		}
 		if err != nil {
 			t.vlogf("RoundTrip failure: %v", err)
 			return nil, err
@@ -695,17 +515,16 @@ func (t *Transport) CloseIdleConnections() {
 }
 
 var (
-	errClientConnClosed         = errors.New("http2: client conn is closed")
-	errClientConnUnusable       = errors.New("http2: client conn not usable")
-	errClientConnNotEstablished = errors.New("http2: client conn could not be established")
-	errClientConnGotGoAway      = errors.New("http2: Transport received Server's graceful shutdown GOAWAY")
+	errClientConnClosed    = errors.New("http2: client conn is closed")
+	errClientConnUnusable  = errors.New("http2: client conn not usable")
+	errClientConnGotGoAway = errors.New("http2: Transport received Server's graceful shutdown GOAWAY")
 )
 
 // shouldRetryRequest is called by RoundTrip when a request fails to get
 // response headers. It is always called with a non-nil error.
 // It returns either a request to retry (either the same request, or a
 // modified clone), or an error if the request can't be replayed.
-func shouldRetryRequest(req *http.Request, err error) (*http.Request, error) {
+func shouldRetryRequest(req *http.Request, err error, afterBodyWrite bool) (*http.Request, error) {
 	if !canRetryError(err) {
 		return nil, err
 	}
@@ -718,6 +537,7 @@ func shouldRetryRequest(req *http.Request, err error) (*http.Request, error) {
 	// If the request body can be reset back to its original
 	// state via the optional req.GetBody, do that.
 	if req.GetBody != nil {
+		// TODO: consider a req.Body.Close here? or audit that all caller paths do?
 		body, err := req.GetBody()
 		if err != nil {
 			return nil, err
@@ -729,8 +549,10 @@ func shouldRetryRequest(req *http.Request, err error) (*http.Request, error) {
 
 	// The Request.Body can't reset back to the beginning, but we
 	// don't seem to have started to read from it yet, so reuse
-	// the request directly.
-	if err == errClientConnUnusable {
+	// the request directly. The "afterBodyWrite" means the
+	// bodyWrite process has started, which becomes true before
+	// the first Read.
+	if !afterBodyWrite {
 		return req, nil
 	}
 
@@ -752,14 +574,11 @@ func canRetryError(err error) bool {
 }
 
 func (t *Transport) dialClientConn(ctx context.Context, addr string, singleUse bool) (*ClientConn, error) {
-	if t.transportTestHooks != nil {
-		return t.newClientConn(nil, singleUse)
-	}
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return nil, err
 	}
-	tconn, err := t.dialTLS(ctx, "tcp", addr, t.newTLSConfig(host))
+	tconn, err := t.dialTLS(ctx)("tcp", addr, t.newTLSConfig(host))
 	if err != nil {
 		return nil, err
 	}
@@ -780,25 +599,24 @@ func (t *Transport) newTLSConfig(host string) *tls.Config {
 	return cfg
 }
 
-func (t *Transport) dialTLS(ctx context.Context, network, addr string, tlsCfg *tls.Config) (net.Conn, error) {
-	if t.DialTLSContext != nil {
-		return t.DialTLSContext(ctx, network, addr, tlsCfg)
-	} else if t.DialTLS != nil {
-		return t.DialTLS(network, addr, tlsCfg)
+func (t *Transport) dialTLS(ctx context.Context) func(string, string, *tls.Config) (net.Conn, error) {
+	if t.DialTLS != nil {
+		return t.DialTLS
 	}
-
-	tlsCn, err := t.dialTLSWithContext(ctx, network, addr, tlsCfg)
-	if err != nil {
-		return nil, err
+	return func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+		tlsCn, err := t.dialTLSWithContext(ctx, network, addr, cfg)
+		if err != nil {
+			return nil, err
+		}
+		state := tlsCn.ConnectionState()
+		if p := state.NegotiatedProtocol; p != NextProtoTLS {
+			return nil, fmt.Errorf("http2: unexpected ALPN protocol %q; want %q", p, NextProtoTLS)
+		}
+		if !state.NegotiatedProtocolIsMutual {
+			return nil, errors.New("http2: could not negotiate protocol mutually")
+		}
+		return tlsCn, nil
 	}
-	state := tlsCn.ConnectionState()
-	if p := state.NegotiatedProtocol; p != NextProtoTLS {
-		return nil, fmt.Errorf("http2: unexpected ALPN protocol %q; want %q", p, NextProtoTLS)
-	}
-	if !state.NegotiatedProtocolIsMutual {
-		return nil, errors.New("http2: could not negotiate protocol mutually")
-	}
-	return tlsCn, nil
 }
 
 // disableKeepAlives reports whether connections should be closed as
@@ -819,33 +637,23 @@ func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
 }
 
 func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, error) {
-	conf := configFromTransport(t)
 	cc := &ClientConn{
-		t:                           t,
-		tconn:                       c,
-		readerDone:                  make(chan struct{}),
-		nextStreamID:                1,
-		maxFrameSize:                16 << 10, // spec default
-		initialWindowSize:           65535,    // spec default
-		initialStreamRecvWindowSize: conf.MaxUploadBufferPerStream,
-		maxConcurrentStreams:        initialMaxConcurrentStreams, // "infinite", per spec. Use a smaller value until we have received server settings.
-		peerMaxHeaderListSize:       0xffffffffffffffff,          // "infinite", per spec. Use 2^64-1 instead.
-		streams:                     make(map[uint32]*clientStream),
-		singleUse:                   singleUse,
-		seenSettingsChan:            make(chan struct{}),
-		wantSettingsAck:             true,
-		readIdleTimeout:             conf.SendPingTimeout,
-		pingTimeout:                 conf.PingTimeout,
-		pings:                       make(map[[8]byte]chan struct{}),
-		reqHeaderMu:                 make(chan struct{}, 1),
-		lastActive:                  t.now(),
+		t:                     t,
+		tconn:                 c,
+		readerDone:            make(chan struct{}),
+		nextStreamID:          1,
+		maxFrameSize:          16 << 10,           // spec default
+		initialWindowSize:     65535,              // spec default
+		maxConcurrentStreams:  1000,               // "infinite", per spec. 1000 seems good enough.
+		peerMaxHeaderListSize: 0xffffffffffffffff, // "infinite", per spec. Use 2^64-1 instead.
+		streams:               make(map[uint32]*clientStream),
+		singleUse:             singleUse,
+		wantSettingsAck:       true,
+		pings:                 make(map[[8]byte]chan struct{}),
 	}
-	var group synctestGroupInterface
-	if t.transportTestHooks != nil {
-		t.markNewGoroutine()
-		t.transportTestHooks.newclientconn(cc)
-		c = cc.tconn
-		group = t.group
+	if d := t.idleConnTimeout(); d != 0 {
+		cc.idleTimeout = d
+		cc.idleTimer = time.AfterFunc(d, cc.onIdleTimeout)
 	}
 	if VerboseLogs {
 		t.vlogf("http2: Transport creating client conn %p to %v", cc, c.RemoteAddr())
@@ -856,25 +664,19 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
 
 	// TODO: adjust this writer size to account for frame size +
 	// MTU + crypto/tls record padding.
-	cc.bw = bufio.NewWriter(stickyErrWriter{
-		group:   group,
-		conn:    c,
-		timeout: conf.WriteByteTimeout,
-		err:     &cc.werr,
-	})
+	cc.bw = bufio.NewWriter(stickyErrWriter{c, &cc.werr})
 	cc.br = bufio.NewReader(c)
 	cc.fr = NewFramer(cc.bw, cc.br)
-	cc.fr.SetMaxReadFrameSize(conf.MaxReadFrameSize)
-	if t.CountError != nil {
-		cc.fr.countError = t.CountError
-	}
-	maxHeaderTableSize := conf.MaxDecoderHeaderTableSize
-	cc.fr.ReadMetaHeaders = hpack.NewDecoder(maxHeaderTableSize, nil)
+	cc.fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
 	cc.fr.MaxHeaderListSize = t.maxHeaderListSize()
 
+	// TODO: SetMaxDynamicTableSize, SetMaxDynamicTableSizeLimit on
+	// henc in response to SETTINGS frames?
 	cc.henc = hpack.NewEncoder(&cc.hbuf)
-	cc.henc.SetMaxDynamicTableSizeLimit(conf.MaxEncoderHeaderTableSize)
-	cc.peerMaxHeaderTableSize = initialHeaderTableSize
+
+	if t.AllowHTTP {
+		cc.nextStreamID = 3
+	}
 
 	if cs, ok := c.(connectionStater); ok {
 		state := cs.ConnectionState()
@@ -883,49 +685,37 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
 
 	initialSettings := []Setting{
 		{ID: SettingEnablePush, Val: 0},
-		{ID: SettingInitialWindowSize, Val: uint32(cc.initialStreamRecvWindowSize)},
+		{ID: SettingInitialWindowSize, Val: transportDefaultStreamFlow},
 	}
-	initialSettings = append(initialSettings, Setting{ID: SettingMaxFrameSize, Val: conf.MaxReadFrameSize})
 	if max := t.maxHeaderListSize(); max != 0 {
 		initialSettings = append(initialSettings, Setting{ID: SettingMaxHeaderListSize, Val: max})
 	}
-	if maxHeaderTableSize != initialHeaderTableSize {
-		initialSettings = append(initialSettings, Setting{ID: SettingHeaderTableSize, Val: maxHeaderTableSize})
-	}
 
 	cc.bw.Write(clientPreface)
 	cc.fr.WriteSettings(initialSettings...)
-	cc.fr.WriteWindowUpdate(0, uint32(conf.MaxUploadBufferPerConnection))
-	cc.inflow.init(conf.MaxUploadBufferPerConnection + initialWindowSize)
+	cc.fr.WriteWindowUpdate(0, transportDefaultConnFlow)
+	cc.inflow.add(transportDefaultConnFlow + initialWindowSize)
 	cc.bw.Flush()
 	if cc.werr != nil {
 		cc.Close()
 		return nil, cc.werr
 	}
 
-	// Start the idle timer after the connection is fully initialized.
-	if d := t.idleConnTimeout(); d != 0 {
-		cc.idleTimeout = d
-		cc.idleTimer = t.afterFunc(d, cc.onIdleTimeout)
-	}
-
 	go cc.readLoop()
 	return cc, nil
 }
 
 func (cc *ClientConn) healthCheck() {
-	pingTimeout := cc.pingTimeout
+	pingTimeout := cc.t.pingTimeout()
 	// We don't need to periodically ping in the health check, because the readLoop of ClientConn will
 	// trigger the healthCheck again if there is no frame received.
-	ctx, cancel := cc.t.contextWithTimeout(context.Background(), pingTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), pingTimeout)
 	defer cancel()
-	cc.vlogf("http2: Transport sending health check")
 	err := cc.Ping(ctx)
 	if err != nil {
-		cc.vlogf("http2: Transport health check failure: %v", err)
 		cc.closeForLostPing()
-	} else {
-		cc.vlogf("http2: Transport health check success")
+		cc.t.connPool().MarkDead(cc)
+		return
 	}
 }
 
@@ -952,108 +742,28 @@ func (cc *ClientConn) setGoAway(f *GoAwayFrame) {
 	}
 	last := f.LastStreamID
 	for streamID, cs := range cc.streams {
-		if streamID <= last {
-			// The server's GOAWAY indicates that it received this stream.
-			// It will either finish processing it, or close the connection
-			// without doing so. Either way, leave the stream alone for now.
-			continue
-		}
-		if streamID == 1 && cc.goAway.ErrCode != ErrCodeNo {
-			// Don't retry the first stream on a connection if we get a non-NO error.
-			// If the server is sending an error on a new connection,
-			// retrying the request on a new one probably isn't going to work.
-			cs.abortStreamLocked(fmt.Errorf("http2: Transport received GOAWAY from server ErrCode:%v", cc.goAway.ErrCode))
-		} else {
-			// Aborting the stream with errClentConnGotGoAway indicates that
-			// the request should be retried on a new connection.
-			cs.abortStreamLocked(errClientConnGotGoAway)
+		if streamID > last {
+			select {
+			case cs.resc <- resAndError{err: errClientConnGotGoAway}:
+			default:
+			}
 		}
 	}
 }
 
 // CanTakeNewRequest reports whether the connection can take a new request,
 // meaning it has not been closed or received or sent a GOAWAY.
-//
-// If the caller is going to immediately make a new request on this
-// connection, use ReserveNewRequest instead.
 func (cc *ClientConn) CanTakeNewRequest() bool {
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
 	return cc.canTakeNewRequestLocked()
 }
 
-// ReserveNewRequest is like CanTakeNewRequest but also reserves a
-// concurrent stream in cc. The reservation is decremented on the
-// next call to RoundTrip.
-func (cc *ClientConn) ReserveNewRequest() bool {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	if st := cc.idleStateLocked(); !st.canTakeNewRequest {
-		return false
-	}
-	cc.streamsReserved++
-	return true
-}
-
-// ClientConnState describes the state of a ClientConn.
-type ClientConnState struct {
-	// Closed is whether the connection is closed.
-	Closed bool
-
-	// Closing is whether the connection is in the process of
-	// closing. It may be closing due to shutdown, being a
-	// single-use connection, being marked as DoNotReuse, or
-	// having received a GOAWAY frame.
-	Closing bool
-
-	// StreamsActive is how many streams are active.
-	StreamsActive int
-
-	// StreamsReserved is how many streams have been reserved via
-	// ClientConn.ReserveNewRequest.
-	StreamsReserved int
-
-	// StreamsPending is how many requests have been sent in excess
-	// of the peer's advertised MaxConcurrentStreams setting and
-	// are waiting for other streams to complete.
-	StreamsPending int
-
-	// MaxConcurrentStreams is how many concurrent streams the
-	// peer advertised as acceptable. Zero means no SETTINGS
-	// frame has been received yet.
-	MaxConcurrentStreams uint32
-
-	// LastIdle, if non-zero, is when the connection last
-	// transitioned to idle state.
-	LastIdle time.Time
-}
-
-// State returns a snapshot of cc's state.
-func (cc *ClientConn) State() ClientConnState {
-	cc.wmu.Lock()
-	maxConcurrent := cc.maxConcurrentStreams
-	if !cc.seenSettings {
-		maxConcurrent = 0
-	}
-	cc.wmu.Unlock()
-
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return ClientConnState{
-		Closed:               cc.closed,
-		Closing:              cc.closing || cc.singleUse || cc.doNotReuse || cc.goAway != nil,
-		StreamsActive:        len(cc.streams) + cc.pendingResets,
-		StreamsReserved:      cc.streamsReserved,
-		StreamsPending:       cc.pendingRequests,
-		LastIdle:             cc.lastIdle,
-		MaxConcurrentStreams: maxConcurrent,
-	}
-}
-
 // clientConnIdleState describes the suitability of a client
 // connection to initiate a new RoundTrip request.
 type clientConnIdleState struct {
 	canTakeNewRequest bool
+	freshConn         bool // whether it's unused by any previous request
 }
 
 func (cc *ClientConn) idleState() clientConnIdleState {
@@ -1074,40 +784,17 @@ func (cc *ClientConn) idleStateLocked() (st clientConnIdleState) {
 		// writing it.
 		maxConcurrentOkay = true
 	} else {
-		// We can take a new request if the total of
-		//   - active streams;
-		//   - reservation slots for new streams; and
-		//   - streams for which we have sent a RST_STREAM and a PING,
-		//     but received no subsequent frame
-		// is less than the concurrency limit.
-		maxConcurrentOkay = cc.currentRequestCountLocked() < int(cc.maxConcurrentStreams)
+		maxConcurrentOkay = int64(len(cc.streams)+1) < int64(cc.maxConcurrentStreams)
 	}
 
 	st.canTakeNewRequest = cc.goAway == nil && !cc.closed && !cc.closing && maxConcurrentOkay &&
 		!cc.doNotReuse &&
 		int64(cc.nextStreamID)+2*int64(cc.pendingRequests) < math.MaxInt32 &&
 		!cc.tooIdleLocked()
-
-	// If this connection has never been used for a request and is closed,
-	// then let it take a request (which will fail).
-	// If the conn was closed for idleness, we're racing the idle timer;
-	// don't try to use the conn. (Issue #70515.)
-	//
-	// This avoids a situation where an error early in a connection's lifetime
-	// goes unreported.
-	if cc.nextStreamID == 1 && cc.streamsReserved == 0 && cc.closed && !cc.closedOnIdle {
-		st.canTakeNewRequest = true
-	}
-
+	st.freshConn = cc.nextStreamID == 1 && st.canTakeNewRequest
 	return
 }
 
-// currentRequestCountLocked reports the number of concurrency slots currently in use,
-// including active streams, reserved slots, and reset streams waiting for acknowledgement.
-func (cc *ClientConn) currentRequestCountLocked() int {
-	return len(cc.streams) + cc.streamsReserved + cc.pendingResets
-}
-
 func (cc *ClientConn) canTakeNewRequestLocked() bool {
 	st := cc.idleStateLocked()
 	return st.canTakeNewRequest
@@ -1120,7 +807,7 @@ func (cc *ClientConn) tooIdleLocked() bool {
 	// times are compared based on their wall time. We don't want
 	// to reuse a connection that's been sitting idle during
 	// VM/laptop suspend if monotonic time was also frozen.
-	return cc.idleTimeout != 0 && !cc.lastIdle.IsZero() && cc.t.timeSince(cc.lastIdle.Round(0)) > cc.idleTimeout
+	return cc.idleTimeout != 0 && !cc.lastIdle.IsZero() && time.Since(cc.lastIdle.Round(0)) > cc.idleTimeout
 }
 
 // onIdleTimeout is called from a time.AfterFunc goroutine. It will
@@ -1133,32 +820,13 @@ func (cc *ClientConn) onIdleTimeout() {
 	cc.closeIfIdle()
 }
 
-func (cc *ClientConn) closeConn() {
-	t := time.AfterFunc(250*time.Millisecond, cc.forceCloseConn)
-	defer t.Stop()
-	cc.tconn.Close()
-}
-
-// A tls.Conn.Close can hang for a long time if the peer is unresponsive.
-// Try to shut it down more aggressively.
-func (cc *ClientConn) forceCloseConn() {
-	tc, ok := cc.tconn.(*tls.Conn)
-	if !ok {
-		return
-	}
-	if nc := tc.NetConn(); nc != nil {
-		nc.Close()
-	}
-}
-
 func (cc *ClientConn) closeIfIdle() {
 	cc.mu.Lock()
-	if len(cc.streams) > 0 || cc.streamsReserved > 0 {
+	if len(cc.streams) > 0 {
 		cc.mu.Unlock()
 		return
 	}
 	cc.closed = true
-	cc.closedOnIdle = true
 	nextID := cc.nextStreamID
 	// TODO: do clients send GOAWAY too? maybe? Just Close:
 	cc.mu.Unlock()
@@ -1166,33 +834,26 @@ func (cc *ClientConn) closeIfIdle() {
 	if VerboseLogs {
 		cc.vlogf("http2: Transport closing idle conn %p (forSingleUse=%v, maxStream=%v)", cc, cc.singleUse, nextID-2)
 	}
-	cc.closeConn()
-}
-
-func (cc *ClientConn) isDoNotReuseAndIdle() bool {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return cc.doNotReuse && len(cc.streams) == 0
+	cc.tconn.Close()
 }
 
 var shutdownEnterWaitStateHook = func() {}
 
-// Shutdown gracefully closes the client connection, waiting for running streams to complete.
+// Shutdown gracefully close the client connection, waiting for running streams to complete.
 func (cc *ClientConn) Shutdown(ctx context.Context) error {
 	if err := cc.sendGoAway(); err != nil {
 		return err
 	}
 	// Wait for all in-flight streams to complete or connection to close
-	done := make(chan struct{})
+	done := make(chan error, 1)
 	cancelled := false // guarded by cc.mu
 	go func() {
-		cc.t.markNewGoroutine()
 		cc.mu.Lock()
 		defer cc.mu.Unlock()
 		for {
 			if len(cc.streams) == 0 || cc.closed {
 				cc.closed = true
-				close(done)
+				done <- cc.tconn.Close()
 				break
 			}
 			if cancelled {
@@ -1203,9 +864,8 @@ func (cc *ClientConn) Shutdown(ctx context.Context) error {
 	}()
 	shutdownEnterWaitStateHook()
 	select {
-	case <-done:
-		cc.closeConn()
-		return nil
+	case err := <-done:
+		return err
 	case <-ctx.Done():
 		cc.mu.Lock()
 		// Free the goroutine above
@@ -1218,18 +878,15 @@ func (cc *ClientConn) Shutdown(ctx context.Context) error {
 
 func (cc *ClientConn) sendGoAway() error {
 	cc.mu.Lock()
-	closing := cc.closing
-	cc.closing = true
-	maxStreamID := cc.nextStreamID
-	cc.mu.Unlock()
-	if closing {
+	defer cc.mu.Unlock()
+	cc.wmu.Lock()
+	defer cc.wmu.Unlock()
+	if cc.closing {
 		// GOAWAY sent already
 		return nil
 	}
-
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
 	// Send a graceful shutdown frame to server
+	maxStreamID := cc.nextStreamID
 	if err := cc.fr.WriteGoAway(maxStreamID, ErrCodeNo, nil); err != nil {
 		return err
 	}
@@ -1237,20 +894,26 @@ func (cc *ClientConn) sendGoAway() error {
 		return err
 	}
 	// Prevent new requests
+	cc.closing = true
 	return nil
 }
 
 // closes the client connection immediately. In-flight requests are interrupted.
 // err is sent to streams.
-func (cc *ClientConn) closeForError(err error) {
+func (cc *ClientConn) closeForError(err error) error {
 	cc.mu.Lock()
-	cc.closed = true
-	for _, cs := range cc.streams {
-		cs.abortStreamLocked(err)
+	defer cc.cond.Broadcast()
+	defer cc.mu.Unlock()
+	for id, cs := range cc.streams {
+		select {
+		case cs.resc <- resAndError{err: err}:
+		default:
+		}
+		cs.bufPipe.CloseWithError(err)
+		delete(cc.streams, id)
 	}
-	cc.cond.Broadcast()
-	cc.mu.Unlock()
-	cc.closeConn()
+	cc.closed = true
+	return cc.tconn.Close()
 }
 
 // Close closes the client connection immediately.
@@ -1258,23 +921,36 @@ func (cc *ClientConn) closeForError(err error) {
 // In-flight requests are interrupted. For a graceful shutdown, use Shutdown instead.
 func (cc *ClientConn) Close() error {
 	err := errors.New("http2: client connection force closed via ClientConn.Close")
-	cc.closeForError(err)
-	return nil
+	return cc.closeForError(err)
 }
 
 // closes the client connection immediately. In-flight requests are interrupted.
-func (cc *ClientConn) closeForLostPing() {
+func (cc *ClientConn) closeForLostPing() error {
 	err := errors.New("http2: client connection lost")
-	if f := cc.t.CountError; f != nil {
-		f("conn_close_lost_ping")
-	}
-	cc.closeForError(err)
+	return cc.closeForError(err)
 }
 
 // errRequestCanceled is a copy of net/http's errRequestCanceled because it's not
 // exported. At least they'll be DeepEqual for h1-vs-h2 comparisons tests.
 var errRequestCanceled = errors.New("net/http: request canceled")
 
+func commaSeparatedTrailers(req *http.Request) (string, error) {
+	keys := make([]string, 0, len(req.Trailer))
+	for k := range req.Trailer {
+		k = http.CanonicalHeaderKey(k)
+		switch k {
+		case "Transfer-Encoding", "Trailer", "Content-Length":
+			return "", fmt.Errorf("invalid Trailer key %q", k)
+		}
+		keys = append(keys, k)
+	}
+	if len(keys) > 0 {
+		sort.Strings(keys)
+		return strings.Join(keys, ","), nil
+	}
+	return "", nil
+}
+
 func (cc *ClientConn) responseHeaderTimeout() time.Duration {
 	if cc.t.t1 != nil {
 		return cc.t.t1.ResponseHeaderTimeout
@@ -1286,6 +962,22 @@ func (cc *ClientConn) responseHeaderTimeout() time.Duration {
 	return 0
 }
 
+// checkConnHeaders checks whether req has any invalid connection-level headers.
+// per RFC 7540 section 8.1.2.2: Connection-Specific Header Fields.
+// Certain headers are special-cased as okay but not transmitted later.
+func checkConnHeaders(req *http.Request) error {
+	if v := req.Header.Get("Upgrade"); v != "" {
+		return fmt.Errorf("http2: invalid Upgrade request header: %q", req.Header["Upgrade"])
+	}
+	if vv := req.Header["Transfer-Encoding"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "chunked") {
+		return fmt.Errorf("http2: invalid Transfer-Encoding request header: %q", vv)
+	}
+	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && !asciiEqualFold(vv[0], "close") && !asciiEqualFold(vv[0], "keep-alive")) {
+		return fmt.Errorf("http2: invalid Connection request header: %q", vv)
+	}
+	return nil
+}
+
 // actualContentLength returns a sanitized version of
 // req.ContentLength, where 0 actually means zero (not unknown) and -1
 // means unknown.
@@ -1299,56 +991,119 @@ func actualContentLength(req *http.Request) int64 {
 	return -1
 }
 
-func (cc *ClientConn) decrStreamReservations() {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	cc.decrStreamReservationsLocked()
-}
-
-func (cc *ClientConn) decrStreamReservationsLocked() {
-	if cc.streamsReserved > 0 {
-		cc.streamsReserved--
-	}
-}
-
 func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
-	return cc.roundTrip(req, nil)
+	resp, _, err := cc.roundTrip(req)
+	return resp, err
 }
 
-func (cc *ClientConn) roundTrip(req *http.Request, streamf func(*clientStream)) (*http.Response, error) {
-	ctx := req.Context()
-	cs := &clientStream{
-		cc:                   cc,
-		ctx:                  ctx,
-		reqCancel:            req.Cancel,
-		isHead:               req.Method == "HEAD",
-		reqBody:              req.Body,
-		reqBodyContentLength: actualContentLength(req),
-		trace:                httptrace.ContextClientTrace(ctx),
-		peerClosed:           make(chan struct{}),
-		abort:                make(chan struct{}),
-		respHeaderRecv:       make(chan struct{}),
-		donec:                make(chan struct{}),
+func (cc *ClientConn) roundTrip(req *http.Request) (res *http.Response, gotErrAfterReqBodyWrite bool, err error) {
+	if err := checkConnHeaders(req); err != nil {
+		return nil, false, err
+	}
+	if cc.idleTimer != nil {
+		cc.idleTimer.Stop()
 	}
 
-	cs.requestedGzip = httpcommon.IsRequestGzip(req.Method, req.Header, cc.t.disableCompression())
+	trailers, err := commaSeparatedTrailers(req)
+	if err != nil {
+		return nil, false, err
+	}
+	hasTrailers := trailers != ""
 
-	go cs.doRequest(req, streamf)
+	cc.mu.Lock()
+	if err := cc.awaitOpenSlotForRequest(req); err != nil {
+		cc.mu.Unlock()
+		return nil, false, err
+	}
 
-	waitDone := func() error {
-		select {
-		case <-cs.donec:
-			return nil
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-cs.reqCancel:
-			return errRequestCanceled
+	body := req.Body
+	contentLen := actualContentLength(req)
+	hasBody := contentLen != 0
+
+	// TODO(bradfitz): this is a copy of the logic in net/http. Unify somewhere?
+	var requestedGzip bool
+	if !cc.t.disableCompression() &&
+		req.Header.Get("Accept-Encoding") == "" &&
+		req.Header.Get("Range") == "" &&
+		req.Method != "HEAD" {
+		// Request gzip only, not deflate. Deflate is ambiguous and
+		// not as universally supported anyway.
+		// See: https://zlib.net/zlib_faq.html#faq39
+		//
+		// Note that we don't request this for HEAD requests,
+		// due to a bug in nginx:
+		//   http://trac.nginx.org/nginx/ticket/358
+		//   https://golang.org/issue/5522
+		//
+		// We don't request gzip if the request is for a range, since
+		// auto-decoding a portion of a gzipped document will just fail
+		// anyway. See https://golang.org/issue/8923
+		requestedGzip = true
+	}
+
+	// we send: HEADERS{1}, CONTINUATION{0,} + DATA{0,} (DATA is
+	// sent by writeRequestBody below, along with any Trailers,
+	// again in form HEADERS{1}, CONTINUATION{0,})
+	hdrs, err := cc.encodeHeaders(req, requestedGzip, trailers, contentLen)
+	if err != nil {
+		cc.mu.Unlock()
+		return nil, false, err
+	}
+
+	cs := cc.newStream()
+	cs.req = req
+	cs.trace = httptrace.ContextClientTrace(req.Context())
+	cs.requestedGzip = requestedGzip
+	bodyWriter := cc.t.getBodyWriterState(cs, body)
+	cs.on100 = bodyWriter.on100
+
+	defer func() {
+		cc.wmu.Lock()
+		werr := cc.werr
+		cc.wmu.Unlock()
+		if werr != nil {
+			cc.Close()
+		}
+	}()
+
+	cc.wmu.Lock()
+	endStream := !hasBody && !hasTrailers
+	werr := cc.writeHeaders(cs.ID, endStream, int(cc.maxFrameSize), hdrs)
+	cc.wmu.Unlock()
+	traceWroteHeaders(cs.trace)
+	cc.mu.Unlock()
+
+	if werr != nil {
+		if hasBody {
+			req.Body.Close() // per RoundTripper contract
+			bodyWriter.cancel()
+		}
+		cc.forgetStreamID(cs.ID)
+		// Don't bother sending a RST_STREAM (our write already failed;
+		// no need to keep writing)
+		traceWroteRequest(cs.trace, werr)
+		return nil, false, werr
+	}
+
+	var respHeaderTimer <-chan time.Time
+	if hasBody {
+		bodyWriter.scheduleBodyWrite()
+	} else {
+		traceWroteRequest(cs.trace, nil)
+		if d := cc.responseHeaderTimeout(); d != 0 {
+			timer := time.NewTimer(d)
+			defer timer.Stop()
+			respHeaderTimer = timer.C
 		}
 	}
 
-	handleResponseHeaders := func() (*http.Response, error) {
-		res := cs.res
-		if res.StatusCode > 299 {
+	readLoopResCh := cs.resc
+	bodyWritten := false
+	ctx := req.Context()
+
+	handleReadLoopResponse := func(re resAndError) (*http.Response, bool, error) {
+		res := re.res
+		if re.err != nil || res.StatusCode > 299 {
 			// On error or status code 3xx, 4xx, 5xx, etc abort any
 			// ongoing write, assuming that the server doesn't care
 			// about our request body. If the server replied with 1xx or
@@ -1358,416 +1113,108 @@ func (cc *ClientConn) roundTrip(req *http.Request, streamf func(*clientStream))
 			// doesn't, they'll RST_STREAM us soon enough. This is a
 			// heuristic to avoid adding knobs to Transport. Hopefully
 			// we can keep it.
-			cs.abortRequestBodyWrite()
+			bodyWriter.cancel()
+			cs.abortRequestBodyWrite(errStopReqBodyWrite)
+			if hasBody && !bodyWritten {
+				<-bodyWriter.resc
+			}
+		}
+		if re.err != nil {
+			cc.forgetStreamID(cs.ID)
+			return nil, cs.getStartedWrite(), re.err
 		}
 		res.Request = req
 		res.TLS = cc.tlsState
-		if res.Body == noBody && actualContentLength(req) == 0 {
-			// If there isn't a request or response body still being
-			// written, then wait for the stream to be closed before
-			// RoundTrip returns.
-			if err := waitDone(); err != nil {
-				return nil, err
-			}
-		}
-		return res, nil
+		return res, false, nil
 	}
 
-	cancelRequest := func(cs *clientStream, err error) error {
-		cs.cc.mu.Lock()
-		bodyClosed := cs.reqBodyClosed
-		cs.cc.mu.Unlock()
-		// Wait for the request body to be closed.
-		//
-		// If nothing closed the body before now, abortStreamLocked
-		// will have started a goroutine to close it.
-		//
-		// Closing the body before returning avoids a race condition
-		// with net/http checking its readTrackingBody to see if the
-		// body was read from or closed. See golang/go#60041.
-		//
-		// The body is closed in a separate goroutine without the
-		// connection mutex held, but dropping the mutex before waiting
-		// will keep us from holding it indefinitely if the body
-		// close is slow for some reason.
-		if bodyClosed != nil {
-			<-bodyClosed
-		}
-		return err
-	}
-
-	for {
-		select {
-		case <-cs.respHeaderRecv:
-			return handleResponseHeaders()
-		case <-cs.abort:
-			select {
-			case <-cs.respHeaderRecv:
-				// If both cs.respHeaderRecv and cs.abort are signaling,
-				// pick respHeaderRecv. The server probably wrote the
-				// response and immediately reset the stream.
-				// golang.org/issue/49645
-				return handleResponseHeaders()
-			default:
-				waitDone()
-				return nil, cs.abortErr
-			}
-		case <-ctx.Done():
-			err := ctx.Err()
-			cs.abortStream(err)
-			return nil, cancelRequest(cs, err)
-		case <-cs.reqCancel:
-			cs.abortStream(errRequestCanceled)
-			return nil, cancelRequest(cs, errRequestCanceled)
-		}
-	}
-}
-
-// doRequest runs for the duration of the request lifetime.
-//
-// It sends the request and performs post-request cleanup (closing Request.Body, etc.).
-func (cs *clientStream) doRequest(req *http.Request, streamf func(*clientStream)) {
-	cs.cc.t.markNewGoroutine()
-	err := cs.writeRequest(req, streamf)
-	cs.cleanupWriteRequest(err)
-}
-
-var errExtendedConnectNotSupported = errors.New("net/http: extended connect not supported by peer")
-
-// writeRequest sends a request.
-//
-// It returns nil after the request is written, the response read,
-// and the request stream is half-closed by the peer.
-//
-// It returns non-nil if the request ends otherwise.
-// If the returned error is StreamError, the error Code may be used in resetting the stream.
-func (cs *clientStream) writeRequest(req *http.Request, streamf func(*clientStream)) (err error) {
-	cc := cs.cc
-	ctx := cs.ctx
-
-	// wait for setting frames to be received, a server can change this value later,
-	// but we just wait for the first settings frame
-	var isExtendedConnect bool
-	if req.Method == "CONNECT" && req.Header.Get(":protocol") != "" {
-		isExtendedConnect = true
-	}
-
-	// Acquire the new-request lock by writing to reqHeaderMu.
-	// This lock guards the critical section covering allocating a new stream ID
-	// (requires mu) and creating the stream (requires wmu).
-	if cc.reqHeaderMu == nil {
-		panic("RoundTrip on uninitialized ClientConn") // for tests
-	}
-	if isExtendedConnect {
-		select {
-		case <-cs.reqCancel:
-			return errRequestCanceled
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-cc.seenSettingsChan:
-			if !cc.extendedConnectAllowed {
-				return errExtendedConnectNotSupported
-			}
-		}
-	}
-	select {
-	case cc.reqHeaderMu <- struct{}{}:
-	case <-cs.reqCancel:
-		return errRequestCanceled
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	cc.mu.Lock()
-	if cc.idleTimer != nil {
-		cc.idleTimer.Stop()
-	}
-	cc.decrStreamReservationsLocked()
-	if err := cc.awaitOpenSlotForStreamLocked(cs); err != nil {
-		cc.mu.Unlock()
-		<-cc.reqHeaderMu
-		return err
-	}
-	cc.addStreamLocked(cs) // assigns stream ID
-	if isConnectionCloseRequest(req) {
-		cc.doNotReuse = true
-	}
-	cc.mu.Unlock()
-
-	if streamf != nil {
-		streamf(cs)
-	}
-
-	continueTimeout := cc.t.expectContinueTimeout()
-	if continueTimeout != 0 {
-		if !httpguts.HeaderValuesContainsToken(req.Header["Expect"], "100-continue") {
-			continueTimeout = 0
+	handleError := func(err error) (*http.Response, bool, error) {
+		if !hasBody || bodyWritten {
+			cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
 		} else {
-			cs.on100 = make(chan struct{}, 1)
+			bodyWriter.cancel()
+			cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
+			<-bodyWriter.resc
 		}
-	}
-
-	// Past this point (where we send request headers), it is possible for
-	// RoundTrip to return successfully. Since the RoundTrip contract permits
-	// the caller to "mutate or reuse" the Request after closing the Response's Body,
-	// we must take care when referencing the Request from here on.
-	err = cs.encodeAndWriteHeaders(req)
-	<-cc.reqHeaderMu
-	if err != nil {
-		return err
-	}
-
-	hasBody := cs.reqBodyContentLength != 0
-	if !hasBody {
-		cs.sentEndStream = true
-	} else {
-		if continueTimeout != 0 {
-			traceWait100Continue(cs.trace)
-			timer := time.NewTimer(continueTimeout)
-			select {
-			case <-timer.C:
-				err = nil
-			case <-cs.on100:
-				err = nil
-			case <-cs.abort:
-				err = cs.abortErr
-			case <-ctx.Done():
-				err = ctx.Err()
-			case <-cs.reqCancel:
-				err = errRequestCanceled
-			}
-			timer.Stop()
-			if err != nil {
-				traceWroteRequest(cs.trace, err)
-				return err
-			}
-		}
-
-		if err = cs.writeRequestBody(req); err != nil {
-			if err != errStopReqBodyWrite {
-				traceWroteRequest(cs.trace, err)
-				return err
-			}
-		} else {
-			cs.sentEndStream = true
-		}
-	}
-
-	traceWroteRequest(cs.trace, err)
-
-	var respHeaderTimer <-chan time.Time
-	var respHeaderRecv chan struct{}
-	if d := cc.responseHeaderTimeout(); d != 0 {
-		timer := cc.t.newTimer(d)
-		defer timer.Stop()
-		respHeaderTimer = timer.C()
-		respHeaderRecv = cs.respHeaderRecv
-	}
-	// Wait until the peer half-closes its end of the stream,
-	// or until the request is aborted (via context, error, or otherwise),
-	// whichever comes first.
-	for {
-		select {
-		case <-cs.peerClosed:
-			return nil
-		case <-respHeaderTimer:
-			return errTimeout
-		case <-respHeaderRecv:
-			respHeaderRecv = nil
-			respHeaderTimer = nil // keep waiting for END_STREAM
-		case <-cs.abort:
-			return cs.abortErr
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-cs.reqCancel:
-			return errRequestCanceled
-		}
-	}
-}
-
-func (cs *clientStream) encodeAndWriteHeaders(req *http.Request) error {
-	cc := cs.cc
-	ctx := cs.ctx
-
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
-
-	// If the request was canceled while waiting for cc.mu, just quit.
-	select {
-	case <-cs.abort:
-		return cs.abortErr
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-cs.reqCancel:
-		return errRequestCanceled
-	default:
-	}
-
-	// Encode headers.
-	//
-	// we send: HEADERS{1}, CONTINUATION{0,} + DATA{0,} (DATA is
-	// sent by writeRequestBody below, along with any Trailers,
-	// again in form HEADERS{1}, CONTINUATION{0,})
-	cc.hbuf.Reset()
-	res, err := encodeRequestHeaders(req, cs.requestedGzip, cc.peerMaxHeaderListSize, func(name, value string) {
-		cc.writeHeader(name, value)
-	})
-	if err != nil {
-		return fmt.Errorf("http2: %w", err)
-	}
-	hdrs := cc.hbuf.Bytes()
-
-	// Write the request.
-	endStream := !res.HasBody && !res.HasTrailers
-	cs.sentHeaders = true
-	err = cc.writeHeaders(cs.ID, endStream, int(cc.maxFrameSize), hdrs)
-	traceWroteHeaders(cs.trace)
-	return err
-}
-
-func encodeRequestHeaders(req *http.Request, addGzipHeader bool, peerMaxHeaderListSize uint64, headerf func(name, value string)) (httpcommon.EncodeHeadersResult, error) {
-	return httpcommon.EncodeHeaders(req.Context(), httpcommon.EncodeHeadersParam{
-		Request: httpcommon.Request{
-			Header:              req.Header,
-			Trailer:             req.Trailer,
-			URL:                 req.URL,
-			Host:                req.Host,
-			Method:              req.Method,
-			ActualContentLength: actualContentLength(req),
-		},
-		AddGzipHeader:         addGzipHeader,
-		PeerMaxHeaderListSize: peerMaxHeaderListSize,
-		DefaultUserAgent:      defaultUserAgent,
-	}, headerf)
-}
-
-// cleanupWriteRequest performs post-request tasks.
-//
-// If err (the result of writeRequest) is non-nil and the stream is not closed,
-// cleanupWriteRequest will send a reset to the peer.
-func (cs *clientStream) cleanupWriteRequest(err error) {
-	cc := cs.cc
-
-	if cs.ID == 0 {
-		// We were canceled before creating the stream, so return our reservation.
-		cc.decrStreamReservations()
-	}
-
-	// TODO: write h12Compare test showing whether
-	// Request.Body is closed by the Transport,
-	// and in multiple cases: server replies <=299 and >299
-	// while still writing request body
-	cc.mu.Lock()
-	mustCloseBody := false
-	if cs.reqBody != nil && cs.reqBodyClosed == nil {
-		mustCloseBody = true
-		cs.reqBodyClosed = make(chan struct{})
-	}
-	bodyClosed := cs.reqBodyClosed
-	closeOnIdle := cc.singleUse || cc.doNotReuse || cc.t.disableKeepAlives() || cc.goAway != nil
-	cc.mu.Unlock()
-	if mustCloseBody {
-		cs.reqBody.Close()
-		close(bodyClosed)
-	}
-	if bodyClosed != nil {
-		<-bodyClosed
-	}
-
-	if err != nil && cs.sentEndStream {
-		// If the connection is closed immediately after the response is read,
-		// we may be aborted before finishing up here. If the stream was closed
-		// cleanly on both sides, there is no error.
-		select {
-		case <-cs.peerClosed:
-			err = nil
-		default:
-		}
-	}
-	if err != nil {
-		cs.abortStream(err) // possibly redundant, but harmless
-		if cs.sentHeaders {
-			if se, ok := err.(StreamError); ok {
-				if se.Cause != errFromPeer {
-					cc.writeStreamReset(cs.ID, se.Code, false, err)
-				}
-			} else {
-				// We're cancelling an in-flight request.
-				//
-				// This could be due to the server becoming unresponsive.
-				// To avoid sending too many requests on a dead connection,
-				// we let the request continue to consume a concurrency slot
-				// until we can confirm the server is still responding.
-				// We do this by sending a PING frame along with the RST_STREAM
-				// (unless a ping is already in flight).
-				//
-				// For simplicity, we don't bother tracking the PING payload:
-				// We reset cc.pendingResets any time we receive a PING ACK.
-				//
-				// We skip this if the conn is going to be closed on idle,
-				// because it's short lived and will probably be closed before
-				// we get the ping response.
-				ping := false
-				if !closeOnIdle {
-					cc.mu.Lock()
-					// rstStreamPingsBlocked works around a gRPC behavior:
-					// see comment on the field for details.
-					if !cc.rstStreamPingsBlocked {
-						if cc.pendingResets == 0 {
-							ping = true
-						}
-						cc.pendingResets++
-					}
-					cc.mu.Unlock()
-				}
-				cc.writeStreamReset(cs.ID, ErrCodeCancel, ping, err)
-			}
-		}
-		cs.bufPipe.CloseWithError(err) // no-op if already closed
-	} else {
-		if cs.sentHeaders && !cs.sentEndStream {
-			cc.writeStreamReset(cs.ID, ErrCodeNo, false, nil)
-		}
-		cs.bufPipe.CloseWithError(errRequestCanceled)
-	}
-	if cs.ID != 0 {
 		cc.forgetStreamID(cs.ID)
+		return nil, cs.getStartedWrite(), err
 	}
 
-	cc.wmu.Lock()
-	werr := cc.werr
-	cc.wmu.Unlock()
-	if werr != nil {
-		cc.Close()
+	for {
+		select {
+		case re := <-readLoopResCh:
+			return handleReadLoopResponse(re)
+		case <-respHeaderTimer:
+			return handleError(errTimeout)
+		case <-ctx.Done():
+			return handleError(ctx.Err())
+		case <-req.Cancel:
+			return handleError(errRequestCanceled)
+		case <-cs.peerReset:
+			// processResetStream already removed the
+			// stream from the streams map; no need for
+			// forgetStreamID.
+			return nil, cs.getStartedWrite(), cs.resetErr
+		case err := <-bodyWriter.resc:
+			bodyWritten = true
+			// Prefer the read loop's response, if available. Issue 16102.
+			select {
+			case re := <-readLoopResCh:
+				return handleReadLoopResponse(re)
+			default:
+			}
+			if err != nil {
+				cc.forgetStreamID(cs.ID)
+				return nil, cs.getStartedWrite(), err
+			}
+			if d := cc.responseHeaderTimeout(); d != 0 {
+				timer := time.NewTimer(d)
+				defer timer.Stop()
+				respHeaderTimer = timer.C
+			}
+		}
 	}
-
-	close(cs.donec)
 }
 
-// awaitOpenSlotForStreamLocked waits until len(streams) < maxConcurrentStreams.
+// awaitOpenSlotForRequest waits until len(streams) < maxConcurrentStreams.
 // Must hold cc.mu.
-func (cc *ClientConn) awaitOpenSlotForStreamLocked(cs *clientStream) error {
+func (cc *ClientConn) awaitOpenSlotForRequest(req *http.Request) error {
+	var waitingForConn chan struct{}
+	var waitingForConnErr error // guarded by cc.mu
 	for {
-		if cc.closed && cc.nextStreamID == 1 && cc.streamsReserved == 0 {
-			// This is the very first request sent to this connection.
-			// Return a fatal error which aborts the retry loop.
-			return errClientConnNotEstablished
-		}
-		cc.lastActive = cc.t.now()
+		cc.lastActive = time.Now()
 		if cc.closed || !cc.canTakeNewRequestLocked() {
+			if waitingForConn != nil {
+				close(waitingForConn)
+			}
 			return errClientConnUnusable
 		}
 		cc.lastIdle = time.Time{}
-		if cc.currentRequestCountLocked() < int(cc.maxConcurrentStreams) {
+		if int64(len(cc.streams))+1 <= int64(cc.maxConcurrentStreams) {
+			if waitingForConn != nil {
+				close(waitingForConn)
+			}
 			return nil
 		}
+		// Unfortunately, we cannot wait on a condition variable and channel at
+		// the same time, so instead, we spin up a goroutine to check if the
+		// request is canceled while we wait for a slot to open in the connection.
+		if waitingForConn == nil {
+			waitingForConn = make(chan struct{})
+			go func() {
+				if err := awaitRequestCancel(req, waitingForConn); err != nil {
+					cc.mu.Lock()
+					waitingForConnErr = err
+					cc.cond.Broadcast()
+					cc.mu.Unlock()
+				}
+			}()
+		}
 		cc.pendingRequests++
 		cc.cond.Wait()
 		cc.pendingRequests--
-		select {
-		case <-cs.abort:
-			return cs.abortErr
-		default:
+		if waitingForConnErr != nil {
+			return waitingForConnErr
 		}
 	}
 }
@@ -1794,6 +1241,10 @@ func (cc *ClientConn) writeHeaders(streamID uint32, endStream bool, maxFrameSize
 			cc.fr.WriteContinuation(streamID, endHeaders, chunk)
 		}
 	}
+	// TODO(bradfitz): this Flush could potentially block (as
+	// could the WriteHeaders call(s) above), which means they
+	// wouldn't respond to Request.Cancel being readable. That's
+	// rare, but this should probably be in a goroutine.
 	cc.bw.Flush()
 	return cc.werr
 }
@@ -1820,7 +1271,7 @@ func (cs *clientStream) frameScratchBufferLen(maxFrameSize int) int {
 	if n > max {
 		n = max
 	}
-	if cl := cs.reqBodyContentLength; cl != -1 && cl+1 < n {
+	if cl := actualContentLength(cs.req); cl != -1 && cl+1 < n {
 		// Add an extra byte past the declared content-length to
 		// give the caller's Request.Body io.Reader a chance to
 		// give us more bytes than they declared, so we can catch it
@@ -1833,35 +1284,33 @@ func (cs *clientStream) frameScratchBufferLen(maxFrameSize int) int {
 	return int(n) // doesn't truncate; max is 512K
 }
 
-// Seven bufPools manage different frame sizes. This helps to avoid scenarios where long-running
-// streaming requests using small frame sizes occupy large buffers initially allocated for prior
-// requests needing big buffers. The size ranges are as follows:
-// {0 KB, 16 KB], {16 KB, 32 KB], {32 KB, 64 KB], {64 KB, 128 KB], {128 KB, 256 KB],
-// {256 KB, 512 KB], {512 KB, infinity}
-// In practice, the maximum scratch buffer size should not exceed 512 KB due to
-// frameScratchBufferLen(maxFrameSize), thus the "infinity pool" should never be used.
-// It exists mainly as a safety measure, for potential future increases in max buffer size.
-var bufPools [7]sync.Pool // of *[]byte
-func bufPoolIndex(size int) int {
-	if size <= 16384 {
-		return 0
-	}
-	size -= 1
-	bits := bits.Len(uint(size))
-	index := bits - 14
-	if index >= len(bufPools) {
-		return len(bufPools) - 1
-	}
-	return index
-}
+var bufPool sync.Pool // of *[]byte
 
-func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
+func (cs *clientStream) writeRequestBody(body io.Reader, bodyCloser io.Closer) (err error) {
 	cc := cs.cc
-	body := cs.reqBody
 	sentEnd := false // whether we sent the final DATA frame w/ END_STREAM
 
+	defer func() {
+		traceWroteRequest(cs.trace, err)
+		// TODO: write h12Compare test showing whether
+		// Request.Body is closed by the Transport,
+		// and in multiple cases: server replies <=299 and >299
+		// while still writing request body
+		var cerr error
+		cc.mu.Lock()
+		if cs.stopReqBody == nil {
+			cs.stopReqBody = errStopReqBodyWrite
+			cerr = bodyCloser.Close()
+		}
+		cc.mu.Unlock()
+		if err == nil {
+			err = cerr
+		}
+	}()
+
+	req := cs.req
 	hasTrailers := req.Trailer != nil
-	remainLen := cs.reqBodyContentLength
+	remainLen := actualContentLength(req)
 	hasContentLen := remainLen != -1
 
 	cc.mu.Lock()
@@ -1871,18 +1320,17 @@ func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 	// Scratch buffer for reading into & writing from.
 	scratchLen := cs.frameScratchBufferLen(maxFrameSize)
 	var buf []byte
-	index := bufPoolIndex(scratchLen)
-	if bp, ok := bufPools[index].Get().(*[]byte); ok && len(*bp) >= scratchLen {
-		defer bufPools[index].Put(bp)
+	if bp, ok := bufPool.Get().(*[]byte); ok && len(*bp) >= scratchLen {
+		defer bufPool.Put(bp)
 		buf = *bp
 	} else {
 		buf = make([]byte, scratchLen)
-		defer bufPools[index].Put(&buf)
+		defer bufPool.Put(&buf)
 	}
 
 	var sawEOF bool
 	for !sawEOF {
-		n, err := body.Read(buf)
+		n, err := body.Read(buf[:len(buf)])
 		if hasContentLen {
 			remainLen -= int64(n)
 			if remainLen == 0 && err == nil {
@@ -1900,29 +1348,29 @@ func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 			}
 			if remainLen < 0 {
 				err = errReqBodyTooLong
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, err)
 				return err
 			}
 		}
-		if err != nil {
-			cc.mu.Lock()
-			bodyClosed := cs.reqBodyClosed != nil
-			cc.mu.Unlock()
-			switch {
-			case bodyClosed:
-				return errStopReqBodyWrite
-			case err == io.EOF:
-				sawEOF = true
-				err = nil
-			default:
-				return err
-			}
+		if err == io.EOF {
+			sawEOF = true
+			err = nil
+		} else if err != nil {
+			cc.writeStreamReset(cs.ID, ErrCodeCancel, err)
+			return err
 		}
 
 		remain := buf[:n]
 		for len(remain) > 0 && err == nil {
 			var allowed int32
 			allowed, err = cs.awaitFlowControl(len(remain))
-			if err != nil {
+			switch {
+			case err == errStopReqBodyWrite:
+				return err
+			case err == errStopReqBodyWriteAndCancel:
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+				return err
+			case err != nil:
 				return err
 			}
 			cc.wmu.Lock()
@@ -1953,26 +1401,20 @@ func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 		return nil
 	}
 
-	// Since the RoundTrip contract permits the caller to "mutate or reuse"
-	// a request after the Response's Body is closed, verify that this hasn't
-	// happened before accessing the trailers.
-	cc.mu.Lock()
-	trailer := req.Trailer
-	err = cs.abortErr
-	cc.mu.Unlock()
-	if err != nil {
-		return err
+	var trls []byte
+	if hasTrailers {
+		cc.mu.Lock()
+		trls, err = cc.encodeTrailers(req)
+		cc.mu.Unlock()
+		if err != nil {
+			cc.writeStreamReset(cs.ID, ErrCodeInternal, err)
+			cc.forgetStreamID(cs.ID)
+			return err
+		}
 	}
 
 	cc.wmu.Lock()
 	defer cc.wmu.Unlock()
-	var trls []byte
-	if len(trailer) > 0 {
-		trls, err = cc.encodeTrailers(trailer)
-		if err != nil {
-			return err
-		}
-	}
 
 	// Two ways to send END_STREAM: either with trailers, or
 	// with an empty DATA frame.
@@ -1993,24 +1435,17 @@ func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 // if the stream is dead.
 func (cs *clientStream) awaitFlowControl(maxBytes int) (taken int32, err error) {
 	cc := cs.cc
-	ctx := cs.ctx
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
 	for {
 		if cc.closed {
 			return 0, errClientConnClosed
 		}
-		if cs.reqBodyClosed != nil {
-			return 0, errStopReqBodyWrite
+		if cs.stopReqBody != nil {
+			return 0, cs.stopReqBody
 		}
-		select {
-		case <-cs.abort:
-			return 0, cs.abortErr
-		case <-ctx.Done():
-			return 0, ctx.Err()
-		case <-cs.reqCancel:
-			return 0, errRequestCanceled
-		default:
+		if err := cs.checkResetOrDone(); err != nil {
+			return 0, err
 		}
 		if a := cs.flow.available(); a > 0 {
 			take := a
@@ -2028,12 +1463,200 @@ func (cs *clientStream) awaitFlowControl(maxBytes int) (taken int32, err error)
 	}
 }
 
-// requires cc.wmu be held.
-func (cc *ClientConn) encodeTrailers(trailer http.Header) ([]byte, error) {
+// requires cc.mu be held.
+func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trailers string, contentLength int64) ([]byte, error) {
+	cc.hbuf.Reset()
+
+	host := req.Host
+	if host == "" {
+		host = req.URL.Host
+	}
+	host, err := httpguts.PunycodeHostPort(host)
+	if err != nil {
+		return nil, err
+	}
+
+	var path string
+	if req.Method != "CONNECT" {
+		path = req.URL.RequestURI()
+		if !validPseudoPath(path) {
+			orig := path
+			path = strings.TrimPrefix(path, req.URL.Scheme+"://"+host)
+			if !validPseudoPath(path) {
+				if req.URL.Opaque != "" {
+					return nil, fmt.Errorf("invalid request :path %q from URL.Opaque = %q", orig, req.URL.Opaque)
+				} else {
+					return nil, fmt.Errorf("invalid request :path %q", orig)
+				}
+			}
+		}
+	}
+
+	// Check for any invalid headers and return an error before we
+	// potentially pollute our hpack state. (We want to be able to
+	// continue to reuse the hpack encoder for future requests)
+	for k, vv := range req.Header {
+		if !httpguts.ValidHeaderFieldName(k) {
+			return nil, fmt.Errorf("invalid HTTP header name %q", k)
+		}
+		for _, v := range vv {
+			if !httpguts.ValidHeaderFieldValue(v) {
+				return nil, fmt.Errorf("invalid HTTP header value %q for header %q", v, k)
+			}
+		}
+	}
+
+	enumerateHeaders := func(f func(name, value string)) {
+		// 8.1.2.3 Request Pseudo-Header Fields
+		// The :path pseudo-header field includes the path and query parts of the
+		// target URI (the path-absolute production and optionally a '?' character
+		// followed by the query production (see Sections 3.3 and 3.4 of
+		// [RFC3986]).
+		f(":authority", host)
+		m := req.Method
+		if m == "" {
+			m = http.MethodGet
+		}
+		f(":method", m)
+		if req.Method != "CONNECT" {
+			f(":path", path)
+			f(":scheme", req.URL.Scheme)
+		}
+		if trailers != "" {
+			f("trailer", trailers)
+		}
+
+		var didUA bool
+		for k, vv := range req.Header {
+			if asciiEqualFold(k, "host") || asciiEqualFold(k, "content-length") {
+				// Host is :authority, already sent.
+				// Content-Length is automatic, set below.
+				continue
+			} else if asciiEqualFold(k, "connection") ||
+				asciiEqualFold(k, "proxy-connection") ||
+				asciiEqualFold(k, "transfer-encoding") ||
+				asciiEqualFold(k, "upgrade") ||
+				asciiEqualFold(k, "keep-alive") {
+				// Per 8.1.2.2 Connection-Specific Header
+				// Fields, don't send connection-specific
+				// fields. We have already checked if any
+				// are error-worthy so just ignore the rest.
+				continue
+			} else if asciiEqualFold(k, "user-agent") {
+				// Match Go's http1 behavior: at most one
+				// User-Agent. If set to nil or empty string,
+				// then omit it. Otherwise if not mentioned,
+				// include the default (below).
+				didUA = true
+				if len(vv) < 1 {
+					continue
+				}
+				vv = vv[:1]
+				if vv[0] == "" {
+					continue
+				}
+			} else if asciiEqualFold(k, "cookie") {
+				// Per 8.1.2.5 To allow for better compression efficiency, the
+				// Cookie header field MAY be split into separate header fields,
+				// each with one or more cookie-pairs.
+				for _, v := range vv {
+					for {
+						p := strings.IndexByte(v, ';')
+						if p < 0 {
+							break
+						}
+						f("cookie", v[:p])
+						p++
+						// strip space after semicolon if any.
+						for p+1 <= len(v) && v[p] == ' ' {
+							p++
+						}
+						v = v[p:]
+					}
+					if len(v) > 0 {
+						f("cookie", v)
+					}
+				}
+				continue
+			}
+
+			for _, v := range vv {
+				f(k, v)
+			}
+		}
+		if shouldSendReqContentLength(req.Method, contentLength) {
+			f("content-length", strconv.FormatInt(contentLength, 10))
+		}
+		if addGzipHeader {
+			f("accept-encoding", "gzip")
+		}
+		if !didUA {
+			f("user-agent", defaultUserAgent)
+		}
+	}
+
+	// Do a first pass over the headers counting bytes to ensure
+	// we don't exceed cc.peerMaxHeaderListSize. This is done as a
+	// separate pass before encoding the headers to prevent
+	// modifying the hpack state.
+	hlSize := uint64(0)
+	enumerateHeaders(func(name, value string) {
+		hf := hpack.HeaderField{Name: name, Value: value}
+		hlSize += uint64(hf.Size())
+	})
+
+	if hlSize > cc.peerMaxHeaderListSize {
+		return nil, errRequestHeaderListSize
+	}
+
+	trace := httptrace.ContextClientTrace(req.Context())
+	traceHeaders := traceHasWroteHeaderField(trace)
+
+	// Header list size is ok. Write the headers.
+	enumerateHeaders(func(name, value string) {
+		name, ascii := asciiToLower(name)
+		if !ascii {
+			// Skip writing invalid headers. Per RFC 7540, Section 8.1.2, header
+			// field names have to be ASCII characters (just as in HTTP/1.x).
+			return
+		}
+		cc.writeHeader(name, value)
+		if traceHeaders {
+			traceWroteHeaderField(trace, name, value)
+		}
+	})
+
+	return cc.hbuf.Bytes(), nil
+}
+
+// shouldSendReqContentLength reports whether the http2.Transport should send
+// a "content-length" request header. This logic is basically a copy of the net/http
+// transferWriter.shouldSendContentLength.
+// The contentLength is the corrected contentLength (so 0 means actually 0, not unknown).
+// -1 means unknown.
+func shouldSendReqContentLength(method string, contentLength int64) bool {
+	if contentLength > 0 {
+		return true
+	}
+	if contentLength < 0 {
+		return false
+	}
+	// For zero bodies, whether we send a content-length depends on the method.
+	// It also kinda doesn't matter for http2 either way, with END_STREAM.
+	switch method {
+	case "POST", "PUT", "PATCH":
+		return true
+	default:
+		return false
+	}
+}
+
+// requires cc.mu be held.
+func (cc *ClientConn) encodeTrailers(req *http.Request) ([]byte, error) {
 	cc.hbuf.Reset()
 
 	hlSize := uint64(0)
-	for k, vv := range trailer {
+	for k, vv := range req.Trailer {
 		for _, v := range vv {
 			hf := hpack.HeaderField{Name: k, Value: v}
 			hlSize += uint64(hf.Size())
@@ -2043,8 +1666,8 @@ func (cc *ClientConn) encodeTrailers(trailer http.Header) ([]byte, error) {
 		return nil, errRequestHeaderListSize
 	}
 
-	for k, vv := range trailer {
-		lowKey, ascii := httpcommon.LowerHeader(k)
+	for k, vv := range req.Trailer {
+		lowKey, ascii := asciiToLower(k)
 		if !ascii {
 			// Skip writing invalid headers. Per RFC 7540, Section 8.1.2, header
 			// field names have to be ASCII characters (just as in HTTP/1.x).
@@ -2073,55 +1696,55 @@ type resAndError struct {
 }
 
 // requires cc.mu be held.
-func (cc *ClientConn) addStreamLocked(cs *clientStream) {
+func (cc *ClientConn) newStream() *clientStream {
+	cs := &clientStream{
+		cc:        cc,
+		ID:        cc.nextStreamID,
+		resc:      make(chan resAndError, 1),
+		peerReset: make(chan struct{}),
+		done:      make(chan struct{}),
+	}
 	cs.flow.add(int32(cc.initialWindowSize))
 	cs.flow.setConnFlow(&cc.flow)
-	cs.inflow.init(cc.initialStreamRecvWindowSize)
-	cs.ID = cc.nextStreamID
+	cs.inflow.add(transportDefaultStreamFlow)
+	cs.inflow.setConnFlow(&cc.inflow)
 	cc.nextStreamID += 2
 	cc.streams[cs.ID] = cs
-	if cs.ID == 0 {
-		panic("assigned stream ID 0")
-	}
+	return cs
 }
 
 func (cc *ClientConn) forgetStreamID(id uint32) {
+	cc.streamByID(id, true)
+}
+
+func (cc *ClientConn) streamByID(id uint32, andRemove bool) *clientStream {
 	cc.mu.Lock()
-	slen := len(cc.streams)
-	delete(cc.streams, id)
-	if len(cc.streams) != slen-1 {
-		panic("forgetting unknown stream id")
-	}
-	cc.lastActive = cc.t.now()
-	if len(cc.streams) == 0 && cc.idleTimer != nil {
-		cc.idleTimer.Reset(cc.idleTimeout)
-		cc.lastIdle = cc.t.now()
-	}
-	// Wake up writeRequestBody via clientStream.awaitFlowControl and
-	// wake up RoundTrip if there is a pending request.
-	cc.cond.Broadcast()
-
-	closeOnIdle := cc.singleUse || cc.doNotReuse || cc.t.disableKeepAlives() || cc.goAway != nil
-	if closeOnIdle && cc.streamsReserved == 0 && len(cc.streams) == 0 {
-		if VerboseLogs {
-			cc.vlogf("http2: Transport closing idle conn %p (forSingleUse=%v, maxStream=%v)", cc, cc.singleUse, cc.nextStreamID-2)
+	defer cc.mu.Unlock()
+	cs := cc.streams[id]
+	if andRemove && cs != nil && !cc.closed {
+		cc.lastActive = time.Now()
+		delete(cc.streams, id)
+		if len(cc.streams) == 0 && cc.idleTimer != nil {
+			cc.idleTimer.Reset(cc.idleTimeout)
+			cc.lastIdle = time.Now()
 		}
-		cc.closed = true
-		defer cc.closeConn()
+		close(cs.done)
+		// Wake up checkResetOrDone via clientStream.awaitFlowControl and
+		// wake up RoundTrip if there is a pending request.
+		cc.cond.Broadcast()
 	}
-
-	cc.mu.Unlock()
+	return cs
 }
 
 // clientConnReadLoop is the state owned by the clientConn's frame-reading readLoop.
 type clientConnReadLoop struct {
-	_  incomparable
-	cc *ClientConn
+	_             incomparable
+	cc            *ClientConn
+	closeWhenIdle bool
 }
 
 // readLoop runs in its own goroutine and reads and dispatches frames.
 func (cc *ClientConn) readLoop() {
-	cc.t.markNewGoroutine()
 	rl := &clientConnReadLoop{cc: cc}
 	defer rl.cleanup()
 	cc.readerErr = rl.run()
@@ -2155,7 +1778,8 @@ func isEOFOrNetReadError(err error) bool {
 
 func (rl *clientConnReadLoop) cleanup() {
 	cc := rl.cc
-	defer cc.closeConn()
+	defer cc.tconn.Close()
+	defer cc.t.connPool().MarkDead(cc)
 	defer close(cc.readerDone)
 
 	if cc.idleTimer != nil {
@@ -2176,83 +1800,29 @@ func (rl *clientConnReadLoop) cleanup() {
 	} else if err == io.EOF {
 		err = io.ErrUnexpectedEOF
 	}
-	cc.closed = true
-
-	// If the connection has never been used, and has been open for only a short time,
-	// leave it in the connection pool for a little while.
-	//
-	// This avoids a situation where new connections are constantly created,
-	// added to the pool, fail, and are removed from the pool, without any error
-	// being surfaced to the user.
-	unusedWaitTime := 5 * time.Second
-	if cc.idleTimeout > 0 && unusedWaitTime > cc.idleTimeout {
-		unusedWaitTime = cc.idleTimeout
-	}
-	idleTime := cc.t.now().Sub(cc.lastActive)
-	if atomic.LoadUint32(&cc.atomicReused) == 0 && idleTime < unusedWaitTime && !cc.closedOnIdle {
-		cc.idleTimer = cc.t.afterFunc(unusedWaitTime-idleTime, func() {
-			cc.t.connPool().MarkDead(cc)
-		})
-	} else {
-		cc.mu.Unlock() // avoid any deadlocks in MarkDead
-		cc.t.connPool().MarkDead(cc)
-		cc.mu.Lock()
-	}
-
 	for _, cs := range cc.streams {
+		cs.bufPipe.CloseWithError(err) // no-op if already closed
 		select {
-		case <-cs.peerClosed:
-			// The server closed the stream before closing the conn,
-			// so no need to interrupt it.
+		case cs.resc <- resAndError{err: err}:
 		default:
-			cs.abortStreamLocked(err)
 		}
+		close(cs.done)
 	}
+	cc.closed = true
 	cc.cond.Broadcast()
 	cc.mu.Unlock()
-
-	if !cc.seenSettings {
-		// If we have a pending request that wants extended CONNECT,
-		// let it continue and fail with the connection error.
-		cc.extendedConnectAllowed = true
-		close(cc.seenSettingsChan)
-	}
-}
-
-// countReadFrameError calls Transport.CountError with a string
-// representing err.
-func (cc *ClientConn) countReadFrameError(err error) {
-	f := cc.t.CountError
-	if f == nil || err == nil {
-		return
-	}
-	if ce, ok := err.(ConnectionError); ok {
-		errCode := ErrCode(ce)
-		f(fmt.Sprintf("read_frame_conn_error_%s", errCode.stringToken()))
-		return
-	}
-	if errors.Is(err, io.EOF) {
-		f("read_frame_eof")
-		return
-	}
-	if errors.Is(err, io.ErrUnexpectedEOF) {
-		f("read_frame_unexpected_eof")
-		return
-	}
-	if errors.Is(err, ErrFrameTooLarge) {
-		f("read_frame_too_large")
-		return
-	}
-	f("read_frame_other")
 }
 
 func (rl *clientConnReadLoop) run() error {
 	cc := rl.cc
+	rl.closeWhenIdle = cc.t.disableKeepAlives() || cc.singleUse
+	gotReply := false // ever saw a HEADERS reply
 	gotSettings := false
-	readIdleTimeout := cc.readIdleTimeout
-	var t timer
+	readIdleTimeout := cc.t.ReadIdleTimeout
+	var t *time.Timer
 	if readIdleTimeout != 0 {
-		t = cc.t.afterFunc(readIdleTimeout, cc.healthCheck)
+		t = time.AfterFunc(readIdleTimeout, cc.healthCheck)
+		defer t.Stop()
 	}
 	for {
 		f, err := cc.fr.ReadFrame()
@@ -2263,7 +1833,9 @@ func (rl *clientConnReadLoop) run() error {
 			cc.vlogf("http2: Transport readFrame error on conn %p: (%T) %v", cc, err, err)
 		}
 		if se, ok := err.(StreamError); ok {
-			if cs := rl.streamByID(se.StreamID, notHeaderOrDataFrame); cs != nil {
+			if cs := cc.streamByID(se.StreamID, false); cs != nil {
+				cs.cc.writeStreamReset(cs.ID, se.Code, err)
+				cs.cc.forgetStreamID(cs.ID)
 				if se.Cause == nil {
 					se.Cause = cc.fr.errDetail
 				}
@@ -2271,7 +1843,6 @@ func (rl *clientConnReadLoop) run() error {
 			}
 			continue
 		} else if err != nil {
-			cc.countReadFrameError(err)
 			return err
 		}
 		if VerboseLogs {
@@ -2284,16 +1855,22 @@ func (rl *clientConnReadLoop) run() error {
 			}
 			gotSettings = true
 		}
+		maybeIdle := false // whether frame might transition us to idle
 
 		switch f := f.(type) {
 		case *MetaHeadersFrame:
 			err = rl.processHeaders(f)
+			maybeIdle = true
+			gotReply = true
 		case *DataFrame:
 			err = rl.processData(f)
+			maybeIdle = true
 		case *GoAwayFrame:
 			err = rl.processGoAway(f)
+			maybeIdle = true
 		case *RSTStreamFrame:
 			err = rl.processResetStream(f)
+			maybeIdle = true
 		case *SettingsFrame:
 			err = rl.processSettings(f)
 		case *PushPromiseFrame:
@@ -2311,24 +1888,38 @@ func (rl *clientConnReadLoop) run() error {
 			}
 			return err
 		}
+		if rl.closeWhenIdle && gotReply && maybeIdle {
+			cc.closeIfIdle()
+		}
 	}
 }
 
 func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
-	cs := rl.streamByID(f.StreamID, headerOrDataFrame)
+	cc := rl.cc
+	cs := cc.streamByID(f.StreamID, false)
 	if cs == nil {
 		// We'd get here if we canceled a request while the
 		// server had its response still in flight. So if this
 		// was just something we canceled, ignore it.
 		return nil
 	}
-	if cs.readClosed {
-		rl.endStreamError(cs, StreamError{
-			StreamID: f.StreamID,
-			Code:     ErrCodeProtocol,
-			Cause:    errors.New("protocol error: headers after END_STREAM"),
-		})
-		return nil
+	if f.StreamEnded() {
+		// Issue 20521: If the stream has ended, streamByID() causes
+		// clientStream.done to be closed, which causes the request's bodyWriter
+		// to be closed with an errStreamClosed, which may be received by
+		// clientConn.RoundTrip before the result of processing these headers.
+		// Deferring stream closure allows the header processing to occur first.
+		// clientConn.RoundTrip may still receive the bodyWriter error first, but
+		// the fix for issue 16102 prioritises any response.
+		//
+		// Issue 22413: If there is no request body, we should close the
+		// stream before writing to cs.resc so that the stream is closed
+		// immediately once RoundTrip returns.
+		if cs.req.Body != nil {
+			defer cc.forgetStreamID(f.StreamID)
+		} else {
+			cc.forgetStreamID(f.StreamID)
+		}
 	}
 	if !cs.firstByte {
 		if cs.trace != nil {
@@ -2352,11 +1943,9 @@ func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
 			return err
 		}
 		// Any other error type is a stream error.
-		rl.endStreamError(cs, StreamError{
-			StreamID: f.StreamID,
-			Code:     ErrCodeProtocol,
-			Cause:    err,
-		})
+		cs.cc.writeStreamReset(f.StreamID, ErrCodeProtocol, err)
+		cc.forgetStreamID(cs.ID)
+		cs.resc <- resAndError{err: err}
 		return nil // return nil from process* funcs to keep conn alive
 	}
 	if res == nil {
@@ -2364,11 +1953,7 @@ func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
 		return nil
 	}
 	cs.resTrailer = &res.Trailer
-	cs.res = res
-	close(cs.respHeaderRecv)
-	if f.StreamEnded() {
-		rl.endStream(cs)
-	}
+	cs.resc <- resAndError{res: res}
 	return nil
 }
 
@@ -2403,7 +1988,7 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 		Status:     status + " " + http.StatusText(statusCode),
 	}
 	for _, hf := range regularFields {
-		key := httpcommon.CanonicalHeader(hf.Name)
+		key := http.CanonicalHeaderKey(hf.Name)
 		if key == "Trailer" {
 			t := res.Trailer
 			if t == nil {
@@ -2411,7 +1996,7 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 				res.Trailer = t
 			}
 			foreachHeaderElement(hf.Value, func(v string) {
-				t[httpcommon.CanonicalHeader(v)] = nil
+				t[http.CanonicalHeaderKey(v)] = nil
 			})
 		} else {
 			vv := header[key]
@@ -2430,83 +2015,54 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 	}
 
 	if statusCode >= 100 && statusCode <= 199 {
-		if f.StreamEnded() {
-			return nil, errors.New("1xx informational response with END_STREAM flag")
+		cs.num1xx++
+		const max1xxResponses = 5 // arbitrary bound on number of informational responses, same as net/http
+		if cs.num1xx > max1xxResponses {
+			return nil, errors.New("http2: too many 1xx informational responses")
 		}
 		if fn := cs.get1xxTraceFunc(); fn != nil {
-			// If the 1xx response is being delivered to the user,
-			// then they're responsible for limiting the number
-			// of responses.
 			if err := fn(statusCode, textproto.MIMEHeader(header)); err != nil {
 				return nil, err
 			}
-		} else {
-			// If the user didn't examine the 1xx response, then we
-			// limit the size of all 1xx headers.
-			//
-			// This differs a bit from the HTTP/1 implementation, which
-			// limits the size of all 1xx headers plus the final response.
-			// Use the larger limit of MaxHeaderListSize and
-			// net/http.Transport.MaxResponseHeaderBytes.
-			limit := int64(cs.cc.t.maxHeaderListSize())
-			if t1 := cs.cc.t.t1; t1 != nil && t1.MaxResponseHeaderBytes > limit {
-				limit = t1.MaxResponseHeaderBytes
-			}
-			for _, h := range f.Fields {
-				cs.totalHeaderSize += int64(h.Size())
-			}
-			if cs.totalHeaderSize > limit {
-				if VerboseLogs {
-					log.Printf("http2: 1xx informational responses too large")
-				}
-				return nil, errors.New("header list too large")
-			}
 		}
 		if statusCode == 100 {
 			traceGot100Continue(cs.trace)
-			select {
-			case cs.on100 <- struct{}{}:
-			default:
+			if cs.on100 != nil {
+				cs.on100() // forces any write delay timer to fire
 			}
 		}
 		cs.pastHeaders = false // do it all again
 		return nil, nil
 	}
 
-	res.ContentLength = -1
-	if clens := res.Header["Content-Length"]; len(clens) == 1 {
-		if cl, err := strconv.ParseUint(clens[0], 10, 63); err == nil {
-			res.ContentLength = int64(cl)
-		} else {
+	streamEnded := f.StreamEnded()
+	isHead := cs.req.Method == "HEAD"
+	if !streamEnded || isHead {
+		res.ContentLength = -1
+		if clens := res.Header["Content-Length"]; len(clens) == 1 {
+			if cl, err := strconv.ParseUint(clens[0], 10, 63); err == nil {
+				res.ContentLength = int64(cl)
+			} else {
+				// TODO: care? unlike http/1, it won't mess up our framing, so it's
+				// more safe smuggling-wise to ignore.
+			}
+		} else if len(clens) > 1 {
 			// TODO: care? unlike http/1, it won't mess up our framing, so it's
 			// more safe smuggling-wise to ignore.
 		}
-	} else if len(clens) > 1 {
-		// TODO: care? unlike http/1, it won't mess up our framing, so it's
-		// more safe smuggling-wise to ignore.
-	} else if f.StreamEnded() && !cs.isHead {
-		res.ContentLength = 0
 	}
 
-	if cs.isHead {
+	if streamEnded || isHead {
 		res.Body = noBody
 		return res, nil
 	}
 
-	if f.StreamEnded() {
-		if res.ContentLength > 0 {
-			res.Body = missingBody{}
-		} else {
-			res.Body = noBody
-		}
-		return res, nil
-	}
-
-	cs.bufPipe.setBuffer(&dataBuffer{expected: res.ContentLength})
+	cs.bufPipe = pipe{b: &dataBuffer{expected: res.ContentLength}}
 	cs.bytesRemain = res.ContentLength
 	res.Body = transportResponseBody{cs}
+	go cs.awaitRequestCancel(cs.req)
 
-	if cs.requestedGzip && asciiEqualFold(res.Header.Get("Content-Encoding"), "gzip") {
+	if cs.requestedGzip && res.Header.Get("Content-Encoding") == "gzip" {
 		res.Header.Del("Content-Encoding")
 		res.Header.Del("Content-Length")
 		res.ContentLength = -1
@@ -2535,7 +2091,7 @@ func (rl *clientConnReadLoop) processTrailers(cs *clientStream, f *MetaHeadersFr
 
 	trailer := make(http.Header)
 	for _, hf := range f.RegularFields() {
-		key := httpcommon.CanonicalHeader(hf.Name)
+		key := http.CanonicalHeaderKey(hf.Name)
 		trailer[key] = append(trailer[key], hf.Value)
 	}
 	cs.trailer = trailer
@@ -2545,7 +2101,8 @@ func (rl *clientConnReadLoop) processTrailers(cs *clientStream, f *MetaHeadersFr
 }
 
 // transportResponseBody is the concrete type of Transport.RoundTrip's
-// Response.Body. It is an io.ReadCloser.
+// Response.Body. It is an io.ReadCloser. On Read, it reads from cs.body.
+// On Close it sends RST_STREAM if EOF wasn't already seen.
 type transportResponseBody struct {
 	cs *clientStream
 }
@@ -2563,7 +2120,7 @@ func (b transportResponseBody) Read(p []byte) (n int, err error) {
 			n = int(cs.bytesRemain)
 			if err == nil {
 				err = errors.New("net/http: server replied with more than declared Content-Length; truncated")
-				cs.abortStream(err)
+				cc.writeStreamReset(cs.ID, ErrCodeProtocol, err)
 			}
 			cs.readErr = err
 			return int(cs.bytesRemain), err
@@ -2581,13 +2138,24 @@ func (b transportResponseBody) Read(p []byte) (n int, err error) {
 	}
 
 	cc.mu.Lock()
-	connAdd := cc.inflow.add(n)
-	var streamAdd int32
-	if err == nil { // No need to refresh if the stream is over or failed.
-		streamAdd = cs.inflow.add(n)
-	}
-	cc.mu.Unlock()
+	defer cc.mu.Unlock()
 
+	var connAdd, streamAdd int32
+	// Check the conn-level first, before the stream-level.
+	if v := cc.inflow.available(); v < transportDefaultConnFlow/2 {
+		connAdd = transportDefaultConnFlow - v
+		cc.inflow.add(connAdd)
+	}
+	if err == nil { // No need to refresh if the stream is over or failed.
+		// Consider any buffered body data (read from the conn but not
+		// consumed by the client) when computing flow control for this
+		// stream.
+		v := int(cs.inflow.available()) + cs.bufPipe.Len()
+		if v < transportDefaultStreamFlow-transportDefaultStreamMinRefresh {
+			streamAdd = int32(transportDefaultStreamFlow - v)
+			cs.inflow.add(streamAdd)
+		}
+	}
 	if connAdd != 0 || streamAdd != 0 {
 		cc.wmu.Lock()
 		defer cc.wmu.Unlock()
@@ -2608,43 +2176,34 @@ func (b transportResponseBody) Close() error {
 	cs := b.cs
 	cc := cs.cc
 
-	cs.bufPipe.BreakWithError(errClosedResponseBody)
-	cs.abortStream(errClosedResponseBody)
-
+	serverSentStreamEnd := cs.bufPipe.Err() == io.EOF
 	unread := cs.bufPipe.Len()
-	if unread > 0 {
-		cc.mu.Lock()
-		// Return connection-level flow control.
-		connAdd := cc.inflow.add(unread)
-		cc.mu.Unlock()
 
-		// TODO(dneil): Acquiring this mutex can block indefinitely.
-		// Move flow control return to a goroutine?
+	if unread > 0 || !serverSentStreamEnd {
+		cc.mu.Lock()
 		cc.wmu.Lock()
+		if !serverSentStreamEnd {
+			cc.fr.WriteRSTStream(cs.ID, ErrCodeCancel)
+			cs.didReset = true
+		}
 		// Return connection-level flow control.
-		if connAdd > 0 {
-			cc.fr.WriteWindowUpdate(0, uint32(connAdd))
+		if unread > 0 {
+			cc.inflow.add(int32(unread))
+			cc.fr.WriteWindowUpdate(0, uint32(unread))
 		}
 		cc.bw.Flush()
 		cc.wmu.Unlock()
+		cc.mu.Unlock()
 	}
 
-	select {
-	case <-cs.donec:
-	case <-cs.ctx.Done():
-		// See golang/go#49366: The net/http package can cancel the
-		// request context after the response body is fully read.
-		// Don't treat this as an error.
-		return nil
-	case <-cs.reqCancel:
-		return errRequestCanceled
-	}
+	cs.bufPipe.BreakWithError(errClosedResponseBody)
+	cc.forgetStreamID(cs.ID)
 	return nil
 }
 
 func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 	cc := rl.cc
-	cs := rl.streamByID(f.StreamID, headerOrDataFrame)
+	cs := cc.streamByID(f.StreamID, f.StreamEnded())
 	data := f.Data()
 	if cs == nil {
 		cc.mu.Lock()
@@ -2663,30 +2222,17 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		// But at least return their flow control:
 		if f.Length > 0 {
 			cc.mu.Lock()
-			ok := cc.inflow.take(f.Length)
-			connAdd := cc.inflow.add(int(f.Length))
+			cc.inflow.add(int32(f.Length))
 			cc.mu.Unlock()
-			if !ok {
-				return ConnectionError(ErrCodeFlowControl)
-			}
-			if connAdd > 0 {
-				cc.wmu.Lock()
-				cc.fr.WriteWindowUpdate(0, uint32(connAdd))
-				cc.bw.Flush()
-				cc.wmu.Unlock()
-			}
+
+			cc.wmu.Lock()
+			cc.fr.WriteWindowUpdate(0, uint32(f.Length))
+			cc.bw.Flush()
+			cc.wmu.Unlock()
 		}
 		return nil
 	}
-	if cs.readClosed {
-		cc.logf("protocol error: received DATA after END_STREAM")
-		rl.endStreamError(cs, StreamError{
-			StreamID: f.StreamID,
-			Code:     ErrCodeProtocol,
-		})
-		return nil
-	}
-	if !cs.pastHeaders {
+	if !cs.firstByte {
 		cc.logf("protocol error: received DATA before a HEADERS frame")
 		rl.endStreamError(cs, StreamError{
 			StreamID: f.StreamID,
@@ -2695,7 +2241,7 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		return nil
 	}
 	if f.Length > 0 {
-		if cs.isHead && len(data) > 0 {
+		if cs.req.Method == "HEAD" && len(data) > 0 {
 			cc.logf("protocol error: received DATA on a HEAD request")
 			rl.endStreamError(cs, StreamError{
 				StreamID: f.StreamID,
@@ -2705,7 +2251,9 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		}
 		// Check connection-level flow control.
 		cc.mu.Lock()
-		if !takeInflows(&cc.inflow, &cs.inflow, f.Length) {
+		if cs.inflow.available() >= int32(f.Length) {
+			cs.inflow.take(int32(f.Length))
+		} else {
 			cc.mu.Unlock()
 			return ConnectionError(ErrCodeFlowControl)
 		}
@@ -2715,40 +2263,30 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		if pad := int(f.Length) - len(data); pad > 0 {
 			refund += pad
 		}
-
-		didReset := false
-		var err error
-		if len(data) > 0 {
-			if _, err = cs.bufPipe.Write(data); err != nil {
-				// Return len(data) now if the stream is already closed,
-				// since data will never be read.
-				didReset = true
-				refund += len(data)
-			}
+		// Return len(data) now if the stream is already closed,
+		// since data will never be read.
+		didReset := cs.didReset
+		if didReset {
+			refund += len(data)
 		}
-
-		sendConn := cc.inflow.add(refund)
-		var sendStream int32
-		if !didReset {
-			sendStream = cs.inflow.add(refund)
-		}
-		cc.mu.Unlock()
-
-		if sendConn > 0 || sendStream > 0 {
+		if refund > 0 {
+			cc.inflow.add(int32(refund))
 			cc.wmu.Lock()
-			if sendConn > 0 {
-				cc.fr.WriteWindowUpdate(0, uint32(sendConn))
-			}
-			if sendStream > 0 {
-				cc.fr.WriteWindowUpdate(cs.ID, uint32(sendStream))
+			cc.fr.WriteWindowUpdate(0, uint32(refund))
+			if !didReset {
+				cs.inflow.add(int32(refund))
+				cc.fr.WriteWindowUpdate(cs.ID, uint32(refund))
 			}
 			cc.bw.Flush()
 			cc.wmu.Unlock()
 		}
+		cc.mu.Unlock()
 
-		if err != nil {
-			rl.endStreamError(cs, err)
-			return nil
+		if len(data) > 0 && !didReset {
+			if _, err := cs.bufPipe.Write(data); err != nil {
+				rl.endStreamError(cs, err)
+				return err
+			}
 		}
 	}
 
@@ -2761,45 +2299,24 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 func (rl *clientConnReadLoop) endStream(cs *clientStream) {
 	// TODO: check that any declared content-length matches, like
 	// server.go's (*stream).endStream method.
-	if !cs.readClosed {
-		cs.readClosed = true
-		// Close cs.bufPipe and cs.peerClosed with cc.mu held to avoid a
-		// race condition: The caller can read io.EOF from Response.Body
-		// and close the body before we close cs.peerClosed, causing
-		// cleanupWriteRequest to send a RST_STREAM.
-		rl.cc.mu.Lock()
-		defer rl.cc.mu.Unlock()
-		cs.bufPipe.closeWithErrorAndCode(io.EOF, cs.copyTrailers)
-		close(cs.peerClosed)
-	}
+	rl.endStreamError(cs, nil)
 }
 
 func (rl *clientConnReadLoop) endStreamError(cs *clientStream, err error) {
-	cs.readAborted = true
-	cs.abortStream(err)
-}
-
-// Constants passed to streamByID for documentation purposes.
-const (
-	headerOrDataFrame    = true
-	notHeaderOrDataFrame = false
-)
-
-// streamByID returns the stream with the given id, or nil if no stream has that id.
-// If headerOrData is true, it clears rst.StreamPingsBlocked.
-func (rl *clientConnReadLoop) streamByID(id uint32, headerOrData bool) *clientStream {
-	rl.cc.mu.Lock()
-	defer rl.cc.mu.Unlock()
-	if headerOrData {
-		// Work around an unfortunate gRPC behavior.
-		// See comment on ClientConn.rstStreamPingsBlocked for details.
-		rl.cc.rstStreamPingsBlocked = false
+	var code func()
+	if err == nil {
+		err = io.EOF
+		code = cs.copyTrailers
 	}
-	cs := rl.cc.streams[id]
-	if cs != nil && !cs.readAborted {
-		return cs
+	if isConnectionCloseRequest(cs.req) {
+		rl.closeWhenIdle = true
+	}
+	cs.bufPipe.closeWithErrorAndCode(err, code)
+
+	select {
+	case cs.resc <- resAndError{err: err}:
+	default:
 	}
-	return nil
 }
 
 func (cs *clientStream) copyTrailers() {
@@ -2818,32 +2335,12 @@ func (rl *clientConnReadLoop) processGoAway(f *GoAwayFrame) error {
 	if f.ErrCode != 0 {
 		// TODO: deal with GOAWAY more. particularly the error code
 		cc.vlogf("transport got GOAWAY with error code = %v", f.ErrCode)
-		if fn := cc.t.CountError; fn != nil {
-			fn("recv_goaway_" + f.ErrCode.stringToken())
-		}
 	}
 	cc.setGoAway(f)
 	return nil
 }
 
 func (rl *clientConnReadLoop) processSettings(f *SettingsFrame) error {
-	cc := rl.cc
-	// Locking both mu and wmu here allows frame encoding to read settings with only wmu held.
-	// Acquiring wmu when f.IsAck() is unnecessary, but convenient and mostly harmless.
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
-
-	if err := rl.processSettingsNoWrite(f); err != nil {
-		return err
-	}
-	if !f.IsAck() {
-		cc.fr.WriteSettingsAck()
-		cc.bw.Flush()
-	}
-	return nil
-}
-
-func (rl *clientConnReadLoop) processSettingsNoWrite(f *SettingsFrame) error {
 	cc := rl.cc
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
@@ -2856,14 +2353,12 @@ func (rl *clientConnReadLoop) processSettingsNoWrite(f *SettingsFrame) error {
 		return ConnectionError(ErrCodeProtocol)
 	}
 
-	var seenMaxConcurrentStreams bool
 	err := f.ForeachSetting(func(s Setting) error {
 		switch s.ID {
 		case SettingMaxFrameSize:
 			cc.maxFrameSize = s.Val
 		case SettingMaxConcurrentStreams:
 			cc.maxConcurrentStreams = s.Val
-			seenMaxConcurrentStreams = true
 		case SettingMaxHeaderListSize:
 			cc.peerMaxHeaderListSize = uint64(s.Val)
 		case SettingInitialWindowSize:
@@ -2885,25 +2380,8 @@ func (rl *clientConnReadLoop) processSettingsNoWrite(f *SettingsFrame) error {
 			cc.cond.Broadcast()
 
 			cc.initialWindowSize = s.Val
-		case SettingHeaderTableSize:
-			cc.henc.SetMaxDynamicTableSize(s.Val)
-			cc.peerMaxHeaderTableSize = s.Val
-		case SettingEnableConnectProtocol:
-			if err := s.Valid(); err != nil {
-				return err
-			}
-			// If the peer wants to send us SETTINGS_ENABLE_CONNECT_PROTOCOL,
-			// we require that it do so in the first SETTINGS frame.
-			//
-			// When we attempt to use extended CONNECT, we wait for the first
-			// SETTINGS frame to see if the server supports it. If we let the
-			// server enable the feature with a later SETTINGS frame, then
-			// users will see inconsistent results depending on whether we've
-			// seen that frame or not.
-			if !cc.seenSettings {
-				cc.extendedConnectAllowed = s.Val == 1
-			}
 		default:
+			// TODO(bradfitz): handle more settings? SETTINGS_HEADER_TABLE_SIZE probably.
 			cc.vlogf("Unhandled Setting: %v", s)
 		}
 		return nil
@@ -2912,24 +2390,17 @@ func (rl *clientConnReadLoop) processSettingsNoWrite(f *SettingsFrame) error {
 		return err
 	}
 
-	if !cc.seenSettings {
-		if !seenMaxConcurrentStreams {
-			// This was the servers initial SETTINGS frame and it
-			// didn't contain a MAX_CONCURRENT_STREAMS field so
-			// increase the number of concurrent streams this
-			// connection can establish to our default.
-			cc.maxConcurrentStreams = defaultMaxConcurrentStreams
-		}
-		close(cc.seenSettingsChan)
-		cc.seenSettings = true
-	}
+	cc.wmu.Lock()
+	defer cc.wmu.Unlock()
 
-	return nil
+	cc.fr.WriteSettingsAck()
+	cc.bw.Flush()
+	return cc.werr
 }
 
 func (rl *clientConnReadLoop) processWindowUpdate(f *WindowUpdateFrame) error {
 	cc := rl.cc
-	cs := rl.streamByID(f.StreamID, notHeaderOrDataFrame)
+	cs := cc.streamByID(f.StreamID, false)
 	if f.StreamID != 0 && cs == nil {
 		return nil
 	}
@@ -2942,15 +2413,6 @@ func (rl *clientConnReadLoop) processWindowUpdate(f *WindowUpdateFrame) error {
 		fl = &cs.flow
 	}
 	if !fl.add(int32(f.Increment)) {
-		// For stream, the sender sends RST_STREAM with an error code of FLOW_CONTROL_ERROR
-		if cs != nil {
-			rl.endStreamError(cs, StreamError{
-				StreamID: f.StreamID,
-				Code:     ErrCodeFlowControl,
-			})
-			return nil
-		}
-
 		return ConnectionError(ErrCodeFlowControl)
 	}
 	cc.cond.Broadcast()
@@ -2958,22 +2420,31 @@ func (rl *clientConnReadLoop) processWindowUpdate(f *WindowUpdateFrame) error {
 }
 
 func (rl *clientConnReadLoop) processResetStream(f *RSTStreamFrame) error {
-	cs := rl.streamByID(f.StreamID, notHeaderOrDataFrame)
+	cs := rl.cc.streamByID(f.StreamID, true)
 	if cs == nil {
-		// TODO: return error if server tries to RST_STREAM an idle stream
+		// TODO: return error if server tries to RST_STEAM an idle stream
 		return nil
 	}
-	serr := streamError(cs.ID, f.ErrCode)
-	serr.Cause = errFromPeer
-	if f.ErrCode == ErrCodeProtocol {
-		rl.cc.SetDoNotReuse()
+	select {
+	case <-cs.peerReset:
+		// Already reset.
+		// This is the only goroutine
+		// which closes this, so there
+		// isn't a race.
+	default:
+		serr := streamError(cs.ID, f.ErrCode)
+		if f.ErrCode == ErrCodeProtocol {
+			rl.cc.SetDoNotReuse()
+			serr.Cause = errFromPeer
+			// TODO(bradfitz): increment a varz here, once Transport
+			// takes an optional interface-typed field that expvar.Map.Add
+			// implements.
+		}
+		cs.resetErr = serr
+		close(cs.peerReset)
+		cs.bufPipe.CloseWithError(serr)
+		cs.cc.cond.Broadcast() // wake up checkResetOrDone via clientStream.awaitFlowControl
 	}
-	if fn := cs.cc.t.CountError; fn != nil {
-		fn("recv_rststream_" + f.ErrCode.stringToken())
-	}
-	cs.abortStream(serr)
-
-	cs.bufPipe.CloseWithError(serr)
 	return nil
 }
 
@@ -2995,26 +2466,19 @@ func (cc *ClientConn) Ping(ctx context.Context) error {
 		}
 		cc.mu.Unlock()
 	}
-	var pingError error
-	errc := make(chan struct{})
-	go func() {
-		cc.t.markNewGoroutine()
-		cc.wmu.Lock()
-		defer cc.wmu.Unlock()
-		if pingError = cc.fr.WritePing(false, p); pingError != nil {
-			close(errc)
-			return
-		}
-		if pingError = cc.bw.Flush(); pingError != nil {
-			close(errc)
-			return
-		}
-	}()
+	cc.wmu.Lock()
+	if err := cc.fr.WritePing(false, p); err != nil {
+		cc.wmu.Unlock()
+		return err
+	}
+	if err := cc.bw.Flush(); err != nil {
+		cc.wmu.Unlock()
+		return err
+	}
+	cc.wmu.Unlock()
 	select {
 	case <-c:
 		return nil
-	case <-errc:
-		return pingError
 	case <-ctx.Done():
 		return ctx.Err()
 	case <-cc.readerDone:
@@ -3033,12 +2497,6 @@ func (rl *clientConnReadLoop) processPing(f *PingFrame) error {
 			close(c)
 			delete(cc.pings, f.Data)
 		}
-		if cc.pendingResets > 0 {
-			// See clientStream.cleanupWriteRequest.
-			cc.pendingResets = 0
-			cc.rstStreamPingsBlocked = true
-			cc.cond.Broadcast()
-		}
 		return nil
 	}
 	cc := rl.cc
@@ -3061,27 +2519,20 @@ func (rl *clientConnReadLoop) processPushPromise(f *PushPromiseFrame) error {
 	return ConnectionError(ErrCodeProtocol)
 }
 
-// writeStreamReset sends a RST_STREAM frame.
-// When ping is true, it also sends a PING frame with a random payload.
-func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, ping bool, err error) {
+func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, err error) {
 	// TODO: map err to more interesting error codes, once the
 	// HTTP community comes up with some. But currently for
 	// RST_STREAM there's no equivalent to GOAWAY frame's debug
 	// data, and the error codes are all pretty vague ("cancel").
 	cc.wmu.Lock()
 	cc.fr.WriteRSTStream(streamID, code)
-	if ping {
-		var payload [8]byte
-		rand.Read(payload[:])
-		cc.fr.WritePing(false, payload)
-	}
 	cc.bw.Flush()
 	cc.wmu.Unlock()
 }
 
 var (
 	errResponseHeaderListSize = errors.New("http2: response header list larger than advertised limit")
-	errRequestHeaderListSize  = httpcommon.ErrRequestHeaderListSize
+	errRequestHeaderListSize  = errors.New("http2: request header list larger than peer's advertised limit")
 )
 
 func (cc *ClientConn) logf(format string, args ...interface{}) {
@@ -3102,17 +2553,7 @@ func (t *Transport) logf(format string, args ...interface{}) {
 	log.Printf(format, args...)
 }
 
-var noBody io.ReadCloser = noBodyReader{}
-
-type noBodyReader struct{}
-
-func (noBodyReader) Close() error             { return nil }
-func (noBodyReader) Read([]byte) (int, error) { return 0, io.EOF }
-
-type missingBody struct{}
-
-func (missingBody) Close() error             { return nil }
-func (missingBody) Read([]byte) (int, error) { return 0, io.ErrUnexpectedEOF }
+var noBody io.ReadCloser = ioutil.NopCloser(bytes.NewReader(nil))
 
 func strSliceContains(ss []string, s string) bool {
 	for _, v := range ss {
@@ -3152,17 +2593,94 @@ func (gz *gzipReader) Read(p []byte) (n int, err error) {
 }
 
 func (gz *gzipReader) Close() error {
-	if err := gz.body.Close(); err != nil {
-		return err
-	}
-	gz.zerr = fs.ErrClosed
-	return nil
+	return gz.body.Close()
 }
 
 type errorReader struct{ err error }
 
 func (r errorReader) Read(p []byte) (int, error) { return 0, r.err }
 
+// bodyWriterState encapsulates various state around the Transport's writing
+// of the request body, particularly regarding doing delayed writes of the body
+// when the request contains "Expect: 100-continue".
+type bodyWriterState struct {
+	cs     *clientStream
+	timer  *time.Timer   // if non-nil, we're doing a delayed write
+	fnonce *sync.Once    // to call fn with
+	fn     func()        // the code to run in the goroutine, writing the body
+	resc   chan error    // result of fn's execution
+	delay  time.Duration // how long we should delay a delayed write for
+}
+
+func (t *Transport) getBodyWriterState(cs *clientStream, body io.Reader) (s bodyWriterState) {
+	s.cs = cs
+	if body == nil {
+		return
+	}
+	resc := make(chan error, 1)
+	s.resc = resc
+	s.fn = func() {
+		cs.cc.mu.Lock()
+		cs.startedWrite = true
+		cs.cc.mu.Unlock()
+		resc <- cs.writeRequestBody(body, cs.req.Body)
+	}
+	s.delay = t.expectContinueTimeout()
+	if s.delay == 0 ||
+		!httpguts.HeaderValuesContainsToken(
+			cs.req.Header["Expect"],
+			"100-continue") {
+		return
+	}
+	s.fnonce = new(sync.Once)
+
+	// Arm the timer with a very large duration, which we'll
+	// intentionally lower later. It has to be large now because
+	// we need a handle to it before writing the headers, but the
+	// s.delay value is defined to not start until after the
+	// request headers were written.
+	const hugeDuration = 365 * 24 * time.Hour
+	s.timer = time.AfterFunc(hugeDuration, func() {
+		s.fnonce.Do(s.fn)
+	})
+	return
+}
+
+func (s bodyWriterState) cancel() {
+	if s.timer != nil {
+		if s.timer.Stop() {
+			s.resc <- nil
+		}
+	}
+}
+
+func (s bodyWriterState) on100() {
+	if s.timer == nil {
+		// If we didn't do a delayed write, ignore the server's
+		// bogus 100 continue response.
+		return
+	}
+	s.timer.Stop()
+	go func() { s.fnonce.Do(s.fn) }()
+}
+
+// scheduleBodyWrite starts writing the body, either immediately (in
+// the common case) or after the delay timeout. It should not be
+// called until after the headers have been written.
+func (s bodyWriterState) scheduleBodyWrite() {
+	if s.timer == nil {
+		// We're not doing a delayed write (see
+		// getBodyWriterState), so just start the writing
+		// goroutine immediately.
+		go s.fn()
+		return
+	}
+	traceWait100Continue(s.cs.trace)
+	if s.timer.Stop() {
+		s.timer.Reset(s.delay)
+	}
+}
+
 // isConnectionCloseRequest reports whether req should use its own
 // connection for a single request and then close the connection.
 func isConnectionCloseRequest(req *http.Request) bool {
@@ -3196,17 +2714,9 @@ func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, err
 }
 
 func (t *Transport) idleConnTimeout() time.Duration {
-	// to keep things backwards compatible, we use non-zero values of
-	// IdleConnTimeout, followed by using the IdleConnTimeout on the underlying
-	// http1 transport, followed by 0
-	if t.IdleConnTimeout != 0 {
-		return t.IdleConnTimeout
-	}
-
 	if t.t1 != nil {
 		return t.t1.IdleConnTimeout
 	}
-
 	return 0
 }
 
@@ -3228,7 +2738,7 @@ func traceGotConn(req *http.Request, cc *ClientConn, reused bool) {
 	cc.mu.Lock()
 	ci.WasIdle = len(cc.streams) == 0 && reused
 	if ci.WasIdle && !cc.lastActive.IsZero() {
-		ci.IdleTime = cc.t.timeSince(cc.lastActive)
+		ci.IdleTime = time.Now().Sub(cc.lastActive)
 	}
 	cc.mu.Unlock()
 
@@ -3264,24 +2774,3 @@ func traceFirstResponseByte(trace *httptrace.ClientTrace) {
 		trace.GotFirstResponseByte()
 	}
 }
-
-func traceGot1xxResponseFunc(trace *httptrace.ClientTrace) func(int, textproto.MIMEHeader) error {
-	if trace != nil {
-		return trace.Got1xxResponse
-	}
-	return nil
-}
-
-// dialTLSWithContext uses tls.Dialer, added in Go 1.15, to open a TLS
-// connection.
-func (t *Transport) dialTLSWithContext(ctx context.Context, network, addr string, cfg *tls.Config) (*tls.Conn, error) {
-	dialer := &tls.Dialer{
-		Config: cfg,
-	}
-	cn, err := dialer.DialContext(ctx, network, addr)
-	if err != nil {
-		return nil, err
-	}
-	tlsCn := cn.(*tls.Conn) // DialContext comment promises this will always succeed
-	return tlsCn, nil
-}
diff --git a/vendor/golang.org/x/net/http2/unencrypted.go b/vendor/golang.org/x/net/http2/unencrypted.go
deleted file mode 100644
index b2de211..0000000
--- a/vendor/golang.org/x/net/http2/unencrypted.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"crypto/tls"
-	"errors"
-	"net"
-)
-
-const nextProtoUnencryptedHTTP2 = "unencrypted_http2"
-
-// unencryptedNetConnFromTLSConn retrieves a net.Conn wrapped in a *tls.Conn.
-//
-// TLSNextProto functions accept a *tls.Conn.
-//
-// When passing an unencrypted HTTP/2 connection to a TLSNextProto function,
-// we pass a *tls.Conn with an underlying net.Conn containing the unencrypted connection.
-// To be extra careful about mistakes (accidentally dropping TLS encryption in a place
-// where we want it), the tls.Conn contains a net.Conn with an UnencryptedNetConn method
-// that returns the actual connection we want to use.
-func unencryptedNetConnFromTLSConn(tc *tls.Conn) (net.Conn, error) {
-	conner, ok := tc.NetConn().(interface {
-		UnencryptedNetConn() net.Conn
-	})
-	if !ok {
-		return nil, errors.New("http2: TLS conn unexpectedly found in unencrypted handoff")
-	}
-	return conner.UnencryptedNetConn(), nil
-}
diff --git a/vendor/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go
index fdb35b9..33f6139 100644
--- a/vendor/golang.org/x/net/http2/write.go
+++ b/vendor/golang.org/x/net/http2/write.go
@@ -13,7 +13,6 @@ import (
 
 	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/internal/httpcommon"
 )
 
 // writeFramer is implemented by any type that is used to write frames.
@@ -132,16 +131,6 @@ func (se StreamError) writeFrame(ctx writeContext) error {
 
 func (se StreamError) staysWithinBuffer(max int) bool { return frameHeaderLen+4 <= max }
 
-type writePing struct {
-	data [8]byte
-}
-
-func (w writePing) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WritePing(false, w.data)
-}
-
-func (w writePing) staysWithinBuffer(max int) bool { return frameHeaderLen+len(w.data) <= max }
-
 type writePingAck struct{ pf *PingFrame }
 
 func (w writePingAck) writeFrame(ctx writeContext) error {
@@ -352,7 +341,7 @@ func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) {
 	}
 	for _, k := range keys {
 		vv := h[k]
-		k, ascii := httpcommon.LowerHeader(k)
+		k, ascii := lowerHeader(k)
 		if !ascii {
 			// Skip writing invalid headers. Per RFC 7540, Section 8.1.2, header
 			// field names have to be ASCII characters (just as in HTTP/1.x).
diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go
index cc893ad..f24d2b1 100644
--- a/vendor/golang.org/x/net/http2/writesched.go
+++ b/vendor/golang.org/x/net/http2/writesched.go
@@ -32,8 +32,7 @@ type WriteScheduler interface {
 
 	// Pop dequeues the next frame to write. Returns false if no frames can
 	// be written. Frames with a given wr.StreamID() are Pop'd in the same
-	// order they are Push'd, except RST_STREAM frames. No frames should be
-	// discarded except by CloseStream.
+	// order they are Push'd. No frames should be discarded except by CloseStream.
 	Pop() (wr FrameWriteRequest, ok bool)
 }
 
@@ -53,7 +52,6 @@ type FrameWriteRequest struct {
 
 	// stream is the stream on which this frame will be written.
 	// nil for non-stream frames like PING and SETTINGS.
-	// nil for RST_STREAM streams, which use the StreamError.StreamID field instead.
 	stream *stream
 
 	// done, if non-nil, must be a buffered channel with space for
@@ -184,8 +182,7 @@ func (wr *FrameWriteRequest) replyToWriter(err error) {
 
 // writeQueue is used by implementations of WriteScheduler.
 type writeQueue struct {
-	s          []FrameWriteRequest
-	prev, next *writeQueue
+	s []FrameWriteRequest
 }
 
 func (q *writeQueue) empty() bool { return len(q.s) == 0 }
diff --git a/vendor/golang.org/x/net/http2/writesched_priority.go b/vendor/golang.org/x/net/http2/writesched_priority.go
index f678333..2618b2c 100644
--- a/vendor/golang.org/x/net/http2/writesched_priority.go
+++ b/vendor/golang.org/x/net/http2/writesched_priority.go
@@ -383,15 +383,16 @@ func (ws *priorityWriteScheduler) AdjustStream(streamID uint32, priority Priorit
 
 func (ws *priorityWriteScheduler) Push(wr FrameWriteRequest) {
 	var n *priorityNode
-	if wr.isControl() {
+	if id := wr.StreamID(); id == 0 {
 		n = &ws.root
 	} else {
-		id := wr.StreamID()
 		n = ws.nodes[id]
 		if n == nil {
 			// id is an idle or closed stream. wr should not be a HEADERS or
-			// DATA frame. In other case, we push wr onto the root, rather
-			// than creating a new priorityNode.
+			// DATA frame. However, wr can be a RST_STREAM. In this case, we
+			// push wr onto the root, rather than creating a new priorityNode,
+			// since RST_STREAM is tiny and the stream's priority is unknown
+			// anyway. See issue #17919.
 			if wr.DataSize() > 0 {
 				panic("add DATA on non-open stream")
 			}
@@ -443,8 +444,8 @@ func (ws *priorityWriteScheduler) addClosedOrIdleNode(list *[]*priorityNode, max
 }
 
 func (ws *priorityWriteScheduler) removeNode(n *priorityNode) {
-	for n.kids != nil {
-		n.kids.setParent(n.parent)
+	for k := n.kids; k != nil; k = k.next {
+		k.setParent(n.parent)
 	}
 	n.setParent(nil)
 	delete(ws.nodes, n.id)
diff --git a/vendor/golang.org/x/net/http2/writesched_random.go b/vendor/golang.org/x/net/http2/writesched_random.go
index f2e55e0..9a7b9e5 100644
--- a/vendor/golang.org/x/net/http2/writesched_random.go
+++ b/vendor/golang.org/x/net/http2/writesched_random.go
@@ -45,11 +45,11 @@ func (ws *randomWriteScheduler) AdjustStream(streamID uint32, priority PriorityP
 }
 
 func (ws *randomWriteScheduler) Push(wr FrameWriteRequest) {
-	if wr.isControl() {
+	id := wr.StreamID()
+	if id == 0 {
 		ws.zero.push(wr)
 		return
 	}
-	id := wr.StreamID()
 	q, ok := ws.sq[id]
 	if !ok {
 		q = ws.queuePool.get()
@@ -59,7 +59,7 @@ func (ws *randomWriteScheduler) Push(wr FrameWriteRequest) {
 }
 
 func (ws *randomWriteScheduler) Pop() (FrameWriteRequest, bool) {
-	// Control and RST_STREAM frames first.
+	// Control frames first.
 	if !ws.zero.empty() {
 		return ws.zero.shift(), true
 	}
diff --git a/vendor/golang.org/x/net/http2/writesched_roundrobin.go b/vendor/golang.org/x/net/http2/writesched_roundrobin.go
deleted file mode 100644
index 54fe863..0000000
--- a/vendor/golang.org/x/net/http2/writesched_roundrobin.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"math"
-)
-
-type roundRobinWriteScheduler struct {
-	// control contains control frames (SETTINGS, PING, etc.).
-	control writeQueue
-
-	// streams maps stream ID to a queue.
-	streams map[uint32]*writeQueue
-
-	// stream queues are stored in a circular linked list.
-	// head is the next stream to write, or nil if there are no streams open.
-	head *writeQueue
-
-	// pool of empty queues for reuse.
-	queuePool writeQueuePool
-}
-
-// newRoundRobinWriteScheduler constructs a new write scheduler.
-// The round robin scheduler priorizes control frames
-// like SETTINGS and PING over DATA frames.
-// When there are no control frames to send, it performs a round-robin
-// selection from the ready streams.
-func newRoundRobinWriteScheduler() WriteScheduler {
-	ws := &roundRobinWriteScheduler{
-		streams: make(map[uint32]*writeQueue),
-	}
-	return ws
-}
-
-func (ws *roundRobinWriteScheduler) OpenStream(streamID uint32, options OpenStreamOptions) {
-	if ws.streams[streamID] != nil {
-		panic(fmt.Errorf("stream %d already opened", streamID))
-	}
-	q := ws.queuePool.get()
-	ws.streams[streamID] = q
-	if ws.head == nil {
-		ws.head = q
-		q.next = q
-		q.prev = q
-	} else {
-		// Queues are stored in a ring.
-		// Insert the new stream before ws.head, putting it at the end of the list.
-		q.prev = ws.head.prev
-		q.next = ws.head
-		q.prev.next = q
-		q.next.prev = q
-	}
-}
-
-func (ws *roundRobinWriteScheduler) CloseStream(streamID uint32) {
-	q := ws.streams[streamID]
-	if q == nil {
-		return
-	}
-	if q.next == q {
-		// This was the only open stream.
-		ws.head = nil
-	} else {
-		q.prev.next = q.next
-		q.next.prev = q.prev
-		if ws.head == q {
-			ws.head = q.next
-		}
-	}
-	delete(ws.streams, streamID)
-	ws.queuePool.put(q)
-}
-
-func (ws *roundRobinWriteScheduler) AdjustStream(streamID uint32, priority PriorityParam) {}
-
-func (ws *roundRobinWriteScheduler) Push(wr FrameWriteRequest) {
-	if wr.isControl() {
-		ws.control.push(wr)
-		return
-	}
-	q := ws.streams[wr.StreamID()]
-	if q == nil {
-		// This is a closed stream.
-		// wr should not be a HEADERS or DATA frame.
-		// We push the request onto the control queue.
-		if wr.DataSize() > 0 {
-			panic("add DATA on non-open stream")
-		}
-		ws.control.push(wr)
-		return
-	}
-	q.push(wr)
-}
-
-func (ws *roundRobinWriteScheduler) Pop() (FrameWriteRequest, bool) {
-	// Control and RST_STREAM frames first.
-	if !ws.control.empty() {
-		return ws.control.shift(), true
-	}
-	if ws.head == nil {
-		return FrameWriteRequest{}, false
-	}
-	q := ws.head
-	for {
-		if wr, ok := q.consume(math.MaxInt32); ok {
-			ws.head = q.next
-			return wr, true
-		}
-		q = q.next
-		if q == ws.head {
-			break
-		}
-	}
-	return FrameWriteRequest{}, false
-}
diff --git a/vendor/golang.org/x/net/idna/go118.go b/vendor/golang.org/x/net/idna/go118.go
deleted file mode 100644
index 712f1ad..0000000
--- a/vendor/golang.org/x/net/idna/go118.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.18
-
-package idna
-
-// Transitional processing is disabled by default in Go 1.18.
-// https://golang.org/issue/47510
-const transitionalLookup = false
diff --git a/vendor/golang.org/x/net/idna/idna10.0.0.go b/vendor/golang.org/x/net/idna/idna10.0.0.go
index 7b37178..5208ba6 100644
--- a/vendor/golang.org/x/net/idna/idna10.0.0.go
+++ b/vendor/golang.org/x/net/idna/idna10.0.0.go
@@ -5,6 +5,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
+// +build go1.10
 
 // Package idna implements IDNA2008 using the compatibility processing
 // defined by UTS (Unicode Technical Standard) #46, which defines a standard to
@@ -58,10 +59,10 @@ type Option func(*options)
 // Transitional sets a Profile to use the Transitional mapping as defined in UTS
 // #46. This will cause, for example, "ß" to be mapped to "ss". Using the
 // transitional mapping provides a compromise between IDNA2003 and IDNA2008
-// compatibility. It is used by some browsers when resolving domain names. This
+// compatibility. It is used by most browsers when resolving domain names. This
 // option is only meaningful if combined with MapForLookup.
 func Transitional(transitional bool) Option {
-	return func(o *options) { o.transitional = transitional }
+	return func(o *options) { o.transitional = true }
 }
 
 // VerifyDNSLength sets whether a Profile should fail if any of the IDN parts
@@ -283,7 +284,7 @@ var (
 
 	punycode = &Profile{}
 	lookup   = &Profile{options{
-		transitional: transitionalLookup,
+		transitional: true,
 		useSTD3Rules: true,
 		checkHyphens: true,
 		checkJoiners: true,
diff --git a/vendor/golang.org/x/net/idna/idna9.0.0.go b/vendor/golang.org/x/net/idna/idna9.0.0.go
index cc6a892..55f718f 100644
--- a/vendor/golang.org/x/net/idna/idna9.0.0.go
+++ b/vendor/golang.org/x/net/idna/idna9.0.0.go
@@ -5,6 +5,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.10
+// +build !go1.10
 
 // Package idna implements IDNA2008 using the compatibility processing
 // defined by UTS (Unicode Technical Standard) #46, which defines a standard to
@@ -57,10 +58,10 @@ type Option func(*options)
 // Transitional sets a Profile to use the Transitional mapping as defined in UTS
 // #46. This will cause, for example, "ß" to be mapped to "ss". Using the
 // transitional mapping provides a compromise between IDNA2003 and IDNA2008
-// compatibility. It is used by some browsers when resolving domain names. This
+// compatibility. It is used by most browsers when resolving domain names. This
 // option is only meaningful if combined with MapForLookup.
 func Transitional(transitional bool) Option {
-	return func(o *options) { o.transitional = transitional }
+	return func(o *options) { o.transitional = true }
 }
 
 // VerifyDNSLength sets whether a Profile should fail if any of the IDN parts
@@ -120,7 +121,7 @@ func CheckJoiners(enable bool) Option {
 	}
 }
 
-// StrictDomainName limits the set of permissible ASCII characters to those
+// StrictDomainName limits the set of permissable ASCII characters to those
 // allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the
 // hyphen). This is set by default for MapForLookup and ValidateForRegistration,
 // but is only useful if ValidateLabels is set.
diff --git a/vendor/golang.org/x/net/idna/pre_go118.go b/vendor/golang.org/x/net/idna/pre_go118.go
deleted file mode 100644
index 40e74bb..0000000
--- a/vendor/golang.org/x/net/idna/pre_go118.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.18
-
-package idna
-
-const transitionalLookup = true
diff --git a/vendor/golang.org/x/net/idna/punycode.go b/vendor/golang.org/x/net/idna/punycode.go
index e8e3ac1..02c7d59 100644
--- a/vendor/golang.org/x/net/idna/punycode.go
+++ b/vendor/golang.org/x/net/idna/punycode.go
@@ -49,7 +49,6 @@ func decode(encoded string) (string, error) {
 		}
 	}
 	i, n, bias := int32(0), initialN, initialBias
-	overflow := false
 	for pos < len(encoded) {
 		oldI, w := i, int32(1)
 		for k := base; ; k += base {
@@ -61,32 +60,29 @@ func decode(encoded string) (string, error) {
 				return "", punyError(encoded)
 			}
 			pos++
-			i, overflow = madd(i, digit, w)
-			if overflow {
+			i += digit * w
+			if i < 0 {
 				return "", punyError(encoded)
 			}
 			t := k - bias
-			if k <= bias {
+			if t < tmin {
 				t = tmin
-			} else if k >= bias+tmax {
+			} else if t > tmax {
 				t = tmax
 			}
 			if digit < t {
 				break
 			}
-			w, overflow = madd(0, w, base-t)
-			if overflow {
+			w *= base - t
+			if w >= math.MaxInt32/base {
 				return "", punyError(encoded)
 			}
 		}
-		if len(output) >= 1024 {
-			return "", punyError(encoded)
-		}
 		x := int32(len(output) + 1)
 		bias = adapt(i-oldI, x, oldI == 0)
 		n += i / x
 		i %= x
-		if n < 0 || n > utf8.MaxRune {
+		if n > utf8.MaxRune || len(output) >= 1024 {
 			return "", punyError(encoded)
 		}
 		output = append(output, 0)
@@ -119,7 +115,6 @@ func encode(prefix, s string) (string, error) {
 	if b > 0 {
 		output = append(output, '-')
 	}
-	overflow := false
 	for remaining != 0 {
 		m := int32(0x7fffffff)
 		for _, r := range s {
@@ -127,8 +122,8 @@ func encode(prefix, s string) (string, error) {
 				m = r
 			}
 		}
-		delta, overflow = madd(delta, m-n, h+1)
-		if overflow {
+		delta += (m - n) * (h + 1)
+		if delta < 0 {
 			return "", punyError(s)
 		}
 		n = m
@@ -146,9 +141,9 @@ func encode(prefix, s string) (string, error) {
 			q := delta
 			for k := base; ; k += base {
 				t := k - bias
-				if k <= bias {
+				if t < tmin {
 					t = tmin
-				} else if k >= bias+tmax {
+				} else if t > tmax {
 					t = tmax
 				}
 				if q < t {
@@ -169,15 +164,6 @@ func encode(prefix, s string) (string, error) {
 	return string(output), nil
 }
 
-// madd computes a + (b * c), detecting overflow.
-func madd(a, b, c int32) (next int32, overflow bool) {
-	p := int64(b) * int64(c)
-	if p > math.MaxInt32-int64(a) {
-		return 0, true
-	}
-	return a + int32(p), false
-}
-
 func decodeDigit(x byte) (digit int32, ok bool) {
 	switch {
 	case '0' <= x && x <= '9':
diff --git a/vendor/golang.org/x/net/idna/tables10.0.0.go b/vendor/golang.org/x/net/idna/tables10.0.0.go
index c6c2bf1..d1d62ef 100644
--- a/vendor/golang.org/x/net/idna/tables10.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables10.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.10 && !go1.13
+// +build go1.10,!go1.13
 
 package idna
 
diff --git a/vendor/golang.org/x/net/idna/tables11.0.0.go b/vendor/golang.org/x/net/idna/tables11.0.0.go
index 7678939..167efba 100644
--- a/vendor/golang.org/x/net/idna/tables11.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables11.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.13 && !go1.14
+// +build go1.13,!go1.14
 
 package idna
 
diff --git a/vendor/golang.org/x/net/idna/tables12.0.0.go b/vendor/golang.org/x/net/idna/tables12.0.0.go
index 0600cd2..ab40f7b 100644
--- a/vendor/golang.org/x/net/idna/tables12.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables12.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.14 && !go1.16
+// +build go1.14,!go1.16
 
 package idna
 
diff --git a/vendor/golang.org/x/net/idna/tables13.0.0.go b/vendor/golang.org/x/net/idna/tables13.0.0.go
index 2fb768e..390c5e5 100644
--- a/vendor/golang.org/x/net/idna/tables13.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables13.0.0.go
@@ -1,293 +1,151 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16 && !go1.21
+//go:build go1.16
+// +build go1.16
 
 package idna
 
 // UnicodeVersion is the Unicode version from which the tables in this package are derived.
 const UnicodeVersion = "13.0.0"
 
-var mappings string = "" + // Size: 6539 bytes
-	"  ̈a ̄23 � ̧1o1�41�23�4i̇l·ʼnsdžⱥⱦhjrwy ̆ ̇ ̊ ̨ ̃ ̋lẍ� ι; ̈�եւاٴوٴۇٴيٴक" +
-	"़ख़ग़ज़ड़ढ़फ़य़ড়ঢ়য়ਲ਼ਸ਼ਖ਼ਗ਼ਜ਼ਫ਼ଡ଼ଢ଼�า�າຫນຫມགྷཌྷདྷབྷཛྷཀྵཱཱིུྲྀྲཱྀླྀླཱ" +
-	"ཱྀྀྒྷྜྷྡྷྦྷྫྷ�ྵвдо�тъѣæbde�gikmnȣptu�ɑəɛɜŋɔɯvβγδφχ�нɒcɕðfɟɡɥɨɩɪ�ɭʟɱɰɲɳ" +
-	"ɴɵɸʂʃƫʉʊʋʌz�ʑʒθssάέήίό�ώἀι�ιἂιἃιἄιἅιἆιἇιἠιἡιἢιἣιἤιἥιἦιἧιὠιὡιὢιὣιὤιὥιὦιὧ" +
-	"ιὰιαιάιᾶιι ̈͂ὴιηιήιῆι ̓̀ ̓� ̓͂� ̔̀ ̔� ̔͂ΰ ̈̀`ὼιωιώιῶι′′′′′‵‵‵‵‵!!???!!?" +
-	"′′′′0456789+=()rsħnoqsmtmωå�בגדπ1�71�91�101�32�31�52�53�54�51�65�61�83" +
-	"�85�87�81�iiivviviiiixxi0�3∫∫∫∫∫∮∮∮∮∮1011121314151617181920(10)(11)(12" +
-	")(13)(14)(15)(16)(17)(18)(19)(20)∫∫∫∫==�̸ɫɽȿɀ. ゙ ゚よりコト(ᄀ)(ᄂ)(ᄃ)(ᄅ)(ᄆ)(ᄇ)" +
-	"(ᄉ)(ᄋ)(ᄌ)(ᄎ)(�)(�)(ᄑ)(ᄒ)(가)(나)(다)(�)(마)(바)(사)(아)(�)(차)(카)(타)(파)(하)(주)(오전" +
-	")(오후)(一)(二)(三)(四)(五)(六)(七)(八)(�)(�)(月)(�)(水)(木)(金)(土)(日)(株)(有)(社)(�)(特)(" +
-	"財)(�)(労)(代)(呼)(学)(監)(�)(資)(�)(祭)(休)(自)(至)21222324252627282930313233343" +
-	"5참고주�3637383940414243444546474849501月2月3月4月5月6月7月8月9月10月11月12月hgev令和アパート" +
-	"アルファアンペアアールイニングイン�ウォンエスクードエーカーオンスオームカイリカラットカロリーガロンガンマギガギニーキュリーギルダーキロキロ" +
-	"グラムキロメートルキロワットグラムグラムトンクルゼイロクロー�ケースコルナコー�サイクルサン�ームシリングセン�セントダースデシドルトンナノ" +
-	"ノット�イツパーセントパーツ�ーレルピアストルピクルピコビルファラッドフィートブッシェルフランヘクタールペソペニヒヘルツペンスページベータ�" +
-	"イントボルトホン�ンドホールホーンマイクロマイルマッ�マルクマンションミクロンミリミリ�ールメガメガトンメートルヤードヤールユアンリットルリ" +
-	"ラルピールーブルレムレントゲンワット0点1点2点3点4点5点6点7点8点9点10点11点12点13点14点15点16点17点18点19点20" +
-	"点21点22点23点24点daauovpcdmiu平�昭和大正明治株�会社panamakakbmbgbkcalpfnfmgkghzmldlk" +
-	"lfmnmmmcmkmm2m3m∕sm∕s2rad∕srad∕s2psnsmspvnvmvkvpwnwmwkwbqcccdc∕kgdbgyhah" +
-	"pinkkktlmlnlxphprsrsvwbv∕ma∕m1日2日3日4日5日6日7日8日9日10日11日12日13日14日15日16日17日1" +
-	"8日19日20日21日22日23日24日25日26日27日28日29日30日31日ьɦɬʞʇœ�𤋮𢡊𢡄�𥉉�𧻓fffiflstմնմեմիվնմ" +
-	"խיִײַעהכל�רתש�שׂשּ�שּׂ�ַ�ָ�ּבּגּדּהּוּזּטּיּךּכּלּמּנּסּףּפּצּקּרּשּתּו" +
-	"ֹבֿכֿפֿ�לٱٻپڀٺٿٹڤڦڄڃچڇ�ڌڎڈژڑکگڳڱںڻۀ�ھےۓڭۇۆۈۋۅۉ�ىئائەئوئۇئۆئۈئ�ئىیئجئحئم" +
-	"ئيبجبحبخبمبىبيتجتحتختمتىتيثجثمثىثيجحجمحجحمخجخحخمسجسحسخسمصحصمضجضحضخضمطحط" +
-	"مظمعجعمغجغم�ج�ح�خ�م�ى�يقحقمقىقيكاكجكحكخكلكمكىكيلجلحلخلملىليمجمحمخمممىمي" +
-	"نجنحنخنمنىنيهجهمهىهييجيحيخيميىييذٰرٰىٰ ٌّ �ّ َّ �ّ �ّ ّٰئرئزئنبربزبنترت" +
-	"زتنثرثزثنمانرنزننيريزينئخئهبهتهصخلهنههٰيهثهسهشمشهـَّـ�ّـ�ّطىطيعىعيغىغيس" +
-	"ىسيشىشيحىحيجىجيخىخيصىصيضىضيشجشحشخشرسرصرضراًتجمتحجتحمتخمتمجتمحتمخجمححميح" +
-	"مىسحجسجحسجىسمحسمجسممصححصممشحمشجيشمخشممضحىضخمطمحطممطميعجمعممعمىغممغميغمى" +
-	"�خمقمحقمملحملحيلحىلججلخملمحمحجمحممحيمجحمجممخجمخممجخهمجهممنحمنحىنجمنجىنم" +
-	"ينمىيممبخيتجيتجىتخيتخىتميتمىجميجحىجمىسخىصحيشحيضحيلجيلمييحييجييميمميقمين" +
-	"حيعميكمينجحمخيلجمكممجحيحجيمجي�ميبحيسخينجيصلےقلےاللهاكبرمحمدصلعمرسولعليه" +
-	"وسلمصلىصلى الله عليه وسلمجل جلالهریال,:!?_{}[]#&*-<>\\$%@ـًـَـ�ـ�ـّـْءآ" +
-	"أؤإئابةتثجحخدذرزسشصضطظعغ�قكلمنهويلآلألإلا\x22'/^|~¢£¬¦¥����������������" +
-	"�������������������ıȷαεζηκλμνξοστυψ∇∂�ٮڡٯ0,1,2,3,4,5,6,7,8,9,(a)(b)(c" +
-	")(d)(e)(f)(g)(h)(i)(j)(k)(l)(m)(n)(o)(p)(q)(r)(s)(t)(u)(v)(w)(x)(y)(z)〔s" +
-	"〕wzhvsdppvwcmcmdmrdj��ココサ手字�デ二多解天交映無料�後�新�終生販声�演投�一三�左中�指走打�空�満有月申割営�〔" +
-	"本〕〔三〕〔二〕〔安〕〔点〕〔打〕〔盗〕〔�〕〔敗〕得�丽丸�你侮侻倂�備僧�㒞�兔兤具㒹內冗冤仌冬况凵刃㓟刻剆剷㔕勇勉勤勺包匆北�����" +
-	"�������咞�呈周咢哶�啓啣善喙喫喳嗂圖嘆圗噑噴切壮城埴�型堲報墬売壷夆夢奢姬娛娧姘婦㛮嬈嬾寃寘寧寳寿将尢�屠屮峀�嵃嵮嵫嵼巡巢㠯巽帨帽" +
-	"幩㡢㡼庰庳庶廊廾�弢㣇形彫㣣徚�志忹�㤺㤜悔惇慈慌慎慺憎憲憤憯懞懲懶�戛�抱拔�挽拼�掃���掩㨮摩摾�摷㩬�敬旣書晉㬙暑㬈㫤冒冕最暜肭�朗" +
-	"望朡��㭉柺枅桒梅梎栟椔�楂榣槪檨櫛㰘次歔㱎歲殟殺殻汎沿�汧洖派海�浩浸涅洴港湮㴳滋滇淹潮濆瀹瀞瀛㶖���炭煅熜爨爵�犀犕�王㺬玥㺸瑇瑜瑱璅" +
-	"瓊㼛甤甾異�㿼䀈直眞真�䀹瞋�䂖硎碌磌䃣祖�秫䄯穀穊�䈂篆築䈧糒䊠糨糣紀絣�緇縂繅䌴�罺羕翺者���育脃�脾媵舄辞䑫芑芋�劳花芳芽苦若��莭" +
-	"茣莽�著����䔫蓱蓳蔖蕤�䕡䕫�虜虧虩蚩蚈蜎蛢�蜨�螆蟡�䗹衠衣裗裞䘵裺㒻䚾䛇誠諭變豕貫�贛起跋趼跰軔輸邔郱鄑鄛鈸鋗鋘鉼��開䦕閷䧦雃嶲霣" +
-	"䩮䩶韠䪲頋頩飢䬳餩馧駂駾䯎鬒鱀鳽䳎䳭鵧䳸麻䵖黹黾鼅�鼖鼻"
-
-var mappingIndex = []uint16{ // 1650 elements
-	// Entry 0 - 3F
-	0x0000, 0x0000, 0x0001, 0x0004, 0x0005, 0x0008, 0x0009, 0x000a,
-	0x000d, 0x0010, 0x0011, 0x0012, 0x0017, 0x001c, 0x0021, 0x0024,
-	0x0027, 0x002a, 0x002b, 0x002e, 0x0031, 0x0034, 0x0035, 0x0036,
-	0x0037, 0x0038, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048,
-	0x004b, 0x004c, 0x004d, 0x0051, 0x0054, 0x0055, 0x005a, 0x005e,
-	0x0062, 0x0066, 0x006a, 0x006e, 0x0074, 0x007a, 0x0080, 0x0086,
-	0x008c, 0x0092, 0x0098, 0x009e, 0x00a4, 0x00aa, 0x00b0, 0x00b6,
-	0x00bc, 0x00c2, 0x00c8, 0x00ce, 0x00d4, 0x00da, 0x00e0, 0x00e6,
-	// Entry 40 - 7F
-	0x00ec, 0x00f2, 0x00f8, 0x00fe, 0x0104, 0x010a, 0x0110, 0x0116,
-	0x011c, 0x0122, 0x0128, 0x012e, 0x0137, 0x013d, 0x0146, 0x014c,
-	0x0152, 0x0158, 0x015e, 0x0164, 0x016a, 0x0170, 0x0172, 0x0174,
-	0x0176, 0x0178, 0x017a, 0x017c, 0x017e, 0x0180, 0x0181, 0x0182,
-	0x0183, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018c,
-	0x018d, 0x018e, 0x018f, 0x0191, 0x0193, 0x0195, 0x0197, 0x0199,
-	0x019b, 0x019d, 0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a8,
-	0x01aa, 0x01ac, 0x01ae, 0x01b0, 0x01b1, 0x01b3, 0x01b5, 0x01b6,
-	// Entry 80 - BF
-	0x01b8, 0x01ba, 0x01bc, 0x01be, 0x01c0, 0x01c2, 0x01c4, 0x01c6,
-	0x01c8, 0x01ca, 0x01cc, 0x01ce, 0x01d0, 0x01d2, 0x01d4, 0x01d6,
-	0x01d8, 0x01da, 0x01dc, 0x01de, 0x01e0, 0x01e2, 0x01e4, 0x01e5,
-	0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01ef, 0x01f1, 0x01f3, 0x01f5,
-	0x01f7, 0x01f9, 0x01fb, 0x01fd, 0x0202, 0x0207, 0x020c, 0x0211,
-	0x0216, 0x021b, 0x0220, 0x0225, 0x022a, 0x022f, 0x0234, 0x0239,
-	0x023e, 0x0243, 0x0248, 0x024d, 0x0252, 0x0257, 0x025c, 0x0261,
-	0x0266, 0x026b, 0x0270, 0x0275, 0x027a, 0x027e, 0x0282, 0x0287,
-	// Entry C0 - FF
-	0x0289, 0x028e, 0x0293, 0x0297, 0x029b, 0x02a0, 0x02a5, 0x02aa,
-	0x02af, 0x02b1, 0x02b6, 0x02bb, 0x02c0, 0x02c2, 0x02c7, 0x02c8,
-	0x02cd, 0x02d1, 0x02d5, 0x02da, 0x02e0, 0x02e9, 0x02ef, 0x02f8,
-	0x02fa, 0x02fc, 0x02fe, 0x0300, 0x030c, 0x030d, 0x030e, 0x030f,
-	0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
-	0x0319, 0x031b, 0x031d, 0x031e, 0x0320, 0x0322, 0x0324, 0x0326,
-	0x0328, 0x032a, 0x032c, 0x032e, 0x0330, 0x0335, 0x033a, 0x0340,
-	0x0345, 0x034a, 0x034f, 0x0354, 0x0359, 0x035e, 0x0363, 0x0368,
-	// Entry 100 - 13F
-	0x036d, 0x0372, 0x0377, 0x037c, 0x0380, 0x0382, 0x0384, 0x0386,
-	0x038a, 0x038c, 0x038e, 0x0393, 0x0399, 0x03a2, 0x03a8, 0x03b1,
-	0x03b3, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x03c1,
-	0x03c3, 0x03c5, 0x03c7, 0x03cb, 0x03cf, 0x03d3, 0x03d7, 0x03db,
-	0x03df, 0x03e3, 0x03e7, 0x03eb, 0x03ef, 0x03f3, 0x03ff, 0x0401,
-	0x0406, 0x0408, 0x040a, 0x040c, 0x040e, 0x040f, 0x0413, 0x0417,
-	0x041d, 0x0423, 0x0428, 0x042d, 0x0432, 0x0437, 0x043c, 0x0441,
-	0x0446, 0x044b, 0x0450, 0x0455, 0x045a, 0x045f, 0x0464, 0x0469,
-	// Entry 140 - 17F
-	0x046e, 0x0473, 0x0478, 0x047d, 0x0482, 0x0487, 0x048c, 0x0491,
-	0x0496, 0x049b, 0x04a0, 0x04a5, 0x04aa, 0x04af, 0x04b4, 0x04bc,
-	0x04c4, 0x04c9, 0x04ce, 0x04d3, 0x04d8, 0x04dd, 0x04e2, 0x04e7,
-	0x04ec, 0x04f1, 0x04f6, 0x04fb, 0x0500, 0x0505, 0x050a, 0x050f,
-	0x0514, 0x0519, 0x051e, 0x0523, 0x0528, 0x052d, 0x0532, 0x0537,
-	0x053c, 0x0541, 0x0546, 0x054b, 0x0550, 0x0555, 0x055a, 0x055f,
-	0x0564, 0x0569, 0x056e, 0x0573, 0x0578, 0x057a, 0x057c, 0x057e,
-	0x0580, 0x0582, 0x0584, 0x0586, 0x0588, 0x058a, 0x058c, 0x058e,
-	// Entry 180 - 1BF
-	0x0590, 0x0592, 0x0594, 0x0596, 0x059c, 0x05a2, 0x05a4, 0x05a6,
-	0x05a8, 0x05aa, 0x05ac, 0x05ae, 0x05b0, 0x05b2, 0x05b4, 0x05b6,
-	0x05b8, 0x05ba, 0x05bc, 0x05be, 0x05c0, 0x05c4, 0x05c8, 0x05cc,
-	0x05d0, 0x05d4, 0x05d8, 0x05dc, 0x05e0, 0x05e4, 0x05e9, 0x05ee,
-	0x05f3, 0x05f5, 0x05f7, 0x05fd, 0x0609, 0x0615, 0x0621, 0x062a,
-	0x0636, 0x063f, 0x0648, 0x0657, 0x0663, 0x066c, 0x0675, 0x067e,
-	0x068a, 0x0696, 0x069f, 0x06a8, 0x06ae, 0x06b7, 0x06c3, 0x06cf,
-	0x06d5, 0x06e4, 0x06f6, 0x0705, 0x070e, 0x071d, 0x072c, 0x0738,
-	// Entry 1C0 - 1FF
-	0x0741, 0x074a, 0x0753, 0x075f, 0x076e, 0x077a, 0x0783, 0x078c,
-	0x0795, 0x079b, 0x07a1, 0x07a7, 0x07ad, 0x07b6, 0x07bf, 0x07ce,
-	0x07d7, 0x07e3, 0x07f2, 0x07fb, 0x0801, 0x0807, 0x0816, 0x0822,
-	0x0831, 0x083a, 0x0849, 0x084f, 0x0858, 0x0861, 0x086a, 0x0873,
-	0x087c, 0x0888, 0x0891, 0x0897, 0x08a0, 0x08a9, 0x08b2, 0x08be,
-	0x08c7, 0x08d0, 0x08d9, 0x08e8, 0x08f4, 0x08fa, 0x0909, 0x090f,
-	0x091b, 0x0927, 0x0930, 0x0939, 0x0942, 0x094e, 0x0954, 0x095d,
-	0x0969, 0x096f, 0x097e, 0x0987, 0x098b, 0x098f, 0x0993, 0x0997,
-	// Entry 200 - 23F
-	0x099b, 0x099f, 0x09a3, 0x09a7, 0x09ab, 0x09af, 0x09b4, 0x09b9,
-	0x09be, 0x09c3, 0x09c8, 0x09cd, 0x09d2, 0x09d7, 0x09dc, 0x09e1,
-	0x09e6, 0x09eb, 0x09f0, 0x09f5, 0x09fa, 0x09fc, 0x09fe, 0x0a00,
-	0x0a02, 0x0a04, 0x0a06, 0x0a0c, 0x0a12, 0x0a18, 0x0a1e, 0x0a2a,
-	0x0a2c, 0x0a2e, 0x0a30, 0x0a32, 0x0a34, 0x0a36, 0x0a38, 0x0a3c,
-	0x0a3e, 0x0a40, 0x0a42, 0x0a44, 0x0a46, 0x0a48, 0x0a4a, 0x0a4c,
-	0x0a4e, 0x0a50, 0x0a52, 0x0a54, 0x0a56, 0x0a58, 0x0a5a, 0x0a5f,
-	0x0a65, 0x0a6c, 0x0a74, 0x0a76, 0x0a78, 0x0a7a, 0x0a7c, 0x0a7e,
-	// Entry 240 - 27F
-	0x0a80, 0x0a82, 0x0a84, 0x0a86, 0x0a88, 0x0a8a, 0x0a8c, 0x0a8e,
-	0x0a90, 0x0a96, 0x0a98, 0x0a9a, 0x0a9c, 0x0a9e, 0x0aa0, 0x0aa2,
-	0x0aa4, 0x0aa6, 0x0aa8, 0x0aaa, 0x0aac, 0x0aae, 0x0ab0, 0x0ab2,
-	0x0ab4, 0x0ab9, 0x0abe, 0x0ac2, 0x0ac6, 0x0aca, 0x0ace, 0x0ad2,
-	0x0ad6, 0x0ada, 0x0ade, 0x0ae2, 0x0ae7, 0x0aec, 0x0af1, 0x0af6,
-	0x0afb, 0x0b00, 0x0b05, 0x0b0a, 0x0b0f, 0x0b14, 0x0b19, 0x0b1e,
-	0x0b23, 0x0b28, 0x0b2d, 0x0b32, 0x0b37, 0x0b3c, 0x0b41, 0x0b46,
-	0x0b4b, 0x0b50, 0x0b52, 0x0b54, 0x0b56, 0x0b58, 0x0b5a, 0x0b5c,
-	// Entry 280 - 2BF
-	0x0b5e, 0x0b62, 0x0b66, 0x0b6a, 0x0b6e, 0x0b72, 0x0b76, 0x0b7a,
-	0x0b7c, 0x0b7e, 0x0b80, 0x0b82, 0x0b86, 0x0b8a, 0x0b8e, 0x0b92,
-	0x0b96, 0x0b9a, 0x0b9e, 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba6, 0x0ba8,
-	0x0baa, 0x0bac, 0x0bb0, 0x0bb4, 0x0bba, 0x0bc0, 0x0bc4, 0x0bc8,
-	0x0bcc, 0x0bd0, 0x0bd4, 0x0bd8, 0x0bdc, 0x0be0, 0x0be4, 0x0be8,
-	0x0bec, 0x0bf0, 0x0bf4, 0x0bf8, 0x0bfc, 0x0c00, 0x0c04, 0x0c08,
-	0x0c0c, 0x0c10, 0x0c14, 0x0c18, 0x0c1c, 0x0c20, 0x0c24, 0x0c28,
-	0x0c2c, 0x0c30, 0x0c34, 0x0c36, 0x0c38, 0x0c3a, 0x0c3c, 0x0c3e,
-	// Entry 2C0 - 2FF
-	0x0c40, 0x0c42, 0x0c44, 0x0c46, 0x0c48, 0x0c4a, 0x0c4c, 0x0c4e,
-	0x0c50, 0x0c52, 0x0c54, 0x0c56, 0x0c58, 0x0c5a, 0x0c5c, 0x0c5e,
-	0x0c60, 0x0c62, 0x0c64, 0x0c66, 0x0c68, 0x0c6a, 0x0c6c, 0x0c6e,
-	0x0c70, 0x0c72, 0x0c74, 0x0c76, 0x0c78, 0x0c7a, 0x0c7c, 0x0c7e,
-	0x0c80, 0x0c82, 0x0c86, 0x0c8a, 0x0c8e, 0x0c92, 0x0c96, 0x0c9a,
-	0x0c9e, 0x0ca2, 0x0ca4, 0x0ca8, 0x0cac, 0x0cb0, 0x0cb4, 0x0cb8,
-	0x0cbc, 0x0cc0, 0x0cc4, 0x0cc8, 0x0ccc, 0x0cd0, 0x0cd4, 0x0cd8,
-	0x0cdc, 0x0ce0, 0x0ce4, 0x0ce8, 0x0cec, 0x0cf0, 0x0cf4, 0x0cf8,
-	// Entry 300 - 33F
-	0x0cfc, 0x0d00, 0x0d04, 0x0d08, 0x0d0c, 0x0d10, 0x0d14, 0x0d18,
-	0x0d1c, 0x0d20, 0x0d24, 0x0d28, 0x0d2c, 0x0d30, 0x0d34, 0x0d38,
-	0x0d3c, 0x0d40, 0x0d44, 0x0d48, 0x0d4c, 0x0d50, 0x0d54, 0x0d58,
-	0x0d5c, 0x0d60, 0x0d64, 0x0d68, 0x0d6c, 0x0d70, 0x0d74, 0x0d78,
-	0x0d7c, 0x0d80, 0x0d84, 0x0d88, 0x0d8c, 0x0d90, 0x0d94, 0x0d98,
-	0x0d9c, 0x0da0, 0x0da4, 0x0da8, 0x0dac, 0x0db0, 0x0db4, 0x0db8,
-	0x0dbc, 0x0dc0, 0x0dc4, 0x0dc8, 0x0dcc, 0x0dd0, 0x0dd4, 0x0dd8,
-	0x0ddc, 0x0de0, 0x0de4, 0x0de8, 0x0dec, 0x0df0, 0x0df4, 0x0df8,
-	// Entry 340 - 37F
-	0x0dfc, 0x0e00, 0x0e04, 0x0e08, 0x0e0c, 0x0e10, 0x0e14, 0x0e18,
-	0x0e1d, 0x0e22, 0x0e27, 0x0e2c, 0x0e31, 0x0e36, 0x0e3a, 0x0e3e,
-	0x0e42, 0x0e46, 0x0e4a, 0x0e4e, 0x0e52, 0x0e56, 0x0e5a, 0x0e5e,
-	0x0e62, 0x0e66, 0x0e6a, 0x0e6e, 0x0e72, 0x0e76, 0x0e7a, 0x0e7e,
-	0x0e82, 0x0e86, 0x0e8a, 0x0e8e, 0x0e92, 0x0e96, 0x0e9a, 0x0e9e,
-	0x0ea2, 0x0ea6, 0x0eaa, 0x0eae, 0x0eb2, 0x0eb6, 0x0ebc, 0x0ec2,
-	0x0ec8, 0x0ecc, 0x0ed0, 0x0ed4, 0x0ed8, 0x0edc, 0x0ee0, 0x0ee4,
-	0x0ee8, 0x0eec, 0x0ef0, 0x0ef4, 0x0ef8, 0x0efc, 0x0f00, 0x0f04,
-	// Entry 380 - 3BF
-	0x0f08, 0x0f0c, 0x0f10, 0x0f14, 0x0f18, 0x0f1c, 0x0f20, 0x0f24,
-	0x0f28, 0x0f2c, 0x0f30, 0x0f34, 0x0f38, 0x0f3e, 0x0f44, 0x0f4a,
-	0x0f50, 0x0f56, 0x0f5c, 0x0f62, 0x0f68, 0x0f6e, 0x0f74, 0x0f7a,
-	0x0f80, 0x0f86, 0x0f8c, 0x0f92, 0x0f98, 0x0f9e, 0x0fa4, 0x0faa,
-	0x0fb0, 0x0fb6, 0x0fbc, 0x0fc2, 0x0fc8, 0x0fce, 0x0fd4, 0x0fda,
-	0x0fe0, 0x0fe6, 0x0fec, 0x0ff2, 0x0ff8, 0x0ffe, 0x1004, 0x100a,
-	0x1010, 0x1016, 0x101c, 0x1022, 0x1028, 0x102e, 0x1034, 0x103a,
-	0x1040, 0x1046, 0x104c, 0x1052, 0x1058, 0x105e, 0x1064, 0x106a,
-	// Entry 3C0 - 3FF
-	0x1070, 0x1076, 0x107c, 0x1082, 0x1088, 0x108e, 0x1094, 0x109a,
-	0x10a0, 0x10a6, 0x10ac, 0x10b2, 0x10b8, 0x10be, 0x10c4, 0x10ca,
-	0x10d0, 0x10d6, 0x10dc, 0x10e2, 0x10e8, 0x10ee, 0x10f4, 0x10fa,
-	0x1100, 0x1106, 0x110c, 0x1112, 0x1118, 0x111e, 0x1124, 0x112a,
-	0x1130, 0x1136, 0x113c, 0x1142, 0x1148, 0x114e, 0x1154, 0x115a,
-	0x1160, 0x1166, 0x116c, 0x1172, 0x1178, 0x1180, 0x1188, 0x1190,
-	0x1198, 0x11a0, 0x11a8, 0x11b0, 0x11b6, 0x11d7, 0x11e6, 0x11ee,
-	0x11ef, 0x11f0, 0x11f1, 0x11f2, 0x11f3, 0x11f4, 0x11f5, 0x11f6,
-	// Entry 400 - 43F
-	0x11f7, 0x11f8, 0x11f9, 0x11fa, 0x11fb, 0x11fc, 0x11fd, 0x11fe,
-	0x11ff, 0x1200, 0x1201, 0x1205, 0x1209, 0x120d, 0x1211, 0x1215,
-	0x1219, 0x121b, 0x121d, 0x121f, 0x1221, 0x1223, 0x1225, 0x1227,
-	0x1229, 0x122b, 0x122d, 0x122f, 0x1231, 0x1233, 0x1235, 0x1237,
-	0x1239, 0x123b, 0x123d, 0x123f, 0x1241, 0x1243, 0x1245, 0x1247,
-	0x1249, 0x124b, 0x124d, 0x124f, 0x1251, 0x1253, 0x1255, 0x1257,
-	0x1259, 0x125b, 0x125d, 0x125f, 0x1263, 0x1267, 0x126b, 0x126f,
-	0x1270, 0x1271, 0x1272, 0x1273, 0x1274, 0x1275, 0x1277, 0x1279,
-	// Entry 440 - 47F
-	0x127b, 0x127d, 0x127f, 0x1287, 0x128f, 0x129b, 0x12a7, 0x12b3,
-	0x12bf, 0x12cb, 0x12d3, 0x12db, 0x12e7, 0x12f3, 0x12ff, 0x130b,
-	0x130d, 0x130f, 0x1311, 0x1313, 0x1315, 0x1317, 0x1319, 0x131b,
-	0x131d, 0x131f, 0x1321, 0x1323, 0x1325, 0x1327, 0x1329, 0x132b,
-	0x132e, 0x1331, 0x1333, 0x1335, 0x1337, 0x1339, 0x133b, 0x133d,
-	0x133f, 0x1341, 0x1343, 0x1345, 0x1347, 0x1349, 0x134b, 0x134d,
-	0x1350, 0x1353, 0x1356, 0x1359, 0x135c, 0x135f, 0x1362, 0x1365,
-	0x1368, 0x136b, 0x136e, 0x1371, 0x1374, 0x1377, 0x137a, 0x137d,
-	// Entry 480 - 4BF
-	0x1380, 0x1383, 0x1386, 0x1389, 0x138c, 0x138f, 0x1392, 0x1395,
-	0x1398, 0x139b, 0x13a2, 0x13a4, 0x13a6, 0x13a8, 0x13ab, 0x13ad,
-	0x13af, 0x13b1, 0x13b3, 0x13b5, 0x13bb, 0x13c1, 0x13c4, 0x13c7,
-	0x13ca, 0x13cd, 0x13d0, 0x13d3, 0x13d6, 0x13d9, 0x13dc, 0x13df,
-	0x13e2, 0x13e5, 0x13e8, 0x13eb, 0x13ee, 0x13f1, 0x13f4, 0x13f7,
-	0x13fa, 0x13fd, 0x1400, 0x1403, 0x1406, 0x1409, 0x140c, 0x140f,
-	0x1412, 0x1415, 0x1418, 0x141b, 0x141e, 0x1421, 0x1424, 0x1427,
-	0x142a, 0x142d, 0x1430, 0x1433, 0x1436, 0x1439, 0x143c, 0x143f,
-	// Entry 4C0 - 4FF
-	0x1442, 0x1445, 0x1448, 0x1451, 0x145a, 0x1463, 0x146c, 0x1475,
-	0x147e, 0x1487, 0x1490, 0x1499, 0x149c, 0x149f, 0x14a2, 0x14a5,
-	0x14a8, 0x14ab, 0x14ae, 0x14b1, 0x14b4, 0x14b7, 0x14ba, 0x14bd,
-	0x14c0, 0x14c3, 0x14c6, 0x14c9, 0x14cc, 0x14cf, 0x14d2, 0x14d5,
-	0x14d8, 0x14db, 0x14de, 0x14e1, 0x14e4, 0x14e7, 0x14ea, 0x14ed,
-	0x14f0, 0x14f3, 0x14f6, 0x14f9, 0x14fc, 0x14ff, 0x1502, 0x1505,
-	0x1508, 0x150b, 0x150e, 0x1511, 0x1514, 0x1517, 0x151a, 0x151d,
-	0x1520, 0x1523, 0x1526, 0x1529, 0x152c, 0x152f, 0x1532, 0x1535,
-	// Entry 500 - 53F
-	0x1538, 0x153b, 0x153e, 0x1541, 0x1544, 0x1547, 0x154a, 0x154d,
-	0x1550, 0x1553, 0x1556, 0x1559, 0x155c, 0x155f, 0x1562, 0x1565,
-	0x1568, 0x156b, 0x156e, 0x1571, 0x1574, 0x1577, 0x157a, 0x157d,
-	0x1580, 0x1583, 0x1586, 0x1589, 0x158c, 0x158f, 0x1592, 0x1595,
-	0x1598, 0x159b, 0x159e, 0x15a1, 0x15a4, 0x15a7, 0x15aa, 0x15ad,
-	0x15b0, 0x15b3, 0x15b6, 0x15b9, 0x15bc, 0x15bf, 0x15c2, 0x15c5,
-	0x15c8, 0x15cb, 0x15ce, 0x15d1, 0x15d4, 0x15d7, 0x15da, 0x15dd,
-	0x15e0, 0x15e3, 0x15e6, 0x15e9, 0x15ec, 0x15ef, 0x15f2, 0x15f5,
-	// Entry 540 - 57F
-	0x15f8, 0x15fb, 0x15fe, 0x1601, 0x1604, 0x1607, 0x160a, 0x160d,
-	0x1610, 0x1613, 0x1616, 0x1619, 0x161c, 0x161f, 0x1622, 0x1625,
-	0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1637, 0x163a, 0x163d,
-	0x1640, 0x1643, 0x1646, 0x1649, 0x164c, 0x164f, 0x1652, 0x1655,
-	0x1658, 0x165b, 0x165e, 0x1661, 0x1664, 0x1667, 0x166a, 0x166d,
-	0x1670, 0x1673, 0x1676, 0x1679, 0x167c, 0x167f, 0x1682, 0x1685,
-	0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1697, 0x169a, 0x169d,
-	0x16a0, 0x16a3, 0x16a6, 0x16a9, 0x16ac, 0x16af, 0x16b2, 0x16b5,
-	// Entry 580 - 5BF
-	0x16b8, 0x16bb, 0x16be, 0x16c1, 0x16c4, 0x16c7, 0x16ca, 0x16cd,
-	0x16d0, 0x16d3, 0x16d6, 0x16d9, 0x16dc, 0x16df, 0x16e2, 0x16e5,
-	0x16e8, 0x16eb, 0x16ee, 0x16f1, 0x16f4, 0x16f7, 0x16fa, 0x16fd,
-	0x1700, 0x1703, 0x1706, 0x1709, 0x170c, 0x170f, 0x1712, 0x1715,
-	0x1718, 0x171b, 0x171e, 0x1721, 0x1724, 0x1727, 0x172a, 0x172d,
-	0x1730, 0x1733, 0x1736, 0x1739, 0x173c, 0x173f, 0x1742, 0x1745,
-	0x1748, 0x174b, 0x174e, 0x1751, 0x1754, 0x1757, 0x175a, 0x175d,
-	0x1760, 0x1763, 0x1766, 0x1769, 0x176c, 0x176f, 0x1772, 0x1775,
-	// Entry 5C0 - 5FF
-	0x1778, 0x177b, 0x177e, 0x1781, 0x1784, 0x1787, 0x178a, 0x178d,
-	0x1790, 0x1793, 0x1796, 0x1799, 0x179c, 0x179f, 0x17a2, 0x17a5,
-	0x17a8, 0x17ab, 0x17ae, 0x17b1, 0x17b4, 0x17b7, 0x17ba, 0x17bd,
-	0x17c0, 0x17c3, 0x17c6, 0x17c9, 0x17cc, 0x17cf, 0x17d2, 0x17d5,
-	0x17d8, 0x17db, 0x17de, 0x17e1, 0x17e4, 0x17e7, 0x17ea, 0x17ed,
-	0x17f0, 0x17f3, 0x17f6, 0x17f9, 0x17fc, 0x17ff, 0x1802, 0x1805,
-	0x1808, 0x180b, 0x180e, 0x1811, 0x1814, 0x1817, 0x181a, 0x181d,
-	0x1820, 0x1823, 0x1826, 0x1829, 0x182c, 0x182f, 0x1832, 0x1835,
-	// Entry 600 - 63F
-	0x1838, 0x183b, 0x183e, 0x1841, 0x1844, 0x1847, 0x184a, 0x184d,
-	0x1850, 0x1853, 0x1856, 0x1859, 0x185c, 0x185f, 0x1862, 0x1865,
-	0x1868, 0x186b, 0x186e, 0x1871, 0x1874, 0x1877, 0x187a, 0x187d,
-	0x1880, 0x1883, 0x1886, 0x1889, 0x188c, 0x188f, 0x1892, 0x1895,
-	0x1898, 0x189b, 0x189e, 0x18a1, 0x18a4, 0x18a7, 0x18aa, 0x18ad,
-	0x18b0, 0x18b3, 0x18b6, 0x18b9, 0x18bc, 0x18bf, 0x18c2, 0x18c5,
-	0x18c8, 0x18cb, 0x18ce, 0x18d1, 0x18d4, 0x18d7, 0x18da, 0x18dd,
-	0x18e0, 0x18e3, 0x18e6, 0x18e9, 0x18ec, 0x18ef, 0x18f2, 0x18f5,
-	// Entry 640 - 67F
-	0x18f8, 0x18fb, 0x18fe, 0x1901, 0x1904, 0x1907, 0x190a, 0x190d,
-	0x1910, 0x1913, 0x1916, 0x1919, 0x191c, 0x191f, 0x1922, 0x1925,
-	0x1928, 0x192b, 0x192e, 0x1931, 0x1934, 0x1937, 0x193a, 0x193d,
-	0x1940, 0x1943, 0x1946, 0x1949, 0x194c, 0x194f, 0x1952, 0x1955,
-	0x1958, 0x195b, 0x195e, 0x1961, 0x1964, 0x1967, 0x196a, 0x196d,
-	0x1970, 0x1973, 0x1976, 0x1979, 0x197c, 0x197f, 0x1982, 0x1985,
-	0x1988, 0x198b,
-} // Size: 3324 bytes
+var mappings string = "" + // Size: 8188 bytes
+	"\x00\x01 \x03 ̈\x01a\x03 ̄\x012\x013\x03 �\x03 ̧\x011\x01o\x051�4\x051�2" +
+	"\x053�4\x03i̇\x03l·\x03ʼn\x01s\x03dž\x03ⱥ\x03ⱦ\x01h\x01j\x01r\x01w\x01y" +
+	"\x03 ̆\x03 ̇\x03 ̊\x03 ̨\x03 ̃\x03 ̋\x01l\x01x\x04̈�\x03 ι\x01;\x05 ̈�" +
+	"\x04եւ\x04اٴ\x04وٴ\x04ۇٴ\x04يٴ\x06क़\x06ख़\x06ग़\x06ज़\x06ड़\x06ढ़\x06फ़" +
+	"\x06य़\x06ড়\x06ঢ়\x06য়\x06ਲ਼\x06ਸ਼\x06ਖ਼\x06ਗ਼\x06ਜ਼\x06ਫ਼\x06ଡ଼\x06ଢ଼" +
+	"\x06�า\x06�າ\x06ຫນ\x06ຫມ\x06གྷ\x06ཌྷ\x06དྷ\x06བྷ\x06ཛྷ\x06ཀྵ\x06ཱི\x06ཱུ" +
+	"\x06ྲྀ\x09ྲཱྀ\x06ླྀ\x09ླཱྀ\x06ཱྀ\x06ྒྷ\x06ྜྷ\x06ྡྷ\x06ྦྷ\x06ྫྷ\x06�ྵ\x02" +
+	"в\x02д\x02о\x02�\x02т\x02ъ\x02ѣ\x02æ\x01b\x01d\x01e\x02�\x01g\x01i\x01k" +
+	"\x01m\x01n\x02ȣ\x01p\x01t\x01u\x02�\x02ɑ\x02ə\x02ɛ\x02ɜ\x02ŋ\x02ɔ\x02ɯ" +
+	"\x01v\x02β\x02γ\x02δ\x02φ\x02χ\x02�\x02н\x02ɒ\x01c\x02ɕ\x02ð\x01f\x02ɟ" +
+	"\x02ɡ\x02ɥ\x02ɨ\x02ɩ\x02ɪ\x02�\x02ɭ\x02ʟ\x02ɱ\x02ɰ\x02ɲ\x02ɳ\x02ɴ\x02ɵ" +
+	"\x02ɸ\x02ʂ\x02ʃ\x02ƫ\x02ʉ\x02ʊ\x02ʋ\x02ʌ\x01z\x02�\x02ʑ\x02ʒ\x02θ\x02ss" +
+	"\x02ά\x02έ\x02ή\x02ί\x02ό\x02�\x02ώ\x05ἀι\x05�ι\x05ἂι\x05ἃι\x05ἄι\x05ἅι" +
+	"\x05ἆι\x05ἇι\x05ἠι\x05ἡι\x05ἢι\x05ἣι\x05ἤι\x05ἥι\x05ἦι\x05ἧι\x05ὠι\x05ὡι" +
+	"\x05ὢι\x05ὣι\x05ὤι\x05ὥι\x05ὦι\x05ὧι\x05ὰι\x04αι\x04άι\x05ᾶι\x02ι\x05 ̈͂" +
+	"\x05ὴι\x04ηι\x04ήι\x05ῆι\x05 ̓̀\x05 ̓�\x05 ̓͂\x02�\x05 ̔̀\x05 ̔�\x05 ̔͂" +
+	"\x02ΰ\x05 ̈̀\x01`\x05ὼι\x04ωι\x04ώι\x05ῶι\x06′′\x09′′′\x06‵‵\x09‵‵‵\x02!" +
+	"!\x02??\x02?!\x02!?\x0c′′′′\x010\x014\x015\x016\x017\x018\x019\x01+\x01=" +
+	"\x01(\x01)\x02rs\x02ħ\x02no\x01q\x02sm\x02tm\x02ω\x02å\x02�\x02ב\x02ג" +
+	"\x02ד\x02π\x051�7\x051�9\x061�10\x051�3\x052�3\x051�5\x052�5\x053�5\x054" +
+	"�5\x051�6\x055�6\x051�8\x053�8\x055�8\x057�8\x041�\x02ii\x02iv\x02vi" +
+	"\x04viii\x02ix\x02xi\x050�3\x06∫∫\x09∫∫∫\x06∮∮\x09∮∮∮\x0210\x0211\x0212" +
+	"\x0213\x0214\x0215\x0216\x0217\x0218\x0219\x0220\x04(10)\x04(11)\x04(12)" +
+	"\x04(13)\x04(14)\x04(15)\x04(16)\x04(17)\x04(18)\x04(19)\x04(20)\x0c∫∫∫∫" +
+	"\x02==\x05�̸\x02ɫ\x02ɽ\x02ȿ\x02ɀ\x01.\x04 ゙\x04 ゚\x06より\x06コト\x05(ᄀ)\x05" +
+	"(ᄂ)\x05(ᄃ)\x05(ᄅ)\x05(ᄆ)\x05(ᄇ)\x05(ᄉ)\x05(ᄋ)\x05(ᄌ)\x05(ᄎ)\x05(�)\x05(�" +
+	")\x05(ᄑ)\x05(ᄒ)\x05(가)\x05(나)\x05(다)\x05(�)\x05(마)\x05(바)\x05(사)\x05(아)" +
+	"\x05(�)\x05(차)\x05(카)\x05(타)\x05(파)\x05(하)\x05(주)\x08(오전)\x08(오후)\x05(一)" +
+	"\x05(二)\x05(三)\x05(四)\x05(五)\x05(六)\x05(七)\x05(八)\x05(�)\x05(�)\x05(月)" +
+	"\x05(�)\x05(水)\x05(木)\x05(金)\x05(土)\x05(日)\x05(株)\x05(有)\x05(社)\x05(�)" +
+	"\x05(特)\x05(財)\x05(�)\x05(労)\x05(代)\x05(呼)\x05(学)\x05(監)\x05(�)\x05(資)" +
+	"\x05(�)\x05(祭)\x05(休)\x05(自)\x05(至)\x0221\x0222\x0223\x0224\x0225\x0226" +
+	"\x0227\x0228\x0229\x0230\x0231\x0232\x0233\x0234\x0235\x06참고\x06주�\x0236" +
+	"\x0237\x0238\x0239\x0240\x0241\x0242\x0243\x0244\x0245\x0246\x0247\x0248" +
+	"\x0249\x0250\x041月\x042月\x043月\x044月\x045月\x046月\x047月\x048月\x049月\x0510" +
+	"月\x0511月\x0512月\x02hg\x02ev\x06令和\x0cアパート\x0cアルファ\x0cアンペア\x09アール\x0cイニ" +
+	"ング\x09イン�\x09ウォン\x0fエスクード\x0cエーカー\x09オンス\x09オーム\x09カイリ\x0cカラット\x0cカロリー" +
+	"\x09ガロン\x09ガンマ\x06ギガ\x09ギニー\x0cキュリー\x0cギルダー\x06キロ\x0fキログラム\x12キロメートル\x0f" +
+	"キロワット\x09グラム\x0fグラムトン\x0fクルゼイロ\x0cクロー�\x09ケース\x09コルナ\x09コー�\x0cサイクル" +
+	"\x0fサン�ーム\x0cシリング\x09セン�\x09セント\x09ダース\x06デシ\x06ドル\x06トン\x06ナノ\x09ノット" +
+	"\x09�イツ\x0fパーセント\x09パーツ\x0c�ーレル\x0fピアストル\x09ピクル\x06ピコ\x06ビル\x0fファラッド\x0c" +
+	"フィート\x0fブッシェル\x09フラン\x0fヘクタール\x06ペソ\x09ペニヒ\x09ヘルツ\x09ペンス\x09ページ\x09ベータ" +
+	"\x0c�イント\x09ボルト\x06ホン\x09�ンド\x09ホール\x09ホーン\x0cマイクロ\x09マイル\x09マッ�\x09マルク" +
+	"\x0fマンション\x0cミクロン\x06ミリ\x0fミリ�ール\x06メガ\x0cメガトン\x0cメートル\x09ヤード\x09ヤール\x09" +
+	"ユアン\x0cリットル\x06リラ\x09ルピー\x0cルーブル\x06レム\x0fレントゲン\x09ワット\x040点\x041点\x04" +
+	"2点\x043点\x044点\x045点\x046点\x047点\x048点\x049点\x0510点\x0511点\x0512点\x0513点" +
+	"\x0514点\x0515点\x0516点\x0517点\x0518点\x0519点\x0520点\x0521点\x0522点\x0523点" +
+	"\x0524点\x02da\x02au\x02ov\x02pc\x02dm\x02iu\x06平�\x06昭和\x06大正\x06明治\x0c株" +
+	"�会社\x02pa\x02na\x02ma\x02ka\x02kb\x02mb\x02gb\x04kcal\x02pf\x02nf\x02m" +
+	"g\x02kg\x02hz\x02ml\x02dl\x02kl\x02fm\x02nm\x02mm\x02cm\x02km\x02m2\x02m" +
+	"3\x05m∕s\x06m∕s2\x07rad∕s\x08rad∕s2\x02ps\x02ns\x02ms\x02pv\x02nv\x02mv" +
+	"\x02kv\x02pw\x02nw\x02mw\x02kw\x02bq\x02cc\x02cd\x06c∕kg\x02db\x02gy\x02" +
+	"ha\x02hp\x02in\x02kk\x02kt\x02lm\x02ln\x02lx\x02ph\x02pr\x02sr\x02sv\x02" +
+	"wb\x05v∕m\x05a∕m\x041日\x042日\x043日\x044日\x045日\x046日\x047日\x048日\x049日" +
+	"\x0510æ—¥\x0511æ—¥\x0512æ—¥\x0513æ—¥\x0514æ—¥\x0515æ—¥\x0516æ—¥\x0517æ—¥\x0518æ—¥\x0519æ—¥" +
+	"\x0520æ—¥\x0521æ—¥\x0522æ—¥\x0523æ—¥\x0524æ—¥\x0525æ—¥\x0526æ—¥\x0527æ—¥\x0528æ—¥\x0529æ—¥" +
+	"\x0530日\x0531日\x02ь\x02ɦ\x02ɬ\x02ʞ\x02ʇ\x02œ\x02�\x04𤋮\x04𢡊\x04𢡄\x04�" +
+	"\x04𥉉\x04�\x04𧻓\x02ff\x02fi\x02fl\x02st\x04մն\x04մե\x04մի\x04վն\x04մխ" +
+	"\x04יִ\x04ײַ\x02ע\x02ה\x02כ\x02ל\x02�\x02ר\x02ת\x04ש�\x04שׂ\x06שּ�\x06שּ" +
+	"ׂ\x04�ַ\x04�ָ\x04�ּ\x04בּ\x04גּ\x04דּ\x04הּ\x04וּ\x04זּ\x04טּ\x04יּ\x04" +
+	"ךּ\x04כּ\x04לּ\x04מּ\x04נּ\x04סּ\x04ףּ\x04פּ\x04צּ\x04קּ\x04רּ\x04שּ" +
+	"\x04תּ\x04וֹ\x04בֿ\x04כֿ\x04פֿ\x04�ל\x02ٱ\x02ٻ\x02پ\x02ڀ\x02ٺ\x02ٿ\x02ٹ" +
+	"\x02ڤ\x02ڦ\x02ڄ\x02ڃ\x02چ\x02ڇ\x02�\x02ڌ\x02ڎ\x02ڈ\x02ژ\x02ڑ\x02ک\x02گ" +
+	"\x02Ú³\x02Ú±\x02Úº\x02Ú»\x02Û€\x02Û�\x02Ú¾\x02Û’\x02Û“\x02Ú­\x02Û‡\x02Û†\x02Ûˆ\x02Û‹" +
+	"\x02ۅ\x02ۉ\x02�\x02ى\x04ئا\x04ئە\x04ئو\x04ئۇ\x04ئۆ\x04ئۈ\x04ئ�\x04ئى\x02" +
+	"ی\x04ئج\x04ئح\x04ئم\x04ئي\x04بج\x04بح\x04بخ\x04بم\x04بى\x04بي\x04تج\x04" +
+	"تح\x04تخ\x04تم\x04تى\x04تي\x04ثج\x04ثم\x04ثى\x04ثي\x04جح\x04جم\x04حج" +
+	"\x04حم\x04خج\x04خح\x04خم\x04سج\x04سح\x04سخ\x04سم\x04صح\x04صم\x04ضج\x04ضح" +
+	"\x04ضخ\x04ضم\x04طح\x04طم\x04ظم\x04عج\x04عم\x04غج\x04غم\x04�ج\x04�ح\x04�خ" +
+	"\x04�م\x04�ى\x04�ي\x04قح\x04قم\x04قى\x04قي\x04كا\x04كج\x04كح\x04كخ\x04كل" +
+	"\x04كم\x04كى\x04كي\x04لج\x04لح\x04لخ\x04لم\x04لى\x04لي\x04مج\x04مح\x04مخ" +
+	"\x04مم\x04مى\x04مي\x04نج\x04نح\x04نخ\x04نم\x04نى\x04ني\x04هج\x04هم\x04هى" +
+	"\x04هي\x04يج\x04يح\x04يخ\x04يم\x04يى\x04يي\x04ذٰ\x04رٰ\x04ىٰ\x05 ٌّ\x05 " +
+	"�ّ\x05 َّ\x05 �ّ\x05 �ّ\x05 ّٰ\x04ئر\x04ئز\x04ئن\x04بر\x04بز\x04بن\x04ت" +
+	"ر\x04تز\x04تن\x04ثر\x04ثز\x04ثن\x04ما\x04نر\x04نز\x04نن\x04ير\x04يز\x04" +
+	"ين\x04ئخ\x04ئه\x04به\x04ته\x04صخ\x04له\x04نه\x04هٰ\x04يه\x04ثه\x04سه" +
+	"\x04شم\x04شه\x06ـَّ\x06ـ�ّ\x06ـ�ّ\x04طى\x04طي\x04عى\x04عي\x04غى\x04غي" +
+	"\x04سى\x04سي\x04شى\x04شي\x04حى\x04حي\x04جى\x04جي\x04خى\x04خي\x04صى\x04صي" +
+	"\x04ضى\x04ضي\x04شج\x04شح\x04شخ\x04شر\x04سر\x04صر\x04ضر\x04اً\x06تجم\x06ت" +
+	"حج\x06تحم\x06تخم\x06تمج\x06تمح\x06تمخ\x06جمح\x06حمي\x06حمى\x06سحج\x06سج" +
+	"ح\x06سجى\x06سمح\x06سمج\x06سمم\x06صحح\x06صمم\x06شحم\x06شجي\x06شمخ\x06شمم" +
+	"\x06ضحى\x06ضخم\x06طمح\x06طمم\x06طمي\x06عجم\x06عمم\x06عمى\x06غمم\x06غمي" +
+	"\x06غمى\x06�خم\x06قمح\x06قمم\x06لحم\x06لحي\x06لحى\x06لجج\x06لخم\x06لمح" +
+	"\x06محج\x06محم\x06محي\x06مجح\x06مجم\x06مخج\x06مخم\x06مجخ\x06همج\x06همم" +
+	"\x06نحم\x06نحى\x06نجم\x06نجى\x06نمي\x06نمى\x06يمم\x06بخي\x06تجي\x06تجى" +
+	"\x06تخي\x06تخى\x06تمي\x06تمى\x06جمي\x06جحى\x06جمى\x06سخى\x06صحي\x06شحي" +
+	"\x06ضحي\x06لجي\x06لمي\x06يحي\x06يجي\x06يمي\x06ممي\x06قمي\x06نحي\x06عمي" +
+	"\x06كمي\x06نجح\x06مخي\x06لجم\x06كمم\x06جحي\x06حجي\x06مجي\x06�مي\x06بحي" +
+	"\x06سخي\x06نجي\x06صلے\x06قلے\x08الله\x08اكبر\x08محمد\x08صلعم\x08رسول\x08" +
+	"عليه\x08وسلم\x06صلى!صلى الله عليه وسلم\x0fجل جلاله\x08ریال\x01,\x01:" +
+	"\x01!\x01?\x01_\x01{\x01}\x01[\x01]\x01#\x01&\x01*\x01-\x01<\x01>\x01\\" +
+	"\x01$\x01%\x01@\x04ـً\x04ـَ\x04ـ�\x04ـ�\x04ـّ\x04ـْ\x02ء\x02آ\x02أ\x02ؤ" +
+	"\x02إ\x02ئ\x02ا\x02ب\x02ة\x02ت\x02ث\x02ج\x02ح\x02خ\x02د\x02ذ\x02ر\x02ز" +
+	"\x02س\x02ش\x02ص\x02ض\x02ط\x02ظ\x02ع\x02غ\x02�\x02ق\x02ك\x02ل\x02م\x02ن" +
+	"\x02ه\x02و\x02ي\x04لآ\x04لأ\x04لإ\x04لا\x01\x22\x01'\x01/\x01^\x01|\x01~" +
+	"\x02¢\x02£\x02¬\x02¦\x02¥\x08��\x08��\x0c���\x0c���\x0c���\x0c���\x0c���" +
+	"\x08��\x08��\x0c���\x0c���\x0c���\x0c���\x02ı\x02ȷ\x02α\x02ε\x02ζ\x02η" +
+	"\x02κ\x02λ\x02μ\x02ν\x02ξ\x02ο\x02σ\x02τ\x02υ\x02ψ\x03∇\x03∂\x02�\x02ٮ" +
+	"\x02Ú¡\x02Ù¯\x020,\x021,\x022,\x023,\x024,\x025,\x026,\x027,\x028,\x029," +
+	"\x03(a)\x03(b)\x03(c)\x03(d)\x03(e)\x03(f)\x03(g)\x03(h)\x03(i)\x03(j)" +
+	"\x03(k)\x03(l)\x03(m)\x03(n)\x03(o)\x03(p)\x03(q)\x03(r)\x03(s)\x03(t)" +
+	"\x03(u)\x03(v)\x03(w)\x03(x)\x03(y)\x03(z)\x07〔s〕\x02wz\x02hv\x02sd\x03p" +
+	"pv\x02wc\x02mc\x02md\x02mr\x02dj\x06��\x06ココ\x03サ\x03手\x03字\x03�\x03デ" +
+	"\x03二\x03多\x03解\x03天\x03交\x03映\x03無\x03料\x03�\x03後\x03�\x03新\x03�\x03終" +
+	"\x03生\x03販\x03声\x03�\x03演\x03投\x03�\x03一\x03三\x03�\x03左\x03中\x03�\x03指" +
+	"\x03走\x03打\x03�\x03空\x03�\x03満\x03有\x03月\x03申\x03割\x03営\x03�\x09〔本〕\x09〔" +
+	"三〕\x09〔二〕\x09〔安〕\x09〔点〕\x09〔打〕\x09〔盗〕\x09〔�〕\x09〔敗〕\x03得\x03�\x03丽\x03" +
+	"丸\x03�\x03你\x03侮\x03侻\x03倂\x03�\x03備\x03僧\x03�\x03㒞\x03�\x03兔\x03兤\x03" +
+	"具\x03㒹\x03內\x03冗\x03冤\x03仌\x03冬\x03况\x03凵\x03刃\x03㓟\x03刻\x03剆\x03剷\x03" +
+	"㔕\x03勇\x03勉\x03勤\x03勺\x03包\x03匆\x03北\x03�\x03�\x03�\x03�\x03�\x03�\x03" +
+	"�\x03�\x03�\x03�\x03�\x03�\x03咞\x03�\x03呈\x03周\x03咢\x03哶\x03�\x03啓\x03" +
+	"啣\x03善\x03喙\x03喫\x03喳\x03嗂\x03圖\x03嘆\x03圗\x03噑\x03噴\x03切\x03壮\x03城\x03" +
+	"埴\x03�\x03型\x03堲\x03報\x03墬\x03売\x03壷\x03夆\x03夢\x03奢\x03姬\x03娛\x03娧\x03" +
+	"姘\x03婦\x03㛮\x03嬈\x03嬾\x03寃\x03寘\x03寧\x03寳\x03寿\x03将\x03尢\x03�\x03屠\x03" +
+	"屮\x03峀\x03�\x03嵃\x03嵮\x03嵫\x03嵼\x03巡\x03巢\x03㠯\x03巽\x03帨\x03帽\x03幩\x03" +
+	"㡢\x03㡼\x03庰\x03庳\x03庶\x03廊\x03廾\x03�\x03弢\x03㣇\x03形\x03彫\x03㣣\x03徚\x03" +
+	"�\x03志\x03忹\x03�\x03㤺\x03㤜\x03悔\x03惇\x03慈\x03慌\x03慎\x03慺\x03憎\x03憲\x03" +
+	"憤\x03憯\x03懞\x03懲\x03懶\x03�\x03戛\x03�\x03抱\x03拔\x03�\x03挽\x03拼\x03�\x03" +
+	"掃\x03�\x03�\x03�\x03掩\x03㨮\x03摩\x03摾\x03�\x03摷\x03㩬\x03�\x03敬\x03旣\x03" +
+	"書\x03晉\x03㬙\x03暑\x03㬈\x03㫤\x03冒\x03冕\x03最\x03暜\x03肭\x03�\x03朗\x03望\x03" +
+	"朡\x03�\x03�\x03㭉\x03柺\x03枅\x03桒\x03梅\x03梎\x03栟\x03椔\x03�\x03楂\x03榣\x03" +
+	"槪\x03檨\x03櫛\x03㰘\x03次\x03歔\x03㱎\x03歲\x03殟\x03殺\x03殻\x03汎\x03沿\x03�\x03" +
+	"汧\x03洖\x03派\x03海\x03�\x03浩\x03浸\x03涅\x03洴\x03港\x03湮\x03㴳\x03滋\x03滇\x03" +
+	"淹\x03潮\x03濆\x03瀹\x03瀞\x03瀛\x03㶖\x03�\x03�\x03�\x03炭\x03煅\x03熜\x03爨\x03" +
+	"爵\x03�\x03犀\x03犕\x03�\x03王\x03㺬\x03玥\x03㺸\x03瑇\x03瑜\x03瑱\x03璅\x03瓊\x03" +
+	"㼛\x03甤\x03甾\x03異\x03�\x03㿼\x03䀈\x03直\x03眞\x03真\x03�\x03䀹\x03瞋\x03�\x03" +
+	"䂖\x03硎\x03碌\x03磌\x03䃣\x03祖\x03�\x03秫\x03䄯\x03穀\x03穊\x03�\x03䈂\x03篆\x03" +
+	"築\x03䈧\x03糒\x03䊠\x03糨\x03糣\x03紀\x03絣\x03�\x03緇\x03縂\x03繅\x03䌴\x03�\x03" +
+	"罺\x03羕\x03翺\x03者\x03�\x03�\x03�\x03育\x03脃\x03�\x03脾\x03媵\x03舄\x03辞\x03" +
+	"䑫\x03芑\x03芋\x03�\x03劳\x03花\x03芳\x03芽\x03苦\x03若\x03�\x03�\x03莭\x03茣\x03" +
+	"莽\x03�\x03著\x03�\x03�\x03�\x03�\x03䔫\x03蓱\x03蓳\x03蔖\x03蕤\x03�\x03䕡\x03" +
+	"䕫\x03�\x03虜\x03虧\x03虩\x03蚩\x03蚈\x03蜎\x03蛢\x03�\x03蜨\x03�\x03螆\x03蟡\x03" +
+	"�\x03䗹\x03衠\x03衣\x03裗\x03裞\x03䘵\x03裺\x03㒻\x03䚾\x03䛇\x03誠\x03諭\x03變\x03" +
+	"豕\x03貫\x03�\x03贛\x03起\x03跋\x03趼\x03跰\x03軔\x03輸\x03邔\x03郱\x03鄑\x03鄛\x03" +
+	"鈸\x03鋗\x03鋘\x03鉼\x03�\x03�\x03開\x03䦕\x03閷\x03䧦\x03雃\x03嶲\x03霣\x03䩮\x03" +
+	"䩶\x03韠\x03䪲\x03頋\x03頩\x03飢\x03䬳\x03餩\x03馧\x03駂\x03駾\x03䯎\x03鬒\x03鱀\x03" +
+	"鳽\x03䳎\x03䳭\x03鵧\x03䳸\x03麻\x03䵖\x03黹\x03黾\x03鼅\x03�\x03鼖\x03鼻"
 
 var xorData string = "" + // Size: 4862 bytes
 	"\x02\x0c\x09\x02\xb0\xec\x02\xad\xd8\x02\xad\xd9\x02\x06\x07\x02\x0f\x12" +
@@ -689,7 +547,7 @@ func (t *idnaTrie) lookupStringUnsafe(s string) uint16 {
 	return 0
 }
 
-// idnaTrie. Total size: 30196 bytes (29.49 KiB). Checksum: e2ae95a945f04016.
+// idnaTrie. Total size: 30288 bytes (29.58 KiB). Checksum: c0cd84404a2f6f19.
 type idnaTrie struct{}
 
 func newIdnaTrie(i int) *idnaTrie {
@@ -742,11 +600,11 @@ var idnaValues = [8192]uint16{
 	0xd2: 0x0040, 0xd3: 0x0040, 0xd4: 0x0040, 0xd5: 0x0040, 0xd6: 0x0040, 0xd7: 0x0040,
 	0xd8: 0x0040, 0xd9: 0x0040, 0xda: 0x0040, 0xdb: 0x0040, 0xdc: 0x0040, 0xdd: 0x0040,
 	0xde: 0x0040, 0xdf: 0x0040, 0xe0: 0x000a, 0xe1: 0x0018, 0xe2: 0x0018, 0xe3: 0x0018,
-	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x0012, 0xe9: 0x0018,
-	0xea: 0x0019, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x0022,
-	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0029, 0xf3: 0x0031, 0xf4: 0x003a, 0xf5: 0x0005,
-	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x0042, 0xf9: 0x0049, 0xfa: 0x0051, 0xfb: 0x0018,
-	0xfc: 0x0059, 0xfd: 0x0061, 0xfe: 0x0069, 0xff: 0x0018,
+	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x001a, 0xe9: 0x0018,
+	0xea: 0x0039, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x004a,
+	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0069, 0xf3: 0x0079, 0xf4: 0x008a, 0xf5: 0x0005,
+	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x00aa, 0xf9: 0x00c9, 0xfa: 0x00d9, 0xfb: 0x0018,
+	0xfc: 0x00e9, 0xfd: 0x0119, 0xfe: 0x0149, 0xff: 0x0018,
 	// Block 0x4, offset 0x100
 	0x100: 0xe00d, 0x101: 0x0008, 0x102: 0xe00d, 0x103: 0x0008, 0x104: 0xe00d, 0x105: 0x0008,
 	0x106: 0xe00d, 0x107: 0x0008, 0x108: 0xe00d, 0x109: 0x0008, 0x10a: 0xe00d, 0x10b: 0x0008,
@@ -756,12 +614,12 @@ var idnaValues = [8192]uint16{
 	0x11e: 0xe00d, 0x11f: 0x0008, 0x120: 0xe00d, 0x121: 0x0008, 0x122: 0xe00d, 0x123: 0x0008,
 	0x124: 0xe00d, 0x125: 0x0008, 0x126: 0xe00d, 0x127: 0x0008, 0x128: 0xe00d, 0x129: 0x0008,
 	0x12a: 0xe00d, 0x12b: 0x0008, 0x12c: 0xe00d, 0x12d: 0x0008, 0x12e: 0xe00d, 0x12f: 0x0008,
-	0x130: 0x0071, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
+	0x130: 0x0179, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
 	0x136: 0xe00d, 0x137: 0x0008, 0x138: 0x0008, 0x139: 0xe01d, 0x13a: 0x0008, 0x13b: 0xe03d,
-	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0079,
+	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0199,
 	// Block 0x5, offset 0x140
-	0x140: 0x0079, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
-	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x0081, 0x14a: 0xe00d, 0x14b: 0x0008,
+	0x140: 0x0199, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
+	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x01b9, 0x14a: 0xe00d, 0x14b: 0x0008,
 	0x14c: 0xe00d, 0x14d: 0x0008, 0x14e: 0xe00d, 0x14f: 0x0008, 0x150: 0xe00d, 0x151: 0x0008,
 	0x152: 0xe00d, 0x153: 0x0008, 0x154: 0xe00d, 0x155: 0x0008, 0x156: 0xe00d, 0x157: 0x0008,
 	0x158: 0xe00d, 0x159: 0x0008, 0x15a: 0xe00d, 0x15b: 0x0008, 0x15c: 0xe00d, 0x15d: 0x0008,
@@ -770,7 +628,7 @@ var idnaValues = [8192]uint16{
 	0x16a: 0xe00d, 0x16b: 0x0008, 0x16c: 0xe00d, 0x16d: 0x0008, 0x16e: 0xe00d, 0x16f: 0x0008,
 	0x170: 0xe00d, 0x171: 0x0008, 0x172: 0xe00d, 0x173: 0x0008, 0x174: 0xe00d, 0x175: 0x0008,
 	0x176: 0xe00d, 0x177: 0x0008, 0x178: 0x0065, 0x179: 0xe01d, 0x17a: 0x0008, 0x17b: 0xe03d,
-	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x0089,
+	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x01d9,
 	// Block 0x6, offset 0x180
 	0x180: 0x0008, 0x181: 0x007d, 0x182: 0xe00d, 0x183: 0x0008, 0x184: 0xe00d, 0x185: 0x0008,
 	0x186: 0x007d, 0x187: 0xe07d, 0x188: 0x0008, 0x189: 0x0095, 0x18a: 0x00ad, 0x18b: 0xe03d,
@@ -784,8 +642,8 @@ var idnaValues = [8192]uint16{
 	0x1b6: 0x0008, 0x1b7: 0x01e5, 0x1b8: 0xe00d, 0x1b9: 0x0008, 0x1ba: 0x0008, 0x1bb: 0x0008,
 	0x1bc: 0xe00d, 0x1bd: 0x0008, 0x1be: 0x0008, 0x1bf: 0x0008,
 	// Block 0x7, offset 0x1c0
-	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x0091, 0x1c5: 0x0091,
-	0x1c6: 0x0091, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
+	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x01e9, 0x1c5: 0x01e9,
+	0x1c6: 0x01e9, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
 	0x1cc: 0x0275, 0x1cd: 0xe01d, 0x1ce: 0x0008, 0x1cf: 0xe0fd, 0x1d0: 0x0008, 0x1d1: 0xe01d,
 	0x1d2: 0x0008, 0x1d3: 0xe03d, 0x1d4: 0x0008, 0x1d5: 0xe01d, 0x1d6: 0x0008, 0x1d7: 0xe07d,
 	0x1d8: 0x0008, 0x1d9: 0xe01d, 0x1da: 0x0008, 0x1db: 0xe03d, 0x1dc: 0x0008, 0x1dd: 0x0008,
@@ -805,22 +663,22 @@ var idnaValues = [8192]uint16{
 	0x224: 0xe00d, 0x225: 0x0008, 0x226: 0xe00d, 0x227: 0x0008, 0x228: 0xe00d, 0x229: 0x0008,
 	0x22a: 0xe00d, 0x22b: 0x0008, 0x22c: 0xe00d, 0x22d: 0x0008, 0x22e: 0xe00d, 0x22f: 0x0008,
 	0x230: 0xe00d, 0x231: 0x0008, 0x232: 0xe00d, 0x233: 0x0008, 0x234: 0x0008, 0x235: 0x0008,
-	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0099, 0x23b: 0xe03d,
-	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x00a1, 0x23f: 0x0008,
+	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0209, 0x23b: 0xe03d,
+	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x0229, 0x23f: 0x0008,
 	// Block 0x9, offset 0x240
 	0x240: 0x0008, 0x241: 0x0008, 0x242: 0x0018, 0x243: 0x0018, 0x244: 0x0018, 0x245: 0x0018,
 	0x246: 0x0008, 0x247: 0x0008, 0x248: 0x0008, 0x249: 0x0008, 0x24a: 0x0008, 0x24b: 0x0008,
 	0x24c: 0x0008, 0x24d: 0x0008, 0x24e: 0x0008, 0x24f: 0x0008, 0x250: 0x0008, 0x251: 0x0008,
 	0x252: 0x0018, 0x253: 0x0018, 0x254: 0x0018, 0x255: 0x0018, 0x256: 0x0018, 0x257: 0x0018,
-	0x258: 0x00d2, 0x259: 0x00da, 0x25a: 0x00e2, 0x25b: 0x00ea, 0x25c: 0x00f2, 0x25d: 0x00fa,
-	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0101, 0x262: 0x0089, 0x263: 0x0109,
+	0x258: 0x029a, 0x259: 0x02ba, 0x25a: 0x02da, 0x25b: 0x02fa, 0x25c: 0x031a, 0x25d: 0x033a,
+	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0359, 0x262: 0x01d9, 0x263: 0x0369,
 	0x264: 0x03c5, 0x265: 0x0018, 0x266: 0x0018, 0x267: 0x0018, 0x268: 0x0018, 0x269: 0x0018,
 	0x26a: 0x0018, 0x26b: 0x0018, 0x26c: 0x0008, 0x26d: 0x0018, 0x26e: 0x0008, 0x26f: 0x0018,
 	0x270: 0x0018, 0x271: 0x0018, 0x272: 0x0018, 0x273: 0x0018, 0x274: 0x0018, 0x275: 0x0018,
 	0x276: 0x0018, 0x277: 0x0018, 0x278: 0x0018, 0x279: 0x0018, 0x27a: 0x0018, 0x27b: 0x0018,
 	0x27c: 0x0018, 0x27d: 0x0018, 0x27e: 0x0018, 0x27f: 0x0018,
 	// Block 0xa, offset 0x280
-	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0111, 0x285: 0x040d,
+	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0379, 0x285: 0x040d,
 	0x286: 0x3308, 0x287: 0x3308, 0x288: 0x3308, 0x289: 0x3308, 0x28a: 0x3308, 0x28b: 0x3308,
 	0x28c: 0x3308, 0x28d: 0x3308, 0x28e: 0x3308, 0x28f: 0x33c0, 0x290: 0x3308, 0x291: 0x3308,
 	0x292: 0x3308, 0x293: 0x3308, 0x294: 0x3308, 0x295: 0x3308, 0x296: 0x3308, 0x297: 0x3308,
@@ -829,10 +687,10 @@ var idnaValues = [8192]uint16{
 	0x2a4: 0x3308, 0x2a5: 0x3308, 0x2a6: 0x3308, 0x2a7: 0x3308, 0x2a8: 0x3308, 0x2a9: 0x3308,
 	0x2aa: 0x3308, 0x2ab: 0x3308, 0x2ac: 0x3308, 0x2ad: 0x3308, 0x2ae: 0x3308, 0x2af: 0x3308,
 	0x2b0: 0xe00d, 0x2b1: 0x0008, 0x2b2: 0xe00d, 0x2b3: 0x0008, 0x2b4: 0x0425, 0x2b5: 0x0008,
-	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x011a, 0x2bb: 0x0008,
-	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x0122, 0x2bf: 0x043d,
+	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x03a2, 0x2bb: 0x0008,
+	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x03c2, 0x2bf: 0x043d,
 	// Block 0xb, offset 0x2c0
-	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x003a, 0x2c5: 0x012a,
+	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x008a, 0x2c5: 0x03d2,
 	0x2c6: 0xe155, 0x2c7: 0x0455, 0x2c8: 0xe12d, 0x2c9: 0xe13d, 0x2ca: 0xe12d, 0x2cb: 0x0040,
 	0x2cc: 0x03dd, 0x2cd: 0x0040, 0x2ce: 0x046d, 0x2cf: 0x0485, 0x2d0: 0x0008, 0x2d1: 0xe105,
 	0x2d2: 0xe105, 0x2d3: 0xe105, 0x2d4: 0xe105, 0x2d5: 0xe105, 0x2d6: 0xe105, 0x2d7: 0xe105,
@@ -924,8 +782,8 @@ var idnaValues = [8192]uint16{
 	0x49e: 0x3308, 0x49f: 0x3308, 0x4a0: 0x0808, 0x4a1: 0x0808, 0x4a2: 0x0808, 0x4a3: 0x0808,
 	0x4a4: 0x0808, 0x4a5: 0x0808, 0x4a6: 0x0808, 0x4a7: 0x0808, 0x4a8: 0x0808, 0x4a9: 0x0808,
 	0x4aa: 0x0018, 0x4ab: 0x0818, 0x4ac: 0x0818, 0x4ad: 0x0818, 0x4ae: 0x0a08, 0x4af: 0x0a08,
-	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0139,
-	0x4b6: 0x0141, 0x4b7: 0x0149, 0x4b8: 0x0151, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
+	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0429,
+	0x4b6: 0x0451, 0x4b7: 0x0479, 0x4b8: 0x04a1, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
 	0x4bc: 0x0a08, 0x4bd: 0x0a08, 0x4be: 0x0a08, 0x4bf: 0x0a08,
 	// Block 0x13, offset 0x4c0
 	0x4c0: 0x0c08, 0x4c1: 0x0a08, 0x4c2: 0x0a08, 0x4c3: 0x0c08, 0x4c4: 0x0c08, 0x4c5: 0x0c08,
@@ -968,8 +826,8 @@ var idnaValues = [8192]uint16{
 	0x586: 0x3308, 0x587: 0x3308, 0x588: 0x3308, 0x589: 0x3008, 0x58a: 0x3008, 0x58b: 0x3008,
 	0x58c: 0x3008, 0x58d: 0x3b08, 0x58e: 0x3008, 0x58f: 0x3008, 0x590: 0x0008, 0x591: 0x3308,
 	0x592: 0x3308, 0x593: 0x3308, 0x594: 0x3308, 0x595: 0x3308, 0x596: 0x3308, 0x597: 0x3308,
-	0x598: 0x0159, 0x599: 0x0161, 0x59a: 0x0169, 0x59b: 0x0171, 0x59c: 0x0179, 0x59d: 0x0181,
-	0x59e: 0x0189, 0x59f: 0x0191, 0x5a0: 0x0008, 0x5a1: 0x0008, 0x5a2: 0x3308, 0x5a3: 0x3308,
+	0x598: 0x04c9, 0x599: 0x0501, 0x59a: 0x0539, 0x59b: 0x0571, 0x59c: 0x05a9, 0x59d: 0x05e1,
+	0x59e: 0x0619, 0x59f: 0x0651, 0x5a0: 0x0008, 0x5a1: 0x0008, 0x5a2: 0x3308, 0x5a3: 0x3308,
 	0x5a4: 0x0018, 0x5a5: 0x0018, 0x5a6: 0x0008, 0x5a7: 0x0008, 0x5a8: 0x0008, 0x5a9: 0x0008,
 	0x5aa: 0x0008, 0x5ab: 0x0008, 0x5ac: 0x0008, 0x5ad: 0x0008, 0x5ae: 0x0008, 0x5af: 0x0008,
 	0x5b0: 0x0018, 0x5b1: 0x0008, 0x5b2: 0x0008, 0x5b3: 0x0008, 0x5b4: 0x0008, 0x5b5: 0x0008,
@@ -992,8 +850,8 @@ var idnaValues = [8192]uint16{
 	0x606: 0x0040, 0x607: 0x3008, 0x608: 0x3008, 0x609: 0x0040, 0x60a: 0x0040, 0x60b: 0x3008,
 	0x60c: 0x3008, 0x60d: 0x3b08, 0x60e: 0x0008, 0x60f: 0x0040, 0x610: 0x0040, 0x611: 0x0040,
 	0x612: 0x0040, 0x613: 0x0040, 0x614: 0x0040, 0x615: 0x0040, 0x616: 0x0040, 0x617: 0x3008,
-	0x618: 0x0040, 0x619: 0x0040, 0x61a: 0x0040, 0x61b: 0x0040, 0x61c: 0x0199, 0x61d: 0x01a1,
-	0x61e: 0x0040, 0x61f: 0x01a9, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x3308, 0x623: 0x3308,
+	0x618: 0x0040, 0x619: 0x0040, 0x61a: 0x0040, 0x61b: 0x0040, 0x61c: 0x0689, 0x61d: 0x06c1,
+	0x61e: 0x0040, 0x61f: 0x06f9, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x3308, 0x623: 0x3308,
 	0x624: 0x0040, 0x625: 0x0040, 0x626: 0x0008, 0x627: 0x0008, 0x628: 0x0008, 0x629: 0x0008,
 	0x62a: 0x0008, 0x62b: 0x0008, 0x62c: 0x0008, 0x62d: 0x0008, 0x62e: 0x0008, 0x62f: 0x0008,
 	0x630: 0x0008, 0x631: 0x0008, 0x632: 0x0018, 0x633: 0x0018, 0x634: 0x0018, 0x635: 0x0018,
@@ -1008,16 +866,16 @@ var idnaValues = [8192]uint16{
 	0x65e: 0x0008, 0x65f: 0x0008, 0x660: 0x0008, 0x661: 0x0008, 0x662: 0x0008, 0x663: 0x0008,
 	0x664: 0x0008, 0x665: 0x0008, 0x666: 0x0008, 0x667: 0x0008, 0x668: 0x0008, 0x669: 0x0040,
 	0x66a: 0x0008, 0x66b: 0x0008, 0x66c: 0x0008, 0x66d: 0x0008, 0x66e: 0x0008, 0x66f: 0x0008,
-	0x670: 0x0008, 0x671: 0x0040, 0x672: 0x0008, 0x673: 0x01b1, 0x674: 0x0040, 0x675: 0x0008,
-	0x676: 0x01b9, 0x677: 0x0040, 0x678: 0x0008, 0x679: 0x0008, 0x67a: 0x0040, 0x67b: 0x0040,
+	0x670: 0x0008, 0x671: 0x0040, 0x672: 0x0008, 0x673: 0x0731, 0x674: 0x0040, 0x675: 0x0008,
+	0x676: 0x0769, 0x677: 0x0040, 0x678: 0x0008, 0x679: 0x0008, 0x67a: 0x0040, 0x67b: 0x0040,
 	0x67c: 0x3308, 0x67d: 0x0040, 0x67e: 0x3008, 0x67f: 0x3008,
 	// Block 0x1a, offset 0x680
 	0x680: 0x3008, 0x681: 0x3308, 0x682: 0x3308, 0x683: 0x0040, 0x684: 0x0040, 0x685: 0x0040,
 	0x686: 0x0040, 0x687: 0x3308, 0x688: 0x3308, 0x689: 0x0040, 0x68a: 0x0040, 0x68b: 0x3308,
 	0x68c: 0x3308, 0x68d: 0x3b08, 0x68e: 0x0040, 0x68f: 0x0040, 0x690: 0x0040, 0x691: 0x3308,
 	0x692: 0x0040, 0x693: 0x0040, 0x694: 0x0040, 0x695: 0x0040, 0x696: 0x0040, 0x697: 0x0040,
-	0x698: 0x0040, 0x699: 0x01c1, 0x69a: 0x01c9, 0x69b: 0x01d1, 0x69c: 0x0008, 0x69d: 0x0040,
-	0x69e: 0x01d9, 0x69f: 0x0040, 0x6a0: 0x0040, 0x6a1: 0x0040, 0x6a2: 0x0040, 0x6a3: 0x0040,
+	0x698: 0x0040, 0x699: 0x07a1, 0x69a: 0x07d9, 0x69b: 0x0811, 0x69c: 0x0008, 0x69d: 0x0040,
+	0x69e: 0x0849, 0x69f: 0x0040, 0x6a0: 0x0040, 0x6a1: 0x0040, 0x6a2: 0x0040, 0x6a3: 0x0040,
 	0x6a4: 0x0040, 0x6a5: 0x0040, 0x6a6: 0x0008, 0x6a7: 0x0008, 0x6a8: 0x0008, 0x6a9: 0x0008,
 	0x6aa: 0x0008, 0x6ab: 0x0008, 0x6ac: 0x0008, 0x6ad: 0x0008, 0x6ae: 0x0008, 0x6af: 0x0008,
 	0x6b0: 0x3308, 0x6b1: 0x3308, 0x6b2: 0x0008, 0x6b3: 0x0008, 0x6b4: 0x0008, 0x6b5: 0x3308,
@@ -1064,7 +922,7 @@ var idnaValues = [8192]uint16{
 	0x786: 0x0040, 0x787: 0x3008, 0x788: 0x3008, 0x789: 0x0040, 0x78a: 0x0040, 0x78b: 0x3008,
 	0x78c: 0x3008, 0x78d: 0x3b08, 0x78e: 0x0040, 0x78f: 0x0040, 0x790: 0x0040, 0x791: 0x0040,
 	0x792: 0x0040, 0x793: 0x0040, 0x794: 0x0040, 0x795: 0x3308, 0x796: 0x3308, 0x797: 0x3008,
-	0x798: 0x0040, 0x799: 0x0040, 0x79a: 0x0040, 0x79b: 0x0040, 0x79c: 0x01e1, 0x79d: 0x01e9,
+	0x798: 0x0040, 0x799: 0x0040, 0x79a: 0x0040, 0x79b: 0x0040, 0x79c: 0x0881, 0x79d: 0x08b9,
 	0x79e: 0x0040, 0x79f: 0x0008, 0x7a0: 0x0008, 0x7a1: 0x0008, 0x7a2: 0x3308, 0x7a3: 0x3308,
 	0x7a4: 0x0040, 0x7a5: 0x0040, 0x7a6: 0x0008, 0x7a7: 0x0008, 0x7a8: 0x0008, 0x7a9: 0x0008,
 	0x7aa: 0x0008, 0x7ab: 0x0008, 0x7ac: 0x0008, 0x7ad: 0x0008, 0x7ae: 0x0008, 0x7af: 0x0008,
@@ -1140,32 +998,32 @@ var idnaValues = [8192]uint16{
 	0x91e: 0x0008, 0x91f: 0x0008, 0x920: 0x0008, 0x921: 0x0008, 0x922: 0x0008, 0x923: 0x0008,
 	0x924: 0x0040, 0x925: 0x0008, 0x926: 0x0040, 0x927: 0x0008, 0x928: 0x0008, 0x929: 0x0008,
 	0x92a: 0x0008, 0x92b: 0x0008, 0x92c: 0x0008, 0x92d: 0x0008, 0x92e: 0x0008, 0x92f: 0x0008,
-	0x930: 0x0008, 0x931: 0x3308, 0x932: 0x0008, 0x933: 0x01f9, 0x934: 0x3308, 0x935: 0x3308,
+	0x930: 0x0008, 0x931: 0x3308, 0x932: 0x0008, 0x933: 0x0929, 0x934: 0x3308, 0x935: 0x3308,
 	0x936: 0x3308, 0x937: 0x3308, 0x938: 0x3308, 0x939: 0x3308, 0x93a: 0x3b08, 0x93b: 0x3308,
 	0x93c: 0x3308, 0x93d: 0x0008, 0x93e: 0x0040, 0x93f: 0x0040,
 	// Block 0x25, offset 0x940
-	0x940: 0x0008, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x0211, 0x944: 0x0008, 0x945: 0x0008,
+	0x940: 0x0008, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x09d1, 0x944: 0x0008, 0x945: 0x0008,
 	0x946: 0x0008, 0x947: 0x0008, 0x948: 0x0040, 0x949: 0x0008, 0x94a: 0x0008, 0x94b: 0x0008,
-	0x94c: 0x0008, 0x94d: 0x0219, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
-	0x952: 0x0221, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0229,
-	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0231, 0x95d: 0x0008,
+	0x94c: 0x0008, 0x94d: 0x0a09, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
+	0x952: 0x0a41, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0a79,
+	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0ab1, 0x95d: 0x0008,
 	0x95e: 0x0008, 0x95f: 0x0008, 0x960: 0x0008, 0x961: 0x0008, 0x962: 0x0008, 0x963: 0x0008,
-	0x964: 0x0008, 0x965: 0x0008, 0x966: 0x0008, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0239,
+	0x964: 0x0008, 0x965: 0x0008, 0x966: 0x0008, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0ae9,
 	0x96a: 0x0008, 0x96b: 0x0008, 0x96c: 0x0008, 0x96d: 0x0040, 0x96e: 0x0040, 0x96f: 0x0040,
-	0x970: 0x0040, 0x971: 0x3308, 0x972: 0x3308, 0x973: 0x0241, 0x974: 0x3308, 0x975: 0x0249,
-	0x976: 0x0251, 0x977: 0x0259, 0x978: 0x0261, 0x979: 0x0269, 0x97a: 0x3308, 0x97b: 0x3308,
+	0x970: 0x0040, 0x971: 0x3308, 0x972: 0x3308, 0x973: 0x0b21, 0x974: 0x3308, 0x975: 0x0b59,
+	0x976: 0x0b91, 0x977: 0x0bc9, 0x978: 0x0c19, 0x979: 0x0c51, 0x97a: 0x3308, 0x97b: 0x3308,
 	0x97c: 0x3308, 0x97d: 0x3308, 0x97e: 0x3308, 0x97f: 0x3008,
 	// Block 0x26, offset 0x980
-	0x980: 0x3308, 0x981: 0x0271, 0x982: 0x3308, 0x983: 0x3308, 0x984: 0x3b08, 0x985: 0x0018,
+	0x980: 0x3308, 0x981: 0x0ca1, 0x982: 0x3308, 0x983: 0x3308, 0x984: 0x3b08, 0x985: 0x0018,
 	0x986: 0x3308, 0x987: 0x3308, 0x988: 0x0008, 0x989: 0x0008, 0x98a: 0x0008, 0x98b: 0x0008,
 	0x98c: 0x0008, 0x98d: 0x3308, 0x98e: 0x3308, 0x98f: 0x3308, 0x990: 0x3308, 0x991: 0x3308,
-	0x992: 0x3308, 0x993: 0x0279, 0x994: 0x3308, 0x995: 0x3308, 0x996: 0x3308, 0x997: 0x3308,
-	0x998: 0x0040, 0x999: 0x3308, 0x99a: 0x3308, 0x99b: 0x3308, 0x99c: 0x3308, 0x99d: 0x0281,
-	0x99e: 0x3308, 0x99f: 0x3308, 0x9a0: 0x3308, 0x9a1: 0x3308, 0x9a2: 0x0289, 0x9a3: 0x3308,
-	0x9a4: 0x3308, 0x9a5: 0x3308, 0x9a6: 0x3308, 0x9a7: 0x0291, 0x9a8: 0x3308, 0x9a9: 0x3308,
-	0x9aa: 0x3308, 0x9ab: 0x3308, 0x9ac: 0x0299, 0x9ad: 0x3308, 0x9ae: 0x3308, 0x9af: 0x3308,
+	0x992: 0x3308, 0x993: 0x0cd9, 0x994: 0x3308, 0x995: 0x3308, 0x996: 0x3308, 0x997: 0x3308,
+	0x998: 0x0040, 0x999: 0x3308, 0x99a: 0x3308, 0x99b: 0x3308, 0x99c: 0x3308, 0x99d: 0x0d11,
+	0x99e: 0x3308, 0x99f: 0x3308, 0x9a0: 0x3308, 0x9a1: 0x3308, 0x9a2: 0x0d49, 0x9a3: 0x3308,
+	0x9a4: 0x3308, 0x9a5: 0x3308, 0x9a6: 0x3308, 0x9a7: 0x0d81, 0x9a8: 0x3308, 0x9a9: 0x3308,
+	0x9aa: 0x3308, 0x9ab: 0x3308, 0x9ac: 0x0db9, 0x9ad: 0x3308, 0x9ae: 0x3308, 0x9af: 0x3308,
 	0x9b0: 0x3308, 0x9b1: 0x3308, 0x9b2: 0x3308, 0x9b3: 0x3308, 0x9b4: 0x3308, 0x9b5: 0x3308,
-	0x9b6: 0x3308, 0x9b7: 0x3308, 0x9b8: 0x3308, 0x9b9: 0x02a1, 0x9ba: 0x3308, 0x9bb: 0x3308,
+	0x9b6: 0x3308, 0x9b7: 0x3308, 0x9b8: 0x3308, 0x9b9: 0x0df1, 0x9ba: 0x3308, 0x9bb: 0x3308,
 	0x9bc: 0x3308, 0x9bd: 0x0040, 0x9be: 0x0018, 0x9bf: 0x0018,
 	// Block 0x27, offset 0x9c0
 	0x9c0: 0x0008, 0x9c1: 0x0008, 0x9c2: 0x0008, 0x9c3: 0x0008, 0x9c4: 0x0008, 0x9c5: 0x0008,
@@ -1175,34 +1033,34 @@ var idnaValues = [8192]uint16{
 	0x9d8: 0x0008, 0x9d9: 0x0008, 0x9da: 0x0008, 0x9db: 0x0008, 0x9dc: 0x0008, 0x9dd: 0x0008,
 	0x9de: 0x0008, 0x9df: 0x0008, 0x9e0: 0x0008, 0x9e1: 0x0008, 0x9e2: 0x0008, 0x9e3: 0x0008,
 	0x9e4: 0x0008, 0x9e5: 0x0008, 0x9e6: 0x0008, 0x9e7: 0x0008, 0x9e8: 0x0008, 0x9e9: 0x0008,
-	0x9ea: 0x0008, 0x9eb: 0x0008, 0x9ec: 0x0019, 0x9ed: 0x02e1, 0x9ee: 0x02e9, 0x9ef: 0x0008,
-	0x9f0: 0x02f1, 0x9f1: 0x02f9, 0x9f2: 0x0301, 0x9f3: 0x0309, 0x9f4: 0x00a9, 0x9f5: 0x0311,
-	0x9f6: 0x00b1, 0x9f7: 0x0319, 0x9f8: 0x0101, 0x9f9: 0x0321, 0x9fa: 0x0329, 0x9fb: 0x0008,
-	0x9fc: 0x0051, 0x9fd: 0x0331, 0x9fe: 0x0339, 0x9ff: 0x00b9,
+	0x9ea: 0x0008, 0x9eb: 0x0008, 0x9ec: 0x0039, 0x9ed: 0x0ed1, 0x9ee: 0x0ee9, 0x9ef: 0x0008,
+	0x9f0: 0x0ef9, 0x9f1: 0x0f09, 0x9f2: 0x0f19, 0x9f3: 0x0f31, 0x9f4: 0x0249, 0x9f5: 0x0f41,
+	0x9f6: 0x0259, 0x9f7: 0x0f51, 0x9f8: 0x0359, 0x9f9: 0x0f61, 0x9fa: 0x0f71, 0x9fb: 0x0008,
+	0x9fc: 0x00d9, 0x9fd: 0x0f81, 0x9fe: 0x0f99, 0x9ff: 0x0269,
 	// Block 0x28, offset 0xa00
-	0xa00: 0x0341, 0xa01: 0x0349, 0xa02: 0x00c1, 0xa03: 0x0019, 0xa04: 0x0351, 0xa05: 0x0359,
-	0xa06: 0x05b5, 0xa07: 0x02e9, 0xa08: 0x02f1, 0xa09: 0x02f9, 0xa0a: 0x0361, 0xa0b: 0x0369,
-	0xa0c: 0x0371, 0xa0d: 0x0309, 0xa0e: 0x0008, 0xa0f: 0x0319, 0xa10: 0x0321, 0xa11: 0x0379,
-	0xa12: 0x0051, 0xa13: 0x0381, 0xa14: 0x05cd, 0xa15: 0x05cd, 0xa16: 0x0339, 0xa17: 0x0341,
-	0xa18: 0x0349, 0xa19: 0x05b5, 0xa1a: 0x0389, 0xa1b: 0x0391, 0xa1c: 0x05e5, 0xa1d: 0x0399,
-	0xa1e: 0x03a1, 0xa1f: 0x03a9, 0xa20: 0x03b1, 0xa21: 0x03b9, 0xa22: 0x0311, 0xa23: 0x00b9,
-	0xa24: 0x0349, 0xa25: 0x0391, 0xa26: 0x0399, 0xa27: 0x03a1, 0xa28: 0x03c1, 0xa29: 0x03b1,
-	0xa2a: 0x03b9, 0xa2b: 0x0008, 0xa2c: 0x0008, 0xa2d: 0x0008, 0xa2e: 0x0008, 0xa2f: 0x0008,
+	0xa00: 0x0fa9, 0xa01: 0x0fb9, 0xa02: 0x0279, 0xa03: 0x0039, 0xa04: 0x0fc9, 0xa05: 0x0fe1,
+	0xa06: 0x05b5, 0xa07: 0x0ee9, 0xa08: 0x0ef9, 0xa09: 0x0f09, 0xa0a: 0x0ff9, 0xa0b: 0x1011,
+	0xa0c: 0x1029, 0xa0d: 0x0f31, 0xa0e: 0x0008, 0xa0f: 0x0f51, 0xa10: 0x0f61, 0xa11: 0x1041,
+	0xa12: 0x00d9, 0xa13: 0x1059, 0xa14: 0x05cd, 0xa15: 0x05cd, 0xa16: 0x0f99, 0xa17: 0x0fa9,
+	0xa18: 0x0fb9, 0xa19: 0x05b5, 0xa1a: 0x1071, 0xa1b: 0x1089, 0xa1c: 0x05e5, 0xa1d: 0x1099,
+	0xa1e: 0x10b1, 0xa1f: 0x10c9, 0xa20: 0x10e1, 0xa21: 0x10f9, 0xa22: 0x0f41, 0xa23: 0x0269,
+	0xa24: 0x0fb9, 0xa25: 0x1089, 0xa26: 0x1099, 0xa27: 0x10b1, 0xa28: 0x1111, 0xa29: 0x10e1,
+	0xa2a: 0x10f9, 0xa2b: 0x0008, 0xa2c: 0x0008, 0xa2d: 0x0008, 0xa2e: 0x0008, 0xa2f: 0x0008,
 	0xa30: 0x0008, 0xa31: 0x0008, 0xa32: 0x0008, 0xa33: 0x0008, 0xa34: 0x0008, 0xa35: 0x0008,
-	0xa36: 0x0008, 0xa37: 0x0008, 0xa38: 0x03c9, 0xa39: 0x0008, 0xa3a: 0x0008, 0xa3b: 0x0008,
+	0xa36: 0x0008, 0xa37: 0x0008, 0xa38: 0x1129, 0xa39: 0x0008, 0xa3a: 0x0008, 0xa3b: 0x0008,
 	0xa3c: 0x0008, 0xa3d: 0x0008, 0xa3e: 0x0008, 0xa3f: 0x0008,
 	// Block 0x29, offset 0xa40
 	0xa40: 0x0008, 0xa41: 0x0008, 0xa42: 0x0008, 0xa43: 0x0008, 0xa44: 0x0008, 0xa45: 0x0008,
 	0xa46: 0x0008, 0xa47: 0x0008, 0xa48: 0x0008, 0xa49: 0x0008, 0xa4a: 0x0008, 0xa4b: 0x0008,
 	0xa4c: 0x0008, 0xa4d: 0x0008, 0xa4e: 0x0008, 0xa4f: 0x0008, 0xa50: 0x0008, 0xa51: 0x0008,
 	0xa52: 0x0008, 0xa53: 0x0008, 0xa54: 0x0008, 0xa55: 0x0008, 0xa56: 0x0008, 0xa57: 0x0008,
-	0xa58: 0x0008, 0xa59: 0x0008, 0xa5a: 0x0008, 0xa5b: 0x03d1, 0xa5c: 0x03d9, 0xa5d: 0x03e1,
-	0xa5e: 0x03e9, 0xa5f: 0x0371, 0xa60: 0x03f1, 0xa61: 0x03f9, 0xa62: 0x0401, 0xa63: 0x0409,
-	0xa64: 0x0411, 0xa65: 0x0419, 0xa66: 0x0421, 0xa67: 0x05fd, 0xa68: 0x0429, 0xa69: 0x0431,
-	0xa6a: 0xe17d, 0xa6b: 0x0439, 0xa6c: 0x0441, 0xa6d: 0x0449, 0xa6e: 0x0451, 0xa6f: 0x0459,
-	0xa70: 0x0461, 0xa71: 0x0469, 0xa72: 0x0471, 0xa73: 0x0479, 0xa74: 0x0481, 0xa75: 0x0489,
-	0xa76: 0x0491, 0xa77: 0x0499, 0xa78: 0x0615, 0xa79: 0x04a1, 0xa7a: 0x04a9, 0xa7b: 0x04b1,
-	0xa7c: 0x04b9, 0xa7d: 0x04c1, 0xa7e: 0x04c9, 0xa7f: 0x04d1,
+	0xa58: 0x0008, 0xa59: 0x0008, 0xa5a: 0x0008, 0xa5b: 0x1141, 0xa5c: 0x1159, 0xa5d: 0x1169,
+	0xa5e: 0x1181, 0xa5f: 0x1029, 0xa60: 0x1199, 0xa61: 0x11a9, 0xa62: 0x11c1, 0xa63: 0x11d9,
+	0xa64: 0x11f1, 0xa65: 0x1209, 0xa66: 0x1221, 0xa67: 0x05fd, 0xa68: 0x1239, 0xa69: 0x1251,
+	0xa6a: 0xe17d, 0xa6b: 0x1269, 0xa6c: 0x1281, 0xa6d: 0x1299, 0xa6e: 0x12b1, 0xa6f: 0x12c9,
+	0xa70: 0x12e1, 0xa71: 0x12f9, 0xa72: 0x1311, 0xa73: 0x1329, 0xa74: 0x1341, 0xa75: 0x1359,
+	0xa76: 0x1371, 0xa77: 0x1389, 0xa78: 0x0615, 0xa79: 0x13a1, 0xa7a: 0x13b9, 0xa7b: 0x13d1,
+	0xa7c: 0x13e1, 0xa7d: 0x13f9, 0xa7e: 0x1411, 0xa7f: 0x1429,
 	// Block 0x2a, offset 0xa80
 	0xa80: 0xe00d, 0xa81: 0x0008, 0xa82: 0xe00d, 0xa83: 0x0008, 0xa84: 0xe00d, 0xa85: 0x0008,
 	0xa86: 0xe00d, 0xa87: 0x0008, 0xa88: 0xe00d, 0xa89: 0x0008, 0xa8a: 0xe00d, 0xa8b: 0x0008,
@@ -1221,7 +1079,7 @@ var idnaValues = [8192]uint16{
 	0xacc: 0xe00d, 0xacd: 0x0008, 0xace: 0xe00d, 0xacf: 0x0008, 0xad0: 0xe00d, 0xad1: 0x0008,
 	0xad2: 0xe00d, 0xad3: 0x0008, 0xad4: 0xe00d, 0xad5: 0x0008, 0xad6: 0x0008, 0xad7: 0x0008,
 	0xad8: 0x0008, 0xad9: 0x0008, 0xada: 0x062d, 0xadb: 0x064d, 0xadc: 0x0008, 0xadd: 0x0008,
-	0xade: 0x04d9, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
+	0xade: 0x1441, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
 	0xae4: 0xe00d, 0xae5: 0x0008, 0xae6: 0xe00d, 0xae7: 0x0008, 0xae8: 0xe00d, 0xae9: 0x0008,
 	0xaea: 0xe00d, 0xaeb: 0x0008, 0xaec: 0xe00d, 0xaed: 0x0008, 0xaee: 0xe00d, 0xaef: 0x0008,
 	0xaf0: 0xe00d, 0xaf1: 0x0008, 0xaf2: 0xe00d, 0xaf3: 0x0008, 0xaf4: 0xe00d, 0xaf5: 0x0008,
@@ -1236,33 +1094,33 @@ var idnaValues = [8192]uint16{
 	0xb1e: 0x0040, 0xb1f: 0xe045, 0xb20: 0x0008, 0xb21: 0x0008, 0xb22: 0x0008, 0xb23: 0x0008,
 	0xb24: 0x0008, 0xb25: 0x0008, 0xb26: 0x0008, 0xb27: 0x0008, 0xb28: 0xe045, 0xb29: 0xe045,
 	0xb2a: 0xe045, 0xb2b: 0xe045, 0xb2c: 0xe045, 0xb2d: 0xe045, 0xb2e: 0xe045, 0xb2f: 0xe045,
-	0xb30: 0x0008, 0xb31: 0x04e1, 0xb32: 0x0008, 0xb33: 0x04e9, 0xb34: 0x0008, 0xb35: 0x04f1,
-	0xb36: 0x0008, 0xb37: 0x04f9, 0xb38: 0x0008, 0xb39: 0x0501, 0xb3a: 0x0008, 0xb3b: 0x0509,
-	0xb3c: 0x0008, 0xb3d: 0x0511, 0xb3e: 0x0040, 0xb3f: 0x0040,
+	0xb30: 0x0008, 0xb31: 0x1459, 0xb32: 0x0008, 0xb33: 0x1471, 0xb34: 0x0008, 0xb35: 0x1489,
+	0xb36: 0x0008, 0xb37: 0x14a1, 0xb38: 0x0008, 0xb39: 0x14b9, 0xb3a: 0x0008, 0xb3b: 0x14d1,
+	0xb3c: 0x0008, 0xb3d: 0x14e9, 0xb3e: 0x0040, 0xb3f: 0x0040,
 	// Block 0x2d, offset 0xb40
-	0xb40: 0x0519, 0xb41: 0x0521, 0xb42: 0x0529, 0xb43: 0x0531, 0xb44: 0x0539, 0xb45: 0x0541,
-	0xb46: 0x0549, 0xb47: 0x0551, 0xb48: 0x0519, 0xb49: 0x0521, 0xb4a: 0x0529, 0xb4b: 0x0531,
-	0xb4c: 0x0539, 0xb4d: 0x0541, 0xb4e: 0x0549, 0xb4f: 0x0551, 0xb50: 0x0559, 0xb51: 0x0561,
-	0xb52: 0x0569, 0xb53: 0x0571, 0xb54: 0x0579, 0xb55: 0x0581, 0xb56: 0x0589, 0xb57: 0x0591,
-	0xb58: 0x0559, 0xb59: 0x0561, 0xb5a: 0x0569, 0xb5b: 0x0571, 0xb5c: 0x0579, 0xb5d: 0x0581,
-	0xb5e: 0x0589, 0xb5f: 0x0591, 0xb60: 0x0599, 0xb61: 0x05a1, 0xb62: 0x05a9, 0xb63: 0x05b1,
-	0xb64: 0x05b9, 0xb65: 0x05c1, 0xb66: 0x05c9, 0xb67: 0x05d1, 0xb68: 0x0599, 0xb69: 0x05a1,
-	0xb6a: 0x05a9, 0xb6b: 0x05b1, 0xb6c: 0x05b9, 0xb6d: 0x05c1, 0xb6e: 0x05c9, 0xb6f: 0x05d1,
-	0xb70: 0x0008, 0xb71: 0x0008, 0xb72: 0x05d9, 0xb73: 0x05e1, 0xb74: 0x05e9, 0xb75: 0x0040,
-	0xb76: 0x0008, 0xb77: 0x05f1, 0xb78: 0xe045, 0xb79: 0xe045, 0xb7a: 0x0665, 0xb7b: 0x04e1,
-	0xb7c: 0x05e1, 0xb7d: 0x067e, 0xb7e: 0x05f9, 0xb7f: 0x069e,
+	0xb40: 0x1501, 0xb41: 0x1531, 0xb42: 0x1561, 0xb43: 0x1591, 0xb44: 0x15c1, 0xb45: 0x15f1,
+	0xb46: 0x1621, 0xb47: 0x1651, 0xb48: 0x1501, 0xb49: 0x1531, 0xb4a: 0x1561, 0xb4b: 0x1591,
+	0xb4c: 0x15c1, 0xb4d: 0x15f1, 0xb4e: 0x1621, 0xb4f: 0x1651, 0xb50: 0x1681, 0xb51: 0x16b1,
+	0xb52: 0x16e1, 0xb53: 0x1711, 0xb54: 0x1741, 0xb55: 0x1771, 0xb56: 0x17a1, 0xb57: 0x17d1,
+	0xb58: 0x1681, 0xb59: 0x16b1, 0xb5a: 0x16e1, 0xb5b: 0x1711, 0xb5c: 0x1741, 0xb5d: 0x1771,
+	0xb5e: 0x17a1, 0xb5f: 0x17d1, 0xb60: 0x1801, 0xb61: 0x1831, 0xb62: 0x1861, 0xb63: 0x1891,
+	0xb64: 0x18c1, 0xb65: 0x18f1, 0xb66: 0x1921, 0xb67: 0x1951, 0xb68: 0x1801, 0xb69: 0x1831,
+	0xb6a: 0x1861, 0xb6b: 0x1891, 0xb6c: 0x18c1, 0xb6d: 0x18f1, 0xb6e: 0x1921, 0xb6f: 0x1951,
+	0xb70: 0x0008, 0xb71: 0x0008, 0xb72: 0x1981, 0xb73: 0x19b1, 0xb74: 0x19d9, 0xb75: 0x0040,
+	0xb76: 0x0008, 0xb77: 0x1a01, 0xb78: 0xe045, 0xb79: 0xe045, 0xb7a: 0x0665, 0xb7b: 0x1459,
+	0xb7c: 0x19b1, 0xb7d: 0x067e, 0xb7e: 0x1a31, 0xb7f: 0x069e,
 	// Block 0x2e, offset 0xb80
-	0xb80: 0x06be, 0xb81: 0x0602, 0xb82: 0x0609, 0xb83: 0x0611, 0xb84: 0x0619, 0xb85: 0x0040,
-	0xb86: 0x0008, 0xb87: 0x0621, 0xb88: 0x06dd, 0xb89: 0x04e9, 0xb8a: 0x06f5, 0xb8b: 0x04f1,
-	0xb8c: 0x0611, 0xb8d: 0x062a, 0xb8e: 0x0632, 0xb8f: 0x063a, 0xb90: 0x0008, 0xb91: 0x0008,
-	0xb92: 0x0008, 0xb93: 0x0641, 0xb94: 0x0040, 0xb95: 0x0040, 0xb96: 0x0008, 0xb97: 0x0008,
-	0xb98: 0xe045, 0xb99: 0xe045, 0xb9a: 0x070d, 0xb9b: 0x04f9, 0xb9c: 0x0040, 0xb9d: 0x064a,
-	0xb9e: 0x0652, 0xb9f: 0x065a, 0xba0: 0x0008, 0xba1: 0x0008, 0xba2: 0x0008, 0xba3: 0x0661,
+	0xb80: 0x06be, 0xb81: 0x1a4a, 0xb82: 0x1a79, 0xb83: 0x1aa9, 0xb84: 0x1ad1, 0xb85: 0x0040,
+	0xb86: 0x0008, 0xb87: 0x1af9, 0xb88: 0x06dd, 0xb89: 0x1471, 0xb8a: 0x06f5, 0xb8b: 0x1489,
+	0xb8c: 0x1aa9, 0xb8d: 0x1b2a, 0xb8e: 0x1b5a, 0xb8f: 0x1b8a, 0xb90: 0x0008, 0xb91: 0x0008,
+	0xb92: 0x0008, 0xb93: 0x1bb9, 0xb94: 0x0040, 0xb95: 0x0040, 0xb96: 0x0008, 0xb97: 0x0008,
+	0xb98: 0xe045, 0xb99: 0xe045, 0xb9a: 0x070d, 0xb9b: 0x14a1, 0xb9c: 0x0040, 0xb9d: 0x1bd2,
+	0xb9e: 0x1c02, 0xb9f: 0x1c32, 0xba0: 0x0008, 0xba1: 0x0008, 0xba2: 0x0008, 0xba3: 0x1c61,
 	0xba4: 0x0008, 0xba5: 0x0008, 0xba6: 0x0008, 0xba7: 0x0008, 0xba8: 0xe045, 0xba9: 0xe045,
-	0xbaa: 0x0725, 0xbab: 0x0509, 0xbac: 0xe04d, 0xbad: 0x066a, 0xbae: 0x012a, 0xbaf: 0x0672,
-	0xbb0: 0x0040, 0xbb1: 0x0040, 0xbb2: 0x0679, 0xbb3: 0x0681, 0xbb4: 0x0689, 0xbb5: 0x0040,
-	0xbb6: 0x0008, 0xbb7: 0x0691, 0xbb8: 0x073d, 0xbb9: 0x0501, 0xbba: 0x0515, 0xbbb: 0x0511,
-	0xbbc: 0x0681, 0xbbd: 0x0756, 0xbbe: 0x0776, 0xbbf: 0x0040,
+	0xbaa: 0x0725, 0xbab: 0x14d1, 0xbac: 0xe04d, 0xbad: 0x1c7a, 0xbae: 0x03d2, 0xbaf: 0x1caa,
+	0xbb0: 0x0040, 0xbb1: 0x0040, 0xbb2: 0x1cb9, 0xbb3: 0x1ce9, 0xbb4: 0x1d11, 0xbb5: 0x0040,
+	0xbb6: 0x0008, 0xbb7: 0x1d39, 0xbb8: 0x073d, 0xbb9: 0x14b9, 0xbba: 0x0515, 0xbbb: 0x14e9,
+	0xbbc: 0x1ce9, 0xbbd: 0x0756, 0xbbe: 0x0776, 0xbbf: 0x0040,
 	// Block 0x2f, offset 0xbc0
 	0xbc0: 0x000a, 0xbc1: 0x000a, 0xbc2: 0x000a, 0xbc3: 0x000a, 0xbc4: 0x000a, 0xbc5: 0x000a,
 	0xbc6: 0x000a, 0xbc7: 0x000a, 0xbc8: 0x000a, 0xbc9: 0x000a, 0xbca: 0x000a, 0xbcb: 0x03c0,
@@ -1272,72 +1130,72 @@ var idnaValues = [8192]uint16{
 	0xbde: 0x0018, 0xbdf: 0x0018, 0xbe0: 0x0018, 0xbe1: 0x0018, 0xbe2: 0x0018, 0xbe3: 0x0018,
 	0xbe4: 0x0040, 0xbe5: 0x0040, 0xbe6: 0x0040, 0xbe7: 0x0018, 0xbe8: 0x0040, 0xbe9: 0x0040,
 	0xbea: 0x0340, 0xbeb: 0x0340, 0xbec: 0x0340, 0xbed: 0x0340, 0xbee: 0x0340, 0xbef: 0x000a,
-	0xbf0: 0x0018, 0xbf1: 0x0018, 0xbf2: 0x0018, 0xbf3: 0x0699, 0xbf4: 0x06a1, 0xbf5: 0x0018,
-	0xbf6: 0x06a9, 0xbf7: 0x06b1, 0xbf8: 0x0018, 0xbf9: 0x0018, 0xbfa: 0x0018, 0xbfb: 0x0018,
-	0xbfc: 0x06ba, 0xbfd: 0x0018, 0xbfe: 0x07b6, 0xbff: 0x0018,
+	0xbf0: 0x0018, 0xbf1: 0x0018, 0xbf2: 0x0018, 0xbf3: 0x1d69, 0xbf4: 0x1da1, 0xbf5: 0x0018,
+	0xbf6: 0x1df1, 0xbf7: 0x1e29, 0xbf8: 0x0018, 0xbf9: 0x0018, 0xbfa: 0x0018, 0xbfb: 0x0018,
+	0xbfc: 0x1e7a, 0xbfd: 0x0018, 0xbfe: 0x07b6, 0xbff: 0x0018,
 	// Block 0x30, offset 0xc00
 	0xc00: 0x0018, 0xc01: 0x0018, 0xc02: 0x0018, 0xc03: 0x0018, 0xc04: 0x0018, 0xc05: 0x0018,
-	0xc06: 0x0018, 0xc07: 0x06c2, 0xc08: 0x06ca, 0xc09: 0x06d2, 0xc0a: 0x0018, 0xc0b: 0x0018,
+	0xc06: 0x0018, 0xc07: 0x1e92, 0xc08: 0x1eaa, 0xc09: 0x1ec2, 0xc0a: 0x0018, 0xc0b: 0x0018,
 	0xc0c: 0x0018, 0xc0d: 0x0018, 0xc0e: 0x0018, 0xc0f: 0x0018, 0xc10: 0x0018, 0xc11: 0x0018,
-	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x06d9,
+	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x1ed9,
 	0xc18: 0x0018, 0xc19: 0x0018, 0xc1a: 0x0018, 0xc1b: 0x0018, 0xc1c: 0x0018, 0xc1d: 0x0018,
 	0xc1e: 0x0018, 0xc1f: 0x000a, 0xc20: 0x03c0, 0xc21: 0x0340, 0xc22: 0x0340, 0xc23: 0x0340,
 	0xc24: 0x03c0, 0xc25: 0x0040, 0xc26: 0x0040, 0xc27: 0x0040, 0xc28: 0x0040, 0xc29: 0x0040,
 	0xc2a: 0x0340, 0xc2b: 0x0340, 0xc2c: 0x0340, 0xc2d: 0x0340, 0xc2e: 0x0340, 0xc2f: 0x0340,
-	0xc30: 0x06e1, 0xc31: 0x0311, 0xc32: 0x0040, 0xc33: 0x0040, 0xc34: 0x06e9, 0xc35: 0x06f1,
-	0xc36: 0x06f9, 0xc37: 0x0701, 0xc38: 0x0709, 0xc39: 0x0711, 0xc3a: 0x071a, 0xc3b: 0x07d5,
-	0xc3c: 0x0722, 0xc3d: 0x072a, 0xc3e: 0x0732, 0xc3f: 0x0329,
+	0xc30: 0x1f41, 0xc31: 0x0f41, 0xc32: 0x0040, 0xc33: 0x0040, 0xc34: 0x1f51, 0xc35: 0x1f61,
+	0xc36: 0x1f71, 0xc37: 0x1f81, 0xc38: 0x1f91, 0xc39: 0x1fa1, 0xc3a: 0x1fb2, 0xc3b: 0x07d5,
+	0xc3c: 0x1fc2, 0xc3d: 0x1fd2, 0xc3e: 0x1fe2, 0xc3f: 0x0f71,
 	// Block 0x31, offset 0xc40
-	0xc40: 0x06e1, 0xc41: 0x0049, 0xc42: 0x0029, 0xc43: 0x0031, 0xc44: 0x06e9, 0xc45: 0x06f1,
-	0xc46: 0x06f9, 0xc47: 0x0701, 0xc48: 0x0709, 0xc49: 0x0711, 0xc4a: 0x071a, 0xc4b: 0x07ed,
-	0xc4c: 0x0722, 0xc4d: 0x072a, 0xc4e: 0x0732, 0xc4f: 0x0040, 0xc50: 0x0019, 0xc51: 0x02f9,
-	0xc52: 0x0051, 0xc53: 0x0109, 0xc54: 0x0361, 0xc55: 0x00a9, 0xc56: 0x0319, 0xc57: 0x0101,
-	0xc58: 0x0321, 0xc59: 0x0329, 0xc5a: 0x0339, 0xc5b: 0x0089, 0xc5c: 0x0341, 0xc5d: 0x0040,
+	0xc40: 0x1f41, 0xc41: 0x00c9, 0xc42: 0x0069, 0xc43: 0x0079, 0xc44: 0x1f51, 0xc45: 0x1f61,
+	0xc46: 0x1f71, 0xc47: 0x1f81, 0xc48: 0x1f91, 0xc49: 0x1fa1, 0xc4a: 0x1fb2, 0xc4b: 0x07ed,
+	0xc4c: 0x1fc2, 0xc4d: 0x1fd2, 0xc4e: 0x1fe2, 0xc4f: 0x0040, 0xc50: 0x0039, 0xc51: 0x0f09,
+	0xc52: 0x00d9, 0xc53: 0x0369, 0xc54: 0x0ff9, 0xc55: 0x0249, 0xc56: 0x0f51, 0xc57: 0x0359,
+	0xc58: 0x0f61, 0xc59: 0x0f71, 0xc5a: 0x0f99, 0xc5b: 0x01d9, 0xc5c: 0x0fa9, 0xc5d: 0x0040,
 	0xc5e: 0x0040, 0xc5f: 0x0040, 0xc60: 0x0018, 0xc61: 0x0018, 0xc62: 0x0018, 0xc63: 0x0018,
-	0xc64: 0x0018, 0xc65: 0x0018, 0xc66: 0x0018, 0xc67: 0x0018, 0xc68: 0x0739, 0xc69: 0x0018,
+	0xc64: 0x0018, 0xc65: 0x0018, 0xc66: 0x0018, 0xc67: 0x0018, 0xc68: 0x1ff1, 0xc69: 0x0018,
 	0xc6a: 0x0018, 0xc6b: 0x0018, 0xc6c: 0x0018, 0xc6d: 0x0018, 0xc6e: 0x0018, 0xc6f: 0x0018,
 	0xc70: 0x0018, 0xc71: 0x0018, 0xc72: 0x0018, 0xc73: 0x0018, 0xc74: 0x0018, 0xc75: 0x0018,
 	0xc76: 0x0018, 0xc77: 0x0018, 0xc78: 0x0018, 0xc79: 0x0018, 0xc7a: 0x0018, 0xc7b: 0x0018,
 	0xc7c: 0x0018, 0xc7d: 0x0018, 0xc7e: 0x0018, 0xc7f: 0x0018,
 	// Block 0x32, offset 0xc80
-	0xc80: 0x0806, 0xc81: 0x0826, 0xc82: 0x03d9, 0xc83: 0x0845, 0xc84: 0x0018, 0xc85: 0x0866,
-	0xc86: 0x0886, 0xc87: 0x0369, 0xc88: 0x0018, 0xc89: 0x08a5, 0xc8a: 0x0309, 0xc8b: 0x00a9,
-	0xc8c: 0x00a9, 0xc8d: 0x00a9, 0xc8e: 0x00a9, 0xc8f: 0x0741, 0xc90: 0x0311, 0xc91: 0x0311,
-	0xc92: 0x0101, 0xc93: 0x0101, 0xc94: 0x0018, 0xc95: 0x0329, 0xc96: 0x0749, 0xc97: 0x0018,
-	0xc98: 0x0018, 0xc99: 0x0339, 0xc9a: 0x0751, 0xc9b: 0x00b9, 0xc9c: 0x00b9, 0xc9d: 0x00b9,
-	0xc9e: 0x0018, 0xc9f: 0x0018, 0xca0: 0x0759, 0xca1: 0x08c5, 0xca2: 0x0761, 0xca3: 0x0018,
-	0xca4: 0x04b1, 0xca5: 0x0018, 0xca6: 0x0769, 0xca7: 0x0018, 0xca8: 0x04b1, 0xca9: 0x0018,
-	0xcaa: 0x0319, 0xcab: 0x0771, 0xcac: 0x02e9, 0xcad: 0x03d9, 0xcae: 0x0018, 0xcaf: 0x02f9,
-	0xcb0: 0x02f9, 0xcb1: 0x03f1, 0xcb2: 0x0040, 0xcb3: 0x0321, 0xcb4: 0x0051, 0xcb5: 0x0779,
-	0xcb6: 0x0781, 0xcb7: 0x0789, 0xcb8: 0x0791, 0xcb9: 0x0311, 0xcba: 0x0018, 0xcbb: 0x08e5,
-	0xcbc: 0x0799, 0xcbd: 0x03a1, 0xcbe: 0x03a1, 0xcbf: 0x0799,
+	0xc80: 0x0806, 0xc81: 0x0826, 0xc82: 0x1159, 0xc83: 0x0845, 0xc84: 0x0018, 0xc85: 0x0866,
+	0xc86: 0x0886, 0xc87: 0x1011, 0xc88: 0x0018, 0xc89: 0x08a5, 0xc8a: 0x0f31, 0xc8b: 0x0249,
+	0xc8c: 0x0249, 0xc8d: 0x0249, 0xc8e: 0x0249, 0xc8f: 0x2009, 0xc90: 0x0f41, 0xc91: 0x0f41,
+	0xc92: 0x0359, 0xc93: 0x0359, 0xc94: 0x0018, 0xc95: 0x0f71, 0xc96: 0x2021, 0xc97: 0x0018,
+	0xc98: 0x0018, 0xc99: 0x0f99, 0xc9a: 0x2039, 0xc9b: 0x0269, 0xc9c: 0x0269, 0xc9d: 0x0269,
+	0xc9e: 0x0018, 0xc9f: 0x0018, 0xca0: 0x2049, 0xca1: 0x08c5, 0xca2: 0x2061, 0xca3: 0x0018,
+	0xca4: 0x13d1, 0xca5: 0x0018, 0xca6: 0x2079, 0xca7: 0x0018, 0xca8: 0x13d1, 0xca9: 0x0018,
+	0xcaa: 0x0f51, 0xcab: 0x2091, 0xcac: 0x0ee9, 0xcad: 0x1159, 0xcae: 0x0018, 0xcaf: 0x0f09,
+	0xcb0: 0x0f09, 0xcb1: 0x1199, 0xcb2: 0x0040, 0xcb3: 0x0f61, 0xcb4: 0x00d9, 0xcb5: 0x20a9,
+	0xcb6: 0x20c1, 0xcb7: 0x20d9, 0xcb8: 0x20f1, 0xcb9: 0x0f41, 0xcba: 0x0018, 0xcbb: 0x08e5,
+	0xcbc: 0x2109, 0xcbd: 0x10b1, 0xcbe: 0x10b1, 0xcbf: 0x2109,
 	// Block 0x33, offset 0xcc0
-	0xcc0: 0x0905, 0xcc1: 0x0018, 0xcc2: 0x0018, 0xcc3: 0x0018, 0xcc4: 0x0018, 0xcc5: 0x02f1,
-	0xcc6: 0x02f1, 0xcc7: 0x02f9, 0xcc8: 0x0311, 0xcc9: 0x00b1, 0xcca: 0x0018, 0xccb: 0x0018,
-	0xccc: 0x0018, 0xccd: 0x0018, 0xcce: 0x0008, 0xccf: 0x0018, 0xcd0: 0x07a1, 0xcd1: 0x07a9,
-	0xcd2: 0x07b1, 0xcd3: 0x07b9, 0xcd4: 0x07c1, 0xcd5: 0x07c9, 0xcd6: 0x07d1, 0xcd7: 0x07d9,
-	0xcd8: 0x07e1, 0xcd9: 0x07e9, 0xcda: 0x07f1, 0xcdb: 0x07f9, 0xcdc: 0x0801, 0xcdd: 0x0809,
-	0xcde: 0x0811, 0xcdf: 0x0819, 0xce0: 0x0311, 0xce1: 0x0821, 0xce2: 0x091d, 0xce3: 0x0829,
-	0xce4: 0x0391, 0xce5: 0x0831, 0xce6: 0x093d, 0xce7: 0x0839, 0xce8: 0x0841, 0xce9: 0x0109,
-	0xcea: 0x0849, 0xceb: 0x095d, 0xcec: 0x0101, 0xced: 0x03d9, 0xcee: 0x02f1, 0xcef: 0x0321,
-	0xcf0: 0x0311, 0xcf1: 0x0821, 0xcf2: 0x097d, 0xcf3: 0x0829, 0xcf4: 0x0391, 0xcf5: 0x0831,
-	0xcf6: 0x099d, 0xcf7: 0x0839, 0xcf8: 0x0841, 0xcf9: 0x0109, 0xcfa: 0x0849, 0xcfb: 0x09bd,
-	0xcfc: 0x0101, 0xcfd: 0x03d9, 0xcfe: 0x02f1, 0xcff: 0x0321,
+	0xcc0: 0x0905, 0xcc1: 0x0018, 0xcc2: 0x0018, 0xcc3: 0x0018, 0xcc4: 0x0018, 0xcc5: 0x0ef9,
+	0xcc6: 0x0ef9, 0xcc7: 0x0f09, 0xcc8: 0x0f41, 0xcc9: 0x0259, 0xcca: 0x0018, 0xccb: 0x0018,
+	0xccc: 0x0018, 0xccd: 0x0018, 0xcce: 0x0008, 0xccf: 0x0018, 0xcd0: 0x2121, 0xcd1: 0x2151,
+	0xcd2: 0x2181, 0xcd3: 0x21b9, 0xcd4: 0x21e9, 0xcd5: 0x2219, 0xcd6: 0x2249, 0xcd7: 0x2279,
+	0xcd8: 0x22a9, 0xcd9: 0x22d9, 0xcda: 0x2309, 0xcdb: 0x2339, 0xcdc: 0x2369, 0xcdd: 0x2399,
+	0xcde: 0x23c9, 0xcdf: 0x23f9, 0xce0: 0x0f41, 0xce1: 0x2421, 0xce2: 0x091d, 0xce3: 0x2439,
+	0xce4: 0x1089, 0xce5: 0x2451, 0xce6: 0x093d, 0xce7: 0x2469, 0xce8: 0x2491, 0xce9: 0x0369,
+	0xcea: 0x24a9, 0xceb: 0x095d, 0xcec: 0x0359, 0xced: 0x1159, 0xcee: 0x0ef9, 0xcef: 0x0f61,
+	0xcf0: 0x0f41, 0xcf1: 0x2421, 0xcf2: 0x097d, 0xcf3: 0x2439, 0xcf4: 0x1089, 0xcf5: 0x2451,
+	0xcf6: 0x099d, 0xcf7: 0x2469, 0xcf8: 0x2491, 0xcf9: 0x0369, 0xcfa: 0x24a9, 0xcfb: 0x09bd,
+	0xcfc: 0x0359, 0xcfd: 0x1159, 0xcfe: 0x0ef9, 0xcff: 0x0f61,
 	// Block 0x34, offset 0xd00
 	0xd00: 0x0018, 0xd01: 0x0018, 0xd02: 0x0018, 0xd03: 0x0018, 0xd04: 0x0018, 0xd05: 0x0018,
 	0xd06: 0x0018, 0xd07: 0x0018, 0xd08: 0x0018, 0xd09: 0x0018, 0xd0a: 0x0018, 0xd0b: 0x0040,
 	0xd0c: 0x0040, 0xd0d: 0x0040, 0xd0e: 0x0040, 0xd0f: 0x0040, 0xd10: 0x0040, 0xd11: 0x0040,
 	0xd12: 0x0040, 0xd13: 0x0040, 0xd14: 0x0040, 0xd15: 0x0040, 0xd16: 0x0040, 0xd17: 0x0040,
 	0xd18: 0x0040, 0xd19: 0x0040, 0xd1a: 0x0040, 0xd1b: 0x0040, 0xd1c: 0x0040, 0xd1d: 0x0040,
-	0xd1e: 0x0040, 0xd1f: 0x0040, 0xd20: 0x0049, 0xd21: 0x0029, 0xd22: 0x0031, 0xd23: 0x06e9,
-	0xd24: 0x06f1, 0xd25: 0x06f9, 0xd26: 0x0701, 0xd27: 0x0709, 0xd28: 0x0711, 0xd29: 0x0879,
-	0xd2a: 0x0881, 0xd2b: 0x0889, 0xd2c: 0x0891, 0xd2d: 0x0899, 0xd2e: 0x08a1, 0xd2f: 0x08a9,
-	0xd30: 0x08b1, 0xd31: 0x08b9, 0xd32: 0x08c1, 0xd33: 0x08c9, 0xd34: 0x0a1e, 0xd35: 0x0a3e,
+	0xd1e: 0x0040, 0xd1f: 0x0040, 0xd20: 0x00c9, 0xd21: 0x0069, 0xd22: 0x0079, 0xd23: 0x1f51,
+	0xd24: 0x1f61, 0xd25: 0x1f71, 0xd26: 0x1f81, 0xd27: 0x1f91, 0xd28: 0x1fa1, 0xd29: 0x2601,
+	0xd2a: 0x2619, 0xd2b: 0x2631, 0xd2c: 0x2649, 0xd2d: 0x2661, 0xd2e: 0x2679, 0xd2f: 0x2691,
+	0xd30: 0x26a9, 0xd31: 0x26c1, 0xd32: 0x26d9, 0xd33: 0x26f1, 0xd34: 0x0a1e, 0xd35: 0x0a3e,
 	0xd36: 0x0a5e, 0xd37: 0x0a7e, 0xd38: 0x0a9e, 0xd39: 0x0abe, 0xd3a: 0x0ade, 0xd3b: 0x0afe,
-	0xd3c: 0x0b1e, 0xd3d: 0x08d2, 0xd3e: 0x08da, 0xd3f: 0x08e2,
+	0xd3c: 0x0b1e, 0xd3d: 0x270a, 0xd3e: 0x2732, 0xd3f: 0x275a,
 	// Block 0x35, offset 0xd40
-	0xd40: 0x08ea, 0xd41: 0x08f2, 0xd42: 0x08fa, 0xd43: 0x0902, 0xd44: 0x090a, 0xd45: 0x0912,
-	0xd46: 0x091a, 0xd47: 0x0922, 0xd48: 0x0040, 0xd49: 0x0040, 0xd4a: 0x0040, 0xd4b: 0x0040,
+	0xd40: 0x2782, 0xd41: 0x27aa, 0xd42: 0x27d2, 0xd43: 0x27fa, 0xd44: 0x2822, 0xd45: 0x284a,
+	0xd46: 0x2872, 0xd47: 0x289a, 0xd48: 0x0040, 0xd49: 0x0040, 0xd4a: 0x0040, 0xd4b: 0x0040,
 	0xd4c: 0x0040, 0xd4d: 0x0040, 0xd4e: 0x0040, 0xd4f: 0x0040, 0xd50: 0x0040, 0xd51: 0x0040,
 	0xd52: 0x0040, 0xd53: 0x0040, 0xd54: 0x0040, 0xd55: 0x0040, 0xd56: 0x0040, 0xd57: 0x0040,
 	0xd58: 0x0040, 0xd59: 0x0040, 0xd5a: 0x0040, 0xd5b: 0x0040, 0xd5c: 0x0b3e, 0xd5d: 0x0b5e,
@@ -1345,17 +1203,17 @@ var idnaValues = [8192]uint16{
 	0xd64: 0x0c3e, 0xd65: 0x0c5e, 0xd66: 0x0c7e, 0xd67: 0x0c9e, 0xd68: 0x0cbe, 0xd69: 0x0cde,
 	0xd6a: 0x0cfe, 0xd6b: 0x0d1e, 0xd6c: 0x0d3e, 0xd6d: 0x0d5e, 0xd6e: 0x0d7e, 0xd6f: 0x0d9e,
 	0xd70: 0x0dbe, 0xd71: 0x0dde, 0xd72: 0x0dfe, 0xd73: 0x0e1e, 0xd74: 0x0e3e, 0xd75: 0x0e5e,
-	0xd76: 0x0019, 0xd77: 0x02e9, 0xd78: 0x03d9, 0xd79: 0x02f1, 0xd7a: 0x02f9, 0xd7b: 0x03f1,
-	0xd7c: 0x0309, 0xd7d: 0x00a9, 0xd7e: 0x0311, 0xd7f: 0x00b1,
+	0xd76: 0x0039, 0xd77: 0x0ee9, 0xd78: 0x1159, 0xd79: 0x0ef9, 0xd7a: 0x0f09, 0xd7b: 0x1199,
+	0xd7c: 0x0f31, 0xd7d: 0x0249, 0xd7e: 0x0f41, 0xd7f: 0x0259,
 	// Block 0x36, offset 0xd80
-	0xd80: 0x0319, 0xd81: 0x0101, 0xd82: 0x0321, 0xd83: 0x0329, 0xd84: 0x0051, 0xd85: 0x0339,
-	0xd86: 0x0751, 0xd87: 0x00b9, 0xd88: 0x0089, 0xd89: 0x0341, 0xd8a: 0x0349, 0xd8b: 0x0391,
-	0xd8c: 0x00c1, 0xd8d: 0x0109, 0xd8e: 0x00c9, 0xd8f: 0x04b1, 0xd90: 0x0019, 0xd91: 0x02e9,
-	0xd92: 0x03d9, 0xd93: 0x02f1, 0xd94: 0x02f9, 0xd95: 0x03f1, 0xd96: 0x0309, 0xd97: 0x00a9,
-	0xd98: 0x0311, 0xd99: 0x00b1, 0xd9a: 0x0319, 0xd9b: 0x0101, 0xd9c: 0x0321, 0xd9d: 0x0329,
-	0xd9e: 0x0051, 0xd9f: 0x0339, 0xda0: 0x0751, 0xda1: 0x00b9, 0xda2: 0x0089, 0xda3: 0x0341,
-	0xda4: 0x0349, 0xda5: 0x0391, 0xda6: 0x00c1, 0xda7: 0x0109, 0xda8: 0x00c9, 0xda9: 0x04b1,
-	0xdaa: 0x06e1, 0xdab: 0x0018, 0xdac: 0x0018, 0xdad: 0x0018, 0xdae: 0x0018, 0xdaf: 0x0018,
+	0xd80: 0x0f51, 0xd81: 0x0359, 0xd82: 0x0f61, 0xd83: 0x0f71, 0xd84: 0x00d9, 0xd85: 0x0f99,
+	0xd86: 0x2039, 0xd87: 0x0269, 0xd88: 0x01d9, 0xd89: 0x0fa9, 0xd8a: 0x0fb9, 0xd8b: 0x1089,
+	0xd8c: 0x0279, 0xd8d: 0x0369, 0xd8e: 0x0289, 0xd8f: 0x13d1, 0xd90: 0x0039, 0xd91: 0x0ee9,
+	0xd92: 0x1159, 0xd93: 0x0ef9, 0xd94: 0x0f09, 0xd95: 0x1199, 0xd96: 0x0f31, 0xd97: 0x0249,
+	0xd98: 0x0f41, 0xd99: 0x0259, 0xd9a: 0x0f51, 0xd9b: 0x0359, 0xd9c: 0x0f61, 0xd9d: 0x0f71,
+	0xd9e: 0x00d9, 0xd9f: 0x0f99, 0xda0: 0x2039, 0xda1: 0x0269, 0xda2: 0x01d9, 0xda3: 0x0fa9,
+	0xda4: 0x0fb9, 0xda5: 0x1089, 0xda6: 0x0279, 0xda7: 0x0369, 0xda8: 0x0289, 0xda9: 0x13d1,
+	0xdaa: 0x1f41, 0xdab: 0x0018, 0xdac: 0x0018, 0xdad: 0x0018, 0xdae: 0x0018, 0xdaf: 0x0018,
 	0xdb0: 0x0018, 0xdb1: 0x0018, 0xdb2: 0x0018, 0xdb3: 0x0018, 0xdb4: 0x0018, 0xdb5: 0x0018,
 	0xdb6: 0x0018, 0xdb7: 0x0018, 0xdb8: 0x0018, 0xdb9: 0x0018, 0xdba: 0x0018, 0xdbb: 0x0018,
 	0xdbc: 0x0018, 0xdbd: 0x0018, 0xdbe: 0x0018, 0xdbf: 0x0018,
@@ -1365,12 +1223,12 @@ var idnaValues = [8192]uint16{
 	0xdcc: 0x0008, 0xdcd: 0x0008, 0xdce: 0x0008, 0xdcf: 0x0008, 0xdd0: 0x0008, 0xdd1: 0x0008,
 	0xdd2: 0x0008, 0xdd3: 0x0008, 0xdd4: 0x0008, 0xdd5: 0x0008, 0xdd6: 0x0008, 0xdd7: 0x0008,
 	0xdd8: 0x0008, 0xdd9: 0x0008, 0xdda: 0x0008, 0xddb: 0x0008, 0xddc: 0x0008, 0xddd: 0x0008,
-	0xdde: 0x0008, 0xddf: 0x0040, 0xde0: 0xe00d, 0xde1: 0x0008, 0xde2: 0x0941, 0xde3: 0x0ed5,
-	0xde4: 0x0949, 0xde5: 0x0008, 0xde6: 0x0008, 0xde7: 0xe07d, 0xde8: 0x0008, 0xde9: 0xe01d,
-	0xdea: 0x0008, 0xdeb: 0xe03d, 0xdec: 0x0008, 0xded: 0x0359, 0xdee: 0x0441, 0xdef: 0x0351,
-	0xdf0: 0x03d1, 0xdf1: 0x0008, 0xdf2: 0xe00d, 0xdf3: 0x0008, 0xdf4: 0x0008, 0xdf5: 0xe01d,
+	0xdde: 0x0008, 0xddf: 0x0040, 0xde0: 0xe00d, 0xde1: 0x0008, 0xde2: 0x2971, 0xde3: 0x0ed5,
+	0xde4: 0x2989, 0xde5: 0x0008, 0xde6: 0x0008, 0xde7: 0xe07d, 0xde8: 0x0008, 0xde9: 0xe01d,
+	0xdea: 0x0008, 0xdeb: 0xe03d, 0xdec: 0x0008, 0xded: 0x0fe1, 0xdee: 0x1281, 0xdef: 0x0fc9,
+	0xdf0: 0x1141, 0xdf1: 0x0008, 0xdf2: 0xe00d, 0xdf3: 0x0008, 0xdf4: 0x0008, 0xdf5: 0xe01d,
 	0xdf6: 0x0008, 0xdf7: 0x0008, 0xdf8: 0x0008, 0xdf9: 0x0008, 0xdfa: 0x0008, 0xdfb: 0x0008,
-	0xdfc: 0x00b1, 0xdfd: 0x0391, 0xdfe: 0x0951, 0xdff: 0x0959,
+	0xdfc: 0x0259, 0xdfd: 0x1089, 0xdfe: 0x29a1, 0xdff: 0x29b9,
 	// Block 0x38, offset 0xe00
 	0xe00: 0xe00d, 0xe01: 0x0008, 0xe02: 0xe00d, 0xe03: 0x0008, 0xe04: 0xe00d, 0xe05: 0x0008,
 	0xe06: 0xe00d, 0xe07: 0x0008, 0xe08: 0xe00d, 0xe09: 0x0008, 0xe0a: 0xe00d, 0xe0b: 0x0008,
@@ -1396,7 +1254,7 @@ var idnaValues = [8192]uint16{
 	0xe76: 0x0040, 0xe77: 0x0040, 0xe78: 0x0040, 0xe79: 0x0040, 0xe7a: 0x0040, 0xe7b: 0x0040,
 	0xe7c: 0x0040, 0xe7d: 0x0040, 0xe7e: 0x0040, 0xe7f: 0x0040,
 	// Block 0x3a, offset 0xe80
-	0xe80: 0x000a, 0xe81: 0x0018, 0xe82: 0x0961, 0xe83: 0x0018, 0xe84: 0x0018, 0xe85: 0x0008,
+	0xe80: 0x000a, 0xe81: 0x0018, 0xe82: 0x29d1, 0xe83: 0x0018, 0xe84: 0x0018, 0xe85: 0x0008,
 	0xe86: 0x0008, 0xe87: 0x0008, 0xe88: 0x0018, 0xe89: 0x0018, 0xe8a: 0x0018, 0xe8b: 0x0018,
 	0xe8c: 0x0018, 0xe8d: 0x0018, 0xe8e: 0x0018, 0xe8f: 0x0018, 0xe90: 0x0018, 0xe91: 0x0018,
 	0xe92: 0x0018, 0xe93: 0x0018, 0xe94: 0x0018, 0xe95: 0x0018, 0xe96: 0x0018, 0xe97: 0x0018,
@@ -1432,17 +1290,17 @@ var idnaValues = [8192]uint16{
 	0xf36: 0x0008, 0xf37: 0x0008, 0xf38: 0x0008, 0xf39: 0x0008, 0xf3a: 0x0008, 0xf3b: 0x0008,
 	0xf3c: 0x0008, 0xf3d: 0x0008, 0xf3e: 0x0008, 0xf3f: 0x0008,
 	// Block 0x3d, offset 0xf40
-	0xf40: 0x0b82, 0xf41: 0x0b8a, 0xf42: 0x0b92, 0xf43: 0x0b9a, 0xf44: 0x32d5, 0xf45: 0x32f5,
+	0xf40: 0x36a2, 0xf41: 0x36d2, 0xf42: 0x3702, 0xf43: 0x3732, 0xf44: 0x32d5, 0xf45: 0x32f5,
 	0xf46: 0x3315, 0xf47: 0x3335, 0xf48: 0x0018, 0xf49: 0x0018, 0xf4a: 0x0018, 0xf4b: 0x0018,
-	0xf4c: 0x0018, 0xf4d: 0x0018, 0xf4e: 0x0018, 0xf4f: 0x0018, 0xf50: 0x3355, 0xf51: 0x0ba1,
-	0xf52: 0x0ba9, 0xf53: 0x0bb1, 0xf54: 0x0bb9, 0xf55: 0x0bc1, 0xf56: 0x0bc9, 0xf57: 0x0bd1,
-	0xf58: 0x0bd9, 0xf59: 0x0be1, 0xf5a: 0x0be9, 0xf5b: 0x0bf1, 0xf5c: 0x0bf9, 0xf5d: 0x0c01,
-	0xf5e: 0x0c09, 0xf5f: 0x0c11, 0xf60: 0x3375, 0xf61: 0x3395, 0xf62: 0x33b5, 0xf63: 0x33d5,
+	0xf4c: 0x0018, 0xf4d: 0x0018, 0xf4e: 0x0018, 0xf4f: 0x0018, 0xf50: 0x3355, 0xf51: 0x3761,
+	0xf52: 0x3779, 0xf53: 0x3791, 0xf54: 0x37a9, 0xf55: 0x37c1, 0xf56: 0x37d9, 0xf57: 0x37f1,
+	0xf58: 0x3809, 0xf59: 0x3821, 0xf5a: 0x3839, 0xf5b: 0x3851, 0xf5c: 0x3869, 0xf5d: 0x3881,
+	0xf5e: 0x3899, 0xf5f: 0x38b1, 0xf60: 0x3375, 0xf61: 0x3395, 0xf62: 0x33b5, 0xf63: 0x33d5,
 	0xf64: 0x33f5, 0xf65: 0x33f5, 0xf66: 0x3415, 0xf67: 0x3435, 0xf68: 0x3455, 0xf69: 0x3475,
 	0xf6a: 0x3495, 0xf6b: 0x34b5, 0xf6c: 0x34d5, 0xf6d: 0x34f5, 0xf6e: 0x3515, 0xf6f: 0x3535,
 	0xf70: 0x3555, 0xf71: 0x3575, 0xf72: 0x3595, 0xf73: 0x35b5, 0xf74: 0x35d5, 0xf75: 0x35f5,
 	0xf76: 0x3615, 0xf77: 0x3635, 0xf78: 0x3655, 0xf79: 0x3675, 0xf7a: 0x3695, 0xf7b: 0x36b5,
-	0xf7c: 0x0c19, 0xf7d: 0x0c21, 0xf7e: 0x36d5, 0xf7f: 0x0018,
+	0xf7c: 0x38c9, 0xf7d: 0x3901, 0xf7e: 0x36d5, 0xf7f: 0x0018,
 	// Block 0x3e, offset 0xf80
 	0xf80: 0x36f5, 0xf81: 0x3715, 0xf82: 0x3735, 0xf83: 0x3755, 0xf84: 0x3775, 0xf85: 0x3795,
 	0xf86: 0x37b5, 0xf87: 0x37d5, 0xf88: 0x37f5, 0xf89: 0x3815, 0xf8a: 0x3835, 0xf8b: 0x3855,
@@ -1452,13 +1310,13 @@ var idnaValues = [8192]uint16{
 	0xf9e: 0x3ab5, 0xf9f: 0x3ad5, 0xfa0: 0x3af5, 0xfa1: 0x3b15, 0xfa2: 0x3b35, 0xfa3: 0x3b55,
 	0xfa4: 0x3b75, 0xfa5: 0x3b95, 0xfa6: 0x1295, 0xfa7: 0x3bb5, 0xfa8: 0x3bd5, 0xfa9: 0x3bf5,
 	0xfaa: 0x3c15, 0xfab: 0x3c35, 0xfac: 0x3c55, 0xfad: 0x3c75, 0xfae: 0x23b5, 0xfaf: 0x3c95,
-	0xfb0: 0x3cb5, 0xfb1: 0x0c29, 0xfb2: 0x0c31, 0xfb3: 0x0c39, 0xfb4: 0x0c41, 0xfb5: 0x0c49,
-	0xfb6: 0x0c51, 0xfb7: 0x0c59, 0xfb8: 0x0c61, 0xfb9: 0x0c69, 0xfba: 0x0c71, 0xfbb: 0x0c79,
-	0xfbc: 0x0c81, 0xfbd: 0x0c89, 0xfbe: 0x0c91, 0xfbf: 0x0c99,
+	0xfb0: 0x3cb5, 0xfb1: 0x3939, 0xfb2: 0x3951, 0xfb3: 0x3969, 0xfb4: 0x3981, 0xfb5: 0x3999,
+	0xfb6: 0x39b1, 0xfb7: 0x39c9, 0xfb8: 0x39e1, 0xfb9: 0x39f9, 0xfba: 0x3a11, 0xfbb: 0x3a29,
+	0xfbc: 0x3a41, 0xfbd: 0x3a59, 0xfbe: 0x3a71, 0xfbf: 0x3a89,
 	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x0ca1, 0xfc1: 0x0ca9, 0xfc2: 0x0cb1, 0xfc3: 0x0cb9, 0xfc4: 0x0cc1, 0xfc5: 0x0cc9,
-	0xfc6: 0x0cd1, 0xfc7: 0x0cd9, 0xfc8: 0x0ce1, 0xfc9: 0x0ce9, 0xfca: 0x0cf1, 0xfcb: 0x0cf9,
-	0xfcc: 0x0d01, 0xfcd: 0x3cd5, 0xfce: 0x0d09, 0xfcf: 0x3cf5, 0xfd0: 0x3d15, 0xfd1: 0x3d2d,
+	0xfc0: 0x3aa1, 0xfc1: 0x3ac9, 0xfc2: 0x3af1, 0xfc3: 0x3b19, 0xfc4: 0x3b41, 0xfc5: 0x3b69,
+	0xfc6: 0x3b91, 0xfc7: 0x3bb9, 0xfc8: 0x3be1, 0xfc9: 0x3c09, 0xfca: 0x3c39, 0xfcb: 0x3c69,
+	0xfcc: 0x3c99, 0xfcd: 0x3cd5, 0xfce: 0x3cb1, 0xfcf: 0x3cf5, 0xfd0: 0x3d15, 0xfd1: 0x3d2d,
 	0xfd2: 0x3d45, 0xfd3: 0x3d5d, 0xfd4: 0x3d75, 0xfd5: 0x3d75, 0xfd6: 0x3d5d, 0xfd7: 0x3d8d,
 	0xfd8: 0x07d5, 0xfd9: 0x3da5, 0xfda: 0x3dbd, 0xfdb: 0x3dd5, 0xfdc: 0x3ded, 0xfdd: 0x3e05,
 	0xfde: 0x3e1d, 0xfdf: 0x3e35, 0xfe0: 0x3e4d, 0xfe1: 0x3e65, 0xfe2: 0x3e7d, 0xfe3: 0x3e95,
@@ -1466,769 +1324,769 @@ var idnaValues = [8192]uint16{
 	0xfea: 0x3ef5, 0xfeb: 0x3f0d, 0xfec: 0x3f25, 0xfed: 0x3f3d, 0xfee: 0x3f55, 0xfef: 0x3f55,
 	0xff0: 0x3f6d, 0xff1: 0x3f6d, 0xff2: 0x3f6d, 0xff3: 0x3f85, 0xff4: 0x3f9d, 0xff5: 0x3fb5,
 	0xff6: 0x3fcd, 0xff7: 0x3fb5, 0xff8: 0x3fe5, 0xff9: 0x3ffd, 0xffa: 0x3f85, 0xffb: 0x4015,
-	0xffc: 0x402d, 0xffd: 0x402d, 0xffe: 0x402d, 0xfff: 0x0d11,
+	0xffc: 0x402d, 0xffd: 0x402d, 0xffe: 0x402d, 0xfff: 0x3cc9,
 	// Block 0x40, offset 0x1000
-	0x1000: 0x10f9, 0x1001: 0x1101, 0x1002: 0x40a5, 0x1003: 0x1109, 0x1004: 0x1111, 0x1005: 0x1119,
-	0x1006: 0x1121, 0x1007: 0x1129, 0x1008: 0x40c5, 0x1009: 0x1131, 0x100a: 0x1139, 0x100b: 0x1141,
-	0x100c: 0x40e5, 0x100d: 0x40e5, 0x100e: 0x1149, 0x100f: 0x1151, 0x1010: 0x1159, 0x1011: 0x4105,
-	0x1012: 0x4125, 0x1013: 0x4145, 0x1014: 0x4165, 0x1015: 0x4185, 0x1016: 0x1161, 0x1017: 0x1169,
-	0x1018: 0x1171, 0x1019: 0x1179, 0x101a: 0x1181, 0x101b: 0x41a5, 0x101c: 0x1189, 0x101d: 0x1191,
-	0x101e: 0x1199, 0x101f: 0x41c5, 0x1020: 0x41e5, 0x1021: 0x11a1, 0x1022: 0x4205, 0x1023: 0x4225,
-	0x1024: 0x4245, 0x1025: 0x11a9, 0x1026: 0x4265, 0x1027: 0x11b1, 0x1028: 0x11b9, 0x1029: 0x10f9,
-	0x102a: 0x4285, 0x102b: 0x42a5, 0x102c: 0x42c5, 0x102d: 0x42e5, 0x102e: 0x11c1, 0x102f: 0x11c9,
-	0x1030: 0x11d1, 0x1031: 0x11d9, 0x1032: 0x4305, 0x1033: 0x11e1, 0x1034: 0x11e9, 0x1035: 0x11f1,
-	0x1036: 0x4325, 0x1037: 0x11f9, 0x1038: 0x1201, 0x1039: 0x11f9, 0x103a: 0x1209, 0x103b: 0x1211,
-	0x103c: 0x4345, 0x103d: 0x1219, 0x103e: 0x1221, 0x103f: 0x1219,
+	0x1000: 0x3d01, 0x1001: 0x3d69, 0x1002: 0x3dd1, 0x1003: 0x3e39, 0x1004: 0x3e89, 0x1005: 0x3ef1,
+	0x1006: 0x3f41, 0x1007: 0x3f91, 0x1008: 0x4011, 0x1009: 0x4079, 0x100a: 0x40c9, 0x100b: 0x4119,
+	0x100c: 0x4169, 0x100d: 0x41d1, 0x100e: 0x4239, 0x100f: 0x4289, 0x1010: 0x42d9, 0x1011: 0x4311,
+	0x1012: 0x4361, 0x1013: 0x43c9, 0x1014: 0x4431, 0x1015: 0x4469, 0x1016: 0x44e9, 0x1017: 0x4581,
+	0x1018: 0x4601, 0x1019: 0x4651, 0x101a: 0x46d1, 0x101b: 0x4751, 0x101c: 0x47b9, 0x101d: 0x4809,
+	0x101e: 0x4859, 0x101f: 0x48a9, 0x1020: 0x4911, 0x1021: 0x4991, 0x1022: 0x49f9, 0x1023: 0x4a49,
+	0x1024: 0x4a99, 0x1025: 0x4ae9, 0x1026: 0x4b21, 0x1027: 0x4b59, 0x1028: 0x4b91, 0x1029: 0x4bc9,
+	0x102a: 0x4c19, 0x102b: 0x4c69, 0x102c: 0x4ce9, 0x102d: 0x4d39, 0x102e: 0x4da1, 0x102f: 0x4e21,
+	0x1030: 0x4e71, 0x1031: 0x4ea9, 0x1032: 0x4ee1, 0x1033: 0x4f61, 0x1034: 0x4fc9, 0x1035: 0x5049,
+	0x1036: 0x5099, 0x1037: 0x5119, 0x1038: 0x5151, 0x1039: 0x51a1, 0x103a: 0x51f1, 0x103b: 0x5241,
+	0x103c: 0x5291, 0x103d: 0x52e1, 0x103e: 0x5349, 0x103f: 0x5399,
 	// Block 0x41, offset 0x1040
-	0x1040: 0x4365, 0x1041: 0x4385, 0x1042: 0x0040, 0x1043: 0x1229, 0x1044: 0x1231, 0x1045: 0x1239,
-	0x1046: 0x1241, 0x1047: 0x0040, 0x1048: 0x1249, 0x1049: 0x1251, 0x104a: 0x1259, 0x104b: 0x1261,
-	0x104c: 0x1269, 0x104d: 0x1271, 0x104e: 0x1199, 0x104f: 0x1279, 0x1050: 0x1281, 0x1051: 0x1289,
-	0x1052: 0x43a5, 0x1053: 0x1291, 0x1054: 0x1121, 0x1055: 0x43c5, 0x1056: 0x43e5, 0x1057: 0x1299,
-	0x1058: 0x0040, 0x1059: 0x4405, 0x105a: 0x12a1, 0x105b: 0x12a9, 0x105c: 0x12b1, 0x105d: 0x12b9,
-	0x105e: 0x12c1, 0x105f: 0x12c9, 0x1060: 0x12d1, 0x1061: 0x12d9, 0x1062: 0x12e1, 0x1063: 0x12e9,
-	0x1064: 0x12f1, 0x1065: 0x12f9, 0x1066: 0x1301, 0x1067: 0x1309, 0x1068: 0x1311, 0x1069: 0x1319,
-	0x106a: 0x1321, 0x106b: 0x1329, 0x106c: 0x1331, 0x106d: 0x1339, 0x106e: 0x1341, 0x106f: 0x1349,
-	0x1070: 0x1351, 0x1071: 0x1359, 0x1072: 0x1361, 0x1073: 0x1369, 0x1074: 0x1371, 0x1075: 0x1379,
-	0x1076: 0x1381, 0x1077: 0x1389, 0x1078: 0x1391, 0x1079: 0x1399, 0x107a: 0x13a1, 0x107b: 0x13a9,
-	0x107c: 0x13b1, 0x107d: 0x13b9, 0x107e: 0x13c1, 0x107f: 0x4425,
+	0x1040: 0x53d1, 0x1041: 0x5421, 0x1042: 0x5471, 0x1043: 0x54c1, 0x1044: 0x5529, 0x1045: 0x5579,
+	0x1046: 0x55c9, 0x1047: 0x5619, 0x1048: 0x5699, 0x1049: 0x5701, 0x104a: 0x5739, 0x104b: 0x57b9,
+	0x104c: 0x57f1, 0x104d: 0x5859, 0x104e: 0x58c1, 0x104f: 0x5911, 0x1050: 0x5961, 0x1051: 0x59b1,
+	0x1052: 0x5a19, 0x1053: 0x5a51, 0x1054: 0x5aa1, 0x1055: 0x5b09, 0x1056: 0x5b41, 0x1057: 0x5bc1,
+	0x1058: 0x5c11, 0x1059: 0x5c39, 0x105a: 0x5c61, 0x105b: 0x5c89, 0x105c: 0x5cb1, 0x105d: 0x5cd9,
+	0x105e: 0x5d01, 0x105f: 0x5d29, 0x1060: 0x5d51, 0x1061: 0x5d79, 0x1062: 0x5da1, 0x1063: 0x5dd1,
+	0x1064: 0x5e01, 0x1065: 0x5e31, 0x1066: 0x5e61, 0x1067: 0x5e91, 0x1068: 0x5ec1, 0x1069: 0x5ef1,
+	0x106a: 0x5f21, 0x106b: 0x5f51, 0x106c: 0x5f81, 0x106d: 0x5fb1, 0x106e: 0x5fe1, 0x106f: 0x6011,
+	0x1070: 0x6041, 0x1071: 0x4045, 0x1072: 0x6071, 0x1073: 0x6089, 0x1074: 0x4065, 0x1075: 0x60a1,
+	0x1076: 0x60b9, 0x1077: 0x60d1, 0x1078: 0x4085, 0x1079: 0x4085, 0x107a: 0x60e9, 0x107b: 0x6101,
+	0x107c: 0x6139, 0x107d: 0x6171, 0x107e: 0x61a9, 0x107f: 0x61e1,
 	// Block 0x42, offset 0x1080
-	0x1080: 0xe00d, 0x1081: 0x0008, 0x1082: 0xe00d, 0x1083: 0x0008, 0x1084: 0xe00d, 0x1085: 0x0008,
-	0x1086: 0xe00d, 0x1087: 0x0008, 0x1088: 0xe00d, 0x1089: 0x0008, 0x108a: 0xe00d, 0x108b: 0x0008,
-	0x108c: 0xe00d, 0x108d: 0x0008, 0x108e: 0xe00d, 0x108f: 0x0008, 0x1090: 0xe00d, 0x1091: 0x0008,
-	0x1092: 0xe00d, 0x1093: 0x0008, 0x1094: 0xe00d, 0x1095: 0x0008, 0x1096: 0xe00d, 0x1097: 0x0008,
-	0x1098: 0xe00d, 0x1099: 0x0008, 0x109a: 0xe00d, 0x109b: 0x0008, 0x109c: 0xe00d, 0x109d: 0x0008,
-	0x109e: 0xe00d, 0x109f: 0x0008, 0x10a0: 0xe00d, 0x10a1: 0x0008, 0x10a2: 0xe00d, 0x10a3: 0x0008,
-	0x10a4: 0xe00d, 0x10a5: 0x0008, 0x10a6: 0xe00d, 0x10a7: 0x0008, 0x10a8: 0xe00d, 0x10a9: 0x0008,
-	0x10aa: 0xe00d, 0x10ab: 0x0008, 0x10ac: 0xe00d, 0x10ad: 0x0008, 0x10ae: 0x0008, 0x10af: 0x3308,
-	0x10b0: 0x3318, 0x10b1: 0x3318, 0x10b2: 0x3318, 0x10b3: 0x0018, 0x10b4: 0x3308, 0x10b5: 0x3308,
-	0x10b6: 0x3308, 0x10b7: 0x3308, 0x10b8: 0x3308, 0x10b9: 0x3308, 0x10ba: 0x3308, 0x10bb: 0x3308,
-	0x10bc: 0x3308, 0x10bd: 0x3308, 0x10be: 0x0018, 0x10bf: 0x0008,
+	0x1080: 0x6249, 0x1081: 0x6261, 0x1082: 0x40a5, 0x1083: 0x6279, 0x1084: 0x6291, 0x1085: 0x62a9,
+	0x1086: 0x62c1, 0x1087: 0x62d9, 0x1088: 0x40c5, 0x1089: 0x62f1, 0x108a: 0x6319, 0x108b: 0x6331,
+	0x108c: 0x40e5, 0x108d: 0x40e5, 0x108e: 0x6349, 0x108f: 0x6361, 0x1090: 0x6379, 0x1091: 0x4105,
+	0x1092: 0x4125, 0x1093: 0x4145, 0x1094: 0x4165, 0x1095: 0x4185, 0x1096: 0x6391, 0x1097: 0x63a9,
+	0x1098: 0x63c1, 0x1099: 0x63d9, 0x109a: 0x63f1, 0x109b: 0x41a5, 0x109c: 0x6409, 0x109d: 0x6421,
+	0x109e: 0x6439, 0x109f: 0x41c5, 0x10a0: 0x41e5, 0x10a1: 0x6451, 0x10a2: 0x4205, 0x10a3: 0x4225,
+	0x10a4: 0x4245, 0x10a5: 0x6469, 0x10a6: 0x4265, 0x10a7: 0x6481, 0x10a8: 0x64b1, 0x10a9: 0x6249,
+	0x10aa: 0x4285, 0x10ab: 0x42a5, 0x10ac: 0x42c5, 0x10ad: 0x42e5, 0x10ae: 0x64e9, 0x10af: 0x6529,
+	0x10b0: 0x6571, 0x10b1: 0x6589, 0x10b2: 0x4305, 0x10b3: 0x65a1, 0x10b4: 0x65b9, 0x10b5: 0x65d1,
+	0x10b6: 0x4325, 0x10b7: 0x65e9, 0x10b8: 0x6601, 0x10b9: 0x65e9, 0x10ba: 0x6619, 0x10bb: 0x6631,
+	0x10bc: 0x4345, 0x10bd: 0x6649, 0x10be: 0x6661, 0x10bf: 0x6649,
 	// Block 0x43, offset 0x10c0
-	0x10c0: 0xe00d, 0x10c1: 0x0008, 0x10c2: 0xe00d, 0x10c3: 0x0008, 0x10c4: 0xe00d, 0x10c5: 0x0008,
-	0x10c6: 0xe00d, 0x10c7: 0x0008, 0x10c8: 0xe00d, 0x10c9: 0x0008, 0x10ca: 0xe00d, 0x10cb: 0x0008,
-	0x10cc: 0xe00d, 0x10cd: 0x0008, 0x10ce: 0xe00d, 0x10cf: 0x0008, 0x10d0: 0xe00d, 0x10d1: 0x0008,
-	0x10d2: 0xe00d, 0x10d3: 0x0008, 0x10d4: 0xe00d, 0x10d5: 0x0008, 0x10d6: 0xe00d, 0x10d7: 0x0008,
-	0x10d8: 0xe00d, 0x10d9: 0x0008, 0x10da: 0xe00d, 0x10db: 0x0008, 0x10dc: 0x02d1, 0x10dd: 0x13c9,
-	0x10de: 0x3308, 0x10df: 0x3308, 0x10e0: 0x0008, 0x10e1: 0x0008, 0x10e2: 0x0008, 0x10e3: 0x0008,
-	0x10e4: 0x0008, 0x10e5: 0x0008, 0x10e6: 0x0008, 0x10e7: 0x0008, 0x10e8: 0x0008, 0x10e9: 0x0008,
-	0x10ea: 0x0008, 0x10eb: 0x0008, 0x10ec: 0x0008, 0x10ed: 0x0008, 0x10ee: 0x0008, 0x10ef: 0x0008,
-	0x10f0: 0x0008, 0x10f1: 0x0008, 0x10f2: 0x0008, 0x10f3: 0x0008, 0x10f4: 0x0008, 0x10f5: 0x0008,
-	0x10f6: 0x0008, 0x10f7: 0x0008, 0x10f8: 0x0008, 0x10f9: 0x0008, 0x10fa: 0x0008, 0x10fb: 0x0008,
-	0x10fc: 0x0008, 0x10fd: 0x0008, 0x10fe: 0x0008, 0x10ff: 0x0008,
+	0x10c0: 0x4365, 0x10c1: 0x4385, 0x10c2: 0x0040, 0x10c3: 0x6679, 0x10c4: 0x6691, 0x10c5: 0x66a9,
+	0x10c6: 0x66c1, 0x10c7: 0x0040, 0x10c8: 0x66f9, 0x10c9: 0x6711, 0x10ca: 0x6729, 0x10cb: 0x6741,
+	0x10cc: 0x6759, 0x10cd: 0x6771, 0x10ce: 0x6439, 0x10cf: 0x6789, 0x10d0: 0x67a1, 0x10d1: 0x67b9,
+	0x10d2: 0x43a5, 0x10d3: 0x67d1, 0x10d4: 0x62c1, 0x10d5: 0x43c5, 0x10d6: 0x43e5, 0x10d7: 0x67e9,
+	0x10d8: 0x0040, 0x10d9: 0x4405, 0x10da: 0x6801, 0x10db: 0x6819, 0x10dc: 0x6831, 0x10dd: 0x6849,
+	0x10de: 0x6861, 0x10df: 0x6891, 0x10e0: 0x68c1, 0x10e1: 0x68e9, 0x10e2: 0x6911, 0x10e3: 0x6939,
+	0x10e4: 0x6961, 0x10e5: 0x6989, 0x10e6: 0x69b1, 0x10e7: 0x69d9, 0x10e8: 0x6a01, 0x10e9: 0x6a29,
+	0x10ea: 0x6a59, 0x10eb: 0x6a89, 0x10ec: 0x6ab9, 0x10ed: 0x6ae9, 0x10ee: 0x6b19, 0x10ef: 0x6b49,
+	0x10f0: 0x6b79, 0x10f1: 0x6ba9, 0x10f2: 0x6bd9, 0x10f3: 0x6c09, 0x10f4: 0x6c39, 0x10f5: 0x6c69,
+	0x10f6: 0x6c99, 0x10f7: 0x6cc9, 0x10f8: 0x6cf9, 0x10f9: 0x6d29, 0x10fa: 0x6d59, 0x10fb: 0x6d89,
+	0x10fc: 0x6db9, 0x10fd: 0x6de9, 0x10fe: 0x6e19, 0x10ff: 0x4425,
 	// Block 0x44, offset 0x1100
-	0x1100: 0x0018, 0x1101: 0x0018, 0x1102: 0x0018, 0x1103: 0x0018, 0x1104: 0x0018, 0x1105: 0x0018,
-	0x1106: 0x0018, 0x1107: 0x0018, 0x1108: 0x0018, 0x1109: 0x0018, 0x110a: 0x0018, 0x110b: 0x0018,
-	0x110c: 0x0018, 0x110d: 0x0018, 0x110e: 0x0018, 0x110f: 0x0018, 0x1110: 0x0018, 0x1111: 0x0018,
-	0x1112: 0x0018, 0x1113: 0x0018, 0x1114: 0x0018, 0x1115: 0x0018, 0x1116: 0x0018, 0x1117: 0x0008,
-	0x1118: 0x0008, 0x1119: 0x0008, 0x111a: 0x0008, 0x111b: 0x0008, 0x111c: 0x0008, 0x111d: 0x0008,
-	0x111e: 0x0008, 0x111f: 0x0008, 0x1120: 0x0018, 0x1121: 0x0018, 0x1122: 0xe00d, 0x1123: 0x0008,
+	0x1100: 0xe00d, 0x1101: 0x0008, 0x1102: 0xe00d, 0x1103: 0x0008, 0x1104: 0xe00d, 0x1105: 0x0008,
+	0x1106: 0xe00d, 0x1107: 0x0008, 0x1108: 0xe00d, 0x1109: 0x0008, 0x110a: 0xe00d, 0x110b: 0x0008,
+	0x110c: 0xe00d, 0x110d: 0x0008, 0x110e: 0xe00d, 0x110f: 0x0008, 0x1110: 0xe00d, 0x1111: 0x0008,
+	0x1112: 0xe00d, 0x1113: 0x0008, 0x1114: 0xe00d, 0x1115: 0x0008, 0x1116: 0xe00d, 0x1117: 0x0008,
+	0x1118: 0xe00d, 0x1119: 0x0008, 0x111a: 0xe00d, 0x111b: 0x0008, 0x111c: 0xe00d, 0x111d: 0x0008,
+	0x111e: 0xe00d, 0x111f: 0x0008, 0x1120: 0xe00d, 0x1121: 0x0008, 0x1122: 0xe00d, 0x1123: 0x0008,
 	0x1124: 0xe00d, 0x1125: 0x0008, 0x1126: 0xe00d, 0x1127: 0x0008, 0x1128: 0xe00d, 0x1129: 0x0008,
-	0x112a: 0xe00d, 0x112b: 0x0008, 0x112c: 0xe00d, 0x112d: 0x0008, 0x112e: 0xe00d, 0x112f: 0x0008,
-	0x1130: 0x0008, 0x1131: 0x0008, 0x1132: 0xe00d, 0x1133: 0x0008, 0x1134: 0xe00d, 0x1135: 0x0008,
-	0x1136: 0xe00d, 0x1137: 0x0008, 0x1138: 0xe00d, 0x1139: 0x0008, 0x113a: 0xe00d, 0x113b: 0x0008,
-	0x113c: 0xe00d, 0x113d: 0x0008, 0x113e: 0xe00d, 0x113f: 0x0008,
+	0x112a: 0xe00d, 0x112b: 0x0008, 0x112c: 0xe00d, 0x112d: 0x0008, 0x112e: 0x0008, 0x112f: 0x3308,
+	0x1130: 0x3318, 0x1131: 0x3318, 0x1132: 0x3318, 0x1133: 0x0018, 0x1134: 0x3308, 0x1135: 0x3308,
+	0x1136: 0x3308, 0x1137: 0x3308, 0x1138: 0x3308, 0x1139: 0x3308, 0x113a: 0x3308, 0x113b: 0x3308,
+	0x113c: 0x3308, 0x113d: 0x3308, 0x113e: 0x0018, 0x113f: 0x0008,
 	// Block 0x45, offset 0x1140
 	0x1140: 0xe00d, 0x1141: 0x0008, 0x1142: 0xe00d, 0x1143: 0x0008, 0x1144: 0xe00d, 0x1145: 0x0008,
 	0x1146: 0xe00d, 0x1147: 0x0008, 0x1148: 0xe00d, 0x1149: 0x0008, 0x114a: 0xe00d, 0x114b: 0x0008,
 	0x114c: 0xe00d, 0x114d: 0x0008, 0x114e: 0xe00d, 0x114f: 0x0008, 0x1150: 0xe00d, 0x1151: 0x0008,
 	0x1152: 0xe00d, 0x1153: 0x0008, 0x1154: 0xe00d, 0x1155: 0x0008, 0x1156: 0xe00d, 0x1157: 0x0008,
-	0x1158: 0xe00d, 0x1159: 0x0008, 0x115a: 0xe00d, 0x115b: 0x0008, 0x115c: 0xe00d, 0x115d: 0x0008,
-	0x115e: 0xe00d, 0x115f: 0x0008, 0x1160: 0xe00d, 0x1161: 0x0008, 0x1162: 0xe00d, 0x1163: 0x0008,
-	0x1164: 0xe00d, 0x1165: 0x0008, 0x1166: 0xe00d, 0x1167: 0x0008, 0x1168: 0xe00d, 0x1169: 0x0008,
-	0x116a: 0xe00d, 0x116b: 0x0008, 0x116c: 0xe00d, 0x116d: 0x0008, 0x116e: 0xe00d, 0x116f: 0x0008,
-	0x1170: 0xe0fd, 0x1171: 0x0008, 0x1172: 0x0008, 0x1173: 0x0008, 0x1174: 0x0008, 0x1175: 0x0008,
-	0x1176: 0x0008, 0x1177: 0x0008, 0x1178: 0x0008, 0x1179: 0xe01d, 0x117a: 0x0008, 0x117b: 0xe03d,
-	0x117c: 0x0008, 0x117d: 0x4445, 0x117e: 0xe00d, 0x117f: 0x0008,
+	0x1158: 0xe00d, 0x1159: 0x0008, 0x115a: 0xe00d, 0x115b: 0x0008, 0x115c: 0x0ea1, 0x115d: 0x6e49,
+	0x115e: 0x3308, 0x115f: 0x3308, 0x1160: 0x0008, 0x1161: 0x0008, 0x1162: 0x0008, 0x1163: 0x0008,
+	0x1164: 0x0008, 0x1165: 0x0008, 0x1166: 0x0008, 0x1167: 0x0008, 0x1168: 0x0008, 0x1169: 0x0008,
+	0x116a: 0x0008, 0x116b: 0x0008, 0x116c: 0x0008, 0x116d: 0x0008, 0x116e: 0x0008, 0x116f: 0x0008,
+	0x1170: 0x0008, 0x1171: 0x0008, 0x1172: 0x0008, 0x1173: 0x0008, 0x1174: 0x0008, 0x1175: 0x0008,
+	0x1176: 0x0008, 0x1177: 0x0008, 0x1178: 0x0008, 0x1179: 0x0008, 0x117a: 0x0008, 0x117b: 0x0008,
+	0x117c: 0x0008, 0x117d: 0x0008, 0x117e: 0x0008, 0x117f: 0x0008,
 	// Block 0x46, offset 0x1180
-	0x1180: 0xe00d, 0x1181: 0x0008, 0x1182: 0xe00d, 0x1183: 0x0008, 0x1184: 0xe00d, 0x1185: 0x0008,
-	0x1186: 0xe00d, 0x1187: 0x0008, 0x1188: 0x0008, 0x1189: 0x0018, 0x118a: 0x0018, 0x118b: 0xe03d,
-	0x118c: 0x0008, 0x118d: 0x0409, 0x118e: 0x0008, 0x118f: 0x0008, 0x1190: 0xe00d, 0x1191: 0x0008,
-	0x1192: 0xe00d, 0x1193: 0x0008, 0x1194: 0x0008, 0x1195: 0x0008, 0x1196: 0xe00d, 0x1197: 0x0008,
-	0x1198: 0xe00d, 0x1199: 0x0008, 0x119a: 0xe00d, 0x119b: 0x0008, 0x119c: 0xe00d, 0x119d: 0x0008,
-	0x119e: 0xe00d, 0x119f: 0x0008, 0x11a0: 0xe00d, 0x11a1: 0x0008, 0x11a2: 0xe00d, 0x11a3: 0x0008,
+	0x1180: 0x0018, 0x1181: 0x0018, 0x1182: 0x0018, 0x1183: 0x0018, 0x1184: 0x0018, 0x1185: 0x0018,
+	0x1186: 0x0018, 0x1187: 0x0018, 0x1188: 0x0018, 0x1189: 0x0018, 0x118a: 0x0018, 0x118b: 0x0018,
+	0x118c: 0x0018, 0x118d: 0x0018, 0x118e: 0x0018, 0x118f: 0x0018, 0x1190: 0x0018, 0x1191: 0x0018,
+	0x1192: 0x0018, 0x1193: 0x0018, 0x1194: 0x0018, 0x1195: 0x0018, 0x1196: 0x0018, 0x1197: 0x0008,
+	0x1198: 0x0008, 0x1199: 0x0008, 0x119a: 0x0008, 0x119b: 0x0008, 0x119c: 0x0008, 0x119d: 0x0008,
+	0x119e: 0x0008, 0x119f: 0x0008, 0x11a0: 0x0018, 0x11a1: 0x0018, 0x11a2: 0xe00d, 0x11a3: 0x0008,
 	0x11a4: 0xe00d, 0x11a5: 0x0008, 0x11a6: 0xe00d, 0x11a7: 0x0008, 0x11a8: 0xe00d, 0x11a9: 0x0008,
-	0x11aa: 0x13d1, 0x11ab: 0x0371, 0x11ac: 0x0401, 0x11ad: 0x13d9, 0x11ae: 0x0421, 0x11af: 0x0008,
-	0x11b0: 0x13e1, 0x11b1: 0x13e9, 0x11b2: 0x0429, 0x11b3: 0x4465, 0x11b4: 0xe00d, 0x11b5: 0x0008,
+	0x11aa: 0xe00d, 0x11ab: 0x0008, 0x11ac: 0xe00d, 0x11ad: 0x0008, 0x11ae: 0xe00d, 0x11af: 0x0008,
+	0x11b0: 0x0008, 0x11b1: 0x0008, 0x11b2: 0xe00d, 0x11b3: 0x0008, 0x11b4: 0xe00d, 0x11b5: 0x0008,
 	0x11b6: 0xe00d, 0x11b7: 0x0008, 0x11b8: 0xe00d, 0x11b9: 0x0008, 0x11ba: 0xe00d, 0x11bb: 0x0008,
 	0x11bc: 0xe00d, 0x11bd: 0x0008, 0x11be: 0xe00d, 0x11bf: 0x0008,
 	// Block 0x47, offset 0x11c0
-	0x11c0: 0x650d, 0x11c1: 0x652d, 0x11c2: 0x654d, 0x11c3: 0x656d, 0x11c4: 0x658d, 0x11c5: 0x65ad,
-	0x11c6: 0x65cd, 0x11c7: 0x65ed, 0x11c8: 0x660d, 0x11c9: 0x662d, 0x11ca: 0x664d, 0x11cb: 0x666d,
-	0x11cc: 0x668d, 0x11cd: 0x66ad, 0x11ce: 0x0008, 0x11cf: 0x0008, 0x11d0: 0x66cd, 0x11d1: 0x0008,
-	0x11d2: 0x66ed, 0x11d3: 0x0008, 0x11d4: 0x0008, 0x11d5: 0x670d, 0x11d6: 0x672d, 0x11d7: 0x674d,
-	0x11d8: 0x676d, 0x11d9: 0x678d, 0x11da: 0x67ad, 0x11db: 0x67cd, 0x11dc: 0x67ed, 0x11dd: 0x680d,
-	0x11de: 0x682d, 0x11df: 0x0008, 0x11e0: 0x684d, 0x11e1: 0x0008, 0x11e2: 0x686d, 0x11e3: 0x0008,
-	0x11e4: 0x0008, 0x11e5: 0x688d, 0x11e6: 0x68ad, 0x11e7: 0x0008, 0x11e8: 0x0008, 0x11e9: 0x0008,
-	0x11ea: 0x68cd, 0x11eb: 0x68ed, 0x11ec: 0x690d, 0x11ed: 0x692d, 0x11ee: 0x694d, 0x11ef: 0x696d,
-	0x11f0: 0x698d, 0x11f1: 0x69ad, 0x11f2: 0x69cd, 0x11f3: 0x69ed, 0x11f4: 0x6a0d, 0x11f5: 0x6a2d,
-	0x11f6: 0x6a4d, 0x11f7: 0x6a6d, 0x11f8: 0x6a8d, 0x11f9: 0x6aad, 0x11fa: 0x6acd, 0x11fb: 0x6aed,
-	0x11fc: 0x6b0d, 0x11fd: 0x6b2d, 0x11fe: 0x6b4d, 0x11ff: 0x6b6d,
+	0x11c0: 0xe00d, 0x11c1: 0x0008, 0x11c2: 0xe00d, 0x11c3: 0x0008, 0x11c4: 0xe00d, 0x11c5: 0x0008,
+	0x11c6: 0xe00d, 0x11c7: 0x0008, 0x11c8: 0xe00d, 0x11c9: 0x0008, 0x11ca: 0xe00d, 0x11cb: 0x0008,
+	0x11cc: 0xe00d, 0x11cd: 0x0008, 0x11ce: 0xe00d, 0x11cf: 0x0008, 0x11d0: 0xe00d, 0x11d1: 0x0008,
+	0x11d2: 0xe00d, 0x11d3: 0x0008, 0x11d4: 0xe00d, 0x11d5: 0x0008, 0x11d6: 0xe00d, 0x11d7: 0x0008,
+	0x11d8: 0xe00d, 0x11d9: 0x0008, 0x11da: 0xe00d, 0x11db: 0x0008, 0x11dc: 0xe00d, 0x11dd: 0x0008,
+	0x11de: 0xe00d, 0x11df: 0x0008, 0x11e0: 0xe00d, 0x11e1: 0x0008, 0x11e2: 0xe00d, 0x11e3: 0x0008,
+	0x11e4: 0xe00d, 0x11e5: 0x0008, 0x11e6: 0xe00d, 0x11e7: 0x0008, 0x11e8: 0xe00d, 0x11e9: 0x0008,
+	0x11ea: 0xe00d, 0x11eb: 0x0008, 0x11ec: 0xe00d, 0x11ed: 0x0008, 0x11ee: 0xe00d, 0x11ef: 0x0008,
+	0x11f0: 0xe0fd, 0x11f1: 0x0008, 0x11f2: 0x0008, 0x11f3: 0x0008, 0x11f4: 0x0008, 0x11f5: 0x0008,
+	0x11f6: 0x0008, 0x11f7: 0x0008, 0x11f8: 0x0008, 0x11f9: 0xe01d, 0x11fa: 0x0008, 0x11fb: 0xe03d,
+	0x11fc: 0x0008, 0x11fd: 0x4445, 0x11fe: 0xe00d, 0x11ff: 0x0008,
 	// Block 0x48, offset 0x1200
-	0x1200: 0x7acd, 0x1201: 0x7aed, 0x1202: 0x7b0d, 0x1203: 0x7b2d, 0x1204: 0x7b4d, 0x1205: 0x7b6d,
-	0x1206: 0x7b8d, 0x1207: 0x7bad, 0x1208: 0x7bcd, 0x1209: 0x7bed, 0x120a: 0x7c0d, 0x120b: 0x7c2d,
-	0x120c: 0x7c4d, 0x120d: 0x7c6d, 0x120e: 0x7c8d, 0x120f: 0x1409, 0x1210: 0x1411, 0x1211: 0x1419,
-	0x1212: 0x7cad, 0x1213: 0x7ccd, 0x1214: 0x7ced, 0x1215: 0x1421, 0x1216: 0x1429, 0x1217: 0x1431,
-	0x1218: 0x7d0d, 0x1219: 0x7d2d, 0x121a: 0x0040, 0x121b: 0x0040, 0x121c: 0x0040, 0x121d: 0x0040,
-	0x121e: 0x0040, 0x121f: 0x0040, 0x1220: 0x0040, 0x1221: 0x0040, 0x1222: 0x0040, 0x1223: 0x0040,
-	0x1224: 0x0040, 0x1225: 0x0040, 0x1226: 0x0040, 0x1227: 0x0040, 0x1228: 0x0040, 0x1229: 0x0040,
-	0x122a: 0x0040, 0x122b: 0x0040, 0x122c: 0x0040, 0x122d: 0x0040, 0x122e: 0x0040, 0x122f: 0x0040,
-	0x1230: 0x0040, 0x1231: 0x0040, 0x1232: 0x0040, 0x1233: 0x0040, 0x1234: 0x0040, 0x1235: 0x0040,
-	0x1236: 0x0040, 0x1237: 0x0040, 0x1238: 0x0040, 0x1239: 0x0040, 0x123a: 0x0040, 0x123b: 0x0040,
-	0x123c: 0x0040, 0x123d: 0x0040, 0x123e: 0x0040, 0x123f: 0x0040,
+	0x1200: 0xe00d, 0x1201: 0x0008, 0x1202: 0xe00d, 0x1203: 0x0008, 0x1204: 0xe00d, 0x1205: 0x0008,
+	0x1206: 0xe00d, 0x1207: 0x0008, 0x1208: 0x0008, 0x1209: 0x0018, 0x120a: 0x0018, 0x120b: 0xe03d,
+	0x120c: 0x0008, 0x120d: 0x11d9, 0x120e: 0x0008, 0x120f: 0x0008, 0x1210: 0xe00d, 0x1211: 0x0008,
+	0x1212: 0xe00d, 0x1213: 0x0008, 0x1214: 0x0008, 0x1215: 0x0008, 0x1216: 0xe00d, 0x1217: 0x0008,
+	0x1218: 0xe00d, 0x1219: 0x0008, 0x121a: 0xe00d, 0x121b: 0x0008, 0x121c: 0xe00d, 0x121d: 0x0008,
+	0x121e: 0xe00d, 0x121f: 0x0008, 0x1220: 0xe00d, 0x1221: 0x0008, 0x1222: 0xe00d, 0x1223: 0x0008,
+	0x1224: 0xe00d, 0x1225: 0x0008, 0x1226: 0xe00d, 0x1227: 0x0008, 0x1228: 0xe00d, 0x1229: 0x0008,
+	0x122a: 0x6e61, 0x122b: 0x1029, 0x122c: 0x11c1, 0x122d: 0x6e79, 0x122e: 0x1221, 0x122f: 0x0008,
+	0x1230: 0x6e91, 0x1231: 0x6ea9, 0x1232: 0x1239, 0x1233: 0x4465, 0x1234: 0xe00d, 0x1235: 0x0008,
+	0x1236: 0xe00d, 0x1237: 0x0008, 0x1238: 0xe00d, 0x1239: 0x0008, 0x123a: 0xe00d, 0x123b: 0x0008,
+	0x123c: 0xe00d, 0x123d: 0x0008, 0x123e: 0xe00d, 0x123f: 0x0008,
 	// Block 0x49, offset 0x1240
-	0x1240: 0x1439, 0x1241: 0x1441, 0x1242: 0x1449, 0x1243: 0x7d4d, 0x1244: 0x7d6d, 0x1245: 0x1451,
-	0x1246: 0x1451, 0x1247: 0x0040, 0x1248: 0x0040, 0x1249: 0x0040, 0x124a: 0x0040, 0x124b: 0x0040,
-	0x124c: 0x0040, 0x124d: 0x0040, 0x124e: 0x0040, 0x124f: 0x0040, 0x1250: 0x0040, 0x1251: 0x0040,
-	0x1252: 0x0040, 0x1253: 0x1459, 0x1254: 0x1461, 0x1255: 0x1469, 0x1256: 0x1471, 0x1257: 0x1479,
-	0x1258: 0x0040, 0x1259: 0x0040, 0x125a: 0x0040, 0x125b: 0x0040, 0x125c: 0x0040, 0x125d: 0x1481,
-	0x125e: 0x3308, 0x125f: 0x1489, 0x1260: 0x1491, 0x1261: 0x0779, 0x1262: 0x0791, 0x1263: 0x1499,
-	0x1264: 0x14a1, 0x1265: 0x14a9, 0x1266: 0x14b1, 0x1267: 0x14b9, 0x1268: 0x14c1, 0x1269: 0x071a,
-	0x126a: 0x14c9, 0x126b: 0x14d1, 0x126c: 0x14d9, 0x126d: 0x14e1, 0x126e: 0x14e9, 0x126f: 0x14f1,
-	0x1270: 0x14f9, 0x1271: 0x1501, 0x1272: 0x1509, 0x1273: 0x1511, 0x1274: 0x1519, 0x1275: 0x1521,
-	0x1276: 0x1529, 0x1277: 0x0040, 0x1278: 0x1531, 0x1279: 0x1539, 0x127a: 0x1541, 0x127b: 0x1549,
-	0x127c: 0x1551, 0x127d: 0x0040, 0x127e: 0x1559, 0x127f: 0x0040,
+	0x1240: 0x650d, 0x1241: 0x652d, 0x1242: 0x654d, 0x1243: 0x656d, 0x1244: 0x658d, 0x1245: 0x65ad,
+	0x1246: 0x65cd, 0x1247: 0x65ed, 0x1248: 0x660d, 0x1249: 0x662d, 0x124a: 0x664d, 0x124b: 0x666d,
+	0x124c: 0x668d, 0x124d: 0x66ad, 0x124e: 0x0008, 0x124f: 0x0008, 0x1250: 0x66cd, 0x1251: 0x0008,
+	0x1252: 0x66ed, 0x1253: 0x0008, 0x1254: 0x0008, 0x1255: 0x670d, 0x1256: 0x672d, 0x1257: 0x674d,
+	0x1258: 0x676d, 0x1259: 0x678d, 0x125a: 0x67ad, 0x125b: 0x67cd, 0x125c: 0x67ed, 0x125d: 0x680d,
+	0x125e: 0x682d, 0x125f: 0x0008, 0x1260: 0x684d, 0x1261: 0x0008, 0x1262: 0x686d, 0x1263: 0x0008,
+	0x1264: 0x0008, 0x1265: 0x688d, 0x1266: 0x68ad, 0x1267: 0x0008, 0x1268: 0x0008, 0x1269: 0x0008,
+	0x126a: 0x68cd, 0x126b: 0x68ed, 0x126c: 0x690d, 0x126d: 0x692d, 0x126e: 0x694d, 0x126f: 0x696d,
+	0x1270: 0x698d, 0x1271: 0x69ad, 0x1272: 0x69cd, 0x1273: 0x69ed, 0x1274: 0x6a0d, 0x1275: 0x6a2d,
+	0x1276: 0x6a4d, 0x1277: 0x6a6d, 0x1278: 0x6a8d, 0x1279: 0x6aad, 0x127a: 0x6acd, 0x127b: 0x6aed,
+	0x127c: 0x6b0d, 0x127d: 0x6b2d, 0x127e: 0x6b4d, 0x127f: 0x6b6d,
 	// Block 0x4a, offset 0x1280
-	0x1280: 0x1561, 0x1281: 0x1569, 0x1282: 0x0040, 0x1283: 0x1571, 0x1284: 0x1579, 0x1285: 0x0040,
-	0x1286: 0x1581, 0x1287: 0x1589, 0x1288: 0x1591, 0x1289: 0x1599, 0x128a: 0x15a1, 0x128b: 0x15a9,
-	0x128c: 0x15b1, 0x128d: 0x15b9, 0x128e: 0x15c1, 0x128f: 0x15c9, 0x1290: 0x15d1, 0x1291: 0x15d1,
-	0x1292: 0x15d9, 0x1293: 0x15d9, 0x1294: 0x15d9, 0x1295: 0x15d9, 0x1296: 0x15e1, 0x1297: 0x15e1,
-	0x1298: 0x15e1, 0x1299: 0x15e1, 0x129a: 0x15e9, 0x129b: 0x15e9, 0x129c: 0x15e9, 0x129d: 0x15e9,
-	0x129e: 0x15f1, 0x129f: 0x15f1, 0x12a0: 0x15f1, 0x12a1: 0x15f1, 0x12a2: 0x15f9, 0x12a3: 0x15f9,
-	0x12a4: 0x15f9, 0x12a5: 0x15f9, 0x12a6: 0x1601, 0x12a7: 0x1601, 0x12a8: 0x1601, 0x12a9: 0x1601,
-	0x12aa: 0x1609, 0x12ab: 0x1609, 0x12ac: 0x1609, 0x12ad: 0x1609, 0x12ae: 0x1611, 0x12af: 0x1611,
-	0x12b0: 0x1611, 0x12b1: 0x1611, 0x12b2: 0x1619, 0x12b3: 0x1619, 0x12b4: 0x1619, 0x12b5: 0x1619,
-	0x12b6: 0x1621, 0x12b7: 0x1621, 0x12b8: 0x1621, 0x12b9: 0x1621, 0x12ba: 0x1629, 0x12bb: 0x1629,
-	0x12bc: 0x1629, 0x12bd: 0x1629, 0x12be: 0x1631, 0x12bf: 0x1631,
+	0x1280: 0x7acd, 0x1281: 0x7aed, 0x1282: 0x7b0d, 0x1283: 0x7b2d, 0x1284: 0x7b4d, 0x1285: 0x7b6d,
+	0x1286: 0x7b8d, 0x1287: 0x7bad, 0x1288: 0x7bcd, 0x1289: 0x7bed, 0x128a: 0x7c0d, 0x128b: 0x7c2d,
+	0x128c: 0x7c4d, 0x128d: 0x7c6d, 0x128e: 0x7c8d, 0x128f: 0x6f19, 0x1290: 0x6f41, 0x1291: 0x6f69,
+	0x1292: 0x7cad, 0x1293: 0x7ccd, 0x1294: 0x7ced, 0x1295: 0x6f91, 0x1296: 0x6fb9, 0x1297: 0x6fe1,
+	0x1298: 0x7d0d, 0x1299: 0x7d2d, 0x129a: 0x0040, 0x129b: 0x0040, 0x129c: 0x0040, 0x129d: 0x0040,
+	0x129e: 0x0040, 0x129f: 0x0040, 0x12a0: 0x0040, 0x12a1: 0x0040, 0x12a2: 0x0040, 0x12a3: 0x0040,
+	0x12a4: 0x0040, 0x12a5: 0x0040, 0x12a6: 0x0040, 0x12a7: 0x0040, 0x12a8: 0x0040, 0x12a9: 0x0040,
+	0x12aa: 0x0040, 0x12ab: 0x0040, 0x12ac: 0x0040, 0x12ad: 0x0040, 0x12ae: 0x0040, 0x12af: 0x0040,
+	0x12b0: 0x0040, 0x12b1: 0x0040, 0x12b2: 0x0040, 0x12b3: 0x0040, 0x12b4: 0x0040, 0x12b5: 0x0040,
+	0x12b6: 0x0040, 0x12b7: 0x0040, 0x12b8: 0x0040, 0x12b9: 0x0040, 0x12ba: 0x0040, 0x12bb: 0x0040,
+	0x12bc: 0x0040, 0x12bd: 0x0040, 0x12be: 0x0040, 0x12bf: 0x0040,
 	// Block 0x4b, offset 0x12c0
-	0x12c0: 0x1631, 0x12c1: 0x1631, 0x12c2: 0x1639, 0x12c3: 0x1639, 0x12c4: 0x1641, 0x12c5: 0x1641,
-	0x12c6: 0x1649, 0x12c7: 0x1649, 0x12c8: 0x1651, 0x12c9: 0x1651, 0x12ca: 0x1659, 0x12cb: 0x1659,
-	0x12cc: 0x1661, 0x12cd: 0x1661, 0x12ce: 0x1669, 0x12cf: 0x1669, 0x12d0: 0x1669, 0x12d1: 0x1669,
-	0x12d2: 0x1671, 0x12d3: 0x1671, 0x12d4: 0x1671, 0x12d5: 0x1671, 0x12d6: 0x1679, 0x12d7: 0x1679,
-	0x12d8: 0x1679, 0x12d9: 0x1679, 0x12da: 0x1681, 0x12db: 0x1681, 0x12dc: 0x1681, 0x12dd: 0x1681,
-	0x12de: 0x1689, 0x12df: 0x1689, 0x12e0: 0x1691, 0x12e1: 0x1691, 0x12e2: 0x1691, 0x12e3: 0x1691,
-	0x12e4: 0x1699, 0x12e5: 0x1699, 0x12e6: 0x16a1, 0x12e7: 0x16a1, 0x12e8: 0x16a1, 0x12e9: 0x16a1,
-	0x12ea: 0x16a9, 0x12eb: 0x16a9, 0x12ec: 0x16a9, 0x12ed: 0x16a9, 0x12ee: 0x16b1, 0x12ef: 0x16b1,
-	0x12f0: 0x16b9, 0x12f1: 0x16b9, 0x12f2: 0x0818, 0x12f3: 0x0818, 0x12f4: 0x0818, 0x12f5: 0x0818,
-	0x12f6: 0x0818, 0x12f7: 0x0818, 0x12f8: 0x0818, 0x12f9: 0x0818, 0x12fa: 0x0818, 0x12fb: 0x0818,
-	0x12fc: 0x0818, 0x12fd: 0x0818, 0x12fe: 0x0818, 0x12ff: 0x0818,
+	0x12c0: 0x7009, 0x12c1: 0x7021, 0x12c2: 0x7039, 0x12c3: 0x7d4d, 0x12c4: 0x7d6d, 0x12c5: 0x7051,
+	0x12c6: 0x7051, 0x12c7: 0x0040, 0x12c8: 0x0040, 0x12c9: 0x0040, 0x12ca: 0x0040, 0x12cb: 0x0040,
+	0x12cc: 0x0040, 0x12cd: 0x0040, 0x12ce: 0x0040, 0x12cf: 0x0040, 0x12d0: 0x0040, 0x12d1: 0x0040,
+	0x12d2: 0x0040, 0x12d3: 0x7069, 0x12d4: 0x7091, 0x12d5: 0x70b9, 0x12d6: 0x70e1, 0x12d7: 0x7109,
+	0x12d8: 0x0040, 0x12d9: 0x0040, 0x12da: 0x0040, 0x12db: 0x0040, 0x12dc: 0x0040, 0x12dd: 0x7131,
+	0x12de: 0x3308, 0x12df: 0x7159, 0x12e0: 0x7181, 0x12e1: 0x20a9, 0x12e2: 0x20f1, 0x12e3: 0x7199,
+	0x12e4: 0x71b1, 0x12e5: 0x71c9, 0x12e6: 0x71e1, 0x12e7: 0x71f9, 0x12e8: 0x7211, 0x12e9: 0x1fb2,
+	0x12ea: 0x7229, 0x12eb: 0x7251, 0x12ec: 0x7279, 0x12ed: 0x72b1, 0x12ee: 0x72e9, 0x12ef: 0x7311,
+	0x12f0: 0x7339, 0x12f1: 0x7361, 0x12f2: 0x7389, 0x12f3: 0x73b1, 0x12f4: 0x73d9, 0x12f5: 0x7401,
+	0x12f6: 0x7429, 0x12f7: 0x0040, 0x12f8: 0x7451, 0x12f9: 0x7479, 0x12fa: 0x74a1, 0x12fb: 0x74c9,
+	0x12fc: 0x74f1, 0x12fd: 0x0040, 0x12fe: 0x7519, 0x12ff: 0x0040,
 	// Block 0x4c, offset 0x1300
-	0x1300: 0x0818, 0x1301: 0x0818, 0x1302: 0x0040, 0x1303: 0x0040, 0x1304: 0x0040, 0x1305: 0x0040,
-	0x1306: 0x0040, 0x1307: 0x0040, 0x1308: 0x0040, 0x1309: 0x0040, 0x130a: 0x0040, 0x130b: 0x0040,
-	0x130c: 0x0040, 0x130d: 0x0040, 0x130e: 0x0040, 0x130f: 0x0040, 0x1310: 0x0040, 0x1311: 0x0040,
-	0x1312: 0x0040, 0x1313: 0x16c1, 0x1314: 0x16c1, 0x1315: 0x16c1, 0x1316: 0x16c1, 0x1317: 0x16c9,
-	0x1318: 0x16c9, 0x1319: 0x16d1, 0x131a: 0x16d1, 0x131b: 0x16d9, 0x131c: 0x16d9, 0x131d: 0x0149,
-	0x131e: 0x16e1, 0x131f: 0x16e1, 0x1320: 0x16e9, 0x1321: 0x16e9, 0x1322: 0x16f1, 0x1323: 0x16f1,
-	0x1324: 0x16f9, 0x1325: 0x16f9, 0x1326: 0x16f9, 0x1327: 0x16f9, 0x1328: 0x1701, 0x1329: 0x1701,
-	0x132a: 0x1709, 0x132b: 0x1709, 0x132c: 0x1711, 0x132d: 0x1711, 0x132e: 0x1719, 0x132f: 0x1719,
-	0x1330: 0x1721, 0x1331: 0x1721, 0x1332: 0x1729, 0x1333: 0x1729, 0x1334: 0x1731, 0x1335: 0x1731,
-	0x1336: 0x1739, 0x1337: 0x1739, 0x1338: 0x1739, 0x1339: 0x1741, 0x133a: 0x1741, 0x133b: 0x1741,
-	0x133c: 0x1749, 0x133d: 0x1749, 0x133e: 0x1749, 0x133f: 0x1749,
+	0x1300: 0x7541, 0x1301: 0x7569, 0x1302: 0x0040, 0x1303: 0x7591, 0x1304: 0x75b9, 0x1305: 0x0040,
+	0x1306: 0x75e1, 0x1307: 0x7609, 0x1308: 0x7631, 0x1309: 0x7659, 0x130a: 0x7681, 0x130b: 0x76a9,
+	0x130c: 0x76d1, 0x130d: 0x76f9, 0x130e: 0x7721, 0x130f: 0x7749, 0x1310: 0x7771, 0x1311: 0x7771,
+	0x1312: 0x7789, 0x1313: 0x7789, 0x1314: 0x7789, 0x1315: 0x7789, 0x1316: 0x77a1, 0x1317: 0x77a1,
+	0x1318: 0x77a1, 0x1319: 0x77a1, 0x131a: 0x77b9, 0x131b: 0x77b9, 0x131c: 0x77b9, 0x131d: 0x77b9,
+	0x131e: 0x77d1, 0x131f: 0x77d1, 0x1320: 0x77d1, 0x1321: 0x77d1, 0x1322: 0x77e9, 0x1323: 0x77e9,
+	0x1324: 0x77e9, 0x1325: 0x77e9, 0x1326: 0x7801, 0x1327: 0x7801, 0x1328: 0x7801, 0x1329: 0x7801,
+	0x132a: 0x7819, 0x132b: 0x7819, 0x132c: 0x7819, 0x132d: 0x7819, 0x132e: 0x7831, 0x132f: 0x7831,
+	0x1330: 0x7831, 0x1331: 0x7831, 0x1332: 0x7849, 0x1333: 0x7849, 0x1334: 0x7849, 0x1335: 0x7849,
+	0x1336: 0x7861, 0x1337: 0x7861, 0x1338: 0x7861, 0x1339: 0x7861, 0x133a: 0x7879, 0x133b: 0x7879,
+	0x133c: 0x7879, 0x133d: 0x7879, 0x133e: 0x7891, 0x133f: 0x7891,
 	// Block 0x4d, offset 0x1340
-	0x1340: 0x1949, 0x1341: 0x1951, 0x1342: 0x1959, 0x1343: 0x1961, 0x1344: 0x1969, 0x1345: 0x1971,
-	0x1346: 0x1979, 0x1347: 0x1981, 0x1348: 0x1989, 0x1349: 0x1991, 0x134a: 0x1999, 0x134b: 0x19a1,
-	0x134c: 0x19a9, 0x134d: 0x19b1, 0x134e: 0x19b9, 0x134f: 0x19c1, 0x1350: 0x19c9, 0x1351: 0x19d1,
-	0x1352: 0x19d9, 0x1353: 0x19e1, 0x1354: 0x19e9, 0x1355: 0x19f1, 0x1356: 0x19f9, 0x1357: 0x1a01,
-	0x1358: 0x1a09, 0x1359: 0x1a11, 0x135a: 0x1a19, 0x135b: 0x1a21, 0x135c: 0x1a29, 0x135d: 0x1a31,
-	0x135e: 0x1a3a, 0x135f: 0x1a42, 0x1360: 0x1a4a, 0x1361: 0x1a52, 0x1362: 0x1a5a, 0x1363: 0x1a62,
-	0x1364: 0x1a69, 0x1365: 0x1a71, 0x1366: 0x1761, 0x1367: 0x1a79, 0x1368: 0x1741, 0x1369: 0x1769,
-	0x136a: 0x1a81, 0x136b: 0x1a89, 0x136c: 0x1789, 0x136d: 0x1a91, 0x136e: 0x1791, 0x136f: 0x1799,
-	0x1370: 0x1a99, 0x1371: 0x1aa1, 0x1372: 0x17b9, 0x1373: 0x1aa9, 0x1374: 0x17c1, 0x1375: 0x17c9,
-	0x1376: 0x1ab1, 0x1377: 0x1ab9, 0x1378: 0x17d9, 0x1379: 0x1ac1, 0x137a: 0x17e1, 0x137b: 0x17e9,
-	0x137c: 0x18d1, 0x137d: 0x18d9, 0x137e: 0x18f1, 0x137f: 0x18f9,
+	0x1340: 0x7891, 0x1341: 0x7891, 0x1342: 0x78a9, 0x1343: 0x78a9, 0x1344: 0x78c1, 0x1345: 0x78c1,
+	0x1346: 0x78d9, 0x1347: 0x78d9, 0x1348: 0x78f1, 0x1349: 0x78f1, 0x134a: 0x7909, 0x134b: 0x7909,
+	0x134c: 0x7921, 0x134d: 0x7921, 0x134e: 0x7939, 0x134f: 0x7939, 0x1350: 0x7939, 0x1351: 0x7939,
+	0x1352: 0x7951, 0x1353: 0x7951, 0x1354: 0x7951, 0x1355: 0x7951, 0x1356: 0x7969, 0x1357: 0x7969,
+	0x1358: 0x7969, 0x1359: 0x7969, 0x135a: 0x7981, 0x135b: 0x7981, 0x135c: 0x7981, 0x135d: 0x7981,
+	0x135e: 0x7999, 0x135f: 0x7999, 0x1360: 0x79b1, 0x1361: 0x79b1, 0x1362: 0x79b1, 0x1363: 0x79b1,
+	0x1364: 0x79c9, 0x1365: 0x79c9, 0x1366: 0x79e1, 0x1367: 0x79e1, 0x1368: 0x79e1, 0x1369: 0x79e1,
+	0x136a: 0x79f9, 0x136b: 0x79f9, 0x136c: 0x79f9, 0x136d: 0x79f9, 0x136e: 0x7a11, 0x136f: 0x7a11,
+	0x1370: 0x7a29, 0x1371: 0x7a29, 0x1372: 0x0818, 0x1373: 0x0818, 0x1374: 0x0818, 0x1375: 0x0818,
+	0x1376: 0x0818, 0x1377: 0x0818, 0x1378: 0x0818, 0x1379: 0x0818, 0x137a: 0x0818, 0x137b: 0x0818,
+	0x137c: 0x0818, 0x137d: 0x0818, 0x137e: 0x0818, 0x137f: 0x0818,
 	// Block 0x4e, offset 0x1380
-	0x1380: 0x1901, 0x1381: 0x1921, 0x1382: 0x1929, 0x1383: 0x1931, 0x1384: 0x1939, 0x1385: 0x1959,
-	0x1386: 0x1961, 0x1387: 0x1969, 0x1388: 0x1ac9, 0x1389: 0x1989, 0x138a: 0x1ad1, 0x138b: 0x1ad9,
-	0x138c: 0x19b9, 0x138d: 0x1ae1, 0x138e: 0x19c1, 0x138f: 0x19c9, 0x1390: 0x1a31, 0x1391: 0x1ae9,
-	0x1392: 0x1af1, 0x1393: 0x1a09, 0x1394: 0x1af9, 0x1395: 0x1a11, 0x1396: 0x1a19, 0x1397: 0x1751,
-	0x1398: 0x1759, 0x1399: 0x1b01, 0x139a: 0x1761, 0x139b: 0x1b09, 0x139c: 0x1771, 0x139d: 0x1779,
-	0x139e: 0x1781, 0x139f: 0x1789, 0x13a0: 0x1b11, 0x13a1: 0x17a1, 0x13a2: 0x17a9, 0x13a3: 0x17b1,
-	0x13a4: 0x17b9, 0x13a5: 0x1b19, 0x13a6: 0x17d9, 0x13a7: 0x17f1, 0x13a8: 0x17f9, 0x13a9: 0x1801,
-	0x13aa: 0x1809, 0x13ab: 0x1811, 0x13ac: 0x1821, 0x13ad: 0x1829, 0x13ae: 0x1831, 0x13af: 0x1839,
-	0x13b0: 0x1841, 0x13b1: 0x1849, 0x13b2: 0x1b21, 0x13b3: 0x1851, 0x13b4: 0x1859, 0x13b5: 0x1861,
-	0x13b6: 0x1869, 0x13b7: 0x1871, 0x13b8: 0x1879, 0x13b9: 0x1889, 0x13ba: 0x1891, 0x13bb: 0x1899,
-	0x13bc: 0x18a1, 0x13bd: 0x18a9, 0x13be: 0x18b1, 0x13bf: 0x18b9,
+	0x1380: 0x0818, 0x1381: 0x0818, 0x1382: 0x0040, 0x1383: 0x0040, 0x1384: 0x0040, 0x1385: 0x0040,
+	0x1386: 0x0040, 0x1387: 0x0040, 0x1388: 0x0040, 0x1389: 0x0040, 0x138a: 0x0040, 0x138b: 0x0040,
+	0x138c: 0x0040, 0x138d: 0x0040, 0x138e: 0x0040, 0x138f: 0x0040, 0x1390: 0x0040, 0x1391: 0x0040,
+	0x1392: 0x0040, 0x1393: 0x7a41, 0x1394: 0x7a41, 0x1395: 0x7a41, 0x1396: 0x7a41, 0x1397: 0x7a59,
+	0x1398: 0x7a59, 0x1399: 0x7a71, 0x139a: 0x7a71, 0x139b: 0x7a89, 0x139c: 0x7a89, 0x139d: 0x0479,
+	0x139e: 0x7aa1, 0x139f: 0x7aa1, 0x13a0: 0x7ab9, 0x13a1: 0x7ab9, 0x13a2: 0x7ad1, 0x13a3: 0x7ad1,
+	0x13a4: 0x7ae9, 0x13a5: 0x7ae9, 0x13a6: 0x7ae9, 0x13a7: 0x7ae9, 0x13a8: 0x7b01, 0x13a9: 0x7b01,
+	0x13aa: 0x7b19, 0x13ab: 0x7b19, 0x13ac: 0x7b41, 0x13ad: 0x7b41, 0x13ae: 0x7b69, 0x13af: 0x7b69,
+	0x13b0: 0x7b91, 0x13b1: 0x7b91, 0x13b2: 0x7bb9, 0x13b3: 0x7bb9, 0x13b4: 0x7be1, 0x13b5: 0x7be1,
+	0x13b6: 0x7c09, 0x13b7: 0x7c09, 0x13b8: 0x7c09, 0x13b9: 0x7c31, 0x13ba: 0x7c31, 0x13bb: 0x7c31,
+	0x13bc: 0x7c59, 0x13bd: 0x7c59, 0x13be: 0x7c59, 0x13bf: 0x7c59,
 	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x18c1, 0x13c1: 0x18c9, 0x13c2: 0x18e1, 0x13c3: 0x18e9, 0x13c4: 0x1909, 0x13c5: 0x1911,
-	0x13c6: 0x1919, 0x13c7: 0x1921, 0x13c8: 0x1929, 0x13c9: 0x1941, 0x13ca: 0x1949, 0x13cb: 0x1951,
-	0x13cc: 0x1959, 0x13cd: 0x1b29, 0x13ce: 0x1971, 0x13cf: 0x1979, 0x13d0: 0x1981, 0x13d1: 0x1989,
-	0x13d2: 0x19a1, 0x13d3: 0x19a9, 0x13d4: 0x19b1, 0x13d5: 0x19b9, 0x13d6: 0x1b31, 0x13d7: 0x19d1,
-	0x13d8: 0x19d9, 0x13d9: 0x1b39, 0x13da: 0x19f1, 0x13db: 0x19f9, 0x13dc: 0x1a01, 0x13dd: 0x1a09,
-	0x13de: 0x1b41, 0x13df: 0x1761, 0x13e0: 0x1b09, 0x13e1: 0x1789, 0x13e2: 0x1b11, 0x13e3: 0x17b9,
-	0x13e4: 0x1b19, 0x13e5: 0x17d9, 0x13e6: 0x1b49, 0x13e7: 0x1841, 0x13e8: 0x1b51, 0x13e9: 0x1b59,
-	0x13ea: 0x1b61, 0x13eb: 0x1921, 0x13ec: 0x1929, 0x13ed: 0x1959, 0x13ee: 0x19b9, 0x13ef: 0x1b31,
-	0x13f0: 0x1a09, 0x13f1: 0x1b41, 0x13f2: 0x1b69, 0x13f3: 0x1b71, 0x13f4: 0x1b79, 0x13f5: 0x1b81,
-	0x13f6: 0x1b89, 0x13f7: 0x1b91, 0x13f8: 0x1b99, 0x13f9: 0x1ba1, 0x13fa: 0x1ba9, 0x13fb: 0x1bb1,
-	0x13fc: 0x1bb9, 0x13fd: 0x1bc1, 0x13fe: 0x1bc9, 0x13ff: 0x1bd1,
+	0x13c0: 0x8649, 0x13c1: 0x8671, 0x13c2: 0x8699, 0x13c3: 0x86c1, 0x13c4: 0x86e9, 0x13c5: 0x8711,
+	0x13c6: 0x8739, 0x13c7: 0x8761, 0x13c8: 0x8789, 0x13c9: 0x87b1, 0x13ca: 0x87d9, 0x13cb: 0x8801,
+	0x13cc: 0x8829, 0x13cd: 0x8851, 0x13ce: 0x8879, 0x13cf: 0x88a1, 0x13d0: 0x88c9, 0x13d1: 0x88f1,
+	0x13d2: 0x8919, 0x13d3: 0x8941, 0x13d4: 0x8969, 0x13d5: 0x8991, 0x13d6: 0x89b9, 0x13d7: 0x89e1,
+	0x13d8: 0x8a09, 0x13d9: 0x8a31, 0x13da: 0x8a59, 0x13db: 0x8a81, 0x13dc: 0x8aa9, 0x13dd: 0x8ad1,
+	0x13de: 0x8afa, 0x13df: 0x8b2a, 0x13e0: 0x8b5a, 0x13e1: 0x8b8a, 0x13e2: 0x8bba, 0x13e3: 0x8bea,
+	0x13e4: 0x8c19, 0x13e5: 0x8c41, 0x13e6: 0x7cc1, 0x13e7: 0x8c69, 0x13e8: 0x7c31, 0x13e9: 0x7ce9,
+	0x13ea: 0x8c91, 0x13eb: 0x8cb9, 0x13ec: 0x7d89, 0x13ed: 0x8ce1, 0x13ee: 0x7db1, 0x13ef: 0x7dd9,
+	0x13f0: 0x8d09, 0x13f1: 0x8d31, 0x13f2: 0x7e79, 0x13f3: 0x8d59, 0x13f4: 0x7ea1, 0x13f5: 0x7ec9,
+	0x13f6: 0x8d81, 0x13f7: 0x8da9, 0x13f8: 0x7f19, 0x13f9: 0x8dd1, 0x13fa: 0x7f41, 0x13fb: 0x7f69,
+	0x13fc: 0x83f1, 0x13fd: 0x8419, 0x13fe: 0x8491, 0x13ff: 0x84b9,
 	// Block 0x50, offset 0x1400
-	0x1400: 0x1bd9, 0x1401: 0x1be1, 0x1402: 0x1be9, 0x1403: 0x1bf1, 0x1404: 0x1bf9, 0x1405: 0x1c01,
-	0x1406: 0x1c09, 0x1407: 0x1c11, 0x1408: 0x1c19, 0x1409: 0x1c21, 0x140a: 0x1c29, 0x140b: 0x1c31,
-	0x140c: 0x1b59, 0x140d: 0x1c39, 0x140e: 0x1c41, 0x140f: 0x1c49, 0x1410: 0x1c51, 0x1411: 0x1b81,
-	0x1412: 0x1b89, 0x1413: 0x1b91, 0x1414: 0x1b99, 0x1415: 0x1ba1, 0x1416: 0x1ba9, 0x1417: 0x1bb1,
-	0x1418: 0x1bb9, 0x1419: 0x1bc1, 0x141a: 0x1bc9, 0x141b: 0x1bd1, 0x141c: 0x1bd9, 0x141d: 0x1be1,
-	0x141e: 0x1be9, 0x141f: 0x1bf1, 0x1420: 0x1bf9, 0x1421: 0x1c01, 0x1422: 0x1c09, 0x1423: 0x1c11,
-	0x1424: 0x1c19, 0x1425: 0x1c21, 0x1426: 0x1c29, 0x1427: 0x1c31, 0x1428: 0x1b59, 0x1429: 0x1c39,
-	0x142a: 0x1c41, 0x142b: 0x1c49, 0x142c: 0x1c51, 0x142d: 0x1c21, 0x142e: 0x1c29, 0x142f: 0x1c31,
-	0x1430: 0x1b59, 0x1431: 0x1b51, 0x1432: 0x1b61, 0x1433: 0x1881, 0x1434: 0x1829, 0x1435: 0x1831,
-	0x1436: 0x1839, 0x1437: 0x1c21, 0x1438: 0x1c29, 0x1439: 0x1c31, 0x143a: 0x1881, 0x143b: 0x1889,
-	0x143c: 0x1c59, 0x143d: 0x1c59, 0x143e: 0x0018, 0x143f: 0x0018,
+	0x1400: 0x84e1, 0x1401: 0x8581, 0x1402: 0x85a9, 0x1403: 0x85d1, 0x1404: 0x85f9, 0x1405: 0x8699,
+	0x1406: 0x86c1, 0x1407: 0x86e9, 0x1408: 0x8df9, 0x1409: 0x8789, 0x140a: 0x8e21, 0x140b: 0x8e49,
+	0x140c: 0x8879, 0x140d: 0x8e71, 0x140e: 0x88a1, 0x140f: 0x88c9, 0x1410: 0x8ad1, 0x1411: 0x8e99,
+	0x1412: 0x8ec1, 0x1413: 0x8a09, 0x1414: 0x8ee9, 0x1415: 0x8a31, 0x1416: 0x8a59, 0x1417: 0x7c71,
+	0x1418: 0x7c99, 0x1419: 0x8f11, 0x141a: 0x7cc1, 0x141b: 0x8f39, 0x141c: 0x7d11, 0x141d: 0x7d39,
+	0x141e: 0x7d61, 0x141f: 0x7d89, 0x1420: 0x8f61, 0x1421: 0x7e01, 0x1422: 0x7e29, 0x1423: 0x7e51,
+	0x1424: 0x7e79, 0x1425: 0x8f89, 0x1426: 0x7f19, 0x1427: 0x7f91, 0x1428: 0x7fb9, 0x1429: 0x7fe1,
+	0x142a: 0x8009, 0x142b: 0x8031, 0x142c: 0x8081, 0x142d: 0x80a9, 0x142e: 0x80d1, 0x142f: 0x80f9,
+	0x1430: 0x8121, 0x1431: 0x8149, 0x1432: 0x8fb1, 0x1433: 0x8171, 0x1434: 0x8199, 0x1435: 0x81c1,
+	0x1436: 0x81e9, 0x1437: 0x8211, 0x1438: 0x8239, 0x1439: 0x8289, 0x143a: 0x82b1, 0x143b: 0x82d9,
+	0x143c: 0x8301, 0x143d: 0x8329, 0x143e: 0x8351, 0x143f: 0x8379,
 	// Block 0x51, offset 0x1440
-	0x1440: 0x0040, 0x1441: 0x0040, 0x1442: 0x0040, 0x1443: 0x0040, 0x1444: 0x0040, 0x1445: 0x0040,
-	0x1446: 0x0040, 0x1447: 0x0040, 0x1448: 0x0040, 0x1449: 0x0040, 0x144a: 0x0040, 0x144b: 0x0040,
-	0x144c: 0x0040, 0x144d: 0x0040, 0x144e: 0x0040, 0x144f: 0x0040, 0x1450: 0x1c61, 0x1451: 0x1c69,
-	0x1452: 0x1c69, 0x1453: 0x1c71, 0x1454: 0x1c79, 0x1455: 0x1c81, 0x1456: 0x1c89, 0x1457: 0x1c91,
-	0x1458: 0x1c99, 0x1459: 0x1c99, 0x145a: 0x1ca1, 0x145b: 0x1ca9, 0x145c: 0x1cb1, 0x145d: 0x1cb9,
-	0x145e: 0x1cc1, 0x145f: 0x1cc9, 0x1460: 0x1cc9, 0x1461: 0x1cd1, 0x1462: 0x1cd9, 0x1463: 0x1cd9,
-	0x1464: 0x1ce1, 0x1465: 0x1ce1, 0x1466: 0x1ce9, 0x1467: 0x1cf1, 0x1468: 0x1cf1, 0x1469: 0x1cf9,
-	0x146a: 0x1d01, 0x146b: 0x1d01, 0x146c: 0x1d09, 0x146d: 0x1d09, 0x146e: 0x1d11, 0x146f: 0x1d19,
-	0x1470: 0x1d19, 0x1471: 0x1d21, 0x1472: 0x1d21, 0x1473: 0x1d29, 0x1474: 0x1d31, 0x1475: 0x1d39,
-	0x1476: 0x1d41, 0x1477: 0x1d41, 0x1478: 0x1d49, 0x1479: 0x1d51, 0x147a: 0x1d59, 0x147b: 0x1d61,
-	0x147c: 0x1d69, 0x147d: 0x1d69, 0x147e: 0x1d71, 0x147f: 0x1d79,
+	0x1440: 0x83a1, 0x1441: 0x83c9, 0x1442: 0x8441, 0x1443: 0x8469, 0x1444: 0x8509, 0x1445: 0x8531,
+	0x1446: 0x8559, 0x1447: 0x8581, 0x1448: 0x85a9, 0x1449: 0x8621, 0x144a: 0x8649, 0x144b: 0x8671,
+	0x144c: 0x8699, 0x144d: 0x8fd9, 0x144e: 0x8711, 0x144f: 0x8739, 0x1450: 0x8761, 0x1451: 0x8789,
+	0x1452: 0x8801, 0x1453: 0x8829, 0x1454: 0x8851, 0x1455: 0x8879, 0x1456: 0x9001, 0x1457: 0x88f1,
+	0x1458: 0x8919, 0x1459: 0x9029, 0x145a: 0x8991, 0x145b: 0x89b9, 0x145c: 0x89e1, 0x145d: 0x8a09,
+	0x145e: 0x9051, 0x145f: 0x7cc1, 0x1460: 0x8f39, 0x1461: 0x7d89, 0x1462: 0x8f61, 0x1463: 0x7e79,
+	0x1464: 0x8f89, 0x1465: 0x7f19, 0x1466: 0x9079, 0x1467: 0x8121, 0x1468: 0x90a1, 0x1469: 0x90c9,
+	0x146a: 0x90f1, 0x146b: 0x8581, 0x146c: 0x85a9, 0x146d: 0x8699, 0x146e: 0x8879, 0x146f: 0x9001,
+	0x1470: 0x8a09, 0x1471: 0x9051, 0x1472: 0x9119, 0x1473: 0x9151, 0x1474: 0x9189, 0x1475: 0x91c1,
+	0x1476: 0x91e9, 0x1477: 0x9211, 0x1478: 0x9239, 0x1479: 0x9261, 0x147a: 0x9289, 0x147b: 0x92b1,
+	0x147c: 0x92d9, 0x147d: 0x9301, 0x147e: 0x9329, 0x147f: 0x9351,
 	// Block 0x52, offset 0x1480
-	0x1480: 0x1f29, 0x1481: 0x1f31, 0x1482: 0x1f39, 0x1483: 0x1f11, 0x1484: 0x1d39, 0x1485: 0x1ce9,
-	0x1486: 0x1f41, 0x1487: 0x1f49, 0x1488: 0x0040, 0x1489: 0x0040, 0x148a: 0x0040, 0x148b: 0x0040,
-	0x148c: 0x0040, 0x148d: 0x0040, 0x148e: 0x0040, 0x148f: 0x0040, 0x1490: 0x0040, 0x1491: 0x0040,
-	0x1492: 0x0040, 0x1493: 0x0040, 0x1494: 0x0040, 0x1495: 0x0040, 0x1496: 0x0040, 0x1497: 0x0040,
-	0x1498: 0x0040, 0x1499: 0x0040, 0x149a: 0x0040, 0x149b: 0x0040, 0x149c: 0x0040, 0x149d: 0x0040,
-	0x149e: 0x0040, 0x149f: 0x0040, 0x14a0: 0x0040, 0x14a1: 0x0040, 0x14a2: 0x0040, 0x14a3: 0x0040,
-	0x14a4: 0x0040, 0x14a5: 0x0040, 0x14a6: 0x0040, 0x14a7: 0x0040, 0x14a8: 0x0040, 0x14a9: 0x0040,
-	0x14aa: 0x0040, 0x14ab: 0x0040, 0x14ac: 0x0040, 0x14ad: 0x0040, 0x14ae: 0x0040, 0x14af: 0x0040,
-	0x14b0: 0x1f51, 0x14b1: 0x1f59, 0x14b2: 0x1f61, 0x14b3: 0x1f69, 0x14b4: 0x1f71, 0x14b5: 0x1f79,
-	0x14b6: 0x1f81, 0x14b7: 0x1f89, 0x14b8: 0x1f91, 0x14b9: 0x1f99, 0x14ba: 0x1fa2, 0x14bb: 0x1faa,
-	0x14bc: 0x1fb1, 0x14bd: 0x0018, 0x14be: 0x0040, 0x14bf: 0x0040,
+	0x1480: 0x9379, 0x1481: 0x93a1, 0x1482: 0x93c9, 0x1483: 0x93f1, 0x1484: 0x9419, 0x1485: 0x9441,
+	0x1486: 0x9469, 0x1487: 0x9491, 0x1488: 0x94b9, 0x1489: 0x94e1, 0x148a: 0x9509, 0x148b: 0x9531,
+	0x148c: 0x90c9, 0x148d: 0x9559, 0x148e: 0x9581, 0x148f: 0x95a9, 0x1490: 0x95d1, 0x1491: 0x91c1,
+	0x1492: 0x91e9, 0x1493: 0x9211, 0x1494: 0x9239, 0x1495: 0x9261, 0x1496: 0x9289, 0x1497: 0x92b1,
+	0x1498: 0x92d9, 0x1499: 0x9301, 0x149a: 0x9329, 0x149b: 0x9351, 0x149c: 0x9379, 0x149d: 0x93a1,
+	0x149e: 0x93c9, 0x149f: 0x93f1, 0x14a0: 0x9419, 0x14a1: 0x9441, 0x14a2: 0x9469, 0x14a3: 0x9491,
+	0x14a4: 0x94b9, 0x14a5: 0x94e1, 0x14a6: 0x9509, 0x14a7: 0x9531, 0x14a8: 0x90c9, 0x14a9: 0x9559,
+	0x14aa: 0x9581, 0x14ab: 0x95a9, 0x14ac: 0x95d1, 0x14ad: 0x94e1, 0x14ae: 0x9509, 0x14af: 0x9531,
+	0x14b0: 0x90c9, 0x14b1: 0x90a1, 0x14b2: 0x90f1, 0x14b3: 0x8261, 0x14b4: 0x80a9, 0x14b5: 0x80d1,
+	0x14b6: 0x80f9, 0x14b7: 0x94e1, 0x14b8: 0x9509, 0x14b9: 0x9531, 0x14ba: 0x8261, 0x14bb: 0x8289,
+	0x14bc: 0x95f9, 0x14bd: 0x95f9, 0x14be: 0x0018, 0x14bf: 0x0018,
 	// Block 0x53, offset 0x14c0
-	0x14c0: 0x33c0, 0x14c1: 0x33c0, 0x14c2: 0x33c0, 0x14c3: 0x33c0, 0x14c4: 0x33c0, 0x14c5: 0x33c0,
-	0x14c6: 0x33c0, 0x14c7: 0x33c0, 0x14c8: 0x33c0, 0x14c9: 0x33c0, 0x14ca: 0x33c0, 0x14cb: 0x33c0,
-	0x14cc: 0x33c0, 0x14cd: 0x33c0, 0x14ce: 0x33c0, 0x14cf: 0x33c0, 0x14d0: 0x1fba, 0x14d1: 0x7d8d,
-	0x14d2: 0x0040, 0x14d3: 0x1fc2, 0x14d4: 0x0122, 0x14d5: 0x1fca, 0x14d6: 0x1fd2, 0x14d7: 0x7dad,
-	0x14d8: 0x7dcd, 0x14d9: 0x0040, 0x14da: 0x0040, 0x14db: 0x0040, 0x14dc: 0x0040, 0x14dd: 0x0040,
-	0x14de: 0x0040, 0x14df: 0x0040, 0x14e0: 0x3308, 0x14e1: 0x3308, 0x14e2: 0x3308, 0x14e3: 0x3308,
-	0x14e4: 0x3308, 0x14e5: 0x3308, 0x14e6: 0x3308, 0x14e7: 0x3308, 0x14e8: 0x3308, 0x14e9: 0x3308,
-	0x14ea: 0x3308, 0x14eb: 0x3308, 0x14ec: 0x3308, 0x14ed: 0x3308, 0x14ee: 0x3308, 0x14ef: 0x3308,
-	0x14f0: 0x0040, 0x14f1: 0x7ded, 0x14f2: 0x7e0d, 0x14f3: 0x1fda, 0x14f4: 0x1fda, 0x14f5: 0x072a,
-	0x14f6: 0x0732, 0x14f7: 0x1fe2, 0x14f8: 0x1fea, 0x14f9: 0x7e2d, 0x14fa: 0x7e4d, 0x14fb: 0x7e6d,
-	0x14fc: 0x7e2d, 0x14fd: 0x7e8d, 0x14fe: 0x7ead, 0x14ff: 0x7e8d,
+	0x14c0: 0x0040, 0x14c1: 0x0040, 0x14c2: 0x0040, 0x14c3: 0x0040, 0x14c4: 0x0040, 0x14c5: 0x0040,
+	0x14c6: 0x0040, 0x14c7: 0x0040, 0x14c8: 0x0040, 0x14c9: 0x0040, 0x14ca: 0x0040, 0x14cb: 0x0040,
+	0x14cc: 0x0040, 0x14cd: 0x0040, 0x14ce: 0x0040, 0x14cf: 0x0040, 0x14d0: 0x9621, 0x14d1: 0x9659,
+	0x14d2: 0x9659, 0x14d3: 0x9691, 0x14d4: 0x96c9, 0x14d5: 0x9701, 0x14d6: 0x9739, 0x14d7: 0x9771,
+	0x14d8: 0x97a9, 0x14d9: 0x97a9, 0x14da: 0x97e1, 0x14db: 0x9819, 0x14dc: 0x9851, 0x14dd: 0x9889,
+	0x14de: 0x98c1, 0x14df: 0x98f9, 0x14e0: 0x98f9, 0x14e1: 0x9931, 0x14e2: 0x9969, 0x14e3: 0x9969,
+	0x14e4: 0x99a1, 0x14e5: 0x99a1, 0x14e6: 0x99d9, 0x14e7: 0x9a11, 0x14e8: 0x9a11, 0x14e9: 0x9a49,
+	0x14ea: 0x9a81, 0x14eb: 0x9a81, 0x14ec: 0x9ab9, 0x14ed: 0x9ab9, 0x14ee: 0x9af1, 0x14ef: 0x9b29,
+	0x14f0: 0x9b29, 0x14f1: 0x9b61, 0x14f2: 0x9b61, 0x14f3: 0x9b99, 0x14f4: 0x9bd1, 0x14f5: 0x9c09,
+	0x14f6: 0x9c41, 0x14f7: 0x9c41, 0x14f8: 0x9c79, 0x14f9: 0x9cb1, 0x14fa: 0x9ce9, 0x14fb: 0x9d21,
+	0x14fc: 0x9d59, 0x14fd: 0x9d59, 0x14fe: 0x9d91, 0x14ff: 0x9dc9,
 	// Block 0x54, offset 0x1500
-	0x1500: 0x7ecd, 0x1501: 0x7eed, 0x1502: 0x7f0d, 0x1503: 0x7eed, 0x1504: 0x7f2d, 0x1505: 0x0018,
-	0x1506: 0x0018, 0x1507: 0x1ff2, 0x1508: 0x1ffa, 0x1509: 0x7f4e, 0x150a: 0x7f6e, 0x150b: 0x7f8e,
-	0x150c: 0x7fae, 0x150d: 0x1fda, 0x150e: 0x1fda, 0x150f: 0x1fda, 0x1510: 0x1fba, 0x1511: 0x7fcd,
-	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0122, 0x1515: 0x1fc2, 0x1516: 0x1fd2, 0x1517: 0x1fca,
-	0x1518: 0x7fed, 0x1519: 0x072a, 0x151a: 0x0732, 0x151b: 0x1fe2, 0x151c: 0x1fea, 0x151d: 0x7ecd,
-	0x151e: 0x7f2d, 0x151f: 0x2002, 0x1520: 0x200a, 0x1521: 0x2012, 0x1522: 0x071a, 0x1523: 0x2019,
-	0x1524: 0x2022, 0x1525: 0x202a, 0x1526: 0x0722, 0x1527: 0x0040, 0x1528: 0x2032, 0x1529: 0x203a,
-	0x152a: 0x2042, 0x152b: 0x204a, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
-	0x1530: 0x800e, 0x1531: 0x2051, 0x1532: 0x802e, 0x1533: 0x0808, 0x1534: 0x804e, 0x1535: 0x0040,
-	0x1536: 0x806e, 0x1537: 0x2059, 0x1538: 0x808e, 0x1539: 0x2061, 0x153a: 0x80ae, 0x153b: 0x2069,
-	0x153c: 0x80ce, 0x153d: 0x2071, 0x153e: 0x80ee, 0x153f: 0x2079,
+	0x1500: 0xa999, 0x1501: 0xa9d1, 0x1502: 0xaa09, 0x1503: 0xa8f1, 0x1504: 0x9c09, 0x1505: 0x99d9,
+	0x1506: 0xaa41, 0x1507: 0xaa79, 0x1508: 0x0040, 0x1509: 0x0040, 0x150a: 0x0040, 0x150b: 0x0040,
+	0x150c: 0x0040, 0x150d: 0x0040, 0x150e: 0x0040, 0x150f: 0x0040, 0x1510: 0x0040, 0x1511: 0x0040,
+	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0040, 0x1515: 0x0040, 0x1516: 0x0040, 0x1517: 0x0040,
+	0x1518: 0x0040, 0x1519: 0x0040, 0x151a: 0x0040, 0x151b: 0x0040, 0x151c: 0x0040, 0x151d: 0x0040,
+	0x151e: 0x0040, 0x151f: 0x0040, 0x1520: 0x0040, 0x1521: 0x0040, 0x1522: 0x0040, 0x1523: 0x0040,
+	0x1524: 0x0040, 0x1525: 0x0040, 0x1526: 0x0040, 0x1527: 0x0040, 0x1528: 0x0040, 0x1529: 0x0040,
+	0x152a: 0x0040, 0x152b: 0x0040, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
+	0x1530: 0xaab1, 0x1531: 0xaae9, 0x1532: 0xab21, 0x1533: 0xab69, 0x1534: 0xabb1, 0x1535: 0xabf9,
+	0x1536: 0xac41, 0x1537: 0xac89, 0x1538: 0xacd1, 0x1539: 0xad19, 0x153a: 0xad52, 0x153b: 0xae62,
+	0x153c: 0xaee1, 0x153d: 0x0018, 0x153e: 0x0040, 0x153f: 0x0040,
 	// Block 0x55, offset 0x1540
-	0x1540: 0x2081, 0x1541: 0x2089, 0x1542: 0x2089, 0x1543: 0x2091, 0x1544: 0x2091, 0x1545: 0x2099,
-	0x1546: 0x2099, 0x1547: 0x20a1, 0x1548: 0x20a1, 0x1549: 0x20a9, 0x154a: 0x20a9, 0x154b: 0x20a9,
-	0x154c: 0x20a9, 0x154d: 0x20b1, 0x154e: 0x20b1, 0x154f: 0x20b9, 0x1550: 0x20b9, 0x1551: 0x20b9,
-	0x1552: 0x20b9, 0x1553: 0x20c1, 0x1554: 0x20c1, 0x1555: 0x20c9, 0x1556: 0x20c9, 0x1557: 0x20c9,
-	0x1558: 0x20c9, 0x1559: 0x20d1, 0x155a: 0x20d1, 0x155b: 0x20d1, 0x155c: 0x20d1, 0x155d: 0x20d9,
-	0x155e: 0x20d9, 0x155f: 0x20d9, 0x1560: 0x20d9, 0x1561: 0x20e1, 0x1562: 0x20e1, 0x1563: 0x20e1,
-	0x1564: 0x20e1, 0x1565: 0x20e9, 0x1566: 0x20e9, 0x1567: 0x20e9, 0x1568: 0x20e9, 0x1569: 0x20f1,
-	0x156a: 0x20f1, 0x156b: 0x20f9, 0x156c: 0x20f9, 0x156d: 0x2101, 0x156e: 0x2101, 0x156f: 0x2109,
-	0x1570: 0x2109, 0x1571: 0x2111, 0x1572: 0x2111, 0x1573: 0x2111, 0x1574: 0x2111, 0x1575: 0x2119,
-	0x1576: 0x2119, 0x1577: 0x2119, 0x1578: 0x2119, 0x1579: 0x2121, 0x157a: 0x2121, 0x157b: 0x2121,
-	0x157c: 0x2121, 0x157d: 0x2129, 0x157e: 0x2129, 0x157f: 0x2129,
+	0x1540: 0x33c0, 0x1541: 0x33c0, 0x1542: 0x33c0, 0x1543: 0x33c0, 0x1544: 0x33c0, 0x1545: 0x33c0,
+	0x1546: 0x33c0, 0x1547: 0x33c0, 0x1548: 0x33c0, 0x1549: 0x33c0, 0x154a: 0x33c0, 0x154b: 0x33c0,
+	0x154c: 0x33c0, 0x154d: 0x33c0, 0x154e: 0x33c0, 0x154f: 0x33c0, 0x1550: 0xaf2a, 0x1551: 0x7d8d,
+	0x1552: 0x0040, 0x1553: 0xaf3a, 0x1554: 0x03c2, 0x1555: 0xaf4a, 0x1556: 0xaf5a, 0x1557: 0x7dad,
+	0x1558: 0x7dcd, 0x1559: 0x0040, 0x155a: 0x0040, 0x155b: 0x0040, 0x155c: 0x0040, 0x155d: 0x0040,
+	0x155e: 0x0040, 0x155f: 0x0040, 0x1560: 0x3308, 0x1561: 0x3308, 0x1562: 0x3308, 0x1563: 0x3308,
+	0x1564: 0x3308, 0x1565: 0x3308, 0x1566: 0x3308, 0x1567: 0x3308, 0x1568: 0x3308, 0x1569: 0x3308,
+	0x156a: 0x3308, 0x156b: 0x3308, 0x156c: 0x3308, 0x156d: 0x3308, 0x156e: 0x3308, 0x156f: 0x3308,
+	0x1570: 0x0040, 0x1571: 0x7ded, 0x1572: 0x7e0d, 0x1573: 0xaf6a, 0x1574: 0xaf6a, 0x1575: 0x1fd2,
+	0x1576: 0x1fe2, 0x1577: 0xaf7a, 0x1578: 0xaf8a, 0x1579: 0x7e2d, 0x157a: 0x7e4d, 0x157b: 0x7e6d,
+	0x157c: 0x7e2d, 0x157d: 0x7e8d, 0x157e: 0x7ead, 0x157f: 0x7e8d,
 	// Block 0x56, offset 0x1580
-	0x1580: 0x2129, 0x1581: 0x2131, 0x1582: 0x2131, 0x1583: 0x2131, 0x1584: 0x2131, 0x1585: 0x2139,
-	0x1586: 0x2139, 0x1587: 0x2139, 0x1588: 0x2139, 0x1589: 0x2141, 0x158a: 0x2141, 0x158b: 0x2141,
-	0x158c: 0x2141, 0x158d: 0x2149, 0x158e: 0x2149, 0x158f: 0x2149, 0x1590: 0x2149, 0x1591: 0x2151,
-	0x1592: 0x2151, 0x1593: 0x2151, 0x1594: 0x2151, 0x1595: 0x2159, 0x1596: 0x2159, 0x1597: 0x2159,
-	0x1598: 0x2159, 0x1599: 0x2161, 0x159a: 0x2161, 0x159b: 0x2161, 0x159c: 0x2161, 0x159d: 0x2169,
-	0x159e: 0x2169, 0x159f: 0x2169, 0x15a0: 0x2169, 0x15a1: 0x2171, 0x15a2: 0x2171, 0x15a3: 0x2171,
-	0x15a4: 0x2171, 0x15a5: 0x2179, 0x15a6: 0x2179, 0x15a7: 0x2179, 0x15a8: 0x2179, 0x15a9: 0x2181,
-	0x15aa: 0x2181, 0x15ab: 0x2181, 0x15ac: 0x2181, 0x15ad: 0x2189, 0x15ae: 0x2189, 0x15af: 0x1701,
-	0x15b0: 0x1701, 0x15b1: 0x2191, 0x15b2: 0x2191, 0x15b3: 0x2191, 0x15b4: 0x2191, 0x15b5: 0x2199,
-	0x15b6: 0x2199, 0x15b7: 0x21a1, 0x15b8: 0x21a1, 0x15b9: 0x21a9, 0x15ba: 0x21a9, 0x15bb: 0x21b1,
-	0x15bc: 0x21b1, 0x15bd: 0x0040, 0x15be: 0x0040, 0x15bf: 0x03c0,
+	0x1580: 0x7ecd, 0x1581: 0x7eed, 0x1582: 0x7f0d, 0x1583: 0x7eed, 0x1584: 0x7f2d, 0x1585: 0x0018,
+	0x1586: 0x0018, 0x1587: 0xaf9a, 0x1588: 0xafaa, 0x1589: 0x7f4e, 0x158a: 0x7f6e, 0x158b: 0x7f8e,
+	0x158c: 0x7fae, 0x158d: 0xaf6a, 0x158e: 0xaf6a, 0x158f: 0xaf6a, 0x1590: 0xaf2a, 0x1591: 0x7fcd,
+	0x1592: 0x0040, 0x1593: 0x0040, 0x1594: 0x03c2, 0x1595: 0xaf3a, 0x1596: 0xaf5a, 0x1597: 0xaf4a,
+	0x1598: 0x7fed, 0x1599: 0x1fd2, 0x159a: 0x1fe2, 0x159b: 0xaf7a, 0x159c: 0xaf8a, 0x159d: 0x7ecd,
+	0x159e: 0x7f2d, 0x159f: 0xafba, 0x15a0: 0xafca, 0x15a1: 0xafda, 0x15a2: 0x1fb2, 0x15a3: 0xafe9,
+	0x15a4: 0xaffa, 0x15a5: 0xb00a, 0x15a6: 0x1fc2, 0x15a7: 0x0040, 0x15a8: 0xb01a, 0x15a9: 0xb02a,
+	0x15aa: 0xb03a, 0x15ab: 0xb04a, 0x15ac: 0x0040, 0x15ad: 0x0040, 0x15ae: 0x0040, 0x15af: 0x0040,
+	0x15b0: 0x800e, 0x15b1: 0xb059, 0x15b2: 0x802e, 0x15b3: 0x0808, 0x15b4: 0x804e, 0x15b5: 0x0040,
+	0x15b6: 0x806e, 0x15b7: 0xb081, 0x15b8: 0x808e, 0x15b9: 0xb0a9, 0x15ba: 0x80ae, 0x15bb: 0xb0d1,
+	0x15bc: 0x80ce, 0x15bd: 0xb0f9, 0x15be: 0x80ee, 0x15bf: 0xb121,
 	// Block 0x57, offset 0x15c0
-	0x15c0: 0x0040, 0x15c1: 0x1fca, 0x15c2: 0x21ba, 0x15c3: 0x2002, 0x15c4: 0x203a, 0x15c5: 0x2042,
-	0x15c6: 0x200a, 0x15c7: 0x21c2, 0x15c8: 0x072a, 0x15c9: 0x0732, 0x15ca: 0x2012, 0x15cb: 0x071a,
-	0x15cc: 0x1fba, 0x15cd: 0x2019, 0x15ce: 0x0961, 0x15cf: 0x21ca, 0x15d0: 0x06e1, 0x15d1: 0x0049,
-	0x15d2: 0x0029, 0x15d3: 0x0031, 0x15d4: 0x06e9, 0x15d5: 0x06f1, 0x15d6: 0x06f9, 0x15d7: 0x0701,
-	0x15d8: 0x0709, 0x15d9: 0x0711, 0x15da: 0x1fc2, 0x15db: 0x0122, 0x15dc: 0x2022, 0x15dd: 0x0722,
-	0x15de: 0x202a, 0x15df: 0x1fd2, 0x15e0: 0x204a, 0x15e1: 0x0019, 0x15e2: 0x02e9, 0x15e3: 0x03d9,
-	0x15e4: 0x02f1, 0x15e5: 0x02f9, 0x15e6: 0x03f1, 0x15e7: 0x0309, 0x15e8: 0x00a9, 0x15e9: 0x0311,
-	0x15ea: 0x00b1, 0x15eb: 0x0319, 0x15ec: 0x0101, 0x15ed: 0x0321, 0x15ee: 0x0329, 0x15ef: 0x0051,
-	0x15f0: 0x0339, 0x15f1: 0x0751, 0x15f2: 0x00b9, 0x15f3: 0x0089, 0x15f4: 0x0341, 0x15f5: 0x0349,
-	0x15f6: 0x0391, 0x15f7: 0x00c1, 0x15f8: 0x0109, 0x15f9: 0x00c9, 0x15fa: 0x04b1, 0x15fb: 0x1ff2,
-	0x15fc: 0x2032, 0x15fd: 0x1ffa, 0x15fe: 0x21d2, 0x15ff: 0x1fda,
+	0x15c0: 0xb149, 0x15c1: 0xb161, 0x15c2: 0xb161, 0x15c3: 0xb179, 0x15c4: 0xb179, 0x15c5: 0xb191,
+	0x15c6: 0xb191, 0x15c7: 0xb1a9, 0x15c8: 0xb1a9, 0x15c9: 0xb1c1, 0x15ca: 0xb1c1, 0x15cb: 0xb1c1,
+	0x15cc: 0xb1c1, 0x15cd: 0xb1d9, 0x15ce: 0xb1d9, 0x15cf: 0xb1f1, 0x15d0: 0xb1f1, 0x15d1: 0xb1f1,
+	0x15d2: 0xb1f1, 0x15d3: 0xb209, 0x15d4: 0xb209, 0x15d5: 0xb221, 0x15d6: 0xb221, 0x15d7: 0xb221,
+	0x15d8: 0xb221, 0x15d9: 0xb239, 0x15da: 0xb239, 0x15db: 0xb239, 0x15dc: 0xb239, 0x15dd: 0xb251,
+	0x15de: 0xb251, 0x15df: 0xb251, 0x15e0: 0xb251, 0x15e1: 0xb269, 0x15e2: 0xb269, 0x15e3: 0xb269,
+	0x15e4: 0xb269, 0x15e5: 0xb281, 0x15e6: 0xb281, 0x15e7: 0xb281, 0x15e8: 0xb281, 0x15e9: 0xb299,
+	0x15ea: 0xb299, 0x15eb: 0xb2b1, 0x15ec: 0xb2b1, 0x15ed: 0xb2c9, 0x15ee: 0xb2c9, 0x15ef: 0xb2e1,
+	0x15f0: 0xb2e1, 0x15f1: 0xb2f9, 0x15f2: 0xb2f9, 0x15f3: 0xb2f9, 0x15f4: 0xb2f9, 0x15f5: 0xb311,
+	0x15f6: 0xb311, 0x15f7: 0xb311, 0x15f8: 0xb311, 0x15f9: 0xb329, 0x15fa: 0xb329, 0x15fb: 0xb329,
+	0x15fc: 0xb329, 0x15fd: 0xb341, 0x15fe: 0xb341, 0x15ff: 0xb341,
 	// Block 0x58, offset 0x1600
-	0x1600: 0x0672, 0x1601: 0x0019, 0x1602: 0x02e9, 0x1603: 0x03d9, 0x1604: 0x02f1, 0x1605: 0x02f9,
-	0x1606: 0x03f1, 0x1607: 0x0309, 0x1608: 0x00a9, 0x1609: 0x0311, 0x160a: 0x00b1, 0x160b: 0x0319,
-	0x160c: 0x0101, 0x160d: 0x0321, 0x160e: 0x0329, 0x160f: 0x0051, 0x1610: 0x0339, 0x1611: 0x0751,
-	0x1612: 0x00b9, 0x1613: 0x0089, 0x1614: 0x0341, 0x1615: 0x0349, 0x1616: 0x0391, 0x1617: 0x00c1,
-	0x1618: 0x0109, 0x1619: 0x00c9, 0x161a: 0x04b1, 0x161b: 0x1fe2, 0x161c: 0x21da, 0x161d: 0x1fea,
-	0x161e: 0x21e2, 0x161f: 0x810d, 0x1620: 0x812d, 0x1621: 0x0961, 0x1622: 0x814d, 0x1623: 0x814d,
-	0x1624: 0x816d, 0x1625: 0x818d, 0x1626: 0x81ad, 0x1627: 0x81cd, 0x1628: 0x81ed, 0x1629: 0x820d,
-	0x162a: 0x822d, 0x162b: 0x824d, 0x162c: 0x826d, 0x162d: 0x828d, 0x162e: 0x82ad, 0x162f: 0x82cd,
-	0x1630: 0x82ed, 0x1631: 0x830d, 0x1632: 0x832d, 0x1633: 0x834d, 0x1634: 0x836d, 0x1635: 0x838d,
-	0x1636: 0x83ad, 0x1637: 0x83cd, 0x1638: 0x83ed, 0x1639: 0x840d, 0x163a: 0x842d, 0x163b: 0x844d,
-	0x163c: 0x81ed, 0x163d: 0x846d, 0x163e: 0x848d, 0x163f: 0x824d,
+	0x1600: 0xb341, 0x1601: 0xb359, 0x1602: 0xb359, 0x1603: 0xb359, 0x1604: 0xb359, 0x1605: 0xb371,
+	0x1606: 0xb371, 0x1607: 0xb371, 0x1608: 0xb371, 0x1609: 0xb389, 0x160a: 0xb389, 0x160b: 0xb389,
+	0x160c: 0xb389, 0x160d: 0xb3a1, 0x160e: 0xb3a1, 0x160f: 0xb3a1, 0x1610: 0xb3a1, 0x1611: 0xb3b9,
+	0x1612: 0xb3b9, 0x1613: 0xb3b9, 0x1614: 0xb3b9, 0x1615: 0xb3d1, 0x1616: 0xb3d1, 0x1617: 0xb3d1,
+	0x1618: 0xb3d1, 0x1619: 0xb3e9, 0x161a: 0xb3e9, 0x161b: 0xb3e9, 0x161c: 0xb3e9, 0x161d: 0xb401,
+	0x161e: 0xb401, 0x161f: 0xb401, 0x1620: 0xb401, 0x1621: 0xb419, 0x1622: 0xb419, 0x1623: 0xb419,
+	0x1624: 0xb419, 0x1625: 0xb431, 0x1626: 0xb431, 0x1627: 0xb431, 0x1628: 0xb431, 0x1629: 0xb449,
+	0x162a: 0xb449, 0x162b: 0xb449, 0x162c: 0xb449, 0x162d: 0xb461, 0x162e: 0xb461, 0x162f: 0x7b01,
+	0x1630: 0x7b01, 0x1631: 0xb479, 0x1632: 0xb479, 0x1633: 0xb479, 0x1634: 0xb479, 0x1635: 0xb491,
+	0x1636: 0xb491, 0x1637: 0xb4b9, 0x1638: 0xb4b9, 0x1639: 0xb4e1, 0x163a: 0xb4e1, 0x163b: 0xb509,
+	0x163c: 0xb509, 0x163d: 0x0040, 0x163e: 0x0040, 0x163f: 0x03c0,
 	// Block 0x59, offset 0x1640
-	0x1640: 0x84ad, 0x1641: 0x84cd, 0x1642: 0x84ed, 0x1643: 0x850d, 0x1644: 0x852d, 0x1645: 0x854d,
-	0x1646: 0x856d, 0x1647: 0x858d, 0x1648: 0x850d, 0x1649: 0x85ad, 0x164a: 0x850d, 0x164b: 0x85cd,
-	0x164c: 0x85cd, 0x164d: 0x85ed, 0x164e: 0x85ed, 0x164f: 0x860d, 0x1650: 0x854d, 0x1651: 0x862d,
-	0x1652: 0x864d, 0x1653: 0x862d, 0x1654: 0x866d, 0x1655: 0x864d, 0x1656: 0x868d, 0x1657: 0x868d,
-	0x1658: 0x86ad, 0x1659: 0x86ad, 0x165a: 0x86cd, 0x165b: 0x86cd, 0x165c: 0x864d, 0x165d: 0x814d,
-	0x165e: 0x86ed, 0x165f: 0x870d, 0x1660: 0x0040, 0x1661: 0x872d, 0x1662: 0x874d, 0x1663: 0x876d,
-	0x1664: 0x878d, 0x1665: 0x876d, 0x1666: 0x87ad, 0x1667: 0x87cd, 0x1668: 0x87ed, 0x1669: 0x87ed,
-	0x166a: 0x880d, 0x166b: 0x880d, 0x166c: 0x882d, 0x166d: 0x882d, 0x166e: 0x880d, 0x166f: 0x880d,
-	0x1670: 0x884d, 0x1671: 0x886d, 0x1672: 0x888d, 0x1673: 0x88ad, 0x1674: 0x88cd, 0x1675: 0x88ed,
-	0x1676: 0x88ed, 0x1677: 0x88ed, 0x1678: 0x890d, 0x1679: 0x890d, 0x167a: 0x890d, 0x167b: 0x890d,
-	0x167c: 0x87ed, 0x167d: 0x87ed, 0x167e: 0x87ed, 0x167f: 0x0040,
+	0x1640: 0x0040, 0x1641: 0xaf4a, 0x1642: 0xb532, 0x1643: 0xafba, 0x1644: 0xb02a, 0x1645: 0xb03a,
+	0x1646: 0xafca, 0x1647: 0xb542, 0x1648: 0x1fd2, 0x1649: 0x1fe2, 0x164a: 0xafda, 0x164b: 0x1fb2,
+	0x164c: 0xaf2a, 0x164d: 0xafe9, 0x164e: 0x29d1, 0x164f: 0xb552, 0x1650: 0x1f41, 0x1651: 0x00c9,
+	0x1652: 0x0069, 0x1653: 0x0079, 0x1654: 0x1f51, 0x1655: 0x1f61, 0x1656: 0x1f71, 0x1657: 0x1f81,
+	0x1658: 0x1f91, 0x1659: 0x1fa1, 0x165a: 0xaf3a, 0x165b: 0x03c2, 0x165c: 0xaffa, 0x165d: 0x1fc2,
+	0x165e: 0xb00a, 0x165f: 0xaf5a, 0x1660: 0xb04a, 0x1661: 0x0039, 0x1662: 0x0ee9, 0x1663: 0x1159,
+	0x1664: 0x0ef9, 0x1665: 0x0f09, 0x1666: 0x1199, 0x1667: 0x0f31, 0x1668: 0x0249, 0x1669: 0x0f41,
+	0x166a: 0x0259, 0x166b: 0x0f51, 0x166c: 0x0359, 0x166d: 0x0f61, 0x166e: 0x0f71, 0x166f: 0x00d9,
+	0x1670: 0x0f99, 0x1671: 0x2039, 0x1672: 0x0269, 0x1673: 0x01d9, 0x1674: 0x0fa9, 0x1675: 0x0fb9,
+	0x1676: 0x1089, 0x1677: 0x0279, 0x1678: 0x0369, 0x1679: 0x0289, 0x167a: 0x13d1, 0x167b: 0xaf9a,
+	0x167c: 0xb01a, 0x167d: 0xafaa, 0x167e: 0xb562, 0x167f: 0xaf6a,
 	// Block 0x5a, offset 0x1680
-	0x1680: 0x0040, 0x1681: 0x0040, 0x1682: 0x874d, 0x1683: 0x872d, 0x1684: 0x892d, 0x1685: 0x872d,
-	0x1686: 0x874d, 0x1687: 0x872d, 0x1688: 0x0040, 0x1689: 0x0040, 0x168a: 0x894d, 0x168b: 0x874d,
-	0x168c: 0x896d, 0x168d: 0x892d, 0x168e: 0x896d, 0x168f: 0x874d, 0x1690: 0x0040, 0x1691: 0x0040,
-	0x1692: 0x898d, 0x1693: 0x89ad, 0x1694: 0x88ad, 0x1695: 0x896d, 0x1696: 0x892d, 0x1697: 0x896d,
-	0x1698: 0x0040, 0x1699: 0x0040, 0x169a: 0x89cd, 0x169b: 0x89ed, 0x169c: 0x89cd, 0x169d: 0x0040,
-	0x169e: 0x0040, 0x169f: 0x0040, 0x16a0: 0x21e9, 0x16a1: 0x21f1, 0x16a2: 0x21f9, 0x16a3: 0x8a0e,
-	0x16a4: 0x2201, 0x16a5: 0x2209, 0x16a6: 0x8a2d, 0x16a7: 0x0040, 0x16a8: 0x8a4d, 0x16a9: 0x8a6d,
-	0x16aa: 0x8a8d, 0x16ab: 0x8a6d, 0x16ac: 0x8aad, 0x16ad: 0x8acd, 0x16ae: 0x8aed, 0x16af: 0x0040,
-	0x16b0: 0x0040, 0x16b1: 0x0040, 0x16b2: 0x0040, 0x16b3: 0x0040, 0x16b4: 0x0040, 0x16b5: 0x0040,
-	0x16b6: 0x0040, 0x16b7: 0x0040, 0x16b8: 0x0040, 0x16b9: 0x0340, 0x16ba: 0x0340, 0x16bb: 0x0340,
-	0x16bc: 0x0040, 0x16bd: 0x0040, 0x16be: 0x0040, 0x16bf: 0x0040,
+	0x1680: 0x1caa, 0x1681: 0x0039, 0x1682: 0x0ee9, 0x1683: 0x1159, 0x1684: 0x0ef9, 0x1685: 0x0f09,
+	0x1686: 0x1199, 0x1687: 0x0f31, 0x1688: 0x0249, 0x1689: 0x0f41, 0x168a: 0x0259, 0x168b: 0x0f51,
+	0x168c: 0x0359, 0x168d: 0x0f61, 0x168e: 0x0f71, 0x168f: 0x00d9, 0x1690: 0x0f99, 0x1691: 0x2039,
+	0x1692: 0x0269, 0x1693: 0x01d9, 0x1694: 0x0fa9, 0x1695: 0x0fb9, 0x1696: 0x1089, 0x1697: 0x0279,
+	0x1698: 0x0369, 0x1699: 0x0289, 0x169a: 0x13d1, 0x169b: 0xaf7a, 0x169c: 0xb572, 0x169d: 0xaf8a,
+	0x169e: 0xb582, 0x169f: 0x810d, 0x16a0: 0x812d, 0x16a1: 0x29d1, 0x16a2: 0x814d, 0x16a3: 0x814d,
+	0x16a4: 0x816d, 0x16a5: 0x818d, 0x16a6: 0x81ad, 0x16a7: 0x81cd, 0x16a8: 0x81ed, 0x16a9: 0x820d,
+	0x16aa: 0x822d, 0x16ab: 0x824d, 0x16ac: 0x826d, 0x16ad: 0x828d, 0x16ae: 0x82ad, 0x16af: 0x82cd,
+	0x16b0: 0x82ed, 0x16b1: 0x830d, 0x16b2: 0x832d, 0x16b3: 0x834d, 0x16b4: 0x836d, 0x16b5: 0x838d,
+	0x16b6: 0x83ad, 0x16b7: 0x83cd, 0x16b8: 0x83ed, 0x16b9: 0x840d, 0x16ba: 0x842d, 0x16bb: 0x844d,
+	0x16bc: 0x81ed, 0x16bd: 0x846d, 0x16be: 0x848d, 0x16bf: 0x824d,
 	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x0a08, 0x16c1: 0x0a08, 0x16c2: 0x0a08, 0x16c3: 0x0a08, 0x16c4: 0x0a08, 0x16c5: 0x0c08,
-	0x16c6: 0x0808, 0x16c7: 0x0c08, 0x16c8: 0x0818, 0x16c9: 0x0c08, 0x16ca: 0x0c08, 0x16cb: 0x0808,
-	0x16cc: 0x0808, 0x16cd: 0x0908, 0x16ce: 0x0c08, 0x16cf: 0x0c08, 0x16d0: 0x0c08, 0x16d1: 0x0c08,
-	0x16d2: 0x0c08, 0x16d3: 0x0a08, 0x16d4: 0x0a08, 0x16d5: 0x0a08, 0x16d6: 0x0a08, 0x16d7: 0x0908,
-	0x16d8: 0x0a08, 0x16d9: 0x0a08, 0x16da: 0x0a08, 0x16db: 0x0a08, 0x16dc: 0x0a08, 0x16dd: 0x0c08,
-	0x16de: 0x0a08, 0x16df: 0x0a08, 0x16e0: 0x0a08, 0x16e1: 0x0c08, 0x16e2: 0x0808, 0x16e3: 0x0808,
-	0x16e4: 0x0c08, 0x16e5: 0x3308, 0x16e6: 0x3308, 0x16e7: 0x0040, 0x16e8: 0x0040, 0x16e9: 0x0040,
-	0x16ea: 0x0040, 0x16eb: 0x0a18, 0x16ec: 0x0a18, 0x16ed: 0x0a18, 0x16ee: 0x0a18, 0x16ef: 0x0c18,
-	0x16f0: 0x0818, 0x16f1: 0x0818, 0x16f2: 0x0818, 0x16f3: 0x0818, 0x16f4: 0x0818, 0x16f5: 0x0818,
-	0x16f6: 0x0818, 0x16f7: 0x0040, 0x16f8: 0x0040, 0x16f9: 0x0040, 0x16fa: 0x0040, 0x16fb: 0x0040,
-	0x16fc: 0x0040, 0x16fd: 0x0040, 0x16fe: 0x0040, 0x16ff: 0x0040,
+	0x16c0: 0x84ad, 0x16c1: 0x84cd, 0x16c2: 0x84ed, 0x16c3: 0x850d, 0x16c4: 0x852d, 0x16c5: 0x854d,
+	0x16c6: 0x856d, 0x16c7: 0x858d, 0x16c8: 0x850d, 0x16c9: 0x85ad, 0x16ca: 0x850d, 0x16cb: 0x85cd,
+	0x16cc: 0x85cd, 0x16cd: 0x85ed, 0x16ce: 0x85ed, 0x16cf: 0x860d, 0x16d0: 0x854d, 0x16d1: 0x862d,
+	0x16d2: 0x864d, 0x16d3: 0x862d, 0x16d4: 0x866d, 0x16d5: 0x864d, 0x16d6: 0x868d, 0x16d7: 0x868d,
+	0x16d8: 0x86ad, 0x16d9: 0x86ad, 0x16da: 0x86cd, 0x16db: 0x86cd, 0x16dc: 0x864d, 0x16dd: 0x814d,
+	0x16de: 0x86ed, 0x16df: 0x870d, 0x16e0: 0x0040, 0x16e1: 0x872d, 0x16e2: 0x874d, 0x16e3: 0x876d,
+	0x16e4: 0x878d, 0x16e5: 0x876d, 0x16e6: 0x87ad, 0x16e7: 0x87cd, 0x16e8: 0x87ed, 0x16e9: 0x87ed,
+	0x16ea: 0x880d, 0x16eb: 0x880d, 0x16ec: 0x882d, 0x16ed: 0x882d, 0x16ee: 0x880d, 0x16ef: 0x880d,
+	0x16f0: 0x884d, 0x16f1: 0x886d, 0x16f2: 0x888d, 0x16f3: 0x88ad, 0x16f4: 0x88cd, 0x16f5: 0x88ed,
+	0x16f6: 0x88ed, 0x16f7: 0x88ed, 0x16f8: 0x890d, 0x16f9: 0x890d, 0x16fa: 0x890d, 0x16fb: 0x890d,
+	0x16fc: 0x87ed, 0x16fd: 0x87ed, 0x16fe: 0x87ed, 0x16ff: 0x0040,
 	// Block 0x5c, offset 0x1700
-	0x1700: 0x0a08, 0x1701: 0x0c08, 0x1702: 0x0a08, 0x1703: 0x0c08, 0x1704: 0x0c08, 0x1705: 0x0c08,
-	0x1706: 0x0a08, 0x1707: 0x0a08, 0x1708: 0x0a08, 0x1709: 0x0c08, 0x170a: 0x0a08, 0x170b: 0x0a08,
-	0x170c: 0x0c08, 0x170d: 0x0a08, 0x170e: 0x0c08, 0x170f: 0x0c08, 0x1710: 0x0a08, 0x1711: 0x0c08,
-	0x1712: 0x0040, 0x1713: 0x0040, 0x1714: 0x0040, 0x1715: 0x0040, 0x1716: 0x0040, 0x1717: 0x0040,
-	0x1718: 0x0040, 0x1719: 0x0818, 0x171a: 0x0818, 0x171b: 0x0818, 0x171c: 0x0818, 0x171d: 0x0040,
-	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0x0040, 0x1721: 0x0040, 0x1722: 0x0040, 0x1723: 0x0040,
-	0x1724: 0x0040, 0x1725: 0x0040, 0x1726: 0x0040, 0x1727: 0x0040, 0x1728: 0x0040, 0x1729: 0x0c18,
-	0x172a: 0x0c18, 0x172b: 0x0c18, 0x172c: 0x0c18, 0x172d: 0x0a18, 0x172e: 0x0a18, 0x172f: 0x0818,
+	0x1700: 0x0040, 0x1701: 0x0040, 0x1702: 0x874d, 0x1703: 0x872d, 0x1704: 0x892d, 0x1705: 0x872d,
+	0x1706: 0x874d, 0x1707: 0x872d, 0x1708: 0x0040, 0x1709: 0x0040, 0x170a: 0x894d, 0x170b: 0x874d,
+	0x170c: 0x896d, 0x170d: 0x892d, 0x170e: 0x896d, 0x170f: 0x874d, 0x1710: 0x0040, 0x1711: 0x0040,
+	0x1712: 0x898d, 0x1713: 0x89ad, 0x1714: 0x88ad, 0x1715: 0x896d, 0x1716: 0x892d, 0x1717: 0x896d,
+	0x1718: 0x0040, 0x1719: 0x0040, 0x171a: 0x89cd, 0x171b: 0x89ed, 0x171c: 0x89cd, 0x171d: 0x0040,
+	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0xb591, 0x1721: 0xb5a9, 0x1722: 0xb5c1, 0x1723: 0x8a0e,
+	0x1724: 0xb5d9, 0x1725: 0xb5f1, 0x1726: 0x8a2d, 0x1727: 0x0040, 0x1728: 0x8a4d, 0x1729: 0x8a6d,
+	0x172a: 0x8a8d, 0x172b: 0x8a6d, 0x172c: 0x8aad, 0x172d: 0x8acd, 0x172e: 0x8aed, 0x172f: 0x0040,
 	0x1730: 0x0040, 0x1731: 0x0040, 0x1732: 0x0040, 0x1733: 0x0040, 0x1734: 0x0040, 0x1735: 0x0040,
-	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0040, 0x173a: 0x0040, 0x173b: 0x0040,
+	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0340, 0x173a: 0x0340, 0x173b: 0x0340,
 	0x173c: 0x0040, 0x173d: 0x0040, 0x173e: 0x0040, 0x173f: 0x0040,
 	// Block 0x5d, offset 0x1740
-	0x1740: 0x3308, 0x1741: 0x3308, 0x1742: 0x3008, 0x1743: 0x3008, 0x1744: 0x0040, 0x1745: 0x0008,
-	0x1746: 0x0008, 0x1747: 0x0008, 0x1748: 0x0008, 0x1749: 0x0008, 0x174a: 0x0008, 0x174b: 0x0008,
-	0x174c: 0x0008, 0x174d: 0x0040, 0x174e: 0x0040, 0x174f: 0x0008, 0x1750: 0x0008, 0x1751: 0x0040,
-	0x1752: 0x0040, 0x1753: 0x0008, 0x1754: 0x0008, 0x1755: 0x0008, 0x1756: 0x0008, 0x1757: 0x0008,
-	0x1758: 0x0008, 0x1759: 0x0008, 0x175a: 0x0008, 0x175b: 0x0008, 0x175c: 0x0008, 0x175d: 0x0008,
-	0x175e: 0x0008, 0x175f: 0x0008, 0x1760: 0x0008, 0x1761: 0x0008, 0x1762: 0x0008, 0x1763: 0x0008,
-	0x1764: 0x0008, 0x1765: 0x0008, 0x1766: 0x0008, 0x1767: 0x0008, 0x1768: 0x0008, 0x1769: 0x0040,
-	0x176a: 0x0008, 0x176b: 0x0008, 0x176c: 0x0008, 0x176d: 0x0008, 0x176e: 0x0008, 0x176f: 0x0008,
-	0x1770: 0x0008, 0x1771: 0x0040, 0x1772: 0x0008, 0x1773: 0x0008, 0x1774: 0x0040, 0x1775: 0x0008,
-	0x1776: 0x0008, 0x1777: 0x0008, 0x1778: 0x0008, 0x1779: 0x0008, 0x177a: 0x0040, 0x177b: 0x3308,
-	0x177c: 0x3308, 0x177d: 0x0008, 0x177e: 0x3008, 0x177f: 0x3008,
+	0x1740: 0x0a08, 0x1741: 0x0a08, 0x1742: 0x0a08, 0x1743: 0x0a08, 0x1744: 0x0a08, 0x1745: 0x0c08,
+	0x1746: 0x0808, 0x1747: 0x0c08, 0x1748: 0x0818, 0x1749: 0x0c08, 0x174a: 0x0c08, 0x174b: 0x0808,
+	0x174c: 0x0808, 0x174d: 0x0908, 0x174e: 0x0c08, 0x174f: 0x0c08, 0x1750: 0x0c08, 0x1751: 0x0c08,
+	0x1752: 0x0c08, 0x1753: 0x0a08, 0x1754: 0x0a08, 0x1755: 0x0a08, 0x1756: 0x0a08, 0x1757: 0x0908,
+	0x1758: 0x0a08, 0x1759: 0x0a08, 0x175a: 0x0a08, 0x175b: 0x0a08, 0x175c: 0x0a08, 0x175d: 0x0c08,
+	0x175e: 0x0a08, 0x175f: 0x0a08, 0x1760: 0x0a08, 0x1761: 0x0c08, 0x1762: 0x0808, 0x1763: 0x0808,
+	0x1764: 0x0c08, 0x1765: 0x3308, 0x1766: 0x3308, 0x1767: 0x0040, 0x1768: 0x0040, 0x1769: 0x0040,
+	0x176a: 0x0040, 0x176b: 0x0a18, 0x176c: 0x0a18, 0x176d: 0x0a18, 0x176e: 0x0a18, 0x176f: 0x0c18,
+	0x1770: 0x0818, 0x1771: 0x0818, 0x1772: 0x0818, 0x1773: 0x0818, 0x1774: 0x0818, 0x1775: 0x0818,
+	0x1776: 0x0818, 0x1777: 0x0040, 0x1778: 0x0040, 0x1779: 0x0040, 0x177a: 0x0040, 0x177b: 0x0040,
+	0x177c: 0x0040, 0x177d: 0x0040, 0x177e: 0x0040, 0x177f: 0x0040,
 	// Block 0x5e, offset 0x1780
-	0x1780: 0x3308, 0x1781: 0x3008, 0x1782: 0x3008, 0x1783: 0x3008, 0x1784: 0x3008, 0x1785: 0x0040,
-	0x1786: 0x0040, 0x1787: 0x3008, 0x1788: 0x3008, 0x1789: 0x0040, 0x178a: 0x0040, 0x178b: 0x3008,
-	0x178c: 0x3008, 0x178d: 0x3808, 0x178e: 0x0040, 0x178f: 0x0040, 0x1790: 0x0008, 0x1791: 0x0040,
-	0x1792: 0x0040, 0x1793: 0x0040, 0x1794: 0x0040, 0x1795: 0x0040, 0x1796: 0x0040, 0x1797: 0x3008,
-	0x1798: 0x0040, 0x1799: 0x0040, 0x179a: 0x0040, 0x179b: 0x0040, 0x179c: 0x0040, 0x179d: 0x0008,
-	0x179e: 0x0008, 0x179f: 0x0008, 0x17a0: 0x0008, 0x17a1: 0x0008, 0x17a2: 0x3008, 0x17a3: 0x3008,
-	0x17a4: 0x0040, 0x17a5: 0x0040, 0x17a6: 0x3308, 0x17a7: 0x3308, 0x17a8: 0x3308, 0x17a9: 0x3308,
-	0x17aa: 0x3308, 0x17ab: 0x3308, 0x17ac: 0x3308, 0x17ad: 0x0040, 0x17ae: 0x0040, 0x17af: 0x0040,
-	0x17b0: 0x3308, 0x17b1: 0x3308, 0x17b2: 0x3308, 0x17b3: 0x3308, 0x17b4: 0x3308, 0x17b5: 0x0040,
+	0x1780: 0x0a08, 0x1781: 0x0c08, 0x1782: 0x0a08, 0x1783: 0x0c08, 0x1784: 0x0c08, 0x1785: 0x0c08,
+	0x1786: 0x0a08, 0x1787: 0x0a08, 0x1788: 0x0a08, 0x1789: 0x0c08, 0x178a: 0x0a08, 0x178b: 0x0a08,
+	0x178c: 0x0c08, 0x178d: 0x0a08, 0x178e: 0x0c08, 0x178f: 0x0c08, 0x1790: 0x0a08, 0x1791: 0x0c08,
+	0x1792: 0x0040, 0x1793: 0x0040, 0x1794: 0x0040, 0x1795: 0x0040, 0x1796: 0x0040, 0x1797: 0x0040,
+	0x1798: 0x0040, 0x1799: 0x0818, 0x179a: 0x0818, 0x179b: 0x0818, 0x179c: 0x0818, 0x179d: 0x0040,
+	0x179e: 0x0040, 0x179f: 0x0040, 0x17a0: 0x0040, 0x17a1: 0x0040, 0x17a2: 0x0040, 0x17a3: 0x0040,
+	0x17a4: 0x0040, 0x17a5: 0x0040, 0x17a6: 0x0040, 0x17a7: 0x0040, 0x17a8: 0x0040, 0x17a9: 0x0c18,
+	0x17aa: 0x0c18, 0x17ab: 0x0c18, 0x17ac: 0x0c18, 0x17ad: 0x0a18, 0x17ae: 0x0a18, 0x17af: 0x0818,
+	0x17b0: 0x0040, 0x17b1: 0x0040, 0x17b2: 0x0040, 0x17b3: 0x0040, 0x17b4: 0x0040, 0x17b5: 0x0040,
 	0x17b6: 0x0040, 0x17b7: 0x0040, 0x17b8: 0x0040, 0x17b9: 0x0040, 0x17ba: 0x0040, 0x17bb: 0x0040,
 	0x17bc: 0x0040, 0x17bd: 0x0040, 0x17be: 0x0040, 0x17bf: 0x0040,
 	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x0008, 0x17c1: 0x0008, 0x17c2: 0x0008, 0x17c3: 0x0008, 0x17c4: 0x0008, 0x17c5: 0x0008,
-	0x17c6: 0x0008, 0x17c7: 0x0040, 0x17c8: 0x0040, 0x17c9: 0x0008, 0x17ca: 0x0040, 0x17cb: 0x0040,
-	0x17cc: 0x0008, 0x17cd: 0x0008, 0x17ce: 0x0008, 0x17cf: 0x0008, 0x17d0: 0x0008, 0x17d1: 0x0008,
-	0x17d2: 0x0008, 0x17d3: 0x0008, 0x17d4: 0x0040, 0x17d5: 0x0008, 0x17d6: 0x0008, 0x17d7: 0x0040,
+	0x17c0: 0x3308, 0x17c1: 0x3308, 0x17c2: 0x3008, 0x17c3: 0x3008, 0x17c4: 0x0040, 0x17c5: 0x0008,
+	0x17c6: 0x0008, 0x17c7: 0x0008, 0x17c8: 0x0008, 0x17c9: 0x0008, 0x17ca: 0x0008, 0x17cb: 0x0008,
+	0x17cc: 0x0008, 0x17cd: 0x0040, 0x17ce: 0x0040, 0x17cf: 0x0008, 0x17d0: 0x0008, 0x17d1: 0x0040,
+	0x17d2: 0x0040, 0x17d3: 0x0008, 0x17d4: 0x0008, 0x17d5: 0x0008, 0x17d6: 0x0008, 0x17d7: 0x0008,
 	0x17d8: 0x0008, 0x17d9: 0x0008, 0x17da: 0x0008, 0x17db: 0x0008, 0x17dc: 0x0008, 0x17dd: 0x0008,
 	0x17de: 0x0008, 0x17df: 0x0008, 0x17e0: 0x0008, 0x17e1: 0x0008, 0x17e2: 0x0008, 0x17e3: 0x0008,
-	0x17e4: 0x0008, 0x17e5: 0x0008, 0x17e6: 0x0008, 0x17e7: 0x0008, 0x17e8: 0x0008, 0x17e9: 0x0008,
+	0x17e4: 0x0008, 0x17e5: 0x0008, 0x17e6: 0x0008, 0x17e7: 0x0008, 0x17e8: 0x0008, 0x17e9: 0x0040,
 	0x17ea: 0x0008, 0x17eb: 0x0008, 0x17ec: 0x0008, 0x17ed: 0x0008, 0x17ee: 0x0008, 0x17ef: 0x0008,
-	0x17f0: 0x3008, 0x17f1: 0x3008, 0x17f2: 0x3008, 0x17f3: 0x3008, 0x17f4: 0x3008, 0x17f5: 0x3008,
-	0x17f6: 0x0040, 0x17f7: 0x3008, 0x17f8: 0x3008, 0x17f9: 0x0040, 0x17fa: 0x0040, 0x17fb: 0x3308,
-	0x17fc: 0x3308, 0x17fd: 0x3808, 0x17fe: 0x3b08, 0x17ff: 0x0008,
+	0x17f0: 0x0008, 0x17f1: 0x0040, 0x17f2: 0x0008, 0x17f3: 0x0008, 0x17f4: 0x0040, 0x17f5: 0x0008,
+	0x17f6: 0x0008, 0x17f7: 0x0008, 0x17f8: 0x0008, 0x17f9: 0x0008, 0x17fa: 0x0040, 0x17fb: 0x3308,
+	0x17fc: 0x3308, 0x17fd: 0x0008, 0x17fe: 0x3008, 0x17ff: 0x3008,
 	// Block 0x60, offset 0x1800
-	0x1800: 0x0019, 0x1801: 0x02e9, 0x1802: 0x03d9, 0x1803: 0x02f1, 0x1804: 0x02f9, 0x1805: 0x03f1,
-	0x1806: 0x0309, 0x1807: 0x00a9, 0x1808: 0x0311, 0x1809: 0x00b1, 0x180a: 0x0319, 0x180b: 0x0101,
-	0x180c: 0x0321, 0x180d: 0x0329, 0x180e: 0x0051, 0x180f: 0x0339, 0x1810: 0x0751, 0x1811: 0x00b9,
-	0x1812: 0x0089, 0x1813: 0x0341, 0x1814: 0x0349, 0x1815: 0x0391, 0x1816: 0x00c1, 0x1817: 0x0109,
-	0x1818: 0x00c9, 0x1819: 0x04b1, 0x181a: 0x0019, 0x181b: 0x02e9, 0x181c: 0x03d9, 0x181d: 0x02f1,
-	0x181e: 0x02f9, 0x181f: 0x03f1, 0x1820: 0x0309, 0x1821: 0x00a9, 0x1822: 0x0311, 0x1823: 0x00b1,
-	0x1824: 0x0319, 0x1825: 0x0101, 0x1826: 0x0321, 0x1827: 0x0329, 0x1828: 0x0051, 0x1829: 0x0339,
-	0x182a: 0x0751, 0x182b: 0x00b9, 0x182c: 0x0089, 0x182d: 0x0341, 0x182e: 0x0349, 0x182f: 0x0391,
-	0x1830: 0x00c1, 0x1831: 0x0109, 0x1832: 0x00c9, 0x1833: 0x04b1, 0x1834: 0x0019, 0x1835: 0x02e9,
-	0x1836: 0x03d9, 0x1837: 0x02f1, 0x1838: 0x02f9, 0x1839: 0x03f1, 0x183a: 0x0309, 0x183b: 0x00a9,
-	0x183c: 0x0311, 0x183d: 0x00b1, 0x183e: 0x0319, 0x183f: 0x0101,
+	0x1800: 0x3308, 0x1801: 0x3008, 0x1802: 0x3008, 0x1803: 0x3008, 0x1804: 0x3008, 0x1805: 0x0040,
+	0x1806: 0x0040, 0x1807: 0x3008, 0x1808: 0x3008, 0x1809: 0x0040, 0x180a: 0x0040, 0x180b: 0x3008,
+	0x180c: 0x3008, 0x180d: 0x3808, 0x180e: 0x0040, 0x180f: 0x0040, 0x1810: 0x0008, 0x1811: 0x0040,
+	0x1812: 0x0040, 0x1813: 0x0040, 0x1814: 0x0040, 0x1815: 0x0040, 0x1816: 0x0040, 0x1817: 0x3008,
+	0x1818: 0x0040, 0x1819: 0x0040, 0x181a: 0x0040, 0x181b: 0x0040, 0x181c: 0x0040, 0x181d: 0x0008,
+	0x181e: 0x0008, 0x181f: 0x0008, 0x1820: 0x0008, 0x1821: 0x0008, 0x1822: 0x3008, 0x1823: 0x3008,
+	0x1824: 0x0040, 0x1825: 0x0040, 0x1826: 0x3308, 0x1827: 0x3308, 0x1828: 0x3308, 0x1829: 0x3308,
+	0x182a: 0x3308, 0x182b: 0x3308, 0x182c: 0x3308, 0x182d: 0x0040, 0x182e: 0x0040, 0x182f: 0x0040,
+	0x1830: 0x3308, 0x1831: 0x3308, 0x1832: 0x3308, 0x1833: 0x3308, 0x1834: 0x3308, 0x1835: 0x0040,
+	0x1836: 0x0040, 0x1837: 0x0040, 0x1838: 0x0040, 0x1839: 0x0040, 0x183a: 0x0040, 0x183b: 0x0040,
+	0x183c: 0x0040, 0x183d: 0x0040, 0x183e: 0x0040, 0x183f: 0x0040,
 	// Block 0x61, offset 0x1840
-	0x1840: 0x0321, 0x1841: 0x0329, 0x1842: 0x0051, 0x1843: 0x0339, 0x1844: 0x0751, 0x1845: 0x00b9,
-	0x1846: 0x0089, 0x1847: 0x0341, 0x1848: 0x0349, 0x1849: 0x0391, 0x184a: 0x00c1, 0x184b: 0x0109,
-	0x184c: 0x00c9, 0x184d: 0x04b1, 0x184e: 0x0019, 0x184f: 0x02e9, 0x1850: 0x03d9, 0x1851: 0x02f1,
-	0x1852: 0x02f9, 0x1853: 0x03f1, 0x1854: 0x0309, 0x1855: 0x0040, 0x1856: 0x0311, 0x1857: 0x00b1,
-	0x1858: 0x0319, 0x1859: 0x0101, 0x185a: 0x0321, 0x185b: 0x0329, 0x185c: 0x0051, 0x185d: 0x0339,
-	0x185e: 0x0751, 0x185f: 0x00b9, 0x1860: 0x0089, 0x1861: 0x0341, 0x1862: 0x0349, 0x1863: 0x0391,
-	0x1864: 0x00c1, 0x1865: 0x0109, 0x1866: 0x00c9, 0x1867: 0x04b1, 0x1868: 0x0019, 0x1869: 0x02e9,
-	0x186a: 0x03d9, 0x186b: 0x02f1, 0x186c: 0x02f9, 0x186d: 0x03f1, 0x186e: 0x0309, 0x186f: 0x00a9,
-	0x1870: 0x0311, 0x1871: 0x00b1, 0x1872: 0x0319, 0x1873: 0x0101, 0x1874: 0x0321, 0x1875: 0x0329,
-	0x1876: 0x0051, 0x1877: 0x0339, 0x1878: 0x0751, 0x1879: 0x00b9, 0x187a: 0x0089, 0x187b: 0x0341,
-	0x187c: 0x0349, 0x187d: 0x0391, 0x187e: 0x00c1, 0x187f: 0x0109,
+	0x1840: 0x0008, 0x1841: 0x0008, 0x1842: 0x0008, 0x1843: 0x0008, 0x1844: 0x0008, 0x1845: 0x0008,
+	0x1846: 0x0008, 0x1847: 0x0040, 0x1848: 0x0040, 0x1849: 0x0008, 0x184a: 0x0040, 0x184b: 0x0040,
+	0x184c: 0x0008, 0x184d: 0x0008, 0x184e: 0x0008, 0x184f: 0x0008, 0x1850: 0x0008, 0x1851: 0x0008,
+	0x1852: 0x0008, 0x1853: 0x0008, 0x1854: 0x0040, 0x1855: 0x0008, 0x1856: 0x0008, 0x1857: 0x0040,
+	0x1858: 0x0008, 0x1859: 0x0008, 0x185a: 0x0008, 0x185b: 0x0008, 0x185c: 0x0008, 0x185d: 0x0008,
+	0x185e: 0x0008, 0x185f: 0x0008, 0x1860: 0x0008, 0x1861: 0x0008, 0x1862: 0x0008, 0x1863: 0x0008,
+	0x1864: 0x0008, 0x1865: 0x0008, 0x1866: 0x0008, 0x1867: 0x0008, 0x1868: 0x0008, 0x1869: 0x0008,
+	0x186a: 0x0008, 0x186b: 0x0008, 0x186c: 0x0008, 0x186d: 0x0008, 0x186e: 0x0008, 0x186f: 0x0008,
+	0x1870: 0x3008, 0x1871: 0x3008, 0x1872: 0x3008, 0x1873: 0x3008, 0x1874: 0x3008, 0x1875: 0x3008,
+	0x1876: 0x0040, 0x1877: 0x3008, 0x1878: 0x3008, 0x1879: 0x0040, 0x187a: 0x0040, 0x187b: 0x3308,
+	0x187c: 0x3308, 0x187d: 0x3808, 0x187e: 0x3b08, 0x187f: 0x0008,
 	// Block 0x62, offset 0x1880
-	0x1880: 0x00c9, 0x1881: 0x04b1, 0x1882: 0x0019, 0x1883: 0x02e9, 0x1884: 0x03d9, 0x1885: 0x02f1,
-	0x1886: 0x02f9, 0x1887: 0x03f1, 0x1888: 0x0309, 0x1889: 0x00a9, 0x188a: 0x0311, 0x188b: 0x00b1,
-	0x188c: 0x0319, 0x188d: 0x0101, 0x188e: 0x0321, 0x188f: 0x0329, 0x1890: 0x0051, 0x1891: 0x0339,
-	0x1892: 0x0751, 0x1893: 0x00b9, 0x1894: 0x0089, 0x1895: 0x0341, 0x1896: 0x0349, 0x1897: 0x0391,
-	0x1898: 0x00c1, 0x1899: 0x0109, 0x189a: 0x00c9, 0x189b: 0x04b1, 0x189c: 0x0019, 0x189d: 0x0040,
-	0x189e: 0x03d9, 0x189f: 0x02f1, 0x18a0: 0x0040, 0x18a1: 0x0040, 0x18a2: 0x0309, 0x18a3: 0x0040,
-	0x18a4: 0x0040, 0x18a5: 0x00b1, 0x18a6: 0x0319, 0x18a7: 0x0040, 0x18a8: 0x0040, 0x18a9: 0x0329,
-	0x18aa: 0x0051, 0x18ab: 0x0339, 0x18ac: 0x0751, 0x18ad: 0x0040, 0x18ae: 0x0089, 0x18af: 0x0341,
-	0x18b0: 0x0349, 0x18b1: 0x0391, 0x18b2: 0x00c1, 0x18b3: 0x0109, 0x18b4: 0x00c9, 0x18b5: 0x04b1,
-	0x18b6: 0x0019, 0x18b7: 0x02e9, 0x18b8: 0x03d9, 0x18b9: 0x02f1, 0x18ba: 0x0040, 0x18bb: 0x03f1,
-	0x18bc: 0x0040, 0x18bd: 0x00a9, 0x18be: 0x0311, 0x18bf: 0x00b1,
+	0x1880: 0x0039, 0x1881: 0x0ee9, 0x1882: 0x1159, 0x1883: 0x0ef9, 0x1884: 0x0f09, 0x1885: 0x1199,
+	0x1886: 0x0f31, 0x1887: 0x0249, 0x1888: 0x0f41, 0x1889: 0x0259, 0x188a: 0x0f51, 0x188b: 0x0359,
+	0x188c: 0x0f61, 0x188d: 0x0f71, 0x188e: 0x00d9, 0x188f: 0x0f99, 0x1890: 0x2039, 0x1891: 0x0269,
+	0x1892: 0x01d9, 0x1893: 0x0fa9, 0x1894: 0x0fb9, 0x1895: 0x1089, 0x1896: 0x0279, 0x1897: 0x0369,
+	0x1898: 0x0289, 0x1899: 0x13d1, 0x189a: 0x0039, 0x189b: 0x0ee9, 0x189c: 0x1159, 0x189d: 0x0ef9,
+	0x189e: 0x0f09, 0x189f: 0x1199, 0x18a0: 0x0f31, 0x18a1: 0x0249, 0x18a2: 0x0f41, 0x18a3: 0x0259,
+	0x18a4: 0x0f51, 0x18a5: 0x0359, 0x18a6: 0x0f61, 0x18a7: 0x0f71, 0x18a8: 0x00d9, 0x18a9: 0x0f99,
+	0x18aa: 0x2039, 0x18ab: 0x0269, 0x18ac: 0x01d9, 0x18ad: 0x0fa9, 0x18ae: 0x0fb9, 0x18af: 0x1089,
+	0x18b0: 0x0279, 0x18b1: 0x0369, 0x18b2: 0x0289, 0x18b3: 0x13d1, 0x18b4: 0x0039, 0x18b5: 0x0ee9,
+	0x18b6: 0x1159, 0x18b7: 0x0ef9, 0x18b8: 0x0f09, 0x18b9: 0x1199, 0x18ba: 0x0f31, 0x18bb: 0x0249,
+	0x18bc: 0x0f41, 0x18bd: 0x0259, 0x18be: 0x0f51, 0x18bf: 0x0359,
 	// Block 0x63, offset 0x18c0
-	0x18c0: 0x0319, 0x18c1: 0x0101, 0x18c2: 0x0321, 0x18c3: 0x0329, 0x18c4: 0x0040, 0x18c5: 0x0339,
-	0x18c6: 0x0751, 0x18c7: 0x00b9, 0x18c8: 0x0089, 0x18c9: 0x0341, 0x18ca: 0x0349, 0x18cb: 0x0391,
-	0x18cc: 0x00c1, 0x18cd: 0x0109, 0x18ce: 0x00c9, 0x18cf: 0x04b1, 0x18d0: 0x0019, 0x18d1: 0x02e9,
-	0x18d2: 0x03d9, 0x18d3: 0x02f1, 0x18d4: 0x02f9, 0x18d5: 0x03f1, 0x18d6: 0x0309, 0x18d7: 0x00a9,
-	0x18d8: 0x0311, 0x18d9: 0x00b1, 0x18da: 0x0319, 0x18db: 0x0101, 0x18dc: 0x0321, 0x18dd: 0x0329,
-	0x18de: 0x0051, 0x18df: 0x0339, 0x18e0: 0x0751, 0x18e1: 0x00b9, 0x18e2: 0x0089, 0x18e3: 0x0341,
-	0x18e4: 0x0349, 0x18e5: 0x0391, 0x18e6: 0x00c1, 0x18e7: 0x0109, 0x18e8: 0x00c9, 0x18e9: 0x04b1,
-	0x18ea: 0x0019, 0x18eb: 0x02e9, 0x18ec: 0x03d9, 0x18ed: 0x02f1, 0x18ee: 0x02f9, 0x18ef: 0x03f1,
-	0x18f0: 0x0309, 0x18f1: 0x00a9, 0x18f2: 0x0311, 0x18f3: 0x00b1, 0x18f4: 0x0319, 0x18f5: 0x0101,
-	0x18f6: 0x0321, 0x18f7: 0x0329, 0x18f8: 0x0051, 0x18f9: 0x0339, 0x18fa: 0x0751, 0x18fb: 0x00b9,
-	0x18fc: 0x0089, 0x18fd: 0x0341, 0x18fe: 0x0349, 0x18ff: 0x0391,
+	0x18c0: 0x0f61, 0x18c1: 0x0f71, 0x18c2: 0x00d9, 0x18c3: 0x0f99, 0x18c4: 0x2039, 0x18c5: 0x0269,
+	0x18c6: 0x01d9, 0x18c7: 0x0fa9, 0x18c8: 0x0fb9, 0x18c9: 0x1089, 0x18ca: 0x0279, 0x18cb: 0x0369,
+	0x18cc: 0x0289, 0x18cd: 0x13d1, 0x18ce: 0x0039, 0x18cf: 0x0ee9, 0x18d0: 0x1159, 0x18d1: 0x0ef9,
+	0x18d2: 0x0f09, 0x18d3: 0x1199, 0x18d4: 0x0f31, 0x18d5: 0x0040, 0x18d6: 0x0f41, 0x18d7: 0x0259,
+	0x18d8: 0x0f51, 0x18d9: 0x0359, 0x18da: 0x0f61, 0x18db: 0x0f71, 0x18dc: 0x00d9, 0x18dd: 0x0f99,
+	0x18de: 0x2039, 0x18df: 0x0269, 0x18e0: 0x01d9, 0x18e1: 0x0fa9, 0x18e2: 0x0fb9, 0x18e3: 0x1089,
+	0x18e4: 0x0279, 0x18e5: 0x0369, 0x18e6: 0x0289, 0x18e7: 0x13d1, 0x18e8: 0x0039, 0x18e9: 0x0ee9,
+	0x18ea: 0x1159, 0x18eb: 0x0ef9, 0x18ec: 0x0f09, 0x18ed: 0x1199, 0x18ee: 0x0f31, 0x18ef: 0x0249,
+	0x18f0: 0x0f41, 0x18f1: 0x0259, 0x18f2: 0x0f51, 0x18f3: 0x0359, 0x18f4: 0x0f61, 0x18f5: 0x0f71,
+	0x18f6: 0x00d9, 0x18f7: 0x0f99, 0x18f8: 0x2039, 0x18f9: 0x0269, 0x18fa: 0x01d9, 0x18fb: 0x0fa9,
+	0x18fc: 0x0fb9, 0x18fd: 0x1089, 0x18fe: 0x0279, 0x18ff: 0x0369,
 	// Block 0x64, offset 0x1900
-	0x1900: 0x00c1, 0x1901: 0x0109, 0x1902: 0x00c9, 0x1903: 0x04b1, 0x1904: 0x0019, 0x1905: 0x02e9,
-	0x1906: 0x0040, 0x1907: 0x02f1, 0x1908: 0x02f9, 0x1909: 0x03f1, 0x190a: 0x0309, 0x190b: 0x0040,
-	0x190c: 0x0040, 0x190d: 0x00b1, 0x190e: 0x0319, 0x190f: 0x0101, 0x1910: 0x0321, 0x1911: 0x0329,
-	0x1912: 0x0051, 0x1913: 0x0339, 0x1914: 0x0751, 0x1915: 0x0040, 0x1916: 0x0089, 0x1917: 0x0341,
-	0x1918: 0x0349, 0x1919: 0x0391, 0x191a: 0x00c1, 0x191b: 0x0109, 0x191c: 0x00c9, 0x191d: 0x0040,
-	0x191e: 0x0019, 0x191f: 0x02e9, 0x1920: 0x03d9, 0x1921: 0x02f1, 0x1922: 0x02f9, 0x1923: 0x03f1,
-	0x1924: 0x0309, 0x1925: 0x00a9, 0x1926: 0x0311, 0x1927: 0x00b1, 0x1928: 0x0319, 0x1929: 0x0101,
-	0x192a: 0x0321, 0x192b: 0x0329, 0x192c: 0x0051, 0x192d: 0x0339, 0x192e: 0x0751, 0x192f: 0x00b9,
-	0x1930: 0x0089, 0x1931: 0x0341, 0x1932: 0x0349, 0x1933: 0x0391, 0x1934: 0x00c1, 0x1935: 0x0109,
-	0x1936: 0x00c9, 0x1937: 0x04b1, 0x1938: 0x0019, 0x1939: 0x02e9, 0x193a: 0x0040, 0x193b: 0x02f1,
-	0x193c: 0x02f9, 0x193d: 0x03f1, 0x193e: 0x0309, 0x193f: 0x0040,
+	0x1900: 0x0289, 0x1901: 0x13d1, 0x1902: 0x0039, 0x1903: 0x0ee9, 0x1904: 0x1159, 0x1905: 0x0ef9,
+	0x1906: 0x0f09, 0x1907: 0x1199, 0x1908: 0x0f31, 0x1909: 0x0249, 0x190a: 0x0f41, 0x190b: 0x0259,
+	0x190c: 0x0f51, 0x190d: 0x0359, 0x190e: 0x0f61, 0x190f: 0x0f71, 0x1910: 0x00d9, 0x1911: 0x0f99,
+	0x1912: 0x2039, 0x1913: 0x0269, 0x1914: 0x01d9, 0x1915: 0x0fa9, 0x1916: 0x0fb9, 0x1917: 0x1089,
+	0x1918: 0x0279, 0x1919: 0x0369, 0x191a: 0x0289, 0x191b: 0x13d1, 0x191c: 0x0039, 0x191d: 0x0040,
+	0x191e: 0x1159, 0x191f: 0x0ef9, 0x1920: 0x0040, 0x1921: 0x0040, 0x1922: 0x0f31, 0x1923: 0x0040,
+	0x1924: 0x0040, 0x1925: 0x0259, 0x1926: 0x0f51, 0x1927: 0x0040, 0x1928: 0x0040, 0x1929: 0x0f71,
+	0x192a: 0x00d9, 0x192b: 0x0f99, 0x192c: 0x2039, 0x192d: 0x0040, 0x192e: 0x01d9, 0x192f: 0x0fa9,
+	0x1930: 0x0fb9, 0x1931: 0x1089, 0x1932: 0x0279, 0x1933: 0x0369, 0x1934: 0x0289, 0x1935: 0x13d1,
+	0x1936: 0x0039, 0x1937: 0x0ee9, 0x1938: 0x1159, 0x1939: 0x0ef9, 0x193a: 0x0040, 0x193b: 0x1199,
+	0x193c: 0x0040, 0x193d: 0x0249, 0x193e: 0x0f41, 0x193f: 0x0259,
 	// Block 0x65, offset 0x1940
-	0x1940: 0x0311, 0x1941: 0x00b1, 0x1942: 0x0319, 0x1943: 0x0101, 0x1944: 0x0321, 0x1945: 0x0040,
-	0x1946: 0x0051, 0x1947: 0x0040, 0x1948: 0x0040, 0x1949: 0x0040, 0x194a: 0x0089, 0x194b: 0x0341,
-	0x194c: 0x0349, 0x194d: 0x0391, 0x194e: 0x00c1, 0x194f: 0x0109, 0x1950: 0x00c9, 0x1951: 0x0040,
-	0x1952: 0x0019, 0x1953: 0x02e9, 0x1954: 0x03d9, 0x1955: 0x02f1, 0x1956: 0x02f9, 0x1957: 0x03f1,
-	0x1958: 0x0309, 0x1959: 0x00a9, 0x195a: 0x0311, 0x195b: 0x00b1, 0x195c: 0x0319, 0x195d: 0x0101,
-	0x195e: 0x0321, 0x195f: 0x0329, 0x1960: 0x0051, 0x1961: 0x0339, 0x1962: 0x0751, 0x1963: 0x00b9,
-	0x1964: 0x0089, 0x1965: 0x0341, 0x1966: 0x0349, 0x1967: 0x0391, 0x1968: 0x00c1, 0x1969: 0x0109,
-	0x196a: 0x00c9, 0x196b: 0x04b1, 0x196c: 0x0019, 0x196d: 0x02e9, 0x196e: 0x03d9, 0x196f: 0x02f1,
-	0x1970: 0x02f9, 0x1971: 0x03f1, 0x1972: 0x0309, 0x1973: 0x00a9, 0x1974: 0x0311, 0x1975: 0x00b1,
-	0x1976: 0x0319, 0x1977: 0x0101, 0x1978: 0x0321, 0x1979: 0x0329, 0x197a: 0x0051, 0x197b: 0x0339,
-	0x197c: 0x0751, 0x197d: 0x00b9, 0x197e: 0x0089, 0x197f: 0x0341,
+	0x1940: 0x0f51, 0x1941: 0x0359, 0x1942: 0x0f61, 0x1943: 0x0f71, 0x1944: 0x0040, 0x1945: 0x0f99,
+	0x1946: 0x2039, 0x1947: 0x0269, 0x1948: 0x01d9, 0x1949: 0x0fa9, 0x194a: 0x0fb9, 0x194b: 0x1089,
+	0x194c: 0x0279, 0x194d: 0x0369, 0x194e: 0x0289, 0x194f: 0x13d1, 0x1950: 0x0039, 0x1951: 0x0ee9,
+	0x1952: 0x1159, 0x1953: 0x0ef9, 0x1954: 0x0f09, 0x1955: 0x1199, 0x1956: 0x0f31, 0x1957: 0x0249,
+	0x1958: 0x0f41, 0x1959: 0x0259, 0x195a: 0x0f51, 0x195b: 0x0359, 0x195c: 0x0f61, 0x195d: 0x0f71,
+	0x195e: 0x00d9, 0x195f: 0x0f99, 0x1960: 0x2039, 0x1961: 0x0269, 0x1962: 0x01d9, 0x1963: 0x0fa9,
+	0x1964: 0x0fb9, 0x1965: 0x1089, 0x1966: 0x0279, 0x1967: 0x0369, 0x1968: 0x0289, 0x1969: 0x13d1,
+	0x196a: 0x0039, 0x196b: 0x0ee9, 0x196c: 0x1159, 0x196d: 0x0ef9, 0x196e: 0x0f09, 0x196f: 0x1199,
+	0x1970: 0x0f31, 0x1971: 0x0249, 0x1972: 0x0f41, 0x1973: 0x0259, 0x1974: 0x0f51, 0x1975: 0x0359,
+	0x1976: 0x0f61, 0x1977: 0x0f71, 0x1978: 0x00d9, 0x1979: 0x0f99, 0x197a: 0x2039, 0x197b: 0x0269,
+	0x197c: 0x01d9, 0x197d: 0x0fa9, 0x197e: 0x0fb9, 0x197f: 0x1089,
 	// Block 0x66, offset 0x1980
-	0x1980: 0x0349, 0x1981: 0x0391, 0x1982: 0x00c1, 0x1983: 0x0109, 0x1984: 0x00c9, 0x1985: 0x04b1,
-	0x1986: 0x0019, 0x1987: 0x02e9, 0x1988: 0x03d9, 0x1989: 0x02f1, 0x198a: 0x02f9, 0x198b: 0x03f1,
-	0x198c: 0x0309, 0x198d: 0x00a9, 0x198e: 0x0311, 0x198f: 0x00b1, 0x1990: 0x0319, 0x1991: 0x0101,
-	0x1992: 0x0321, 0x1993: 0x0329, 0x1994: 0x0051, 0x1995: 0x0339, 0x1996: 0x0751, 0x1997: 0x00b9,
-	0x1998: 0x0089, 0x1999: 0x0341, 0x199a: 0x0349, 0x199b: 0x0391, 0x199c: 0x00c1, 0x199d: 0x0109,
-	0x199e: 0x00c9, 0x199f: 0x04b1, 0x19a0: 0x0019, 0x19a1: 0x02e9, 0x19a2: 0x03d9, 0x19a3: 0x02f1,
-	0x19a4: 0x02f9, 0x19a5: 0x03f1, 0x19a6: 0x0309, 0x19a7: 0x00a9, 0x19a8: 0x0311, 0x19a9: 0x00b1,
-	0x19aa: 0x0319, 0x19ab: 0x0101, 0x19ac: 0x0321, 0x19ad: 0x0329, 0x19ae: 0x0051, 0x19af: 0x0339,
-	0x19b0: 0x0751, 0x19b1: 0x00b9, 0x19b2: 0x0089, 0x19b3: 0x0341, 0x19b4: 0x0349, 0x19b5: 0x0391,
-	0x19b6: 0x00c1, 0x19b7: 0x0109, 0x19b8: 0x00c9, 0x19b9: 0x04b1, 0x19ba: 0x0019, 0x19bb: 0x02e9,
-	0x19bc: 0x03d9, 0x19bd: 0x02f1, 0x19be: 0x02f9, 0x19bf: 0x03f1,
+	0x1980: 0x0279, 0x1981: 0x0369, 0x1982: 0x0289, 0x1983: 0x13d1, 0x1984: 0x0039, 0x1985: 0x0ee9,
+	0x1986: 0x0040, 0x1987: 0x0ef9, 0x1988: 0x0f09, 0x1989: 0x1199, 0x198a: 0x0f31, 0x198b: 0x0040,
+	0x198c: 0x0040, 0x198d: 0x0259, 0x198e: 0x0f51, 0x198f: 0x0359, 0x1990: 0x0f61, 0x1991: 0x0f71,
+	0x1992: 0x00d9, 0x1993: 0x0f99, 0x1994: 0x2039, 0x1995: 0x0040, 0x1996: 0x01d9, 0x1997: 0x0fa9,
+	0x1998: 0x0fb9, 0x1999: 0x1089, 0x199a: 0x0279, 0x199b: 0x0369, 0x199c: 0x0289, 0x199d: 0x0040,
+	0x199e: 0x0039, 0x199f: 0x0ee9, 0x19a0: 0x1159, 0x19a1: 0x0ef9, 0x19a2: 0x0f09, 0x19a3: 0x1199,
+	0x19a4: 0x0f31, 0x19a5: 0x0249, 0x19a6: 0x0f41, 0x19a7: 0x0259, 0x19a8: 0x0f51, 0x19a9: 0x0359,
+	0x19aa: 0x0f61, 0x19ab: 0x0f71, 0x19ac: 0x00d9, 0x19ad: 0x0f99, 0x19ae: 0x2039, 0x19af: 0x0269,
+	0x19b0: 0x01d9, 0x19b1: 0x0fa9, 0x19b2: 0x0fb9, 0x19b3: 0x1089, 0x19b4: 0x0279, 0x19b5: 0x0369,
+	0x19b6: 0x0289, 0x19b7: 0x13d1, 0x19b8: 0x0039, 0x19b9: 0x0ee9, 0x19ba: 0x0040, 0x19bb: 0x0ef9,
+	0x19bc: 0x0f09, 0x19bd: 0x1199, 0x19be: 0x0f31, 0x19bf: 0x0040,
 	// Block 0x67, offset 0x19c0
-	0x19c0: 0x0309, 0x19c1: 0x00a9, 0x19c2: 0x0311, 0x19c3: 0x00b1, 0x19c4: 0x0319, 0x19c5: 0x0101,
-	0x19c6: 0x0321, 0x19c7: 0x0329, 0x19c8: 0x0051, 0x19c9: 0x0339, 0x19ca: 0x0751, 0x19cb: 0x00b9,
-	0x19cc: 0x0089, 0x19cd: 0x0341, 0x19ce: 0x0349, 0x19cf: 0x0391, 0x19d0: 0x00c1, 0x19d1: 0x0109,
-	0x19d2: 0x00c9, 0x19d3: 0x04b1, 0x19d4: 0x0019, 0x19d5: 0x02e9, 0x19d6: 0x03d9, 0x19d7: 0x02f1,
-	0x19d8: 0x02f9, 0x19d9: 0x03f1, 0x19da: 0x0309, 0x19db: 0x00a9, 0x19dc: 0x0311, 0x19dd: 0x00b1,
-	0x19de: 0x0319, 0x19df: 0x0101, 0x19e0: 0x0321, 0x19e1: 0x0329, 0x19e2: 0x0051, 0x19e3: 0x0339,
-	0x19e4: 0x0751, 0x19e5: 0x00b9, 0x19e6: 0x0089, 0x19e7: 0x0341, 0x19e8: 0x0349, 0x19e9: 0x0391,
-	0x19ea: 0x00c1, 0x19eb: 0x0109, 0x19ec: 0x00c9, 0x19ed: 0x04b1, 0x19ee: 0x0019, 0x19ef: 0x02e9,
-	0x19f0: 0x03d9, 0x19f1: 0x02f1, 0x19f2: 0x02f9, 0x19f3: 0x03f1, 0x19f4: 0x0309, 0x19f5: 0x00a9,
-	0x19f6: 0x0311, 0x19f7: 0x00b1, 0x19f8: 0x0319, 0x19f9: 0x0101, 0x19fa: 0x0321, 0x19fb: 0x0329,
-	0x19fc: 0x0051, 0x19fd: 0x0339, 0x19fe: 0x0751, 0x19ff: 0x00b9,
+	0x19c0: 0x0f41, 0x19c1: 0x0259, 0x19c2: 0x0f51, 0x19c3: 0x0359, 0x19c4: 0x0f61, 0x19c5: 0x0040,
+	0x19c6: 0x00d9, 0x19c7: 0x0040, 0x19c8: 0x0040, 0x19c9: 0x0040, 0x19ca: 0x01d9, 0x19cb: 0x0fa9,
+	0x19cc: 0x0fb9, 0x19cd: 0x1089, 0x19ce: 0x0279, 0x19cf: 0x0369, 0x19d0: 0x0289, 0x19d1: 0x0040,
+	0x19d2: 0x0039, 0x19d3: 0x0ee9, 0x19d4: 0x1159, 0x19d5: 0x0ef9, 0x19d6: 0x0f09, 0x19d7: 0x1199,
+	0x19d8: 0x0f31, 0x19d9: 0x0249, 0x19da: 0x0f41, 0x19db: 0x0259, 0x19dc: 0x0f51, 0x19dd: 0x0359,
+	0x19de: 0x0f61, 0x19df: 0x0f71, 0x19e0: 0x00d9, 0x19e1: 0x0f99, 0x19e2: 0x2039, 0x19e3: 0x0269,
+	0x19e4: 0x01d9, 0x19e5: 0x0fa9, 0x19e6: 0x0fb9, 0x19e7: 0x1089, 0x19e8: 0x0279, 0x19e9: 0x0369,
+	0x19ea: 0x0289, 0x19eb: 0x13d1, 0x19ec: 0x0039, 0x19ed: 0x0ee9, 0x19ee: 0x1159, 0x19ef: 0x0ef9,
+	0x19f0: 0x0f09, 0x19f1: 0x1199, 0x19f2: 0x0f31, 0x19f3: 0x0249, 0x19f4: 0x0f41, 0x19f5: 0x0259,
+	0x19f6: 0x0f51, 0x19f7: 0x0359, 0x19f8: 0x0f61, 0x19f9: 0x0f71, 0x19fa: 0x00d9, 0x19fb: 0x0f99,
+	0x19fc: 0x2039, 0x19fd: 0x0269, 0x19fe: 0x01d9, 0x19ff: 0x0fa9,
 	// Block 0x68, offset 0x1a00
-	0x1a00: 0x0089, 0x1a01: 0x0341, 0x1a02: 0x0349, 0x1a03: 0x0391, 0x1a04: 0x00c1, 0x1a05: 0x0109,
-	0x1a06: 0x00c9, 0x1a07: 0x04b1, 0x1a08: 0x0019, 0x1a09: 0x02e9, 0x1a0a: 0x03d9, 0x1a0b: 0x02f1,
-	0x1a0c: 0x02f9, 0x1a0d: 0x03f1, 0x1a0e: 0x0309, 0x1a0f: 0x00a9, 0x1a10: 0x0311, 0x1a11: 0x00b1,
-	0x1a12: 0x0319, 0x1a13: 0x0101, 0x1a14: 0x0321, 0x1a15: 0x0329, 0x1a16: 0x0051, 0x1a17: 0x0339,
-	0x1a18: 0x0751, 0x1a19: 0x00b9, 0x1a1a: 0x0089, 0x1a1b: 0x0341, 0x1a1c: 0x0349, 0x1a1d: 0x0391,
-	0x1a1e: 0x00c1, 0x1a1f: 0x0109, 0x1a20: 0x00c9, 0x1a21: 0x04b1, 0x1a22: 0x0019, 0x1a23: 0x02e9,
-	0x1a24: 0x03d9, 0x1a25: 0x02f1, 0x1a26: 0x02f9, 0x1a27: 0x03f1, 0x1a28: 0x0309, 0x1a29: 0x00a9,
-	0x1a2a: 0x0311, 0x1a2b: 0x00b1, 0x1a2c: 0x0319, 0x1a2d: 0x0101, 0x1a2e: 0x0321, 0x1a2f: 0x0329,
-	0x1a30: 0x0051, 0x1a31: 0x0339, 0x1a32: 0x0751, 0x1a33: 0x00b9, 0x1a34: 0x0089, 0x1a35: 0x0341,
-	0x1a36: 0x0349, 0x1a37: 0x0391, 0x1a38: 0x00c1, 0x1a39: 0x0109, 0x1a3a: 0x00c9, 0x1a3b: 0x04b1,
-	0x1a3c: 0x0019, 0x1a3d: 0x02e9, 0x1a3e: 0x03d9, 0x1a3f: 0x02f1,
+	0x1a00: 0x0fb9, 0x1a01: 0x1089, 0x1a02: 0x0279, 0x1a03: 0x0369, 0x1a04: 0x0289, 0x1a05: 0x13d1,
+	0x1a06: 0x0039, 0x1a07: 0x0ee9, 0x1a08: 0x1159, 0x1a09: 0x0ef9, 0x1a0a: 0x0f09, 0x1a0b: 0x1199,
+	0x1a0c: 0x0f31, 0x1a0d: 0x0249, 0x1a0e: 0x0f41, 0x1a0f: 0x0259, 0x1a10: 0x0f51, 0x1a11: 0x0359,
+	0x1a12: 0x0f61, 0x1a13: 0x0f71, 0x1a14: 0x00d9, 0x1a15: 0x0f99, 0x1a16: 0x2039, 0x1a17: 0x0269,
+	0x1a18: 0x01d9, 0x1a19: 0x0fa9, 0x1a1a: 0x0fb9, 0x1a1b: 0x1089, 0x1a1c: 0x0279, 0x1a1d: 0x0369,
+	0x1a1e: 0x0289, 0x1a1f: 0x13d1, 0x1a20: 0x0039, 0x1a21: 0x0ee9, 0x1a22: 0x1159, 0x1a23: 0x0ef9,
+	0x1a24: 0x0f09, 0x1a25: 0x1199, 0x1a26: 0x0f31, 0x1a27: 0x0249, 0x1a28: 0x0f41, 0x1a29: 0x0259,
+	0x1a2a: 0x0f51, 0x1a2b: 0x0359, 0x1a2c: 0x0f61, 0x1a2d: 0x0f71, 0x1a2e: 0x00d9, 0x1a2f: 0x0f99,
+	0x1a30: 0x2039, 0x1a31: 0x0269, 0x1a32: 0x01d9, 0x1a33: 0x0fa9, 0x1a34: 0x0fb9, 0x1a35: 0x1089,
+	0x1a36: 0x0279, 0x1a37: 0x0369, 0x1a38: 0x0289, 0x1a39: 0x13d1, 0x1a3a: 0x0039, 0x1a3b: 0x0ee9,
+	0x1a3c: 0x1159, 0x1a3d: 0x0ef9, 0x1a3e: 0x0f09, 0x1a3f: 0x1199,
 	// Block 0x69, offset 0x1a40
-	0x1a40: 0x02f9, 0x1a41: 0x03f1, 0x1a42: 0x0309, 0x1a43: 0x00a9, 0x1a44: 0x0311, 0x1a45: 0x00b1,
-	0x1a46: 0x0319, 0x1a47: 0x0101, 0x1a48: 0x0321, 0x1a49: 0x0329, 0x1a4a: 0x0051, 0x1a4b: 0x0339,
-	0x1a4c: 0x0751, 0x1a4d: 0x00b9, 0x1a4e: 0x0089, 0x1a4f: 0x0341, 0x1a50: 0x0349, 0x1a51: 0x0391,
-	0x1a52: 0x00c1, 0x1a53: 0x0109, 0x1a54: 0x00c9, 0x1a55: 0x04b1, 0x1a56: 0x0019, 0x1a57: 0x02e9,
-	0x1a58: 0x03d9, 0x1a59: 0x02f1, 0x1a5a: 0x02f9, 0x1a5b: 0x03f1, 0x1a5c: 0x0309, 0x1a5d: 0x00a9,
-	0x1a5e: 0x0311, 0x1a5f: 0x00b1, 0x1a60: 0x0319, 0x1a61: 0x0101, 0x1a62: 0x0321, 0x1a63: 0x0329,
-	0x1a64: 0x0051, 0x1a65: 0x0339, 0x1a66: 0x0751, 0x1a67: 0x00b9, 0x1a68: 0x0089, 0x1a69: 0x0341,
-	0x1a6a: 0x0349, 0x1a6b: 0x0391, 0x1a6c: 0x00c1, 0x1a6d: 0x0109, 0x1a6e: 0x00c9, 0x1a6f: 0x04b1,
-	0x1a70: 0x0019, 0x1a71: 0x02e9, 0x1a72: 0x03d9, 0x1a73: 0x02f1, 0x1a74: 0x02f9, 0x1a75: 0x03f1,
-	0x1a76: 0x0309, 0x1a77: 0x00a9, 0x1a78: 0x0311, 0x1a79: 0x00b1, 0x1a7a: 0x0319, 0x1a7b: 0x0101,
-	0x1a7c: 0x0321, 0x1a7d: 0x0329, 0x1a7e: 0x0051, 0x1a7f: 0x0339,
+	0x1a40: 0x0f31, 0x1a41: 0x0249, 0x1a42: 0x0f41, 0x1a43: 0x0259, 0x1a44: 0x0f51, 0x1a45: 0x0359,
+	0x1a46: 0x0f61, 0x1a47: 0x0f71, 0x1a48: 0x00d9, 0x1a49: 0x0f99, 0x1a4a: 0x2039, 0x1a4b: 0x0269,
+	0x1a4c: 0x01d9, 0x1a4d: 0x0fa9, 0x1a4e: 0x0fb9, 0x1a4f: 0x1089, 0x1a50: 0x0279, 0x1a51: 0x0369,
+	0x1a52: 0x0289, 0x1a53: 0x13d1, 0x1a54: 0x0039, 0x1a55: 0x0ee9, 0x1a56: 0x1159, 0x1a57: 0x0ef9,
+	0x1a58: 0x0f09, 0x1a59: 0x1199, 0x1a5a: 0x0f31, 0x1a5b: 0x0249, 0x1a5c: 0x0f41, 0x1a5d: 0x0259,
+	0x1a5e: 0x0f51, 0x1a5f: 0x0359, 0x1a60: 0x0f61, 0x1a61: 0x0f71, 0x1a62: 0x00d9, 0x1a63: 0x0f99,
+	0x1a64: 0x2039, 0x1a65: 0x0269, 0x1a66: 0x01d9, 0x1a67: 0x0fa9, 0x1a68: 0x0fb9, 0x1a69: 0x1089,
+	0x1a6a: 0x0279, 0x1a6b: 0x0369, 0x1a6c: 0x0289, 0x1a6d: 0x13d1, 0x1a6e: 0x0039, 0x1a6f: 0x0ee9,
+	0x1a70: 0x1159, 0x1a71: 0x0ef9, 0x1a72: 0x0f09, 0x1a73: 0x1199, 0x1a74: 0x0f31, 0x1a75: 0x0249,
+	0x1a76: 0x0f41, 0x1a77: 0x0259, 0x1a78: 0x0f51, 0x1a79: 0x0359, 0x1a7a: 0x0f61, 0x1a7b: 0x0f71,
+	0x1a7c: 0x00d9, 0x1a7d: 0x0f99, 0x1a7e: 0x2039, 0x1a7f: 0x0269,
 	// Block 0x6a, offset 0x1a80
-	0x1a80: 0x0751, 0x1a81: 0x00b9, 0x1a82: 0x0089, 0x1a83: 0x0341, 0x1a84: 0x0349, 0x1a85: 0x0391,
-	0x1a86: 0x00c1, 0x1a87: 0x0109, 0x1a88: 0x00c9, 0x1a89: 0x04b1, 0x1a8a: 0x0019, 0x1a8b: 0x02e9,
-	0x1a8c: 0x03d9, 0x1a8d: 0x02f1, 0x1a8e: 0x02f9, 0x1a8f: 0x03f1, 0x1a90: 0x0309, 0x1a91: 0x00a9,
-	0x1a92: 0x0311, 0x1a93: 0x00b1, 0x1a94: 0x0319, 0x1a95: 0x0101, 0x1a96: 0x0321, 0x1a97: 0x0329,
-	0x1a98: 0x0051, 0x1a99: 0x0339, 0x1a9a: 0x0751, 0x1a9b: 0x00b9, 0x1a9c: 0x0089, 0x1a9d: 0x0341,
-	0x1a9e: 0x0349, 0x1a9f: 0x0391, 0x1aa0: 0x00c1, 0x1aa1: 0x0109, 0x1aa2: 0x00c9, 0x1aa3: 0x04b1,
-	0x1aa4: 0x2279, 0x1aa5: 0x2281, 0x1aa6: 0x0040, 0x1aa7: 0x0040, 0x1aa8: 0x2289, 0x1aa9: 0x0399,
-	0x1aaa: 0x03a1, 0x1aab: 0x03a9, 0x1aac: 0x2291, 0x1aad: 0x2299, 0x1aae: 0x22a1, 0x1aaf: 0x04d1,
-	0x1ab0: 0x05f9, 0x1ab1: 0x22a9, 0x1ab2: 0x22b1, 0x1ab3: 0x22b9, 0x1ab4: 0x22c1, 0x1ab5: 0x22c9,
-	0x1ab6: 0x22d1, 0x1ab7: 0x0799, 0x1ab8: 0x03c1, 0x1ab9: 0x04d1, 0x1aba: 0x22d9, 0x1abb: 0x22e1,
-	0x1abc: 0x22e9, 0x1abd: 0x03b1, 0x1abe: 0x03b9, 0x1abf: 0x22f1,
+	0x1a80: 0x01d9, 0x1a81: 0x0fa9, 0x1a82: 0x0fb9, 0x1a83: 0x1089, 0x1a84: 0x0279, 0x1a85: 0x0369,
+	0x1a86: 0x0289, 0x1a87: 0x13d1, 0x1a88: 0x0039, 0x1a89: 0x0ee9, 0x1a8a: 0x1159, 0x1a8b: 0x0ef9,
+	0x1a8c: 0x0f09, 0x1a8d: 0x1199, 0x1a8e: 0x0f31, 0x1a8f: 0x0249, 0x1a90: 0x0f41, 0x1a91: 0x0259,
+	0x1a92: 0x0f51, 0x1a93: 0x0359, 0x1a94: 0x0f61, 0x1a95: 0x0f71, 0x1a96: 0x00d9, 0x1a97: 0x0f99,
+	0x1a98: 0x2039, 0x1a99: 0x0269, 0x1a9a: 0x01d9, 0x1a9b: 0x0fa9, 0x1a9c: 0x0fb9, 0x1a9d: 0x1089,
+	0x1a9e: 0x0279, 0x1a9f: 0x0369, 0x1aa0: 0x0289, 0x1aa1: 0x13d1, 0x1aa2: 0x0039, 0x1aa3: 0x0ee9,
+	0x1aa4: 0x1159, 0x1aa5: 0x0ef9, 0x1aa6: 0x0f09, 0x1aa7: 0x1199, 0x1aa8: 0x0f31, 0x1aa9: 0x0249,
+	0x1aaa: 0x0f41, 0x1aab: 0x0259, 0x1aac: 0x0f51, 0x1aad: 0x0359, 0x1aae: 0x0f61, 0x1aaf: 0x0f71,
+	0x1ab0: 0x00d9, 0x1ab1: 0x0f99, 0x1ab2: 0x2039, 0x1ab3: 0x0269, 0x1ab4: 0x01d9, 0x1ab5: 0x0fa9,
+	0x1ab6: 0x0fb9, 0x1ab7: 0x1089, 0x1ab8: 0x0279, 0x1ab9: 0x0369, 0x1aba: 0x0289, 0x1abb: 0x13d1,
+	0x1abc: 0x0039, 0x1abd: 0x0ee9, 0x1abe: 0x1159, 0x1abf: 0x0ef9,
 	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0x0769, 0x1ac1: 0x22f9, 0x1ac2: 0x2289, 0x1ac3: 0x0399, 0x1ac4: 0x03a1, 0x1ac5: 0x03a9,
-	0x1ac6: 0x2291, 0x1ac7: 0x2299, 0x1ac8: 0x22a1, 0x1ac9: 0x04d1, 0x1aca: 0x05f9, 0x1acb: 0x22a9,
-	0x1acc: 0x22b1, 0x1acd: 0x22b9, 0x1ace: 0x22c1, 0x1acf: 0x22c9, 0x1ad0: 0x22d1, 0x1ad1: 0x0799,
-	0x1ad2: 0x03c1, 0x1ad3: 0x22d9, 0x1ad4: 0x22d9, 0x1ad5: 0x22e1, 0x1ad6: 0x22e9, 0x1ad7: 0x03b1,
-	0x1ad8: 0x03b9, 0x1ad9: 0x22f1, 0x1ada: 0x0769, 0x1adb: 0x2301, 0x1adc: 0x2291, 0x1add: 0x04d1,
-	0x1ade: 0x22a9, 0x1adf: 0x03b1, 0x1ae0: 0x03c1, 0x1ae1: 0x0799, 0x1ae2: 0x2289, 0x1ae3: 0x0399,
-	0x1ae4: 0x03a1, 0x1ae5: 0x03a9, 0x1ae6: 0x2291, 0x1ae7: 0x2299, 0x1ae8: 0x22a1, 0x1ae9: 0x04d1,
-	0x1aea: 0x05f9, 0x1aeb: 0x22a9, 0x1aec: 0x22b1, 0x1aed: 0x22b9, 0x1aee: 0x22c1, 0x1aef: 0x22c9,
-	0x1af0: 0x22d1, 0x1af1: 0x0799, 0x1af2: 0x03c1, 0x1af3: 0x04d1, 0x1af4: 0x22d9, 0x1af5: 0x22e1,
-	0x1af6: 0x22e9, 0x1af7: 0x03b1, 0x1af8: 0x03b9, 0x1af9: 0x22f1, 0x1afa: 0x0769, 0x1afb: 0x22f9,
-	0x1afc: 0x2289, 0x1afd: 0x0399, 0x1afe: 0x03a1, 0x1aff: 0x03a9,
+	0x1ac0: 0x0f09, 0x1ac1: 0x1199, 0x1ac2: 0x0f31, 0x1ac3: 0x0249, 0x1ac4: 0x0f41, 0x1ac5: 0x0259,
+	0x1ac6: 0x0f51, 0x1ac7: 0x0359, 0x1ac8: 0x0f61, 0x1ac9: 0x0f71, 0x1aca: 0x00d9, 0x1acb: 0x0f99,
+	0x1acc: 0x2039, 0x1acd: 0x0269, 0x1ace: 0x01d9, 0x1acf: 0x0fa9, 0x1ad0: 0x0fb9, 0x1ad1: 0x1089,
+	0x1ad2: 0x0279, 0x1ad3: 0x0369, 0x1ad4: 0x0289, 0x1ad5: 0x13d1, 0x1ad6: 0x0039, 0x1ad7: 0x0ee9,
+	0x1ad8: 0x1159, 0x1ad9: 0x0ef9, 0x1ada: 0x0f09, 0x1adb: 0x1199, 0x1adc: 0x0f31, 0x1add: 0x0249,
+	0x1ade: 0x0f41, 0x1adf: 0x0259, 0x1ae0: 0x0f51, 0x1ae1: 0x0359, 0x1ae2: 0x0f61, 0x1ae3: 0x0f71,
+	0x1ae4: 0x00d9, 0x1ae5: 0x0f99, 0x1ae6: 0x2039, 0x1ae7: 0x0269, 0x1ae8: 0x01d9, 0x1ae9: 0x0fa9,
+	0x1aea: 0x0fb9, 0x1aeb: 0x1089, 0x1aec: 0x0279, 0x1aed: 0x0369, 0x1aee: 0x0289, 0x1aef: 0x13d1,
+	0x1af0: 0x0039, 0x1af1: 0x0ee9, 0x1af2: 0x1159, 0x1af3: 0x0ef9, 0x1af4: 0x0f09, 0x1af5: 0x1199,
+	0x1af6: 0x0f31, 0x1af7: 0x0249, 0x1af8: 0x0f41, 0x1af9: 0x0259, 0x1afa: 0x0f51, 0x1afb: 0x0359,
+	0x1afc: 0x0f61, 0x1afd: 0x0f71, 0x1afe: 0x00d9, 0x1aff: 0x0f99,
 	// Block 0x6c, offset 0x1b00
-	0x1b00: 0x2291, 0x1b01: 0x2299, 0x1b02: 0x22a1, 0x1b03: 0x04d1, 0x1b04: 0x05f9, 0x1b05: 0x22a9,
-	0x1b06: 0x22b1, 0x1b07: 0x22b9, 0x1b08: 0x22c1, 0x1b09: 0x22c9, 0x1b0a: 0x22d1, 0x1b0b: 0x0799,
-	0x1b0c: 0x03c1, 0x1b0d: 0x22d9, 0x1b0e: 0x22d9, 0x1b0f: 0x22e1, 0x1b10: 0x22e9, 0x1b11: 0x03b1,
-	0x1b12: 0x03b9, 0x1b13: 0x22f1, 0x1b14: 0x0769, 0x1b15: 0x2301, 0x1b16: 0x2291, 0x1b17: 0x04d1,
-	0x1b18: 0x22a9, 0x1b19: 0x03b1, 0x1b1a: 0x03c1, 0x1b1b: 0x0799, 0x1b1c: 0x2289, 0x1b1d: 0x0399,
-	0x1b1e: 0x03a1, 0x1b1f: 0x03a9, 0x1b20: 0x2291, 0x1b21: 0x2299, 0x1b22: 0x22a1, 0x1b23: 0x04d1,
-	0x1b24: 0x05f9, 0x1b25: 0x22a9, 0x1b26: 0x22b1, 0x1b27: 0x22b9, 0x1b28: 0x22c1, 0x1b29: 0x22c9,
-	0x1b2a: 0x22d1, 0x1b2b: 0x0799, 0x1b2c: 0x03c1, 0x1b2d: 0x04d1, 0x1b2e: 0x22d9, 0x1b2f: 0x22e1,
-	0x1b30: 0x22e9, 0x1b31: 0x03b1, 0x1b32: 0x03b9, 0x1b33: 0x22f1, 0x1b34: 0x0769, 0x1b35: 0x22f9,
-	0x1b36: 0x2289, 0x1b37: 0x0399, 0x1b38: 0x03a1, 0x1b39: 0x03a9, 0x1b3a: 0x2291, 0x1b3b: 0x2299,
-	0x1b3c: 0x22a1, 0x1b3d: 0x04d1, 0x1b3e: 0x05f9, 0x1b3f: 0x22a9,
+	0x1b00: 0x2039, 0x1b01: 0x0269, 0x1b02: 0x01d9, 0x1b03: 0x0fa9, 0x1b04: 0x0fb9, 0x1b05: 0x1089,
+	0x1b06: 0x0279, 0x1b07: 0x0369, 0x1b08: 0x0289, 0x1b09: 0x13d1, 0x1b0a: 0x0039, 0x1b0b: 0x0ee9,
+	0x1b0c: 0x1159, 0x1b0d: 0x0ef9, 0x1b0e: 0x0f09, 0x1b0f: 0x1199, 0x1b10: 0x0f31, 0x1b11: 0x0249,
+	0x1b12: 0x0f41, 0x1b13: 0x0259, 0x1b14: 0x0f51, 0x1b15: 0x0359, 0x1b16: 0x0f61, 0x1b17: 0x0f71,
+	0x1b18: 0x00d9, 0x1b19: 0x0f99, 0x1b1a: 0x2039, 0x1b1b: 0x0269, 0x1b1c: 0x01d9, 0x1b1d: 0x0fa9,
+	0x1b1e: 0x0fb9, 0x1b1f: 0x1089, 0x1b20: 0x0279, 0x1b21: 0x0369, 0x1b22: 0x0289, 0x1b23: 0x13d1,
+	0x1b24: 0xbad1, 0x1b25: 0xbae9, 0x1b26: 0x0040, 0x1b27: 0x0040, 0x1b28: 0xbb01, 0x1b29: 0x1099,
+	0x1b2a: 0x10b1, 0x1b2b: 0x10c9, 0x1b2c: 0xbb19, 0x1b2d: 0xbb31, 0x1b2e: 0xbb49, 0x1b2f: 0x1429,
+	0x1b30: 0x1a31, 0x1b31: 0xbb61, 0x1b32: 0xbb79, 0x1b33: 0xbb91, 0x1b34: 0xbba9, 0x1b35: 0xbbc1,
+	0x1b36: 0xbbd9, 0x1b37: 0x2109, 0x1b38: 0x1111, 0x1b39: 0x1429, 0x1b3a: 0xbbf1, 0x1b3b: 0xbc09,
+	0x1b3c: 0xbc21, 0x1b3d: 0x10e1, 0x1b3e: 0x10f9, 0x1b3f: 0xbc39,
 	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x22b1, 0x1b41: 0x22b9, 0x1b42: 0x22c1, 0x1b43: 0x22c9, 0x1b44: 0x22d1, 0x1b45: 0x0799,
-	0x1b46: 0x03c1, 0x1b47: 0x22d9, 0x1b48: 0x22d9, 0x1b49: 0x22e1, 0x1b4a: 0x22e9, 0x1b4b: 0x03b1,
-	0x1b4c: 0x03b9, 0x1b4d: 0x22f1, 0x1b4e: 0x0769, 0x1b4f: 0x2301, 0x1b50: 0x2291, 0x1b51: 0x04d1,
-	0x1b52: 0x22a9, 0x1b53: 0x03b1, 0x1b54: 0x03c1, 0x1b55: 0x0799, 0x1b56: 0x2289, 0x1b57: 0x0399,
-	0x1b58: 0x03a1, 0x1b59: 0x03a9, 0x1b5a: 0x2291, 0x1b5b: 0x2299, 0x1b5c: 0x22a1, 0x1b5d: 0x04d1,
-	0x1b5e: 0x05f9, 0x1b5f: 0x22a9, 0x1b60: 0x22b1, 0x1b61: 0x22b9, 0x1b62: 0x22c1, 0x1b63: 0x22c9,
-	0x1b64: 0x22d1, 0x1b65: 0x0799, 0x1b66: 0x03c1, 0x1b67: 0x04d1, 0x1b68: 0x22d9, 0x1b69: 0x22e1,
-	0x1b6a: 0x22e9, 0x1b6b: 0x03b1, 0x1b6c: 0x03b9, 0x1b6d: 0x22f1, 0x1b6e: 0x0769, 0x1b6f: 0x22f9,
-	0x1b70: 0x2289, 0x1b71: 0x0399, 0x1b72: 0x03a1, 0x1b73: 0x03a9, 0x1b74: 0x2291, 0x1b75: 0x2299,
-	0x1b76: 0x22a1, 0x1b77: 0x04d1, 0x1b78: 0x05f9, 0x1b79: 0x22a9, 0x1b7a: 0x22b1, 0x1b7b: 0x22b9,
-	0x1b7c: 0x22c1, 0x1b7d: 0x22c9, 0x1b7e: 0x22d1, 0x1b7f: 0x0799,
+	0x1b40: 0x2079, 0x1b41: 0xbc51, 0x1b42: 0xbb01, 0x1b43: 0x1099, 0x1b44: 0x10b1, 0x1b45: 0x10c9,
+	0x1b46: 0xbb19, 0x1b47: 0xbb31, 0x1b48: 0xbb49, 0x1b49: 0x1429, 0x1b4a: 0x1a31, 0x1b4b: 0xbb61,
+	0x1b4c: 0xbb79, 0x1b4d: 0xbb91, 0x1b4e: 0xbba9, 0x1b4f: 0xbbc1, 0x1b50: 0xbbd9, 0x1b51: 0x2109,
+	0x1b52: 0x1111, 0x1b53: 0xbbf1, 0x1b54: 0xbbf1, 0x1b55: 0xbc09, 0x1b56: 0xbc21, 0x1b57: 0x10e1,
+	0x1b58: 0x10f9, 0x1b59: 0xbc39, 0x1b5a: 0x2079, 0x1b5b: 0xbc71, 0x1b5c: 0xbb19, 0x1b5d: 0x1429,
+	0x1b5e: 0xbb61, 0x1b5f: 0x10e1, 0x1b60: 0x1111, 0x1b61: 0x2109, 0x1b62: 0xbb01, 0x1b63: 0x1099,
+	0x1b64: 0x10b1, 0x1b65: 0x10c9, 0x1b66: 0xbb19, 0x1b67: 0xbb31, 0x1b68: 0xbb49, 0x1b69: 0x1429,
+	0x1b6a: 0x1a31, 0x1b6b: 0xbb61, 0x1b6c: 0xbb79, 0x1b6d: 0xbb91, 0x1b6e: 0xbba9, 0x1b6f: 0xbbc1,
+	0x1b70: 0xbbd9, 0x1b71: 0x2109, 0x1b72: 0x1111, 0x1b73: 0x1429, 0x1b74: 0xbbf1, 0x1b75: 0xbc09,
+	0x1b76: 0xbc21, 0x1b77: 0x10e1, 0x1b78: 0x10f9, 0x1b79: 0xbc39, 0x1b7a: 0x2079, 0x1b7b: 0xbc51,
+	0x1b7c: 0xbb01, 0x1b7d: 0x1099, 0x1b7e: 0x10b1, 0x1b7f: 0x10c9,
 	// Block 0x6e, offset 0x1b80
-	0x1b80: 0x03c1, 0x1b81: 0x22d9, 0x1b82: 0x22d9, 0x1b83: 0x22e1, 0x1b84: 0x22e9, 0x1b85: 0x03b1,
-	0x1b86: 0x03b9, 0x1b87: 0x22f1, 0x1b88: 0x0769, 0x1b89: 0x2301, 0x1b8a: 0x2291, 0x1b8b: 0x04d1,
-	0x1b8c: 0x22a9, 0x1b8d: 0x03b1, 0x1b8e: 0x03c1, 0x1b8f: 0x0799, 0x1b90: 0x2289, 0x1b91: 0x0399,
-	0x1b92: 0x03a1, 0x1b93: 0x03a9, 0x1b94: 0x2291, 0x1b95: 0x2299, 0x1b96: 0x22a1, 0x1b97: 0x04d1,
-	0x1b98: 0x05f9, 0x1b99: 0x22a9, 0x1b9a: 0x22b1, 0x1b9b: 0x22b9, 0x1b9c: 0x22c1, 0x1b9d: 0x22c9,
-	0x1b9e: 0x22d1, 0x1b9f: 0x0799, 0x1ba0: 0x03c1, 0x1ba1: 0x04d1, 0x1ba2: 0x22d9, 0x1ba3: 0x22e1,
-	0x1ba4: 0x22e9, 0x1ba5: 0x03b1, 0x1ba6: 0x03b9, 0x1ba7: 0x22f1, 0x1ba8: 0x0769, 0x1ba9: 0x22f9,
-	0x1baa: 0x2289, 0x1bab: 0x0399, 0x1bac: 0x03a1, 0x1bad: 0x03a9, 0x1bae: 0x2291, 0x1baf: 0x2299,
-	0x1bb0: 0x22a1, 0x1bb1: 0x04d1, 0x1bb2: 0x05f9, 0x1bb3: 0x22a9, 0x1bb4: 0x22b1, 0x1bb5: 0x22b9,
-	0x1bb6: 0x22c1, 0x1bb7: 0x22c9, 0x1bb8: 0x22d1, 0x1bb9: 0x0799, 0x1bba: 0x03c1, 0x1bbb: 0x22d9,
-	0x1bbc: 0x22d9, 0x1bbd: 0x22e1, 0x1bbe: 0x22e9, 0x1bbf: 0x03b1,
+	0x1b80: 0xbb19, 0x1b81: 0xbb31, 0x1b82: 0xbb49, 0x1b83: 0x1429, 0x1b84: 0x1a31, 0x1b85: 0xbb61,
+	0x1b86: 0xbb79, 0x1b87: 0xbb91, 0x1b88: 0xbba9, 0x1b89: 0xbbc1, 0x1b8a: 0xbbd9, 0x1b8b: 0x2109,
+	0x1b8c: 0x1111, 0x1b8d: 0xbbf1, 0x1b8e: 0xbbf1, 0x1b8f: 0xbc09, 0x1b90: 0xbc21, 0x1b91: 0x10e1,
+	0x1b92: 0x10f9, 0x1b93: 0xbc39, 0x1b94: 0x2079, 0x1b95: 0xbc71, 0x1b96: 0xbb19, 0x1b97: 0x1429,
+	0x1b98: 0xbb61, 0x1b99: 0x10e1, 0x1b9a: 0x1111, 0x1b9b: 0x2109, 0x1b9c: 0xbb01, 0x1b9d: 0x1099,
+	0x1b9e: 0x10b1, 0x1b9f: 0x10c9, 0x1ba0: 0xbb19, 0x1ba1: 0xbb31, 0x1ba2: 0xbb49, 0x1ba3: 0x1429,
+	0x1ba4: 0x1a31, 0x1ba5: 0xbb61, 0x1ba6: 0xbb79, 0x1ba7: 0xbb91, 0x1ba8: 0xbba9, 0x1ba9: 0xbbc1,
+	0x1baa: 0xbbd9, 0x1bab: 0x2109, 0x1bac: 0x1111, 0x1bad: 0x1429, 0x1bae: 0xbbf1, 0x1baf: 0xbc09,
+	0x1bb0: 0xbc21, 0x1bb1: 0x10e1, 0x1bb2: 0x10f9, 0x1bb3: 0xbc39, 0x1bb4: 0x2079, 0x1bb5: 0xbc51,
+	0x1bb6: 0xbb01, 0x1bb7: 0x1099, 0x1bb8: 0x10b1, 0x1bb9: 0x10c9, 0x1bba: 0xbb19, 0x1bbb: 0xbb31,
+	0x1bbc: 0xbb49, 0x1bbd: 0x1429, 0x1bbe: 0x1a31, 0x1bbf: 0xbb61,
 	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0x03b9, 0x1bc1: 0x22f1, 0x1bc2: 0x0769, 0x1bc3: 0x2301, 0x1bc4: 0x2291, 0x1bc5: 0x04d1,
-	0x1bc6: 0x22a9, 0x1bc7: 0x03b1, 0x1bc8: 0x03c1, 0x1bc9: 0x0799, 0x1bca: 0x2309, 0x1bcb: 0x2309,
-	0x1bcc: 0x0040, 0x1bcd: 0x0040, 0x1bce: 0x06e1, 0x1bcf: 0x0049, 0x1bd0: 0x0029, 0x1bd1: 0x0031,
-	0x1bd2: 0x06e9, 0x1bd3: 0x06f1, 0x1bd4: 0x06f9, 0x1bd5: 0x0701, 0x1bd6: 0x0709, 0x1bd7: 0x0711,
-	0x1bd8: 0x06e1, 0x1bd9: 0x0049, 0x1bda: 0x0029, 0x1bdb: 0x0031, 0x1bdc: 0x06e9, 0x1bdd: 0x06f1,
-	0x1bde: 0x06f9, 0x1bdf: 0x0701, 0x1be0: 0x0709, 0x1be1: 0x0711, 0x1be2: 0x06e1, 0x1be3: 0x0049,
-	0x1be4: 0x0029, 0x1be5: 0x0031, 0x1be6: 0x06e9, 0x1be7: 0x06f1, 0x1be8: 0x06f9, 0x1be9: 0x0701,
-	0x1bea: 0x0709, 0x1beb: 0x0711, 0x1bec: 0x06e1, 0x1bed: 0x0049, 0x1bee: 0x0029, 0x1bef: 0x0031,
-	0x1bf0: 0x06e9, 0x1bf1: 0x06f1, 0x1bf2: 0x06f9, 0x1bf3: 0x0701, 0x1bf4: 0x0709, 0x1bf5: 0x0711,
-	0x1bf6: 0x06e1, 0x1bf7: 0x0049, 0x1bf8: 0x0029, 0x1bf9: 0x0031, 0x1bfa: 0x06e9, 0x1bfb: 0x06f1,
-	0x1bfc: 0x06f9, 0x1bfd: 0x0701, 0x1bfe: 0x0709, 0x1bff: 0x0711,
+	0x1bc0: 0xbb79, 0x1bc1: 0xbb91, 0x1bc2: 0xbba9, 0x1bc3: 0xbbc1, 0x1bc4: 0xbbd9, 0x1bc5: 0x2109,
+	0x1bc6: 0x1111, 0x1bc7: 0xbbf1, 0x1bc8: 0xbbf1, 0x1bc9: 0xbc09, 0x1bca: 0xbc21, 0x1bcb: 0x10e1,
+	0x1bcc: 0x10f9, 0x1bcd: 0xbc39, 0x1bce: 0x2079, 0x1bcf: 0xbc71, 0x1bd0: 0xbb19, 0x1bd1: 0x1429,
+	0x1bd2: 0xbb61, 0x1bd3: 0x10e1, 0x1bd4: 0x1111, 0x1bd5: 0x2109, 0x1bd6: 0xbb01, 0x1bd7: 0x1099,
+	0x1bd8: 0x10b1, 0x1bd9: 0x10c9, 0x1bda: 0xbb19, 0x1bdb: 0xbb31, 0x1bdc: 0xbb49, 0x1bdd: 0x1429,
+	0x1bde: 0x1a31, 0x1bdf: 0xbb61, 0x1be0: 0xbb79, 0x1be1: 0xbb91, 0x1be2: 0xbba9, 0x1be3: 0xbbc1,
+	0x1be4: 0xbbd9, 0x1be5: 0x2109, 0x1be6: 0x1111, 0x1be7: 0x1429, 0x1be8: 0xbbf1, 0x1be9: 0xbc09,
+	0x1bea: 0xbc21, 0x1beb: 0x10e1, 0x1bec: 0x10f9, 0x1bed: 0xbc39, 0x1bee: 0x2079, 0x1bef: 0xbc51,
+	0x1bf0: 0xbb01, 0x1bf1: 0x1099, 0x1bf2: 0x10b1, 0x1bf3: 0x10c9, 0x1bf4: 0xbb19, 0x1bf5: 0xbb31,
+	0x1bf6: 0xbb49, 0x1bf7: 0x1429, 0x1bf8: 0x1a31, 0x1bf9: 0xbb61, 0x1bfa: 0xbb79, 0x1bfb: 0xbb91,
+	0x1bfc: 0xbba9, 0x1bfd: 0xbbc1, 0x1bfe: 0xbbd9, 0x1bff: 0x2109,
 	// Block 0x70, offset 0x1c00
-	0x1c00: 0xe115, 0x1c01: 0xe115, 0x1c02: 0xe135, 0x1c03: 0xe135, 0x1c04: 0xe115, 0x1c05: 0xe115,
-	0x1c06: 0xe175, 0x1c07: 0xe175, 0x1c08: 0xe115, 0x1c09: 0xe115, 0x1c0a: 0xe135, 0x1c0b: 0xe135,
-	0x1c0c: 0xe115, 0x1c0d: 0xe115, 0x1c0e: 0xe1f5, 0x1c0f: 0xe1f5, 0x1c10: 0xe115, 0x1c11: 0xe115,
-	0x1c12: 0xe135, 0x1c13: 0xe135, 0x1c14: 0xe115, 0x1c15: 0xe115, 0x1c16: 0xe175, 0x1c17: 0xe175,
-	0x1c18: 0xe115, 0x1c19: 0xe115, 0x1c1a: 0xe135, 0x1c1b: 0xe135, 0x1c1c: 0xe115, 0x1c1d: 0xe115,
-	0x1c1e: 0x8b3d, 0x1c1f: 0x8b3d, 0x1c20: 0x04b5, 0x1c21: 0x04b5, 0x1c22: 0x0a08, 0x1c23: 0x0a08,
-	0x1c24: 0x0a08, 0x1c25: 0x0a08, 0x1c26: 0x0a08, 0x1c27: 0x0a08, 0x1c28: 0x0a08, 0x1c29: 0x0a08,
-	0x1c2a: 0x0a08, 0x1c2b: 0x0a08, 0x1c2c: 0x0a08, 0x1c2d: 0x0a08, 0x1c2e: 0x0a08, 0x1c2f: 0x0a08,
-	0x1c30: 0x0a08, 0x1c31: 0x0a08, 0x1c32: 0x0a08, 0x1c33: 0x0a08, 0x1c34: 0x0a08, 0x1c35: 0x0a08,
-	0x1c36: 0x0a08, 0x1c37: 0x0a08, 0x1c38: 0x0a08, 0x1c39: 0x0a08, 0x1c3a: 0x0a08, 0x1c3b: 0x0a08,
-	0x1c3c: 0x0a08, 0x1c3d: 0x0a08, 0x1c3e: 0x0a08, 0x1c3f: 0x0a08,
+	0x1c00: 0x1111, 0x1c01: 0xbbf1, 0x1c02: 0xbbf1, 0x1c03: 0xbc09, 0x1c04: 0xbc21, 0x1c05: 0x10e1,
+	0x1c06: 0x10f9, 0x1c07: 0xbc39, 0x1c08: 0x2079, 0x1c09: 0xbc71, 0x1c0a: 0xbb19, 0x1c0b: 0x1429,
+	0x1c0c: 0xbb61, 0x1c0d: 0x10e1, 0x1c0e: 0x1111, 0x1c0f: 0x2109, 0x1c10: 0xbb01, 0x1c11: 0x1099,
+	0x1c12: 0x10b1, 0x1c13: 0x10c9, 0x1c14: 0xbb19, 0x1c15: 0xbb31, 0x1c16: 0xbb49, 0x1c17: 0x1429,
+	0x1c18: 0x1a31, 0x1c19: 0xbb61, 0x1c1a: 0xbb79, 0x1c1b: 0xbb91, 0x1c1c: 0xbba9, 0x1c1d: 0xbbc1,
+	0x1c1e: 0xbbd9, 0x1c1f: 0x2109, 0x1c20: 0x1111, 0x1c21: 0x1429, 0x1c22: 0xbbf1, 0x1c23: 0xbc09,
+	0x1c24: 0xbc21, 0x1c25: 0x10e1, 0x1c26: 0x10f9, 0x1c27: 0xbc39, 0x1c28: 0x2079, 0x1c29: 0xbc51,
+	0x1c2a: 0xbb01, 0x1c2b: 0x1099, 0x1c2c: 0x10b1, 0x1c2d: 0x10c9, 0x1c2e: 0xbb19, 0x1c2f: 0xbb31,
+	0x1c30: 0xbb49, 0x1c31: 0x1429, 0x1c32: 0x1a31, 0x1c33: 0xbb61, 0x1c34: 0xbb79, 0x1c35: 0xbb91,
+	0x1c36: 0xbba9, 0x1c37: 0xbbc1, 0x1c38: 0xbbd9, 0x1c39: 0x2109, 0x1c3a: 0x1111, 0x1c3b: 0xbbf1,
+	0x1c3c: 0xbbf1, 0x1c3d: 0xbc09, 0x1c3e: 0xbc21, 0x1c3f: 0x10e1,
 	// Block 0x71, offset 0x1c40
-	0x1c40: 0x20b1, 0x1c41: 0x20b9, 0x1c42: 0x20d9, 0x1c43: 0x20f1, 0x1c44: 0x0040, 0x1c45: 0x2189,
-	0x1c46: 0x2109, 0x1c47: 0x20e1, 0x1c48: 0x2131, 0x1c49: 0x2191, 0x1c4a: 0x2161, 0x1c4b: 0x2169,
-	0x1c4c: 0x2171, 0x1c4d: 0x2179, 0x1c4e: 0x2111, 0x1c4f: 0x2141, 0x1c50: 0x2151, 0x1c51: 0x2121,
-	0x1c52: 0x2159, 0x1c53: 0x2101, 0x1c54: 0x2119, 0x1c55: 0x20c9, 0x1c56: 0x20d1, 0x1c57: 0x20e9,
-	0x1c58: 0x20f9, 0x1c59: 0x2129, 0x1c5a: 0x2139, 0x1c5b: 0x2149, 0x1c5c: 0x2311, 0x1c5d: 0x1689,
-	0x1c5e: 0x2319, 0x1c5f: 0x2321, 0x1c60: 0x0040, 0x1c61: 0x20b9, 0x1c62: 0x20d9, 0x1c63: 0x0040,
-	0x1c64: 0x2181, 0x1c65: 0x0040, 0x1c66: 0x0040, 0x1c67: 0x20e1, 0x1c68: 0x0040, 0x1c69: 0x2191,
-	0x1c6a: 0x2161, 0x1c6b: 0x2169, 0x1c6c: 0x2171, 0x1c6d: 0x2179, 0x1c6e: 0x2111, 0x1c6f: 0x2141,
-	0x1c70: 0x2151, 0x1c71: 0x2121, 0x1c72: 0x2159, 0x1c73: 0x0040, 0x1c74: 0x2119, 0x1c75: 0x20c9,
-	0x1c76: 0x20d1, 0x1c77: 0x20e9, 0x1c78: 0x0040, 0x1c79: 0x2129, 0x1c7a: 0x0040, 0x1c7b: 0x2149,
-	0x1c7c: 0x0040, 0x1c7d: 0x0040, 0x1c7e: 0x0040, 0x1c7f: 0x0040,
+	0x1c40: 0x10f9, 0x1c41: 0xbc39, 0x1c42: 0x2079, 0x1c43: 0xbc71, 0x1c44: 0xbb19, 0x1c45: 0x1429,
+	0x1c46: 0xbb61, 0x1c47: 0x10e1, 0x1c48: 0x1111, 0x1c49: 0x2109, 0x1c4a: 0xbc91, 0x1c4b: 0xbc91,
+	0x1c4c: 0x0040, 0x1c4d: 0x0040, 0x1c4e: 0x1f41, 0x1c4f: 0x00c9, 0x1c50: 0x0069, 0x1c51: 0x0079,
+	0x1c52: 0x1f51, 0x1c53: 0x1f61, 0x1c54: 0x1f71, 0x1c55: 0x1f81, 0x1c56: 0x1f91, 0x1c57: 0x1fa1,
+	0x1c58: 0x1f41, 0x1c59: 0x00c9, 0x1c5a: 0x0069, 0x1c5b: 0x0079, 0x1c5c: 0x1f51, 0x1c5d: 0x1f61,
+	0x1c5e: 0x1f71, 0x1c5f: 0x1f81, 0x1c60: 0x1f91, 0x1c61: 0x1fa1, 0x1c62: 0x1f41, 0x1c63: 0x00c9,
+	0x1c64: 0x0069, 0x1c65: 0x0079, 0x1c66: 0x1f51, 0x1c67: 0x1f61, 0x1c68: 0x1f71, 0x1c69: 0x1f81,
+	0x1c6a: 0x1f91, 0x1c6b: 0x1fa1, 0x1c6c: 0x1f41, 0x1c6d: 0x00c9, 0x1c6e: 0x0069, 0x1c6f: 0x0079,
+	0x1c70: 0x1f51, 0x1c71: 0x1f61, 0x1c72: 0x1f71, 0x1c73: 0x1f81, 0x1c74: 0x1f91, 0x1c75: 0x1fa1,
+	0x1c76: 0x1f41, 0x1c77: 0x00c9, 0x1c78: 0x0069, 0x1c79: 0x0079, 0x1c7a: 0x1f51, 0x1c7b: 0x1f61,
+	0x1c7c: 0x1f71, 0x1c7d: 0x1f81, 0x1c7e: 0x1f91, 0x1c7f: 0x1fa1,
 	// Block 0x72, offset 0x1c80
-	0x1c80: 0x0040, 0x1c81: 0x0040, 0x1c82: 0x20d9, 0x1c83: 0x0040, 0x1c84: 0x0040, 0x1c85: 0x0040,
-	0x1c86: 0x0040, 0x1c87: 0x20e1, 0x1c88: 0x0040, 0x1c89: 0x2191, 0x1c8a: 0x0040, 0x1c8b: 0x2169,
-	0x1c8c: 0x0040, 0x1c8d: 0x2179, 0x1c8e: 0x2111, 0x1c8f: 0x2141, 0x1c90: 0x0040, 0x1c91: 0x2121,
-	0x1c92: 0x2159, 0x1c93: 0x0040, 0x1c94: 0x2119, 0x1c95: 0x0040, 0x1c96: 0x0040, 0x1c97: 0x20e9,
-	0x1c98: 0x0040, 0x1c99: 0x2129, 0x1c9a: 0x0040, 0x1c9b: 0x2149, 0x1c9c: 0x0040, 0x1c9d: 0x1689,
-	0x1c9e: 0x0040, 0x1c9f: 0x2321, 0x1ca0: 0x0040, 0x1ca1: 0x20b9, 0x1ca2: 0x20d9, 0x1ca3: 0x0040,
-	0x1ca4: 0x2181, 0x1ca5: 0x0040, 0x1ca6: 0x0040, 0x1ca7: 0x20e1, 0x1ca8: 0x2131, 0x1ca9: 0x2191,
-	0x1caa: 0x2161, 0x1cab: 0x0040, 0x1cac: 0x2171, 0x1cad: 0x2179, 0x1cae: 0x2111, 0x1caf: 0x2141,
-	0x1cb0: 0x2151, 0x1cb1: 0x2121, 0x1cb2: 0x2159, 0x1cb3: 0x0040, 0x1cb4: 0x2119, 0x1cb5: 0x20c9,
-	0x1cb6: 0x20d1, 0x1cb7: 0x20e9, 0x1cb8: 0x0040, 0x1cb9: 0x2129, 0x1cba: 0x2139, 0x1cbb: 0x2149,
-	0x1cbc: 0x2311, 0x1cbd: 0x0040, 0x1cbe: 0x2319, 0x1cbf: 0x0040,
+	0x1c80: 0xe115, 0x1c81: 0xe115, 0x1c82: 0xe135, 0x1c83: 0xe135, 0x1c84: 0xe115, 0x1c85: 0xe115,
+	0x1c86: 0xe175, 0x1c87: 0xe175, 0x1c88: 0xe115, 0x1c89: 0xe115, 0x1c8a: 0xe135, 0x1c8b: 0xe135,
+	0x1c8c: 0xe115, 0x1c8d: 0xe115, 0x1c8e: 0xe1f5, 0x1c8f: 0xe1f5, 0x1c90: 0xe115, 0x1c91: 0xe115,
+	0x1c92: 0xe135, 0x1c93: 0xe135, 0x1c94: 0xe115, 0x1c95: 0xe115, 0x1c96: 0xe175, 0x1c97: 0xe175,
+	0x1c98: 0xe115, 0x1c99: 0xe115, 0x1c9a: 0xe135, 0x1c9b: 0xe135, 0x1c9c: 0xe115, 0x1c9d: 0xe115,
+	0x1c9e: 0x8b3d, 0x1c9f: 0x8b3d, 0x1ca0: 0x04b5, 0x1ca1: 0x04b5, 0x1ca2: 0x0a08, 0x1ca3: 0x0a08,
+	0x1ca4: 0x0a08, 0x1ca5: 0x0a08, 0x1ca6: 0x0a08, 0x1ca7: 0x0a08, 0x1ca8: 0x0a08, 0x1ca9: 0x0a08,
+	0x1caa: 0x0a08, 0x1cab: 0x0a08, 0x1cac: 0x0a08, 0x1cad: 0x0a08, 0x1cae: 0x0a08, 0x1caf: 0x0a08,
+	0x1cb0: 0x0a08, 0x1cb1: 0x0a08, 0x1cb2: 0x0a08, 0x1cb3: 0x0a08, 0x1cb4: 0x0a08, 0x1cb5: 0x0a08,
+	0x1cb6: 0x0a08, 0x1cb7: 0x0a08, 0x1cb8: 0x0a08, 0x1cb9: 0x0a08, 0x1cba: 0x0a08, 0x1cbb: 0x0a08,
+	0x1cbc: 0x0a08, 0x1cbd: 0x0a08, 0x1cbe: 0x0a08, 0x1cbf: 0x0a08,
 	// Block 0x73, offset 0x1cc0
-	0x1cc0: 0x20b1, 0x1cc1: 0x20b9, 0x1cc2: 0x20d9, 0x1cc3: 0x20f1, 0x1cc4: 0x2181, 0x1cc5: 0x2189,
-	0x1cc6: 0x2109, 0x1cc7: 0x20e1, 0x1cc8: 0x2131, 0x1cc9: 0x2191, 0x1cca: 0x0040, 0x1ccb: 0x2169,
-	0x1ccc: 0x2171, 0x1ccd: 0x2179, 0x1cce: 0x2111, 0x1ccf: 0x2141, 0x1cd0: 0x2151, 0x1cd1: 0x2121,
-	0x1cd2: 0x2159, 0x1cd3: 0x2101, 0x1cd4: 0x2119, 0x1cd5: 0x20c9, 0x1cd6: 0x20d1, 0x1cd7: 0x20e9,
-	0x1cd8: 0x20f9, 0x1cd9: 0x2129, 0x1cda: 0x2139, 0x1cdb: 0x2149, 0x1cdc: 0x0040, 0x1cdd: 0x0040,
-	0x1cde: 0x0040, 0x1cdf: 0x0040, 0x1ce0: 0x0040, 0x1ce1: 0x20b9, 0x1ce2: 0x20d9, 0x1ce3: 0x20f1,
-	0x1ce4: 0x0040, 0x1ce5: 0x2189, 0x1ce6: 0x2109, 0x1ce7: 0x20e1, 0x1ce8: 0x2131, 0x1ce9: 0x2191,
-	0x1cea: 0x0040, 0x1ceb: 0x2169, 0x1cec: 0x2171, 0x1ced: 0x2179, 0x1cee: 0x2111, 0x1cef: 0x2141,
-	0x1cf0: 0x2151, 0x1cf1: 0x2121, 0x1cf2: 0x2159, 0x1cf3: 0x2101, 0x1cf4: 0x2119, 0x1cf5: 0x20c9,
-	0x1cf6: 0x20d1, 0x1cf7: 0x20e9, 0x1cf8: 0x20f9, 0x1cf9: 0x2129, 0x1cfa: 0x2139, 0x1cfb: 0x2149,
+	0x1cc0: 0xb1d9, 0x1cc1: 0xb1f1, 0x1cc2: 0xb251, 0x1cc3: 0xb299, 0x1cc4: 0x0040, 0x1cc5: 0xb461,
+	0x1cc6: 0xb2e1, 0x1cc7: 0xb269, 0x1cc8: 0xb359, 0x1cc9: 0xb479, 0x1cca: 0xb3e9, 0x1ccb: 0xb401,
+	0x1ccc: 0xb419, 0x1ccd: 0xb431, 0x1cce: 0xb2f9, 0x1ccf: 0xb389, 0x1cd0: 0xb3b9, 0x1cd1: 0xb329,
+	0x1cd2: 0xb3d1, 0x1cd3: 0xb2c9, 0x1cd4: 0xb311, 0x1cd5: 0xb221, 0x1cd6: 0xb239, 0x1cd7: 0xb281,
+	0x1cd8: 0xb2b1, 0x1cd9: 0xb341, 0x1cda: 0xb371, 0x1cdb: 0xb3a1, 0x1cdc: 0xbca9, 0x1cdd: 0x7999,
+	0x1cde: 0xbcc1, 0x1cdf: 0xbcd9, 0x1ce0: 0x0040, 0x1ce1: 0xb1f1, 0x1ce2: 0xb251, 0x1ce3: 0x0040,
+	0x1ce4: 0xb449, 0x1ce5: 0x0040, 0x1ce6: 0x0040, 0x1ce7: 0xb269, 0x1ce8: 0x0040, 0x1ce9: 0xb479,
+	0x1cea: 0xb3e9, 0x1ceb: 0xb401, 0x1cec: 0xb419, 0x1ced: 0xb431, 0x1cee: 0xb2f9, 0x1cef: 0xb389,
+	0x1cf0: 0xb3b9, 0x1cf1: 0xb329, 0x1cf2: 0xb3d1, 0x1cf3: 0x0040, 0x1cf4: 0xb311, 0x1cf5: 0xb221,
+	0x1cf6: 0xb239, 0x1cf7: 0xb281, 0x1cf8: 0x0040, 0x1cf9: 0xb341, 0x1cfa: 0x0040, 0x1cfb: 0xb3a1,
 	0x1cfc: 0x0040, 0x1cfd: 0x0040, 0x1cfe: 0x0040, 0x1cff: 0x0040,
 	// Block 0x74, offset 0x1d00
-	0x1d00: 0x0040, 0x1d01: 0x232a, 0x1d02: 0x2332, 0x1d03: 0x233a, 0x1d04: 0x2342, 0x1d05: 0x234a,
-	0x1d06: 0x2352, 0x1d07: 0x235a, 0x1d08: 0x2362, 0x1d09: 0x236a, 0x1d0a: 0x2372, 0x1d0b: 0x0018,
-	0x1d0c: 0x0018, 0x1d0d: 0x0018, 0x1d0e: 0x0018, 0x1d0f: 0x0018, 0x1d10: 0x237a, 0x1d11: 0x2382,
-	0x1d12: 0x238a, 0x1d13: 0x2392, 0x1d14: 0x239a, 0x1d15: 0x23a2, 0x1d16: 0x23aa, 0x1d17: 0x23b2,
-	0x1d18: 0x23ba, 0x1d19: 0x23c2, 0x1d1a: 0x23ca, 0x1d1b: 0x23d2, 0x1d1c: 0x23da, 0x1d1d: 0x23e2,
-	0x1d1e: 0x23ea, 0x1d1f: 0x23f2, 0x1d20: 0x23fa, 0x1d21: 0x2402, 0x1d22: 0x240a, 0x1d23: 0x2412,
-	0x1d24: 0x241a, 0x1d25: 0x2422, 0x1d26: 0x242a, 0x1d27: 0x2432, 0x1d28: 0x243a, 0x1d29: 0x2442,
-	0x1d2a: 0x2449, 0x1d2b: 0x03d9, 0x1d2c: 0x00b9, 0x1d2d: 0x1239, 0x1d2e: 0x2451, 0x1d2f: 0x0018,
-	0x1d30: 0x0019, 0x1d31: 0x02e9, 0x1d32: 0x03d9, 0x1d33: 0x02f1, 0x1d34: 0x02f9, 0x1d35: 0x03f1,
-	0x1d36: 0x0309, 0x1d37: 0x00a9, 0x1d38: 0x0311, 0x1d39: 0x00b1, 0x1d3a: 0x0319, 0x1d3b: 0x0101,
-	0x1d3c: 0x0321, 0x1d3d: 0x0329, 0x1d3e: 0x0051, 0x1d3f: 0x0339,
+	0x1d00: 0x0040, 0x1d01: 0x0040, 0x1d02: 0xb251, 0x1d03: 0x0040, 0x1d04: 0x0040, 0x1d05: 0x0040,
+	0x1d06: 0x0040, 0x1d07: 0xb269, 0x1d08: 0x0040, 0x1d09: 0xb479, 0x1d0a: 0x0040, 0x1d0b: 0xb401,
+	0x1d0c: 0x0040, 0x1d0d: 0xb431, 0x1d0e: 0xb2f9, 0x1d0f: 0xb389, 0x1d10: 0x0040, 0x1d11: 0xb329,
+	0x1d12: 0xb3d1, 0x1d13: 0x0040, 0x1d14: 0xb311, 0x1d15: 0x0040, 0x1d16: 0x0040, 0x1d17: 0xb281,
+	0x1d18: 0x0040, 0x1d19: 0xb341, 0x1d1a: 0x0040, 0x1d1b: 0xb3a1, 0x1d1c: 0x0040, 0x1d1d: 0x7999,
+	0x1d1e: 0x0040, 0x1d1f: 0xbcd9, 0x1d20: 0x0040, 0x1d21: 0xb1f1, 0x1d22: 0xb251, 0x1d23: 0x0040,
+	0x1d24: 0xb449, 0x1d25: 0x0040, 0x1d26: 0x0040, 0x1d27: 0xb269, 0x1d28: 0xb359, 0x1d29: 0xb479,
+	0x1d2a: 0xb3e9, 0x1d2b: 0x0040, 0x1d2c: 0xb419, 0x1d2d: 0xb431, 0x1d2e: 0xb2f9, 0x1d2f: 0xb389,
+	0x1d30: 0xb3b9, 0x1d31: 0xb329, 0x1d32: 0xb3d1, 0x1d33: 0x0040, 0x1d34: 0xb311, 0x1d35: 0xb221,
+	0x1d36: 0xb239, 0x1d37: 0xb281, 0x1d38: 0x0040, 0x1d39: 0xb341, 0x1d3a: 0xb371, 0x1d3b: 0xb3a1,
+	0x1d3c: 0xbca9, 0x1d3d: 0x0040, 0x1d3e: 0xbcc1, 0x1d3f: 0x0040,
 	// Block 0x75, offset 0x1d40
-	0x1d40: 0x0751, 0x1d41: 0x00b9, 0x1d42: 0x0089, 0x1d43: 0x0341, 0x1d44: 0x0349, 0x1d45: 0x0391,
-	0x1d46: 0x00c1, 0x1d47: 0x0109, 0x1d48: 0x00c9, 0x1d49: 0x04b1, 0x1d4a: 0x2459, 0x1d4b: 0x11f9,
-	0x1d4c: 0x2461, 0x1d4d: 0x04d9, 0x1d4e: 0x2469, 0x1d4f: 0x2471, 0x1d50: 0x0018, 0x1d51: 0x0018,
-	0x1d52: 0x0018, 0x1d53: 0x0018, 0x1d54: 0x0018, 0x1d55: 0x0018, 0x1d56: 0x0018, 0x1d57: 0x0018,
-	0x1d58: 0x0018, 0x1d59: 0x0018, 0x1d5a: 0x0018, 0x1d5b: 0x0018, 0x1d5c: 0x0018, 0x1d5d: 0x0018,
-	0x1d5e: 0x0018, 0x1d5f: 0x0018, 0x1d60: 0x0018, 0x1d61: 0x0018, 0x1d62: 0x0018, 0x1d63: 0x0018,
-	0x1d64: 0x0018, 0x1d65: 0x0018, 0x1d66: 0x0018, 0x1d67: 0x0018, 0x1d68: 0x0018, 0x1d69: 0x0018,
-	0x1d6a: 0x2479, 0x1d6b: 0x2481, 0x1d6c: 0x2489, 0x1d6d: 0x0018, 0x1d6e: 0x0018, 0x1d6f: 0x0018,
-	0x1d70: 0x0018, 0x1d71: 0x0018, 0x1d72: 0x0018, 0x1d73: 0x0018, 0x1d74: 0x0018, 0x1d75: 0x0018,
-	0x1d76: 0x0018, 0x1d77: 0x0018, 0x1d78: 0x0018, 0x1d79: 0x0018, 0x1d7a: 0x0018, 0x1d7b: 0x0018,
-	0x1d7c: 0x0018, 0x1d7d: 0x0018, 0x1d7e: 0x0018, 0x1d7f: 0x0018,
+	0x1d40: 0xb1d9, 0x1d41: 0xb1f1, 0x1d42: 0xb251, 0x1d43: 0xb299, 0x1d44: 0xb449, 0x1d45: 0xb461,
+	0x1d46: 0xb2e1, 0x1d47: 0xb269, 0x1d48: 0xb359, 0x1d49: 0xb479, 0x1d4a: 0x0040, 0x1d4b: 0xb401,
+	0x1d4c: 0xb419, 0x1d4d: 0xb431, 0x1d4e: 0xb2f9, 0x1d4f: 0xb389, 0x1d50: 0xb3b9, 0x1d51: 0xb329,
+	0x1d52: 0xb3d1, 0x1d53: 0xb2c9, 0x1d54: 0xb311, 0x1d55: 0xb221, 0x1d56: 0xb239, 0x1d57: 0xb281,
+	0x1d58: 0xb2b1, 0x1d59: 0xb341, 0x1d5a: 0xb371, 0x1d5b: 0xb3a1, 0x1d5c: 0x0040, 0x1d5d: 0x0040,
+	0x1d5e: 0x0040, 0x1d5f: 0x0040, 0x1d60: 0x0040, 0x1d61: 0xb1f1, 0x1d62: 0xb251, 0x1d63: 0xb299,
+	0x1d64: 0x0040, 0x1d65: 0xb461, 0x1d66: 0xb2e1, 0x1d67: 0xb269, 0x1d68: 0xb359, 0x1d69: 0xb479,
+	0x1d6a: 0x0040, 0x1d6b: 0xb401, 0x1d6c: 0xb419, 0x1d6d: 0xb431, 0x1d6e: 0xb2f9, 0x1d6f: 0xb389,
+	0x1d70: 0xb3b9, 0x1d71: 0xb329, 0x1d72: 0xb3d1, 0x1d73: 0xb2c9, 0x1d74: 0xb311, 0x1d75: 0xb221,
+	0x1d76: 0xb239, 0x1d77: 0xb281, 0x1d78: 0xb2b1, 0x1d79: 0xb341, 0x1d7a: 0xb371, 0x1d7b: 0xb3a1,
+	0x1d7c: 0x0040, 0x1d7d: 0x0040, 0x1d7e: 0x0040, 0x1d7f: 0x0040,
 	// Block 0x76, offset 0x1d80
-	0x1d80: 0x2499, 0x1d81: 0x24a1, 0x1d82: 0x24a9, 0x1d83: 0x0040, 0x1d84: 0x0040, 0x1d85: 0x0040,
-	0x1d86: 0x0040, 0x1d87: 0x0040, 0x1d88: 0x0040, 0x1d89: 0x0040, 0x1d8a: 0x0040, 0x1d8b: 0x0040,
-	0x1d8c: 0x0040, 0x1d8d: 0x0040, 0x1d8e: 0x0040, 0x1d8f: 0x0040, 0x1d90: 0x24b1, 0x1d91: 0x24b9,
-	0x1d92: 0x24c1, 0x1d93: 0x24c9, 0x1d94: 0x24d1, 0x1d95: 0x24d9, 0x1d96: 0x24e1, 0x1d97: 0x24e9,
-	0x1d98: 0x24f1, 0x1d99: 0x24f9, 0x1d9a: 0x2501, 0x1d9b: 0x2509, 0x1d9c: 0x2511, 0x1d9d: 0x2519,
-	0x1d9e: 0x2521, 0x1d9f: 0x2529, 0x1da0: 0x2531, 0x1da1: 0x2539, 0x1da2: 0x2541, 0x1da3: 0x2549,
-	0x1da4: 0x2551, 0x1da5: 0x2559, 0x1da6: 0x2561, 0x1da7: 0x2569, 0x1da8: 0x2571, 0x1da9: 0x2579,
-	0x1daa: 0x2581, 0x1dab: 0x2589, 0x1dac: 0x2591, 0x1dad: 0x2599, 0x1dae: 0x25a1, 0x1daf: 0x25a9,
-	0x1db0: 0x25b1, 0x1db1: 0x25b9, 0x1db2: 0x25c1, 0x1db3: 0x25c9, 0x1db4: 0x25d1, 0x1db5: 0x25d9,
-	0x1db6: 0x25e1, 0x1db7: 0x25e9, 0x1db8: 0x25f1, 0x1db9: 0x25f9, 0x1dba: 0x2601, 0x1dbb: 0x2609,
-	0x1dbc: 0x0040, 0x1dbd: 0x0040, 0x1dbe: 0x0040, 0x1dbf: 0x0040,
+	0x1d80: 0x0040, 0x1d81: 0xbcf2, 0x1d82: 0xbd0a, 0x1d83: 0xbd22, 0x1d84: 0xbd3a, 0x1d85: 0xbd52,
+	0x1d86: 0xbd6a, 0x1d87: 0xbd82, 0x1d88: 0xbd9a, 0x1d89: 0xbdb2, 0x1d8a: 0xbdca, 0x1d8b: 0x0018,
+	0x1d8c: 0x0018, 0x1d8d: 0x0018, 0x1d8e: 0x0018, 0x1d8f: 0x0018, 0x1d90: 0xbde2, 0x1d91: 0xbe02,
+	0x1d92: 0xbe22, 0x1d93: 0xbe42, 0x1d94: 0xbe62, 0x1d95: 0xbe82, 0x1d96: 0xbea2, 0x1d97: 0xbec2,
+	0x1d98: 0xbee2, 0x1d99: 0xbf02, 0x1d9a: 0xbf22, 0x1d9b: 0xbf42, 0x1d9c: 0xbf62, 0x1d9d: 0xbf82,
+	0x1d9e: 0xbfa2, 0x1d9f: 0xbfc2, 0x1da0: 0xbfe2, 0x1da1: 0xc002, 0x1da2: 0xc022, 0x1da3: 0xc042,
+	0x1da4: 0xc062, 0x1da5: 0xc082, 0x1da6: 0xc0a2, 0x1da7: 0xc0c2, 0x1da8: 0xc0e2, 0x1da9: 0xc102,
+	0x1daa: 0xc121, 0x1dab: 0x1159, 0x1dac: 0x0269, 0x1dad: 0x66a9, 0x1dae: 0xc161, 0x1daf: 0x0018,
+	0x1db0: 0x0039, 0x1db1: 0x0ee9, 0x1db2: 0x1159, 0x1db3: 0x0ef9, 0x1db4: 0x0f09, 0x1db5: 0x1199,
+	0x1db6: 0x0f31, 0x1db7: 0x0249, 0x1db8: 0x0f41, 0x1db9: 0x0259, 0x1dba: 0x0f51, 0x1dbb: 0x0359,
+	0x1dbc: 0x0f61, 0x1dbd: 0x0f71, 0x1dbe: 0x00d9, 0x1dbf: 0x0f99,
 	// Block 0x77, offset 0x1dc0
-	0x1dc0: 0x2669, 0x1dc1: 0x2671, 0x1dc2: 0x2679, 0x1dc3: 0x8b55, 0x1dc4: 0x2681, 0x1dc5: 0x2689,
-	0x1dc6: 0x2691, 0x1dc7: 0x2699, 0x1dc8: 0x26a1, 0x1dc9: 0x26a9, 0x1dca: 0x26b1, 0x1dcb: 0x26b9,
-	0x1dcc: 0x26c1, 0x1dcd: 0x8b75, 0x1dce: 0x26c9, 0x1dcf: 0x26d1, 0x1dd0: 0x26d9, 0x1dd1: 0x26e1,
-	0x1dd2: 0x8b95, 0x1dd3: 0x26e9, 0x1dd4: 0x26f1, 0x1dd5: 0x2521, 0x1dd6: 0x8bb5, 0x1dd7: 0x26f9,
-	0x1dd8: 0x2701, 0x1dd9: 0x2709, 0x1dda: 0x2711, 0x1ddb: 0x2719, 0x1ddc: 0x8bd5, 0x1ddd: 0x2721,
-	0x1dde: 0x2729, 0x1ddf: 0x2731, 0x1de0: 0x2739, 0x1de1: 0x2741, 0x1de2: 0x25f9, 0x1de3: 0x2749,
-	0x1de4: 0x2751, 0x1de5: 0x2759, 0x1de6: 0x2761, 0x1de7: 0x2769, 0x1de8: 0x2771, 0x1de9: 0x2779,
-	0x1dea: 0x2781, 0x1deb: 0x2789, 0x1dec: 0x2791, 0x1ded: 0x2799, 0x1dee: 0x27a1, 0x1def: 0x27a9,
-	0x1df0: 0x27b1, 0x1df1: 0x27b9, 0x1df2: 0x27b9, 0x1df3: 0x27b9, 0x1df4: 0x8bf5, 0x1df5: 0x27c1,
-	0x1df6: 0x27c9, 0x1df7: 0x27d1, 0x1df8: 0x8c15, 0x1df9: 0x27d9, 0x1dfa: 0x27e1, 0x1dfb: 0x27e9,
-	0x1dfc: 0x27f1, 0x1dfd: 0x27f9, 0x1dfe: 0x2801, 0x1dff: 0x2809,
+	0x1dc0: 0x2039, 0x1dc1: 0x0269, 0x1dc2: 0x01d9, 0x1dc3: 0x0fa9, 0x1dc4: 0x0fb9, 0x1dc5: 0x1089,
+	0x1dc6: 0x0279, 0x1dc7: 0x0369, 0x1dc8: 0x0289, 0x1dc9: 0x13d1, 0x1dca: 0xc179, 0x1dcb: 0x65e9,
+	0x1dcc: 0xc191, 0x1dcd: 0x1441, 0x1dce: 0xc1a9, 0x1dcf: 0xc1c9, 0x1dd0: 0x0018, 0x1dd1: 0x0018,
+	0x1dd2: 0x0018, 0x1dd3: 0x0018, 0x1dd4: 0x0018, 0x1dd5: 0x0018, 0x1dd6: 0x0018, 0x1dd7: 0x0018,
+	0x1dd8: 0x0018, 0x1dd9: 0x0018, 0x1dda: 0x0018, 0x1ddb: 0x0018, 0x1ddc: 0x0018, 0x1ddd: 0x0018,
+	0x1dde: 0x0018, 0x1ddf: 0x0018, 0x1de0: 0x0018, 0x1de1: 0x0018, 0x1de2: 0x0018, 0x1de3: 0x0018,
+	0x1de4: 0x0018, 0x1de5: 0x0018, 0x1de6: 0x0018, 0x1de7: 0x0018, 0x1de8: 0x0018, 0x1de9: 0x0018,
+	0x1dea: 0xc1e1, 0x1deb: 0xc1f9, 0x1dec: 0xc211, 0x1ded: 0x0018, 0x1dee: 0x0018, 0x1def: 0x0018,
+	0x1df0: 0x0018, 0x1df1: 0x0018, 0x1df2: 0x0018, 0x1df3: 0x0018, 0x1df4: 0x0018, 0x1df5: 0x0018,
+	0x1df6: 0x0018, 0x1df7: 0x0018, 0x1df8: 0x0018, 0x1df9: 0x0018, 0x1dfa: 0x0018, 0x1dfb: 0x0018,
+	0x1dfc: 0x0018, 0x1dfd: 0x0018, 0x1dfe: 0x0018, 0x1dff: 0x0018,
 	// Block 0x78, offset 0x1e00
-	0x1e00: 0x2811, 0x1e01: 0x2819, 0x1e02: 0x2821, 0x1e03: 0x2829, 0x1e04: 0x2831, 0x1e05: 0x2839,
-	0x1e06: 0x2839, 0x1e07: 0x2841, 0x1e08: 0x2849, 0x1e09: 0x2851, 0x1e0a: 0x2859, 0x1e0b: 0x2861,
-	0x1e0c: 0x2869, 0x1e0d: 0x2871, 0x1e0e: 0x2879, 0x1e0f: 0x2881, 0x1e10: 0x2889, 0x1e11: 0x2891,
-	0x1e12: 0x2899, 0x1e13: 0x28a1, 0x1e14: 0x28a9, 0x1e15: 0x28b1, 0x1e16: 0x28b9, 0x1e17: 0x28c1,
-	0x1e18: 0x28c9, 0x1e19: 0x8c35, 0x1e1a: 0x28d1, 0x1e1b: 0x28d9, 0x1e1c: 0x28e1, 0x1e1d: 0x24d9,
-	0x1e1e: 0x28e9, 0x1e1f: 0x28f1, 0x1e20: 0x8c55, 0x1e21: 0x8c75, 0x1e22: 0x28f9, 0x1e23: 0x2901,
-	0x1e24: 0x2909, 0x1e25: 0x2911, 0x1e26: 0x2919, 0x1e27: 0x2921, 0x1e28: 0x2040, 0x1e29: 0x2929,
-	0x1e2a: 0x2931, 0x1e2b: 0x2931, 0x1e2c: 0x8c95, 0x1e2d: 0x2939, 0x1e2e: 0x2941, 0x1e2f: 0x2949,
-	0x1e30: 0x2951, 0x1e31: 0x8cb5, 0x1e32: 0x2959, 0x1e33: 0x2961, 0x1e34: 0x2040, 0x1e35: 0x2969,
-	0x1e36: 0x2971, 0x1e37: 0x2979, 0x1e38: 0x2981, 0x1e39: 0x2989, 0x1e3a: 0x2991, 0x1e3b: 0x8cd5,
-	0x1e3c: 0x2999, 0x1e3d: 0x8cf5, 0x1e3e: 0x29a1, 0x1e3f: 0x29a9,
+	0x1e00: 0xc241, 0x1e01: 0xc279, 0x1e02: 0xc2b1, 0x1e03: 0x0040, 0x1e04: 0x0040, 0x1e05: 0x0040,
+	0x1e06: 0x0040, 0x1e07: 0x0040, 0x1e08: 0x0040, 0x1e09: 0x0040, 0x1e0a: 0x0040, 0x1e0b: 0x0040,
+	0x1e0c: 0x0040, 0x1e0d: 0x0040, 0x1e0e: 0x0040, 0x1e0f: 0x0040, 0x1e10: 0xc2d1, 0x1e11: 0xc2f1,
+	0x1e12: 0xc311, 0x1e13: 0xc331, 0x1e14: 0xc351, 0x1e15: 0xc371, 0x1e16: 0xc391, 0x1e17: 0xc3b1,
+	0x1e18: 0xc3d1, 0x1e19: 0xc3f1, 0x1e1a: 0xc411, 0x1e1b: 0xc431, 0x1e1c: 0xc451, 0x1e1d: 0xc471,
+	0x1e1e: 0xc491, 0x1e1f: 0xc4b1, 0x1e20: 0xc4d1, 0x1e21: 0xc4f1, 0x1e22: 0xc511, 0x1e23: 0xc531,
+	0x1e24: 0xc551, 0x1e25: 0xc571, 0x1e26: 0xc591, 0x1e27: 0xc5b1, 0x1e28: 0xc5d1, 0x1e29: 0xc5f1,
+	0x1e2a: 0xc611, 0x1e2b: 0xc631, 0x1e2c: 0xc651, 0x1e2d: 0xc671, 0x1e2e: 0xc691, 0x1e2f: 0xc6b1,
+	0x1e30: 0xc6d1, 0x1e31: 0xc6f1, 0x1e32: 0xc711, 0x1e33: 0xc731, 0x1e34: 0xc751, 0x1e35: 0xc771,
+	0x1e36: 0xc791, 0x1e37: 0xc7b1, 0x1e38: 0xc7d1, 0x1e39: 0xc7f1, 0x1e3a: 0xc811, 0x1e3b: 0xc831,
+	0x1e3c: 0x0040, 0x1e3d: 0x0040, 0x1e3e: 0x0040, 0x1e3f: 0x0040,
 	// Block 0x79, offset 0x1e40
-	0x1e40: 0x29b1, 0x1e41: 0x29b9, 0x1e42: 0x29c1, 0x1e43: 0x29c9, 0x1e44: 0x29d1, 0x1e45: 0x29d9,
-	0x1e46: 0x29e1, 0x1e47: 0x29e9, 0x1e48: 0x29f1, 0x1e49: 0x8d15, 0x1e4a: 0x29f9, 0x1e4b: 0x2a01,
-	0x1e4c: 0x2a09, 0x1e4d: 0x2a11, 0x1e4e: 0x2a19, 0x1e4f: 0x8d35, 0x1e50: 0x2a21, 0x1e51: 0x8d55,
-	0x1e52: 0x8d75, 0x1e53: 0x2a29, 0x1e54: 0x2a31, 0x1e55: 0x2a31, 0x1e56: 0x2a39, 0x1e57: 0x8d95,
-	0x1e58: 0x8db5, 0x1e59: 0x2a41, 0x1e5a: 0x2a49, 0x1e5b: 0x2a51, 0x1e5c: 0x2a59, 0x1e5d: 0x2a61,
-	0x1e5e: 0x2a69, 0x1e5f: 0x2a71, 0x1e60: 0x2a79, 0x1e61: 0x2a81, 0x1e62: 0x2a89, 0x1e63: 0x2a91,
-	0x1e64: 0x8dd5, 0x1e65: 0x2a99, 0x1e66: 0x2aa1, 0x1e67: 0x2aa9, 0x1e68: 0x2ab1, 0x1e69: 0x2aa9,
-	0x1e6a: 0x2ab9, 0x1e6b: 0x2ac1, 0x1e6c: 0x2ac9, 0x1e6d: 0x2ad1, 0x1e6e: 0x2ad9, 0x1e6f: 0x2ae1,
-	0x1e70: 0x2ae9, 0x1e71: 0x2af1, 0x1e72: 0x2af9, 0x1e73: 0x2b01, 0x1e74: 0x2b09, 0x1e75: 0x2b11,
-	0x1e76: 0x2b19, 0x1e77: 0x2b21, 0x1e78: 0x8df5, 0x1e79: 0x2b29, 0x1e7a: 0x2b31, 0x1e7b: 0x2b39,
-	0x1e7c: 0x2b41, 0x1e7d: 0x2b49, 0x1e7e: 0x8e15, 0x1e7f: 0x2b51,
+	0x1e40: 0xcb61, 0x1e41: 0xcb81, 0x1e42: 0xcba1, 0x1e43: 0x8b55, 0x1e44: 0xcbc1, 0x1e45: 0xcbe1,
+	0x1e46: 0xcc01, 0x1e47: 0xcc21, 0x1e48: 0xcc41, 0x1e49: 0xcc61, 0x1e4a: 0xcc81, 0x1e4b: 0xcca1,
+	0x1e4c: 0xccc1, 0x1e4d: 0x8b75, 0x1e4e: 0xcce1, 0x1e4f: 0xcd01, 0x1e50: 0xcd21, 0x1e51: 0xcd41,
+	0x1e52: 0x8b95, 0x1e53: 0xcd61, 0x1e54: 0xcd81, 0x1e55: 0xc491, 0x1e56: 0x8bb5, 0x1e57: 0xcda1,
+	0x1e58: 0xcdc1, 0x1e59: 0xcde1, 0x1e5a: 0xce01, 0x1e5b: 0xce21, 0x1e5c: 0x8bd5, 0x1e5d: 0xce41,
+	0x1e5e: 0xce61, 0x1e5f: 0xce81, 0x1e60: 0xcea1, 0x1e61: 0xcec1, 0x1e62: 0xc7f1, 0x1e63: 0xcee1,
+	0x1e64: 0xcf01, 0x1e65: 0xcf21, 0x1e66: 0xcf41, 0x1e67: 0xcf61, 0x1e68: 0xcf81, 0x1e69: 0xcfa1,
+	0x1e6a: 0xcfc1, 0x1e6b: 0xcfe1, 0x1e6c: 0xd001, 0x1e6d: 0xd021, 0x1e6e: 0xd041, 0x1e6f: 0xd061,
+	0x1e70: 0xd081, 0x1e71: 0xd0a1, 0x1e72: 0xd0a1, 0x1e73: 0xd0a1, 0x1e74: 0x8bf5, 0x1e75: 0xd0c1,
+	0x1e76: 0xd0e1, 0x1e77: 0xd101, 0x1e78: 0x8c15, 0x1e79: 0xd121, 0x1e7a: 0xd141, 0x1e7b: 0xd161,
+	0x1e7c: 0xd181, 0x1e7d: 0xd1a1, 0x1e7e: 0xd1c1, 0x1e7f: 0xd1e1,
 	// Block 0x7a, offset 0x1e80
-	0x1e80: 0x2b59, 0x1e81: 0x2b61, 0x1e82: 0x2b69, 0x1e83: 0x2b71, 0x1e84: 0x2b79, 0x1e85: 0x2b81,
-	0x1e86: 0x2b89, 0x1e87: 0x2b91, 0x1e88: 0x2b99, 0x1e89: 0x2ba1, 0x1e8a: 0x8e35, 0x1e8b: 0x2ba9,
-	0x1e8c: 0x2bb1, 0x1e8d: 0x2bb9, 0x1e8e: 0x2bc1, 0x1e8f: 0x2bc9, 0x1e90: 0x2bd1, 0x1e91: 0x2bd9,
-	0x1e92: 0x2be1, 0x1e93: 0x2be9, 0x1e94: 0x2bf1, 0x1e95: 0x2bf9, 0x1e96: 0x2c01, 0x1e97: 0x2c09,
-	0x1e98: 0x2c11, 0x1e99: 0x2c19, 0x1e9a: 0x2c21, 0x1e9b: 0x2c29, 0x1e9c: 0x2c31, 0x1e9d: 0x8e55,
-	0x1e9e: 0x2c39, 0x1e9f: 0x2c41, 0x1ea0: 0x2c49, 0x1ea1: 0x2c51, 0x1ea2: 0x2c59, 0x1ea3: 0x8e75,
-	0x1ea4: 0x2c61, 0x1ea5: 0x2c69, 0x1ea6: 0x2c71, 0x1ea7: 0x2c79, 0x1ea8: 0x2c81, 0x1ea9: 0x2c89,
-	0x1eaa: 0x2c91, 0x1eab: 0x2c99, 0x1eac: 0x7f0d, 0x1ead: 0x2ca1, 0x1eae: 0x2ca9, 0x1eaf: 0x2cb1,
-	0x1eb0: 0x8e95, 0x1eb1: 0x2cb9, 0x1eb2: 0x2cc1, 0x1eb3: 0x2cc9, 0x1eb4: 0x2cd1, 0x1eb5: 0x2cd9,
-	0x1eb6: 0x2ce1, 0x1eb7: 0x8eb5, 0x1eb8: 0x8ed5, 0x1eb9: 0x8ef5, 0x1eba: 0x2ce9, 0x1ebb: 0x8f15,
-	0x1ebc: 0x2cf1, 0x1ebd: 0x2cf9, 0x1ebe: 0x2d01, 0x1ebf: 0x2d09,
+	0x1e80: 0xd201, 0x1e81: 0xd221, 0x1e82: 0xd241, 0x1e83: 0xd261, 0x1e84: 0xd281, 0x1e85: 0xd2a1,
+	0x1e86: 0xd2a1, 0x1e87: 0xd2c1, 0x1e88: 0xd2e1, 0x1e89: 0xd301, 0x1e8a: 0xd321, 0x1e8b: 0xd341,
+	0x1e8c: 0xd361, 0x1e8d: 0xd381, 0x1e8e: 0xd3a1, 0x1e8f: 0xd3c1, 0x1e90: 0xd3e1, 0x1e91: 0xd401,
+	0x1e92: 0xd421, 0x1e93: 0xd441, 0x1e94: 0xd461, 0x1e95: 0xd481, 0x1e96: 0xd4a1, 0x1e97: 0xd4c1,
+	0x1e98: 0xd4e1, 0x1e99: 0x8c35, 0x1e9a: 0xd501, 0x1e9b: 0xd521, 0x1e9c: 0xd541, 0x1e9d: 0xc371,
+	0x1e9e: 0xd561, 0x1e9f: 0xd581, 0x1ea0: 0x8c55, 0x1ea1: 0x8c75, 0x1ea2: 0xd5a1, 0x1ea3: 0xd5c1,
+	0x1ea4: 0xd5e1, 0x1ea5: 0xd601, 0x1ea6: 0xd621, 0x1ea7: 0xd641, 0x1ea8: 0x2040, 0x1ea9: 0xd661,
+	0x1eaa: 0xd681, 0x1eab: 0xd681, 0x1eac: 0x8c95, 0x1ead: 0xd6a1, 0x1eae: 0xd6c1, 0x1eaf: 0xd6e1,
+	0x1eb0: 0xd701, 0x1eb1: 0x8cb5, 0x1eb2: 0xd721, 0x1eb3: 0xd741, 0x1eb4: 0x2040, 0x1eb5: 0xd761,
+	0x1eb6: 0xd781, 0x1eb7: 0xd7a1, 0x1eb8: 0xd7c1, 0x1eb9: 0xd7e1, 0x1eba: 0xd801, 0x1ebb: 0x8cd5,
+	0x1ebc: 0xd821, 0x1ebd: 0x8cf5, 0x1ebe: 0xd841, 0x1ebf: 0xd861,
 	// Block 0x7b, offset 0x1ec0
-	0x1ec0: 0x2d11, 0x1ec1: 0x2d19, 0x1ec2: 0x2d21, 0x1ec3: 0x2d29, 0x1ec4: 0x2d31, 0x1ec5: 0x2d39,
-	0x1ec6: 0x8f35, 0x1ec7: 0x2d41, 0x1ec8: 0x2d49, 0x1ec9: 0x2d51, 0x1eca: 0x2d59, 0x1ecb: 0x2d61,
-	0x1ecc: 0x2d69, 0x1ecd: 0x8f55, 0x1ece: 0x2d71, 0x1ecf: 0x2d79, 0x1ed0: 0x8f75, 0x1ed1: 0x8f95,
-	0x1ed2: 0x2d81, 0x1ed3: 0x2d89, 0x1ed4: 0x2d91, 0x1ed5: 0x2d99, 0x1ed6: 0x2da1, 0x1ed7: 0x2da9,
-	0x1ed8: 0x2db1, 0x1ed9: 0x2db9, 0x1eda: 0x2dc1, 0x1edb: 0x8fb5, 0x1edc: 0x2dc9, 0x1edd: 0x8fd5,
-	0x1ede: 0x2dd1, 0x1edf: 0x2040, 0x1ee0: 0x2dd9, 0x1ee1: 0x2de1, 0x1ee2: 0x2de9, 0x1ee3: 0x8ff5,
-	0x1ee4: 0x2df1, 0x1ee5: 0x2df9, 0x1ee6: 0x9015, 0x1ee7: 0x9035, 0x1ee8: 0x2e01, 0x1ee9: 0x2e09,
-	0x1eea: 0x2e11, 0x1eeb: 0x2e19, 0x1eec: 0x2e21, 0x1eed: 0x2e21, 0x1eee: 0x2e29, 0x1eef: 0x2e31,
-	0x1ef0: 0x2e39, 0x1ef1: 0x2e41, 0x1ef2: 0x2e49, 0x1ef3: 0x2e51, 0x1ef4: 0x2e59, 0x1ef5: 0x9055,
-	0x1ef6: 0x2e61, 0x1ef7: 0x9075, 0x1ef8: 0x2e69, 0x1ef9: 0x9095, 0x1efa: 0x2e71, 0x1efb: 0x90b5,
-	0x1efc: 0x90d5, 0x1efd: 0x90f5, 0x1efe: 0x2e79, 0x1eff: 0x2e81,
+	0x1ec0: 0xd881, 0x1ec1: 0xd8a1, 0x1ec2: 0xd8c1, 0x1ec3: 0xd8e1, 0x1ec4: 0xd901, 0x1ec5: 0xd921,
+	0x1ec6: 0xd941, 0x1ec7: 0xd961, 0x1ec8: 0xd981, 0x1ec9: 0x8d15, 0x1eca: 0xd9a1, 0x1ecb: 0xd9c1,
+	0x1ecc: 0xd9e1, 0x1ecd: 0xda01, 0x1ece: 0xda21, 0x1ecf: 0x8d35, 0x1ed0: 0xda41, 0x1ed1: 0x8d55,
+	0x1ed2: 0x8d75, 0x1ed3: 0xda61, 0x1ed4: 0xda81, 0x1ed5: 0xda81, 0x1ed6: 0xdaa1, 0x1ed7: 0x8d95,
+	0x1ed8: 0x8db5, 0x1ed9: 0xdac1, 0x1eda: 0xdae1, 0x1edb: 0xdb01, 0x1edc: 0xdb21, 0x1edd: 0xdb41,
+	0x1ede: 0xdb61, 0x1edf: 0xdb81, 0x1ee0: 0xdba1, 0x1ee1: 0xdbc1, 0x1ee2: 0xdbe1, 0x1ee3: 0xdc01,
+	0x1ee4: 0x8dd5, 0x1ee5: 0xdc21, 0x1ee6: 0xdc41, 0x1ee7: 0xdc61, 0x1ee8: 0xdc81, 0x1ee9: 0xdc61,
+	0x1eea: 0xdca1, 0x1eeb: 0xdcc1, 0x1eec: 0xdce1, 0x1eed: 0xdd01, 0x1eee: 0xdd21, 0x1eef: 0xdd41,
+	0x1ef0: 0xdd61, 0x1ef1: 0xdd81, 0x1ef2: 0xdda1, 0x1ef3: 0xddc1, 0x1ef4: 0xdde1, 0x1ef5: 0xde01,
+	0x1ef6: 0xde21, 0x1ef7: 0xde41, 0x1ef8: 0x8df5, 0x1ef9: 0xde61, 0x1efa: 0xde81, 0x1efb: 0xdea1,
+	0x1efc: 0xdec1, 0x1efd: 0xdee1, 0x1efe: 0x8e15, 0x1eff: 0xdf01,
 	// Block 0x7c, offset 0x1f00
-	0x1f00: 0x2e89, 0x1f01: 0x9115, 0x1f02: 0x9135, 0x1f03: 0x9155, 0x1f04: 0x9175, 0x1f05: 0x2e91,
-	0x1f06: 0x2e99, 0x1f07: 0x2e99, 0x1f08: 0x2ea1, 0x1f09: 0x2ea9, 0x1f0a: 0x2eb1, 0x1f0b: 0x2eb9,
-	0x1f0c: 0x2ec1, 0x1f0d: 0x9195, 0x1f0e: 0x2ec9, 0x1f0f: 0x2ed1, 0x1f10: 0x2ed9, 0x1f11: 0x2ee1,
-	0x1f12: 0x91b5, 0x1f13: 0x2ee9, 0x1f14: 0x91d5, 0x1f15: 0x91f5, 0x1f16: 0x2ef1, 0x1f17: 0x2ef9,
-	0x1f18: 0x2f01, 0x1f19: 0x2f09, 0x1f1a: 0x2f11, 0x1f1b: 0x2f19, 0x1f1c: 0x9215, 0x1f1d: 0x9235,
-	0x1f1e: 0x9255, 0x1f1f: 0x2040, 0x1f20: 0x2f21, 0x1f21: 0x9275, 0x1f22: 0x2f29, 0x1f23: 0x2f31,
-	0x1f24: 0x2f39, 0x1f25: 0x9295, 0x1f26: 0x2f41, 0x1f27: 0x2f49, 0x1f28: 0x2f51, 0x1f29: 0x2f59,
-	0x1f2a: 0x2f61, 0x1f2b: 0x92b5, 0x1f2c: 0x2f69, 0x1f2d: 0x2f71, 0x1f2e: 0x2f79, 0x1f2f: 0x2f81,
-	0x1f30: 0x2f89, 0x1f31: 0x2f91, 0x1f32: 0x92d5, 0x1f33: 0x92f5, 0x1f34: 0x2f99, 0x1f35: 0x9315,
-	0x1f36: 0x2fa1, 0x1f37: 0x9335, 0x1f38: 0x2fa9, 0x1f39: 0x2fb1, 0x1f3a: 0x2fb9, 0x1f3b: 0x9355,
-	0x1f3c: 0x9375, 0x1f3d: 0x2fc1, 0x1f3e: 0x9395, 0x1f3f: 0x2fc9,
+	0x1f00: 0xe601, 0x1f01: 0xe621, 0x1f02: 0xe641, 0x1f03: 0xe661, 0x1f04: 0xe681, 0x1f05: 0xe6a1,
+	0x1f06: 0x8f35, 0x1f07: 0xe6c1, 0x1f08: 0xe6e1, 0x1f09: 0xe701, 0x1f0a: 0xe721, 0x1f0b: 0xe741,
+	0x1f0c: 0xe761, 0x1f0d: 0x8f55, 0x1f0e: 0xe781, 0x1f0f: 0xe7a1, 0x1f10: 0x8f75, 0x1f11: 0x8f95,
+	0x1f12: 0xe7c1, 0x1f13: 0xe7e1, 0x1f14: 0xe801, 0x1f15: 0xe821, 0x1f16: 0xe841, 0x1f17: 0xe861,
+	0x1f18: 0xe881, 0x1f19: 0xe8a1, 0x1f1a: 0xe8c1, 0x1f1b: 0x8fb5, 0x1f1c: 0xe8e1, 0x1f1d: 0x8fd5,
+	0x1f1e: 0xe901, 0x1f1f: 0x2040, 0x1f20: 0xe921, 0x1f21: 0xe941, 0x1f22: 0xe961, 0x1f23: 0x8ff5,
+	0x1f24: 0xe981, 0x1f25: 0xe9a1, 0x1f26: 0x9015, 0x1f27: 0x9035, 0x1f28: 0xe9c1, 0x1f29: 0xe9e1,
+	0x1f2a: 0xea01, 0x1f2b: 0xea21, 0x1f2c: 0xea41, 0x1f2d: 0xea41, 0x1f2e: 0xea61, 0x1f2f: 0xea81,
+	0x1f30: 0xeaa1, 0x1f31: 0xeac1, 0x1f32: 0xeae1, 0x1f33: 0xeb01, 0x1f34: 0xeb21, 0x1f35: 0x9055,
+	0x1f36: 0xeb41, 0x1f37: 0x9075, 0x1f38: 0xeb61, 0x1f39: 0x9095, 0x1f3a: 0xeb81, 0x1f3b: 0x90b5,
+	0x1f3c: 0x90d5, 0x1f3d: 0x90f5, 0x1f3e: 0xeba1, 0x1f3f: 0xebc1,
 	// Block 0x7d, offset 0x1f40
-	0x1f40: 0x93b5, 0x1f41: 0x2fd1, 0x1f42: 0x2fd9, 0x1f43: 0x2fe1, 0x1f44: 0x2fe9, 0x1f45: 0x2ff1,
-	0x1f46: 0x2ff9, 0x1f47: 0x93d5, 0x1f48: 0x93f5, 0x1f49: 0x9415, 0x1f4a: 0x9435, 0x1f4b: 0x2a29,
-	0x1f4c: 0x3001, 0x1f4d: 0x3009, 0x1f4e: 0x3011, 0x1f4f: 0x3019, 0x1f50: 0x3021, 0x1f51: 0x3029,
-	0x1f52: 0x3031, 0x1f53: 0x3039, 0x1f54: 0x3041, 0x1f55: 0x3049, 0x1f56: 0x3051, 0x1f57: 0x9455,
-	0x1f58: 0x3059, 0x1f59: 0x3061, 0x1f5a: 0x3069, 0x1f5b: 0x3071, 0x1f5c: 0x3079, 0x1f5d: 0x3081,
-	0x1f5e: 0x3089, 0x1f5f: 0x3091, 0x1f60: 0x3099, 0x1f61: 0x30a1, 0x1f62: 0x30a9, 0x1f63: 0x30b1,
-	0x1f64: 0x9475, 0x1f65: 0x9495, 0x1f66: 0x94b5, 0x1f67: 0x30b9, 0x1f68: 0x30c1, 0x1f69: 0x30c9,
-	0x1f6a: 0x30d1, 0x1f6b: 0x94d5, 0x1f6c: 0x30d9, 0x1f6d: 0x94f5, 0x1f6e: 0x30e1, 0x1f6f: 0x30e9,
-	0x1f70: 0x9515, 0x1f71: 0x9535, 0x1f72: 0x30f1, 0x1f73: 0x30f9, 0x1f74: 0x3101, 0x1f75: 0x3109,
-	0x1f76: 0x3111, 0x1f77: 0x3119, 0x1f78: 0x3121, 0x1f79: 0x3129, 0x1f7a: 0x3131, 0x1f7b: 0x3139,
-	0x1f7c: 0x3141, 0x1f7d: 0x3149, 0x1f7e: 0x3151, 0x1f7f: 0x2040,
+	0x1f40: 0xebe1, 0x1f41: 0x9115, 0x1f42: 0x9135, 0x1f43: 0x9155, 0x1f44: 0x9175, 0x1f45: 0xec01,
+	0x1f46: 0xec21, 0x1f47: 0xec21, 0x1f48: 0xec41, 0x1f49: 0xec61, 0x1f4a: 0xec81, 0x1f4b: 0xeca1,
+	0x1f4c: 0xecc1, 0x1f4d: 0x9195, 0x1f4e: 0xece1, 0x1f4f: 0xed01, 0x1f50: 0xed21, 0x1f51: 0xed41,
+	0x1f52: 0x91b5, 0x1f53: 0xed61, 0x1f54: 0x91d5, 0x1f55: 0x91f5, 0x1f56: 0xed81, 0x1f57: 0xeda1,
+	0x1f58: 0xedc1, 0x1f59: 0xede1, 0x1f5a: 0xee01, 0x1f5b: 0xee21, 0x1f5c: 0x9215, 0x1f5d: 0x9235,
+	0x1f5e: 0x9255, 0x1f5f: 0x2040, 0x1f60: 0xee41, 0x1f61: 0x9275, 0x1f62: 0xee61, 0x1f63: 0xee81,
+	0x1f64: 0xeea1, 0x1f65: 0x9295, 0x1f66: 0xeec1, 0x1f67: 0xeee1, 0x1f68: 0xef01, 0x1f69: 0xef21,
+	0x1f6a: 0xef41, 0x1f6b: 0x92b5, 0x1f6c: 0xef61, 0x1f6d: 0xef81, 0x1f6e: 0xefa1, 0x1f6f: 0xefc1,
+	0x1f70: 0xefe1, 0x1f71: 0xf001, 0x1f72: 0x92d5, 0x1f73: 0x92f5, 0x1f74: 0xf021, 0x1f75: 0x9315,
+	0x1f76: 0xf041, 0x1f77: 0x9335, 0x1f78: 0xf061, 0x1f79: 0xf081, 0x1f7a: 0xf0a1, 0x1f7b: 0x9355,
+	0x1f7c: 0x9375, 0x1f7d: 0xf0c1, 0x1f7e: 0x9395, 0x1f7f: 0xf0e1,
 	// Block 0x7e, offset 0x1f80
-	0x1f80: 0x3159, 0x1f81: 0x3161, 0x1f82: 0x3169, 0x1f83: 0x3171, 0x1f84: 0x3179, 0x1f85: 0x9555,
-	0x1f86: 0x3181, 0x1f87: 0x3189, 0x1f88: 0x3191, 0x1f89: 0x3199, 0x1f8a: 0x31a1, 0x1f8b: 0x9575,
-	0x1f8c: 0x9595, 0x1f8d: 0x31a9, 0x1f8e: 0x31b1, 0x1f8f: 0x31b9, 0x1f90: 0x31c1, 0x1f91: 0x31c9,
-	0x1f92: 0x31d1, 0x1f93: 0x95b5, 0x1f94: 0x31d9, 0x1f95: 0x31e1, 0x1f96: 0x31e9, 0x1f97: 0x31f1,
-	0x1f98: 0x95d5, 0x1f99: 0x95f5, 0x1f9a: 0x31f9, 0x1f9b: 0x3201, 0x1f9c: 0x3209, 0x1f9d: 0x9615,
-	0x1f9e: 0x3211, 0x1f9f: 0x3219, 0x1fa0: 0x684d, 0x1fa1: 0x9635, 0x1fa2: 0x3221, 0x1fa3: 0x3229,
-	0x1fa4: 0x3231, 0x1fa5: 0x9655, 0x1fa6: 0x3239, 0x1fa7: 0x3241, 0x1fa8: 0x3249, 0x1fa9: 0x3251,
-	0x1faa: 0x3259, 0x1fab: 0x3261, 0x1fac: 0x3269, 0x1fad: 0x9675, 0x1fae: 0x3271, 0x1faf: 0x3279,
-	0x1fb0: 0x3281, 0x1fb1: 0x9695, 0x1fb2: 0x3289, 0x1fb3: 0x3291, 0x1fb4: 0x3299, 0x1fb5: 0x32a1,
-	0x1fb6: 0x7b6d, 0x1fb7: 0x96b5, 0x1fb8: 0x32a9, 0x1fb9: 0x32b1, 0x1fba: 0x32b9, 0x1fbb: 0x96d5,
-	0x1fbc: 0x32c1, 0x1fbd: 0x96f5, 0x1fbe: 0x32c9, 0x1fbf: 0x32c9,
+	0x1f80: 0xf721, 0x1f81: 0xf741, 0x1f82: 0xf761, 0x1f83: 0xf781, 0x1f84: 0xf7a1, 0x1f85: 0x9555,
+	0x1f86: 0xf7c1, 0x1f87: 0xf7e1, 0x1f88: 0xf801, 0x1f89: 0xf821, 0x1f8a: 0xf841, 0x1f8b: 0x9575,
+	0x1f8c: 0x9595, 0x1f8d: 0xf861, 0x1f8e: 0xf881, 0x1f8f: 0xf8a1, 0x1f90: 0xf8c1, 0x1f91: 0xf8e1,
+	0x1f92: 0xf901, 0x1f93: 0x95b5, 0x1f94: 0xf921, 0x1f95: 0xf941, 0x1f96: 0xf961, 0x1f97: 0xf981,
+	0x1f98: 0x95d5, 0x1f99: 0x95f5, 0x1f9a: 0xf9a1, 0x1f9b: 0xf9c1, 0x1f9c: 0xf9e1, 0x1f9d: 0x9615,
+	0x1f9e: 0xfa01, 0x1f9f: 0xfa21, 0x1fa0: 0x684d, 0x1fa1: 0x9635, 0x1fa2: 0xfa41, 0x1fa3: 0xfa61,
+	0x1fa4: 0xfa81, 0x1fa5: 0x9655, 0x1fa6: 0xfaa1, 0x1fa7: 0xfac1, 0x1fa8: 0xfae1, 0x1fa9: 0xfb01,
+	0x1faa: 0xfb21, 0x1fab: 0xfb41, 0x1fac: 0xfb61, 0x1fad: 0x9675, 0x1fae: 0xfb81, 0x1faf: 0xfba1,
+	0x1fb0: 0xfbc1, 0x1fb1: 0x9695, 0x1fb2: 0xfbe1, 0x1fb3: 0xfc01, 0x1fb4: 0xfc21, 0x1fb5: 0xfc41,
+	0x1fb6: 0x7b6d, 0x1fb7: 0x96b5, 0x1fb8: 0xfc61, 0x1fb9: 0xfc81, 0x1fba: 0xfca1, 0x1fbb: 0x96d5,
+	0x1fbc: 0xfcc1, 0x1fbd: 0x96f5, 0x1fbe: 0xfce1, 0x1fbf: 0xfce1,
 	// Block 0x7f, offset 0x1fc0
-	0x1fc0: 0x32d1, 0x1fc1: 0x9715, 0x1fc2: 0x32d9, 0x1fc3: 0x32e1, 0x1fc4: 0x32e9, 0x1fc5: 0x32f1,
-	0x1fc6: 0x32f9, 0x1fc7: 0x3301, 0x1fc8: 0x3309, 0x1fc9: 0x9735, 0x1fca: 0x3311, 0x1fcb: 0x3319,
-	0x1fcc: 0x3321, 0x1fcd: 0x3329, 0x1fce: 0x3331, 0x1fcf: 0x3339, 0x1fd0: 0x9755, 0x1fd1: 0x3341,
-	0x1fd2: 0x9775, 0x1fd3: 0x9795, 0x1fd4: 0x97b5, 0x1fd5: 0x3349, 0x1fd6: 0x3351, 0x1fd7: 0x3359,
-	0x1fd8: 0x3361, 0x1fd9: 0x3369, 0x1fda: 0x3371, 0x1fdb: 0x3379, 0x1fdc: 0x3381, 0x1fdd: 0x97d5,
+	0x1fc0: 0xfd01, 0x1fc1: 0x9715, 0x1fc2: 0xfd21, 0x1fc3: 0xfd41, 0x1fc4: 0xfd61, 0x1fc5: 0xfd81,
+	0x1fc6: 0xfda1, 0x1fc7: 0xfdc1, 0x1fc8: 0xfde1, 0x1fc9: 0x9735, 0x1fca: 0xfe01, 0x1fcb: 0xfe21,
+	0x1fcc: 0xfe41, 0x1fcd: 0xfe61, 0x1fce: 0xfe81, 0x1fcf: 0xfea1, 0x1fd0: 0x9755, 0x1fd1: 0xfec1,
+	0x1fd2: 0x9775, 0x1fd3: 0x9795, 0x1fd4: 0x97b5, 0x1fd5: 0xfee1, 0x1fd6: 0xff01, 0x1fd7: 0xff21,
+	0x1fd8: 0xff41, 0x1fd9: 0xff61, 0x1fda: 0xff81, 0x1fdb: 0xffa1, 0x1fdc: 0xffc1, 0x1fdd: 0x97d5,
 	0x1fde: 0x0040, 0x1fdf: 0x0040, 0x1fe0: 0x0040, 0x1fe1: 0x0040, 0x1fe2: 0x0040, 0x1fe3: 0x0040,
 	0x1fe4: 0x0040, 0x1fe5: 0x0040, 0x1fe6: 0x0040, 0x1fe7: 0x0040, 0x1fe8: 0x0040, 0x1fe9: 0x0040,
 	0x1fea: 0x0040, 0x1feb: 0x0040, 0x1fec: 0x0040, 0x1fed: 0x0040, 0x1fee: 0x0040, 0x1fef: 0x0040,
@@ -2276,7 +2134,7 @@ var idnaIndex = [2368]uint16{
 	0x1b8: 0xd6, 0x1b9: 0xd7, 0x1ba: 0xd8, 0x1bb: 0xd9, 0x1bc: 0xda, 0x1bd: 0xdb, 0x1be: 0xdc, 0x1bf: 0x37,
 	// Block 0x7, offset 0x1c0
 	0x1c0: 0x38, 0x1c1: 0xdd, 0x1c2: 0xde, 0x1c3: 0xdf, 0x1c4: 0xe0, 0x1c5: 0x39, 0x1c6: 0x3a, 0x1c7: 0xe1,
-	0x1c8: 0xe2, 0x1c9: 0x3b, 0x1ca: 0x3c, 0x1cb: 0x3d, 0x1cc: 0xe3, 0x1cd: 0xe4, 0x1ce: 0x3e, 0x1cf: 0x3f,
+	0x1c8: 0xe2, 0x1c9: 0x3b, 0x1ca: 0x3c, 0x1cb: 0x3d, 0x1cc: 0x3e, 0x1cd: 0x3f, 0x1ce: 0x40, 0x1cf: 0x41,
 	0x1d0: 0xa0, 0x1d1: 0xa0, 0x1d2: 0xa0, 0x1d3: 0xa0, 0x1d4: 0xa0, 0x1d5: 0xa0, 0x1d6: 0xa0, 0x1d7: 0xa0,
 	0x1d8: 0xa0, 0x1d9: 0xa0, 0x1da: 0xa0, 0x1db: 0xa0, 0x1dc: 0xa0, 0x1dd: 0xa0, 0x1de: 0xa0, 0x1df: 0xa0,
 	0x1e0: 0xa0, 0x1e1: 0xa0, 0x1e2: 0xa0, 0x1e3: 0xa0, 0x1e4: 0xa0, 0x1e5: 0xa0, 0x1e6: 0xa0, 0x1e7: 0xa0,
@@ -2309,143 +2167,143 @@ var idnaIndex = [2368]uint16{
 	0x2a0: 0xa0, 0x2a1: 0xa0, 0x2a2: 0xa0, 0x2a3: 0xa0, 0x2a4: 0xa0, 0x2a5: 0xa0, 0x2a6: 0xa0, 0x2a7: 0xa0,
 	0x2a8: 0xa0, 0x2a9: 0xa0, 0x2aa: 0xa0, 0x2ab: 0xa0, 0x2ac: 0xa0, 0x2ad: 0xa0, 0x2ae: 0xa0, 0x2af: 0xa0,
 	0x2b0: 0xa0, 0x2b1: 0xa0, 0x2b2: 0xa0, 0x2b3: 0xa0, 0x2b4: 0xa0, 0x2b5: 0xa0, 0x2b6: 0xa0, 0x2b7: 0xa0,
-	0x2b8: 0xa0, 0x2b9: 0xa0, 0x2ba: 0xa0, 0x2bb: 0xa0, 0x2bc: 0xa0, 0x2bd: 0xa0, 0x2be: 0xa0, 0x2bf: 0xe5,
+	0x2b8: 0xa0, 0x2b9: 0xa0, 0x2ba: 0xa0, 0x2bb: 0xa0, 0x2bc: 0xa0, 0x2bd: 0xa0, 0x2be: 0xa0, 0x2bf: 0xe3,
 	// Block 0xb, offset 0x2c0
 	0x2c0: 0xa0, 0x2c1: 0xa0, 0x2c2: 0xa0, 0x2c3: 0xa0, 0x2c4: 0xa0, 0x2c5: 0xa0, 0x2c6: 0xa0, 0x2c7: 0xa0,
 	0x2c8: 0xa0, 0x2c9: 0xa0, 0x2ca: 0xa0, 0x2cb: 0xa0, 0x2cc: 0xa0, 0x2cd: 0xa0, 0x2ce: 0xa0, 0x2cf: 0xa0,
-	0x2d0: 0xa0, 0x2d1: 0xa0, 0x2d2: 0xe6, 0x2d3: 0xe7, 0x2d4: 0xa0, 0x2d5: 0xa0, 0x2d6: 0xa0, 0x2d7: 0xa0,
-	0x2d8: 0xe8, 0x2d9: 0x40, 0x2da: 0x41, 0x2db: 0xe9, 0x2dc: 0x42, 0x2dd: 0x43, 0x2de: 0x44, 0x2df: 0xea,
-	0x2e0: 0xeb, 0x2e1: 0xec, 0x2e2: 0xed, 0x2e3: 0xee, 0x2e4: 0xef, 0x2e5: 0xf0, 0x2e6: 0xf1, 0x2e7: 0xf2,
-	0x2e8: 0xf3, 0x2e9: 0xf4, 0x2ea: 0xf5, 0x2eb: 0xf6, 0x2ec: 0xf7, 0x2ed: 0xf8, 0x2ee: 0xf9, 0x2ef: 0xfa,
+	0x2d0: 0xa0, 0x2d1: 0xa0, 0x2d2: 0xe4, 0x2d3: 0xe5, 0x2d4: 0xa0, 0x2d5: 0xa0, 0x2d6: 0xa0, 0x2d7: 0xa0,
+	0x2d8: 0xe6, 0x2d9: 0x42, 0x2da: 0x43, 0x2db: 0xe7, 0x2dc: 0x44, 0x2dd: 0x45, 0x2de: 0x46, 0x2df: 0xe8,
+	0x2e0: 0xe9, 0x2e1: 0xea, 0x2e2: 0xeb, 0x2e3: 0xec, 0x2e4: 0xed, 0x2e5: 0xee, 0x2e6: 0xef, 0x2e7: 0xf0,
+	0x2e8: 0xf1, 0x2e9: 0xf2, 0x2ea: 0xf3, 0x2eb: 0xf4, 0x2ec: 0xf5, 0x2ed: 0xf6, 0x2ee: 0xf7, 0x2ef: 0xf8,
 	0x2f0: 0xa0, 0x2f1: 0xa0, 0x2f2: 0xa0, 0x2f3: 0xa0, 0x2f4: 0xa0, 0x2f5: 0xa0, 0x2f6: 0xa0, 0x2f7: 0xa0,
 	0x2f8: 0xa0, 0x2f9: 0xa0, 0x2fa: 0xa0, 0x2fb: 0xa0, 0x2fc: 0xa0, 0x2fd: 0xa0, 0x2fe: 0xa0, 0x2ff: 0xa0,
 	// Block 0xc, offset 0x300
 	0x300: 0xa0, 0x301: 0xa0, 0x302: 0xa0, 0x303: 0xa0, 0x304: 0xa0, 0x305: 0xa0, 0x306: 0xa0, 0x307: 0xa0,
 	0x308: 0xa0, 0x309: 0xa0, 0x30a: 0xa0, 0x30b: 0xa0, 0x30c: 0xa0, 0x30d: 0xa0, 0x30e: 0xa0, 0x30f: 0xa0,
 	0x310: 0xa0, 0x311: 0xa0, 0x312: 0xa0, 0x313: 0xa0, 0x314: 0xa0, 0x315: 0xa0, 0x316: 0xa0, 0x317: 0xa0,
-	0x318: 0xa0, 0x319: 0xa0, 0x31a: 0xa0, 0x31b: 0xa0, 0x31c: 0xa0, 0x31d: 0xa0, 0x31e: 0xfb, 0x31f: 0xfc,
+	0x318: 0xa0, 0x319: 0xa0, 0x31a: 0xa0, 0x31b: 0xa0, 0x31c: 0xa0, 0x31d: 0xa0, 0x31e: 0xf9, 0x31f: 0xfa,
 	// Block 0xd, offset 0x340
-	0x340: 0xfd, 0x341: 0xfd, 0x342: 0xfd, 0x343: 0xfd, 0x344: 0xfd, 0x345: 0xfd, 0x346: 0xfd, 0x347: 0xfd,
-	0x348: 0xfd, 0x349: 0xfd, 0x34a: 0xfd, 0x34b: 0xfd, 0x34c: 0xfd, 0x34d: 0xfd, 0x34e: 0xfd, 0x34f: 0xfd,
-	0x350: 0xfd, 0x351: 0xfd, 0x352: 0xfd, 0x353: 0xfd, 0x354: 0xfd, 0x355: 0xfd, 0x356: 0xfd, 0x357: 0xfd,
-	0x358: 0xfd, 0x359: 0xfd, 0x35a: 0xfd, 0x35b: 0xfd, 0x35c: 0xfd, 0x35d: 0xfd, 0x35e: 0xfd, 0x35f: 0xfd,
-	0x360: 0xfd, 0x361: 0xfd, 0x362: 0xfd, 0x363: 0xfd, 0x364: 0xfd, 0x365: 0xfd, 0x366: 0xfd, 0x367: 0xfd,
-	0x368: 0xfd, 0x369: 0xfd, 0x36a: 0xfd, 0x36b: 0xfd, 0x36c: 0xfd, 0x36d: 0xfd, 0x36e: 0xfd, 0x36f: 0xfd,
-	0x370: 0xfd, 0x371: 0xfd, 0x372: 0xfd, 0x373: 0xfd, 0x374: 0xfd, 0x375: 0xfd, 0x376: 0xfd, 0x377: 0xfd,
-	0x378: 0xfd, 0x379: 0xfd, 0x37a: 0xfd, 0x37b: 0xfd, 0x37c: 0xfd, 0x37d: 0xfd, 0x37e: 0xfd, 0x37f: 0xfd,
+	0x340: 0xfb, 0x341: 0xfb, 0x342: 0xfb, 0x343: 0xfb, 0x344: 0xfb, 0x345: 0xfb, 0x346: 0xfb, 0x347: 0xfb,
+	0x348: 0xfb, 0x349: 0xfb, 0x34a: 0xfb, 0x34b: 0xfb, 0x34c: 0xfb, 0x34d: 0xfb, 0x34e: 0xfb, 0x34f: 0xfb,
+	0x350: 0xfb, 0x351: 0xfb, 0x352: 0xfb, 0x353: 0xfb, 0x354: 0xfb, 0x355: 0xfb, 0x356: 0xfb, 0x357: 0xfb,
+	0x358: 0xfb, 0x359: 0xfb, 0x35a: 0xfb, 0x35b: 0xfb, 0x35c: 0xfb, 0x35d: 0xfb, 0x35e: 0xfb, 0x35f: 0xfb,
+	0x360: 0xfb, 0x361: 0xfb, 0x362: 0xfb, 0x363: 0xfb, 0x364: 0xfb, 0x365: 0xfb, 0x366: 0xfb, 0x367: 0xfb,
+	0x368: 0xfb, 0x369: 0xfb, 0x36a: 0xfb, 0x36b: 0xfb, 0x36c: 0xfb, 0x36d: 0xfb, 0x36e: 0xfb, 0x36f: 0xfb,
+	0x370: 0xfb, 0x371: 0xfb, 0x372: 0xfb, 0x373: 0xfb, 0x374: 0xfb, 0x375: 0xfb, 0x376: 0xfb, 0x377: 0xfb,
+	0x378: 0xfb, 0x379: 0xfb, 0x37a: 0xfb, 0x37b: 0xfb, 0x37c: 0xfb, 0x37d: 0xfb, 0x37e: 0xfb, 0x37f: 0xfb,
 	// Block 0xe, offset 0x380
-	0x380: 0xfd, 0x381: 0xfd, 0x382: 0xfd, 0x383: 0xfd, 0x384: 0xfd, 0x385: 0xfd, 0x386: 0xfd, 0x387: 0xfd,
-	0x388: 0xfd, 0x389: 0xfd, 0x38a: 0xfd, 0x38b: 0xfd, 0x38c: 0xfd, 0x38d: 0xfd, 0x38e: 0xfd, 0x38f: 0xfd,
-	0x390: 0xfd, 0x391: 0xfd, 0x392: 0xfd, 0x393: 0xfd, 0x394: 0xfd, 0x395: 0xfd, 0x396: 0xfd, 0x397: 0xfd,
-	0x398: 0xfd, 0x399: 0xfd, 0x39a: 0xfd, 0x39b: 0xfd, 0x39c: 0xfd, 0x39d: 0xfd, 0x39e: 0xfd, 0x39f: 0xfd,
-	0x3a0: 0xfd, 0x3a1: 0xfd, 0x3a2: 0xfd, 0x3a3: 0xfd, 0x3a4: 0xfe, 0x3a5: 0xff, 0x3a6: 0x100, 0x3a7: 0x101,
-	0x3a8: 0x45, 0x3a9: 0x102, 0x3aa: 0x103, 0x3ab: 0x46, 0x3ac: 0x47, 0x3ad: 0x48, 0x3ae: 0x49, 0x3af: 0x4a,
-	0x3b0: 0x104, 0x3b1: 0x4b, 0x3b2: 0x4c, 0x3b3: 0x4d, 0x3b4: 0x4e, 0x3b5: 0x4f, 0x3b6: 0x105, 0x3b7: 0x50,
-	0x3b8: 0x51, 0x3b9: 0x52, 0x3ba: 0x53, 0x3bb: 0x54, 0x3bc: 0x55, 0x3bd: 0x56, 0x3be: 0x57, 0x3bf: 0x58,
+	0x380: 0xfb, 0x381: 0xfb, 0x382: 0xfb, 0x383: 0xfb, 0x384: 0xfb, 0x385: 0xfb, 0x386: 0xfb, 0x387: 0xfb,
+	0x388: 0xfb, 0x389: 0xfb, 0x38a: 0xfb, 0x38b: 0xfb, 0x38c: 0xfb, 0x38d: 0xfb, 0x38e: 0xfb, 0x38f: 0xfb,
+	0x390: 0xfb, 0x391: 0xfb, 0x392: 0xfb, 0x393: 0xfb, 0x394: 0xfb, 0x395: 0xfb, 0x396: 0xfb, 0x397: 0xfb,
+	0x398: 0xfb, 0x399: 0xfb, 0x39a: 0xfb, 0x39b: 0xfb, 0x39c: 0xfb, 0x39d: 0xfb, 0x39e: 0xfb, 0x39f: 0xfb,
+	0x3a0: 0xfb, 0x3a1: 0xfb, 0x3a2: 0xfb, 0x3a3: 0xfb, 0x3a4: 0xfc, 0x3a5: 0xfd, 0x3a6: 0xfe, 0x3a7: 0xff,
+	0x3a8: 0x47, 0x3a9: 0x100, 0x3aa: 0x101, 0x3ab: 0x48, 0x3ac: 0x49, 0x3ad: 0x4a, 0x3ae: 0x4b, 0x3af: 0x4c,
+	0x3b0: 0x102, 0x3b1: 0x4d, 0x3b2: 0x4e, 0x3b3: 0x4f, 0x3b4: 0x50, 0x3b5: 0x51, 0x3b6: 0x103, 0x3b7: 0x52,
+	0x3b8: 0x53, 0x3b9: 0x54, 0x3ba: 0x55, 0x3bb: 0x56, 0x3bc: 0x57, 0x3bd: 0x58, 0x3be: 0x59, 0x3bf: 0x5a,
 	// Block 0xf, offset 0x3c0
-	0x3c0: 0x106, 0x3c1: 0x107, 0x3c2: 0xa0, 0x3c3: 0x108, 0x3c4: 0x109, 0x3c5: 0x9c, 0x3c6: 0x10a, 0x3c7: 0x10b,
-	0x3c8: 0xfd, 0x3c9: 0xfd, 0x3ca: 0x10c, 0x3cb: 0x10d, 0x3cc: 0x10e, 0x3cd: 0x10f, 0x3ce: 0x110, 0x3cf: 0x111,
-	0x3d0: 0x112, 0x3d1: 0xa0, 0x3d2: 0x113, 0x3d3: 0x114, 0x3d4: 0x115, 0x3d5: 0x116, 0x3d6: 0xfd, 0x3d7: 0xfd,
-	0x3d8: 0xa0, 0x3d9: 0xa0, 0x3da: 0xa0, 0x3db: 0xa0, 0x3dc: 0x117, 0x3dd: 0x118, 0x3de: 0xfd, 0x3df: 0xfd,
-	0x3e0: 0x119, 0x3e1: 0x11a, 0x3e2: 0x11b, 0x3e3: 0x11c, 0x3e4: 0x11d, 0x3e5: 0xfd, 0x3e6: 0x11e, 0x3e7: 0x11f,
-	0x3e8: 0x120, 0x3e9: 0x121, 0x3ea: 0x122, 0x3eb: 0x59, 0x3ec: 0x123, 0x3ed: 0x124, 0x3ee: 0x5a, 0x3ef: 0xfd,
-	0x3f0: 0x125, 0x3f1: 0x126, 0x3f2: 0x127, 0x3f3: 0x128, 0x3f4: 0x129, 0x3f5: 0xfd, 0x3f6: 0xfd, 0x3f7: 0xfd,
-	0x3f8: 0xfd, 0x3f9: 0x12a, 0x3fa: 0x12b, 0x3fb: 0xfd, 0x3fc: 0x12c, 0x3fd: 0x12d, 0x3fe: 0x12e, 0x3ff: 0x12f,
+	0x3c0: 0x104, 0x3c1: 0x105, 0x3c2: 0xa0, 0x3c3: 0x106, 0x3c4: 0x107, 0x3c5: 0x9c, 0x3c6: 0x108, 0x3c7: 0x109,
+	0x3c8: 0xfb, 0x3c9: 0xfb, 0x3ca: 0x10a, 0x3cb: 0x10b, 0x3cc: 0x10c, 0x3cd: 0x10d, 0x3ce: 0x10e, 0x3cf: 0x10f,
+	0x3d0: 0x110, 0x3d1: 0xa0, 0x3d2: 0x111, 0x3d3: 0x112, 0x3d4: 0x113, 0x3d5: 0x114, 0x3d6: 0xfb, 0x3d7: 0xfb,
+	0x3d8: 0xa0, 0x3d9: 0xa0, 0x3da: 0xa0, 0x3db: 0xa0, 0x3dc: 0x115, 0x3dd: 0x116, 0x3de: 0xfb, 0x3df: 0xfb,
+	0x3e0: 0x117, 0x3e1: 0x118, 0x3e2: 0x119, 0x3e3: 0x11a, 0x3e4: 0x11b, 0x3e5: 0xfb, 0x3e6: 0x11c, 0x3e7: 0x11d,
+	0x3e8: 0x11e, 0x3e9: 0x11f, 0x3ea: 0x120, 0x3eb: 0x5b, 0x3ec: 0x121, 0x3ed: 0x122, 0x3ee: 0x5c, 0x3ef: 0xfb,
+	0x3f0: 0x123, 0x3f1: 0x124, 0x3f2: 0x125, 0x3f3: 0x126, 0x3f4: 0x127, 0x3f5: 0xfb, 0x3f6: 0xfb, 0x3f7: 0xfb,
+	0x3f8: 0xfb, 0x3f9: 0x128, 0x3fa: 0x129, 0x3fb: 0xfb, 0x3fc: 0x12a, 0x3fd: 0x12b, 0x3fe: 0x12c, 0x3ff: 0x12d,
 	// Block 0x10, offset 0x400
-	0x400: 0x130, 0x401: 0x131, 0x402: 0x132, 0x403: 0x133, 0x404: 0x134, 0x405: 0x135, 0x406: 0x136, 0x407: 0x137,
-	0x408: 0x138, 0x409: 0xfd, 0x40a: 0x139, 0x40b: 0x13a, 0x40c: 0x5b, 0x40d: 0x5c, 0x40e: 0xfd, 0x40f: 0xfd,
-	0x410: 0x13b, 0x411: 0x13c, 0x412: 0x13d, 0x413: 0x13e, 0x414: 0xfd, 0x415: 0xfd, 0x416: 0x13f, 0x417: 0x140,
-	0x418: 0x141, 0x419: 0x142, 0x41a: 0x143, 0x41b: 0x144, 0x41c: 0x145, 0x41d: 0xfd, 0x41e: 0xfd, 0x41f: 0xfd,
-	0x420: 0x146, 0x421: 0xfd, 0x422: 0x147, 0x423: 0x148, 0x424: 0x5d, 0x425: 0x149, 0x426: 0x14a, 0x427: 0x14b,
-	0x428: 0x14c, 0x429: 0x14d, 0x42a: 0x14e, 0x42b: 0x14f, 0x42c: 0xfd, 0x42d: 0xfd, 0x42e: 0xfd, 0x42f: 0xfd,
-	0x430: 0x150, 0x431: 0x151, 0x432: 0x152, 0x433: 0xfd, 0x434: 0x153, 0x435: 0x154, 0x436: 0x155, 0x437: 0xfd,
-	0x438: 0xfd, 0x439: 0xfd, 0x43a: 0xfd, 0x43b: 0x156, 0x43c: 0xfd, 0x43d: 0xfd, 0x43e: 0x157, 0x43f: 0x158,
+	0x400: 0x12e, 0x401: 0x12f, 0x402: 0x130, 0x403: 0x131, 0x404: 0x132, 0x405: 0x133, 0x406: 0x134, 0x407: 0x135,
+	0x408: 0x136, 0x409: 0xfb, 0x40a: 0x137, 0x40b: 0x138, 0x40c: 0x5d, 0x40d: 0x5e, 0x40e: 0xfb, 0x40f: 0xfb,
+	0x410: 0x139, 0x411: 0x13a, 0x412: 0x13b, 0x413: 0x13c, 0x414: 0xfb, 0x415: 0xfb, 0x416: 0x13d, 0x417: 0x13e,
+	0x418: 0x13f, 0x419: 0x140, 0x41a: 0x141, 0x41b: 0x142, 0x41c: 0x143, 0x41d: 0xfb, 0x41e: 0xfb, 0x41f: 0xfb,
+	0x420: 0x144, 0x421: 0xfb, 0x422: 0x145, 0x423: 0x146, 0x424: 0x5f, 0x425: 0x147, 0x426: 0x148, 0x427: 0x149,
+	0x428: 0x14a, 0x429: 0x14b, 0x42a: 0x14c, 0x42b: 0x14d, 0x42c: 0xfb, 0x42d: 0xfb, 0x42e: 0xfb, 0x42f: 0xfb,
+	0x430: 0x14e, 0x431: 0x14f, 0x432: 0x150, 0x433: 0xfb, 0x434: 0x151, 0x435: 0x152, 0x436: 0x153, 0x437: 0xfb,
+	0x438: 0xfb, 0x439: 0xfb, 0x43a: 0xfb, 0x43b: 0x154, 0x43c: 0xfb, 0x43d: 0xfb, 0x43e: 0x155, 0x43f: 0x156,
 	// Block 0x11, offset 0x440
 	0x440: 0xa0, 0x441: 0xa0, 0x442: 0xa0, 0x443: 0xa0, 0x444: 0xa0, 0x445: 0xa0, 0x446: 0xa0, 0x447: 0xa0,
-	0x448: 0xa0, 0x449: 0xa0, 0x44a: 0xa0, 0x44b: 0xa0, 0x44c: 0xa0, 0x44d: 0xa0, 0x44e: 0x159, 0x44f: 0xfd,
-	0x450: 0x9c, 0x451: 0x15a, 0x452: 0xa0, 0x453: 0xa0, 0x454: 0xa0, 0x455: 0x15b, 0x456: 0xfd, 0x457: 0xfd,
-	0x458: 0xfd, 0x459: 0xfd, 0x45a: 0xfd, 0x45b: 0xfd, 0x45c: 0xfd, 0x45d: 0xfd, 0x45e: 0xfd, 0x45f: 0xfd,
-	0x460: 0xfd, 0x461: 0xfd, 0x462: 0xfd, 0x463: 0xfd, 0x464: 0xfd, 0x465: 0xfd, 0x466: 0xfd, 0x467: 0xfd,
-	0x468: 0xfd, 0x469: 0xfd, 0x46a: 0xfd, 0x46b: 0xfd, 0x46c: 0xfd, 0x46d: 0xfd, 0x46e: 0xfd, 0x46f: 0xfd,
-	0x470: 0xfd, 0x471: 0xfd, 0x472: 0xfd, 0x473: 0xfd, 0x474: 0xfd, 0x475: 0xfd, 0x476: 0xfd, 0x477: 0xfd,
-	0x478: 0xfd, 0x479: 0xfd, 0x47a: 0xfd, 0x47b: 0xfd, 0x47c: 0xfd, 0x47d: 0xfd, 0x47e: 0xfd, 0x47f: 0xfd,
+	0x448: 0xa0, 0x449: 0xa0, 0x44a: 0xa0, 0x44b: 0xa0, 0x44c: 0xa0, 0x44d: 0xa0, 0x44e: 0x157, 0x44f: 0xfb,
+	0x450: 0x9c, 0x451: 0x158, 0x452: 0xa0, 0x453: 0xa0, 0x454: 0xa0, 0x455: 0x159, 0x456: 0xfb, 0x457: 0xfb,
+	0x458: 0xfb, 0x459: 0xfb, 0x45a: 0xfb, 0x45b: 0xfb, 0x45c: 0xfb, 0x45d: 0xfb, 0x45e: 0xfb, 0x45f: 0xfb,
+	0x460: 0xfb, 0x461: 0xfb, 0x462: 0xfb, 0x463: 0xfb, 0x464: 0xfb, 0x465: 0xfb, 0x466: 0xfb, 0x467: 0xfb,
+	0x468: 0xfb, 0x469: 0xfb, 0x46a: 0xfb, 0x46b: 0xfb, 0x46c: 0xfb, 0x46d: 0xfb, 0x46e: 0xfb, 0x46f: 0xfb,
+	0x470: 0xfb, 0x471: 0xfb, 0x472: 0xfb, 0x473: 0xfb, 0x474: 0xfb, 0x475: 0xfb, 0x476: 0xfb, 0x477: 0xfb,
+	0x478: 0xfb, 0x479: 0xfb, 0x47a: 0xfb, 0x47b: 0xfb, 0x47c: 0xfb, 0x47d: 0xfb, 0x47e: 0xfb, 0x47f: 0xfb,
 	// Block 0x12, offset 0x480
 	0x480: 0xa0, 0x481: 0xa0, 0x482: 0xa0, 0x483: 0xa0, 0x484: 0xa0, 0x485: 0xa0, 0x486: 0xa0, 0x487: 0xa0,
 	0x488: 0xa0, 0x489: 0xa0, 0x48a: 0xa0, 0x48b: 0xa0, 0x48c: 0xa0, 0x48d: 0xa0, 0x48e: 0xa0, 0x48f: 0xa0,
-	0x490: 0x15c, 0x491: 0xfd, 0x492: 0xfd, 0x493: 0xfd, 0x494: 0xfd, 0x495: 0xfd, 0x496: 0xfd, 0x497: 0xfd,
-	0x498: 0xfd, 0x499: 0xfd, 0x49a: 0xfd, 0x49b: 0xfd, 0x49c: 0xfd, 0x49d: 0xfd, 0x49e: 0xfd, 0x49f: 0xfd,
-	0x4a0: 0xfd, 0x4a1: 0xfd, 0x4a2: 0xfd, 0x4a3: 0xfd, 0x4a4: 0xfd, 0x4a5: 0xfd, 0x4a6: 0xfd, 0x4a7: 0xfd,
-	0x4a8: 0xfd, 0x4a9: 0xfd, 0x4aa: 0xfd, 0x4ab: 0xfd, 0x4ac: 0xfd, 0x4ad: 0xfd, 0x4ae: 0xfd, 0x4af: 0xfd,
-	0x4b0: 0xfd, 0x4b1: 0xfd, 0x4b2: 0xfd, 0x4b3: 0xfd, 0x4b4: 0xfd, 0x4b5: 0xfd, 0x4b6: 0xfd, 0x4b7: 0xfd,
-	0x4b8: 0xfd, 0x4b9: 0xfd, 0x4ba: 0xfd, 0x4bb: 0xfd, 0x4bc: 0xfd, 0x4bd: 0xfd, 0x4be: 0xfd, 0x4bf: 0xfd,
+	0x490: 0x15a, 0x491: 0xfb, 0x492: 0xfb, 0x493: 0xfb, 0x494: 0xfb, 0x495: 0xfb, 0x496: 0xfb, 0x497: 0xfb,
+	0x498: 0xfb, 0x499: 0xfb, 0x49a: 0xfb, 0x49b: 0xfb, 0x49c: 0xfb, 0x49d: 0xfb, 0x49e: 0xfb, 0x49f: 0xfb,
+	0x4a0: 0xfb, 0x4a1: 0xfb, 0x4a2: 0xfb, 0x4a3: 0xfb, 0x4a4: 0xfb, 0x4a5: 0xfb, 0x4a6: 0xfb, 0x4a7: 0xfb,
+	0x4a8: 0xfb, 0x4a9: 0xfb, 0x4aa: 0xfb, 0x4ab: 0xfb, 0x4ac: 0xfb, 0x4ad: 0xfb, 0x4ae: 0xfb, 0x4af: 0xfb,
+	0x4b0: 0xfb, 0x4b1: 0xfb, 0x4b2: 0xfb, 0x4b3: 0xfb, 0x4b4: 0xfb, 0x4b5: 0xfb, 0x4b6: 0xfb, 0x4b7: 0xfb,
+	0x4b8: 0xfb, 0x4b9: 0xfb, 0x4ba: 0xfb, 0x4bb: 0xfb, 0x4bc: 0xfb, 0x4bd: 0xfb, 0x4be: 0xfb, 0x4bf: 0xfb,
 	// Block 0x13, offset 0x4c0
-	0x4c0: 0xfd, 0x4c1: 0xfd, 0x4c2: 0xfd, 0x4c3: 0xfd, 0x4c4: 0xfd, 0x4c5: 0xfd, 0x4c6: 0xfd, 0x4c7: 0xfd,
-	0x4c8: 0xfd, 0x4c9: 0xfd, 0x4ca: 0xfd, 0x4cb: 0xfd, 0x4cc: 0xfd, 0x4cd: 0xfd, 0x4ce: 0xfd, 0x4cf: 0xfd,
+	0x4c0: 0xfb, 0x4c1: 0xfb, 0x4c2: 0xfb, 0x4c3: 0xfb, 0x4c4: 0xfb, 0x4c5: 0xfb, 0x4c6: 0xfb, 0x4c7: 0xfb,
+	0x4c8: 0xfb, 0x4c9: 0xfb, 0x4ca: 0xfb, 0x4cb: 0xfb, 0x4cc: 0xfb, 0x4cd: 0xfb, 0x4ce: 0xfb, 0x4cf: 0xfb,
 	0x4d0: 0xa0, 0x4d1: 0xa0, 0x4d2: 0xa0, 0x4d3: 0xa0, 0x4d4: 0xa0, 0x4d5: 0xa0, 0x4d6: 0xa0, 0x4d7: 0xa0,
-	0x4d8: 0xa0, 0x4d9: 0x15d, 0x4da: 0xfd, 0x4db: 0xfd, 0x4dc: 0xfd, 0x4dd: 0xfd, 0x4de: 0xfd, 0x4df: 0xfd,
-	0x4e0: 0xfd, 0x4e1: 0xfd, 0x4e2: 0xfd, 0x4e3: 0xfd, 0x4e4: 0xfd, 0x4e5: 0xfd, 0x4e6: 0xfd, 0x4e7: 0xfd,
-	0x4e8: 0xfd, 0x4e9: 0xfd, 0x4ea: 0xfd, 0x4eb: 0xfd, 0x4ec: 0xfd, 0x4ed: 0xfd, 0x4ee: 0xfd, 0x4ef: 0xfd,
-	0x4f0: 0xfd, 0x4f1: 0xfd, 0x4f2: 0xfd, 0x4f3: 0xfd, 0x4f4: 0xfd, 0x4f5: 0xfd, 0x4f6: 0xfd, 0x4f7: 0xfd,
-	0x4f8: 0xfd, 0x4f9: 0xfd, 0x4fa: 0xfd, 0x4fb: 0xfd, 0x4fc: 0xfd, 0x4fd: 0xfd, 0x4fe: 0xfd, 0x4ff: 0xfd,
+	0x4d8: 0xa0, 0x4d9: 0x15b, 0x4da: 0xfb, 0x4db: 0xfb, 0x4dc: 0xfb, 0x4dd: 0xfb, 0x4de: 0xfb, 0x4df: 0xfb,
+	0x4e0: 0xfb, 0x4e1: 0xfb, 0x4e2: 0xfb, 0x4e3: 0xfb, 0x4e4: 0xfb, 0x4e5: 0xfb, 0x4e6: 0xfb, 0x4e7: 0xfb,
+	0x4e8: 0xfb, 0x4e9: 0xfb, 0x4ea: 0xfb, 0x4eb: 0xfb, 0x4ec: 0xfb, 0x4ed: 0xfb, 0x4ee: 0xfb, 0x4ef: 0xfb,
+	0x4f0: 0xfb, 0x4f1: 0xfb, 0x4f2: 0xfb, 0x4f3: 0xfb, 0x4f4: 0xfb, 0x4f5: 0xfb, 0x4f6: 0xfb, 0x4f7: 0xfb,
+	0x4f8: 0xfb, 0x4f9: 0xfb, 0x4fa: 0xfb, 0x4fb: 0xfb, 0x4fc: 0xfb, 0x4fd: 0xfb, 0x4fe: 0xfb, 0x4ff: 0xfb,
 	// Block 0x14, offset 0x500
-	0x500: 0xfd, 0x501: 0xfd, 0x502: 0xfd, 0x503: 0xfd, 0x504: 0xfd, 0x505: 0xfd, 0x506: 0xfd, 0x507: 0xfd,
-	0x508: 0xfd, 0x509: 0xfd, 0x50a: 0xfd, 0x50b: 0xfd, 0x50c: 0xfd, 0x50d: 0xfd, 0x50e: 0xfd, 0x50f: 0xfd,
-	0x510: 0xfd, 0x511: 0xfd, 0x512: 0xfd, 0x513: 0xfd, 0x514: 0xfd, 0x515: 0xfd, 0x516: 0xfd, 0x517: 0xfd,
-	0x518: 0xfd, 0x519: 0xfd, 0x51a: 0xfd, 0x51b: 0xfd, 0x51c: 0xfd, 0x51d: 0xfd, 0x51e: 0xfd, 0x51f: 0xfd,
+	0x500: 0xfb, 0x501: 0xfb, 0x502: 0xfb, 0x503: 0xfb, 0x504: 0xfb, 0x505: 0xfb, 0x506: 0xfb, 0x507: 0xfb,
+	0x508: 0xfb, 0x509: 0xfb, 0x50a: 0xfb, 0x50b: 0xfb, 0x50c: 0xfb, 0x50d: 0xfb, 0x50e: 0xfb, 0x50f: 0xfb,
+	0x510: 0xfb, 0x511: 0xfb, 0x512: 0xfb, 0x513: 0xfb, 0x514: 0xfb, 0x515: 0xfb, 0x516: 0xfb, 0x517: 0xfb,
+	0x518: 0xfb, 0x519: 0xfb, 0x51a: 0xfb, 0x51b: 0xfb, 0x51c: 0xfb, 0x51d: 0xfb, 0x51e: 0xfb, 0x51f: 0xfb,
 	0x520: 0xa0, 0x521: 0xa0, 0x522: 0xa0, 0x523: 0xa0, 0x524: 0xa0, 0x525: 0xa0, 0x526: 0xa0, 0x527: 0xa0,
-	0x528: 0x14f, 0x529: 0x15e, 0x52a: 0xfd, 0x52b: 0x15f, 0x52c: 0x160, 0x52d: 0x161, 0x52e: 0x162, 0x52f: 0xfd,
-	0x530: 0xfd, 0x531: 0xfd, 0x532: 0xfd, 0x533: 0xfd, 0x534: 0xfd, 0x535: 0xfd, 0x536: 0xfd, 0x537: 0xfd,
-	0x538: 0xfd, 0x539: 0x163, 0x53a: 0x164, 0x53b: 0xfd, 0x53c: 0xa0, 0x53d: 0x165, 0x53e: 0x166, 0x53f: 0x167,
+	0x528: 0x14d, 0x529: 0x15c, 0x52a: 0xfb, 0x52b: 0x15d, 0x52c: 0x15e, 0x52d: 0x15f, 0x52e: 0x160, 0x52f: 0xfb,
+	0x530: 0xfb, 0x531: 0xfb, 0x532: 0xfb, 0x533: 0xfb, 0x534: 0xfb, 0x535: 0xfb, 0x536: 0xfb, 0x537: 0xfb,
+	0x538: 0xfb, 0x539: 0x161, 0x53a: 0x162, 0x53b: 0xfb, 0x53c: 0xa0, 0x53d: 0x163, 0x53e: 0x164, 0x53f: 0x165,
 	// Block 0x15, offset 0x540
 	0x540: 0xa0, 0x541: 0xa0, 0x542: 0xa0, 0x543: 0xa0, 0x544: 0xa0, 0x545: 0xa0, 0x546: 0xa0, 0x547: 0xa0,
 	0x548: 0xa0, 0x549: 0xa0, 0x54a: 0xa0, 0x54b: 0xa0, 0x54c: 0xa0, 0x54d: 0xa0, 0x54e: 0xa0, 0x54f: 0xa0,
 	0x550: 0xa0, 0x551: 0xa0, 0x552: 0xa0, 0x553: 0xa0, 0x554: 0xa0, 0x555: 0xa0, 0x556: 0xa0, 0x557: 0xa0,
-	0x558: 0xa0, 0x559: 0xa0, 0x55a: 0xa0, 0x55b: 0xa0, 0x55c: 0xa0, 0x55d: 0xa0, 0x55e: 0xa0, 0x55f: 0x168,
+	0x558: 0xa0, 0x559: 0xa0, 0x55a: 0xa0, 0x55b: 0xa0, 0x55c: 0xa0, 0x55d: 0xa0, 0x55e: 0xa0, 0x55f: 0x166,
 	0x560: 0xa0, 0x561: 0xa0, 0x562: 0xa0, 0x563: 0xa0, 0x564: 0xa0, 0x565: 0xa0, 0x566: 0xa0, 0x567: 0xa0,
 	0x568: 0xa0, 0x569: 0xa0, 0x56a: 0xa0, 0x56b: 0xa0, 0x56c: 0xa0, 0x56d: 0xa0, 0x56e: 0xa0, 0x56f: 0xa0,
-	0x570: 0xa0, 0x571: 0xa0, 0x572: 0xa0, 0x573: 0x169, 0x574: 0x16a, 0x575: 0xfd, 0x576: 0xfd, 0x577: 0xfd,
-	0x578: 0xfd, 0x579: 0xfd, 0x57a: 0xfd, 0x57b: 0xfd, 0x57c: 0xfd, 0x57d: 0xfd, 0x57e: 0xfd, 0x57f: 0xfd,
+	0x570: 0xa0, 0x571: 0xa0, 0x572: 0xa0, 0x573: 0x167, 0x574: 0x168, 0x575: 0xfb, 0x576: 0xfb, 0x577: 0xfb,
+	0x578: 0xfb, 0x579: 0xfb, 0x57a: 0xfb, 0x57b: 0xfb, 0x57c: 0xfb, 0x57d: 0xfb, 0x57e: 0xfb, 0x57f: 0xfb,
 	// Block 0x16, offset 0x580
-	0x580: 0xa0, 0x581: 0xa0, 0x582: 0xa0, 0x583: 0xa0, 0x584: 0x16b, 0x585: 0x16c, 0x586: 0xa0, 0x587: 0xa0,
-	0x588: 0xa0, 0x589: 0xa0, 0x58a: 0xa0, 0x58b: 0x16d, 0x58c: 0xfd, 0x58d: 0xfd, 0x58e: 0xfd, 0x58f: 0xfd,
-	0x590: 0xfd, 0x591: 0xfd, 0x592: 0xfd, 0x593: 0xfd, 0x594: 0xfd, 0x595: 0xfd, 0x596: 0xfd, 0x597: 0xfd,
-	0x598: 0xfd, 0x599: 0xfd, 0x59a: 0xfd, 0x59b: 0xfd, 0x59c: 0xfd, 0x59d: 0xfd, 0x59e: 0xfd, 0x59f: 0xfd,
-	0x5a0: 0xfd, 0x5a1: 0xfd, 0x5a2: 0xfd, 0x5a3: 0xfd, 0x5a4: 0xfd, 0x5a5: 0xfd, 0x5a6: 0xfd, 0x5a7: 0xfd,
-	0x5a8: 0xfd, 0x5a9: 0xfd, 0x5aa: 0xfd, 0x5ab: 0xfd, 0x5ac: 0xfd, 0x5ad: 0xfd, 0x5ae: 0xfd, 0x5af: 0xfd,
-	0x5b0: 0xa0, 0x5b1: 0x16e, 0x5b2: 0x16f, 0x5b3: 0xfd, 0x5b4: 0xfd, 0x5b5: 0xfd, 0x5b6: 0xfd, 0x5b7: 0xfd,
-	0x5b8: 0xfd, 0x5b9: 0xfd, 0x5ba: 0xfd, 0x5bb: 0xfd, 0x5bc: 0xfd, 0x5bd: 0xfd, 0x5be: 0xfd, 0x5bf: 0xfd,
+	0x580: 0xa0, 0x581: 0xa0, 0x582: 0xa0, 0x583: 0xa0, 0x584: 0x169, 0x585: 0x16a, 0x586: 0xa0, 0x587: 0xa0,
+	0x588: 0xa0, 0x589: 0xa0, 0x58a: 0xa0, 0x58b: 0x16b, 0x58c: 0xfb, 0x58d: 0xfb, 0x58e: 0xfb, 0x58f: 0xfb,
+	0x590: 0xfb, 0x591: 0xfb, 0x592: 0xfb, 0x593: 0xfb, 0x594: 0xfb, 0x595: 0xfb, 0x596: 0xfb, 0x597: 0xfb,
+	0x598: 0xfb, 0x599: 0xfb, 0x59a: 0xfb, 0x59b: 0xfb, 0x59c: 0xfb, 0x59d: 0xfb, 0x59e: 0xfb, 0x59f: 0xfb,
+	0x5a0: 0xfb, 0x5a1: 0xfb, 0x5a2: 0xfb, 0x5a3: 0xfb, 0x5a4: 0xfb, 0x5a5: 0xfb, 0x5a6: 0xfb, 0x5a7: 0xfb,
+	0x5a8: 0xfb, 0x5a9: 0xfb, 0x5aa: 0xfb, 0x5ab: 0xfb, 0x5ac: 0xfb, 0x5ad: 0xfb, 0x5ae: 0xfb, 0x5af: 0xfb,
+	0x5b0: 0xa0, 0x5b1: 0x16c, 0x5b2: 0x16d, 0x5b3: 0xfb, 0x5b4: 0xfb, 0x5b5: 0xfb, 0x5b6: 0xfb, 0x5b7: 0xfb,
+	0x5b8: 0xfb, 0x5b9: 0xfb, 0x5ba: 0xfb, 0x5bb: 0xfb, 0x5bc: 0xfb, 0x5bd: 0xfb, 0x5be: 0xfb, 0x5bf: 0xfb,
 	// Block 0x17, offset 0x5c0
-	0x5c0: 0x9c, 0x5c1: 0x9c, 0x5c2: 0x9c, 0x5c3: 0x170, 0x5c4: 0x171, 0x5c5: 0x172, 0x5c6: 0x173, 0x5c7: 0x174,
-	0x5c8: 0x9c, 0x5c9: 0x175, 0x5ca: 0xfd, 0x5cb: 0x176, 0x5cc: 0x9c, 0x5cd: 0x177, 0x5ce: 0xfd, 0x5cf: 0xfd,
-	0x5d0: 0x5e, 0x5d1: 0x5f, 0x5d2: 0x60, 0x5d3: 0x61, 0x5d4: 0x62, 0x5d5: 0x63, 0x5d6: 0x64, 0x5d7: 0x65,
-	0x5d8: 0x66, 0x5d9: 0x67, 0x5da: 0x68, 0x5db: 0x69, 0x5dc: 0x6a, 0x5dd: 0x6b, 0x5de: 0x6c, 0x5df: 0x6d,
+	0x5c0: 0x9c, 0x5c1: 0x9c, 0x5c2: 0x9c, 0x5c3: 0x16e, 0x5c4: 0x16f, 0x5c5: 0x170, 0x5c6: 0x171, 0x5c7: 0x172,
+	0x5c8: 0x9c, 0x5c9: 0x173, 0x5ca: 0xfb, 0x5cb: 0x174, 0x5cc: 0x9c, 0x5cd: 0x175, 0x5ce: 0xfb, 0x5cf: 0xfb,
+	0x5d0: 0x60, 0x5d1: 0x61, 0x5d2: 0x62, 0x5d3: 0x63, 0x5d4: 0x64, 0x5d5: 0x65, 0x5d6: 0x66, 0x5d7: 0x67,
+	0x5d8: 0x68, 0x5d9: 0x69, 0x5da: 0x6a, 0x5db: 0x6b, 0x5dc: 0x6c, 0x5dd: 0x6d, 0x5de: 0x6e, 0x5df: 0x6f,
 	0x5e0: 0x9c, 0x5e1: 0x9c, 0x5e2: 0x9c, 0x5e3: 0x9c, 0x5e4: 0x9c, 0x5e5: 0x9c, 0x5e6: 0x9c, 0x5e7: 0x9c,
-	0x5e8: 0x178, 0x5e9: 0x179, 0x5ea: 0x17a, 0x5eb: 0xfd, 0x5ec: 0xfd, 0x5ed: 0xfd, 0x5ee: 0xfd, 0x5ef: 0xfd,
-	0x5f0: 0xfd, 0x5f1: 0xfd, 0x5f2: 0xfd, 0x5f3: 0xfd, 0x5f4: 0xfd, 0x5f5: 0xfd, 0x5f6: 0xfd, 0x5f7: 0xfd,
-	0x5f8: 0xfd, 0x5f9: 0xfd, 0x5fa: 0xfd, 0x5fb: 0xfd, 0x5fc: 0xfd, 0x5fd: 0xfd, 0x5fe: 0xfd, 0x5ff: 0xfd,
+	0x5e8: 0x176, 0x5e9: 0x177, 0x5ea: 0x178, 0x5eb: 0xfb, 0x5ec: 0xfb, 0x5ed: 0xfb, 0x5ee: 0xfb, 0x5ef: 0xfb,
+	0x5f0: 0xfb, 0x5f1: 0xfb, 0x5f2: 0xfb, 0x5f3: 0xfb, 0x5f4: 0xfb, 0x5f5: 0xfb, 0x5f6: 0xfb, 0x5f7: 0xfb,
+	0x5f8: 0xfb, 0x5f9: 0xfb, 0x5fa: 0xfb, 0x5fb: 0xfb, 0x5fc: 0xfb, 0x5fd: 0xfb, 0x5fe: 0xfb, 0x5ff: 0xfb,
 	// Block 0x18, offset 0x600
-	0x600: 0x17b, 0x601: 0xfd, 0x602: 0xfd, 0x603: 0xfd, 0x604: 0x17c, 0x605: 0x17d, 0x606: 0xfd, 0x607: 0xfd,
-	0x608: 0xfd, 0x609: 0xfd, 0x60a: 0xfd, 0x60b: 0x17e, 0x60c: 0xfd, 0x60d: 0xfd, 0x60e: 0xfd, 0x60f: 0xfd,
-	0x610: 0xfd, 0x611: 0xfd, 0x612: 0xfd, 0x613: 0xfd, 0x614: 0xfd, 0x615: 0xfd, 0x616: 0xfd, 0x617: 0xfd,
-	0x618: 0xfd, 0x619: 0xfd, 0x61a: 0xfd, 0x61b: 0xfd, 0x61c: 0xfd, 0x61d: 0xfd, 0x61e: 0xfd, 0x61f: 0xfd,
-	0x620: 0x125, 0x621: 0x125, 0x622: 0x125, 0x623: 0x17f, 0x624: 0x6e, 0x625: 0x180, 0x626: 0xfd, 0x627: 0xfd,
-	0x628: 0xfd, 0x629: 0xfd, 0x62a: 0xfd, 0x62b: 0xfd, 0x62c: 0xfd, 0x62d: 0xfd, 0x62e: 0xfd, 0x62f: 0xfd,
-	0x630: 0xfd, 0x631: 0x181, 0x632: 0x182, 0x633: 0xfd, 0x634: 0x183, 0x635: 0xfd, 0x636: 0xfd, 0x637: 0xfd,
-	0x638: 0x6f, 0x639: 0x70, 0x63a: 0x71, 0x63b: 0x184, 0x63c: 0xfd, 0x63d: 0xfd, 0x63e: 0xfd, 0x63f: 0xfd,
+	0x600: 0x179, 0x601: 0xfb, 0x602: 0xfb, 0x603: 0xfb, 0x604: 0x17a, 0x605: 0x17b, 0x606: 0xfb, 0x607: 0xfb,
+	0x608: 0xfb, 0x609: 0xfb, 0x60a: 0xfb, 0x60b: 0x17c, 0x60c: 0xfb, 0x60d: 0xfb, 0x60e: 0xfb, 0x60f: 0xfb,
+	0x610: 0xfb, 0x611: 0xfb, 0x612: 0xfb, 0x613: 0xfb, 0x614: 0xfb, 0x615: 0xfb, 0x616: 0xfb, 0x617: 0xfb,
+	0x618: 0xfb, 0x619: 0xfb, 0x61a: 0xfb, 0x61b: 0xfb, 0x61c: 0xfb, 0x61d: 0xfb, 0x61e: 0xfb, 0x61f: 0xfb,
+	0x620: 0x123, 0x621: 0x123, 0x622: 0x123, 0x623: 0x17d, 0x624: 0x70, 0x625: 0x17e, 0x626: 0xfb, 0x627: 0xfb,
+	0x628: 0xfb, 0x629: 0xfb, 0x62a: 0xfb, 0x62b: 0xfb, 0x62c: 0xfb, 0x62d: 0xfb, 0x62e: 0xfb, 0x62f: 0xfb,
+	0x630: 0xfb, 0x631: 0x17f, 0x632: 0x180, 0x633: 0xfb, 0x634: 0x181, 0x635: 0xfb, 0x636: 0xfb, 0x637: 0xfb,
+	0x638: 0x71, 0x639: 0x72, 0x63a: 0x73, 0x63b: 0x182, 0x63c: 0xfb, 0x63d: 0xfb, 0x63e: 0xfb, 0x63f: 0xfb,
 	// Block 0x19, offset 0x640
-	0x640: 0x185, 0x641: 0x9c, 0x642: 0x186, 0x643: 0x187, 0x644: 0x72, 0x645: 0x73, 0x646: 0x188, 0x647: 0x189,
-	0x648: 0x74, 0x649: 0x18a, 0x64a: 0xfd, 0x64b: 0xfd, 0x64c: 0x9c, 0x64d: 0x9c, 0x64e: 0x9c, 0x64f: 0x9c,
+	0x640: 0x183, 0x641: 0x9c, 0x642: 0x184, 0x643: 0x185, 0x644: 0x74, 0x645: 0x75, 0x646: 0x186, 0x647: 0x187,
+	0x648: 0x76, 0x649: 0x188, 0x64a: 0xfb, 0x64b: 0xfb, 0x64c: 0x9c, 0x64d: 0x9c, 0x64e: 0x9c, 0x64f: 0x9c,
 	0x650: 0x9c, 0x651: 0x9c, 0x652: 0x9c, 0x653: 0x9c, 0x654: 0x9c, 0x655: 0x9c, 0x656: 0x9c, 0x657: 0x9c,
-	0x658: 0x9c, 0x659: 0x9c, 0x65a: 0x9c, 0x65b: 0x18b, 0x65c: 0x9c, 0x65d: 0x18c, 0x65e: 0x9c, 0x65f: 0x18d,
-	0x660: 0x18e, 0x661: 0x18f, 0x662: 0x190, 0x663: 0xfd, 0x664: 0x9c, 0x665: 0x191, 0x666: 0x9c, 0x667: 0x192,
-	0x668: 0x9c, 0x669: 0x193, 0x66a: 0x194, 0x66b: 0x195, 0x66c: 0x9c, 0x66d: 0x9c, 0x66e: 0x196, 0x66f: 0x197,
-	0x670: 0xfd, 0x671: 0xfd, 0x672: 0xfd, 0x673: 0xfd, 0x674: 0xfd, 0x675: 0xfd, 0x676: 0xfd, 0x677: 0xfd,
-	0x678: 0xfd, 0x679: 0xfd, 0x67a: 0xfd, 0x67b: 0xfd, 0x67c: 0xfd, 0x67d: 0xfd, 0x67e: 0xfd, 0x67f: 0xfd,
+	0x658: 0x9c, 0x659: 0x9c, 0x65a: 0x9c, 0x65b: 0x189, 0x65c: 0x9c, 0x65d: 0x18a, 0x65e: 0x9c, 0x65f: 0x18b,
+	0x660: 0x18c, 0x661: 0x18d, 0x662: 0x18e, 0x663: 0xfb, 0x664: 0x9c, 0x665: 0x18f, 0x666: 0x9c, 0x667: 0x190,
+	0x668: 0x9c, 0x669: 0x191, 0x66a: 0x192, 0x66b: 0x193, 0x66c: 0x9c, 0x66d: 0x9c, 0x66e: 0x194, 0x66f: 0x195,
+	0x670: 0xfb, 0x671: 0xfb, 0x672: 0xfb, 0x673: 0xfb, 0x674: 0xfb, 0x675: 0xfb, 0x676: 0xfb, 0x677: 0xfb,
+	0x678: 0xfb, 0x679: 0xfb, 0x67a: 0xfb, 0x67b: 0xfb, 0x67c: 0xfb, 0x67d: 0xfb, 0x67e: 0xfb, 0x67f: 0xfb,
 	// Block 0x1a, offset 0x680
 	0x680: 0xa0, 0x681: 0xa0, 0x682: 0xa0, 0x683: 0xa0, 0x684: 0xa0, 0x685: 0xa0, 0x686: 0xa0, 0x687: 0xa0,
 	0x688: 0xa0, 0x689: 0xa0, 0x68a: 0xa0, 0x68b: 0xa0, 0x68c: 0xa0, 0x68d: 0xa0, 0x68e: 0xa0, 0x68f: 0xa0,
 	0x690: 0xa0, 0x691: 0xa0, 0x692: 0xa0, 0x693: 0xa0, 0x694: 0xa0, 0x695: 0xa0, 0x696: 0xa0, 0x697: 0xa0,
-	0x698: 0xa0, 0x699: 0xa0, 0x69a: 0xa0, 0x69b: 0x198, 0x69c: 0xa0, 0x69d: 0xa0, 0x69e: 0xa0, 0x69f: 0xa0,
+	0x698: 0xa0, 0x699: 0xa0, 0x69a: 0xa0, 0x69b: 0x196, 0x69c: 0xa0, 0x69d: 0xa0, 0x69e: 0xa0, 0x69f: 0xa0,
 	0x6a0: 0xa0, 0x6a1: 0xa0, 0x6a2: 0xa0, 0x6a3: 0xa0, 0x6a4: 0xa0, 0x6a5: 0xa0, 0x6a6: 0xa0, 0x6a7: 0xa0,
 	0x6a8: 0xa0, 0x6a9: 0xa0, 0x6aa: 0xa0, 0x6ab: 0xa0, 0x6ac: 0xa0, 0x6ad: 0xa0, 0x6ae: 0xa0, 0x6af: 0xa0,
 	0x6b0: 0xa0, 0x6b1: 0xa0, 0x6b2: 0xa0, 0x6b3: 0xa0, 0x6b4: 0xa0, 0x6b5: 0xa0, 0x6b6: 0xa0, 0x6b7: 0xa0,
@@ -2454,8 +2312,8 @@ var idnaIndex = [2368]uint16{
 	0x6c0: 0xa0, 0x6c1: 0xa0, 0x6c2: 0xa0, 0x6c3: 0xa0, 0x6c4: 0xa0, 0x6c5: 0xa0, 0x6c6: 0xa0, 0x6c7: 0xa0,
 	0x6c8: 0xa0, 0x6c9: 0xa0, 0x6ca: 0xa0, 0x6cb: 0xa0, 0x6cc: 0xa0, 0x6cd: 0xa0, 0x6ce: 0xa0, 0x6cf: 0xa0,
 	0x6d0: 0xa0, 0x6d1: 0xa0, 0x6d2: 0xa0, 0x6d3: 0xa0, 0x6d4: 0xa0, 0x6d5: 0xa0, 0x6d6: 0xa0, 0x6d7: 0xa0,
-	0x6d8: 0xa0, 0x6d9: 0xa0, 0x6da: 0xa0, 0x6db: 0xa0, 0x6dc: 0x199, 0x6dd: 0xa0, 0x6de: 0xa0, 0x6df: 0xa0,
-	0x6e0: 0x19a, 0x6e1: 0xa0, 0x6e2: 0xa0, 0x6e3: 0xa0, 0x6e4: 0xa0, 0x6e5: 0xa0, 0x6e6: 0xa0, 0x6e7: 0xa0,
+	0x6d8: 0xa0, 0x6d9: 0xa0, 0x6da: 0xa0, 0x6db: 0xa0, 0x6dc: 0x197, 0x6dd: 0xa0, 0x6de: 0xa0, 0x6df: 0xa0,
+	0x6e0: 0x198, 0x6e1: 0xa0, 0x6e2: 0xa0, 0x6e3: 0xa0, 0x6e4: 0xa0, 0x6e5: 0xa0, 0x6e6: 0xa0, 0x6e7: 0xa0,
 	0x6e8: 0xa0, 0x6e9: 0xa0, 0x6ea: 0xa0, 0x6eb: 0xa0, 0x6ec: 0xa0, 0x6ed: 0xa0, 0x6ee: 0xa0, 0x6ef: 0xa0,
 	0x6f0: 0xa0, 0x6f1: 0xa0, 0x6f2: 0xa0, 0x6f3: 0xa0, 0x6f4: 0xa0, 0x6f5: 0xa0, 0x6f6: 0xa0, 0x6f7: 0xa0,
 	0x6f8: 0xa0, 0x6f9: 0xa0, 0x6fa: 0xa0, 0x6fb: 0xa0, 0x6fc: 0xa0, 0x6fd: 0xa0, 0x6fe: 0xa0, 0x6ff: 0xa0,
@@ -2467,34 +2325,34 @@ var idnaIndex = [2368]uint16{
 	0x720: 0xa0, 0x721: 0xa0, 0x722: 0xa0, 0x723: 0xa0, 0x724: 0xa0, 0x725: 0xa0, 0x726: 0xa0, 0x727: 0xa0,
 	0x728: 0xa0, 0x729: 0xa0, 0x72a: 0xa0, 0x72b: 0xa0, 0x72c: 0xa0, 0x72d: 0xa0, 0x72e: 0xa0, 0x72f: 0xa0,
 	0x730: 0xa0, 0x731: 0xa0, 0x732: 0xa0, 0x733: 0xa0, 0x734: 0xa0, 0x735: 0xa0, 0x736: 0xa0, 0x737: 0xa0,
-	0x738: 0xa0, 0x739: 0xa0, 0x73a: 0x19b, 0x73b: 0xa0, 0x73c: 0xa0, 0x73d: 0xa0, 0x73e: 0xa0, 0x73f: 0xa0,
+	0x738: 0xa0, 0x739: 0xa0, 0x73a: 0x199, 0x73b: 0xa0, 0x73c: 0xa0, 0x73d: 0xa0, 0x73e: 0xa0, 0x73f: 0xa0,
 	// Block 0x1d, offset 0x740
 	0x740: 0xa0, 0x741: 0xa0, 0x742: 0xa0, 0x743: 0xa0, 0x744: 0xa0, 0x745: 0xa0, 0x746: 0xa0, 0x747: 0xa0,
 	0x748: 0xa0, 0x749: 0xa0, 0x74a: 0xa0, 0x74b: 0xa0, 0x74c: 0xa0, 0x74d: 0xa0, 0x74e: 0xa0, 0x74f: 0xa0,
 	0x750: 0xa0, 0x751: 0xa0, 0x752: 0xa0, 0x753: 0xa0, 0x754: 0xa0, 0x755: 0xa0, 0x756: 0xa0, 0x757: 0xa0,
 	0x758: 0xa0, 0x759: 0xa0, 0x75a: 0xa0, 0x75b: 0xa0, 0x75c: 0xa0, 0x75d: 0xa0, 0x75e: 0xa0, 0x75f: 0xa0,
 	0x760: 0xa0, 0x761: 0xa0, 0x762: 0xa0, 0x763: 0xa0, 0x764: 0xa0, 0x765: 0xa0, 0x766: 0xa0, 0x767: 0xa0,
-	0x768: 0xa0, 0x769: 0xa0, 0x76a: 0xa0, 0x76b: 0xa0, 0x76c: 0xa0, 0x76d: 0xa0, 0x76e: 0xa0, 0x76f: 0x19c,
-	0x770: 0xfd, 0x771: 0xfd, 0x772: 0xfd, 0x773: 0xfd, 0x774: 0xfd, 0x775: 0xfd, 0x776: 0xfd, 0x777: 0xfd,
-	0x778: 0xfd, 0x779: 0xfd, 0x77a: 0xfd, 0x77b: 0xfd, 0x77c: 0xfd, 0x77d: 0xfd, 0x77e: 0xfd, 0x77f: 0xfd,
+	0x768: 0xa0, 0x769: 0xa0, 0x76a: 0xa0, 0x76b: 0xa0, 0x76c: 0xa0, 0x76d: 0xa0, 0x76e: 0xa0, 0x76f: 0x19a,
+	0x770: 0xfb, 0x771: 0xfb, 0x772: 0xfb, 0x773: 0xfb, 0x774: 0xfb, 0x775: 0xfb, 0x776: 0xfb, 0x777: 0xfb,
+	0x778: 0xfb, 0x779: 0xfb, 0x77a: 0xfb, 0x77b: 0xfb, 0x77c: 0xfb, 0x77d: 0xfb, 0x77e: 0xfb, 0x77f: 0xfb,
 	// Block 0x1e, offset 0x780
-	0x780: 0xfd, 0x781: 0xfd, 0x782: 0xfd, 0x783: 0xfd, 0x784: 0xfd, 0x785: 0xfd, 0x786: 0xfd, 0x787: 0xfd,
-	0x788: 0xfd, 0x789: 0xfd, 0x78a: 0xfd, 0x78b: 0xfd, 0x78c: 0xfd, 0x78d: 0xfd, 0x78e: 0xfd, 0x78f: 0xfd,
-	0x790: 0xfd, 0x791: 0xfd, 0x792: 0xfd, 0x793: 0xfd, 0x794: 0xfd, 0x795: 0xfd, 0x796: 0xfd, 0x797: 0xfd,
-	0x798: 0xfd, 0x799: 0xfd, 0x79a: 0xfd, 0x79b: 0xfd, 0x79c: 0xfd, 0x79d: 0xfd, 0x79e: 0xfd, 0x79f: 0xfd,
-	0x7a0: 0x75, 0x7a1: 0x76, 0x7a2: 0x77, 0x7a3: 0x78, 0x7a4: 0x79, 0x7a5: 0x7a, 0x7a6: 0x7b, 0x7a7: 0x7c,
-	0x7a8: 0x7d, 0x7a9: 0xfd, 0x7aa: 0xfd, 0x7ab: 0xfd, 0x7ac: 0xfd, 0x7ad: 0xfd, 0x7ae: 0xfd, 0x7af: 0xfd,
-	0x7b0: 0xfd, 0x7b1: 0xfd, 0x7b2: 0xfd, 0x7b3: 0xfd, 0x7b4: 0xfd, 0x7b5: 0xfd, 0x7b6: 0xfd, 0x7b7: 0xfd,
-	0x7b8: 0xfd, 0x7b9: 0xfd, 0x7ba: 0xfd, 0x7bb: 0xfd, 0x7bc: 0xfd, 0x7bd: 0xfd, 0x7be: 0xfd, 0x7bf: 0xfd,
+	0x780: 0xfb, 0x781: 0xfb, 0x782: 0xfb, 0x783: 0xfb, 0x784: 0xfb, 0x785: 0xfb, 0x786: 0xfb, 0x787: 0xfb,
+	0x788: 0xfb, 0x789: 0xfb, 0x78a: 0xfb, 0x78b: 0xfb, 0x78c: 0xfb, 0x78d: 0xfb, 0x78e: 0xfb, 0x78f: 0xfb,
+	0x790: 0xfb, 0x791: 0xfb, 0x792: 0xfb, 0x793: 0xfb, 0x794: 0xfb, 0x795: 0xfb, 0x796: 0xfb, 0x797: 0xfb,
+	0x798: 0xfb, 0x799: 0xfb, 0x79a: 0xfb, 0x79b: 0xfb, 0x79c: 0xfb, 0x79d: 0xfb, 0x79e: 0xfb, 0x79f: 0xfb,
+	0x7a0: 0x77, 0x7a1: 0x78, 0x7a2: 0x79, 0x7a3: 0x19b, 0x7a4: 0x7a, 0x7a5: 0x7b, 0x7a6: 0x19c, 0x7a7: 0x7c,
+	0x7a8: 0x7d, 0x7a9: 0xfb, 0x7aa: 0xfb, 0x7ab: 0xfb, 0x7ac: 0xfb, 0x7ad: 0xfb, 0x7ae: 0xfb, 0x7af: 0xfb,
+	0x7b0: 0xfb, 0x7b1: 0xfb, 0x7b2: 0xfb, 0x7b3: 0xfb, 0x7b4: 0xfb, 0x7b5: 0xfb, 0x7b6: 0xfb, 0x7b7: 0xfb,
+	0x7b8: 0xfb, 0x7b9: 0xfb, 0x7ba: 0xfb, 0x7bb: 0xfb, 0x7bc: 0xfb, 0x7bd: 0xfb, 0x7be: 0xfb, 0x7bf: 0xfb,
 	// Block 0x1f, offset 0x7c0
 	0x7c0: 0xa0, 0x7c1: 0xa0, 0x7c2: 0xa0, 0x7c3: 0xa0, 0x7c4: 0xa0, 0x7c5: 0xa0, 0x7c6: 0xa0, 0x7c7: 0xa0,
-	0x7c8: 0xa0, 0x7c9: 0xa0, 0x7ca: 0xa0, 0x7cb: 0xa0, 0x7cc: 0xa0, 0x7cd: 0x19d, 0x7ce: 0xfd, 0x7cf: 0xfd,
-	0x7d0: 0xfd, 0x7d1: 0xfd, 0x7d2: 0xfd, 0x7d3: 0xfd, 0x7d4: 0xfd, 0x7d5: 0xfd, 0x7d6: 0xfd, 0x7d7: 0xfd,
-	0x7d8: 0xfd, 0x7d9: 0xfd, 0x7da: 0xfd, 0x7db: 0xfd, 0x7dc: 0xfd, 0x7dd: 0xfd, 0x7de: 0xfd, 0x7df: 0xfd,
-	0x7e0: 0xfd, 0x7e1: 0xfd, 0x7e2: 0xfd, 0x7e3: 0xfd, 0x7e4: 0xfd, 0x7e5: 0xfd, 0x7e6: 0xfd, 0x7e7: 0xfd,
-	0x7e8: 0xfd, 0x7e9: 0xfd, 0x7ea: 0xfd, 0x7eb: 0xfd, 0x7ec: 0xfd, 0x7ed: 0xfd, 0x7ee: 0xfd, 0x7ef: 0xfd,
-	0x7f0: 0xfd, 0x7f1: 0xfd, 0x7f2: 0xfd, 0x7f3: 0xfd, 0x7f4: 0xfd, 0x7f5: 0xfd, 0x7f6: 0xfd, 0x7f7: 0xfd,
-	0x7f8: 0xfd, 0x7f9: 0xfd, 0x7fa: 0xfd, 0x7fb: 0xfd, 0x7fc: 0xfd, 0x7fd: 0xfd, 0x7fe: 0xfd, 0x7ff: 0xfd,
+	0x7c8: 0xa0, 0x7c9: 0xa0, 0x7ca: 0xa0, 0x7cb: 0xa0, 0x7cc: 0xa0, 0x7cd: 0x19d, 0x7ce: 0xfb, 0x7cf: 0xfb,
+	0x7d0: 0xfb, 0x7d1: 0xfb, 0x7d2: 0xfb, 0x7d3: 0xfb, 0x7d4: 0xfb, 0x7d5: 0xfb, 0x7d6: 0xfb, 0x7d7: 0xfb,
+	0x7d8: 0xfb, 0x7d9: 0xfb, 0x7da: 0xfb, 0x7db: 0xfb, 0x7dc: 0xfb, 0x7dd: 0xfb, 0x7de: 0xfb, 0x7df: 0xfb,
+	0x7e0: 0xfb, 0x7e1: 0xfb, 0x7e2: 0xfb, 0x7e3: 0xfb, 0x7e4: 0xfb, 0x7e5: 0xfb, 0x7e6: 0xfb, 0x7e7: 0xfb,
+	0x7e8: 0xfb, 0x7e9: 0xfb, 0x7ea: 0xfb, 0x7eb: 0xfb, 0x7ec: 0xfb, 0x7ed: 0xfb, 0x7ee: 0xfb, 0x7ef: 0xfb,
+	0x7f0: 0xfb, 0x7f1: 0xfb, 0x7f2: 0xfb, 0x7f3: 0xfb, 0x7f4: 0xfb, 0x7f5: 0xfb, 0x7f6: 0xfb, 0x7f7: 0xfb,
+	0x7f8: 0xfb, 0x7f9: 0xfb, 0x7fa: 0xfb, 0x7fb: 0xfb, 0x7fc: 0xfb, 0x7fd: 0xfb, 0x7fe: 0xfb, 0x7ff: 0xfb,
 	// Block 0x20, offset 0x800
 	0x810: 0x0d, 0x811: 0x0e, 0x812: 0x0f, 0x813: 0x10, 0x814: 0x11, 0x815: 0x0b, 0x816: 0x12, 0x817: 0x07,
 	0x818: 0x13, 0x819: 0x0b, 0x81a: 0x0b, 0x81b: 0x14, 0x81c: 0x0b, 0x81d: 0x15, 0x81e: 0x16, 0x81f: 0x17,
@@ -2512,14 +2370,14 @@ var idnaIndex = [2368]uint16{
 	0x870: 0x0b, 0x871: 0x0b, 0x872: 0x0b, 0x873: 0x0b, 0x874: 0x0b, 0x875: 0x0b, 0x876: 0x0b, 0x877: 0x0b,
 	0x878: 0x0b, 0x879: 0x0b, 0x87a: 0x0b, 0x87b: 0x0b, 0x87c: 0x0b, 0x87d: 0x0b, 0x87e: 0x0b, 0x87f: 0x0b,
 	// Block 0x22, offset 0x880
-	0x880: 0x19e, 0x881: 0x19f, 0x882: 0xfd, 0x883: 0xfd, 0x884: 0x1a0, 0x885: 0x1a0, 0x886: 0x1a0, 0x887: 0x1a1,
-	0x888: 0xfd, 0x889: 0xfd, 0x88a: 0xfd, 0x88b: 0xfd, 0x88c: 0xfd, 0x88d: 0xfd, 0x88e: 0xfd, 0x88f: 0xfd,
-	0x890: 0xfd, 0x891: 0xfd, 0x892: 0xfd, 0x893: 0xfd, 0x894: 0xfd, 0x895: 0xfd, 0x896: 0xfd, 0x897: 0xfd,
-	0x898: 0xfd, 0x899: 0xfd, 0x89a: 0xfd, 0x89b: 0xfd, 0x89c: 0xfd, 0x89d: 0xfd, 0x89e: 0xfd, 0x89f: 0xfd,
-	0x8a0: 0xfd, 0x8a1: 0xfd, 0x8a2: 0xfd, 0x8a3: 0xfd, 0x8a4: 0xfd, 0x8a5: 0xfd, 0x8a6: 0xfd, 0x8a7: 0xfd,
-	0x8a8: 0xfd, 0x8a9: 0xfd, 0x8aa: 0xfd, 0x8ab: 0xfd, 0x8ac: 0xfd, 0x8ad: 0xfd, 0x8ae: 0xfd, 0x8af: 0xfd,
-	0x8b0: 0xfd, 0x8b1: 0xfd, 0x8b2: 0xfd, 0x8b3: 0xfd, 0x8b4: 0xfd, 0x8b5: 0xfd, 0x8b6: 0xfd, 0x8b7: 0xfd,
-	0x8b8: 0xfd, 0x8b9: 0xfd, 0x8ba: 0xfd, 0x8bb: 0xfd, 0x8bc: 0xfd, 0x8bd: 0xfd, 0x8be: 0xfd, 0x8bf: 0xfd,
+	0x880: 0x19e, 0x881: 0x19f, 0x882: 0xfb, 0x883: 0xfb, 0x884: 0x1a0, 0x885: 0x1a0, 0x886: 0x1a0, 0x887: 0x1a1,
+	0x888: 0xfb, 0x889: 0xfb, 0x88a: 0xfb, 0x88b: 0xfb, 0x88c: 0xfb, 0x88d: 0xfb, 0x88e: 0xfb, 0x88f: 0xfb,
+	0x890: 0xfb, 0x891: 0xfb, 0x892: 0xfb, 0x893: 0xfb, 0x894: 0xfb, 0x895: 0xfb, 0x896: 0xfb, 0x897: 0xfb,
+	0x898: 0xfb, 0x899: 0xfb, 0x89a: 0xfb, 0x89b: 0xfb, 0x89c: 0xfb, 0x89d: 0xfb, 0x89e: 0xfb, 0x89f: 0xfb,
+	0x8a0: 0xfb, 0x8a1: 0xfb, 0x8a2: 0xfb, 0x8a3: 0xfb, 0x8a4: 0xfb, 0x8a5: 0xfb, 0x8a6: 0xfb, 0x8a7: 0xfb,
+	0x8a8: 0xfb, 0x8a9: 0xfb, 0x8aa: 0xfb, 0x8ab: 0xfb, 0x8ac: 0xfb, 0x8ad: 0xfb, 0x8ae: 0xfb, 0x8af: 0xfb,
+	0x8b0: 0xfb, 0x8b1: 0xfb, 0x8b2: 0xfb, 0x8b3: 0xfb, 0x8b4: 0xfb, 0x8b5: 0xfb, 0x8b6: 0xfb, 0x8b7: 0xfb,
+	0x8b8: 0xfb, 0x8b9: 0xfb, 0x8ba: 0xfb, 0x8bb: 0xfb, 0x8bc: 0xfb, 0x8bd: 0xfb, 0x8be: 0xfb, 0x8bf: 0xfb,
 	// Block 0x23, offset 0x8c0
 	0x8c0: 0x0b, 0x8c1: 0x0b, 0x8c2: 0x0b, 0x8c3: 0x0b, 0x8c4: 0x0b, 0x8c5: 0x0b, 0x8c6: 0x0b, 0x8c7: 0x0b,
 	0x8c8: 0x0b, 0x8c9: 0x0b, 0x8ca: 0x0b, 0x8cb: 0x0b, 0x8cc: 0x0b, 0x8cd: 0x0b, 0x8ce: 0x0b, 0x8cf: 0x0b,
@@ -2535,10 +2393,10 @@ var idnaIndex = [2368]uint16{
 }
 
 // idnaSparseOffset: 292 entries, 584 bytes
-var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x85, 0x8b, 0x94, 0xa4, 0xb2, 0xbd, 0xca, 0xdb, 0xe5, 0xec, 0xf9, 0x10a, 0x111, 0x11c, 0x12b, 0x139, 0x143, 0x145, 0x14a, 0x14d, 0x150, 0x152, 0x15e, 0x169, 0x171, 0x177, 0x17d, 0x182, 0x187, 0x18a, 0x18e, 0x194, 0x199, 0x1a5, 0x1af, 0x1b5, 0x1c6, 0x1d0, 0x1d3, 0x1db, 0x1de, 0x1eb, 0x1f3, 0x1f7, 0x1fe, 0x206, 0x216, 0x222, 0x225, 0x22f, 0x23b, 0x247, 0x253, 0x25b, 0x260, 0x26d, 0x27e, 0x282, 0x28d, 0x291, 0x29a, 0x2a2, 0x2a8, 0x2ad, 0x2b0, 0x2b4, 0x2ba, 0x2be, 0x2c2, 0x2c6, 0x2cc, 0x2d4, 0x2db, 0x2e6, 0x2f0, 0x2f4, 0x2f7, 0x2fd, 0x301, 0x303, 0x306, 0x308, 0x30b, 0x315, 0x318, 0x327, 0x32b, 0x32f, 0x331, 0x33a, 0x33d, 0x341, 0x346, 0x34b, 0x351, 0x362, 0x372, 0x378, 0x37c, 0x38b, 0x390, 0x398, 0x3a2, 0x3ad, 0x3b5, 0x3c6, 0x3cf, 0x3df, 0x3ec, 0x3f8, 0x3fd, 0x40a, 0x40e, 0x413, 0x415, 0x417, 0x41b, 0x41d, 0x421, 0x42a, 0x430, 0x434, 0x444, 0x44e, 0x453, 0x456, 0x45c, 0x463, 0x468, 0x46c, 0x472, 0x477, 0x480, 0x485, 0x48b, 0x492, 0x499, 0x4a0, 0x4a4, 0x4a9, 0x4ac, 0x4b1, 0x4bd, 0x4c3, 0x4c8, 0x4cf, 0x4d7, 0x4dc, 0x4e0, 0x4f0, 0x4f7, 0x4fb, 0x4ff, 0x506, 0x508, 0x50b, 0x50e, 0x512, 0x51b, 0x51f, 0x527, 0x52f, 0x537, 0x543, 0x54f, 0x555, 0x55e, 0x56a, 0x571, 0x57a, 0x585, 0x58c, 0x59b, 0x5a8, 0x5b5, 0x5be, 0x5c2, 0x5d1, 0x5d9, 0x5e4, 0x5ed, 0x5f3, 0x5fb, 0x604, 0x60f, 0x612, 0x61e, 0x627, 0x62a, 0x62f, 0x638, 0x63d, 0x64a, 0x655, 0x65e, 0x668, 0x66b, 0x675, 0x67e, 0x68a, 0x697, 0x6a4, 0x6b2, 0x6b9, 0x6bd, 0x6c1, 0x6c4, 0x6c9, 0x6cc, 0x6d1, 0x6d4, 0x6db, 0x6e2, 0x6e6, 0x6f1, 0x6f4, 0x6f7, 0x6fa, 0x700, 0x706, 0x70f, 0x712, 0x715, 0x718, 0x71b, 0x722, 0x725, 0x72a, 0x734, 0x737, 0x73b, 0x74a, 0x756, 0x75a, 0x75f, 0x763, 0x768, 0x76c, 0x771, 0x77a, 0x785, 0x78b, 0x791, 0x797, 0x79d, 0x7a6, 0x7a9, 0x7ac, 0x7b0, 0x7b4, 0x7b8, 0x7be, 0x7c4, 0x7c9, 0x7cc, 0x7dc, 0x7e3, 0x7e6, 0x7eb, 0x7ef, 0x7f5, 0x7fc, 0x800, 0x804, 0x80d, 0x814, 0x819, 0x81d, 0x82b, 0x82e, 0x831, 0x835, 0x839, 0x83c, 0x83f, 0x844, 0x846, 0x848}
+var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x85, 0x8b, 0x94, 0xa4, 0xb2, 0xbd, 0xca, 0xdb, 0xe5, 0xec, 0xf9, 0x10a, 0x111, 0x11c, 0x12b, 0x139, 0x143, 0x145, 0x14a, 0x14d, 0x150, 0x152, 0x15e, 0x169, 0x171, 0x177, 0x17d, 0x182, 0x187, 0x18a, 0x18e, 0x194, 0x199, 0x1a5, 0x1af, 0x1b5, 0x1c6, 0x1d0, 0x1d3, 0x1db, 0x1de, 0x1eb, 0x1f3, 0x1f7, 0x1fe, 0x206, 0x216, 0x222, 0x225, 0x22f, 0x23b, 0x247, 0x253, 0x25b, 0x260, 0x26d, 0x27e, 0x282, 0x28d, 0x291, 0x29a, 0x2a2, 0x2a8, 0x2ad, 0x2b0, 0x2b4, 0x2ba, 0x2be, 0x2c2, 0x2c6, 0x2cc, 0x2d4, 0x2db, 0x2e6, 0x2f0, 0x2f4, 0x2f7, 0x2fd, 0x301, 0x303, 0x306, 0x308, 0x30b, 0x315, 0x318, 0x327, 0x32b, 0x330, 0x333, 0x337, 0x33c, 0x341, 0x347, 0x358, 0x368, 0x36e, 0x372, 0x381, 0x386, 0x38e, 0x398, 0x3a3, 0x3ab, 0x3bc, 0x3c5, 0x3d5, 0x3e2, 0x3ee, 0x3f3, 0x400, 0x404, 0x409, 0x40b, 0x40d, 0x411, 0x413, 0x417, 0x420, 0x426, 0x42a, 0x43a, 0x444, 0x449, 0x44c, 0x452, 0x459, 0x45e, 0x462, 0x468, 0x46d, 0x476, 0x47b, 0x481, 0x488, 0x48f, 0x496, 0x49a, 0x49f, 0x4a2, 0x4a7, 0x4b3, 0x4b9, 0x4be, 0x4c5, 0x4cd, 0x4d2, 0x4d6, 0x4e6, 0x4ed, 0x4f1, 0x4f5, 0x4fc, 0x4fe, 0x501, 0x504, 0x508, 0x511, 0x515, 0x51d, 0x525, 0x52d, 0x539, 0x545, 0x54b, 0x554, 0x560, 0x567, 0x570, 0x57b, 0x582, 0x591, 0x59e, 0x5ab, 0x5b4, 0x5b8, 0x5c7, 0x5cf, 0x5da, 0x5e3, 0x5e9, 0x5f1, 0x5fa, 0x605, 0x608, 0x614, 0x61d, 0x620, 0x625, 0x62e, 0x633, 0x640, 0x64b, 0x654, 0x65e, 0x661, 0x66b, 0x674, 0x680, 0x68d, 0x69a, 0x6a8, 0x6af, 0x6b3, 0x6b7, 0x6ba, 0x6bf, 0x6c2, 0x6c7, 0x6ca, 0x6d1, 0x6d8, 0x6dc, 0x6e7, 0x6ea, 0x6ed, 0x6f0, 0x6f6, 0x6fc, 0x705, 0x708, 0x70b, 0x70e, 0x711, 0x718, 0x71b, 0x720, 0x72a, 0x72d, 0x731, 0x740, 0x74c, 0x750, 0x755, 0x759, 0x75e, 0x762, 0x767, 0x770, 0x77b, 0x781, 0x787, 0x78d, 0x793, 0x79c, 0x79f, 0x7a2, 0x7a6, 0x7aa, 0x7ae, 0x7b4, 0x7ba, 0x7bf, 0x7c2, 0x7d2, 0x7d9, 0x7dc, 0x7e1, 0x7e5, 0x7eb, 0x7f2, 0x7f6, 0x7fa, 0x803, 0x80a, 0x80f, 0x813, 0x821, 0x824, 0x827, 0x82b, 0x82f, 0x832, 0x842, 0x853, 0x856, 0x85b, 0x85d, 0x85f}
 
-// idnaSparseValues: 2123 entries, 8492 bytes
-var idnaSparseValues = [2123]valueRange{
+// idnaSparseValues: 2146 entries, 8584 bytes
+var idnaSparseValues = [2146]valueRange{
 	// Block 0x0, offset 0x0
 	{value: 0x0000, lo: 0x07},
 	{value: 0xe105, lo: 0x80, hi: 0x96},
@@ -2569,15 +2427,15 @@ var idnaSparseValues = [2123]valueRange{
 	// Block 0x2, offset 0x19
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x00a9, lo: 0xb0, hi: 0xb0},
+	{value: 0x0249, lo: 0xb0, hi: 0xb0},
 	{value: 0x037d, lo: 0xb1, hi: 0xb1},
-	{value: 0x00b1, lo: 0xb2, hi: 0xb2},
-	{value: 0x00b9, lo: 0xb3, hi: 0xb3},
+	{value: 0x0259, lo: 0xb2, hi: 0xb2},
+	{value: 0x0269, lo: 0xb3, hi: 0xb3},
 	{value: 0x034d, lo: 0xb4, hi: 0xb4},
 	{value: 0x0395, lo: 0xb5, hi: 0xb5},
 	{value: 0xe1bd, lo: 0xb6, hi: 0xb6},
-	{value: 0x00c1, lo: 0xb7, hi: 0xb7},
-	{value: 0x00c9, lo: 0xb8, hi: 0xb8},
+	{value: 0x0279, lo: 0xb7, hi: 0xb7},
+	{value: 0x0289, lo: 0xb8, hi: 0xb8},
 	{value: 0x0008, lo: 0xb9, hi: 0xbf},
 	// Block 0x3, offset 0x25
 	{value: 0x0000, lo: 0x01},
@@ -2599,7 +2457,7 @@ var idnaSparseValues = [2123]valueRange{
 	// Block 0x6, offset 0x33
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0131, lo: 0x87, hi: 0x87},
+	{value: 0x0401, lo: 0x87, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x88},
 	{value: 0x0018, lo: 0x89, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0x8c},
@@ -2785,7 +2643,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0x81, hi: 0xb0},
 	{value: 0x3308, lo: 0xb1, hi: 0xb1},
 	{value: 0x0008, lo: 0xb2, hi: 0xb2},
-	{value: 0x01f1, lo: 0xb3, hi: 0xb3},
+	{value: 0x08f1, lo: 0xb3, hi: 0xb3},
 	{value: 0x3308, lo: 0xb4, hi: 0xb9},
 	{value: 0x3b08, lo: 0xba, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbe},
@@ -2808,8 +2666,8 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x8e, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0201, lo: 0x9c, hi: 0x9c},
-	{value: 0x0209, lo: 0x9d, hi: 0x9d},
+	{value: 0x0961, lo: 0x9c, hi: 0x9c},
+	{value: 0x0999, lo: 0x9d, hi: 0x9d},
 	{value: 0x0008, lo: 0x9e, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
 	// Block 0x18, offset 0xf9
@@ -3217,13 +3075,13 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
 	// Block 0x44, offset 0x260
 	{value: 0x0000, lo: 0x0c},
-	{value: 0x02a9, lo: 0x80, hi: 0x80},
-	{value: 0x02b1, lo: 0x81, hi: 0x81},
-	{value: 0x02b9, lo: 0x82, hi: 0x82},
-	{value: 0x02c1, lo: 0x83, hi: 0x83},
-	{value: 0x02c9, lo: 0x84, hi: 0x85},
-	{value: 0x02d1, lo: 0x86, hi: 0x86},
-	{value: 0x02d9, lo: 0x87, hi: 0x87},
+	{value: 0x0e29, lo: 0x80, hi: 0x80},
+	{value: 0x0e41, lo: 0x81, hi: 0x81},
+	{value: 0x0e59, lo: 0x82, hi: 0x82},
+	{value: 0x0e71, lo: 0x83, hi: 0x83},
+	{value: 0x0e89, lo: 0x84, hi: 0x85},
+	{value: 0x0ea1, lo: 0x86, hi: 0x86},
+	{value: 0x0eb9, lo: 0x87, hi: 0x87},
 	{value: 0x057d, lo: 0x88, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
 	{value: 0x059d, lo: 0x90, hi: 0xba},
@@ -3275,18 +3133,18 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x83, hi: 0x83},
 	{value: 0x0008, lo: 0x84, hi: 0x84},
 	{value: 0x0018, lo: 0x85, hi: 0x88},
-	{value: 0x0851, lo: 0x89, hi: 0x89},
+	{value: 0x24c1, lo: 0x89, hi: 0x89},
 	{value: 0x0018, lo: 0x8a, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
 	// Block 0x4a, offset 0x29a
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x0859, lo: 0xac, hi: 0xac},
-	{value: 0x0861, lo: 0xad, hi: 0xad},
+	{value: 0x24f1, lo: 0xac, hi: 0xac},
+	{value: 0x2529, lo: 0xad, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xae},
-	{value: 0x0869, lo: 0xaf, hi: 0xaf},
-	{value: 0x0871, lo: 0xb0, hi: 0xb0},
+	{value: 0x2579, lo: 0xaf, hi: 0xaf},
+	{value: 0x25b1, lo: 0xb0, hi: 0xb0},
 	{value: 0x0018, lo: 0xb1, hi: 0xbf},
 	// Block 0x4b, offset 0x2a2
 	{value: 0x0000, lo: 0x05},
@@ -3308,19 +3166,19 @@ var idnaSparseValues = [2123]valueRange{
 	// Block 0x4e, offset 0x2b0
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x0929, lo: 0x8c, hi: 0x8c},
+	{value: 0x28c1, lo: 0x8c, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0xbf},
 	// Block 0x4f, offset 0x2b4
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0xb3},
 	{value: 0x0e7e, lo: 0xb4, hi: 0xb4},
-	{value: 0x0932, lo: 0xb5, hi: 0xb5},
+	{value: 0x292a, lo: 0xb5, hi: 0xb5},
 	{value: 0x0e9e, lo: 0xb6, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
 	// Block 0x50, offset 0x2ba
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x9b},
-	{value: 0x0939, lo: 0x9c, hi: 0x9c},
+	{value: 0x2941, lo: 0x9c, hi: 0x9c},
 	{value: 0x0018, lo: 0x9d, hi: 0xbf},
 	// Block 0x51, offset 0x2be
 	{value: 0x0000, lo: 0x03},
@@ -3419,16 +3277,16 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0x80, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0x98},
 	{value: 0x3308, lo: 0x99, hi: 0x9a},
-	{value: 0x096a, lo: 0x9b, hi: 0x9b},
-	{value: 0x0972, lo: 0x9c, hi: 0x9c},
+	{value: 0x29e2, lo: 0x9b, hi: 0x9b},
+	{value: 0x2a0a, lo: 0x9c, hi: 0x9c},
 	{value: 0x0008, lo: 0x9d, hi: 0x9e},
-	{value: 0x0979, lo: 0x9f, hi: 0x9f},
+	{value: 0x2a31, lo: 0x9f, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa0},
 	{value: 0x0008, lo: 0xa1, hi: 0xbf},
 	// Block 0x61, offset 0x315
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbe},
-	{value: 0x0981, lo: 0xbf, hi: 0xbf},
+	{value: 0x2a69, lo: 0xbf, hi: 0xbf},
 	// Block 0x62, offset 0x318
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x0040, lo: 0x80, hi: 0x84},
@@ -3451,58 +3309,46 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa4, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
 	// Block 0x64, offset 0x32b
-	{value: 0x0008, lo: 0x03},
-	{value: 0x098a, lo: 0x80, hi: 0x9e},
+	{value: 0x0030, lo: 0x04},
+	{value: 0x2aa2, lo: 0x80, hi: 0x9d},
+	{value: 0x305a, lo: 0x9e, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x0a82, lo: 0xa0, hi: 0xbf},
-	// Block 0x65, offset 0x32f
-	{value: 0x0008, lo: 0x01},
-	{value: 0x0d19, lo: 0x80, hi: 0xbf},
-	// Block 0x66, offset 0x331
-	{value: 0x0008, lo: 0x08},
-	{value: 0x0f19, lo: 0x80, hi: 0xb0},
-	{value: 0x4045, lo: 0xb1, hi: 0xb1},
-	{value: 0x10a1, lo: 0xb2, hi: 0xb3},
-	{value: 0x4065, lo: 0xb4, hi: 0xb4},
-	{value: 0x10b1, lo: 0xb5, hi: 0xb7},
-	{value: 0x4085, lo: 0xb8, hi: 0xb8},
-	{value: 0x4085, lo: 0xb9, hi: 0xb9},
-	{value: 0x10c9, lo: 0xba, hi: 0xbf},
-	// Block 0x67, offset 0x33a
+	{value: 0x30a2, lo: 0xa0, hi: 0xbf},
+	// Block 0x65, offset 0x330
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x68, offset 0x33d
+	// Block 0x66, offset 0x333
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x8c},
 	{value: 0x0040, lo: 0x8d, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x69, offset 0x341
+	// Block 0x67, offset 0x337
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xbd},
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x6a, offset 0x346
+	// Block 0x68, offset 0x33c
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x6b, offset 0x34b
+	// Block 0x69, offset 0x341
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xa5},
 	{value: 0x0018, lo: 0xa6, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb1},
 	{value: 0x0018, lo: 0xb2, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6c, offset 0x351
+	// Block 0x6a, offset 0x347
 	{value: 0x0000, lo: 0x10},
 	{value: 0x0040, lo: 0x80, hi: 0x81},
 	{value: 0xe00d, lo: 0x82, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0x83},
 	{value: 0x03f5, lo: 0x84, hi: 0x84},
-	{value: 0x0479, lo: 0x85, hi: 0x85},
+	{value: 0x1329, lo: 0x85, hi: 0x85},
 	{value: 0x447d, lo: 0x86, hi: 0x86},
 	{value: 0xe07d, lo: 0x87, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x88},
@@ -3511,10 +3357,10 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x8b, hi: 0xb4},
 	{value: 0xe01d, lo: 0xb5, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xb7},
-	{value: 0x0741, lo: 0xb8, hi: 0xb8},
-	{value: 0x13f1, lo: 0xb9, hi: 0xb9},
+	{value: 0x2009, lo: 0xb8, hi: 0xb8},
+	{value: 0x6ec1, lo: 0xb9, hi: 0xb9},
 	{value: 0x0008, lo: 0xba, hi: 0xbf},
-	// Block 0x6d, offset 0x362
+	// Block 0x6b, offset 0x358
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0008, lo: 0x80, hi: 0x81},
 	{value: 0x3308, lo: 0x82, hi: 0x82},
@@ -3531,19 +3377,19 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x6e, offset 0x372
+	// Block 0x6c, offset 0x368
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0208, lo: 0x80, hi: 0xb1},
 	{value: 0x0108, lo: 0xb2, hi: 0xb2},
 	{value: 0x0008, lo: 0xb3, hi: 0xb3},
 	{value: 0x0018, lo: 0xb4, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6f, offset 0x378
+	// Block 0x6d, offset 0x36e
 	{value: 0x0000, lo: 0x03},
 	{value: 0x3008, lo: 0x80, hi: 0x81},
 	{value: 0x0008, lo: 0x82, hi: 0xb3},
 	{value: 0x3008, lo: 0xb4, hi: 0xbf},
-	// Block 0x70, offset 0x37c
+	// Block 0x6e, offset 0x372
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3008, lo: 0x80, hi: 0x83},
 	{value: 0x3b08, lo: 0x84, hi: 0x84},
@@ -3559,13 +3405,13 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xbc, hi: 0xbc},
 	{value: 0x0008, lo: 0xbd, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x71, offset 0x38b
+	// Block 0x6f, offset 0x381
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa5},
 	{value: 0x3308, lo: 0xa6, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x72, offset 0x390
+	// Block 0x70, offset 0x386
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x3308, lo: 0x87, hi: 0x91},
@@ -3574,7 +3420,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x94, hi: 0x9e},
 	{value: 0x0018, lo: 0x9f, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x73, offset 0x398
+	// Block 0x71, offset 0x38e
 	{value: 0x0000, lo: 0x09},
 	{value: 0x3308, lo: 0x80, hi: 0x82},
 	{value: 0x3008, lo: 0x83, hi: 0x83},
@@ -3585,7 +3431,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xba, hi: 0xbb},
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x74, offset 0x3a2
+	// Block 0x72, offset 0x398
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3808, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x8d},
@@ -3597,7 +3443,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xa5, hi: 0xa5},
 	{value: 0x0008, lo: 0xa6, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x75, offset 0x3ad
+	// Block 0x73, offset 0x3a3
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xa8},
 	{value: 0x3308, lo: 0xa9, hi: 0xae},
@@ -3606,7 +3452,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xb3, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x76, offset 0x3b5
+	// Block 0x74, offset 0x3ab
 	{value: 0x0000, lo: 0x10},
 	{value: 0x0008, lo: 0x80, hi: 0x82},
 	{value: 0x3308, lo: 0x83, hi: 0x83},
@@ -3624,7 +3470,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbc},
 	{value: 0x3008, lo: 0xbd, hi: 0xbd},
 	{value: 0x0008, lo: 0xbe, hi: 0xbf},
-	// Block 0x77, offset 0x3c6
+	// Block 0x75, offset 0x3bc
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb0},
@@ -3634,7 +3480,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xb7, hi: 0xb8},
 	{value: 0x0008, lo: 0xb9, hi: 0xbd},
 	{value: 0x3308, lo: 0xbe, hi: 0xbf},
-	// Block 0x78, offset 0x3cf
+	// Block 0x76, offset 0x3c5
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x81},
@@ -3651,7 +3497,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xb5, hi: 0xb5},
 	{value: 0x3b08, lo: 0xb6, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x79, offset 0x3df
+	// Block 0x77, offset 0x3d5
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x86},
@@ -3665,26 +3511,26 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa8, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x7a, offset 0x3ec
+	// Block 0x78, offset 0x3e2
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x9a},
 	{value: 0x0018, lo: 0x9b, hi: 0x9b},
 	{value: 0x449d, lo: 0x9c, hi: 0x9c},
 	{value: 0x44b5, lo: 0x9d, hi: 0x9d},
-	{value: 0x0941, lo: 0x9e, hi: 0x9e},
+	{value: 0x2971, lo: 0x9e, hi: 0x9e},
 	{value: 0xe06d, lo: 0x9f, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa8},
-	{value: 0x13f9, lo: 0xa9, hi: 0xa9},
+	{value: 0x6ed9, lo: 0xa9, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x44cd, lo: 0xb0, hi: 0xbf},
-	// Block 0x7b, offset 0x3f8
+	// Block 0x79, offset 0x3ee
 	{value: 0x0000, lo: 0x04},
 	{value: 0x44ed, lo: 0x80, hi: 0x8f},
 	{value: 0x450d, lo: 0x90, hi: 0x9f},
 	{value: 0x452d, lo: 0xa0, hi: 0xaf},
 	{value: 0x450d, lo: 0xb0, hi: 0xbf},
-	// Block 0x7c, offset 0x3fd
+	// Block 0x7a, offset 0x3f3
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0xa2},
 	{value: 0x3008, lo: 0xa3, hi: 0xa4},
@@ -3698,76 +3544,76 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x7d, offset 0x40a
+	// Block 0x7b, offset 0x400
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x7e, offset 0x40e
+	// Block 0x7c, offset 0x404
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8a},
 	{value: 0x0018, lo: 0x8b, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x7f, offset 0x413
+	// Block 0x7d, offset 0x409
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0040, lo: 0x80, hi: 0xbf},
-	// Block 0x80, offset 0x415
+	// Block 0x7e, offset 0x40b
 	{value: 0x0020, lo: 0x01},
 	{value: 0x454d, lo: 0x80, hi: 0xbf},
-	// Block 0x81, offset 0x417
+	// Block 0x7f, offset 0x40d
 	{value: 0x0020, lo: 0x03},
 	{value: 0x4d4d, lo: 0x80, hi: 0x94},
 	{value: 0x4b0d, lo: 0x95, hi: 0x95},
 	{value: 0x4fed, lo: 0x96, hi: 0xbf},
-	// Block 0x82, offset 0x41b
+	// Block 0x80, offset 0x411
 	{value: 0x0020, lo: 0x01},
 	{value: 0x552d, lo: 0x80, hi: 0xbf},
-	// Block 0x83, offset 0x41d
+	// Block 0x81, offset 0x413
 	{value: 0x0020, lo: 0x03},
 	{value: 0x5d2d, lo: 0x80, hi: 0x84},
 	{value: 0x568d, lo: 0x85, hi: 0x85},
 	{value: 0x5dcd, lo: 0x86, hi: 0xbf},
-	// Block 0x84, offset 0x421
+	// Block 0x82, offset 0x417
 	{value: 0x0020, lo: 0x08},
 	{value: 0x6b8d, lo: 0x80, hi: 0x8f},
 	{value: 0x6d4d, lo: 0x90, hi: 0x90},
 	{value: 0x6d8d, lo: 0x91, hi: 0xab},
-	{value: 0x1401, lo: 0xac, hi: 0xac},
+	{value: 0x6ef1, lo: 0xac, hi: 0xac},
 	{value: 0x70ed, lo: 0xad, hi: 0xad},
 	{value: 0x0040, lo: 0xae, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x710d, lo: 0xb0, hi: 0xbf},
-	// Block 0x85, offset 0x42a
+	// Block 0x83, offset 0x420
 	{value: 0x0020, lo: 0x05},
 	{value: 0x730d, lo: 0x80, hi: 0xad},
 	{value: 0x656d, lo: 0xae, hi: 0xae},
 	{value: 0x78cd, lo: 0xaf, hi: 0xb5},
 	{value: 0x6f8d, lo: 0xb6, hi: 0xb6},
 	{value: 0x79ad, lo: 0xb7, hi: 0xbf},
-	// Block 0x86, offset 0x430
-	{value: 0x0008, lo: 0x03},
-	{value: 0x1751, lo: 0x80, hi: 0x82},
-	{value: 0x1741, lo: 0x83, hi: 0x83},
-	{value: 0x1769, lo: 0x84, hi: 0xbf},
-	// Block 0x87, offset 0x434
-	{value: 0x0008, lo: 0x0f},
-	{value: 0x1d81, lo: 0x80, hi: 0x83},
-	{value: 0x1d99, lo: 0x84, hi: 0x85},
-	{value: 0x1da1, lo: 0x86, hi: 0x87},
-	{value: 0x1da9, lo: 0x88, hi: 0x8f},
+	// Block 0x84, offset 0x426
+	{value: 0x0028, lo: 0x03},
+	{value: 0x7c71, lo: 0x80, hi: 0x82},
+	{value: 0x7c31, lo: 0x83, hi: 0x83},
+	{value: 0x7ce9, lo: 0x84, hi: 0xbf},
+	// Block 0x85, offset 0x42a
+	{value: 0x0038, lo: 0x0f},
+	{value: 0x9e01, lo: 0x80, hi: 0x83},
+	{value: 0x9ea9, lo: 0x84, hi: 0x85},
+	{value: 0x9ee1, lo: 0x86, hi: 0x87},
+	{value: 0x9f19, lo: 0x88, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x90},
 	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x1de9, lo: 0x92, hi: 0x97},
-	{value: 0x1e11, lo: 0x98, hi: 0x9c},
-	{value: 0x1e31, lo: 0x9d, hi: 0xb3},
-	{value: 0x1d71, lo: 0xb4, hi: 0xb4},
-	{value: 0x1d81, lo: 0xb5, hi: 0xb5},
-	{value: 0x1ee9, lo: 0xb6, hi: 0xbb},
-	{value: 0x1f09, lo: 0xbc, hi: 0xbc},
-	{value: 0x1ef9, lo: 0xbd, hi: 0xbd},
-	{value: 0x1f19, lo: 0xbe, hi: 0xbf},
-	// Block 0x88, offset 0x444
+	{value: 0xa0d9, lo: 0x92, hi: 0x97},
+	{value: 0xa1f1, lo: 0x98, hi: 0x9c},
+	{value: 0xa2d1, lo: 0x9d, hi: 0xb3},
+	{value: 0x9d91, lo: 0xb4, hi: 0xb4},
+	{value: 0x9e01, lo: 0xb5, hi: 0xb5},
+	{value: 0xa7d9, lo: 0xb6, hi: 0xbb},
+	{value: 0xa8b9, lo: 0xbc, hi: 0xbc},
+	{value: 0xa849, lo: 0xbd, hi: 0xbd},
+	{value: 0xa929, lo: 0xbe, hi: 0xbf},
+	// Block 0x86, offset 0x43a
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8c},
@@ -3778,24 +3624,24 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xbc, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbe},
 	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x89, offset 0x44e
+	// Block 0x87, offset 0x444
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x8d},
 	{value: 0x0040, lo: 0x8e, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x8a, offset 0x453
+	// Block 0x88, offset 0x449
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x8b, offset 0x456
+	// Block 0x89, offset 0x44c
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x82},
 	{value: 0x0040, lo: 0x83, hi: 0x86},
 	{value: 0x0018, lo: 0x87, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x8c, offset 0x45c
+	// Block 0x8a, offset 0x452
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x8e},
 	{value: 0x0040, lo: 0x8f, hi: 0x8f},
@@ -3803,31 +3649,31 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x9d, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa0},
 	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x8d, offset 0x463
+	// Block 0x8b, offset 0x459
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbc},
 	{value: 0x3308, lo: 0xbd, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x8e, offset 0x468
+	// Block 0x8c, offset 0x45e
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x9c},
 	{value: 0x0040, lo: 0x9d, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x8f, offset 0x46c
+	// Block 0x8d, offset 0x462
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x90},
 	{value: 0x0040, lo: 0x91, hi: 0x9f},
 	{value: 0x3308, lo: 0xa0, hi: 0xa0},
 	{value: 0x0018, lo: 0xa1, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x90, offset 0x472
+	// Block 0x8e, offset 0x468
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xac},
 	{value: 0x0008, lo: 0xad, hi: 0xbf},
-	// Block 0x91, offset 0x477
+	// Block 0x8f, offset 0x46d
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x81},
@@ -3837,20 +3683,20 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0x90, hi: 0xb5},
 	{value: 0x3308, lo: 0xb6, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x92, offset 0x480
+	// Block 0x90, offset 0x476
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9e},
 	{value: 0x0018, lo: 0x9f, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x93, offset 0x485
+	// Block 0x91, offset 0x47b
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0040, lo: 0x84, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0x94, offset 0x48b
+	// Block 0x92, offset 0x481
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe145, lo: 0x80, hi: 0x87},
 	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
@@ -3858,7 +3704,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x8b0d, lo: 0x98, hi: 0x9f},
 	{value: 0x8b25, lo: 0xa0, hi: 0xa7},
 	{value: 0x0008, lo: 0xa8, hi: 0xbf},
-	// Block 0x95, offset 0x492
+	// Block 0x93, offset 0x488
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9f},
@@ -3866,7 +3712,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xaa, hi: 0xaf},
 	{value: 0x8b25, lo: 0xb0, hi: 0xb7},
 	{value: 0x8b0d, lo: 0xb8, hi: 0xbf},
-	// Block 0x96, offset 0x499
+	// Block 0x94, offset 0x48f
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe145, lo: 0x80, hi: 0x87},
 	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
@@ -3874,28 +3720,28 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x94, hi: 0x97},
 	{value: 0x0008, lo: 0x98, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x97, offset 0x4a0
+	// Block 0x95, offset 0x496
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x98, offset 0x4a4
+	// Block 0x96, offset 0x49a
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xae},
 	{value: 0x0018, lo: 0xaf, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x99, offset 0x4a9
+	// Block 0x97, offset 0x49f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x9a, offset 0x4ac
+	// Block 0x98, offset 0x4a2
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xbf},
-	// Block 0x9b, offset 0x4b1
+	// Block 0x99, offset 0x4a7
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0808, lo: 0x80, hi: 0x85},
 	{value: 0x0040, lo: 0x86, hi: 0x87},
@@ -3908,20 +3754,20 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0808, lo: 0xbc, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbe},
 	{value: 0x0808, lo: 0xbf, hi: 0xbf},
-	// Block 0x9c, offset 0x4bd
+	// Block 0x9a, offset 0x4b3
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x96},
 	{value: 0x0818, lo: 0x97, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb6},
 	{value: 0x0818, lo: 0xb7, hi: 0xbf},
-	// Block 0x9d, offset 0x4c3
+	// Block 0x9b, offset 0x4b9
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0808, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0xa6},
 	{value: 0x0818, lo: 0xa7, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x9e, offset 0x4c8
+	// Block 0x9c, offset 0x4be
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb2},
@@ -3929,7 +3775,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0808, lo: 0xb4, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xba},
 	{value: 0x0818, lo: 0xbb, hi: 0xbf},
-	// Block 0x9f, offset 0x4cf
+	// Block 0x9d, offset 0x4c5
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0818, lo: 0x96, hi: 0x9b},
@@ -3938,18 +3784,18 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0808, lo: 0xa0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbe},
 	{value: 0x0818, lo: 0xbf, hi: 0xbf},
-	// Block 0xa0, offset 0x4d7
+	// Block 0x9e, offset 0x4cd
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0808, lo: 0x80, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbb},
 	{value: 0x0818, lo: 0xbc, hi: 0xbd},
 	{value: 0x0808, lo: 0xbe, hi: 0xbf},
-	// Block 0xa1, offset 0x4dc
+	// Block 0x9f, offset 0x4d2
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0818, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x91},
 	{value: 0x0818, lo: 0x92, hi: 0xbf},
-	// Block 0xa2, offset 0x4e0
+	// Block 0xa0, offset 0x4d6
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0808, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x83},
@@ -3966,7 +3812,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xb8, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xa3, offset 0x4f0
+	// Block 0xa1, offset 0x4e6
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0818, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
@@ -3974,17 +3820,17 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xbc},
 	{value: 0x0818, lo: 0xbd, hi: 0xbf},
-	// Block 0xa4, offset 0x4f7
+	// Block 0xa2, offset 0x4ed
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0x9c},
 	{value: 0x0818, lo: 0x9d, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xa5, offset 0x4fb
+	// Block 0xa3, offset 0x4f1
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xb8},
 	{value: 0x0018, lo: 0xb9, hi: 0xbf},
-	// Block 0xa6, offset 0x4ff
+	// Block 0xa4, offset 0x4f5
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x97},
@@ -3992,23 +3838,23 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0808, lo: 0xa0, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xb7},
 	{value: 0x0818, lo: 0xb8, hi: 0xbf},
-	// Block 0xa7, offset 0x506
+	// Block 0xa5, offset 0x4fc
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0808, lo: 0x80, hi: 0xbf},
-	// Block 0xa8, offset 0x508
+	// Block 0xa6, offset 0x4fe
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0808, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xa9, offset 0x50b
+	// Block 0xa7, offset 0x501
 	{value: 0x0000, lo: 0x02},
 	{value: 0x03dd, lo: 0x80, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xaa, offset 0x50e
+	// Block 0xa8, offset 0x504
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xb9},
 	{value: 0x0818, lo: 0xba, hi: 0xbf},
-	// Block 0xab, offset 0x512
+	// Block 0xa9, offset 0x508
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0908, lo: 0x80, hi: 0x80},
 	{value: 0x0a08, lo: 0x81, hi: 0xa1},
@@ -4018,12 +3864,12 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0808, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xac, offset 0x51b
+	// Block 0xaa, offset 0x511
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0818, lo: 0xa0, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xad, offset 0x51f
+	// Block 0xab, offset 0x515
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xaa},
@@ -4032,7 +3878,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0808, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xae, offset 0x527
+	// Block 0xac, offset 0x51d
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0x9c},
 	{value: 0x0818, lo: 0x9d, hi: 0xa6},
@@ -4041,7 +3887,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0a08, lo: 0xb0, hi: 0xb2},
 	{value: 0x0c08, lo: 0xb3, hi: 0xb3},
 	{value: 0x0a08, lo: 0xb4, hi: 0xbf},
-	// Block 0xaf, offset 0x52f
+	// Block 0xad, offset 0x525
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0a08, lo: 0x80, hi: 0x84},
 	{value: 0x0808, lo: 0x85, hi: 0x85},
@@ -4050,7 +3896,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0c18, lo: 0x94, hi: 0x94},
 	{value: 0x0818, lo: 0x95, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xb0, offset 0x537
+	// Block 0xae, offset 0x52d
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0a08, lo: 0xb0, hi: 0xb0},
@@ -4063,7 +3909,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0a08, lo: 0xbb, hi: 0xbc},
 	{value: 0x0c08, lo: 0xbd, hi: 0xbd},
 	{value: 0x0a08, lo: 0xbe, hi: 0xbf},
-	// Block 0xb1, offset 0x543
+	// Block 0xaf, offset 0x539
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0808, lo: 0x80, hi: 0x80},
 	{value: 0x0a08, lo: 0x81, hi: 0x81},
@@ -4076,14 +3922,14 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x8c, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb2, offset 0x54f
+	// Block 0xb0, offset 0x545
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0xb7},
 	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xb3, offset 0x555
+	// Block 0xb1, offset 0x54b
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x85},
 	{value: 0x3b08, lo: 0x86, hi: 0x86},
@@ -4093,7 +3939,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa6, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xb4, offset 0x55e
+	// Block 0xb2, offset 0x554
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x3308, lo: 0x80, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
@@ -4106,7 +3952,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xbb, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbd},
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0xb5, offset 0x56a
+	// Block 0xb3, offset 0x560
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x81},
 	{value: 0x0040, lo: 0x82, hi: 0x8f},
@@ -4114,7 +3960,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa9, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xb6, offset 0x571
+	// Block 0xb4, offset 0x567
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0xa6},
@@ -4124,7 +3970,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3b08, lo: 0xb3, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xbf},
-	// Block 0xb7, offset 0x57a
+	// Block 0xb5, offset 0x570
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0018, lo: 0x80, hi: 0x83},
 	{value: 0x0008, lo: 0x84, hi: 0x84},
@@ -4136,7 +3982,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xb4, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb8, offset 0x585
+	// Block 0xb6, offset 0x57b
 	{value: 0x0000, lo: 0x06},
 	{value: 0x3308, lo: 0x80, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
@@ -4144,7 +3990,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xb3, hi: 0xb5},
 	{value: 0x3308, lo: 0xb6, hi: 0xbe},
 	{value: 0x3008, lo: 0xbf, hi: 0xbf},
-	// Block 0xb9, offset 0x58c
+	// Block 0xb7, offset 0x582
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3808, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x84},
@@ -4160,7 +4006,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa0, hi: 0xa0},
 	{value: 0x0018, lo: 0xa1, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xba, offset 0x59b
+	// Block 0xb8, offset 0x591
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x91},
 	{value: 0x0040, lo: 0x92, hi: 0x92},
@@ -4174,7 +4020,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xb8, hi: 0xbd},
 	{value: 0x3308, lo: 0xbe, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xbb, offset 0x5a8
+	// Block 0xb9, offset 0x59e
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4188,7 +4034,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0xa9, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xbc, offset 0x5b5
+	// Block 0xba, offset 0x5ab
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x3308, lo: 0x9f, hi: 0x9f},
@@ -4198,12 +4044,12 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xab, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xbd, offset 0x5be
+	// Block 0xbb, offset 0x5b4
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xb4},
 	{value: 0x3008, lo: 0xb5, hi: 0xb7},
 	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xbe, offset 0x5c2
+	// Block 0xbc, offset 0x5b8
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3008, lo: 0x80, hi: 0x81},
 	{value: 0x3b08, lo: 0x82, hi: 0x82},
@@ -4219,7 +4065,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0x9e, hi: 0x9e},
 	{value: 0x0008, lo: 0x9f, hi: 0xa1},
 	{value: 0x0040, lo: 0xa2, hi: 0xbf},
-	// Block 0xbf, offset 0x5d1
+	// Block 0xbd, offset 0x5c7
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb2},
@@ -4228,7 +4074,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xba, hi: 0xba},
 	{value: 0x3008, lo: 0xbb, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xc0, offset 0x5d9
+	// Block 0xbe, offset 0x5cf
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x3008, lo: 0x81, hi: 0x81},
@@ -4240,7 +4086,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xc1, offset 0x5e4
+	// Block 0xbf, offset 0x5da
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xae},
 	{value: 0x3008, lo: 0xaf, hi: 0xb1},
@@ -4250,14 +4096,14 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc2, offset 0x5ed
+	// Block 0xc0, offset 0x5e3
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x97},
 	{value: 0x0008, lo: 0x98, hi: 0x9b},
 	{value: 0x3308, lo: 0x9c, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0xc3, offset 0x5f3
+	// Block 0xc1, offset 0x5e9
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb2},
@@ -4266,7 +4112,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xbd, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc4, offset 0x5fb
+	// Block 0xc2, offset 0x5f1
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x83},
@@ -4276,7 +4122,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x9a, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xac},
 	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xc5, offset 0x604
+	// Block 0xc3, offset 0x5fa
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0xaa},
 	{value: 0x3308, lo: 0xab, hi: 0xab},
@@ -4288,11 +4134,11 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xb7, hi: 0xb7},
 	{value: 0x0008, lo: 0xb8, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xc6, offset 0x60f
+	// Block 0xc4, offset 0x605
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x0040, lo: 0x8a, hi: 0xbf},
-	// Block 0xc7, offset 0x612
+	// Block 0xc5, offset 0x608
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x9a},
 	{value: 0x0040, lo: 0x9b, hi: 0x9c},
@@ -4305,7 +4151,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0xc8, offset 0x61e
+	// Block 0xc6, offset 0x614
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xab},
 	{value: 0x3008, lo: 0xac, hi: 0xae},
@@ -4315,17 +4161,17 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xba, hi: 0xba},
 	{value: 0x0018, lo: 0xbb, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xc9, offset 0x627
+	// Block 0xc7, offset 0x61d
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x049d, lo: 0xa0, hi: 0xbf},
-	// Block 0xca, offset 0x62a
+	// Block 0xc8, offset 0x620
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xbe},
 	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0xcb, offset 0x62f
+	// Block 0xc9, offset 0x625
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3008, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x81},
@@ -4335,13 +4181,13 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xcc, offset 0x638
+	// Block 0xca, offset 0x62e
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xa9},
 	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xcd, offset 0x63d
+	// Block 0xcb, offset 0x633
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x90},
 	{value: 0x3008, lo: 0x91, hi: 0x93},
@@ -4355,7 +4201,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa3, hi: 0xa3},
 	{value: 0x3008, lo: 0xa4, hi: 0xa4},
 	{value: 0x0040, lo: 0xa5, hi: 0xbf},
-	// Block 0xce, offset 0x64a
+	// Block 0xcc, offset 0x640
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x8a},
@@ -4367,7 +4213,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xba, hi: 0xba},
 	{value: 0x3308, lo: 0xbb, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xcf, offset 0x655
+	// Block 0xcd, offset 0x64b
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x3b08, lo: 0x87, hi: 0x87},
@@ -4377,7 +4223,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0x97, hi: 0x98},
 	{value: 0x3308, lo: 0x99, hi: 0x9b},
 	{value: 0x0008, lo: 0x9c, hi: 0xbf},
-	// Block 0xd0, offset 0x65e
+	// Block 0xce, offset 0x654
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x3308, lo: 0x8a, hi: 0x96},
@@ -4388,11 +4234,11 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0x9d, hi: 0x9d},
 	{value: 0x0018, lo: 0x9e, hi: 0xa2},
 	{value: 0x0040, lo: 0xa3, hi: 0xbf},
-	// Block 0xd1, offset 0x668
+	// Block 0xcf, offset 0x65e
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd2, offset 0x66b
+	// Block 0xd0, offset 0x661
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x89},
@@ -4403,7 +4249,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xb8, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xd3, offset 0x675
+	// Block 0xd1, offset 0x66b
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x85},
@@ -4413,7 +4259,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0008, lo: 0xb2, hi: 0xbf},
-	// Block 0xd4, offset 0x67e
+	// Block 0xd2, offset 0x674
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x91},
@@ -4426,7 +4272,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xb4, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xd5, offset 0x68a
+	// Block 0xd3, offset 0x680
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4440,7 +4286,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xd6, offset 0x697
+	// Block 0xd4, offset 0x68d
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x3308, lo: 0x80, hi: 0x83},
 	{value: 0x3b08, lo: 0x84, hi: 0x85},
@@ -4454,7 +4300,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa7, hi: 0xa8},
 	{value: 0x0040, lo: 0xa9, hi: 0xa9},
 	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xd7, offset 0x6a4
+	// Block 0xd5, offset 0x69a
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x3008, lo: 0x8a, hi: 0x8e},
@@ -4469,7 +4315,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xbf},
-	// Block 0xd8, offset 0x6b2
+	// Block 0xd6, offset 0x6a8
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xb2},
@@ -4477,41 +4323,41 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3008, lo: 0xb5, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd9, offset 0x6b9
+	// Block 0xd7, offset 0x6af
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb0},
 	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0xda, offset 0x6bd
+	// Block 0xd8, offset 0x6b3
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xdb, offset 0x6c1
+	// Block 0xd9, offset 0x6b7
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xdc, offset 0x6c4
+	// Block 0xda, offset 0x6ba
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xdd, offset 0x6c9
+	// Block 0xdb, offset 0x6bf
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0040, lo: 0x84, hi: 0xbf},
-	// Block 0xde, offset 0x6cc
+	// Block 0xdc, offset 0x6c2
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0340, lo: 0xb0, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xdf, offset 0x6d1
+	// Block 0xdd, offset 0x6c7
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0xbf},
-	// Block 0xe0, offset 0x6d4
+	// Block 0xde, offset 0x6ca
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0x9f},
@@ -4519,7 +4365,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xaa, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xe1, offset 0x6db
+	// Block 0xdf, offset 0x6d1
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xad},
@@ -4527,12 +4373,12 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x3308, lo: 0xb0, hi: 0xb4},
 	{value: 0x0018, lo: 0xb5, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xe2, offset 0x6e2
+	// Block 0xe0, offset 0x6d8
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0xe3, offset 0x6e6
+	// Block 0xe1, offset 0x6dc
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0018, lo: 0x84, hi: 0x85},
@@ -4544,33 +4390,33 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa3, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbc},
 	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0xe4, offset 0x6f1
+	// Block 0xe2, offset 0x6e7
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0xe5, offset 0x6f4
+	// Block 0xe3, offset 0x6ea
 	{value: 0x0000, lo: 0x02},
 	{value: 0xe105, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0xe6, offset 0x6f7
+	// Block 0xe4, offset 0x6ed
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0x9a},
 	{value: 0x0040, lo: 0x9b, hi: 0xbf},
-	// Block 0xe7, offset 0x6fa
+	// Block 0xe5, offset 0x6f0
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0x8e},
 	{value: 0x3308, lo: 0x8f, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x90},
 	{value: 0x3008, lo: 0x91, hi: 0xbf},
-	// Block 0xe8, offset 0x700
+	// Block 0xe6, offset 0x6f6
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3008, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8e},
 	{value: 0x3308, lo: 0x8f, hi: 0x92},
 	{value: 0x0008, lo: 0x93, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xe9, offset 0x706
+	// Block 0xe7, offset 0x6fc
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa1},
@@ -4580,23 +4426,23 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa5, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xea, offset 0x70f
+	// Block 0xe8, offset 0x705
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0xeb, offset 0x712
+	// Block 0xe9, offset 0x708
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0xec, offset 0x715
+	// Block 0xea, offset 0x70b
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xed, offset 0x718
+	// Block 0xeb, offset 0x70e
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0xbf},
-	// Block 0xee, offset 0x71b
+	// Block 0xec, offset 0x711
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x92},
@@ -4604,17 +4450,17 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0008, lo: 0xa4, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xef, offset 0x722
+	// Block 0xed, offset 0x718
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xf0, offset 0x725
+	// Block 0xee, offset 0x71b
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xaa},
 	{value: 0x0040, lo: 0xab, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0xf1, offset 0x72a
+	// Block 0xef, offset 0x720
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
@@ -4625,32 +4471,32 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0x9f, hi: 0x9f},
 	{value: 0x03c0, lo: 0xa0, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xbf},
-	// Block 0xf2, offset 0x734
+	// Block 0xf0, offset 0x72a
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xf3, offset 0x737
+	// Block 0xf1, offset 0x72d
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xa6},
 	{value: 0x0040, lo: 0xa7, hi: 0xa8},
 	{value: 0x0018, lo: 0xa9, hi: 0xbf},
-	// Block 0xf4, offset 0x73b
+	// Block 0xf2, offset 0x731
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x0018, lo: 0x80, hi: 0x9d},
-	{value: 0x2211, lo: 0x9e, hi: 0x9e},
-	{value: 0x2219, lo: 0x9f, hi: 0x9f},
-	{value: 0x2221, lo: 0xa0, hi: 0xa0},
-	{value: 0x2229, lo: 0xa1, hi: 0xa1},
-	{value: 0x2231, lo: 0xa2, hi: 0xa2},
-	{value: 0x2239, lo: 0xa3, hi: 0xa3},
-	{value: 0x2241, lo: 0xa4, hi: 0xa4},
+	{value: 0xb609, lo: 0x9e, hi: 0x9e},
+	{value: 0xb651, lo: 0x9f, hi: 0x9f},
+	{value: 0xb699, lo: 0xa0, hi: 0xa0},
+	{value: 0xb701, lo: 0xa1, hi: 0xa1},
+	{value: 0xb769, lo: 0xa2, hi: 0xa2},
+	{value: 0xb7d1, lo: 0xa3, hi: 0xa3},
+	{value: 0xb839, lo: 0xa4, hi: 0xa4},
 	{value: 0x3018, lo: 0xa5, hi: 0xa6},
 	{value: 0x3318, lo: 0xa7, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xac},
 	{value: 0x3018, lo: 0xad, hi: 0xb2},
 	{value: 0x0340, lo: 0xb3, hi: 0xba},
 	{value: 0x3318, lo: 0xbb, hi: 0xbf},
-	// Block 0xf5, offset 0x74a
+	// Block 0xf3, offset 0x740
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x3318, lo: 0x80, hi: 0x82},
 	{value: 0x0018, lo: 0x83, hi: 0x84},
@@ -4658,45 +4504,45 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0018, lo: 0x8c, hi: 0xa9},
 	{value: 0x3318, lo: 0xaa, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xba},
-	{value: 0x2249, lo: 0xbb, hi: 0xbb},
-	{value: 0x2251, lo: 0xbc, hi: 0xbc},
-	{value: 0x2259, lo: 0xbd, hi: 0xbd},
-	{value: 0x2261, lo: 0xbe, hi: 0xbe},
-	{value: 0x2269, lo: 0xbf, hi: 0xbf},
-	// Block 0xf6, offset 0x756
+	{value: 0xb8a1, lo: 0xbb, hi: 0xbb},
+	{value: 0xb8e9, lo: 0xbc, hi: 0xbc},
+	{value: 0xb931, lo: 0xbd, hi: 0xbd},
+	{value: 0xb999, lo: 0xbe, hi: 0xbe},
+	{value: 0xba01, lo: 0xbf, hi: 0xbf},
+	// Block 0xf4, offset 0x74c
 	{value: 0x0000, lo: 0x03},
-	{value: 0x2271, lo: 0x80, hi: 0x80},
+	{value: 0xba69, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0xa8},
 	{value: 0x0040, lo: 0xa9, hi: 0xbf},
-	// Block 0xf7, offset 0x75a
+	// Block 0xf5, offset 0x750
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x81},
 	{value: 0x3318, lo: 0x82, hi: 0x84},
 	{value: 0x0018, lo: 0x85, hi: 0x85},
 	{value: 0x0040, lo: 0x86, hi: 0xbf},
-	// Block 0xf8, offset 0x75f
+	// Block 0xf6, offset 0x755
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0xf9, offset 0x763
+	// Block 0xf7, offset 0x759
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xfa, offset 0x768
+	// Block 0xf8, offset 0x75e
 	{value: 0x0000, lo: 0x03},
 	{value: 0x3308, lo: 0x80, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xba},
 	{value: 0x3308, lo: 0xbb, hi: 0xbf},
-	// Block 0xfb, offset 0x76c
+	// Block 0xf9, offset 0x762
 	{value: 0x0000, lo: 0x04},
 	{value: 0x3308, lo: 0x80, hi: 0xac},
 	{value: 0x0018, lo: 0xad, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb5},
 	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0xfc, offset 0x771
+	// Block 0xfa, offset 0x767
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x83},
 	{value: 0x3308, lo: 0x84, hi: 0x84},
@@ -4706,7 +4552,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa0, hi: 0xa0},
 	{value: 0x3308, lo: 0xa1, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xfd, offset 0x77a
+	// Block 0xfb, offset 0x770
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3308, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4718,35 +4564,35 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa5, hi: 0xa5},
 	{value: 0x3308, lo: 0xa6, hi: 0xaa},
 	{value: 0x0040, lo: 0xab, hi: 0xbf},
-	// Block 0xfe, offset 0x785
+	// Block 0xfc, offset 0x77b
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xac},
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb6},
 	{value: 0x0008, lo: 0xb7, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0xff, offset 0x78b
+	// Block 0xfd, offset 0x781
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x0040, lo: 0x8a, hi: 0x8d},
 	{value: 0x0008, lo: 0x8e, hi: 0x8e},
 	{value: 0x0018, lo: 0x8f, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0x100, offset 0x791
+	// Block 0xfe, offset 0x787
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xab},
 	{value: 0x3308, lo: 0xac, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x101, offset 0x797
+	// Block 0xff, offset 0x78d
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0808, lo: 0x80, hi: 0x84},
 	{value: 0x0040, lo: 0x85, hi: 0x86},
 	{value: 0x0818, lo: 0x87, hi: 0x8f},
 	{value: 0x3308, lo: 0x90, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0x102, offset 0x79d
+	// Block 0x100, offset 0x793
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0a08, lo: 0x80, hi: 0x83},
 	{value: 0x3308, lo: 0x84, hi: 0x8a},
@@ -4756,71 +4602,71 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0x9a, hi: 0x9d},
 	{value: 0x0818, lo: 0x9e, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x103, offset 0x7a6
+	// Block 0x101, offset 0x79c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0xb0},
 	{value: 0x0818, lo: 0xb1, hi: 0xbf},
-	// Block 0x104, offset 0x7a9
+	// Block 0x102, offset 0x79f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0818, lo: 0x80, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x105, offset 0x7ac
+	// Block 0x103, offset 0x7a2
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0818, lo: 0x81, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x106, offset 0x7b0
+	// Block 0x104, offset 0x7a6
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x107, offset 0x7b4
+	// Block 0x105, offset 0x7aa
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x108, offset 0x7b8
+	// Block 0x106, offset 0x7ae
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x93},
 	{value: 0x0040, lo: 0x94, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xb0},
 	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0x109, offset 0x7be
+	// Block 0x107, offset 0x7b4
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x90},
 	{value: 0x0018, lo: 0x91, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0x10a, offset 0x7c4
+	// Block 0x108, offset 0x7ba
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x8f},
-	{value: 0x2491, lo: 0x90, hi: 0x90},
+	{value: 0xc229, lo: 0x90, hi: 0x90},
 	{value: 0x0018, lo: 0x91, hi: 0xad},
 	{value: 0x0040, lo: 0xae, hi: 0xbf},
-	// Block 0x10b, offset 0x7c9
+	// Block 0x109, offset 0x7bf
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0xa5},
 	{value: 0x0018, lo: 0xa6, hi: 0xbf},
-	// Block 0x10c, offset 0x7cc
+	// Block 0x10a, offset 0x7c2
 	{value: 0x0000, lo: 0x0f},
-	{value: 0x2611, lo: 0x80, hi: 0x80},
-	{value: 0x2619, lo: 0x81, hi: 0x81},
-	{value: 0x2621, lo: 0x82, hi: 0x82},
-	{value: 0x2629, lo: 0x83, hi: 0x83},
-	{value: 0x2631, lo: 0x84, hi: 0x84},
-	{value: 0x2639, lo: 0x85, hi: 0x85},
-	{value: 0x2641, lo: 0x86, hi: 0x86},
-	{value: 0x2649, lo: 0x87, hi: 0x87},
-	{value: 0x2651, lo: 0x88, hi: 0x88},
+	{value: 0xc851, lo: 0x80, hi: 0x80},
+	{value: 0xc8a1, lo: 0x81, hi: 0x81},
+	{value: 0xc8f1, lo: 0x82, hi: 0x82},
+	{value: 0xc941, lo: 0x83, hi: 0x83},
+	{value: 0xc991, lo: 0x84, hi: 0x84},
+	{value: 0xc9e1, lo: 0x85, hi: 0x85},
+	{value: 0xca31, lo: 0x86, hi: 0x86},
+	{value: 0xca81, lo: 0x87, hi: 0x87},
+	{value: 0xcad1, lo: 0x88, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x2659, lo: 0x90, hi: 0x90},
-	{value: 0x2661, lo: 0x91, hi: 0x91},
+	{value: 0xcb21, lo: 0x90, hi: 0x90},
+	{value: 0xcb41, lo: 0x91, hi: 0x91},
 	{value: 0x0040, lo: 0x92, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa5},
 	{value: 0x0040, lo: 0xa6, hi: 0xbf},
-	// Block 0x10d, offset 0x7dc
+	// Block 0x10b, offset 0x7d2
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x97},
 	{value: 0x0040, lo: 0x98, hi: 0x9f},
@@ -4828,29 +4674,29 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x10e, offset 0x7e3
+	// Block 0x10c, offset 0x7d9
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x10f, offset 0x7e6
+	// Block 0x10d, offset 0x7dc
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x98},
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x110, offset 0x7eb
+	// Block 0x10e, offset 0x7e1
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x111, offset 0x7ef
+	// Block 0x10f, offset 0x7e5
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0x112, offset 0x7f5
+	// Block 0x110, offset 0x7eb
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
@@ -4858,17 +4704,17 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x113, offset 0x7fc
+	// Block 0x111, offset 0x7f2
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xb9},
 	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0x114, offset 0x800
+	// Block 0x112, offset 0x7f6
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0xbf},
-	// Block 0x115, offset 0x804
+	// Block 0x113, offset 0x7fa
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x93},
 	{value: 0x0040, lo: 0x94, hi: 0x9f},
@@ -4878,7 +4724,7 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xb5, hi: 0xb7},
 	{value: 0x0018, lo: 0xb8, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x116, offset 0x80d
+	// Block 0x114, offset 0x803
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
@@ -4886,74 +4732,109 @@ var idnaSparseValues = [2123]valueRange{
 	{value: 0x0040, lo: 0xa9, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x117, offset 0x814
+	// Block 0x115, offset 0x80a
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x82},
 	{value: 0x0040, lo: 0x83, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0x118, offset 0x819
+	// Block 0x116, offset 0x80f
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x92},
 	{value: 0x0040, lo: 0x93, hi: 0x93},
 	{value: 0x0018, lo: 0x94, hi: 0xbf},
-	// Block 0x119, offset 0x81d
+	// Block 0x117, offset 0x813
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x0018, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0xaf},
-	{value: 0x06e1, lo: 0xb0, hi: 0xb0},
-	{value: 0x0049, lo: 0xb1, hi: 0xb1},
-	{value: 0x0029, lo: 0xb2, hi: 0xb2},
-	{value: 0x0031, lo: 0xb3, hi: 0xb3},
-	{value: 0x06e9, lo: 0xb4, hi: 0xb4},
-	{value: 0x06f1, lo: 0xb5, hi: 0xb5},
-	{value: 0x06f9, lo: 0xb6, hi: 0xb6},
-	{value: 0x0701, lo: 0xb7, hi: 0xb7},
-	{value: 0x0709, lo: 0xb8, hi: 0xb8},
-	{value: 0x0711, lo: 0xb9, hi: 0xb9},
+	{value: 0x1f41, lo: 0xb0, hi: 0xb0},
+	{value: 0x00c9, lo: 0xb1, hi: 0xb1},
+	{value: 0x0069, lo: 0xb2, hi: 0xb2},
+	{value: 0x0079, lo: 0xb3, hi: 0xb3},
+	{value: 0x1f51, lo: 0xb4, hi: 0xb4},
+	{value: 0x1f61, lo: 0xb5, hi: 0xb5},
+	{value: 0x1f71, lo: 0xb6, hi: 0xb6},
+	{value: 0x1f81, lo: 0xb7, hi: 0xb7},
+	{value: 0x1f91, lo: 0xb8, hi: 0xb8},
+	{value: 0x1fa1, lo: 0xb9, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x11a, offset 0x82b
+	// Block 0x118, offset 0x821
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x11b, offset 0x82e
+	// Block 0x119, offset 0x824
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x11c, offset 0x831
+	// Block 0x11a, offset 0x827
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x11d, offset 0x835
+	// Block 0x11b, offset 0x82b
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa1},
 	{value: 0x0040, lo: 0xa2, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x11e, offset 0x839
+	// Block 0x11c, offset 0x82f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xa0},
 	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x11f, offset 0x83c
+	// Block 0x11d, offset 0x832
+	{value: 0x0020, lo: 0x0f},
+	{value: 0xdf21, lo: 0x80, hi: 0x89},
+	{value: 0x8e35, lo: 0x8a, hi: 0x8a},
+	{value: 0xe061, lo: 0x8b, hi: 0x9c},
+	{value: 0x8e55, lo: 0x9d, hi: 0x9d},
+	{value: 0xe2a1, lo: 0x9e, hi: 0xa2},
+	{value: 0x8e75, lo: 0xa3, hi: 0xa3},
+	{value: 0xe341, lo: 0xa4, hi: 0xab},
+	{value: 0x7f0d, lo: 0xac, hi: 0xac},
+	{value: 0xe441, lo: 0xad, hi: 0xaf},
+	{value: 0x8e95, lo: 0xb0, hi: 0xb0},
+	{value: 0xe4a1, lo: 0xb1, hi: 0xb6},
+	{value: 0x8eb5, lo: 0xb7, hi: 0xb9},
+	{value: 0xe561, lo: 0xba, hi: 0xba},
+	{value: 0x8f15, lo: 0xbb, hi: 0xbb},
+	{value: 0xe581, lo: 0xbc, hi: 0xbf},
+	// Block 0x11e, offset 0x842
+	{value: 0x0020, lo: 0x10},
+	{value: 0x93b5, lo: 0x80, hi: 0x80},
+	{value: 0xf101, lo: 0x81, hi: 0x86},
+	{value: 0x93d5, lo: 0x87, hi: 0x8a},
+	{value: 0xda61, lo: 0x8b, hi: 0x8b},
+	{value: 0xf1c1, lo: 0x8c, hi: 0x96},
+	{value: 0x9455, lo: 0x97, hi: 0x97},
+	{value: 0xf321, lo: 0x98, hi: 0xa3},
+	{value: 0x9475, lo: 0xa4, hi: 0xa6},
+	{value: 0xf4a1, lo: 0xa7, hi: 0xaa},
+	{value: 0x94d5, lo: 0xab, hi: 0xab},
+	{value: 0xf521, lo: 0xac, hi: 0xac},
+	{value: 0x94f5, lo: 0xad, hi: 0xad},
+	{value: 0xf541, lo: 0xae, hi: 0xaf},
+	{value: 0x9515, lo: 0xb0, hi: 0xb1},
+	{value: 0xf581, lo: 0xb2, hi: 0xbe},
+	{value: 0x2040, lo: 0xbf, hi: 0xbf},
+	// Block 0x11f, offset 0x853
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0xbf},
-	// Block 0x120, offset 0x83f
+	// Block 0x120, offset 0x856
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0340, lo: 0x81, hi: 0x81},
 	{value: 0x0040, lo: 0x82, hi: 0x9f},
 	{value: 0x0340, lo: 0xa0, hi: 0xbf},
-	// Block 0x121, offset 0x844
+	// Block 0x121, offset 0x85b
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0340, lo: 0x80, hi: 0xbf},
-	// Block 0x122, offset 0x846
+	// Block 0x122, offset 0x85d
 	{value: 0x0000, lo: 0x01},
 	{value: 0x33c0, lo: 0x80, hi: 0xbf},
-	// Block 0x123, offset 0x848
+	// Block 0x123, offset 0x85f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x33c0, lo: 0x80, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
 }
 
-// Total table size 44953 bytes (43KiB); checksum: D51909DD
+// Total table size 43370 bytes (42KiB); checksum: EBD909C0
diff --git a/vendor/golang.org/x/net/idna/tables15.0.0.go b/vendor/golang.org/x/net/idna/tables15.0.0.go
deleted file mode 100644
index 5ff05fe..0000000
--- a/vendor/golang.org/x/net/idna/tables15.0.0.go
+++ /dev/null
@@ -1,5144 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-//go:build go1.21
-
-package idna
-
-// UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "15.0.0"
-
-var mappings string = "" + // Size: 6704 bytes
-	"  ̈a ̄23 � ̧1o1�41�23�4i̇l·ʼnsdžⱥⱦhjrwy ̆ ̇ ̊ ̨ ̃ ̋lẍ� ι; ̈�եւاٴوٴۇٴيٴक" +
-	"़ख़ग़ज़ड़ढ़फ़य़ড়ঢ়য়ਲ਼ਸ਼ਖ਼ਗ਼ਜ਼ਫ਼ଡ଼ଢ଼�า�າຫນຫມགྷཌྷདྷབྷཛྷཀྵཱཱིུྲྀྲཱྀླྀླཱ" +
-	"ཱྀྀྒྷྜྷྡྷྦྷྫྷ�ྵвдо�тъѣæbde�gikmnȣptu�ɑəɛɜŋɔɯvβγδφχ�нɒcɕðfɟɡɥɨɩɪ�ɭʟɱɰɲɳ" +
-	"ɴɵɸʂʃƫʉʊʋʌz�ʑʒθssάέήίό�ώἀι�ιἂιἃιἄιἅιἆιἇιἠιἡιἢιἣιἤιἥιἦιἧιὠιὡιὢιὣιὤιὥιὦιὧ" +
-	"ιὰιαιάιᾶιι ̈͂ὴιηιήιῆι ̓̀ ̓� ̓͂� ̔̀ ̔� ̔͂ΰ ̈̀`ὼιωιώιῶι′′′′′‵‵‵‵‵!!???!!?" +
-	"′′′′0456789+=()rsħnoqsmtmωå�בגדπ1�71�91�101�32�31�52�53�54�51�65�61�83" +
-	"�85�87�81�iiivviviiiixxi0�3∫∫∫∫∫∮∮∮∮∮1011121314151617181920(10)(11)(12" +
-	")(13)(14)(15)(16)(17)(18)(19)(20)∫∫∫∫==�̸ɫɽȿɀ. ゙ ゚よりコト(ᄀ)(ᄂ)(ᄃ)(ᄅ)(ᄆ)(ᄇ)" +
-	"(ᄉ)(ᄋ)(ᄌ)(ᄎ)(�)(�)(ᄑ)(ᄒ)(가)(나)(다)(�)(마)(바)(사)(아)(�)(차)(카)(타)(파)(하)(주)(오전" +
-	")(오후)(一)(二)(三)(四)(五)(六)(七)(八)(�)(�)(月)(�)(水)(木)(金)(土)(日)(株)(有)(社)(�)(特)(" +
-	"財)(�)(労)(代)(呼)(学)(監)(�)(資)(�)(祭)(休)(自)(至)21222324252627282930313233343" +
-	"5참고주�3637383940414243444546474849501月2月3月4月5月6月7月8月9月10月11月12月hgev令和アパート" +
-	"アルファアンペアアールイニングイン�ウォンエスクードエーカーオンスオームカイリカラットカロリーガロンガンマギガギニーキュリーギルダーキロキロ" +
-	"グラムキロメートルキロワットグラムグラムトンクルゼイロクロー�ケースコルナコー�サイクルサン�ームシリングセン�セントダースデシドルトンナノ" +
-	"ノット�イツパーセントパーツ�ーレルピアストルピクルピコビルファラッドフィートブッシェルフランヘクタールペソペニヒヘルツペンスページベータ�" +
-	"イントボルトホン�ンドホールホーンマイクロマイルマッ�マルクマンションミクロンミリミリ�ールメガメガトンメートルヤードヤールユアンリットルリ" +
-	"ラルピールーブルレムレントゲンワット0点1点2点3点4点5点6点7点8点9点10点11点12点13点14点15点16点17点18点19点20" +
-	"点21点22点23点24点daauovpcdmiu平�昭和大正明治株�会社panamakakbmbgbkcalpfnfmgkghzmldlk" +
-	"lfmnmmmcmkmm2m3m∕sm∕s2rad∕srad∕s2psnsmspvnvmvkvpwnwmwkwbqcccdc∕kgdbgyhah" +
-	"pinkkktlmlnlxphprsrsvwbv∕ma∕m1日2日3日4日5日6日7日8日9日10日11日12日13日14日15日16日17日1" +
-	"8日19日20日21日22日23日24日25日26日27日28日29日30日31日ьɦɬʞʇœ�𤋮𢡊𢡄�𥉉�𧻓fffiflstմնմեմիվնմ" +
-	"խיִײַעהכל�רתש�שׂשּ�שּׂ�ַ�ָ�ּבּגּדּהּוּזּטּיּךּכּלּמּנּסּףּפּצּקּרּשּתּו" +
-	"ֹבֿכֿפֿ�לٱٻپڀٺٿٹڤڦڄڃچڇ�ڌڎڈژڑکگڳڱںڻۀ�ھےۓڭۇۆۈۋۅۉ�ىئائەئوئۇئۆئۈئ�ئىیئجئحئم" +
-	"ئيبجبحبخبمبىبيتجتحتختمتىتيثجثمثىثيجحجمحجحمخجخحخمسجسحسخسمصحصمضجضحضخضمطحط" +
-	"مظمعجعمغجغم�ج�ح�خ�م�ى�يقحقمقىقيكاكجكحكخكلكمكىكيلجلحلخلملىليمجمحمخمممىمي" +
-	"نجنحنخنمنىنيهجهمهىهييجيحيخيميىييذٰرٰىٰ ٌّ �ّ َّ �ّ �ّ ّٰئرئزئنبربزبنترت" +
-	"زتنثرثزثنمانرنزننيريزينئخئهبهتهصخلهنههٰيهثهسهشمشهـَّـ�ّـ�ّطىطيعىعيغىغيس" +
-	"ىسيشىشيحىحيجىجيخىخيصىصيضىضيشجشحشخشرسرصرضراًتجمتحجتحمتخمتمجتمحتمخجمححميح" +
-	"مىسحجسجحسجىسمحسمجسممصححصممشحمشجيشمخشممضحىضخمطمحطممطميعجمعممعمىغممغميغمى" +
-	"�خمقمحقمملحملحيلحىلججلخملمحمحجمحممحيمجحمجممخجمخممجخهمجهممنحمنحىنجمنجىنم" +
-	"ينمىيممبخيتجيتجىتخيتخىتميتمىجميجحىجمىسخىصحيشحيضحيلجيلمييحييجييميمميقمين" +
-	"حيعميكمينجحمخيلجمكممجحيحجيمجي�ميبحيسخينجيصلےقلےاللهاكبرمحمدصلعمرسولعليه" +
-	"وسلمصلىصلى الله عليه وسلمجل جلالهریال,:!?_{}[]#&*-<>\\$%@ـًـَـ�ـ�ـّـْءآ" +
-	"أؤإئابةتثجحخدذرزسشصضطظعغ�قكلمنهويلآلألإلا\x22'/^|~¢£¬¦¥�ˑʙɓʣꭦʥʤɖɗᶑɘɞʩɤɢ" +
-	"ɠʛʜɧʄʪʫꞎɮʎøɶɷɺɾʀʨʦꭧʧʈⱱ�ʡʢʘǀ�ǂ�����������������������������������ıȷαεζηκ" +
-	"λμνξοστυψ∇∂�абгежзиклмпруфхцчшы�юꚉәіјөү�ґѕџҫꙑұٮڡٯ0,1,2,3,4,5,6,7,8,9,(a" +
-	")(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)(m)(n)(o)(p)(q)(r)(s)(t)(u)(v)(w)(x)(y" +
-	")(z)〔s〕wzhvsdppvwcmcmdmrdj��ココサ手字�デ二多解天交映無料�後�新�終生販声�演投�一三�左中�指走打�空�満有月申" +
-	"割営�〔本〕〔三〕〔二〕〔安〕〔点〕〔打〕〔盗〕〔�〕〔敗〕得�丽丸�你侮侻倂�備僧�㒞�兔兤具㒹內冗冤仌冬况凵刃㓟刻剆剷㔕勇勉勤勺包匆北�" +
-	"�����������咞�呈周咢哶�啓啣善喙喫喳嗂圖嘆圗噑噴切壮城埴�型堲報墬売壷夆夢奢姬娛娧姘婦㛮嬈嬾寃寘寧寳寿将尢�屠屮峀�嵃嵮嵫嵼巡巢" +
-	"㠯巽帨帽幩㡢㡼庰庳庶廊廾�弢㣇形彫㣣徚�志忹�㤺㤜悔惇慈慌慎慺憎憲憤憯懞懲懶�戛�抱拔�挽拼�掃���掩㨮摩摾�摷㩬�敬旣書晉㬙暑㬈㫤冒冕最" +
-	"暜肭�朗望朡��㭉柺枅桒梅梎栟椔�楂榣槪檨櫛㰘次歔㱎歲殟殺殻汎沿�汧洖派海�浩浸涅洴港湮㴳滋滇淹潮濆瀹瀞瀛㶖���炭煅熜爨爵�犀犕�王㺬玥㺸" +
-	"瑇瑜瑱璅瓊㼛甤甾異�㿼䀈直眞真�䀹瞋�䂖硎碌磌䃣祖�秫䄯穀穊�䈂篆築䈧糒䊠糨糣紀絣�緇縂繅䌴�罺羕翺者���育脃�脾媵舄辞䑫芑芋�劳花芳芽苦" +
-	"若��莭茣莽�著����䔫蓱蓳蔖蕤�䕡䕫�虜虧虩蚩蚈蜎蛢�蜨�螆蟡�䗹衠衣裗裞䘵裺㒻䚾䛇誠諭變豕貫�贛起跋趼跰軔輸邔郱鄑鄛鈸鋗鋘鉼��開䦕閷" +
-	"䧦雃嶲霣䩮䩶韠䪲頋頩飢䬳餩馧駂駾䯎鬒鱀鳽䳎䳭鵧䳸麻䵖黹黾鼅�鼖鼻"
-
-var mappingIndex = []uint16{ // 1729 elements
-	// Entry 0 - 3F
-	0x0000, 0x0000, 0x0001, 0x0004, 0x0005, 0x0008, 0x0009, 0x000a,
-	0x000d, 0x0010, 0x0011, 0x0012, 0x0017, 0x001c, 0x0021, 0x0024,
-	0x0027, 0x002a, 0x002b, 0x002e, 0x0031, 0x0034, 0x0035, 0x0036,
-	0x0037, 0x0038, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048,
-	0x004b, 0x004c, 0x004d, 0x0051, 0x0054, 0x0055, 0x005a, 0x005e,
-	0x0062, 0x0066, 0x006a, 0x006e, 0x0074, 0x007a, 0x0080, 0x0086,
-	0x008c, 0x0092, 0x0098, 0x009e, 0x00a4, 0x00aa, 0x00b0, 0x00b6,
-	0x00bc, 0x00c2, 0x00c8, 0x00ce, 0x00d4, 0x00da, 0x00e0, 0x00e6,
-	// Entry 40 - 7F
-	0x00ec, 0x00f2, 0x00f8, 0x00fe, 0x0104, 0x010a, 0x0110, 0x0116,
-	0x011c, 0x0122, 0x0128, 0x012e, 0x0137, 0x013d, 0x0146, 0x014c,
-	0x0152, 0x0158, 0x015e, 0x0164, 0x016a, 0x0170, 0x0172, 0x0174,
-	0x0176, 0x0178, 0x017a, 0x017c, 0x017e, 0x0180, 0x0181, 0x0182,
-	0x0183, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018c,
-	0x018d, 0x018e, 0x018f, 0x0191, 0x0193, 0x0195, 0x0197, 0x0199,
-	0x019b, 0x019d, 0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a8,
-	0x01aa, 0x01ac, 0x01ae, 0x01b0, 0x01b1, 0x01b3, 0x01b5, 0x01b6,
-	// Entry 80 - BF
-	0x01b8, 0x01ba, 0x01bc, 0x01be, 0x01c0, 0x01c2, 0x01c4, 0x01c6,
-	0x01c8, 0x01ca, 0x01cc, 0x01ce, 0x01d0, 0x01d2, 0x01d4, 0x01d6,
-	0x01d8, 0x01da, 0x01dc, 0x01de, 0x01e0, 0x01e2, 0x01e4, 0x01e5,
-	0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01ef, 0x01f1, 0x01f3, 0x01f5,
-	0x01f7, 0x01f9, 0x01fb, 0x01fd, 0x0202, 0x0207, 0x020c, 0x0211,
-	0x0216, 0x021b, 0x0220, 0x0225, 0x022a, 0x022f, 0x0234, 0x0239,
-	0x023e, 0x0243, 0x0248, 0x024d, 0x0252, 0x0257, 0x025c, 0x0261,
-	0x0266, 0x026b, 0x0270, 0x0275, 0x027a, 0x027e, 0x0282, 0x0287,
-	// Entry C0 - FF
-	0x0289, 0x028e, 0x0293, 0x0297, 0x029b, 0x02a0, 0x02a5, 0x02aa,
-	0x02af, 0x02b1, 0x02b6, 0x02bb, 0x02c0, 0x02c2, 0x02c7, 0x02c8,
-	0x02cd, 0x02d1, 0x02d5, 0x02da, 0x02e0, 0x02e9, 0x02ef, 0x02f8,
-	0x02fa, 0x02fc, 0x02fe, 0x0300, 0x030c, 0x030d, 0x030e, 0x030f,
-	0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
-	0x0319, 0x031b, 0x031d, 0x031e, 0x0320, 0x0322, 0x0324, 0x0326,
-	0x0328, 0x032a, 0x032c, 0x032e, 0x0330, 0x0335, 0x033a, 0x0340,
-	0x0345, 0x034a, 0x034f, 0x0354, 0x0359, 0x035e, 0x0363, 0x0368,
-	// Entry 100 - 13F
-	0x036d, 0x0372, 0x0377, 0x037c, 0x0380, 0x0382, 0x0384, 0x0386,
-	0x038a, 0x038c, 0x038e, 0x0393, 0x0399, 0x03a2, 0x03a8, 0x03b1,
-	0x03b3, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x03c1,
-	0x03c3, 0x03c5, 0x03c7, 0x03cb, 0x03cf, 0x03d3, 0x03d7, 0x03db,
-	0x03df, 0x03e3, 0x03e7, 0x03eb, 0x03ef, 0x03f3, 0x03ff, 0x0401,
-	0x0406, 0x0408, 0x040a, 0x040c, 0x040e, 0x040f, 0x0413, 0x0417,
-	0x041d, 0x0423, 0x0428, 0x042d, 0x0432, 0x0437, 0x043c, 0x0441,
-	0x0446, 0x044b, 0x0450, 0x0455, 0x045a, 0x045f, 0x0464, 0x0469,
-	// Entry 140 - 17F
-	0x046e, 0x0473, 0x0478, 0x047d, 0x0482, 0x0487, 0x048c, 0x0491,
-	0x0496, 0x049b, 0x04a0, 0x04a5, 0x04aa, 0x04af, 0x04b4, 0x04bc,
-	0x04c4, 0x04c9, 0x04ce, 0x04d3, 0x04d8, 0x04dd, 0x04e2, 0x04e7,
-	0x04ec, 0x04f1, 0x04f6, 0x04fb, 0x0500, 0x0505, 0x050a, 0x050f,
-	0x0514, 0x0519, 0x051e, 0x0523, 0x0528, 0x052d, 0x0532, 0x0537,
-	0x053c, 0x0541, 0x0546, 0x054b, 0x0550, 0x0555, 0x055a, 0x055f,
-	0x0564, 0x0569, 0x056e, 0x0573, 0x0578, 0x057a, 0x057c, 0x057e,
-	0x0580, 0x0582, 0x0584, 0x0586, 0x0588, 0x058a, 0x058c, 0x058e,
-	// Entry 180 - 1BF
-	0x0590, 0x0592, 0x0594, 0x0596, 0x059c, 0x05a2, 0x05a4, 0x05a6,
-	0x05a8, 0x05aa, 0x05ac, 0x05ae, 0x05b0, 0x05b2, 0x05b4, 0x05b6,
-	0x05b8, 0x05ba, 0x05bc, 0x05be, 0x05c0, 0x05c4, 0x05c8, 0x05cc,
-	0x05d0, 0x05d4, 0x05d8, 0x05dc, 0x05e0, 0x05e4, 0x05e9, 0x05ee,
-	0x05f3, 0x05f5, 0x05f7, 0x05fd, 0x0609, 0x0615, 0x0621, 0x062a,
-	0x0636, 0x063f, 0x0648, 0x0657, 0x0663, 0x066c, 0x0675, 0x067e,
-	0x068a, 0x0696, 0x069f, 0x06a8, 0x06ae, 0x06b7, 0x06c3, 0x06cf,
-	0x06d5, 0x06e4, 0x06f6, 0x0705, 0x070e, 0x071d, 0x072c, 0x0738,
-	// Entry 1C0 - 1FF
-	0x0741, 0x074a, 0x0753, 0x075f, 0x076e, 0x077a, 0x0783, 0x078c,
-	0x0795, 0x079b, 0x07a1, 0x07a7, 0x07ad, 0x07b6, 0x07bf, 0x07ce,
-	0x07d7, 0x07e3, 0x07f2, 0x07fb, 0x0801, 0x0807, 0x0816, 0x0822,
-	0x0831, 0x083a, 0x0849, 0x084f, 0x0858, 0x0861, 0x086a, 0x0873,
-	0x087c, 0x0888, 0x0891, 0x0897, 0x08a0, 0x08a9, 0x08b2, 0x08be,
-	0x08c7, 0x08d0, 0x08d9, 0x08e8, 0x08f4, 0x08fa, 0x0909, 0x090f,
-	0x091b, 0x0927, 0x0930, 0x0939, 0x0942, 0x094e, 0x0954, 0x095d,
-	0x0969, 0x096f, 0x097e, 0x0987, 0x098b, 0x098f, 0x0993, 0x0997,
-	// Entry 200 - 23F
-	0x099b, 0x099f, 0x09a3, 0x09a7, 0x09ab, 0x09af, 0x09b4, 0x09b9,
-	0x09be, 0x09c3, 0x09c8, 0x09cd, 0x09d2, 0x09d7, 0x09dc, 0x09e1,
-	0x09e6, 0x09eb, 0x09f0, 0x09f5, 0x09fa, 0x09fc, 0x09fe, 0x0a00,
-	0x0a02, 0x0a04, 0x0a06, 0x0a0c, 0x0a12, 0x0a18, 0x0a1e, 0x0a2a,
-	0x0a2c, 0x0a2e, 0x0a30, 0x0a32, 0x0a34, 0x0a36, 0x0a38, 0x0a3c,
-	0x0a3e, 0x0a40, 0x0a42, 0x0a44, 0x0a46, 0x0a48, 0x0a4a, 0x0a4c,
-	0x0a4e, 0x0a50, 0x0a52, 0x0a54, 0x0a56, 0x0a58, 0x0a5a, 0x0a5f,
-	0x0a65, 0x0a6c, 0x0a74, 0x0a76, 0x0a78, 0x0a7a, 0x0a7c, 0x0a7e,
-	// Entry 240 - 27F
-	0x0a80, 0x0a82, 0x0a84, 0x0a86, 0x0a88, 0x0a8a, 0x0a8c, 0x0a8e,
-	0x0a90, 0x0a96, 0x0a98, 0x0a9a, 0x0a9c, 0x0a9e, 0x0aa0, 0x0aa2,
-	0x0aa4, 0x0aa6, 0x0aa8, 0x0aaa, 0x0aac, 0x0aae, 0x0ab0, 0x0ab2,
-	0x0ab4, 0x0ab9, 0x0abe, 0x0ac2, 0x0ac6, 0x0aca, 0x0ace, 0x0ad2,
-	0x0ad6, 0x0ada, 0x0ade, 0x0ae2, 0x0ae7, 0x0aec, 0x0af1, 0x0af6,
-	0x0afb, 0x0b00, 0x0b05, 0x0b0a, 0x0b0f, 0x0b14, 0x0b19, 0x0b1e,
-	0x0b23, 0x0b28, 0x0b2d, 0x0b32, 0x0b37, 0x0b3c, 0x0b41, 0x0b46,
-	0x0b4b, 0x0b50, 0x0b52, 0x0b54, 0x0b56, 0x0b58, 0x0b5a, 0x0b5c,
-	// Entry 280 - 2BF
-	0x0b5e, 0x0b62, 0x0b66, 0x0b6a, 0x0b6e, 0x0b72, 0x0b76, 0x0b7a,
-	0x0b7c, 0x0b7e, 0x0b80, 0x0b82, 0x0b86, 0x0b8a, 0x0b8e, 0x0b92,
-	0x0b96, 0x0b9a, 0x0b9e, 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba6, 0x0ba8,
-	0x0baa, 0x0bac, 0x0bb0, 0x0bb4, 0x0bba, 0x0bc0, 0x0bc4, 0x0bc8,
-	0x0bcc, 0x0bd0, 0x0bd4, 0x0bd8, 0x0bdc, 0x0be0, 0x0be4, 0x0be8,
-	0x0bec, 0x0bf0, 0x0bf4, 0x0bf8, 0x0bfc, 0x0c00, 0x0c04, 0x0c08,
-	0x0c0c, 0x0c10, 0x0c14, 0x0c18, 0x0c1c, 0x0c20, 0x0c24, 0x0c28,
-	0x0c2c, 0x0c30, 0x0c34, 0x0c36, 0x0c38, 0x0c3a, 0x0c3c, 0x0c3e,
-	// Entry 2C0 - 2FF
-	0x0c40, 0x0c42, 0x0c44, 0x0c46, 0x0c48, 0x0c4a, 0x0c4c, 0x0c4e,
-	0x0c50, 0x0c52, 0x0c54, 0x0c56, 0x0c58, 0x0c5a, 0x0c5c, 0x0c5e,
-	0x0c60, 0x0c62, 0x0c64, 0x0c66, 0x0c68, 0x0c6a, 0x0c6c, 0x0c6e,
-	0x0c70, 0x0c72, 0x0c74, 0x0c76, 0x0c78, 0x0c7a, 0x0c7c, 0x0c7e,
-	0x0c80, 0x0c82, 0x0c86, 0x0c8a, 0x0c8e, 0x0c92, 0x0c96, 0x0c9a,
-	0x0c9e, 0x0ca2, 0x0ca4, 0x0ca8, 0x0cac, 0x0cb0, 0x0cb4, 0x0cb8,
-	0x0cbc, 0x0cc0, 0x0cc4, 0x0cc8, 0x0ccc, 0x0cd0, 0x0cd4, 0x0cd8,
-	0x0cdc, 0x0ce0, 0x0ce4, 0x0ce8, 0x0cec, 0x0cf0, 0x0cf4, 0x0cf8,
-	// Entry 300 - 33F
-	0x0cfc, 0x0d00, 0x0d04, 0x0d08, 0x0d0c, 0x0d10, 0x0d14, 0x0d18,
-	0x0d1c, 0x0d20, 0x0d24, 0x0d28, 0x0d2c, 0x0d30, 0x0d34, 0x0d38,
-	0x0d3c, 0x0d40, 0x0d44, 0x0d48, 0x0d4c, 0x0d50, 0x0d54, 0x0d58,
-	0x0d5c, 0x0d60, 0x0d64, 0x0d68, 0x0d6c, 0x0d70, 0x0d74, 0x0d78,
-	0x0d7c, 0x0d80, 0x0d84, 0x0d88, 0x0d8c, 0x0d90, 0x0d94, 0x0d98,
-	0x0d9c, 0x0da0, 0x0da4, 0x0da8, 0x0dac, 0x0db0, 0x0db4, 0x0db8,
-	0x0dbc, 0x0dc0, 0x0dc4, 0x0dc8, 0x0dcc, 0x0dd0, 0x0dd4, 0x0dd8,
-	0x0ddc, 0x0de0, 0x0de4, 0x0de8, 0x0dec, 0x0df0, 0x0df4, 0x0df8,
-	// Entry 340 - 37F
-	0x0dfc, 0x0e00, 0x0e04, 0x0e08, 0x0e0c, 0x0e10, 0x0e14, 0x0e18,
-	0x0e1d, 0x0e22, 0x0e27, 0x0e2c, 0x0e31, 0x0e36, 0x0e3a, 0x0e3e,
-	0x0e42, 0x0e46, 0x0e4a, 0x0e4e, 0x0e52, 0x0e56, 0x0e5a, 0x0e5e,
-	0x0e62, 0x0e66, 0x0e6a, 0x0e6e, 0x0e72, 0x0e76, 0x0e7a, 0x0e7e,
-	0x0e82, 0x0e86, 0x0e8a, 0x0e8e, 0x0e92, 0x0e96, 0x0e9a, 0x0e9e,
-	0x0ea2, 0x0ea6, 0x0eaa, 0x0eae, 0x0eb2, 0x0eb6, 0x0ebc, 0x0ec2,
-	0x0ec8, 0x0ecc, 0x0ed0, 0x0ed4, 0x0ed8, 0x0edc, 0x0ee0, 0x0ee4,
-	0x0ee8, 0x0eec, 0x0ef0, 0x0ef4, 0x0ef8, 0x0efc, 0x0f00, 0x0f04,
-	// Entry 380 - 3BF
-	0x0f08, 0x0f0c, 0x0f10, 0x0f14, 0x0f18, 0x0f1c, 0x0f20, 0x0f24,
-	0x0f28, 0x0f2c, 0x0f30, 0x0f34, 0x0f38, 0x0f3e, 0x0f44, 0x0f4a,
-	0x0f50, 0x0f56, 0x0f5c, 0x0f62, 0x0f68, 0x0f6e, 0x0f74, 0x0f7a,
-	0x0f80, 0x0f86, 0x0f8c, 0x0f92, 0x0f98, 0x0f9e, 0x0fa4, 0x0faa,
-	0x0fb0, 0x0fb6, 0x0fbc, 0x0fc2, 0x0fc8, 0x0fce, 0x0fd4, 0x0fda,
-	0x0fe0, 0x0fe6, 0x0fec, 0x0ff2, 0x0ff8, 0x0ffe, 0x1004, 0x100a,
-	0x1010, 0x1016, 0x101c, 0x1022, 0x1028, 0x102e, 0x1034, 0x103a,
-	0x1040, 0x1046, 0x104c, 0x1052, 0x1058, 0x105e, 0x1064, 0x106a,
-	// Entry 3C0 - 3FF
-	0x1070, 0x1076, 0x107c, 0x1082, 0x1088, 0x108e, 0x1094, 0x109a,
-	0x10a0, 0x10a6, 0x10ac, 0x10b2, 0x10b8, 0x10be, 0x10c4, 0x10ca,
-	0x10d0, 0x10d6, 0x10dc, 0x10e2, 0x10e8, 0x10ee, 0x10f4, 0x10fa,
-	0x1100, 0x1106, 0x110c, 0x1112, 0x1118, 0x111e, 0x1124, 0x112a,
-	0x1130, 0x1136, 0x113c, 0x1142, 0x1148, 0x114e, 0x1154, 0x115a,
-	0x1160, 0x1166, 0x116c, 0x1172, 0x1178, 0x1180, 0x1188, 0x1190,
-	0x1198, 0x11a0, 0x11a8, 0x11b0, 0x11b6, 0x11d7, 0x11e6, 0x11ee,
-	0x11ef, 0x11f0, 0x11f1, 0x11f2, 0x11f3, 0x11f4, 0x11f5, 0x11f6,
-	// Entry 400 - 43F
-	0x11f7, 0x11f8, 0x11f9, 0x11fa, 0x11fb, 0x11fc, 0x11fd, 0x11fe,
-	0x11ff, 0x1200, 0x1201, 0x1205, 0x1209, 0x120d, 0x1211, 0x1215,
-	0x1219, 0x121b, 0x121d, 0x121f, 0x1221, 0x1223, 0x1225, 0x1227,
-	0x1229, 0x122b, 0x122d, 0x122f, 0x1231, 0x1233, 0x1235, 0x1237,
-	0x1239, 0x123b, 0x123d, 0x123f, 0x1241, 0x1243, 0x1245, 0x1247,
-	0x1249, 0x124b, 0x124d, 0x124f, 0x1251, 0x1253, 0x1255, 0x1257,
-	0x1259, 0x125b, 0x125d, 0x125f, 0x1263, 0x1267, 0x126b, 0x126f,
-	0x1270, 0x1271, 0x1272, 0x1273, 0x1274, 0x1275, 0x1277, 0x1279,
-	// Entry 440 - 47F
-	0x127b, 0x127d, 0x127f, 0x1281, 0x1283, 0x1285, 0x1287, 0x1289,
-	0x128c, 0x128e, 0x1290, 0x1292, 0x1294, 0x1297, 0x1299, 0x129b,
-	0x129d, 0x129f, 0x12a1, 0x12a3, 0x12a5, 0x12a7, 0x12a9, 0x12ab,
-	0x12ad, 0x12af, 0x12b2, 0x12b4, 0x12b6, 0x12b8, 0x12ba, 0x12bc,
-	0x12be, 0x12c0, 0x12c2, 0x12c4, 0x12c6, 0x12c9, 0x12cb, 0x12cd,
-	0x12d0, 0x12d2, 0x12d4, 0x12d6, 0x12d8, 0x12da, 0x12dc, 0x12de,
-	0x12e6, 0x12ee, 0x12fa, 0x1306, 0x1312, 0x131e, 0x132a, 0x1332,
-	0x133a, 0x1346, 0x1352, 0x135e, 0x136a, 0x136c, 0x136e, 0x1370,
-	// Entry 480 - 4BF
-	0x1372, 0x1374, 0x1376, 0x1378, 0x137a, 0x137c, 0x137e, 0x1380,
-	0x1382, 0x1384, 0x1386, 0x1388, 0x138a, 0x138d, 0x1390, 0x1392,
-	0x1394, 0x1396, 0x1398, 0x139a, 0x139c, 0x139e, 0x13a0, 0x13a2,
-	0x13a4, 0x13a6, 0x13a8, 0x13aa, 0x13ac, 0x13ae, 0x13b0, 0x13b2,
-	0x13b4, 0x13b6, 0x13b8, 0x13ba, 0x13bc, 0x13bf, 0x13c1, 0x13c3,
-	0x13c5, 0x13c7, 0x13c9, 0x13cb, 0x13cd, 0x13cf, 0x13d1, 0x13d3,
-	0x13d6, 0x13d8, 0x13da, 0x13dc, 0x13de, 0x13e0, 0x13e2, 0x13e4,
-	0x13e6, 0x13e8, 0x13ea, 0x13ec, 0x13ee, 0x13f0, 0x13f2, 0x13f5,
-	// Entry 4C0 - 4FF
-	0x13f8, 0x13fb, 0x13fe, 0x1401, 0x1404, 0x1407, 0x140a, 0x140d,
-	0x1410, 0x1413, 0x1416, 0x1419, 0x141c, 0x141f, 0x1422, 0x1425,
-	0x1428, 0x142b, 0x142e, 0x1431, 0x1434, 0x1437, 0x143a, 0x143d,
-	0x1440, 0x1447, 0x1449, 0x144b, 0x144d, 0x1450, 0x1452, 0x1454,
-	0x1456, 0x1458, 0x145a, 0x1460, 0x1466, 0x1469, 0x146c, 0x146f,
-	0x1472, 0x1475, 0x1478, 0x147b, 0x147e, 0x1481, 0x1484, 0x1487,
-	0x148a, 0x148d, 0x1490, 0x1493, 0x1496, 0x1499, 0x149c, 0x149f,
-	0x14a2, 0x14a5, 0x14a8, 0x14ab, 0x14ae, 0x14b1, 0x14b4, 0x14b7,
-	// Entry 500 - 53F
-	0x14ba, 0x14bd, 0x14c0, 0x14c3, 0x14c6, 0x14c9, 0x14cc, 0x14cf,
-	0x14d2, 0x14d5, 0x14d8, 0x14db, 0x14de, 0x14e1, 0x14e4, 0x14e7,
-	0x14ea, 0x14ed, 0x14f6, 0x14ff, 0x1508, 0x1511, 0x151a, 0x1523,
-	0x152c, 0x1535, 0x153e, 0x1541, 0x1544, 0x1547, 0x154a, 0x154d,
-	0x1550, 0x1553, 0x1556, 0x1559, 0x155c, 0x155f, 0x1562, 0x1565,
-	0x1568, 0x156b, 0x156e, 0x1571, 0x1574, 0x1577, 0x157a, 0x157d,
-	0x1580, 0x1583, 0x1586, 0x1589, 0x158c, 0x158f, 0x1592, 0x1595,
-	0x1598, 0x159b, 0x159e, 0x15a1, 0x15a4, 0x15a7, 0x15aa, 0x15ad,
-	// Entry 540 - 57F
-	0x15b0, 0x15b3, 0x15b6, 0x15b9, 0x15bc, 0x15bf, 0x15c2, 0x15c5,
-	0x15c8, 0x15cb, 0x15ce, 0x15d1, 0x15d4, 0x15d7, 0x15da, 0x15dd,
-	0x15e0, 0x15e3, 0x15e6, 0x15e9, 0x15ec, 0x15ef, 0x15f2, 0x15f5,
-	0x15f8, 0x15fb, 0x15fe, 0x1601, 0x1604, 0x1607, 0x160a, 0x160d,
-	0x1610, 0x1613, 0x1616, 0x1619, 0x161c, 0x161f, 0x1622, 0x1625,
-	0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1637, 0x163a, 0x163d,
-	0x1640, 0x1643, 0x1646, 0x1649, 0x164c, 0x164f, 0x1652, 0x1655,
-	0x1658, 0x165b, 0x165e, 0x1661, 0x1664, 0x1667, 0x166a, 0x166d,
-	// Entry 580 - 5BF
-	0x1670, 0x1673, 0x1676, 0x1679, 0x167c, 0x167f, 0x1682, 0x1685,
-	0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1697, 0x169a, 0x169d,
-	0x16a0, 0x16a3, 0x16a6, 0x16a9, 0x16ac, 0x16af, 0x16b2, 0x16b5,
-	0x16b8, 0x16bb, 0x16be, 0x16c1, 0x16c4, 0x16c7, 0x16ca, 0x16cd,
-	0x16d0, 0x16d3, 0x16d6, 0x16d9, 0x16dc, 0x16df, 0x16e2, 0x16e5,
-	0x16e8, 0x16eb, 0x16ee, 0x16f1, 0x16f4, 0x16f7, 0x16fa, 0x16fd,
-	0x1700, 0x1703, 0x1706, 0x1709, 0x170c, 0x170f, 0x1712, 0x1715,
-	0x1718, 0x171b, 0x171e, 0x1721, 0x1724, 0x1727, 0x172a, 0x172d,
-	// Entry 5C0 - 5FF
-	0x1730, 0x1733, 0x1736, 0x1739, 0x173c, 0x173f, 0x1742, 0x1745,
-	0x1748, 0x174b, 0x174e, 0x1751, 0x1754, 0x1757, 0x175a, 0x175d,
-	0x1760, 0x1763, 0x1766, 0x1769, 0x176c, 0x176f, 0x1772, 0x1775,
-	0x1778, 0x177b, 0x177e, 0x1781, 0x1784, 0x1787, 0x178a, 0x178d,
-	0x1790, 0x1793, 0x1796, 0x1799, 0x179c, 0x179f, 0x17a2, 0x17a5,
-	0x17a8, 0x17ab, 0x17ae, 0x17b1, 0x17b4, 0x17b7, 0x17ba, 0x17bd,
-	0x17c0, 0x17c3, 0x17c6, 0x17c9, 0x17cc, 0x17cf, 0x17d2, 0x17d5,
-	0x17d8, 0x17db, 0x17de, 0x17e1, 0x17e4, 0x17e7, 0x17ea, 0x17ed,
-	// Entry 600 - 63F
-	0x17f0, 0x17f3, 0x17f6, 0x17f9, 0x17fc, 0x17ff, 0x1802, 0x1805,
-	0x1808, 0x180b, 0x180e, 0x1811, 0x1814, 0x1817, 0x181a, 0x181d,
-	0x1820, 0x1823, 0x1826, 0x1829, 0x182c, 0x182f, 0x1832, 0x1835,
-	0x1838, 0x183b, 0x183e, 0x1841, 0x1844, 0x1847, 0x184a, 0x184d,
-	0x1850, 0x1853, 0x1856, 0x1859, 0x185c, 0x185f, 0x1862, 0x1865,
-	0x1868, 0x186b, 0x186e, 0x1871, 0x1874, 0x1877, 0x187a, 0x187d,
-	0x1880, 0x1883, 0x1886, 0x1889, 0x188c, 0x188f, 0x1892, 0x1895,
-	0x1898, 0x189b, 0x189e, 0x18a1, 0x18a4, 0x18a7, 0x18aa, 0x18ad,
-	// Entry 640 - 67F
-	0x18b0, 0x18b3, 0x18b6, 0x18b9, 0x18bc, 0x18bf, 0x18c2, 0x18c5,
-	0x18c8, 0x18cb, 0x18ce, 0x18d1, 0x18d4, 0x18d7, 0x18da, 0x18dd,
-	0x18e0, 0x18e3, 0x18e6, 0x18e9, 0x18ec, 0x18ef, 0x18f2, 0x18f5,
-	0x18f8, 0x18fb, 0x18fe, 0x1901, 0x1904, 0x1907, 0x190a, 0x190d,
-	0x1910, 0x1913, 0x1916, 0x1919, 0x191c, 0x191f, 0x1922, 0x1925,
-	0x1928, 0x192b, 0x192e, 0x1931, 0x1934, 0x1937, 0x193a, 0x193d,
-	0x1940, 0x1943, 0x1946, 0x1949, 0x194c, 0x194f, 0x1952, 0x1955,
-	0x1958, 0x195b, 0x195e, 0x1961, 0x1964, 0x1967, 0x196a, 0x196d,
-	// Entry 680 - 6BF
-	0x1970, 0x1973, 0x1976, 0x1979, 0x197c, 0x197f, 0x1982, 0x1985,
-	0x1988, 0x198b, 0x198e, 0x1991, 0x1994, 0x1997, 0x199a, 0x199d,
-	0x19a0, 0x19a3, 0x19a6, 0x19a9, 0x19ac, 0x19af, 0x19b2, 0x19b5,
-	0x19b8, 0x19bb, 0x19be, 0x19c1, 0x19c4, 0x19c7, 0x19ca, 0x19cd,
-	0x19d0, 0x19d3, 0x19d6, 0x19d9, 0x19dc, 0x19df, 0x19e2, 0x19e5,
-	0x19e8, 0x19eb, 0x19ee, 0x19f1, 0x19f4, 0x19f7, 0x19fa, 0x19fd,
-	0x1a00, 0x1a03, 0x1a06, 0x1a09, 0x1a0c, 0x1a0f, 0x1a12, 0x1a15,
-	0x1a18, 0x1a1b, 0x1a1e, 0x1a21, 0x1a24, 0x1a27, 0x1a2a, 0x1a2d,
-	// Entry 6C0 - 6FF
-	0x1a30,
-} // Size: 3482 bytes
-
-var xorData string = "" + // Size: 4907 bytes
-	"\x02\x0c\x09\x02\xb0\xec\x02\xad\xd8\x02\xad\xd9\x02\x06\x07\x02\x0f\x12" +
-	"\x02\x0f\x1f\x02\x0f\x1d\x02\x01\x13\x02\x0f\x16\x02\x0f\x0b\x02\x0f3" +
-	"\x02\x0f7\x02\x0f?\x02\x0f/\x02\x0f*\x02\x0c&\x02\x0c*\x02\x0c;\x02\x0c9" +
-	"\x02\x0c%\x02\xab\xed\x02\xab\xe2\x02\xab\xe3\x02\xa9\xe0\x02\xa9\xe1" +
-	"\x02\xa9\xe6\x02\xa3\xcb\x02\xa3\xc8\x02\xa3\xc9\x02\x01#\x02\x01\x08" +
-	"\x02\x0e>\x02\x0e'\x02\x0f\x03\x02\x03\x0d\x02\x03\x09\x02\x03\x17\x02" +
-	"\x03\x0e\x02\x02\x03\x02\x011\x02\x01\x00\x02\x01\x10\x02\x03<\x02\x07" +
-	"\x0d\x02\x02\x0c\x02\x0c0\x02\x01\x03\x02\x01\x01\x02\x01 \x02\x01\x22" +
-	"\x02\x01)\x02\x01\x0a\x02\x01\x0c\x02\x02\x06\x02\x02\x02\x02\x03\x10" +
-	"\x03\x037 \x03\x0b+\x03\x021\x00\x02\x01\x04\x02\x01\x02\x02\x019\x02" +
-	"\x03\x1c\x02\x02$\x03\x80p$\x02\x03:\x02\x03\x0a\x03\xc1r.\x03\xc1r,\x03" +
-	"\xc1r\x02\x02\x02:\x02\x02>\x02\x02,\x02\x02\x10\x02\x02\x00\x03\xc1s<" +
-	"\x03\xc1s*\x03\xc2L$\x03\xc2L;\x02\x09)\x02\x0a\x19\x03\x83\xab\xe3\x03" +
-	"\x83\xab\xf2\x03 4\xe0\x03\x81\xab\xea\x03\x81\xab\xf3\x03 4\xef\x03\x96" +
-	"\xe1\xcd\x03\x84\xe5\xc3\x02\x0d\x11\x03\x8b\xec\xcb\x03\x94\xec\xcf\x03" +
-	"\x9a\xec\xc2\x03\x8b\xec\xdb\x03\x94\xec\xdf\x03\x9a\xec\xd2\x03\x01\x0c" +
-	"!\x03\x01\x0c#\x03ʠ\x9d\x03ʣ\x9c\x03ʢ\x9f\x03ʥ\x9e\x03ʤ\x91\x03ʧ\x90\x03" +
-	"ʦ\x93\x03ʩ\x92\x03ʨ\x95\x03\xca\xf3\xb5\x03\xca\xf0\xb4\x03\xca\xf1\xb7" +
-	"\x03\xca\xf6\xb6\x03\xca\xf7\x89\x03\xca\xf4\x88\x03\xca\xf5\x8b\x03\xca" +
-	"\xfa\x8a\x03\xca\xfb\x8d\x03\xca\xf8\x8c\x03\xca\xf9\x8f\x03\xca\xfe\x8e" +
-	"\x03\xca\xff\x81\x03\xca\xfc\x80\x03\xca\xfd\x83\x03\xca\xe2\x82\x03\xca" +
-	"\xe3\x85\x03\xca\xe0\x84\x03\xca\xe1\x87\x03\xca\xe6\x86\x03\xca\xe7\x99" +
-	"\x03\xca\xe4\x98\x03\xca\xe5\x9b\x03\xca\xea\x9a\x03\xca\xeb\x9d\x03\xca" +
-	"\xe8\x9c\x03Ø“\x89\x03ß”\x8b\x02\x010\x03\x03\x04\x1e\x03\x04\x15\x12\x03" +
-	"\x0b\x05,\x03\x06\x04\x00\x03\x06\x04)\x03\x06\x044\x03\x06\x04<\x03\x06" +
-	"\x05\x1d\x03\x06\x06\x00\x03\x06\x06\x0a\x03\x06\x06'\x03\x06\x062\x03" +
-	"\x0786\x03\x079/\x03\x079 \x03\x07:\x0e\x03\x07:\x1b\x03\x07:%\x03\x07;/" +
-	"\x03\x07;%\x03\x074\x11\x03\x076\x09\x03\x077*\x03\x070\x01\x03\x070\x0f" +
-	"\x03\x070.\x03\x071\x16\x03\x071\x04\x03\x0710\x03\x072\x18\x03\x072-" +
-	"\x03\x073\x14\x03\x073>\x03\x07'\x09\x03\x07 \x00\x03\x07\x1f\x0b\x03" +
-	"\x07\x18#\x03\x07\x18(\x03\x07\x186\x03\x07\x18\x03\x03\x07\x19\x16\x03" +
-	"\x07\x116\x03\x07\x12'\x03\x07\x13\x10\x03\x07\x0c&\x03\x07\x0c\x08\x03" +
-	"\x07\x0c\x13\x03\x07\x0d\x02\x03\x07\x0d\x1c\x03\x07\x0b5\x03\x07\x0b" +
-	"\x0a\x03\x07\x0b\x01\x03\x07\x0b\x0f\x03\x07\x05\x00\x03\x07\x05\x09\x03" +
-	"\x07\x05\x0b\x03\x07\x07\x01\x03\x07\x07\x08\x03\x07\x00<\x03\x07\x00+" +
-	"\x03\x07\x01)\x03\x07\x01\x1b\x03\x07\x01\x08\x03\x07\x03?\x03\x0445\x03" +
-	"\x044\x08\x03\x0454\x03\x04)/\x03\x04)5\x03\x04+\x05\x03\x04+\x14\x03" +
-	"\x04+ \x03\x04+<\x03\x04*&\x03\x04*\x22\x03\x04&8\x03\x04!\x01\x03\x04!" +
-	"\x22\x03\x04\x11+\x03\x04\x10.\x03\x04\x104\x03\x04\x13=\x03\x04\x12\x04" +
-	"\x03\x04\x12\x0a\x03\x04\x0d\x1d\x03\x04\x0d\x07\x03\x04\x0d \x03\x05<>" +
-	"\x03\x055<\x03\x055!\x03\x055#\x03\x055&\x03\x054\x1d\x03\x054\x02\x03" +
-	"\x054\x07\x03\x0571\x03\x053\x1a\x03\x053\x16\x03\x05.<\x03\x05.\x07\x03" +
-	"\x05):\x03\x05)<\x03\x05)\x0c\x03\x05)\x15\x03\x05+-\x03\x05+5\x03\x05$" +
-	"\x1e\x03\x05$\x14\x03\x05'\x04\x03\x05'\x14\x03\x05&\x02\x03\x05\x226" +
-	"\x03\x05\x22\x0c\x03\x05\x22\x1c\x03\x05\x19\x0a\x03\x05\x1b\x09\x03\x05" +
-	"\x1b\x0c\x03\x05\x14\x07\x03\x05\x16?\x03\x05\x16\x0c\x03\x05\x0c\x05" +
-	"\x03\x05\x0e\x0f\x03\x05\x01\x0e\x03\x05\x00(\x03\x05\x030\x03\x05\x03" +
-	"\x06\x03\x0a==\x03\x0a=1\x03\x0a=,\x03\x0a=\x0c\x03\x0a??\x03\x0a<\x08" +
-	"\x03\x0a9!\x03\x0a9)\x03\x0a97\x03\x0a99\x03\x0a6\x0a\x03\x0a6\x1c\x03" +
-	"\x0a6\x17\x03\x0a7'\x03\x0a78\x03\x0a73\x03\x0a'\x01\x03\x0a'&\x03\x0a" +
-	"\x1f\x0e\x03\x0a\x1f\x03\x03\x0a\x1f3\x03\x0a\x1b/\x03\x0a\x18\x19\x03" +
-	"\x0a\x19\x01\x03\x0a\x16\x14\x03\x0a\x0e\x22\x03\x0a\x0f\x10\x03\x0a\x0f" +
-	"\x02\x03\x0a\x0f \x03\x0a\x0c\x04\x03\x0a\x0b>\x03\x0a\x0b+\x03\x0a\x08/" +
-	"\x03\x0a\x046\x03\x0a\x05\x14\x03\x0a\x00\x04\x03\x0a\x00\x10\x03\x0a" +
-	"\x00\x14\x03\x0b<3\x03\x0b;*\x03\x0b9\x22\x03\x0b9)\x03\x0b97\x03\x0b+" +
-	"\x10\x03\x0b((\x03\x0b&5\x03\x0b$\x1c\x03\x0b$\x12\x03\x0b%\x04\x03\x0b#" +
-	"<\x03\x0b#0\x03\x0b#\x0d\x03\x0b#\x19\x03\x0b!:\x03\x0b!\x1f\x03\x0b!" +
-	"\x00\x03\x0b\x1e5\x03\x0b\x1c\x1d\x03\x0b\x1d-\x03\x0b\x1d(\x03\x0b\x18." +
-	"\x03\x0b\x18 \x03\x0b\x18\x16\x03\x0b\x14\x13\x03\x0b\x15$\x03\x0b\x15" +
-	"\x22\x03\x0b\x12\x1b\x03\x0b\x12\x10\x03\x0b\x132\x03\x0b\x13=\x03\x0b" +
-	"\x12\x18\x03\x0b\x0c&\x03\x0b\x061\x03\x0b\x06:\x03\x0b\x05#\x03\x0b\x05" +
-	"<\x03\x0b\x04\x0b\x03\x0b\x04\x04\x03\x0b\x04\x1b\x03\x0b\x042\x03\x0b" +
-	"\x041\x03\x0b\x03\x03\x03\x0b\x03\x1d\x03\x0b\x03/\x03\x0b\x03+\x03\x0b" +
-	"\x02\x1b\x03\x0b\x02\x00\x03\x0b\x01\x1e\x03\x0b\x01\x08\x03\x0b\x015" +
-	"\x03\x06\x0d9\x03\x06\x0d=\x03\x06\x0d?\x03\x02\x001\x03\x02\x003\x03" +
-	"\x02\x02\x19\x03\x02\x006\x03\x02\x02\x1b\x03\x02\x004\x03\x02\x00<\x03" +
-	"\x02\x02\x0a\x03\x02\x02\x0e\x03\x02\x01\x1a\x03\x02\x01\x07\x03\x02\x01" +
-	"\x05\x03\x02\x01\x0b\x03\x02\x01%\x03\x02\x01\x0c\x03\x02\x01\x04\x03" +
-	"\x02\x01\x1c\x03\x02\x00.\x03\x02\x002\x03\x02\x00>\x03\x02\x00\x12\x03" +
-	"\x02\x00\x16\x03\x02\x011\x03\x02\x013\x03\x02\x02 \x03\x02\x02%\x03\x02" +
-	"\x02$\x03\x02\x028\x03\x02\x02;\x03\x02\x024\x03\x02\x012\x03\x02\x022" +
-	"\x03\x02\x02/\x03\x02\x01,\x03\x02\x01\x13\x03\x02\x01\x16\x03\x02\x01" +
-	"\x11\x03\x02\x01\x1e\x03\x02\x01\x15\x03\x02\x01\x17\x03\x02\x01\x0f\x03" +
-	"\x02\x01\x08\x03\x02\x00?\x03\x02\x03\x07\x03\x02\x03\x0d\x03\x02\x03" +
-	"\x13\x03\x02\x03\x1d\x03\x02\x03\x1f\x03\x02\x00\x03\x03\x02\x00\x0d\x03" +
-	"\x02\x00\x01\x03\x02\x00\x1b\x03\x02\x00\x19\x03\x02\x00\x18\x03\x02\x00" +
-	"\x13\x03\x02\x00/\x03\x07>\x12\x03\x07<\x1f\x03\x07>\x1d\x03\x06\x1d\x0e" +
-	"\x03\x07>\x1c\x03\x07>:\x03\x07>\x13\x03\x04\x12+\x03\x07?\x03\x03\x07>" +
-	"\x02\x03\x06\x224\x03\x06\x1a.\x03\x07<%\x03\x06\x1c\x0b\x03\x0609\x03" +
-	"\x05\x1f\x01\x03\x04'\x08\x03\x93\xfd\xf5\x03\x02\x0d \x03\x02\x0d#\x03" +
-	"\x02\x0d!\x03\x02\x0d&\x03\x02\x0d\x22\x03\x02\x0d/\x03\x02\x0d,\x03\x02" +
-	"\x0d$\x03\x02\x0d'\x03\x02\x0d%\x03\x02\x0d;\x03\x02\x0d=\x03\x02\x0d?" +
-	"\x03\x099.\x03\x08\x0b7\x03\x08\x02\x14\x03\x08\x14\x0d\x03\x08.:\x03" +
-	"\x089'\x03\x0f\x0b\x18\x03\x0f\x1c1\x03\x0f\x17&\x03\x0f9\x1f\x03\x0f0" +
-	"\x0c\x03\x0e\x0a9\x03\x0e\x056\x03\x0e\x1c#\x03\x0f\x13\x0e\x03\x072\x00" +
-	"\x03\x070\x0d\x03\x072\x0b\x03\x06\x11\x18\x03\x070\x10\x03\x06\x0f(\x03" +
-	"\x072\x05\x03\x06\x0f,\x03\x073\x15\x03\x06\x07\x08\x03\x05\x16\x02\x03" +
-	"\x04\x0b \x03\x05:8\x03\x05\x16%\x03\x0a\x0d\x1f\x03\x06\x16\x10\x03\x05" +
-	"\x1d5\x03\x05*;\x03\x05\x16\x1b\x03\x04.-\x03\x06\x1a\x19\x03\x04\x03," +
-	"\x03\x0b87\x03\x04/\x0a\x03\x06\x00,\x03\x04-\x01\x03\x04\x1e-\x03\x06/(" +
-	"\x03\x0a\x0b5\x03\x06\x0e7\x03\x06\x07.\x03\x0597\x03\x0a*%\x03\x0760" +
-	"\x03\x06\x0c;\x03\x05'\x00\x03\x072.\x03\x072\x08\x03\x06=\x01\x03\x06" +
-	"\x05\x1b\x03\x06\x06\x12\x03\x06$=\x03\x06'\x0d\x03\x04\x11\x0f\x03\x076" +
-	",\x03\x06\x07;\x03\x06.,\x03\x86\xf9\xea\x03\x8f\xff\xeb\x02\x092\x02" +
-	"\x095\x02\x094\x02\x09;\x02\x09>\x02\x098\x02\x09*\x02\x09/\x02\x09,\x02" +
-	"\x09%\x02\x09&\x02\x09#\x02\x09 \x02\x08!\x02\x08%\x02\x08$\x02\x08+\x02" +
-	"\x08.\x02\x08*\x02\x08&\x02\x088\x02\x08>\x02\x084\x02\x086\x02\x080\x02" +
-	"\x08\x10\x02\x08\x17\x02\x08\x12\x02\x08\x1d\x02\x08\x1f\x02\x08\x13\x02" +
-	"\x08\x15\x02\x08\x14\x02\x08\x0c\x03\x8b\xfd\xd0\x03\x81\xec\xc6\x03\x87" +
-	"\xe0\x8a\x03-2\xe3\x03\x80\xef\xe4\x03-2\xea\x03\x88\xe6\xeb\x03\x8e\xe6" +
-	"\xe8\x03\x84\xe6\xe9\x03\x97\xe6\xee\x03-2\xf9\x03-2\xf6\x03\x8e\xe3\xad" +
-	"\x03\x80\xe3\x92\x03\x88\xe3\x90\x03\x8e\xe3\x90\x03\x80\xe3\x97\x03\x88" +
-	"\xe3\x95\x03\x88\xfe\xcb\x03\x8e\xfe\xca\x03\x84\xfe\xcd\x03\x91\xef\xc9" +
-	"\x03-2\xc1\x03-2\xc0\x03-2\xcb\x03\x88@\x09\x03\x8e@\x08\x03\x8f\xe0\xf5" +
-	"\x03\x8e\xe6\xf9\x03\x8e\xe0\xfa\x03\x93\xff\xf4\x03\x84\xee\xd3\x03\x0b" +
-	"(\x04\x023 \x03\x0b)\x08\x021;\x02\x01*\x03\x0b#\x10\x03\x0b 0\x03\x0b!" +
-	"\x10\x03\x0b!0\x03\x07\x15\x08\x03\x09?5\x03\x07\x1f\x08\x03\x07\x17\x0b" +
-	"\x03\x09\x1f\x15\x03\x0b\x1c7\x03\x0a+#\x03\x06\x1a\x1b\x03\x06\x1a\x14" +
-	"\x03\x0a\x01\x18\x03\x06#\x1b\x03\x0a2\x0c\x03\x0a\x01\x04\x03\x09#;\x03" +
-	"\x08='\x03\x08\x1a\x0a\x03\x07</\x03\x07:+\x03\x07\x07*\x03\x06&\x1c\x03" +
-	"\x09\x0c\x16\x03\x09\x10\x0e\x03\x08'\x0f\x03\x08+\x09\x03\x074%\x03\x06" +
-	"!3\x03\x06\x03+\x03\x0b\x1e\x19\x03\x0a))\x03\x09\x08\x19\x03\x08,\x05" +
-	"\x03\x07<2\x03\x06\x1c>\x03\x0a\x111\x03\x09\x1b\x09\x03\x073.\x03\x07" +
-	"\x01\x00\x03\x09/,\x03\x07#>\x03\x07\x048\x03\x0a\x1f\x22\x03\x098>\x03" +
-	"\x09\x11\x00\x03\x08/\x17\x03\x06'\x22\x03\x0b\x1a+\x03\x0a\x22\x19\x03" +
-	"\x0a/1\x03\x0974\x03\x09\x0f\x22\x03\x08,\x22\x03\x08?\x14\x03\x07$5\x03" +
-	"\x07<3\x03\x07=*\x03\x07\x13\x18\x03\x068\x0a\x03\x06\x09\x16\x03\x06" +
-	"\x13\x00\x03\x08\x067\x03\x08\x01\x03\x03\x08\x12\x1d\x03\x07+7\x03\x06(" +
-	";\x03\x06\x1c?\x03\x07\x0e\x17\x03\x0a\x06\x1d\x03\x0a\x19\x07\x03\x08" +
-	"\x14$\x03\x07$;\x03\x08,$\x03\x08\x06\x0d\x03\x07\x16\x0a\x03\x06>>\x03" +
-	"\x0a\x06\x12\x03\x0a\x14)\x03\x09\x0d\x1f\x03\x09\x12\x17\x03\x09\x19" +
-	"\x01\x03\x08\x11 \x03\x08\x1d'\x03\x06<\x1a\x03\x0a.\x00\x03\x07'\x18" +
-	"\x03\x0a\x22\x08\x03\x08\x0d\x0a\x03\x08\x13)\x03\x07*)\x03\x06<,\x03" +
-	"\x07\x0b\x1a\x03\x09.\x14\x03\x09\x0d\x1e\x03\x07\x0e#\x03\x0b\x1d'\x03" +
-	"\x0a\x0a8\x03\x09%2\x03\x08+&\x03\x080\x12\x03\x0a)4\x03\x08\x06\x1f\x03" +
-	"\x0b\x1b\x1a\x03\x0a\x1b\x0f\x03\x0b\x1d*\x03\x09\x16$\x03\x090\x11\x03" +
-	"\x08\x11\x08\x03\x0a*(\x03\x0a\x042\x03\x089,\x03\x074'\x03\x07\x0f\x05" +
-	"\x03\x09\x0b\x0a\x03\x07\x1b\x01\x03\x09\x17:\x03\x09.\x0d\x03\x07.\x11" +
-	"\x03\x09+\x15\x03\x080\x13\x03\x0b\x1f\x19\x03\x0a \x11\x03\x0a\x220\x03" +
-	"\x09\x07;\x03\x08\x16\x1c\x03\x07,\x13\x03\x07\x0e/\x03\x06\x221\x03\x0a" +
-	".\x0a\x03\x0a7\x02\x03\x0a\x032\x03\x0a\x1d.\x03\x091\x06\x03\x09\x19:" +
-	"\x03\x08\x02/\x03\x060+\x03\x06\x0f-\x03\x06\x1c\x1f\x03\x06\x1d\x07\x03" +
-	"\x0a,\x11\x03\x09=\x0d\x03\x09\x0b;\x03\x07\x1b/\x03\x0a\x1f:\x03\x09 " +
-	"\x1f\x03\x09.\x10\x03\x094\x0b\x03\x09\x1a1\x03\x08#\x1a\x03\x084\x1d" +
-	"\x03\x08\x01\x1f\x03\x08\x11\x22\x03\x07'8\x03\x07\x1a>\x03\x0757\x03" +
-	"\x06&9\x03\x06+\x11\x03\x0a.\x0b\x03\x0a,>\x03\x0a4#\x03\x08%\x17\x03" +
-	"\x07\x05\x22\x03\x07\x0c\x0b\x03\x0a\x1d+\x03\x0a\x19\x16\x03\x09+\x1f" +
-	"\x03\x09\x08\x0b\x03\x08\x16\x18\x03\x08+\x12\x03\x0b\x1d\x0c\x03\x0a=" +
-	"\x10\x03\x0a\x09\x0d\x03\x0a\x10\x11\x03\x09&0\x03\x08(\x1f\x03\x087\x07" +
-	"\x03\x08\x185\x03\x07'6\x03\x06.\x05\x03\x06=\x04\x03\x06;;\x03\x06\x06," +
-	"\x03\x0b\x18>\x03\x08\x00\x18\x03\x06 \x03\x03\x06<\x00\x03\x09%\x18\x03" +
-	"\x0b\x1c<\x03\x0a%!\x03\x0a\x09\x12\x03\x0a\x16\x02\x03\x090'\x03\x09" +
-	"\x0e=\x03\x08 \x0e\x03\x08>\x03\x03\x074>\x03\x06&?\x03\x06\x19\x09\x03" +
-	"\x06?(\x03\x0a-\x0e\x03\x09:3\x03\x098:\x03\x09\x12\x0b\x03\x09\x1d\x17" +
-	"\x03\x087\x05\x03\x082\x14\x03\x08\x06%\x03\x08\x13\x1f\x03\x06\x06\x0e" +
-	"\x03\x0a\x22<\x03\x09/<\x03\x06>+\x03\x0a'?\x03\x0a\x13\x0c\x03\x09\x10<" +
-	"\x03\x07\x1b=\x03\x0a\x19\x13\x03\x09\x22\x1d\x03\x09\x07\x0d\x03\x08)" +
-	"\x1c\x03\x06=\x1a\x03\x0a/4\x03\x0a7\x11\x03\x0a\x16:\x03\x09?3\x03\x09:" +
-	"/\x03\x09\x05\x0a\x03\x09\x14\x06\x03\x087\x22\x03\x080\x07\x03\x08\x1a" +
-	"\x1f\x03\x07\x04(\x03\x07\x04\x09\x03\x06 %\x03\x06<\x08\x03\x0a+\x14" +
-	"\x03\x09\x1d\x16\x03\x0a70\x03\x08 >\x03\x0857\x03\x070\x0a\x03\x06=\x12" +
-	"\x03\x06\x16%\x03\x06\x1d,\x03\x099#\x03\x09\x10>\x03\x07 \x1e\x03\x08" +
-	"\x0c<\x03\x08\x0b\x18\x03\x08\x15+\x03\x08,:\x03\x08%\x22\x03\x07\x0a$" +
-	"\x03\x0b\x1c=\x03\x07+\x08\x03\x0a/\x05\x03\x0a \x07\x03\x0a\x12'\x03" +
-	"\x09#\x11\x03\x08\x1b\x15\x03\x0a\x06\x01\x03\x09\x1c\x1b\x03\x0922\x03" +
-	"\x07\x14<\x03\x07\x09\x04\x03\x061\x04\x03\x07\x0e\x01\x03\x0a\x13\x18" +
-	"\x03\x0a-\x0c\x03\x0a?\x0d\x03\x0a\x09\x0a\x03\x091&\x03\x0a/\x0b\x03" +
-	"\x08$<\x03\x083\x1d\x03\x08\x0c$\x03\x08\x0d\x07\x03\x08\x0d?\x03\x08" +
-	"\x0e\x14\x03\x065\x0a\x03\x08\x1a#\x03\x08\x16#\x03\x0702\x03\x07\x03" +
-	"\x1a\x03\x06(\x1d\x03\x06+\x1b\x03\x06\x0b\x05\x03\x06\x0b\x17\x03\x06" +
-	"\x0c\x04\x03\x06\x1e\x19\x03\x06+0\x03\x062\x18\x03\x0b\x16\x1e\x03\x0a+" +
-	"\x16\x03\x0a-?\x03\x0a#:\x03\x0a#\x10\x03\x0a%$\x03\x0a>+\x03\x0a01\x03" +
-	"\x0a1\x10\x03\x0a\x099\x03\x0a\x0a\x12\x03\x0a\x19\x1f\x03\x0a\x19\x12" +
-	"\x03\x09*)\x03\x09-\x16\x03\x09.1\x03\x09.2\x03\x09<\x0e\x03\x09> \x03" +
-	"\x093\x12\x03\x09\x0b\x01\x03\x09\x1c2\x03\x09\x11\x1c\x03\x09\x15%\x03" +
-	"\x08,&\x03\x08!\x22\x03\x089(\x03\x08\x0b\x1a\x03\x08\x0d2\x03\x08\x0c" +
-	"\x04\x03\x08\x0c\x06\x03\x08\x0c\x1f\x03\x08\x0c\x0c\x03\x08\x0f\x1f\x03" +
-	"\x08\x0f\x1d\x03\x08\x00\x14\x03\x08\x03\x14\x03\x08\x06\x16\x03\x08\x1e" +
-	"#\x03\x08\x11\x11\x03\x08\x10\x18\x03\x08\x14(\x03\x07)\x1e\x03\x07.1" +
-	"\x03\x07 $\x03\x07 '\x03\x078\x08\x03\x07\x0d0\x03\x07\x0f7\x03\x07\x05#" +
-	"\x03\x07\x05\x1a\x03\x07\x1a7\x03\x07\x1d-\x03\x07\x17\x10\x03\x06)\x1f" +
-	"\x03\x062\x0b\x03\x066\x16\x03\x06\x09\x11\x03\x09(\x1e\x03\x07!5\x03" +
-	"\x0b\x11\x16\x03\x0a/\x04\x03\x0a,\x1a\x03\x0b\x173\x03\x0a,1\x03\x0a/5" +
-	"\x03\x0a\x221\x03\x0a\x22\x0d\x03\x0a?%\x03\x0a<,\x03\x0a?#\x03\x0a>\x19" +
-	"\x03\x0a\x08&\x03\x0a\x0b\x0e\x03\x0a\x0c:\x03\x0a\x0c+\x03\x0a\x03\x22" +
-	"\x03\x0a\x06)\x03\x0a\x11\x10\x03\x0a\x11\x1a\x03\x0a\x17-\x03\x0a\x14(" +
-	"\x03\x09)\x1e\x03\x09/\x09\x03\x09.\x00\x03\x09,\x07\x03\x09/*\x03\x09-9" +
-	"\x03\x09\x228\x03\x09%\x09\x03\x09:\x12\x03\x09;\x1d\x03\x09?\x06\x03" +
-	"\x093%\x03\x096\x05\x03\x096\x08\x03\x097\x02\x03\x09\x07,\x03\x09\x04," +
-	"\x03\x09\x1f\x16\x03\x09\x11\x03\x03\x09\x11\x12\x03\x09\x168\x03\x08*" +
-	"\x05\x03\x08/2\x03\x084:\x03\x08\x22+\x03\x08 0\x03\x08&\x0a\x03\x08;" +
-	"\x10\x03\x08>$\x03\x08>\x18\x03\x0829\x03\x082:\x03\x081,\x03\x081<\x03" +
-	"\x081\x1c\x03\x087#\x03\x087*\x03\x08\x09'\x03\x08\x00\x1d\x03\x08\x05-" +
-	"\x03\x08\x1f4\x03\x08\x1d\x04\x03\x08\x16\x0f\x03\x07*7\x03\x07'!\x03" +
-	"\x07%\x1b\x03\x077\x0c\x03\x07\x0c1\x03\x07\x0c.\x03\x07\x00\x06\x03\x07" +
-	"\x01\x02\x03\x07\x010\x03\x07\x06=\x03\x07\x01\x03\x03\x07\x01\x13\x03" +
-	"\x07\x06\x06\x03\x07\x05\x0a\x03\x07\x1f\x09\x03\x07\x17:\x03\x06*1\x03" +
-	"\x06-\x1d\x03\x06\x223\x03\x062:\x03\x060$\x03\x066\x1e\x03\x064\x12\x03" +
-	"\x0645\x03\x06\x0b\x00\x03\x06\x0b7\x03\x06\x07\x1f\x03\x06\x15\x12\x03" +
-	"\x0c\x05\x0f\x03\x0b+\x0b\x03\x0b+-\x03\x06\x16\x1b\x03\x06\x15\x17\x03" +
-	"\x89\xca\xea\x03\x89\xca\xe8\x03\x0c8\x10\x03\x0c8\x01\x03\x0c8\x0f\x03" +
-	"\x0d8%\x03\x0d8!\x03\x0c8-\x03\x0c8/\x03\x0c8+\x03\x0c87\x03\x0c85\x03" +
-	"\x0c9\x09\x03\x0c9\x0d\x03\x0c9\x0f\x03\x0c9\x0b\x03\xcfu\x0c\x03\xcfu" +
-	"\x0f\x03\xcfu\x0e\x03\xcfu\x09\x03\x0c9\x10\x03\x0d9\x0c\x03\xcf`;\x03" +
-	"\xcf`>\x03\xcf`9\x03\xcf`8\x03\xcf`7\x03\xcf`*\x03\xcf`-\x03\xcf`,\x03" +
-	"\x0d\x1b\x1a\x03\x0d\x1b&\x03\x0c=.\x03\x0c=%\x03\x0c>\x1e\x03\x0c>\x14" +
-	"\x03\x0c?\x06\x03\x0c?\x0b\x03\x0c?\x0c\x03\x0c?\x0d\x03\x0c?\x02\x03" +
-	"\x0c>\x0f\x03\x0c>\x08\x03\x0c>\x09\x03\x0c>,\x03\x0c>\x0c\x03\x0c?\x13" +
-	"\x03\x0c?\x16\x03\x0c?\x15\x03\x0c?\x1c\x03\x0c?\x1f\x03\x0c?\x1d\x03" +
-	"\x0c?\x1a\x03\x0c?\x17\x03\x0c?\x08\x03\x0c?\x09\x03\x0c?\x0e\x03\x0c?" +
-	"\x04\x03\x0c?\x05\x03\x0c<?\x03\x0c=\x00\x03\x0c=\x06\x03\x0c=\x05\x03" +
-	"\x0c=\x0c\x03\x0c=\x0f\x03\x0c=\x0d\x03\x0c=\x0b\x03\x0c=\x07\x03\x0c=" +
-	"\x19\x03\x0c=\x15\x03\x0c=\x11\x03\x0c=1\x03\x0c=3\x03\x0c=0\x03\x0c=>" +
-	"\x03\x0c=2\x03\x0c=6\x03\x0c<\x07\x03\x0c<\x05\x03\x0e:!\x03\x0e:#\x03" +
-	"\x0e8\x09\x03\x0e:&\x03\x0e8\x0b\x03\x0e:$\x03\x0e:,\x03\x0e8\x1a\x03" +
-	"\x0e8\x1e\x03\x0e:*\x03\x0e:7\x03\x0e:5\x03\x0e:;\x03\x0e:\x15\x03\x0e:<" +
-	"\x03\x0e:4\x03\x0e:'\x03\x0e:-\x03\x0e:%\x03\x0e:?\x03\x0e:=\x03\x0e:)" +
-	"\x03\x0e:/\x03\xcfs'\x03\x0d=\x0f\x03\x0d+*\x03\x0d99\x03\x0d9;\x03\x0d9" +
-	"?\x03\x0d)\x0d\x03\x0d(%\x02\x01\x18\x02\x01(\x02\x03'\x02\x03)\x02\x03+" +
-	"\x02\x03/\x02\x03\x19\x02\x03\x1b\x02\x03\x1f\x03\x0d\x22\x18\x03\x0d" +
-	"\x22\x1a\x03\x0d\x22'\x03\x0d\x22/\x03\x0d\x223\x03\x0d\x22$\x02\x01\x1e" +
-	"\x03\x0f$!\x03\x0f87\x03\x0f4\x0e\x03\x0f5\x1d\x03\x06'\x03\x03\x0f\x08" +
-	"\x18\x03\x0f\x0d\x1b\x03\x0e2=\x03\x0e;\x08\x03\x0e:\x0b\x03\x0e\x06$" +
-	"\x03\x0e\x0d)\x03\x0e\x16\x1f\x03\x0e\x16\x1b\x03\x0d$\x0a\x03\x05,\x1d" +
-	"\x03\x0d. \x03\x0d.#\x03\x0c(/\x03\x09%\x02\x03\x0d90\x03\x0d\x0e4\x03" +
-	"\x0d\x0d\x0f\x03\x0c#\x00\x03\x0c,\x1e\x03\x0c2\x0e\x03\x0c\x01\x17\x03" +
-	"\x0c\x09:\x03\x0e\x173\x03\x0c\x08\x03\x03\x0c\x11\x07\x03\x0c\x10\x18" +
-	"\x03\x0c\x1f\x1c\x03\x0c\x19\x0e\x03\x0c\x1a\x1f\x03\x0f0>\x03\x0b->\x03" +
-	"\x0b<+\x03\x0b8\x13\x03\x0b\x043\x03\x0b\x14\x03\x03\x0b\x16%\x03\x0d" +
-	"\x22&\x03\x0b\x1a\x1a\x03\x0b\x1a\x04\x03\x0a%9\x03\x0a&2\x03\x0a&0\x03" +
-	"\x0a!\x1a\x03\x0a!7\x03\x0a5\x10\x03\x0a=4\x03\x0a?\x0e\x03\x0a>\x10\x03" +
-	"\x0a\x00 \x03\x0a\x0f:\x03\x0a\x0f9\x03\x0a\x0b\x0a\x03\x0a\x17%\x03\x0a" +
-	"\x1b-\x03\x09-\x1a\x03\x09,4\x03\x09.,\x03\x09)\x09\x03\x096!\x03\x091" +
-	"\x1f\x03\x093\x16\x03\x0c+\x1f\x03\x098 \x03\x098=\x03\x0c(\x1a\x03\x0c(" +
-	"\x16\x03\x09\x0a+\x03\x09\x16\x12\x03\x09\x13\x0e\x03\x09\x153\x03\x08)!" +
-	"\x03\x09\x1a\x01\x03\x09\x18\x01\x03\x08%#\x03\x08>\x22\x03\x08\x05%\x03" +
-	"\x08\x02*\x03\x08\x15;\x03\x08\x1b7\x03\x0f\x07\x1d\x03\x0f\x04\x03\x03" +
-	"\x070\x0c\x03\x07;\x0b\x03\x07\x08\x17\x03\x07\x12\x06\x03\x06/-\x03\x06" +
-	"71\x03\x065+\x03\x06>7\x03\x06\x049\x03\x05+\x1e\x03\x05,\x17\x03\x05 " +
-	"\x1d\x03\x05\x22\x05\x03\x050\x1d"
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *idnaTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return idnaValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = idnaIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *idnaTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return idnaValues[c0]
-	}
-	i := idnaIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *idnaTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return idnaValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = idnaIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *idnaTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return idnaValues[c0]
-	}
-	i := idnaIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// idnaTrie. Total size: 31598 bytes (30.86 KiB). Checksum: d3118eda0d6b5360.
-type idnaTrie struct{}
-
-func newIdnaTrie(i int) *idnaTrie {
-	return &idnaTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *idnaTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 133:
-		return uint16(idnaValues[n<<6+uint32(b)])
-	default:
-		n -= 133
-		return uint16(idnaSparse.lookup(n, b))
-	}
-}
-
-// idnaValues: 135 blocks, 8640 entries, 17280 bytes
-// The third block is the zero block.
-var idnaValues = [8640]uint16{
-	// Block 0x0, offset 0x0
-	0x00: 0x0080, 0x01: 0x0080, 0x02: 0x0080, 0x03: 0x0080, 0x04: 0x0080, 0x05: 0x0080,
-	0x06: 0x0080, 0x07: 0x0080, 0x08: 0x0080, 0x09: 0x0080, 0x0a: 0x0080, 0x0b: 0x0080,
-	0x0c: 0x0080, 0x0d: 0x0080, 0x0e: 0x0080, 0x0f: 0x0080, 0x10: 0x0080, 0x11: 0x0080,
-	0x12: 0x0080, 0x13: 0x0080, 0x14: 0x0080, 0x15: 0x0080, 0x16: 0x0080, 0x17: 0x0080,
-	0x18: 0x0080, 0x19: 0x0080, 0x1a: 0x0080, 0x1b: 0x0080, 0x1c: 0x0080, 0x1d: 0x0080,
-	0x1e: 0x0080, 0x1f: 0x0080, 0x20: 0x0080, 0x21: 0x0080, 0x22: 0x0080, 0x23: 0x0080,
-	0x24: 0x0080, 0x25: 0x0080, 0x26: 0x0080, 0x27: 0x0080, 0x28: 0x0080, 0x29: 0x0080,
-	0x2a: 0x0080, 0x2b: 0x0080, 0x2c: 0x0080, 0x2d: 0x0008, 0x2e: 0x0008, 0x2f: 0x0080,
-	0x30: 0x0008, 0x31: 0x0008, 0x32: 0x0008, 0x33: 0x0008, 0x34: 0x0008, 0x35: 0x0008,
-	0x36: 0x0008, 0x37: 0x0008, 0x38: 0x0008, 0x39: 0x0008, 0x3a: 0x0080, 0x3b: 0x0080,
-	0x3c: 0x0080, 0x3d: 0x0080, 0x3e: 0x0080, 0x3f: 0x0080,
-	// Block 0x1, offset 0x40
-	0x40: 0x0080, 0x41: 0xe105, 0x42: 0xe105, 0x43: 0xe105, 0x44: 0xe105, 0x45: 0xe105,
-	0x46: 0xe105, 0x47: 0xe105, 0x48: 0xe105, 0x49: 0xe105, 0x4a: 0xe105, 0x4b: 0xe105,
-	0x4c: 0xe105, 0x4d: 0xe105, 0x4e: 0xe105, 0x4f: 0xe105, 0x50: 0xe105, 0x51: 0xe105,
-	0x52: 0xe105, 0x53: 0xe105, 0x54: 0xe105, 0x55: 0xe105, 0x56: 0xe105, 0x57: 0xe105,
-	0x58: 0xe105, 0x59: 0xe105, 0x5a: 0xe105, 0x5b: 0x0080, 0x5c: 0x0080, 0x5d: 0x0080,
-	0x5e: 0x0080, 0x5f: 0x0080, 0x60: 0x0080, 0x61: 0x0008, 0x62: 0x0008, 0x63: 0x0008,
-	0x64: 0x0008, 0x65: 0x0008, 0x66: 0x0008, 0x67: 0x0008, 0x68: 0x0008, 0x69: 0x0008,
-	0x6a: 0x0008, 0x6b: 0x0008, 0x6c: 0x0008, 0x6d: 0x0008, 0x6e: 0x0008, 0x6f: 0x0008,
-	0x70: 0x0008, 0x71: 0x0008, 0x72: 0x0008, 0x73: 0x0008, 0x74: 0x0008, 0x75: 0x0008,
-	0x76: 0x0008, 0x77: 0x0008, 0x78: 0x0008, 0x79: 0x0008, 0x7a: 0x0008, 0x7b: 0x0080,
-	0x7c: 0x0080, 0x7d: 0x0080, 0x7e: 0x0080, 0x7f: 0x0080,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x0040, 0xc1: 0x0040, 0xc2: 0x0040, 0xc3: 0x0040, 0xc4: 0x0040, 0xc5: 0x0040,
-	0xc6: 0x0040, 0xc7: 0x0040, 0xc8: 0x0040, 0xc9: 0x0040, 0xca: 0x0040, 0xcb: 0x0040,
-	0xcc: 0x0040, 0xcd: 0x0040, 0xce: 0x0040, 0xcf: 0x0040, 0xd0: 0x0040, 0xd1: 0x0040,
-	0xd2: 0x0040, 0xd3: 0x0040, 0xd4: 0x0040, 0xd5: 0x0040, 0xd6: 0x0040, 0xd7: 0x0040,
-	0xd8: 0x0040, 0xd9: 0x0040, 0xda: 0x0040, 0xdb: 0x0040, 0xdc: 0x0040, 0xdd: 0x0040,
-	0xde: 0x0040, 0xdf: 0x0040, 0xe0: 0x000a, 0xe1: 0x0018, 0xe2: 0x0018, 0xe3: 0x0018,
-	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x0012, 0xe9: 0x0018,
-	0xea: 0x0019, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x0022,
-	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0029, 0xf3: 0x0031, 0xf4: 0x003a, 0xf5: 0x0005,
-	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x0042, 0xf9: 0x0049, 0xfa: 0x0051, 0xfb: 0x0018,
-	0xfc: 0x0059, 0xfd: 0x0061, 0xfe: 0x0069, 0xff: 0x0018,
-	// Block 0x4, offset 0x100
-	0x100: 0xe00d, 0x101: 0x0008, 0x102: 0xe00d, 0x103: 0x0008, 0x104: 0xe00d, 0x105: 0x0008,
-	0x106: 0xe00d, 0x107: 0x0008, 0x108: 0xe00d, 0x109: 0x0008, 0x10a: 0xe00d, 0x10b: 0x0008,
-	0x10c: 0xe00d, 0x10d: 0x0008, 0x10e: 0xe00d, 0x10f: 0x0008, 0x110: 0xe00d, 0x111: 0x0008,
-	0x112: 0xe00d, 0x113: 0x0008, 0x114: 0xe00d, 0x115: 0x0008, 0x116: 0xe00d, 0x117: 0x0008,
-	0x118: 0xe00d, 0x119: 0x0008, 0x11a: 0xe00d, 0x11b: 0x0008, 0x11c: 0xe00d, 0x11d: 0x0008,
-	0x11e: 0xe00d, 0x11f: 0x0008, 0x120: 0xe00d, 0x121: 0x0008, 0x122: 0xe00d, 0x123: 0x0008,
-	0x124: 0xe00d, 0x125: 0x0008, 0x126: 0xe00d, 0x127: 0x0008, 0x128: 0xe00d, 0x129: 0x0008,
-	0x12a: 0xe00d, 0x12b: 0x0008, 0x12c: 0xe00d, 0x12d: 0x0008, 0x12e: 0xe00d, 0x12f: 0x0008,
-	0x130: 0x0071, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
-	0x136: 0xe00d, 0x137: 0x0008, 0x138: 0x0008, 0x139: 0xe01d, 0x13a: 0x0008, 0x13b: 0xe03d,
-	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0079,
-	// Block 0x5, offset 0x140
-	0x140: 0x0079, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
-	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x0081, 0x14a: 0xe00d, 0x14b: 0x0008,
-	0x14c: 0xe00d, 0x14d: 0x0008, 0x14e: 0xe00d, 0x14f: 0x0008, 0x150: 0xe00d, 0x151: 0x0008,
-	0x152: 0xe00d, 0x153: 0x0008, 0x154: 0xe00d, 0x155: 0x0008, 0x156: 0xe00d, 0x157: 0x0008,
-	0x158: 0xe00d, 0x159: 0x0008, 0x15a: 0xe00d, 0x15b: 0x0008, 0x15c: 0xe00d, 0x15d: 0x0008,
-	0x15e: 0xe00d, 0x15f: 0x0008, 0x160: 0xe00d, 0x161: 0x0008, 0x162: 0xe00d, 0x163: 0x0008,
-	0x164: 0xe00d, 0x165: 0x0008, 0x166: 0xe00d, 0x167: 0x0008, 0x168: 0xe00d, 0x169: 0x0008,
-	0x16a: 0xe00d, 0x16b: 0x0008, 0x16c: 0xe00d, 0x16d: 0x0008, 0x16e: 0xe00d, 0x16f: 0x0008,
-	0x170: 0xe00d, 0x171: 0x0008, 0x172: 0xe00d, 0x173: 0x0008, 0x174: 0xe00d, 0x175: 0x0008,
-	0x176: 0xe00d, 0x177: 0x0008, 0x178: 0x0065, 0x179: 0xe01d, 0x17a: 0x0008, 0x17b: 0xe03d,
-	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x0089,
-	// Block 0x6, offset 0x180
-	0x180: 0x0008, 0x181: 0x007d, 0x182: 0xe00d, 0x183: 0x0008, 0x184: 0xe00d, 0x185: 0x0008,
-	0x186: 0x007d, 0x187: 0xe07d, 0x188: 0x0008, 0x189: 0x0095, 0x18a: 0x00ad, 0x18b: 0xe03d,
-	0x18c: 0x0008, 0x18d: 0x0008, 0x18e: 0x00c5, 0x18f: 0x00dd, 0x190: 0x00f5, 0x191: 0xe01d,
-	0x192: 0x0008, 0x193: 0x010d, 0x194: 0x0125, 0x195: 0x0008, 0x196: 0x013d, 0x197: 0x013d,
-	0x198: 0xe00d, 0x199: 0x0008, 0x19a: 0x0008, 0x19b: 0x0008, 0x19c: 0x010d, 0x19d: 0x0155,
-	0x19e: 0x0008, 0x19f: 0x016d, 0x1a0: 0xe00d, 0x1a1: 0x0008, 0x1a2: 0xe00d, 0x1a3: 0x0008,
-	0x1a4: 0xe00d, 0x1a5: 0x0008, 0x1a6: 0x0185, 0x1a7: 0xe07d, 0x1a8: 0x0008, 0x1a9: 0x019d,
-	0x1aa: 0x0008, 0x1ab: 0x0008, 0x1ac: 0xe00d, 0x1ad: 0x0008, 0x1ae: 0x0185, 0x1af: 0xe0fd,
-	0x1b0: 0x0008, 0x1b1: 0x01b5, 0x1b2: 0x01cd, 0x1b3: 0xe03d, 0x1b4: 0x0008, 0x1b5: 0xe01d,
-	0x1b6: 0x0008, 0x1b7: 0x01e5, 0x1b8: 0xe00d, 0x1b9: 0x0008, 0x1ba: 0x0008, 0x1bb: 0x0008,
-	0x1bc: 0xe00d, 0x1bd: 0x0008, 0x1be: 0x0008, 0x1bf: 0x0008,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x0091, 0x1c5: 0x0091,
-	0x1c6: 0x0091, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
-	0x1cc: 0x0275, 0x1cd: 0xe01d, 0x1ce: 0x0008, 0x1cf: 0xe0fd, 0x1d0: 0x0008, 0x1d1: 0xe01d,
-	0x1d2: 0x0008, 0x1d3: 0xe03d, 0x1d4: 0x0008, 0x1d5: 0xe01d, 0x1d6: 0x0008, 0x1d7: 0xe07d,
-	0x1d8: 0x0008, 0x1d9: 0xe01d, 0x1da: 0x0008, 0x1db: 0xe03d, 0x1dc: 0x0008, 0x1dd: 0x0008,
-	0x1de: 0xe00d, 0x1df: 0x0008, 0x1e0: 0xe00d, 0x1e1: 0x0008, 0x1e2: 0xe00d, 0x1e3: 0x0008,
-	0x1e4: 0xe00d, 0x1e5: 0x0008, 0x1e6: 0xe00d, 0x1e7: 0x0008, 0x1e8: 0xe00d, 0x1e9: 0x0008,
-	0x1ea: 0xe00d, 0x1eb: 0x0008, 0x1ec: 0xe00d, 0x1ed: 0x0008, 0x1ee: 0xe00d, 0x1ef: 0x0008,
-	0x1f0: 0x0008, 0x1f1: 0x028d, 0x1f2: 0x02a5, 0x1f3: 0x02bd, 0x1f4: 0xe00d, 0x1f5: 0x0008,
-	0x1f6: 0x02d5, 0x1f7: 0x02ed, 0x1f8: 0xe00d, 0x1f9: 0x0008, 0x1fa: 0xe00d, 0x1fb: 0x0008,
-	0x1fc: 0xe00d, 0x1fd: 0x0008, 0x1fe: 0xe00d, 0x1ff: 0x0008,
-	// Block 0x8, offset 0x200
-	0x200: 0xe00d, 0x201: 0x0008, 0x202: 0xe00d, 0x203: 0x0008, 0x204: 0xe00d, 0x205: 0x0008,
-	0x206: 0xe00d, 0x207: 0x0008, 0x208: 0xe00d, 0x209: 0x0008, 0x20a: 0xe00d, 0x20b: 0x0008,
-	0x20c: 0xe00d, 0x20d: 0x0008, 0x20e: 0xe00d, 0x20f: 0x0008, 0x210: 0xe00d, 0x211: 0x0008,
-	0x212: 0xe00d, 0x213: 0x0008, 0x214: 0xe00d, 0x215: 0x0008, 0x216: 0xe00d, 0x217: 0x0008,
-	0x218: 0xe00d, 0x219: 0x0008, 0x21a: 0xe00d, 0x21b: 0x0008, 0x21c: 0xe00d, 0x21d: 0x0008,
-	0x21e: 0xe00d, 0x21f: 0x0008, 0x220: 0x0305, 0x221: 0x0008, 0x222: 0xe00d, 0x223: 0x0008,
-	0x224: 0xe00d, 0x225: 0x0008, 0x226: 0xe00d, 0x227: 0x0008, 0x228: 0xe00d, 0x229: 0x0008,
-	0x22a: 0xe00d, 0x22b: 0x0008, 0x22c: 0xe00d, 0x22d: 0x0008, 0x22e: 0xe00d, 0x22f: 0x0008,
-	0x230: 0xe00d, 0x231: 0x0008, 0x232: 0xe00d, 0x233: 0x0008, 0x234: 0x0008, 0x235: 0x0008,
-	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0099, 0x23b: 0xe03d,
-	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x00a1, 0x23f: 0x0008,
-	// Block 0x9, offset 0x240
-	0x240: 0x0008, 0x241: 0x0008, 0x242: 0x0018, 0x243: 0x0018, 0x244: 0x0018, 0x245: 0x0018,
-	0x246: 0x0008, 0x247: 0x0008, 0x248: 0x0008, 0x249: 0x0008, 0x24a: 0x0008, 0x24b: 0x0008,
-	0x24c: 0x0008, 0x24d: 0x0008, 0x24e: 0x0008, 0x24f: 0x0008, 0x250: 0x0008, 0x251: 0x0008,
-	0x252: 0x0018, 0x253: 0x0018, 0x254: 0x0018, 0x255: 0x0018, 0x256: 0x0018, 0x257: 0x0018,
-	0x258: 0x00d2, 0x259: 0x00da, 0x25a: 0x00e2, 0x25b: 0x00ea, 0x25c: 0x00f2, 0x25d: 0x00fa,
-	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0101, 0x262: 0x0089, 0x263: 0x0109,
-	0x264: 0x03c5, 0x265: 0x0018, 0x266: 0x0018, 0x267: 0x0018, 0x268: 0x0018, 0x269: 0x0018,
-	0x26a: 0x0018, 0x26b: 0x0018, 0x26c: 0x0008, 0x26d: 0x0018, 0x26e: 0x0008, 0x26f: 0x0018,
-	0x270: 0x0018, 0x271: 0x0018, 0x272: 0x0018, 0x273: 0x0018, 0x274: 0x0018, 0x275: 0x0018,
-	0x276: 0x0018, 0x277: 0x0018, 0x278: 0x0018, 0x279: 0x0018, 0x27a: 0x0018, 0x27b: 0x0018,
-	0x27c: 0x0018, 0x27d: 0x0018, 0x27e: 0x0018, 0x27f: 0x0018,
-	// Block 0xa, offset 0x280
-	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0111, 0x285: 0x040d,
-	0x286: 0x3308, 0x287: 0x3308, 0x288: 0x3308, 0x289: 0x3308, 0x28a: 0x3308, 0x28b: 0x3308,
-	0x28c: 0x3308, 0x28d: 0x3308, 0x28e: 0x3308, 0x28f: 0x33c0, 0x290: 0x3308, 0x291: 0x3308,
-	0x292: 0x3308, 0x293: 0x3308, 0x294: 0x3308, 0x295: 0x3308, 0x296: 0x3308, 0x297: 0x3308,
-	0x298: 0x3308, 0x299: 0x3308, 0x29a: 0x3308, 0x29b: 0x3308, 0x29c: 0x3308, 0x29d: 0x3308,
-	0x29e: 0x3308, 0x29f: 0x3308, 0x2a0: 0x3308, 0x2a1: 0x3308, 0x2a2: 0x3308, 0x2a3: 0x3308,
-	0x2a4: 0x3308, 0x2a5: 0x3308, 0x2a6: 0x3308, 0x2a7: 0x3308, 0x2a8: 0x3308, 0x2a9: 0x3308,
-	0x2aa: 0x3308, 0x2ab: 0x3308, 0x2ac: 0x3308, 0x2ad: 0x3308, 0x2ae: 0x3308, 0x2af: 0x3308,
-	0x2b0: 0xe00d, 0x2b1: 0x0008, 0x2b2: 0xe00d, 0x2b3: 0x0008, 0x2b4: 0x0425, 0x2b5: 0x0008,
-	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x011a, 0x2bb: 0x0008,
-	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x0122, 0x2bf: 0x043d,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x003a, 0x2c5: 0x012a,
-	0x2c6: 0xe155, 0x2c7: 0x0455, 0x2c8: 0xe12d, 0x2c9: 0xe13d, 0x2ca: 0xe12d, 0x2cb: 0x0040,
-	0x2cc: 0x03dd, 0x2cd: 0x0040, 0x2ce: 0x046d, 0x2cf: 0x0485, 0x2d0: 0x0008, 0x2d1: 0xe105,
-	0x2d2: 0xe105, 0x2d3: 0xe105, 0x2d4: 0xe105, 0x2d5: 0xe105, 0x2d6: 0xe105, 0x2d7: 0xe105,
-	0x2d8: 0xe105, 0x2d9: 0xe105, 0x2da: 0xe105, 0x2db: 0xe105, 0x2dc: 0xe105, 0x2dd: 0xe105,
-	0x2de: 0xe105, 0x2df: 0xe105, 0x2e0: 0x049d, 0x2e1: 0x049d, 0x2e2: 0x0040, 0x2e3: 0x049d,
-	0x2e4: 0x049d, 0x2e5: 0x049d, 0x2e6: 0x049d, 0x2e7: 0x049d, 0x2e8: 0x049d, 0x2e9: 0x049d,
-	0x2ea: 0x049d, 0x2eb: 0x049d, 0x2ec: 0x0008, 0x2ed: 0x0008, 0x2ee: 0x0008, 0x2ef: 0x0008,
-	0x2f0: 0x0008, 0x2f1: 0x0008, 0x2f2: 0x0008, 0x2f3: 0x0008, 0x2f4: 0x0008, 0x2f5: 0x0008,
-	0x2f6: 0x0008, 0x2f7: 0x0008, 0x2f8: 0x0008, 0x2f9: 0x0008, 0x2fa: 0x0008, 0x2fb: 0x0008,
-	0x2fc: 0x0008, 0x2fd: 0x0008, 0x2fe: 0x0008, 0x2ff: 0x0008,
-	// Block 0xc, offset 0x300
-	0x300: 0x0008, 0x301: 0x0008, 0x302: 0xe00f, 0x303: 0x0008, 0x304: 0x0008, 0x305: 0x0008,
-	0x306: 0x0008, 0x307: 0x0008, 0x308: 0x0008, 0x309: 0x0008, 0x30a: 0x0008, 0x30b: 0x0008,
-	0x30c: 0x0008, 0x30d: 0x0008, 0x30e: 0x0008, 0x30f: 0xe0c5, 0x310: 0x04b5, 0x311: 0x04cd,
-	0x312: 0xe0bd, 0x313: 0xe0f5, 0x314: 0xe0fd, 0x315: 0xe09d, 0x316: 0xe0b5, 0x317: 0x0008,
-	0x318: 0xe00d, 0x319: 0x0008, 0x31a: 0xe00d, 0x31b: 0x0008, 0x31c: 0xe00d, 0x31d: 0x0008,
-	0x31e: 0xe00d, 0x31f: 0x0008, 0x320: 0xe00d, 0x321: 0x0008, 0x322: 0xe00d, 0x323: 0x0008,
-	0x324: 0xe00d, 0x325: 0x0008, 0x326: 0xe00d, 0x327: 0x0008, 0x328: 0xe00d, 0x329: 0x0008,
-	0x32a: 0xe00d, 0x32b: 0x0008, 0x32c: 0xe00d, 0x32d: 0x0008, 0x32e: 0xe00d, 0x32f: 0x0008,
-	0x330: 0x04e5, 0x331: 0xe185, 0x332: 0xe18d, 0x333: 0x0008, 0x334: 0x04fd, 0x335: 0x03dd,
-	0x336: 0x0018, 0x337: 0xe07d, 0x338: 0x0008, 0x339: 0xe1d5, 0x33a: 0xe00d, 0x33b: 0x0008,
-	0x33c: 0x0008, 0x33d: 0x0515, 0x33e: 0x052d, 0x33f: 0x052d,
-	// Block 0xd, offset 0x340
-	0x340: 0x0008, 0x341: 0x0008, 0x342: 0x0008, 0x343: 0x0008, 0x344: 0x0008, 0x345: 0x0008,
-	0x346: 0x0008, 0x347: 0x0008, 0x348: 0x0008, 0x349: 0x0008, 0x34a: 0x0008, 0x34b: 0x0008,
-	0x34c: 0x0008, 0x34d: 0x0008, 0x34e: 0x0008, 0x34f: 0x0008, 0x350: 0x0008, 0x351: 0x0008,
-	0x352: 0x0008, 0x353: 0x0008, 0x354: 0x0008, 0x355: 0x0008, 0x356: 0x0008, 0x357: 0x0008,
-	0x358: 0x0008, 0x359: 0x0008, 0x35a: 0x0008, 0x35b: 0x0008, 0x35c: 0x0008, 0x35d: 0x0008,
-	0x35e: 0x0008, 0x35f: 0x0008, 0x360: 0xe00d, 0x361: 0x0008, 0x362: 0xe00d, 0x363: 0x0008,
-	0x364: 0xe00d, 0x365: 0x0008, 0x366: 0xe00d, 0x367: 0x0008, 0x368: 0xe00d, 0x369: 0x0008,
-	0x36a: 0xe00d, 0x36b: 0x0008, 0x36c: 0xe00d, 0x36d: 0x0008, 0x36e: 0xe00d, 0x36f: 0x0008,
-	0x370: 0xe00d, 0x371: 0x0008, 0x372: 0xe00d, 0x373: 0x0008, 0x374: 0xe00d, 0x375: 0x0008,
-	0x376: 0xe00d, 0x377: 0x0008, 0x378: 0xe00d, 0x379: 0x0008, 0x37a: 0xe00d, 0x37b: 0x0008,
-	0x37c: 0xe00d, 0x37d: 0x0008, 0x37e: 0xe00d, 0x37f: 0x0008,
-	// Block 0xe, offset 0x380
-	0x380: 0xe00d, 0x381: 0x0008, 0x382: 0x0018, 0x383: 0x3308, 0x384: 0x3308, 0x385: 0x3308,
-	0x386: 0x3308, 0x387: 0x3308, 0x388: 0x3318, 0x389: 0x3318, 0x38a: 0xe00d, 0x38b: 0x0008,
-	0x38c: 0xe00d, 0x38d: 0x0008, 0x38e: 0xe00d, 0x38f: 0x0008, 0x390: 0xe00d, 0x391: 0x0008,
-	0x392: 0xe00d, 0x393: 0x0008, 0x394: 0xe00d, 0x395: 0x0008, 0x396: 0xe00d, 0x397: 0x0008,
-	0x398: 0xe00d, 0x399: 0x0008, 0x39a: 0xe00d, 0x39b: 0x0008, 0x39c: 0xe00d, 0x39d: 0x0008,
-	0x39e: 0xe00d, 0x39f: 0x0008, 0x3a0: 0xe00d, 0x3a1: 0x0008, 0x3a2: 0xe00d, 0x3a3: 0x0008,
-	0x3a4: 0xe00d, 0x3a5: 0x0008, 0x3a6: 0xe00d, 0x3a7: 0x0008, 0x3a8: 0xe00d, 0x3a9: 0x0008,
-	0x3aa: 0xe00d, 0x3ab: 0x0008, 0x3ac: 0xe00d, 0x3ad: 0x0008, 0x3ae: 0xe00d, 0x3af: 0x0008,
-	0x3b0: 0xe00d, 0x3b1: 0x0008, 0x3b2: 0xe00d, 0x3b3: 0x0008, 0x3b4: 0xe00d, 0x3b5: 0x0008,
-	0x3b6: 0xe00d, 0x3b7: 0x0008, 0x3b8: 0xe00d, 0x3b9: 0x0008, 0x3ba: 0xe00d, 0x3bb: 0x0008,
-	0x3bc: 0xe00d, 0x3bd: 0x0008, 0x3be: 0xe00d, 0x3bf: 0x0008,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x0040, 0x3c1: 0xe01d, 0x3c2: 0x0008, 0x3c3: 0xe03d, 0x3c4: 0x0008, 0x3c5: 0xe01d,
-	0x3c6: 0x0008, 0x3c7: 0xe07d, 0x3c8: 0x0008, 0x3c9: 0xe01d, 0x3ca: 0x0008, 0x3cb: 0xe03d,
-	0x3cc: 0x0008, 0x3cd: 0xe01d, 0x3ce: 0x0008, 0x3cf: 0x0008, 0x3d0: 0xe00d, 0x3d1: 0x0008,
-	0x3d2: 0xe00d, 0x3d3: 0x0008, 0x3d4: 0xe00d, 0x3d5: 0x0008, 0x3d6: 0xe00d, 0x3d7: 0x0008,
-	0x3d8: 0xe00d, 0x3d9: 0x0008, 0x3da: 0xe00d, 0x3db: 0x0008, 0x3dc: 0xe00d, 0x3dd: 0x0008,
-	0x3de: 0xe00d, 0x3df: 0x0008, 0x3e0: 0xe00d, 0x3e1: 0x0008, 0x3e2: 0xe00d, 0x3e3: 0x0008,
-	0x3e4: 0xe00d, 0x3e5: 0x0008, 0x3e6: 0xe00d, 0x3e7: 0x0008, 0x3e8: 0xe00d, 0x3e9: 0x0008,
-	0x3ea: 0xe00d, 0x3eb: 0x0008, 0x3ec: 0xe00d, 0x3ed: 0x0008, 0x3ee: 0xe00d, 0x3ef: 0x0008,
-	0x3f0: 0xe00d, 0x3f1: 0x0008, 0x3f2: 0xe00d, 0x3f3: 0x0008, 0x3f4: 0xe00d, 0x3f5: 0x0008,
-	0x3f6: 0xe00d, 0x3f7: 0x0008, 0x3f8: 0xe00d, 0x3f9: 0x0008, 0x3fa: 0xe00d, 0x3fb: 0x0008,
-	0x3fc: 0xe00d, 0x3fd: 0x0008, 0x3fe: 0xe00d, 0x3ff: 0x0008,
-	// Block 0x10, offset 0x400
-	0x400: 0xe00d, 0x401: 0x0008, 0x402: 0xe00d, 0x403: 0x0008, 0x404: 0xe00d, 0x405: 0x0008,
-	0x406: 0xe00d, 0x407: 0x0008, 0x408: 0xe00d, 0x409: 0x0008, 0x40a: 0xe00d, 0x40b: 0x0008,
-	0x40c: 0xe00d, 0x40d: 0x0008, 0x40e: 0xe00d, 0x40f: 0x0008, 0x410: 0xe00d, 0x411: 0x0008,
-	0x412: 0xe00d, 0x413: 0x0008, 0x414: 0xe00d, 0x415: 0x0008, 0x416: 0xe00d, 0x417: 0x0008,
-	0x418: 0xe00d, 0x419: 0x0008, 0x41a: 0xe00d, 0x41b: 0x0008, 0x41c: 0xe00d, 0x41d: 0x0008,
-	0x41e: 0xe00d, 0x41f: 0x0008, 0x420: 0xe00d, 0x421: 0x0008, 0x422: 0xe00d, 0x423: 0x0008,
-	0x424: 0xe00d, 0x425: 0x0008, 0x426: 0xe00d, 0x427: 0x0008, 0x428: 0xe00d, 0x429: 0x0008,
-	0x42a: 0xe00d, 0x42b: 0x0008, 0x42c: 0xe00d, 0x42d: 0x0008, 0x42e: 0xe00d, 0x42f: 0x0008,
-	0x430: 0x0040, 0x431: 0x03f5, 0x432: 0x03f5, 0x433: 0x03f5, 0x434: 0x03f5, 0x435: 0x03f5,
-	0x436: 0x03f5, 0x437: 0x03f5, 0x438: 0x03f5, 0x439: 0x03f5, 0x43a: 0x03f5, 0x43b: 0x03f5,
-	0x43c: 0x03f5, 0x43d: 0x03f5, 0x43e: 0x03f5, 0x43f: 0x03f5,
-	// Block 0x11, offset 0x440
-	0x440: 0x0840, 0x441: 0x0840, 0x442: 0x0840, 0x443: 0x0840, 0x444: 0x0840, 0x445: 0x0840,
-	0x446: 0x0018, 0x447: 0x0018, 0x448: 0x0818, 0x449: 0x0018, 0x44a: 0x0018, 0x44b: 0x0818,
-	0x44c: 0x0018, 0x44d: 0x0818, 0x44e: 0x0018, 0x44f: 0x0018, 0x450: 0x3308, 0x451: 0x3308,
-	0x452: 0x3308, 0x453: 0x3308, 0x454: 0x3308, 0x455: 0x3308, 0x456: 0x3308, 0x457: 0x3308,
-	0x458: 0x3308, 0x459: 0x3308, 0x45a: 0x3308, 0x45b: 0x0818, 0x45c: 0x0b40, 0x45d: 0x0818,
-	0x45e: 0x0818, 0x45f: 0x0818, 0x460: 0x0a08, 0x461: 0x0808, 0x462: 0x0c08, 0x463: 0x0c08,
-	0x464: 0x0c08, 0x465: 0x0c08, 0x466: 0x0a08, 0x467: 0x0c08, 0x468: 0x0a08, 0x469: 0x0c08,
-	0x46a: 0x0a08, 0x46b: 0x0a08, 0x46c: 0x0a08, 0x46d: 0x0a08, 0x46e: 0x0a08, 0x46f: 0x0c08,
-	0x470: 0x0c08, 0x471: 0x0c08, 0x472: 0x0c08, 0x473: 0x0a08, 0x474: 0x0a08, 0x475: 0x0a08,
-	0x476: 0x0a08, 0x477: 0x0a08, 0x478: 0x0a08, 0x479: 0x0a08, 0x47a: 0x0a08, 0x47b: 0x0a08,
-	0x47c: 0x0a08, 0x47d: 0x0a08, 0x47e: 0x0a08, 0x47f: 0x0a08,
-	// Block 0x12, offset 0x480
-	0x480: 0x0818, 0x481: 0x0a08, 0x482: 0x0a08, 0x483: 0x0a08, 0x484: 0x0a08, 0x485: 0x0a08,
-	0x486: 0x0a08, 0x487: 0x0a08, 0x488: 0x0c08, 0x489: 0x0a08, 0x48a: 0x0a08, 0x48b: 0x3308,
-	0x48c: 0x3308, 0x48d: 0x3308, 0x48e: 0x3308, 0x48f: 0x3308, 0x490: 0x3308, 0x491: 0x3308,
-	0x492: 0x3308, 0x493: 0x3308, 0x494: 0x3308, 0x495: 0x3308, 0x496: 0x3308, 0x497: 0x3308,
-	0x498: 0x3308, 0x499: 0x3308, 0x49a: 0x3308, 0x49b: 0x3308, 0x49c: 0x3308, 0x49d: 0x3308,
-	0x49e: 0x3308, 0x49f: 0x3308, 0x4a0: 0x0808, 0x4a1: 0x0808, 0x4a2: 0x0808, 0x4a3: 0x0808,
-	0x4a4: 0x0808, 0x4a5: 0x0808, 0x4a6: 0x0808, 0x4a7: 0x0808, 0x4a8: 0x0808, 0x4a9: 0x0808,
-	0x4aa: 0x0018, 0x4ab: 0x0818, 0x4ac: 0x0818, 0x4ad: 0x0818, 0x4ae: 0x0a08, 0x4af: 0x0a08,
-	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0139,
-	0x4b6: 0x0141, 0x4b7: 0x0149, 0x4b8: 0x0151, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
-	0x4bc: 0x0a08, 0x4bd: 0x0a08, 0x4be: 0x0a08, 0x4bf: 0x0a08,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x0c08, 0x4c1: 0x0a08, 0x4c2: 0x0a08, 0x4c3: 0x0c08, 0x4c4: 0x0c08, 0x4c5: 0x0c08,
-	0x4c6: 0x0c08, 0x4c7: 0x0c08, 0x4c8: 0x0c08, 0x4c9: 0x0c08, 0x4ca: 0x0c08, 0x4cb: 0x0c08,
-	0x4cc: 0x0a08, 0x4cd: 0x0c08, 0x4ce: 0x0a08, 0x4cf: 0x0c08, 0x4d0: 0x0a08, 0x4d1: 0x0a08,
-	0x4d2: 0x0c08, 0x4d3: 0x0c08, 0x4d4: 0x0818, 0x4d5: 0x0c08, 0x4d6: 0x3308, 0x4d7: 0x3308,
-	0x4d8: 0x3308, 0x4d9: 0x3308, 0x4da: 0x3308, 0x4db: 0x3308, 0x4dc: 0x3308, 0x4dd: 0x0840,
-	0x4de: 0x0018, 0x4df: 0x3308, 0x4e0: 0x3308, 0x4e1: 0x3308, 0x4e2: 0x3308, 0x4e3: 0x3308,
-	0x4e4: 0x3308, 0x4e5: 0x0808, 0x4e6: 0x0808, 0x4e7: 0x3308, 0x4e8: 0x3308, 0x4e9: 0x0018,
-	0x4ea: 0x3308, 0x4eb: 0x3308, 0x4ec: 0x3308, 0x4ed: 0x3308, 0x4ee: 0x0c08, 0x4ef: 0x0c08,
-	0x4f0: 0x0008, 0x4f1: 0x0008, 0x4f2: 0x0008, 0x4f3: 0x0008, 0x4f4: 0x0008, 0x4f5: 0x0008,
-	0x4f6: 0x0008, 0x4f7: 0x0008, 0x4f8: 0x0008, 0x4f9: 0x0008, 0x4fa: 0x0a08, 0x4fb: 0x0a08,
-	0x4fc: 0x0a08, 0x4fd: 0x0808, 0x4fe: 0x0808, 0x4ff: 0x0a08,
-	// Block 0x14, offset 0x500
-	0x500: 0x0818, 0x501: 0x0818, 0x502: 0x0818, 0x503: 0x0818, 0x504: 0x0818, 0x505: 0x0818,
-	0x506: 0x0818, 0x507: 0x0818, 0x508: 0x0818, 0x509: 0x0818, 0x50a: 0x0818, 0x50b: 0x0818,
-	0x50c: 0x0818, 0x50d: 0x0818, 0x50e: 0x0040, 0x50f: 0x0b40, 0x510: 0x0c08, 0x511: 0x3308,
-	0x512: 0x0a08, 0x513: 0x0a08, 0x514: 0x0a08, 0x515: 0x0c08, 0x516: 0x0c08, 0x517: 0x0c08,
-	0x518: 0x0c08, 0x519: 0x0c08, 0x51a: 0x0a08, 0x51b: 0x0a08, 0x51c: 0x0a08, 0x51d: 0x0a08,
-	0x51e: 0x0c08, 0x51f: 0x0a08, 0x520: 0x0a08, 0x521: 0x0a08, 0x522: 0x0a08, 0x523: 0x0a08,
-	0x524: 0x0a08, 0x525: 0x0a08, 0x526: 0x0a08, 0x527: 0x0a08, 0x528: 0x0c08, 0x529: 0x0a08,
-	0x52a: 0x0c08, 0x52b: 0x0a08, 0x52c: 0x0c08, 0x52d: 0x0a08, 0x52e: 0x0a08, 0x52f: 0x0c08,
-	0x530: 0x3308, 0x531: 0x3308, 0x532: 0x3308, 0x533: 0x3308, 0x534: 0x3308, 0x535: 0x3308,
-	0x536: 0x3308, 0x537: 0x3308, 0x538: 0x3308, 0x539: 0x3308, 0x53a: 0x3308, 0x53b: 0x3308,
-	0x53c: 0x3308, 0x53d: 0x3308, 0x53e: 0x3308, 0x53f: 0x3308,
-	// Block 0x15, offset 0x540
-	0x540: 0x0c08, 0x541: 0x0a08, 0x542: 0x0a08, 0x543: 0x0a08, 0x544: 0x0a08, 0x545: 0x0a08,
-	0x546: 0x0c08, 0x547: 0x0c08, 0x548: 0x0a08, 0x549: 0x0c08, 0x54a: 0x0a08, 0x54b: 0x0a08,
-	0x54c: 0x0a08, 0x54d: 0x0a08, 0x54e: 0x0a08, 0x54f: 0x0a08, 0x550: 0x0a08, 0x551: 0x0a08,
-	0x552: 0x0a08, 0x553: 0x0a08, 0x554: 0x0c08, 0x555: 0x0a08, 0x556: 0x0c08, 0x557: 0x0c08,
-	0x558: 0x0c08, 0x559: 0x3308, 0x55a: 0x3308, 0x55b: 0x3308, 0x55c: 0x0040, 0x55d: 0x0040,
-	0x55e: 0x0818, 0x55f: 0x0040, 0x560: 0x0a08, 0x561: 0x0808, 0x562: 0x0a08, 0x563: 0x0a08,
-	0x564: 0x0a08, 0x565: 0x0a08, 0x566: 0x0808, 0x567: 0x0c08, 0x568: 0x0a08, 0x569: 0x0c08,
-	0x56a: 0x0c08, 0x56b: 0x0040, 0x56c: 0x0040, 0x56d: 0x0040, 0x56e: 0x0040, 0x56f: 0x0040,
-	0x570: 0x0c08, 0x571: 0x0c08, 0x572: 0x0c08, 0x573: 0x0c08, 0x574: 0x0c08, 0x575: 0x0c08,
-	0x576: 0x0c08, 0x577: 0x0c08, 0x578: 0x0c08, 0x579: 0x0c08, 0x57a: 0x0c08, 0x57b: 0x0c08,
-	0x57c: 0x0c08, 0x57d: 0x0c08, 0x57e: 0x0c08, 0x57f: 0x0c08,
-	// Block 0x16, offset 0x580
-	0x580: 0x0c08, 0x581: 0x0c08, 0x582: 0x0c08, 0x583: 0x0808, 0x584: 0x0808, 0x585: 0x0808,
-	0x586: 0x0a08, 0x587: 0x0808, 0x588: 0x0818, 0x589: 0x0a08, 0x58a: 0x0a08, 0x58b: 0x0a08,
-	0x58c: 0x0a08, 0x58d: 0x0a08, 0x58e: 0x0c08, 0x58f: 0x0040, 0x590: 0x0840, 0x591: 0x0840,
-	0x592: 0x0040, 0x593: 0x0040, 0x594: 0x0040, 0x595: 0x0040, 0x596: 0x0040, 0x597: 0x0040,
-	0x598: 0x3308, 0x599: 0x3308, 0x59a: 0x3308, 0x59b: 0x3308, 0x59c: 0x3308, 0x59d: 0x3308,
-	0x59e: 0x3308, 0x59f: 0x3308, 0x5a0: 0x0a08, 0x5a1: 0x0a08, 0x5a2: 0x0a08, 0x5a3: 0x0a08,
-	0x5a4: 0x0a08, 0x5a5: 0x0a08, 0x5a6: 0x0a08, 0x5a7: 0x0a08, 0x5a8: 0x0a08, 0x5a9: 0x0a08,
-	0x5aa: 0x0c08, 0x5ab: 0x0c08, 0x5ac: 0x0c08, 0x5ad: 0x0808, 0x5ae: 0x0c08, 0x5af: 0x0a08,
-	0x5b0: 0x0a08, 0x5b1: 0x0c08, 0x5b2: 0x0c08, 0x5b3: 0x0a08, 0x5b4: 0x0a08, 0x5b5: 0x0a08,
-	0x5b6: 0x0a08, 0x5b7: 0x0a08, 0x5b8: 0x0a08, 0x5b9: 0x0c08, 0x5ba: 0x0a08, 0x5bb: 0x0a08,
-	0x5bc: 0x0a08, 0x5bd: 0x0a08, 0x5be: 0x0a08, 0x5bf: 0x0a08,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x3008, 0x5c1: 0x3308, 0x5c2: 0x3308, 0x5c3: 0x3308, 0x5c4: 0x3308, 0x5c5: 0x3308,
-	0x5c6: 0x3308, 0x5c7: 0x3308, 0x5c8: 0x3308, 0x5c9: 0x3008, 0x5ca: 0x3008, 0x5cb: 0x3008,
-	0x5cc: 0x3008, 0x5cd: 0x3b08, 0x5ce: 0x3008, 0x5cf: 0x3008, 0x5d0: 0x0008, 0x5d1: 0x3308,
-	0x5d2: 0x3308, 0x5d3: 0x3308, 0x5d4: 0x3308, 0x5d5: 0x3308, 0x5d6: 0x3308, 0x5d7: 0x3308,
-	0x5d8: 0x0159, 0x5d9: 0x0161, 0x5da: 0x0169, 0x5db: 0x0171, 0x5dc: 0x0179, 0x5dd: 0x0181,
-	0x5de: 0x0189, 0x5df: 0x0191, 0x5e0: 0x0008, 0x5e1: 0x0008, 0x5e2: 0x3308, 0x5e3: 0x3308,
-	0x5e4: 0x0018, 0x5e5: 0x0018, 0x5e6: 0x0008, 0x5e7: 0x0008, 0x5e8: 0x0008, 0x5e9: 0x0008,
-	0x5ea: 0x0008, 0x5eb: 0x0008, 0x5ec: 0x0008, 0x5ed: 0x0008, 0x5ee: 0x0008, 0x5ef: 0x0008,
-	0x5f0: 0x0018, 0x5f1: 0x0008, 0x5f2: 0x0008, 0x5f3: 0x0008, 0x5f4: 0x0008, 0x5f5: 0x0008,
-	0x5f6: 0x0008, 0x5f7: 0x0008, 0x5f8: 0x0008, 0x5f9: 0x0008, 0x5fa: 0x0008, 0x5fb: 0x0008,
-	0x5fc: 0x0008, 0x5fd: 0x0008, 0x5fe: 0x0008, 0x5ff: 0x0008,
-	// Block 0x18, offset 0x600
-	0x600: 0x0008, 0x601: 0x3308, 0x602: 0x3008, 0x603: 0x3008, 0x604: 0x0040, 0x605: 0x0008,
-	0x606: 0x0008, 0x607: 0x0008, 0x608: 0x0008, 0x609: 0x0008, 0x60a: 0x0008, 0x60b: 0x0008,
-	0x60c: 0x0008, 0x60d: 0x0040, 0x60e: 0x0040, 0x60f: 0x0008, 0x610: 0x0008, 0x611: 0x0040,
-	0x612: 0x0040, 0x613: 0x0008, 0x614: 0x0008, 0x615: 0x0008, 0x616: 0x0008, 0x617: 0x0008,
-	0x618: 0x0008, 0x619: 0x0008, 0x61a: 0x0008, 0x61b: 0x0008, 0x61c: 0x0008, 0x61d: 0x0008,
-	0x61e: 0x0008, 0x61f: 0x0008, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x0008, 0x623: 0x0008,
-	0x624: 0x0008, 0x625: 0x0008, 0x626: 0x0008, 0x627: 0x0008, 0x628: 0x0008, 0x629: 0x0040,
-	0x62a: 0x0008, 0x62b: 0x0008, 0x62c: 0x0008, 0x62d: 0x0008, 0x62e: 0x0008, 0x62f: 0x0008,
-	0x630: 0x0008, 0x631: 0x0040, 0x632: 0x0008, 0x633: 0x0040, 0x634: 0x0040, 0x635: 0x0040,
-	0x636: 0x0008, 0x637: 0x0008, 0x638: 0x0008, 0x639: 0x0008, 0x63a: 0x0040, 0x63b: 0x0040,
-	0x63c: 0x3308, 0x63d: 0x0008, 0x63e: 0x3008, 0x63f: 0x3008,
-	// Block 0x19, offset 0x640
-	0x640: 0x3008, 0x641: 0x3308, 0x642: 0x3308, 0x643: 0x3308, 0x644: 0x3308, 0x645: 0x0040,
-	0x646: 0x0040, 0x647: 0x3008, 0x648: 0x3008, 0x649: 0x0040, 0x64a: 0x0040, 0x64b: 0x3008,
-	0x64c: 0x3008, 0x64d: 0x3b08, 0x64e: 0x0008, 0x64f: 0x0040, 0x650: 0x0040, 0x651: 0x0040,
-	0x652: 0x0040, 0x653: 0x0040, 0x654: 0x0040, 0x655: 0x0040, 0x656: 0x0040, 0x657: 0x3008,
-	0x658: 0x0040, 0x659: 0x0040, 0x65a: 0x0040, 0x65b: 0x0040, 0x65c: 0x0199, 0x65d: 0x01a1,
-	0x65e: 0x0040, 0x65f: 0x01a9, 0x660: 0x0008, 0x661: 0x0008, 0x662: 0x3308, 0x663: 0x3308,
-	0x664: 0x0040, 0x665: 0x0040, 0x666: 0x0008, 0x667: 0x0008, 0x668: 0x0008, 0x669: 0x0008,
-	0x66a: 0x0008, 0x66b: 0x0008, 0x66c: 0x0008, 0x66d: 0x0008, 0x66e: 0x0008, 0x66f: 0x0008,
-	0x670: 0x0008, 0x671: 0x0008, 0x672: 0x0018, 0x673: 0x0018, 0x674: 0x0018, 0x675: 0x0018,
-	0x676: 0x0018, 0x677: 0x0018, 0x678: 0x0018, 0x679: 0x0018, 0x67a: 0x0018, 0x67b: 0x0018,
-	0x67c: 0x0008, 0x67d: 0x0018, 0x67e: 0x3308, 0x67f: 0x0040,
-	// Block 0x1a, offset 0x680
-	0x680: 0x0040, 0x681: 0x3308, 0x682: 0x3308, 0x683: 0x3008, 0x684: 0x0040, 0x685: 0x0008,
-	0x686: 0x0008, 0x687: 0x0008, 0x688: 0x0008, 0x689: 0x0008, 0x68a: 0x0008, 0x68b: 0x0040,
-	0x68c: 0x0040, 0x68d: 0x0040, 0x68e: 0x0040, 0x68f: 0x0008, 0x690: 0x0008, 0x691: 0x0040,
-	0x692: 0x0040, 0x693: 0x0008, 0x694: 0x0008, 0x695: 0x0008, 0x696: 0x0008, 0x697: 0x0008,
-	0x698: 0x0008, 0x699: 0x0008, 0x69a: 0x0008, 0x69b: 0x0008, 0x69c: 0x0008, 0x69d: 0x0008,
-	0x69e: 0x0008, 0x69f: 0x0008, 0x6a0: 0x0008, 0x6a1: 0x0008, 0x6a2: 0x0008, 0x6a3: 0x0008,
-	0x6a4: 0x0008, 0x6a5: 0x0008, 0x6a6: 0x0008, 0x6a7: 0x0008, 0x6a8: 0x0008, 0x6a9: 0x0040,
-	0x6aa: 0x0008, 0x6ab: 0x0008, 0x6ac: 0x0008, 0x6ad: 0x0008, 0x6ae: 0x0008, 0x6af: 0x0008,
-	0x6b0: 0x0008, 0x6b1: 0x0040, 0x6b2: 0x0008, 0x6b3: 0x01b1, 0x6b4: 0x0040, 0x6b5: 0x0008,
-	0x6b6: 0x01b9, 0x6b7: 0x0040, 0x6b8: 0x0008, 0x6b9: 0x0008, 0x6ba: 0x0040, 0x6bb: 0x0040,
-	0x6bc: 0x3308, 0x6bd: 0x0040, 0x6be: 0x3008, 0x6bf: 0x3008,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x3008, 0x6c1: 0x3308, 0x6c2: 0x3308, 0x6c3: 0x0040, 0x6c4: 0x0040, 0x6c5: 0x0040,
-	0x6c6: 0x0040, 0x6c7: 0x3308, 0x6c8: 0x3308, 0x6c9: 0x0040, 0x6ca: 0x0040, 0x6cb: 0x3308,
-	0x6cc: 0x3308, 0x6cd: 0x3b08, 0x6ce: 0x0040, 0x6cf: 0x0040, 0x6d0: 0x0040, 0x6d1: 0x3308,
-	0x6d2: 0x0040, 0x6d3: 0x0040, 0x6d4: 0x0040, 0x6d5: 0x0040, 0x6d6: 0x0040, 0x6d7: 0x0040,
-	0x6d8: 0x0040, 0x6d9: 0x01c1, 0x6da: 0x01c9, 0x6db: 0x01d1, 0x6dc: 0x0008, 0x6dd: 0x0040,
-	0x6de: 0x01d9, 0x6df: 0x0040, 0x6e0: 0x0040, 0x6e1: 0x0040, 0x6e2: 0x0040, 0x6e3: 0x0040,
-	0x6e4: 0x0040, 0x6e5: 0x0040, 0x6e6: 0x0008, 0x6e7: 0x0008, 0x6e8: 0x0008, 0x6e9: 0x0008,
-	0x6ea: 0x0008, 0x6eb: 0x0008, 0x6ec: 0x0008, 0x6ed: 0x0008, 0x6ee: 0x0008, 0x6ef: 0x0008,
-	0x6f0: 0x3308, 0x6f1: 0x3308, 0x6f2: 0x0008, 0x6f3: 0x0008, 0x6f4: 0x0008, 0x6f5: 0x3308,
-	0x6f6: 0x0018, 0x6f7: 0x0040, 0x6f8: 0x0040, 0x6f9: 0x0040, 0x6fa: 0x0040, 0x6fb: 0x0040,
-	0x6fc: 0x0040, 0x6fd: 0x0040, 0x6fe: 0x0040, 0x6ff: 0x0040,
-	// Block 0x1c, offset 0x700
-	0x700: 0x0040, 0x701: 0x3308, 0x702: 0x3308, 0x703: 0x3008, 0x704: 0x0040, 0x705: 0x0008,
-	0x706: 0x0008, 0x707: 0x0008, 0x708: 0x0008, 0x709: 0x0008, 0x70a: 0x0008, 0x70b: 0x0008,
-	0x70c: 0x0008, 0x70d: 0x0008, 0x70e: 0x0040, 0x70f: 0x0008, 0x710: 0x0008, 0x711: 0x0008,
-	0x712: 0x0040, 0x713: 0x0008, 0x714: 0x0008, 0x715: 0x0008, 0x716: 0x0008, 0x717: 0x0008,
-	0x718: 0x0008, 0x719: 0x0008, 0x71a: 0x0008, 0x71b: 0x0008, 0x71c: 0x0008, 0x71d: 0x0008,
-	0x71e: 0x0008, 0x71f: 0x0008, 0x720: 0x0008, 0x721: 0x0008, 0x722: 0x0008, 0x723: 0x0008,
-	0x724: 0x0008, 0x725: 0x0008, 0x726: 0x0008, 0x727: 0x0008, 0x728: 0x0008, 0x729: 0x0040,
-	0x72a: 0x0008, 0x72b: 0x0008, 0x72c: 0x0008, 0x72d: 0x0008, 0x72e: 0x0008, 0x72f: 0x0008,
-	0x730: 0x0008, 0x731: 0x0040, 0x732: 0x0008, 0x733: 0x0008, 0x734: 0x0040, 0x735: 0x0008,
-	0x736: 0x0008, 0x737: 0x0008, 0x738: 0x0008, 0x739: 0x0008, 0x73a: 0x0040, 0x73b: 0x0040,
-	0x73c: 0x3308, 0x73d: 0x0008, 0x73e: 0x3008, 0x73f: 0x3008,
-	// Block 0x1d, offset 0x740
-	0x740: 0x3008, 0x741: 0x3308, 0x742: 0x3308, 0x743: 0x3308, 0x744: 0x3308, 0x745: 0x3308,
-	0x746: 0x0040, 0x747: 0x3308, 0x748: 0x3308, 0x749: 0x3008, 0x74a: 0x0040, 0x74b: 0x3008,
-	0x74c: 0x3008, 0x74d: 0x3b08, 0x74e: 0x0040, 0x74f: 0x0040, 0x750: 0x0008, 0x751: 0x0040,
-	0x752: 0x0040, 0x753: 0x0040, 0x754: 0x0040, 0x755: 0x0040, 0x756: 0x0040, 0x757: 0x0040,
-	0x758: 0x0040, 0x759: 0x0040, 0x75a: 0x0040, 0x75b: 0x0040, 0x75c: 0x0040, 0x75d: 0x0040,
-	0x75e: 0x0040, 0x75f: 0x0040, 0x760: 0x0008, 0x761: 0x0008, 0x762: 0x3308, 0x763: 0x3308,
-	0x764: 0x0040, 0x765: 0x0040, 0x766: 0x0008, 0x767: 0x0008, 0x768: 0x0008, 0x769: 0x0008,
-	0x76a: 0x0008, 0x76b: 0x0008, 0x76c: 0x0008, 0x76d: 0x0008, 0x76e: 0x0008, 0x76f: 0x0008,
-	0x770: 0x0018, 0x771: 0x0018, 0x772: 0x0040, 0x773: 0x0040, 0x774: 0x0040, 0x775: 0x0040,
-	0x776: 0x0040, 0x777: 0x0040, 0x778: 0x0040, 0x779: 0x0008, 0x77a: 0x3308, 0x77b: 0x3308,
-	0x77c: 0x3308, 0x77d: 0x3308, 0x77e: 0x3308, 0x77f: 0x3308,
-	// Block 0x1e, offset 0x780
-	0x780: 0x0040, 0x781: 0x3308, 0x782: 0x3008, 0x783: 0x3008, 0x784: 0x0040, 0x785: 0x0008,
-	0x786: 0x0008, 0x787: 0x0008, 0x788: 0x0008, 0x789: 0x0008, 0x78a: 0x0008, 0x78b: 0x0008,
-	0x78c: 0x0008, 0x78d: 0x0040, 0x78e: 0x0040, 0x78f: 0x0008, 0x790: 0x0008, 0x791: 0x0040,
-	0x792: 0x0040, 0x793: 0x0008, 0x794: 0x0008, 0x795: 0x0008, 0x796: 0x0008, 0x797: 0x0008,
-	0x798: 0x0008, 0x799: 0x0008, 0x79a: 0x0008, 0x79b: 0x0008, 0x79c: 0x0008, 0x79d: 0x0008,
-	0x79e: 0x0008, 0x79f: 0x0008, 0x7a0: 0x0008, 0x7a1: 0x0008, 0x7a2: 0x0008, 0x7a3: 0x0008,
-	0x7a4: 0x0008, 0x7a5: 0x0008, 0x7a6: 0x0008, 0x7a7: 0x0008, 0x7a8: 0x0008, 0x7a9: 0x0040,
-	0x7aa: 0x0008, 0x7ab: 0x0008, 0x7ac: 0x0008, 0x7ad: 0x0008, 0x7ae: 0x0008, 0x7af: 0x0008,
-	0x7b0: 0x0008, 0x7b1: 0x0040, 0x7b2: 0x0008, 0x7b3: 0x0008, 0x7b4: 0x0040, 0x7b5: 0x0008,
-	0x7b6: 0x0008, 0x7b7: 0x0008, 0x7b8: 0x0008, 0x7b9: 0x0008, 0x7ba: 0x0040, 0x7bb: 0x0040,
-	0x7bc: 0x3308, 0x7bd: 0x0008, 0x7be: 0x3008, 0x7bf: 0x3308,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x3008, 0x7c1: 0x3308, 0x7c2: 0x3308, 0x7c3: 0x3308, 0x7c4: 0x3308, 0x7c5: 0x0040,
-	0x7c6: 0x0040, 0x7c7: 0x3008, 0x7c8: 0x3008, 0x7c9: 0x0040, 0x7ca: 0x0040, 0x7cb: 0x3008,
-	0x7cc: 0x3008, 0x7cd: 0x3b08, 0x7ce: 0x0040, 0x7cf: 0x0040, 0x7d0: 0x0040, 0x7d1: 0x0040,
-	0x7d2: 0x0040, 0x7d3: 0x0040, 0x7d4: 0x0040, 0x7d5: 0x3308, 0x7d6: 0x3308, 0x7d7: 0x3008,
-	0x7d8: 0x0040, 0x7d9: 0x0040, 0x7da: 0x0040, 0x7db: 0x0040, 0x7dc: 0x01e1, 0x7dd: 0x01e9,
-	0x7de: 0x0040, 0x7df: 0x0008, 0x7e0: 0x0008, 0x7e1: 0x0008, 0x7e2: 0x3308, 0x7e3: 0x3308,
-	0x7e4: 0x0040, 0x7e5: 0x0040, 0x7e6: 0x0008, 0x7e7: 0x0008, 0x7e8: 0x0008, 0x7e9: 0x0008,
-	0x7ea: 0x0008, 0x7eb: 0x0008, 0x7ec: 0x0008, 0x7ed: 0x0008, 0x7ee: 0x0008, 0x7ef: 0x0008,
-	0x7f0: 0x0018, 0x7f1: 0x0008, 0x7f2: 0x0018, 0x7f3: 0x0018, 0x7f4: 0x0018, 0x7f5: 0x0018,
-	0x7f6: 0x0018, 0x7f7: 0x0018, 0x7f8: 0x0040, 0x7f9: 0x0040, 0x7fa: 0x0040, 0x7fb: 0x0040,
-	0x7fc: 0x0040, 0x7fd: 0x0040, 0x7fe: 0x0040, 0x7ff: 0x0040,
-	// Block 0x20, offset 0x800
-	0x800: 0x0040, 0x801: 0x0040, 0x802: 0x3308, 0x803: 0x0008, 0x804: 0x0040, 0x805: 0x0008,
-	0x806: 0x0008, 0x807: 0x0008, 0x808: 0x0008, 0x809: 0x0008, 0x80a: 0x0008, 0x80b: 0x0040,
-	0x80c: 0x0040, 0x80d: 0x0040, 0x80e: 0x0008, 0x80f: 0x0008, 0x810: 0x0008, 0x811: 0x0040,
-	0x812: 0x0008, 0x813: 0x0008, 0x814: 0x0008, 0x815: 0x0008, 0x816: 0x0040, 0x817: 0x0040,
-	0x818: 0x0040, 0x819: 0x0008, 0x81a: 0x0008, 0x81b: 0x0040, 0x81c: 0x0008, 0x81d: 0x0040,
-	0x81e: 0x0008, 0x81f: 0x0008, 0x820: 0x0040, 0x821: 0x0040, 0x822: 0x0040, 0x823: 0x0008,
-	0x824: 0x0008, 0x825: 0x0040, 0x826: 0x0040, 0x827: 0x0040, 0x828: 0x0008, 0x829: 0x0008,
-	0x82a: 0x0008, 0x82b: 0x0040, 0x82c: 0x0040, 0x82d: 0x0040, 0x82e: 0x0008, 0x82f: 0x0008,
-	0x830: 0x0008, 0x831: 0x0008, 0x832: 0x0008, 0x833: 0x0008, 0x834: 0x0008, 0x835: 0x0008,
-	0x836: 0x0008, 0x837: 0x0008, 0x838: 0x0008, 0x839: 0x0008, 0x83a: 0x0040, 0x83b: 0x0040,
-	0x83c: 0x0040, 0x83d: 0x0040, 0x83e: 0x3008, 0x83f: 0x3008,
-	// Block 0x21, offset 0x840
-	0x840: 0x3308, 0x841: 0x3008, 0x842: 0x3008, 0x843: 0x3008, 0x844: 0x3008, 0x845: 0x0040,
-	0x846: 0x3308, 0x847: 0x3308, 0x848: 0x3308, 0x849: 0x0040, 0x84a: 0x3308, 0x84b: 0x3308,
-	0x84c: 0x3308, 0x84d: 0x3b08, 0x84e: 0x0040, 0x84f: 0x0040, 0x850: 0x0040, 0x851: 0x0040,
-	0x852: 0x0040, 0x853: 0x0040, 0x854: 0x0040, 0x855: 0x3308, 0x856: 0x3308, 0x857: 0x0040,
-	0x858: 0x0008, 0x859: 0x0008, 0x85a: 0x0008, 0x85b: 0x0040, 0x85c: 0x0040, 0x85d: 0x0008,
-	0x85e: 0x0040, 0x85f: 0x0040, 0x860: 0x0008, 0x861: 0x0008, 0x862: 0x3308, 0x863: 0x3308,
-	0x864: 0x0040, 0x865: 0x0040, 0x866: 0x0008, 0x867: 0x0008, 0x868: 0x0008, 0x869: 0x0008,
-	0x86a: 0x0008, 0x86b: 0x0008, 0x86c: 0x0008, 0x86d: 0x0008, 0x86e: 0x0008, 0x86f: 0x0008,
-	0x870: 0x0040, 0x871: 0x0040, 0x872: 0x0040, 0x873: 0x0040, 0x874: 0x0040, 0x875: 0x0040,
-	0x876: 0x0040, 0x877: 0x0018, 0x878: 0x0018, 0x879: 0x0018, 0x87a: 0x0018, 0x87b: 0x0018,
-	0x87c: 0x0018, 0x87d: 0x0018, 0x87e: 0x0018, 0x87f: 0x0018,
-	// Block 0x22, offset 0x880
-	0x880: 0x0008, 0x881: 0x3308, 0x882: 0x3008, 0x883: 0x3008, 0x884: 0x0018, 0x885: 0x0008,
-	0x886: 0x0008, 0x887: 0x0008, 0x888: 0x0008, 0x889: 0x0008, 0x88a: 0x0008, 0x88b: 0x0008,
-	0x88c: 0x0008, 0x88d: 0x0040, 0x88e: 0x0008, 0x88f: 0x0008, 0x890: 0x0008, 0x891: 0x0040,
-	0x892: 0x0008, 0x893: 0x0008, 0x894: 0x0008, 0x895: 0x0008, 0x896: 0x0008, 0x897: 0x0008,
-	0x898: 0x0008, 0x899: 0x0008, 0x89a: 0x0008, 0x89b: 0x0008, 0x89c: 0x0008, 0x89d: 0x0008,
-	0x89e: 0x0008, 0x89f: 0x0008, 0x8a0: 0x0008, 0x8a1: 0x0008, 0x8a2: 0x0008, 0x8a3: 0x0008,
-	0x8a4: 0x0008, 0x8a5: 0x0008, 0x8a6: 0x0008, 0x8a7: 0x0008, 0x8a8: 0x0008, 0x8a9: 0x0040,
-	0x8aa: 0x0008, 0x8ab: 0x0008, 0x8ac: 0x0008, 0x8ad: 0x0008, 0x8ae: 0x0008, 0x8af: 0x0008,
-	0x8b0: 0x0008, 0x8b1: 0x0008, 0x8b2: 0x0008, 0x8b3: 0x0008, 0x8b4: 0x0040, 0x8b5: 0x0008,
-	0x8b6: 0x0008, 0x8b7: 0x0008, 0x8b8: 0x0008, 0x8b9: 0x0008, 0x8ba: 0x0040, 0x8bb: 0x0040,
-	0x8bc: 0x3308, 0x8bd: 0x0008, 0x8be: 0x3008, 0x8bf: 0x3308,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x3008, 0x8c1: 0x3008, 0x8c2: 0x3008, 0x8c3: 0x3008, 0x8c4: 0x3008, 0x8c5: 0x0040,
-	0x8c6: 0x3308, 0x8c7: 0x3008, 0x8c8: 0x3008, 0x8c9: 0x0040, 0x8ca: 0x3008, 0x8cb: 0x3008,
-	0x8cc: 0x3308, 0x8cd: 0x3b08, 0x8ce: 0x0040, 0x8cf: 0x0040, 0x8d0: 0x0040, 0x8d1: 0x0040,
-	0x8d2: 0x0040, 0x8d3: 0x0040, 0x8d4: 0x0040, 0x8d5: 0x3008, 0x8d6: 0x3008, 0x8d7: 0x0040,
-	0x8d8: 0x0040, 0x8d9: 0x0040, 0x8da: 0x0040, 0x8db: 0x0040, 0x8dc: 0x0040, 0x8dd: 0x0008,
-	0x8de: 0x0008, 0x8df: 0x0040, 0x8e0: 0x0008, 0x8e1: 0x0008, 0x8e2: 0x3308, 0x8e3: 0x3308,
-	0x8e4: 0x0040, 0x8e5: 0x0040, 0x8e6: 0x0008, 0x8e7: 0x0008, 0x8e8: 0x0008, 0x8e9: 0x0008,
-	0x8ea: 0x0008, 0x8eb: 0x0008, 0x8ec: 0x0008, 0x8ed: 0x0008, 0x8ee: 0x0008, 0x8ef: 0x0008,
-	0x8f0: 0x0040, 0x8f1: 0x0008, 0x8f2: 0x0008, 0x8f3: 0x3008, 0x8f4: 0x0040, 0x8f5: 0x0040,
-	0x8f6: 0x0040, 0x8f7: 0x0040, 0x8f8: 0x0040, 0x8f9: 0x0040, 0x8fa: 0x0040, 0x8fb: 0x0040,
-	0x8fc: 0x0040, 0x8fd: 0x0040, 0x8fe: 0x0040, 0x8ff: 0x0040,
-	// Block 0x24, offset 0x900
-	0x900: 0x3008, 0x901: 0x3308, 0x902: 0x3308, 0x903: 0x3308, 0x904: 0x3308, 0x905: 0x0040,
-	0x906: 0x3008, 0x907: 0x3008, 0x908: 0x3008, 0x909: 0x0040, 0x90a: 0x3008, 0x90b: 0x3008,
-	0x90c: 0x3008, 0x90d: 0x3b08, 0x90e: 0x0008, 0x90f: 0x0018, 0x910: 0x0040, 0x911: 0x0040,
-	0x912: 0x0040, 0x913: 0x0040, 0x914: 0x0008, 0x915: 0x0008, 0x916: 0x0008, 0x917: 0x3008,
-	0x918: 0x0018, 0x919: 0x0018, 0x91a: 0x0018, 0x91b: 0x0018, 0x91c: 0x0018, 0x91d: 0x0018,
-	0x91e: 0x0018, 0x91f: 0x0008, 0x920: 0x0008, 0x921: 0x0008, 0x922: 0x3308, 0x923: 0x3308,
-	0x924: 0x0040, 0x925: 0x0040, 0x926: 0x0008, 0x927: 0x0008, 0x928: 0x0008, 0x929: 0x0008,
-	0x92a: 0x0008, 0x92b: 0x0008, 0x92c: 0x0008, 0x92d: 0x0008, 0x92e: 0x0008, 0x92f: 0x0008,
-	0x930: 0x0018, 0x931: 0x0018, 0x932: 0x0018, 0x933: 0x0018, 0x934: 0x0018, 0x935: 0x0018,
-	0x936: 0x0018, 0x937: 0x0018, 0x938: 0x0018, 0x939: 0x0018, 0x93a: 0x0008, 0x93b: 0x0008,
-	0x93c: 0x0008, 0x93d: 0x0008, 0x93e: 0x0008, 0x93f: 0x0008,
-	// Block 0x25, offset 0x940
-	0x940: 0x0040, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x0040, 0x944: 0x0008, 0x945: 0x0040,
-	0x946: 0x0008, 0x947: 0x0008, 0x948: 0x0008, 0x949: 0x0008, 0x94a: 0x0008, 0x94b: 0x0040,
-	0x94c: 0x0008, 0x94d: 0x0008, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
-	0x952: 0x0008, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0008,
-	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0008, 0x95d: 0x0008,
-	0x95e: 0x0008, 0x95f: 0x0008, 0x960: 0x0008, 0x961: 0x0008, 0x962: 0x0008, 0x963: 0x0008,
-	0x964: 0x0040, 0x965: 0x0008, 0x966: 0x0040, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0008,
-	0x96a: 0x0008, 0x96b: 0x0008, 0x96c: 0x0008, 0x96d: 0x0008, 0x96e: 0x0008, 0x96f: 0x0008,
-	0x970: 0x0008, 0x971: 0x3308, 0x972: 0x0008, 0x973: 0x01f9, 0x974: 0x3308, 0x975: 0x3308,
-	0x976: 0x3308, 0x977: 0x3308, 0x978: 0x3308, 0x979: 0x3308, 0x97a: 0x3b08, 0x97b: 0x3308,
-	0x97c: 0x3308, 0x97d: 0x0008, 0x97e: 0x0040, 0x97f: 0x0040,
-	// Block 0x26, offset 0x980
-	0x980: 0x0008, 0x981: 0x0008, 0x982: 0x0008, 0x983: 0x0211, 0x984: 0x0008, 0x985: 0x0008,
-	0x986: 0x0008, 0x987: 0x0008, 0x988: 0x0040, 0x989: 0x0008, 0x98a: 0x0008, 0x98b: 0x0008,
-	0x98c: 0x0008, 0x98d: 0x0219, 0x98e: 0x0008, 0x98f: 0x0008, 0x990: 0x0008, 0x991: 0x0008,
-	0x992: 0x0221, 0x993: 0x0008, 0x994: 0x0008, 0x995: 0x0008, 0x996: 0x0008, 0x997: 0x0229,
-	0x998: 0x0008, 0x999: 0x0008, 0x99a: 0x0008, 0x99b: 0x0008, 0x99c: 0x0231, 0x99d: 0x0008,
-	0x99e: 0x0008, 0x99f: 0x0008, 0x9a0: 0x0008, 0x9a1: 0x0008, 0x9a2: 0x0008, 0x9a3: 0x0008,
-	0x9a4: 0x0008, 0x9a5: 0x0008, 0x9a6: 0x0008, 0x9a7: 0x0008, 0x9a8: 0x0008, 0x9a9: 0x0239,
-	0x9aa: 0x0008, 0x9ab: 0x0008, 0x9ac: 0x0008, 0x9ad: 0x0040, 0x9ae: 0x0040, 0x9af: 0x0040,
-	0x9b0: 0x0040, 0x9b1: 0x3308, 0x9b2: 0x3308, 0x9b3: 0x0241, 0x9b4: 0x3308, 0x9b5: 0x0249,
-	0x9b6: 0x0251, 0x9b7: 0x0259, 0x9b8: 0x0261, 0x9b9: 0x0269, 0x9ba: 0x3308, 0x9bb: 0x3308,
-	0x9bc: 0x3308, 0x9bd: 0x3308, 0x9be: 0x3308, 0x9bf: 0x3008,
-	// Block 0x27, offset 0x9c0
-	0x9c0: 0x3308, 0x9c1: 0x0271, 0x9c2: 0x3308, 0x9c3: 0x3308, 0x9c4: 0x3b08, 0x9c5: 0x0018,
-	0x9c6: 0x3308, 0x9c7: 0x3308, 0x9c8: 0x0008, 0x9c9: 0x0008, 0x9ca: 0x0008, 0x9cb: 0x0008,
-	0x9cc: 0x0008, 0x9cd: 0x3308, 0x9ce: 0x3308, 0x9cf: 0x3308, 0x9d0: 0x3308, 0x9d1: 0x3308,
-	0x9d2: 0x3308, 0x9d3: 0x0279, 0x9d4: 0x3308, 0x9d5: 0x3308, 0x9d6: 0x3308, 0x9d7: 0x3308,
-	0x9d8: 0x0040, 0x9d9: 0x3308, 0x9da: 0x3308, 0x9db: 0x3308, 0x9dc: 0x3308, 0x9dd: 0x0281,
-	0x9de: 0x3308, 0x9df: 0x3308, 0x9e0: 0x3308, 0x9e1: 0x3308, 0x9e2: 0x0289, 0x9e3: 0x3308,
-	0x9e4: 0x3308, 0x9e5: 0x3308, 0x9e6: 0x3308, 0x9e7: 0x0291, 0x9e8: 0x3308, 0x9e9: 0x3308,
-	0x9ea: 0x3308, 0x9eb: 0x3308, 0x9ec: 0x0299, 0x9ed: 0x3308, 0x9ee: 0x3308, 0x9ef: 0x3308,
-	0x9f0: 0x3308, 0x9f1: 0x3308, 0x9f2: 0x3308, 0x9f3: 0x3308, 0x9f4: 0x3308, 0x9f5: 0x3308,
-	0x9f6: 0x3308, 0x9f7: 0x3308, 0x9f8: 0x3308, 0x9f9: 0x02a1, 0x9fa: 0x3308, 0x9fb: 0x3308,
-	0x9fc: 0x3308, 0x9fd: 0x0040, 0x9fe: 0x0018, 0x9ff: 0x0018,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x0008, 0xa01: 0x0008, 0xa02: 0x0008, 0xa03: 0x0008, 0xa04: 0x0008, 0xa05: 0x0008,
-	0xa06: 0x0008, 0xa07: 0x0008, 0xa08: 0x0008, 0xa09: 0x0008, 0xa0a: 0x0008, 0xa0b: 0x0008,
-	0xa0c: 0x0008, 0xa0d: 0x0008, 0xa0e: 0x0008, 0xa0f: 0x0008, 0xa10: 0x0008, 0xa11: 0x0008,
-	0xa12: 0x0008, 0xa13: 0x0008, 0xa14: 0x0008, 0xa15: 0x0008, 0xa16: 0x0008, 0xa17: 0x0008,
-	0xa18: 0x0008, 0xa19: 0x0008, 0xa1a: 0x0008, 0xa1b: 0x0008, 0xa1c: 0x0008, 0xa1d: 0x0008,
-	0xa1e: 0x0008, 0xa1f: 0x0008, 0xa20: 0x0008, 0xa21: 0x0008, 0xa22: 0x0008, 0xa23: 0x0008,
-	0xa24: 0x0008, 0xa25: 0x0008, 0xa26: 0x0008, 0xa27: 0x0008, 0xa28: 0x0008, 0xa29: 0x0008,
-	0xa2a: 0x0008, 0xa2b: 0x0008, 0xa2c: 0x0019, 0xa2d: 0x02e1, 0xa2e: 0x02e9, 0xa2f: 0x0008,
-	0xa30: 0x02f1, 0xa31: 0x02f9, 0xa32: 0x0301, 0xa33: 0x0309, 0xa34: 0x00a9, 0xa35: 0x0311,
-	0xa36: 0x00b1, 0xa37: 0x0319, 0xa38: 0x0101, 0xa39: 0x0321, 0xa3a: 0x0329, 0xa3b: 0x0008,
-	0xa3c: 0x0051, 0xa3d: 0x0331, 0xa3e: 0x0339, 0xa3f: 0x00b9,
-	// Block 0x29, offset 0xa40
-	0xa40: 0x0341, 0xa41: 0x0349, 0xa42: 0x00c1, 0xa43: 0x0019, 0xa44: 0x0351, 0xa45: 0x0359,
-	0xa46: 0x05b5, 0xa47: 0x02e9, 0xa48: 0x02f1, 0xa49: 0x02f9, 0xa4a: 0x0361, 0xa4b: 0x0369,
-	0xa4c: 0x0371, 0xa4d: 0x0309, 0xa4e: 0x0008, 0xa4f: 0x0319, 0xa50: 0x0321, 0xa51: 0x0379,
-	0xa52: 0x0051, 0xa53: 0x0381, 0xa54: 0x05cd, 0xa55: 0x05cd, 0xa56: 0x0339, 0xa57: 0x0341,
-	0xa58: 0x0349, 0xa59: 0x05b5, 0xa5a: 0x0389, 0xa5b: 0x0391, 0xa5c: 0x05e5, 0xa5d: 0x0399,
-	0xa5e: 0x03a1, 0xa5f: 0x03a9, 0xa60: 0x03b1, 0xa61: 0x03b9, 0xa62: 0x0311, 0xa63: 0x00b9,
-	0xa64: 0x0349, 0xa65: 0x0391, 0xa66: 0x0399, 0xa67: 0x03a1, 0xa68: 0x03c1, 0xa69: 0x03b1,
-	0xa6a: 0x03b9, 0xa6b: 0x0008, 0xa6c: 0x0008, 0xa6d: 0x0008, 0xa6e: 0x0008, 0xa6f: 0x0008,
-	0xa70: 0x0008, 0xa71: 0x0008, 0xa72: 0x0008, 0xa73: 0x0008, 0xa74: 0x0008, 0xa75: 0x0008,
-	0xa76: 0x0008, 0xa77: 0x0008, 0xa78: 0x03c9, 0xa79: 0x0008, 0xa7a: 0x0008, 0xa7b: 0x0008,
-	0xa7c: 0x0008, 0xa7d: 0x0008, 0xa7e: 0x0008, 0xa7f: 0x0008,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x0008, 0xa81: 0x0008, 0xa82: 0x0008, 0xa83: 0x0008, 0xa84: 0x0008, 0xa85: 0x0008,
-	0xa86: 0x0008, 0xa87: 0x0008, 0xa88: 0x0008, 0xa89: 0x0008, 0xa8a: 0x0008, 0xa8b: 0x0008,
-	0xa8c: 0x0008, 0xa8d: 0x0008, 0xa8e: 0x0008, 0xa8f: 0x0008, 0xa90: 0x0008, 0xa91: 0x0008,
-	0xa92: 0x0008, 0xa93: 0x0008, 0xa94: 0x0008, 0xa95: 0x0008, 0xa96: 0x0008, 0xa97: 0x0008,
-	0xa98: 0x0008, 0xa99: 0x0008, 0xa9a: 0x0008, 0xa9b: 0x03d1, 0xa9c: 0x03d9, 0xa9d: 0x03e1,
-	0xa9e: 0x03e9, 0xa9f: 0x0371, 0xaa0: 0x03f1, 0xaa1: 0x03f9, 0xaa2: 0x0401, 0xaa3: 0x0409,
-	0xaa4: 0x0411, 0xaa5: 0x0419, 0xaa6: 0x0421, 0xaa7: 0x05fd, 0xaa8: 0x0429, 0xaa9: 0x0431,
-	0xaaa: 0xe17d, 0xaab: 0x0439, 0xaac: 0x0441, 0xaad: 0x0449, 0xaae: 0x0451, 0xaaf: 0x0459,
-	0xab0: 0x0461, 0xab1: 0x0469, 0xab2: 0x0471, 0xab3: 0x0479, 0xab4: 0x0481, 0xab5: 0x0489,
-	0xab6: 0x0491, 0xab7: 0x0499, 0xab8: 0x0615, 0xab9: 0x04a1, 0xaba: 0x04a9, 0xabb: 0x04b1,
-	0xabc: 0x04b9, 0xabd: 0x04c1, 0xabe: 0x04c9, 0xabf: 0x04d1,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0xe00d, 0xac1: 0x0008, 0xac2: 0xe00d, 0xac3: 0x0008, 0xac4: 0xe00d, 0xac5: 0x0008,
-	0xac6: 0xe00d, 0xac7: 0x0008, 0xac8: 0xe00d, 0xac9: 0x0008, 0xaca: 0xe00d, 0xacb: 0x0008,
-	0xacc: 0xe00d, 0xacd: 0x0008, 0xace: 0xe00d, 0xacf: 0x0008, 0xad0: 0xe00d, 0xad1: 0x0008,
-	0xad2: 0xe00d, 0xad3: 0x0008, 0xad4: 0xe00d, 0xad5: 0x0008, 0xad6: 0xe00d, 0xad7: 0x0008,
-	0xad8: 0xe00d, 0xad9: 0x0008, 0xada: 0xe00d, 0xadb: 0x0008, 0xadc: 0xe00d, 0xadd: 0x0008,
-	0xade: 0xe00d, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
-	0xae4: 0xe00d, 0xae5: 0x0008, 0xae6: 0xe00d, 0xae7: 0x0008, 0xae8: 0xe00d, 0xae9: 0x0008,
-	0xaea: 0xe00d, 0xaeb: 0x0008, 0xaec: 0xe00d, 0xaed: 0x0008, 0xaee: 0xe00d, 0xaef: 0x0008,
-	0xaf0: 0xe00d, 0xaf1: 0x0008, 0xaf2: 0xe00d, 0xaf3: 0x0008, 0xaf4: 0xe00d, 0xaf5: 0x0008,
-	0xaf6: 0xe00d, 0xaf7: 0x0008, 0xaf8: 0xe00d, 0xaf9: 0x0008, 0xafa: 0xe00d, 0xafb: 0x0008,
-	0xafc: 0xe00d, 0xafd: 0x0008, 0xafe: 0xe00d, 0xaff: 0x0008,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0xe00d, 0xb01: 0x0008, 0xb02: 0xe00d, 0xb03: 0x0008, 0xb04: 0xe00d, 0xb05: 0x0008,
-	0xb06: 0xe00d, 0xb07: 0x0008, 0xb08: 0xe00d, 0xb09: 0x0008, 0xb0a: 0xe00d, 0xb0b: 0x0008,
-	0xb0c: 0xe00d, 0xb0d: 0x0008, 0xb0e: 0xe00d, 0xb0f: 0x0008, 0xb10: 0xe00d, 0xb11: 0x0008,
-	0xb12: 0xe00d, 0xb13: 0x0008, 0xb14: 0xe00d, 0xb15: 0x0008, 0xb16: 0x0008, 0xb17: 0x0008,
-	0xb18: 0x0008, 0xb19: 0x0008, 0xb1a: 0x062d, 0xb1b: 0x064d, 0xb1c: 0x0008, 0xb1d: 0x0008,
-	0xb1e: 0x04d9, 0xb1f: 0x0008, 0xb20: 0xe00d, 0xb21: 0x0008, 0xb22: 0xe00d, 0xb23: 0x0008,
-	0xb24: 0xe00d, 0xb25: 0x0008, 0xb26: 0xe00d, 0xb27: 0x0008, 0xb28: 0xe00d, 0xb29: 0x0008,
-	0xb2a: 0xe00d, 0xb2b: 0x0008, 0xb2c: 0xe00d, 0xb2d: 0x0008, 0xb2e: 0xe00d, 0xb2f: 0x0008,
-	0xb30: 0xe00d, 0xb31: 0x0008, 0xb32: 0xe00d, 0xb33: 0x0008, 0xb34: 0xe00d, 0xb35: 0x0008,
-	0xb36: 0xe00d, 0xb37: 0x0008, 0xb38: 0xe00d, 0xb39: 0x0008, 0xb3a: 0xe00d, 0xb3b: 0x0008,
-	0xb3c: 0xe00d, 0xb3d: 0x0008, 0xb3e: 0xe00d, 0xb3f: 0x0008,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x0008, 0xb41: 0x0008, 0xb42: 0x0008, 0xb43: 0x0008, 0xb44: 0x0008, 0xb45: 0x0008,
-	0xb46: 0x0040, 0xb47: 0x0040, 0xb48: 0xe045, 0xb49: 0xe045, 0xb4a: 0xe045, 0xb4b: 0xe045,
-	0xb4c: 0xe045, 0xb4d: 0xe045, 0xb4e: 0x0040, 0xb4f: 0x0040, 0xb50: 0x0008, 0xb51: 0x0008,
-	0xb52: 0x0008, 0xb53: 0x0008, 0xb54: 0x0008, 0xb55: 0x0008, 0xb56: 0x0008, 0xb57: 0x0008,
-	0xb58: 0x0040, 0xb59: 0xe045, 0xb5a: 0x0040, 0xb5b: 0xe045, 0xb5c: 0x0040, 0xb5d: 0xe045,
-	0xb5e: 0x0040, 0xb5f: 0xe045, 0xb60: 0x0008, 0xb61: 0x0008, 0xb62: 0x0008, 0xb63: 0x0008,
-	0xb64: 0x0008, 0xb65: 0x0008, 0xb66: 0x0008, 0xb67: 0x0008, 0xb68: 0xe045, 0xb69: 0xe045,
-	0xb6a: 0xe045, 0xb6b: 0xe045, 0xb6c: 0xe045, 0xb6d: 0xe045, 0xb6e: 0xe045, 0xb6f: 0xe045,
-	0xb70: 0x0008, 0xb71: 0x04e1, 0xb72: 0x0008, 0xb73: 0x04e9, 0xb74: 0x0008, 0xb75: 0x04f1,
-	0xb76: 0x0008, 0xb77: 0x04f9, 0xb78: 0x0008, 0xb79: 0x0501, 0xb7a: 0x0008, 0xb7b: 0x0509,
-	0xb7c: 0x0008, 0xb7d: 0x0511, 0xb7e: 0x0040, 0xb7f: 0x0040,
-	// Block 0x2e, offset 0xb80
-	0xb80: 0x0519, 0xb81: 0x0521, 0xb82: 0x0529, 0xb83: 0x0531, 0xb84: 0x0539, 0xb85: 0x0541,
-	0xb86: 0x0549, 0xb87: 0x0551, 0xb88: 0x0519, 0xb89: 0x0521, 0xb8a: 0x0529, 0xb8b: 0x0531,
-	0xb8c: 0x0539, 0xb8d: 0x0541, 0xb8e: 0x0549, 0xb8f: 0x0551, 0xb90: 0x0559, 0xb91: 0x0561,
-	0xb92: 0x0569, 0xb93: 0x0571, 0xb94: 0x0579, 0xb95: 0x0581, 0xb96: 0x0589, 0xb97: 0x0591,
-	0xb98: 0x0559, 0xb99: 0x0561, 0xb9a: 0x0569, 0xb9b: 0x0571, 0xb9c: 0x0579, 0xb9d: 0x0581,
-	0xb9e: 0x0589, 0xb9f: 0x0591, 0xba0: 0x0599, 0xba1: 0x05a1, 0xba2: 0x05a9, 0xba3: 0x05b1,
-	0xba4: 0x05b9, 0xba5: 0x05c1, 0xba6: 0x05c9, 0xba7: 0x05d1, 0xba8: 0x0599, 0xba9: 0x05a1,
-	0xbaa: 0x05a9, 0xbab: 0x05b1, 0xbac: 0x05b9, 0xbad: 0x05c1, 0xbae: 0x05c9, 0xbaf: 0x05d1,
-	0xbb0: 0x0008, 0xbb1: 0x0008, 0xbb2: 0x05d9, 0xbb3: 0x05e1, 0xbb4: 0x05e9, 0xbb5: 0x0040,
-	0xbb6: 0x0008, 0xbb7: 0x05f1, 0xbb8: 0xe045, 0xbb9: 0xe045, 0xbba: 0x0665, 0xbbb: 0x04e1,
-	0xbbc: 0x05e1, 0xbbd: 0x067e, 0xbbe: 0x05f9, 0xbbf: 0x069e,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x06be, 0xbc1: 0x0602, 0xbc2: 0x0609, 0xbc3: 0x0611, 0xbc4: 0x0619, 0xbc5: 0x0040,
-	0xbc6: 0x0008, 0xbc7: 0x0621, 0xbc8: 0x06dd, 0xbc9: 0x04e9, 0xbca: 0x06f5, 0xbcb: 0x04f1,
-	0xbcc: 0x0611, 0xbcd: 0x062a, 0xbce: 0x0632, 0xbcf: 0x063a, 0xbd0: 0x0008, 0xbd1: 0x0008,
-	0xbd2: 0x0008, 0xbd3: 0x0641, 0xbd4: 0x0040, 0xbd5: 0x0040, 0xbd6: 0x0008, 0xbd7: 0x0008,
-	0xbd8: 0xe045, 0xbd9: 0xe045, 0xbda: 0x070d, 0xbdb: 0x04f9, 0xbdc: 0x0040, 0xbdd: 0x064a,
-	0xbde: 0x0652, 0xbdf: 0x065a, 0xbe0: 0x0008, 0xbe1: 0x0008, 0xbe2: 0x0008, 0xbe3: 0x0661,
-	0xbe4: 0x0008, 0xbe5: 0x0008, 0xbe6: 0x0008, 0xbe7: 0x0008, 0xbe8: 0xe045, 0xbe9: 0xe045,
-	0xbea: 0x0725, 0xbeb: 0x0509, 0xbec: 0xe04d, 0xbed: 0x066a, 0xbee: 0x012a, 0xbef: 0x0672,
-	0xbf0: 0x0040, 0xbf1: 0x0040, 0xbf2: 0x0679, 0xbf3: 0x0681, 0xbf4: 0x0689, 0xbf5: 0x0040,
-	0xbf6: 0x0008, 0xbf7: 0x0691, 0xbf8: 0x073d, 0xbf9: 0x0501, 0xbfa: 0x0515, 0xbfb: 0x0511,
-	0xbfc: 0x0681, 0xbfd: 0x0756, 0xbfe: 0x0776, 0xbff: 0x0040,
-	// Block 0x30, offset 0xc00
-	0xc00: 0x000a, 0xc01: 0x000a, 0xc02: 0x000a, 0xc03: 0x000a, 0xc04: 0x000a, 0xc05: 0x000a,
-	0xc06: 0x000a, 0xc07: 0x000a, 0xc08: 0x000a, 0xc09: 0x000a, 0xc0a: 0x000a, 0xc0b: 0x03c0,
-	0xc0c: 0x0003, 0xc0d: 0x0003, 0xc0e: 0x0340, 0xc0f: 0x0b40, 0xc10: 0x0018, 0xc11: 0xe00d,
-	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x0796,
-	0xc18: 0x0018, 0xc19: 0x0018, 0xc1a: 0x0018, 0xc1b: 0x0018, 0xc1c: 0x0018, 0xc1d: 0x0018,
-	0xc1e: 0x0018, 0xc1f: 0x0018, 0xc20: 0x0018, 0xc21: 0x0018, 0xc22: 0x0018, 0xc23: 0x0018,
-	0xc24: 0x0040, 0xc25: 0x0040, 0xc26: 0x0040, 0xc27: 0x0018, 0xc28: 0x0040, 0xc29: 0x0040,
-	0xc2a: 0x0340, 0xc2b: 0x0340, 0xc2c: 0x0340, 0xc2d: 0x0340, 0xc2e: 0x0340, 0xc2f: 0x000a,
-	0xc30: 0x0018, 0xc31: 0x0018, 0xc32: 0x0018, 0xc33: 0x0699, 0xc34: 0x06a1, 0xc35: 0x0018,
-	0xc36: 0x06a9, 0xc37: 0x06b1, 0xc38: 0x0018, 0xc39: 0x0018, 0xc3a: 0x0018, 0xc3b: 0x0018,
-	0xc3c: 0x06ba, 0xc3d: 0x0018, 0xc3e: 0x07b6, 0xc3f: 0x0018,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x0018, 0xc41: 0x0018, 0xc42: 0x0018, 0xc43: 0x0018, 0xc44: 0x0018, 0xc45: 0x0018,
-	0xc46: 0x0018, 0xc47: 0x06c2, 0xc48: 0x06ca, 0xc49: 0x06d2, 0xc4a: 0x0018, 0xc4b: 0x0018,
-	0xc4c: 0x0018, 0xc4d: 0x0018, 0xc4e: 0x0018, 0xc4f: 0x0018, 0xc50: 0x0018, 0xc51: 0x0018,
-	0xc52: 0x0018, 0xc53: 0x0018, 0xc54: 0x0018, 0xc55: 0x0018, 0xc56: 0x0018, 0xc57: 0x06d9,
-	0xc58: 0x0018, 0xc59: 0x0018, 0xc5a: 0x0018, 0xc5b: 0x0018, 0xc5c: 0x0018, 0xc5d: 0x0018,
-	0xc5e: 0x0018, 0xc5f: 0x000a, 0xc60: 0x03c0, 0xc61: 0x0340, 0xc62: 0x0340, 0xc63: 0x0340,
-	0xc64: 0x03c0, 0xc65: 0x0040, 0xc66: 0x0040, 0xc67: 0x0040, 0xc68: 0x0040, 0xc69: 0x0040,
-	0xc6a: 0x0340, 0xc6b: 0x0340, 0xc6c: 0x0340, 0xc6d: 0x0340, 0xc6e: 0x0340, 0xc6f: 0x0340,
-	0xc70: 0x06e1, 0xc71: 0x0311, 0xc72: 0x0040, 0xc73: 0x0040, 0xc74: 0x06e9, 0xc75: 0x06f1,
-	0xc76: 0x06f9, 0xc77: 0x0701, 0xc78: 0x0709, 0xc79: 0x0711, 0xc7a: 0x071a, 0xc7b: 0x07d5,
-	0xc7c: 0x0722, 0xc7d: 0x072a, 0xc7e: 0x0732, 0xc7f: 0x0329,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x06e1, 0xc81: 0x0049, 0xc82: 0x0029, 0xc83: 0x0031, 0xc84: 0x06e9, 0xc85: 0x06f1,
-	0xc86: 0x06f9, 0xc87: 0x0701, 0xc88: 0x0709, 0xc89: 0x0711, 0xc8a: 0x071a, 0xc8b: 0x07ed,
-	0xc8c: 0x0722, 0xc8d: 0x072a, 0xc8e: 0x0732, 0xc8f: 0x0040, 0xc90: 0x0019, 0xc91: 0x02f9,
-	0xc92: 0x0051, 0xc93: 0x0109, 0xc94: 0x0361, 0xc95: 0x00a9, 0xc96: 0x0319, 0xc97: 0x0101,
-	0xc98: 0x0321, 0xc99: 0x0329, 0xc9a: 0x0339, 0xc9b: 0x0089, 0xc9c: 0x0341, 0xc9d: 0x0040,
-	0xc9e: 0x0040, 0xc9f: 0x0040, 0xca0: 0x0018, 0xca1: 0x0018, 0xca2: 0x0018, 0xca3: 0x0018,
-	0xca4: 0x0018, 0xca5: 0x0018, 0xca6: 0x0018, 0xca7: 0x0018, 0xca8: 0x0739, 0xca9: 0x0018,
-	0xcaa: 0x0018, 0xcab: 0x0018, 0xcac: 0x0018, 0xcad: 0x0018, 0xcae: 0x0018, 0xcaf: 0x0018,
-	0xcb0: 0x0018, 0xcb1: 0x0018, 0xcb2: 0x0018, 0xcb3: 0x0018, 0xcb4: 0x0018, 0xcb5: 0x0018,
-	0xcb6: 0x0018, 0xcb7: 0x0018, 0xcb8: 0x0018, 0xcb9: 0x0018, 0xcba: 0x0018, 0xcbb: 0x0018,
-	0xcbc: 0x0018, 0xcbd: 0x0018, 0xcbe: 0x0018, 0xcbf: 0x0018,
-	// Block 0x33, offset 0xcc0
-	0xcc0: 0x0806, 0xcc1: 0x0826, 0xcc2: 0x03d9, 0xcc3: 0x0845, 0xcc4: 0x0018, 0xcc5: 0x0866,
-	0xcc6: 0x0886, 0xcc7: 0x0369, 0xcc8: 0x0018, 0xcc9: 0x08a5, 0xcca: 0x0309, 0xccb: 0x00a9,
-	0xccc: 0x00a9, 0xccd: 0x00a9, 0xcce: 0x00a9, 0xccf: 0x0741, 0xcd0: 0x0311, 0xcd1: 0x0311,
-	0xcd2: 0x0101, 0xcd3: 0x0101, 0xcd4: 0x0018, 0xcd5: 0x0329, 0xcd6: 0x0749, 0xcd7: 0x0018,
-	0xcd8: 0x0018, 0xcd9: 0x0339, 0xcda: 0x0751, 0xcdb: 0x00b9, 0xcdc: 0x00b9, 0xcdd: 0x00b9,
-	0xcde: 0x0018, 0xcdf: 0x0018, 0xce0: 0x0759, 0xce1: 0x08c5, 0xce2: 0x0761, 0xce3: 0x0018,
-	0xce4: 0x04b1, 0xce5: 0x0018, 0xce6: 0x0769, 0xce7: 0x0018, 0xce8: 0x04b1, 0xce9: 0x0018,
-	0xcea: 0x0319, 0xceb: 0x0771, 0xcec: 0x02e9, 0xced: 0x03d9, 0xcee: 0x0018, 0xcef: 0x02f9,
-	0xcf0: 0x02f9, 0xcf1: 0x03f1, 0xcf2: 0x0040, 0xcf3: 0x0321, 0xcf4: 0x0051, 0xcf5: 0x0779,
-	0xcf6: 0x0781, 0xcf7: 0x0789, 0xcf8: 0x0791, 0xcf9: 0x0311, 0xcfa: 0x0018, 0xcfb: 0x08e5,
-	0xcfc: 0x0799, 0xcfd: 0x03a1, 0xcfe: 0x03a1, 0xcff: 0x0799,
-	// Block 0x34, offset 0xd00
-	0xd00: 0x0905, 0xd01: 0x0018, 0xd02: 0x0018, 0xd03: 0x0018, 0xd04: 0x0018, 0xd05: 0x02f1,
-	0xd06: 0x02f1, 0xd07: 0x02f9, 0xd08: 0x0311, 0xd09: 0x00b1, 0xd0a: 0x0018, 0xd0b: 0x0018,
-	0xd0c: 0x0018, 0xd0d: 0x0018, 0xd0e: 0x0008, 0xd0f: 0x0018, 0xd10: 0x07a1, 0xd11: 0x07a9,
-	0xd12: 0x07b1, 0xd13: 0x07b9, 0xd14: 0x07c1, 0xd15: 0x07c9, 0xd16: 0x07d1, 0xd17: 0x07d9,
-	0xd18: 0x07e1, 0xd19: 0x07e9, 0xd1a: 0x07f1, 0xd1b: 0x07f9, 0xd1c: 0x0801, 0xd1d: 0x0809,
-	0xd1e: 0x0811, 0xd1f: 0x0819, 0xd20: 0x0311, 0xd21: 0x0821, 0xd22: 0x091d, 0xd23: 0x0829,
-	0xd24: 0x0391, 0xd25: 0x0831, 0xd26: 0x093d, 0xd27: 0x0839, 0xd28: 0x0841, 0xd29: 0x0109,
-	0xd2a: 0x0849, 0xd2b: 0x095d, 0xd2c: 0x0101, 0xd2d: 0x03d9, 0xd2e: 0x02f1, 0xd2f: 0x0321,
-	0xd30: 0x0311, 0xd31: 0x0821, 0xd32: 0x097d, 0xd33: 0x0829, 0xd34: 0x0391, 0xd35: 0x0831,
-	0xd36: 0x099d, 0xd37: 0x0839, 0xd38: 0x0841, 0xd39: 0x0109, 0xd3a: 0x0849, 0xd3b: 0x09bd,
-	0xd3c: 0x0101, 0xd3d: 0x03d9, 0xd3e: 0x02f1, 0xd3f: 0x0321,
-	// Block 0x35, offset 0xd40
-	0xd40: 0x0018, 0xd41: 0x0018, 0xd42: 0x0018, 0xd43: 0x0018, 0xd44: 0x0018, 0xd45: 0x0018,
-	0xd46: 0x0018, 0xd47: 0x0018, 0xd48: 0x0018, 0xd49: 0x0018, 0xd4a: 0x0018, 0xd4b: 0x0040,
-	0xd4c: 0x0040, 0xd4d: 0x0040, 0xd4e: 0x0040, 0xd4f: 0x0040, 0xd50: 0x0040, 0xd51: 0x0040,
-	0xd52: 0x0040, 0xd53: 0x0040, 0xd54: 0x0040, 0xd55: 0x0040, 0xd56: 0x0040, 0xd57: 0x0040,
-	0xd58: 0x0040, 0xd59: 0x0040, 0xd5a: 0x0040, 0xd5b: 0x0040, 0xd5c: 0x0040, 0xd5d: 0x0040,
-	0xd5e: 0x0040, 0xd5f: 0x0040, 0xd60: 0x0049, 0xd61: 0x0029, 0xd62: 0x0031, 0xd63: 0x06e9,
-	0xd64: 0x06f1, 0xd65: 0x06f9, 0xd66: 0x0701, 0xd67: 0x0709, 0xd68: 0x0711, 0xd69: 0x0879,
-	0xd6a: 0x0881, 0xd6b: 0x0889, 0xd6c: 0x0891, 0xd6d: 0x0899, 0xd6e: 0x08a1, 0xd6f: 0x08a9,
-	0xd70: 0x08b1, 0xd71: 0x08b9, 0xd72: 0x08c1, 0xd73: 0x08c9, 0xd74: 0x0a1e, 0xd75: 0x0a3e,
-	0xd76: 0x0a5e, 0xd77: 0x0a7e, 0xd78: 0x0a9e, 0xd79: 0x0abe, 0xd7a: 0x0ade, 0xd7b: 0x0afe,
-	0xd7c: 0x0b1e, 0xd7d: 0x08d2, 0xd7e: 0x08da, 0xd7f: 0x08e2,
-	// Block 0x36, offset 0xd80
-	0xd80: 0x08ea, 0xd81: 0x08f2, 0xd82: 0x08fa, 0xd83: 0x0902, 0xd84: 0x090a, 0xd85: 0x0912,
-	0xd86: 0x091a, 0xd87: 0x0922, 0xd88: 0x0040, 0xd89: 0x0040, 0xd8a: 0x0040, 0xd8b: 0x0040,
-	0xd8c: 0x0040, 0xd8d: 0x0040, 0xd8e: 0x0040, 0xd8f: 0x0040, 0xd90: 0x0040, 0xd91: 0x0040,
-	0xd92: 0x0040, 0xd93: 0x0040, 0xd94: 0x0040, 0xd95: 0x0040, 0xd96: 0x0040, 0xd97: 0x0040,
-	0xd98: 0x0040, 0xd99: 0x0040, 0xd9a: 0x0040, 0xd9b: 0x0040, 0xd9c: 0x0b3e, 0xd9d: 0x0b5e,
-	0xd9e: 0x0b7e, 0xd9f: 0x0b9e, 0xda0: 0x0bbe, 0xda1: 0x0bde, 0xda2: 0x0bfe, 0xda3: 0x0c1e,
-	0xda4: 0x0c3e, 0xda5: 0x0c5e, 0xda6: 0x0c7e, 0xda7: 0x0c9e, 0xda8: 0x0cbe, 0xda9: 0x0cde,
-	0xdaa: 0x0cfe, 0xdab: 0x0d1e, 0xdac: 0x0d3e, 0xdad: 0x0d5e, 0xdae: 0x0d7e, 0xdaf: 0x0d9e,
-	0xdb0: 0x0dbe, 0xdb1: 0x0dde, 0xdb2: 0x0dfe, 0xdb3: 0x0e1e, 0xdb4: 0x0e3e, 0xdb5: 0x0e5e,
-	0xdb6: 0x0019, 0xdb7: 0x02e9, 0xdb8: 0x03d9, 0xdb9: 0x02f1, 0xdba: 0x02f9, 0xdbb: 0x03f1,
-	0xdbc: 0x0309, 0xdbd: 0x00a9, 0xdbe: 0x0311, 0xdbf: 0x00b1,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x0319, 0xdc1: 0x0101, 0xdc2: 0x0321, 0xdc3: 0x0329, 0xdc4: 0x0051, 0xdc5: 0x0339,
-	0xdc6: 0x0751, 0xdc7: 0x00b9, 0xdc8: 0x0089, 0xdc9: 0x0341, 0xdca: 0x0349, 0xdcb: 0x0391,
-	0xdcc: 0x00c1, 0xdcd: 0x0109, 0xdce: 0x00c9, 0xdcf: 0x04b1, 0xdd0: 0x0019, 0xdd1: 0x02e9,
-	0xdd2: 0x03d9, 0xdd3: 0x02f1, 0xdd4: 0x02f9, 0xdd5: 0x03f1, 0xdd6: 0x0309, 0xdd7: 0x00a9,
-	0xdd8: 0x0311, 0xdd9: 0x00b1, 0xdda: 0x0319, 0xddb: 0x0101, 0xddc: 0x0321, 0xddd: 0x0329,
-	0xdde: 0x0051, 0xddf: 0x0339, 0xde0: 0x0751, 0xde1: 0x00b9, 0xde2: 0x0089, 0xde3: 0x0341,
-	0xde4: 0x0349, 0xde5: 0x0391, 0xde6: 0x00c1, 0xde7: 0x0109, 0xde8: 0x00c9, 0xde9: 0x04b1,
-	0xdea: 0x06e1, 0xdeb: 0x0018, 0xdec: 0x0018, 0xded: 0x0018, 0xdee: 0x0018, 0xdef: 0x0018,
-	0xdf0: 0x0018, 0xdf1: 0x0018, 0xdf2: 0x0018, 0xdf3: 0x0018, 0xdf4: 0x0018, 0xdf5: 0x0018,
-	0xdf6: 0x0018, 0xdf7: 0x0018, 0xdf8: 0x0018, 0xdf9: 0x0018, 0xdfa: 0x0018, 0xdfb: 0x0018,
-	0xdfc: 0x0018, 0xdfd: 0x0018, 0xdfe: 0x0018, 0xdff: 0x0018,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x0008, 0xe01: 0x0008, 0xe02: 0x0008, 0xe03: 0x0008, 0xe04: 0x0008, 0xe05: 0x0008,
-	0xe06: 0x0008, 0xe07: 0x0008, 0xe08: 0x0008, 0xe09: 0x0008, 0xe0a: 0x0008, 0xe0b: 0x0008,
-	0xe0c: 0x0008, 0xe0d: 0x0008, 0xe0e: 0x0008, 0xe0f: 0x0008, 0xe10: 0x0008, 0xe11: 0x0008,
-	0xe12: 0x0008, 0xe13: 0x0008, 0xe14: 0x0008, 0xe15: 0x0008, 0xe16: 0x0008, 0xe17: 0x0008,
-	0xe18: 0x0008, 0xe19: 0x0008, 0xe1a: 0x0008, 0xe1b: 0x0008, 0xe1c: 0x0008, 0xe1d: 0x0008,
-	0xe1e: 0x0008, 0xe1f: 0x0008, 0xe20: 0xe00d, 0xe21: 0x0008, 0xe22: 0x0941, 0xe23: 0x0ed5,
-	0xe24: 0x0949, 0xe25: 0x0008, 0xe26: 0x0008, 0xe27: 0xe07d, 0xe28: 0x0008, 0xe29: 0xe01d,
-	0xe2a: 0x0008, 0xe2b: 0xe03d, 0xe2c: 0x0008, 0xe2d: 0x0359, 0xe2e: 0x0441, 0xe2f: 0x0351,
-	0xe30: 0x03d1, 0xe31: 0x0008, 0xe32: 0xe00d, 0xe33: 0x0008, 0xe34: 0x0008, 0xe35: 0xe01d,
-	0xe36: 0x0008, 0xe37: 0x0008, 0xe38: 0x0008, 0xe39: 0x0008, 0xe3a: 0x0008, 0xe3b: 0x0008,
-	0xe3c: 0x00b1, 0xe3d: 0x0391, 0xe3e: 0x0951, 0xe3f: 0x0959,
-	// Block 0x39, offset 0xe40
-	0xe40: 0xe00d, 0xe41: 0x0008, 0xe42: 0xe00d, 0xe43: 0x0008, 0xe44: 0xe00d, 0xe45: 0x0008,
-	0xe46: 0xe00d, 0xe47: 0x0008, 0xe48: 0xe00d, 0xe49: 0x0008, 0xe4a: 0xe00d, 0xe4b: 0x0008,
-	0xe4c: 0xe00d, 0xe4d: 0x0008, 0xe4e: 0xe00d, 0xe4f: 0x0008, 0xe50: 0xe00d, 0xe51: 0x0008,
-	0xe52: 0xe00d, 0xe53: 0x0008, 0xe54: 0xe00d, 0xe55: 0x0008, 0xe56: 0xe00d, 0xe57: 0x0008,
-	0xe58: 0xe00d, 0xe59: 0x0008, 0xe5a: 0xe00d, 0xe5b: 0x0008, 0xe5c: 0xe00d, 0xe5d: 0x0008,
-	0xe5e: 0xe00d, 0xe5f: 0x0008, 0xe60: 0xe00d, 0xe61: 0x0008, 0xe62: 0xe00d, 0xe63: 0x0008,
-	0xe64: 0x0008, 0xe65: 0x0018, 0xe66: 0x0018, 0xe67: 0x0018, 0xe68: 0x0018, 0xe69: 0x0018,
-	0xe6a: 0x0018, 0xe6b: 0xe03d, 0xe6c: 0x0008, 0xe6d: 0xe01d, 0xe6e: 0x0008, 0xe6f: 0x3308,
-	0xe70: 0x3308, 0xe71: 0x3308, 0xe72: 0xe00d, 0xe73: 0x0008, 0xe74: 0x0040, 0xe75: 0x0040,
-	0xe76: 0x0040, 0xe77: 0x0040, 0xe78: 0x0040, 0xe79: 0x0018, 0xe7a: 0x0018, 0xe7b: 0x0018,
-	0xe7c: 0x0018, 0xe7d: 0x0018, 0xe7e: 0x0018, 0xe7f: 0x0018,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x2715, 0xe81: 0x2735, 0xe82: 0x2755, 0xe83: 0x2775, 0xe84: 0x2795, 0xe85: 0x27b5,
-	0xe86: 0x27d5, 0xe87: 0x27f5, 0xe88: 0x2815, 0xe89: 0x2835, 0xe8a: 0x2855, 0xe8b: 0x2875,
-	0xe8c: 0x2895, 0xe8d: 0x28b5, 0xe8e: 0x28d5, 0xe8f: 0x28f5, 0xe90: 0x2915, 0xe91: 0x2935,
-	0xe92: 0x2955, 0xe93: 0x2975, 0xe94: 0x2995, 0xe95: 0x29b5, 0xe96: 0x0040, 0xe97: 0x0040,
-	0xe98: 0x0040, 0xe99: 0x0040, 0xe9a: 0x0040, 0xe9b: 0x0040, 0xe9c: 0x0040, 0xe9d: 0x0040,
-	0xe9e: 0x0040, 0xe9f: 0x0040, 0xea0: 0x0040, 0xea1: 0x0040, 0xea2: 0x0040, 0xea3: 0x0040,
-	0xea4: 0x0040, 0xea5: 0x0040, 0xea6: 0x0040, 0xea7: 0x0040, 0xea8: 0x0040, 0xea9: 0x0040,
-	0xeaa: 0x0040, 0xeab: 0x0040, 0xeac: 0x0040, 0xead: 0x0040, 0xeae: 0x0040, 0xeaf: 0x0040,
-	0xeb0: 0x0040, 0xeb1: 0x0040, 0xeb2: 0x0040, 0xeb3: 0x0040, 0xeb4: 0x0040, 0xeb5: 0x0040,
-	0xeb6: 0x0040, 0xeb7: 0x0040, 0xeb8: 0x0040, 0xeb9: 0x0040, 0xeba: 0x0040, 0xebb: 0x0040,
-	0xebc: 0x0040, 0xebd: 0x0040, 0xebe: 0x0040, 0xebf: 0x0040,
-	// Block 0x3b, offset 0xec0
-	0xec0: 0x000a, 0xec1: 0x0018, 0xec2: 0x0961, 0xec3: 0x0018, 0xec4: 0x0018, 0xec5: 0x0008,
-	0xec6: 0x0008, 0xec7: 0x0008, 0xec8: 0x0018, 0xec9: 0x0018, 0xeca: 0x0018, 0xecb: 0x0018,
-	0xecc: 0x0018, 0xecd: 0x0018, 0xece: 0x0018, 0xecf: 0x0018, 0xed0: 0x0018, 0xed1: 0x0018,
-	0xed2: 0x0018, 0xed3: 0x0018, 0xed4: 0x0018, 0xed5: 0x0018, 0xed6: 0x0018, 0xed7: 0x0018,
-	0xed8: 0x0018, 0xed9: 0x0018, 0xeda: 0x0018, 0xedb: 0x0018, 0xedc: 0x0018, 0xedd: 0x0018,
-	0xede: 0x0018, 0xedf: 0x0018, 0xee0: 0x0018, 0xee1: 0x0018, 0xee2: 0x0018, 0xee3: 0x0018,
-	0xee4: 0x0018, 0xee5: 0x0018, 0xee6: 0x0018, 0xee7: 0x0018, 0xee8: 0x0018, 0xee9: 0x0018,
-	0xeea: 0x3308, 0xeeb: 0x3308, 0xeec: 0x3308, 0xeed: 0x3308, 0xeee: 0x3018, 0xeef: 0x3018,
-	0xef0: 0x0018, 0xef1: 0x0018, 0xef2: 0x0018, 0xef3: 0x0018, 0xef4: 0x0018, 0xef5: 0x0018,
-	0xef6: 0xe125, 0xef7: 0x0018, 0xef8: 0x29d5, 0xef9: 0x29f5, 0xefa: 0x2a15, 0xefb: 0x0018,
-	0xefc: 0x0008, 0xefd: 0x0018, 0xefe: 0x0018, 0xeff: 0x0018,
-	// Block 0x3c, offset 0xf00
-	0xf00: 0x2b55, 0xf01: 0x2b75, 0xf02: 0x2b95, 0xf03: 0x2bb5, 0xf04: 0x2bd5, 0xf05: 0x2bf5,
-	0xf06: 0x2bf5, 0xf07: 0x2bf5, 0xf08: 0x2c15, 0xf09: 0x2c15, 0xf0a: 0x2c15, 0xf0b: 0x2c15,
-	0xf0c: 0x2c35, 0xf0d: 0x2c35, 0xf0e: 0x2c35, 0xf0f: 0x2c55, 0xf10: 0x2c75, 0xf11: 0x2c75,
-	0xf12: 0x2a95, 0xf13: 0x2a95, 0xf14: 0x2c75, 0xf15: 0x2c75, 0xf16: 0x2c95, 0xf17: 0x2c95,
-	0xf18: 0x2c75, 0xf19: 0x2c75, 0xf1a: 0x2a95, 0xf1b: 0x2a95, 0xf1c: 0x2c75, 0xf1d: 0x2c75,
-	0xf1e: 0x2c55, 0xf1f: 0x2c55, 0xf20: 0x2cb5, 0xf21: 0x2cb5, 0xf22: 0x2cd5, 0xf23: 0x2cd5,
-	0xf24: 0x0040, 0xf25: 0x2cf5, 0xf26: 0x2d15, 0xf27: 0x2d35, 0xf28: 0x2d35, 0xf29: 0x2d55,
-	0xf2a: 0x2d75, 0xf2b: 0x2d95, 0xf2c: 0x2db5, 0xf2d: 0x2dd5, 0xf2e: 0x2df5, 0xf2f: 0x2e15,
-	0xf30: 0x2e35, 0xf31: 0x2e55, 0xf32: 0x2e55, 0xf33: 0x2e75, 0xf34: 0x2e95, 0xf35: 0x2e95,
-	0xf36: 0x2eb5, 0xf37: 0x2ed5, 0xf38: 0x2e75, 0xf39: 0x2ef5, 0xf3a: 0x2f15, 0xf3b: 0x2ef5,
-	0xf3c: 0x2e75, 0xf3d: 0x2f35, 0xf3e: 0x2f55, 0xf3f: 0x2f75,
-	// Block 0x3d, offset 0xf40
-	0xf40: 0x2f95, 0xf41: 0x2fb5, 0xf42: 0x2d15, 0xf43: 0x2cf5, 0xf44: 0x2fd5, 0xf45: 0x2ff5,
-	0xf46: 0x3015, 0xf47: 0x3035, 0xf48: 0x3055, 0xf49: 0x3075, 0xf4a: 0x3095, 0xf4b: 0x30b5,
-	0xf4c: 0x30d5, 0xf4d: 0x30f5, 0xf4e: 0x3115, 0xf4f: 0x0040, 0xf50: 0x0018, 0xf51: 0x0018,
-	0xf52: 0x3135, 0xf53: 0x3155, 0xf54: 0x3175, 0xf55: 0x3195, 0xf56: 0x31b5, 0xf57: 0x31d5,
-	0xf58: 0x31f5, 0xf59: 0x3215, 0xf5a: 0x3235, 0xf5b: 0x3255, 0xf5c: 0x3175, 0xf5d: 0x3275,
-	0xf5e: 0x3295, 0xf5f: 0x32b5, 0xf60: 0x0008, 0xf61: 0x0008, 0xf62: 0x0008, 0xf63: 0x0008,
-	0xf64: 0x0008, 0xf65: 0x0008, 0xf66: 0x0008, 0xf67: 0x0008, 0xf68: 0x0008, 0xf69: 0x0008,
-	0xf6a: 0x0008, 0xf6b: 0x0008, 0xf6c: 0x0008, 0xf6d: 0x0008, 0xf6e: 0x0008, 0xf6f: 0x0008,
-	0xf70: 0x0008, 0xf71: 0x0008, 0xf72: 0x0008, 0xf73: 0x0008, 0xf74: 0x0008, 0xf75: 0x0008,
-	0xf76: 0x0008, 0xf77: 0x0008, 0xf78: 0x0008, 0xf79: 0x0008, 0xf7a: 0x0008, 0xf7b: 0x0008,
-	0xf7c: 0x0008, 0xf7d: 0x0008, 0xf7e: 0x0008, 0xf7f: 0x0008,
-	// Block 0x3e, offset 0xf80
-	0xf80: 0x0b82, 0xf81: 0x0b8a, 0xf82: 0x0b92, 0xf83: 0x0b9a, 0xf84: 0x32d5, 0xf85: 0x32f5,
-	0xf86: 0x3315, 0xf87: 0x3335, 0xf88: 0x0018, 0xf89: 0x0018, 0xf8a: 0x0018, 0xf8b: 0x0018,
-	0xf8c: 0x0018, 0xf8d: 0x0018, 0xf8e: 0x0018, 0xf8f: 0x0018, 0xf90: 0x3355, 0xf91: 0x0ba1,
-	0xf92: 0x0ba9, 0xf93: 0x0bb1, 0xf94: 0x0bb9, 0xf95: 0x0bc1, 0xf96: 0x0bc9, 0xf97: 0x0bd1,
-	0xf98: 0x0bd9, 0xf99: 0x0be1, 0xf9a: 0x0be9, 0xf9b: 0x0bf1, 0xf9c: 0x0bf9, 0xf9d: 0x0c01,
-	0xf9e: 0x0c09, 0xf9f: 0x0c11, 0xfa0: 0x3375, 0xfa1: 0x3395, 0xfa2: 0x33b5, 0xfa3: 0x33d5,
-	0xfa4: 0x33f5, 0xfa5: 0x33f5, 0xfa6: 0x3415, 0xfa7: 0x3435, 0xfa8: 0x3455, 0xfa9: 0x3475,
-	0xfaa: 0x3495, 0xfab: 0x34b5, 0xfac: 0x34d5, 0xfad: 0x34f5, 0xfae: 0x3515, 0xfaf: 0x3535,
-	0xfb0: 0x3555, 0xfb1: 0x3575, 0xfb2: 0x3595, 0xfb3: 0x35b5, 0xfb4: 0x35d5, 0xfb5: 0x35f5,
-	0xfb6: 0x3615, 0xfb7: 0x3635, 0xfb8: 0x3655, 0xfb9: 0x3675, 0xfba: 0x3695, 0xfbb: 0x36b5,
-	0xfbc: 0x0c19, 0xfbd: 0x0c21, 0xfbe: 0x36d5, 0xfbf: 0x0018,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x36f5, 0xfc1: 0x3715, 0xfc2: 0x3735, 0xfc3: 0x3755, 0xfc4: 0x3775, 0xfc5: 0x3795,
-	0xfc6: 0x37b5, 0xfc7: 0x37d5, 0xfc8: 0x37f5, 0xfc9: 0x3815, 0xfca: 0x3835, 0xfcb: 0x3855,
-	0xfcc: 0x3875, 0xfcd: 0x3895, 0xfce: 0x38b5, 0xfcf: 0x38d5, 0xfd0: 0x38f5, 0xfd1: 0x3915,
-	0xfd2: 0x3935, 0xfd3: 0x3955, 0xfd4: 0x3975, 0xfd5: 0x3995, 0xfd6: 0x39b5, 0xfd7: 0x39d5,
-	0xfd8: 0x39f5, 0xfd9: 0x3a15, 0xfda: 0x3a35, 0xfdb: 0x3a55, 0xfdc: 0x3a75, 0xfdd: 0x3a95,
-	0xfde: 0x3ab5, 0xfdf: 0x3ad5, 0xfe0: 0x3af5, 0xfe1: 0x3b15, 0xfe2: 0x3b35, 0xfe3: 0x3b55,
-	0xfe4: 0x3b75, 0xfe5: 0x3b95, 0xfe6: 0x1295, 0xfe7: 0x3bb5, 0xfe8: 0x3bd5, 0xfe9: 0x3bf5,
-	0xfea: 0x3c15, 0xfeb: 0x3c35, 0xfec: 0x3c55, 0xfed: 0x3c75, 0xfee: 0x23b5, 0xfef: 0x3c95,
-	0xff0: 0x3cb5, 0xff1: 0x0c29, 0xff2: 0x0c31, 0xff3: 0x0c39, 0xff4: 0x0c41, 0xff5: 0x0c49,
-	0xff6: 0x0c51, 0xff7: 0x0c59, 0xff8: 0x0c61, 0xff9: 0x0c69, 0xffa: 0x0c71, 0xffb: 0x0c79,
-	0xffc: 0x0c81, 0xffd: 0x0c89, 0xffe: 0x0c91, 0xfff: 0x0c99,
-	// Block 0x40, offset 0x1000
-	0x1000: 0x0ca1, 0x1001: 0x0ca9, 0x1002: 0x0cb1, 0x1003: 0x0cb9, 0x1004: 0x0cc1, 0x1005: 0x0cc9,
-	0x1006: 0x0cd1, 0x1007: 0x0cd9, 0x1008: 0x0ce1, 0x1009: 0x0ce9, 0x100a: 0x0cf1, 0x100b: 0x0cf9,
-	0x100c: 0x0d01, 0x100d: 0x3cd5, 0x100e: 0x0d09, 0x100f: 0x3cf5, 0x1010: 0x3d15, 0x1011: 0x3d2d,
-	0x1012: 0x3d45, 0x1013: 0x3d5d, 0x1014: 0x3d75, 0x1015: 0x3d75, 0x1016: 0x3d5d, 0x1017: 0x3d8d,
-	0x1018: 0x07d5, 0x1019: 0x3da5, 0x101a: 0x3dbd, 0x101b: 0x3dd5, 0x101c: 0x3ded, 0x101d: 0x3e05,
-	0x101e: 0x3e1d, 0x101f: 0x3e35, 0x1020: 0x3e4d, 0x1021: 0x3e65, 0x1022: 0x3e7d, 0x1023: 0x3e95,
-	0x1024: 0x3ead, 0x1025: 0x3ead, 0x1026: 0x3ec5, 0x1027: 0x3ec5, 0x1028: 0x3edd, 0x1029: 0x3edd,
-	0x102a: 0x3ef5, 0x102b: 0x3f0d, 0x102c: 0x3f25, 0x102d: 0x3f3d, 0x102e: 0x3f55, 0x102f: 0x3f55,
-	0x1030: 0x3f6d, 0x1031: 0x3f6d, 0x1032: 0x3f6d, 0x1033: 0x3f85, 0x1034: 0x3f9d, 0x1035: 0x3fb5,
-	0x1036: 0x3fcd, 0x1037: 0x3fb5, 0x1038: 0x3fe5, 0x1039: 0x3ffd, 0x103a: 0x3f85, 0x103b: 0x4015,
-	0x103c: 0x402d, 0x103d: 0x402d, 0x103e: 0x402d, 0x103f: 0x0d11,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x10f9, 0x1041: 0x1101, 0x1042: 0x40a5, 0x1043: 0x1109, 0x1044: 0x1111, 0x1045: 0x1119,
-	0x1046: 0x1121, 0x1047: 0x1129, 0x1048: 0x40c5, 0x1049: 0x1131, 0x104a: 0x1139, 0x104b: 0x1141,
-	0x104c: 0x40e5, 0x104d: 0x40e5, 0x104e: 0x1149, 0x104f: 0x1151, 0x1050: 0x1159, 0x1051: 0x4105,
-	0x1052: 0x4125, 0x1053: 0x4145, 0x1054: 0x4165, 0x1055: 0x4185, 0x1056: 0x1161, 0x1057: 0x1169,
-	0x1058: 0x1171, 0x1059: 0x1179, 0x105a: 0x1181, 0x105b: 0x41a5, 0x105c: 0x1189, 0x105d: 0x1191,
-	0x105e: 0x1199, 0x105f: 0x41c5, 0x1060: 0x41e5, 0x1061: 0x11a1, 0x1062: 0x4205, 0x1063: 0x4225,
-	0x1064: 0x4245, 0x1065: 0x11a9, 0x1066: 0x4265, 0x1067: 0x11b1, 0x1068: 0x11b9, 0x1069: 0x10f9,
-	0x106a: 0x4285, 0x106b: 0x42a5, 0x106c: 0x42c5, 0x106d: 0x42e5, 0x106e: 0x11c1, 0x106f: 0x11c9,
-	0x1070: 0x11d1, 0x1071: 0x11d9, 0x1072: 0x4305, 0x1073: 0x11e1, 0x1074: 0x11e9, 0x1075: 0x11f1,
-	0x1076: 0x4325, 0x1077: 0x11f9, 0x1078: 0x1201, 0x1079: 0x11f9, 0x107a: 0x1209, 0x107b: 0x1211,
-	0x107c: 0x4345, 0x107d: 0x1219, 0x107e: 0x1221, 0x107f: 0x1219,
-	// Block 0x42, offset 0x1080
-	0x1080: 0x4365, 0x1081: 0x4385, 0x1082: 0x0040, 0x1083: 0x1229, 0x1084: 0x1231, 0x1085: 0x1239,
-	0x1086: 0x1241, 0x1087: 0x0040, 0x1088: 0x1249, 0x1089: 0x1251, 0x108a: 0x1259, 0x108b: 0x1261,
-	0x108c: 0x1269, 0x108d: 0x1271, 0x108e: 0x1199, 0x108f: 0x1279, 0x1090: 0x1281, 0x1091: 0x1289,
-	0x1092: 0x43a5, 0x1093: 0x1291, 0x1094: 0x1121, 0x1095: 0x43c5, 0x1096: 0x43e5, 0x1097: 0x1299,
-	0x1098: 0x0040, 0x1099: 0x4405, 0x109a: 0x12a1, 0x109b: 0x12a9, 0x109c: 0x12b1, 0x109d: 0x12b9,
-	0x109e: 0x12c1, 0x109f: 0x12c9, 0x10a0: 0x12d1, 0x10a1: 0x12d9, 0x10a2: 0x12e1, 0x10a3: 0x12e9,
-	0x10a4: 0x12f1, 0x10a5: 0x12f9, 0x10a6: 0x1301, 0x10a7: 0x1309, 0x10a8: 0x1311, 0x10a9: 0x1319,
-	0x10aa: 0x1321, 0x10ab: 0x1329, 0x10ac: 0x1331, 0x10ad: 0x1339, 0x10ae: 0x1341, 0x10af: 0x1349,
-	0x10b0: 0x1351, 0x10b1: 0x1359, 0x10b2: 0x1361, 0x10b3: 0x1369, 0x10b4: 0x1371, 0x10b5: 0x1379,
-	0x10b6: 0x1381, 0x10b7: 0x1389, 0x10b8: 0x1391, 0x10b9: 0x1399, 0x10ba: 0x13a1, 0x10bb: 0x13a9,
-	0x10bc: 0x13b1, 0x10bd: 0x13b9, 0x10be: 0x13c1, 0x10bf: 0x4425,
-	// Block 0x43, offset 0x10c0
-	0x10c0: 0xe00d, 0x10c1: 0x0008, 0x10c2: 0xe00d, 0x10c3: 0x0008, 0x10c4: 0xe00d, 0x10c5: 0x0008,
-	0x10c6: 0xe00d, 0x10c7: 0x0008, 0x10c8: 0xe00d, 0x10c9: 0x0008, 0x10ca: 0xe00d, 0x10cb: 0x0008,
-	0x10cc: 0xe00d, 0x10cd: 0x0008, 0x10ce: 0xe00d, 0x10cf: 0x0008, 0x10d0: 0xe00d, 0x10d1: 0x0008,
-	0x10d2: 0xe00d, 0x10d3: 0x0008, 0x10d4: 0xe00d, 0x10d5: 0x0008, 0x10d6: 0xe00d, 0x10d7: 0x0008,
-	0x10d8: 0xe00d, 0x10d9: 0x0008, 0x10da: 0xe00d, 0x10db: 0x0008, 0x10dc: 0xe00d, 0x10dd: 0x0008,
-	0x10de: 0xe00d, 0x10df: 0x0008, 0x10e0: 0xe00d, 0x10e1: 0x0008, 0x10e2: 0xe00d, 0x10e3: 0x0008,
-	0x10e4: 0xe00d, 0x10e5: 0x0008, 0x10e6: 0xe00d, 0x10e7: 0x0008, 0x10e8: 0xe00d, 0x10e9: 0x0008,
-	0x10ea: 0xe00d, 0x10eb: 0x0008, 0x10ec: 0xe00d, 0x10ed: 0x0008, 0x10ee: 0x0008, 0x10ef: 0x3308,
-	0x10f0: 0x3318, 0x10f1: 0x3318, 0x10f2: 0x3318, 0x10f3: 0x0018, 0x10f4: 0x3308, 0x10f5: 0x3308,
-	0x10f6: 0x3308, 0x10f7: 0x3308, 0x10f8: 0x3308, 0x10f9: 0x3308, 0x10fa: 0x3308, 0x10fb: 0x3308,
-	0x10fc: 0x3308, 0x10fd: 0x3308, 0x10fe: 0x0018, 0x10ff: 0x0008,
-	// Block 0x44, offset 0x1100
-	0x1100: 0xe00d, 0x1101: 0x0008, 0x1102: 0xe00d, 0x1103: 0x0008, 0x1104: 0xe00d, 0x1105: 0x0008,
-	0x1106: 0xe00d, 0x1107: 0x0008, 0x1108: 0xe00d, 0x1109: 0x0008, 0x110a: 0xe00d, 0x110b: 0x0008,
-	0x110c: 0xe00d, 0x110d: 0x0008, 0x110e: 0xe00d, 0x110f: 0x0008, 0x1110: 0xe00d, 0x1111: 0x0008,
-	0x1112: 0xe00d, 0x1113: 0x0008, 0x1114: 0xe00d, 0x1115: 0x0008, 0x1116: 0xe00d, 0x1117: 0x0008,
-	0x1118: 0xe00d, 0x1119: 0x0008, 0x111a: 0xe00d, 0x111b: 0x0008, 0x111c: 0x02d1, 0x111d: 0x13c9,
-	0x111e: 0x3308, 0x111f: 0x3308, 0x1120: 0x0008, 0x1121: 0x0008, 0x1122: 0x0008, 0x1123: 0x0008,
-	0x1124: 0x0008, 0x1125: 0x0008, 0x1126: 0x0008, 0x1127: 0x0008, 0x1128: 0x0008, 0x1129: 0x0008,
-	0x112a: 0x0008, 0x112b: 0x0008, 0x112c: 0x0008, 0x112d: 0x0008, 0x112e: 0x0008, 0x112f: 0x0008,
-	0x1130: 0x0008, 0x1131: 0x0008, 0x1132: 0x0008, 0x1133: 0x0008, 0x1134: 0x0008, 0x1135: 0x0008,
-	0x1136: 0x0008, 0x1137: 0x0008, 0x1138: 0x0008, 0x1139: 0x0008, 0x113a: 0x0008, 0x113b: 0x0008,
-	0x113c: 0x0008, 0x113d: 0x0008, 0x113e: 0x0008, 0x113f: 0x0008,
-	// Block 0x45, offset 0x1140
-	0x1140: 0x0018, 0x1141: 0x0018, 0x1142: 0x0018, 0x1143: 0x0018, 0x1144: 0x0018, 0x1145: 0x0018,
-	0x1146: 0x0018, 0x1147: 0x0018, 0x1148: 0x0018, 0x1149: 0x0018, 0x114a: 0x0018, 0x114b: 0x0018,
-	0x114c: 0x0018, 0x114d: 0x0018, 0x114e: 0x0018, 0x114f: 0x0018, 0x1150: 0x0018, 0x1151: 0x0018,
-	0x1152: 0x0018, 0x1153: 0x0018, 0x1154: 0x0018, 0x1155: 0x0018, 0x1156: 0x0018, 0x1157: 0x0008,
-	0x1158: 0x0008, 0x1159: 0x0008, 0x115a: 0x0008, 0x115b: 0x0008, 0x115c: 0x0008, 0x115d: 0x0008,
-	0x115e: 0x0008, 0x115f: 0x0008, 0x1160: 0x0018, 0x1161: 0x0018, 0x1162: 0xe00d, 0x1163: 0x0008,
-	0x1164: 0xe00d, 0x1165: 0x0008, 0x1166: 0xe00d, 0x1167: 0x0008, 0x1168: 0xe00d, 0x1169: 0x0008,
-	0x116a: 0xe00d, 0x116b: 0x0008, 0x116c: 0xe00d, 0x116d: 0x0008, 0x116e: 0xe00d, 0x116f: 0x0008,
-	0x1170: 0x0008, 0x1171: 0x0008, 0x1172: 0xe00d, 0x1173: 0x0008, 0x1174: 0xe00d, 0x1175: 0x0008,
-	0x1176: 0xe00d, 0x1177: 0x0008, 0x1178: 0xe00d, 0x1179: 0x0008, 0x117a: 0xe00d, 0x117b: 0x0008,
-	0x117c: 0xe00d, 0x117d: 0x0008, 0x117e: 0xe00d, 0x117f: 0x0008,
-	// Block 0x46, offset 0x1180
-	0x1180: 0xe00d, 0x1181: 0x0008, 0x1182: 0xe00d, 0x1183: 0x0008, 0x1184: 0xe00d, 0x1185: 0x0008,
-	0x1186: 0xe00d, 0x1187: 0x0008, 0x1188: 0xe00d, 0x1189: 0x0008, 0x118a: 0xe00d, 0x118b: 0x0008,
-	0x118c: 0xe00d, 0x118d: 0x0008, 0x118e: 0xe00d, 0x118f: 0x0008, 0x1190: 0xe00d, 0x1191: 0x0008,
-	0x1192: 0xe00d, 0x1193: 0x0008, 0x1194: 0xe00d, 0x1195: 0x0008, 0x1196: 0xe00d, 0x1197: 0x0008,
-	0x1198: 0xe00d, 0x1199: 0x0008, 0x119a: 0xe00d, 0x119b: 0x0008, 0x119c: 0xe00d, 0x119d: 0x0008,
-	0x119e: 0xe00d, 0x119f: 0x0008, 0x11a0: 0xe00d, 0x11a1: 0x0008, 0x11a2: 0xe00d, 0x11a3: 0x0008,
-	0x11a4: 0xe00d, 0x11a5: 0x0008, 0x11a6: 0xe00d, 0x11a7: 0x0008, 0x11a8: 0xe00d, 0x11a9: 0x0008,
-	0x11aa: 0xe00d, 0x11ab: 0x0008, 0x11ac: 0xe00d, 0x11ad: 0x0008, 0x11ae: 0xe00d, 0x11af: 0x0008,
-	0x11b0: 0xe0fd, 0x11b1: 0x0008, 0x11b2: 0x0008, 0x11b3: 0x0008, 0x11b4: 0x0008, 0x11b5: 0x0008,
-	0x11b6: 0x0008, 0x11b7: 0x0008, 0x11b8: 0x0008, 0x11b9: 0xe01d, 0x11ba: 0x0008, 0x11bb: 0xe03d,
-	0x11bc: 0x0008, 0x11bd: 0x4445, 0x11be: 0xe00d, 0x11bf: 0x0008,
-	// Block 0x47, offset 0x11c0
-	0x11c0: 0xe00d, 0x11c1: 0x0008, 0x11c2: 0xe00d, 0x11c3: 0x0008, 0x11c4: 0xe00d, 0x11c5: 0x0008,
-	0x11c6: 0xe00d, 0x11c7: 0x0008, 0x11c8: 0x0008, 0x11c9: 0x0018, 0x11ca: 0x0018, 0x11cb: 0xe03d,
-	0x11cc: 0x0008, 0x11cd: 0x0409, 0x11ce: 0x0008, 0x11cf: 0x0008, 0x11d0: 0xe00d, 0x11d1: 0x0008,
-	0x11d2: 0xe00d, 0x11d3: 0x0008, 0x11d4: 0x0008, 0x11d5: 0x0008, 0x11d6: 0xe00d, 0x11d7: 0x0008,
-	0x11d8: 0xe00d, 0x11d9: 0x0008, 0x11da: 0xe00d, 0x11db: 0x0008, 0x11dc: 0xe00d, 0x11dd: 0x0008,
-	0x11de: 0xe00d, 0x11df: 0x0008, 0x11e0: 0xe00d, 0x11e1: 0x0008, 0x11e2: 0xe00d, 0x11e3: 0x0008,
-	0x11e4: 0xe00d, 0x11e5: 0x0008, 0x11e6: 0xe00d, 0x11e7: 0x0008, 0x11e8: 0xe00d, 0x11e9: 0x0008,
-	0x11ea: 0x13d1, 0x11eb: 0x0371, 0x11ec: 0x0401, 0x11ed: 0x13d9, 0x11ee: 0x0421, 0x11ef: 0x0008,
-	0x11f0: 0x13e1, 0x11f1: 0x13e9, 0x11f2: 0x0429, 0x11f3: 0x4465, 0x11f4: 0xe00d, 0x11f5: 0x0008,
-	0x11f6: 0xe00d, 0x11f7: 0x0008, 0x11f8: 0xe00d, 0x11f9: 0x0008, 0x11fa: 0xe00d, 0x11fb: 0x0008,
-	0x11fc: 0xe00d, 0x11fd: 0x0008, 0x11fe: 0xe00d, 0x11ff: 0x0008,
-	// Block 0x48, offset 0x1200
-	0x1200: 0xe00d, 0x1201: 0x0008, 0x1202: 0xe00d, 0x1203: 0x0008, 0x1204: 0x03f5, 0x1205: 0x0479,
-	0x1206: 0x447d, 0x1207: 0xe07d, 0x1208: 0x0008, 0x1209: 0xe01d, 0x120a: 0x0008, 0x120b: 0x0040,
-	0x120c: 0x0040, 0x120d: 0x0040, 0x120e: 0x0040, 0x120f: 0x0040, 0x1210: 0xe00d, 0x1211: 0x0008,
-	0x1212: 0x0040, 0x1213: 0x0008, 0x1214: 0x0040, 0x1215: 0x0008, 0x1216: 0xe00d, 0x1217: 0x0008,
-	0x1218: 0xe00d, 0x1219: 0x0008, 0x121a: 0x0040, 0x121b: 0x0040, 0x121c: 0x0040, 0x121d: 0x0040,
-	0x121e: 0x0040, 0x121f: 0x0040, 0x1220: 0x0040, 0x1221: 0x0040, 0x1222: 0x0040, 0x1223: 0x0040,
-	0x1224: 0x0040, 0x1225: 0x0040, 0x1226: 0x0040, 0x1227: 0x0040, 0x1228: 0x0040, 0x1229: 0x0040,
-	0x122a: 0x0040, 0x122b: 0x0040, 0x122c: 0x0040, 0x122d: 0x0040, 0x122e: 0x0040, 0x122f: 0x0040,
-	0x1230: 0x0040, 0x1231: 0x0040, 0x1232: 0x03d9, 0x1233: 0x03f1, 0x1234: 0x0751, 0x1235: 0xe01d,
-	0x1236: 0x0008, 0x1237: 0x0008, 0x1238: 0x0741, 0x1239: 0x13f1, 0x123a: 0x0008, 0x123b: 0x0008,
-	0x123c: 0x0008, 0x123d: 0x0008, 0x123e: 0x0008, 0x123f: 0x0008,
-	// Block 0x49, offset 0x1240
-	0x1240: 0x650d, 0x1241: 0x652d, 0x1242: 0x654d, 0x1243: 0x656d, 0x1244: 0x658d, 0x1245: 0x65ad,
-	0x1246: 0x65cd, 0x1247: 0x65ed, 0x1248: 0x660d, 0x1249: 0x662d, 0x124a: 0x664d, 0x124b: 0x666d,
-	0x124c: 0x668d, 0x124d: 0x66ad, 0x124e: 0x0008, 0x124f: 0x0008, 0x1250: 0x66cd, 0x1251: 0x0008,
-	0x1252: 0x66ed, 0x1253: 0x0008, 0x1254: 0x0008, 0x1255: 0x670d, 0x1256: 0x672d, 0x1257: 0x674d,
-	0x1258: 0x676d, 0x1259: 0x678d, 0x125a: 0x67ad, 0x125b: 0x67cd, 0x125c: 0x67ed, 0x125d: 0x680d,
-	0x125e: 0x682d, 0x125f: 0x0008, 0x1260: 0x684d, 0x1261: 0x0008, 0x1262: 0x686d, 0x1263: 0x0008,
-	0x1264: 0x0008, 0x1265: 0x688d, 0x1266: 0x68ad, 0x1267: 0x0008, 0x1268: 0x0008, 0x1269: 0x0008,
-	0x126a: 0x68cd, 0x126b: 0x68ed, 0x126c: 0x690d, 0x126d: 0x692d, 0x126e: 0x694d, 0x126f: 0x696d,
-	0x1270: 0x698d, 0x1271: 0x69ad, 0x1272: 0x69cd, 0x1273: 0x69ed, 0x1274: 0x6a0d, 0x1275: 0x6a2d,
-	0x1276: 0x6a4d, 0x1277: 0x6a6d, 0x1278: 0x6a8d, 0x1279: 0x6aad, 0x127a: 0x6acd, 0x127b: 0x6aed,
-	0x127c: 0x6b0d, 0x127d: 0x6b2d, 0x127e: 0x6b4d, 0x127f: 0x6b6d,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x7acd, 0x1281: 0x7aed, 0x1282: 0x7b0d, 0x1283: 0x7b2d, 0x1284: 0x7b4d, 0x1285: 0x7b6d,
-	0x1286: 0x7b8d, 0x1287: 0x7bad, 0x1288: 0x7bcd, 0x1289: 0x7bed, 0x128a: 0x7c0d, 0x128b: 0x7c2d,
-	0x128c: 0x7c4d, 0x128d: 0x7c6d, 0x128e: 0x7c8d, 0x128f: 0x1409, 0x1290: 0x1411, 0x1291: 0x1419,
-	0x1292: 0x7cad, 0x1293: 0x7ccd, 0x1294: 0x7ced, 0x1295: 0x1421, 0x1296: 0x1429, 0x1297: 0x1431,
-	0x1298: 0x7d0d, 0x1299: 0x7d2d, 0x129a: 0x0040, 0x129b: 0x0040, 0x129c: 0x0040, 0x129d: 0x0040,
-	0x129e: 0x0040, 0x129f: 0x0040, 0x12a0: 0x0040, 0x12a1: 0x0040, 0x12a2: 0x0040, 0x12a3: 0x0040,
-	0x12a4: 0x0040, 0x12a5: 0x0040, 0x12a6: 0x0040, 0x12a7: 0x0040, 0x12a8: 0x0040, 0x12a9: 0x0040,
-	0x12aa: 0x0040, 0x12ab: 0x0040, 0x12ac: 0x0040, 0x12ad: 0x0040, 0x12ae: 0x0040, 0x12af: 0x0040,
-	0x12b0: 0x0040, 0x12b1: 0x0040, 0x12b2: 0x0040, 0x12b3: 0x0040, 0x12b4: 0x0040, 0x12b5: 0x0040,
-	0x12b6: 0x0040, 0x12b7: 0x0040, 0x12b8: 0x0040, 0x12b9: 0x0040, 0x12ba: 0x0040, 0x12bb: 0x0040,
-	0x12bc: 0x0040, 0x12bd: 0x0040, 0x12be: 0x0040, 0x12bf: 0x0040,
-	// Block 0x4b, offset 0x12c0
-	0x12c0: 0x1439, 0x12c1: 0x1441, 0x12c2: 0x1449, 0x12c3: 0x7d4d, 0x12c4: 0x7d6d, 0x12c5: 0x1451,
-	0x12c6: 0x1451, 0x12c7: 0x0040, 0x12c8: 0x0040, 0x12c9: 0x0040, 0x12ca: 0x0040, 0x12cb: 0x0040,
-	0x12cc: 0x0040, 0x12cd: 0x0040, 0x12ce: 0x0040, 0x12cf: 0x0040, 0x12d0: 0x0040, 0x12d1: 0x0040,
-	0x12d2: 0x0040, 0x12d3: 0x1459, 0x12d4: 0x1461, 0x12d5: 0x1469, 0x12d6: 0x1471, 0x12d7: 0x1479,
-	0x12d8: 0x0040, 0x12d9: 0x0040, 0x12da: 0x0040, 0x12db: 0x0040, 0x12dc: 0x0040, 0x12dd: 0x1481,
-	0x12de: 0x3308, 0x12df: 0x1489, 0x12e0: 0x1491, 0x12e1: 0x0779, 0x12e2: 0x0791, 0x12e3: 0x1499,
-	0x12e4: 0x14a1, 0x12e5: 0x14a9, 0x12e6: 0x14b1, 0x12e7: 0x14b9, 0x12e8: 0x14c1, 0x12e9: 0x071a,
-	0x12ea: 0x14c9, 0x12eb: 0x14d1, 0x12ec: 0x14d9, 0x12ed: 0x14e1, 0x12ee: 0x14e9, 0x12ef: 0x14f1,
-	0x12f0: 0x14f9, 0x12f1: 0x1501, 0x12f2: 0x1509, 0x12f3: 0x1511, 0x12f4: 0x1519, 0x12f5: 0x1521,
-	0x12f6: 0x1529, 0x12f7: 0x0040, 0x12f8: 0x1531, 0x12f9: 0x1539, 0x12fa: 0x1541, 0x12fb: 0x1549,
-	0x12fc: 0x1551, 0x12fd: 0x0040, 0x12fe: 0x1559, 0x12ff: 0x0040,
-	// Block 0x4c, offset 0x1300
-	0x1300: 0x1561, 0x1301: 0x1569, 0x1302: 0x0040, 0x1303: 0x1571, 0x1304: 0x1579, 0x1305: 0x0040,
-	0x1306: 0x1581, 0x1307: 0x1589, 0x1308: 0x1591, 0x1309: 0x1599, 0x130a: 0x15a1, 0x130b: 0x15a9,
-	0x130c: 0x15b1, 0x130d: 0x15b9, 0x130e: 0x15c1, 0x130f: 0x15c9, 0x1310: 0x15d1, 0x1311: 0x15d1,
-	0x1312: 0x15d9, 0x1313: 0x15d9, 0x1314: 0x15d9, 0x1315: 0x15d9, 0x1316: 0x15e1, 0x1317: 0x15e1,
-	0x1318: 0x15e1, 0x1319: 0x15e1, 0x131a: 0x15e9, 0x131b: 0x15e9, 0x131c: 0x15e9, 0x131d: 0x15e9,
-	0x131e: 0x15f1, 0x131f: 0x15f1, 0x1320: 0x15f1, 0x1321: 0x15f1, 0x1322: 0x15f9, 0x1323: 0x15f9,
-	0x1324: 0x15f9, 0x1325: 0x15f9, 0x1326: 0x1601, 0x1327: 0x1601, 0x1328: 0x1601, 0x1329: 0x1601,
-	0x132a: 0x1609, 0x132b: 0x1609, 0x132c: 0x1609, 0x132d: 0x1609, 0x132e: 0x1611, 0x132f: 0x1611,
-	0x1330: 0x1611, 0x1331: 0x1611, 0x1332: 0x1619, 0x1333: 0x1619, 0x1334: 0x1619, 0x1335: 0x1619,
-	0x1336: 0x1621, 0x1337: 0x1621, 0x1338: 0x1621, 0x1339: 0x1621, 0x133a: 0x1629, 0x133b: 0x1629,
-	0x133c: 0x1629, 0x133d: 0x1629, 0x133e: 0x1631, 0x133f: 0x1631,
-	// Block 0x4d, offset 0x1340
-	0x1340: 0x1631, 0x1341: 0x1631, 0x1342: 0x1639, 0x1343: 0x1639, 0x1344: 0x1641, 0x1345: 0x1641,
-	0x1346: 0x1649, 0x1347: 0x1649, 0x1348: 0x1651, 0x1349: 0x1651, 0x134a: 0x1659, 0x134b: 0x1659,
-	0x134c: 0x1661, 0x134d: 0x1661, 0x134e: 0x1669, 0x134f: 0x1669, 0x1350: 0x1669, 0x1351: 0x1669,
-	0x1352: 0x1671, 0x1353: 0x1671, 0x1354: 0x1671, 0x1355: 0x1671, 0x1356: 0x1679, 0x1357: 0x1679,
-	0x1358: 0x1679, 0x1359: 0x1679, 0x135a: 0x1681, 0x135b: 0x1681, 0x135c: 0x1681, 0x135d: 0x1681,
-	0x135e: 0x1689, 0x135f: 0x1689, 0x1360: 0x1691, 0x1361: 0x1691, 0x1362: 0x1691, 0x1363: 0x1691,
-	0x1364: 0x1699, 0x1365: 0x1699, 0x1366: 0x16a1, 0x1367: 0x16a1, 0x1368: 0x16a1, 0x1369: 0x16a1,
-	0x136a: 0x16a9, 0x136b: 0x16a9, 0x136c: 0x16a9, 0x136d: 0x16a9, 0x136e: 0x16b1, 0x136f: 0x16b1,
-	0x1370: 0x16b9, 0x1371: 0x16b9, 0x1372: 0x0818, 0x1373: 0x0818, 0x1374: 0x0818, 0x1375: 0x0818,
-	0x1376: 0x0818, 0x1377: 0x0818, 0x1378: 0x0818, 0x1379: 0x0818, 0x137a: 0x0818, 0x137b: 0x0818,
-	0x137c: 0x0818, 0x137d: 0x0818, 0x137e: 0x0818, 0x137f: 0x0818,
-	// Block 0x4e, offset 0x1380
-	0x1380: 0x0818, 0x1381: 0x0818, 0x1382: 0x0818, 0x1383: 0x0040, 0x1384: 0x0040, 0x1385: 0x0040,
-	0x1386: 0x0040, 0x1387: 0x0040, 0x1388: 0x0040, 0x1389: 0x0040, 0x138a: 0x0040, 0x138b: 0x0040,
-	0x138c: 0x0040, 0x138d: 0x0040, 0x138e: 0x0040, 0x138f: 0x0040, 0x1390: 0x0040, 0x1391: 0x0040,
-	0x1392: 0x0040, 0x1393: 0x16c1, 0x1394: 0x16c1, 0x1395: 0x16c1, 0x1396: 0x16c1, 0x1397: 0x16c9,
-	0x1398: 0x16c9, 0x1399: 0x16d1, 0x139a: 0x16d1, 0x139b: 0x16d9, 0x139c: 0x16d9, 0x139d: 0x0149,
-	0x139e: 0x16e1, 0x139f: 0x16e1, 0x13a0: 0x16e9, 0x13a1: 0x16e9, 0x13a2: 0x16f1, 0x13a3: 0x16f1,
-	0x13a4: 0x16f9, 0x13a5: 0x16f9, 0x13a6: 0x16f9, 0x13a7: 0x16f9, 0x13a8: 0x1701, 0x13a9: 0x1701,
-	0x13aa: 0x1709, 0x13ab: 0x1709, 0x13ac: 0x1711, 0x13ad: 0x1711, 0x13ae: 0x1719, 0x13af: 0x1719,
-	0x13b0: 0x1721, 0x13b1: 0x1721, 0x13b2: 0x1729, 0x13b3: 0x1729, 0x13b4: 0x1731, 0x13b5: 0x1731,
-	0x13b6: 0x1739, 0x13b7: 0x1739, 0x13b8: 0x1739, 0x13b9: 0x1741, 0x13ba: 0x1741, 0x13bb: 0x1741,
-	0x13bc: 0x1749, 0x13bd: 0x1749, 0x13be: 0x1749, 0x13bf: 0x1749,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x1949, 0x13c1: 0x1951, 0x13c2: 0x1959, 0x13c3: 0x1961, 0x13c4: 0x1969, 0x13c5: 0x1971,
-	0x13c6: 0x1979, 0x13c7: 0x1981, 0x13c8: 0x1989, 0x13c9: 0x1991, 0x13ca: 0x1999, 0x13cb: 0x19a1,
-	0x13cc: 0x19a9, 0x13cd: 0x19b1, 0x13ce: 0x19b9, 0x13cf: 0x19c1, 0x13d0: 0x19c9, 0x13d1: 0x19d1,
-	0x13d2: 0x19d9, 0x13d3: 0x19e1, 0x13d4: 0x19e9, 0x13d5: 0x19f1, 0x13d6: 0x19f9, 0x13d7: 0x1a01,
-	0x13d8: 0x1a09, 0x13d9: 0x1a11, 0x13da: 0x1a19, 0x13db: 0x1a21, 0x13dc: 0x1a29, 0x13dd: 0x1a31,
-	0x13de: 0x1a3a, 0x13df: 0x1a42, 0x13e0: 0x1a4a, 0x13e1: 0x1a52, 0x13e2: 0x1a5a, 0x13e3: 0x1a62,
-	0x13e4: 0x1a69, 0x13e5: 0x1a71, 0x13e6: 0x1761, 0x13e7: 0x1a79, 0x13e8: 0x1741, 0x13e9: 0x1769,
-	0x13ea: 0x1a81, 0x13eb: 0x1a89, 0x13ec: 0x1789, 0x13ed: 0x1a91, 0x13ee: 0x1791, 0x13ef: 0x1799,
-	0x13f0: 0x1a99, 0x13f1: 0x1aa1, 0x13f2: 0x17b9, 0x13f3: 0x1aa9, 0x13f4: 0x17c1, 0x13f5: 0x17c9,
-	0x13f6: 0x1ab1, 0x13f7: 0x1ab9, 0x13f8: 0x17d9, 0x13f9: 0x1ac1, 0x13fa: 0x17e1, 0x13fb: 0x17e9,
-	0x13fc: 0x18d1, 0x13fd: 0x18d9, 0x13fe: 0x18f1, 0x13ff: 0x18f9,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x1901, 0x1401: 0x1921, 0x1402: 0x1929, 0x1403: 0x1931, 0x1404: 0x1939, 0x1405: 0x1959,
-	0x1406: 0x1961, 0x1407: 0x1969, 0x1408: 0x1ac9, 0x1409: 0x1989, 0x140a: 0x1ad1, 0x140b: 0x1ad9,
-	0x140c: 0x19b9, 0x140d: 0x1ae1, 0x140e: 0x19c1, 0x140f: 0x19c9, 0x1410: 0x1a31, 0x1411: 0x1ae9,
-	0x1412: 0x1af1, 0x1413: 0x1a09, 0x1414: 0x1af9, 0x1415: 0x1a11, 0x1416: 0x1a19, 0x1417: 0x1751,
-	0x1418: 0x1759, 0x1419: 0x1b01, 0x141a: 0x1761, 0x141b: 0x1b09, 0x141c: 0x1771, 0x141d: 0x1779,
-	0x141e: 0x1781, 0x141f: 0x1789, 0x1420: 0x1b11, 0x1421: 0x17a1, 0x1422: 0x17a9, 0x1423: 0x17b1,
-	0x1424: 0x17b9, 0x1425: 0x1b19, 0x1426: 0x17d9, 0x1427: 0x17f1, 0x1428: 0x17f9, 0x1429: 0x1801,
-	0x142a: 0x1809, 0x142b: 0x1811, 0x142c: 0x1821, 0x142d: 0x1829, 0x142e: 0x1831, 0x142f: 0x1839,
-	0x1430: 0x1841, 0x1431: 0x1849, 0x1432: 0x1b21, 0x1433: 0x1851, 0x1434: 0x1859, 0x1435: 0x1861,
-	0x1436: 0x1869, 0x1437: 0x1871, 0x1438: 0x1879, 0x1439: 0x1889, 0x143a: 0x1891, 0x143b: 0x1899,
-	0x143c: 0x18a1, 0x143d: 0x18a9, 0x143e: 0x18b1, 0x143f: 0x18b9,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x18c1, 0x1441: 0x18c9, 0x1442: 0x18e1, 0x1443: 0x18e9, 0x1444: 0x1909, 0x1445: 0x1911,
-	0x1446: 0x1919, 0x1447: 0x1921, 0x1448: 0x1929, 0x1449: 0x1941, 0x144a: 0x1949, 0x144b: 0x1951,
-	0x144c: 0x1959, 0x144d: 0x1b29, 0x144e: 0x1971, 0x144f: 0x1979, 0x1450: 0x1981, 0x1451: 0x1989,
-	0x1452: 0x19a1, 0x1453: 0x19a9, 0x1454: 0x19b1, 0x1455: 0x19b9, 0x1456: 0x1b31, 0x1457: 0x19d1,
-	0x1458: 0x19d9, 0x1459: 0x1b39, 0x145a: 0x19f1, 0x145b: 0x19f9, 0x145c: 0x1a01, 0x145d: 0x1a09,
-	0x145e: 0x1b41, 0x145f: 0x1761, 0x1460: 0x1b09, 0x1461: 0x1789, 0x1462: 0x1b11, 0x1463: 0x17b9,
-	0x1464: 0x1b19, 0x1465: 0x17d9, 0x1466: 0x1b49, 0x1467: 0x1841, 0x1468: 0x1b51, 0x1469: 0x1b59,
-	0x146a: 0x1b61, 0x146b: 0x1921, 0x146c: 0x1929, 0x146d: 0x1959, 0x146e: 0x19b9, 0x146f: 0x1b31,
-	0x1470: 0x1a09, 0x1471: 0x1b41, 0x1472: 0x1b69, 0x1473: 0x1b71, 0x1474: 0x1b79, 0x1475: 0x1b81,
-	0x1476: 0x1b89, 0x1477: 0x1b91, 0x1478: 0x1b99, 0x1479: 0x1ba1, 0x147a: 0x1ba9, 0x147b: 0x1bb1,
-	0x147c: 0x1bb9, 0x147d: 0x1bc1, 0x147e: 0x1bc9, 0x147f: 0x1bd1,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x1bd9, 0x1481: 0x1be1, 0x1482: 0x1be9, 0x1483: 0x1bf1, 0x1484: 0x1bf9, 0x1485: 0x1c01,
-	0x1486: 0x1c09, 0x1487: 0x1c11, 0x1488: 0x1c19, 0x1489: 0x1c21, 0x148a: 0x1c29, 0x148b: 0x1c31,
-	0x148c: 0x1b59, 0x148d: 0x1c39, 0x148e: 0x1c41, 0x148f: 0x1c49, 0x1490: 0x1c51, 0x1491: 0x1b81,
-	0x1492: 0x1b89, 0x1493: 0x1b91, 0x1494: 0x1b99, 0x1495: 0x1ba1, 0x1496: 0x1ba9, 0x1497: 0x1bb1,
-	0x1498: 0x1bb9, 0x1499: 0x1bc1, 0x149a: 0x1bc9, 0x149b: 0x1bd1, 0x149c: 0x1bd9, 0x149d: 0x1be1,
-	0x149e: 0x1be9, 0x149f: 0x1bf1, 0x14a0: 0x1bf9, 0x14a1: 0x1c01, 0x14a2: 0x1c09, 0x14a3: 0x1c11,
-	0x14a4: 0x1c19, 0x14a5: 0x1c21, 0x14a6: 0x1c29, 0x14a7: 0x1c31, 0x14a8: 0x1b59, 0x14a9: 0x1c39,
-	0x14aa: 0x1c41, 0x14ab: 0x1c49, 0x14ac: 0x1c51, 0x14ad: 0x1c21, 0x14ae: 0x1c29, 0x14af: 0x1c31,
-	0x14b0: 0x1b59, 0x14b1: 0x1b51, 0x14b2: 0x1b61, 0x14b3: 0x1881, 0x14b4: 0x1829, 0x14b5: 0x1831,
-	0x14b6: 0x1839, 0x14b7: 0x1c21, 0x14b8: 0x1c29, 0x14b9: 0x1c31, 0x14ba: 0x1881, 0x14bb: 0x1889,
-	0x14bc: 0x1c59, 0x14bd: 0x1c59, 0x14be: 0x0018, 0x14bf: 0x0018,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x0018, 0x14c1: 0x0018, 0x14c2: 0x0018, 0x14c3: 0x0018, 0x14c4: 0x0018, 0x14c5: 0x0018,
-	0x14c6: 0x0018, 0x14c7: 0x0018, 0x14c8: 0x0018, 0x14c9: 0x0018, 0x14ca: 0x0018, 0x14cb: 0x0018,
-	0x14cc: 0x0018, 0x14cd: 0x0018, 0x14ce: 0x0018, 0x14cf: 0x0018, 0x14d0: 0x1c61, 0x14d1: 0x1c69,
-	0x14d2: 0x1c69, 0x14d3: 0x1c71, 0x14d4: 0x1c79, 0x14d5: 0x1c81, 0x14d6: 0x1c89, 0x14d7: 0x1c91,
-	0x14d8: 0x1c99, 0x14d9: 0x1c99, 0x14da: 0x1ca1, 0x14db: 0x1ca9, 0x14dc: 0x1cb1, 0x14dd: 0x1cb9,
-	0x14de: 0x1cc1, 0x14df: 0x1cc9, 0x14e0: 0x1cc9, 0x14e1: 0x1cd1, 0x14e2: 0x1cd9, 0x14e3: 0x1cd9,
-	0x14e4: 0x1ce1, 0x14e5: 0x1ce1, 0x14e6: 0x1ce9, 0x14e7: 0x1cf1, 0x14e8: 0x1cf1, 0x14e9: 0x1cf9,
-	0x14ea: 0x1d01, 0x14eb: 0x1d01, 0x14ec: 0x1d09, 0x14ed: 0x1d09, 0x14ee: 0x1d11, 0x14ef: 0x1d19,
-	0x14f0: 0x1d19, 0x14f1: 0x1d21, 0x14f2: 0x1d21, 0x14f3: 0x1d29, 0x14f4: 0x1d31, 0x14f5: 0x1d39,
-	0x14f6: 0x1d41, 0x14f7: 0x1d41, 0x14f8: 0x1d49, 0x14f9: 0x1d51, 0x14fa: 0x1d59, 0x14fb: 0x1d61,
-	0x14fc: 0x1d69, 0x14fd: 0x1d69, 0x14fe: 0x1d71, 0x14ff: 0x1d79,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x1f29, 0x1501: 0x1f31, 0x1502: 0x1f39, 0x1503: 0x1f11, 0x1504: 0x1d39, 0x1505: 0x1ce9,
-	0x1506: 0x1f41, 0x1507: 0x1f49, 0x1508: 0x0040, 0x1509: 0x0040, 0x150a: 0x0040, 0x150b: 0x0040,
-	0x150c: 0x0040, 0x150d: 0x0040, 0x150e: 0x0040, 0x150f: 0x0018, 0x1510: 0x0040, 0x1511: 0x0040,
-	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0040, 0x1515: 0x0040, 0x1516: 0x0040, 0x1517: 0x0040,
-	0x1518: 0x0040, 0x1519: 0x0040, 0x151a: 0x0040, 0x151b: 0x0040, 0x151c: 0x0040, 0x151d: 0x0040,
-	0x151e: 0x0040, 0x151f: 0x0040, 0x1520: 0x0040, 0x1521: 0x0040, 0x1522: 0x0040, 0x1523: 0x0040,
-	0x1524: 0x0040, 0x1525: 0x0040, 0x1526: 0x0040, 0x1527: 0x0040, 0x1528: 0x0040, 0x1529: 0x0040,
-	0x152a: 0x0040, 0x152b: 0x0040, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
-	0x1530: 0x1f51, 0x1531: 0x1f59, 0x1532: 0x1f61, 0x1533: 0x1f69, 0x1534: 0x1f71, 0x1535: 0x1f79,
-	0x1536: 0x1f81, 0x1537: 0x1f89, 0x1538: 0x1f91, 0x1539: 0x1f99, 0x153a: 0x1fa2, 0x153b: 0x1faa,
-	0x153c: 0x1fb1, 0x153d: 0x0018, 0x153e: 0x0018, 0x153f: 0x0018,
-	// Block 0x55, offset 0x1540
-	0x1540: 0x33c0, 0x1541: 0x33c0, 0x1542: 0x33c0, 0x1543: 0x33c0, 0x1544: 0x33c0, 0x1545: 0x33c0,
-	0x1546: 0x33c0, 0x1547: 0x33c0, 0x1548: 0x33c0, 0x1549: 0x33c0, 0x154a: 0x33c0, 0x154b: 0x33c0,
-	0x154c: 0x33c0, 0x154d: 0x33c0, 0x154e: 0x33c0, 0x154f: 0x33c0, 0x1550: 0x1fba, 0x1551: 0x7d8d,
-	0x1552: 0x0040, 0x1553: 0x1fc2, 0x1554: 0x0122, 0x1555: 0x1fca, 0x1556: 0x1fd2, 0x1557: 0x7dad,
-	0x1558: 0x7dcd, 0x1559: 0x0040, 0x155a: 0x0040, 0x155b: 0x0040, 0x155c: 0x0040, 0x155d: 0x0040,
-	0x155e: 0x0040, 0x155f: 0x0040, 0x1560: 0x3308, 0x1561: 0x3308, 0x1562: 0x3308, 0x1563: 0x3308,
-	0x1564: 0x3308, 0x1565: 0x3308, 0x1566: 0x3308, 0x1567: 0x3308, 0x1568: 0x3308, 0x1569: 0x3308,
-	0x156a: 0x3308, 0x156b: 0x3308, 0x156c: 0x3308, 0x156d: 0x3308, 0x156e: 0x3308, 0x156f: 0x3308,
-	0x1570: 0x0040, 0x1571: 0x7ded, 0x1572: 0x7e0d, 0x1573: 0x1fda, 0x1574: 0x1fda, 0x1575: 0x072a,
-	0x1576: 0x0732, 0x1577: 0x1fe2, 0x1578: 0x1fea, 0x1579: 0x7e2d, 0x157a: 0x7e4d, 0x157b: 0x7e6d,
-	0x157c: 0x7e2d, 0x157d: 0x7e8d, 0x157e: 0x7ead, 0x157f: 0x7e8d,
-	// Block 0x56, offset 0x1580
-	0x1580: 0x7ecd, 0x1581: 0x7eed, 0x1582: 0x7f0d, 0x1583: 0x7eed, 0x1584: 0x7f2d, 0x1585: 0x0018,
-	0x1586: 0x0018, 0x1587: 0x1ff2, 0x1588: 0x1ffa, 0x1589: 0x7f4e, 0x158a: 0x7f6e, 0x158b: 0x7f8e,
-	0x158c: 0x7fae, 0x158d: 0x1fda, 0x158e: 0x1fda, 0x158f: 0x1fda, 0x1590: 0x1fba, 0x1591: 0x7fcd,
-	0x1592: 0x0040, 0x1593: 0x0040, 0x1594: 0x0122, 0x1595: 0x1fc2, 0x1596: 0x1fd2, 0x1597: 0x1fca,
-	0x1598: 0x7fed, 0x1599: 0x072a, 0x159a: 0x0732, 0x159b: 0x1fe2, 0x159c: 0x1fea, 0x159d: 0x7ecd,
-	0x159e: 0x7f2d, 0x159f: 0x2002, 0x15a0: 0x200a, 0x15a1: 0x2012, 0x15a2: 0x071a, 0x15a3: 0x2019,
-	0x15a4: 0x2022, 0x15a5: 0x202a, 0x15a6: 0x0722, 0x15a7: 0x0040, 0x15a8: 0x2032, 0x15a9: 0x203a,
-	0x15aa: 0x2042, 0x15ab: 0x204a, 0x15ac: 0x0040, 0x15ad: 0x0040, 0x15ae: 0x0040, 0x15af: 0x0040,
-	0x15b0: 0x800e, 0x15b1: 0x2051, 0x15b2: 0x802e, 0x15b3: 0x0808, 0x15b4: 0x804e, 0x15b5: 0x0040,
-	0x15b6: 0x806e, 0x15b7: 0x2059, 0x15b8: 0x808e, 0x15b9: 0x2061, 0x15ba: 0x80ae, 0x15bb: 0x2069,
-	0x15bc: 0x80ce, 0x15bd: 0x2071, 0x15be: 0x80ee, 0x15bf: 0x2079,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x2081, 0x15c1: 0x2089, 0x15c2: 0x2089, 0x15c3: 0x2091, 0x15c4: 0x2091, 0x15c5: 0x2099,
-	0x15c6: 0x2099, 0x15c7: 0x20a1, 0x15c8: 0x20a1, 0x15c9: 0x20a9, 0x15ca: 0x20a9, 0x15cb: 0x20a9,
-	0x15cc: 0x20a9, 0x15cd: 0x20b1, 0x15ce: 0x20b1, 0x15cf: 0x20b9, 0x15d0: 0x20b9, 0x15d1: 0x20b9,
-	0x15d2: 0x20b9, 0x15d3: 0x20c1, 0x15d4: 0x20c1, 0x15d5: 0x20c9, 0x15d6: 0x20c9, 0x15d7: 0x20c9,
-	0x15d8: 0x20c9, 0x15d9: 0x20d1, 0x15da: 0x20d1, 0x15db: 0x20d1, 0x15dc: 0x20d1, 0x15dd: 0x20d9,
-	0x15de: 0x20d9, 0x15df: 0x20d9, 0x15e0: 0x20d9, 0x15e1: 0x20e1, 0x15e2: 0x20e1, 0x15e3: 0x20e1,
-	0x15e4: 0x20e1, 0x15e5: 0x20e9, 0x15e6: 0x20e9, 0x15e7: 0x20e9, 0x15e8: 0x20e9, 0x15e9: 0x20f1,
-	0x15ea: 0x20f1, 0x15eb: 0x20f9, 0x15ec: 0x20f9, 0x15ed: 0x2101, 0x15ee: 0x2101, 0x15ef: 0x2109,
-	0x15f0: 0x2109, 0x15f1: 0x2111, 0x15f2: 0x2111, 0x15f3: 0x2111, 0x15f4: 0x2111, 0x15f5: 0x2119,
-	0x15f6: 0x2119, 0x15f7: 0x2119, 0x15f8: 0x2119, 0x15f9: 0x2121, 0x15fa: 0x2121, 0x15fb: 0x2121,
-	0x15fc: 0x2121, 0x15fd: 0x2129, 0x15fe: 0x2129, 0x15ff: 0x2129,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x2129, 0x1601: 0x2131, 0x1602: 0x2131, 0x1603: 0x2131, 0x1604: 0x2131, 0x1605: 0x2139,
-	0x1606: 0x2139, 0x1607: 0x2139, 0x1608: 0x2139, 0x1609: 0x2141, 0x160a: 0x2141, 0x160b: 0x2141,
-	0x160c: 0x2141, 0x160d: 0x2149, 0x160e: 0x2149, 0x160f: 0x2149, 0x1610: 0x2149, 0x1611: 0x2151,
-	0x1612: 0x2151, 0x1613: 0x2151, 0x1614: 0x2151, 0x1615: 0x2159, 0x1616: 0x2159, 0x1617: 0x2159,
-	0x1618: 0x2159, 0x1619: 0x2161, 0x161a: 0x2161, 0x161b: 0x2161, 0x161c: 0x2161, 0x161d: 0x2169,
-	0x161e: 0x2169, 0x161f: 0x2169, 0x1620: 0x2169, 0x1621: 0x2171, 0x1622: 0x2171, 0x1623: 0x2171,
-	0x1624: 0x2171, 0x1625: 0x2179, 0x1626: 0x2179, 0x1627: 0x2179, 0x1628: 0x2179, 0x1629: 0x2181,
-	0x162a: 0x2181, 0x162b: 0x2181, 0x162c: 0x2181, 0x162d: 0x2189, 0x162e: 0x2189, 0x162f: 0x1701,
-	0x1630: 0x1701, 0x1631: 0x2191, 0x1632: 0x2191, 0x1633: 0x2191, 0x1634: 0x2191, 0x1635: 0x2199,
-	0x1636: 0x2199, 0x1637: 0x21a1, 0x1638: 0x21a1, 0x1639: 0x21a9, 0x163a: 0x21a9, 0x163b: 0x21b1,
-	0x163c: 0x21b1, 0x163d: 0x0040, 0x163e: 0x0040, 0x163f: 0x03c0,
-	// Block 0x59, offset 0x1640
-	0x1640: 0x0040, 0x1641: 0x1fca, 0x1642: 0x21ba, 0x1643: 0x2002, 0x1644: 0x203a, 0x1645: 0x2042,
-	0x1646: 0x200a, 0x1647: 0x21c2, 0x1648: 0x072a, 0x1649: 0x0732, 0x164a: 0x2012, 0x164b: 0x071a,
-	0x164c: 0x1fba, 0x164d: 0x2019, 0x164e: 0x0961, 0x164f: 0x21ca, 0x1650: 0x06e1, 0x1651: 0x0049,
-	0x1652: 0x0029, 0x1653: 0x0031, 0x1654: 0x06e9, 0x1655: 0x06f1, 0x1656: 0x06f9, 0x1657: 0x0701,
-	0x1658: 0x0709, 0x1659: 0x0711, 0x165a: 0x1fc2, 0x165b: 0x0122, 0x165c: 0x2022, 0x165d: 0x0722,
-	0x165e: 0x202a, 0x165f: 0x1fd2, 0x1660: 0x204a, 0x1661: 0x0019, 0x1662: 0x02e9, 0x1663: 0x03d9,
-	0x1664: 0x02f1, 0x1665: 0x02f9, 0x1666: 0x03f1, 0x1667: 0x0309, 0x1668: 0x00a9, 0x1669: 0x0311,
-	0x166a: 0x00b1, 0x166b: 0x0319, 0x166c: 0x0101, 0x166d: 0x0321, 0x166e: 0x0329, 0x166f: 0x0051,
-	0x1670: 0x0339, 0x1671: 0x0751, 0x1672: 0x00b9, 0x1673: 0x0089, 0x1674: 0x0341, 0x1675: 0x0349,
-	0x1676: 0x0391, 0x1677: 0x00c1, 0x1678: 0x0109, 0x1679: 0x00c9, 0x167a: 0x04b1, 0x167b: 0x1ff2,
-	0x167c: 0x2032, 0x167d: 0x1ffa, 0x167e: 0x21d2, 0x167f: 0x1fda,
-	// Block 0x5a, offset 0x1680
-	0x1680: 0x0672, 0x1681: 0x0019, 0x1682: 0x02e9, 0x1683: 0x03d9, 0x1684: 0x02f1, 0x1685: 0x02f9,
-	0x1686: 0x03f1, 0x1687: 0x0309, 0x1688: 0x00a9, 0x1689: 0x0311, 0x168a: 0x00b1, 0x168b: 0x0319,
-	0x168c: 0x0101, 0x168d: 0x0321, 0x168e: 0x0329, 0x168f: 0x0051, 0x1690: 0x0339, 0x1691: 0x0751,
-	0x1692: 0x00b9, 0x1693: 0x0089, 0x1694: 0x0341, 0x1695: 0x0349, 0x1696: 0x0391, 0x1697: 0x00c1,
-	0x1698: 0x0109, 0x1699: 0x00c9, 0x169a: 0x04b1, 0x169b: 0x1fe2, 0x169c: 0x21da, 0x169d: 0x1fea,
-	0x169e: 0x21e2, 0x169f: 0x810d, 0x16a0: 0x812d, 0x16a1: 0x0961, 0x16a2: 0x814d, 0x16a3: 0x814d,
-	0x16a4: 0x816d, 0x16a5: 0x818d, 0x16a6: 0x81ad, 0x16a7: 0x81cd, 0x16a8: 0x81ed, 0x16a9: 0x820d,
-	0x16aa: 0x822d, 0x16ab: 0x824d, 0x16ac: 0x826d, 0x16ad: 0x828d, 0x16ae: 0x82ad, 0x16af: 0x82cd,
-	0x16b0: 0x82ed, 0x16b1: 0x830d, 0x16b2: 0x832d, 0x16b3: 0x834d, 0x16b4: 0x836d, 0x16b5: 0x838d,
-	0x16b6: 0x83ad, 0x16b7: 0x83cd, 0x16b8: 0x83ed, 0x16b9: 0x840d, 0x16ba: 0x842d, 0x16bb: 0x844d,
-	0x16bc: 0x81ed, 0x16bd: 0x846d, 0x16be: 0x848d, 0x16bf: 0x824d,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x84ad, 0x16c1: 0x84cd, 0x16c2: 0x84ed, 0x16c3: 0x850d, 0x16c4: 0x852d, 0x16c5: 0x854d,
-	0x16c6: 0x856d, 0x16c7: 0x858d, 0x16c8: 0x850d, 0x16c9: 0x85ad, 0x16ca: 0x850d, 0x16cb: 0x85cd,
-	0x16cc: 0x85cd, 0x16cd: 0x85ed, 0x16ce: 0x85ed, 0x16cf: 0x860d, 0x16d0: 0x854d, 0x16d1: 0x862d,
-	0x16d2: 0x864d, 0x16d3: 0x862d, 0x16d4: 0x866d, 0x16d5: 0x864d, 0x16d6: 0x868d, 0x16d7: 0x868d,
-	0x16d8: 0x86ad, 0x16d9: 0x86ad, 0x16da: 0x86cd, 0x16db: 0x86cd, 0x16dc: 0x864d, 0x16dd: 0x814d,
-	0x16de: 0x86ed, 0x16df: 0x870d, 0x16e0: 0x0040, 0x16e1: 0x872d, 0x16e2: 0x874d, 0x16e3: 0x876d,
-	0x16e4: 0x878d, 0x16e5: 0x876d, 0x16e6: 0x87ad, 0x16e7: 0x87cd, 0x16e8: 0x87ed, 0x16e9: 0x87ed,
-	0x16ea: 0x880d, 0x16eb: 0x880d, 0x16ec: 0x882d, 0x16ed: 0x882d, 0x16ee: 0x880d, 0x16ef: 0x880d,
-	0x16f0: 0x884d, 0x16f1: 0x886d, 0x16f2: 0x888d, 0x16f3: 0x88ad, 0x16f4: 0x88cd, 0x16f5: 0x88ed,
-	0x16f6: 0x88ed, 0x16f7: 0x88ed, 0x16f8: 0x890d, 0x16f9: 0x890d, 0x16fa: 0x890d, 0x16fb: 0x890d,
-	0x16fc: 0x87ed, 0x16fd: 0x87ed, 0x16fe: 0x87ed, 0x16ff: 0x0040,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x0040, 0x1701: 0x0040, 0x1702: 0x874d, 0x1703: 0x872d, 0x1704: 0x892d, 0x1705: 0x872d,
-	0x1706: 0x874d, 0x1707: 0x872d, 0x1708: 0x0040, 0x1709: 0x0040, 0x170a: 0x894d, 0x170b: 0x874d,
-	0x170c: 0x896d, 0x170d: 0x892d, 0x170e: 0x896d, 0x170f: 0x874d, 0x1710: 0x0040, 0x1711: 0x0040,
-	0x1712: 0x898d, 0x1713: 0x89ad, 0x1714: 0x88ad, 0x1715: 0x896d, 0x1716: 0x892d, 0x1717: 0x896d,
-	0x1718: 0x0040, 0x1719: 0x0040, 0x171a: 0x89cd, 0x171b: 0x89ed, 0x171c: 0x89cd, 0x171d: 0x0040,
-	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0x21e9, 0x1721: 0x21f1, 0x1722: 0x21f9, 0x1723: 0x8a0e,
-	0x1724: 0x2201, 0x1725: 0x2209, 0x1726: 0x8a2d, 0x1727: 0x0040, 0x1728: 0x8a4d, 0x1729: 0x8a6d,
-	0x172a: 0x8a8d, 0x172b: 0x8a6d, 0x172c: 0x8aad, 0x172d: 0x8acd, 0x172e: 0x8aed, 0x172f: 0x0040,
-	0x1730: 0x0040, 0x1731: 0x0040, 0x1732: 0x0040, 0x1733: 0x0040, 0x1734: 0x0040, 0x1735: 0x0040,
-	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0340, 0x173a: 0x0340, 0x173b: 0x0340,
-	0x173c: 0x0040, 0x173d: 0x0040, 0x173e: 0x0040, 0x173f: 0x0040,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x0008, 0x1741: 0x0008, 0x1742: 0x0008, 0x1743: 0x0008, 0x1744: 0x0008, 0x1745: 0x0008,
-	0x1746: 0x0008, 0x1747: 0x0008, 0x1748: 0x0008, 0x1749: 0x0008, 0x174a: 0x0008, 0x174b: 0x0008,
-	0x174c: 0x0008, 0x174d: 0x0008, 0x174e: 0x0008, 0x174f: 0x0008, 0x1750: 0x0008, 0x1751: 0x0008,
-	0x1752: 0x0008, 0x1753: 0x0008, 0x1754: 0x0008, 0x1755: 0x0008, 0x1756: 0x0008, 0x1757: 0x0008,
-	0x1758: 0x0008, 0x1759: 0x0008, 0x175a: 0x0008, 0x175b: 0x0008, 0x175c: 0x0008, 0x175d: 0x0008,
-	0x175e: 0x0008, 0x175f: 0x0008, 0x1760: 0x0008, 0x1761: 0x0008, 0x1762: 0x0008, 0x1763: 0x0008,
-	0x1764: 0x0040, 0x1765: 0x0040, 0x1766: 0x0040, 0x1767: 0x0040, 0x1768: 0x0040, 0x1769: 0x0040,
-	0x176a: 0x0040, 0x176b: 0x0040, 0x176c: 0x0040, 0x176d: 0x0040, 0x176e: 0x0040, 0x176f: 0x0018,
-	0x1770: 0x8b3d, 0x1771: 0x8b55, 0x1772: 0x8b6d, 0x1773: 0x8b55, 0x1774: 0x8b85, 0x1775: 0x8b55,
-	0x1776: 0x8b6d, 0x1777: 0x8b55, 0x1778: 0x8b3d, 0x1779: 0x8b9d, 0x177a: 0x8bb5, 0x177b: 0x0040,
-	0x177c: 0x8bcd, 0x177d: 0x8b9d, 0x177e: 0x8bb5, 0x177f: 0x8b9d,
-	// Block 0x5e, offset 0x1780
-	0x1780: 0xe13d, 0x1781: 0xe14d, 0x1782: 0xe15d, 0x1783: 0xe14d, 0x1784: 0xe17d, 0x1785: 0xe14d,
-	0x1786: 0xe15d, 0x1787: 0xe14d, 0x1788: 0xe13d, 0x1789: 0xe1cd, 0x178a: 0xe1dd, 0x178b: 0x0040,
-	0x178c: 0xe1fd, 0x178d: 0xe1cd, 0x178e: 0xe1dd, 0x178f: 0xe1cd, 0x1790: 0xe13d, 0x1791: 0xe14d,
-	0x1792: 0xe15d, 0x1793: 0x0040, 0x1794: 0xe17d, 0x1795: 0xe14d, 0x1796: 0x0040, 0x1797: 0x0008,
-	0x1798: 0x0008, 0x1799: 0x0008, 0x179a: 0x0008, 0x179b: 0x0008, 0x179c: 0x0008, 0x179d: 0x0008,
-	0x179e: 0x0008, 0x179f: 0x0008, 0x17a0: 0x0008, 0x17a1: 0x0008, 0x17a2: 0x0040, 0x17a3: 0x0008,
-	0x17a4: 0x0008, 0x17a5: 0x0008, 0x17a6: 0x0008, 0x17a7: 0x0008, 0x17a8: 0x0008, 0x17a9: 0x0008,
-	0x17aa: 0x0008, 0x17ab: 0x0008, 0x17ac: 0x0008, 0x17ad: 0x0008, 0x17ae: 0x0008, 0x17af: 0x0008,
-	0x17b0: 0x0008, 0x17b1: 0x0008, 0x17b2: 0x0040, 0x17b3: 0x0008, 0x17b4: 0x0008, 0x17b5: 0x0008,
-	0x17b6: 0x0008, 0x17b7: 0x0008, 0x17b8: 0x0008, 0x17b9: 0x0008, 0x17ba: 0x0040, 0x17bb: 0x0008,
-	0x17bc: 0x0008, 0x17bd: 0x0040, 0x17be: 0x0040, 0x17bf: 0x0040,
-	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x0008, 0x17c1: 0x2211, 0x17c2: 0x2219, 0x17c3: 0x02e1, 0x17c4: 0x2221, 0x17c5: 0x2229,
-	0x17c6: 0x0040, 0x17c7: 0x2231, 0x17c8: 0x2239, 0x17c9: 0x2241, 0x17ca: 0x2249, 0x17cb: 0x2251,
-	0x17cc: 0x2259, 0x17cd: 0x2261, 0x17ce: 0x2269, 0x17cf: 0x2271, 0x17d0: 0x2279, 0x17d1: 0x2281,
-	0x17d2: 0x2289, 0x17d3: 0x2291, 0x17d4: 0x2299, 0x17d5: 0x0741, 0x17d6: 0x22a1, 0x17d7: 0x22a9,
-	0x17d8: 0x22b1, 0x17d9: 0x22b9, 0x17da: 0x22c1, 0x17db: 0x13d9, 0x17dc: 0x8be5, 0x17dd: 0x22c9,
-	0x17de: 0x22d1, 0x17df: 0x8c05, 0x17e0: 0x22d9, 0x17e1: 0x8c25, 0x17e2: 0x22e1, 0x17e3: 0x22e9,
-	0x17e4: 0x22f1, 0x17e5: 0x0751, 0x17e6: 0x22f9, 0x17e7: 0x8c45, 0x17e8: 0x0949, 0x17e9: 0x2301,
-	0x17ea: 0x2309, 0x17eb: 0x2311, 0x17ec: 0x2319, 0x17ed: 0x2321, 0x17ee: 0x2329, 0x17ef: 0x2331,
-	0x17f0: 0x2339, 0x17f1: 0x0040, 0x17f2: 0x2341, 0x17f3: 0x2349, 0x17f4: 0x2351, 0x17f5: 0x2359,
-	0x17f6: 0x2361, 0x17f7: 0x2369, 0x17f8: 0x2371, 0x17f9: 0x8c65, 0x17fa: 0x8c85, 0x17fb: 0x0040,
-	0x17fc: 0x0040, 0x17fd: 0x0040, 0x17fe: 0x0040, 0x17ff: 0x0040,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x0a08, 0x1801: 0x0a08, 0x1802: 0x0a08, 0x1803: 0x0a08, 0x1804: 0x0a08, 0x1805: 0x0c08,
-	0x1806: 0x0808, 0x1807: 0x0c08, 0x1808: 0x0818, 0x1809: 0x0c08, 0x180a: 0x0c08, 0x180b: 0x0808,
-	0x180c: 0x0808, 0x180d: 0x0908, 0x180e: 0x0c08, 0x180f: 0x0c08, 0x1810: 0x0c08, 0x1811: 0x0c08,
-	0x1812: 0x0c08, 0x1813: 0x0a08, 0x1814: 0x0a08, 0x1815: 0x0a08, 0x1816: 0x0a08, 0x1817: 0x0908,
-	0x1818: 0x0a08, 0x1819: 0x0a08, 0x181a: 0x0a08, 0x181b: 0x0a08, 0x181c: 0x0a08, 0x181d: 0x0c08,
-	0x181e: 0x0a08, 0x181f: 0x0a08, 0x1820: 0x0a08, 0x1821: 0x0c08, 0x1822: 0x0808, 0x1823: 0x0808,
-	0x1824: 0x0c08, 0x1825: 0x3308, 0x1826: 0x3308, 0x1827: 0x0040, 0x1828: 0x0040, 0x1829: 0x0040,
-	0x182a: 0x0040, 0x182b: 0x0a18, 0x182c: 0x0a18, 0x182d: 0x0a18, 0x182e: 0x0a18, 0x182f: 0x0c18,
-	0x1830: 0x0818, 0x1831: 0x0818, 0x1832: 0x0818, 0x1833: 0x0818, 0x1834: 0x0818, 0x1835: 0x0818,
-	0x1836: 0x0818, 0x1837: 0x0040, 0x1838: 0x0040, 0x1839: 0x0040, 0x183a: 0x0040, 0x183b: 0x0040,
-	0x183c: 0x0040, 0x183d: 0x0040, 0x183e: 0x0040, 0x183f: 0x0040,
-	// Block 0x61, offset 0x1840
-	0x1840: 0x0a08, 0x1841: 0x0c08, 0x1842: 0x0a08, 0x1843: 0x0c08, 0x1844: 0x0c08, 0x1845: 0x0c08,
-	0x1846: 0x0a08, 0x1847: 0x0a08, 0x1848: 0x0a08, 0x1849: 0x0c08, 0x184a: 0x0a08, 0x184b: 0x0a08,
-	0x184c: 0x0c08, 0x184d: 0x0a08, 0x184e: 0x0c08, 0x184f: 0x0c08, 0x1850: 0x0a08, 0x1851: 0x0c08,
-	0x1852: 0x0040, 0x1853: 0x0040, 0x1854: 0x0040, 0x1855: 0x0040, 0x1856: 0x0040, 0x1857: 0x0040,
-	0x1858: 0x0040, 0x1859: 0x0818, 0x185a: 0x0818, 0x185b: 0x0818, 0x185c: 0x0818, 0x185d: 0x0040,
-	0x185e: 0x0040, 0x185f: 0x0040, 0x1860: 0x0040, 0x1861: 0x0040, 0x1862: 0x0040, 0x1863: 0x0040,
-	0x1864: 0x0040, 0x1865: 0x0040, 0x1866: 0x0040, 0x1867: 0x0040, 0x1868: 0x0040, 0x1869: 0x0c18,
-	0x186a: 0x0c18, 0x186b: 0x0c18, 0x186c: 0x0c18, 0x186d: 0x0a18, 0x186e: 0x0a18, 0x186f: 0x0818,
-	0x1870: 0x0040, 0x1871: 0x0040, 0x1872: 0x0040, 0x1873: 0x0040, 0x1874: 0x0040, 0x1875: 0x0040,
-	0x1876: 0x0040, 0x1877: 0x0040, 0x1878: 0x0040, 0x1879: 0x0040, 0x187a: 0x0040, 0x187b: 0x0040,
-	0x187c: 0x0040, 0x187d: 0x0040, 0x187e: 0x0040, 0x187f: 0x0040,
-	// Block 0x62, offset 0x1880
-	0x1880: 0x3308, 0x1881: 0x3308, 0x1882: 0x3008, 0x1883: 0x3008, 0x1884: 0x0040, 0x1885: 0x0008,
-	0x1886: 0x0008, 0x1887: 0x0008, 0x1888: 0x0008, 0x1889: 0x0008, 0x188a: 0x0008, 0x188b: 0x0008,
-	0x188c: 0x0008, 0x188d: 0x0040, 0x188e: 0x0040, 0x188f: 0x0008, 0x1890: 0x0008, 0x1891: 0x0040,
-	0x1892: 0x0040, 0x1893: 0x0008, 0x1894: 0x0008, 0x1895: 0x0008, 0x1896: 0x0008, 0x1897: 0x0008,
-	0x1898: 0x0008, 0x1899: 0x0008, 0x189a: 0x0008, 0x189b: 0x0008, 0x189c: 0x0008, 0x189d: 0x0008,
-	0x189e: 0x0008, 0x189f: 0x0008, 0x18a0: 0x0008, 0x18a1: 0x0008, 0x18a2: 0x0008, 0x18a3: 0x0008,
-	0x18a4: 0x0008, 0x18a5: 0x0008, 0x18a6: 0x0008, 0x18a7: 0x0008, 0x18a8: 0x0008, 0x18a9: 0x0040,
-	0x18aa: 0x0008, 0x18ab: 0x0008, 0x18ac: 0x0008, 0x18ad: 0x0008, 0x18ae: 0x0008, 0x18af: 0x0008,
-	0x18b0: 0x0008, 0x18b1: 0x0040, 0x18b2: 0x0008, 0x18b3: 0x0008, 0x18b4: 0x0040, 0x18b5: 0x0008,
-	0x18b6: 0x0008, 0x18b7: 0x0008, 0x18b8: 0x0008, 0x18b9: 0x0008, 0x18ba: 0x0040, 0x18bb: 0x3308,
-	0x18bc: 0x3308, 0x18bd: 0x0008, 0x18be: 0x3008, 0x18bf: 0x3008,
-	// Block 0x63, offset 0x18c0
-	0x18c0: 0x3308, 0x18c1: 0x3008, 0x18c2: 0x3008, 0x18c3: 0x3008, 0x18c4: 0x3008, 0x18c5: 0x0040,
-	0x18c6: 0x0040, 0x18c7: 0x3008, 0x18c8: 0x3008, 0x18c9: 0x0040, 0x18ca: 0x0040, 0x18cb: 0x3008,
-	0x18cc: 0x3008, 0x18cd: 0x3808, 0x18ce: 0x0040, 0x18cf: 0x0040, 0x18d0: 0x0008, 0x18d1: 0x0040,
-	0x18d2: 0x0040, 0x18d3: 0x0040, 0x18d4: 0x0040, 0x18d5: 0x0040, 0x18d6: 0x0040, 0x18d7: 0x3008,
-	0x18d8: 0x0040, 0x18d9: 0x0040, 0x18da: 0x0040, 0x18db: 0x0040, 0x18dc: 0x0040, 0x18dd: 0x0008,
-	0x18de: 0x0008, 0x18df: 0x0008, 0x18e0: 0x0008, 0x18e1: 0x0008, 0x18e2: 0x3008, 0x18e3: 0x3008,
-	0x18e4: 0x0040, 0x18e5: 0x0040, 0x18e6: 0x3308, 0x18e7: 0x3308, 0x18e8: 0x3308, 0x18e9: 0x3308,
-	0x18ea: 0x3308, 0x18eb: 0x3308, 0x18ec: 0x3308, 0x18ed: 0x0040, 0x18ee: 0x0040, 0x18ef: 0x0040,
-	0x18f0: 0x3308, 0x18f1: 0x3308, 0x18f2: 0x3308, 0x18f3: 0x3308, 0x18f4: 0x3308, 0x18f5: 0x0040,
-	0x18f6: 0x0040, 0x18f7: 0x0040, 0x18f8: 0x0040, 0x18f9: 0x0040, 0x18fa: 0x0040, 0x18fb: 0x0040,
-	0x18fc: 0x0040, 0x18fd: 0x0040, 0x18fe: 0x0040, 0x18ff: 0x0040,
-	// Block 0x64, offset 0x1900
-	0x1900: 0x0008, 0x1901: 0x0008, 0x1902: 0x0008, 0x1903: 0x0008, 0x1904: 0x0008, 0x1905: 0x0008,
-	0x1906: 0x0008, 0x1907: 0x0040, 0x1908: 0x0040, 0x1909: 0x0008, 0x190a: 0x0040, 0x190b: 0x0040,
-	0x190c: 0x0008, 0x190d: 0x0008, 0x190e: 0x0008, 0x190f: 0x0008, 0x1910: 0x0008, 0x1911: 0x0008,
-	0x1912: 0x0008, 0x1913: 0x0008, 0x1914: 0x0040, 0x1915: 0x0008, 0x1916: 0x0008, 0x1917: 0x0040,
-	0x1918: 0x0008, 0x1919: 0x0008, 0x191a: 0x0008, 0x191b: 0x0008, 0x191c: 0x0008, 0x191d: 0x0008,
-	0x191e: 0x0008, 0x191f: 0x0008, 0x1920: 0x0008, 0x1921: 0x0008, 0x1922: 0x0008, 0x1923: 0x0008,
-	0x1924: 0x0008, 0x1925: 0x0008, 0x1926: 0x0008, 0x1927: 0x0008, 0x1928: 0x0008, 0x1929: 0x0008,
-	0x192a: 0x0008, 0x192b: 0x0008, 0x192c: 0x0008, 0x192d: 0x0008, 0x192e: 0x0008, 0x192f: 0x0008,
-	0x1930: 0x3008, 0x1931: 0x3008, 0x1932: 0x3008, 0x1933: 0x3008, 0x1934: 0x3008, 0x1935: 0x3008,
-	0x1936: 0x0040, 0x1937: 0x3008, 0x1938: 0x3008, 0x1939: 0x0040, 0x193a: 0x0040, 0x193b: 0x3308,
-	0x193c: 0x3308, 0x193d: 0x3808, 0x193e: 0x3b08, 0x193f: 0x0008,
-	// Block 0x65, offset 0x1940
-	0x1940: 0x0019, 0x1941: 0x02e9, 0x1942: 0x03d9, 0x1943: 0x02f1, 0x1944: 0x02f9, 0x1945: 0x03f1,
-	0x1946: 0x0309, 0x1947: 0x00a9, 0x1948: 0x0311, 0x1949: 0x00b1, 0x194a: 0x0319, 0x194b: 0x0101,
-	0x194c: 0x0321, 0x194d: 0x0329, 0x194e: 0x0051, 0x194f: 0x0339, 0x1950: 0x0751, 0x1951: 0x00b9,
-	0x1952: 0x0089, 0x1953: 0x0341, 0x1954: 0x0349, 0x1955: 0x0391, 0x1956: 0x00c1, 0x1957: 0x0109,
-	0x1958: 0x00c9, 0x1959: 0x04b1, 0x195a: 0x0019, 0x195b: 0x02e9, 0x195c: 0x03d9, 0x195d: 0x02f1,
-	0x195e: 0x02f9, 0x195f: 0x03f1, 0x1960: 0x0309, 0x1961: 0x00a9, 0x1962: 0x0311, 0x1963: 0x00b1,
-	0x1964: 0x0319, 0x1965: 0x0101, 0x1966: 0x0321, 0x1967: 0x0329, 0x1968: 0x0051, 0x1969: 0x0339,
-	0x196a: 0x0751, 0x196b: 0x00b9, 0x196c: 0x0089, 0x196d: 0x0341, 0x196e: 0x0349, 0x196f: 0x0391,
-	0x1970: 0x00c1, 0x1971: 0x0109, 0x1972: 0x00c9, 0x1973: 0x04b1, 0x1974: 0x0019, 0x1975: 0x02e9,
-	0x1976: 0x03d9, 0x1977: 0x02f1, 0x1978: 0x02f9, 0x1979: 0x03f1, 0x197a: 0x0309, 0x197b: 0x00a9,
-	0x197c: 0x0311, 0x197d: 0x00b1, 0x197e: 0x0319, 0x197f: 0x0101,
-	// Block 0x66, offset 0x1980
-	0x1980: 0x0321, 0x1981: 0x0329, 0x1982: 0x0051, 0x1983: 0x0339, 0x1984: 0x0751, 0x1985: 0x00b9,
-	0x1986: 0x0089, 0x1987: 0x0341, 0x1988: 0x0349, 0x1989: 0x0391, 0x198a: 0x00c1, 0x198b: 0x0109,
-	0x198c: 0x00c9, 0x198d: 0x04b1, 0x198e: 0x0019, 0x198f: 0x02e9, 0x1990: 0x03d9, 0x1991: 0x02f1,
-	0x1992: 0x02f9, 0x1993: 0x03f1, 0x1994: 0x0309, 0x1995: 0x0040, 0x1996: 0x0311, 0x1997: 0x00b1,
-	0x1998: 0x0319, 0x1999: 0x0101, 0x199a: 0x0321, 0x199b: 0x0329, 0x199c: 0x0051, 0x199d: 0x0339,
-	0x199e: 0x0751, 0x199f: 0x00b9, 0x19a0: 0x0089, 0x19a1: 0x0341, 0x19a2: 0x0349, 0x19a3: 0x0391,
-	0x19a4: 0x00c1, 0x19a5: 0x0109, 0x19a6: 0x00c9, 0x19a7: 0x04b1, 0x19a8: 0x0019, 0x19a9: 0x02e9,
-	0x19aa: 0x03d9, 0x19ab: 0x02f1, 0x19ac: 0x02f9, 0x19ad: 0x03f1, 0x19ae: 0x0309, 0x19af: 0x00a9,
-	0x19b0: 0x0311, 0x19b1: 0x00b1, 0x19b2: 0x0319, 0x19b3: 0x0101, 0x19b4: 0x0321, 0x19b5: 0x0329,
-	0x19b6: 0x0051, 0x19b7: 0x0339, 0x19b8: 0x0751, 0x19b9: 0x00b9, 0x19ba: 0x0089, 0x19bb: 0x0341,
-	0x19bc: 0x0349, 0x19bd: 0x0391, 0x19be: 0x00c1, 0x19bf: 0x0109,
-	// Block 0x67, offset 0x19c0
-	0x19c0: 0x00c9, 0x19c1: 0x04b1, 0x19c2: 0x0019, 0x19c3: 0x02e9, 0x19c4: 0x03d9, 0x19c5: 0x02f1,
-	0x19c6: 0x02f9, 0x19c7: 0x03f1, 0x19c8: 0x0309, 0x19c9: 0x00a9, 0x19ca: 0x0311, 0x19cb: 0x00b1,
-	0x19cc: 0x0319, 0x19cd: 0x0101, 0x19ce: 0x0321, 0x19cf: 0x0329, 0x19d0: 0x0051, 0x19d1: 0x0339,
-	0x19d2: 0x0751, 0x19d3: 0x00b9, 0x19d4: 0x0089, 0x19d5: 0x0341, 0x19d6: 0x0349, 0x19d7: 0x0391,
-	0x19d8: 0x00c1, 0x19d9: 0x0109, 0x19da: 0x00c9, 0x19db: 0x04b1, 0x19dc: 0x0019, 0x19dd: 0x0040,
-	0x19de: 0x03d9, 0x19df: 0x02f1, 0x19e0: 0x0040, 0x19e1: 0x0040, 0x19e2: 0x0309, 0x19e3: 0x0040,
-	0x19e4: 0x0040, 0x19e5: 0x00b1, 0x19e6: 0x0319, 0x19e7: 0x0040, 0x19e8: 0x0040, 0x19e9: 0x0329,
-	0x19ea: 0x0051, 0x19eb: 0x0339, 0x19ec: 0x0751, 0x19ed: 0x0040, 0x19ee: 0x0089, 0x19ef: 0x0341,
-	0x19f0: 0x0349, 0x19f1: 0x0391, 0x19f2: 0x00c1, 0x19f3: 0x0109, 0x19f4: 0x00c9, 0x19f5: 0x04b1,
-	0x19f6: 0x0019, 0x19f7: 0x02e9, 0x19f8: 0x03d9, 0x19f9: 0x02f1, 0x19fa: 0x0040, 0x19fb: 0x03f1,
-	0x19fc: 0x0040, 0x19fd: 0x00a9, 0x19fe: 0x0311, 0x19ff: 0x00b1,
-	// Block 0x68, offset 0x1a00
-	0x1a00: 0x0319, 0x1a01: 0x0101, 0x1a02: 0x0321, 0x1a03: 0x0329, 0x1a04: 0x0040, 0x1a05: 0x0339,
-	0x1a06: 0x0751, 0x1a07: 0x00b9, 0x1a08: 0x0089, 0x1a09: 0x0341, 0x1a0a: 0x0349, 0x1a0b: 0x0391,
-	0x1a0c: 0x00c1, 0x1a0d: 0x0109, 0x1a0e: 0x00c9, 0x1a0f: 0x04b1, 0x1a10: 0x0019, 0x1a11: 0x02e9,
-	0x1a12: 0x03d9, 0x1a13: 0x02f1, 0x1a14: 0x02f9, 0x1a15: 0x03f1, 0x1a16: 0x0309, 0x1a17: 0x00a9,
-	0x1a18: 0x0311, 0x1a19: 0x00b1, 0x1a1a: 0x0319, 0x1a1b: 0x0101, 0x1a1c: 0x0321, 0x1a1d: 0x0329,
-	0x1a1e: 0x0051, 0x1a1f: 0x0339, 0x1a20: 0x0751, 0x1a21: 0x00b9, 0x1a22: 0x0089, 0x1a23: 0x0341,
-	0x1a24: 0x0349, 0x1a25: 0x0391, 0x1a26: 0x00c1, 0x1a27: 0x0109, 0x1a28: 0x00c9, 0x1a29: 0x04b1,
-	0x1a2a: 0x0019, 0x1a2b: 0x02e9, 0x1a2c: 0x03d9, 0x1a2d: 0x02f1, 0x1a2e: 0x02f9, 0x1a2f: 0x03f1,
-	0x1a30: 0x0309, 0x1a31: 0x00a9, 0x1a32: 0x0311, 0x1a33: 0x00b1, 0x1a34: 0x0319, 0x1a35: 0x0101,
-	0x1a36: 0x0321, 0x1a37: 0x0329, 0x1a38: 0x0051, 0x1a39: 0x0339, 0x1a3a: 0x0751, 0x1a3b: 0x00b9,
-	0x1a3c: 0x0089, 0x1a3d: 0x0341, 0x1a3e: 0x0349, 0x1a3f: 0x0391,
-	// Block 0x69, offset 0x1a40
-	0x1a40: 0x00c1, 0x1a41: 0x0109, 0x1a42: 0x00c9, 0x1a43: 0x04b1, 0x1a44: 0x0019, 0x1a45: 0x02e9,
-	0x1a46: 0x0040, 0x1a47: 0x02f1, 0x1a48: 0x02f9, 0x1a49: 0x03f1, 0x1a4a: 0x0309, 0x1a4b: 0x0040,
-	0x1a4c: 0x0040, 0x1a4d: 0x00b1, 0x1a4e: 0x0319, 0x1a4f: 0x0101, 0x1a50: 0x0321, 0x1a51: 0x0329,
-	0x1a52: 0x0051, 0x1a53: 0x0339, 0x1a54: 0x0751, 0x1a55: 0x0040, 0x1a56: 0x0089, 0x1a57: 0x0341,
-	0x1a58: 0x0349, 0x1a59: 0x0391, 0x1a5a: 0x00c1, 0x1a5b: 0x0109, 0x1a5c: 0x00c9, 0x1a5d: 0x0040,
-	0x1a5e: 0x0019, 0x1a5f: 0x02e9, 0x1a60: 0x03d9, 0x1a61: 0x02f1, 0x1a62: 0x02f9, 0x1a63: 0x03f1,
-	0x1a64: 0x0309, 0x1a65: 0x00a9, 0x1a66: 0x0311, 0x1a67: 0x00b1, 0x1a68: 0x0319, 0x1a69: 0x0101,
-	0x1a6a: 0x0321, 0x1a6b: 0x0329, 0x1a6c: 0x0051, 0x1a6d: 0x0339, 0x1a6e: 0x0751, 0x1a6f: 0x00b9,
-	0x1a70: 0x0089, 0x1a71: 0x0341, 0x1a72: 0x0349, 0x1a73: 0x0391, 0x1a74: 0x00c1, 0x1a75: 0x0109,
-	0x1a76: 0x00c9, 0x1a77: 0x04b1, 0x1a78: 0x0019, 0x1a79: 0x02e9, 0x1a7a: 0x0040, 0x1a7b: 0x02f1,
-	0x1a7c: 0x02f9, 0x1a7d: 0x03f1, 0x1a7e: 0x0309, 0x1a7f: 0x0040,
-	// Block 0x6a, offset 0x1a80
-	0x1a80: 0x0311, 0x1a81: 0x00b1, 0x1a82: 0x0319, 0x1a83: 0x0101, 0x1a84: 0x0321, 0x1a85: 0x0040,
-	0x1a86: 0x0051, 0x1a87: 0x0040, 0x1a88: 0x0040, 0x1a89: 0x0040, 0x1a8a: 0x0089, 0x1a8b: 0x0341,
-	0x1a8c: 0x0349, 0x1a8d: 0x0391, 0x1a8e: 0x00c1, 0x1a8f: 0x0109, 0x1a90: 0x00c9, 0x1a91: 0x0040,
-	0x1a92: 0x0019, 0x1a93: 0x02e9, 0x1a94: 0x03d9, 0x1a95: 0x02f1, 0x1a96: 0x02f9, 0x1a97: 0x03f1,
-	0x1a98: 0x0309, 0x1a99: 0x00a9, 0x1a9a: 0x0311, 0x1a9b: 0x00b1, 0x1a9c: 0x0319, 0x1a9d: 0x0101,
-	0x1a9e: 0x0321, 0x1a9f: 0x0329, 0x1aa0: 0x0051, 0x1aa1: 0x0339, 0x1aa2: 0x0751, 0x1aa3: 0x00b9,
-	0x1aa4: 0x0089, 0x1aa5: 0x0341, 0x1aa6: 0x0349, 0x1aa7: 0x0391, 0x1aa8: 0x00c1, 0x1aa9: 0x0109,
-	0x1aaa: 0x00c9, 0x1aab: 0x04b1, 0x1aac: 0x0019, 0x1aad: 0x02e9, 0x1aae: 0x03d9, 0x1aaf: 0x02f1,
-	0x1ab0: 0x02f9, 0x1ab1: 0x03f1, 0x1ab2: 0x0309, 0x1ab3: 0x00a9, 0x1ab4: 0x0311, 0x1ab5: 0x00b1,
-	0x1ab6: 0x0319, 0x1ab7: 0x0101, 0x1ab8: 0x0321, 0x1ab9: 0x0329, 0x1aba: 0x0051, 0x1abb: 0x0339,
-	0x1abc: 0x0751, 0x1abd: 0x00b9, 0x1abe: 0x0089, 0x1abf: 0x0341,
-	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0x0349, 0x1ac1: 0x0391, 0x1ac2: 0x00c1, 0x1ac3: 0x0109, 0x1ac4: 0x00c9, 0x1ac5: 0x04b1,
-	0x1ac6: 0x0019, 0x1ac7: 0x02e9, 0x1ac8: 0x03d9, 0x1ac9: 0x02f1, 0x1aca: 0x02f9, 0x1acb: 0x03f1,
-	0x1acc: 0x0309, 0x1acd: 0x00a9, 0x1ace: 0x0311, 0x1acf: 0x00b1, 0x1ad0: 0x0319, 0x1ad1: 0x0101,
-	0x1ad2: 0x0321, 0x1ad3: 0x0329, 0x1ad4: 0x0051, 0x1ad5: 0x0339, 0x1ad6: 0x0751, 0x1ad7: 0x00b9,
-	0x1ad8: 0x0089, 0x1ad9: 0x0341, 0x1ada: 0x0349, 0x1adb: 0x0391, 0x1adc: 0x00c1, 0x1add: 0x0109,
-	0x1ade: 0x00c9, 0x1adf: 0x04b1, 0x1ae0: 0x0019, 0x1ae1: 0x02e9, 0x1ae2: 0x03d9, 0x1ae3: 0x02f1,
-	0x1ae4: 0x02f9, 0x1ae5: 0x03f1, 0x1ae6: 0x0309, 0x1ae7: 0x00a9, 0x1ae8: 0x0311, 0x1ae9: 0x00b1,
-	0x1aea: 0x0319, 0x1aeb: 0x0101, 0x1aec: 0x0321, 0x1aed: 0x0329, 0x1aee: 0x0051, 0x1aef: 0x0339,
-	0x1af0: 0x0751, 0x1af1: 0x00b9, 0x1af2: 0x0089, 0x1af3: 0x0341, 0x1af4: 0x0349, 0x1af5: 0x0391,
-	0x1af6: 0x00c1, 0x1af7: 0x0109, 0x1af8: 0x00c9, 0x1af9: 0x04b1, 0x1afa: 0x0019, 0x1afb: 0x02e9,
-	0x1afc: 0x03d9, 0x1afd: 0x02f1, 0x1afe: 0x02f9, 0x1aff: 0x03f1,
-	// Block 0x6c, offset 0x1b00
-	0x1b00: 0x0309, 0x1b01: 0x00a9, 0x1b02: 0x0311, 0x1b03: 0x00b1, 0x1b04: 0x0319, 0x1b05: 0x0101,
-	0x1b06: 0x0321, 0x1b07: 0x0329, 0x1b08: 0x0051, 0x1b09: 0x0339, 0x1b0a: 0x0751, 0x1b0b: 0x00b9,
-	0x1b0c: 0x0089, 0x1b0d: 0x0341, 0x1b0e: 0x0349, 0x1b0f: 0x0391, 0x1b10: 0x00c1, 0x1b11: 0x0109,
-	0x1b12: 0x00c9, 0x1b13: 0x04b1, 0x1b14: 0x0019, 0x1b15: 0x02e9, 0x1b16: 0x03d9, 0x1b17: 0x02f1,
-	0x1b18: 0x02f9, 0x1b19: 0x03f1, 0x1b1a: 0x0309, 0x1b1b: 0x00a9, 0x1b1c: 0x0311, 0x1b1d: 0x00b1,
-	0x1b1e: 0x0319, 0x1b1f: 0x0101, 0x1b20: 0x0321, 0x1b21: 0x0329, 0x1b22: 0x0051, 0x1b23: 0x0339,
-	0x1b24: 0x0751, 0x1b25: 0x00b9, 0x1b26: 0x0089, 0x1b27: 0x0341, 0x1b28: 0x0349, 0x1b29: 0x0391,
-	0x1b2a: 0x00c1, 0x1b2b: 0x0109, 0x1b2c: 0x00c9, 0x1b2d: 0x04b1, 0x1b2e: 0x0019, 0x1b2f: 0x02e9,
-	0x1b30: 0x03d9, 0x1b31: 0x02f1, 0x1b32: 0x02f9, 0x1b33: 0x03f1, 0x1b34: 0x0309, 0x1b35: 0x00a9,
-	0x1b36: 0x0311, 0x1b37: 0x00b1, 0x1b38: 0x0319, 0x1b39: 0x0101, 0x1b3a: 0x0321, 0x1b3b: 0x0329,
-	0x1b3c: 0x0051, 0x1b3d: 0x0339, 0x1b3e: 0x0751, 0x1b3f: 0x00b9,
-	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x0089, 0x1b41: 0x0341, 0x1b42: 0x0349, 0x1b43: 0x0391, 0x1b44: 0x00c1, 0x1b45: 0x0109,
-	0x1b46: 0x00c9, 0x1b47: 0x04b1, 0x1b48: 0x0019, 0x1b49: 0x02e9, 0x1b4a: 0x03d9, 0x1b4b: 0x02f1,
-	0x1b4c: 0x02f9, 0x1b4d: 0x03f1, 0x1b4e: 0x0309, 0x1b4f: 0x00a9, 0x1b50: 0x0311, 0x1b51: 0x00b1,
-	0x1b52: 0x0319, 0x1b53: 0x0101, 0x1b54: 0x0321, 0x1b55: 0x0329, 0x1b56: 0x0051, 0x1b57: 0x0339,
-	0x1b58: 0x0751, 0x1b59: 0x00b9, 0x1b5a: 0x0089, 0x1b5b: 0x0341, 0x1b5c: 0x0349, 0x1b5d: 0x0391,
-	0x1b5e: 0x00c1, 0x1b5f: 0x0109, 0x1b60: 0x00c9, 0x1b61: 0x04b1, 0x1b62: 0x0019, 0x1b63: 0x02e9,
-	0x1b64: 0x03d9, 0x1b65: 0x02f1, 0x1b66: 0x02f9, 0x1b67: 0x03f1, 0x1b68: 0x0309, 0x1b69: 0x00a9,
-	0x1b6a: 0x0311, 0x1b6b: 0x00b1, 0x1b6c: 0x0319, 0x1b6d: 0x0101, 0x1b6e: 0x0321, 0x1b6f: 0x0329,
-	0x1b70: 0x0051, 0x1b71: 0x0339, 0x1b72: 0x0751, 0x1b73: 0x00b9, 0x1b74: 0x0089, 0x1b75: 0x0341,
-	0x1b76: 0x0349, 0x1b77: 0x0391, 0x1b78: 0x00c1, 0x1b79: 0x0109, 0x1b7a: 0x00c9, 0x1b7b: 0x04b1,
-	0x1b7c: 0x0019, 0x1b7d: 0x02e9, 0x1b7e: 0x03d9, 0x1b7f: 0x02f1,
-	// Block 0x6e, offset 0x1b80
-	0x1b80: 0x02f9, 0x1b81: 0x03f1, 0x1b82: 0x0309, 0x1b83: 0x00a9, 0x1b84: 0x0311, 0x1b85: 0x00b1,
-	0x1b86: 0x0319, 0x1b87: 0x0101, 0x1b88: 0x0321, 0x1b89: 0x0329, 0x1b8a: 0x0051, 0x1b8b: 0x0339,
-	0x1b8c: 0x0751, 0x1b8d: 0x00b9, 0x1b8e: 0x0089, 0x1b8f: 0x0341, 0x1b90: 0x0349, 0x1b91: 0x0391,
-	0x1b92: 0x00c1, 0x1b93: 0x0109, 0x1b94: 0x00c9, 0x1b95: 0x04b1, 0x1b96: 0x0019, 0x1b97: 0x02e9,
-	0x1b98: 0x03d9, 0x1b99: 0x02f1, 0x1b9a: 0x02f9, 0x1b9b: 0x03f1, 0x1b9c: 0x0309, 0x1b9d: 0x00a9,
-	0x1b9e: 0x0311, 0x1b9f: 0x00b1, 0x1ba0: 0x0319, 0x1ba1: 0x0101, 0x1ba2: 0x0321, 0x1ba3: 0x0329,
-	0x1ba4: 0x0051, 0x1ba5: 0x0339, 0x1ba6: 0x0751, 0x1ba7: 0x00b9, 0x1ba8: 0x0089, 0x1ba9: 0x0341,
-	0x1baa: 0x0349, 0x1bab: 0x0391, 0x1bac: 0x00c1, 0x1bad: 0x0109, 0x1bae: 0x00c9, 0x1baf: 0x04b1,
-	0x1bb0: 0x0019, 0x1bb1: 0x02e9, 0x1bb2: 0x03d9, 0x1bb3: 0x02f1, 0x1bb4: 0x02f9, 0x1bb5: 0x03f1,
-	0x1bb6: 0x0309, 0x1bb7: 0x00a9, 0x1bb8: 0x0311, 0x1bb9: 0x00b1, 0x1bba: 0x0319, 0x1bbb: 0x0101,
-	0x1bbc: 0x0321, 0x1bbd: 0x0329, 0x1bbe: 0x0051, 0x1bbf: 0x0339,
-	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0x0751, 0x1bc1: 0x00b9, 0x1bc2: 0x0089, 0x1bc3: 0x0341, 0x1bc4: 0x0349, 0x1bc5: 0x0391,
-	0x1bc6: 0x00c1, 0x1bc7: 0x0109, 0x1bc8: 0x00c9, 0x1bc9: 0x04b1, 0x1bca: 0x0019, 0x1bcb: 0x02e9,
-	0x1bcc: 0x03d9, 0x1bcd: 0x02f1, 0x1bce: 0x02f9, 0x1bcf: 0x03f1, 0x1bd0: 0x0309, 0x1bd1: 0x00a9,
-	0x1bd2: 0x0311, 0x1bd3: 0x00b1, 0x1bd4: 0x0319, 0x1bd5: 0x0101, 0x1bd6: 0x0321, 0x1bd7: 0x0329,
-	0x1bd8: 0x0051, 0x1bd9: 0x0339, 0x1bda: 0x0751, 0x1bdb: 0x00b9, 0x1bdc: 0x0089, 0x1bdd: 0x0341,
-	0x1bde: 0x0349, 0x1bdf: 0x0391, 0x1be0: 0x00c1, 0x1be1: 0x0109, 0x1be2: 0x00c9, 0x1be3: 0x04b1,
-	0x1be4: 0x23e1, 0x1be5: 0x23e9, 0x1be6: 0x0040, 0x1be7: 0x0040, 0x1be8: 0x23f1, 0x1be9: 0x0399,
-	0x1bea: 0x03a1, 0x1beb: 0x03a9, 0x1bec: 0x23f9, 0x1bed: 0x2401, 0x1bee: 0x2409, 0x1bef: 0x04d1,
-	0x1bf0: 0x05f9, 0x1bf1: 0x2411, 0x1bf2: 0x2419, 0x1bf3: 0x2421, 0x1bf4: 0x2429, 0x1bf5: 0x2431,
-	0x1bf6: 0x2439, 0x1bf7: 0x0799, 0x1bf8: 0x03c1, 0x1bf9: 0x04d1, 0x1bfa: 0x2441, 0x1bfb: 0x2449,
-	0x1bfc: 0x2451, 0x1bfd: 0x03b1, 0x1bfe: 0x03b9, 0x1bff: 0x2459,
-	// Block 0x70, offset 0x1c00
-	0x1c00: 0x0769, 0x1c01: 0x2461, 0x1c02: 0x23f1, 0x1c03: 0x0399, 0x1c04: 0x03a1, 0x1c05: 0x03a9,
-	0x1c06: 0x23f9, 0x1c07: 0x2401, 0x1c08: 0x2409, 0x1c09: 0x04d1, 0x1c0a: 0x05f9, 0x1c0b: 0x2411,
-	0x1c0c: 0x2419, 0x1c0d: 0x2421, 0x1c0e: 0x2429, 0x1c0f: 0x2431, 0x1c10: 0x2439, 0x1c11: 0x0799,
-	0x1c12: 0x03c1, 0x1c13: 0x2441, 0x1c14: 0x2441, 0x1c15: 0x2449, 0x1c16: 0x2451, 0x1c17: 0x03b1,
-	0x1c18: 0x03b9, 0x1c19: 0x2459, 0x1c1a: 0x0769, 0x1c1b: 0x2469, 0x1c1c: 0x23f9, 0x1c1d: 0x04d1,
-	0x1c1e: 0x2411, 0x1c1f: 0x03b1, 0x1c20: 0x03c1, 0x1c21: 0x0799, 0x1c22: 0x23f1, 0x1c23: 0x0399,
-	0x1c24: 0x03a1, 0x1c25: 0x03a9, 0x1c26: 0x23f9, 0x1c27: 0x2401, 0x1c28: 0x2409, 0x1c29: 0x04d1,
-	0x1c2a: 0x05f9, 0x1c2b: 0x2411, 0x1c2c: 0x2419, 0x1c2d: 0x2421, 0x1c2e: 0x2429, 0x1c2f: 0x2431,
-	0x1c30: 0x2439, 0x1c31: 0x0799, 0x1c32: 0x03c1, 0x1c33: 0x04d1, 0x1c34: 0x2441, 0x1c35: 0x2449,
-	0x1c36: 0x2451, 0x1c37: 0x03b1, 0x1c38: 0x03b9, 0x1c39: 0x2459, 0x1c3a: 0x0769, 0x1c3b: 0x2461,
-	0x1c3c: 0x23f1, 0x1c3d: 0x0399, 0x1c3e: 0x03a1, 0x1c3f: 0x03a9,
-	// Block 0x71, offset 0x1c40
-	0x1c40: 0x23f9, 0x1c41: 0x2401, 0x1c42: 0x2409, 0x1c43: 0x04d1, 0x1c44: 0x05f9, 0x1c45: 0x2411,
-	0x1c46: 0x2419, 0x1c47: 0x2421, 0x1c48: 0x2429, 0x1c49: 0x2431, 0x1c4a: 0x2439, 0x1c4b: 0x0799,
-	0x1c4c: 0x03c1, 0x1c4d: 0x2441, 0x1c4e: 0x2441, 0x1c4f: 0x2449, 0x1c50: 0x2451, 0x1c51: 0x03b1,
-	0x1c52: 0x03b9, 0x1c53: 0x2459, 0x1c54: 0x0769, 0x1c55: 0x2469, 0x1c56: 0x23f9, 0x1c57: 0x04d1,
-	0x1c58: 0x2411, 0x1c59: 0x03b1, 0x1c5a: 0x03c1, 0x1c5b: 0x0799, 0x1c5c: 0x23f1, 0x1c5d: 0x0399,
-	0x1c5e: 0x03a1, 0x1c5f: 0x03a9, 0x1c60: 0x23f9, 0x1c61: 0x2401, 0x1c62: 0x2409, 0x1c63: 0x04d1,
-	0x1c64: 0x05f9, 0x1c65: 0x2411, 0x1c66: 0x2419, 0x1c67: 0x2421, 0x1c68: 0x2429, 0x1c69: 0x2431,
-	0x1c6a: 0x2439, 0x1c6b: 0x0799, 0x1c6c: 0x03c1, 0x1c6d: 0x04d1, 0x1c6e: 0x2441, 0x1c6f: 0x2449,
-	0x1c70: 0x2451, 0x1c71: 0x03b1, 0x1c72: 0x03b9, 0x1c73: 0x2459, 0x1c74: 0x0769, 0x1c75: 0x2461,
-	0x1c76: 0x23f1, 0x1c77: 0x0399, 0x1c78: 0x03a1, 0x1c79: 0x03a9, 0x1c7a: 0x23f9, 0x1c7b: 0x2401,
-	0x1c7c: 0x2409, 0x1c7d: 0x04d1, 0x1c7e: 0x05f9, 0x1c7f: 0x2411,
-	// Block 0x72, offset 0x1c80
-	0x1c80: 0x2419, 0x1c81: 0x2421, 0x1c82: 0x2429, 0x1c83: 0x2431, 0x1c84: 0x2439, 0x1c85: 0x0799,
-	0x1c86: 0x03c1, 0x1c87: 0x2441, 0x1c88: 0x2441, 0x1c89: 0x2449, 0x1c8a: 0x2451, 0x1c8b: 0x03b1,
-	0x1c8c: 0x03b9, 0x1c8d: 0x2459, 0x1c8e: 0x0769, 0x1c8f: 0x2469, 0x1c90: 0x23f9, 0x1c91: 0x04d1,
-	0x1c92: 0x2411, 0x1c93: 0x03b1, 0x1c94: 0x03c1, 0x1c95: 0x0799, 0x1c96: 0x23f1, 0x1c97: 0x0399,
-	0x1c98: 0x03a1, 0x1c99: 0x03a9, 0x1c9a: 0x23f9, 0x1c9b: 0x2401, 0x1c9c: 0x2409, 0x1c9d: 0x04d1,
-	0x1c9e: 0x05f9, 0x1c9f: 0x2411, 0x1ca0: 0x2419, 0x1ca1: 0x2421, 0x1ca2: 0x2429, 0x1ca3: 0x2431,
-	0x1ca4: 0x2439, 0x1ca5: 0x0799, 0x1ca6: 0x03c1, 0x1ca7: 0x04d1, 0x1ca8: 0x2441, 0x1ca9: 0x2449,
-	0x1caa: 0x2451, 0x1cab: 0x03b1, 0x1cac: 0x03b9, 0x1cad: 0x2459, 0x1cae: 0x0769, 0x1caf: 0x2461,
-	0x1cb0: 0x23f1, 0x1cb1: 0x0399, 0x1cb2: 0x03a1, 0x1cb3: 0x03a9, 0x1cb4: 0x23f9, 0x1cb5: 0x2401,
-	0x1cb6: 0x2409, 0x1cb7: 0x04d1, 0x1cb8: 0x05f9, 0x1cb9: 0x2411, 0x1cba: 0x2419, 0x1cbb: 0x2421,
-	0x1cbc: 0x2429, 0x1cbd: 0x2431, 0x1cbe: 0x2439, 0x1cbf: 0x0799,
-	// Block 0x73, offset 0x1cc0
-	0x1cc0: 0x03c1, 0x1cc1: 0x2441, 0x1cc2: 0x2441, 0x1cc3: 0x2449, 0x1cc4: 0x2451, 0x1cc5: 0x03b1,
-	0x1cc6: 0x03b9, 0x1cc7: 0x2459, 0x1cc8: 0x0769, 0x1cc9: 0x2469, 0x1cca: 0x23f9, 0x1ccb: 0x04d1,
-	0x1ccc: 0x2411, 0x1ccd: 0x03b1, 0x1cce: 0x03c1, 0x1ccf: 0x0799, 0x1cd0: 0x23f1, 0x1cd1: 0x0399,
-	0x1cd2: 0x03a1, 0x1cd3: 0x03a9, 0x1cd4: 0x23f9, 0x1cd5: 0x2401, 0x1cd6: 0x2409, 0x1cd7: 0x04d1,
-	0x1cd8: 0x05f9, 0x1cd9: 0x2411, 0x1cda: 0x2419, 0x1cdb: 0x2421, 0x1cdc: 0x2429, 0x1cdd: 0x2431,
-	0x1cde: 0x2439, 0x1cdf: 0x0799, 0x1ce0: 0x03c1, 0x1ce1: 0x04d1, 0x1ce2: 0x2441, 0x1ce3: 0x2449,
-	0x1ce4: 0x2451, 0x1ce5: 0x03b1, 0x1ce6: 0x03b9, 0x1ce7: 0x2459, 0x1ce8: 0x0769, 0x1ce9: 0x2461,
-	0x1cea: 0x23f1, 0x1ceb: 0x0399, 0x1cec: 0x03a1, 0x1ced: 0x03a9, 0x1cee: 0x23f9, 0x1cef: 0x2401,
-	0x1cf0: 0x2409, 0x1cf1: 0x04d1, 0x1cf2: 0x05f9, 0x1cf3: 0x2411, 0x1cf4: 0x2419, 0x1cf5: 0x2421,
-	0x1cf6: 0x2429, 0x1cf7: 0x2431, 0x1cf8: 0x2439, 0x1cf9: 0x0799, 0x1cfa: 0x03c1, 0x1cfb: 0x2441,
-	0x1cfc: 0x2441, 0x1cfd: 0x2449, 0x1cfe: 0x2451, 0x1cff: 0x03b1,
-	// Block 0x74, offset 0x1d00
-	0x1d00: 0x03b9, 0x1d01: 0x2459, 0x1d02: 0x0769, 0x1d03: 0x2469, 0x1d04: 0x23f9, 0x1d05: 0x04d1,
-	0x1d06: 0x2411, 0x1d07: 0x03b1, 0x1d08: 0x03c1, 0x1d09: 0x0799, 0x1d0a: 0x2471, 0x1d0b: 0x2471,
-	0x1d0c: 0x0040, 0x1d0d: 0x0040, 0x1d0e: 0x06e1, 0x1d0f: 0x0049, 0x1d10: 0x0029, 0x1d11: 0x0031,
-	0x1d12: 0x06e9, 0x1d13: 0x06f1, 0x1d14: 0x06f9, 0x1d15: 0x0701, 0x1d16: 0x0709, 0x1d17: 0x0711,
-	0x1d18: 0x06e1, 0x1d19: 0x0049, 0x1d1a: 0x0029, 0x1d1b: 0x0031, 0x1d1c: 0x06e9, 0x1d1d: 0x06f1,
-	0x1d1e: 0x06f9, 0x1d1f: 0x0701, 0x1d20: 0x0709, 0x1d21: 0x0711, 0x1d22: 0x06e1, 0x1d23: 0x0049,
-	0x1d24: 0x0029, 0x1d25: 0x0031, 0x1d26: 0x06e9, 0x1d27: 0x06f1, 0x1d28: 0x06f9, 0x1d29: 0x0701,
-	0x1d2a: 0x0709, 0x1d2b: 0x0711, 0x1d2c: 0x06e1, 0x1d2d: 0x0049, 0x1d2e: 0x0029, 0x1d2f: 0x0031,
-	0x1d30: 0x06e9, 0x1d31: 0x06f1, 0x1d32: 0x06f9, 0x1d33: 0x0701, 0x1d34: 0x0709, 0x1d35: 0x0711,
-	0x1d36: 0x06e1, 0x1d37: 0x0049, 0x1d38: 0x0029, 0x1d39: 0x0031, 0x1d3a: 0x06e9, 0x1d3b: 0x06f1,
-	0x1d3c: 0x06f9, 0x1d3d: 0x0701, 0x1d3e: 0x0709, 0x1d3f: 0x0711,
-	// Block 0x75, offset 0x1d40
-	0x1d40: 0x3308, 0x1d41: 0x3308, 0x1d42: 0x3308, 0x1d43: 0x3308, 0x1d44: 0x3308, 0x1d45: 0x3308,
-	0x1d46: 0x3308, 0x1d47: 0x0040, 0x1d48: 0x3308, 0x1d49: 0x3308, 0x1d4a: 0x3308, 0x1d4b: 0x3308,
-	0x1d4c: 0x3308, 0x1d4d: 0x3308, 0x1d4e: 0x3308, 0x1d4f: 0x3308, 0x1d50: 0x3308, 0x1d51: 0x3308,
-	0x1d52: 0x3308, 0x1d53: 0x3308, 0x1d54: 0x3308, 0x1d55: 0x3308, 0x1d56: 0x3308, 0x1d57: 0x3308,
-	0x1d58: 0x3308, 0x1d59: 0x0040, 0x1d5a: 0x0040, 0x1d5b: 0x3308, 0x1d5c: 0x3308, 0x1d5d: 0x3308,
-	0x1d5e: 0x3308, 0x1d5f: 0x3308, 0x1d60: 0x3308, 0x1d61: 0x3308, 0x1d62: 0x0040, 0x1d63: 0x3308,
-	0x1d64: 0x3308, 0x1d65: 0x0040, 0x1d66: 0x3308, 0x1d67: 0x3308, 0x1d68: 0x3308, 0x1d69: 0x3308,
-	0x1d6a: 0x3308, 0x1d6b: 0x0040, 0x1d6c: 0x0040, 0x1d6d: 0x0040, 0x1d6e: 0x0040, 0x1d6f: 0x0040,
-	0x1d70: 0x2479, 0x1d71: 0x2481, 0x1d72: 0x02a9, 0x1d73: 0x2489, 0x1d74: 0x02b1, 0x1d75: 0x2491,
-	0x1d76: 0x2499, 0x1d77: 0x24a1, 0x1d78: 0x24a9, 0x1d79: 0x24b1, 0x1d7a: 0x24b9, 0x1d7b: 0x24c1,
-	0x1d7c: 0x02b9, 0x1d7d: 0x24c9, 0x1d7e: 0x24d1, 0x1d7f: 0x02c1,
-	// Block 0x76, offset 0x1d80
-	0x1d80: 0x02c9, 0x1d81: 0x24d9, 0x1d82: 0x24e1, 0x1d83: 0x24e9, 0x1d84: 0x24f1, 0x1d85: 0x24f9,
-	0x1d86: 0x2501, 0x1d87: 0x2509, 0x1d88: 0x2511, 0x1d89: 0x2519, 0x1d8a: 0x2521, 0x1d8b: 0x2529,
-	0x1d8c: 0x2531, 0x1d8d: 0x2539, 0x1d8e: 0x2541, 0x1d8f: 0x2549, 0x1d90: 0x2551, 0x1d91: 0x2479,
-	0x1d92: 0x2481, 0x1d93: 0x02a9, 0x1d94: 0x2489, 0x1d95: 0x02b1, 0x1d96: 0x2491, 0x1d97: 0x2499,
-	0x1d98: 0x24a1, 0x1d99: 0x24a9, 0x1d9a: 0x24b1, 0x1d9b: 0x24b9, 0x1d9c: 0x02b9, 0x1d9d: 0x24c9,
-	0x1d9e: 0x02c1, 0x1d9f: 0x24d9, 0x1da0: 0x24e1, 0x1da1: 0x24e9, 0x1da2: 0x24f1, 0x1da3: 0x24f9,
-	0x1da4: 0x2501, 0x1da5: 0x02d1, 0x1da6: 0x2509, 0x1da7: 0x2559, 0x1da8: 0x2531, 0x1da9: 0x2561,
-	0x1daa: 0x2569, 0x1dab: 0x2571, 0x1dac: 0x2579, 0x1dad: 0x2581, 0x1dae: 0x0040, 0x1daf: 0x0040,
-	0x1db0: 0x0040, 0x1db1: 0x0040, 0x1db2: 0x0040, 0x1db3: 0x0040, 0x1db4: 0x0040, 0x1db5: 0x0040,
-	0x1db6: 0x0040, 0x1db7: 0x0040, 0x1db8: 0x0040, 0x1db9: 0x0040, 0x1dba: 0x0040, 0x1dbb: 0x0040,
-	0x1dbc: 0x0040, 0x1dbd: 0x0040, 0x1dbe: 0x0040, 0x1dbf: 0x0040,
-	// Block 0x77, offset 0x1dc0
-	0x1dc0: 0xe115, 0x1dc1: 0xe115, 0x1dc2: 0xe135, 0x1dc3: 0xe135, 0x1dc4: 0xe115, 0x1dc5: 0xe115,
-	0x1dc6: 0xe175, 0x1dc7: 0xe175, 0x1dc8: 0xe115, 0x1dc9: 0xe115, 0x1dca: 0xe135, 0x1dcb: 0xe135,
-	0x1dcc: 0xe115, 0x1dcd: 0xe115, 0x1dce: 0xe1f5, 0x1dcf: 0xe1f5, 0x1dd0: 0xe115, 0x1dd1: 0xe115,
-	0x1dd2: 0xe135, 0x1dd3: 0xe135, 0x1dd4: 0xe115, 0x1dd5: 0xe115, 0x1dd6: 0xe175, 0x1dd7: 0xe175,
-	0x1dd8: 0xe115, 0x1dd9: 0xe115, 0x1dda: 0xe135, 0x1ddb: 0xe135, 0x1ddc: 0xe115, 0x1ddd: 0xe115,
-	0x1dde: 0x8ca5, 0x1ddf: 0x8ca5, 0x1de0: 0x04b5, 0x1de1: 0x04b5, 0x1de2: 0x0a08, 0x1de3: 0x0a08,
-	0x1de4: 0x0a08, 0x1de5: 0x0a08, 0x1de6: 0x0a08, 0x1de7: 0x0a08, 0x1de8: 0x0a08, 0x1de9: 0x0a08,
-	0x1dea: 0x0a08, 0x1deb: 0x0a08, 0x1dec: 0x0a08, 0x1ded: 0x0a08, 0x1dee: 0x0a08, 0x1def: 0x0a08,
-	0x1df0: 0x0a08, 0x1df1: 0x0a08, 0x1df2: 0x0a08, 0x1df3: 0x0a08, 0x1df4: 0x0a08, 0x1df5: 0x0a08,
-	0x1df6: 0x0a08, 0x1df7: 0x0a08, 0x1df8: 0x0a08, 0x1df9: 0x0a08, 0x1dfa: 0x0a08, 0x1dfb: 0x0a08,
-	0x1dfc: 0x0a08, 0x1dfd: 0x0a08, 0x1dfe: 0x0a08, 0x1dff: 0x0a08,
-	// Block 0x78, offset 0x1e00
-	0x1e00: 0x20b1, 0x1e01: 0x20b9, 0x1e02: 0x20d9, 0x1e03: 0x20f1, 0x1e04: 0x0040, 0x1e05: 0x2189,
-	0x1e06: 0x2109, 0x1e07: 0x20e1, 0x1e08: 0x2131, 0x1e09: 0x2191, 0x1e0a: 0x2161, 0x1e0b: 0x2169,
-	0x1e0c: 0x2171, 0x1e0d: 0x2179, 0x1e0e: 0x2111, 0x1e0f: 0x2141, 0x1e10: 0x2151, 0x1e11: 0x2121,
-	0x1e12: 0x2159, 0x1e13: 0x2101, 0x1e14: 0x2119, 0x1e15: 0x20c9, 0x1e16: 0x20d1, 0x1e17: 0x20e9,
-	0x1e18: 0x20f9, 0x1e19: 0x2129, 0x1e1a: 0x2139, 0x1e1b: 0x2149, 0x1e1c: 0x2589, 0x1e1d: 0x1689,
-	0x1e1e: 0x2591, 0x1e1f: 0x2599, 0x1e20: 0x0040, 0x1e21: 0x20b9, 0x1e22: 0x20d9, 0x1e23: 0x0040,
-	0x1e24: 0x2181, 0x1e25: 0x0040, 0x1e26: 0x0040, 0x1e27: 0x20e1, 0x1e28: 0x0040, 0x1e29: 0x2191,
-	0x1e2a: 0x2161, 0x1e2b: 0x2169, 0x1e2c: 0x2171, 0x1e2d: 0x2179, 0x1e2e: 0x2111, 0x1e2f: 0x2141,
-	0x1e30: 0x2151, 0x1e31: 0x2121, 0x1e32: 0x2159, 0x1e33: 0x0040, 0x1e34: 0x2119, 0x1e35: 0x20c9,
-	0x1e36: 0x20d1, 0x1e37: 0x20e9, 0x1e38: 0x0040, 0x1e39: 0x2129, 0x1e3a: 0x0040, 0x1e3b: 0x2149,
-	0x1e3c: 0x0040, 0x1e3d: 0x0040, 0x1e3e: 0x0040, 0x1e3f: 0x0040,
-	// Block 0x79, offset 0x1e40
-	0x1e40: 0x0040, 0x1e41: 0x0040, 0x1e42: 0x20d9, 0x1e43: 0x0040, 0x1e44: 0x0040, 0x1e45: 0x0040,
-	0x1e46: 0x0040, 0x1e47: 0x20e1, 0x1e48: 0x0040, 0x1e49: 0x2191, 0x1e4a: 0x0040, 0x1e4b: 0x2169,
-	0x1e4c: 0x0040, 0x1e4d: 0x2179, 0x1e4e: 0x2111, 0x1e4f: 0x2141, 0x1e50: 0x0040, 0x1e51: 0x2121,
-	0x1e52: 0x2159, 0x1e53: 0x0040, 0x1e54: 0x2119, 0x1e55: 0x0040, 0x1e56: 0x0040, 0x1e57: 0x20e9,
-	0x1e58: 0x0040, 0x1e59: 0x2129, 0x1e5a: 0x0040, 0x1e5b: 0x2149, 0x1e5c: 0x0040, 0x1e5d: 0x1689,
-	0x1e5e: 0x0040, 0x1e5f: 0x2599, 0x1e60: 0x0040, 0x1e61: 0x20b9, 0x1e62: 0x20d9, 0x1e63: 0x0040,
-	0x1e64: 0x2181, 0x1e65: 0x0040, 0x1e66: 0x0040, 0x1e67: 0x20e1, 0x1e68: 0x2131, 0x1e69: 0x2191,
-	0x1e6a: 0x2161, 0x1e6b: 0x0040, 0x1e6c: 0x2171, 0x1e6d: 0x2179, 0x1e6e: 0x2111, 0x1e6f: 0x2141,
-	0x1e70: 0x2151, 0x1e71: 0x2121, 0x1e72: 0x2159, 0x1e73: 0x0040, 0x1e74: 0x2119, 0x1e75: 0x20c9,
-	0x1e76: 0x20d1, 0x1e77: 0x20e9, 0x1e78: 0x0040, 0x1e79: 0x2129, 0x1e7a: 0x2139, 0x1e7b: 0x2149,
-	0x1e7c: 0x2589, 0x1e7d: 0x0040, 0x1e7e: 0x2591, 0x1e7f: 0x0040,
-	// Block 0x7a, offset 0x1e80
-	0x1e80: 0x20b1, 0x1e81: 0x20b9, 0x1e82: 0x20d9, 0x1e83: 0x20f1, 0x1e84: 0x2181, 0x1e85: 0x2189,
-	0x1e86: 0x2109, 0x1e87: 0x20e1, 0x1e88: 0x2131, 0x1e89: 0x2191, 0x1e8a: 0x0040, 0x1e8b: 0x2169,
-	0x1e8c: 0x2171, 0x1e8d: 0x2179, 0x1e8e: 0x2111, 0x1e8f: 0x2141, 0x1e90: 0x2151, 0x1e91: 0x2121,
-	0x1e92: 0x2159, 0x1e93: 0x2101, 0x1e94: 0x2119, 0x1e95: 0x20c9, 0x1e96: 0x20d1, 0x1e97: 0x20e9,
-	0x1e98: 0x20f9, 0x1e99: 0x2129, 0x1e9a: 0x2139, 0x1e9b: 0x2149, 0x1e9c: 0x0040, 0x1e9d: 0x0040,
-	0x1e9e: 0x0040, 0x1e9f: 0x0040, 0x1ea0: 0x0040, 0x1ea1: 0x20b9, 0x1ea2: 0x20d9, 0x1ea3: 0x20f1,
-	0x1ea4: 0x0040, 0x1ea5: 0x2189, 0x1ea6: 0x2109, 0x1ea7: 0x20e1, 0x1ea8: 0x2131, 0x1ea9: 0x2191,
-	0x1eaa: 0x0040, 0x1eab: 0x2169, 0x1eac: 0x2171, 0x1ead: 0x2179, 0x1eae: 0x2111, 0x1eaf: 0x2141,
-	0x1eb0: 0x2151, 0x1eb1: 0x2121, 0x1eb2: 0x2159, 0x1eb3: 0x2101, 0x1eb4: 0x2119, 0x1eb5: 0x20c9,
-	0x1eb6: 0x20d1, 0x1eb7: 0x20e9, 0x1eb8: 0x20f9, 0x1eb9: 0x2129, 0x1eba: 0x2139, 0x1ebb: 0x2149,
-	0x1ebc: 0x0040, 0x1ebd: 0x0040, 0x1ebe: 0x0040, 0x1ebf: 0x0040,
-	// Block 0x7b, offset 0x1ec0
-	0x1ec0: 0x0040, 0x1ec1: 0x25a2, 0x1ec2: 0x25aa, 0x1ec3: 0x25b2, 0x1ec4: 0x25ba, 0x1ec5: 0x25c2,
-	0x1ec6: 0x25ca, 0x1ec7: 0x25d2, 0x1ec8: 0x25da, 0x1ec9: 0x25e2, 0x1eca: 0x25ea, 0x1ecb: 0x0018,
-	0x1ecc: 0x0018, 0x1ecd: 0x0018, 0x1ece: 0x0018, 0x1ecf: 0x0018, 0x1ed0: 0x25f2, 0x1ed1: 0x25fa,
-	0x1ed2: 0x2602, 0x1ed3: 0x260a, 0x1ed4: 0x2612, 0x1ed5: 0x261a, 0x1ed6: 0x2622, 0x1ed7: 0x262a,
-	0x1ed8: 0x2632, 0x1ed9: 0x263a, 0x1eda: 0x2642, 0x1edb: 0x264a, 0x1edc: 0x2652, 0x1edd: 0x265a,
-	0x1ede: 0x2662, 0x1edf: 0x266a, 0x1ee0: 0x2672, 0x1ee1: 0x267a, 0x1ee2: 0x2682, 0x1ee3: 0x268a,
-	0x1ee4: 0x2692, 0x1ee5: 0x269a, 0x1ee6: 0x26a2, 0x1ee7: 0x26aa, 0x1ee8: 0x26b2, 0x1ee9: 0x26ba,
-	0x1eea: 0x26c1, 0x1eeb: 0x03d9, 0x1eec: 0x00b9, 0x1eed: 0x1239, 0x1eee: 0x26c9, 0x1eef: 0x0018,
-	0x1ef0: 0x0019, 0x1ef1: 0x02e9, 0x1ef2: 0x03d9, 0x1ef3: 0x02f1, 0x1ef4: 0x02f9, 0x1ef5: 0x03f1,
-	0x1ef6: 0x0309, 0x1ef7: 0x00a9, 0x1ef8: 0x0311, 0x1ef9: 0x00b1, 0x1efa: 0x0319, 0x1efb: 0x0101,
-	0x1efc: 0x0321, 0x1efd: 0x0329, 0x1efe: 0x0051, 0x1eff: 0x0339,
-	// Block 0x7c, offset 0x1f00
-	0x1f00: 0x0751, 0x1f01: 0x00b9, 0x1f02: 0x0089, 0x1f03: 0x0341, 0x1f04: 0x0349, 0x1f05: 0x0391,
-	0x1f06: 0x00c1, 0x1f07: 0x0109, 0x1f08: 0x00c9, 0x1f09: 0x04b1, 0x1f0a: 0x26d1, 0x1f0b: 0x11f9,
-	0x1f0c: 0x26d9, 0x1f0d: 0x04d9, 0x1f0e: 0x26e1, 0x1f0f: 0x26e9, 0x1f10: 0x0018, 0x1f11: 0x0018,
-	0x1f12: 0x0018, 0x1f13: 0x0018, 0x1f14: 0x0018, 0x1f15: 0x0018, 0x1f16: 0x0018, 0x1f17: 0x0018,
-	0x1f18: 0x0018, 0x1f19: 0x0018, 0x1f1a: 0x0018, 0x1f1b: 0x0018, 0x1f1c: 0x0018, 0x1f1d: 0x0018,
-	0x1f1e: 0x0018, 0x1f1f: 0x0018, 0x1f20: 0x0018, 0x1f21: 0x0018, 0x1f22: 0x0018, 0x1f23: 0x0018,
-	0x1f24: 0x0018, 0x1f25: 0x0018, 0x1f26: 0x0018, 0x1f27: 0x0018, 0x1f28: 0x0018, 0x1f29: 0x0018,
-	0x1f2a: 0x26f1, 0x1f2b: 0x26f9, 0x1f2c: 0x2701, 0x1f2d: 0x0018, 0x1f2e: 0x0018, 0x1f2f: 0x0018,
-	0x1f30: 0x0018, 0x1f31: 0x0018, 0x1f32: 0x0018, 0x1f33: 0x0018, 0x1f34: 0x0018, 0x1f35: 0x0018,
-	0x1f36: 0x0018, 0x1f37: 0x0018, 0x1f38: 0x0018, 0x1f39: 0x0018, 0x1f3a: 0x0018, 0x1f3b: 0x0018,
-	0x1f3c: 0x0018, 0x1f3d: 0x0018, 0x1f3e: 0x0018, 0x1f3f: 0x0018,
-	// Block 0x7d, offset 0x1f40
-	0x1f40: 0x2711, 0x1f41: 0x2719, 0x1f42: 0x2721, 0x1f43: 0x0040, 0x1f44: 0x0040, 0x1f45: 0x0040,
-	0x1f46: 0x0040, 0x1f47: 0x0040, 0x1f48: 0x0040, 0x1f49: 0x0040, 0x1f4a: 0x0040, 0x1f4b: 0x0040,
-	0x1f4c: 0x0040, 0x1f4d: 0x0040, 0x1f4e: 0x0040, 0x1f4f: 0x0040, 0x1f50: 0x2729, 0x1f51: 0x2731,
-	0x1f52: 0x2739, 0x1f53: 0x2741, 0x1f54: 0x2749, 0x1f55: 0x2751, 0x1f56: 0x2759, 0x1f57: 0x2761,
-	0x1f58: 0x2769, 0x1f59: 0x2771, 0x1f5a: 0x2779, 0x1f5b: 0x2781, 0x1f5c: 0x2789, 0x1f5d: 0x2791,
-	0x1f5e: 0x2799, 0x1f5f: 0x27a1, 0x1f60: 0x27a9, 0x1f61: 0x27b1, 0x1f62: 0x27b9, 0x1f63: 0x27c1,
-	0x1f64: 0x27c9, 0x1f65: 0x27d1, 0x1f66: 0x27d9, 0x1f67: 0x27e1, 0x1f68: 0x27e9, 0x1f69: 0x27f1,
-	0x1f6a: 0x27f9, 0x1f6b: 0x2801, 0x1f6c: 0x2809, 0x1f6d: 0x2811, 0x1f6e: 0x2819, 0x1f6f: 0x2821,
-	0x1f70: 0x2829, 0x1f71: 0x2831, 0x1f72: 0x2839, 0x1f73: 0x2841, 0x1f74: 0x2849, 0x1f75: 0x2851,
-	0x1f76: 0x2859, 0x1f77: 0x2861, 0x1f78: 0x2869, 0x1f79: 0x2871, 0x1f7a: 0x2879, 0x1f7b: 0x2881,
-	0x1f7c: 0x0040, 0x1f7d: 0x0040, 0x1f7e: 0x0040, 0x1f7f: 0x0040,
-	// Block 0x7e, offset 0x1f80
-	0x1f80: 0x28e1, 0x1f81: 0x28e9, 0x1f82: 0x28f1, 0x1f83: 0x8cbd, 0x1f84: 0x28f9, 0x1f85: 0x2901,
-	0x1f86: 0x2909, 0x1f87: 0x2911, 0x1f88: 0x2919, 0x1f89: 0x2921, 0x1f8a: 0x2929, 0x1f8b: 0x2931,
-	0x1f8c: 0x2939, 0x1f8d: 0x8cdd, 0x1f8e: 0x2941, 0x1f8f: 0x2949, 0x1f90: 0x2951, 0x1f91: 0x2959,
-	0x1f92: 0x8cfd, 0x1f93: 0x2961, 0x1f94: 0x2969, 0x1f95: 0x2799, 0x1f96: 0x8d1d, 0x1f97: 0x2971,
-	0x1f98: 0x2979, 0x1f99: 0x2981, 0x1f9a: 0x2989, 0x1f9b: 0x2991, 0x1f9c: 0x8d3d, 0x1f9d: 0x2999,
-	0x1f9e: 0x29a1, 0x1f9f: 0x29a9, 0x1fa0: 0x29b1, 0x1fa1: 0x29b9, 0x1fa2: 0x2871, 0x1fa3: 0x29c1,
-	0x1fa4: 0x29c9, 0x1fa5: 0x29d1, 0x1fa6: 0x29d9, 0x1fa7: 0x29e1, 0x1fa8: 0x29e9, 0x1fa9: 0x29f1,
-	0x1faa: 0x29f9, 0x1fab: 0x2a01, 0x1fac: 0x2a09, 0x1fad: 0x2a11, 0x1fae: 0x2a19, 0x1faf: 0x2a21,
-	0x1fb0: 0x2a29, 0x1fb1: 0x2a31, 0x1fb2: 0x2a31, 0x1fb3: 0x2a31, 0x1fb4: 0x8d5d, 0x1fb5: 0x2a39,
-	0x1fb6: 0x2a41, 0x1fb7: 0x2a49, 0x1fb8: 0x8d7d, 0x1fb9: 0x2a51, 0x1fba: 0x2a59, 0x1fbb: 0x2a61,
-	0x1fbc: 0x2a69, 0x1fbd: 0x2a71, 0x1fbe: 0x2a79, 0x1fbf: 0x2a81,
-	// Block 0x7f, offset 0x1fc0
-	0x1fc0: 0x2a89, 0x1fc1: 0x2a91, 0x1fc2: 0x2a99, 0x1fc3: 0x2aa1, 0x1fc4: 0x2aa9, 0x1fc5: 0x2ab1,
-	0x1fc6: 0x2ab1, 0x1fc7: 0x2ab9, 0x1fc8: 0x2ac1, 0x1fc9: 0x2ac9, 0x1fca: 0x2ad1, 0x1fcb: 0x2ad9,
-	0x1fcc: 0x2ae1, 0x1fcd: 0x2ae9, 0x1fce: 0x2af1, 0x1fcf: 0x2af9, 0x1fd0: 0x2b01, 0x1fd1: 0x2b09,
-	0x1fd2: 0x2b11, 0x1fd3: 0x2b19, 0x1fd4: 0x2b21, 0x1fd5: 0x2b29, 0x1fd6: 0x2b31, 0x1fd7: 0x2b39,
-	0x1fd8: 0x2b41, 0x1fd9: 0x8d9d, 0x1fda: 0x2b49, 0x1fdb: 0x2b51, 0x1fdc: 0x2b59, 0x1fdd: 0x2751,
-	0x1fde: 0x2b61, 0x1fdf: 0x2b69, 0x1fe0: 0x8dbd, 0x1fe1: 0x8ddd, 0x1fe2: 0x2b71, 0x1fe3: 0x2b79,
-	0x1fe4: 0x2b81, 0x1fe5: 0x2b89, 0x1fe6: 0x2b91, 0x1fe7: 0x2b99, 0x1fe8: 0x2040, 0x1fe9: 0x2ba1,
-	0x1fea: 0x2ba9, 0x1feb: 0x2ba9, 0x1fec: 0x8dfd, 0x1fed: 0x2bb1, 0x1fee: 0x2bb9, 0x1fef: 0x2bc1,
-	0x1ff0: 0x2bc9, 0x1ff1: 0x8e1d, 0x1ff2: 0x2bd1, 0x1ff3: 0x2bd9, 0x1ff4: 0x2040, 0x1ff5: 0x2be1,
-	0x1ff6: 0x2be9, 0x1ff7: 0x2bf1, 0x1ff8: 0x2bf9, 0x1ff9: 0x2c01, 0x1ffa: 0x2c09, 0x1ffb: 0x8e3d,
-	0x1ffc: 0x2c11, 0x1ffd: 0x8e5d, 0x1ffe: 0x2c19, 0x1fff: 0x2c21,
-	// Block 0x80, offset 0x2000
-	0x2000: 0x2c29, 0x2001: 0x2c31, 0x2002: 0x2c39, 0x2003: 0x2c41, 0x2004: 0x2c49, 0x2005: 0x2c51,
-	0x2006: 0x2c59, 0x2007: 0x2c61, 0x2008: 0x2c69, 0x2009: 0x8e7d, 0x200a: 0x2c71, 0x200b: 0x2c79,
-	0x200c: 0x2c81, 0x200d: 0x2c89, 0x200e: 0x2c91, 0x200f: 0x8e9d, 0x2010: 0x2c99, 0x2011: 0x8ebd,
-	0x2012: 0x8edd, 0x2013: 0x2ca1, 0x2014: 0x2ca9, 0x2015: 0x2ca9, 0x2016: 0x2cb1, 0x2017: 0x8efd,
-	0x2018: 0x8f1d, 0x2019: 0x2cb9, 0x201a: 0x2cc1, 0x201b: 0x2cc9, 0x201c: 0x2cd1, 0x201d: 0x2cd9,
-	0x201e: 0x2ce1, 0x201f: 0x2ce9, 0x2020: 0x2cf1, 0x2021: 0x2cf9, 0x2022: 0x2d01, 0x2023: 0x2d09,
-	0x2024: 0x8f3d, 0x2025: 0x2d11, 0x2026: 0x2d19, 0x2027: 0x2d21, 0x2028: 0x2d29, 0x2029: 0x2d21,
-	0x202a: 0x2d31, 0x202b: 0x2d39, 0x202c: 0x2d41, 0x202d: 0x2d49, 0x202e: 0x2d51, 0x202f: 0x2d59,
-	0x2030: 0x2d61, 0x2031: 0x2d69, 0x2032: 0x2d71, 0x2033: 0x2d79, 0x2034: 0x2d81, 0x2035: 0x2d89,
-	0x2036: 0x2d91, 0x2037: 0x2d99, 0x2038: 0x8f5d, 0x2039: 0x2da1, 0x203a: 0x2da9, 0x203b: 0x2db1,
-	0x203c: 0x2db9, 0x203d: 0x2dc1, 0x203e: 0x8f7d, 0x203f: 0x2dc9,
-	// Block 0x81, offset 0x2040
-	0x2040: 0x2dd1, 0x2041: 0x2dd9, 0x2042: 0x2de1, 0x2043: 0x2de9, 0x2044: 0x2df1, 0x2045: 0x2df9,
-	0x2046: 0x2e01, 0x2047: 0x2e09, 0x2048: 0x2e11, 0x2049: 0x2e19, 0x204a: 0x8f9d, 0x204b: 0x2e21,
-	0x204c: 0x2e29, 0x204d: 0x2e31, 0x204e: 0x2e39, 0x204f: 0x2e41, 0x2050: 0x2e49, 0x2051: 0x2e51,
-	0x2052: 0x2e59, 0x2053: 0x2e61, 0x2054: 0x2e69, 0x2055: 0x2e71, 0x2056: 0x2e79, 0x2057: 0x2e81,
-	0x2058: 0x2e89, 0x2059: 0x2e91, 0x205a: 0x2e99, 0x205b: 0x2ea1, 0x205c: 0x2ea9, 0x205d: 0x8fbd,
-	0x205e: 0x2eb1, 0x205f: 0x2eb9, 0x2060: 0x2ec1, 0x2061: 0x2ec9, 0x2062: 0x2ed1, 0x2063: 0x8fdd,
-	0x2064: 0x2ed9, 0x2065: 0x2ee1, 0x2066: 0x2ee9, 0x2067: 0x2ef1, 0x2068: 0x2ef9, 0x2069: 0x2f01,
-	0x206a: 0x2f09, 0x206b: 0x2f11, 0x206c: 0x7f0d, 0x206d: 0x2f19, 0x206e: 0x2f21, 0x206f: 0x2f29,
-	0x2070: 0x8ffd, 0x2071: 0x2f31, 0x2072: 0x2f39, 0x2073: 0x2f41, 0x2074: 0x2f49, 0x2075: 0x2f51,
-	0x2076: 0x2f59, 0x2077: 0x901d, 0x2078: 0x903d, 0x2079: 0x905d, 0x207a: 0x2f61, 0x207b: 0x907d,
-	0x207c: 0x2f69, 0x207d: 0x2f71, 0x207e: 0x2f79, 0x207f: 0x2f81,
-	// Block 0x82, offset 0x2080
-	0x2080: 0x2f89, 0x2081: 0x2f91, 0x2082: 0x2f99, 0x2083: 0x2fa1, 0x2084: 0x2fa9, 0x2085: 0x2fb1,
-	0x2086: 0x909d, 0x2087: 0x2fb9, 0x2088: 0x2fc1, 0x2089: 0x2fc9, 0x208a: 0x2fd1, 0x208b: 0x2fd9,
-	0x208c: 0x2fe1, 0x208d: 0x90bd, 0x208e: 0x2fe9, 0x208f: 0x2ff1, 0x2090: 0x90dd, 0x2091: 0x90fd,
-	0x2092: 0x2ff9, 0x2093: 0x3001, 0x2094: 0x3009, 0x2095: 0x3011, 0x2096: 0x3019, 0x2097: 0x3021,
-	0x2098: 0x3029, 0x2099: 0x3031, 0x209a: 0x3039, 0x209b: 0x911d, 0x209c: 0x3041, 0x209d: 0x913d,
-	0x209e: 0x3049, 0x209f: 0x2040, 0x20a0: 0x3051, 0x20a1: 0x3059, 0x20a2: 0x3061, 0x20a3: 0x915d,
-	0x20a4: 0x3069, 0x20a5: 0x3071, 0x20a6: 0x917d, 0x20a7: 0x919d, 0x20a8: 0x3079, 0x20a9: 0x3081,
-	0x20aa: 0x3089, 0x20ab: 0x3091, 0x20ac: 0x3099, 0x20ad: 0x3099, 0x20ae: 0x30a1, 0x20af: 0x30a9,
-	0x20b0: 0x30b1, 0x20b1: 0x30b9, 0x20b2: 0x30c1, 0x20b3: 0x30c9, 0x20b4: 0x30d1, 0x20b5: 0x91bd,
-	0x20b6: 0x30d9, 0x20b7: 0x91dd, 0x20b8: 0x30e1, 0x20b9: 0x91fd, 0x20ba: 0x30e9, 0x20bb: 0x921d,
-	0x20bc: 0x923d, 0x20bd: 0x925d, 0x20be: 0x30f1, 0x20bf: 0x30f9,
-	// Block 0x83, offset 0x20c0
-	0x20c0: 0x3101, 0x20c1: 0x927d, 0x20c2: 0x929d, 0x20c3: 0x92bd, 0x20c4: 0x92dd, 0x20c5: 0x3109,
-	0x20c6: 0x3111, 0x20c7: 0x3111, 0x20c8: 0x3119, 0x20c9: 0x3121, 0x20ca: 0x3129, 0x20cb: 0x3131,
-	0x20cc: 0x3139, 0x20cd: 0x92fd, 0x20ce: 0x3141, 0x20cf: 0x3149, 0x20d0: 0x3151, 0x20d1: 0x3159,
-	0x20d2: 0x931d, 0x20d3: 0x3161, 0x20d4: 0x933d, 0x20d5: 0x935d, 0x20d6: 0x3169, 0x20d7: 0x3171,
-	0x20d8: 0x3179, 0x20d9: 0x3181, 0x20da: 0x3189, 0x20db: 0x3191, 0x20dc: 0x937d, 0x20dd: 0x939d,
-	0x20de: 0x93bd, 0x20df: 0x2040, 0x20e0: 0x3199, 0x20e1: 0x93dd, 0x20e2: 0x31a1, 0x20e3: 0x31a9,
-	0x20e4: 0x31b1, 0x20e5: 0x93fd, 0x20e6: 0x31b9, 0x20e7: 0x31c1, 0x20e8: 0x31c9, 0x20e9: 0x31d1,
-	0x20ea: 0x31d9, 0x20eb: 0x941d, 0x20ec: 0x31e1, 0x20ed: 0x31e9, 0x20ee: 0x31f1, 0x20ef: 0x31f9,
-	0x20f0: 0x3201, 0x20f1: 0x3209, 0x20f2: 0x943d, 0x20f3: 0x945d, 0x20f4: 0x3211, 0x20f5: 0x947d,
-	0x20f6: 0x3219, 0x20f7: 0x949d, 0x20f8: 0x3221, 0x20f9: 0x3229, 0x20fa: 0x3231, 0x20fb: 0x94bd,
-	0x20fc: 0x94dd, 0x20fd: 0x3239, 0x20fe: 0x94fd, 0x20ff: 0x3241,
-	// Block 0x84, offset 0x2100
-	0x2100: 0x951d, 0x2101: 0x3249, 0x2102: 0x3251, 0x2103: 0x3259, 0x2104: 0x3261, 0x2105: 0x3269,
-	0x2106: 0x3271, 0x2107: 0x953d, 0x2108: 0x955d, 0x2109: 0x957d, 0x210a: 0x959d, 0x210b: 0x2ca1,
-	0x210c: 0x3279, 0x210d: 0x3281, 0x210e: 0x3289, 0x210f: 0x3291, 0x2110: 0x3299, 0x2111: 0x32a1,
-	0x2112: 0x32a9, 0x2113: 0x32b1, 0x2114: 0x32b9, 0x2115: 0x32c1, 0x2116: 0x32c9, 0x2117: 0x95bd,
-	0x2118: 0x32d1, 0x2119: 0x32d9, 0x211a: 0x32e1, 0x211b: 0x32e9, 0x211c: 0x32f1, 0x211d: 0x32f9,
-	0x211e: 0x3301, 0x211f: 0x3309, 0x2120: 0x3311, 0x2121: 0x3319, 0x2122: 0x3321, 0x2123: 0x3329,
-	0x2124: 0x95dd, 0x2125: 0x95fd, 0x2126: 0x961d, 0x2127: 0x3331, 0x2128: 0x3339, 0x2129: 0x3341,
-	0x212a: 0x3349, 0x212b: 0x963d, 0x212c: 0x3351, 0x212d: 0x965d, 0x212e: 0x3359, 0x212f: 0x3361,
-	0x2130: 0x967d, 0x2131: 0x969d, 0x2132: 0x3369, 0x2133: 0x3371, 0x2134: 0x3379, 0x2135: 0x3381,
-	0x2136: 0x3389, 0x2137: 0x3391, 0x2138: 0x3399, 0x2139: 0x33a1, 0x213a: 0x33a9, 0x213b: 0x33b1,
-	0x213c: 0x33b9, 0x213d: 0x33c1, 0x213e: 0x33c9, 0x213f: 0x2040,
-	// Block 0x85, offset 0x2140
-	0x2140: 0x33d1, 0x2141: 0x33d9, 0x2142: 0x33e1, 0x2143: 0x33e9, 0x2144: 0x33f1, 0x2145: 0x96bd,
-	0x2146: 0x33f9, 0x2147: 0x3401, 0x2148: 0x3409, 0x2149: 0x3411, 0x214a: 0x3419, 0x214b: 0x96dd,
-	0x214c: 0x96fd, 0x214d: 0x3421, 0x214e: 0x3429, 0x214f: 0x3431, 0x2150: 0x3439, 0x2151: 0x3441,
-	0x2152: 0x3449, 0x2153: 0x971d, 0x2154: 0x3451, 0x2155: 0x3459, 0x2156: 0x3461, 0x2157: 0x3469,
-	0x2158: 0x973d, 0x2159: 0x975d, 0x215a: 0x3471, 0x215b: 0x3479, 0x215c: 0x3481, 0x215d: 0x977d,
-	0x215e: 0x3489, 0x215f: 0x3491, 0x2160: 0x684d, 0x2161: 0x979d, 0x2162: 0x3499, 0x2163: 0x34a1,
-	0x2164: 0x34a9, 0x2165: 0x97bd, 0x2166: 0x34b1, 0x2167: 0x34b9, 0x2168: 0x34c1, 0x2169: 0x34c9,
-	0x216a: 0x34d1, 0x216b: 0x34d9, 0x216c: 0x34e1, 0x216d: 0x97dd, 0x216e: 0x34e9, 0x216f: 0x34f1,
-	0x2170: 0x34f9, 0x2171: 0x97fd, 0x2172: 0x3501, 0x2173: 0x3509, 0x2174: 0x3511, 0x2175: 0x3519,
-	0x2176: 0x7b6d, 0x2177: 0x981d, 0x2178: 0x3521, 0x2179: 0x3529, 0x217a: 0x3531, 0x217b: 0x983d,
-	0x217c: 0x3539, 0x217d: 0x985d, 0x217e: 0x3541, 0x217f: 0x3541,
-	// Block 0x86, offset 0x2180
-	0x2180: 0x3549, 0x2181: 0x987d, 0x2182: 0x3551, 0x2183: 0x3559, 0x2184: 0x3561, 0x2185: 0x3569,
-	0x2186: 0x3571, 0x2187: 0x3579, 0x2188: 0x3581, 0x2189: 0x989d, 0x218a: 0x3589, 0x218b: 0x3591,
-	0x218c: 0x3599, 0x218d: 0x35a1, 0x218e: 0x35a9, 0x218f: 0x35b1, 0x2190: 0x98bd, 0x2191: 0x35b9,
-	0x2192: 0x98dd, 0x2193: 0x98fd, 0x2194: 0x991d, 0x2195: 0x35c1, 0x2196: 0x35c9, 0x2197: 0x35d1,
-	0x2198: 0x35d9, 0x2199: 0x35e1, 0x219a: 0x35e9, 0x219b: 0x35f1, 0x219c: 0x35f9, 0x219d: 0x993d,
-	0x219e: 0x0040, 0x219f: 0x0040, 0x21a0: 0x0040, 0x21a1: 0x0040, 0x21a2: 0x0040, 0x21a3: 0x0040,
-	0x21a4: 0x0040, 0x21a5: 0x0040, 0x21a6: 0x0040, 0x21a7: 0x0040, 0x21a8: 0x0040, 0x21a9: 0x0040,
-	0x21aa: 0x0040, 0x21ab: 0x0040, 0x21ac: 0x0040, 0x21ad: 0x0040, 0x21ae: 0x0040, 0x21af: 0x0040,
-	0x21b0: 0x0040, 0x21b1: 0x0040, 0x21b2: 0x0040, 0x21b3: 0x0040, 0x21b4: 0x0040, 0x21b5: 0x0040,
-	0x21b6: 0x0040, 0x21b7: 0x0040, 0x21b8: 0x0040, 0x21b9: 0x0040, 0x21ba: 0x0040, 0x21bb: 0x0040,
-	0x21bc: 0x0040, 0x21bd: 0x0040, 0x21be: 0x0040, 0x21bf: 0x0040,
-}
-
-// idnaIndex: 39 blocks, 2496 entries, 4992 bytes
-// Block 0 is the zero block.
-var idnaIndex = [2496]uint16{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x85, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x04, 0xc7: 0x05,
-	0xc8: 0x06, 0xc9: 0x86, 0xca: 0x87, 0xcb: 0x07, 0xcc: 0x88, 0xcd: 0x08, 0xce: 0x09, 0xcf: 0x0a,
-	0xd0: 0x89, 0xd1: 0x0b, 0xd2: 0x0c, 0xd3: 0x0d, 0xd4: 0x0e, 0xd5: 0x8a, 0xd6: 0x8b, 0xd7: 0x8c,
-	0xd8: 0x0f, 0xd9: 0x10, 0xda: 0x8d, 0xdb: 0x11, 0xdc: 0x12, 0xdd: 0x8e, 0xde: 0x8f, 0xdf: 0x90,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06, 0xe5: 0x07, 0xe6: 0x07, 0xe7: 0x07,
-	0xe8: 0x07, 0xe9: 0x07, 0xea: 0x08, 0xeb: 0x07, 0xec: 0x07, 0xed: 0x09, 0xee: 0x0a, 0xef: 0x0b,
-	0xf0: 0x20, 0xf1: 0x21, 0xf2: 0x21, 0xf3: 0x23, 0xf4: 0x24,
-	// Block 0x4, offset 0x100
-	0x120: 0x91, 0x121: 0x13, 0x122: 0x14, 0x123: 0x92, 0x124: 0x93, 0x125: 0x15, 0x126: 0x16, 0x127: 0x17,
-	0x128: 0x18, 0x129: 0x19, 0x12a: 0x1a, 0x12b: 0x1b, 0x12c: 0x1c, 0x12d: 0x1d, 0x12e: 0x1e, 0x12f: 0x94,
-	0x130: 0x95, 0x131: 0x1f, 0x132: 0x20, 0x133: 0x21, 0x134: 0x96, 0x135: 0x22, 0x136: 0x97, 0x137: 0x98,
-	0x138: 0x99, 0x139: 0x9a, 0x13a: 0x23, 0x13b: 0x9b, 0x13c: 0x9c, 0x13d: 0x24, 0x13e: 0x25, 0x13f: 0x9d,
-	// Block 0x5, offset 0x140
-	0x140: 0x9e, 0x141: 0x9f, 0x142: 0xa0, 0x143: 0xa1, 0x144: 0xa2, 0x145: 0xa3, 0x146: 0xa4, 0x147: 0xa5,
-	0x148: 0xa6, 0x149: 0xa7, 0x14a: 0xa8, 0x14b: 0xa9, 0x14c: 0xaa, 0x14d: 0xab, 0x14e: 0xac, 0x14f: 0xad,
-	0x150: 0xae, 0x151: 0xa6, 0x152: 0xa6, 0x153: 0xa6, 0x154: 0xa6, 0x155: 0xa6, 0x156: 0xa6, 0x157: 0xa6,
-	0x158: 0xa6, 0x159: 0xaf, 0x15a: 0xb0, 0x15b: 0xb1, 0x15c: 0xb2, 0x15d: 0xb3, 0x15e: 0xb4, 0x15f: 0xb5,
-	0x160: 0xb6, 0x161: 0xb7, 0x162: 0xb8, 0x163: 0xb9, 0x164: 0xba, 0x165: 0xbb, 0x166: 0xbc, 0x167: 0xbd,
-	0x168: 0xbe, 0x169: 0xbf, 0x16a: 0xc0, 0x16b: 0xc1, 0x16c: 0xc2, 0x16d: 0xc3, 0x16e: 0xc4, 0x16f: 0xc5,
-	0x170: 0xc6, 0x171: 0xc7, 0x172: 0xc8, 0x173: 0xc9, 0x174: 0x26, 0x175: 0x27, 0x176: 0x28, 0x177: 0x88,
-	0x178: 0x29, 0x179: 0x29, 0x17a: 0x2a, 0x17b: 0x29, 0x17c: 0xca, 0x17d: 0x2b, 0x17e: 0x2c, 0x17f: 0x2d,
-	// Block 0x6, offset 0x180
-	0x180: 0x2e, 0x181: 0x2f, 0x182: 0x30, 0x183: 0xcb, 0x184: 0x31, 0x185: 0x32, 0x186: 0xcc, 0x187: 0xa2,
-	0x188: 0xcd, 0x189: 0xce, 0x18a: 0xa2, 0x18b: 0xa2, 0x18c: 0xcf, 0x18d: 0xa2, 0x18e: 0xa2, 0x18f: 0xa2,
-	0x190: 0xd0, 0x191: 0x33, 0x192: 0x34, 0x193: 0x35, 0x194: 0xa2, 0x195: 0xa2, 0x196: 0xa2, 0x197: 0xa2,
-	0x198: 0xa2, 0x199: 0xa2, 0x19a: 0xa2, 0x19b: 0xa2, 0x19c: 0xa2, 0x19d: 0xa2, 0x19e: 0xa2, 0x19f: 0xa2,
-	0x1a0: 0xa2, 0x1a1: 0xa2, 0x1a2: 0xa2, 0x1a3: 0xa2, 0x1a4: 0xa2, 0x1a5: 0xa2, 0x1a6: 0xa2, 0x1a7: 0xa2,
-	0x1a8: 0xd1, 0x1a9: 0xd2, 0x1aa: 0xa2, 0x1ab: 0xd3, 0x1ac: 0xa2, 0x1ad: 0xd4, 0x1ae: 0xd5, 0x1af: 0xa2,
-	0x1b0: 0xd6, 0x1b1: 0x36, 0x1b2: 0x29, 0x1b3: 0x37, 0x1b4: 0xd7, 0x1b5: 0xd8, 0x1b6: 0xd9, 0x1b7: 0xda,
-	0x1b8: 0xdb, 0x1b9: 0xdc, 0x1ba: 0xdd, 0x1bb: 0xde, 0x1bc: 0xdf, 0x1bd: 0xe0, 0x1be: 0xe1, 0x1bf: 0x38,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x39, 0x1c1: 0xe2, 0x1c2: 0xe3, 0x1c3: 0xe4, 0x1c4: 0xe5, 0x1c5: 0x3a, 0x1c6: 0x3b, 0x1c7: 0xe6,
-	0x1c8: 0xe7, 0x1c9: 0x3c, 0x1ca: 0x3d, 0x1cb: 0x3e, 0x1cc: 0xe8, 0x1cd: 0xe9, 0x1ce: 0x3f, 0x1cf: 0x40,
-	0x1d0: 0xa6, 0x1d1: 0xa6, 0x1d2: 0xa6, 0x1d3: 0xa6, 0x1d4: 0xa6, 0x1d5: 0xa6, 0x1d6: 0xa6, 0x1d7: 0xa6,
-	0x1d8: 0xa6, 0x1d9: 0xa6, 0x1da: 0xa6, 0x1db: 0xa6, 0x1dc: 0xa6, 0x1dd: 0xa6, 0x1de: 0xa6, 0x1df: 0xa6,
-	0x1e0: 0xa6, 0x1e1: 0xa6, 0x1e2: 0xa6, 0x1e3: 0xa6, 0x1e4: 0xa6, 0x1e5: 0xa6, 0x1e6: 0xa6, 0x1e7: 0xa6,
-	0x1e8: 0xa6, 0x1e9: 0xa6, 0x1ea: 0xa6, 0x1eb: 0xa6, 0x1ec: 0xa6, 0x1ed: 0xa6, 0x1ee: 0xa6, 0x1ef: 0xa6,
-	0x1f0: 0xa6, 0x1f1: 0xa6, 0x1f2: 0xa6, 0x1f3: 0xa6, 0x1f4: 0xa6, 0x1f5: 0xa6, 0x1f6: 0xa6, 0x1f7: 0xa6,
-	0x1f8: 0xa6, 0x1f9: 0xa6, 0x1fa: 0xa6, 0x1fb: 0xa6, 0x1fc: 0xa6, 0x1fd: 0xa6, 0x1fe: 0xa6, 0x1ff: 0xa6,
-	// Block 0x8, offset 0x200
-	0x200: 0xa6, 0x201: 0xa6, 0x202: 0xa6, 0x203: 0xa6, 0x204: 0xa6, 0x205: 0xa6, 0x206: 0xa6, 0x207: 0xa6,
-	0x208: 0xa6, 0x209: 0xa6, 0x20a: 0xa6, 0x20b: 0xa6, 0x20c: 0xa6, 0x20d: 0xa6, 0x20e: 0xa6, 0x20f: 0xa6,
-	0x210: 0xa6, 0x211: 0xa6, 0x212: 0xa6, 0x213: 0xa6, 0x214: 0xa6, 0x215: 0xa6, 0x216: 0xa6, 0x217: 0xa6,
-	0x218: 0xa6, 0x219: 0xa6, 0x21a: 0xa6, 0x21b: 0xa6, 0x21c: 0xa6, 0x21d: 0xa6, 0x21e: 0xa6, 0x21f: 0xa6,
-	0x220: 0xa6, 0x221: 0xa6, 0x222: 0xa6, 0x223: 0xa6, 0x224: 0xa6, 0x225: 0xa6, 0x226: 0xa6, 0x227: 0xa6,
-	0x228: 0xa6, 0x229: 0xa6, 0x22a: 0xa6, 0x22b: 0xa6, 0x22c: 0xa6, 0x22d: 0xa6, 0x22e: 0xa6, 0x22f: 0xa6,
-	0x230: 0xa6, 0x231: 0xa6, 0x232: 0xa6, 0x233: 0xa6, 0x234: 0xa6, 0x235: 0xa6, 0x236: 0xa6, 0x237: 0xa2,
-	0x238: 0xa6, 0x239: 0xa6, 0x23a: 0xa6, 0x23b: 0xa6, 0x23c: 0xa6, 0x23d: 0xa6, 0x23e: 0xa6, 0x23f: 0xa6,
-	// Block 0x9, offset 0x240
-	0x240: 0xa6, 0x241: 0xa6, 0x242: 0xa6, 0x243: 0xa6, 0x244: 0xa6, 0x245: 0xa6, 0x246: 0xa6, 0x247: 0xa6,
-	0x248: 0xa6, 0x249: 0xa6, 0x24a: 0xa6, 0x24b: 0xa6, 0x24c: 0xa6, 0x24d: 0xa6, 0x24e: 0xa6, 0x24f: 0xa6,
-	0x250: 0xa6, 0x251: 0xa6, 0x252: 0xa6, 0x253: 0xa6, 0x254: 0xa6, 0x255: 0xa6, 0x256: 0xa6, 0x257: 0xa6,
-	0x258: 0xa6, 0x259: 0xa6, 0x25a: 0xa6, 0x25b: 0xa6, 0x25c: 0xa6, 0x25d: 0xa6, 0x25e: 0xa6, 0x25f: 0xa6,
-	0x260: 0xa6, 0x261: 0xa6, 0x262: 0xa6, 0x263: 0xa6, 0x264: 0xa6, 0x265: 0xa6, 0x266: 0xa6, 0x267: 0xa6,
-	0x268: 0xa6, 0x269: 0xa6, 0x26a: 0xa6, 0x26b: 0xa6, 0x26c: 0xa6, 0x26d: 0xa6, 0x26e: 0xa6, 0x26f: 0xa6,
-	0x270: 0xa6, 0x271: 0xa6, 0x272: 0xa6, 0x273: 0xa6, 0x274: 0xa6, 0x275: 0xa6, 0x276: 0xa6, 0x277: 0xa6,
-	0x278: 0xa6, 0x279: 0xa6, 0x27a: 0xa6, 0x27b: 0xa6, 0x27c: 0xa6, 0x27d: 0xa6, 0x27e: 0xa6, 0x27f: 0xa6,
-	// Block 0xa, offset 0x280
-	0x280: 0xa6, 0x281: 0xa6, 0x282: 0xa6, 0x283: 0xa6, 0x284: 0xa6, 0x285: 0xa6, 0x286: 0xa6, 0x287: 0xa6,
-	0x288: 0xa6, 0x289: 0xa6, 0x28a: 0xa6, 0x28b: 0xa6, 0x28c: 0xa6, 0x28d: 0xa6, 0x28e: 0xa6, 0x28f: 0xa6,
-	0x290: 0xa6, 0x291: 0xa6, 0x292: 0xea, 0x293: 0xeb, 0x294: 0xa6, 0x295: 0xa6, 0x296: 0xa6, 0x297: 0xa6,
-	0x298: 0xec, 0x299: 0x41, 0x29a: 0x42, 0x29b: 0xed, 0x29c: 0x43, 0x29d: 0x44, 0x29e: 0x45, 0x29f: 0x46,
-	0x2a0: 0xee, 0x2a1: 0xef, 0x2a2: 0xf0, 0x2a3: 0xf1, 0x2a4: 0xf2, 0x2a5: 0xf3, 0x2a6: 0xf4, 0x2a7: 0xf5,
-	0x2a8: 0xf6, 0x2a9: 0xf7, 0x2aa: 0xf8, 0x2ab: 0xf9, 0x2ac: 0xfa, 0x2ad: 0xfb, 0x2ae: 0xfc, 0x2af: 0xfd,
-	0x2b0: 0xa6, 0x2b1: 0xa6, 0x2b2: 0xa6, 0x2b3: 0xa6, 0x2b4: 0xa6, 0x2b5: 0xa6, 0x2b6: 0xa6, 0x2b7: 0xa6,
-	0x2b8: 0xa6, 0x2b9: 0xa6, 0x2ba: 0xa6, 0x2bb: 0xa6, 0x2bc: 0xa6, 0x2bd: 0xa6, 0x2be: 0xa6, 0x2bf: 0xa6,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0xa6, 0x2c1: 0xa6, 0x2c2: 0xa6, 0x2c3: 0xa6, 0x2c4: 0xa6, 0x2c5: 0xa6, 0x2c6: 0xa6, 0x2c7: 0xa6,
-	0x2c8: 0xa6, 0x2c9: 0xa6, 0x2ca: 0xa6, 0x2cb: 0xa6, 0x2cc: 0xa6, 0x2cd: 0xa6, 0x2ce: 0xa6, 0x2cf: 0xa6,
-	0x2d0: 0xa6, 0x2d1: 0xa6, 0x2d2: 0xa6, 0x2d3: 0xa6, 0x2d4: 0xa6, 0x2d5: 0xa6, 0x2d6: 0xa6, 0x2d7: 0xa6,
-	0x2d8: 0xa6, 0x2d9: 0xa6, 0x2da: 0xa6, 0x2db: 0xa6, 0x2dc: 0xa6, 0x2dd: 0xa6, 0x2de: 0xfe, 0x2df: 0xff,
-	// Block 0xc, offset 0x300
-	0x300: 0x100, 0x301: 0x100, 0x302: 0x100, 0x303: 0x100, 0x304: 0x100, 0x305: 0x100, 0x306: 0x100, 0x307: 0x100,
-	0x308: 0x100, 0x309: 0x100, 0x30a: 0x100, 0x30b: 0x100, 0x30c: 0x100, 0x30d: 0x100, 0x30e: 0x100, 0x30f: 0x100,
-	0x310: 0x100, 0x311: 0x100, 0x312: 0x100, 0x313: 0x100, 0x314: 0x100, 0x315: 0x100, 0x316: 0x100, 0x317: 0x100,
-	0x318: 0x100, 0x319: 0x100, 0x31a: 0x100, 0x31b: 0x100, 0x31c: 0x100, 0x31d: 0x100, 0x31e: 0x100, 0x31f: 0x100,
-	0x320: 0x100, 0x321: 0x100, 0x322: 0x100, 0x323: 0x100, 0x324: 0x100, 0x325: 0x100, 0x326: 0x100, 0x327: 0x100,
-	0x328: 0x100, 0x329: 0x100, 0x32a: 0x100, 0x32b: 0x100, 0x32c: 0x100, 0x32d: 0x100, 0x32e: 0x100, 0x32f: 0x100,
-	0x330: 0x100, 0x331: 0x100, 0x332: 0x100, 0x333: 0x100, 0x334: 0x100, 0x335: 0x100, 0x336: 0x100, 0x337: 0x100,
-	0x338: 0x100, 0x339: 0x100, 0x33a: 0x100, 0x33b: 0x100, 0x33c: 0x100, 0x33d: 0x100, 0x33e: 0x100, 0x33f: 0x100,
-	// Block 0xd, offset 0x340
-	0x340: 0x100, 0x341: 0x100, 0x342: 0x100, 0x343: 0x100, 0x344: 0x100, 0x345: 0x100, 0x346: 0x100, 0x347: 0x100,
-	0x348: 0x100, 0x349: 0x100, 0x34a: 0x100, 0x34b: 0x100, 0x34c: 0x100, 0x34d: 0x100, 0x34e: 0x100, 0x34f: 0x100,
-	0x350: 0x100, 0x351: 0x100, 0x352: 0x100, 0x353: 0x100, 0x354: 0x100, 0x355: 0x100, 0x356: 0x100, 0x357: 0x100,
-	0x358: 0x100, 0x359: 0x100, 0x35a: 0x100, 0x35b: 0x100, 0x35c: 0x100, 0x35d: 0x100, 0x35e: 0x100, 0x35f: 0x100,
-	0x360: 0x100, 0x361: 0x100, 0x362: 0x100, 0x363: 0x100, 0x364: 0x101, 0x365: 0x102, 0x366: 0x103, 0x367: 0x104,
-	0x368: 0x47, 0x369: 0x105, 0x36a: 0x106, 0x36b: 0x48, 0x36c: 0x49, 0x36d: 0x4a, 0x36e: 0x4b, 0x36f: 0x4c,
-	0x370: 0x107, 0x371: 0x4d, 0x372: 0x4e, 0x373: 0x4f, 0x374: 0x50, 0x375: 0x51, 0x376: 0x108, 0x377: 0x52,
-	0x378: 0x53, 0x379: 0x54, 0x37a: 0x55, 0x37b: 0x56, 0x37c: 0x57, 0x37d: 0x58, 0x37e: 0x59, 0x37f: 0x5a,
-	// Block 0xe, offset 0x380
-	0x380: 0x109, 0x381: 0x10a, 0x382: 0xa6, 0x383: 0x10b, 0x384: 0x10c, 0x385: 0xa2, 0x386: 0x10d, 0x387: 0x10e,
-	0x388: 0x100, 0x389: 0x100, 0x38a: 0x10f, 0x38b: 0x110, 0x38c: 0x111, 0x38d: 0x112, 0x38e: 0x113, 0x38f: 0x114,
-	0x390: 0x115, 0x391: 0xa6, 0x392: 0x116, 0x393: 0x117, 0x394: 0x118, 0x395: 0x5b, 0x396: 0x5c, 0x397: 0x100,
-	0x398: 0xa6, 0x399: 0xa6, 0x39a: 0xa6, 0x39b: 0xa6, 0x39c: 0x119, 0x39d: 0x11a, 0x39e: 0x5d, 0x39f: 0x100,
-	0x3a0: 0x11b, 0x3a1: 0x11c, 0x3a2: 0x11d, 0x3a3: 0x11e, 0x3a4: 0x11f, 0x3a5: 0x100, 0x3a6: 0x120, 0x3a7: 0x121,
-	0x3a8: 0x122, 0x3a9: 0x123, 0x3aa: 0x124, 0x3ab: 0x5e, 0x3ac: 0x125, 0x3ad: 0x126, 0x3ae: 0x5f, 0x3af: 0x100,
-	0x3b0: 0x127, 0x3b1: 0x128, 0x3b2: 0x129, 0x3b3: 0x12a, 0x3b4: 0x12b, 0x3b5: 0x100, 0x3b6: 0x100, 0x3b7: 0x100,
-	0x3b8: 0x100, 0x3b9: 0x12c, 0x3ba: 0x12d, 0x3bb: 0x12e, 0x3bc: 0x12f, 0x3bd: 0x130, 0x3be: 0x131, 0x3bf: 0x132,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x133, 0x3c1: 0x134, 0x3c2: 0x135, 0x3c3: 0x136, 0x3c4: 0x137, 0x3c5: 0x138, 0x3c6: 0x139, 0x3c7: 0x13a,
-	0x3c8: 0x13b, 0x3c9: 0x13c, 0x3ca: 0x13d, 0x3cb: 0x13e, 0x3cc: 0x60, 0x3cd: 0x61, 0x3ce: 0x100, 0x3cf: 0x100,
-	0x3d0: 0x13f, 0x3d1: 0x140, 0x3d2: 0x141, 0x3d3: 0x142, 0x3d4: 0x100, 0x3d5: 0x100, 0x3d6: 0x143, 0x3d7: 0x144,
-	0x3d8: 0x145, 0x3d9: 0x146, 0x3da: 0x147, 0x3db: 0x148, 0x3dc: 0x149, 0x3dd: 0x14a, 0x3de: 0x100, 0x3df: 0x100,
-	0x3e0: 0x14b, 0x3e1: 0x100, 0x3e2: 0x14c, 0x3e3: 0x14d, 0x3e4: 0x62, 0x3e5: 0x14e, 0x3e6: 0x14f, 0x3e7: 0x150,
-	0x3e8: 0x151, 0x3e9: 0x152, 0x3ea: 0x153, 0x3eb: 0x154, 0x3ec: 0x155, 0x3ed: 0x100, 0x3ee: 0x100, 0x3ef: 0x100,
-	0x3f0: 0x156, 0x3f1: 0x157, 0x3f2: 0x158, 0x3f3: 0x100, 0x3f4: 0x159, 0x3f5: 0x15a, 0x3f6: 0x15b, 0x3f7: 0x100,
-	0x3f8: 0x100, 0x3f9: 0x100, 0x3fa: 0x100, 0x3fb: 0x15c, 0x3fc: 0x15d, 0x3fd: 0x15e, 0x3fe: 0x15f, 0x3ff: 0x160,
-	// Block 0x10, offset 0x400
-	0x400: 0xa6, 0x401: 0xa6, 0x402: 0xa6, 0x403: 0xa6, 0x404: 0xa6, 0x405: 0xa6, 0x406: 0xa6, 0x407: 0xa6,
-	0x408: 0xa6, 0x409: 0xa6, 0x40a: 0xa6, 0x40b: 0xa6, 0x40c: 0xa6, 0x40d: 0xa6, 0x40e: 0x161, 0x40f: 0x100,
-	0x410: 0xa2, 0x411: 0x162, 0x412: 0xa6, 0x413: 0xa6, 0x414: 0xa6, 0x415: 0x163, 0x416: 0x100, 0x417: 0x100,
-	0x418: 0x100, 0x419: 0x100, 0x41a: 0x100, 0x41b: 0x100, 0x41c: 0x100, 0x41d: 0x100, 0x41e: 0x100, 0x41f: 0x100,
-	0x420: 0x100, 0x421: 0x100, 0x422: 0x100, 0x423: 0x100, 0x424: 0x100, 0x425: 0x100, 0x426: 0x100, 0x427: 0x100,
-	0x428: 0x100, 0x429: 0x100, 0x42a: 0x100, 0x42b: 0x100, 0x42c: 0x100, 0x42d: 0x100, 0x42e: 0x100, 0x42f: 0x100,
-	0x430: 0x100, 0x431: 0x100, 0x432: 0x100, 0x433: 0x100, 0x434: 0x100, 0x435: 0x100, 0x436: 0x100, 0x437: 0x100,
-	0x438: 0x100, 0x439: 0x100, 0x43a: 0x100, 0x43b: 0x100, 0x43c: 0x100, 0x43d: 0x100, 0x43e: 0x164, 0x43f: 0x165,
-	// Block 0x11, offset 0x440
-	0x440: 0xa6, 0x441: 0xa6, 0x442: 0xa6, 0x443: 0xa6, 0x444: 0xa6, 0x445: 0xa6, 0x446: 0xa6, 0x447: 0xa6,
-	0x448: 0xa6, 0x449: 0xa6, 0x44a: 0xa6, 0x44b: 0xa6, 0x44c: 0xa6, 0x44d: 0xa6, 0x44e: 0xa6, 0x44f: 0xa6,
-	0x450: 0x166, 0x451: 0x167, 0x452: 0x100, 0x453: 0x100, 0x454: 0x100, 0x455: 0x100, 0x456: 0x100, 0x457: 0x100,
-	0x458: 0x100, 0x459: 0x100, 0x45a: 0x100, 0x45b: 0x100, 0x45c: 0x100, 0x45d: 0x100, 0x45e: 0x100, 0x45f: 0x100,
-	0x460: 0x100, 0x461: 0x100, 0x462: 0x100, 0x463: 0x100, 0x464: 0x100, 0x465: 0x100, 0x466: 0x100, 0x467: 0x100,
-	0x468: 0x100, 0x469: 0x100, 0x46a: 0x100, 0x46b: 0x100, 0x46c: 0x100, 0x46d: 0x100, 0x46e: 0x100, 0x46f: 0x100,
-	0x470: 0x100, 0x471: 0x100, 0x472: 0x100, 0x473: 0x100, 0x474: 0x100, 0x475: 0x100, 0x476: 0x100, 0x477: 0x100,
-	0x478: 0x100, 0x479: 0x100, 0x47a: 0x100, 0x47b: 0x100, 0x47c: 0x100, 0x47d: 0x100, 0x47e: 0x100, 0x47f: 0x100,
-	// Block 0x12, offset 0x480
-	0x480: 0x100, 0x481: 0x100, 0x482: 0x100, 0x483: 0x100, 0x484: 0x100, 0x485: 0x100, 0x486: 0x100, 0x487: 0x100,
-	0x488: 0x100, 0x489: 0x100, 0x48a: 0x100, 0x48b: 0x100, 0x48c: 0x100, 0x48d: 0x100, 0x48e: 0x100, 0x48f: 0x100,
-	0x490: 0xa6, 0x491: 0xa6, 0x492: 0xa6, 0x493: 0xa6, 0x494: 0xa6, 0x495: 0xa6, 0x496: 0xa6, 0x497: 0xa6,
-	0x498: 0xa6, 0x499: 0x14a, 0x49a: 0x100, 0x49b: 0x100, 0x49c: 0x100, 0x49d: 0x100, 0x49e: 0x100, 0x49f: 0x100,
-	0x4a0: 0x100, 0x4a1: 0x100, 0x4a2: 0x100, 0x4a3: 0x100, 0x4a4: 0x100, 0x4a5: 0x100, 0x4a6: 0x100, 0x4a7: 0x100,
-	0x4a8: 0x100, 0x4a9: 0x100, 0x4aa: 0x100, 0x4ab: 0x100, 0x4ac: 0x100, 0x4ad: 0x100, 0x4ae: 0x100, 0x4af: 0x100,
-	0x4b0: 0x100, 0x4b1: 0x100, 0x4b2: 0x100, 0x4b3: 0x100, 0x4b4: 0x100, 0x4b5: 0x100, 0x4b6: 0x100, 0x4b7: 0x100,
-	0x4b8: 0x100, 0x4b9: 0x100, 0x4ba: 0x100, 0x4bb: 0x100, 0x4bc: 0x100, 0x4bd: 0x100, 0x4be: 0x100, 0x4bf: 0x100,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x100, 0x4c1: 0x100, 0x4c2: 0x100, 0x4c3: 0x100, 0x4c4: 0x100, 0x4c5: 0x100, 0x4c6: 0x100, 0x4c7: 0x100,
-	0x4c8: 0x100, 0x4c9: 0x100, 0x4ca: 0x100, 0x4cb: 0x100, 0x4cc: 0x100, 0x4cd: 0x100, 0x4ce: 0x100, 0x4cf: 0x100,
-	0x4d0: 0x100, 0x4d1: 0x100, 0x4d2: 0x100, 0x4d3: 0x100, 0x4d4: 0x100, 0x4d5: 0x100, 0x4d6: 0x100, 0x4d7: 0x100,
-	0x4d8: 0x100, 0x4d9: 0x100, 0x4da: 0x100, 0x4db: 0x100, 0x4dc: 0x100, 0x4dd: 0x100, 0x4de: 0x100, 0x4df: 0x100,
-	0x4e0: 0xa6, 0x4e1: 0xa6, 0x4e2: 0xa6, 0x4e3: 0xa6, 0x4e4: 0xa6, 0x4e5: 0xa6, 0x4e6: 0xa6, 0x4e7: 0xa6,
-	0x4e8: 0x154, 0x4e9: 0x168, 0x4ea: 0x169, 0x4eb: 0x16a, 0x4ec: 0x16b, 0x4ed: 0x16c, 0x4ee: 0x16d, 0x4ef: 0x100,
-	0x4f0: 0x100, 0x4f1: 0x100, 0x4f2: 0x100, 0x4f3: 0x100, 0x4f4: 0x100, 0x4f5: 0x100, 0x4f6: 0x100, 0x4f7: 0x100,
-	0x4f8: 0x100, 0x4f9: 0x16e, 0x4fa: 0x16f, 0x4fb: 0x100, 0x4fc: 0xa6, 0x4fd: 0x170, 0x4fe: 0x171, 0x4ff: 0x172,
-	// Block 0x14, offset 0x500
-	0x500: 0xa6, 0x501: 0xa6, 0x502: 0xa6, 0x503: 0xa6, 0x504: 0xa6, 0x505: 0xa6, 0x506: 0xa6, 0x507: 0xa6,
-	0x508: 0xa6, 0x509: 0xa6, 0x50a: 0xa6, 0x50b: 0xa6, 0x50c: 0xa6, 0x50d: 0xa6, 0x50e: 0xa6, 0x50f: 0xa6,
-	0x510: 0xa6, 0x511: 0xa6, 0x512: 0xa6, 0x513: 0xa6, 0x514: 0xa6, 0x515: 0xa6, 0x516: 0xa6, 0x517: 0xa6,
-	0x518: 0xa6, 0x519: 0xa6, 0x51a: 0xa6, 0x51b: 0xa6, 0x51c: 0xa6, 0x51d: 0xa6, 0x51e: 0xa6, 0x51f: 0x173,
-	0x520: 0xa6, 0x521: 0xa6, 0x522: 0xa6, 0x523: 0xa6, 0x524: 0xa6, 0x525: 0xa6, 0x526: 0xa6, 0x527: 0xa6,
-	0x528: 0xa6, 0x529: 0xa6, 0x52a: 0xa6, 0x52b: 0xa6, 0x52c: 0xa6, 0x52d: 0xa6, 0x52e: 0xa6, 0x52f: 0xa6,
-	0x530: 0xa6, 0x531: 0xa6, 0x532: 0xa6, 0x533: 0x174, 0x534: 0x175, 0x535: 0x100, 0x536: 0x100, 0x537: 0x100,
-	0x538: 0x100, 0x539: 0x100, 0x53a: 0x100, 0x53b: 0x100, 0x53c: 0x100, 0x53d: 0x100, 0x53e: 0x100, 0x53f: 0x100,
-	// Block 0x15, offset 0x540
-	0x540: 0x100, 0x541: 0x100, 0x542: 0x100, 0x543: 0x100, 0x544: 0x100, 0x545: 0x100, 0x546: 0x100, 0x547: 0x100,
-	0x548: 0x100, 0x549: 0x100, 0x54a: 0x100, 0x54b: 0x100, 0x54c: 0x100, 0x54d: 0x100, 0x54e: 0x100, 0x54f: 0x100,
-	0x550: 0x100, 0x551: 0x100, 0x552: 0x100, 0x553: 0x100, 0x554: 0x100, 0x555: 0x100, 0x556: 0x100, 0x557: 0x100,
-	0x558: 0x100, 0x559: 0x100, 0x55a: 0x100, 0x55b: 0x100, 0x55c: 0x100, 0x55d: 0x100, 0x55e: 0x100, 0x55f: 0x100,
-	0x560: 0x100, 0x561: 0x100, 0x562: 0x100, 0x563: 0x100, 0x564: 0x100, 0x565: 0x100, 0x566: 0x100, 0x567: 0x100,
-	0x568: 0x100, 0x569: 0x100, 0x56a: 0x100, 0x56b: 0x100, 0x56c: 0x100, 0x56d: 0x100, 0x56e: 0x100, 0x56f: 0x100,
-	0x570: 0x100, 0x571: 0x100, 0x572: 0x100, 0x573: 0x100, 0x574: 0x100, 0x575: 0x100, 0x576: 0x100, 0x577: 0x100,
-	0x578: 0x100, 0x579: 0x100, 0x57a: 0x100, 0x57b: 0x100, 0x57c: 0x100, 0x57d: 0x100, 0x57e: 0x100, 0x57f: 0x176,
-	// Block 0x16, offset 0x580
-	0x580: 0xa6, 0x581: 0xa6, 0x582: 0xa6, 0x583: 0xa6, 0x584: 0x177, 0x585: 0x178, 0x586: 0xa6, 0x587: 0xa6,
-	0x588: 0xa6, 0x589: 0xa6, 0x58a: 0xa6, 0x58b: 0x179, 0x58c: 0x100, 0x58d: 0x100, 0x58e: 0x100, 0x58f: 0x100,
-	0x590: 0x100, 0x591: 0x100, 0x592: 0x100, 0x593: 0x100, 0x594: 0x100, 0x595: 0x100, 0x596: 0x100, 0x597: 0x100,
-	0x598: 0x100, 0x599: 0x100, 0x59a: 0x100, 0x59b: 0x100, 0x59c: 0x100, 0x59d: 0x100, 0x59e: 0x100, 0x59f: 0x100,
-	0x5a0: 0x100, 0x5a1: 0x100, 0x5a2: 0x100, 0x5a3: 0x100, 0x5a4: 0x100, 0x5a5: 0x100, 0x5a6: 0x100, 0x5a7: 0x100,
-	0x5a8: 0x100, 0x5a9: 0x100, 0x5aa: 0x100, 0x5ab: 0x100, 0x5ac: 0x100, 0x5ad: 0x100, 0x5ae: 0x100, 0x5af: 0x100,
-	0x5b0: 0xa6, 0x5b1: 0x17a, 0x5b2: 0x17b, 0x5b3: 0x100, 0x5b4: 0x100, 0x5b5: 0x100, 0x5b6: 0x100, 0x5b7: 0x100,
-	0x5b8: 0x100, 0x5b9: 0x100, 0x5ba: 0x100, 0x5bb: 0x100, 0x5bc: 0x100, 0x5bd: 0x100, 0x5be: 0x100, 0x5bf: 0x100,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x100, 0x5c1: 0x100, 0x5c2: 0x100, 0x5c3: 0x100, 0x5c4: 0x100, 0x5c5: 0x100, 0x5c6: 0x100, 0x5c7: 0x100,
-	0x5c8: 0x100, 0x5c9: 0x100, 0x5ca: 0x100, 0x5cb: 0x100, 0x5cc: 0x100, 0x5cd: 0x100, 0x5ce: 0x100, 0x5cf: 0x100,
-	0x5d0: 0x100, 0x5d1: 0x100, 0x5d2: 0x100, 0x5d3: 0x100, 0x5d4: 0x100, 0x5d5: 0x100, 0x5d6: 0x100, 0x5d7: 0x100,
-	0x5d8: 0x100, 0x5d9: 0x100, 0x5da: 0x100, 0x5db: 0x100, 0x5dc: 0x100, 0x5dd: 0x100, 0x5de: 0x100, 0x5df: 0x100,
-	0x5e0: 0x100, 0x5e1: 0x100, 0x5e2: 0x100, 0x5e3: 0x100, 0x5e4: 0x100, 0x5e5: 0x100, 0x5e6: 0x100, 0x5e7: 0x100,
-	0x5e8: 0x100, 0x5e9: 0x100, 0x5ea: 0x100, 0x5eb: 0x100, 0x5ec: 0x100, 0x5ed: 0x100, 0x5ee: 0x100, 0x5ef: 0x100,
-	0x5f0: 0x100, 0x5f1: 0x100, 0x5f2: 0x100, 0x5f3: 0x100, 0x5f4: 0x100, 0x5f5: 0x100, 0x5f6: 0x100, 0x5f7: 0x100,
-	0x5f8: 0x100, 0x5f9: 0x100, 0x5fa: 0x100, 0x5fb: 0x100, 0x5fc: 0x17c, 0x5fd: 0x17d, 0x5fe: 0xa2, 0x5ff: 0x17e,
-	// Block 0x18, offset 0x600
-	0x600: 0xa2, 0x601: 0xa2, 0x602: 0xa2, 0x603: 0x17f, 0x604: 0x180, 0x605: 0x181, 0x606: 0x182, 0x607: 0x183,
-	0x608: 0xa2, 0x609: 0x184, 0x60a: 0x100, 0x60b: 0x185, 0x60c: 0xa2, 0x60d: 0x186, 0x60e: 0x100, 0x60f: 0x100,
-	0x610: 0x63, 0x611: 0x64, 0x612: 0x65, 0x613: 0x66, 0x614: 0x67, 0x615: 0x68, 0x616: 0x69, 0x617: 0x6a,
-	0x618: 0x6b, 0x619: 0x6c, 0x61a: 0x6d, 0x61b: 0x6e, 0x61c: 0x6f, 0x61d: 0x70, 0x61e: 0x71, 0x61f: 0x72,
-	0x620: 0xa2, 0x621: 0xa2, 0x622: 0xa2, 0x623: 0xa2, 0x624: 0xa2, 0x625: 0xa2, 0x626: 0xa2, 0x627: 0xa2,
-	0x628: 0x187, 0x629: 0x188, 0x62a: 0x189, 0x62b: 0x100, 0x62c: 0x100, 0x62d: 0x100, 0x62e: 0x100, 0x62f: 0x100,
-	0x630: 0x100, 0x631: 0x100, 0x632: 0x100, 0x633: 0x100, 0x634: 0x100, 0x635: 0x100, 0x636: 0x100, 0x637: 0x100,
-	0x638: 0x100, 0x639: 0x100, 0x63a: 0x100, 0x63b: 0x100, 0x63c: 0x18a, 0x63d: 0x100, 0x63e: 0x100, 0x63f: 0x100,
-	// Block 0x19, offset 0x640
-	0x640: 0x73, 0x641: 0x74, 0x642: 0x18b, 0x643: 0x100, 0x644: 0x18c, 0x645: 0x18d, 0x646: 0x100, 0x647: 0x100,
-	0x648: 0x100, 0x649: 0x100, 0x64a: 0x18e, 0x64b: 0x18f, 0x64c: 0x100, 0x64d: 0x100, 0x64e: 0x100, 0x64f: 0x100,
-	0x650: 0x100, 0x651: 0x100, 0x652: 0x100, 0x653: 0x190, 0x654: 0x100, 0x655: 0x100, 0x656: 0x100, 0x657: 0x100,
-	0x658: 0x100, 0x659: 0x100, 0x65a: 0x100, 0x65b: 0x100, 0x65c: 0x100, 0x65d: 0x100, 0x65e: 0x100, 0x65f: 0x191,
-	0x660: 0x127, 0x661: 0x127, 0x662: 0x127, 0x663: 0x192, 0x664: 0x75, 0x665: 0x193, 0x666: 0x100, 0x667: 0x100,
-	0x668: 0x100, 0x669: 0x100, 0x66a: 0x100, 0x66b: 0x100, 0x66c: 0x100, 0x66d: 0x100, 0x66e: 0x100, 0x66f: 0x100,
-	0x670: 0x100, 0x671: 0x194, 0x672: 0x195, 0x673: 0x100, 0x674: 0x196, 0x675: 0x100, 0x676: 0x100, 0x677: 0x100,
-	0x678: 0x76, 0x679: 0x77, 0x67a: 0x78, 0x67b: 0x197, 0x67c: 0x100, 0x67d: 0x100, 0x67e: 0x100, 0x67f: 0x100,
-	// Block 0x1a, offset 0x680
-	0x680: 0x198, 0x681: 0xa2, 0x682: 0x199, 0x683: 0x19a, 0x684: 0x79, 0x685: 0x7a, 0x686: 0x19b, 0x687: 0x19c,
-	0x688: 0x7b, 0x689: 0x19d, 0x68a: 0x100, 0x68b: 0x100, 0x68c: 0xa2, 0x68d: 0xa2, 0x68e: 0xa2, 0x68f: 0xa2,
-	0x690: 0xa2, 0x691: 0xa2, 0x692: 0xa2, 0x693: 0xa2, 0x694: 0xa2, 0x695: 0xa2, 0x696: 0xa2, 0x697: 0xa2,
-	0x698: 0xa2, 0x699: 0xa2, 0x69a: 0xa2, 0x69b: 0x19e, 0x69c: 0xa2, 0x69d: 0x19f, 0x69e: 0xa2, 0x69f: 0x1a0,
-	0x6a0: 0x1a1, 0x6a1: 0x1a2, 0x6a2: 0x1a3, 0x6a3: 0x100, 0x6a4: 0xa2, 0x6a5: 0xa2, 0x6a6: 0xa2, 0x6a7: 0xa2,
-	0x6a8: 0xa2, 0x6a9: 0x1a4, 0x6aa: 0x1a5, 0x6ab: 0x1a6, 0x6ac: 0xa2, 0x6ad: 0xa2, 0x6ae: 0x1a7, 0x6af: 0x1a8,
-	0x6b0: 0x100, 0x6b1: 0x100, 0x6b2: 0x100, 0x6b3: 0x100, 0x6b4: 0x100, 0x6b5: 0x100, 0x6b6: 0x100, 0x6b7: 0x100,
-	0x6b8: 0x100, 0x6b9: 0x100, 0x6ba: 0x100, 0x6bb: 0x100, 0x6bc: 0x100, 0x6bd: 0x100, 0x6be: 0x100, 0x6bf: 0x100,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0xa6, 0x6c1: 0xa6, 0x6c2: 0xa6, 0x6c3: 0xa6, 0x6c4: 0xa6, 0x6c5: 0xa6, 0x6c6: 0xa6, 0x6c7: 0xa6,
-	0x6c8: 0xa6, 0x6c9: 0xa6, 0x6ca: 0xa6, 0x6cb: 0xa6, 0x6cc: 0xa6, 0x6cd: 0xa6, 0x6ce: 0xa6, 0x6cf: 0xa6,
-	0x6d0: 0xa6, 0x6d1: 0xa6, 0x6d2: 0xa6, 0x6d3: 0xa6, 0x6d4: 0xa6, 0x6d5: 0xa6, 0x6d6: 0xa6, 0x6d7: 0xa6,
-	0x6d8: 0xa6, 0x6d9: 0xa6, 0x6da: 0xa6, 0x6db: 0x1a9, 0x6dc: 0xa6, 0x6dd: 0xa6, 0x6de: 0xa6, 0x6df: 0xa6,
-	0x6e0: 0xa6, 0x6e1: 0xa6, 0x6e2: 0xa6, 0x6e3: 0xa6, 0x6e4: 0xa6, 0x6e5: 0xa6, 0x6e6: 0xa6, 0x6e7: 0xa6,
-	0x6e8: 0xa6, 0x6e9: 0xa6, 0x6ea: 0xa6, 0x6eb: 0xa6, 0x6ec: 0xa6, 0x6ed: 0xa6, 0x6ee: 0xa6, 0x6ef: 0xa6,
-	0x6f0: 0xa6, 0x6f1: 0xa6, 0x6f2: 0xa6, 0x6f3: 0xa6, 0x6f4: 0xa6, 0x6f5: 0xa6, 0x6f6: 0xa6, 0x6f7: 0xa6,
-	0x6f8: 0xa6, 0x6f9: 0xa6, 0x6fa: 0xa6, 0x6fb: 0xa6, 0x6fc: 0xa6, 0x6fd: 0xa6, 0x6fe: 0xa6, 0x6ff: 0xa6,
-	// Block 0x1c, offset 0x700
-	0x700: 0xa6, 0x701: 0xa6, 0x702: 0xa6, 0x703: 0xa6, 0x704: 0xa6, 0x705: 0xa6, 0x706: 0xa6, 0x707: 0xa6,
-	0x708: 0xa6, 0x709: 0xa6, 0x70a: 0xa6, 0x70b: 0xa6, 0x70c: 0xa6, 0x70d: 0xa6, 0x70e: 0xa6, 0x70f: 0xa6,
-	0x710: 0xa6, 0x711: 0xa6, 0x712: 0xa6, 0x713: 0xa6, 0x714: 0xa6, 0x715: 0xa6, 0x716: 0xa6, 0x717: 0xa6,
-	0x718: 0xa6, 0x719: 0xa6, 0x71a: 0xa6, 0x71b: 0xa6, 0x71c: 0x1aa, 0x71d: 0xa6, 0x71e: 0xa6, 0x71f: 0xa6,
-	0x720: 0x1ab, 0x721: 0xa6, 0x722: 0xa6, 0x723: 0xa6, 0x724: 0xa6, 0x725: 0xa6, 0x726: 0xa6, 0x727: 0xa6,
-	0x728: 0xa6, 0x729: 0xa6, 0x72a: 0xa6, 0x72b: 0xa6, 0x72c: 0xa6, 0x72d: 0xa6, 0x72e: 0xa6, 0x72f: 0xa6,
-	0x730: 0xa6, 0x731: 0xa6, 0x732: 0xa6, 0x733: 0xa6, 0x734: 0xa6, 0x735: 0xa6, 0x736: 0xa6, 0x737: 0xa6,
-	0x738: 0xa6, 0x739: 0xa6, 0x73a: 0xa6, 0x73b: 0xa6, 0x73c: 0xa6, 0x73d: 0xa6, 0x73e: 0xa6, 0x73f: 0xa6,
-	// Block 0x1d, offset 0x740
-	0x740: 0xa6, 0x741: 0xa6, 0x742: 0xa6, 0x743: 0xa6, 0x744: 0xa6, 0x745: 0xa6, 0x746: 0xa6, 0x747: 0xa6,
-	0x748: 0xa6, 0x749: 0xa6, 0x74a: 0xa6, 0x74b: 0xa6, 0x74c: 0xa6, 0x74d: 0xa6, 0x74e: 0xa6, 0x74f: 0xa6,
-	0x750: 0xa6, 0x751: 0xa6, 0x752: 0xa6, 0x753: 0xa6, 0x754: 0xa6, 0x755: 0xa6, 0x756: 0xa6, 0x757: 0xa6,
-	0x758: 0xa6, 0x759: 0xa6, 0x75a: 0xa6, 0x75b: 0xa6, 0x75c: 0xa6, 0x75d: 0xa6, 0x75e: 0xa6, 0x75f: 0xa6,
-	0x760: 0xa6, 0x761: 0xa6, 0x762: 0xa6, 0x763: 0xa6, 0x764: 0xa6, 0x765: 0xa6, 0x766: 0xa6, 0x767: 0xa6,
-	0x768: 0xa6, 0x769: 0xa6, 0x76a: 0xa6, 0x76b: 0xa6, 0x76c: 0xa6, 0x76d: 0xa6, 0x76e: 0xa6, 0x76f: 0xa6,
-	0x770: 0xa6, 0x771: 0xa6, 0x772: 0xa6, 0x773: 0xa6, 0x774: 0xa6, 0x775: 0xa6, 0x776: 0xa6, 0x777: 0xa6,
-	0x778: 0xa6, 0x779: 0xa6, 0x77a: 0x1ac, 0x77b: 0xa6, 0x77c: 0xa6, 0x77d: 0xa6, 0x77e: 0xa6, 0x77f: 0xa6,
-	// Block 0x1e, offset 0x780
-	0x780: 0xa6, 0x781: 0xa6, 0x782: 0xa6, 0x783: 0xa6, 0x784: 0xa6, 0x785: 0xa6, 0x786: 0xa6, 0x787: 0xa6,
-	0x788: 0xa6, 0x789: 0xa6, 0x78a: 0xa6, 0x78b: 0xa6, 0x78c: 0xa6, 0x78d: 0xa6, 0x78e: 0xa6, 0x78f: 0xa6,
-	0x790: 0xa6, 0x791: 0xa6, 0x792: 0xa6, 0x793: 0xa6, 0x794: 0xa6, 0x795: 0xa6, 0x796: 0xa6, 0x797: 0xa6,
-	0x798: 0xa6, 0x799: 0xa6, 0x79a: 0xa6, 0x79b: 0xa6, 0x79c: 0xa6, 0x79d: 0xa6, 0x79e: 0xa6, 0x79f: 0xa6,
-	0x7a0: 0xa6, 0x7a1: 0xa6, 0x7a2: 0xa6, 0x7a3: 0xa6, 0x7a4: 0xa6, 0x7a5: 0xa6, 0x7a6: 0xa6, 0x7a7: 0xa6,
-	0x7a8: 0xa6, 0x7a9: 0xa6, 0x7aa: 0xa6, 0x7ab: 0xa6, 0x7ac: 0xa6, 0x7ad: 0xa6, 0x7ae: 0xa6, 0x7af: 0x1ad,
-	0x7b0: 0x100, 0x7b1: 0x100, 0x7b2: 0x100, 0x7b3: 0x100, 0x7b4: 0x100, 0x7b5: 0x100, 0x7b6: 0x100, 0x7b7: 0x100,
-	0x7b8: 0x100, 0x7b9: 0x100, 0x7ba: 0x100, 0x7bb: 0x100, 0x7bc: 0x100, 0x7bd: 0x100, 0x7be: 0x100, 0x7bf: 0x100,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x100, 0x7c1: 0x100, 0x7c2: 0x100, 0x7c3: 0x100, 0x7c4: 0x100, 0x7c5: 0x100, 0x7c6: 0x100, 0x7c7: 0x100,
-	0x7c8: 0x100, 0x7c9: 0x100, 0x7ca: 0x100, 0x7cb: 0x100, 0x7cc: 0x100, 0x7cd: 0x100, 0x7ce: 0x100, 0x7cf: 0x100,
-	0x7d0: 0x100, 0x7d1: 0x100, 0x7d2: 0x100, 0x7d3: 0x100, 0x7d4: 0x100, 0x7d5: 0x100, 0x7d6: 0x100, 0x7d7: 0x100,
-	0x7d8: 0x100, 0x7d9: 0x100, 0x7da: 0x100, 0x7db: 0x100, 0x7dc: 0x100, 0x7dd: 0x100, 0x7de: 0x100, 0x7df: 0x100,
-	0x7e0: 0x7c, 0x7e1: 0x7d, 0x7e2: 0x7e, 0x7e3: 0x7f, 0x7e4: 0x80, 0x7e5: 0x81, 0x7e6: 0x82, 0x7e7: 0x83,
-	0x7e8: 0x84, 0x7e9: 0x100, 0x7ea: 0x100, 0x7eb: 0x100, 0x7ec: 0x100, 0x7ed: 0x100, 0x7ee: 0x100, 0x7ef: 0x100,
-	0x7f0: 0x100, 0x7f1: 0x100, 0x7f2: 0x100, 0x7f3: 0x100, 0x7f4: 0x100, 0x7f5: 0x100, 0x7f6: 0x100, 0x7f7: 0x100,
-	0x7f8: 0x100, 0x7f9: 0x100, 0x7fa: 0x100, 0x7fb: 0x100, 0x7fc: 0x100, 0x7fd: 0x100, 0x7fe: 0x100, 0x7ff: 0x100,
-	// Block 0x20, offset 0x800
-	0x800: 0xa6, 0x801: 0xa6, 0x802: 0xa6, 0x803: 0xa6, 0x804: 0xa6, 0x805: 0xa6, 0x806: 0xa6, 0x807: 0xa6,
-	0x808: 0xa6, 0x809: 0xa6, 0x80a: 0xa6, 0x80b: 0xa6, 0x80c: 0xa6, 0x80d: 0x1ae, 0x80e: 0xa6, 0x80f: 0xa6,
-	0x810: 0xa6, 0x811: 0xa6, 0x812: 0xa6, 0x813: 0xa6, 0x814: 0xa6, 0x815: 0xa6, 0x816: 0xa6, 0x817: 0xa6,
-	0x818: 0xa6, 0x819: 0xa6, 0x81a: 0xa6, 0x81b: 0xa6, 0x81c: 0xa6, 0x81d: 0xa6, 0x81e: 0xa6, 0x81f: 0xa6,
-	0x820: 0xa6, 0x821: 0xa6, 0x822: 0xa6, 0x823: 0xa6, 0x824: 0xa6, 0x825: 0xa6, 0x826: 0xa6, 0x827: 0xa6,
-	0x828: 0xa6, 0x829: 0xa6, 0x82a: 0xa6, 0x82b: 0xa6, 0x82c: 0xa6, 0x82d: 0xa6, 0x82e: 0xa6, 0x82f: 0xa6,
-	0x830: 0xa6, 0x831: 0xa6, 0x832: 0xa6, 0x833: 0xa6, 0x834: 0xa6, 0x835: 0xa6, 0x836: 0xa6, 0x837: 0xa6,
-	0x838: 0xa6, 0x839: 0xa6, 0x83a: 0xa6, 0x83b: 0xa6, 0x83c: 0xa6, 0x83d: 0xa6, 0x83e: 0xa6, 0x83f: 0xa6,
-	// Block 0x21, offset 0x840
-	0x840: 0xa6, 0x841: 0xa6, 0x842: 0xa6, 0x843: 0xa6, 0x844: 0xa6, 0x845: 0xa6, 0x846: 0xa6, 0x847: 0xa6,
-	0x848: 0xa6, 0x849: 0xa6, 0x84a: 0xa6, 0x84b: 0xa6, 0x84c: 0xa6, 0x84d: 0xa6, 0x84e: 0x1af, 0x84f: 0x100,
-	0x850: 0x100, 0x851: 0x100, 0x852: 0x100, 0x853: 0x100, 0x854: 0x100, 0x855: 0x100, 0x856: 0x100, 0x857: 0x100,
-	0x858: 0x100, 0x859: 0x100, 0x85a: 0x100, 0x85b: 0x100, 0x85c: 0x100, 0x85d: 0x100, 0x85e: 0x100, 0x85f: 0x100,
-	0x860: 0x100, 0x861: 0x100, 0x862: 0x100, 0x863: 0x100, 0x864: 0x100, 0x865: 0x100, 0x866: 0x100, 0x867: 0x100,
-	0x868: 0x100, 0x869: 0x100, 0x86a: 0x100, 0x86b: 0x100, 0x86c: 0x100, 0x86d: 0x100, 0x86e: 0x100, 0x86f: 0x100,
-	0x870: 0x100, 0x871: 0x100, 0x872: 0x100, 0x873: 0x100, 0x874: 0x100, 0x875: 0x100, 0x876: 0x100, 0x877: 0x100,
-	0x878: 0x100, 0x879: 0x100, 0x87a: 0x100, 0x87b: 0x100, 0x87c: 0x100, 0x87d: 0x100, 0x87e: 0x100, 0x87f: 0x100,
-	// Block 0x22, offset 0x880
-	0x890: 0x0c, 0x891: 0x0d, 0x892: 0x0e, 0x893: 0x0f, 0x894: 0x10, 0x895: 0x0a, 0x896: 0x11, 0x897: 0x07,
-	0x898: 0x12, 0x899: 0x0a, 0x89a: 0x13, 0x89b: 0x14, 0x89c: 0x15, 0x89d: 0x16, 0x89e: 0x17, 0x89f: 0x18,
-	0x8a0: 0x07, 0x8a1: 0x07, 0x8a2: 0x07, 0x8a3: 0x07, 0x8a4: 0x07, 0x8a5: 0x07, 0x8a6: 0x07, 0x8a7: 0x07,
-	0x8a8: 0x07, 0x8a9: 0x07, 0x8aa: 0x19, 0x8ab: 0x1a, 0x8ac: 0x1b, 0x8ad: 0x07, 0x8ae: 0x1c, 0x8af: 0x1d,
-	0x8b0: 0x07, 0x8b1: 0x1e, 0x8b2: 0x1f, 0x8b3: 0x0a, 0x8b4: 0x0a, 0x8b5: 0x0a, 0x8b6: 0x0a, 0x8b7: 0x0a,
-	0x8b8: 0x0a, 0x8b9: 0x0a, 0x8ba: 0x0a, 0x8bb: 0x0a, 0x8bc: 0x0a, 0x8bd: 0x0a, 0x8be: 0x0a, 0x8bf: 0x0a,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x0a, 0x8c1: 0x0a, 0x8c2: 0x0a, 0x8c3: 0x0a, 0x8c4: 0x0a, 0x8c5: 0x0a, 0x8c6: 0x0a, 0x8c7: 0x0a,
-	0x8c8: 0x0a, 0x8c9: 0x0a, 0x8ca: 0x0a, 0x8cb: 0x0a, 0x8cc: 0x0a, 0x8cd: 0x0a, 0x8ce: 0x0a, 0x8cf: 0x0a,
-	0x8d0: 0x0a, 0x8d1: 0x0a, 0x8d2: 0x0a, 0x8d3: 0x0a, 0x8d4: 0x0a, 0x8d5: 0x0a, 0x8d6: 0x0a, 0x8d7: 0x0a,
-	0x8d8: 0x0a, 0x8d9: 0x0a, 0x8da: 0x0a, 0x8db: 0x0a, 0x8dc: 0x0a, 0x8dd: 0x0a, 0x8de: 0x0a, 0x8df: 0x0a,
-	0x8e0: 0x0a, 0x8e1: 0x0a, 0x8e2: 0x0a, 0x8e3: 0x0a, 0x8e4: 0x0a, 0x8e5: 0x0a, 0x8e6: 0x0a, 0x8e7: 0x0a,
-	0x8e8: 0x0a, 0x8e9: 0x0a, 0x8ea: 0x0a, 0x8eb: 0x0a, 0x8ec: 0x0a, 0x8ed: 0x0a, 0x8ee: 0x0a, 0x8ef: 0x0a,
-	0x8f0: 0x0a, 0x8f1: 0x0a, 0x8f2: 0x0a, 0x8f3: 0x0a, 0x8f4: 0x0a, 0x8f5: 0x0a, 0x8f6: 0x0a, 0x8f7: 0x0a,
-	0x8f8: 0x0a, 0x8f9: 0x0a, 0x8fa: 0x0a, 0x8fb: 0x0a, 0x8fc: 0x0a, 0x8fd: 0x0a, 0x8fe: 0x0a, 0x8ff: 0x0a,
-	// Block 0x24, offset 0x900
-	0x900: 0x1b0, 0x901: 0x1b1, 0x902: 0x100, 0x903: 0x100, 0x904: 0x1b2, 0x905: 0x1b2, 0x906: 0x1b2, 0x907: 0x1b3,
-	0x908: 0x100, 0x909: 0x100, 0x90a: 0x100, 0x90b: 0x100, 0x90c: 0x100, 0x90d: 0x100, 0x90e: 0x100, 0x90f: 0x100,
-	0x910: 0x100, 0x911: 0x100, 0x912: 0x100, 0x913: 0x100, 0x914: 0x100, 0x915: 0x100, 0x916: 0x100, 0x917: 0x100,
-	0x918: 0x100, 0x919: 0x100, 0x91a: 0x100, 0x91b: 0x100, 0x91c: 0x100, 0x91d: 0x100, 0x91e: 0x100, 0x91f: 0x100,
-	0x920: 0x100, 0x921: 0x100, 0x922: 0x100, 0x923: 0x100, 0x924: 0x100, 0x925: 0x100, 0x926: 0x100, 0x927: 0x100,
-	0x928: 0x100, 0x929: 0x100, 0x92a: 0x100, 0x92b: 0x100, 0x92c: 0x100, 0x92d: 0x100, 0x92e: 0x100, 0x92f: 0x100,
-	0x930: 0x100, 0x931: 0x100, 0x932: 0x100, 0x933: 0x100, 0x934: 0x100, 0x935: 0x100, 0x936: 0x100, 0x937: 0x100,
-	0x938: 0x100, 0x939: 0x100, 0x93a: 0x100, 0x93b: 0x100, 0x93c: 0x100, 0x93d: 0x100, 0x93e: 0x100, 0x93f: 0x100,
-	// Block 0x25, offset 0x940
-	0x940: 0x0a, 0x941: 0x0a, 0x942: 0x0a, 0x943: 0x0a, 0x944: 0x0a, 0x945: 0x0a, 0x946: 0x0a, 0x947: 0x0a,
-	0x948: 0x0a, 0x949: 0x0a, 0x94a: 0x0a, 0x94b: 0x0a, 0x94c: 0x0a, 0x94d: 0x0a, 0x94e: 0x0a, 0x94f: 0x0a,
-	0x950: 0x0a, 0x951: 0x0a, 0x952: 0x0a, 0x953: 0x0a, 0x954: 0x0a, 0x955: 0x0a, 0x956: 0x0a, 0x957: 0x0a,
-	0x958: 0x0a, 0x959: 0x0a, 0x95a: 0x0a, 0x95b: 0x0a, 0x95c: 0x0a, 0x95d: 0x0a, 0x95e: 0x0a, 0x95f: 0x0a,
-	0x960: 0x22, 0x961: 0x0a, 0x962: 0x0a, 0x963: 0x0a, 0x964: 0x0a, 0x965: 0x0a, 0x966: 0x0a, 0x967: 0x0a,
-	0x968: 0x0a, 0x969: 0x0a, 0x96a: 0x0a, 0x96b: 0x0a, 0x96c: 0x0a, 0x96d: 0x0a, 0x96e: 0x0a, 0x96f: 0x0a,
-	0x970: 0x0a, 0x971: 0x0a, 0x972: 0x0a, 0x973: 0x0a, 0x974: 0x0a, 0x975: 0x0a, 0x976: 0x0a, 0x977: 0x0a,
-	0x978: 0x0a, 0x979: 0x0a, 0x97a: 0x0a, 0x97b: 0x0a, 0x97c: 0x0a, 0x97d: 0x0a, 0x97e: 0x0a, 0x97f: 0x0a,
-	// Block 0x26, offset 0x980
-	0x980: 0x0a, 0x981: 0x0a, 0x982: 0x0a, 0x983: 0x0a, 0x984: 0x0a, 0x985: 0x0a, 0x986: 0x0a, 0x987: 0x0a,
-	0x988: 0x0a, 0x989: 0x0a, 0x98a: 0x0a, 0x98b: 0x0a, 0x98c: 0x0a, 0x98d: 0x0a, 0x98e: 0x0a, 0x98f: 0x0a,
-}
-
-// idnaSparseOffset: 303 entries, 606 bytes
-var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x7e, 0x87, 0x97, 0xa6, 0xb1, 0xbe, 0xcf, 0xd9, 0xe0, 0xed, 0xfe, 0x105, 0x110, 0x11f, 0x12d, 0x137, 0x139, 0x13e, 0x141, 0x144, 0x146, 0x152, 0x15d, 0x165, 0x16b, 0x171, 0x176, 0x17b, 0x17e, 0x182, 0x188, 0x18d, 0x198, 0x1a2, 0x1a8, 0x1b9, 0x1c4, 0x1c7, 0x1cf, 0x1d2, 0x1df, 0x1e7, 0x1eb, 0x1f2, 0x1fa, 0x20a, 0x216, 0x219, 0x223, 0x22f, 0x23b, 0x247, 0x24f, 0x254, 0x261, 0x272, 0x27d, 0x282, 0x28b, 0x293, 0x299, 0x29e, 0x2a1, 0x2a5, 0x2ab, 0x2af, 0x2b3, 0x2b7, 0x2bc, 0x2c4, 0x2cb, 0x2d6, 0x2e0, 0x2e4, 0x2e7, 0x2ed, 0x2f1, 0x2f3, 0x2f6, 0x2f8, 0x2fb, 0x305, 0x308, 0x317, 0x31b, 0x31f, 0x321, 0x32a, 0x32e, 0x333, 0x338, 0x33e, 0x34e, 0x354, 0x358, 0x367, 0x36c, 0x374, 0x37e, 0x389, 0x391, 0x3a2, 0x3ab, 0x3bb, 0x3c8, 0x3d4, 0x3d9, 0x3e6, 0x3ea, 0x3ef, 0x3f1, 0x3f3, 0x3f7, 0x3f9, 0x3fd, 0x406, 0x40c, 0x410, 0x420, 0x42a, 0x42f, 0x432, 0x438, 0x43f, 0x444, 0x448, 0x44e, 0x453, 0x45c, 0x461, 0x467, 0x46e, 0x475, 0x47c, 0x480, 0x483, 0x488, 0x494, 0x49a, 0x49f, 0x4a6, 0x4ae, 0x4b3, 0x4b7, 0x4c7, 0x4ce, 0x4d2, 0x4d6, 0x4dd, 0x4df, 0x4e2, 0x4e5, 0x4e9, 0x4f2, 0x4f6, 0x4fe, 0x501, 0x509, 0x514, 0x523, 0x52f, 0x535, 0x542, 0x54e, 0x556, 0x55f, 0x56a, 0x571, 0x580, 0x58d, 0x591, 0x59e, 0x5a7, 0x5ab, 0x5ba, 0x5c2, 0x5cd, 0x5d6, 0x5dc, 0x5e4, 0x5ed, 0x5f9, 0x5fc, 0x608, 0x60b, 0x614, 0x617, 0x61c, 0x625, 0x62a, 0x637, 0x642, 0x64b, 0x656, 0x659, 0x65c, 0x666, 0x66f, 0x67b, 0x688, 0x695, 0x6a3, 0x6aa, 0x6b5, 0x6bc, 0x6c0, 0x6c4, 0x6c7, 0x6cc, 0x6cf, 0x6d2, 0x6d6, 0x6d9, 0x6de, 0x6e5, 0x6e8, 0x6f0, 0x6f4, 0x6ff, 0x702, 0x705, 0x708, 0x70e, 0x714, 0x71d, 0x720, 0x723, 0x726, 0x72e, 0x733, 0x73c, 0x73f, 0x744, 0x74e, 0x752, 0x756, 0x759, 0x75c, 0x760, 0x76f, 0x77b, 0x77f, 0x784, 0x789, 0x78e, 0x792, 0x797, 0x7a0, 0x7a5, 0x7a9, 0x7af, 0x7b5, 0x7ba, 0x7c0, 0x7c6, 0x7d0, 0x7d6, 0x7df, 0x7e2, 0x7e5, 0x7e9, 0x7ed, 0x7f1, 0x7f7, 0x7fd, 0x802, 0x805, 0x815, 0x81c, 0x820, 0x827, 0x82b, 0x831, 0x838, 0x83f, 0x845, 0x84e, 0x852, 0x860, 0x863, 0x866, 0x86a, 0x86e, 0x871, 0x875, 0x878, 0x87d, 0x87f, 0x881}
-
-// idnaSparseValues: 2180 entries, 8720 bytes
-var idnaSparseValues = [2180]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0000, lo: 0x07},
-	{value: 0xe105, lo: 0x80, hi: 0x96},
-	{value: 0x0018, lo: 0x97, hi: 0x97},
-	{value: 0xe105, lo: 0x98, hi: 0x9e},
-	{value: 0x001f, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbf},
-	// Block 0x1, offset 0x8
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0xe01d, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x82},
-	{value: 0x0335, lo: 0x83, hi: 0x83},
-	{value: 0x034d, lo: 0x84, hi: 0x84},
-	{value: 0x0365, lo: 0x85, hi: 0x85},
-	{value: 0xe00d, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x87},
-	{value: 0xe00d, lo: 0x88, hi: 0x88},
-	{value: 0x0008, lo: 0x89, hi: 0x89},
-	{value: 0xe00d, lo: 0x8a, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0x8b},
-	{value: 0xe00d, lo: 0x8c, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0x8d},
-	{value: 0xe00d, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0xbf},
-	// Block 0x2, offset 0x19
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x00a9, lo: 0xb0, hi: 0xb0},
-	{value: 0x037d, lo: 0xb1, hi: 0xb1},
-	{value: 0x00b1, lo: 0xb2, hi: 0xb2},
-	{value: 0x00b9, lo: 0xb3, hi: 0xb3},
-	{value: 0x034d, lo: 0xb4, hi: 0xb4},
-	{value: 0x0395, lo: 0xb5, hi: 0xb5},
-	{value: 0xe1bd, lo: 0xb6, hi: 0xb6},
-	{value: 0x00c1, lo: 0xb7, hi: 0xb7},
-	{value: 0x00c9, lo: 0xb8, hi: 0xb8},
-	{value: 0x0008, lo: 0xb9, hi: 0xbf},
-	// Block 0x3, offset 0x25
-	{value: 0x0000, lo: 0x01},
-	{value: 0x3308, lo: 0x80, hi: 0xbf},
-	// Block 0x4, offset 0x27
-	{value: 0x0000, lo: 0x04},
-	{value: 0x03f5, lo: 0x80, hi: 0x8f},
-	{value: 0xe105, lo: 0x90, hi: 0x9f},
-	{value: 0x049d, lo: 0xa0, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x5, offset 0x2c
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe185, lo: 0x80, hi: 0x8f},
-	{value: 0x0545, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x98},
-	{value: 0x0008, lo: 0x99, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x6, offset 0x33
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0131, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x88},
-	{value: 0x0018, lo: 0x89, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x3308, lo: 0x91, hi: 0xbd},
-	{value: 0x0818, lo: 0xbe, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x7, offset 0x3e
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0818, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x82},
-	{value: 0x0818, lo: 0x83, hi: 0x83},
-	{value: 0x3308, lo: 0x84, hi: 0x85},
-	{value: 0x0818, lo: 0x86, hi: 0x86},
-	{value: 0x3308, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0808, lo: 0x90, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xae},
-	{value: 0x0808, lo: 0xaf, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x8, offset 0x4a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0a08, lo: 0x80, hi: 0x87},
-	{value: 0x0c08, lo: 0x88, hi: 0x99},
-	{value: 0x0a08, lo: 0x9a, hi: 0xbf},
-	// Block 0x9, offset 0x4e
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x3308, lo: 0x80, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8c},
-	{value: 0x0c08, lo: 0x8d, hi: 0x8d},
-	{value: 0x0a08, lo: 0x8e, hi: 0x98},
-	{value: 0x0c08, lo: 0x99, hi: 0x9b},
-	{value: 0x0a08, lo: 0x9c, hi: 0xaa},
-	{value: 0x0c08, lo: 0xab, hi: 0xac},
-	{value: 0x0a08, lo: 0xad, hi: 0xb0},
-	{value: 0x0c08, lo: 0xb1, hi: 0xb1},
-	{value: 0x0a08, lo: 0xb2, hi: 0xb2},
-	{value: 0x0c08, lo: 0xb3, hi: 0xb4},
-	{value: 0x0a08, lo: 0xb5, hi: 0xb7},
-	{value: 0x0c08, lo: 0xb8, hi: 0xb9},
-	{value: 0x0a08, lo: 0xba, hi: 0xbf},
-	// Block 0xa, offset 0x5d
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0808, lo: 0x80, hi: 0xa5},
-	{value: 0x3308, lo: 0xa6, hi: 0xb0},
-	{value: 0x0808, lo: 0xb1, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xb, offset 0x62
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0808, lo: 0x80, hi: 0x89},
-	{value: 0x0a08, lo: 0x8a, hi: 0xaa},
-	{value: 0x3308, lo: 0xab, hi: 0xb3},
-	{value: 0x0808, lo: 0xb4, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xb9},
-	{value: 0x0818, lo: 0xba, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbc},
-	{value: 0x3308, lo: 0xbd, hi: 0xbd},
-	{value: 0x0818, lo: 0xbe, hi: 0xbf},
-	// Block 0xc, offset 0x6c
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0808, lo: 0x80, hi: 0x95},
-	{value: 0x3308, lo: 0x96, hi: 0x99},
-	{value: 0x0808, lo: 0x9a, hi: 0x9a},
-	{value: 0x3308, lo: 0x9b, hi: 0xa3},
-	{value: 0x0808, lo: 0xa4, hi: 0xa4},
-	{value: 0x3308, lo: 0xa5, hi: 0xa7},
-	{value: 0x0808, lo: 0xa8, hi: 0xa8},
-	{value: 0x3308, lo: 0xa9, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0818, lo: 0xb0, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xd, offset 0x78
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0a08, lo: 0x80, hi: 0x88},
-	{value: 0x0808, lo: 0x89, hi: 0x89},
-	{value: 0x3308, lo: 0x8a, hi: 0xa1},
-	{value: 0x0840, lo: 0xa2, hi: 0xa2},
-	{value: 0x3308, lo: 0xa3, hi: 0xbf},
-	// Block 0xe, offset 0x7e
-	{value: 0x0000, lo: 0x08},
-	{value: 0x3308, lo: 0x80, hi: 0x82},
-	{value: 0x3008, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0xb9},
-	{value: 0x3308, lo: 0xba, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0xf, offset 0x87
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x3008, lo: 0x81, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x85},
-	{value: 0x3008, lo: 0x86, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x3008, lo: 0x8a, hi: 0x8c},
-	{value: 0x3b08, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x96},
-	{value: 0x3008, lo: 0x97, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x10, offset 0x97
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x3008, lo: 0x81, hi: 0x83},
-	{value: 0x3308, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xa9},
-	{value: 0x0008, lo: 0xaa, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x3308, lo: 0xbe, hi: 0xbf},
-	// Block 0x11, offset 0xa6
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x3308, lo: 0x80, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0xba},
-	{value: 0x3b08, lo: 0xbb, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x12, offset 0xb1
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xb2},
-	{value: 0x0008, lo: 0xb3, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x13, offset 0xbe
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x89},
-	{value: 0x3b08, lo: 0x8a, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8e},
-	{value: 0x3008, lo: 0x8f, hi: 0x91},
-	{value: 0x3308, lo: 0x92, hi: 0x94},
-	{value: 0x0040, lo: 0x95, hi: 0x95},
-	{value: 0x3308, lo: 0x96, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x3008, lo: 0x98, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xb1},
-	{value: 0x3008, lo: 0xb2, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x14, offset 0xcf
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xb0},
-	{value: 0x3308, lo: 0xb1, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb2},
-	{value: 0x01f1, lo: 0xb3, hi: 0xb3},
-	{value: 0x3308, lo: 0xb4, hi: 0xb9},
-	{value: 0x3b08, lo: 0xba, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x15, offset 0xd9
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x3308, lo: 0x87, hi: 0x8e},
-	{value: 0x0018, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0xbf},
-	// Block 0x16, offset 0xe0
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x85},
-	{value: 0x0008, lo: 0x86, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x3308, lo: 0x88, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0201, lo: 0x9c, hi: 0x9c},
-	{value: 0x0209, lo: 0x9d, hi: 0x9d},
-	{value: 0x0008, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x17, offset 0xed
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0x8b},
-	{value: 0xe03d, lo: 0x8c, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x97},
-	{value: 0x3308, lo: 0x98, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xb4},
-	{value: 0x3308, lo: 0xb5, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xb6},
-	{value: 0x3308, lo: 0xb7, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xb8},
-	{value: 0x3308, lo: 0xb9, hi: 0xb9},
-	{value: 0x0018, lo: 0xba, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x18, offset 0xfe
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x85},
-	{value: 0x3308, lo: 0x86, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0018, lo: 0x8e, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0xbf},
-	// Block 0x19, offset 0x105
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x3008, lo: 0xab, hi: 0xac},
-	{value: 0x3308, lo: 0xad, hi: 0xb0},
-	{value: 0x3008, lo: 0xb1, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb7},
-	{value: 0x3008, lo: 0xb8, hi: 0xb8},
-	{value: 0x3b08, lo: 0xb9, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbc},
-	{value: 0x3308, lo: 0xbd, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x1a, offset 0x110
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x95},
-	{value: 0x3008, lo: 0x96, hi: 0x97},
-	{value: 0x3308, lo: 0x98, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0x9d},
-	{value: 0x3308, lo: 0x9e, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xa1},
-	{value: 0x3008, lo: 0xa2, hi: 0xa4},
-	{value: 0x0008, lo: 0xa5, hi: 0xa6},
-	{value: 0x3008, lo: 0xa7, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb0},
-	{value: 0x3308, lo: 0xb1, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xbf},
-	// Block 0x1b, offset 0x11f
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0008, lo: 0x80, hi: 0x81},
-	{value: 0x3308, lo: 0x82, hi: 0x82},
-	{value: 0x3008, lo: 0x83, hi: 0x84},
-	{value: 0x3308, lo: 0x85, hi: 0x86},
-	{value: 0x3008, lo: 0x87, hi: 0x8c},
-	{value: 0x3308, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x8e},
-	{value: 0x3008, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x3008, lo: 0x9a, hi: 0x9c},
-	{value: 0x3308, lo: 0x9d, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x1c, offset 0x12d
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x86},
-	{value: 0x055d, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8c},
-	{value: 0x055d, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbb},
-	{value: 0xe105, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0x1d, offset 0x137
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0018, lo: 0x80, hi: 0xbf},
-	// Block 0x1e, offset 0x139
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xa0},
-	{value: 0x2018, lo: 0xa1, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0x1f, offset 0x13e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xa7},
-	{value: 0x2018, lo: 0xa8, hi: 0xbf},
-	// Block 0x20, offset 0x141
-	{value: 0x0000, lo: 0x02},
-	{value: 0x2018, lo: 0x80, hi: 0x82},
-	{value: 0x0018, lo: 0x83, hi: 0xbf},
-	// Block 0x21, offset 0x144
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0008, lo: 0x80, hi: 0xbf},
-	// Block 0x22, offset 0x146
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x23, offset 0x152
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x24, offset 0x15d
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbf},
-	// Block 0x25, offset 0x165
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbf},
-	// Block 0x26, offset 0x16b
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0x9c},
-	{value: 0x3308, lo: 0x9d, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x27, offset 0x171
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x28, offset 0x176
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0xe045, lo: 0xb8, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x29, offset 0x17b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xbf},
-	// Block 0x2a, offset 0x17e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xac},
-	{value: 0x0018, lo: 0xad, hi: 0xae},
-	{value: 0x0008, lo: 0xaf, hi: 0xbf},
-	// Block 0x2b, offset 0x182
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9c},
-	{value: 0x0040, lo: 0x9d, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x2c, offset 0x188
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0x2d, offset 0x18d
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x91},
-	{value: 0x3308, lo: 0x92, hi: 0x93},
-	{value: 0x3b08, lo: 0x94, hi: 0x94},
-	{value: 0x3808, lo: 0x95, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x9e},
-	{value: 0x0008, lo: 0x9f, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb3},
-	{value: 0x3808, lo: 0xb4, hi: 0xb4},
-	{value: 0x0018, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x2e, offset 0x198
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x91},
-	{value: 0x3308, lo: 0x92, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x2f, offset 0x1a2
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xb3},
-	{value: 0x3340, lo: 0xb4, hi: 0xb5},
-	{value: 0x3008, lo: 0xb6, hi: 0xb6},
-	{value: 0x3308, lo: 0xb7, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x30, offset 0x1a8
-	{value: 0x0000, lo: 0x10},
-	{value: 0x3008, lo: 0x80, hi: 0x85},
-	{value: 0x3308, lo: 0x86, hi: 0x86},
-	{value: 0x3008, lo: 0x87, hi: 0x88},
-	{value: 0x3308, lo: 0x89, hi: 0x91},
-	{value: 0x3b08, lo: 0x92, hi: 0x92},
-	{value: 0x3308, lo: 0x93, hi: 0x93},
-	{value: 0x0018, lo: 0x94, hi: 0x96},
-	{value: 0x0008, lo: 0x97, hi: 0x97},
-	{value: 0x0018, lo: 0x98, hi: 0x9b},
-	{value: 0x0008, lo: 0x9c, hi: 0x9c},
-	{value: 0x3308, lo: 0x9d, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x31, offset 0x1b9
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0018, lo: 0x80, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x86},
-	{value: 0x0218, lo: 0x87, hi: 0x87},
-	{value: 0x0018, lo: 0x88, hi: 0x8a},
-	{value: 0x33c0, lo: 0x8b, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8e},
-	{value: 0x33c0, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0208, lo: 0xa0, hi: 0xbf},
-	// Block 0x32, offset 0x1c4
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0208, lo: 0x80, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0x33, offset 0x1c7
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x3308, lo: 0x85, hi: 0x86},
-	{value: 0x0208, lo: 0x87, hi: 0xa8},
-	{value: 0x3308, lo: 0xa9, hi: 0xa9},
-	{value: 0x0208, lo: 0xaa, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x34, offset 0x1cf
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0x35, offset 0x1d2
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x3308, lo: 0xa0, hi: 0xa2},
-	{value: 0x3008, lo: 0xa3, hi: 0xa6},
-	{value: 0x3308, lo: 0xa7, hi: 0xa8},
-	{value: 0x3008, lo: 0xa9, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x3008, lo: 0xb0, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb2},
-	{value: 0x3008, lo: 0xb3, hi: 0xb8},
-	{value: 0x3308, lo: 0xb9, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x36, offset 0x1df
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0x83},
-	{value: 0x0018, lo: 0x84, hi: 0x85},
-	{value: 0x0008, lo: 0x86, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x37, offset 0x1e7
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x38, offset 0x1eb
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0028, lo: 0x9a, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0xbf},
-	// Block 0x39, offset 0x1f2
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x3308, lo: 0x97, hi: 0x98},
-	{value: 0x3008, lo: 0x99, hi: 0x9a},
-	{value: 0x3308, lo: 0x9b, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x3a, offset 0x1fa
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x94},
-	{value: 0x3008, lo: 0x95, hi: 0x95},
-	{value: 0x3308, lo: 0x96, hi: 0x96},
-	{value: 0x3008, lo: 0x97, hi: 0x97},
-	{value: 0x3308, lo: 0x98, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x3b08, lo: 0xa0, hi: 0xa0},
-	{value: 0x3008, lo: 0xa1, hi: 0xa1},
-	{value: 0x3308, lo: 0xa2, hi: 0xa2},
-	{value: 0x3008, lo: 0xa3, hi: 0xa4},
-	{value: 0x3308, lo: 0xa5, hi: 0xac},
-	{value: 0x3008, lo: 0xad, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x3b, offset 0x20a
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa6},
-	{value: 0x0008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0018, lo: 0xa8, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xbd},
-	{value: 0x3318, lo: 0xbe, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x3c, offset 0x216
-	{value: 0x0000, lo: 0x02},
-	{value: 0x3308, lo: 0x80, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0xbf},
-	// Block 0x3d, offset 0x219
-	{value: 0x0000, lo: 0x09},
-	{value: 0x3308, lo: 0x80, hi: 0x83},
-	{value: 0x3008, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0xb3},
-	{value: 0x3308, lo: 0xb4, hi: 0xb4},
-	{value: 0x3008, lo: 0xb5, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbc},
-	{value: 0x3008, lo: 0xbd, hi: 0xbf},
-	// Block 0x3e, offset 0x223
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x3008, lo: 0x80, hi: 0x81},
-	{value: 0x3308, lo: 0x82, hi: 0x82},
-	{value: 0x3008, lo: 0x83, hi: 0x83},
-	{value: 0x3808, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0xaa},
-	{value: 0x3308, lo: 0xab, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x3f, offset 0x22f
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x3308, lo: 0x80, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xa0},
-	{value: 0x3008, lo: 0xa1, hi: 0xa1},
-	{value: 0x3308, lo: 0xa2, hi: 0xa5},
-	{value: 0x3008, lo: 0xa6, hi: 0xa7},
-	{value: 0x3308, lo: 0xa8, hi: 0xa9},
-	{value: 0x3808, lo: 0xaa, hi: 0xaa},
-	{value: 0x3b08, lo: 0xab, hi: 0xab},
-	{value: 0x3308, lo: 0xac, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xbf},
-	// Block 0x40, offset 0x23b
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x3308, lo: 0xa6, hi: 0xa6},
-	{value: 0x3008, lo: 0xa7, hi: 0xa7},
-	{value: 0x3308, lo: 0xa8, hi: 0xa9},
-	{value: 0x3008, lo: 0xaa, hi: 0xac},
-	{value: 0x3308, lo: 0xad, hi: 0xad},
-	{value: 0x3008, lo: 0xae, hi: 0xae},
-	{value: 0x3308, lo: 0xaf, hi: 0xb1},
-	{value: 0x3808, lo: 0xb2, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbb},
-	{value: 0x0018, lo: 0xbc, hi: 0xbf},
-	// Block 0x41, offset 0x247
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa3},
-	{value: 0x3008, lo: 0xa4, hi: 0xab},
-	{value: 0x3308, lo: 0xac, hi: 0xb3},
-	{value: 0x3008, lo: 0xb4, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbf},
-	// Block 0x42, offset 0x24f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x43, offset 0x254
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x02a9, lo: 0x80, hi: 0x80},
-	{value: 0x02b1, lo: 0x81, hi: 0x81},
-	{value: 0x02b9, lo: 0x82, hi: 0x82},
-	{value: 0x02c1, lo: 0x83, hi: 0x83},
-	{value: 0x02c9, lo: 0x84, hi: 0x85},
-	{value: 0x02d1, lo: 0x86, hi: 0x86},
-	{value: 0x02d9, lo: 0x87, hi: 0x87},
-	{value: 0x057d, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x059d, lo: 0x90, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbc},
-	{value: 0x059d, lo: 0xbd, hi: 0xbf},
-	// Block 0x44, offset 0x261
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x3308, lo: 0x90, hi: 0x92},
-	{value: 0x0018, lo: 0x93, hi: 0x93},
-	{value: 0x3308, lo: 0x94, hi: 0xa0},
-	{value: 0x3008, lo: 0xa1, hi: 0xa1},
-	{value: 0x3308, lo: 0xa2, hi: 0xa8},
-	{value: 0x0008, lo: 0xa9, hi: 0xac},
-	{value: 0x3308, lo: 0xad, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb3},
-	{value: 0x3308, lo: 0xb4, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xb6},
-	{value: 0x3008, lo: 0xb7, hi: 0xb7},
-	{value: 0x3308, lo: 0xb8, hi: 0xb9},
-	{value: 0x0008, lo: 0xba, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x45, offset 0x272
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x87},
-	{value: 0xe045, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0xe045, lo: 0x98, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa7},
-	{value: 0xe045, lo: 0xa8, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb7},
-	{value: 0xe045, lo: 0xb8, hi: 0xbf},
-	// Block 0x46, offset 0x27d
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0x8f},
-	{value: 0x3318, lo: 0x90, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0x47, offset 0x282
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x88},
-	{value: 0x0851, lo: 0x89, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x48, offset 0x28b
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x0859, lo: 0xac, hi: 0xac},
-	{value: 0x0861, lo: 0xad, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xae},
-	{value: 0x0869, lo: 0xaf, hi: 0xaf},
-	{value: 0x0871, lo: 0xb0, hi: 0xb0},
-	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0x49, offset 0x293
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x9f},
-	{value: 0x0080, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xad},
-	{value: 0x0080, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x4a, offset 0x299
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0xa8},
-	{value: 0x09dd, lo: 0xa9, hi: 0xa9},
-	{value: 0x09fd, lo: 0xaa, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xbf},
-	// Block 0x4b, offset 0x29e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xbf},
-	// Block 0x4c, offset 0x2a1
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x0929, lo: 0x8c, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0xbf},
-	// Block 0x4d, offset 0x2a5
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0xb3},
-	{value: 0x0e7e, lo: 0xb4, hi: 0xb4},
-	{value: 0x0932, lo: 0xb5, hi: 0xb5},
-	{value: 0x0e9e, lo: 0xb6, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x4e, offset 0x2ab
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x9b},
-	{value: 0x0939, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0xbf},
-	// Block 0x4f, offset 0x2af
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0x50, offset 0x2b3
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x96},
-	{value: 0x0018, lo: 0x97, hi: 0xbf},
-	// Block 0x51, offset 0x2b7
-	{value: 0x0000, lo: 0x04},
-	{value: 0xe185, lo: 0x80, hi: 0x8f},
-	{value: 0x03f5, lo: 0x90, hi: 0x9f},
-	{value: 0x0ebd, lo: 0xa0, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x52, offset 0x2bc
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x0040, lo: 0xa6, hi: 0xa6},
-	{value: 0x0008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xac},
-	{value: 0x0008, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x53, offset 0x2c4
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xae},
-	{value: 0xe075, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0x54, offset 0x2cb
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x55, offset 0x2d6
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x3308, lo: 0xa0, hi: 0xbf},
-	// Block 0x56, offset 0x2e0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xae},
-	{value: 0x0008, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x57, offset 0x2e4
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x58, offset 0x2e7
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9e},
-	{value: 0x0ef5, lo: 0x9f, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0x59, offset 0x2ed
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb2},
-	{value: 0x0f15, lo: 0xb3, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x5a, offset 0x2f1
-	{value: 0x0020, lo: 0x01},
-	{value: 0x0f35, lo: 0x80, hi: 0xbf},
-	// Block 0x5b, offset 0x2f3
-	{value: 0x0020, lo: 0x02},
-	{value: 0x1735, lo: 0x80, hi: 0x8f},
-	{value: 0x1915, lo: 0x90, hi: 0xbf},
-	// Block 0x5c, offset 0x2f6
-	{value: 0x0020, lo: 0x01},
-	{value: 0x1f15, lo: 0x80, hi: 0xbf},
-	// Block 0x5d, offset 0x2f8
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xbf},
-	// Block 0x5e, offset 0x2fb
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x98},
-	{value: 0x3308, lo: 0x99, hi: 0x9a},
-	{value: 0x096a, lo: 0x9b, hi: 0x9b},
-	{value: 0x0972, lo: 0x9c, hi: 0x9c},
-	{value: 0x0008, lo: 0x9d, hi: 0x9e},
-	{value: 0x0979, lo: 0x9f, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xbf},
-	// Block 0x5f, offset 0x305
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xbe},
-	{value: 0x0981, lo: 0xbf, hi: 0xbf},
-	// Block 0x60, offset 0x308
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0040, lo: 0x80, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xb0},
-	{value: 0x2a35, lo: 0xb1, hi: 0xb1},
-	{value: 0x2a55, lo: 0xb2, hi: 0xb2},
-	{value: 0x2a75, lo: 0xb3, hi: 0xb3},
-	{value: 0x2a95, lo: 0xb4, hi: 0xb4},
-	{value: 0x2a75, lo: 0xb5, hi: 0xb5},
-	{value: 0x2ab5, lo: 0xb6, hi: 0xb6},
-	{value: 0x2ad5, lo: 0xb7, hi: 0xb7},
-	{value: 0x2af5, lo: 0xb8, hi: 0xb9},
-	{value: 0x2b15, lo: 0xba, hi: 0xbb},
-	{value: 0x2b35, lo: 0xbc, hi: 0xbd},
-	{value: 0x2b15, lo: 0xbe, hi: 0xbf},
-	// Block 0x61, offset 0x317
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x62, offset 0x31b
-	{value: 0x0008, lo: 0x03},
-	{value: 0x098a, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x0a82, lo: 0xa0, hi: 0xbf},
-	// Block 0x63, offset 0x31f
-	{value: 0x0008, lo: 0x01},
-	{value: 0x0d19, lo: 0x80, hi: 0xbf},
-	// Block 0x64, offset 0x321
-	{value: 0x0008, lo: 0x08},
-	{value: 0x0f19, lo: 0x80, hi: 0xb0},
-	{value: 0x4045, lo: 0xb1, hi: 0xb1},
-	{value: 0x10a1, lo: 0xb2, hi: 0xb3},
-	{value: 0x4065, lo: 0xb4, hi: 0xb4},
-	{value: 0x10b1, lo: 0xb5, hi: 0xb7},
-	{value: 0x4085, lo: 0xb8, hi: 0xb8},
-	{value: 0x4085, lo: 0xb9, hi: 0xb9},
-	{value: 0x10c9, lo: 0xba, hi: 0xbf},
-	// Block 0x65, offset 0x32a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x66, offset 0x32e
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x67, offset 0x333
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x68, offset 0x338
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x0018, lo: 0xa6, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb1},
-	{value: 0x0018, lo: 0xb2, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x69, offset 0x33e
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x81},
-	{value: 0x3308, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0x85},
-	{value: 0x3b08, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x8a},
-	{value: 0x3308, lo: 0x8b, hi: 0x8b},
-	{value: 0x0008, lo: 0x8c, hi: 0xa2},
-	{value: 0x3008, lo: 0xa3, hi: 0xa4},
-	{value: 0x3308, lo: 0xa5, hi: 0xa6},
-	{value: 0x3008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0018, lo: 0xa8, hi: 0xab},
-	{value: 0x3b08, lo: 0xac, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x6a, offset 0x34e
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0208, lo: 0x80, hi: 0xb1},
-	{value: 0x0108, lo: 0xb2, hi: 0xb2},
-	{value: 0x0008, lo: 0xb3, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6b, offset 0x354
-	{value: 0x0000, lo: 0x03},
-	{value: 0x3008, lo: 0x80, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0xb3},
-	{value: 0x3008, lo: 0xb4, hi: 0xbf},
-	// Block 0x6c, offset 0x358
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x3008, lo: 0x80, hi: 0x83},
-	{value: 0x3b08, lo: 0x84, hi: 0x84},
-	{value: 0x3308, lo: 0x85, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8d},
-	{value: 0x0018, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x3308, lo: 0xa0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xba},
-	{value: 0x0008, lo: 0xbb, hi: 0xbb},
-	{value: 0x0018, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x6d, offset 0x367
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x3308, lo: 0xa6, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x6e, offset 0x36c
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x3308, lo: 0x87, hi: 0x91},
-	{value: 0x3008, lo: 0x92, hi: 0x92},
-	{value: 0x3808, lo: 0x93, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x6f, offset 0x374
-	{value: 0x0000, lo: 0x09},
-	{value: 0x3308, lo: 0x80, hi: 0x82},
-	{value: 0x3008, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb3},
-	{value: 0x3008, lo: 0xb4, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xb9},
-	{value: 0x3008, lo: 0xba, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x70, offset 0x37e
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x3808, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa4},
-	{value: 0x3308, lo: 0xa5, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x71, offset 0x389
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa8},
-	{value: 0x3308, lo: 0xa9, hi: 0xae},
-	{value: 0x3008, lo: 0xaf, hi: 0xb0},
-	{value: 0x3308, lo: 0xb1, hi: 0xb2},
-	{value: 0x3008, lo: 0xb3, hi: 0xb4},
-	{value: 0x3308, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x72, offset 0x391
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x82},
-	{value: 0x3308, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x8b},
-	{value: 0x3308, lo: 0x8c, hi: 0x8c},
-	{value: 0x3008, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0018, lo: 0x9c, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xb9},
-	{value: 0x0008, lo: 0xba, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbc},
-	{value: 0x3008, lo: 0xbd, hi: 0xbd},
-	{value: 0x0008, lo: 0xbe, hi: 0xbf},
-	// Block 0x73, offset 0x3a2
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xb6},
-	{value: 0x3308, lo: 0xb7, hi: 0xb8},
-	{value: 0x0008, lo: 0xb9, hi: 0xbd},
-	{value: 0x3308, lo: 0xbe, hi: 0xbf},
-	// Block 0x74, offset 0x3ab
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x9a},
-	{value: 0x0008, lo: 0x9b, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xaa},
-	{value: 0x3008, lo: 0xab, hi: 0xab},
-	{value: 0x3308, lo: 0xac, hi: 0xad},
-	{value: 0x3008, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb4},
-	{value: 0x3008, lo: 0xb5, hi: 0xb5},
-	{value: 0x3b08, lo: 0xb6, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x75, offset 0x3bb
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x88},
-	{value: 0x0008, lo: 0x89, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x90},
-	{value: 0x0008, lo: 0x91, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x76, offset 0x3c8
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9b},
-	{value: 0x449d, lo: 0x9c, hi: 0x9c},
-	{value: 0x44b5, lo: 0x9d, hi: 0x9d},
-	{value: 0x0941, lo: 0x9e, hi: 0x9e},
-	{value: 0xe06d, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa8},
-	{value: 0x13f9, lo: 0xa9, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x44cd, lo: 0xb0, hi: 0xbf},
-	// Block 0x77, offset 0x3d4
-	{value: 0x0000, lo: 0x04},
-	{value: 0x44ed, lo: 0x80, hi: 0x8f},
-	{value: 0x450d, lo: 0x90, hi: 0x9f},
-	{value: 0x452d, lo: 0xa0, hi: 0xaf},
-	{value: 0x450d, lo: 0xb0, hi: 0xbf},
-	// Block 0x78, offset 0x3d9
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0xa2},
-	{value: 0x3008, lo: 0xa3, hi: 0xa4},
-	{value: 0x3308, lo: 0xa5, hi: 0xa5},
-	{value: 0x3008, lo: 0xa6, hi: 0xa7},
-	{value: 0x3308, lo: 0xa8, hi: 0xa8},
-	{value: 0x3008, lo: 0xa9, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xab},
-	{value: 0x3008, lo: 0xac, hi: 0xac},
-	{value: 0x3b08, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x79, offset 0x3e6
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x7a, offset 0x3ea
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8a},
-	{value: 0x0018, lo: 0x8b, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x7b, offset 0x3ef
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0040, lo: 0x80, hi: 0xbf},
-	// Block 0x7c, offset 0x3f1
-	{value: 0x0020, lo: 0x01},
-	{value: 0x454d, lo: 0x80, hi: 0xbf},
-	// Block 0x7d, offset 0x3f3
-	{value: 0x0020, lo: 0x03},
-	{value: 0x4d4d, lo: 0x80, hi: 0x94},
-	{value: 0x4b0d, lo: 0x95, hi: 0x95},
-	{value: 0x4fed, lo: 0x96, hi: 0xbf},
-	// Block 0x7e, offset 0x3f7
-	{value: 0x0020, lo: 0x01},
-	{value: 0x552d, lo: 0x80, hi: 0xbf},
-	// Block 0x7f, offset 0x3f9
-	{value: 0x0020, lo: 0x03},
-	{value: 0x5d2d, lo: 0x80, hi: 0x84},
-	{value: 0x568d, lo: 0x85, hi: 0x85},
-	{value: 0x5dcd, lo: 0x86, hi: 0xbf},
-	// Block 0x80, offset 0x3fd
-	{value: 0x0020, lo: 0x08},
-	{value: 0x6b8d, lo: 0x80, hi: 0x8f},
-	{value: 0x6d4d, lo: 0x90, hi: 0x90},
-	{value: 0x6d8d, lo: 0x91, hi: 0xab},
-	{value: 0x1401, lo: 0xac, hi: 0xac},
-	{value: 0x70ed, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x710d, lo: 0xb0, hi: 0xbf},
-	// Block 0x81, offset 0x406
-	{value: 0x0020, lo: 0x05},
-	{value: 0x730d, lo: 0x80, hi: 0xad},
-	{value: 0x656d, lo: 0xae, hi: 0xae},
-	{value: 0x78cd, lo: 0xaf, hi: 0xb5},
-	{value: 0x6f8d, lo: 0xb6, hi: 0xb6},
-	{value: 0x79ad, lo: 0xb7, hi: 0xbf},
-	// Block 0x82, offset 0x40c
-	{value: 0x0008, lo: 0x03},
-	{value: 0x1751, lo: 0x80, hi: 0x82},
-	{value: 0x1741, lo: 0x83, hi: 0x83},
-	{value: 0x1769, lo: 0x84, hi: 0xbf},
-	// Block 0x83, offset 0x410
-	{value: 0x0008, lo: 0x0f},
-	{value: 0x1d81, lo: 0x80, hi: 0x83},
-	{value: 0x1d99, lo: 0x84, hi: 0x85},
-	{value: 0x1da1, lo: 0x86, hi: 0x87},
-	{value: 0x1da9, lo: 0x88, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x1de9, lo: 0x92, hi: 0x97},
-	{value: 0x1e11, lo: 0x98, hi: 0x9c},
-	{value: 0x1e31, lo: 0x9d, hi: 0xb3},
-	{value: 0x1d71, lo: 0xb4, hi: 0xb4},
-	{value: 0x1d81, lo: 0xb5, hi: 0xb5},
-	{value: 0x1ee9, lo: 0xb6, hi: 0xbb},
-	{value: 0x1f09, lo: 0xbc, hi: 0xbc},
-	{value: 0x1ef9, lo: 0xbd, hi: 0xbd},
-	{value: 0x1f19, lo: 0xbe, hi: 0xbf},
-	// Block 0x84, offset 0x420
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbb},
-	{value: 0x0008, lo: 0xbc, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x85, offset 0x42a
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x86, offset 0x42f
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x87, offset 0x432
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x88, offset 0x438
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x9c},
-	{value: 0x0040, lo: 0x9d, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa0},
-	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x89, offset 0x43f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbc},
-	{value: 0x3308, lo: 0xbd, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x8a, offset 0x444
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x9c},
-	{value: 0x0040, lo: 0x9d, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x8b, offset 0x448
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x9f},
-	{value: 0x3308, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x8c, offset 0x44e
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xac},
-	{value: 0x0008, lo: 0xad, hi: 0xbf},
-	// Block 0x8d, offset 0x453
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x8e, offset 0x45c
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x8f, offset 0x461
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0x90, offset 0x467
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe145, lo: 0x80, hi: 0x87},
-	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
-	{value: 0xe145, lo: 0x90, hi: 0x97},
-	{value: 0x8b0d, lo: 0x98, hi: 0x9f},
-	{value: 0x8b25, lo: 0xa0, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xbf},
-	// Block 0x91, offset 0x46e
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x8b25, lo: 0xb0, hi: 0xb7},
-	{value: 0x8b0d, lo: 0xb8, hi: 0xbf},
-	// Block 0x92, offset 0x475
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe145, lo: 0x80, hi: 0x87},
-	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
-	{value: 0xe145, lo: 0x90, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x93, offset 0x47c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x94, offset 0x480
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x95, offset 0x483
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xbf},
-	// Block 0x96, offset 0x488
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0808, lo: 0x80, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x87},
-	{value: 0x0808, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0808, lo: 0x8a, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb6},
-	{value: 0x0808, lo: 0xb7, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbb},
-	{value: 0x0808, lo: 0xbc, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbe},
-	{value: 0x0808, lo: 0xbf, hi: 0xbf},
-	// Block 0x97, offset 0x494
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0808, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x96},
-	{value: 0x0818, lo: 0x97, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xb6},
-	{value: 0x0818, lo: 0xb7, hi: 0xbf},
-	// Block 0x98, offset 0x49a
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0808, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xa6},
-	{value: 0x0818, lo: 0xa7, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x99, offset 0x49f
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb3},
-	{value: 0x0808, lo: 0xb4, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xba},
-	{value: 0x0818, lo: 0xbb, hi: 0xbf},
-	// Block 0x9a, offset 0x4a6
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0808, lo: 0x80, hi: 0x95},
-	{value: 0x0818, lo: 0x96, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbe},
-	{value: 0x0818, lo: 0xbf, hi: 0xbf},
-	// Block 0x9b, offset 0x4ae
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0808, lo: 0x80, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbb},
-	{value: 0x0818, lo: 0xbc, hi: 0xbd},
-	{value: 0x0808, lo: 0xbe, hi: 0xbf},
-	// Block 0x9c, offset 0x4b3
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0818, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x91},
-	{value: 0x0818, lo: 0x92, hi: 0xbf},
-	// Block 0x9d, offset 0x4b7
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0808, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x3308, lo: 0x85, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8b},
-	{value: 0x3308, lo: 0x8c, hi: 0x8f},
-	{value: 0x0808, lo: 0x90, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x94},
-	{value: 0x0808, lo: 0x95, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0x98},
-	{value: 0x0808, lo: 0x99, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0x3308, lo: 0xb8, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0x9e, offset 0x4c7
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0818, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x0818, lo: 0x90, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xbc},
-	{value: 0x0818, lo: 0xbd, hi: 0xbf},
-	// Block 0x9f, offset 0x4ce
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0808, lo: 0x80, hi: 0x9c},
-	{value: 0x0818, lo: 0x9d, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xa0, offset 0x4d2
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0808, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb8},
-	{value: 0x0018, lo: 0xb9, hi: 0xbf},
-	// Block 0xa1, offset 0x4d6
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0808, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0x0818, lo: 0x98, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb7},
-	{value: 0x0818, lo: 0xb8, hi: 0xbf},
-	// Block 0xa2, offset 0x4dd
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0808, lo: 0x80, hi: 0xbf},
-	// Block 0xa3, offset 0x4df
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0808, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xa4, offset 0x4e2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x03dd, lo: 0x80, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xa5, offset 0x4e5
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0808, lo: 0x80, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb9},
-	{value: 0x0818, lo: 0xba, hi: 0xbf},
-	// Block 0xa6, offset 0x4e9
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0908, lo: 0x80, hi: 0x80},
-	{value: 0x0a08, lo: 0x81, hi: 0xa1},
-	{value: 0x0c08, lo: 0xa2, hi: 0xa2},
-	{value: 0x0a08, lo: 0xa3, hi: 0xa3},
-	{value: 0x3308, lo: 0xa4, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0808, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xa7, offset 0x4f2
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0818, lo: 0xa0, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xa8, offset 0x4f6
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0808, lo: 0x80, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaa},
-	{value: 0x3308, lo: 0xab, hi: 0xac},
-	{value: 0x0818, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0808, lo: 0xb0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xa9, offset 0x4fe
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0xbc},
-	{value: 0x3308, lo: 0xbd, hi: 0xbf},
-	// Block 0xaa, offset 0x501
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0808, lo: 0x80, hi: 0x9c},
-	{value: 0x0818, lo: 0x9d, hi: 0xa6},
-	{value: 0x0808, lo: 0xa7, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0a08, lo: 0xb0, hi: 0xb2},
-	{value: 0x0c08, lo: 0xb3, hi: 0xb3},
-	{value: 0x0a08, lo: 0xb4, hi: 0xbf},
-	// Block 0xab, offset 0x509
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0a08, lo: 0x80, hi: 0x84},
-	{value: 0x0808, lo: 0x85, hi: 0x85},
-	{value: 0x3308, lo: 0x86, hi: 0x90},
-	{value: 0x0a18, lo: 0x91, hi: 0x93},
-	{value: 0x0c18, lo: 0x94, hi: 0x94},
-	{value: 0x0818, lo: 0x95, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xaf},
-	{value: 0x0a08, lo: 0xb0, hi: 0xb3},
-	{value: 0x0c08, lo: 0xb4, hi: 0xb5},
-	{value: 0x0a08, lo: 0xb6, hi: 0xbf},
-	// Block 0xac, offset 0x514
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0a08, lo: 0x80, hi: 0x81},
-	{value: 0x3308, lo: 0x82, hi: 0x85},
-	{value: 0x0818, lo: 0x86, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0xaf},
-	{value: 0x0a08, lo: 0xb0, hi: 0xb0},
-	{value: 0x0808, lo: 0xb1, hi: 0xb1},
-	{value: 0x0a08, lo: 0xb2, hi: 0xb3},
-	{value: 0x0c08, lo: 0xb4, hi: 0xb6},
-	{value: 0x0808, lo: 0xb7, hi: 0xb7},
-	{value: 0x0a08, lo: 0xb8, hi: 0xb8},
-	{value: 0x0c08, lo: 0xb9, hi: 0xba},
-	{value: 0x0a08, lo: 0xbb, hi: 0xbc},
-	{value: 0x0c08, lo: 0xbd, hi: 0xbd},
-	{value: 0x0a08, lo: 0xbe, hi: 0xbf},
-	// Block 0xad, offset 0x523
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0808, lo: 0x80, hi: 0x80},
-	{value: 0x0a08, lo: 0x81, hi: 0x81},
-	{value: 0x0c08, lo: 0x82, hi: 0x83},
-	{value: 0x0a08, lo: 0x84, hi: 0x84},
-	{value: 0x0818, lo: 0x85, hi: 0x88},
-	{value: 0x0c18, lo: 0x89, hi: 0x89},
-	{value: 0x0a18, lo: 0x8a, hi: 0x8a},
-	{value: 0x0918, lo: 0x8b, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x9f},
-	{value: 0x0808, lo: 0xa0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xae, offset 0x52f
-	{value: 0x0000, lo: 0x05},
-	{value: 0x3008, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xb7},
-	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xaf, offset 0x535
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x3308, lo: 0x80, hi: 0x85},
-	{value: 0x3b08, lo: 0x86, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x91},
-	{value: 0x0018, lo: 0x92, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x3b08, lo: 0xb0, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xb0, offset 0x542
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x3308, lo: 0x80, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xaf},
-	{value: 0x3008, lo: 0xb0, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb6},
-	{value: 0x3008, lo: 0xb7, hi: 0xb8},
-	{value: 0x3b08, lo: 0xb9, hi: 0xb9},
-	{value: 0x3308, lo: 0xba, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0xb1, offset 0x54e
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0x81},
-	{value: 0x3308, lo: 0x82, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xb2, offset 0x556
-	{value: 0x0000, lo: 0x08},
-	{value: 0x3308, lo: 0x80, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xa6},
-	{value: 0x3308, lo: 0xa7, hi: 0xab},
-	{value: 0x3008, lo: 0xac, hi: 0xac},
-	{value: 0x3308, lo: 0xad, hi: 0xb2},
-	{value: 0x3b08, lo: 0xb3, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xb5},
-	{value: 0x0008, lo: 0xb6, hi: 0xbf},
-	// Block 0xb3, offset 0x55f
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0018, lo: 0x80, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x84},
-	{value: 0x3008, lo: 0x85, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb5},
-	{value: 0x0008, lo: 0xb6, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb4, offset 0x56a
-	{value: 0x0000, lo: 0x06},
-	{value: 0x3308, lo: 0x80, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xb2},
-	{value: 0x3008, lo: 0xb3, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xbe},
-	{value: 0x3008, lo: 0xbf, hi: 0xbf},
-	// Block 0xb5, offset 0x571
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x3808, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x88},
-	{value: 0x3308, lo: 0x89, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8d},
-	{value: 0x3008, lo: 0x8e, hi: 0x8e},
-	{value: 0x3308, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9b},
-	{value: 0x0008, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xb6, offset 0x580
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0x92},
-	{value: 0x0008, lo: 0x93, hi: 0xab},
-	{value: 0x3008, lo: 0xac, hi: 0xae},
-	{value: 0x3308, lo: 0xaf, hi: 0xb1},
-	{value: 0x3008, lo: 0xb2, hi: 0xb3},
-	{value: 0x3308, lo: 0xb4, hi: 0xb4},
-	{value: 0x3808, lo: 0xb5, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xbd},
-	{value: 0x3308, lo: 0xbe, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0xb7, offset 0x58d
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x81},
-	{value: 0x0040, lo: 0x82, hi: 0xbf},
-	// Block 0xb8, offset 0x591
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9e},
-	{value: 0x0008, lo: 0x9f, hi: 0xa8},
-	{value: 0x0018, lo: 0xa9, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xb9, offset 0x59e
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x3308, lo: 0x9f, hi: 0x9f},
-	{value: 0x3008, lo: 0xa0, hi: 0xa2},
-	{value: 0x3308, lo: 0xa3, hi: 0xa9},
-	{value: 0x3b08, lo: 0xaa, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xba, offset 0x5a7
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xb4},
-	{value: 0x3008, lo: 0xb5, hi: 0xb7},
-	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xbb, offset 0x5ab
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x3008, lo: 0x80, hi: 0x81},
-	{value: 0x3b08, lo: 0x82, hi: 0x82},
-	{value: 0x3308, lo: 0x83, hi: 0x84},
-	{value: 0x3008, lo: 0x85, hi: 0x85},
-	{value: 0x3308, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x8a},
-	{value: 0x0018, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0x9d},
-	{value: 0x3308, lo: 0x9e, hi: 0x9e},
-	{value: 0x0008, lo: 0x9f, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xbf},
-	// Block 0xbc, offset 0x5ba
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x3008, lo: 0xb0, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb8},
-	{value: 0x3008, lo: 0xb9, hi: 0xb9},
-	{value: 0x3308, lo: 0xba, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xbd, offset 0x5c2
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x3008, lo: 0x81, hi: 0x81},
-	{value: 0x3b08, lo: 0x82, hi: 0x82},
-	{value: 0x3308, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x85},
-	{value: 0x0018, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xbe, offset 0x5cd
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0xae},
-	{value: 0x3008, lo: 0xaf, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0x3008, lo: 0xb8, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xbf, offset 0x5d6
-	{value: 0x0000, lo: 0x05},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x9b},
-	{value: 0x3308, lo: 0x9c, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0xc0, offset 0x5dc
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x3008, lo: 0xb0, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xba},
-	{value: 0x3008, lo: 0xbb, hi: 0xbc},
-	{value: 0x3308, lo: 0xbd, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc1, offset 0x5e4
-	{value: 0x0000, lo: 0x08},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xc2, offset 0x5ed
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x3308, lo: 0xab, hi: 0xab},
-	{value: 0x3008, lo: 0xac, hi: 0xac},
-	{value: 0x3308, lo: 0xad, hi: 0xad},
-	{value: 0x3008, lo: 0xae, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb5},
-	{value: 0x3808, lo: 0xb6, hi: 0xb6},
-	{value: 0x3308, lo: 0xb7, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xb8},
-	{value: 0x0018, lo: 0xb9, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xc3, offset 0x5f9
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0xbf},
-	// Block 0xc4, offset 0x5fc
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0x9c},
-	{value: 0x3308, lo: 0x9d, hi: 0x9f},
-	{value: 0x3008, lo: 0xa0, hi: 0xa1},
-	{value: 0x3308, lo: 0xa2, hi: 0xa5},
-	{value: 0x3008, lo: 0xa6, hi: 0xa6},
-	{value: 0x3308, lo: 0xa7, hi: 0xaa},
-	{value: 0x3b08, lo: 0xab, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0xc5, offset 0x608
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0xbf},
-	// Block 0xc6, offset 0x60b
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0xab},
-	{value: 0x3008, lo: 0xac, hi: 0xae},
-	{value: 0x3308, lo: 0xaf, hi: 0xb7},
-	{value: 0x3008, lo: 0xb8, hi: 0xb8},
-	{value: 0x3b08, lo: 0xb9, hi: 0xb9},
-	{value: 0x3308, lo: 0xba, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xc7, offset 0x614
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x049d, lo: 0xa0, hi: 0xbf},
-	// Block 0xc8, offset 0x617
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0xc9, offset 0x61c
-	{value: 0x0000, lo: 0x08},
-	{value: 0x3008, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x81},
-	{value: 0x3008, lo: 0x82, hi: 0x82},
-	{value: 0x3308, lo: 0x83, hi: 0x83},
-	{value: 0x0018, lo: 0x84, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xca, offset 0x625
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xa9},
-	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xcb, offset 0x62a
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x90},
-	{value: 0x3008, lo: 0x91, hi: 0x93},
-	{value: 0x3308, lo: 0x94, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0x99},
-	{value: 0x3308, lo: 0x9a, hi: 0x9b},
-	{value: 0x3008, lo: 0x9c, hi: 0x9f},
-	{value: 0x3b08, lo: 0xa0, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xa1},
-	{value: 0x0018, lo: 0xa2, hi: 0xa2},
-	{value: 0x0008, lo: 0xa3, hi: 0xa3},
-	{value: 0x3008, lo: 0xa4, hi: 0xa4},
-	{value: 0x0040, lo: 0xa5, hi: 0xbf},
-	// Block 0xcc, offset 0x637
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x3308, lo: 0x81, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb3},
-	{value: 0x3b08, lo: 0xb4, hi: 0xb4},
-	{value: 0x3308, lo: 0xb5, hi: 0xb8},
-	{value: 0x3008, lo: 0xb9, hi: 0xb9},
-	{value: 0x0008, lo: 0xba, hi: 0xba},
-	{value: 0x3308, lo: 0xbb, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xcd, offset 0x642
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x86},
-	{value: 0x3b08, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x90},
-	{value: 0x3308, lo: 0x91, hi: 0x96},
-	{value: 0x3008, lo: 0x97, hi: 0x98},
-	{value: 0x3308, lo: 0x99, hi: 0x9b},
-	{value: 0x0008, lo: 0x9c, hi: 0xbf},
-	// Block 0xce, offset 0x64b
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x3308, lo: 0x8a, hi: 0x96},
-	{value: 0x3008, lo: 0x97, hi: 0x97},
-	{value: 0x3308, lo: 0x98, hi: 0x98},
-	{value: 0x3b08, lo: 0x99, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9c},
-	{value: 0x0008, lo: 0x9d, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0xa2},
-	{value: 0x0040, lo: 0xa3, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xcf, offset 0x656
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd0, offset 0x659
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0xbf},
-	// Block 0xd1, offset 0x65c
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0xae},
-	{value: 0x3008, lo: 0xaf, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb7},
-	{value: 0x3308, lo: 0xb8, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbe},
-	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xd2, offset 0x666
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xbf},
-	// Block 0xd3, offset 0x66f
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x91},
-	{value: 0x3308, lo: 0x92, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xa8},
-	{value: 0x3008, lo: 0xa9, hi: 0xa9},
-	{value: 0x3308, lo: 0xaa, hi: 0xb0},
-	{value: 0x3008, lo: 0xb1, hi: 0xb1},
-	{value: 0x3308, lo: 0xb2, hi: 0xb3},
-	{value: 0x3008, lo: 0xb4, hi: 0xb4},
-	{value: 0x3308, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xd4, offset 0x67b
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0xb0},
-	{value: 0x3308, lo: 0xb1, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb9},
-	{value: 0x3308, lo: 0xba, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbb},
-	{value: 0x3308, lo: 0xbc, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbe},
-	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xd5, offset 0x688
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x3308, lo: 0x80, hi: 0x83},
-	{value: 0x3b08, lo: 0x84, hi: 0x85},
-	{value: 0x0008, lo: 0x86, hi: 0x86},
-	{value: 0x3308, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa5},
-	{value: 0x0040, lo: 0xa6, hi: 0xa6},
-	{value: 0x0008, lo: 0xa7, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xa9},
-	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xd6, offset 0x695
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x3008, lo: 0x8a, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x3308, lo: 0x90, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0x92},
-	{value: 0x3008, lo: 0x93, hi: 0x94},
-	{value: 0x3308, lo: 0x95, hi: 0x95},
-	{value: 0x3008, lo: 0x96, hi: 0x96},
-	{value: 0x3b08, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xbf},
-	// Block 0xd7, offset 0x6a3
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb2},
-	{value: 0x3308, lo: 0xb3, hi: 0xb4},
-	{value: 0x3008, lo: 0xb5, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd8, offset 0x6aa
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x3308, lo: 0x80, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x82},
-	{value: 0x3008, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0xb3},
-	{value: 0x3008, lo: 0xb4, hi: 0xb5},
-	{value: 0x3308, lo: 0xb6, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbd},
-	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0xd9, offset 0x6b5
-	{value: 0x0000, lo: 0x06},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x3808, lo: 0x81, hi: 0x81},
-	{value: 0x3b08, lo: 0x82, hi: 0x82},
-	{value: 0x0018, lo: 0x83, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xda, offset 0x6bc
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0xdb, offset 0x6c0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xdc, offset 0x6c4
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xdd, offset 0x6c7
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xde, offset 0x6cc
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0xbf},
-	// Block 0xdf, offset 0x6cf
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xbf},
-	// Block 0xe0, offset 0x6d2
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xb0},
-	{value: 0x0018, lo: 0xb1, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xe1, offset 0x6d6
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x0340, lo: 0xb0, hi: 0xbf},
-	// Block 0xe2, offset 0x6d9
-	{value: 0x0000, lo: 0x04},
-	{value: 0x3308, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x86},
-	{value: 0x3308, lo: 0x87, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0xe3, offset 0x6de
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xe4, offset 0x6e5
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xe5, offset 0x6e8
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb4},
-	{value: 0x0018, lo: 0xb5, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xe6, offset 0x6f0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0xe7, offset 0x6f4
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0018, lo: 0x84, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xa2},
-	{value: 0x0008, lo: 0xa3, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0xe8, offset 0x6ff
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0xe9, offset 0x702
-	{value: 0x0000, lo: 0x02},
-	{value: 0xe105, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0xea, offset 0x705
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0xbf},
-	// Block 0xeb, offset 0x708
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8e},
-	{value: 0x3308, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x90},
-	{value: 0x3008, lo: 0x91, hi: 0xbf},
-	// Block 0xec, offset 0x70e
-	{value: 0x0000, lo: 0x05},
-	{value: 0x3008, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8e},
-	{value: 0x3308, lo: 0x8f, hi: 0x92},
-	{value: 0x0008, lo: 0x93, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xed, offset 0x714
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa1},
-	{value: 0x0018, lo: 0xa2, hi: 0xa2},
-	{value: 0x0008, lo: 0xa3, hi: 0xa3},
-	{value: 0x3308, lo: 0xa4, hi: 0xa4},
-	{value: 0x0040, lo: 0xa5, hi: 0xaf},
-	{value: 0x3008, lo: 0xb0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xee, offset 0x71d
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0xef, offset 0x720
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0xf0, offset 0x723
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xf1, offset 0x726
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0040, lo: 0x80, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xf2, offset 0x72e
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa2},
-	{value: 0x0040, lo: 0xa3, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xf3, offset 0x733
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x92},
-	{value: 0x0040, lo: 0x93, hi: 0x94},
-	{value: 0x0008, lo: 0x95, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xa3},
-	{value: 0x0008, lo: 0xa4, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xf4, offset 0x73c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xf5, offset 0x73f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0xf6, offset 0x744
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0018, lo: 0x9c, hi: 0x9c},
-	{value: 0x3308, lo: 0x9d, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x03c0, lo: 0xa0, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xbf},
-	// Block 0xf7, offset 0x74e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x3308, lo: 0x80, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xbf},
-	// Block 0xf8, offset 0x752
-	{value: 0x0000, lo: 0x03},
-	{value: 0x3308, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0xf9, offset 0x756
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0xbf},
-	// Block 0xfa, offset 0x759
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xfb, offset 0x75c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa8},
-	{value: 0x0018, lo: 0xa9, hi: 0xbf},
-	// Block 0xfc, offset 0x760
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0018, lo: 0x80, hi: 0x9d},
-	{value: 0x2379, lo: 0x9e, hi: 0x9e},
-	{value: 0x2381, lo: 0x9f, hi: 0x9f},
-	{value: 0x2389, lo: 0xa0, hi: 0xa0},
-	{value: 0x2391, lo: 0xa1, hi: 0xa1},
-	{value: 0x2399, lo: 0xa2, hi: 0xa2},
-	{value: 0x23a1, lo: 0xa3, hi: 0xa3},
-	{value: 0x23a9, lo: 0xa4, hi: 0xa4},
-	{value: 0x3018, lo: 0xa5, hi: 0xa6},
-	{value: 0x3318, lo: 0xa7, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xac},
-	{value: 0x3018, lo: 0xad, hi: 0xb2},
-	{value: 0x0340, lo: 0xb3, hi: 0xba},
-	{value: 0x3318, lo: 0xbb, hi: 0xbf},
-	// Block 0xfd, offset 0x76f
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x3318, lo: 0x80, hi: 0x82},
-	{value: 0x0018, lo: 0x83, hi: 0x84},
-	{value: 0x3318, lo: 0x85, hi: 0x8b},
-	{value: 0x0018, lo: 0x8c, hi: 0xa9},
-	{value: 0x3318, lo: 0xaa, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xba},
-	{value: 0x23b1, lo: 0xbb, hi: 0xbb},
-	{value: 0x23b9, lo: 0xbc, hi: 0xbc},
-	{value: 0x23c1, lo: 0xbd, hi: 0xbd},
-	{value: 0x23c9, lo: 0xbe, hi: 0xbe},
-	{value: 0x23d1, lo: 0xbf, hi: 0xbf},
-	// Block 0xfe, offset 0x77b
-	{value: 0x0000, lo: 0x03},
-	{value: 0x23d9, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xbf},
-	// Block 0xff, offset 0x77f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x81},
-	{value: 0x3318, lo: 0x82, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0xbf},
-	// Block 0x100, offset 0x784
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x101, offset 0x789
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0x102, offset 0x78e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x3308, lo: 0x80, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xba},
-	{value: 0x3308, lo: 0xbb, hi: 0xbf},
-	// Block 0x103, offset 0x792
-	{value: 0x0000, lo: 0x04},
-	{value: 0x3308, lo: 0x80, hi: 0xac},
-	{value: 0x0018, lo: 0xad, hi: 0xb4},
-	{value: 0x3308, lo: 0xb5, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0x104, offset 0x797
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x83},
-	{value: 0x3308, lo: 0x84, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x9a},
-	{value: 0x3308, lo: 0x9b, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa0},
-	{value: 0x3308, lo: 0xa1, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x105, offset 0x7a0
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xa4},
-	{value: 0x0008, lo: 0xa5, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xbf},
-	// Block 0x106, offset 0x7a5
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x8e},
-	{value: 0x3308, lo: 0x8f, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0x107, offset 0x7a9
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x3308, lo: 0xb0, hi: 0xb6},
-	{value: 0x0008, lo: 0xb7, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x108, offset 0x7af
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x8e},
-	{value: 0x0018, lo: 0x8f, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0x109, offset 0x7b5
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xad},
-	{value: 0x3308, lo: 0xae, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xbf},
-	// Block 0x10a, offset 0x7ba
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xab},
-	{value: 0x3308, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x10b, offset 0x7c0
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xab},
-	{value: 0x3308, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x10c, offset 0x7c6
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xac},
-	{value: 0x0008, lo: 0xad, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x10d, offset 0x7d0
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0808, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x86},
-	{value: 0x0818, lo: 0x87, hi: 0x8f},
-	{value: 0x3308, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0x10e, offset 0x7d6
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0a08, lo: 0x80, hi: 0x83},
-	{value: 0x3308, lo: 0x84, hi: 0x8a},
-	{value: 0x0b08, lo: 0x8b, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0808, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9d},
-	{value: 0x0818, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x10f, offset 0x7df
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0xb0},
-	{value: 0x0818, lo: 0xb1, hi: 0xbf},
-	// Block 0x110, offset 0x7e2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0818, lo: 0x80, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x111, offset 0x7e5
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0818, lo: 0x81, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x112, offset 0x7e9
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x113, offset 0x7ed
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x114, offset 0x7f1
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xb0},
-	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0x115, offset 0x7f7
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x0018, lo: 0x91, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0x116, offset 0x7fd
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x8f},
-	{value: 0x2709, lo: 0x90, hi: 0x90},
-	{value: 0x0018, lo: 0x91, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xbf},
-	// Block 0x117, offset 0x802
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0xa5},
-	{value: 0x0018, lo: 0xa6, hi: 0xbf},
-	// Block 0x118, offset 0x805
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x2889, lo: 0x80, hi: 0x80},
-	{value: 0x2891, lo: 0x81, hi: 0x81},
-	{value: 0x2899, lo: 0x82, hi: 0x82},
-	{value: 0x28a1, lo: 0x83, hi: 0x83},
-	{value: 0x28a9, lo: 0x84, hi: 0x84},
-	{value: 0x28b1, lo: 0x85, hi: 0x85},
-	{value: 0x28b9, lo: 0x86, hi: 0x86},
-	{value: 0x28c1, lo: 0x87, hi: 0x87},
-	{value: 0x28c9, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x28d1, lo: 0x90, hi: 0x90},
-	{value: 0x28d9, lo: 0x91, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa5},
-	{value: 0x0040, lo: 0xa6, hi: 0xbf},
-	// Block 0x119, offset 0x815
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0x9b},
-	{value: 0x0018, lo: 0x9c, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x11a, offset 0x81c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbf},
-	// Block 0x11b, offset 0x820
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0x11c, offset 0x827
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x11d, offset 0x82b
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0x11e, offset 0x831
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x11f, offset 0x838
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x120, offset 0x83f
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x121, offset 0x845
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8d},
-	{value: 0x0018, lo: 0x8e, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0x122, offset 0x84e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x92},
-	{value: 0x0040, lo: 0x93, hi: 0x93},
-	{value: 0x0018, lo: 0x94, hi: 0xbf},
-	// Block 0x123, offset 0x852
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0018, lo: 0x80, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0xaf},
-	{value: 0x06e1, lo: 0xb0, hi: 0xb0},
-	{value: 0x0049, lo: 0xb1, hi: 0xb1},
-	{value: 0x0029, lo: 0xb2, hi: 0xb2},
-	{value: 0x0031, lo: 0xb3, hi: 0xb3},
-	{value: 0x06e9, lo: 0xb4, hi: 0xb4},
-	{value: 0x06f1, lo: 0xb5, hi: 0xb5},
-	{value: 0x06f9, lo: 0xb6, hi: 0xb6},
-	{value: 0x0701, lo: 0xb7, hi: 0xb7},
-	{value: 0x0709, lo: 0xb8, hi: 0xb8},
-	{value: 0x0711, lo: 0xb9, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x124, offset 0x860
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x125, offset 0x863
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x126, offset 0x866
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x127, offset 0x86a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x128, offset 0x86e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xa0},
-	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x129, offset 0x871
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xbf},
-	// Block 0x12a, offset 0x875
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x12b, offset 0x878
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0340, lo: 0x81, hi: 0x81},
-	{value: 0x0040, lo: 0x82, hi: 0x9f},
-	{value: 0x0340, lo: 0xa0, hi: 0xbf},
-	// Block 0x12c, offset 0x87d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0340, lo: 0x80, hi: 0xbf},
-	// Block 0x12d, offset 0x87f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x33c0, lo: 0x80, hi: 0xbf},
-	// Block 0x12e, offset 0x881
-	{value: 0x0000, lo: 0x02},
-	{value: 0x33c0, lo: 0x80, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-}
-
-// Total table size 46723 bytes (45KiB); checksum: 4CF3143A
diff --git a/vendor/golang.org/x/net/idna/tables9.0.0.go b/vendor/golang.org/x/net/idna/tables9.0.0.go
index 0f25e84..4074b53 100644
--- a/vendor/golang.org/x/net/idna/tables9.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables9.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build !go1.10
+// +build !go1.10
 
 package idna
 
diff --git a/vendor/golang.org/x/net/idna/trie.go b/vendor/golang.org/x/net/idna/trie.go
index 4212741..c4ef847 100644
--- a/vendor/golang.org/x/net/idna/trie.go
+++ b/vendor/golang.org/x/net/idna/trie.go
@@ -6,6 +6,27 @@
 
 package idna
 
+// appendMapping appends the mapping for the respective rune. isMapped must be
+// true. A mapping is a categorization of a rune as defined in UTS #46.
+func (c info) appendMapping(b []byte, s string) []byte {
+	index := int(c >> indexShift)
+	if c&xorBit == 0 {
+		s := mappings[index:]
+		return append(b, s[1:s[0]+1]...)
+	}
+	b = append(b, s...)
+	if c&inlineXOR == inlineXOR {
+		// TODO: support and handle two-byte inline masks
+		b[len(b)-1] ^= byte(index)
+	} else {
+		for p := len(b) - int(xorData[index]); p < len(b); p++ {
+			index++
+			b[p] ^= xorData[index]
+		}
+	}
+	return b
+}
+
 // Sparse block handling code.
 
 type valueRange struct {
diff --git a/vendor/golang.org/x/net/idna/trie12.0.0.go b/vendor/golang.org/x/net/idna/trie12.0.0.go
deleted file mode 100644
index 8a75b96..0000000
--- a/vendor/golang.org/x/net/idna/trie12.0.0.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.16
-
-package idna
-
-// appendMapping appends the mapping for the respective rune. isMapped must be
-// true. A mapping is a categorization of a rune as defined in UTS #46.
-func (c info) appendMapping(b []byte, s string) []byte {
-	index := int(c >> indexShift)
-	if c&xorBit == 0 {
-		s := mappings[index:]
-		return append(b, s[1:s[0]+1]...)
-	}
-	b = append(b, s...)
-	if c&inlineXOR == inlineXOR {
-		// TODO: support and handle two-byte inline masks
-		b[len(b)-1] ^= byte(index)
-	} else {
-		for p := len(b) - int(xorData[index]); p < len(b); p++ {
-			index++
-			b[p] ^= xorData[index]
-		}
-	}
-	return b
-}
diff --git a/vendor/golang.org/x/net/idna/trie13.0.0.go b/vendor/golang.org/x/net/idna/trie13.0.0.go
deleted file mode 100644
index fa45bb9..0000000
--- a/vendor/golang.org/x/net/idna/trie13.0.0.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.16
-
-package idna
-
-// appendMapping appends the mapping for the respective rune. isMapped must be
-// true. A mapping is a categorization of a rune as defined in UTS #46.
-func (c info) appendMapping(b []byte, s string) []byte {
-	index := int(c >> indexShift)
-	if c&xorBit == 0 {
-		p := index
-		return append(b, mappings[mappingIndex[p]:mappingIndex[p+1]]...)
-	}
-	b = append(b, s...)
-	if c&inlineXOR == inlineXOR {
-		// TODO: support and handle two-byte inline masks
-		b[len(b)-1] ^= byte(index)
-	} else {
-		for p := len(b) - int(xorData[index]); p < len(b); p++ {
-			index++
-			b[p] ^= xorData[index]
-		}
-	}
-	return b
-}
diff --git a/vendor/golang.org/x/net/idna/trieval.go b/vendor/golang.org/x/net/idna/trieval.go
index 9c070a4..7a8cf88 100644
--- a/vendor/golang.org/x/net/idna/trieval.go
+++ b/vendor/golang.org/x/net/idna/trieval.go
@@ -17,23 +17,23 @@ package idna
 //
 // The per-rune values have the following format:
 //
-//	if mapped {
-//	  if inlinedXOR {
-//	    15..13 inline XOR marker
-//	    12..11 unused
-//	    10..3  inline XOR mask
-//	  } else {
-//	    15..3  index into xor or mapping table
-//	  }
-//	} else {
-//	    15..14 unused
-//	    13     mayNeedNorm
-//	    12..11 attributes
-//	    10..8  joining type
-//	     7..3  category type
-//	}
-//	   2  use xor pattern
-//	1..0  mapped category
+//   if mapped {
+//     if inlinedXOR {
+//       15..13 inline XOR marker
+//       12..11 unused
+//       10..3  inline XOR mask
+//     } else {
+//       15..3  index into xor or mapping table
+//     }
+//   } else {
+//       15..14 unused
+//       13     mayNeedNorm
+//       12..11 attributes
+//       10..8  joining type
+//        7..3  category type
+//   }
+//      2  use xor pattern
+//   1..0  mapped category
 //
 // See the definitions below for a more detailed description of the various
 // bits.
diff --git a/vendor/golang.org/x/net/internal/httpcommon/ascii.go b/vendor/golang.org/x/net/internal/httpcommon/ascii.go
deleted file mode 100644
index ed14da5..0000000
--- a/vendor/golang.org/x/net/internal/httpcommon/ascii.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package httpcommon
-
-import "strings"
-
-// The HTTP protocols are defined in terms of ASCII, not Unicode. This file
-// contains helper functions which may use Unicode-aware functions which would
-// otherwise be unsafe and could introduce vulnerabilities if used improperly.
-
-// asciiEqualFold is strings.EqualFold, ASCII only. It reports whether s and t
-// are equal, ASCII-case-insensitively.
-func asciiEqualFold(s, t string) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i := 0; i < len(s); i++ {
-		if lower(s[i]) != lower(t[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// lower returns the ASCII lowercase version of b.
-func lower(b byte) byte {
-	if 'A' <= b && b <= 'Z' {
-		return b + ('a' - 'A')
-	}
-	return b
-}
-
-// isASCIIPrint returns whether s is ASCII and printable according to
-// https://tools.ietf.org/html/rfc20#section-4.2.
-func isASCIIPrint(s string) bool {
-	for i := 0; i < len(s); i++ {
-		if s[i] < ' ' || s[i] > '~' {
-			return false
-		}
-	}
-	return true
-}
-
-// asciiToLower returns the lowercase version of s if s is ASCII and printable,
-// and whether or not it was.
-func asciiToLower(s string) (lower string, ok bool) {
-	if !isASCIIPrint(s) {
-		return "", false
-	}
-	return strings.ToLower(s), true
-}
diff --git a/vendor/golang.org/x/net/internal/httpcommon/request.go b/vendor/golang.org/x/net/internal/httpcommon/request.go
deleted file mode 100644
index 4b70553..0000000
--- a/vendor/golang.org/x/net/internal/httpcommon/request.go
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package httpcommon
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http/httptrace"
-	"net/textproto"
-	"net/url"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/net/http/httpguts"
-	"golang.org/x/net/http2/hpack"
-)
-
-var (
-	ErrRequestHeaderListSize = errors.New("request header list larger than peer's advertised limit")
-)
-
-// Request is a subset of http.Request.
-// It'd be simpler to pass an *http.Request, of course, but we can't depend on net/http
-// without creating a dependency cycle.
-type Request struct {
-	URL                 *url.URL
-	Method              string
-	Host                string
-	Header              map[string][]string
-	Trailer             map[string][]string
-	ActualContentLength int64 // 0 means 0, -1 means unknown
-}
-
-// EncodeHeadersParam is parameters to EncodeHeaders.
-type EncodeHeadersParam struct {
-	Request Request
-
-	// AddGzipHeader indicates that an "accept-encoding: gzip" header should be
-	// added to the request.
-	AddGzipHeader bool
-
-	// PeerMaxHeaderListSize, when non-zero, is the peer's MAX_HEADER_LIST_SIZE setting.
-	PeerMaxHeaderListSize uint64
-
-	// DefaultUserAgent is the User-Agent header to send when the request
-	// neither contains a User-Agent nor disables it.
-	DefaultUserAgent string
-}
-
-// EncodeHeadersParam is the result of EncodeHeaders.
-type EncodeHeadersResult struct {
-	HasBody     bool
-	HasTrailers bool
-}
-
-// EncodeHeaders constructs request headers common to HTTP/2 and HTTP/3.
-// It validates a request and calls headerf with each pseudo-header and header
-// for the request.
-// The headerf function is called with the validated, canonicalized header name.
-func EncodeHeaders(ctx context.Context, param EncodeHeadersParam, headerf func(name, value string)) (res EncodeHeadersResult, _ error) {
-	req := param.Request
-
-	// Check for invalid connection-level headers.
-	if err := checkConnHeaders(req.Header); err != nil {
-		return res, err
-	}
-
-	if req.URL == nil {
-		return res, errors.New("Request.URL is nil")
-	}
-
-	host := req.Host
-	if host == "" {
-		host = req.URL.Host
-	}
-	host, err := httpguts.PunycodeHostPort(host)
-	if err != nil {
-		return res, err
-	}
-	if !httpguts.ValidHostHeader(host) {
-		return res, errors.New("invalid Host header")
-	}
-
-	// isNormalConnect is true if this is a non-extended CONNECT request.
-	isNormalConnect := false
-	var protocol string
-	if vv := req.Header[":protocol"]; len(vv) > 0 {
-		protocol = vv[0]
-	}
-	if req.Method == "CONNECT" && protocol == "" {
-		isNormalConnect = true
-	} else if protocol != "" && req.Method != "CONNECT" {
-		return res, errors.New("invalid :protocol header in non-CONNECT request")
-	}
-
-	// Validate the path, except for non-extended CONNECT requests which have no path.
-	var path string
-	if !isNormalConnect {
-		path = req.URL.RequestURI()
-		if !validPseudoPath(path) {
-			orig := path
-			path = strings.TrimPrefix(path, req.URL.Scheme+"://"+host)
-			if !validPseudoPath(path) {
-				if req.URL.Opaque != "" {
-					return res, fmt.Errorf("invalid request :path %q from URL.Opaque = %q", orig, req.URL.Opaque)
-				} else {
-					return res, fmt.Errorf("invalid request :path %q", orig)
-				}
-			}
-		}
-	}
-
-	// Check for any invalid headers+trailers and return an error before we
-	// potentially pollute our hpack state. (We want to be able to
-	// continue to reuse the hpack encoder for future requests)
-	if err := validateHeaders(req.Header); err != "" {
-		return res, fmt.Errorf("invalid HTTP header %s", err)
-	}
-	if err := validateHeaders(req.Trailer); err != "" {
-		return res, fmt.Errorf("invalid HTTP trailer %s", err)
-	}
-
-	trailers, err := commaSeparatedTrailers(req.Trailer)
-	if err != nil {
-		return res, err
-	}
-
-	enumerateHeaders := func(f func(name, value string)) {
-		// 8.1.2.3 Request Pseudo-Header Fields
-		// The :path pseudo-header field includes the path and query parts of the
-		// target URI (the path-absolute production and optionally a '?' character
-		// followed by the query production, see Sections 3.3 and 3.4 of
-		// [RFC3986]).
-		f(":authority", host)
-		m := req.Method
-		if m == "" {
-			m = "GET"
-		}
-		f(":method", m)
-		if !isNormalConnect {
-			f(":path", path)
-			f(":scheme", req.URL.Scheme)
-		}
-		if protocol != "" {
-			f(":protocol", protocol)
-		}
-		if trailers != "" {
-			f("trailer", trailers)
-		}
-
-		var didUA bool
-		for k, vv := range req.Header {
-			if asciiEqualFold(k, "host") || asciiEqualFold(k, "content-length") {
-				// Host is :authority, already sent.
-				// Content-Length is automatic, set below.
-				continue
-			} else if asciiEqualFold(k, "connection") ||
-				asciiEqualFold(k, "proxy-connection") ||
-				asciiEqualFold(k, "transfer-encoding") ||
-				asciiEqualFold(k, "upgrade") ||
-				asciiEqualFold(k, "keep-alive") {
-				// Per 8.1.2.2 Connection-Specific Header
-				// Fields, don't send connection-specific
-				// fields. We have already checked if any
-				// are error-worthy so just ignore the rest.
-				continue
-			} else if asciiEqualFold(k, "user-agent") {
-				// Match Go's http1 behavior: at most one
-				// User-Agent. If set to nil or empty string,
-				// then omit it. Otherwise if not mentioned,
-				// include the default (below).
-				didUA = true
-				if len(vv) < 1 {
-					continue
-				}
-				vv = vv[:1]
-				if vv[0] == "" {
-					continue
-				}
-			} else if asciiEqualFold(k, "cookie") {
-				// Per 8.1.2.5 To allow for better compression efficiency, the
-				// Cookie header field MAY be split into separate header fields,
-				// each with one or more cookie-pairs.
-				for _, v := range vv {
-					for {
-						p := strings.IndexByte(v, ';')
-						if p < 0 {
-							break
-						}
-						f("cookie", v[:p])
-						p++
-						// strip space after semicolon if any.
-						for p+1 <= len(v) && v[p] == ' ' {
-							p++
-						}
-						v = v[p:]
-					}
-					if len(v) > 0 {
-						f("cookie", v)
-					}
-				}
-				continue
-			} else if k == ":protocol" {
-				// :protocol pseudo-header was already sent above.
-				continue
-			}
-
-			for _, v := range vv {
-				f(k, v)
-			}
-		}
-		if shouldSendReqContentLength(req.Method, req.ActualContentLength) {
-			f("content-length", strconv.FormatInt(req.ActualContentLength, 10))
-		}
-		if param.AddGzipHeader {
-			f("accept-encoding", "gzip")
-		}
-		if !didUA {
-			f("user-agent", param.DefaultUserAgent)
-		}
-	}
-
-	// Do a first pass over the headers counting bytes to ensure
-	// we don't exceed cc.peerMaxHeaderListSize. This is done as a
-	// separate pass before encoding the headers to prevent
-	// modifying the hpack state.
-	if param.PeerMaxHeaderListSize > 0 {
-		hlSize := uint64(0)
-		enumerateHeaders(func(name, value string) {
-			hf := hpack.HeaderField{Name: name, Value: value}
-			hlSize += uint64(hf.Size())
-		})
-
-		if hlSize > param.PeerMaxHeaderListSize {
-			return res, ErrRequestHeaderListSize
-		}
-	}
-
-	trace := httptrace.ContextClientTrace(ctx)
-
-	// Header list size is ok. Write the headers.
-	enumerateHeaders(func(name, value string) {
-		name, ascii := LowerHeader(name)
-		if !ascii {
-			// Skip writing invalid headers. Per RFC 7540, Section 8.1.2, header
-			// field names have to be ASCII characters (just as in HTTP/1.x).
-			return
-		}
-
-		headerf(name, value)
-
-		if trace != nil && trace.WroteHeaderField != nil {
-			trace.WroteHeaderField(name, []string{value})
-		}
-	})
-
-	res.HasBody = req.ActualContentLength != 0
-	res.HasTrailers = trailers != ""
-	return res, nil
-}
-
-// IsRequestGzip reports whether we should add an Accept-Encoding: gzip header
-// for a request.
-func IsRequestGzip(method string, header map[string][]string, disableCompression bool) bool {
-	// TODO(bradfitz): this is a copy of the logic in net/http. Unify somewhere?
-	if !disableCompression &&
-		len(header["Accept-Encoding"]) == 0 &&
-		len(header["Range"]) == 0 &&
-		method != "HEAD" {
-		// Request gzip only, not deflate. Deflate is ambiguous and
-		// not as universally supported anyway.
-		// See: https://zlib.net/zlib_faq.html#faq39
-		//
-		// Note that we don't request this for HEAD requests,
-		// due to a bug in nginx:
-		//   http://trac.nginx.org/nginx/ticket/358
-		//   https://golang.org/issue/5522
-		//
-		// We don't request gzip if the request is for a range, since
-		// auto-decoding a portion of a gzipped document will just fail
-		// anyway. See https://golang.org/issue/8923
-		return true
-	}
-	return false
-}
-
-// checkConnHeaders checks whether req has any invalid connection-level headers.
-//
-// https://www.rfc-editor.org/rfc/rfc9114.html#section-4.2-3
-// https://www.rfc-editor.org/rfc/rfc9113.html#section-8.2.2-1
-//
-// Certain headers are special-cased as okay but not transmitted later.
-// For example, we allow "Transfer-Encoding: chunked", but drop the header when encoding.
-func checkConnHeaders(h map[string][]string) error {
-	if vv := h["Upgrade"]; len(vv) > 0 && (vv[0] != "" && vv[0] != "chunked") {
-		return fmt.Errorf("invalid Upgrade request header: %q", vv)
-	}
-	if vv := h["Transfer-Encoding"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "chunked") {
-		return fmt.Errorf("invalid Transfer-Encoding request header: %q", vv)
-	}
-	if vv := h["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && !asciiEqualFold(vv[0], "close") && !asciiEqualFold(vv[0], "keep-alive")) {
-		return fmt.Errorf("invalid Connection request header: %q", vv)
-	}
-	return nil
-}
-
-func commaSeparatedTrailers(trailer map[string][]string) (string, error) {
-	keys := make([]string, 0, len(trailer))
-	for k := range trailer {
-		k = CanonicalHeader(k)
-		switch k {
-		case "Transfer-Encoding", "Trailer", "Content-Length":
-			return "", fmt.Errorf("invalid Trailer key %q", k)
-		}
-		keys = append(keys, k)
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		return strings.Join(keys, ","), nil
-	}
-	return "", nil
-}
-
-// validPseudoPath reports whether v is a valid :path pseudo-header
-// value. It must be either:
-//
-//   - a non-empty string starting with '/'
-//   - the string '*', for OPTIONS requests.
-//
-// For now this is only used a quick check for deciding when to clean
-// up Opaque URLs before sending requests from the Transport.
-// See golang.org/issue/16847
-//
-// We used to enforce that the path also didn't start with "//", but
-// Google's GFE accepts such paths and Chrome sends them, so ignore
-// that part of the spec. See golang.org/issue/19103.
-func validPseudoPath(v string) bool {
-	return (len(v) > 0 && v[0] == '/') || v == "*"
-}
-
-func validateHeaders(hdrs map[string][]string) string {
-	for k, vv := range hdrs {
-		if !httpguts.ValidHeaderFieldName(k) && k != ":protocol" {
-			return fmt.Sprintf("name %q", k)
-		}
-		for _, v := range vv {
-			if !httpguts.ValidHeaderFieldValue(v) {
-				// Don't include the value in the error,
-				// because it may be sensitive.
-				return fmt.Sprintf("value for header %q", k)
-			}
-		}
-	}
-	return ""
-}
-
-// shouldSendReqContentLength reports whether we should send
-// a "content-length" request header. This logic is basically a copy of the net/http
-// transferWriter.shouldSendContentLength.
-// The contentLength is the corrected contentLength (so 0 means actually 0, not unknown).
-// -1 means unknown.
-func shouldSendReqContentLength(method string, contentLength int64) bool {
-	if contentLength > 0 {
-		return true
-	}
-	if contentLength < 0 {
-		return false
-	}
-	// For zero bodies, whether we send a content-length depends on the method.
-	// It also kinda doesn't matter for http2 either way, with END_STREAM.
-	switch method {
-	case "POST", "PUT", "PATCH":
-		return true
-	default:
-		return false
-	}
-}
-
-// ServerRequestParam is parameters to NewServerRequest.
-type ServerRequestParam struct {
-	Method                  string
-	Scheme, Authority, Path string
-	Protocol                string
-	Header                  map[string][]string
-}
-
-// ServerRequestResult is the result of NewServerRequest.
-type ServerRequestResult struct {
-	// Various http.Request fields.
-	URL        *url.URL
-	RequestURI string
-	Trailer    map[string][]string
-
-	NeedsContinue bool // client provided an "Expect: 100-continue" header
-
-	// If the request should be rejected, this is a short string suitable for passing
-	// to the http2 package's CountError function.
-	// It might be a bit odd to return errors this way rather than returing an error,
-	// but this ensures we don't forget to include a CountError reason.
-	InvalidReason string
-}
-
-func NewServerRequest(rp ServerRequestParam) ServerRequestResult {
-	needsContinue := httpguts.HeaderValuesContainsToken(rp.Header["Expect"], "100-continue")
-	if needsContinue {
-		delete(rp.Header, "Expect")
-	}
-	// Merge Cookie headers into one "; "-delimited value.
-	if cookies := rp.Header["Cookie"]; len(cookies) > 1 {
-		rp.Header["Cookie"] = []string{strings.Join(cookies, "; ")}
-	}
-
-	// Setup Trailers
-	var trailer map[string][]string
-	for _, v := range rp.Header["Trailer"] {
-		for _, key := range strings.Split(v, ",") {
-			key = textproto.CanonicalMIMEHeaderKey(textproto.TrimString(key))
-			switch key {
-			case "Transfer-Encoding", "Trailer", "Content-Length":
-				// Bogus. (copy of http1 rules)
-				// Ignore.
-			default:
-				if trailer == nil {
-					trailer = make(map[string][]string)
-				}
-				trailer[key] = nil
-			}
-		}
-	}
-	delete(rp.Header, "Trailer")
-
-	// "':authority' MUST NOT include the deprecated userinfo subcomponent
-	// for "http" or "https" schemed URIs."
-	// https://www.rfc-editor.org/rfc/rfc9113.html#section-8.3.1-2.3.8
-	if strings.IndexByte(rp.Authority, '@') != -1 && (rp.Scheme == "http" || rp.Scheme == "https") {
-		return ServerRequestResult{
-			InvalidReason: "userinfo_in_authority",
-		}
-	}
-
-	var url_ *url.URL
-	var requestURI string
-	if rp.Method == "CONNECT" && rp.Protocol == "" {
-		url_ = &url.URL{Host: rp.Authority}
-		requestURI = rp.Authority // mimic HTTP/1 server behavior
-	} else {
-		var err error
-		url_, err = url.ParseRequestURI(rp.Path)
-		if err != nil {
-			return ServerRequestResult{
-				InvalidReason: "bad_path",
-			}
-		}
-		requestURI = rp.Path
-	}
-
-	return ServerRequestResult{
-		URL:           url_,
-		NeedsContinue: needsContinue,
-		RequestURI:    requestURI,
-		Trailer:       trailer,
-	}
-}
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr.go b/vendor/golang.org/x/net/internal/socket/cmsghdr.go
index 33a5bf5..4bdaaaf 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go
index 68f438c..0d30e0a 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
+// +build aix darwin dragonfly freebsd netbsd openbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
index 058ea8d..4936e8a 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (arm || mips || mipsle || 386 || ppc) && linux
+// +build arm mips mipsle 386 ppc
+// +build linux
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
index 3ca0d3a..1ba4310 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && linux
+//go:build (arm64 || amd64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && linux
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le riscv64 s390x
+// +build linux
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
index 6d0e426..d3dbe1b 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go
index 7ca9cb7..1d9f2ed 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go
index 0211f22..aa1b062 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/cmsghdr_zos_s390x.go b/vendor/golang.org/x/net/internal/socket/cmsghdr_zos_s390x.go
index 68dc8ad..98be146 100644
--- a/vendor/golang.org/x/net/internal/socket/cmsghdr_zos_s390x.go
+++ b/vendor/golang.org/x/net/internal/socket/cmsghdr_zos_s390x.go
@@ -4,8 +4,22 @@
 
 package socket
 
+import "syscall"
+
 func (h *cmsghdr) set(l, lvl, typ int) {
 	h.Len = int32(l)
 	h.Level = int32(lvl)
 	h.Type = int32(typ)
 }
+
+func controlHeaderLen() int {
+	return syscall.CmsgLen(0)
+}
+
+func controlMessageLen(dataLen int) int {
+	return syscall.CmsgLen(dataLen)
+}
+
+func controlMessageSpace(dataLen int) int {
+	return syscall.CmsgSpace(dataLen)
+}
diff --git a/vendor/golang.org/x/net/internal/socket/complete_dontwait.go b/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
index 2038f29..5b1d50a 100644
--- a/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
+++ b/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go b/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
index 70e6f44..be63409 100644
--- a/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
+++ b/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || windows || zos
+// +build aix windows zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/empty.s b/vendor/golang.org/x/net/internal/socket/empty.s
index 49d7979..bff0231 100644
--- a/vendor/golang.org/x/net/internal/socket/empty.s
+++ b/vendor/golang.org/x/net/internal/socket/empty.s
@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin && go1.12
+// +build darwin,go1.12
 
 // This exists solely so we can linkname in symbols from syscall.
diff --git a/vendor/golang.org/x/net/internal/socket/error_unix.go b/vendor/golang.org/x/net/internal/socket/error_unix.go
index 7a5cc5c..78f4129 100644
--- a/vendor/golang.org/x/net/internal/socket/error_unix.go
+++ b/vendor/golang.org/x/net/internal/socket/error_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/iovec_32bit.go b/vendor/golang.org/x/net/internal/socket/iovec_32bit.go
index 340e53f..2b8fbb3 100644
--- a/vendor/golang.org/x/net/internal/socket/iovec_32bit.go
+++ b/vendor/golang.org/x/net/internal/socket/iovec_32bit.go
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (arm || mips || mipsle || 386 || ppc) && (darwin || dragonfly || freebsd || linux || netbsd || openbsd)
+// +build arm mips mipsle 386 ppc
+// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/iovec_64bit.go b/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
index 26470c1..3dc5def 100644
--- a/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || zos)
+//go:build (arm64 || amd64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || zos)
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le riscv64 s390x
+// +build aix darwin dragonfly freebsd linux netbsd openbsd zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go b/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
index 8859ce1..f7da2bc 100644
--- a/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/iovec_stub.go b/vendor/golang.org/x/net/internal/socket/iovec_stub.go
index da886b0..14caf52 100644
--- a/vendor/golang.org/x/net/internal/socket/iovec_stub.go
+++ b/vendor/golang.org/x/net/internal/socket/iovec_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go b/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go
index 4825b21..113e773 100644
--- a/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go
+++ b/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !linux && !netbsd
+// +build !aix,!linux,!netbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go b/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go
index 311fd2c..40ebeda 100644
--- a/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go
+++ b/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go
@@ -3,14 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || linux || netbsd
+// +build aix linux netbsd
 
 package socket
 
 import (
 	"net"
-	"os"
 	"sync"
-	"syscall"
 )
 
 type mmsghdrs []mmsghdr
@@ -94,102 +93,22 @@ func (p *mmsghdrsPacker) pack(ms []Message, parseFn func([]byte, string) (net.Ad
 	return hs
 }
 
-// syscaller is a helper to invoke recvmmsg and sendmmsg via the RawConn.Read/Write interface.
-// It is reusable, to amortize the overhead of allocating a closure for the function passed to
-// RawConn.Read/Write.
-type syscaller struct {
-	n     int
-	operr error
-	hs    mmsghdrs
-	flags int
-
-	boundRecvmmsgF func(uintptr) bool
-	boundSendmmsgF func(uintptr) bool
-}
-
-func (r *syscaller) init() {
-	r.boundRecvmmsgF = r.recvmmsgF
-	r.boundSendmmsgF = r.sendmmsgF
-}
-
-func (r *syscaller) recvmmsg(c syscall.RawConn, hs mmsghdrs, flags int) (int, error) {
-	r.n = 0
-	r.operr = nil
-	r.hs = hs
-	r.flags = flags
-	if err := c.Read(r.boundRecvmmsgF); err != nil {
-		return r.n, err
-	}
-	if r.operr != nil {
-		return r.n, os.NewSyscallError("recvmmsg", r.operr)
-	}
-	return r.n, nil
-}
-
-func (r *syscaller) recvmmsgF(s uintptr) bool {
-	r.n, r.operr = recvmmsg(s, r.hs, r.flags)
-	return ioComplete(r.flags, r.operr)
-}
-
-func (r *syscaller) sendmmsg(c syscall.RawConn, hs mmsghdrs, flags int) (int, error) {
-	r.n = 0
-	r.operr = nil
-	r.hs = hs
-	r.flags = flags
-	if err := c.Write(r.boundSendmmsgF); err != nil {
-		return r.n, err
-	}
-	if r.operr != nil {
-		return r.n, os.NewSyscallError("sendmmsg", r.operr)
-	}
-	return r.n, nil
-}
-
-func (r *syscaller) sendmmsgF(s uintptr) bool {
-	r.n, r.operr = sendmmsg(s, r.hs, r.flags)
-	return ioComplete(r.flags, r.operr)
-}
-
-// mmsgTmps holds reusable temporary helpers for recvmmsg and sendmmsg.
-type mmsgTmps struct {
-	packer    mmsghdrsPacker
-	syscaller syscaller
-}
-
-var defaultMmsgTmpsPool = mmsgTmpsPool{
+var defaultMmsghdrsPool = mmsghdrsPool{
 	p: sync.Pool{
 		New: func() interface{} {
-			tmps := new(mmsgTmps)
-			tmps.syscaller.init()
-			return tmps
+			return new(mmsghdrsPacker)
 		},
 	},
 }
 
-type mmsgTmpsPool struct {
+type mmsghdrsPool struct {
 	p sync.Pool
 }
 
-func (p *mmsgTmpsPool) Get() *mmsgTmps {
-	m := p.p.Get().(*mmsgTmps)
-	// Clear fields up to the len (not the cap) of the slice,
-	// assuming that the previous caller only used that many elements.
-	for i := range m.packer.sockaddrs {
-		m.packer.sockaddrs[i] = 0
-	}
-	m.packer.sockaddrs = m.packer.sockaddrs[:0]
-	for i := range m.packer.vs {
-		m.packer.vs[i] = iovec{}
-	}
-	m.packer.vs = m.packer.vs[:0]
-	for i := range m.packer.hs {
-		m.packer.hs[i].Len = 0
-		m.packer.hs[i].Hdr = msghdr{}
-	}
-	m.packer.hs = m.packer.hs[:0]
-	return m
+func (p *mmsghdrsPool) Get() *mmsghdrsPacker {
+	return p.p.Get().(*mmsghdrsPacker)
 }
 
-func (p *mmsgTmpsPool) Put(tmps *mmsgTmps) {
-	p.p.Put(tmps)
+func (p *mmsghdrsPool) Put(packer *mmsghdrsPacker) {
+	p.p.Put(packer)
 }
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go b/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go
index ebff4f6..25f6847 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
+// +build aix darwin dragonfly freebsd netbsd openbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go b/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
index 62e6fe8..5b8e00f 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd
+// +build aix darwin dragonfly freebsd netbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_linux.go b/vendor/golang.org/x/net/internal/socket/msghdr_linux.go
index 5a38798..c3c7cc4 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_linux.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_linux.go
@@ -17,6 +17,9 @@ func (h *msghdr) pack(vs []iovec, bs [][]byte, oob []byte, sa []byte) {
 	if sa != nil {
 		h.Name = (*byte)(unsafe.Pointer(&sa[0]))
 		h.Namelen = uint32(len(sa))
+	} else {
+		h.Name = nil
+		h.Namelen = 0
 	}
 }
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go b/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
index 3dd0725..b4658fb 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (arm || mips || mipsle || 386 || ppc) && linux
+// +build arm mips mipsle 386 ppc
+// +build linux
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go b/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
index 5af9ddd..c9c592d 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && linux
+//go:build (arm64 || amd64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && linux
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le riscv64 s390x
+// +build linux
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go b/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
index e212b50..3098f5d 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_stub.go b/vendor/golang.org/x/net/internal/socket/msghdr_stub.go
index e876776..eb79151 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_stub.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go b/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
index 529db68..324e9ee 100644
--- a/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
+++ b/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build s390x && zos
+// +build s390x,zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/norace.go b/vendor/golang.org/x/net/internal/socket/norace.go
index 8af30ec..de0ad42 100644
--- a/vendor/golang.org/x/net/internal/socket/norace.go
+++ b/vendor/golang.org/x/net/internal/socket/norace.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !race
+// +build !race
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/race.go b/vendor/golang.org/x/net/internal/socket/race.go
index 9afa958..f0a28a6 100644
--- a/vendor/golang.org/x/net/internal/socket/race.go
+++ b/vendor/golang.org/x/net/internal/socket/race.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
+// +build race
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go b/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
index 0431390..3fcb51b 100644
--- a/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
+++ b/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
@@ -3,28 +3,38 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux
+// +build linux
 
 package socket
 
 import (
 	"net"
+	"os"
 )
 
 func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {
 	for i := range ms {
 		ms[i].raceWrite()
 	}
-	tmps := defaultMmsgTmpsPool.Get()
-	defer defaultMmsgTmpsPool.Put(tmps)
+	packer := defaultMmsghdrsPool.Get()
+	defer defaultMmsghdrsPool.Put(packer)
 	var parseFn func([]byte, string) (net.Addr, error)
 	if c.network != "tcp" {
 		parseFn = parseInetAddr
 	}
-	hs := tmps.packer.pack(ms, parseFn, nil)
-	n, err := tmps.syscaller.recvmmsg(c.c, hs, flags)
-	if err != nil {
+	hs := packer.pack(ms, parseFn, nil)
+	var operr error
+	var n int
+	fn := func(s uintptr) bool {
+		n, operr = recvmmsg(s, hs, flags)
+		return ioComplete(flags, operr)
+	}
+	if err := c.c.Read(fn); err != nil {
 		return n, err
 	}
+	if operr != nil {
+		return n, os.NewSyscallError("recvmmsg", operr)
+	}
 	if err := hs[:n].unpack(ms[:n], parseFn, c.network); err != nil {
 		return n, err
 	}
@@ -35,17 +45,25 @@ func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {
 	for i := range ms {
 		ms[i].raceRead()
 	}
-	tmps := defaultMmsgTmpsPool.Get()
-	defer defaultMmsgTmpsPool.Put(tmps)
+	packer := defaultMmsghdrsPool.Get()
+	defer defaultMmsghdrsPool.Put(packer)
 	var marshalFn func(net.Addr, []byte) int
 	if c.network != "tcp" {
 		marshalFn = marshalInetAddr
 	}
-	hs := tmps.packer.pack(ms, nil, marshalFn)
-	n, err := tmps.syscaller.sendmmsg(c.c, hs, flags)
-	if err != nil {
+	hs := packer.pack(ms, nil, marshalFn)
+	var operr error
+	var n int
+	fn := func(s uintptr) bool {
+		n, operr = sendmmsg(s, hs, flags)
+		return ioComplete(flags, operr)
+	}
+	if err := c.c.Write(fn); err != nil {
 		return n, err
 	}
+	if operr != nil {
+		return n, os.NewSyscallError("sendmmsg", operr)
+	}
 	if err := hs[:n].unpack(ms[:n], nil, ""); err != nil {
 		return n, err
 	}
diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_msg.go b/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
index 7c0d741..ba53f56 100644
--- a/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
+++ b/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
@@ -3,25 +3,27 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
 
 package socket
 
 import (
-	"net"
 	"os"
 )
 
 func (c *Conn) recvMsg(m *Message, flags int) error {
 	m.raceWrite()
-	var (
-		operr     error
-		n         int
-		oobn      int
-		recvflags int
-		from      net.Addr
-	)
+	var h msghdr
+	vs := make([]iovec, len(m.Buffers))
+	var sa []byte
+	if c.network != "tcp" {
+		sa = make([]byte, sizeofSockaddrInet6)
+	}
+	h.pack(vs, m.Buffers, m.OOB, sa)
+	var operr error
+	var n int
 	fn := func(s uintptr) bool {
-		n, oobn, recvflags, from, operr = recvmsg(s, m.Buffers, m.OOB, flags, c.network)
+		n, operr = recvmsg(s, &h, flags)
 		return ioComplete(flags, operr)
 	}
 	if err := c.c.Read(fn); err != nil {
@@ -30,21 +32,34 @@ func (c *Conn) recvMsg(m *Message, flags int) error {
 	if operr != nil {
 		return os.NewSyscallError("recvmsg", operr)
 	}
-	m.Addr = from
+	if c.network != "tcp" {
+		var err error
+		m.Addr, err = parseInetAddr(sa[:], c.network)
+		if err != nil {
+			return err
+		}
+	}
 	m.N = n
-	m.NN = oobn
-	m.Flags = recvflags
+	m.NN = h.controllen()
+	m.Flags = h.flags()
 	return nil
 }
 
 func (c *Conn) sendMsg(m *Message, flags int) error {
 	m.raceRead()
-	var (
-		operr error
-		n     int
-	)
+	var h msghdr
+	vs := make([]iovec, len(m.Buffers))
+	var sa []byte
+	if m.Addr != nil {
+		var a [sizeofSockaddrInet6]byte
+		n := marshalInetAddr(m.Addr, a[:])
+		sa = a[:n]
+	}
+	h.pack(vs, m.Buffers, m.OOB, sa)
+	var operr error
+	var n int
 	fn := func(s uintptr) bool {
-		n, operr = sendmsg(s, m.Buffers, m.OOB, m.Addr, flags)
+		n, operr = sendmsg(s, &h, flags)
 		return ioComplete(flags, operr)
 	}
 	if err := c.c.Write(fn); err != nil {
diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go b/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
index e363fb5..02f3285 100644
--- a/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
+++ b/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !linux
+// +build !linux
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go b/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
index ff7a8ba..dd78587 100644
--- a/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
+++ b/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_bsd.go b/vendor/golang.org/x/net/internal/socket/sys_bsd.go
index e7664d4..b6cd770 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_bsd.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_bsd.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris
+//go:build aix || darwin || dragonfly || freebsd || openbsd
+// +build aix darwin dragonfly freebsd openbsd
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_const_unix.go b/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
index d7627f8..5d99f23 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linkname.go b/vendor/golang.org/x/net/internal/socket/sys_linkname.go
new file mode 100644
index 0000000..21734af
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socket/sys_linkname.go
@@ -0,0 +1,43 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build aix || (go1.12 && darwin)
+// +build aix go1.12,darwin
+
+package socket
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+//go:linkname syscall_getsockopt syscall.getsockopt
+func syscall_getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *uint32) error
+
+func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
+	l := uint32(len(b))
+	err := syscall_getsockopt(int(s), level, name, unsafe.Pointer(&b[0]), &l)
+	return int(l), err
+}
+
+//go:linkname syscall_setsockopt syscall.setsockopt
+func syscall_setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error
+
+func setsockopt(s uintptr, level, name int, b []byte) error {
+	return syscall_setsockopt(int(s), level, name, unsafe.Pointer(&b[0]), uintptr(len(b)))
+}
+
+//go:linkname syscall_recvmsg syscall.recvmsg
+func syscall_recvmsg(s int, msg *syscall.Msghdr, flags int) (n int, err error)
+
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	return syscall_recvmsg(int(s), (*syscall.Msghdr)(unsafe.Pointer(h)), flags)
+}
+
+//go:linkname syscall_sendmsg syscall.sendmsg
+func syscall_sendmsg(s int, msg *syscall.Msghdr, flags int) (n int, err error)
+
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	return syscall_sendmsg(int(s), (*syscall.Msghdr)(unsafe.Pointer(h)), flags)
+}
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux.go b/vendor/golang.org/x/net/internal/socket/sys_linux.go
index 08d4910..76f5b8a 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_linux.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_linux.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && !s390x && !386
+// +build linux,!s390x,!386
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_386.go b/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
index c877ef2..6512153 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
@@ -10,13 +10,38 @@ import (
 )
 
 const (
-	sysRECVMMSG = 0x13
-	sysSENDMMSG = 0x14
+	sysSETSOCKOPT = 0xe
+	sysGETSOCKOPT = 0xf
+	sysSENDMSG    = 0x10
+	sysRECVMSG    = 0x11
+	sysRECVMMSG   = 0x13
+	sysSENDMMSG   = 0x14
 )
 
 func socketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
 func rawsocketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
 
+func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
+	l := uint32(len(b))
+	_, errno := socketcall(sysGETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(unsafe.Pointer(&l)), 0)
+	return int(l), errnoErr(errno)
+}
+
+func setsockopt(s uintptr, level, name int, b []byte) error {
+	_, errno := socketcall(sysSETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
+	return errnoErr(errno)
+}
+
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, errno := socketcall(sysRECVMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, errno := socketcall(sysSENDMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
 	n, errno := socketcall(sysRECVMMSG, s, uintptr(unsafe.Pointer(&hs[0])), uintptr(len(hs)), uintptr(flags), 0, 0)
 	return int(n), errnoErr(errno)
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go b/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
deleted file mode 100644
index 1d18247..0000000
--- a/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build loong64
-
-package socket
-
-const (
-	sysRECVMMSG = 0xf3
-	sysSENDMMSG = 0x10d
-)
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go b/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
index 0e407d1..5b128fb 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build riscv64
+// +build riscv64
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_s390x.go b/vendor/golang.org/x/net/internal/socket/sys_linux_s390x.go
index c877ef2..6512153 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_linux_s390x.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_linux_s390x.go
@@ -10,13 +10,38 @@ import (
 )
 
 const (
-	sysRECVMMSG = 0x13
-	sysSENDMMSG = 0x14
+	sysSETSOCKOPT = 0xe
+	sysGETSOCKOPT = 0xf
+	sysSENDMSG    = 0x10
+	sysRECVMSG    = 0x11
+	sysRECVMMSG   = 0x13
+	sysSENDMMSG   = 0x14
 )
 
 func socketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
 func rawsocketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
 
+func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
+	l := uint32(len(b))
+	_, errno := socketcall(sysGETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(unsafe.Pointer(&l)), 0)
+	return int(l), errnoErr(errno)
+}
+
+func setsockopt(s uintptr, level, name int, b []byte) error {
+	_, errno := socketcall(sysSETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
+	return errnoErr(errno)
+}
+
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, errno := socketcall(sysRECVMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, errno := socketcall(sysSENDMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
 	n, errno := socketcall(sysRECVMMSG, s, uintptr(unsafe.Pointer(&hs[0])), uintptr(len(hs)), uintptr(flags), 0, 0)
 	return int(n), errnoErr(errno)
diff --git a/vendor/golang.org/x/net/internal/socket/sys_posix.go b/vendor/golang.org/x/net/internal/socket/sys_posix.go
index 58d8654..42b8f23 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_posix.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_posix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_solaris.go b/vendor/golang.org/x/net/internal/socket/sys_solaris.go
new file mode 100644
index 0000000..e79ca95
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socket/sys_solaris.go
@@ -0,0 +1,59 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package socket
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+//go:cgo_import_dynamic libc___xnet_getsockopt __xnet_getsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_recvmsg __xnet_recvmsg "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_sendmsg __xnet_sendmsg "libsocket.so"
+
+//go:linkname procGetsockopt libc___xnet_getsockopt
+//go:linkname procSetsockopt libc_setsockopt
+//go:linkname procRecvmsg libc___xnet_recvmsg
+//go:linkname procSendmsg libc___xnet_sendmsg
+
+var (
+	procGetsockopt uintptr
+	procSetsockopt uintptr
+	procRecvmsg    uintptr
+	procSendmsg    uintptr
+)
+
+func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (uintptr, uintptr, syscall.Errno)
+func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (uintptr, uintptr, syscall.Errno)
+
+func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
+	l := uint32(len(b))
+	_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procGetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(unsafe.Pointer(&l)), 0)
+	return int(l), errnoErr(errno)
+}
+
+func setsockopt(s uintptr, level, name int, b []byte) error {
+	_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procSetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
+	return errnoErr(errno)
+}
+
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procRecvmsg)), 3, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procSendmsg)), 3, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+	return int(n), errnoErr(errno)
+}
+
+func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
+	return 0, errNotImplemented
+}
+
+func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
+	return 0, errNotImplemented
+}
diff --git a/vendor/golang.org/x/net/internal/socket/sys_solaris_amd64.s b/vendor/golang.org/x/net/internal/socket/sys_solaris_amd64.s
new file mode 100644
index 0000000..a18ac5e
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socket/sys_solaris_amd64.s
@@ -0,0 +1,11 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "textflag.h"
+
+TEXT	·sysvicall6(SB),NOSPLIT,$0-88
+	JMP	syscall·sysvicall6(SB)
+
+TEXT	·rawSysvicall6(SB),NOSPLIT,$0-88
+	JMP	syscall·rawSysvicall6(SB)
diff --git a/vendor/golang.org/x/net/internal/socket/sys_stub.go b/vendor/golang.org/x/net/internal/socket/sys_stub.go
index 2e5b473..381e45e 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_stub.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package socket
 
@@ -35,11 +36,11 @@ func setsockopt(s uintptr, level, name int, b []byte) error {
 	return errNotImplemented
 }
 
-func recvmsg(s uintptr, buffers [][]byte, oob []byte, flags int, network string) (n, oobn int, recvflags int, from net.Addr, err error) {
-	return 0, 0, 0, nil, errNotImplemented
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	return 0, errNotImplemented
 }
 
-func sendmsg(s uintptr, buffers [][]byte, oob []byte, to net.Addr, flags int) (int, error) {
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
 	return 0, errNotImplemented
 }
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_unix.go b/vendor/golang.org/x/net/internal/socket/sys_unix.go
index 93058db..c98ebae 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_unix.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_unix.go
@@ -2,120 +2,33 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+//go:build dragonfly || freebsd || (linux && !s390x && !386) || netbsd || openbsd
+// +build dragonfly freebsd linux,!s390x,!386 netbsd openbsd
 
 package socket
 
 import (
-	"net"
+	"syscall"
 	"unsafe"
-
-	"golang.org/x/sys/unix"
 )
 
-//go:linkname syscall_getsockopt syscall.getsockopt
-func syscall_getsockopt(s, level, name int, val unsafe.Pointer, vallen *uint32) error
-
-//go:linkname syscall_setsockopt syscall.setsockopt
-func syscall_setsockopt(s, level, name int, val unsafe.Pointer, vallen uintptr) error
-
 func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
 	l := uint32(len(b))
-	err := syscall_getsockopt(int(s), level, name, unsafe.Pointer(&b[0]), &l)
-	return int(l), err
+	_, _, errno := syscall.Syscall6(syscall.SYS_GETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(unsafe.Pointer(&l)), 0)
+	return int(l), errnoErr(errno)
 }
 
 func setsockopt(s uintptr, level, name int, b []byte) error {
-	return syscall_setsockopt(int(s), level, name, unsafe.Pointer(&b[0]), uintptr(len(b)))
+	_, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
+	return errnoErr(errno)
 }
 
-func recvmsg(s uintptr, buffers [][]byte, oob []byte, flags int, network string) (n, oobn int, recvflags int, from net.Addr, err error) {
-	var unixFrom unix.Sockaddr
-	n, oobn, recvflags, unixFrom, err = unix.RecvmsgBuffers(int(s), buffers, oob, flags)
-	if unixFrom != nil {
-		from = sockaddrToAddr(unixFrom, network)
-	}
-	return
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := syscall.Syscall(syscall.SYS_RECVMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags))
+	return int(n), errnoErr(errno)
 }
 
-func sendmsg(s uintptr, buffers [][]byte, oob []byte, to net.Addr, flags int) (int, error) {
-	var unixTo unix.Sockaddr
-	if to != nil {
-		unixTo = addrToSockaddr(to)
-	}
-	return unix.SendmsgBuffers(int(s), buffers, oob, unixTo, flags)
-}
-
-// addrToSockaddr converts a net.Addr to a unix.Sockaddr.
-func addrToSockaddr(a net.Addr) unix.Sockaddr {
-	var (
-		ip   net.IP
-		port int
-		zone string
-	)
-	switch a := a.(type) {
-	case *net.TCPAddr:
-		ip = a.IP
-		port = a.Port
-		zone = a.Zone
-	case *net.UDPAddr:
-		ip = a.IP
-		port = a.Port
-		zone = a.Zone
-	case *net.IPAddr:
-		ip = a.IP
-		zone = a.Zone
-	default:
-		return nil
-	}
-
-	if ip4 := ip.To4(); ip4 != nil {
-		sa := unix.SockaddrInet4{Port: port}
-		copy(sa.Addr[:], ip4)
-		return &sa
-	}
-
-	if ip6 := ip.To16(); ip6 != nil && ip.To4() == nil {
-		sa := unix.SockaddrInet6{Port: port}
-		copy(sa.Addr[:], ip6)
-		if zone != "" {
-			sa.ZoneId = uint32(zoneCache.index(zone))
-		}
-		return &sa
-	}
-
-	return nil
-}
-
-// sockaddrToAddr converts a unix.Sockaddr to a net.Addr.
-func sockaddrToAddr(sa unix.Sockaddr, network string) net.Addr {
-	var (
-		ip   net.IP
-		port int
-		zone string
-	)
-	switch sa := sa.(type) {
-	case *unix.SockaddrInet4:
-		ip = make(net.IP, net.IPv4len)
-		copy(ip, sa.Addr[:])
-		port = sa.Port
-	case *unix.SockaddrInet6:
-		ip = make(net.IP, net.IPv6len)
-		copy(ip, sa.Addr[:])
-		port = sa.Port
-		if sa.ZoneId > 0 {
-			zone = zoneCache.name(int(sa.ZoneId))
-		}
-	default:
-		return nil
-	}
-
-	switch network {
-	case "tcp", "tcp4", "tcp6":
-		return &net.TCPAddr{IP: ip, Port: port, Zone: zone}
-	case "udp", "udp4", "udp6":
-		return &net.UDPAddr{IP: ip, Port: port, Zone: zone}
-	default:
-		return &net.IPAddr{IP: ip, Zone: zone}
-	}
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := syscall.Syscall(syscall.SYS_SENDMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags))
+	return int(n), errnoErr(errno)
 }
diff --git a/vendor/golang.org/x/net/internal/socket/sys_windows.go b/vendor/golang.org/x/net/internal/socket/sys_windows.go
index b738b89..2de0d68 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_windows.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_windows.go
@@ -5,7 +5,6 @@
 package socket
 
 import (
-	"net"
 	"syscall"
 	"unsafe"
 
@@ -38,11 +37,11 @@ func setsockopt(s uintptr, level, name int, b []byte) error {
 	return syscall.Setsockopt(syscall.Handle(s), int32(level), int32(name), (*byte)(unsafe.Pointer(&b[0])), int32(len(b)))
 }
 
-func recvmsg(s uintptr, buffers [][]byte, oob []byte, flags int, network string) (n, oobn int, recvflags int, from net.Addr, err error) {
-	return 0, 0, 0, nil, errNotImplemented
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	return 0, errNotImplemented
 }
 
-func sendmsg(s uintptr, buffers [][]byte, oob []byte, to net.Addr, flags int) (int, error) {
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
 	return 0, errNotImplemented
 }
 
diff --git a/vendor/golang.org/x/net/internal/socket/sys_zos_s390x.go b/vendor/golang.org/x/net/internal/socket/sys_zos_s390x.go
index eaa896c..1e38b92 100644
--- a/vendor/golang.org/x/net/internal/socket/sys_zos_s390x.go
+++ b/vendor/golang.org/x/net/internal/socket/sys_zos_s390x.go
@@ -5,7 +5,6 @@
 package socket
 
 import (
-	"net"
 	"syscall"
 	"unsafe"
 )
@@ -28,39 +27,12 @@ func setsockopt(s uintptr, level, name int, b []byte) error {
 	return errnoErr(errno)
 }
 
-func recvmsg(s uintptr, buffers [][]byte, oob []byte, flags int, network string) (n, oobn int, recvflags int, from net.Addr, err error) {
-	var h msghdr
-	vs := make([]iovec, len(buffers))
-	var sa []byte
-	if network != "tcp" {
-		sa = make([]byte, sizeofSockaddrInet6)
-	}
-	h.pack(vs, buffers, oob, sa)
-	sn, _, errno := syscall_syscall(syscall.SYS___RECVMSG_A, s, uintptr(unsafe.Pointer(&h)), uintptr(flags))
-	n = int(sn)
-	oobn = h.controllen()
-	recvflags = h.flags()
-	err = errnoErr(errno)
-	if network != "tcp" {
-		var err2 error
-		from, err2 = parseInetAddr(sa, network)
-		if err2 != nil && err == nil {
-			err = err2
-		}
-	}
-	return
-}
-
-func sendmsg(s uintptr, buffers [][]byte, oob []byte, to net.Addr, flags int) (int, error) {
-	var h msghdr
-	vs := make([]iovec, len(buffers))
-	var sa []byte
-	if to != nil {
-		var a [sizeofSockaddrInet6]byte
-		n := marshalInetAddr(to, a[:])
-		sa = a[:n]
-	}
-	h.pack(vs, buffers, oob, sa)
-	n, _, errno := syscall_syscall(syscall.SYS___SENDMSG_A, s, uintptr(unsafe.Pointer(&h)), uintptr(flags))
+func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := syscall_syscall(syscall.SYS___RECVMSG_A, s, uintptr(unsafe.Pointer(h)), uintptr(flags))
+	return int(n), errnoErr(errno)
+}
+
+func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+	n, _, errno := syscall_syscall(syscall.SYS___SENDMSG_A, s, uintptr(unsafe.Pointer(h)), uintptr(flags))
 	return int(n), errnoErr(errno)
 }
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go b/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
index 45bab00..00691bd 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
@@ -3,6 +3,7 @@
 
 // Added for go1.11 compatibility
 //go:build aix
+// +build aix
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_freebsd_riscv64.go b/vendor/golang.org/x/net/internal/socket/zsys_darwin_386.go
similarity index 79%
rename from vendor/golang.org/x/net/internal/socket/zsys_freebsd_riscv64.go
rename to vendor/golang.org/x/net/internal/socket/zsys_darwin_386.go
index 965c0b2..5acf6db 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_freebsd_riscv64.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_darwin_386.go
@@ -1,11 +1,11 @@
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_freebsd.go
+// cgo -godefs defs_darwin.go
 
 package socket
 
 type iovec struct {
 	Base *byte
-	Len  uint64
+	Len  uint32
 }
 
 type msghdr struct {
@@ -25,6 +25,6 @@ type cmsghdr struct {
 }
 
 const (
-	sizeofIovec  = 0x10
-	sizeofMsghdr = 0x30
+	sizeofIovec  = 0x8
+	sizeofMsghdr = 0x1c
 )
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_openbsd_ppc64.go b/vendor/golang.org/x/net/internal/socket/zsys_darwin_arm.go
similarity index 74%
rename from vendor/golang.org/x/net/internal/socket/zsys_openbsd_ppc64.go
rename to vendor/golang.org/x/net/internal/socket/zsys_darwin_arm.go
index 3c9576e..5acf6db 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_openbsd_ppc64.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_darwin_arm.go
@@ -1,18 +1,18 @@
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_openbsd.go
+// cgo -godefs defs_darwin.go
 
 package socket
 
 type iovec struct {
 	Base *byte
-	Len  uint64
+	Len  uint32
 }
 
 type msghdr struct {
 	Name       *byte
 	Namelen    uint32
 	Iov        *iovec
-	Iovlen     uint32
+	Iovlen     int32
 	Control    *byte
 	Controllen uint32
 	Flags      int32
@@ -25,6 +25,6 @@ type cmsghdr struct {
 }
 
 const (
-	sizeofIovec  = 0x10
-	sizeofMsghdr = 0x30
+	sizeofIovec  = 0x8
+	sizeofMsghdr = 0x1c
 )
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go b/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
deleted file mode 100644
index b6fc15a..0000000
--- a/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_linux.go
-
-//go:build loong64
-
-package socket
-
-type iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_0  [4]byte
-}
-
-type mmsghdr struct {
-	Hdr       msghdr
-	Len       uint32
-	Pad_cgo_0 [4]byte
-}
-
-type cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-const (
-	sizeofIovec  = 0x10
-	sizeofMsghdr = 0x38
-)
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_linux_ppc.go b/vendor/golang.org/x/net/internal/socket/zsys_linux_ppc.go
index 4c19269..59b71da 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_linux_ppc.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_linux_ppc.go
@@ -4,32 +4,32 @@
 package socket
 
 type iovec struct {
-	Base *byte
-	Len  uint32
+	Base	*byte
+	Len	uint32
 }
 
 type msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
+	Name		*byte
+	Namelen		uint32
+	Iov		*iovec
+	Iovlen		uint32
+	Control		*byte
+	Controllen	uint32
+	Flags		int32
 }
 
 type mmsghdr struct {
-	Hdr msghdr
-	Len uint32
+	Hdr	msghdr
+	Len	uint32
 }
 
 type cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
+	Len	uint32
+	Level	int32
+	Type	int32
 }
 
 const (
-	sizeofIovec  = 0x8
-	sizeofMsghdr = 0x1c
+	sizeofIovec	= 0x8
+	sizeofMsghdr	= 0x1c
 )
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go b/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
index e67fc3c..c066272 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
@@ -2,6 +2,7 @@
 // cgo -godefs defs_linux.go
 
 //go:build riscv64
+// +build riscv64
 
 package socket
 
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_openbsd_riscv64.go b/vendor/golang.org/x/net/internal/socket/zsys_openbsd_riscv64.go
deleted file mode 100644
index 3c9576e..0000000
--- a/vendor/golang.org/x/net/internal/socket/zsys_openbsd_riscv64.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_openbsd.go
-
-package socket
-
-type iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-const (
-	sizeofIovec  = 0x10
-	sizeofMsghdr = 0x30
-)
diff --git a/vendor/golang.org/x/net/ipv4/control_bsd.go b/vendor/golang.org/x/net/ipv4/control_bsd.go
index c88da8c..b7385df 100644
--- a/vendor/golang.org/x/net/ipv4/control_bsd.go
+++ b/vendor/golang.org/x/net/ipv4/control_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
+// +build aix darwin dragonfly freebsd netbsd openbsd
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/control_pktinfo.go b/vendor/golang.org/x/net/ipv4/control_pktinfo.go
index 14ae2da..0e748db 100644
--- a/vendor/golang.org/x/net/ipv4/control_pktinfo.go
+++ b/vendor/golang.org/x/net/ipv4/control_pktinfo.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || linux || solaris
+// +build darwin linux solaris
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/control_stub.go b/vendor/golang.org/x/net/ipv4/control_stub.go
index 3ba6611..f27322c 100644
--- a/vendor/golang.org/x/net/ipv4/control_stub.go
+++ b/vendor/golang.org/x/net/ipv4/control_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/control_unix.go b/vendor/golang.org/x/net/ipv4/control_unix.go
index 2e76554..2413e02 100644
--- a/vendor/golang.org/x/net/ipv4/control_unix.go
+++ b/vendor/golang.org/x/net/ipv4/control_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/doc.go b/vendor/golang.org/x/net/ipv4/doc.go
index 6fbdc52..2458349 100644
--- a/vendor/golang.org/x/net/ipv4/doc.go
+++ b/vendor/golang.org/x/net/ipv4/doc.go
@@ -16,7 +16,8 @@
 // 3376.
 // Source-specific multicast is defined in RFC 4607.
 //
-// # Unicasting
+//
+// Unicasting
 //
 // The options for unicasting are available for net.TCPConn,
 // net.UDPConn and net.IPConn which are created as network connections
@@ -50,7 +51,8 @@
 //		}(c)
 //	}
 //
-// # Multicasting
+//
+// Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
 // net.IPConn which are created as network connections that use the
@@ -139,7 +141,8 @@
 //		}
 //	}
 //
-// # More multicasting
+//
+// More multicasting
 //
 // An application that uses PacketConn or RawConn may join multiple
 // multicast groups. For example, a UDP listener with port 1024 might
@@ -197,7 +200,8 @@
 //		// error handling
 //	}
 //
-// # Source-specific multicasting
+//
+// Source-specific multicasting
 //
 // An application that uses PacketConn or RawConn on IGMPv3 supported
 // platform is able to join source-specific multicast groups.
diff --git a/vendor/golang.org/x/net/ipv4/icmp_stub.go b/vendor/golang.org/x/net/ipv4/icmp_stub.go
index c2c4ce7..cd4ee6e 100644
--- a/vendor/golang.org/x/net/ipv4/icmp_stub.go
+++ b/vendor/golang.org/x/net/ipv4/icmp_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !linux
+// +build !linux
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg.go b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
index 91c685e..1bb370e 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
index 2afd4b5..53f0794 100644
--- a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sockopt_posix.go b/vendor/golang.org/x/net/ipv4/sockopt_posix.go
index 82e2c37..eb07c1c 100644
--- a/vendor/golang.org/x/net/ipv4/sockopt_posix.go
+++ b/vendor/golang.org/x/net/ipv4/sockopt_posix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sockopt_stub.go b/vendor/golang.org/x/net/ipv4/sockopt_stub.go
index 840108b..cf03689 100644
--- a/vendor/golang.org/x/net/ipv4/sockopt_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sockopt_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_aix.go b/vendor/golang.org/x/net/ipv4/sys_aix.go
index 9244a68..02730cd 100644
--- a/vendor/golang.org/x/net/ipv4/sys_aix.go
+++ b/vendor/golang.org/x/net/ipv4/sys_aix.go
@@ -4,6 +4,7 @@
 
 // Added for go1.11 compatibility
 //go:build aix
+// +build aix
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_asmreq.go b/vendor/golang.org/x/net/ipv4/sys_asmreq.go
index 645f254..22322b3 100644
--- a/vendor/golang.org/x/net/ipv4/sys_asmreq.go
+++ b/vendor/golang.org/x/net/ipv4/sys_asmreq.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris || windows
+// +build aix darwin dragonfly freebsd netbsd openbsd solaris windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go b/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go
index 48cfb6d..fde6401 100644
--- a/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !netbsd && !openbsd && !solaris && !windows
+// +build !aix,!darwin,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_asmreqn.go b/vendor/golang.org/x/net/ipv4/sys_asmreqn.go
index 0b27b63..54eb990 100644
--- a/vendor/golang.org/x/net/ipv4/sys_asmreqn.go
+++ b/vendor/golang.org/x/net/ipv4/sys_asmreqn.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || freebsd || linux
+// +build darwin freebsd linux
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go b/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go
index 303a5e2..dcb15f2 100644
--- a/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !freebsd && !linux
+// +build !darwin,!freebsd,!linux
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_bpf.go b/vendor/golang.org/x/net/ipv4/sys_bpf.go
index 1b4780d..fb11e32 100644
--- a/vendor/golang.org/x/net/ipv4/sys_bpf.go
+++ b/vendor/golang.org/x/net/ipv4/sys_bpf.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux
+// +build linux
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go b/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go
index b1f779b..fc53a0d 100644
--- a/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !linux
+// +build !linux
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_bsd.go b/vendor/golang.org/x/net/ipv4/sys_bsd.go
index b7b032d..e191b2f 100644
--- a/vendor/golang.org/x/net/ipv4/sys_bsd.go
+++ b/vendor/golang.org/x/net/ipv4/sys_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build netbsd || openbsd
+// +build netbsd openbsd
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_ssmreq.go b/vendor/golang.org/x/net/ipv4/sys_ssmreq.go
index a295e15..6a4e7ab 100644
--- a/vendor/golang.org/x/net/ipv4/sys_ssmreq.go
+++ b/vendor/golang.org/x/net/ipv4/sys_ssmreq.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || freebsd || linux || solaris
+// +build darwin freebsd linux solaris
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go b/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go
index 74bd454..157159f 100644
--- a/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !freebsd && !linux && !solaris
+// +build !darwin,!freebsd,!linux,!solaris
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/sys_stub.go b/vendor/golang.org/x/net/ipv4/sys_stub.go
index 20af407..d550851 100644
--- a/vendor/golang.org/x/net/ipv4/sys_stub.go
+++ b/vendor/golang.org/x/net/ipv4/sys_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go b/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go
index dd45402..b7f2d6e 100644
--- a/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go
+++ b/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go
@@ -3,6 +3,7 @@
 
 // Added for go1.11 compatibility
 //go:build aix
+// +build aix
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/zsys_freebsd_riscv64.go b/vendor/golang.org/x/net/ipv4/zsys_freebsd_riscv64.go
deleted file mode 100644
index 0feb9a7..0000000
--- a/vendor/golang.org/x/net/ipv4/zsys_freebsd_riscv64.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_freebsd.go
-
-package ipv4
-
-const (
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]uint8
-	X__ss_align int64
-	X__ss_pad2  [112]uint8
-}
-
-type sockaddrInet struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
diff --git a/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go b/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go
deleted file mode 100644
index 54f9e13..0000000
--- a/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_linux.go
-
-//go:build loong64
-
-package ipv4
-
-const (
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
diff --git a/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go b/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go
index 78374a5..e2edebd 100644
--- a/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go
+++ b/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go
@@ -2,6 +2,7 @@
 // cgo -godefs defs_linux.go
 
 //go:build riscv64
+// +build riscv64
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go b/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go
index a8f04e7..2733ddb 100644
--- a/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go
+++ b/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
+// +build darwin
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go b/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go
index 51fbbb1..9c90844 100644
--- a/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go
+++ b/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/control_stub.go b/vendor/golang.org/x/net/ipv6/control_stub.go
index eb28ce7..b7e8643 100644
--- a/vendor/golang.org/x/net/ipv6/control_stub.go
+++ b/vendor/golang.org/x/net/ipv6/control_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/control_unix.go b/vendor/golang.org/x/net/ipv6/control_unix.go
index 9c73b86..63e475d 100644
--- a/vendor/golang.org/x/net/ipv6/control_unix.go
+++ b/vendor/golang.org/x/net/ipv6/control_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/dgramopt.go b/vendor/golang.org/x/net/ipv6/dgramopt.go
index 846f0e1..1f422e7 100644
--- a/vendor/golang.org/x/net/ipv6/dgramopt.go
+++ b/vendor/golang.org/x/net/ipv6/dgramopt.go
@@ -245,7 +245,7 @@ func (c *dgramOpt) Checksum() (on bool, offset int, err error) {
 	return true, offset, nil
 }
 
-// SetChecksum enables the kernel checksum processing. If on is true,
+// SetChecksum enables the kernel checksum processing. If on is ture,
 // the offset should be an offset in bytes into the data of where the
 // checksum field is located.
 func (c *dgramOpt) SetChecksum(on bool, offset int) error {
diff --git a/vendor/golang.org/x/net/ipv6/doc.go b/vendor/golang.org/x/net/ipv6/doc.go
index 2148b81..e0be9d5 100644
--- a/vendor/golang.org/x/net/ipv6/doc.go
+++ b/vendor/golang.org/x/net/ipv6/doc.go
@@ -17,7 +17,8 @@
 // On Darwin, this package requires OS X Mavericks version 10.9 or
 // above, or equivalent.
 //
-// # Unicasting
+//
+// Unicasting
 //
 // The options for unicasting are available for net.TCPConn,
 // net.UDPConn and net.IPConn which are created as network connections
@@ -51,7 +52,8 @@
 //		}(c)
 //	}
 //
-// # Multicasting
+//
+// Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
 // net.IPConn which are created as network connections that use the
@@ -138,7 +140,8 @@
 //		}
 //	}
 //
-// # More multicasting
+//
+// More multicasting
 //
 // An application that uses PacketConn may join multiple multicast
 // groups. For example, a UDP listener with port 1024 might join two
@@ -196,7 +199,8 @@
 //		// error handling
 //	}
 //
-// # Source-specific multicasting
+//
+// Source-specific multicasting
 //
 // An application that uses PacketConn on MLDv2 supported platform is
 // able to join source-specific multicast groups.
diff --git a/vendor/golang.org/x/net/ipv6/icmp_bsd.go b/vendor/golang.org/x/net/ipv6/icmp_bsd.go
index 2814534..120bf87 100644
--- a/vendor/golang.org/x/net/ipv6/icmp_bsd.go
+++ b/vendor/golang.org/x/net/ipv6/icmp_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
+// +build aix darwin dragonfly freebsd netbsd openbsd
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/icmp_stub.go b/vendor/golang.org/x/net/ipv6/icmp_stub.go
index c92c9b5..d60136a 100644
--- a/vendor/golang.org/x/net/ipv6/icmp_stub.go
+++ b/vendor/golang.org/x/net/ipv6/icmp_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg.go b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
index be04e4d..b0692e4 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
index 29b9ccf..cd0ff50 100644
--- a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sockopt_posix.go b/vendor/golang.org/x/net/ipv6/sockopt_posix.go
index 34dfed5..37c6287 100644
--- a/vendor/golang.org/x/net/ipv6/sockopt_posix.go
+++ b/vendor/golang.org/x/net/ipv6/sockopt_posix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sockopt_stub.go b/vendor/golang.org/x/net/ipv6/sockopt_stub.go
index a09c3aa..32fd866 100644
--- a/vendor/golang.org/x/net/ipv6/sockopt_stub.go
+++ b/vendor/golang.org/x/net/ipv6/sockopt_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_aix.go b/vendor/golang.org/x/net/ipv6/sys_aix.go
index 93c8efc..a47182a 100644
--- a/vendor/golang.org/x/net/ipv6/sys_aix.go
+++ b/vendor/golang.org/x/net/ipv6/sys_aix.go
@@ -4,6 +4,7 @@
 
 // Added for go1.11 compatibility
 //go:build aix
+// +build aix
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_asmreq.go b/vendor/golang.org/x/net/ipv6/sys_asmreq.go
index 5c9cb44..6ff9950 100644
--- a/vendor/golang.org/x/net/ipv6/sys_asmreq.go
+++ b/vendor/golang.org/x/net/ipv6/sys_asmreq.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_asmreq_stub.go b/vendor/golang.org/x/net/ipv6/sys_asmreq_stub.go
index dc70494..485290c 100644
--- a/vendor/golang.org/x/net/ipv6/sys_asmreq_stub.go
+++ b/vendor/golang.org/x/net/ipv6/sys_asmreq_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_bpf.go b/vendor/golang.org/x/net/ipv6/sys_bpf.go
index e39f75f..b5661fb 100644
--- a/vendor/golang.org/x/net/ipv6/sys_bpf.go
+++ b/vendor/golang.org/x/net/ipv6/sys_bpf.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux
+// +build linux
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_bpf_stub.go b/vendor/golang.org/x/net/ipv6/sys_bpf_stub.go
index 8532a8f..cb00661 100644
--- a/vendor/golang.org/x/net/ipv6/sys_bpf_stub.go
+++ b/vendor/golang.org/x/net/ipv6/sys_bpf_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !linux
+// +build !linux
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_bsd.go b/vendor/golang.org/x/net/ipv6/sys_bsd.go
index 9f3bc2a..bde41a6 100644
--- a/vendor/golang.org/x/net/ipv6/sys_bsd.go
+++ b/vendor/golang.org/x/net/ipv6/sys_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build dragonfly || netbsd || openbsd
+// +build dragonfly netbsd openbsd
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_ssmreq.go b/vendor/golang.org/x/net/ipv6/sys_ssmreq.go
index b40f5c6..023488a 100644
--- a/vendor/golang.org/x/net/ipv6/sys_ssmreq.go
+++ b/vendor/golang.org/x/net/ipv6/sys_ssmreq.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || freebsd || linux || solaris || zos
+// +build aix darwin freebsd linux solaris zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_ssmreq_stub.go b/vendor/golang.org/x/net/ipv6/sys_ssmreq_stub.go
index 6526aad..acdf2e5 100644
--- a/vendor/golang.org/x/net/ipv6/sys_ssmreq_stub.go
+++ b/vendor/golang.org/x/net/ipv6/sys_ssmreq_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !freebsd && !linux && !solaris && !zos
+// +build !aix,!darwin,!freebsd,!linux,!solaris,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/sys_stub.go b/vendor/golang.org/x/net/ipv6/sys_stub.go
index 76602c3..5807bba 100644
--- a/vendor/golang.org/x/net/ipv6/sys_stub.go
+++ b/vendor/golang.org/x/net/ipv6/sys_stub.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/zsys_aix_ppc64.go b/vendor/golang.org/x/net/ipv6/zsys_aix_ppc64.go
index 668716d..f604b0f 100644
--- a/vendor/golang.org/x/net/ipv6/zsys_aix_ppc64.go
+++ b/vendor/golang.org/x/net/ipv6/zsys_aix_ppc64.go
@@ -3,6 +3,7 @@
 
 // Added for go1.11 compatibility
 //go:build aix
+// +build aix
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/zsys_freebsd_riscv64.go b/vendor/golang.org/x/net/ipv6/zsys_freebsd_riscv64.go
deleted file mode 100644
index 5b39eb8..0000000
--- a/vendor/golang.org/x/net/ipv6/zsys_freebsd_riscv64.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_freebsd.go
-
-package ipv6
-
-const (
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet6   = 0x1c
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]uint8
-	X__ss_align int64
-	X__ss_pad2  [112]uint8
-}
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/vendor/golang.org/x/net/ipv6/zsys_linux_loong64.go b/vendor/golang.org/x/net/ipv6/zsys_linux_loong64.go
deleted file mode 100644
index 6a53284..0000000
--- a/vendor/golang.org/x/net/ipv6/zsys_linux_loong64.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs defs_linux.go
-
-//go:build loong64
-
-package ipv6
-
-const (
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
diff --git a/vendor/golang.org/x/net/ipv6/zsys_linux_riscv64.go b/vendor/golang.org/x/net/ipv6/zsys_linux_riscv64.go
index 13b3472..d4f78e4 100644
--- a/vendor/golang.org/x/net/ipv6/zsys_linux_riscv64.go
+++ b/vendor/golang.org/x/net/ipv6/zsys_linux_riscv64.go
@@ -2,6 +2,7 @@
 // cgo -godefs defs_linux.go
 
 //go:build riscv64
+// +build riscv64
 
 package ipv6
 
diff --git a/vendor/golang.org/x/oauth2/.travis.yml b/vendor/golang.org/x/oauth2/.travis.yml
deleted file mode 100644
index fa139db..0000000
--- a/vendor/golang.org/x/oauth2/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: go
-
-go:
-  - tip
-
-install:
-  - export GOPATH="$HOME/gopath"
-  - mkdir -p "$GOPATH/src/golang.org/x"
-  - mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/golang.org/x/oauth2"
-  - go get -v -t -d golang.org/x/oauth2/...
-
-script:
-  - go test -v golang.org/x/oauth2/...
diff --git a/vendor/golang.org/x/oauth2/CONTRIBUTING.md b/vendor/golang.org/x/oauth2/CONTRIBUTING.md
deleted file mode 100644
index dfbed62..0000000
--- a/vendor/golang.org/x/oauth2/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-## Filing issues
-
-When [filing an issue](https://github.com/golang/oauth2/issues), make sure to answer these five questions:
-
-1.  What version of Go are you using (`go version`)?
-2.  What operating system and processor architecture are you using?
-3.  What did you do?
-4.  What did you expect to see?
-5.  What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
diff --git a/vendor/golang.org/x/oauth2/LICENSE b/vendor/golang.org/x/oauth2/LICENSE
deleted file mode 100644
index 2a7cf70..0000000
--- a/vendor/golang.org/x/oauth2/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright 2009 The Go Authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google LLC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/oauth2/README.md b/vendor/golang.org/x/oauth2/README.md
deleted file mode 100644
index 48dbb9d..0000000
--- a/vendor/golang.org/x/oauth2/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# OAuth2 for Go
-
-[![Go Reference](https://pkg.go.dev/badge/golang.org/x/oauth2.svg)](https://pkg.go.dev/golang.org/x/oauth2)
-[![Build Status](https://travis-ci.org/golang/oauth2.svg?branch=master)](https://travis-ci.org/golang/oauth2)
-
-oauth2 package contains a client implementation for OAuth 2.0 spec.
-
-See pkg.go.dev for further documentation and examples.
-
-* [pkg.go.dev/golang.org/x/oauth2](https://pkg.go.dev/golang.org/x/oauth2)
-* [pkg.go.dev/golang.org/x/oauth2/google](https://pkg.go.dev/golang.org/x/oauth2/google)
-
-## Policy for new endpoints
-
-We no longer accept new provider-specific packages in this repo if all
-they do is add a single endpoint variable. If you just want to add a
-single endpoint, add it to the
-[pkg.go.dev/golang.org/x/oauth2/endpoints](https://pkg.go.dev/golang.org/x/oauth2/endpoints)
-package.
-
-## Report Issues / Send Patches
-
-The main issue tracker for the oauth2 repository is located at
-https://github.com/golang/oauth2/issues.
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://go.dev/doc/contribute.
-
-The git repository is https://go.googlesource.com/oauth2.
-
-Note:
-
-* Excluding trivial changes, all contributions should be connected to an existing issue.
-* API changes must go through the [change proposal process](https://go.dev/s/proposal-process) before they can be accepted.
-* The code owners are listed at [dev.golang.org/owners](https://dev.golang.org/owners#:~:text=x/oauth2).
diff --git a/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go b/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go
deleted file mode 100644
index e86346e..0000000
--- a/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package clientcredentials implements the OAuth2.0 "client credentials" token flow,
-// also known as the "two-legged OAuth 2.0".
-//
-// This should be used when the client is acting on its own behalf or when the client
-// is the resource owner. It may also be used when requesting access to protected
-// resources based on an authorization previously arranged with the authorization
-// server.
-//
-// See https://tools.ietf.org/html/rfc6749#section-4.4
-package clientcredentials // import "golang.org/x/oauth2/clientcredentials"
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/internal"
-)
-
-// Config describes a 2-legged OAuth2 flow, with both the
-// client application information and the server's endpoint URLs.
-type Config struct {
-	// ClientID is the application's ID.
-	ClientID string
-
-	// ClientSecret is the application's secret.
-	ClientSecret string
-
-	// TokenURL is the resource server's token endpoint
-	// URL. This is a constant specific to each server.
-	TokenURL string
-
-	// Scopes specifies optional requested permissions.
-	Scopes []string
-
-	// EndpointParams specifies additional parameters for requests to the token endpoint.
-	EndpointParams url.Values
-
-	// AuthStyle optionally specifies how the endpoint wants the
-	// client ID & client secret sent. The zero value means to
-	// auto-detect.
-	AuthStyle oauth2.AuthStyle
-
-	// authStyleCache caches which auth style to use when Endpoint.AuthStyle is
-	// the zero value (AuthStyleAutoDetect).
-	authStyleCache internal.LazyAuthStyleCache
-}
-
-// Token uses client credentials to retrieve a token.
-//
-// The provided context optionally controls which HTTP client is used. See the [oauth2.HTTPClient] variable.
-func (c *Config) Token(ctx context.Context) (*oauth2.Token, error) {
-	return c.TokenSource(ctx).Token()
-}
-
-// Client returns an HTTP client using the provided token.
-// The token will auto-refresh as necessary.
-//
-// The provided context optionally controls which HTTP client
-// is returned. See the [oauth2.HTTPClient] variable.
-//
-// The returned [http.Client] and its Transport should not be modified.
-func (c *Config) Client(ctx context.Context) *http.Client {
-	return oauth2.NewClient(ctx, c.TokenSource(ctx))
-}
-
-// TokenSource returns a [oauth2.TokenSource] that returns t until t expires,
-// automatically refreshing it as necessary using the provided context and the
-// client ID and client secret.
-//
-// Most users will use [Config.Client] instead.
-func (c *Config) TokenSource(ctx context.Context) oauth2.TokenSource {
-	source := &tokenSource{
-		ctx:  ctx,
-		conf: c,
-	}
-	return oauth2.ReuseTokenSource(nil, source)
-}
-
-type tokenSource struct {
-	ctx  context.Context
-	conf *Config
-}
-
-// Token refreshes the token by using a new client credentials request.
-// tokens received this way do not include a refresh token
-func (c *tokenSource) Token() (*oauth2.Token, error) {
-	v := url.Values{
-		"grant_type": {"client_credentials"},
-	}
-	if len(c.conf.Scopes) > 0 {
-		v.Set("scope", strings.Join(c.conf.Scopes, " "))
-	}
-	for k, p := range c.conf.EndpointParams {
-		// Allow grant_type to be overridden to allow interoperability with
-		// non-compliant implementations.
-		if _, ok := v[k]; ok && k != "grant_type" {
-			return nil, fmt.Errorf("oauth2: cannot overwrite parameter %q", k)
-		}
-		v[k] = p
-	}
-
-	tk, err := internal.RetrieveToken(c.ctx, c.conf.ClientID, c.conf.ClientSecret, c.conf.TokenURL, v, internal.AuthStyle(c.conf.AuthStyle), c.conf.authStyleCache.Get())
-	if err != nil {
-		if rErr, ok := err.(*internal.RetrieveError); ok {
-			return nil, (*oauth2.RetrieveError)(rErr)
-		}
-		return nil, err
-	}
-	t := &oauth2.Token{
-		AccessToken:  tk.AccessToken,
-		TokenType:    tk.TokenType,
-		RefreshToken: tk.RefreshToken,
-		Expiry:       tk.Expiry,
-	}
-	return t.WithExtra(tk.Raw), nil
-}
diff --git a/vendor/golang.org/x/oauth2/deviceauth.go b/vendor/golang.org/x/oauth2/deviceauth.go
deleted file mode 100644
index e99c92f..0000000
--- a/vendor/golang.org/x/oauth2/deviceauth.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package oauth2
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2/internal"
-)
-
-// https://datatracker.ietf.org/doc/html/rfc8628#section-3.5
-const (
-	errAuthorizationPending = "authorization_pending"
-	errSlowDown             = "slow_down"
-	errAccessDenied         = "access_denied"
-	errExpiredToken         = "expired_token"
-)
-
-// DeviceAuthResponse describes a successful RFC 8628 Device Authorization Response
-// https://datatracker.ietf.org/doc/html/rfc8628#section-3.2
-type DeviceAuthResponse struct {
-	// DeviceCode
-	DeviceCode string `json:"device_code"`
-	// UserCode is the code the user should enter at the verification uri
-	UserCode string `json:"user_code"`
-	// VerificationURI is where user should enter the user code
-	VerificationURI string `json:"verification_uri"`
-	// VerificationURIComplete (if populated) includes the user code in the verification URI. This is typically shown to the user in non-textual form, such as a QR code.
-	VerificationURIComplete string `json:"verification_uri_complete,omitempty"`
-	// Expiry is when the device code and user code expire
-	Expiry time.Time `json:"expires_in,omitempty"`
-	// Interval is the duration in seconds that Poll should wait between requests
-	Interval int64 `json:"interval,omitempty"`
-}
-
-func (d DeviceAuthResponse) MarshalJSON() ([]byte, error) {
-	type Alias DeviceAuthResponse
-	var expiresIn int64
-	if !d.Expiry.IsZero() {
-		expiresIn = int64(time.Until(d.Expiry).Seconds())
-	}
-	return json.Marshal(&struct {
-		ExpiresIn int64 `json:"expires_in,omitempty"`
-		*Alias
-	}{
-		ExpiresIn: expiresIn,
-		Alias:     (*Alias)(&d),
-	})
-
-}
-
-func (c *DeviceAuthResponse) UnmarshalJSON(data []byte) error {
-	type Alias DeviceAuthResponse
-	aux := &struct {
-		ExpiresIn int64 `json:"expires_in"`
-		// workaround misspelling of verification_uri
-		VerificationURL string `json:"verification_url"`
-		*Alias
-	}{
-		Alias: (*Alias)(c),
-	}
-	if err := json.Unmarshal(data, &aux); err != nil {
-		return err
-	}
-	if aux.ExpiresIn != 0 {
-		c.Expiry = time.Now().UTC().Add(time.Second * time.Duration(aux.ExpiresIn))
-	}
-	if c.VerificationURI == "" {
-		c.VerificationURI = aux.VerificationURL
-	}
-	return nil
-}
-
-// DeviceAuth returns a device auth struct which contains a device code
-// and authorization information provided for users to enter on another device.
-func (c *Config) DeviceAuth(ctx context.Context, opts ...AuthCodeOption) (*DeviceAuthResponse, error) {
-	// https://datatracker.ietf.org/doc/html/rfc8628#section-3.1
-	v := url.Values{
-		"client_id": {c.ClientID},
-	}
-	if len(c.Scopes) > 0 {
-		v.Set("scope", strings.Join(c.Scopes, " "))
-	}
-	for _, opt := range opts {
-		opt.setValue(v)
-	}
-	return retrieveDeviceAuth(ctx, c, v)
-}
-
-func retrieveDeviceAuth(ctx context.Context, c *Config, v url.Values) (*DeviceAuthResponse, error) {
-	if c.Endpoint.DeviceAuthURL == "" {
-		return nil, errors.New("endpoint missing DeviceAuthURL")
-	}
-
-	req, err := http.NewRequest("POST", c.Endpoint.DeviceAuthURL, strings.NewReader(v.Encode()))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Accept", "application/json")
-
-	t := time.Now()
-	r, err := internal.ContextClient(ctx).Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	body, err := io.ReadAll(io.LimitReader(r.Body, 1<<20))
-	if err != nil {
-		return nil, fmt.Errorf("oauth2: cannot auth device: %v", err)
-	}
-	if code := r.StatusCode; code < 200 || code > 299 {
-		return nil, &RetrieveError{
-			Response: r,
-			Body:     body,
-		}
-	}
-
-	da := &DeviceAuthResponse{}
-	err = json.Unmarshal(body, &da)
-	if err != nil {
-		return nil, fmt.Errorf("unmarshal %s", err)
-	}
-
-	if !da.Expiry.IsZero() {
-		// Make a small adjustment to account for time taken by the request
-		da.Expiry = da.Expiry.Add(-time.Since(t))
-	}
-
-	return da, nil
-}
-
-// DeviceAccessToken polls the server to exchange a device code for a token.
-func (c *Config) DeviceAccessToken(ctx context.Context, da *DeviceAuthResponse, opts ...AuthCodeOption) (*Token, error) {
-	if !da.Expiry.IsZero() {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithDeadline(ctx, da.Expiry)
-		defer cancel()
-	}
-
-	// https://datatracker.ietf.org/doc/html/rfc8628#section-3.4
-	v := url.Values{
-		"client_id":   {c.ClientID},
-		"grant_type":  {"urn:ietf:params:oauth:grant-type:device_code"},
-		"device_code": {da.DeviceCode},
-	}
-	if len(c.Scopes) > 0 {
-		v.Set("scope", strings.Join(c.Scopes, " "))
-	}
-	for _, opt := range opts {
-		opt.setValue(v)
-	}
-
-	// "If no value is provided, clients MUST use 5 as the default."
-	// https://datatracker.ietf.org/doc/html/rfc8628#section-3.2
-	interval := da.Interval
-	if interval == 0 {
-		interval = 5
-	}
-
-	ticker := time.NewTicker(time.Duration(interval) * time.Second)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-ticker.C:
-			tok, err := retrieveToken(ctx, c, v)
-			if err == nil {
-				return tok, nil
-			}
-
-			e, ok := err.(*RetrieveError)
-			if !ok {
-				return nil, err
-			}
-			switch e.ErrorCode {
-			case errSlowDown:
-				// https://datatracker.ietf.org/doc/html/rfc8628#section-3.5
-				// "the interval MUST be increased by 5 seconds for this and all subsequent requests"
-				interval += 5
-				ticker.Reset(time.Duration(interval) * time.Second)
-			case errAuthorizationPending:
-				// Do nothing.
-			case errAccessDenied, errExpiredToken:
-				fallthrough
-			default:
-				return tok, err
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/oauth2/internal/doc.go b/vendor/golang.org/x/oauth2/internal/doc.go
deleted file mode 100644
index 8c7c475..0000000
--- a/vendor/golang.org/x/oauth2/internal/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package internal contains support packages for [golang.org/x/oauth2].
-package internal
diff --git a/vendor/golang.org/x/oauth2/internal/oauth2.go b/vendor/golang.org/x/oauth2/internal/oauth2.go
deleted file mode 100644
index 71ea6ad..0000000
--- a/vendor/golang.org/x/oauth2/internal/oauth2.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"fmt"
-)
-
-// ParseKey converts the binary contents of a private key file
-// to an [*rsa.PrivateKey]. It detects whether the private key is in a
-// PEM container or not. If so, it extracts the private key
-// from PEM container before conversion. It only supports PEM
-// containers with no passphrase.
-func ParseKey(key []byte) (*rsa.PrivateKey, error) {
-	block, _ := pem.Decode(key)
-	if block != nil {
-		key = block.Bytes
-	}
-	parsedKey, err := x509.ParsePKCS8PrivateKey(key)
-	if err != nil {
-		parsedKey, err = x509.ParsePKCS1PrivateKey(key)
-		if err != nil {
-			return nil, fmt.Errorf("private key should be a PEM or plain PKCS1 or PKCS8; parse error: %v", err)
-		}
-	}
-	parsed, ok := parsedKey.(*rsa.PrivateKey)
-	if !ok {
-		return nil, errors.New("private key is invalid")
-	}
-	return parsed, nil
-}
diff --git a/vendor/golang.org/x/oauth2/internal/token.go b/vendor/golang.org/x/oauth2/internal/token.go
deleted file mode 100644
index 8389f24..0000000
--- a/vendor/golang.org/x/oauth2/internal/token.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"mime"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// Token represents the credentials used to authorize
-// the requests to access protected resources on the OAuth 2.0
-// provider's backend.
-//
-// This type is a mirror of [golang.org/x/oauth2.Token] and exists to break
-// an otherwise-circular dependency. Other internal packages
-// should convert this Token into an [golang.org/x/oauth2.Token] before use.
-type Token struct {
-	// AccessToken is the token that authorizes and authenticates
-	// the requests.
-	AccessToken string
-
-	// TokenType is the type of token.
-	// The Type method returns either this or "Bearer", the default.
-	TokenType string
-
-	// RefreshToken is a token that's used by the application
-	// (as opposed to the user) to refresh the access token
-	// if it expires.
-	RefreshToken string
-
-	// Expiry is the optional expiration time of the access token.
-	//
-	// If zero, TokenSource implementations will reuse the same
-	// token forever and RefreshToken or equivalent
-	// mechanisms for that TokenSource will not be used.
-	Expiry time.Time
-
-	// ExpiresIn is the OAuth2 wire format "expires_in" field,
-	// which specifies how many seconds later the token expires,
-	// relative to an unknown time base approximately around "now".
-	// It is the application's responsibility to populate
-	// `Expiry` from `ExpiresIn` when required.
-	ExpiresIn int64 `json:"expires_in,omitempty"`
-
-	// Raw optionally contains extra metadata from the server
-	// when updating a token.
-	Raw any
-}
-
-// tokenJSON is the struct representing the HTTP response from OAuth2
-// providers returning a token or error in JSON form.
-// https://datatracker.ietf.org/doc/html/rfc6749#section-5.1
-type tokenJSON struct {
-	AccessToken  string         `json:"access_token"`
-	TokenType    string         `json:"token_type"`
-	RefreshToken string         `json:"refresh_token"`
-	ExpiresIn    expirationTime `json:"expires_in"` // at least PayPal returns string, while most return number
-	// error fields
-	// https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
-	ErrorCode        string `json:"error"`
-	ErrorDescription string `json:"error_description"`
-	ErrorURI         string `json:"error_uri"`
-}
-
-func (e *tokenJSON) expiry() (t time.Time) {
-	if v := e.ExpiresIn; v != 0 {
-		return time.Now().Add(time.Duration(v) * time.Second)
-	}
-	return
-}
-
-type expirationTime int32
-
-func (e *expirationTime) UnmarshalJSON(b []byte) error {
-	if len(b) == 0 || string(b) == "null" {
-		return nil
-	}
-	var n json.Number
-	err := json.Unmarshal(b, &n)
-	if err != nil {
-		return err
-	}
-	i, err := n.Int64()
-	if err != nil {
-		return err
-	}
-	if i > math.MaxInt32 {
-		i = math.MaxInt32
-	}
-	*e = expirationTime(i)
-	return nil
-}
-
-// AuthStyle is a copy of the golang.org/x/oauth2 package's AuthStyle type.
-type AuthStyle int
-
-const (
-	AuthStyleUnknown  AuthStyle = 0
-	AuthStyleInParams AuthStyle = 1
-	AuthStyleInHeader AuthStyle = 2
-)
-
-// LazyAuthStyleCache is a backwards compatibility compromise to let Configs
-// have a lazily-initialized AuthStyleCache.
-//
-// The two users of this, oauth2.Config and oauth2/clientcredentials.Config,
-// both would ideally just embed an unexported AuthStyleCache but because both
-// were historically allowed to be copied by value we can't retroactively add an
-// uncopyable Mutex to them.
-//
-// We could use an atomic.Pointer, but that was added recently enough (in Go
-// 1.18) that we'd break Go 1.17 users where the tests as of 2023-08-03
-// still pass. By using an atomic.Value, it supports both Go 1.17 and
-// copying by value, even if that's not ideal.
-type LazyAuthStyleCache struct {
-	v atomic.Value // of *AuthStyleCache
-}
-
-func (lc *LazyAuthStyleCache) Get() *AuthStyleCache {
-	if c, ok := lc.v.Load().(*AuthStyleCache); ok {
-		return c
-	}
-	c := new(AuthStyleCache)
-	if !lc.v.CompareAndSwap(nil, c) {
-		c = lc.v.Load().(*AuthStyleCache)
-	}
-	return c
-}
-
-type authStyleCacheKey struct {
-	url      string
-	clientID string
-}
-
-// AuthStyleCache is the set of tokenURLs we've successfully used via
-// RetrieveToken and which style auth we ended up using.
-// It's called a cache, but it doesn't (yet?) shrink. It's expected that
-// the set of OAuth2 servers a program contacts over time is fixed and
-// small.
-type AuthStyleCache struct {
-	mu sync.Mutex
-	m  map[authStyleCacheKey]AuthStyle
-}
-
-// lookupAuthStyle reports which auth style we last used with tokenURL
-// when calling RetrieveToken and whether we have ever done so.
-func (c *AuthStyleCache) lookupAuthStyle(tokenURL, clientID string) (style AuthStyle, ok bool) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	style, ok = c.m[authStyleCacheKey{tokenURL, clientID}]
-	return
-}
-
-// setAuthStyle adds an entry to authStyleCache, documented above.
-func (c *AuthStyleCache) setAuthStyle(tokenURL, clientID string, v AuthStyle) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.m == nil {
-		c.m = make(map[authStyleCacheKey]AuthStyle)
-	}
-	c.m[authStyleCacheKey{tokenURL, clientID}] = v
-}
-
-// newTokenRequest returns a new *http.Request to retrieve a new token
-// from tokenURL using the provided clientID, clientSecret, and POST
-// body parameters.
-//
-// inParams is whether the clientID & clientSecret should be encoded
-// as the POST body. An 'inParams' value of true means to send it in
-// the POST body (along with any values in v); false means to send it
-// in the Authorization header.
-func newTokenRequest(tokenURL, clientID, clientSecret string, v url.Values, authStyle AuthStyle) (*http.Request, error) {
-	if authStyle == AuthStyleInParams {
-		v = cloneURLValues(v)
-		if clientID != "" {
-			v.Set("client_id", clientID)
-		}
-		if clientSecret != "" {
-			v.Set("client_secret", clientSecret)
-		}
-	}
-	req, err := http.NewRequest("POST", tokenURL, strings.NewReader(v.Encode()))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	if authStyle == AuthStyleInHeader {
-		req.SetBasicAuth(url.QueryEscape(clientID), url.QueryEscape(clientSecret))
-	}
-	return req, nil
-}
-
-func cloneURLValues(v url.Values) url.Values {
-	v2 := make(url.Values, len(v))
-	for k, vv := range v {
-		v2[k] = append([]string(nil), vv...)
-	}
-	return v2
-}
-
-func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string, v url.Values, authStyle AuthStyle, styleCache *AuthStyleCache) (*Token, error) {
-	needsAuthStyleProbe := authStyle == AuthStyleUnknown
-	if needsAuthStyleProbe {
-		if style, ok := styleCache.lookupAuthStyle(tokenURL, clientID); ok {
-			authStyle = style
-			needsAuthStyleProbe = false
-		} else {
-			authStyle = AuthStyleInHeader // the first way we'll try
-		}
-	}
-	req, err := newTokenRequest(tokenURL, clientID, clientSecret, v, authStyle)
-	if err != nil {
-		return nil, err
-	}
-	token, err := doTokenRoundTrip(ctx, req)
-	if err != nil && needsAuthStyleProbe {
-		// If we get an error, assume the server wants the
-		// clientID & clientSecret in a different form.
-		// See https://code.google.com/p/goauth2/issues/detail?id=31 for background.
-		// In summary:
-		// - Reddit only accepts client secret in the Authorization header
-		// - Dropbox accepts either it in URL param or Auth header, but not both.
-		// - Google only accepts URL param (not spec compliant?), not Auth header
-		// - Stripe only accepts client secret in Auth header with Bearer method, not Basic
-		//
-		// We used to maintain a big table in this code of all the sites and which way
-		// they went, but maintaining it didn't scale & got annoying.
-		// So just try both ways.
-		authStyle = AuthStyleInParams // the second way we'll try
-		req, _ = newTokenRequest(tokenURL, clientID, clientSecret, v, authStyle)
-		token, err = doTokenRoundTrip(ctx, req)
-	}
-	if needsAuthStyleProbe && err == nil {
-		styleCache.setAuthStyle(tokenURL, clientID, authStyle)
-	}
-	// Don't overwrite `RefreshToken` with an empty value
-	// if this was a token refreshing request.
-	if token != nil && token.RefreshToken == "" {
-		token.RefreshToken = v.Get("refresh_token")
-	}
-	return token, err
-}
-
-func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) {
-	r, err := ContextClient(ctx).Do(req.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-	body, err := io.ReadAll(io.LimitReader(r.Body, 1<<20))
-	r.Body.Close()
-	if err != nil {
-		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
-	}
-
-	failureStatus := r.StatusCode < 200 || r.StatusCode > 299
-	retrieveError := &RetrieveError{
-		Response: r,
-		Body:     body,
-		// attempt to populate error detail below
-	}
-
-	var token *Token
-	content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	switch content {
-	case "application/x-www-form-urlencoded", "text/plain":
-		// some endpoints return a query string
-		vals, err := url.ParseQuery(string(body))
-		if err != nil {
-			if failureStatus {
-				return nil, retrieveError
-			}
-			return nil, fmt.Errorf("oauth2: cannot parse response: %v", err)
-		}
-		retrieveError.ErrorCode = vals.Get("error")
-		retrieveError.ErrorDescription = vals.Get("error_description")
-		retrieveError.ErrorURI = vals.Get("error_uri")
-		token = &Token{
-			AccessToken:  vals.Get("access_token"),
-			TokenType:    vals.Get("token_type"),
-			RefreshToken: vals.Get("refresh_token"),
-			Raw:          vals,
-		}
-		e := vals.Get("expires_in")
-		expires, _ := strconv.Atoi(e)
-		if expires != 0 {
-			token.Expiry = time.Now().Add(time.Duration(expires) * time.Second)
-		}
-	default:
-		var tj tokenJSON
-		if err = json.Unmarshal(body, &tj); err != nil {
-			if failureStatus {
-				return nil, retrieveError
-			}
-			return nil, fmt.Errorf("oauth2: cannot parse json: %v", err)
-		}
-		retrieveError.ErrorCode = tj.ErrorCode
-		retrieveError.ErrorDescription = tj.ErrorDescription
-		retrieveError.ErrorURI = tj.ErrorURI
-		token = &Token{
-			AccessToken:  tj.AccessToken,
-			TokenType:    tj.TokenType,
-			RefreshToken: tj.RefreshToken,
-			Expiry:       tj.expiry(),
-			ExpiresIn:    int64(tj.ExpiresIn),
-			Raw:          make(map[string]any),
-		}
-		json.Unmarshal(body, &token.Raw) // no error checks for optional fields
-	}
-	// according to spec, servers should respond status 400 in error case
-	// https://www.rfc-editor.org/rfc/rfc6749#section-5.2
-	// but some unorthodox servers respond 200 in error case
-	if failureStatus || retrieveError.ErrorCode != "" {
-		return nil, retrieveError
-	}
-	if token.AccessToken == "" {
-		return nil, errors.New("oauth2: server response missing access_token")
-	}
-	return token, nil
-}
-
-// mirrors oauth2.RetrieveError
-type RetrieveError struct {
-	Response         *http.Response
-	Body             []byte
-	ErrorCode        string
-	ErrorDescription string
-	ErrorURI         string
-}
-
-func (r *RetrieveError) Error() string {
-	if r.ErrorCode != "" {
-		s := fmt.Sprintf("oauth2: %q", r.ErrorCode)
-		if r.ErrorDescription != "" {
-			s += fmt.Sprintf(" %q", r.ErrorDescription)
-		}
-		if r.ErrorURI != "" {
-			s += fmt.Sprintf(" %q", r.ErrorURI)
-		}
-		return s
-	}
-	return fmt.Sprintf("oauth2: cannot fetch token: %v\nResponse: %s", r.Response.Status, r.Body)
-}
diff --git a/vendor/golang.org/x/oauth2/internal/transport.go b/vendor/golang.org/x/oauth2/internal/transport.go
deleted file mode 100644
index afc0aeb..0000000
--- a/vendor/golang.org/x/oauth2/internal/transport.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"context"
-	"net/http"
-)
-
-// HTTPClient is the context key to use with [context.WithValue]
-// to associate an [*http.Client] value with a context.
-var HTTPClient ContextKey
-
-// ContextKey is just an empty struct. It exists so HTTPClient can be
-// an immutable public variable with a unique type. It's immutable
-// because nobody else can create a ContextKey, being unexported.
-type ContextKey struct{}
-
-func ContextClient(ctx context.Context) *http.Client {
-	if ctx != nil {
-		if hc, ok := ctx.Value(HTTPClient).(*http.Client); ok {
-			return hc
-		}
-	}
-	return http.DefaultClient
-}
diff --git a/vendor/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go
deleted file mode 100644
index de34feb..0000000
--- a/vendor/golang.org/x/oauth2/oauth2.go
+++ /dev/null
@@ -1,424 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package oauth2 provides support for making
-// OAuth2 authorized and authenticated HTTP requests,
-// as specified in RFC 6749.
-// It can additionally grant authorization with Bearer JWT.
-package oauth2 // import "golang.org/x/oauth2"
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/oauth2/internal"
-)
-
-// NoContext is the default context you should supply if not using
-// your own [context.Context].
-//
-// Deprecated: Use [context.Background] or [context.TODO] instead.
-var NoContext = context.TODO()
-
-// RegisterBrokenAuthHeaderProvider previously did something. It is now a no-op.
-//
-// Deprecated: this function no longer does anything. Caller code that
-// wants to avoid potential extra HTTP requests made during
-// auto-probing of the provider's auth style should set
-// Endpoint.AuthStyle.
-func RegisterBrokenAuthHeaderProvider(tokenURL string) {}
-
-// Config describes a typical 3-legged OAuth2 flow, with both the
-// client application information and the server's endpoint URLs.
-// For the client credentials 2-legged OAuth2 flow, see the
-// [golang.org/x/oauth2/clientcredentials] package.
-type Config struct {
-	// ClientID is the application's ID.
-	ClientID string
-
-	// ClientSecret is the application's secret.
-	ClientSecret string
-
-	// Endpoint contains the authorization server's token endpoint
-	// URLs. These are constants specific to each server and are
-	// often available via site-specific packages, such as
-	// google.Endpoint or github.Endpoint.
-	Endpoint Endpoint
-
-	// RedirectURL is the URL to redirect users going through
-	// the OAuth flow, after the resource owner's URLs.
-	RedirectURL string
-
-	// Scopes specifies optional requested permissions.
-	Scopes []string
-
-	// authStyleCache caches which auth style to use when Endpoint.AuthStyle is
-	// the zero value (AuthStyleAutoDetect).
-	authStyleCache internal.LazyAuthStyleCache
-}
-
-// A TokenSource is anything that can return a token.
-type TokenSource interface {
-	// Token returns a token or an error.
-	// Token must be safe for concurrent use by multiple goroutines.
-	// The returned Token must not be modified.
-	Token() (*Token, error)
-}
-
-// Endpoint represents an OAuth 2.0 provider's authorization and token
-// endpoint URLs.
-type Endpoint struct {
-	AuthURL       string
-	DeviceAuthURL string
-	TokenURL      string
-
-	// AuthStyle optionally specifies how the endpoint wants the
-	// client ID & client secret sent. The zero value means to
-	// auto-detect.
-	AuthStyle AuthStyle
-}
-
-// AuthStyle represents how requests for tokens are authenticated
-// to the server.
-type AuthStyle int
-
-const (
-	// AuthStyleAutoDetect means to auto-detect which authentication
-	// style the provider wants by trying both ways and caching
-	// the successful way for the future.
-	AuthStyleAutoDetect AuthStyle = 0
-
-	// AuthStyleInParams sends the "client_id" and "client_secret"
-	// in the POST body as application/x-www-form-urlencoded parameters.
-	AuthStyleInParams AuthStyle = 1
-
-	// AuthStyleInHeader sends the client_id and client_password
-	// using HTTP Basic Authorization. This is an optional style
-	// described in the OAuth2 RFC 6749 section 2.3.1.
-	AuthStyleInHeader AuthStyle = 2
-)
-
-var (
-	// AccessTypeOnline and AccessTypeOffline are options passed
-	// to the Options.AuthCodeURL method. They modify the
-	// "access_type" field that gets sent in the URL returned by
-	// AuthCodeURL.
-	//
-	// Online is the default if neither is specified. If your
-	// application needs to refresh access tokens when the user
-	// is not present at the browser, then use offline. This will
-	// result in your application obtaining a refresh token the
-	// first time your application exchanges an authorization
-	// code for a user.
-	AccessTypeOnline  AuthCodeOption = SetAuthURLParam("access_type", "online")
-	AccessTypeOffline AuthCodeOption = SetAuthURLParam("access_type", "offline")
-
-	// ApprovalForce forces the users to view the consent dialog
-	// and confirm the permissions request at the URL returned
-	// from AuthCodeURL, even if they've already done so.
-	ApprovalForce AuthCodeOption = SetAuthURLParam("prompt", "consent")
-)
-
-// An AuthCodeOption is passed to Config.AuthCodeURL.
-type AuthCodeOption interface {
-	setValue(url.Values)
-}
-
-type setParam struct{ k, v string }
-
-func (p setParam) setValue(m url.Values) { m.Set(p.k, p.v) }
-
-// SetAuthURLParam builds an [AuthCodeOption] which passes key/value parameters
-// to a provider's authorization endpoint.
-func SetAuthURLParam(key, value string) AuthCodeOption {
-	return setParam{key, value}
-}
-
-// AuthCodeURL returns a URL to OAuth 2.0 provider's consent page
-// that asks for permissions for the required scopes explicitly.
-//
-// State is an opaque value used by the client to maintain state between the
-// request and callback. The authorization server includes this value when
-// redirecting the user agent back to the client.
-//
-// Opts may include [AccessTypeOnline] or [AccessTypeOffline], as well
-// as [ApprovalForce].
-//
-// To protect against CSRF attacks, opts should include a PKCE challenge
-// (S256ChallengeOption). Not all servers support PKCE. An alternative is to
-// generate a random state parameter and verify it after exchange.
-// See https://datatracker.ietf.org/doc/html/rfc6749#section-10.12 (predating
-// PKCE), https://www.oauth.com/oauth2-servers/pkce/ and
-// https://www.ietf.org/archive/id/draft-ietf-oauth-v2-1-09.html#name-cross-site-request-forgery (describing both approaches)
-func (c *Config) AuthCodeURL(state string, opts ...AuthCodeOption) string {
-	var buf bytes.Buffer
-	buf.WriteString(c.Endpoint.AuthURL)
-	v := url.Values{
-		"response_type": {"code"},
-		"client_id":     {c.ClientID},
-	}
-	if c.RedirectURL != "" {
-		v.Set("redirect_uri", c.RedirectURL)
-	}
-	if len(c.Scopes) > 0 {
-		v.Set("scope", strings.Join(c.Scopes, " "))
-	}
-	if state != "" {
-		v.Set("state", state)
-	}
-	for _, opt := range opts {
-		opt.setValue(v)
-	}
-	if strings.Contains(c.Endpoint.AuthURL, "?") {
-		buf.WriteByte('&')
-	} else {
-		buf.WriteByte('?')
-	}
-	buf.WriteString(v.Encode())
-	return buf.String()
-}
-
-// PasswordCredentialsToken converts a resource owner username and password
-// pair into a token.
-//
-// Per the RFC, this grant type should only be used "when there is a high
-// degree of trust between the resource owner and the client (e.g., the client
-// is part of the device operating system or a highly privileged application),
-// and when other authorization grant types are not available."
-// See https://tools.ietf.org/html/rfc6749#section-4.3 for more info.
-//
-// The provided context optionally controls which HTTP client is used. See the [HTTPClient] variable.
-func (c *Config) PasswordCredentialsToken(ctx context.Context, username, password string) (*Token, error) {
-	v := url.Values{
-		"grant_type": {"password"},
-		"username":   {username},
-		"password":   {password},
-	}
-	if len(c.Scopes) > 0 {
-		v.Set("scope", strings.Join(c.Scopes, " "))
-	}
-	return retrieveToken(ctx, c, v)
-}
-
-// Exchange converts an authorization code into a token.
-//
-// It is used after a resource provider redirects the user back
-// to the Redirect URI (the URL obtained from AuthCodeURL).
-//
-// The provided context optionally controls which HTTP client is used. See the [HTTPClient] variable.
-//
-// The code will be in the [http.Request.FormValue]("code"). Before
-// calling Exchange, be sure to validate [http.Request.FormValue]("state") if you are
-// using it to protect against CSRF attacks.
-//
-// If using PKCE to protect against CSRF attacks, opts should include a
-// VerifierOption.
-func (c *Config) Exchange(ctx context.Context, code string, opts ...AuthCodeOption) (*Token, error) {
-	v := url.Values{
-		"grant_type": {"authorization_code"},
-		"code":       {code},
-	}
-	if c.RedirectURL != "" {
-		v.Set("redirect_uri", c.RedirectURL)
-	}
-	for _, opt := range opts {
-		opt.setValue(v)
-	}
-	return retrieveToken(ctx, c, v)
-}
-
-// Client returns an HTTP client using the provided token.
-// The token will auto-refresh as necessary. The underlying
-// HTTP transport will be obtained using the provided context.
-// The returned client and its Transport should not be modified.
-func (c *Config) Client(ctx context.Context, t *Token) *http.Client {
-	return NewClient(ctx, c.TokenSource(ctx, t))
-}
-
-// TokenSource returns a [TokenSource] that returns t until t expires,
-// automatically refreshing it as necessary using the provided context.
-//
-// Most users will use [Config.Client] instead.
-func (c *Config) TokenSource(ctx context.Context, t *Token) TokenSource {
-	tkr := &tokenRefresher{
-		ctx:  ctx,
-		conf: c,
-	}
-	if t != nil {
-		tkr.refreshToken = t.RefreshToken
-	}
-	return &reuseTokenSource{
-		t:   t,
-		new: tkr,
-	}
-}
-
-// tokenRefresher is a TokenSource that makes "grant_type=refresh_token"
-// HTTP requests to renew a token using a RefreshToken.
-type tokenRefresher struct {
-	ctx          context.Context // used to get HTTP requests
-	conf         *Config
-	refreshToken string
-}
-
-// WARNING: Token is not safe for concurrent access, as it
-// updates the tokenRefresher's refreshToken field.
-// Within this package, it is used by reuseTokenSource which
-// synchronizes calls to this method with its own mutex.
-func (tf *tokenRefresher) Token() (*Token, error) {
-	if tf.refreshToken == "" {
-		return nil, errors.New("oauth2: token expired and refresh token is not set")
-	}
-
-	tk, err := retrieveToken(tf.ctx, tf.conf, url.Values{
-		"grant_type":    {"refresh_token"},
-		"refresh_token": {tf.refreshToken},
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	if tf.refreshToken != tk.RefreshToken {
-		tf.refreshToken = tk.RefreshToken
-	}
-	return tk, nil
-}
-
-// reuseTokenSource is a TokenSource that holds a single token in memory
-// and validates its expiry before each call to retrieve it with
-// Token. If it's expired, it will be auto-refreshed using the
-// new TokenSource.
-type reuseTokenSource struct {
-	new TokenSource // called when t is expired.
-
-	mu sync.Mutex // guards t
-	t  *Token
-
-	expiryDelta time.Duration
-}
-
-// Token returns the current token if it's still valid, else will
-// refresh the current token and return the new one.
-func (s *reuseTokenSource) Token() (*Token, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.t.Valid() {
-		return s.t, nil
-	}
-	t, err := s.new.Token()
-	if err != nil {
-		return nil, err
-	}
-	t.expiryDelta = s.expiryDelta
-	s.t = t
-	return t, nil
-}
-
-// StaticTokenSource returns a [TokenSource] that always returns the same token.
-// Because the provided token t is never refreshed, StaticTokenSource is only
-// useful for tokens that never expire.
-func StaticTokenSource(t *Token) TokenSource {
-	return staticTokenSource{t}
-}
-
-// staticTokenSource is a TokenSource that always returns the same Token.
-type staticTokenSource struct {
-	t *Token
-}
-
-func (s staticTokenSource) Token() (*Token, error) {
-	return s.t, nil
-}
-
-// HTTPClient is the context key to use with [context.WithValue]
-// to associate a [*http.Client] value with a context.
-var HTTPClient internal.ContextKey
-
-// NewClient creates an [*http.Client] from a [context.Context] and [TokenSource].
-// The returned client is not valid beyond the lifetime of the context.
-//
-// Note that if a custom [*http.Client] is provided via the [context.Context] it
-// is used only for token acquisition and is not used to configure the
-// [*http.Client] returned from NewClient.
-//
-// As a special case, if src is nil, a non-OAuth2 client is returned
-// using the provided context. This exists to support related OAuth2
-// packages.
-func NewClient(ctx context.Context, src TokenSource) *http.Client {
-	if src == nil {
-		return internal.ContextClient(ctx)
-	}
-	cc := internal.ContextClient(ctx)
-	return &http.Client{
-		Transport: &Transport{
-			Base:   cc.Transport,
-			Source: ReuseTokenSource(nil, src),
-		},
-		CheckRedirect: cc.CheckRedirect,
-		Jar:           cc.Jar,
-		Timeout:       cc.Timeout,
-	}
-}
-
-// ReuseTokenSource returns a [TokenSource] which repeatedly returns the
-// same token as long as it's valid, starting with t.
-// When its cached token is invalid, a new token is obtained from src.
-//
-// ReuseTokenSource is typically used to reuse tokens from a cache
-// (such as a file on disk) between runs of a program, rather than
-// obtaining new tokens unnecessarily.
-//
-// The initial token t may be nil, in which case the [TokenSource] is
-// wrapped in a caching version if it isn't one already. This also
-// means it's always safe to wrap ReuseTokenSource around any other
-// [TokenSource] without adverse effects.
-func ReuseTokenSource(t *Token, src TokenSource) TokenSource {
-	// Don't wrap a reuseTokenSource in itself. That would work,
-	// but cause an unnecessary number of mutex operations.
-	// Just build the equivalent one.
-	if rt, ok := src.(*reuseTokenSource); ok {
-		if t == nil {
-			// Just use it directly.
-			return rt
-		}
-		src = rt.new
-	}
-	return &reuseTokenSource{
-		t:   t,
-		new: src,
-	}
-}
-
-// ReuseTokenSourceWithExpiry returns a [TokenSource] that acts in the same manner as the
-// [TokenSource] returned by [ReuseTokenSource], except the expiry buffer is
-// configurable. The expiration time of a token is calculated as
-// t.Expiry.Add(-earlyExpiry).
-func ReuseTokenSourceWithExpiry(t *Token, src TokenSource, earlyExpiry time.Duration) TokenSource {
-	// Don't wrap a reuseTokenSource in itself. That would work,
-	// but cause an unnecessary number of mutex operations.
-	// Just build the equivalent one.
-	if rt, ok := src.(*reuseTokenSource); ok {
-		if t == nil {
-			// Just use it directly, but set the expiryDelta to earlyExpiry,
-			// so the behavior matches what the user expects.
-			rt.expiryDelta = earlyExpiry
-			return rt
-		}
-		src = rt.new
-	}
-	if t != nil {
-		t.expiryDelta = earlyExpiry
-	}
-	return &reuseTokenSource{
-		t:           t,
-		new:         src,
-		expiryDelta: earlyExpiry,
-	}
-}
diff --git a/vendor/golang.org/x/oauth2/pkce.go b/vendor/golang.org/x/oauth2/pkce.go
deleted file mode 100644
index cea8374..0000000
--- a/vendor/golang.org/x/oauth2/pkce.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package oauth2
-
-import (
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"net/url"
-)
-
-const (
-	codeChallengeKey       = "code_challenge"
-	codeChallengeMethodKey = "code_challenge_method"
-	codeVerifierKey        = "code_verifier"
-)
-
-// GenerateVerifier generates a PKCE code verifier with 32 octets of randomness.
-// This follows recommendations in RFC 7636.
-//
-// A fresh verifier should be generated for each authorization.
-// The resulting verifier should be passed to [Config.AuthCodeURL] or [Config.DeviceAuth]
-// with [S256ChallengeOption], and to [Config.Exchange] or [Config.DeviceAccessToken]
-// with [VerifierOption].
-func GenerateVerifier() string {
-	// "RECOMMENDED that the output of a suitable random number generator be
-	// used to create a 32-octet sequence.  The octet sequence is then
-	// base64url-encoded to produce a 43-octet URL-safe string to use as the
-	// code verifier."
-	// https://datatracker.ietf.org/doc/html/rfc7636#section-4.1
-	data := make([]byte, 32)
-	if _, err := rand.Read(data); err != nil {
-		panic(err)
-	}
-	return base64.RawURLEncoding.EncodeToString(data)
-}
-
-// VerifierOption returns a PKCE code verifier [AuthCodeOption]. It should only be
-// passed to [Config.Exchange] or [Config.DeviceAccessToken].
-func VerifierOption(verifier string) AuthCodeOption {
-	return setParam{k: codeVerifierKey, v: verifier}
-}
-
-// S256ChallengeFromVerifier returns a PKCE code challenge derived from verifier with method S256.
-//
-// Prefer to use [S256ChallengeOption] where possible.
-func S256ChallengeFromVerifier(verifier string) string {
-	sha := sha256.Sum256([]byte(verifier))
-	return base64.RawURLEncoding.EncodeToString(sha[:])
-}
-
-// S256ChallengeOption derives a PKCE code challenge derived from verifier with
-// method S256. It should be passed to [Config.AuthCodeURL] or [Config.DeviceAuth]
-// only.
-func S256ChallengeOption(verifier string) AuthCodeOption {
-	return challengeOption{
-		challenge_method: "S256",
-		challenge:        S256ChallengeFromVerifier(verifier),
-	}
-}
-
-type challengeOption struct{ challenge_method, challenge string }
-
-func (p challengeOption) setValue(m url.Values) {
-	m.Set(codeChallengeMethodKey, p.challenge_method)
-	m.Set(codeChallengeKey, p.challenge)
-}
diff --git a/vendor/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go
deleted file mode 100644
index 239ec32..0000000
--- a/vendor/golang.org/x/oauth2/token.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package oauth2
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2/internal"
-)
-
-// defaultExpiryDelta determines how earlier a token should be considered
-// expired than its actual expiration time. It is used to avoid late
-// expirations due to client-server time mismatches.
-const defaultExpiryDelta = 10 * time.Second
-
-// Token represents the credentials used to authorize
-// the requests to access protected resources on the OAuth 2.0
-// provider's backend.
-//
-// Most users of this package should not access fields of Token
-// directly. They're exported mostly for use by related packages
-// implementing derivative OAuth2 flows.
-type Token struct {
-	// AccessToken is the token that authorizes and authenticates
-	// the requests.
-	AccessToken string `json:"access_token"`
-
-	// TokenType is the type of token.
-	// The Type method returns either this or "Bearer", the default.
-	TokenType string `json:"token_type,omitempty"`
-
-	// RefreshToken is a token that's used by the application
-	// (as opposed to the user) to refresh the access token
-	// if it expires.
-	RefreshToken string `json:"refresh_token,omitempty"`
-
-	// Expiry is the optional expiration time of the access token.
-	//
-	// If zero, [TokenSource] implementations will reuse the same
-	// token forever and RefreshToken or equivalent
-	// mechanisms for that TokenSource will not be used.
-	Expiry time.Time `json:"expiry,omitempty"`
-
-	// ExpiresIn is the OAuth2 wire format "expires_in" field,
-	// which specifies how many seconds later the token expires,
-	// relative to an unknown time base approximately around "now".
-	// It is the application's responsibility to populate
-	// `Expiry` from `ExpiresIn` when required.
-	ExpiresIn int64 `json:"expires_in,omitempty"`
-
-	// raw optionally contains extra metadata from the server
-	// when updating a token.
-	raw any
-
-	// expiryDelta is used to calculate when a token is considered
-	// expired, by subtracting from Expiry. If zero, defaultExpiryDelta
-	// is used.
-	expiryDelta time.Duration
-}
-
-// Type returns t.TokenType if non-empty, else "Bearer".
-func (t *Token) Type() string {
-	if strings.EqualFold(t.TokenType, "bearer") {
-		return "Bearer"
-	}
-	if strings.EqualFold(t.TokenType, "mac") {
-		return "MAC"
-	}
-	if strings.EqualFold(t.TokenType, "basic") {
-		return "Basic"
-	}
-	if t.TokenType != "" {
-		return t.TokenType
-	}
-	return "Bearer"
-}
-
-// SetAuthHeader sets the Authorization header to r using the access
-// token in t.
-//
-// This method is unnecessary when using [Transport] or an HTTP Client
-// returned by this package.
-func (t *Token) SetAuthHeader(r *http.Request) {
-	r.Header.Set("Authorization", t.Type()+" "+t.AccessToken)
-}
-
-// WithExtra returns a new [Token] that's a clone of t, but using the
-// provided raw extra map. This is only intended for use by packages
-// implementing derivative OAuth2 flows.
-func (t *Token) WithExtra(extra any) *Token {
-	t2 := new(Token)
-	*t2 = *t
-	t2.raw = extra
-	return t2
-}
-
-// Extra returns an extra field.
-// Extra fields are key-value pairs returned by the server as a
-// part of the token retrieval response.
-func (t *Token) Extra(key string) any {
-	if raw, ok := t.raw.(map[string]any); ok {
-		return raw[key]
-	}
-
-	vals, ok := t.raw.(url.Values)
-	if !ok {
-		return nil
-	}
-
-	v := vals.Get(key)
-	switch s := strings.TrimSpace(v); strings.Count(s, ".") {
-	case 0: // Contains no "."; try to parse as int
-		if i, err := strconv.ParseInt(s, 10, 64); err == nil {
-			return i
-		}
-	case 1: // Contains a single "."; try to parse as float
-		if f, err := strconv.ParseFloat(s, 64); err == nil {
-			return f
-		}
-	}
-
-	return v
-}
-
-// timeNow is time.Now but pulled out as a variable for tests.
-var timeNow = time.Now
-
-// expired reports whether the token is expired.
-// t must be non-nil.
-func (t *Token) expired() bool {
-	if t.Expiry.IsZero() {
-		return false
-	}
-
-	expiryDelta := defaultExpiryDelta
-	if t.expiryDelta != 0 {
-		expiryDelta = t.expiryDelta
-	}
-	return t.Expiry.Round(0).Add(-expiryDelta).Before(timeNow())
-}
-
-// Valid reports whether t is non-nil, has an AccessToken, and is not expired.
-func (t *Token) Valid() bool {
-	return t != nil && t.AccessToken != "" && !t.expired()
-}
-
-// tokenFromInternal maps an *internal.Token struct into
-// a *Token struct.
-func tokenFromInternal(t *internal.Token) *Token {
-	if t == nil {
-		return nil
-	}
-	return &Token{
-		AccessToken:  t.AccessToken,
-		TokenType:    t.TokenType,
-		RefreshToken: t.RefreshToken,
-		Expiry:       t.Expiry,
-		ExpiresIn:    t.ExpiresIn,
-		raw:          t.Raw,
-	}
-}
-
-// retrieveToken takes a *Config and uses that to retrieve an *internal.Token.
-// This token is then mapped from *internal.Token into an *oauth2.Token which is returned along
-// with an error.
-func retrieveToken(ctx context.Context, c *Config, v url.Values) (*Token, error) {
-	tk, err := internal.RetrieveToken(ctx, c.ClientID, c.ClientSecret, c.Endpoint.TokenURL, v, internal.AuthStyle(c.Endpoint.AuthStyle), c.authStyleCache.Get())
-	if err != nil {
-		if rErr, ok := err.(*internal.RetrieveError); ok {
-			return nil, (*RetrieveError)(rErr)
-		}
-		return nil, err
-	}
-	return tokenFromInternal(tk), nil
-}
-
-// RetrieveError is the error returned when the token endpoint returns a
-// non-2XX HTTP status code or populates RFC 6749's 'error' parameter.
-// https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
-type RetrieveError struct {
-	Response *http.Response
-	// Body is the body that was consumed by reading Response.Body.
-	// It may be truncated.
-	Body []byte
-	// ErrorCode is RFC 6749's 'error' parameter.
-	ErrorCode string
-	// ErrorDescription is RFC 6749's 'error_description' parameter.
-	ErrorDescription string
-	// ErrorURI is RFC 6749's 'error_uri' parameter.
-	ErrorURI string
-}
-
-func (r *RetrieveError) Error() string {
-	if r.ErrorCode != "" {
-		s := fmt.Sprintf("oauth2: %q", r.ErrorCode)
-		if r.ErrorDescription != "" {
-			s += fmt.Sprintf(" %q", r.ErrorDescription)
-		}
-		if r.ErrorURI != "" {
-			s += fmt.Sprintf(" %q", r.ErrorURI)
-		}
-		return s
-	}
-	return fmt.Sprintf("oauth2: cannot fetch token: %v\nResponse: %s", r.Response.Status, r.Body)
-}
diff --git a/vendor/golang.org/x/oauth2/transport.go b/vendor/golang.org/x/oauth2/transport.go
deleted file mode 100644
index 8bbebba..0000000
--- a/vendor/golang.org/x/oauth2/transport.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package oauth2
-
-import (
-	"errors"
-	"log"
-	"net/http"
-	"sync"
-)
-
-// Transport is an [http.RoundTripper] that makes OAuth 2.0 HTTP requests,
-// wrapping a base [http.RoundTripper] and adding an Authorization header
-// with a token from the supplied [TokenSource].
-//
-// Transport is a low-level mechanism. Most code will use the
-// higher-level [Config.Client] method instead.
-type Transport struct {
-	// Source supplies the token to add to outgoing requests'
-	// Authorization headers.
-	Source TokenSource
-
-	// Base is the base RoundTripper used to make HTTP requests.
-	// If nil, http.DefaultTransport is used.
-	Base http.RoundTripper
-}
-
-// RoundTrip authorizes and authenticates the request with an
-// access token from Transport's Source.
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	reqBodyClosed := false
-	if req.Body != nil {
-		defer func() {
-			if !reqBodyClosed {
-				req.Body.Close()
-			}
-		}()
-	}
-
-	if t.Source == nil {
-		return nil, errors.New("oauth2: Transport's Source is nil")
-	}
-	token, err := t.Source.Token()
-	if err != nil {
-		return nil, err
-	}
-
-	req2 := req.Clone(req.Context())
-	token.SetAuthHeader(req2)
-
-	// req.Body is assumed to be closed by the base RoundTripper.
-	reqBodyClosed = true
-	return t.base().RoundTrip(req2)
-}
-
-var cancelOnce sync.Once
-
-// CancelRequest does nothing. It used to be a legacy cancellation mechanism
-// but now only it only logs on first use to warn that it's deprecated.
-//
-// Deprecated: use contexts for cancellation instead.
-func (t *Transport) CancelRequest(req *http.Request) {
-	cancelOnce.Do(func() {
-		log.Printf("deprecated: golang.org/x/oauth2: Transport.CancelRequest no longer does anything; use contexts")
-	})
-}
-
-func (t *Transport) base() http.RoundTripper {
-	if t.Base != nil {
-		return t.Base
-	}
-	return http.DefaultTransport
-}
diff --git a/vendor/golang.org/x/sync/LICENSE b/vendor/golang.org/x/sync/LICENSE
deleted file mode 100644
index 2a7cf70..0000000
--- a/vendor/golang.org/x/sync/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright 2009 The Go Authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google LLC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/sync/PATENTS b/vendor/golang.org/x/sync/PATENTS
deleted file mode 100644
index 7330990..0000000
--- a/vendor/golang.org/x/sync/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/sync/errgroup/errgroup.go b/vendor/golang.org/x/sync/errgroup/errgroup.go
deleted file mode 100644
index cb6bb9a..0000000
--- a/vendor/golang.org/x/sync/errgroup/errgroup.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package errgroup provides synchronization, error propagation, and Context
-// cancelation for groups of goroutines working on subtasks of a common task.
-//
-// [errgroup.Group] is related to [sync.WaitGroup] but adds handling of tasks
-// returning errors.
-package errgroup
-
-import (
-	"context"
-	"fmt"
-	"runtime"
-	"runtime/debug"
-	"sync"
-)
-
-type token struct{}
-
-// A Group is a collection of goroutines working on subtasks that are part of
-// the same overall task. A Group should not be reused for different tasks.
-//
-// A zero Group is valid, has no limit on the number of active goroutines,
-// and does not cancel on error.
-type Group struct {
-	cancel func(error)
-
-	wg sync.WaitGroup
-
-	sem chan token
-
-	errOnce sync.Once
-	err     error
-
-	mu         sync.Mutex
-	panicValue any  // = PanicError | PanicValue; non-nil if some Group.Go goroutine panicked.
-	abnormal   bool // some Group.Go goroutine terminated abnormally (panic or goexit).
-}
-
-func (g *Group) done() {
-	if g.sem != nil {
-		<-g.sem
-	}
-	g.wg.Done()
-}
-
-// WithContext returns a new Group and an associated Context derived from ctx.
-//
-// The derived Context is canceled the first time a function passed to Go
-// returns a non-nil error or the first time Wait returns, whichever occurs
-// first.
-func WithContext(ctx context.Context) (*Group, context.Context) {
-	ctx, cancel := context.WithCancelCause(ctx)
-	return &Group{cancel: cancel}, ctx
-}
-
-// Wait blocks until all function calls from the Go method have returned
-// normally, then returns the first non-nil error (if any) from them.
-//
-// If any of the calls panics, Wait panics with a [PanicValue];
-// and if any of them calls [runtime.Goexit], Wait calls runtime.Goexit.
-func (g *Group) Wait() error {
-	g.wg.Wait()
-	if g.cancel != nil {
-		g.cancel(g.err)
-	}
-	if g.panicValue != nil {
-		panic(g.panicValue)
-	}
-	if g.abnormal {
-		runtime.Goexit()
-	}
-	return g.err
-}
-
-// Go calls the given function in a new goroutine.
-//
-// The first call to Go must happen before a Wait.
-// It blocks until the new goroutine can be added without the number of
-// goroutines in the group exceeding the configured limit.
-//
-// The first goroutine in the group that returns a non-nil error, panics, or
-// invokes [runtime.Goexit] will cancel the associated Context, if any.
-func (g *Group) Go(f func() error) {
-	if g.sem != nil {
-		g.sem <- token{}
-	}
-
-	g.add(f)
-}
-
-func (g *Group) add(f func() error) {
-	g.wg.Add(1)
-	go func() {
-		defer g.done()
-		normalReturn := false
-		defer func() {
-			if normalReturn {
-				return
-			}
-			v := recover()
-			g.mu.Lock()
-			defer g.mu.Unlock()
-			if !g.abnormal {
-				if g.cancel != nil {
-					g.cancel(g.err)
-				}
-				g.abnormal = true
-			}
-			if v != nil && g.panicValue == nil {
-				switch v := v.(type) {
-				case error:
-					g.panicValue = PanicError{
-						Recovered: v,
-						Stack:     debug.Stack(),
-					}
-				default:
-					g.panicValue = PanicValue{
-						Recovered: v,
-						Stack:     debug.Stack(),
-					}
-				}
-			}
-		}()
-
-		err := f()
-		normalReturn = true
-		if err != nil {
-			g.errOnce.Do(func() {
-				g.err = err
-				if g.cancel != nil {
-					g.cancel(g.err)
-				}
-			})
-		}
-	}()
-}
-
-// TryGo calls the given function in a new goroutine only if the number of
-// active goroutines in the group is currently below the configured limit.
-//
-// The return value reports whether the goroutine was started.
-func (g *Group) TryGo(f func() error) bool {
-	if g.sem != nil {
-		select {
-		case g.sem <- token{}:
-			// Note: this allows barging iff channels in general allow barging.
-		default:
-			return false
-		}
-	}
-
-	g.add(f)
-	return true
-}
-
-// SetLimit limits the number of active goroutines in this group to at most n.
-// A negative value indicates no limit.
-// A limit of zero will prevent any new goroutines from being added.
-//
-// Any subsequent call to the Go method will block until it can add an active
-// goroutine without exceeding the configured limit.
-//
-// The limit must not be modified while any goroutines in the group are active.
-func (g *Group) SetLimit(n int) {
-	if n < 0 {
-		g.sem = nil
-		return
-	}
-	if len(g.sem) != 0 {
-		panic(fmt.Errorf("errgroup: modify limit while %v goroutines in the group are still active", len(g.sem)))
-	}
-	g.sem = make(chan token, n)
-}
-
-// PanicError wraps an error recovered from an unhandled panic
-// when calling a function passed to Go or TryGo.
-type PanicError struct {
-	Recovered error
-	Stack     []byte // result of call to [debug.Stack]
-}
-
-func (p PanicError) Error() string {
-	if len(p.Stack) > 0 {
-		return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack)
-	}
-	return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered)
-}
-
-func (p PanicError) Unwrap() error { return p.Recovered }
-
-// PanicValue wraps a value that does not implement the error interface,
-// recovered from an unhandled panic when calling a function passed to Go or
-// TryGo.
-type PanicValue struct {
-	Recovered any
-	Stack     []byte // result of call to [debug.Stack]
-}
-
-func (p PanicValue) String() string {
-	if len(p.Stack) > 0 {
-		return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack)
-	}
-	return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered)
-}
diff --git a/vendor/golang.org/x/sys/AUTHORS b/vendor/golang.org/x/sys/AUTHORS
new file mode 100644
index 0000000..15167cd
--- /dev/null
+++ b/vendor/golang.org/x/sys/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/sys/CONTRIBUTORS b/vendor/golang.org/x/sys/CONTRIBUTORS
new file mode 100644
index 0000000..1c4577e
--- /dev/null
+++ b/vendor/golang.org/x/sys/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
index 2a7cf70..6a66aea 100644
--- a/vendor/golang.org/x/sys/LICENSE
+++ b/vendor/golang.org/x/sys/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 The Go Authors.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google LLC nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go b/vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
new file mode 100644
index 0000000..e07899b
--- /dev/null
+++ b/vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
@@ -0,0 +1,30 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package unsafeheader contains header declarations for the Go runtime's
+// slice and string implementations.
+//
+// This package allows x/sys to use types equivalent to
+// reflect.SliceHeader and reflect.StringHeader without introducing
+// a dependency on the (relatively heavy) "reflect" package.
+package unsafeheader
+
+import (
+	"unsafe"
+)
+
+// Slice is the runtime representation of a slice.
+// It cannot be used safely or portably and its representation may change in a later release.
+type Slice struct {
+	Data unsafe.Pointer
+	Len  int
+	Cap  int
+}
+
+// String is the runtime representation of a string.
+// It cannot be used safely or portably and its representation may change in a later release.
+type String struct {
+	Data unsafe.Pointer
+	Len  int
+}
diff --git a/vendor/golang.org/x/sys/unix/README.md b/vendor/golang.org/x/sys/unix/README.md
index 6e08a76..474efad 100644
--- a/vendor/golang.org/x/sys/unix/README.md
+++ b/vendor/golang.org/x/sys/unix/README.md
@@ -149,14 +149,14 @@ To add a constant, add the header that includes it to the appropriate variable.
 Then, edit the regex (if necessary) to match the desired constant. Avoid making
 the regex too broad to avoid matching unintended constants.
 
-### internal/mkmerge
+### mkmerge.go
 
 This program is used to extract duplicate const, func, and type declarations
 from the generated architecture-specific files listed below, and merge these
 into a common file for each OS.
 
 The merge is performed in the following steps:
-1. Construct the set of common code that is identical in all architecture-specific files.
+1. Construct the set of common code that is idential in all architecture-specific files.
 2. Write this common code to the merged file.
 3. Remove the common code from all architecture-specific files.
 
diff --git a/vendor/golang.org/x/sys/unix/aliases.go b/vendor/golang.org/x/sys/unix/aliases.go
index b0e4198..abc89c1 100644
--- a/vendor/golang.org/x/sys/unix/aliases.go
+++ b/vendor/golang.org/x/sys/unix/aliases.go
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+//go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos) && go1.9
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
+// +build go1.9
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s b/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s
index 269e173..db9171c 100644
--- a/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s
+++ b/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_386.s b/vendor/golang.org/x/sys/unix/asm_bsd_386.s
index a4fcef0..e0fcd9b 100644
--- a/vendor/golang.org/x/sys/unix/asm_bsd_386.s
+++ b/vendor/golang.org/x/sys/unix/asm_bsd_386.s
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (freebsd || netbsd || openbsd) && gc
+// +build freebsd netbsd openbsd
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s
index 1e63615..2b99c34 100644
--- a/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s
+++ b/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && gc
+// +build darwin dragonfly freebsd netbsd openbsd
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_arm.s b/vendor/golang.org/x/sys/unix/asm_bsd_arm.s
index 6496c31..d702d4a 100644
--- a/vendor/golang.org/x/sys/unix/asm_bsd_arm.s
+++ b/vendor/golang.org/x/sys/unix/asm_bsd_arm.s
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (freebsd || netbsd || openbsd) && gc
+// +build freebsd netbsd openbsd
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s b/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s
index 4fd1f54..fe36a73 100644
--- a/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s
+++ b/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build (darwin || freebsd || netbsd || openbsd) && gc
+// +build darwin freebsd netbsd openbsd
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s b/vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s
deleted file mode 100644
index 42f7eb9..0000000
--- a/vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (darwin || freebsd || netbsd || openbsd) && gc
-
-#include "textflag.h"
-
-//
-// System call support for ppc64, BSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_riscv64.s b/vendor/golang.org/x/sys/unix/asm_bsd_riscv64.s
deleted file mode 100644
index f890266..0000000
--- a/vendor/golang.org/x/sys/unix/asm_bsd_riscv64.s
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (darwin || freebsd || netbsd || openbsd) && gc
-
-#include "textflag.h"
-
-// System call support for RISCV64 BSD
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s
index 3b47348..8fd101d 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_386.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_386.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
index 67e29f3..7ed38e4 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
index d6ae269..8ef1d51 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
index 01e5e25..98ae027 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && arm64 && gc
+// +build linux
+// +build arm64
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_loong64.s b/vendor/golang.org/x/sys/unix/asm_linux_loong64.s
deleted file mode 100644
index 2abf12f..0000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_loong64.s
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && loong64 && gc
-
-#include "textflag.h"
-
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT ·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
-	JAL	runtime·entersyscall(SB)
-	MOVV	a1+8(FP), R4
-	MOVV	a2+16(FP), R5
-	MOVV	a3+24(FP), R6
-	MOVV	R0, R7
-	MOVV	R0, R8
-	MOVV	R0, R9
-	MOVV	trap+0(FP), R11	// syscall entry
-	SYSCALL
-	MOVV	R4, r1+32(FP)
-	MOVV	R0, r2+40(FP)	// r2 is not used. Always set to 0
-	JAL	runtime·exitsyscall(SB)
-	RET
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
-	MOVV	a1+8(FP), R4
-	MOVV	a2+16(FP), R5
-	MOVV	a3+24(FP), R6
-	MOVV	R0, R7
-	MOVV	R0, R8
-	MOVV	R0, R9
-	MOVV	trap+0(FP), R11	// syscall entry
-	SYSCALL
-	MOVV	R4, r1+32(FP)
-	MOVV	R0, r2+40(FP)	// r2 is not used. Always set to 0
-	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
index f84bae7..21231d2 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips64 || mips64le) && gc
+// +build linux
+// +build mips64 mips64le
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
index f08f628..6783b26 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips || mipsle) && gc
+// +build linux
+// +build mips mipsle
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
index bdfc024..19d4989 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (ppc64 || ppc64le) && gc
+// +build linux
+// +build ppc64 ppc64le
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s
index 2e8c996..e42eb81 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build riscv64 && gc
+// +build riscv64
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
index 2c394b1..c46aab3 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && s390x && gc
+// +build linux
+// +build s390x
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s b/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s
index fab586a..5e7a116 100644
--- a/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
index f949ec5..f8c5394 100644
--- a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
+++ b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
+// +build gc
 
 #include "textflag.h"
 
diff --git a/vendor/golang.org/x/sys/unix/asm_zos_s390x.s b/vendor/golang.org/x/sys/unix/asm_zos_s390x.s
index 813dfad..3b54e18 100644
--- a/vendor/golang.org/x/sys/unix/asm_zos_s390x.s
+++ b/vendor/golang.org/x/sys/unix/asm_zos_s390x.s
@@ -3,17 +3,18 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x && gc
+// +build zos
+// +build s390x
+// +build gc
 
 #include "textflag.h"
 
 #define PSALAA            1208(R0)
 #define GTAB64(x)           80(x)
 #define LCA64(x)            88(x)
-#define SAVSTACK_ASYNC(x)  336(x) // in the LCA
 #define CAA(x)               8(x)
-#define CEECAATHDID(x)     976(x) // in the CAA
-#define EDCHPXV(x)        1016(x) // in the CAA
-#define GOCB(x)           1104(x) // in the CAA
+#define EDCHPXV(x)        1016(x)       // in the CAA
+#define SAVSTACK_ASYNC(x)  336(x)       // in the LCA
 
 // SS_*, where x=SAVSTACK_ASYNC
 #define SS_LE(x)             0(x)
@@ -21,125 +22,394 @@
 #define SS_ERRNO(x)         16(x)
 #define SS_ERRNOJR(x)       20(x)
 
-// Function Descriptor Offsets
-#define __errno  0x156*16
-#define __err2ad 0x16C*16
+#define LE_CALL BYTE $0x0D; BYTE $0x76; // BL R7, R6
 
-// Call Instructions
-#define LE_CALL    BYTE $0x0D; BYTE $0x76 // BL R7, R6
-#define SVC_LOAD   BYTE $0x0A; BYTE $0x08 // SVC 08 LOAD
-#define SVC_DELETE BYTE $0x0A; BYTE $0x09 // SVC 09 DELETE
-
-DATA zosLibVec<>(SB)/8, $0
-GLOBL zosLibVec<>(SB), NOPTR, $8
-
-TEXT ·initZosLibVec(SB), NOSPLIT|NOFRAME, $0-0
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
-	MOVD CAA(R8), R8
-	MOVD EDCHPXV(R8), R8
-	MOVD R8, zosLibVec<>(SB)
-	RET
-
-TEXT ·GetZosLibVec(SB), NOSPLIT|NOFRAME, $0-0
-	MOVD zosLibVec<>(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·clearErrno(SB), NOSPLIT, $0-0
-	BL   addrerrno<>(SB)
-	MOVD $0, 0(R3)
+TEXT ·clearErrno(SB),NOSPLIT,$0-0
+	BL	addrerrno<>(SB)
+	MOVD	$0, 0(R3)
 	RET
 
 // Returns the address of errno in R3.
-TEXT addrerrno<>(SB), NOSPLIT|NOFRAME, $0-0
+TEXT addrerrno<>(SB),NOSPLIT|NOFRAME,$0-0
 	// Get library control area (LCA).
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
 
 	// Get __errno FuncDesc.
-	MOVD CAA(R8), R9
-	MOVD EDCHPXV(R9), R9
-	ADD  $(__errno), R9
-	LMG  0(R9), R5, R6
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	ADD	$(0x156*16), R9
+	LMG	0(R9), R5, R6
 
 	// Switch to saved LE stack.
-	MOVD SAVSTACK_ASYNC(R8), R9
-	MOVD 0(R9), R4
-	MOVD $0, 0(R9)
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
 
 	// Call __errno function.
 	LE_CALL
 	NOPH
 
 	// Switch back to Go stack.
-	XOR  R0, R0    // Restore R0 to $0.
-	MOVD R4, 0(R9) // Save stack pointer.
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+	RET
+
+TEXT ·syscall_syscall(SB),NOSPLIT,$0-56
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+32(FP)
+	MOVD	R0, r2+40(FP)
+	MOVD	R0, err+48(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	addrerrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+48(FP)
+done:
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·syscall_rawsyscall(SB),NOSPLIT,$0-56
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+32(FP)
+	MOVD	R0, r2+40(FP)
+	MOVD	R0, err+48(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	addrerrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+48(FP)
+done:
+	RET
+
+TEXT ·syscall_syscall6(SB),NOSPLIT,$0-80
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Fill in parameter list.
+	MOVD	a4+32(FP), R12
+	MOVD	R12, (2176+24)(R4)
+	MOVD	a5+40(FP), R12
+	MOVD	R12, (2176+32)(R4)
+	MOVD	a6+48(FP), R12
+	MOVD	R12, (2176+40)(R4)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+56(FP)
+	MOVD	R0, r2+64(FP)
+	MOVD	R0, err+72(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	addrerrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+72(FP)
+done:
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·syscall_rawsyscall6(SB),NOSPLIT,$0-80
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Fill in parameter list.
+	MOVD	a4+32(FP), R12
+	MOVD	R12, (2176+24)(R4)
+	MOVD	a5+40(FP), R12
+	MOVD	R12, (2176+32)(R4)
+	MOVD	a6+48(FP), R12
+	MOVD	R12, (2176+40)(R4)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+56(FP)
+	MOVD	R0, r2+64(FP)
+	MOVD	R0, err+72(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	·rrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+72(FP)
+done:
+	RET
+
+TEXT ·syscall_syscall9(SB),NOSPLIT,$0
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Fill in parameter list.
+	MOVD	a4+32(FP), R12
+	MOVD	R12, (2176+24)(R4)
+	MOVD	a5+40(FP), R12
+	MOVD	R12, (2176+32)(R4)
+	MOVD	a6+48(FP), R12
+	MOVD	R12, (2176+40)(R4)
+	MOVD	a7+56(FP), R12
+	MOVD	R12, (2176+48)(R4)
+	MOVD	a8+64(FP), R12
+	MOVD	R12, (2176+56)(R4)
+	MOVD	a9+72(FP), R12
+	MOVD	R12, (2176+64)(R4)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+80(FP)
+	MOVD	R0, r2+88(FP)
+	MOVD	R0, err+96(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	addrerrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+96(FP)
+done:
+        BL	runtime·exitsyscall(SB)
+        RET
+
+TEXT ·syscall_rawsyscall9(SB),NOSPLIT,$0
+	MOVD	a1+8(FP), R1
+	MOVD	a2+16(FP), R2
+	MOVD	a3+24(FP), R3
+
+	// Get library control area (LCA).
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+
+	// Get function.
+	MOVD	CAA(R8), R9
+	MOVD	EDCHPXV(R9), R9
+	MOVD	trap+0(FP), R5
+	SLD	$4, R5
+	ADD	R5, R9
+	LMG	0(R9), R5, R6
+
+	// Restore LE stack.
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R4
+	MOVD	$0, 0(R9)
+
+	// Fill in parameter list.
+	MOVD	a4+32(FP), R12
+	MOVD	R12, (2176+24)(R4)
+	MOVD	a5+40(FP), R12
+	MOVD	R12, (2176+32)(R4)
+	MOVD	a6+48(FP), R12
+	MOVD	R12, (2176+40)(R4)
+	MOVD	a7+56(FP), R12
+	MOVD	R12, (2176+48)(R4)
+	MOVD	a8+64(FP), R12
+	MOVD	R12, (2176+56)(R4)
+	MOVD	a9+72(FP), R12
+	MOVD	R12, (2176+64)(R4)
+
+	// Call function.
+	LE_CALL
+	NOPH
+	XOR	R0, R0      // Restore R0 to $0.
+	MOVD	R4, 0(R9)   // Save stack pointer.
+
+	MOVD	R3, r1+80(FP)
+	MOVD	R0, r2+88(FP)
+	MOVD	R0, err+96(FP)
+	MOVW	R3, R4
+	CMP	R4, $-1
+	BNE	done
+	BL	addrerrno<>(SB)
+	MOVWZ	0(R3), R3
+	MOVD	R3, err+96(FP)
+done:
 	RET
 
 // func svcCall(fnptr unsafe.Pointer, argv *unsafe.Pointer, dsa *uint64)
-TEXT ·svcCall(SB), NOSPLIT, $0
-	BL   runtime·save_g(SB)     // Save g and stack pointer
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
-	MOVD SAVSTACK_ASYNC(R8), R9
-	MOVD R15, 0(R9)
+TEXT ·svcCall(SB),NOSPLIT,$0
+	BL	runtime·save_g(SB)   // Save g and stack pointer
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	R15, 0(R9)
 
-	MOVD argv+8(FP), R1   // Move function arguments into registers
-	MOVD dsa+16(FP), g
-	MOVD fnptr+0(FP), R15
+	MOVD	argv+8(FP), R1       // Move function arguments into registers
+	MOVD	dsa+16(FP), g
+	MOVD	fnptr+0(FP), R15
 
-	BYTE $0x0D // Branch to function
-	BYTE $0xEF
+	BYTE	$0x0D                // Branch to function
+	BYTE	$0xEF
 
-	BL   runtime·load_g(SB)     // Restore g and stack pointer
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
-	MOVD SAVSTACK_ASYNC(R8), R9
-	MOVD 0(R9), R15
+	BL	runtime·load_g(SB)   // Restore g and stack pointer
+	MOVW	PSALAA, R8
+	MOVD	LCA64(R8), R8
+	MOVD	SAVSTACK_ASYNC(R8), R9
+	MOVD	0(R9), R15
 
 	RET
 
 // func svcLoad(name *byte) unsafe.Pointer
-TEXT ·svcLoad(SB), NOSPLIT, $0
-	MOVD R15, R2         // Save go stack pointer
-	MOVD name+0(FP), R0  // Move SVC args into registers
-	MOVD $0x80000000, R1
-	MOVD $0, R15
-	SVC_LOAD
-	MOVW R15, R3         // Save return code from SVC
-	MOVD R2, R15         // Restore go stack pointer
-	CMP  R3, $0          // Check SVC return code
-	BNE  error
+TEXT ·svcLoad(SB),NOSPLIT,$0
+	MOVD	R15, R2          // Save go stack pointer
+	MOVD	name+0(FP), R0   // Move SVC args into registers
+	MOVD	$0x80000000, R1
+	MOVD	$0, R15
+	BYTE	$0x0A            // SVC 08 LOAD
+	BYTE	$0x08
+	MOVW	R15, R3          // Save return code from SVC
+	MOVD	R2, R15          // Restore go stack pointer
+	CMP	R3, $0           // Check SVC return code
+	BNE	error
 
-	MOVD $-2, R3       // Reset last bit of entry point to zero
-	AND  R0, R3
-	MOVD R3, ret+8(FP) // Return entry point returned by SVC
-	CMP  R0, R3        // Check if last bit of entry point was set
-	BNE  done
+	MOVD	$-2, R3          // Reset last bit of entry point to zero
+	AND	R0, R3
+	MOVD	R3, addr+8(FP)   // Return entry point returned by SVC
+	CMP	R0, R3           // Check if last bit of entry point was set
+	BNE	done
 
-	MOVD R15, R2 // Save go stack pointer
-	MOVD $0, R15 // Move SVC args into registers (entry point still in r0 from SVC 08)
-	SVC_DELETE
-	MOVD R2, R15 // Restore go stack pointer
+	MOVD	R15, R2          // Save go stack pointer
+	MOVD	$0, R15          // Move SVC args into registers (entry point still in r0 from SVC 08)
+	BYTE	$0x0A            // SVC 09 DELETE
+	BYTE	$0x09
+	MOVD	R2, R15          // Restore go stack pointer
 
 error:
-	MOVD $0, ret+8(FP) // Return 0 on failure
-
+	MOVD	$0, addr+8(FP)   // Return 0 on failure
 done:
-	XOR R0, R0 // Reset r0 to 0
+	XOR	R0, R0           // Reset r0 to 0
 	RET
 
 // func svcUnload(name *byte, fnptr unsafe.Pointer) int64
-TEXT ·svcUnload(SB), NOSPLIT, $0
-	MOVD R15, R2          // Save go stack pointer
-	MOVD name+0(FP), R0   // Move SVC args into registers
-	MOVD fnptr+8(FP), R15
-	SVC_DELETE
-	XOR  R0, R0           // Reset r0 to 0
-	MOVD R15, R1          // Save SVC return code
-	MOVD R2, R15          // Restore go stack pointer
-	MOVD R1, ret+16(FP)   // Return SVC return code
+TEXT ·svcUnload(SB),NOSPLIT,$0
+	MOVD	R15, R2          // Save go stack pointer
+	MOVD	name+0(FP), R0   // Move SVC args into registers
+	MOVD	addr+8(FP), R15
+	BYTE	$0x0A            // SVC 09
+	BYTE	$0x09
+	XOR	R0, R0           // Reset r0 to 0
+	MOVD	R15, R1          // Save SVC return code
+	MOVD	R2, R15          // Restore go stack pointer
+	MOVD	R1, rc+0(FP)     // Return SVC return code
 	RET
 
 // func gettid() uint64
@@ -150,233 +420,7 @@ TEXT ·gettid(SB), NOSPLIT, $0
 
 	// Get CEECAATHDID
 	MOVD CAA(R8), R9
-	MOVD CEECAATHDID(R9), R9
+	MOVD 0x3D0(R9), R9
 	MOVD R9, ret+0(FP)
 
 	RET
-
-//
-// Call LE function, if the return is -1
-// errno and errno2 is retrieved
-//
-TEXT ·CallLeFuncWithErr(SB), NOSPLIT, $0
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
-	MOVD CAA(R8), R9
-	MOVD g, GOCB(R9)
-
-	// Restore LE stack.
-	MOVD SAVSTACK_ASYNC(R8), R9 // R9-> LE stack frame saving address
-	MOVD 0(R9), R4              // R4-> restore previously saved stack frame pointer
-
-	MOVD parms_base+8(FP), R7 // R7 -> argument array
-	MOVD parms_len+16(FP), R8 // R8 number of arguments
-
-	//  arg 1 ---> R1
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	MOVD 0(R7), R1
-
-	//  arg 2 ---> R2
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	ADD  $8, R7
-	MOVD 0(R7), R2
-
-	//  arg 3 --> R3
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	ADD  $8, R7
-	MOVD 0(R7), R3
-
-	CMP  R8, $0
-	BEQ  docall
-	MOVD $2176+16, R6 // starting LE stack address-8 to store 4th argument
-
-repeat:
-	ADD  $8, R7
-	MOVD 0(R7), R0      // advance arg pointer by 8 byte
-	ADD  $8, R6         // advance LE argument address by 8 byte
-	MOVD R0, (R4)(R6*1) // copy argument from go-slice to le-frame
-	SUB  $1, R8
-	CMP  R8, $0
-	BNE  repeat
-
-docall:
-	MOVD funcdesc+0(FP), R8 // R8-> function descriptor
-	LMG  0(R8), R5, R6
-	MOVD $0, 0(R9)          // R9 address of SAVSTACK_ASYNC
-	LE_CALL                 // balr R7, R6 (return #1)
-	NOPH
-	MOVD R3, ret+32(FP)
-	CMP  R3, $-1            // compare result to -1
-	BNE  done
-
-	// retrieve errno and errno2
-	MOVD  zosLibVec<>(SB), R8
-	ADD   $(__errno), R8
-	LMG   0(R8), R5, R6
-	LE_CALL                   // balr R7, R6 __errno (return #3)
-	NOPH
-	MOVWZ 0(R3), R3
-	MOVD  R3, err+48(FP)
-	MOVD  zosLibVec<>(SB), R8
-	ADD   $(__err2ad), R8
-	LMG   0(R8), R5, R6
-	LE_CALL                   // balr R7, R6 __err2ad (return #2)
-	NOPH
-	MOVW  (R3), R2            // retrieve errno2
-	MOVD  R2, errno2+40(FP)   // store in return area
-
-done:
-	MOVD R4, 0(R9)            // Save stack pointer.
-	RET
-
-//
-// Call LE function, if the return is 0
-// errno and errno2 is retrieved
-//
-TEXT ·CallLeFuncWithPtrReturn(SB), NOSPLIT, $0
-	MOVW PSALAA, R8
-	MOVD LCA64(R8), R8
-	MOVD CAA(R8), R9
-	MOVD g, GOCB(R9)
-
-	// Restore LE stack.
-	MOVD SAVSTACK_ASYNC(R8), R9 // R9-> LE stack frame saving address
-	MOVD 0(R9), R4              // R4-> restore previously saved stack frame pointer
-
-	MOVD parms_base+8(FP), R7 // R7 -> argument array
-	MOVD parms_len+16(FP), R8 // R8 number of arguments
-
-	//  arg 1 ---> R1
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	MOVD 0(R7), R1
-
-	//  arg 2 ---> R2
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	ADD  $8, R7
-	MOVD 0(R7), R2
-
-	//  arg 3 --> R3
-	CMP  R8, $0
-	BEQ  docall
-	SUB  $1, R8
-	ADD  $8, R7
-	MOVD 0(R7), R3
-
-	CMP  R8, $0
-	BEQ  docall
-	MOVD $2176+16, R6 // starting LE stack address-8 to store 4th argument
-
-repeat:
-	ADD  $8, R7
-	MOVD 0(R7), R0      // advance arg pointer by 8 byte
-	ADD  $8, R6         // advance LE argument address by 8 byte
-	MOVD R0, (R4)(R6*1) // copy argument from go-slice to le-frame
-	SUB  $1, R8
-	CMP  R8, $0
-	BNE  repeat
-
-docall:
-	MOVD funcdesc+0(FP), R8 // R8-> function descriptor
-	LMG  0(R8), R5, R6
-	MOVD $0, 0(R9)          // R9 address of SAVSTACK_ASYNC
-	LE_CALL                 // balr R7, R6 (return #1)
-	NOPH
-	MOVD R3, ret+32(FP)
-	CMP  R3, $0             // compare result to 0
-	BNE  done
-
-	// retrieve errno and errno2
-	MOVD  zosLibVec<>(SB), R8
-	ADD   $(__errno), R8
-	LMG   0(R8), R5, R6
-	LE_CALL                   // balr R7, R6 __errno (return #3)
-	NOPH
-	MOVWZ 0(R3), R3
-	MOVD  R3, err+48(FP)
-	MOVD  zosLibVec<>(SB), R8
-	ADD   $(__err2ad), R8
-	LMG   0(R8), R5, R6
-	LE_CALL                   // balr R7, R6 __err2ad (return #2)
-	NOPH
-	MOVW  (R3), R2            // retrieve errno2
-	MOVD  R2, errno2+40(FP)   // store in return area
-	XOR   R2, R2
-	MOVWZ R2, (R3)            // clear errno2
-
-done:
-	MOVD R4, 0(R9)            // Save stack pointer.
-	RET
-
-//
-// function to test if a pointer can be safely dereferenced (content read)
-// return 0 for succces
-//
-TEXT ·ptrtest(SB), NOSPLIT, $0-16
-	MOVD arg+0(FP), R10 // test pointer in R10
-
-	// set up R2 to point to CEECAADMC
-	BYTE $0xE3; BYTE $0x20; BYTE $0x04; BYTE $0xB8; BYTE $0x00; BYTE $0x17 // llgt  2,1208
-	BYTE $0xB9; BYTE $0x17; BYTE $0x00; BYTE $0x22                         // llgtr 2,2
-	BYTE $0xA5; BYTE $0x26; BYTE $0x7F; BYTE $0xFF                         // nilh  2,32767
-	BYTE $0xE3; BYTE $0x22; BYTE $0x00; BYTE $0x58; BYTE $0x00; BYTE $0x04 // lg    2,88(2)
-	BYTE $0xE3; BYTE $0x22; BYTE $0x00; BYTE $0x08; BYTE $0x00; BYTE $0x04 // lg    2,8(2)
-	BYTE $0x41; BYTE $0x22; BYTE $0x03; BYTE $0x68                         // la    2,872(2)
-
-	// set up R5 to point to the "shunt" path which set 1 to R3 (failure)
-	BYTE $0xB9; BYTE $0x82; BYTE $0x00; BYTE $0x33 // xgr   3,3
-	BYTE $0xA7; BYTE $0x55; BYTE $0x00; BYTE $0x04 // bras  5,lbl1
-	BYTE $0xA7; BYTE $0x39; BYTE $0x00; BYTE $0x01 // lghi  3,1
-
-	// if r3 is not zero (failed) then branch to finish
-	BYTE $0xB9; BYTE $0x02; BYTE $0x00; BYTE $0x33 // lbl1     ltgr  3,3
-	BYTE $0xA7; BYTE $0x74; BYTE $0x00; BYTE $0x08 // brc   b'0111',lbl2
-
-	// stomic store shunt address in R5 into CEECAADMC
-	BYTE $0xE3; BYTE $0x52; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x24 // stg   5,0(2)
-
-	// now try reading from the test pointer in R10, if it fails it branches to the "lghi" instruction above
-	BYTE $0xE3; BYTE $0x9A; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x04 // lg    9,0(10)
-
-	// finish here, restore 0 into CEECAADMC
-	BYTE $0xB9; BYTE $0x82; BYTE $0x00; BYTE $0x99                         // lbl2     xgr   9,9
-	BYTE $0xE3; BYTE $0x92; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x24 // stg   9,0(2)
-	MOVD R3, ret+8(FP)                                                     // result in R3
-	RET
-
-//
-// function to test if a untptr can be loaded from a pointer
-// return 1: the 8-byte content
-//        2: 0 for success, 1 for failure
-//
-// func safeload(ptr uintptr) ( value uintptr, error uintptr)
-TEXT ·safeload(SB), NOSPLIT, $0-24
-	MOVD ptr+0(FP), R10                                                    // test pointer in R10
-	MOVD $0x0, R6
-	BYTE $0xE3; BYTE $0x20; BYTE $0x04; BYTE $0xB8; BYTE $0x00; BYTE $0x17 // llgt  2,1208
-	BYTE $0xB9; BYTE $0x17; BYTE $0x00; BYTE $0x22                         // llgtr 2,2
-	BYTE $0xA5; BYTE $0x26; BYTE $0x7F; BYTE $0xFF                         // nilh  2,32767
-	BYTE $0xE3; BYTE $0x22; BYTE $0x00; BYTE $0x58; BYTE $0x00; BYTE $0x04 // lg    2,88(2)
-	BYTE $0xE3; BYTE $0x22; BYTE $0x00; BYTE $0x08; BYTE $0x00; BYTE $0x04 // lg    2,8(2)
-	BYTE $0x41; BYTE $0x22; BYTE $0x03; BYTE $0x68                         // la    2,872(2)
-	BYTE $0xB9; BYTE $0x82; BYTE $0x00; BYTE $0x33                         // xgr   3,3
-	BYTE $0xA7; BYTE $0x55; BYTE $0x00; BYTE $0x04                         // bras  5,lbl1
-	BYTE $0xA7; BYTE $0x39; BYTE $0x00; BYTE $0x01                         // lghi  3,1
-	BYTE $0xB9; BYTE $0x02; BYTE $0x00; BYTE $0x33                         // lbl1     ltgr  3,3
-	BYTE $0xA7; BYTE $0x74; BYTE $0x00; BYTE $0x08                         // brc   b'0111',lbl2
-	BYTE $0xE3; BYTE $0x52; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x24 // stg 5,0(2)
-	BYTE $0xE3; BYTE $0x6A; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x04 // lg    6,0(10)
-	BYTE $0xB9; BYTE $0x82; BYTE $0x00; BYTE $0x99                         // lbl2     xgr   9,9
-	BYTE $0xE3; BYTE $0x92; BYTE $0x00; BYTE $0x00; BYTE $0x00; BYTE $0x24 // stg   9,0(2)
-	MOVD R6, value+8(FP)                                                   // result in R6
-	MOVD R3, error+16(FP)                                                  // error in R3
-	RET
diff --git a/vendor/golang.org/x/sys/unix/auxv.go b/vendor/golang.org/x/sys/unix/auxv.go
deleted file mode 100644
index 37a8252..0000000
--- a/vendor/golang.org/x/sys/unix/auxv.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.21 && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos)
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:linkname runtime_getAuxv runtime.getAuxv
-func runtime_getAuxv() []uintptr
-
-// Auxv returns the ELF auxiliary vector as a sequence of key/value pairs.
-// The returned slice is always a fresh copy, owned by the caller.
-// It returns an error on non-ELF platforms, or if the auxiliary vector cannot be accessed,
-// which happens in some locked-down environments and build modes.
-func Auxv() ([][2]uintptr, error) {
-	vec := runtime_getAuxv()
-	vecLen := len(vec)
-
-	if vecLen == 0 {
-		return nil, syscall.ENOENT
-	}
-
-	if vecLen%2 != 0 {
-		return nil, syscall.EINVAL
-	}
-
-	result := make([]uintptr, vecLen)
-	copy(result, vec)
-	return unsafe.Slice((*[2]uintptr)(unsafe.Pointer(&result[0])), vecLen/2), nil
-}
diff --git a/vendor/golang.org/x/sys/unix/auxv_unsupported.go b/vendor/golang.org/x/sys/unix/auxv_unsupported.go
deleted file mode 100644
index 1200487..0000000
--- a/vendor/golang.org/x/sys/unix/auxv_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.21 && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos)
-
-package unix
-
-import "syscall"
-
-func Auxv() ([][2]uintptr, error) {
-	return nil, syscall.ENOTSUP
-}
diff --git a/vendor/golang.org/x/sys/unix/bpxsvc_zos.go b/vendor/golang.org/x/sys/unix/bpxsvc_zos.go
deleted file mode 100644
index 39d647d..0000000
--- a/vendor/golang.org/x/sys/unix/bpxsvc_zos.go
+++ /dev/null
@@ -1,657 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build zos
-
-package unix
-
-import (
-	"bytes"
-	"fmt"
-	"unsafe"
-)
-
-//go:noescape
-func bpxcall(plist []unsafe.Pointer, bpx_offset int64)
-
-//go:noescape
-func A2e([]byte)
-
-//go:noescape
-func E2a([]byte)
-
-const (
-	BPX4STA = 192  // stat
-	BPX4FST = 104  // fstat
-	BPX4LST = 132  // lstat
-	BPX4OPN = 156  // open
-	BPX4CLO = 72   // close
-	BPX4CHR = 500  // chattr
-	BPX4FCR = 504  // fchattr
-	BPX4LCR = 1180 // lchattr
-	BPX4CTW = 492  // cond_timed_wait
-	BPX4GTH = 1056 // __getthent
-	BPX4PTQ = 412  // pthread_quiesc
-	BPX4PTR = 320  // ptrace
-)
-
-const (
-	//options
-	//byte1
-	BPX_OPNFHIGH = 0x80
-	//byte2
-	BPX_OPNFEXEC = 0x80
-	//byte3
-	BPX_O_NOLARGEFILE = 0x08
-	BPX_O_LARGEFILE   = 0x04
-	BPX_O_ASYNCSIG    = 0x02
-	BPX_O_SYNC        = 0x01
-	//byte4
-	BPX_O_CREXCL   = 0xc0
-	BPX_O_CREAT    = 0x80
-	BPX_O_EXCL     = 0x40
-	BPX_O_NOCTTY   = 0x20
-	BPX_O_TRUNC    = 0x10
-	BPX_O_APPEND   = 0x08
-	BPX_O_NONBLOCK = 0x04
-	BPX_FNDELAY    = 0x04
-	BPX_O_RDWR     = 0x03
-	BPX_O_RDONLY   = 0x02
-	BPX_O_WRONLY   = 0x01
-	BPX_O_ACCMODE  = 0x03
-	BPX_O_GETFL    = 0x0f
-
-	//mode
-	// byte1 (file type)
-	BPX_FT_DIR      = 1
-	BPX_FT_CHARSPEC = 2
-	BPX_FT_REGFILE  = 3
-	BPX_FT_FIFO     = 4
-	BPX_FT_SYMLINK  = 5
-	BPX_FT_SOCKET   = 6
-	//byte3
-	BPX_S_ISUID  = 0x08
-	BPX_S_ISGID  = 0x04
-	BPX_S_ISVTX  = 0x02
-	BPX_S_IRWXU1 = 0x01
-	BPX_S_IRUSR  = 0x01
-	//byte4
-	BPX_S_IRWXU2 = 0xc0
-	BPX_S_IWUSR  = 0x80
-	BPX_S_IXUSR  = 0x40
-	BPX_S_IRWXG  = 0x38
-	BPX_S_IRGRP  = 0x20
-	BPX_S_IWGRP  = 0x10
-	BPX_S_IXGRP  = 0x08
-	BPX_S_IRWXOX = 0x07
-	BPX_S_IROTH  = 0x04
-	BPX_S_IWOTH  = 0x02
-	BPX_S_IXOTH  = 0x01
-
-	CW_INTRPT  = 1
-	CW_CONDVAR = 32
-	CW_TIMEOUT = 64
-
-	PGTHA_NEXT        = 2
-	PGTHA_CURRENT     = 1
-	PGTHA_FIRST       = 0
-	PGTHA_LAST        = 3
-	PGTHA_PROCESS     = 0x80
-	PGTHA_CONTTY      = 0x40
-	PGTHA_PATH        = 0x20
-	PGTHA_COMMAND     = 0x10
-	PGTHA_FILEDATA    = 0x08
-	PGTHA_THREAD      = 0x04
-	PGTHA_PTAG        = 0x02
-	PGTHA_COMMANDLONG = 0x01
-	PGTHA_THREADFAST  = 0x80
-	PGTHA_FILEPATH    = 0x40
-	PGTHA_THDSIGMASK  = 0x20
-	// thread quiece mode
-	QUIESCE_TERM       int32 = 1
-	QUIESCE_FORCE      int32 = 2
-	QUIESCE_QUERY      int32 = 3
-	QUIESCE_FREEZE     int32 = 4
-	QUIESCE_UNFREEZE   int32 = 5
-	FREEZE_THIS_THREAD int32 = 6
-	FREEZE_EXIT        int32 = 8
-	QUIESCE_SRB        int32 = 9
-)
-
-type Pgtha struct {
-	Pid        uint32 // 0
-	Tid0       uint32 // 4
-	Tid1       uint32
-	Accesspid  byte    // C
-	Accesstid  byte    // D
-	Accessasid uint16  // E
-	Loginname  [8]byte // 10
-	Flag1      byte    // 18
-	Flag1b2    byte    // 19
-}
-
-type Bpxystat_t struct { // DSECT BPXYSTAT
-	St_id           [4]uint8  // 0
-	St_length       uint16    // 0x4
-	St_version      uint16    // 0x6
-	St_mode         uint32    // 0x8
-	St_ino          uint32    // 0xc
-	St_dev          uint32    // 0x10
-	St_nlink        uint32    // 0x14
-	St_uid          uint32    // 0x18
-	St_gid          uint32    // 0x1c
-	St_size         uint64    // 0x20
-	St_atime        uint32    // 0x28
-	St_mtime        uint32    // 0x2c
-	St_ctime        uint32    // 0x30
-	St_rdev         uint32    // 0x34
-	St_auditoraudit uint32    // 0x38
-	St_useraudit    uint32    // 0x3c
-	St_blksize      uint32    // 0x40
-	St_createtime   uint32    // 0x44
-	St_auditid      [4]uint32 // 0x48
-	St_res01        uint32    // 0x58
-	Ft_ccsid        uint16    // 0x5c
-	Ft_flags        uint16    // 0x5e
-	St_res01a       [2]uint32 // 0x60
-	St_res02        uint32    // 0x68
-	St_blocks       uint32    // 0x6c
-	St_opaque       [3]uint8  // 0x70
-	St_visible      uint8     // 0x73
-	St_reftime      uint32    // 0x74
-	St_fid          uint64    // 0x78
-	St_filefmt      uint8     // 0x80
-	St_fspflag2     uint8     // 0x81
-	St_res03        [2]uint8  // 0x82
-	St_ctimemsec    uint32    // 0x84
-	St_seclabel     [8]uint8  // 0x88
-	St_res04        [4]uint8  // 0x90
-	// end of version 1
-	_               uint32    // 0x94
-	St_atime64      uint64    // 0x98
-	St_mtime64      uint64    // 0xa0
-	St_ctime64      uint64    // 0xa8
-	St_createtime64 uint64    // 0xb0
-	St_reftime64    uint64    // 0xb8
-	_               uint64    // 0xc0
-	St_res05        [16]uint8 // 0xc8
-	// end of version 2
-}
-
-type BpxFilestatus struct {
-	Oflag1 byte
-	Oflag2 byte
-	Oflag3 byte
-	Oflag4 byte
-}
-
-type BpxMode struct {
-	Ftype byte
-	Mode1 byte
-	Mode2 byte
-	Mode3 byte
-}
-
-// Thr attribute structure for extended attributes
-type Bpxyatt_t struct { // DSECT BPXYATT
-	Att_id           [4]uint8
-	Att_version      uint16
-	Att_res01        [2]uint8
-	Att_setflags1    uint8
-	Att_setflags2    uint8
-	Att_setflags3    uint8
-	Att_setflags4    uint8
-	Att_mode         uint32
-	Att_uid          uint32
-	Att_gid          uint32
-	Att_opaquemask   [3]uint8
-	Att_visblmaskres uint8
-	Att_opaque       [3]uint8
-	Att_visibleres   uint8
-	Att_size_h       uint32
-	Att_size_l       uint32
-	Att_atime        uint32
-	Att_mtime        uint32
-	Att_auditoraudit uint32
-	Att_useraudit    uint32
-	Att_ctime        uint32
-	Att_reftime      uint32
-	// end of version 1
-	Att_filefmt uint8
-	Att_res02   [3]uint8
-	Att_filetag uint32
-	Att_res03   [8]uint8
-	// end of version 2
-	Att_atime64   uint64
-	Att_mtime64   uint64
-	Att_ctime64   uint64
-	Att_reftime64 uint64
-	Att_seclabel  [8]uint8
-	Att_ver3res02 [8]uint8
-	// end of version 3
-}
-
-func BpxOpen(name string, options *BpxFilestatus, mode *BpxMode) (rv int32, rc int32, rn int32) {
-	if len(name) < 1024 {
-		var namebuf [1024]byte
-		sz := int32(copy(namebuf[:], name))
-		A2e(namebuf[:sz])
-		var parms [7]unsafe.Pointer
-		parms[0] = unsafe.Pointer(&sz)
-		parms[1] = unsafe.Pointer(&namebuf[0])
-		parms[2] = unsafe.Pointer(options)
-		parms[3] = unsafe.Pointer(mode)
-		parms[4] = unsafe.Pointer(&rv)
-		parms[5] = unsafe.Pointer(&rc)
-		parms[6] = unsafe.Pointer(&rn)
-		bpxcall(parms[:], BPX4OPN)
-		return rv, rc, rn
-	}
-	return -1, -1, -1
-}
-
-func BpxClose(fd int32) (rv int32, rc int32, rn int32) {
-	var parms [4]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&fd)
-	parms[1] = unsafe.Pointer(&rv)
-	parms[2] = unsafe.Pointer(&rc)
-	parms[3] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4CLO)
-	return rv, rc, rn
-}
-
-func BpxFileFStat(fd int32, st *Bpxystat_t) (rv int32, rc int32, rn int32) {
-	st.St_id = [4]uint8{0xe2, 0xe3, 0xc1, 0xe3}
-	st.St_version = 2
-	stat_sz := uint32(unsafe.Sizeof(*st))
-	var parms [6]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&fd)
-	parms[1] = unsafe.Pointer(&stat_sz)
-	parms[2] = unsafe.Pointer(st)
-	parms[3] = unsafe.Pointer(&rv)
-	parms[4] = unsafe.Pointer(&rc)
-	parms[5] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4FST)
-	return rv, rc, rn
-}
-
-func BpxFileStat(name string, st *Bpxystat_t) (rv int32, rc int32, rn int32) {
-	if len(name) < 1024 {
-		var namebuf [1024]byte
-		sz := int32(copy(namebuf[:], name))
-		A2e(namebuf[:sz])
-		st.St_id = [4]uint8{0xe2, 0xe3, 0xc1, 0xe3}
-		st.St_version = 2
-		stat_sz := uint32(unsafe.Sizeof(*st))
-		var parms [7]unsafe.Pointer
-		parms[0] = unsafe.Pointer(&sz)
-		parms[1] = unsafe.Pointer(&namebuf[0])
-		parms[2] = unsafe.Pointer(&stat_sz)
-		parms[3] = unsafe.Pointer(st)
-		parms[4] = unsafe.Pointer(&rv)
-		parms[5] = unsafe.Pointer(&rc)
-		parms[6] = unsafe.Pointer(&rn)
-		bpxcall(parms[:], BPX4STA)
-		return rv, rc, rn
-	}
-	return -1, -1, -1
-}
-
-func BpxFileLStat(name string, st *Bpxystat_t) (rv int32, rc int32, rn int32) {
-	if len(name) < 1024 {
-		var namebuf [1024]byte
-		sz := int32(copy(namebuf[:], name))
-		A2e(namebuf[:sz])
-		st.St_id = [4]uint8{0xe2, 0xe3, 0xc1, 0xe3}
-		st.St_version = 2
-		stat_sz := uint32(unsafe.Sizeof(*st))
-		var parms [7]unsafe.Pointer
-		parms[0] = unsafe.Pointer(&sz)
-		parms[1] = unsafe.Pointer(&namebuf[0])
-		parms[2] = unsafe.Pointer(&stat_sz)
-		parms[3] = unsafe.Pointer(st)
-		parms[4] = unsafe.Pointer(&rv)
-		parms[5] = unsafe.Pointer(&rc)
-		parms[6] = unsafe.Pointer(&rn)
-		bpxcall(parms[:], BPX4LST)
-		return rv, rc, rn
-	}
-	return -1, -1, -1
-}
-
-func BpxChattr(path string, attr *Bpxyatt_t) (rv int32, rc int32, rn int32) {
-	if len(path) >= 1024 {
-		return -1, -1, -1
-	}
-	var namebuf [1024]byte
-	sz := int32(copy(namebuf[:], path))
-	A2e(namebuf[:sz])
-	attr_sz := uint32(unsafe.Sizeof(*attr))
-	var parms [7]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&sz)
-	parms[1] = unsafe.Pointer(&namebuf[0])
-	parms[2] = unsafe.Pointer(&attr_sz)
-	parms[3] = unsafe.Pointer(attr)
-	parms[4] = unsafe.Pointer(&rv)
-	parms[5] = unsafe.Pointer(&rc)
-	parms[6] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4CHR)
-	return rv, rc, rn
-}
-
-func BpxLchattr(path string, attr *Bpxyatt_t) (rv int32, rc int32, rn int32) {
-	if len(path) >= 1024 {
-		return -1, -1, -1
-	}
-	var namebuf [1024]byte
-	sz := int32(copy(namebuf[:], path))
-	A2e(namebuf[:sz])
-	attr_sz := uint32(unsafe.Sizeof(*attr))
-	var parms [7]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&sz)
-	parms[1] = unsafe.Pointer(&namebuf[0])
-	parms[2] = unsafe.Pointer(&attr_sz)
-	parms[3] = unsafe.Pointer(attr)
-	parms[4] = unsafe.Pointer(&rv)
-	parms[5] = unsafe.Pointer(&rc)
-	parms[6] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4LCR)
-	return rv, rc, rn
-}
-
-func BpxFchattr(fd int32, attr *Bpxyatt_t) (rv int32, rc int32, rn int32) {
-	attr_sz := uint32(unsafe.Sizeof(*attr))
-	var parms [6]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&fd)
-	parms[1] = unsafe.Pointer(&attr_sz)
-	parms[2] = unsafe.Pointer(attr)
-	parms[3] = unsafe.Pointer(&rv)
-	parms[4] = unsafe.Pointer(&rc)
-	parms[5] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4FCR)
-	return rv, rc, rn
-}
-
-func BpxCondTimedWait(sec uint32, nsec uint32, events uint32, secrem *uint32, nsecrem *uint32) (rv int32, rc int32, rn int32) {
-	var parms [8]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&sec)
-	parms[1] = unsafe.Pointer(&nsec)
-	parms[2] = unsafe.Pointer(&events)
-	parms[3] = unsafe.Pointer(secrem)
-	parms[4] = unsafe.Pointer(nsecrem)
-	parms[5] = unsafe.Pointer(&rv)
-	parms[6] = unsafe.Pointer(&rc)
-	parms[7] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4CTW)
-	return rv, rc, rn
-}
-func BpxGetthent(in *Pgtha, outlen *uint32, out unsafe.Pointer) (rv int32, rc int32, rn int32) {
-	var parms [7]unsafe.Pointer
-	inlen := uint32(26) // nothing else will work. Go says Pgtha is 28-byte because of alignment, but Pgtha is "packed" and must be 26-byte
-	parms[0] = unsafe.Pointer(&inlen)
-	parms[1] = unsafe.Pointer(&in)
-	parms[2] = unsafe.Pointer(outlen)
-	parms[3] = unsafe.Pointer(&out)
-	parms[4] = unsafe.Pointer(&rv)
-	parms[5] = unsafe.Pointer(&rc)
-	parms[6] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4GTH)
-	return rv, rc, rn
-}
-func ZosJobname() (jobname string, err error) {
-	var pgtha Pgtha
-	pgtha.Pid = uint32(Getpid())
-	pgtha.Accesspid = PGTHA_CURRENT
-	pgtha.Flag1 = PGTHA_PROCESS
-	var out [256]byte
-	var outlen uint32
-	outlen = 256
-	rv, rc, rn := BpxGetthent(&pgtha, &outlen, unsafe.Pointer(&out[0]))
-	if rv == 0 {
-		gthc := []byte{0x87, 0xa3, 0x88, 0x83} // 'gthc' in ebcdic
-		ix := bytes.Index(out[:], gthc)
-		if ix == -1 {
-			err = fmt.Errorf("BPX4GTH: gthc return data not found")
-			return
-		}
-		jn := out[ix+80 : ix+88] // we didn't declare Pgthc, but jobname is 8-byte at offset 80
-		E2a(jn)
-		jobname = string(bytes.TrimRight(jn, " "))
-
-	} else {
-		err = fmt.Errorf("BPX4GTH: rc=%d errno=%d reason=code=0x%x", rv, rc, rn)
-	}
-	return
-}
-func Bpx4ptq(code int32, data string) (rv int32, rc int32, rn int32) {
-	var userdata [8]byte
-	var parms [5]unsafe.Pointer
-	copy(userdata[:], data+"        ")
-	A2e(userdata[:])
-	parms[0] = unsafe.Pointer(&code)
-	parms[1] = unsafe.Pointer(&userdata[0])
-	parms[2] = unsafe.Pointer(&rv)
-	parms[3] = unsafe.Pointer(&rc)
-	parms[4] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4PTQ)
-	return rv, rc, rn
-}
-
-const (
-	PT_TRACE_ME             = 0  // Debug this process
-	PT_READ_I               = 1  // Read a full word
-	PT_READ_D               = 2  // Read a full word
-	PT_READ_U               = 3  // Read control info
-	PT_WRITE_I              = 4  //Write a full word
-	PT_WRITE_D              = 5  //Write a full word
-	PT_CONTINUE             = 7  //Continue the process
-	PT_KILL                 = 8  //Terminate the process
-	PT_READ_GPR             = 11 // Read GPR, CR, PSW
-	PT_READ_FPR             = 12 // Read FPR
-	PT_READ_VR              = 13 // Read VR
-	PT_WRITE_GPR            = 14 // Write GPR, CR, PSW
-	PT_WRITE_FPR            = 15 // Write FPR
-	PT_WRITE_VR             = 16 // Write VR
-	PT_READ_BLOCK           = 17 // Read storage
-	PT_WRITE_BLOCK          = 19 // Write storage
-	PT_READ_GPRH            = 20 // Read GPRH
-	PT_WRITE_GPRH           = 21 // Write GPRH
-	PT_REGHSET              = 22 // Read all GPRHs
-	PT_ATTACH               = 30 // Attach to a process
-	PT_DETACH               = 31 // Detach from a process
-	PT_REGSET               = 32 // Read all GPRs
-	PT_REATTACH             = 33 // Reattach to a process
-	PT_LDINFO               = 34 // Read loader info
-	PT_MULTI                = 35 // Multi process mode
-	PT_LD64INFO             = 36 // RMODE64 Info Area
-	PT_BLOCKREQ             = 40 // Block request
-	PT_THREAD_INFO          = 60 // Read thread info
-	PT_THREAD_MODIFY        = 61
-	PT_THREAD_READ_FOCUS    = 62
-	PT_THREAD_WRITE_FOCUS   = 63
-	PT_THREAD_HOLD          = 64
-	PT_THREAD_SIGNAL        = 65
-	PT_EXPLAIN              = 66
-	PT_EVENTS               = 67
-	PT_THREAD_INFO_EXTENDED = 68
-	PT_REATTACH2            = 71
-	PT_CAPTURE              = 72
-	PT_UNCAPTURE            = 73
-	PT_GET_THREAD_TCB       = 74
-	PT_GET_ALET             = 75
-	PT_SWAPIN               = 76
-	PT_EXTENDED_EVENT       = 98
-	PT_RECOVER              = 99  // Debug a program check
-	PT_GPR0                 = 0   // General purpose register 0
-	PT_GPR1                 = 1   // General purpose register 1
-	PT_GPR2                 = 2   // General purpose register 2
-	PT_GPR3                 = 3   // General purpose register 3
-	PT_GPR4                 = 4   // General purpose register 4
-	PT_GPR5                 = 5   // General purpose register 5
-	PT_GPR6                 = 6   // General purpose register 6
-	PT_GPR7                 = 7   // General purpose register 7
-	PT_GPR8                 = 8   // General purpose register 8
-	PT_GPR9                 = 9   // General purpose register 9
-	PT_GPR10                = 10  // General purpose register 10
-	PT_GPR11                = 11  // General purpose register 11
-	PT_GPR12                = 12  // General purpose register 12
-	PT_GPR13                = 13  // General purpose register 13
-	PT_GPR14                = 14  // General purpose register 14
-	PT_GPR15                = 15  // General purpose register 15
-	PT_FPR0                 = 16  // Floating point register 0
-	PT_FPR1                 = 17  // Floating point register 1
-	PT_FPR2                 = 18  // Floating point register 2
-	PT_FPR3                 = 19  // Floating point register 3
-	PT_FPR4                 = 20  // Floating point register 4
-	PT_FPR5                 = 21  // Floating point register 5
-	PT_FPR6                 = 22  // Floating point register 6
-	PT_FPR7                 = 23  // Floating point register 7
-	PT_FPR8                 = 24  // Floating point register 8
-	PT_FPR9                 = 25  // Floating point register 9
-	PT_FPR10                = 26  // Floating point register 10
-	PT_FPR11                = 27  // Floating point register 11
-	PT_FPR12                = 28  // Floating point register 12
-	PT_FPR13                = 29  // Floating point register 13
-	PT_FPR14                = 30  // Floating point register 14
-	PT_FPR15                = 31  // Floating point register 15
-	PT_FPC                  = 32  // Floating point control register
-	PT_PSW                  = 40  // PSW
-	PT_PSW0                 = 40  // Left half of the PSW
-	PT_PSW1                 = 41  // Right half of the PSW
-	PT_CR0                  = 42  // Control register 0
-	PT_CR1                  = 43  // Control register 1
-	PT_CR2                  = 44  // Control register 2
-	PT_CR3                  = 45  // Control register 3
-	PT_CR4                  = 46  // Control register 4
-	PT_CR5                  = 47  // Control register 5
-	PT_CR6                  = 48  // Control register 6
-	PT_CR7                  = 49  // Control register 7
-	PT_CR8                  = 50  // Control register 8
-	PT_CR9                  = 51  // Control register 9
-	PT_CR10                 = 52  // Control register 10
-	PT_CR11                 = 53  // Control register 11
-	PT_CR12                 = 54  // Control register 12
-	PT_CR13                 = 55  // Control register 13
-	PT_CR14                 = 56  // Control register 14
-	PT_CR15                 = 57  // Control register 15
-	PT_GPRH0                = 58  // GP High register 0
-	PT_GPRH1                = 59  // GP High register 1
-	PT_GPRH2                = 60  // GP High register 2
-	PT_GPRH3                = 61  // GP High register 3
-	PT_GPRH4                = 62  // GP High register 4
-	PT_GPRH5                = 63  // GP High register 5
-	PT_GPRH6                = 64  // GP High register 6
-	PT_GPRH7                = 65  // GP High register 7
-	PT_GPRH8                = 66  // GP High register 8
-	PT_GPRH9                = 67  // GP High register 9
-	PT_GPRH10               = 68  // GP High register 10
-	PT_GPRH11               = 69  // GP High register 11
-	PT_GPRH12               = 70  // GP High register 12
-	PT_GPRH13               = 71  // GP High register 13
-	PT_GPRH14               = 72  // GP High register 14
-	PT_GPRH15               = 73  // GP High register 15
-	PT_VR0                  = 74  // Vector register 0
-	PT_VR1                  = 75  // Vector register 1
-	PT_VR2                  = 76  // Vector register 2
-	PT_VR3                  = 77  // Vector register 3
-	PT_VR4                  = 78  // Vector register 4
-	PT_VR5                  = 79  // Vector register 5
-	PT_VR6                  = 80  // Vector register 6
-	PT_VR7                  = 81  // Vector register 7
-	PT_VR8                  = 82  // Vector register 8
-	PT_VR9                  = 83  // Vector register 9
-	PT_VR10                 = 84  // Vector register 10
-	PT_VR11                 = 85  // Vector register 11
-	PT_VR12                 = 86  // Vector register 12
-	PT_VR13                 = 87  // Vector register 13
-	PT_VR14                 = 88  // Vector register 14
-	PT_VR15                 = 89  // Vector register 15
-	PT_VR16                 = 90  // Vector register 16
-	PT_VR17                 = 91  // Vector register 17
-	PT_VR18                 = 92  // Vector register 18
-	PT_VR19                 = 93  // Vector register 19
-	PT_VR20                 = 94  // Vector register 20
-	PT_VR21                 = 95  // Vector register 21
-	PT_VR22                 = 96  // Vector register 22
-	PT_VR23                 = 97  // Vector register 23
-	PT_VR24                 = 98  // Vector register 24
-	PT_VR25                 = 99  // Vector register 25
-	PT_VR26                 = 100 // Vector register 26
-	PT_VR27                 = 101 // Vector register 27
-	PT_VR28                 = 102 // Vector register 28
-	PT_VR29                 = 103 // Vector register 29
-	PT_VR30                 = 104 // Vector register 30
-	PT_VR31                 = 105 // Vector register 31
-	PT_PSWG                 = 106 // PSWG
-	PT_PSWG0                = 106 // Bytes 0-3
-	PT_PSWG1                = 107 // Bytes 4-7
-	PT_PSWG2                = 108 // Bytes 8-11 (IA high word)
-	PT_PSWG3                = 109 // Bytes 12-15 (IA low word)
-)
-
-func Bpx4ptr(request int32, pid int32, addr unsafe.Pointer, data unsafe.Pointer, buffer unsafe.Pointer) (rv int32, rc int32, rn int32) {
-	var parms [8]unsafe.Pointer
-	parms[0] = unsafe.Pointer(&request)
-	parms[1] = unsafe.Pointer(&pid)
-	parms[2] = unsafe.Pointer(&addr)
-	parms[3] = unsafe.Pointer(&data)
-	parms[4] = unsafe.Pointer(&buffer)
-	parms[5] = unsafe.Pointer(&rv)
-	parms[6] = unsafe.Pointer(&rc)
-	parms[7] = unsafe.Pointer(&rn)
-	bpxcall(parms[:], BPX4PTR)
-	return rv, rc, rn
-}
-
-func copyU8(val uint8, dest []uint8) int {
-	if len(dest) < 1 {
-		return 0
-	}
-	dest[0] = val
-	return 1
-}
-
-func copyU8Arr(src, dest []uint8) int {
-	if len(dest) < len(src) {
-		return 0
-	}
-	for i, v := range src {
-		dest[i] = v
-	}
-	return len(src)
-}
-
-func copyU16(val uint16, dest []uint16) int {
-	if len(dest) < 1 {
-		return 0
-	}
-	dest[0] = val
-	return 1
-}
-
-func copyU32(val uint32, dest []uint32) int {
-	if len(dest) < 1 {
-		return 0
-	}
-	dest[0] = val
-	return 1
-}
-
-func copyU32Arr(src, dest []uint32) int {
-	if len(dest) < len(src) {
-		return 0
-	}
-	for i, v := range src {
-		dest[i] = v
-	}
-	return len(src)
-}
-
-func copyU64(val uint64, dest []uint64) int {
-	if len(dest) < 1 {
-		return 0
-	}
-	dest[0] = val
-	return 1
-}
diff --git a/vendor/golang.org/x/sys/unix/bpxsvc_zos.s b/vendor/golang.org/x/sys/unix/bpxsvc_zos.s
deleted file mode 100644
index 4bd4a17..0000000
--- a/vendor/golang.org/x/sys/unix/bpxsvc_zos.s
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "go_asm.h"
-#include "textflag.h"
-
-// function to call USS assembly language services
-//
-// doc: https://www.ibm.com/support/knowledgecenter/en/SSLTBW_3.1.0/com.ibm.zos.v3r1.bpxb100/bit64env.htm
-//
-//   arg1 unsafe.Pointer array that ressembles an OS PLIST
-//
-//   arg2 function offset as in
-//       doc: https://www.ibm.com/support/knowledgecenter/en/SSLTBW_3.1.0/com.ibm.zos.v3r1.bpxb100/bpx2cr_List_of_offsets.htm
-//
-// func bpxcall(plist []unsafe.Pointer, bpx_offset int64)
-
-TEXT ·bpxcall(SB), NOSPLIT|NOFRAME, $0
-	MOVD  plist_base+0(FP), R1  // r1 points to plist
-	MOVD  bpx_offset+24(FP), R2 // r2 offset to BPX vector table
-	MOVD  R14, R7               // save r14
-	MOVD  R15, R8               // save r15
-	MOVWZ 16(R0), R9
-	MOVWZ 544(R9), R9
-	MOVWZ 24(R9), R9            // call vector in r9
-	ADD   R2, R9                // add offset to vector table
-	MOVWZ (R9), R9              // r9 points to entry point
-	BYTE  $0x0D                 // BL R14,R9 --> basr r14,r9
-	BYTE  $0xE9                 // clobbers 0,1,14,15
-	MOVD  R8, R15               // restore 15
-	JMP   R7                    // return via saved return address
-
-//   func A2e(arr [] byte)
-//   code page conversion from  819 to 1047
-TEXT ·A2e(SB), NOSPLIT|NOFRAME, $0
-	MOVD arg_base+0(FP), R2                        // pointer to arry of characters
-	MOVD arg_len+8(FP), R3                         // count
-	XOR  R0, R0
-	XOR  R1, R1
-	BYTE $0xA7; BYTE $0x15; BYTE $0x00; BYTE $0x82 // BRAS 1,(2+(256/2))
-
-	// ASCII -> EBCDIC conversion table:
-	BYTE $0x00; BYTE $0x01; BYTE $0x02; BYTE $0x03
-	BYTE $0x37; BYTE $0x2d; BYTE $0x2e; BYTE $0x2f
-	BYTE $0x16; BYTE $0x05; BYTE $0x15; BYTE $0x0b
-	BYTE $0x0c; BYTE $0x0d; BYTE $0x0e; BYTE $0x0f
-	BYTE $0x10; BYTE $0x11; BYTE $0x12; BYTE $0x13
-	BYTE $0x3c; BYTE $0x3d; BYTE $0x32; BYTE $0x26
-	BYTE $0x18; BYTE $0x19; BYTE $0x3f; BYTE $0x27
-	BYTE $0x1c; BYTE $0x1d; BYTE $0x1e; BYTE $0x1f
-	BYTE $0x40; BYTE $0x5a; BYTE $0x7f; BYTE $0x7b
-	BYTE $0x5b; BYTE $0x6c; BYTE $0x50; BYTE $0x7d
-	BYTE $0x4d; BYTE $0x5d; BYTE $0x5c; BYTE $0x4e
-	BYTE $0x6b; BYTE $0x60; BYTE $0x4b; BYTE $0x61
-	BYTE $0xf0; BYTE $0xf1; BYTE $0xf2; BYTE $0xf3
-	BYTE $0xf4; BYTE $0xf5; BYTE $0xf6; BYTE $0xf7
-	BYTE $0xf8; BYTE $0xf9; BYTE $0x7a; BYTE $0x5e
-	BYTE $0x4c; BYTE $0x7e; BYTE $0x6e; BYTE $0x6f
-	BYTE $0x7c; BYTE $0xc1; BYTE $0xc2; BYTE $0xc3
-	BYTE $0xc4; BYTE $0xc5; BYTE $0xc6; BYTE $0xc7
-	BYTE $0xc8; BYTE $0xc9; BYTE $0xd1; BYTE $0xd2
-	BYTE $0xd3; BYTE $0xd4; BYTE $0xd5; BYTE $0xd6
-	BYTE $0xd7; BYTE $0xd8; BYTE $0xd9; BYTE $0xe2
-	BYTE $0xe3; BYTE $0xe4; BYTE $0xe5; BYTE $0xe6
-	BYTE $0xe7; BYTE $0xe8; BYTE $0xe9; BYTE $0xad
-	BYTE $0xe0; BYTE $0xbd; BYTE $0x5f; BYTE $0x6d
-	BYTE $0x79; BYTE $0x81; BYTE $0x82; BYTE $0x83
-	BYTE $0x84; BYTE $0x85; BYTE $0x86; BYTE $0x87
-	BYTE $0x88; BYTE $0x89; BYTE $0x91; BYTE $0x92
-	BYTE $0x93; BYTE $0x94; BYTE $0x95; BYTE $0x96
-	BYTE $0x97; BYTE $0x98; BYTE $0x99; BYTE $0xa2
-	BYTE $0xa3; BYTE $0xa4; BYTE $0xa5; BYTE $0xa6
-	BYTE $0xa7; BYTE $0xa8; BYTE $0xa9; BYTE $0xc0
-	BYTE $0x4f; BYTE $0xd0; BYTE $0xa1; BYTE $0x07
-	BYTE $0x20; BYTE $0x21; BYTE $0x22; BYTE $0x23
-	BYTE $0x24; BYTE $0x25; BYTE $0x06; BYTE $0x17
-	BYTE $0x28; BYTE $0x29; BYTE $0x2a; BYTE $0x2b
-	BYTE $0x2c; BYTE $0x09; BYTE $0x0a; BYTE $0x1b
-	BYTE $0x30; BYTE $0x31; BYTE $0x1a; BYTE $0x33
-	BYTE $0x34; BYTE $0x35; BYTE $0x36; BYTE $0x08
-	BYTE $0x38; BYTE $0x39; BYTE $0x3a; BYTE $0x3b
-	BYTE $0x04; BYTE $0x14; BYTE $0x3e; BYTE $0xff
-	BYTE $0x41; BYTE $0xaa; BYTE $0x4a; BYTE $0xb1
-	BYTE $0x9f; BYTE $0xb2; BYTE $0x6a; BYTE $0xb5
-	BYTE $0xbb; BYTE $0xb4; BYTE $0x9a; BYTE $0x8a
-	BYTE $0xb0; BYTE $0xca; BYTE $0xaf; BYTE $0xbc
-	BYTE $0x90; BYTE $0x8f; BYTE $0xea; BYTE $0xfa
-	BYTE $0xbe; BYTE $0xa0; BYTE $0xb6; BYTE $0xb3
-	BYTE $0x9d; BYTE $0xda; BYTE $0x9b; BYTE $0x8b
-	BYTE $0xb7; BYTE $0xb8; BYTE $0xb9; BYTE $0xab
-	BYTE $0x64; BYTE $0x65; BYTE $0x62; BYTE $0x66
-	BYTE $0x63; BYTE $0x67; BYTE $0x9e; BYTE $0x68
-	BYTE $0x74; BYTE $0x71; BYTE $0x72; BYTE $0x73
-	BYTE $0x78; BYTE $0x75; BYTE $0x76; BYTE $0x77
-	BYTE $0xac; BYTE $0x69; BYTE $0xed; BYTE $0xee
-	BYTE $0xeb; BYTE $0xef; BYTE $0xec; BYTE $0xbf
-	BYTE $0x80; BYTE $0xfd; BYTE $0xfe; BYTE $0xfb
-	BYTE $0xfc; BYTE $0xba; BYTE $0xae; BYTE $0x59
-	BYTE $0x44; BYTE $0x45; BYTE $0x42; BYTE $0x46
-	BYTE $0x43; BYTE $0x47; BYTE $0x9c; BYTE $0x48
-	BYTE $0x54; BYTE $0x51; BYTE $0x52; BYTE $0x53
-	BYTE $0x58; BYTE $0x55; BYTE $0x56; BYTE $0x57
-	BYTE $0x8c; BYTE $0x49; BYTE $0xcd; BYTE $0xce
-	BYTE $0xcb; BYTE $0xcf; BYTE $0xcc; BYTE $0xe1
-	BYTE $0x70; BYTE $0xdd; BYTE $0xde; BYTE $0xdb
-	BYTE $0xdc; BYTE $0x8d; BYTE $0x8e; BYTE $0xdf
-
-retry:
-	WORD $0xB9931022 // TROO 2,2,b'0001'
-	BVS  retry
-	RET
-
-//   func e2a(arr [] byte)
-//   code page conversion from  1047 to 819
-TEXT ·E2a(SB), NOSPLIT|NOFRAME, $0
-	MOVD arg_base+0(FP), R2                        // pointer to arry of characters
-	MOVD arg_len+8(FP), R3                         // count
-	XOR  R0, R0
-	XOR  R1, R1
-	BYTE $0xA7; BYTE $0x15; BYTE $0x00; BYTE $0x82 // BRAS 1,(2+(256/2))
-
-	// EBCDIC -> ASCII conversion table:
-	BYTE $0x00; BYTE $0x01; BYTE $0x02; BYTE $0x03
-	BYTE $0x9c; BYTE $0x09; BYTE $0x86; BYTE $0x7f
-	BYTE $0x97; BYTE $0x8d; BYTE $0x8e; BYTE $0x0b
-	BYTE $0x0c; BYTE $0x0d; BYTE $0x0e; BYTE $0x0f
-	BYTE $0x10; BYTE $0x11; BYTE $0x12; BYTE $0x13
-	BYTE $0x9d; BYTE $0x0a; BYTE $0x08; BYTE $0x87
-	BYTE $0x18; BYTE $0x19; BYTE $0x92; BYTE $0x8f
-	BYTE $0x1c; BYTE $0x1d; BYTE $0x1e; BYTE $0x1f
-	BYTE $0x80; BYTE $0x81; BYTE $0x82; BYTE $0x83
-	BYTE $0x84; BYTE $0x85; BYTE $0x17; BYTE $0x1b
-	BYTE $0x88; BYTE $0x89; BYTE $0x8a; BYTE $0x8b
-	BYTE $0x8c; BYTE $0x05; BYTE $0x06; BYTE $0x07
-	BYTE $0x90; BYTE $0x91; BYTE $0x16; BYTE $0x93
-	BYTE $0x94; BYTE $0x95; BYTE $0x96; BYTE $0x04
-	BYTE $0x98; BYTE $0x99; BYTE $0x9a; BYTE $0x9b
-	BYTE $0x14; BYTE $0x15; BYTE $0x9e; BYTE $0x1a
-	BYTE $0x20; BYTE $0xa0; BYTE $0xe2; BYTE $0xe4
-	BYTE $0xe0; BYTE $0xe1; BYTE $0xe3; BYTE $0xe5
-	BYTE $0xe7; BYTE $0xf1; BYTE $0xa2; BYTE $0x2e
-	BYTE $0x3c; BYTE $0x28; BYTE $0x2b; BYTE $0x7c
-	BYTE $0x26; BYTE $0xe9; BYTE $0xea; BYTE $0xeb
-	BYTE $0xe8; BYTE $0xed; BYTE $0xee; BYTE $0xef
-	BYTE $0xec; BYTE $0xdf; BYTE $0x21; BYTE $0x24
-	BYTE $0x2a; BYTE $0x29; BYTE $0x3b; BYTE $0x5e
-	BYTE $0x2d; BYTE $0x2f; BYTE $0xc2; BYTE $0xc4
-	BYTE $0xc0; BYTE $0xc1; BYTE $0xc3; BYTE $0xc5
-	BYTE $0xc7; BYTE $0xd1; BYTE $0xa6; BYTE $0x2c
-	BYTE $0x25; BYTE $0x5f; BYTE $0x3e; BYTE $0x3f
-	BYTE $0xf8; BYTE $0xc9; BYTE $0xca; BYTE $0xcb
-	BYTE $0xc8; BYTE $0xcd; BYTE $0xce; BYTE $0xcf
-	BYTE $0xcc; BYTE $0x60; BYTE $0x3a; BYTE $0x23
-	BYTE $0x40; BYTE $0x27; BYTE $0x3d; BYTE $0x22
-	BYTE $0xd8; BYTE $0x61; BYTE $0x62; BYTE $0x63
-	BYTE $0x64; BYTE $0x65; BYTE $0x66; BYTE $0x67
-	BYTE $0x68; BYTE $0x69; BYTE $0xab; BYTE $0xbb
-	BYTE $0xf0; BYTE $0xfd; BYTE $0xfe; BYTE $0xb1
-	BYTE $0xb0; BYTE $0x6a; BYTE $0x6b; BYTE $0x6c
-	BYTE $0x6d; BYTE $0x6e; BYTE $0x6f; BYTE $0x70
-	BYTE $0x71; BYTE $0x72; BYTE $0xaa; BYTE $0xba
-	BYTE $0xe6; BYTE $0xb8; BYTE $0xc6; BYTE $0xa4
-	BYTE $0xb5; BYTE $0x7e; BYTE $0x73; BYTE $0x74
-	BYTE $0x75; BYTE $0x76; BYTE $0x77; BYTE $0x78
-	BYTE $0x79; BYTE $0x7a; BYTE $0xa1; BYTE $0xbf
-	BYTE $0xd0; BYTE $0x5b; BYTE $0xde; BYTE $0xae
-	BYTE $0xac; BYTE $0xa3; BYTE $0xa5; BYTE $0xb7
-	BYTE $0xa9; BYTE $0xa7; BYTE $0xb6; BYTE $0xbc
-	BYTE $0xbd; BYTE $0xbe; BYTE $0xdd; BYTE $0xa8
-	BYTE $0xaf; BYTE $0x5d; BYTE $0xb4; BYTE $0xd7
-	BYTE $0x7b; BYTE $0x41; BYTE $0x42; BYTE $0x43
-	BYTE $0x44; BYTE $0x45; BYTE $0x46; BYTE $0x47
-	BYTE $0x48; BYTE $0x49; BYTE $0xad; BYTE $0xf4
-	BYTE $0xf6; BYTE $0xf2; BYTE $0xf3; BYTE $0xf5
-	BYTE $0x7d; BYTE $0x4a; BYTE $0x4b; BYTE $0x4c
-	BYTE $0x4d; BYTE $0x4e; BYTE $0x4f; BYTE $0x50
-	BYTE $0x51; BYTE $0x52; BYTE $0xb9; BYTE $0xfb
-	BYTE $0xfc; BYTE $0xf9; BYTE $0xfa; BYTE $0xff
-	BYTE $0x5c; BYTE $0xf7; BYTE $0x53; BYTE $0x54
-	BYTE $0x55; BYTE $0x56; BYTE $0x57; BYTE $0x58
-	BYTE $0x59; BYTE $0x5a; BYTE $0xb2; BYTE $0xd4
-	BYTE $0xd6; BYTE $0xd2; BYTE $0xd3; BYTE $0xd5
-	BYTE $0x30; BYTE $0x31; BYTE $0x32; BYTE $0x33
-	BYTE $0x34; BYTE $0x35; BYTE $0x36; BYTE $0x37
-	BYTE $0x38; BYTE $0x39; BYTE $0xb3; BYTE $0xdb
-	BYTE $0xdc; BYTE $0xd9; BYTE $0xda; BYTE $0x9f
-
-retry:
-	WORD $0xB9931022 // TROO 2,2,b'0001'
-	BVS  retry
-	RET
diff --git a/vendor/golang.org/x/sys/unix/cap_freebsd.go b/vendor/golang.org/x/sys/unix/cap_freebsd.go
index a086578..0b7c6ad 100644
--- a/vendor/golang.org/x/sys/unix/cap_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/cap_freebsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build freebsd
+// +build freebsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go
index 6fb7cb7..394a396 100644
--- a/vendor/golang.org/x/sys/unix/constants.go
+++ b/vendor/golang.org/x/sys/unix/constants.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/dev_aix_ppc.go b/vendor/golang.org/x/sys/unix/dev_aix_ppc.go
index d785134..65a9985 100644
--- a/vendor/golang.org/x/sys/unix/dev_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/dev_aix_ppc.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix && ppc
+// +build aix,ppc
 
 // Functions to access/create device major and minor numbers matching the
 // encoding used by AIX.
diff --git a/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go b/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go
index 623a5e6..8fc08ad 100644
--- a/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix && ppc64
+// +build aix,ppc64
 
 // Functions to access/create device major and minor numbers matching the
 // encoding used AIX.
diff --git a/vendor/golang.org/x/sys/unix/dev_zos.go b/vendor/golang.org/x/sys/unix/dev_zos.go
index bb6a64f..a388e59 100644
--- a/vendor/golang.org/x/sys/unix/dev_zos.go
+++ b/vendor/golang.org/x/sys/unix/dev_zos.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 // Functions to access/create device major and minor numbers matching the
 // encoding used by z/OS.
diff --git a/vendor/golang.org/x/sys/unix/dirent.go b/vendor/golang.org/x/sys/unix/dirent.go
index 1ebf117..e74e5ea 100644
--- a/vendor/golang.org/x/sys/unix/dirent.go
+++ b/vendor/golang.org/x/sys/unix/dirent.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/endian_big.go b/vendor/golang.org/x/sys/unix/endian_big.go
index 1095fd3..a520265 100644
--- a/vendor/golang.org/x/sys/unix/endian_big.go
+++ b/vendor/golang.org/x/sys/unix/endian_big.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 //
 //go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64
+// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go
index b9f0e27..4362f47 100644
--- a/vendor/golang.org/x/sys/unix/endian_little.go
+++ b/vendor/golang.org/x/sys/unix/endian_little.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh
+//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh
+// +build 386 amd64 amd64p32 alpha arm arm64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go
index a96da71..29ccc4d 100644
--- a/vendor/golang.org/x/sys/unix/env_unix.go
+++ b/vendor/golang.org/x/sys/unix/env_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 // Unix environment variables.
 
diff --git a/vendor/golang.org/x/sys/unix/epoll_zos.go b/vendor/golang.org/x/sys/unix/epoll_zos.go
new file mode 100644
index 0000000..cedaf7e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/epoll_zos.go
@@ -0,0 +1,221 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build zos && s390x
+// +build zos,s390x
+
+package unix
+
+import (
+	"sync"
+)
+
+// This file simulates epoll on z/OS using poll.
+
+// Analogous to epoll_event on Linux.
+// TODO(neeilan): Pad is because the Linux kernel expects a 96-bit struct. We never pass this to the kernel; remove?
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	EPOLLERR      = 0x8
+	EPOLLHUP      = 0x10
+	EPOLLIN       = 0x1
+	EPOLLMSG      = 0x400
+	EPOLLOUT      = 0x4
+	EPOLLPRI      = 0x2
+	EPOLLRDBAND   = 0x80
+	EPOLLRDNORM   = 0x40
+	EPOLLWRBAND   = 0x200
+	EPOLLWRNORM   = 0x100
+	EPOLL_CTL_ADD = 0x1
+	EPOLL_CTL_DEL = 0x2
+	EPOLL_CTL_MOD = 0x3
+	// The following constants are part of the epoll API, but represent
+	// currently unsupported functionality on z/OS.
+	// EPOLL_CLOEXEC  = 0x80000
+	// EPOLLET        = 0x80000000
+	// EPOLLONESHOT   = 0x40000000
+	// EPOLLRDHUP     = 0x2000     // Typically used with edge-triggered notis
+	// EPOLLEXCLUSIVE = 0x10000000 // Exclusive wake-up mode
+	// EPOLLWAKEUP    = 0x20000000 // Relies on Linux's BLOCK_SUSPEND capability
+)
+
+// TODO(neeilan): We can eliminate these epToPoll / pToEpoll calls by using identical mask values for POLL/EPOLL
+// constants where possible The lower 16 bits of epoll events (uint32) can fit any system poll event (int16).
+
+// epToPollEvt converts epoll event field to poll equivalent.
+// In epoll, Events is a 32-bit field, while poll uses 16 bits.
+func epToPollEvt(events uint32) int16 {
+	var ep2p = map[uint32]int16{
+		EPOLLIN:  POLLIN,
+		EPOLLOUT: POLLOUT,
+		EPOLLHUP: POLLHUP,
+		EPOLLPRI: POLLPRI,
+		EPOLLERR: POLLERR,
+	}
+
+	var pollEvts int16 = 0
+	for epEvt, pEvt := range ep2p {
+		if (events & epEvt) != 0 {
+			pollEvts |= pEvt
+		}
+	}
+
+	return pollEvts
+}
+
+// pToEpollEvt converts 16 bit poll event bitfields to 32-bit epoll event fields.
+func pToEpollEvt(revents int16) uint32 {
+	var p2ep = map[int16]uint32{
+		POLLIN:  EPOLLIN,
+		POLLOUT: EPOLLOUT,
+		POLLHUP: EPOLLHUP,
+		POLLPRI: EPOLLPRI,
+		POLLERR: EPOLLERR,
+	}
+
+	var epollEvts uint32 = 0
+	for pEvt, epEvt := range p2ep {
+		if (revents & pEvt) != 0 {
+			epollEvts |= epEvt
+		}
+	}
+
+	return epollEvts
+}
+
+// Per-process epoll implementation.
+type epollImpl struct {
+	mu       sync.Mutex
+	epfd2ep  map[int]*eventPoll
+	nextEpfd int
+}
+
+// eventPoll holds a set of file descriptors being watched by the process. A process can have multiple epoll instances.
+// On Linux, this is an in-kernel data structure accessed through a fd.
+type eventPoll struct {
+	mu  sync.Mutex
+	fds map[int]*EpollEvent
+}
+
+// epoll impl for this process.
+var impl epollImpl = epollImpl{
+	epfd2ep:  make(map[int]*eventPoll),
+	nextEpfd: 0,
+}
+
+func (e *epollImpl) epollcreate(size int) (epfd int, err error) {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+	epfd = e.nextEpfd
+	e.nextEpfd++
+
+	e.epfd2ep[epfd] = &eventPoll{
+		fds: make(map[int]*EpollEvent),
+	}
+	return epfd, nil
+}
+
+func (e *epollImpl) epollcreate1(flag int) (fd int, err error) {
+	return e.epollcreate(4)
+}
+
+func (e *epollImpl) epollctl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+
+	ep, ok := e.epfd2ep[epfd]
+	if !ok {
+
+		return EBADF
+	}
+
+	switch op {
+	case EPOLL_CTL_ADD:
+		// TODO(neeilan): When we make epfds and fds disjoint, detect epoll
+		// loops here (instances watching each other) and return ELOOP.
+		if _, ok := ep.fds[fd]; ok {
+			return EEXIST
+		}
+		ep.fds[fd] = event
+	case EPOLL_CTL_MOD:
+		if _, ok := ep.fds[fd]; !ok {
+			return ENOENT
+		}
+		ep.fds[fd] = event
+	case EPOLL_CTL_DEL:
+		if _, ok := ep.fds[fd]; !ok {
+			return ENOENT
+		}
+		delete(ep.fds, fd)
+
+	}
+	return nil
+}
+
+// Must be called while holding ep.mu
+func (ep *eventPoll) getFds() []int {
+	fds := make([]int, len(ep.fds))
+	for fd := range ep.fds {
+		fds = append(fds, fd)
+	}
+	return fds
+}
+
+func (e *epollImpl) epollwait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	e.mu.Lock() // in [rare] case of concurrent epollcreate + epollwait
+	ep, ok := e.epfd2ep[epfd]
+
+	if !ok {
+		e.mu.Unlock()
+		return 0, EBADF
+	}
+
+	pollfds := make([]PollFd, 4)
+	for fd, epollevt := range ep.fds {
+		pollfds = append(pollfds, PollFd{Fd: int32(fd), Events: epToPollEvt(epollevt.Events)})
+	}
+	e.mu.Unlock()
+
+	n, err = Poll(pollfds, msec)
+	if err != nil {
+		return n, err
+	}
+
+	i := 0
+	for _, pFd := range pollfds {
+		if pFd.Revents != 0 {
+			events[i] = EpollEvent{Fd: pFd.Fd, Events: pToEpollEvt(pFd.Revents)}
+			i++
+		}
+
+		if i == n {
+			break
+		}
+	}
+
+	return n, nil
+}
+
+func EpollCreate(size int) (fd int, err error) {
+	return impl.epollcreate(size)
+}
+
+func EpollCreate1(flag int) (fd int, err error) {
+	return impl.epollcreate1(flag)
+}
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	return impl.epollctl(epfd, op, fd, event)
+}
+
+// Because EpollWait mutates events, the caller is expected to coordinate
+// concurrent access if calling with the same epfd from multiple goroutines.
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	return impl.epollwait(epfd, events, msec)
+}
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_386.go b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
new file mode 100644
index 0000000..761db66
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
@@ -0,0 +1,233 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	DLT_HHDLC                         = 0x79
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IP_FAITH                          = 0x16
+	IP_MAX_SOURCE_FILTER              = 0x400
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RT_CACHING_CONTEXT                = 0x1
+	RT_NORTREF                        = 0x2
+	SIOCADDRT                         = 0x8030720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8030720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
new file mode 100644
index 0000000..070f44b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
@@ -0,0 +1,233 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	DLT_HHDLC                         = 0x79
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IP_FAITH                          = 0x16
+	IP_MAX_SOURCE_FILTER              = 0x400
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RT_CACHING_CONTEXT                = 0x1
+	RT_NORTREF                        = 0x2
+	SIOCADDRT                         = 0x8040720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8040720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
new file mode 100644
index 0000000..856dca3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
@@ -0,0 +1,226 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+const (
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+
+	// missing constants on FreeBSD-11.1-RELEASE, copied from old values in ztypes_freebsd_arm.go
+	IFF_SMART       = 0x20
+	IFT_FAITH       = 0xf2
+	IFT_IPXIP       = 0xf9
+	IPPROTO_MAXID   = 0x34
+	IPV6_FAITH      = 0x1d
+	IP_FAITH        = 0x16
+	MAP_NORESERVE   = 0x40
+	MAP_RENAME      = 0x20
+	NET_RT_MAXID    = 0x6
+	RTF_PRCLONING   = 0x10000
+	RTM_OLDADD      = 0x9
+	RTM_OLDDEL      = 0xa
+	SIOCADDRT       = 0x8030720a
+	SIOCALIFADDR    = 0x8118691b
+	SIOCDELRT       = 0x8030720b
+	SIOCDLIFADDR    = 0x8118691d
+	SIOCGLIFADDR    = 0xc118691c
+	SIOCGLIFPHYADDR = 0xc118694b
+	SIOCSLIFPHYADDR = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go
new file mode 100644
index 0000000..946dcf3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go
@@ -0,0 +1,17 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	DLT_HHDLC            = 0x79
+	IPV6_MIN_MEMBERSHIPS = 0x1f
+	IP_MAX_SOURCE_FILTER = 0x400
+	IP_MIN_MEMBERSHIPS   = 0x1f
+	RT_CACHING_CONTEXT   = 0x1
+	RT_NORTREF           = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/fcntl.go b/vendor/golang.org/x/sys/unix/fcntl.go
index 6200876..e9b9912 100644
--- a/vendor/golang.org/x/sys/unix/fcntl.go
+++ b/vendor/golang.org/x/sys/unix/fcntl.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build dragonfly || freebsd || linux || netbsd
+//go:build dragonfly || freebsd || linux || netbsd || openbsd
+// +build dragonfly freebsd linux netbsd openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go b/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
index 13b4acd..29d4480 100644
--- a/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
+++ b/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build (linux && 386) || (linux && arm) || (linux && mips) || (linux && mipsle) || (linux && ppc)
+// +build linux,386 linux,arm linux,mips linux,mipsle linux,ppc
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/fdset.go b/vendor/golang.org/x/sys/unix/fdset.go
index 9e83d18..a8068f9 100644
--- a/vendor/golang.org/x/sys/unix/fdset.go
+++ b/vendor/golang.org/x/sys/unix/fdset.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/fstatfs_zos.go b/vendor/golang.org/x/sys/unix/fstatfs_zos.go
new file mode 100644
index 0000000..e377cc9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/fstatfs_zos.go
@@ -0,0 +1,164 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build zos && s390x
+// +build zos,s390x
+
+package unix
+
+import (
+	"unsafe"
+)
+
+// This file simulates fstatfs on z/OS using fstatvfs and w_getmntent.
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	var stat_v Statvfs_t
+	err = Fstatvfs(fd, &stat_v)
+	if err == nil {
+		// populate stat
+		stat.Type = 0
+		stat.Bsize = stat_v.Bsize
+		stat.Blocks = stat_v.Blocks
+		stat.Bfree = stat_v.Bfree
+		stat.Bavail = stat_v.Bavail
+		stat.Files = stat_v.Files
+		stat.Ffree = stat_v.Ffree
+		stat.Fsid = stat_v.Fsid
+		stat.Namelen = stat_v.Namemax
+		stat.Frsize = stat_v.Frsize
+		stat.Flags = stat_v.Flag
+		for passn := 0; passn < 5; passn++ {
+			switch passn {
+			case 0:
+				err = tryGetmntent64(stat)
+				break
+			case 1:
+				err = tryGetmntent128(stat)
+				break
+			case 2:
+				err = tryGetmntent256(stat)
+				break
+			case 3:
+				err = tryGetmntent512(stat)
+				break
+			case 4:
+				err = tryGetmntent1024(stat)
+				break
+			default:
+				break
+			}
+			//proceed to return if: err is nil (found), err is nonnil but not ERANGE (another error occurred)
+			if err == nil || err != nil && err != ERANGE {
+				break
+			}
+		}
+	}
+	return err
+}
+
+func tryGetmntent64(stat *Statfs_t) (err error) {
+	var mnt_ent_buffer struct {
+		header       W_Mnth
+		filesys_info [64]W_Mntent
+	}
+	var buffer_size int = int(unsafe.Sizeof(mnt_ent_buffer))
+	fs_count, err := W_Getmntent((*byte)(unsafe.Pointer(&mnt_ent_buffer)), buffer_size)
+	if err != nil {
+		return err
+	}
+	err = ERANGE //return ERANGE if no match is found in this batch
+	for i := 0; i < fs_count; i++ {
+		if stat.Fsid == uint64(mnt_ent_buffer.filesys_info[i].Dev) {
+			stat.Type = uint32(mnt_ent_buffer.filesys_info[i].Fstname[0])
+			err = nil
+			break
+		}
+	}
+	return err
+}
+
+func tryGetmntent128(stat *Statfs_t) (err error) {
+	var mnt_ent_buffer struct {
+		header       W_Mnth
+		filesys_info [128]W_Mntent
+	}
+	var buffer_size int = int(unsafe.Sizeof(mnt_ent_buffer))
+	fs_count, err := W_Getmntent((*byte)(unsafe.Pointer(&mnt_ent_buffer)), buffer_size)
+	if err != nil {
+		return err
+	}
+	err = ERANGE //return ERANGE if no match is found in this batch
+	for i := 0; i < fs_count; i++ {
+		if stat.Fsid == uint64(mnt_ent_buffer.filesys_info[i].Dev) {
+			stat.Type = uint32(mnt_ent_buffer.filesys_info[i].Fstname[0])
+			err = nil
+			break
+		}
+	}
+	return err
+}
+
+func tryGetmntent256(stat *Statfs_t) (err error) {
+	var mnt_ent_buffer struct {
+		header       W_Mnth
+		filesys_info [256]W_Mntent
+	}
+	var buffer_size int = int(unsafe.Sizeof(mnt_ent_buffer))
+	fs_count, err := W_Getmntent((*byte)(unsafe.Pointer(&mnt_ent_buffer)), buffer_size)
+	if err != nil {
+		return err
+	}
+	err = ERANGE //return ERANGE if no match is found in this batch
+	for i := 0; i < fs_count; i++ {
+		if stat.Fsid == uint64(mnt_ent_buffer.filesys_info[i].Dev) {
+			stat.Type = uint32(mnt_ent_buffer.filesys_info[i].Fstname[0])
+			err = nil
+			break
+		}
+	}
+	return err
+}
+
+func tryGetmntent512(stat *Statfs_t) (err error) {
+	var mnt_ent_buffer struct {
+		header       W_Mnth
+		filesys_info [512]W_Mntent
+	}
+	var buffer_size int = int(unsafe.Sizeof(mnt_ent_buffer))
+	fs_count, err := W_Getmntent((*byte)(unsafe.Pointer(&mnt_ent_buffer)), buffer_size)
+	if err != nil {
+		return err
+	}
+	err = ERANGE //return ERANGE if no match is found in this batch
+	for i := 0; i < fs_count; i++ {
+		if stat.Fsid == uint64(mnt_ent_buffer.filesys_info[i].Dev) {
+			stat.Type = uint32(mnt_ent_buffer.filesys_info[i].Fstname[0])
+			err = nil
+			break
+		}
+	}
+	return err
+}
+
+func tryGetmntent1024(stat *Statfs_t) (err error) {
+	var mnt_ent_buffer struct {
+		header       W_Mnth
+		filesys_info [1024]W_Mntent
+	}
+	var buffer_size int = int(unsafe.Sizeof(mnt_ent_buffer))
+	fs_count, err := W_Getmntent((*byte)(unsafe.Pointer(&mnt_ent_buffer)), buffer_size)
+	if err != nil {
+		return err
+	}
+	err = ERANGE //return ERANGE if no match is found in this batch
+	for i := 0; i < fs_count; i++ {
+		if stat.Fsid == uint64(mnt_ent_buffer.filesys_info[i].Dev) {
+			stat.Type = uint32(mnt_ent_buffer.filesys_info[i].Fstname[0])
+			err = nil
+			break
+		}
+	}
+	return err
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
index aca5721..0dee232 100644
--- a/vendor/golang.org/x/sys/unix/gccgo.go
+++ b/vendor/golang.org/x/sys/unix/gccgo.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build gccgo && !aix && !hurd
+//go:build gccgo && !aix
+// +build gccgo,!aix
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
index d468b7b..2cb1fef 100644
--- a/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build gccgo && !aix && !hurd
+// +build gccgo
+// +build !aix
 
 #include <errno.h>
 #include <stdint.h>
diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
index 972d61b..e60e49a 100644
--- a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gccgo && linux && amd64
+// +build gccgo,linux,amd64
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ifreq_linux.go b/vendor/golang.org/x/sys/unix/ifreq_linux.go
index 848840a..934af31 100644
--- a/vendor/golang.org/x/sys/unix/ifreq_linux.go
+++ b/vendor/golang.org/x/sys/unix/ifreq_linux.go
@@ -3,10 +3,12 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux
+// +build linux
 
 package unix
 
 import (
+	"bytes"
 	"unsafe"
 )
 
@@ -43,7 +45,13 @@ func NewIfreq(name string) (*Ifreq, error) {
 
 // Name returns the interface name associated with the Ifreq.
 func (ifr *Ifreq) Name() string {
-	return ByteSliceToString(ifr.raw.Ifrn[:])
+	// BytePtrToString requires a NULL terminator or the program may crash. If
+	// one is not present, just return the empty string.
+	if !bytes.Contains(ifr.raw.Ifrn[:], []byte{0x00}) {
+		return ""
+	}
+
+	return BytePtrToString(&ifr.raw.Ifrn[0])
 }
 
 // According to netdevice(7), only AF_INET addresses are returned for numerous
diff --git a/vendor/golang.org/x/sys/unix/ioctl_unsigned.go b/vendor/golang.org/x/sys/unix/ioctl.go
similarity index 77%
rename from vendor/golang.org/x/sys/unix/ioctl_unsigned.go
rename to vendor/golang.org/x/sys/unix/ioctl.go
index 20f470b..6c7ad05 100644
--- a/vendor/golang.org/x/sys/unix/ioctl_unsigned.go
+++ b/vendor/golang.org/x/sys/unix/ioctl.go
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin || dragonfly || freebsd || hurd || linux || netbsd || openbsd
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package unix
 
 import (
+	"runtime"
 	"unsafe"
 )
 
@@ -25,7 +27,7 @@ func IoctlSetInt(fd int, req uint, value int) error {
 // passing the integer value directly.
 func IoctlSetPointerInt(fd int, req uint, value int) error {
 	v := int32(value)
-	return ioctlPtr(fd, req, unsafe.Pointer(&v))
+	return ioctl(fd, req, uintptr(unsafe.Pointer(&v)))
 }
 
 // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
@@ -34,7 +36,9 @@ func IoctlSetPointerInt(fd int, req uint, value int) error {
 func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 	// TODO: if we get the chance, remove the req parameter and
 	// hardcode TIOCSWINSZ.
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
+	return err
 }
 
 // IoctlSetTermios performs an ioctl on fd with a *Termios.
@@ -42,7 +46,9 @@ func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 // The req value will usually be TCSETA or TIOCSETA.
 func IoctlSetTermios(fd int, req uint, value *Termios) error {
 	// TODO: if we get the chance, remove the req parameter.
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
+	return err
 }
 
 // IoctlGetInt performs an ioctl operation which gets an integer value
@@ -52,18 +58,18 @@ func IoctlSetTermios(fd int, req uint, value *Termios) error {
 // for those, IoctlRetInt should be used instead of this function.
 func IoctlGetInt(fd int, req uint) (int, error) {
 	var value int
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return value, err
 }
 
 func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 	var value Winsize
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
 func IoctlGetTermios(fd int, req uint) (*Termios, error) {
 	var value Termios
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
diff --git a/vendor/golang.org/x/sys/unix/ioctl_linux.go b/vendor/golang.org/x/sys/unix/ioctl_linux.go
index 7ca4fa1..1dadead 100644
--- a/vendor/golang.org/x/sys/unix/ioctl_linux.go
+++ b/vendor/golang.org/x/sys/unix/ioctl_linux.go
@@ -4,7 +4,9 @@
 
 package unix
 
-import "unsafe"
+import (
+	"unsafe"
+)
 
 // IoctlRetInt performs an ioctl operation specified by req on a device
 // associated with opened file descriptor fd, and returns a non-negative
@@ -58,102 +60,6 @@ func IoctlGetEthtoolDrvinfo(fd int, ifname string) (*EthtoolDrvinfo, error) {
 	return &value, err
 }
 
-// IoctlGetEthtoolTsInfo fetches ethtool timestamping and PHC
-// association for the network device specified by ifname.
-func IoctlGetEthtoolTsInfo(fd int, ifname string) (*EthtoolTsInfo, error) {
-	ifr, err := NewIfreq(ifname)
-	if err != nil {
-		return nil, err
-	}
-
-	value := EthtoolTsInfo{Cmd: ETHTOOL_GET_TS_INFO}
-	ifrd := ifr.withData(unsafe.Pointer(&value))
-
-	err = ioctlIfreqData(fd, SIOCETHTOOL, &ifrd)
-	return &value, err
-}
-
-// IoctlGetHwTstamp retrieves the hardware timestamping configuration
-// for the network device specified by ifname.
-func IoctlGetHwTstamp(fd int, ifname string) (*HwTstampConfig, error) {
-	ifr, err := NewIfreq(ifname)
-	if err != nil {
-		return nil, err
-	}
-
-	value := HwTstampConfig{}
-	ifrd := ifr.withData(unsafe.Pointer(&value))
-
-	err = ioctlIfreqData(fd, SIOCGHWTSTAMP, &ifrd)
-	return &value, err
-}
-
-// IoctlSetHwTstamp updates the hardware timestamping configuration for
-// the network device specified by ifname.
-func IoctlSetHwTstamp(fd int, ifname string, cfg *HwTstampConfig) error {
-	ifr, err := NewIfreq(ifname)
-	if err != nil {
-		return err
-	}
-	ifrd := ifr.withData(unsafe.Pointer(cfg))
-	return ioctlIfreqData(fd, SIOCSHWTSTAMP, &ifrd)
-}
-
-// FdToClockID derives the clock ID from the file descriptor number
-// - see clock_gettime(3), FD_TO_CLOCKID macros. The resulting ID is
-// suitable for system calls like ClockGettime.
-func FdToClockID(fd int) int32 { return int32((int(^fd) << 3) | 3) }
-
-// IoctlPtpClockGetcaps returns the description of a given PTP device.
-func IoctlPtpClockGetcaps(fd int) (*PtpClockCaps, error) {
-	var value PtpClockCaps
-	err := ioctlPtr(fd, PTP_CLOCK_GETCAPS2, unsafe.Pointer(&value))
-	return &value, err
-}
-
-// IoctlPtpSysOffsetPrecise returns a description of the clock
-// offset compared to the system clock.
-func IoctlPtpSysOffsetPrecise(fd int) (*PtpSysOffsetPrecise, error) {
-	var value PtpSysOffsetPrecise
-	err := ioctlPtr(fd, PTP_SYS_OFFSET_PRECISE2, unsafe.Pointer(&value))
-	return &value, err
-}
-
-// IoctlPtpSysOffsetExtended returns an extended description of the
-// clock offset compared to the system clock. The samples parameter
-// specifies the desired number of measurements.
-func IoctlPtpSysOffsetExtended(fd int, samples uint) (*PtpSysOffsetExtended, error) {
-	value := PtpSysOffsetExtended{Samples: uint32(samples)}
-	err := ioctlPtr(fd, PTP_SYS_OFFSET_EXTENDED2, unsafe.Pointer(&value))
-	return &value, err
-}
-
-// IoctlPtpPinGetfunc returns the configuration of the specified
-// I/O pin on given PTP device.
-func IoctlPtpPinGetfunc(fd int, index uint) (*PtpPinDesc, error) {
-	value := PtpPinDesc{Index: uint32(index)}
-	err := ioctlPtr(fd, PTP_PIN_GETFUNC2, unsafe.Pointer(&value))
-	return &value, err
-}
-
-// IoctlPtpPinSetfunc updates configuration of the specified PTP
-// I/O pin.
-func IoctlPtpPinSetfunc(fd int, pd *PtpPinDesc) error {
-	return ioctlPtr(fd, PTP_PIN_SETFUNC2, unsafe.Pointer(pd))
-}
-
-// IoctlPtpPeroutRequest configures the periodic output mode of the
-// PTP I/O pins.
-func IoctlPtpPeroutRequest(fd int, r *PtpPeroutRequest) error {
-	return ioctlPtr(fd, PTP_PEROUT_REQUEST2, unsafe.Pointer(r))
-}
-
-// IoctlPtpExttsRequest configures the external timestamping mode
-// of the PTP I/O pins.
-func IoctlPtpExttsRequest(fd int, r *PtpExttsRequest) error {
-	return ioctlPtr(fd, PTP_EXTTS_REQUEST2, unsafe.Pointer(r))
-}
-
 // IoctlGetWatchdogInfo fetches information about a watchdog device from the
 // Linux watchdog API. For more information, see:
 // https://www.kernel.org/doc/html/latest/watchdog/watchdog-api.html.
@@ -288,47 +194,3 @@ func ioctlIfreqData(fd int, req uint, value *ifreqData) error {
 	// identical so pass *IfreqData directly.
 	return ioctlPtr(fd, req, unsafe.Pointer(value))
 }
-
-// IoctlKCMClone attaches a new file descriptor to a multiplexor by cloning an
-// existing KCM socket, returning a structure containing the file descriptor of
-// the new socket.
-func IoctlKCMClone(fd int) (*KCMClone, error) {
-	var info KCMClone
-	if err := ioctlPtr(fd, SIOCKCMCLONE, unsafe.Pointer(&info)); err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// IoctlKCMAttach attaches a TCP socket and associated BPF program file
-// descriptor to a multiplexor.
-func IoctlKCMAttach(fd int, info KCMAttach) error {
-	return ioctlPtr(fd, SIOCKCMATTACH, unsafe.Pointer(&info))
-}
-
-// IoctlKCMUnattach unattaches a TCP socket file descriptor from a multiplexor.
-func IoctlKCMUnattach(fd int, info KCMUnattach) error {
-	return ioctlPtr(fd, SIOCKCMUNATTACH, unsafe.Pointer(&info))
-}
-
-// IoctlLoopGetStatus64 gets the status of the loop device associated with the
-// file descriptor fd using the LOOP_GET_STATUS64 operation.
-func IoctlLoopGetStatus64(fd int) (*LoopInfo64, error) {
-	var value LoopInfo64
-	if err := ioctlPtr(fd, LOOP_GET_STATUS64, unsafe.Pointer(&value)); err != nil {
-		return nil, err
-	}
-	return &value, nil
-}
-
-// IoctlLoopSetStatus64 sets the status of the loop device associated with the
-// file descriptor fd using the LOOP_SET_STATUS64 operation.
-func IoctlLoopSetStatus64(fd int, value *LoopInfo64) error {
-	return ioctlPtr(fd, LOOP_SET_STATUS64, unsafe.Pointer(value))
-}
-
-// IoctlLoopConfigure configures all loop device parameters in a single step
-func IoctlLoopConfigure(fd int, value *LoopConfig) error {
-	return ioctlPtr(fd, LOOP_CONFIGURE, unsafe.Pointer(value))
-}
diff --git a/vendor/golang.org/x/sys/unix/ioctl_signed.go b/vendor/golang.org/x/sys/unix/ioctl_signed.go
deleted file mode 100644
index 5b0759b..0000000
--- a/vendor/golang.org/x/sys/unix/ioctl_signed.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build aix || solaris
-
-package unix
-
-import (
-	"unsafe"
-)
-
-// ioctl itself should not be exposed directly, but additional get/set
-// functions for specific types are permissible.
-
-// IoctlSetInt performs an ioctl operation which sets an integer value
-// on fd, using the specified request number.
-func IoctlSetInt(fd int, req int, value int) error {
-	return ioctl(fd, req, uintptr(value))
-}
-
-// IoctlSetPointerInt performs an ioctl operation which sets an
-// integer value on fd, using the specified request number. The ioctl
-// argument is called with a pointer to the integer value, rather than
-// passing the integer value directly.
-func IoctlSetPointerInt(fd int, req int, value int) error {
-	v := int32(value)
-	return ioctlPtr(fd, req, unsafe.Pointer(&v))
-}
-
-// IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
-//
-// To change fd's window size, the req argument should be TIOCSWINSZ.
-func IoctlSetWinsize(fd int, req int, value *Winsize) error {
-	// TODO: if we get the chance, remove the req parameter and
-	// hardcode TIOCSWINSZ.
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
-}
-
-// IoctlSetTermios performs an ioctl on fd with a *Termios.
-//
-// The req value will usually be TCSETA or TIOCSETA.
-func IoctlSetTermios(fd int, req int, value *Termios) error {
-	// TODO: if we get the chance, remove the req parameter.
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
-}
-
-// IoctlGetInt performs an ioctl operation which gets an integer value
-// from fd, using the specified request number.
-//
-// A few ioctl requests use the return value as an output parameter;
-// for those, IoctlRetInt should be used instead of this function.
-func IoctlGetInt(fd int, req int) (int, error) {
-	var value int
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
-	return value, err
-}
-
-func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
-	var value Winsize
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
-	return &value, err
-}
-
-func IoctlGetTermios(fd int, req int) (*Termios, error) {
-	var value Termios
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
-	return &value, err
-}
diff --git a/vendor/golang.org/x/sys/unix/ioctl_zos.go b/vendor/golang.org/x/sys/unix/ioctl_zos.go
index c8b2a75..5384e7d 100644
--- a/vendor/golang.org/x/sys/unix/ioctl_zos.go
+++ b/vendor/golang.org/x/sys/unix/ioctl_zos.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 package unix
 
@@ -16,23 +17,25 @@ import (
 
 // IoctlSetInt performs an ioctl operation which sets an integer value
 // on fd, using the specified request number.
-func IoctlSetInt(fd int, req int, value int) error {
+func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
 // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
 //
 // To change fd's window size, the req argument should be TIOCSWINSZ.
-func IoctlSetWinsize(fd int, req int, value *Winsize) error {
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 	// TODO: if we get the chance, remove the req parameter and
 	// hardcode TIOCSWINSZ.
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
+	return err
 }
 
 // IoctlSetTermios performs an ioctl on fd with a *Termios.
 //
 // The req value is expected to be TCSETS, TCSETSW, or TCSETSF
-func IoctlSetTermios(fd int, req int, value *Termios) error {
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
 	if (req != TCSETS) && (req != TCSETSW) && (req != TCSETSF) {
 		return ENOSYS
 	}
@@ -46,22 +49,22 @@ func IoctlSetTermios(fd int, req int, value *Termios) error {
 //
 // A few ioctl requests use the return value as an output parameter;
 // for those, IoctlRetInt should be used instead of this function.
-func IoctlGetInt(fd int, req int) (int, error) {
+func IoctlGetInt(fd int, req uint) (int, error) {
 	var value int
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return value, err
 }
 
-func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 	var value Winsize
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
 // IoctlGetTermios performs an ioctl on fd with a *Termios.
 //
 // The req value is expected to be TCGETS
-func IoctlGetTermios(fd int, req int) (*Termios, error) {
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
 	var value Termios
 	if req != TCGETS {
 		return &value, ENOSYS
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
index e6f31d3..396aadf 100644
--- a/vendor/golang.org/x/sys/unix/mkall.sh
+++ b/vendor/golang.org/x/sys/unix/mkall.sh
@@ -50,7 +50,7 @@ if [[ "$GOOS" = "linux" ]]; then
 	# Use the Docker-based build system
 	# Files generated through docker (use $cmd so you can Ctl-C the build or run)
 	$cmd docker build --tag generate:$GOOS $GOOS
-	$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS
+	$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")" && /bin/pwd):/build generate:$GOOS
 	exit
 fi
 
@@ -73,12 +73,12 @@ aix_ppc64)
 darwin_amd64)
 	mkerrors="$mkerrors -m64"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	mkasm="go run mkasm.go"
+	mkasm="go run mkasm_darwin.go"
 	;;
 darwin_arm64)
 	mkerrors="$mkerrors -m64"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	mkasm="go run mkasm.go"
+	mkasm="go run mkasm_darwin.go"
 	;;
 dragonfly_amd64)
 	mkerrors="$mkerrors -m64"
@@ -89,30 +89,25 @@ dragonfly_amd64)
 freebsd_386)
 	mkerrors="$mkerrors -m32"
 	mksyscall="go run mksyscall.go -l32"
-	mksysnum="go run mksysnum.go 'https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12'"
+	mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 freebsd_amd64)
 	mkerrors="$mkerrors -m64"
-	mksysnum="go run mksysnum.go 'https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12'"
+	mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 freebsd_arm)
 	mkerrors="$mkerrors"
 	mksyscall="go run mksyscall.go -l32 -arm"
-	mksysnum="go run mksysnum.go 'https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12'"
+	mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
 	# Let the type of C char be signed for making the bare syscall
 	# API consistent across platforms.
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
 	;;
 freebsd_arm64)
 	mkerrors="$mkerrors -m64"
-	mksysnum="go run mksysnum.go 'https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12'"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-freebsd_riscv64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="go run mksysnum.go 'https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12'"
+	mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
 	;;
 netbsd_386)
@@ -142,60 +137,42 @@ netbsd_arm64)
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 openbsd_386)
-	mkasm="go run mkasm.go"
 	mkerrors="$mkerrors -m32"
-	mksyscall="go run mksyscall.go -l32 -openbsd -libc"
+	mksyscall="go run mksyscall.go -l32 -openbsd"
 	mksysctl="go run mksysctl_openbsd.go"
+	mksysnum="go run mksysnum.go 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master'"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 openbsd_amd64)
-	mkasm="go run mkasm.go"
 	mkerrors="$mkerrors -m64"
-	mksyscall="go run mksyscall.go -openbsd -libc"
+	mksyscall="go run mksyscall.go -openbsd"
 	mksysctl="go run mksysctl_openbsd.go"
+	mksysnum="go run mksysnum.go 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master'"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 openbsd_arm)
-	mkasm="go run mkasm.go"
 	mkerrors="$mkerrors"
-	mksyscall="go run mksyscall.go -l32 -openbsd -arm -libc"
+	mksyscall="go run mksyscall.go -l32 -openbsd -arm"
 	mksysctl="go run mksysctl_openbsd.go"
+	mksysnum="go run mksysnum.go 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master'"
 	# Let the type of C char be signed for making the bare syscall
 	# API consistent across platforms.
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
 	;;
 openbsd_arm64)
-	mkasm="go run mkasm.go"
 	mkerrors="$mkerrors -m64"
-	mksyscall="go run mksyscall.go -openbsd -libc"
+	mksyscall="go run mksyscall.go -openbsd"
 	mksysctl="go run mksysctl_openbsd.go"
+	mksysnum="go run mksysnum.go 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master'"
 	# Let the type of C char be signed for making the bare syscall
 	# API consistent across platforms.
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
 	;;
 openbsd_mips64)
-	mkasm="go run mkasm.go"
 	mkerrors="$mkerrors -m64"
-	mksyscall="go run mksyscall.go -openbsd -libc"
-	mksysctl="go run mksysctl_openbsd.go"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-openbsd_ppc64)
-	mkasm="go run mkasm.go"
-	mkerrors="$mkerrors -m64"
-	mksyscall="go run mksyscall.go -openbsd -libc"
-	mksysctl="go run mksysctl_openbsd.go"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-openbsd_riscv64)
-	mkasm="go run mkasm.go"
-	mkerrors="$mkerrors -m64"
-	mksyscall="go run mksyscall.go -openbsd -libc"
+	mksyscall="go run mksyscall.go -openbsd"
 	mksysctl="go run mksysctl_openbsd.go"
+	mksysnum="go run mksysnum.go 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master'"
 	# Let the type of C char be signed for making the bare syscall
 	# API consistent across platforms.
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
@@ -232,6 +209,11 @@ esac
 			if [ "$GOOSARCH" == "aix_ppc64" ]; then
 				# aix/ppc64 script generates files instead of writing to stdin.
 				echo "$mksyscall -tags $GOOS,$GOARCH $syscall_goos $GOOSARCH_in && gofmt -w zsyscall_$GOOSARCH.go && gofmt -w zsyscall_"$GOOSARCH"_gccgo.go && gofmt -w zsyscall_"$GOOSARCH"_gc.go " ;
+			elif [ "$GOOS" == "darwin" ]; then
+			        # 1.12 and later, syscalls via libSystem
+				echo "$mksyscall -tags $GOOS,$GOARCH,go1.12 $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go";
+				# 1.13 and later, syscalls via libSystem (including syscallPtr)
+				echo "$mksyscall -tags $GOOS,$GOARCH,go1.13 syscall_darwin.1_13.go |gofmt >zsyscall_$GOOSARCH.1_13.go";
 			elif [ "$GOOS" == "illumos" ]; then
 			        # illumos code generation requires a --illumos switch
 			        echo "$mksyscall -illumos -tags illumos,$GOARCH syscall_illumos.go |gofmt > zsyscall_illumos_$GOARCH.go";
@@ -245,5 +227,5 @@ esac
 	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
 	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
 	if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go | go run mkpost.go > ztypes_$GOOSARCH.go"; fi
-	if [ -n "$mkasm" ]; then echo "$mkasm $GOOS $GOARCH"; fi
+	if [ -n "$mkasm" ]; then echo "$mkasm $GOARCH"; fi
 ) | $run
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index 6ab02b6..0bcb8c3 100644
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -54,11 +54,10 @@ includes_AIX='
 
 includes_Darwin='
 #define _DARWIN_C_SOURCE
-#define KERNEL 1
+#define KERNEL
 #define _DARWIN_USE_64_BIT_INODE
 #define __APPLE_USE_RFC_3542
 #include <stdint.h>
-#include <sys/stdio.h>
 #include <sys/attr.h>
 #include <sys/clonefile.h>
 #include <sys/kern_control.h>
@@ -67,7 +66,6 @@ includes_Darwin='
 #include <sys/ptrace.h>
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/un.h>
 #include <sys/sockio.h>
 #include <sys/sys_domain.h>
@@ -77,7 +75,6 @@ includes_Darwin='
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <sys/xattr.h>
-#include <sys/vsock.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_types.h>
@@ -85,9 +82,6 @@ includes_Darwin='
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <termios.h>
-
-// for backwards compatibility because moved TIOCREMOTE to Kernel.framework after MacOSX12.0.sdk.
-#define TIOCREMOTE 0x80047469
 '
 
 includes_DragonFly='
@@ -130,7 +124,6 @@ includes_FreeBSD='
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
-#include <sys/ptrace.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_types.h>
@@ -158,16 +151,6 @@ includes_Linux='
 #endif
 #define _GNU_SOURCE
 
-// See the description in unix/linux/types.go
-#if defined(__ARM_EABI__) || \
-	(defined(__mips__) && (_MIPS_SIM == _ABIO32)) || \
-	(defined(__powerpc__) && (!defined(__powerpc64__)))
-# ifdef   _TIME_BITS
-#  undef  _TIME_BITS
-# endif
-# define  _TIME_BITS 32
-#endif
-
 // <sys/ioctl.h> is broken on powerpc64, as it fails to include definitions of
 // these structures. We just include them copied from <bits/termios.h>.
 #if defined(__powerpc__)
@@ -215,12 +198,9 @@ struct ltchars {
 #include <sys/timerfd.h>
 #include <sys/uio.h>
 #include <sys/xattr.h>
-#include <netinet/udp.h>
-#include <linux/audit.h>
 #include <linux/bpf.h>
 #include <linux/can.h>
 #include <linux/can/error.h>
-#include <linux/can/netlink.h>
 #include <linux/can/raw.h>
 #include <linux/capability.h>
 #include <linux/cryptouser.h>
@@ -230,7 +210,6 @@ struct ltchars {
 #include <linux/ethtool_netlink.h>
 #include <linux/falloc.h>
 #include <linux/fanotify.h>
-#include <linux/fib_rules.h>
 #include <linux/filter.h>
 #include <linux/fs.h>
 #include <linux/fscrypt.h>
@@ -248,25 +227,20 @@ struct ltchars {
 #include <linux/if_packet.h>
 #include <linux/if_xdp.h>
 #include <linux/input.h>
-#include <linux/kcm.h>
 #include <linux/kexec.h>
 #include <linux/keyctl.h>
-#include <linux/landlock.h>
 #include <linux/loop.h>
 #include <linux/lwtunnel.h>
 #include <linux/magic.h>
 #include <linux/memfd.h>
 #include <linux/module.h>
-#include <linux/mount.h>
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
 #include <linux/netlink.h>
 #include <linux/net_namespace.h>
 #include <linux/nfc.h>
 #include <linux/nsfs.h>
 #include <linux/perf_event.h>
 #include <linux/pps.h>
-#include <linux/ptp_clock.h>
 #include <linux/ptrace.h>
 #include <linux/random.h>
 #include <linux/reboot.h>
@@ -275,14 +249,12 @@ struct ltchars {
 #include <linux/sched.h>
 #include <linux/seccomp.h>
 #include <linux/serial.h>
-#include <linux/sock_diag.h>
 #include <linux/sockios.h>
 #include <linux/taskstats.h>
 #include <linux/tipc.h>
 #include <linux/vm_sockets.h>
 #include <linux/wait.h>
 #include <linux/watchdog.h>
-#include <linux/wireguard.h>
 
 #include <mtd/ubi-user.h>
 #include <mtd/mtd-user.h>
@@ -297,6 +269,10 @@ struct ltchars {
 #include <asm/termbits.h>
 #endif
 
+#ifndef MSG_FASTOPEN
+#define MSG_FASTOPEN    0x20000000
+#endif
+
 #ifndef PTRACE_GETREGS
 #define PTRACE_GETREGS	0xc
 #endif
@@ -305,6 +281,10 @@ struct ltchars {
 #define PTRACE_SETREGS	0xd
 #endif
 
+#ifndef SOL_NETLINK
+#define SOL_NETLINK	270
+#endif
+
 #ifdef SOL_BLUETOOTH
 // SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
 // but it is already in bluetooth_linux.go
@@ -321,23 +301,10 @@ struct ltchars {
 #undef TIPC_WAIT_FOREVER
 #define TIPC_WAIT_FOREVER 0xffffffff
 
-// Copied from linux/netfilter/nf_nat.h
-// Including linux/netfilter/nf_nat.h here causes conflicts between linux/in.h
-// and netinet/in.h.
-#define NF_NAT_RANGE_MAP_IPS			(1 << 0)
-#define NF_NAT_RANGE_PROTO_SPECIFIED		(1 << 1)
-#define NF_NAT_RANGE_PROTO_RANDOM		(1 << 2)
-#define NF_NAT_RANGE_PERSISTENT			(1 << 3)
-#define NF_NAT_RANGE_PROTO_RANDOM_FULLY		(1 << 4)
-#define NF_NAT_RANGE_PROTO_OFFSET		(1 << 5)
-#define NF_NAT_RANGE_NETMAP			(1 << 6)
-#define NF_NAT_RANGE_PROTO_RANDOM_ALL		\
-	(NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
-#define NF_NAT_RANGE_MASK					\
-	(NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED |	\
-	 NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT |	\
-	 NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET | \
-	 NF_NAT_RANGE_NETMAP)
+// Copied from linux/l2tp.h
+// Including linux/l2tp.h here causes conflicts between linux/in.h
+// and netinet/in.h included via net/route.h above.
+#define IPPROTO_L2TP		115
 
 // Copied from linux/hid.h.
 // Keep in sync with the size of the referenced fields.
@@ -498,6 +465,7 @@ ccflags="$@"
 		$2 !~ /^EQUIV_/ &&
 		$2 !~ /^EXPR_/ &&
 		$2 !~ /^EVIOC/ &&
+		$2 !~ /^EV_/ &&
 		$2 ~ /^E[A-Z0-9_]+$/ ||
 		$2 ~ /^B[0-9_]+$/ ||
 		$2 ~ /^(OLD|NEW)DEV$/ ||
@@ -529,18 +497,13 @@ ccflags="$@"
 		$2 ~ /^O?XTABS$/ ||
 		$2 ~ /^TC[IO](ON|OFF)$/ ||
 		$2 ~ /^IN_/ ||
-		$2 ~ /^KCM/ ||
-		$2 ~ /^LANDLOCK_/ ||
 		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
 		$2 ~ /^LO_(KEY|NAME)_SIZE$/ ||
 		$2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ ||
-		$2 == "LOOP_CONFIGURE" ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MREMAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL|TCPOPT|UDP)_/ ||
+		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL|TCPOPT)_/ ||
 		$2 ~ /^NFC_(GENL|PROTO|COMM|RF|SE|DIRECTION|LLCP|SOCKPROTO)_/ ||
 		$2 ~ /^NFC_.*_(MAX)?SIZE$/ ||
-		$2 ~ /^PTP_/ ||
 		$2 ~ /^RAW_PAYLOAD_/ ||
-		$2 ~ /^[US]F_/ ||
 		$2 ~ /^TP_STATUS_/ ||
 		$2 ~ /^FALLOC_/ ||
 		$2 ~ /^ICMPV?6?_(FILTER|SEC)/ ||
@@ -552,10 +515,10 @@ ccflags="$@"
 		$2 ~ /^HW_MACHINE$/ ||
 		$2 ~ /^SYSCTL_VERS/ ||
 		$2 !~ "MNT_BITS" &&
-		$2 ~ /^(MS|MNT|MOUNT|UMOUNT)_/ ||
+		$2 ~ /^(MS|MNT|UMOUNT)_/ ||
 		$2 ~ /^NS_GET_/ ||
 		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
-		$2 ~ /^(O|F|[ES]?FD|NAME|S|PTRACE|PT|PIOD|TFD)_/ ||
+		$2 ~ /^(O|F|[ES]?FD|NAME|S|PTRACE|PT|TFD)_/ ||
 		$2 ~ /^KEXEC_/ ||
 		$2 ~ /^LINUX_REBOOT_CMD_/ ||
 		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
@@ -563,8 +526,6 @@ ccflags="$@"
 		$2 !~ "NLA_TYPE_MASK" &&
 		$2 !~ /^RTC_VL_(ACCURACY|BACKUP|DATA)/ &&
 		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P|NETNSA)_/ ||
-		$2 ~ /^SOCK_|SK_DIAG_|SKNLGRP_$/ ||
-		$2 ~ /^(CONNECT|SAE)_/ ||
 		$2 ~ /^FIORDCHK$/ ||
 		$2 ~ /^SIOC/ ||
 		$2 ~ /^TIOC/ ||
@@ -579,9 +540,8 @@ ccflags="$@"
 		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|LOCKS|MEMLOCK|MSGQUEUE|NICE|NOFILE|NPROC|RSS|RTPRIO|RTTIME|SIGPENDING|STACK)|RLIM_INFINITY/ ||
 		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
 		$2 ~ /^CLONE_[A-Z_]+/ ||
-		$2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+|BPF_F_LINK)$/ &&
+		$2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+)$/ &&
 		$2 ~ /^(BPF|DLT)_/ ||
-		$2 ~ /^AUDIT_/ ||
 		$2 ~ /^(CLOCK|TIMER)_/ ||
 		$2 ~ /^CAN_/ ||
 		$2 ~ /^CAP_/ ||
@@ -600,11 +560,11 @@ ccflags="$@"
 		$2 ~ /^KEY_(SPEC|REQKEY_DEFL)_/ ||
 		$2 ~ /^KEYCTL_/ ||
 		$2 ~ /^PERF_/ ||
-		$2 ~ /^SECCOMP_/ ||
+		$2 ~ /^SECCOMP_MODE_/ ||
 		$2 ~ /^SEEK_/ ||
-		$2 ~ /^SCHED_/ ||
 		$2 ~ /^SPLICE_/ ||
 		$2 ~ /^SYNC_FILE_RANGE_/ ||
+		$2 !~ /^AUDIT_RECORD_MAGIC/ &&
 		$2 !~ /IOC_MAGIC/ &&
 		$2 ~ /^[A-Z][A-Z0-9_]+_MAGIC2?$/ ||
 		$2 ~ /^(VM|VMADDR)_/ ||
@@ -621,9 +581,6 @@ ccflags="$@"
 		$2 ~ /^FSOPT_/ ||
 		$2 ~ /^WDIO[CFS]_/ ||
 		$2 ~ /^NFN/ ||
-		$2 !~ /^NFT_META_IIFTYPE/ &&
-		$2 ~ /^NFT_/ ||
-		$2 ~ /^NF_NAT_/ ||
 		$2 ~ /^XDP_/ ||
 		$2 ~ /^RWF_/ ||
 		$2 ~ /^(HDIO|WIN|SMART)_/ ||
@@ -633,10 +590,8 @@ ccflags="$@"
 		$2 ~ /^DEVLINK_/ ||
 		$2 ~ /^ETHTOOL_/ ||
 		$2 ~ /^LWTUNNEL_IP/ ||
-		$2 ~ /^ITIMER_/ ||
 		$2 !~ "WMESGLEN" &&
 		$2 ~ /^W[A-Z0-9]+$/ ||
-		$2 ~ /^P_/ ||
 		$2 ~/^PPPIOC/ ||
 		$2 ~ /^FAN_|FANOTIFY_/ ||
 		$2 == "HID_MAX_DESCRIPTOR_SIZE" ||
@@ -645,9 +600,7 @@ ccflags="$@"
 		$2 ~ /^MTD/ ||
 		$2 ~ /^OTP/ ||
 		$2 ~ /^MEM/ ||
-		$2 ~ /^WG/ ||
-		$2 ~ /^FIB_RULE_/ ||
-		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE|IOMIN$|IOOPT$|ALIGNOFF$|DISCARD|ROTATIONAL$|ZEROOUT$|GETDISKSEQ$)/ {printf("\t%s = C.%s\n", $2, $2)}
+		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)}
 		$2 ~ /^__WCOREFLAG$/ {next}
 		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
 
@@ -668,7 +621,7 @@ errors=$(
 signals=$(
 	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
 	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
-	grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
 	sort
 )
 
@@ -678,13 +631,14 @@ echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
 	sort >_error.grep
 echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
 	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
 	sort >_signal.grep
 
 echo '// mkerrors.sh' "$@"
 echo '// Code generated by the command above; see README.md. DO NOT EDIT.'
 echo
 echo "//go:build ${GOARCH} && ${GOOS}"
+echo "// +build ${GOARCH},${GOOS}"
 echo
 go tool cgo -godefs -- "$@" _const.go >_error.out
 cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
@@ -763,8 +717,7 @@ main(void)
 		e = errors[i].num;
 		if(i > 0 && errors[i-1].num == e)
 			continue;
-		strncpy(buf, strerror(e), sizeof(buf) - 1);
-		buf[sizeof(buf) - 1] = '\0';
+		strcpy(buf, strerror(e));
 		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
 		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
 			buf[0] += a - A;
@@ -783,8 +736,7 @@ main(void)
 		e = signals[i].num;
 		if(i > 0 && signals[i-1].num == e)
 			continue;
-		strncpy(buf, strsignal(e), sizeof(buf) - 1);
-		buf[sizeof(buf) - 1] = '\0';
+		strcpy(buf, strsignal(e));
 		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
 		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
 			buf[0] += a - A;
diff --git a/vendor/golang.org/x/sys/unix/mmap_nomremap.go b/vendor/golang.org/x/sys/unix/mmap_nomremap.go
deleted file mode 100644
index 7f602ff..0000000
--- a/vendor/golang.org/x/sys/unix/mmap_nomremap.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris || zos
-
-package unix
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
diff --git a/vendor/golang.org/x/sys/unix/mremap.go b/vendor/golang.org/x/sys/unix/mremap.go
deleted file mode 100644
index 3a5e776..0000000
--- a/vendor/golang.org/x/sys/unix/mremap.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux || netbsd
-
-package unix
-
-import "unsafe"
-
-type mremapMmapper struct {
-	mmapper
-	mremap func(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
-}
-
-var mapper = &mremapMmapper{
-	mmapper: mmapper{
-		active: make(map[*byte][]byte),
-		mmap:   mmap,
-		munmap: munmap,
-	},
-	mremap: mremap,
-}
-
-func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
-	if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&mremapFixed != 0 {
-		return nil, EINVAL
-	}
-
-	pOld := &oldData[cap(oldData)-1]
-	m.Lock()
-	defer m.Unlock()
-	bOld := m.active[pOld]
-	if bOld == nil || &bOld[0] != &oldData[0] {
-		return nil, EINVAL
-	}
-	newAddr, errno := m.mremap(uintptr(unsafe.Pointer(&bOld[0])), uintptr(len(bOld)), uintptr(newLength), flags, 0)
-	if errno != nil {
-		return nil, errno
-	}
-	bNew := unsafe.Slice((*byte)(unsafe.Pointer(newAddr)), newLength)
-	pNew := &bNew[cap(bNew)-1]
-	if flags&mremapDontunmap == 0 {
-		delete(m.active, pOld)
-	}
-	m.active[pNew] = bNew
-	return bNew, nil
-}
-
-func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
-	return mapper.Mremap(oldData, newLength, flags)
-}
-
-func MremapPtr(oldAddr unsafe.Pointer, oldSize uintptr, newAddr unsafe.Pointer, newSize uintptr, flags int) (ret unsafe.Pointer, err error) {
-	xaddr, err := mapper.mremap(uintptr(oldAddr), oldSize, newSize, flags, uintptr(newAddr))
-	return unsafe.Pointer(xaddr), err
-}
diff --git a/vendor/golang.org/x/sys/unix/pagesize_unix.go b/vendor/golang.org/x/sys/unix/pagesize_unix.go
index 0482408..53f1b4c 100644
--- a/vendor/golang.org/x/sys/unix/pagesize_unix.go
+++ b/vendor/golang.org/x/sys/unix/pagesize_unix.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 // For Unix, get the pagesize from the runtime.
 
diff --git a/vendor/golang.org/x/sys/unix/pledge_openbsd.go b/vendor/golang.org/x/sys/unix/pledge_openbsd.go
index 6a09af5..eb48294 100644
--- a/vendor/golang.org/x/sys/unix/pledge_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/pledge_openbsd.go
@@ -8,31 +8,54 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
+	"syscall"
+	"unsafe"
 )
 
 // Pledge implements the pledge syscall.
 //
-// This changes both the promises and execpromises; use PledgePromises or
-// PledgeExecpromises to only change the promises or execpromises
-// respectively.
+// The pledge syscall does not accept execpromises on OpenBSD releases
+// before 6.3.
+//
+// execpromises must be empty when Pledge is called on OpenBSD
+// releases predating 6.3, otherwise an error will be returned.
 //
 // For more information see pledge(2).
 func Pledge(promises, execpromises string) error {
-	if err := pledgeAvailable(); err != nil {
-		return err
-	}
-
-	pptr, err := BytePtrFromString(promises)
+	maj, min, err := majmin()
 	if err != nil {
 		return err
 	}
 
-	exptr, err := BytePtrFromString(execpromises)
+	err = pledgeAvailable(maj, min, execpromises)
 	if err != nil {
 		return err
 	}
 
-	return pledge(pptr, exptr)
+	pptr, err := syscall.BytePtrFromString(promises)
+	if err != nil {
+		return err
+	}
+
+	// This variable will hold either a nil unsafe.Pointer or
+	// an unsafe.Pointer to a string (execpromises).
+	var expr unsafe.Pointer
+
+	// If we're running on OpenBSD > 6.2, pass execpromises to the syscall.
+	if maj > 6 || (maj == 6 && min > 2) {
+		exptr, err := syscall.BytePtrFromString(execpromises)
+		if err != nil {
+			return err
+		}
+		expr = unsafe.Pointer(exptr)
+	}
+
+	_, _, e := syscall.Syscall(SYS_PLEDGE, uintptr(unsafe.Pointer(pptr)), uintptr(expr), 0)
+	if e != 0 {
+		return e
+	}
+
+	return nil
 }
 
 // PledgePromises implements the pledge syscall.
@@ -41,16 +64,30 @@ func Pledge(promises, execpromises string) error {
 //
 // For more information see pledge(2).
 func PledgePromises(promises string) error {
-	if err := pledgeAvailable(); err != nil {
-		return err
-	}
-
-	pptr, err := BytePtrFromString(promises)
+	maj, min, err := majmin()
 	if err != nil {
 		return err
 	}
 
-	return pledge(pptr, nil)
+	err = pledgeAvailable(maj, min, "")
+	if err != nil {
+		return err
+	}
+
+	// This variable holds the execpromises and is always nil.
+	var expr unsafe.Pointer
+
+	pptr, err := syscall.BytePtrFromString(promises)
+	if err != nil {
+		return err
+	}
+
+	_, _, e := syscall.Syscall(SYS_PLEDGE, uintptr(unsafe.Pointer(pptr)), uintptr(expr), 0)
+	if e != 0 {
+		return e
+	}
+
+	return nil
 }
 
 // PledgeExecpromises implements the pledge syscall.
@@ -59,16 +96,30 @@ func PledgePromises(promises string) error {
 //
 // For more information see pledge(2).
 func PledgeExecpromises(execpromises string) error {
-	if err := pledgeAvailable(); err != nil {
-		return err
-	}
-
-	exptr, err := BytePtrFromString(execpromises)
+	maj, min, err := majmin()
 	if err != nil {
 		return err
 	}
 
-	return pledge(nil, exptr)
+	err = pledgeAvailable(maj, min, execpromises)
+	if err != nil {
+		return err
+	}
+
+	// This variable holds the promises and is always nil.
+	var pptr unsafe.Pointer
+
+	exptr, err := syscall.BytePtrFromString(execpromises)
+	if err != nil {
+		return err
+	}
+
+	_, _, e := syscall.Syscall(SYS_PLEDGE, uintptr(pptr), uintptr(unsafe.Pointer(exptr)), 0)
+	if e != 0 {
+		return e
+	}
+
+	return nil
 }
 
 // majmin returns major and minor version number for an OpenBSD system.
@@ -96,15 +147,16 @@ func majmin() (major int, minor int, err error) {
 
 // pledgeAvailable checks for availability of the pledge(2) syscall
 // based on the running OpenBSD version.
-func pledgeAvailable() error {
-	maj, min, err := majmin()
-	if err != nil {
-		return err
+func pledgeAvailable(maj, min int, execpromises string) error {
+	// If OpenBSD <= 5.9, pledge is not available.
+	if (maj == 5 && min != 9) || maj < 5 {
+		return fmt.Errorf("pledge syscall is not available on OpenBSD %d.%d", maj, min)
 	}
 
-	// Require OpenBSD 6.4 as a minimum.
-	if maj < 6 || (maj == 6 && min <= 3) {
-		return fmt.Errorf("cannot call Pledge on OpenBSD %d.%d", maj, min)
+	// If OpenBSD <= 6.2 and execpromises is not empty,
+	// return an error - execpromises is not available before 6.3
+	if (maj < 6 || (maj == 6 && min <= 2)) && execpromises != "" {
+		return fmt.Errorf("cannot use execpromises on OpenBSD %d.%d", maj, min)
 	}
 
 	return nil
diff --git a/vendor/golang.org/x/sys/unix/ptrace_darwin.go b/vendor/golang.org/x/sys/unix/ptrace_darwin.go
index 3f0975f..463c3ef 100644
--- a/vendor/golang.org/x/sys/unix/ptrace_darwin.go
+++ b/vendor/golang.org/x/sys/unix/ptrace_darwin.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin && !ios
+// +build darwin,!ios
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ptrace_ios.go b/vendor/golang.org/x/sys/unix/ptrace_ios.go
index a4d35db..ed0509a 100644
--- a/vendor/golang.org/x/sys/unix/ptrace_ios.go
+++ b/vendor/golang.org/x/sys/unix/ptrace_ios.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ios
+// +build ios
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/race.go b/vendor/golang.org/x/sys/unix/race.go
index 714d2aa..6f6c5fe 100644
--- a/vendor/golang.org/x/sys/unix/race.go
+++ b/vendor/golang.org/x/sys/unix/race.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build (darwin && race) || (linux && race) || (freebsd && race)
+// +build darwin,race linux,race freebsd,race
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/race0.go b/vendor/golang.org/x/sys/unix/race0.go
index 4a9f663..706e132 100644
--- a/vendor/golang.org/x/sys/unix/race0.go
+++ b/vendor/golang.org/x/sys/unix/race0.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || (darwin && !race) || (linux && !race) || (freebsd && !race) || netbsd || openbsd || solaris || dragonfly || zos
+// +build aix darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly zos
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/readdirent_getdents.go b/vendor/golang.org/x/sys/unix/readdirent_getdents.go
index dbd2b6c..4d62575 100644
--- a/vendor/golang.org/x/sys/unix/readdirent_getdents.go
+++ b/vendor/golang.org/x/sys/unix/readdirent_getdents.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || dragonfly || freebsd || linux || netbsd || openbsd
+// +build aix dragonfly freebsd linux netbsd openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go b/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
index b903c00..2a4ba47 100644
--- a/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
+++ b/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin || zos
+//go:build darwin
+// +build darwin
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
index 5f63147..8bf4570 100644
--- a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
@@ -34,52 +34,3 @@ func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
 	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
 	return &ucred, nil
 }
-
-// PktInfo4 encodes Inet4Pktinfo into a socket control message of type IP_PKTINFO.
-func PktInfo4(info *Inet4Pktinfo) []byte {
-	b := make([]byte, CmsgSpace(SizeofInet4Pktinfo))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_IP
-	h.Type = IP_PKTINFO
-	h.SetLen(CmsgLen(SizeofInet4Pktinfo))
-	*(*Inet4Pktinfo)(h.data(0)) = *info
-	return b
-}
-
-// PktInfo6 encodes Inet6Pktinfo into a socket control message of type IPV6_PKTINFO.
-func PktInfo6(info *Inet6Pktinfo) []byte {
-	b := make([]byte, CmsgSpace(SizeofInet6Pktinfo))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_IPV6
-	h.Type = IPV6_PKTINFO
-	h.SetLen(CmsgLen(SizeofInet6Pktinfo))
-	*(*Inet6Pktinfo)(h.data(0)) = *info
-	return b
-}
-
-// ParseOrigDstAddr decodes a socket control message containing the original
-// destination address. To receive such a message the IP_RECVORIGDSTADDR or
-// IPV6_RECVORIGDSTADDR option must be enabled on the socket.
-func ParseOrigDstAddr(m *SocketControlMessage) (Sockaddr, error) {
-	switch {
-	case m.Header.Level == SOL_IP && m.Header.Type == IP_ORIGDSTADDR:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(&m.Data[0]))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.Addr = pp.Addr
-		return sa, nil
-
-	case m.Header.Level == SOL_IPV6 && m.Header.Type == IPV6_ORIGDSTADDR:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(&m.Data[0]))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		sa.Addr = pp.Addr
-		return sa, nil
-
-	default:
-		return nil, EINVAL
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
index c3a62db..453a942 100644
--- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 // Socket control messages
 
@@ -51,20 +52,6 @@ func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
 	return msgs, nil
 }
 
-// ParseOneSocketControlMessage parses a single socket control message from b, returning the message header,
-// message data (a slice of b), and the remainder of b after that single message.
-// When there are no remaining messages, len(remainder) == 0.
-func ParseOneSocketControlMessage(b []byte) (hdr Cmsghdr, data []byte, remainder []byte, err error) {
-	h, dbuf, err := socketControlMessageHeaderAndData(b)
-	if err != nil {
-		return Cmsghdr{}, nil, nil, err
-	}
-	if i := cmsgAlignOf(int(h.Len)); i < len(b) {
-		remainder = b[i:]
-	}
-	return *h, dbuf, remainder, nil
-}
-
 func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
 	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
 	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
index 4a1eab3..0840fe4 100644
--- a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin freebsd linux netbsd openbsd solaris zos
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_zos.go b/vendor/golang.org/x/sys/unix/sockcmsg_zos.go
deleted file mode 100644
index 3e53dbc..0000000
--- a/vendor/golang.org/x/sys/unix/sockcmsg_zos.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Socket control messages
-
-package unix
-
-import "unsafe"
-
-// UnixCredentials encodes credentials into a socket control message
-// for sending to another process. This can be used for
-// authentication.
-func UnixCredentials(ucred *Ucred) []byte {
-	b := make([]byte, CmsgSpace(SizeofUcred))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_SOCKET
-	h.Type = SCM_CREDENTIALS
-	h.SetLen(CmsgLen(SizeofUcred))
-	*(*Ucred)(h.data(0)) = *ucred
-	return b
-}
-
-// ParseUnixCredentials decodes a socket control message that contains
-// credentials in a Ucred structure. To receive such a message, the
-// SO_PASSCRED option must be enabled on the socket.
-func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
-	if m.Header.Level != SOL_SOCKET {
-		return nil, EINVAL
-	}
-	if m.Header.Type != SCM_CREDENTIALS {
-		return nil, EINVAL
-	}
-	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
-	return &ucred, nil
-}
-
-// PktInfo4 encodes Inet4Pktinfo into a socket control message of type IP_PKTINFO.
-func PktInfo4(info *Inet4Pktinfo) []byte {
-	b := make([]byte, CmsgSpace(SizeofInet4Pktinfo))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_IP
-	h.Type = IP_PKTINFO
-	h.SetLen(CmsgLen(SizeofInet4Pktinfo))
-	*(*Inet4Pktinfo)(h.data(0)) = *info
-	return b
-}
-
-// PktInfo6 encodes Inet6Pktinfo into a socket control message of type IPV6_PKTINFO.
-func PktInfo6(info *Inet6Pktinfo) []byte {
-	b := make([]byte, CmsgSpace(SizeofInet6Pktinfo))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_IPV6
-	h.Type = IPV6_PKTINFO
-	h.SetLen(CmsgLen(SizeofInet6Pktinfo))
-	*(*Inet6Pktinfo)(h.data(0)) = *info
-	return b
-}
diff --git a/vendor/golang.org/x/sys/unix/str.go b/vendor/golang.org/x/sys/unix/str.go
new file mode 100644
index 0000000..8ba89ed
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/str.go
@@ -0,0 +1,27 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+func itoa(val int) string { // do it here rather than with fmt to avoid dependency
+	if val < 0 {
+		return "-" + uitoa(uint(-val))
+	}
+	return uitoa(uint(val))
+}
+
+func uitoa(val uint) string {
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
+	for val >= 10 {
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
+	}
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
+}
diff --git a/vendor/golang.org/x/sys/unix/symaddr_zos_s390x.s b/vendor/golang.org/x/sys/unix/symaddr_zos_s390x.s
deleted file mode 100644
index 3c4f33c..0000000
--- a/vendor/golang.org/x/sys/unix/symaddr_zos_s390x.s
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build zos && s390x && gc
-
-#include "textflag.h"
-
-//  provide the address of function variable to be fixed up.
-
-TEXT ·getPipe2Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Pipe2(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_FlockAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Flock(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_GetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Getxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_NanosleepAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Nanosleep(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_SetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Setxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_Wait4Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Wait4(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_MountAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Mount(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_UnmountAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Unmount(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_UtimesNanoAtAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·UtimesNanoAt(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_UtimesNanoAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·UtimesNano(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_MkfifoatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Mkfifoat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_ChtagAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Chtag(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-TEXT ·get_ReadlinkatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Readlinkat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-	
diff --git a/vendor/golang.org/x/sys/unix/syscall.go b/vendor/golang.org/x/sys/unix/syscall.go
index 5ea74da..649fa87 100644
--- a/vendor/golang.org/x/sys/unix/syscall.go
+++ b/vendor/golang.org/x/sys/unix/syscall.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 // Package unix contains an interface to the low-level operating system
 // primitives. OS details vary depending on the underlying system, and
@@ -28,6 +29,8 @@ import (
 	"bytes"
 	"strings"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
 // ByteSliceFromString returns a NUL-terminated slice of bytes
@@ -79,7 +82,13 @@ func BytePtrToString(p *byte) string {
 		ptr = unsafe.Pointer(uintptr(ptr) + 1)
 	}
 
-	return string(unsafe.Slice(p, n))
+	var s []byte
+	h := (*unsafeheader.Slice)(unsafe.Pointer(&s))
+	h.Data = unsafe.Pointer(p)
+	h.Len = n
+	h.Cap = n
+
+	return string(s)
 }
 
 // Single-word zero for use when we need a valid pointer to 0 bytes.
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix.go b/vendor/golang.org/x/sys/unix/syscall_aix.go
index 6f15ba1..d8efb71 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix
+// +build aix
 
 // Aix system calls.
 // This file is compiled as ordinary Go code,
@@ -36,7 +37,6 @@ func Creat(path string, mode uint32) (fd int, err error) {
 }
 
 //sys	utimes(path string, times *[2]Timeval) (err error)
-
 func Utimes(path string, tv []Timeval) error {
 	if len(tv) != 2 {
 		return EINVAL
@@ -45,7 +45,6 @@ func Utimes(path string, tv []Timeval) error {
 }
 
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flag int) (err error)
-
 func UtimesNano(path string, ts []Timespec) error {
 	if len(ts) != 2 {
 		return EINVAL
@@ -71,7 +70,9 @@ func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
 }
 
@@ -84,7 +85,9 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
 }
 
@@ -106,8 +109,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	if n > 0 {
 		sl += _Socklen(n) + 1
 	}
-	if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
-		// Check sl > 3 so we don't change unnamed socket behavior.
+	if sa.raw.Path[0] == '@' {
 		sa.raw.Path[0] = 0
 		// Don't count trailing NUL for abstract address.
 		sl--
@@ -217,63 +219,20 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
-func recvmsgRaw(fd int, iov []Iovec, oob []byte, flags int, rsa *RawSockaddrAny) (n, oobn int, recvflags int, err error) {
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var dummy byte
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if emptyIovecs(iov) {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
-	if n, err = recvmsg(fd, &msg, flags); n == -1 {
-		return
-	}
-	oobn = int(msg.Controllen)
-	recvflags = int(msg.Flags)
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	// Recvmsg not implemented on AIX
+	sa := new(SockaddrUnix)
+	return -1, -1, -1, sa, ENOSYS
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
 	return
 }
 
-func sendmsgN(fd int, iov []Iovec, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var dummy byte
-	var empty bool
-	if len(oob) > 0 {
-		// send at least one normal byte
-		empty = emptyIovecs(iov)
-		if empty {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && empty {
-		n = 0
-	}
-	return n, nil
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	// SendmsgN not implemented on AIX
+	return -1, ENOSYS
 }
 
 func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
@@ -292,7 +251,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				break
 			}
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -300,7 +261,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		sa := new(SockaddrInet4)
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 
 	case AF_INET6:
@@ -309,7 +272,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
 		sa.ZoneId = pp.Scope_id
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 	}
 	return nil, EAFNOSUPPORT
@@ -349,18 +314,16 @@ func direntNamlen(buf []byte) (uint64, bool) {
 }
 
 //sys	getdirent(fd int, buf []byte) (n int, err error)
-
 func Getdents(fd int, buf []byte) (n int, err error) {
 	return getdirent(fd, buf)
 }
 
 //sys	wait4(pid Pid_t, status *_C_int, options int, rusage *Rusage) (wpid Pid_t, err error)
-
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
 	var status _C_int
 	var r Pid_t
 	err = ERESTART
-	// AIX wait4 may return with ERESTART errno, while the process is still
+	// AIX wait4 may return with ERESTART errno, while the processus is still
 	// active.
 	for err == ERESTART {
 		r, err = wait4(Pid_t(pid), &status, options, rusage)
@@ -408,8 +371,7 @@ func (w WaitStatus) CoreDump() bool { return w&0x80 == 0x80 }
 
 func (w WaitStatus) TrapCause() int { return -1 }
 
-//sys	ioctl(fd int, req int, arg uintptr) (err error)
-//sys	ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) = ioctl
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
 
 // fcntl must never be called with cmd=F_DUP2FD because it doesn't work on AIX
 // There is no way to create a custom fcntl and to keep //sys fcntl easily,
@@ -423,12 +385,6 @@ func (w WaitStatus) TrapCause() int { return -1 }
 
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 
-//sys	fsyncRange(fd int, how int, start int64, length int64) (err error) = fsync_range
-
-func Fsync(fd int) error {
-	return fsyncRange(fd, O_SYNC, 0, 0)
-}
-
 /*
  * Direct access
  */
@@ -445,6 +401,7 @@ func Fsync(fd int) error {
 //sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	Fdatasync(fd int) (err error)
+//sys	Fsync(fd int) (err error)
 // readdir_r
 //sysnb	Getpgid(pid int) (pgid int, err error)
 
@@ -487,6 +444,8 @@ func Fsync(fd int) error {
 //sys	Unlinkat(dirfd int, path string, flags int) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
 //sys	write(fd int, p []byte) (n int, err error)
+//sys	readlen(fd int, p *byte, np int) (n int, err error) = read
+//sys	writelen(fd int, p *byte, np int) (n int, err error) = write
 
 //sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = posix_fadvise64
@@ -503,8 +462,8 @@ func Fsync(fd int) error {
 //sys	Listen(s int, n int) (err error)
 //sys	lstat(path string, stat *Stat_t) (err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = pread64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = pwrite64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = pread64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = pwrite64
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
 //sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
@@ -533,6 +492,21 @@ func Fsync(fd int) error {
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = nsendmsg
 
 //sys	munmap(addr uintptr, length uintptr) (err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
 //sys	Mlock(b []byte) (err error)
@@ -549,10 +523,8 @@ func Pipe(p []int) (err error) {
 	}
 	var pp [2]_C_int
 	err = pipe(&pp)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return
 }
 
@@ -572,7 +544,6 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
 //sys	Getsystemcfg(label int) (n uint64)
 
 //sys	umount(target string) (err error)
-
 func Unmount(target string, flags int) (err error) {
 	if flags != 0 {
 		// AIX doesn't have any flags for umount.
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
index 1fdaa47..e92a0be 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
@@ -3,10 +3,12 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix && ppc
+// +build aix,ppc
 
 package unix
 
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = getrlimit64
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error) = setrlimit64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = lseek64
 
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
index c87f9a9..16eed17 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
@@ -3,10 +3,12 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix && ppc64
+// +build aix,ppc64
 
 package unix
 
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = lseek
 
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) = mmap64
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index a00c3e5..95ac394 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
+// +build darwin dragonfly freebsd netbsd openbsd
 
 // BSD system call wrappers shared by *BSD based systems
 // including OS X (Darwin) and FreeBSD.  Like the other
@@ -162,7 +163,9 @@ func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
 }
 
@@ -176,7 +179,9 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
 }
 
@@ -205,7 +210,9 @@ func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Nlen = sa.Nlen
 	sa.raw.Alen = sa.Alen
 	sa.raw.Slen = sa.Slen
-	sa.raw.Data = sa.Data
+	for i := 0; i < len(sa.raw.Data); i++ {
+		sa.raw.Data[i] = sa.Data[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
 }
 
@@ -221,7 +228,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		sa.Nlen = pp.Nlen
 		sa.Alen = pp.Alen
 		sa.Slen = pp.Slen
-		sa.Data = pp.Data
+		for i := 0; i < len(sa.Data); i++ {
+			sa.Data[i] = pp.Data[i]
+		}
 		return sa, nil
 
 	case AF_UNIX:
@@ -244,7 +253,8 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				break
 			}
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -252,7 +262,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		sa := new(SockaddrInet4)
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 
 	case AF_INET6:
@@ -261,7 +273,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
 		sa.ZoneId = pp.Scope_id
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 	}
 	return anyToSockaddrGOOS(fd, rsa)
@@ -316,69 +330,87 @@ func GetsockoptString(fd, level, opt int) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return ByteSliceToString(buf[:vallen]), nil
+	return string(buf[:vallen-1]), nil
 }
 
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
 //sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
 
-func recvmsgRaw(fd int, iov []Iovec, oob []byte, flags int, rsa *RawSockaddrAny) (n, oobn int, recvflags int, err error) {
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(rsa))
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
 	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
 	var dummy byte
 	if len(oob) > 0 {
 		// receive at least one normal byte
-		if emptyIovecs(iov) {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
 		}
 		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
 		msg.SetControllen(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = recvmsg(fd, &msg, flags); err != nil {
 		return
 	}
 	oobn = int(msg.Controllen)
 	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
 	return
 }
 
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 
-func sendmsgN(fd int, iov []Iovec, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
 	var msg Msghdr
 	msg.Name = (*byte)(unsafe.Pointer(ptr))
 	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
 	var dummy byte
-	var empty bool
 	if len(oob) > 0 {
 		// send at least one normal byte
-		empty = emptyIovecs(iov)
-		if empty {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
 		}
 		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
 		msg.SetControllen(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = sendmsg(fd, &msg, flags); err != nil {
 		return 0, err
 	}
-	if len(oob) > 0 && empty {
+	if len(oob) > 0 && len(p) == 0 {
 		n = 0
 	}
 	return n, nil
@@ -551,7 +583,12 @@ func UtimesNano(path string, ts []Timespec) error {
 	if len(ts) != 2 {
 		return EINVAL
 	}
-	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	// Darwin setattrlist can set nanosecond timestamps
+	err := setattrlistTimes(path, ts, 0)
+	if err != ENOSYS {
+		return err
+	}
+	err = utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
 	if err != ENOSYS {
 		return err
 	}
@@ -571,6 +608,10 @@ func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
 	if len(ts) != 2 {
 		return EINVAL
 	}
+	err := setattrlistTimes(path, ts, flags)
+	if err != ENOSYS {
+		return err
+	}
 	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
 }
 
@@ -600,6 +641,20 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
 //	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
 //	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
 
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
 //sys	Madvise(b []byte, behav int) (err error)
 //sys	Mlock(b []byte) (err error)
 //sys	Mlockall(flags int) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go b/vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go
new file mode 100644
index 0000000..b009860
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go
@@ -0,0 +1,32 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build darwin && go1.12 && !go1.13
+// +build darwin,go1.12,!go1.13
+
+package unix
+
+import (
+	"unsafe"
+)
+
+const _SYS_GETDIRENTRIES64 = 344
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	// To implement this using libSystem we'd need syscall_syscallPtr for
+	// fdopendir. However, syscallPtr was only added in Go 1.13, so we fall
+	// back to raw syscalls for this func on Go 1.12.
+	var p unsafe.Pointer
+	if len(buf) > 0 {
+		p = unsafe.Pointer(&buf[0])
+	} else {
+		p = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(_SYS_GETDIRENTRIES64, uintptr(fd), uintptr(p), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		return n, errnoErr(e1)
+	}
+	return n, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
new file mode 100644
index 0000000..1596426
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
@@ -0,0 +1,108 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build darwin && go1.13
+// +build darwin,go1.13
+
+package unix
+
+import (
+	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
+)
+
+//sys	closedir(dir uintptr) (err error)
+//sys	readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno)
+
+func fdopendir(fd int) (dir uintptr, err error) {
+	r0, _, e1 := syscall_syscallPtr(libc_fdopendir_trampoline_addr, uintptr(fd), 0, 0)
+	dir = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_fdopendir_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fdopendir fdopendir "/usr/lib/libSystem.B.dylib"
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	// Simulate Getdirentries using fdopendir/readdir_r/closedir.
+	// We store the number of entries to skip in the seek
+	// offset of fd. See issue #31368.
+	// It's not the full required semantics, but should handle the case
+	// of calling Getdirentries or ReadDirent repeatedly.
+	// It won't handle assigning the results of lseek to *basep, or handle
+	// the directory being edited underfoot.
+	skip, err := Seek(fd, 0, 1 /* SEEK_CUR */)
+	if err != nil {
+		return 0, err
+	}
+
+	// We need to duplicate the incoming file descriptor
+	// because the caller expects to retain control of it, but
+	// fdopendir expects to take control of its argument.
+	// Just Dup'ing the file descriptor is not enough, as the
+	// result shares underlying state. Use Openat to make a really
+	// new file descriptor referring to the same directory.
+	fd2, err := Openat(fd, ".", O_RDONLY, 0)
+	if err != nil {
+		return 0, err
+	}
+	d, err := fdopendir(fd2)
+	if err != nil {
+		Close(fd2)
+		return 0, err
+	}
+	defer closedir(d)
+
+	var cnt int64
+	for {
+		var entry Dirent
+		var entryp *Dirent
+		e := readdir_r(d, &entry, &entryp)
+		if e != 0 {
+			return n, errnoErr(e)
+		}
+		if entryp == nil {
+			break
+		}
+		if skip > 0 {
+			skip--
+			cnt++
+			continue
+		}
+
+		reclen := int(entry.Reclen)
+		if reclen > len(buf) {
+			// Not enough room. Return for now.
+			// The counter will let us know where we should start up again.
+			// Note: this strategy for suspending in the middle and
+			// restarting is O(n^2) in the length of the directory. Oh well.
+			break
+		}
+
+		// Copy entry into return buffer.
+		var s []byte
+		hdr := (*unsafeheader.Slice)(unsafe.Pointer(&s))
+		hdr.Data = unsafe.Pointer(&entry)
+		hdr.Cap = reclen
+		hdr.Len = reclen
+		copy(buf, s)
+
+		buf = buf[reclen:]
+		n += reclen
+		cnt++
+	}
+	// Set the seek offset of the input fd to record
+	// how many files we've already returned.
+	_, err = Seek(fd, cnt, 0 /* SEEK_SET */)
+	if err != nil {
+		return n, err
+	}
+
+	return n, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 798f61a..23f6b57 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -14,100 +14,11 @@ package unix
 
 import (
 	"fmt"
+	"runtime"
 	"syscall"
 	"unsafe"
 )
 
-//sys	closedir(dir uintptr) (err error)
-//sys	readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno)
-
-func fdopendir(fd int) (dir uintptr, err error) {
-	r0, _, e1 := syscall_syscallPtr(libc_fdopendir_trampoline_addr, uintptr(fd), 0, 0)
-	dir = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fdopendir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fdopendir fdopendir "/usr/lib/libSystem.B.dylib"
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	// Simulate Getdirentries using fdopendir/readdir_r/closedir.
-	// We store the number of entries to skip in the seek
-	// offset of fd. See issue #31368.
-	// It's not the full required semantics, but should handle the case
-	// of calling Getdirentries or ReadDirent repeatedly.
-	// It won't handle assigning the results of lseek to *basep, or handle
-	// the directory being edited underfoot.
-	skip, err := Seek(fd, 0, 1 /* SEEK_CUR */)
-	if err != nil {
-		return 0, err
-	}
-
-	// We need to duplicate the incoming file descriptor
-	// because the caller expects to retain control of it, but
-	// fdopendir expects to take control of its argument.
-	// Just Dup'ing the file descriptor is not enough, as the
-	// result shares underlying state. Use Openat to make a really
-	// new file descriptor referring to the same directory.
-	fd2, err := Openat(fd, ".", O_RDONLY, 0)
-	if err != nil {
-		return 0, err
-	}
-	d, err := fdopendir(fd2)
-	if err != nil {
-		Close(fd2)
-		return 0, err
-	}
-	defer closedir(d)
-
-	var cnt int64
-	for {
-		var entry Dirent
-		var entryp *Dirent
-		e := readdir_r(d, &entry, &entryp)
-		if e != 0 {
-			return n, errnoErr(e)
-		}
-		if entryp == nil {
-			break
-		}
-		if skip > 0 {
-			skip--
-			cnt++
-			continue
-		}
-
-		reclen := int(entry.Reclen)
-		if reclen > len(buf) {
-			// Not enough room. Return for now.
-			// The counter will let us know where we should start up again.
-			// Note: this strategy for suspending in the middle and
-			// restarting is O(n^2) in the length of the directory. Oh well.
-			break
-		}
-
-		// Copy entry into return buffer.
-		s := unsafe.Slice((*byte)(unsafe.Pointer(&entry)), reclen)
-		copy(buf, s)
-
-		buf = buf[reclen:]
-		n += reclen
-		cnt++
-	}
-	// Set the seek offset of the input fd to record
-	// how many files we've already returned.
-	_, err = Seek(fd, cnt, 0 /* SEEK_SET */)
-	if err != nil {
-		return n, err
-	}
-
-	return n, nil
-}
-
 // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
@@ -137,30 +48,6 @@ func (sa *SockaddrCtl) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrCtl, nil
 }
 
-// SockaddrVM implements the Sockaddr interface for AF_VSOCK type sockets.
-// SockaddrVM provides access to Darwin VM sockets: a mechanism that enables
-// bidirectional communication between a hypervisor and its guest virtual
-// machines.
-type SockaddrVM struct {
-	// CID and Port specify a context ID and port address for a VM socket.
-	// Guests have a unique CID, and hosts may have a well-known CID of:
-	//  - VMADDR_CID_HYPERVISOR: refers to the hypervisor process.
-	//  - VMADDR_CID_LOCAL: refers to local communication (loopback).
-	//  - VMADDR_CID_HOST: refers to other processes on the host.
-	CID  uint32
-	Port uint32
-	raw  RawSockaddrVM
-}
-
-func (sa *SockaddrVM) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Len = SizeofSockaddrVM
-	sa.raw.Family = AF_VSOCK
-	sa.raw.Port = sa.Port
-	sa.raw.Cid = sa.CID
-
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrVM, nil
-}
-
 func anyToSockaddrGOOS(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_SYSTEM:
@@ -171,13 +58,6 @@ func anyToSockaddrGOOS(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 			sa.Unit = pp.Sc_unit
 			return sa, nil
 		}
-	case AF_VSOCK:
-		pp := (*RawSockaddrVM)(unsafe.Pointer(rsa))
-		sa := &SockaddrVM{
-			CID:  pp.Cid,
-			Port: pp.Port,
-		}
-		return sa, nil
 	}
 	return nil, EAFNOSUPPORT
 }
@@ -229,7 +109,16 @@ func direntNamlen(buf []byte) (uint64, bool) {
 
 func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
 func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
-func PtraceDenyAttach() (err error)    { return ptrace(PT_DENY_ATTACH, 0, 0, 0) }
+
+type attrList struct {
+	bitmapCount uint16
+	_           uint16
+	CommonAttr  uint32
+	VolAttr     uint32
+	DirAttr     uint32
+	FileAttr    uint32
+	Forkattr    uint32
+}
 
 //sysnb	pipe(p *[2]int32) (err error)
 
@@ -239,10 +128,8 @@ func Pipe(p []int) (err error) {
 	}
 	var x [2]int32
 	err = pipe(&x)
-	if err == nil {
-		p[0] = int(x[0])
-		p[1] = int(x[1])
-	}
+	p[0] = int(x[0])
+	p[1] = int(x[1])
 	return
 }
 
@@ -362,7 +249,36 @@ func Flistxattr(fd int, dest []byte) (sz int, err error) {
 	return flistxattr(fd, xattrPointer(dest), len(dest), 0)
 }
 
-//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	_p0, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+
+	var attrList attrList
+	attrList.bitmapCount = ATTR_BIT_MAP_COUNT
+	attrList.CommonAttr = ATTR_CMN_MODTIME | ATTR_CMN_ACCTIME
+
+	// order is mtime, atime: the opposite of Chtimes
+	attributes := [2]Timespec{times[1], times[0]}
+	options := 0
+	if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		options |= FSOPT_NOFOLLOW
+	}
+	return setattrlist(
+		_p0,
+		unsafe.Pointer(&attrList),
+		unsafe.Pointer(&attributes),
+		unsafe.Sizeof(attributes),
+		options)
+}
+
+//sys	setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error)
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
+	// Darwin doesn't support SYS_UTIMENSAT
+	return ENOSYS
+}
 
 /*
  * Wrapped
@@ -375,10 +291,11 @@ func Flistxattr(fd int, dest []byte) (sz int, err error) {
 func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
-//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 func IoctlCtlInfo(fd int, ctlInfo *CtlInfo) error {
-	return ioctlPtr(fd, CTLIOCGINFO, unsafe.Pointer(ctlInfo))
+	err := ioctl(fd, CTLIOCGINFO, uintptr(unsafe.Pointer(ctlInfo)))
+	runtime.KeepAlive(ctlInfo)
+	return err
 }
 
 // IfreqMTU is struct ifreq used to get or set a network device's MTU.
@@ -392,26 +309,16 @@ type IfreqMTU struct {
 func IoctlGetIfreqMTU(fd int, ifname string) (*IfreqMTU, error) {
 	var ifreq IfreqMTU
 	copy(ifreq.Name[:], ifname)
-	err := ioctlPtr(fd, SIOCGIFMTU, unsafe.Pointer(&ifreq))
+	err := ioctl(fd, SIOCGIFMTU, uintptr(unsafe.Pointer(&ifreq)))
 	return &ifreq, err
 }
 
 // IoctlSetIfreqMTU performs the SIOCSIFMTU ioctl operation on fd to set the MTU
 // of the network device specified by ifreq.Name.
 func IoctlSetIfreqMTU(fd int, ifreq *IfreqMTU) error {
-	return ioctlPtr(fd, SIOCSIFMTU, unsafe.Pointer(ifreq))
-}
-
-//sys	renamexNp(from string, to string, flag uint32) (err error)
-
-func RenamexNp(from string, to string, flag uint32) (err error) {
-	return renamexNp(from, to, flag)
-}
-
-//sys	renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error)
-
-func RenameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) {
-	return renameatxNp(fromfd, from, tofd, to, flag)
+	err := ioctl(fd, SIOCSIFMTU, uintptr(unsafe.Pointer(ifreq)))
+	runtime.KeepAlive(ifreq)
+	return err
 }
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS_SYSCTL
@@ -492,267 +399,40 @@ func GetsockoptXucred(fd, level, opt int) (*Xucred, error) {
 	return x, err
 }
 
-func GetsockoptTCPConnectionInfo(fd, level, opt int) (*TCPConnectionInfo, error) {
-	var value TCPConnectionInfo
-	vallen := _Socklen(SizeofTCPConnectionInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func SysctlKinfoProc(name string, args ...int) (*KinfoProc, error) {
-	mib, err := sysctlmib(name, args...)
+func SysctlKinfoProcSlice(name string) ([]KinfoProc, error) {
+	mib, err := sysctlmib(name)
 	if err != nil {
 		return nil, err
 	}
 
-	var kinfo KinfoProc
-	n := uintptr(SizeofKinfoProc)
-	if err := sysctl(mib, (*byte)(unsafe.Pointer(&kinfo)), &n, nil, 0); err != nil {
+	// Find size.
+	n := uintptr(0)
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
 		return nil, err
 	}
-	if n != SizeofKinfoProc {
-		return nil, EIO
+	if n == 0 {
+		return nil, nil
+	}
+	if n%SizeofKinfoProc != 0 {
+		return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
 	}
-	return &kinfo, nil
-}
 
-func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
+	// Read into buffer of that size.
+	buf := make([]KinfoProc, n/SizeofKinfoProc)
+	if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil {
 		return nil, err
 	}
-
-	for {
-		// Find size.
-		n := uintptr(0)
-		if err := sysctl(mib, nil, &n, nil, 0); err != nil {
-			return nil, err
-		}
-		if n == 0 {
-			return nil, nil
-		}
-		if n%SizeofKinfoProc != 0 {
-			return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
-		}
-
-		// Read into buffer of that size.
-		buf := make([]KinfoProc, n/SizeofKinfoProc)
-		if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil {
-			if err == ENOMEM {
-				// Process table grew. Try again.
-				continue
-			}
-			return nil, err
-		}
-		if n%SizeofKinfoProc != 0 {
-			return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
-		}
-
-		// The actual call may return less than the original reported required
-		// size so ensure we deal with that.
-		return buf[:n/SizeofKinfoProc], nil
-	}
-}
-
-//sys	pthread_chdir_np(path string) (err error)
-
-func PthreadChdir(path string) (err error) {
-	return pthread_chdir_np(path)
-}
-
-//sys	pthread_fchdir_np(fd int) (err error)
-
-func PthreadFchdir(fd int) (err error) {
-	return pthread_fchdir_np(fd)
-}
-
-// Connectx calls connectx(2) to initiate a connection on a socket.
-//
-// srcIf, srcAddr, and dstAddr are filled into a [SaEndpoints] struct and passed as the endpoints argument.
-//
-//   - srcIf is the optional source interface index. 0 means unspecified.
-//   - srcAddr is the optional source address. nil means unspecified.
-//   - dstAddr is the destination address.
-//
-// On success, Connectx returns the number of bytes enqueued for transmission.
-func Connectx(fd int, srcIf uint32, srcAddr, dstAddr Sockaddr, associd SaeAssocID, flags uint32, iov []Iovec, connid *SaeConnID) (n uintptr, err error) {
-	endpoints := SaEndpoints{
-		Srcif: srcIf,
+	if n%SizeofKinfoProc != 0 {
+		return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
 	}
 
-	if srcAddr != nil {
-		addrp, addrlen, err := srcAddr.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-		endpoints.Srcaddr = (*RawSockaddr)(addrp)
-		endpoints.Srcaddrlen = uint32(addrlen)
-	}
-
-	if dstAddr != nil {
-		addrp, addrlen, err := dstAddr.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-		endpoints.Dstaddr = (*RawSockaddr)(addrp)
-		endpoints.Dstaddrlen = uint32(addrlen)
-	}
-
-	err = connectx(fd, &endpoints, associd, flags, iov, &n, connid)
-	return
-}
-
-// sys	connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error)
-const minIovec = 8
-
-func Readv(fd int, iovs [][]byte) (n int, err error) {
-	if !darwinKernelVersionMin(11, 0, 0) {
-		return 0, ENOSYS
-	}
-
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	n, err = readv(fd, iovecs)
-	readvRacedetect(iovecs, n, err)
-	return n, err
-}
-
-func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	if !darwinKernelVersionMin(11, 0, 0) {
-		return 0, ENOSYS
-	}
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	n, err = preadv(fd, iovecs, offset)
-	readvRacedetect(iovecs, n, err)
-	return n, err
-}
-
-func Writev(fd int, iovs [][]byte) (n int, err error) {
-	if !darwinKernelVersionMin(11, 0, 0) {
-		return 0, ENOSYS
-	}
-
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = writev(fd, iovecs)
-	writevRacedetect(iovecs, n)
-	return n, err
-}
-
-func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	if !darwinKernelVersionMin(11, 0, 0) {
-		return 0, ENOSYS
-	}
-
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = pwritev(fd, iovecs, offset)
-	writevRacedetect(iovecs, n)
-	return n, err
-}
-
-func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
-	for _, b := range bs {
-		var v Iovec
-		v.SetLen(len(b))
-		if len(b) > 0 {
-			v.Base = &b[0]
-		} else {
-			v.Base = (*byte)(unsafe.Pointer(&_zero))
-		}
-		vecs = append(vecs, v)
-	}
-	return vecs
-}
-
-func writevRacedetect(iovecs []Iovec, n int) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := int(iovecs[i].Len)
-		if m > n {
-			m = n
-		}
-		n -= m
-		if m > 0 {
-			raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-}
-
-func readvRacedetect(iovecs []Iovec, n int, err error) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := int(iovecs[i].Len)
-		if m > n {
-			m = n
-		}
-		n -= m
-		if m > 0 {
-			raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-	if err == nil {
-		raceAcquire(unsafe.Pointer(&ioSync))
-	}
-}
-
-func darwinMajorMinPatch() (maj, min, patch int, err error) {
-	var un Utsname
-	err = Uname(&un)
-	if err != nil {
-		return
-	}
-
-	var mmp [3]int
-	c := 0
-Loop:
-	for _, b := range un.Release[:] {
-		switch {
-		case b >= '0' && b <= '9':
-			mmp[c] = 10*mmp[c] + int(b-'0')
-		case b == '.':
-			c++
-			if c > 2 {
-				return 0, 0, 0, ENOTSUP
-			}
-		case b == 0:
-			break Loop
-		default:
-			return 0, 0, 0, ENOTSUP
-		}
-	}
-	if c != 2 {
-		return 0, 0, 0, ENOTSUP
-	}
-	return mmp[0], mmp[1], mmp[2], nil
-}
-
-func darwinKernelVersionMin(maj, min, patch int) bool {
-	actualMaj, actualMin, actualPatch, err := darwinMajorMinPatch()
-	if err != nil {
-		return false
-	}
-	return actualMaj > maj || actualMaj == maj && (actualMin > min || actualMin == min && actualPatch >= patch)
+	// The actual call may return less than the original reported required
+	// size so ensure we deal with that.
+	return buf[:n/SizeofKinfoProc], nil
 }
 
 //sys	sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)
 
-//sys	shmat(id int, addr uintptr, flag int) (ret uintptr, err error)
-//sys	shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error)
-//sys	shmdt(addr uintptr) (err error)
-//sys	shmget(key int, size int, flag int) (id int, err error)
-
 /*
  * Exposed directly
  */
@@ -808,12 +488,11 @@ func darwinKernelVersionMin(maj, min, patch int) bool {
 //sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
@@ -823,7 +502,6 @@ func darwinKernelVersionMin(maj, min, patch int) bool {
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error)
 //sys	Setegid(egid int) (err error)
 //sysnb	Seteuid(euid int) (err error)
 //sysnb	Setgid(gid int) (err error)
@@ -833,6 +511,7 @@ func darwinKernelVersionMin(maj, min, patch int) bool {
 //sys	Setprivexec(flag int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -848,7 +527,195 @@ func darwinKernelVersionMin(maj, min, patch int) bool {
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	readv(fd int, iovecs []Iovec) (n int, err error)
-//sys	preadv(fd int, iovecs []Iovec, offset int64) (n int, err error)
-//sys	writev(fd int, iovecs []Iovec) (n int, err error)
-//sys	pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// sendfile
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
index 0eaecf5..b37310c 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && darwin
+// +build amd64,darwin
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
index f36c670..d51ec99 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && darwin
+// +build arm64,darwin
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go b/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
index 2f0fa76..53c9664 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin
+//go:build darwin && go1.12
+// +build darwin,go1.12
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index be8c002..5af108a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -101,10 +101,7 @@ func Pipe(p []int) (err error) {
 	if len(p) != 2 {
 		return EINVAL
 	}
-	r, w, err := pipe()
-	if err == nil {
-		p[0], p[1] = r, w
-	}
+	p[0], p[1], err = pipe()
 	return
 }
 
@@ -117,22 +114,17 @@ func Pipe2(p []int, flags int) (err error) {
 	var pp [2]_C_int
 	// pipe2 on dragonfly takes an fds array as an argument, but still
 	// returns the file descriptors.
-	r, w, err := pipe2(&pp, flags)
-	if err == nil {
-		p[0], p[1] = r, w
-	}
+	p[0], p[1], err = pipe2(&pp, flags)
 	return err
 }
 
 //sys	extpread(fd int, p []byte, flags int, offset int64) (n int, err error)
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	return extpread(fd, p, 0, offset)
 }
 
 //sys	extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error)
-
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return extpwrite(fd, p, 0, offset)
 }
 
@@ -171,8 +163,12 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
-//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
@@ -246,18 +242,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 	return sendfile(outfd, infd, offset, count)
 }
 
-func Dup3(oldfd, newfd, flags int) error {
-	if oldfd == newfd || flags&^O_CLOEXEC != 0 {
-		return EINVAL
-	}
-	how := F_DUP2FD
-	if flags&O_CLOEXEC != 0 {
-		how = F_DUP2FD_CLOEXEC
-	}
-	_, err := fcntl(oldfd, how, newfd)
-	return err
-}
-
 /*
  * Exposed directly
  */
@@ -268,7 +252,6 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	Chmod(path string, mode uint32) (err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	Dup(fd int) (nfd int, err error)
 //sys	Dup2(from int, to int) (err error)
@@ -338,6 +321,7 @@ func Dup3(oldfd, newfd, flags int) error {
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -355,5 +339,203 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ * TODO(jsing): Update this list for DragonFly.
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Getxattr
+// Fgetxattr
+// Setxattr
+// Fsetxattr
+// Removexattr
+// Fremovexattr
+// Listxattr
+// Flistxattr
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
index 14bab6b..4e2d321 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && dragonfly
+// +build amd64,dragonfly
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index 2b57e0f..18c392c 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -13,17 +13,29 @@
 package unix
 
 import (
-	"errors"
 	"sync"
 	"unsafe"
 )
 
+const (
+	SYS_FSTAT_FREEBSD12         = 551 // { int fstat(int fd, _Out_ struct stat *sb); }
+	SYS_FSTATAT_FREEBSD12       = 552 // { int fstatat(int fd, _In_z_ char *path, \
+	SYS_GETDIRENTRIES_FREEBSD12 = 554 // { ssize_t getdirentries(int fd, \
+	SYS_STATFS_FREEBSD12        = 555 // { int statfs(_In_z_ char *path, \
+	SYS_FSTATFS_FREEBSD12       = 556 // { int fstatfs(int fd, \
+	SYS_GETFSSTAT_FREEBSD12     = 557 // { int getfsstat( \
+	SYS_MKNODAT_FREEBSD12       = 559 // { int mknodat(int fd, _In_z_ char *path, \
+)
+
 // See https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/versions.html.
 var (
 	osreldateOnce sync.Once
 	osreldate     uint32
 )
 
+// INO64_FIRST from /usr/src/lib/libc/sys/compat-ino64.h
+const _ino64First = 1200031
+
 func supportsABI(ver uint32) bool {
 	osreldateOnce.Do(func() { osreldate, _ = SysctlUint32("kern.osreldate") })
 	return osreldate >= ver
@@ -98,10 +110,8 @@ func Pipe2(p []int, flags int) error {
 	}
 	var pp [2]_C_int
 	err := pipe2(&pp, flags)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return err
 }
 
@@ -147,49 +157,72 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var (
-		_p0     unsafe.Pointer
-		bufsize uintptr
+		_p0          unsafe.Pointer
+		bufsize      uintptr
+		oldBuf       []statfs_freebsd11_t
+		needsConvert bool
 	)
+
 	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+		if supportsABI(_ino64First) {
+			_p0 = unsafe.Pointer(&buf[0])
+			bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+		} else {
+			n := len(buf)
+			oldBuf = make([]statfs_freebsd11_t, n)
+			_p0 = unsafe.Pointer(&oldBuf[0])
+			bufsize = unsafe.Sizeof(statfs_freebsd11_t{}) * uintptr(n)
+			needsConvert = true
+		}
 	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	var sysno uintptr = SYS_GETFSSTAT
+	if supportsABI(_ino64First) {
+		sysno = SYS_GETFSSTAT_FREEBSD12
+	}
+	r0, _, e1 := Syscall(sysno, uintptr(_p0), bufsize, uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
 	}
+	if e1 == 0 && needsConvert {
+		for i := range oldBuf {
+			buf[i].convertFrom(&oldBuf[i])
+		}
+	}
 	return
 }
 
-//sys	ioctl(fd int, req uint, arg uintptr) (err error) = SYS_IOCTL
-//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
 func Uname(uname *Utsname) error {
 	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
 	n := unsafe.Sizeof(uname.Sysname)
-	// Suppress ENOMEM errors to be compatible with the C library __xuname() implementation.
-	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil && !errors.Is(err, ENOMEM) {
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
 		return err
 	}
 
 	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
 	n = unsafe.Sizeof(uname.Nodename)
-	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil && !errors.Is(err, ENOMEM) {
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
 		return err
 	}
 
 	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
 	n = unsafe.Sizeof(uname.Release)
-	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil && !errors.Is(err, ENOMEM) {
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
 		return err
 	}
 
 	mib = []_C_int{CTL_KERN, KERN_VERSION}
 	n = unsafe.Sizeof(uname.Version)
-	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil && !errors.Is(err, ENOMEM) {
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
 		return err
 	}
 
@@ -207,7 +240,7 @@ func Uname(uname *Utsname) error {
 
 	mib = []_C_int{CTL_HW, HW_MACHINE}
 	n = unsafe.Sizeof(uname.Machine)
-	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil && !errors.Is(err, ENOMEM) {
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
 		return err
 	}
 
@@ -215,11 +248,87 @@ func Uname(uname *Utsname) error {
 }
 
 func Stat(path string, st *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, st, 0)
+	var oldStat stat_freebsd11_t
+	if supportsABI(_ino64First) {
+		return fstatat_freebsd12(AT_FDCWD, path, st, 0)
+	}
+	err = stat(path, &oldStat)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStat)
+	return nil
 }
 
 func Lstat(path string, st *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, st, AT_SYMLINK_NOFOLLOW)
+	var oldStat stat_freebsd11_t
+	if supportsABI(_ino64First) {
+		return fstatat_freebsd12(AT_FDCWD, path, st, AT_SYMLINK_NOFOLLOW)
+	}
+	err = lstat(path, &oldStat)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStat)
+	return nil
+}
+
+func Fstat(fd int, st *Stat_t) (err error) {
+	var oldStat stat_freebsd11_t
+	if supportsABI(_ino64First) {
+		return fstat_freebsd12(fd, st)
+	}
+	err = fstat(fd, &oldStat)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStat)
+	return nil
+}
+
+func Fstatat(fd int, path string, st *Stat_t, flags int) (err error) {
+	var oldStat stat_freebsd11_t
+	if supportsABI(_ino64First) {
+		return fstatat_freebsd12(fd, path, st, flags)
+	}
+	err = fstatat(fd, path, &oldStat, flags)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStat)
+	return nil
+}
+
+func Statfs(path string, st *Statfs_t) (err error) {
+	var oldStatfs statfs_freebsd11_t
+	if supportsABI(_ino64First) {
+		return statfs_freebsd12(path, st)
+	}
+	err = statfs(path, &oldStatfs)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStatfs)
+	return nil
+}
+
+func Fstatfs(fd int, st *Statfs_t) (err error) {
+	var oldStatfs statfs_freebsd11_t
+	if supportsABI(_ino64First) {
+		return fstatfs_freebsd12(fd, st)
+	}
+	err = fstatfs(fd, &oldStatfs)
+	if err != nil {
+		return err
+	}
+
+	st.convertFrom(&oldStatfs)
+	return nil
 }
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -227,25 +336,162 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 }
 
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	if basep == nil || unsafe.Sizeof(*basep) == 8 {
-		return getdirentries(fd, buf, (*uint64)(unsafe.Pointer(basep)))
+	if supportsABI(_ino64First) {
+		if basep == nil || unsafe.Sizeof(*basep) == 8 {
+			return getdirentries_freebsd12(fd, buf, (*uint64)(unsafe.Pointer(basep)))
+		}
+		// The freebsd12 syscall needs a 64-bit base. On 32-bit machines
+		// we can't just use the basep passed in. See #32498.
+		var base uint64 = uint64(*basep)
+		n, err = getdirentries_freebsd12(fd, buf, &base)
+		*basep = uintptr(base)
+		if base>>32 != 0 {
+			// We can't stuff the base back into a uintptr, so any
+			// future calls would be suspect. Generate an error.
+			// EIO is allowed by getdirentries.
+			err = EIO
+		}
+		return
 	}
-	// The syscall needs a 64-bit base. On 32-bit machines
-	// we can't just use the basep passed in. See #32498.
-	var base uint64 = uint64(*basep)
-	n, err = getdirentries(fd, buf, &base)
-	*basep = uintptr(base)
-	if base>>32 != 0 {
-		// We can't stuff the base back into a uintptr, so any
-		// future calls would be suspect. Generate an error.
-		// EIO is allowed by getdirentries.
-		err = EIO
+
+	// The old syscall entries are smaller than the new. Use 1/4 of the original
+	// buffer size rounded up to DIRBLKSIZ (see /usr/src/lib/libc/sys/getdirentries.c).
+	oldBufLen := roundup(len(buf)/4, _dirblksiz)
+	oldBuf := make([]byte, oldBufLen)
+	n, err = getdirentries(fd, oldBuf, basep)
+	if err == nil && n > 0 {
+		n = convertFromDirents11(buf, oldBuf[:n])
 	}
 	return
 }
 
 func Mknod(path string, mode uint32, dev uint64) (err error) {
-	return Mknodat(AT_FDCWD, path, mode, dev)
+	var oldDev int
+	if supportsABI(_ino64First) {
+		return mknodat_freebsd12(AT_FDCWD, path, mode, dev)
+	}
+	oldDev = int(dev)
+	return mknod(path, mode, oldDev)
+}
+
+func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
+	var oldDev int
+	if supportsABI(_ino64First) {
+		return mknodat_freebsd12(fd, path, mode, dev)
+	}
+	oldDev = int(dev)
+	return mknodat(fd, path, mode, oldDev)
+}
+
+// round x to the nearest multiple of y, larger or equal to x.
+//
+// from /usr/include/sys/param.h Macros for counting and rounding.
+// #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+func roundup(x, y int) int {
+	return ((x + y - 1) / y) * y
+}
+
+func (s *Stat_t) convertFrom(old *stat_freebsd11_t) {
+	*s = Stat_t{
+		Dev:     uint64(old.Dev),
+		Ino:     uint64(old.Ino),
+		Nlink:   uint64(old.Nlink),
+		Mode:    old.Mode,
+		Uid:     old.Uid,
+		Gid:     old.Gid,
+		Rdev:    uint64(old.Rdev),
+		Atim:    old.Atim,
+		Mtim:    old.Mtim,
+		Ctim:    old.Ctim,
+		Btim:    old.Btim,
+		Size:    old.Size,
+		Blocks:  old.Blocks,
+		Blksize: old.Blksize,
+		Flags:   old.Flags,
+		Gen:     uint64(old.Gen),
+	}
+}
+
+func (s *Statfs_t) convertFrom(old *statfs_freebsd11_t) {
+	*s = Statfs_t{
+		Version:     _statfsVersion,
+		Type:        old.Type,
+		Flags:       old.Flags,
+		Bsize:       old.Bsize,
+		Iosize:      old.Iosize,
+		Blocks:      old.Blocks,
+		Bfree:       old.Bfree,
+		Bavail:      old.Bavail,
+		Files:       old.Files,
+		Ffree:       old.Ffree,
+		Syncwrites:  old.Syncwrites,
+		Asyncwrites: old.Asyncwrites,
+		Syncreads:   old.Syncreads,
+		Asyncreads:  old.Asyncreads,
+		// Spare
+		Namemax: old.Namemax,
+		Owner:   old.Owner,
+		Fsid:    old.Fsid,
+		// Charspare
+		// Fstypename
+		// Mntfromname
+		// Mntonname
+	}
+
+	sl := old.Fstypename[:]
+	n := clen(*(*[]byte)(unsafe.Pointer(&sl)))
+	copy(s.Fstypename[:], old.Fstypename[:n])
+
+	sl = old.Mntfromname[:]
+	n = clen(*(*[]byte)(unsafe.Pointer(&sl)))
+	copy(s.Mntfromname[:], old.Mntfromname[:n])
+
+	sl = old.Mntonname[:]
+	n = clen(*(*[]byte)(unsafe.Pointer(&sl)))
+	copy(s.Mntonname[:], old.Mntonname[:n])
+}
+
+func convertFromDirents11(buf []byte, old []byte) int {
+	const (
+		fixedSize    = int(unsafe.Offsetof(Dirent{}.Name))
+		oldFixedSize = int(unsafe.Offsetof(dirent_freebsd11{}.Name))
+	)
+
+	dstPos := 0
+	srcPos := 0
+	for dstPos+fixedSize < len(buf) && srcPos+oldFixedSize < len(old) {
+		var dstDirent Dirent
+		var srcDirent dirent_freebsd11
+
+		// If multiple direntries are written, sometimes when we reach the final one,
+		// we may have cap of old less than size of dirent_freebsd11.
+		copy((*[unsafe.Sizeof(srcDirent)]byte)(unsafe.Pointer(&srcDirent))[:], old[srcPos:])
+
+		reclen := roundup(fixedSize+int(srcDirent.Namlen)+1, 8)
+		if dstPos+reclen > len(buf) {
+			break
+		}
+
+		dstDirent.Fileno = uint64(srcDirent.Fileno)
+		dstDirent.Off = 0
+		dstDirent.Reclen = uint16(reclen)
+		dstDirent.Type = srcDirent.Type
+		dstDirent.Pad0 = 0
+		dstDirent.Namlen = uint16(srcDirent.Namlen)
+		dstDirent.Pad1 = 0
+
+		copy(dstDirent.Name[:], srcDirent.Name[:srcDirent.Namlen])
+		copy(buf[dstPos:], (*[unsafe.Sizeof(dstDirent)]byte)(unsafe.Pointer(&dstDirent))[:])
+		padding := buf[dstPos+fixedSize+int(dstDirent.Namlen) : dstPos+reclen]
+		for i := range padding {
+			padding[i] = 0
+		}
+
+		dstPos += int(dstDirent.Reclen)
+		srcPos += int(srcDirent.Reclen)
+	}
+
+	return dstPos
 }
 
 func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
@@ -256,51 +502,33 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 //sys	ptrace(request int, pid int, addr uintptr, data int) (err error)
-//sys	ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) = SYS_PTRACE
 
 func PtraceAttach(pid int) (err error) {
-	return ptrace(PT_ATTACH, pid, 0, 0)
+	return ptrace(PTRACE_ATTACH, pid, 0, 0)
 }
 
 func PtraceCont(pid int, signal int) (err error) {
-	return ptrace(PT_CONTINUE, pid, 1, signal)
+	return ptrace(PTRACE_CONT, pid, 1, signal)
 }
 
 func PtraceDetach(pid int) (err error) {
-	return ptrace(PT_DETACH, pid, 1, 0)
+	return ptrace(PTRACE_DETACH, pid, 1, 0)
 }
 
 func PtraceGetFpRegs(pid int, fpregsout *FpReg) (err error) {
-	return ptracePtr(PT_GETFPREGS, pid, unsafe.Pointer(fpregsout), 0)
+	return ptrace(PTRACE_GETFPREGS, pid, uintptr(unsafe.Pointer(fpregsout)), 0)
 }
 
 func PtraceGetRegs(pid int, regsout *Reg) (err error) {
-	return ptracePtr(PT_GETREGS, pid, unsafe.Pointer(regsout), 0)
-}
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-	}
-	if countin > 0 {
-		_ = out[:countin] // check bounds
-		ioDesc.Addr = &out[0]
-	} else if out != nil {
-		ioDesc.Addr = (*byte)(unsafe.Pointer(&_zero))
-	}
-	ioDesc.SetLen(countin)
-
-	err = ptracePtr(PT_IO, pid, unsafe.Pointer(&ioDesc), 0)
-	return int(ioDesc.Len), err
+	return ptrace(PTRACE_GETREGS, pid, uintptr(unsafe.Pointer(regsout)), 0)
 }
 
 func PtraceLwpEvents(pid int, enable int) (err error) {
-	return ptrace(PT_LWP_EVENTS, pid, 0, enable)
+	return ptrace(PTRACE_LWPEVENTS, pid, 0, enable)
 }
 
-func PtraceLwpInfo(pid int, info *PtraceLwpInfoStruct) (err error) {
-	return ptracePtr(PT_LWPINFO, pid, unsafe.Pointer(info), int(unsafe.Sizeof(*info)))
+func PtraceLwpInfo(pid int, info uintptr) (err error) {
+	return ptrace(PTRACE_LWPINFO, pid, info, int(unsafe.Sizeof(PtraceLwpInfoStruct{})))
 }
 
 func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
@@ -320,23 +548,11 @@ func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
 }
 
 func PtraceSetRegs(pid int, regs *Reg) (err error) {
-	return ptracePtr(PT_SETREGS, pid, unsafe.Pointer(regs), 0)
+	return ptrace(PTRACE_SETREGS, pid, uintptr(unsafe.Pointer(regs)), 0)
 }
 
 func PtraceSingleStep(pid int) (err error) {
-	return ptrace(PT_STEP, pid, 1, 0)
-}
-
-func Dup3(oldfd, newfd, flags int) error {
-	if oldfd == newfd || flags&^O_CLOEXEC != 0 {
-		return EINVAL
-	}
-	how := F_DUP2FD
-	if flags&O_CLOEXEC != 0 {
-		how = F_DUP2FD_CLOEXEC
-	}
-	_, err := fcntl(oldfd, how, newfd)
-	return err
+	return ptrace(PTRACE_SINGLESTEP, pid, 1, 0)
 }
 
 /*
@@ -352,7 +568,6 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	Chmod(path string, mode uint32) (err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	Dup(fd int) (nfd int, err error)
 //sys	Dup2(from int, to int) (err error)
@@ -379,12 +594,16 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	fstat(fd int, stat *stat_freebsd11_t) (err error)
+//sys	fstat_freebsd12(fd int, stat *Stat_t) (err error)
+//sys	fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error)
+//sys	fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	fstatfs(fd int, stat *statfs_freebsd11_t) (err error)
+//sys	fstatfs_freebsd12(fd int, stat *Statfs_t) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
-//sys	getdirentries(fd int, buf []byte, basep *uint64) (n int, err error)
+//sys	getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sys	getdirentries_freebsd12(fd int, buf []byte, basep *uint64) (n int, err error)
 //sys	Getdtablesize() (size int)
 //sysnb	Getegid() (egid int)
 //sysnb	Geteuid() (uid int)
@@ -406,16 +625,19 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	Link(path string, link string) (err error)
 //sys	Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error)
 //sys	Listen(s int, backlog int) (err error)
+//sys	lstat(path string, stat *stat_freebsd11_t) (err error)
 //sys	Mkdir(path string, mode uint32) (err error)
 //sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknodat(fd int, path string, mode uint32, dev uint64) (err error)
+//sys	mknod(path string, mode uint32, dev int) (err error)
+//sys	mknodat(fd int, path string, mode uint32, dev int) (err error)
+//sys	mknodat_freebsd12(fd int, path string, mode uint32, dev uint64) (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Openat(fdat int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
@@ -435,10 +657,13 @@ func Dup3(oldfd, newfd, flags int) error {
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	stat(path string, stat *stat_freebsd11_t) (err error)
+//sys	statfs(path string, stat *statfs_freebsd11_t) (err error)
+//sys	statfs_freebsd12(path string, stat *Statfs_t) (err error)
 //sys	Symlink(path string, link string) (err error)
 //sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
 //sys	Sync() (err error)
@@ -451,5 +676,197 @@ func Dup3(oldfd, newfd, flags int) error {
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdents
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
index 3967bca..342fc32 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && freebsd
+// +build 386,freebsd
 
 package unix
 
@@ -41,10 +42,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
-func (d *PtraceIoDesc) SetLen(length int) {
-	d.Len = uint32(length)
-}
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
@@ -60,5 +57,11 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
-	return ptracePtr(PT_GETFSBASE, pid, unsafe.Pointer(fsbase), 0)
+	return ptrace(PTRACE_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
+}
+
+func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint32(countin)}
+	err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
+	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
index eff19ad..a32d5aa 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && freebsd
+// +build amd64,freebsd
 
 package unix
 
@@ -41,10 +42,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
-func (d *PtraceIoDesc) SetLen(length int) {
-	d.Len = uint64(length)
-}
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
@@ -60,5 +57,11 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
-	return ptracePtr(PT_GETFSBASE, pid, unsafe.Pointer(fsbase), 0)
+	return ptrace(PTRACE_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
+}
+
+func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint64(countin)}
+	err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
+	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
index 4f24b51..1e36d39 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm && freebsd
+// +build arm,freebsd
 
 package unix
 
@@ -41,10 +42,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
-func (d *PtraceIoDesc) SetLen(length int) {
-	d.Len = uint32(length)
-}
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
@@ -58,3 +55,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint32(countin)}
+	err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
+	return int(ioDesc.Len), err
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
index ac30759..a09a153 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && freebsd
+// +build arm64,freebsd
 
 package unix
 
@@ -41,10 +42,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
-func (d *PtraceIoDesc) SetLen(length int) {
-	d.Len = uint64(length)
-}
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
@@ -58,3 +55,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint64(countin)}
+	err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
+	return int(ioDesc.Len), err
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
deleted file mode 100644
index aab725c..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build riscv64 && freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func setTimespec(sec, nsec int64) Timespec {
-	return Timespec{Sec: sec, Nsec: nsec}
-}
-
-func setTimeval(sec, usec int64) Timeval {
-	return Timeval{Sec: sec, Usec: usec}
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (msghdr *Msghdr) SetIovlen(length int) {
-	msghdr.Iovlen = int32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func (d *PtraceIoDesc) SetLen(length int) {
-	d.Len = uint64(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_hurd.go b/vendor/golang.org/x/sys/unix/syscall_hurd.go
deleted file mode 100644
index a6a2d2f..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_hurd.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build hurd
-
-package unix
-
-/*
-#include <stdint.h>
-int ioctl(int, unsigned long int, uintptr_t);
-*/
-import "C"
-import "unsafe"
-
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	r0, er := C.ioctl(C.int(fd), C.ulong(req), C.uintptr_t(arg))
-	if r0 == -1 && er != nil {
-		err = er
-	}
-	return
-}
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	r0, er := C.ioctl(C.int(fd), C.ulong(req), C.uintptr_t(uintptr(arg)))
-	if r0 == -1 && er != nil {
-		err = er
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_hurd_386.go b/vendor/golang.org/x/sys/unix/syscall_hurd_386.go
deleted file mode 100644
index df89f9e..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_hurd_386.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build 386 && hurd
-
-package unix
-
-const (
-	TIOCGETA = 0x62251713
-)
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_illumos.go b/vendor/golang.org/x/sys/unix/syscall_illumos.go
index a863f70..8d5f294 100644
--- a/vendor/golang.org/x/sys/unix/syscall_illumos.go
+++ b/vendor/golang.org/x/sys/unix/syscall_illumos.go
@@ -5,10 +5,13 @@
 // illumos system calls not present on Solaris.
 
 //go:build amd64 && illumos
+// +build amd64,illumos
 
 package unix
 
 import (
+	"fmt"
+	"runtime"
 	"unsafe"
 )
 
@@ -17,9 +20,10 @@ func bytes2iovec(bs [][]byte) []Iovec {
 	for i, b := range bs {
 		iovecs[i].SetLen(len(b))
 		if len(b) > 0 {
-			iovecs[i].Base = &b[0]
+			// somehow Iovec.Base on illumos is (*int8), not (*byte)
+			iovecs[i].Base = (*int8)(unsafe.Pointer(&b[0]))
 		} else {
-			iovecs[i].Base = (*byte)(unsafe.Pointer(&_zero))
+			iovecs[i].Base = (*int8)(unsafe.Pointer(&_zero))
 		}
 	}
 	return iovecs
@@ -76,3 +80,107 @@ func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
 	}
 	return
 }
+
+//sys	putmsg(fd int, clptr *strbuf, dataptr *strbuf, flags int) (err error)
+
+func Putmsg(fd int, cl []byte, data []byte, flags int) (err error) {
+	var clp, datap *strbuf
+	if len(cl) > 0 {
+		clp = &strbuf{
+			Len: int32(len(cl)),
+			Buf: (*int8)(unsafe.Pointer(&cl[0])),
+		}
+	}
+	if len(data) > 0 {
+		datap = &strbuf{
+			Len: int32(len(data)),
+			Buf: (*int8)(unsafe.Pointer(&data[0])),
+		}
+	}
+	return putmsg(fd, clp, datap, flags)
+}
+
+//sys	getmsg(fd int, clptr *strbuf, dataptr *strbuf, flags *int) (err error)
+
+func Getmsg(fd int, cl []byte, data []byte) (retCl []byte, retData []byte, flags int, err error) {
+	var clp, datap *strbuf
+	if len(cl) > 0 {
+		clp = &strbuf{
+			Maxlen: int32(len(cl)),
+			Buf:    (*int8)(unsafe.Pointer(&cl[0])),
+		}
+	}
+	if len(data) > 0 {
+		datap = &strbuf{
+			Maxlen: int32(len(data)),
+			Buf:    (*int8)(unsafe.Pointer(&data[0])),
+		}
+	}
+
+	if err = getmsg(fd, clp, datap, &flags); err != nil {
+		return nil, nil, 0, err
+	}
+
+	if len(cl) > 0 {
+		retCl = cl[:clp.Len]
+	}
+	if len(data) > 0 {
+		retData = data[:datap.Len]
+	}
+	return retCl, retData, flags, nil
+}
+
+func IoctlSetIntRetInt(fd int, req uint, arg int) (int, error) {
+	return ioctlRet(fd, req, uintptr(arg))
+}
+
+func IoctlSetString(fd int, req uint, val string) error {
+	bs := make([]byte, len(val)+1)
+	copy(bs[:len(bs)-1], val)
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&bs[0])))
+	runtime.KeepAlive(&bs[0])
+	return err
+}
+
+// Lifreq Helpers
+
+func (l *Lifreq) SetName(name string) error {
+	if len(name) >= len(l.Name) {
+		return fmt.Errorf("name cannot be more than %d characters", len(l.Name)-1)
+	}
+	for i := range name {
+		l.Name[i] = int8(name[i])
+	}
+	return nil
+}
+
+func (l *Lifreq) SetLifruInt(d int) {
+	*(*int)(unsafe.Pointer(&l.Lifru[0])) = d
+}
+
+func (l *Lifreq) GetLifruInt() int {
+	return *(*int)(unsafe.Pointer(&l.Lifru[0]))
+}
+
+func (l *Lifreq) SetLifruUint(d uint) {
+	*(*uint)(unsafe.Pointer(&l.Lifru[0])) = d
+}
+
+func (l *Lifreq) GetLifruUint() uint {
+	return *(*uint)(unsafe.Pointer(&l.Lifru[0]))
+}
+
+func IoctlLifreq(fd int, req uint, l *Lifreq) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(l)))
+}
+
+// Strioctl Helpers
+
+func (s *Strioctl) SetInt(i int) {
+	s.Len = int32(unsafe.Sizeof(i))
+	s.Dp = (*int8)(unsafe.Pointer(&i))
+}
+
+func IoctlSetStrioctlRetInt(fd int, req uint, s *Strioctl) (int, error) {
+	return ioctlRet(fd, req, uintptr(unsafe.Pointer(s)))
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 4958a65..60d6c16 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -13,10 +13,8 @@ package unix
 
 import (
 	"encoding/binary"
-	"slices"
-	"strconv"
+	"runtime"
 	"syscall"
-	"time"
 	"unsafe"
 )
 
@@ -40,13 +38,6 @@ func Creat(path string, mode uint32) (fd int, err error) {
 	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
 }
 
-func EpollCreate(size int) (fd int, err error) {
-	if size <= 0 {
-		return -1, EINVAL
-	}
-	return EpollCreate1(0)
-}
-
 //sys	FanotifyInit(flags uint, event_f_flags uint) (fd int, err error)
 //sys	fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error)
 
@@ -62,31 +53,19 @@ func FanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname string) (
 }
 
 //sys	fchmodat(dirfd int, path string, mode uint32) (err error)
-//sys	fchmodat2(dirfd int, path string, mode uint32, flags int) (err error)
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) error {
-	// Linux fchmodat doesn't support the flags parameter, but fchmodat2 does.
-	// Try fchmodat2 if flags are specified.
-	if flags != 0 {
-		err := fchmodat2(dirfd, path, mode, flags)
-		if err == ENOSYS {
-			// fchmodat2 isn't available. If the flags are known to be valid,
-			// return EOPNOTSUPP to indicate that fchmodat doesn't support them.
-			if flags&^(AT_SYMLINK_NOFOLLOW|AT_EMPTY_PATH) != 0 {
-				return EINVAL
-			} else if flags&(AT_SYMLINK_NOFOLLOW|AT_EMPTY_PATH) != 0 {
-				return EOPNOTSUPP
-			}
-		}
-		return err
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	// Linux fchmodat doesn't support the flags parameter. Mimick glibc's behavior
+	// and check the flags. Otherwise the mode would be applied to the symlink
+	// destination which is not what the user expects.
+	if flags&^AT_SYMLINK_NOFOLLOW != 0 {
+		return EINVAL
+	} else if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		return EOPNOTSUPP
 	}
 	return fchmodat(dirfd, path, mode)
 }
 
-func InotifyInit() (fd int, err error) {
-	return InotifyInit1(0)
-}
-
 //sys	ioctl(fd int, req uint, arg uintptr) (err error) = SYS_IOCTL
 //sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
@@ -130,25 +109,6 @@ func Openat2(dirfd int, path string, how *OpenHow) (fd int, err error) {
 	return openat2(dirfd, path, how, SizeofOpenHow)
 }
 
-func Pipe(p []int) error {
-	return Pipe2(p, 0)
-}
-
-//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) error {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err := pipe2(&pp, flags)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
-	return err
-}
-
 //sys	ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
 
 func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
@@ -158,15 +118,6 @@ func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error
 	return ppoll(&fds[0], len(fds), timeout, sigmask)
 }
 
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	var ts *Timespec
-	if timeout >= 0 {
-		ts = new(Timespec)
-		*ts = NsecToTimespec(int64(timeout) * 1e6)
-	}
-	return Ppoll(fds, ts, nil)
-}
-
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -243,7 +194,7 @@ func Futimesat(dirfd int, path string, tv []Timeval) error {
 func Futimes(fd int, tv []Timeval) (err error) {
 	// Believe it or not, this is the best we can do on Linux
 	// (and is what glibc does).
-	return Utimes("/proc/self/fd/"+strconv.Itoa(fd), tv)
+	return Utimes("/proc/self/fd/"+itoa(fd), tv)
 }
 
 const ImplementsGetwd = true
@@ -260,13 +211,6 @@ func Getwd() (wd string, err error) {
 	if n < 1 || n > len(buf) || buf[n-1] != 0 {
 		return "", EINVAL
 	}
-	// In some cases, Linux can return a path that starts with the
-	// "(unreachable)" prefix, which can potentially be a valid relative
-	// path. To work around that, return ENOENT if path is not absolute.
-	if buf[0] != '/' {
-		return "", ENOENT
-	}
-
 	return string(buf[0 : n-1]), nil
 }
 
@@ -376,8 +320,6 @@ func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int,
 	return
 }
 
-//sys	Waitid(idType int, id int, info *Siginfo, options int, rusage *Rusage) (err error)
-
 func Mkfifo(path string, mode uint32) error {
 	return Mknod(path, mode|S_IFIFO, 0)
 }
@@ -394,7 +336,9 @@ func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
 }
 
@@ -407,7 +351,9 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
 }
 
@@ -418,7 +364,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 		return nil, 0, EINVAL
 	}
 	sa.raw.Family = AF_UNIX
-	for i := range n {
+	for i := 0; i < n; i++ {
 		sa.raw.Path[i] = int8(name[i])
 	}
 	// length is family (uint16), name, NUL.
@@ -426,8 +372,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	if n > 0 {
 		sl += _Socklen(n) + 1
 	}
-	if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
-		// Check sl > 3 so we don't change unnamed socket behavior.
+	if sa.raw.Path[0] == '@' {
 		sa.raw.Path[0] = 0
 		// Don't count trailing NUL for abstract address.
 		sl--
@@ -457,7 +402,9 @@ func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Hatype = sa.Hatype
 	sa.raw.Pkttype = sa.Pkttype
 	sa.raw.Halen = sa.Halen
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
 }
 
@@ -508,7 +455,7 @@ func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	psm := (*[2]byte)(unsafe.Pointer(&sa.raw.Psm))
 	psm[0] = byte(sa.PSM)
 	psm[1] = byte(sa.PSM >> 8)
-	for i := range len(sa.Addr) {
+	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Bdaddr[i] = sa.Addr[len(sa.Addr)-1-i]
 	}
 	cid := (*[2]byte)(unsafe.Pointer(&sa.raw.Cid))
@@ -523,24 +470,24 @@ func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
 //
 // Server example:
 //
-//	fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
-//	_ = unix.Bind(fd, &unix.SockaddrRFCOMM{
-//		Channel: 1,
-//		Addr:    [6]uint8{0, 0, 0, 0, 0, 0}, // BDADDR_ANY or 00:00:00:00:00:00
-//	})
-//	_ = Listen(fd, 1)
-//	nfd, sa, _ := Accept(fd)
-//	fmt.Printf("conn addr=%v fd=%d", sa.(*unix.SockaddrRFCOMM).Addr, nfd)
-//	Read(nfd, buf)
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = unix.Bind(fd, &unix.SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]uint8{0, 0, 0, 0, 0, 0}, // BDADDR_ANY or 00:00:00:00:00:00
+//      })
+//      _ = Listen(fd, 1)
+//      nfd, sa, _ := Accept(fd)
+//      fmt.Printf("conn addr=%v fd=%d", sa.(*unix.SockaddrRFCOMM).Addr, nfd)
+//      Read(nfd, buf)
 //
 // Client example:
 //
-//	fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
-//	_ = Connect(fd, &SockaddrRFCOMM{
-//		Channel: 1,
-//		Addr:    [6]byte{0x11, 0x22, 0x33, 0xaa, 0xbb, 0xcc}, // CC:BB:AA:33:22:11
-//	})
-//	Write(fd, []byte(`hello`))
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = Connect(fd, &SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]byte{0x11, 0x22, 0x33, 0xaa, 0xbb, 0xcc}, // CC:BB:AA:33:22:11
+//      })
+//      Write(fd, []byte(`hello`))
 type SockaddrRFCOMM struct {
 	// Addr represents a bluetooth address, byte ordering is little-endian.
 	Addr [6]uint8
@@ -567,12 +514,12 @@ func (sa *SockaddrRFCOMM) sockaddr() (unsafe.Pointer, _Socklen, error) {
 // The SockaddrCAN struct must be bound to the socket file descriptor
 // using Bind before the CAN socket can be used.
 //
-//	// Read one raw CAN frame
-//	fd, _ := Socket(AF_CAN, SOCK_RAW, CAN_RAW)
-//	addr := &SockaddrCAN{Ifindex: index}
-//	Bind(fd, addr)
-//	frame := make([]byte, 16)
-//	Read(fd, frame)
+//      // Read one raw CAN frame
+//      fd, _ := Socket(AF_CAN, SOCK_RAW, CAN_RAW)
+//      addr := &SockaddrCAN{Ifindex: index}
+//      Bind(fd, addr)
+//      frame := make([]byte, 16)
+//      Read(fd, frame)
 //
 // The full SocketCAN documentation can be found in the linux kernel
 // archives at: https://www.kernel.org/doc/Documentation/networking/can.txt
@@ -590,11 +537,11 @@ func (sa *SockaddrCAN) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Family = AF_CAN
 	sa.raw.Ifindex = int32(sa.Ifindex)
 	rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
-	for i := range 4 {
+	for i := 0; i < 4; i++ {
 		sa.raw.Addr[i] = rx[i]
 	}
 	tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
-	for i := range 4 {
+	for i := 0; i < 4; i++ {
 		sa.raw.Addr[i+4] = tx[i]
 	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrCAN, nil
@@ -619,11 +566,11 @@ func (sa *SockaddrCANJ1939) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Family = AF_CAN
 	sa.raw.Ifindex = int32(sa.Ifindex)
 	n := (*[8]byte)(unsafe.Pointer(&sa.Name))
-	for i := range 8 {
+	for i := 0; i < 8; i++ {
 		sa.raw.Addr[i] = n[i]
 	}
 	p := (*[4]byte)(unsafe.Pointer(&sa.PGN))
-	for i := range 4 {
+	for i := 0; i < 4; i++ {
 		sa.raw.Addr[i+8] = p[i]
 	}
 	sa.raw.Addr[12] = sa.Addr
@@ -643,13 +590,13 @@ func (sa *SockaddrCANJ1939) sockaddr() (unsafe.Pointer, _Socklen, error) {
 // Here is an example of using an AF_ALG socket with SHA1 hashing.
 // The initial socket setup process is as follows:
 //
-//	// Open a socket to perform SHA1 hashing.
-//	fd, _ := unix.Socket(unix.AF_ALG, unix.SOCK_SEQPACKET, 0)
-//	addr := &unix.SockaddrALG{Type: "hash", Name: "sha1"}
-//	unix.Bind(fd, addr)
-//	// Note: unix.Accept does not work at this time; must invoke accept()
-//	// manually using unix.Syscall.
-//	hashfd, _, _ := unix.Syscall(unix.SYS_ACCEPT, uintptr(fd), 0, 0)
+//      // Open a socket to perform SHA1 hashing.
+//      fd, _ := unix.Socket(unix.AF_ALG, unix.SOCK_SEQPACKET, 0)
+//      addr := &unix.SockaddrALG{Type: "hash", Name: "sha1"}
+//      unix.Bind(fd, addr)
+//      // Note: unix.Accept does not work at this time; must invoke accept()
+//      // manually using unix.Syscall.
+//      hashfd, _, _ := unix.Syscall(unix.SYS_ACCEPT, uintptr(fd), 0, 0)
 //
 // Once a file descriptor has been returned from Accept, it may be used to
 // perform SHA1 hashing. The descriptor is not safe for concurrent use, but
@@ -658,39 +605,39 @@ func (sa *SockaddrCANJ1939) sockaddr() (unsafe.Pointer, _Socklen, error) {
 // When hashing a small byte slice or string, a single Write and Read may
 // be used:
 //
-//	// Assume hashfd is already configured using the setup process.
-//	hash := os.NewFile(hashfd, "sha1")
-//	// Hash an input string and read the results. Each Write discards
-//	// previous hash state. Read always reads the current state.
-//	b := make([]byte, 20)
-//	for i := 0; i < 2; i++ {
-//	    io.WriteString(hash, "Hello, world.")
-//	    hash.Read(b)
-//	    fmt.Println(hex.EncodeToString(b))
-//	}
-//	// Output:
-//	// 2ae01472317d1935a84797ec1983ae243fc6aa28
-//	// 2ae01472317d1935a84797ec1983ae243fc6aa28
+//      // Assume hashfd is already configured using the setup process.
+//      hash := os.NewFile(hashfd, "sha1")
+//      // Hash an input string and read the results. Each Write discards
+//      // previous hash state. Read always reads the current state.
+//      b := make([]byte, 20)
+//      for i := 0; i < 2; i++ {
+//          io.WriteString(hash, "Hello, world.")
+//          hash.Read(b)
+//          fmt.Println(hex.EncodeToString(b))
+//      }
+//      // Output:
+//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
+//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
 //
 // For hashing larger byte slices, or byte streams such as those read from
 // a file or socket, use Sendto with MSG_MORE to instruct the kernel to update
 // the hash digest instead of creating a new one for a given chunk and finalizing it.
 //
-//	// Assume hashfd and addr are already configured using the setup process.
-//	hash := os.NewFile(hashfd, "sha1")
-//	// Hash the contents of a file.
-//	f, _ := os.Open("/tmp/linux-4.10-rc7.tar.xz")
-//	b := make([]byte, 4096)
-//	for {
-//	    n, err := f.Read(b)
-//	    if err == io.EOF {
-//	        break
-//	    }
-//	    unix.Sendto(hashfd, b[:n], unix.MSG_MORE, addr)
-//	}
-//	hash.Read(b)
-//	fmt.Println(hex.EncodeToString(b))
-//	// Output: 85cdcad0c06eef66f805ecce353bec9accbeecc5
+//      // Assume hashfd and addr are already configured using the setup process.
+//      hash := os.NewFile(hashfd, "sha1")
+//      // Hash the contents of a file.
+//      f, _ := os.Open("/tmp/linux-4.10-rc7.tar.xz")
+//      b := make([]byte, 4096)
+//      for {
+//          n, err := f.Read(b)
+//          if err == io.EOF {
+//              break
+//          }
+//          unix.Sendto(hashfd, b[:n], unix.MSG_MORE, addr)
+//      }
+//      hash.Read(b)
+//      fmt.Println(hex.EncodeToString(b))
+//      // Output: 85cdcad0c06eef66f805ecce353bec9accbeecc5
 //
 // For more information, see: http://www.chronox.de/crypto-API/crypto/userspace-if.html.
 type SockaddrALG struct {
@@ -703,10 +650,10 @@ type SockaddrALG struct {
 
 func (sa *SockaddrALG) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	// Leave room for NUL byte terminator.
-	if len(sa.Type) > len(sa.raw.Type)-1 {
+	if len(sa.Type) > 13 {
 		return nil, 0, EINVAL
 	}
-	if len(sa.Name) > len(sa.raw.Name)-1 {
+	if len(sa.Name) > 63 {
 		return nil, 0, EINVAL
 	}
 
@@ -714,8 +661,17 @@ func (sa *SockaddrALG) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Feat = sa.Feature
 	sa.raw.Mask = sa.Mask
 
-	copy(sa.raw.Type[:], sa.Type)
-	copy(sa.raw.Name[:], sa.Name)
+	typ, err := ByteSliceFromString(sa.Type)
+	if err != nil {
+		return nil, 0, err
+	}
+	name, err := ByteSliceFromString(sa.Name)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	copy(sa.raw.Type[:], typ)
+	copy(sa.raw.Name[:], name)
 
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrALG, nil
 }
@@ -863,10 +819,12 @@ func (sa *SockaddrTIPC) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	if sa.Addr == nil {
 		return nil, 0, EINVAL
 	}
+
 	sa.raw.Family = AF_TIPC
 	sa.raw.Scope = int8(sa.Scope)
 	sa.raw.Addrtype = sa.Addr.tipcAddrtype()
 	sa.raw.Addr = sa.Addr.tipcAddr()
+
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrTIPC, nil
 }
 
@@ -880,7 +838,9 @@ type SockaddrL2TPIP struct {
 func (sa *SockaddrL2TPIP) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Family = AF_INET
 	sa.raw.Conn_id = sa.ConnId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2TPIP, nil
 }
 
@@ -896,7 +856,9 @@ func (sa *SockaddrL2TPIP6) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	sa.raw.Family = AF_INET6
 	sa.raw.Conn_id = sa.ConnId
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2TPIP6, nil
 }
 
@@ -912,7 +874,7 @@ func (sa *SockaddrIUCV) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	// These are EBCDIC encoded by the kernel, but we still need to pad them
 	// with blanks. Initializing with blanks allows the caller to feed in either
 	// a padded or an unpadded string.
-	for i := range 8 {
+	for i := 0; i < 8; i++ {
 		sa.raw.Nodeid[i] = ' '
 		sa.raw.User_id[i] = ' '
 		sa.raw.Name[i] = ' '
@@ -992,7 +954,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		sa.Hatype = pp.Hatype
 		sa.Pkttype = pp.Pkttype
 		sa.Halen = pp.Halen
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 
 	case AF_UNIX:
@@ -1016,7 +980,8 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -1030,14 +995,18 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 			pp := (*RawSockaddrL2TPIP)(unsafe.Pointer(rsa))
 			sa := new(SockaddrL2TPIP)
 			sa.ConnId = pp.Conn_id
-			sa.Addr = pp.Addr
+			for i := 0; i < len(sa.Addr); i++ {
+				sa.Addr[i] = pp.Addr[i]
+			}
 			return sa, nil
 		default:
 			pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
 			sa := new(SockaddrInet4)
 			p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 			sa.Port = int(p[0])<<8 + int(p[1])
-			sa.Addr = pp.Addr
+			for i := 0; i < len(sa.Addr); i++ {
+				sa.Addr[i] = pp.Addr[i]
+			}
 			return sa, nil
 		}
 
@@ -1053,7 +1022,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 			sa := new(SockaddrL2TPIP6)
 			sa.ConnId = pp.Conn_id
 			sa.ZoneId = pp.Scope_id
-			sa.Addr = pp.Addr
+			for i := 0; i < len(sa.Addr); i++ {
+				sa.Addr[i] = pp.Addr[i]
+			}
 			return sa, nil
 		default:
 			pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
@@ -1061,7 +1032,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 			p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 			sa.Port = int(p[0])<<8 + int(p[1])
 			sa.ZoneId = pp.Scope_id
-			sa.Addr = pp.Addr
+			for i := 0; i < len(sa.Addr); i++ {
+				sa.Addr[i] = pp.Addr[i]
+			}
 			return sa, nil
 		}
 
@@ -1149,7 +1122,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		var user [8]byte
 		var name [8]byte
 
-		for i := range 8 {
+		for i := 0; i < 8; i++ {
 			user[i] = byte(pp.User_id[i])
 			name[i] = byte(pp.Name[i])
 		}
@@ -1174,11 +1147,11 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				Ifindex: int(pp.Ifindex),
 			}
 			name := (*[8]byte)(unsafe.Pointer(&sa.Name))
-			for i := range 8 {
+			for i := 0; i < 8; i++ {
 				name[i] = pp.Addr[i]
 			}
 			pgn := (*[4]byte)(unsafe.Pointer(&sa.PGN))
-			for i := range 4 {
+			for i := 0; i < 4; i++ {
 				pgn[i] = pp.Addr[i+8]
 			}
 			addr := (*[1]byte)(unsafe.Pointer(&sa.Addr))
@@ -1189,11 +1162,11 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				Ifindex: int(pp.Ifindex),
 			}
 			rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
-			for i := range 4 {
+			for i := 0; i < 4; i++ {
 				rx[i] = pp.Addr[i]
 			}
 			tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
-			for i := range 4 {
+			for i := 0; i < 4; i++ {
 				tx[i] = pp.Addr[i+4]
 			}
 			return sa, nil
@@ -1296,48 +1269,6 @@ func GetsockoptTCPInfo(fd, level, opt int) (*TCPInfo, error) {
 	return &value, err
 }
 
-// GetsockoptTCPCCVegasInfo returns algorithm specific congestion control information for a socket using the "vegas"
-// algorithm.
-//
-// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
-//
-//	algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
-func GetsockoptTCPCCVegasInfo(fd, level, opt int) (*TCPVegasInfo, error) {
-	var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
-	vallen := _Socklen(SizeofTCPCCInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	out := (*TCPVegasInfo)(unsafe.Pointer(&value[0]))
-	return out, err
-}
-
-// GetsockoptTCPCCDCTCPInfo returns algorithm specific congestion control information for a socket using the "dctp"
-// algorithm.
-//
-// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
-//
-//	algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
-func GetsockoptTCPCCDCTCPInfo(fd, level, opt int) (*TCPDCTCPInfo, error) {
-	var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
-	vallen := _Socklen(SizeofTCPCCInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	out := (*TCPDCTCPInfo)(unsafe.Pointer(&value[0]))
-	return out, err
-}
-
-// GetsockoptTCPCCBBRInfo returns algorithm specific congestion control information for a socket using the "bbr"
-// algorithm.
-//
-// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
-//
-//	algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
-func GetsockoptTCPCCBBRInfo(fd, level, opt int) (*TCPBBRInfo, error) {
-	var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
-	vallen := _Socklen(SizeofTCPCCInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	out := (*TCPBBRInfo)(unsafe.Pointer(&value[0]))
-	return out, err
-}
-
 // GetsockoptString returns the string value of the socket option opt for the
 // socket associated with fd at the given socket level.
 func GetsockoptString(fd, level, opt int) (string, error) {
@@ -1353,7 +1284,7 @@ func GetsockoptString(fd, level, opt int) (string, error) {
 			return "", err
 		}
 	}
-	return ByteSliceToString(buf[:vallen]), nil
+	return string(buf[:vallen-1]), nil
 }
 
 func GetsockoptTpacketStats(fd, level, opt int) (*TpacketStats, error) {
@@ -1407,10 +1338,6 @@ func SetsockoptTCPRepairOpt(fd, level, opt int, o []TCPRepairOpt) (err error) {
 	return setsockopt(fd, level, opt, unsafe.Pointer(&o[0]), uintptr(SizeofTCPRepairOpt*len(o)))
 }
 
-func SetsockoptTCPMD5Sig(fd, level, opt int, s *TCPMD5Sig) error {
-	return setsockopt(fd, level, opt, unsafe.Pointer(s), unsafe.Sizeof(*s))
-}
-
 // Keyctl Commands (http://man7.org/linux/man-pages/man2/keyctl.2.html)
 
 // KeyctlInt calls keyctl commands in which each argument is an int.
@@ -1546,13 +1473,19 @@ func KeyctlRestrictKeyring(ringid int, keyType string, restriction string) error
 //sys	keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) = SYS_KEYCTL
 //sys	keyctlRestrictKeyring(cmd int, arg2 int) (err error) = SYS_KEYCTL
 
-func recvmsgRaw(fd int, iov []Iovec, oob []byte, flags int, rsa *RawSockaddrAny) (n, oobn int, recvflags int, err error) {
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(rsa))
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
 	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = &p[0]
+		iov.SetLen(len(p))
+	}
 	var dummy byte
 	if len(oob) > 0 {
-		if emptyIovecs(iov) {
+		if len(p) == 0 {
 			var sockType int
 			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
 			if err != nil {
@@ -1560,36 +1493,53 @@ func recvmsgRaw(fd int, iov []Iovec, oob []byte, flags int, rsa *RawSockaddrAny)
 			}
 			// receive at least one normal byte
 			if sockType != SOCK_DGRAM {
-				var iova [1]Iovec
-				iova[0].Base = &dummy
-				iova[0].SetLen(1)
-				iov = iova[:]
+				iov.Base = &dummy
+				iov.SetLen(1)
 			}
 		}
 		msg.Control = &oob[0]
 		msg.SetControllen(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = recvmsg(fd, &msg, flags); err != nil {
 		return
 	}
 	oobn = int(msg.Controllen)
 	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
 	return
 }
 
-func sendmsgN(fd int, iov []Iovec, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		var err error
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
 	var msg Msghdr
 	msg.Name = (*byte)(ptr)
 	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = &p[0]
+		iov.SetLen(len(p))
+	}
 	var dummy byte
-	var empty bool
 	if len(oob) > 0 {
-		empty = emptyIovecs(iov)
-		if empty {
+		if len(p) == 0 {
 			var sockType int
 			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
 			if err != nil {
@@ -1597,23 +1547,19 @@ func sendmsgN(fd int, iov []Iovec, oob []byte, ptr unsafe.Pointer, salen _Sockle
 			}
 			// send at least one normal byte
 			if sockType != SOCK_DGRAM {
-				var iova [1]Iovec
-				iova[0].Base = &dummy
-				iova[0].SetLen(1)
-				iov = iova[:]
+				iov.Base = &dummy
+				iov.SetLen(1)
 			}
 		}
 		msg.Control = &oob[0]
 		msg.SetControllen(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = sendmsg(fd, &msg, flags); err != nil {
 		return 0, err
 	}
-	if len(oob) > 0 && empty {
+	if len(oob) > 0 && len(p) == 0 {
 		n = 0
 	}
 	return n, nil
@@ -1625,7 +1571,6 @@ func BindToDevice(fd int, device string) (err error) {
 }
 
 //sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
-//sys	ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) = SYS_PTRACE
 
 func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
 	// The peek requests are machine-size oriented, so we wrap it
@@ -1643,7 +1588,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro
 	// boundary.
 	n := 0
 	if addr%SizeofPtr != 0 {
-		err = ptracePtr(req, pid, addr-addr%SizeofPtr, unsafe.Pointer(&buf[0]))
+		err = ptrace(req, pid, addr-addr%SizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
 		if err != nil {
 			return 0, err
 		}
@@ -1655,7 +1600,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro
 	for len(out) > 0 {
 		// We use an internal buffer to guarantee alignment.
 		// It's not documented if this is necessary, but we're paranoid.
-		err = ptracePtr(req, pid, addr+uintptr(n), unsafe.Pointer(&buf[0]))
+		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
 		if err != nil {
 			return n, err
 		}
@@ -1687,7 +1632,7 @@ func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (c
 	n := 0
 	if addr%SizeofPtr != 0 {
 		var buf [SizeofPtr]byte
-		err = ptracePtr(peekReq, pid, addr-addr%SizeofPtr, unsafe.Pointer(&buf[0]))
+		err = ptrace(peekReq, pid, addr-addr%SizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
 		if err != nil {
 			return 0, err
 		}
@@ -1714,7 +1659,7 @@ func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (c
 	// Trailing edge.
 	if len(data) > 0 {
 		var buf [SizeofPtr]byte
-		err = ptracePtr(peekReq, pid, addr+uintptr(n), unsafe.Pointer(&buf[0]))
+		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
 		if err != nil {
 			return n, err
 		}
@@ -1742,23 +1687,12 @@ func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
 	return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data)
 }
 
-// elfNT_PRSTATUS is a copy of the debug/elf.NT_PRSTATUS constant so
-// x/sys/unix doesn't need to depend on debug/elf and thus
-// compress/zlib, debug/dwarf, and other packages.
-const elfNT_PRSTATUS = 1
-
 func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
-	var iov Iovec
-	iov.Base = (*byte)(unsafe.Pointer(regsout))
-	iov.SetLen(int(unsafe.Sizeof(*regsout)))
-	return ptracePtr(PTRACE_GETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
-	var iov Iovec
-	iov.Base = (*byte)(unsafe.Pointer(regs))
-	iov.SetLen(int(unsafe.Sizeof(*regs)))
-	return ptracePtr(PTRACE_SETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
 
 func PtraceSetOptions(pid int, options int) (err error) {
@@ -1767,7 +1701,7 @@ func PtraceSetOptions(pid int, options int) (err error) {
 
 func PtraceGetEventMsg(pid int) (msg uint, err error) {
 	var data _C_long
-	err = ptracePtr(PTRACE_GETEVENTMSG, pid, 0, unsafe.Pointer(&data))
+	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
 	msg = uint(data)
 	return
 }
@@ -1827,16 +1761,6 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri
 	return mount(source, target, fstype, flags, datap)
 }
 
-//sys	mountSetattr(dirfd int, pathname string, flags uint, attr *MountAttr, size uintptr) (err error) = SYS_MOUNT_SETATTR
-
-// MountSetattr is a wrapper for mount_setattr(2).
-// https://man7.org/linux/man-pages/man2/mount_setattr.2.html
-//
-// Requires kernel >= 5.12.
-func MountSetattr(dirfd int, pathname string, flags uint, attr *MountAttr) error {
-	return mountSetattr(dirfd, pathname, flags, attr, unsafe.Sizeof(*attr))
-}
-
 func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	if raceenabled {
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
@@ -1858,10 +1782,8 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sysnb	Capset(hdr *CapUserHeader, data *CapUserData) (err error)
 //sys	Chdir(path string) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockAdjtime(clockid int32, buf *Timex) (state int, err error)
 //sys	ClockGetres(clockid int32, res *Timespec) (err error)
 //sys	ClockGettime(clockid int32, time *Timespec) (err error)
-//sys	ClockSettime(clockid int32, time *Timespec) (err error)
 //sys	ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	CloseRange(first uint, last uint, flags uint) (err error)
@@ -1870,7 +1792,11 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Dup(oldfd int) (fd int, err error)
 
 func Dup2(oldfd, newfd int) error {
-	return Dup3(oldfd, newfd, 0)
+	// Android O and newer blocks dup2; riscv and arm64 don't implement dup2.
+	if runtime.GOOS == "android" || runtime.GOARCH == "riscv64" || runtime.GOARCH == "arm64" {
+		return Dup3(oldfd, newfd, 0)
+	}
+	return dup2(oldfd, newfd)
 }
 
 //sys	Dup3(oldfd int, newfd int, flags int) (err error)
@@ -1890,108 +1816,6 @@ func Dup2(oldfd, newfd int) error {
 //sys	Fremovexattr(fd int, attr string) (err error)
 //sys	Fsetxattr(fd int, attr string, dest []byte, flags int) (err error)
 //sys	Fsync(fd int) (err error)
-//sys	Fsmount(fd int, flags int, mountAttrs int) (fsfd int, err error)
-//sys	Fsopen(fsName string, flags int) (fd int, err error)
-//sys	Fspick(dirfd int, pathName string, flags int) (fd int, err error)
-
-//sys	fsconfig(fd int, cmd uint, key *byte, value *byte, aux int) (err error)
-
-func fsconfigCommon(fd int, cmd uint, key string, value *byte, aux int) (err error) {
-	var keyp *byte
-	if keyp, err = BytePtrFromString(key); err != nil {
-		return
-	}
-	return fsconfig(fd, cmd, keyp, value, aux)
-}
-
-// FsconfigSetFlag is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_FLAG.
-//
-// fd is the filesystem context to act upon.
-// key the parameter key to set.
-func FsconfigSetFlag(fd int, key string) (err error) {
-	return fsconfigCommon(fd, FSCONFIG_SET_FLAG, key, nil, 0)
-}
-
-// FsconfigSetString is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_STRING.
-//
-// fd is the filesystem context to act upon.
-// key the parameter key to set.
-// value is the parameter value to set.
-func FsconfigSetString(fd int, key string, value string) (err error) {
-	var valuep *byte
-	if valuep, err = BytePtrFromString(value); err != nil {
-		return
-	}
-	return fsconfigCommon(fd, FSCONFIG_SET_STRING, key, valuep, 0)
-}
-
-// FsconfigSetBinary is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_BINARY.
-//
-// fd is the filesystem context to act upon.
-// key the parameter key to set.
-// value is the parameter value to set.
-func FsconfigSetBinary(fd int, key string, value []byte) (err error) {
-	if len(value) == 0 {
-		return EINVAL
-	}
-	return fsconfigCommon(fd, FSCONFIG_SET_BINARY, key, &value[0], len(value))
-}
-
-// FsconfigSetPath is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_PATH.
-//
-// fd is the filesystem context to act upon.
-// key the parameter key to set.
-// path is a non-empty path for specified key.
-// atfd is a file descriptor at which to start lookup from or AT_FDCWD.
-func FsconfigSetPath(fd int, key string, path string, atfd int) (err error) {
-	var valuep *byte
-	if valuep, err = BytePtrFromString(path); err != nil {
-		return
-	}
-	return fsconfigCommon(fd, FSCONFIG_SET_PATH, key, valuep, atfd)
-}
-
-// FsconfigSetPathEmpty is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_PATH_EMPTY. The same as
-// FconfigSetPath but with AT_PATH_EMPTY implied.
-func FsconfigSetPathEmpty(fd int, key string, path string, atfd int) (err error) {
-	var valuep *byte
-	if valuep, err = BytePtrFromString(path); err != nil {
-		return
-	}
-	return fsconfigCommon(fd, FSCONFIG_SET_PATH_EMPTY, key, valuep, atfd)
-}
-
-// FsconfigSetFd is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_SET_FD.
-//
-// fd is the filesystem context to act upon.
-// key the parameter key to set.
-// value is a file descriptor to be assigned to specified key.
-func FsconfigSetFd(fd int, key string, value int) (err error) {
-	return fsconfigCommon(fd, FSCONFIG_SET_FD, key, nil, value)
-}
-
-// FsconfigCreate is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_CMD_CREATE.
-//
-// fd is the filesystem context to act upon.
-func FsconfigCreate(fd int) (err error) {
-	return fsconfig(fd, FSCONFIG_CMD_CREATE, nil, nil, 0)
-}
-
-// FsconfigReconfigure is equivalent to fsconfig(2) called
-// with cmd == FSCONFIG_CMD_RECONFIGURE.
-//
-// fd is the filesystem context to act upon.
-func FsconfigReconfigure(fd int) (err error) {
-	return fsconfig(fd, FSCONFIG_CMD_RECONFIGURE, nil, nil, 0)
-}
-
 //sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
 //sysnb	Getpgid(pid int) (pgid int, err error)
 
@@ -2003,26 +1827,7 @@ func Getpgrp() (pid int) {
 //sysnb	Getpid() (pid int)
 //sysnb	Getppid() (ppid int)
 //sys	Getpriority(which int, who int) (prio int, err error)
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	vdsoRet, supported := vgetrandom(buf, uint32(flags))
-	if supported {
-		if vdsoRet < 0 {
-			return 0, errnoErr(syscall.Errno(-vdsoRet))
-		}
-		return vdsoRet, nil
-	}
-	var p *byte
-	if len(buf) > 0 {
-		p = &buf[0]
-	}
-	r, _, e := Syscall(SYS_GETRANDOM, uintptr(unsafe.Pointer(p)), uintptr(len(buf)), uintptr(flags))
-	if e != 0 {
-		return 0, errnoErr(e)
-	}
-	return int(r), nil
-}
-
+//sys	Getrandom(buf []byte, flags int) (n int, err error)
 //sysnb	Getrusage(who int, rusage *Rusage) (err error)
 //sysnb	Getsid(pid int) (sid int, err error)
 //sysnb	Gettid() (tid int)
@@ -2041,13 +1846,12 @@ func Getrandom(buf []byte, flags int) (n int, err error) {
 //sys	MemfdCreate(name string, flags int) (fd int, err error)
 //sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	MoveMount(fromDirfd int, fromPathName string, toDirfd int, toPathName string, flags int) (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	OpenTree(dfd int, fileName string, flags uint) (r int, err error)
 //sys	PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error)
 //sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
+//sysnb	Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64
 //sys	Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
-//sys	pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error)
+//sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
 //sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error)
@@ -2059,15 +1863,6 @@ func Getrandom(buf []byte, flags int) (n int, err error) {
 //sysnb	Settimeofday(tv *Timeval) (err error)
 //sys	Setns(fd int, nstype int) (err error)
 
-//go:linkname syscall_prlimit syscall.prlimit
-func syscall_prlimit(pid, resource int, newlimit, old *syscall.Rlimit) error
-
-func Prlimit(pid, resource int, newlimit, old *Rlimit) error {
-	// Just call the syscall version, because as of Go 1.21
-	// it will affect starting a new process.
-	return syscall_prlimit(pid, resource, (*syscall.Rlimit)(newlimit), (*syscall.Rlimit)(old))
-}
-
 // PrctlRetInt performs a prctl operation specified by option and further
 // optional arguments arg2 through arg5 depending on option. It returns a
 // non-negative integer that is returned by the prctl syscall.
@@ -2079,28 +1874,17 @@ func PrctlRetInt(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uint
 	return int(ret), nil
 }
 
+// issue 1435.
+// On linux Setuid and Setgid only affects the current thread, not the process.
+// This does not match what most callers expect so we must return an error
+// here rather than letting the caller think that the call succeeded.
+
 func Setuid(uid int) (err error) {
-	return syscall.Setuid(uid)
+	return EOPNOTSUPP
 }
 
-func Setgid(gid int) (err error) {
-	return syscall.Setgid(gid)
-}
-
-func Setreuid(ruid, euid int) (err error) {
-	return syscall.Setreuid(ruid, euid)
-}
-
-func Setregid(rgid, egid int) (err error) {
-	return syscall.Setregid(rgid, egid)
-}
-
-func Setresuid(ruid, euid, suid int) (err error) {
-	return syscall.Setresuid(ruid, euid, suid)
-}
-
-func Setresgid(rgid, egid, sgid int) (err error) {
-	return syscall.Setresgid(rgid, egid, sgid)
+func Setgid(uid int) (err error) {
+	return EOPNOTSUPP
 }
 
 // SetfsgidRetGid sets fsgid for current thread and returns previous fsgid set.
@@ -2150,6 +1934,8 @@ func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) {
 //sys	Unshare(flags int) (err error)
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	exitThread(code int) (err error) = SYS_EXIT
+//sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
 //sys	readv(fd int, iovs []Iovec) (n int, err error) = SYS_READV
 //sys	writev(fd int, iovs []Iovec) (n int, err error) = SYS_WRITEV
 //sys	preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PREADV
@@ -2157,46 +1943,36 @@ func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) {
 //sys	preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PREADV2
 //sys	pwritev2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PWRITEV2
 
-// minIovec is the size of the small initial allocation used by
-// Readv, Writev, etc.
-//
-// This small allocation gets stack allocated, which lets the
-// common use case of len(iovs) <= minIovs avoid more expensive
-// heap allocations.
-const minIovec = 8
-
-// appendBytes converts bs to Iovecs and appends them to vecs.
-func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
-	for _, b := range bs {
-		var v Iovec
-		v.SetLen(len(b))
+func bytes2iovec(bs [][]byte) []Iovec {
+	iovecs := make([]Iovec, len(bs))
+	for i, b := range bs {
+		iovecs[i].SetLen(len(b))
 		if len(b) > 0 {
-			v.Base = &b[0]
+			iovecs[i].Base = &b[0]
 		} else {
-			v.Base = (*byte)(unsafe.Pointer(&_zero))
+			iovecs[i].Base = (*byte)(unsafe.Pointer(&_zero))
 		}
-		vecs = append(vecs, v)
 	}
-	return vecs
+	return iovecs
 }
 
-// offs2lohi splits offs into its low and high order bits.
+// offs2lohi splits offs into its lower and upper unsigned long. On 64-bit
+// systems, hi will always be 0. On 32-bit systems, offs will be split in half.
+// preadv/pwritev chose this calling convention so they don't need to add a
+// padding-register for alignment on ARM.
 func offs2lohi(offs int64) (lo, hi uintptr) {
-	const longBits = SizeofLong * 8
-	return uintptr(offs), uintptr(uint64(offs) >> (longBits - 1) >> 1) // two shifts to avoid false positive in vet
+	return uintptr(offs), uintptr(uint64(offs) >> SizeofLong)
 }
 
 func Readv(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	n, err = readv(fd, iovecs)
 	readvRacedetect(iovecs, n, err)
 	return n, err
 }
 
 func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	lo, hi := offs2lohi(offset)
 	n, err = preadv(fd, iovecs, lo, hi)
 	readvRacedetect(iovecs, n, err)
@@ -2204,8 +1980,7 @@ func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
 }
 
 func Preadv2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	lo, hi := offs2lohi(offset)
 	n, err = preadv2(fd, iovecs, lo, hi, flags)
 	readvRacedetect(iovecs, n, err)
@@ -2217,7 +1992,10 @@ func readvRacedetect(iovecs []Iovec, n int, err error) {
 		return
 	}
 	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := min(int(iovecs[i].Len), n)
+		m := int(iovecs[i].Len)
+		if m > n {
+			m = n
+		}
 		n -= m
 		if m > 0 {
 			raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
@@ -2229,8 +2007,7 @@ func readvRacedetect(iovecs []Iovec, n int, err error) {
 }
 
 func Writev(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	if raceenabled {
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
 	}
@@ -2240,8 +2017,7 @@ func Writev(fd int, iovs [][]byte) (n int, err error) {
 }
 
 func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	if raceenabled {
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
 	}
@@ -2252,8 +2028,7 @@ func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
 }
 
 func Pwritev2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+	iovecs := bytes2iovec(iovs)
 	if raceenabled {
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
 	}
@@ -2268,7 +2043,10 @@ func writevRacedetect(iovecs []Iovec, n int) {
 		return
 	}
 	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := min(int(iovecs[i].Len), n)
+		m := int(iovecs[i].Len)
+		if m > n {
+			m = n
+		}
 		n -= m
 		if m > 0 {
 			raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
@@ -2278,7 +2056,21 @@ func writevRacedetect(iovecs []Iovec, n int) {
 
 // mmap varies by architecture; see syscall_linux_*.go.
 //sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
 //sys	Mlock(b []byte) (err error)
@@ -2287,12 +2079,6 @@ func writevRacedetect(iovecs []Iovec, n int) {
 //sys	Munlock(b []byte) (err error)
 //sys	Munlockall() (err error)
 
-const (
-	mremapFixed     = MREMAP_FIXED
-	mremapDontunmap = MREMAP_DONTUNMAP
-	mremapMaymove   = MREMAP_MAYMOVE
-)
-
 // Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd,
 // using the specified flags.
 func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
@@ -2315,15 +2101,12 @@ func isGroupMember(gid int) bool {
 		return false
 	}
 
-	return slices.Contains(groups, gid)
-}
-
-func isCapDacOverrideSet() bool {
-	hdr := CapUserHeader{Version: LINUX_CAPABILITY_VERSION_3}
-	data := [2]CapUserData{}
-	err := Capget(&hdr, &data[0])
-
-	return err == nil && data[0].Effective&(1<<CAP_DAC_OVERRIDE) != 0
+	for _, g := range groups {
+		if g == gid {
+			return true
+		}
+	}
+	return false
 }
 
 //sys	faccessat(dirfd int, path string, mode uint32) (err error)
@@ -2361,12 +2144,6 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	var uid int
 	if flags&AT_EACCESS != 0 {
 		uid = Geteuid()
-		if uid != 0 && isCapDacOverrideSet() {
-			// If CAP_DAC_OVERRIDE is set, file access check is
-			// done by the kernel in the same way as for root
-			// (see generic_permission() in the Linux sources).
-			uid = 0
-		}
 	} else {
 		uid = Getuid()
 	}
@@ -2394,7 +2171,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 			gid = Getgid()
 		}
 
-		if uint32(gid) == st.Gid || isGroupMember(int(st.Gid)) {
+		if uint32(gid) == st.Gid || isGroupMember(gid) {
 			fmode = (st.Mode >> 3) & 7
 		} else {
 			fmode = st.Mode & 7
@@ -2446,7 +2223,7 @@ func (fh *FileHandle) Bytes() []byte {
 	if n == 0 {
 		return nil
 	}
-	return unsafe.Slice((*byte)(unsafe.Pointer(uintptr(unsafe.Pointer(&fh.fileHandle.Type))+4)), n)
+	return (*[1 << 30]byte)(unsafe.Pointer(uintptr(unsafe.Pointer(&fh.fileHandle.Type)) + 4))[:n:n]
 }
 
 // NameToHandleAt wraps the name_to_handle_at system call; it obtains
@@ -2507,141 +2284,107 @@ type RemoteIovec struct {
 //sys	ProcessVMReadv(pid int, localIov []Iovec, remoteIov []RemoteIovec, flags uint) (n int, err error) = SYS_PROCESS_VM_READV
 //sys	ProcessVMWritev(pid int, localIov []Iovec, remoteIov []RemoteIovec, flags uint) (n int, err error) = SYS_PROCESS_VM_WRITEV
 
-//sys	PidfdOpen(pid int, flags int) (fd int, err error) = SYS_PIDFD_OPEN
-//sys	PidfdGetfd(pidfd int, targetfd int, flags int) (fd int, err error) = SYS_PIDFD_GETFD
-//sys	PidfdSendSignal(pidfd int, sig Signal, info *Siginfo, flags int) (err error) = SYS_PIDFD_SEND_SIGNAL
-
-//sys	shmat(id int, addr uintptr, flag int) (ret uintptr, err error)
-//sys	shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error)
-//sys	shmdt(addr uintptr) (err error)
-//sys	shmget(key int, size int, flag int) (id int, err error)
-
-//sys	getitimer(which int, currValue *Itimerval) (err error)
-//sys	setitimer(which int, newValue *Itimerval, oldValue *Itimerval) (err error)
-
-// MakeItimerval creates an Itimerval from interval and value durations.
-func MakeItimerval(interval, value time.Duration) Itimerval {
-	return Itimerval{
-		Interval: NsecToTimeval(interval.Nanoseconds()),
-		Value:    NsecToTimeval(value.Nanoseconds()),
-	}
-}
-
-// A value which may be passed to the which parameter for Getitimer and
-// Setitimer.
-type ItimerWhich int
-
-// Possible which values for Getitimer and Setitimer.
-const (
-	ItimerReal    ItimerWhich = ITIMER_REAL
-	ItimerVirtual ItimerWhich = ITIMER_VIRTUAL
-	ItimerProf    ItimerWhich = ITIMER_PROF
-)
-
-// Getitimer wraps getitimer(2) to return the current value of the timer
-// specified by which.
-func Getitimer(which ItimerWhich) (Itimerval, error) {
-	var it Itimerval
-	if err := getitimer(int(which), &it); err != nil {
-		return Itimerval{}, err
-	}
-
-	return it, nil
-}
-
-// Setitimer wraps setitimer(2) to arm or disarm the timer specified by which.
-// It returns the previous value of the timer.
-//
-// If the Itimerval argument is the zero value, the timer will be disarmed.
-func Setitimer(which ItimerWhich, it Itimerval) (Itimerval, error) {
-	var prev Itimerval
-	if err := setitimer(int(which), &it, &prev); err != nil {
-		return Itimerval{}, err
-	}
-
-	return prev, nil
-}
-
-//sysnb	rtSigprocmask(how int, set *Sigset_t, oldset *Sigset_t, sigsetsize uintptr) (err error) = SYS_RT_SIGPROCMASK
-
-func PthreadSigmask(how int, set, oldset *Sigset_t) error {
-	if oldset != nil {
-		// Explicitly clear in case Sigset_t is larger than _C__NSIG.
-		*oldset = Sigset_t{}
-	}
-	return rtSigprocmask(how, set, oldset, _C__NSIG/8)
-}
-
-//sysnb	getresuid(ruid *_C_int, euid *_C_int, suid *_C_int)
-//sysnb	getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int)
-
-func Getresuid() (ruid, euid, suid int) {
-	var r, e, s _C_int
-	getresuid(&r, &e, &s)
-	return int(r), int(e), int(s)
-}
-
-func Getresgid() (rgid, egid, sgid int) {
-	var r, e, s _C_int
-	getresgid(&r, &e, &s)
-	return int(r), int(e), int(s)
-}
-
-// Pselect is a wrapper around the Linux pselect6 system call.
-// This version does not modify the timeout argument.
-func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	// Per https://man7.org/linux/man-pages/man2/select.2.html#NOTES,
-	// The Linux pselect6() system call modifies its timeout argument.
-	// [Not modifying the argument] is the behavior required by POSIX.1-2001.
-	var mutableTimeout *Timespec
-	if timeout != nil {
-		mutableTimeout = new(Timespec)
-		*mutableTimeout = *timeout
-	}
-
-	// The final argument of the pselect6() system call is not a
-	// sigset_t * pointer, but is instead a structure
-	var kernelMask *sigset_argpack
-	if sigmask != nil {
-		wordBits := 32 << (^uintptr(0) >> 63) // see math.intSize
-
-		// A sigset stores one bit per signal,
-		// offset by 1 (because signal 0 does not exist).
-		// So the number of words needed is ⌈__C_NSIG - 1 / wordBits⌉.
-		sigsetWords := (_C__NSIG - 1 + wordBits - 1) / (wordBits)
-
-		sigsetBytes := uintptr(sigsetWords * (wordBits / 8))
-		kernelMask = &sigset_argpack{
-			ss:    sigmask,
-			ssLen: sigsetBytes,
-		}
-	}
-
-	return pselect6(nfd, r, w, e, mutableTimeout, kernelMask)
-}
-
-//sys	schedSetattr(pid int, attr *SchedAttr, flags uint) (err error)
-//sys	schedGetattr(pid int, attr *SchedAttr, size uint, flags uint) (err error)
-
-// SchedSetAttr is a wrapper for sched_setattr(2) syscall.
-// https://man7.org/linux/man-pages/man2/sched_setattr.2.html
-func SchedSetAttr(pid int, attr *SchedAttr, flags uint) error {
-	if attr == nil {
-		return EINVAL
-	}
-	attr.Size = SizeofSchedAttr
-	return schedSetattr(pid, attr, flags)
-}
-
-// SchedGetAttr is a wrapper for sched_getattr(2) syscall.
-// https://man7.org/linux/man-pages/man2/sched_getattr.2.html
-func SchedGetAttr(pid int, flags uint) (*SchedAttr, error) {
-	attr := &SchedAttr{}
-	if err := schedGetattr(pid, attr, SizeofSchedAttr, flags); err != nil {
-		return nil, err
-	}
-	return attr, nil
-}
-
-//sys	Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) (err error)
-//sys	Mseal(b []byte, flags uint) (err error)
+/*
+ * Unimplemented
+ */
+// AfsSyscall
+// Alarm
+// ArchPrctl
+// Brk
+// ClockNanosleep
+// ClockSettime
+// Clone
+// EpollCtlOld
+// EpollPwait
+// EpollWaitOld
+// Execve
+// Fork
+// Futex
+// GetKernelSyms
+// GetMempolicy
+// GetRobustList
+// GetThreadArea
+// Getitimer
+// Getpmsg
+// IoCancel
+// IoDestroy
+// IoGetevents
+// IoSetup
+// IoSubmit
+// IoprioGet
+// IoprioSet
+// KexecLoad
+// LookupDcookie
+// Mbind
+// MigratePages
+// Mincore
+// ModifyLdt
+// Mount
+// MovePages
+// MqGetsetattr
+// MqNotify
+// MqOpen
+// MqTimedreceive
+// MqTimedsend
+// MqUnlink
+// Mremap
+// Msgctl
+// Msgget
+// Msgrcv
+// Msgsnd
+// Nfsservctl
+// Personality
+// Pselect6
+// Ptrace
+// Putpmsg
+// Quotactl
+// Readahead
+// Readv
+// RemapFilePages
+// RestartSyscall
+// RtSigaction
+// RtSigpending
+// RtSigprocmask
+// RtSigqueueinfo
+// RtSigreturn
+// RtSigsuspend
+// RtSigtimedwait
+// SchedGetPriorityMax
+// SchedGetPriorityMin
+// SchedGetparam
+// SchedGetscheduler
+// SchedRrGetInterval
+// SchedSetparam
+// SchedYield
+// Security
+// Semctl
+// Semget
+// Semop
+// Semtimedop
+// SetMempolicy
+// SetRobustList
+// SetThreadArea
+// SetTidAddress
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Sigaltstack
+// Swapoff
+// Swapon
+// Sysfs
+// TimerCreate
+// TimerDelete
+// TimerGetoverrun
+// TimerGettime
+// TimerSettime
+// Tkill (obsolete)
+// Tuxcall
+// Umount2
+// Uselib
+// Utimensat
+// Vfork
+// Vhangup
+// Vserver
+// Waitid
+// _Sysctl
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
index 506dafa..91317d7 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && linux
+// +build 386,linux
 
 package unix
 
@@ -18,8 +19,36 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 // 64-bit file system and 32-bit uid calls
 // (386 default is 32-bit file system and 16-bit uid).
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
@@ -30,16 +59,21 @@ func setTimeval(sec, usec int64) Timeval {
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
 //sysnb	Getgid() (gid int) = SYS_GETGID32
 //sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
 //sys	setfsgid(gid int) (prev int, err error) = SYS_SETFSGID32
 //sys	setfsuid(uid int) (prev int, err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
@@ -96,6 +130,33 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
+//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = Prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	newoffset, errno := seek(fd, offset, whence)
 	if errno != 0 {
@@ -141,6 +202,14 @@ const (
 	_SENDMMSG    = 20
 )
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	fd, e := socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	fd, e := socketcall(_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	if e != 0 {
@@ -312,3 +381,12 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint32(length)
 }
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_alarm.go b/vendor/golang.org/x/sys/unix/syscall_linux_alarm.go
deleted file mode 100644
index 38d5564..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_alarm.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (386 || amd64 || mips || mipsle || mips64 || mipsle || ppc64 || ppc64le || ppc || s390x || sparc64)
-
-package unix
-
-// SYS_ALARM is not defined on arm or riscv, but is available for other GOARCH
-// values.
-
-//sys	Alarm(seconds uint) (remaining uint, err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
index d557cf8..c77f768 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -3,9 +3,12 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && linux
+// +build amd64,linux
 
 package unix
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -18,6 +21,11 @@ package unix
 //sysnb	Getgid() (gid int)
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
+
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
@@ -27,10 +35,9 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
 }
 
-//sys	MemfdSecret(flags int) (fd int, err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 
@@ -39,12 +46,17 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return pselect6(nfd, r, w, e, ts, nil)
+	return Pselect(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
@@ -57,6 +69,7 @@ func Stat(path string, stat *Stat_t) (err error) {
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -107,6 +120,32 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: sec, Usec: usec}
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func (r *PtraceRegs) PC() uint64 { return r.Rip }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
@@ -131,6 +170,15 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
 
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 //sys	kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error)
 
 func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
index facdb83..8b0f0f3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && linux && gc
+// +build amd64,linux,gc
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
index cd2dd79..31e029b 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm && linux
+// +build arm,linux
 
 package unix
 
@@ -18,6 +19,32 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	newoffset, errno := seek(fd, offset, whence)
 	if errno != 0 {
@@ -26,6 +53,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return newoffset, nil
 }
 
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -44,6 +72,8 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 
 // 64-bit file system and 32-bit uid calls
 // (16-bit uid calls are not always supported in newer kernels)
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
@@ -52,6 +82,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
 //sysnb	Getgid() (gid int) = SYS_GETGID32
 //sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
@@ -61,6 +92,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 //sys	setfsgid(gid int) (prev int, err error) = SYS_SETFSGID32
 //sys	setfsuid(uid int) (prev int, err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
@@ -91,8 +126,8 @@ func Utime(path string, buf *Utimbuf) error {
 
 //sys	utimes(path string, times *[2]Timeval) (err error)
 
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
 //sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
 
@@ -170,6 +205,33 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
+//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = Prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
 func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
@@ -194,6 +256,15 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint32(length)
 }
 
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 //sys	armSyncFileRange(fd int, flags int, off int64, n int64) (err error) = SYS_ARM_SYNC_FILE_RANGE
 
 func SyncFileRange(fd int, off int64, n int64, flags int) error {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
index 745e5c7..4b977ba 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -3,11 +3,19 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && linux
+// +build arm64,linux
 
 package unix
 
 import "unsafe"
 
+func EpollCreate(size int) (fd int, err error) {
+	if size <= 0 {
+		return -1, EINVAL
+	}
+	return EpollCreate1(0)
+}
+
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -21,9 +29,8 @@ import "unsafe"
 //sysnb	getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
 //sys	Listen(s int, n int) (err error)
-//sys	MemfdSecret(flags int) (fd int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 
@@ -32,12 +39,17 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return pselect6(nfd, r, w, e, ts, nil)
+	return Pselect(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
@@ -61,6 +73,7 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 	return ENOSYS
 }
 
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -132,6 +145,30 @@ func utimes(path string, tv *[2]Timeval) (err error) {
 	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
 }
 
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 // Getrlimit prefers the prlimit64 system call. See issue 38604.
 func Getrlimit(resource int, rlim *Rlimit) error {
 	err := Prlimit(0, resource, nil, rlim)
@@ -141,6 +178,15 @@ func Getrlimit(resource int, rlim *Rlimit) error {
 	return getrlimit(resource, rlim)
 }
 
+// Setrlimit prefers the prlimit64 system call. See issue 38604.
+func Setrlimit(resource int, rlim *Rlimit) error {
+	err := Prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+	return setrlimit(resource, rlim)
+}
+
 func (r *PtraceRegs) PC() uint64 { return r.Pc }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
@@ -165,11 +211,31 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
 
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
+// dup2 exists because func Dup3 in syscall_linux.go references
+// it in an unreachable path. dup2 isn't available on arm64.
+func dup2(oldfd int, newfd int) error
+
 func Pause() error {
 	_, err := ppoll(nil, 0, nil, nil)
 	return err
 }
 
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	var ts *Timespec
+	if timeout >= 0 {
+		ts = new(Timespec)
+		*ts = NsecToTimespec(int64(timeout) * 1e6)
+	}
+	if len(fds) == 0 {
+		return ppoll(nil, 0, ts, nil)
+	}
+	return ppoll(&fds[0], len(fds), ts, nil)
+}
+
 //sys	kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error)
 
 func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error {
@@ -182,5 +248,3 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
 	}
 	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
 }
-
-const SYS_FSTATAT = SYS_NEWFSTATAT
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
index ffc4c2b..2b1168d 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && gc
+// +build linux,gc
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
index 9ebfdcf..9843fb4 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && gc && 386
+// +build linux,gc,386
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go
index 5f2b57c..a6008fc 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm && gc && linux
+// +build arm,gc,linux
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
index d1a3ad8..7740af2 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && gccgo && 386
+// +build linux,gccgo,386
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
index f2f6742..e16a122 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && gccgo && arm
+// +build linux,gccgo,arm
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
deleted file mode 100644
index dd2262a..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build loong64 && linux
-
-package unix
-
-import "unsafe"
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getuid() (uid int)
-//sys	Listen(s int, n int) (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	var ts *Timespec
-	if timeout != nil {
-		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
-	}
-	return pselect6(nfd, r, w, e, ts, nil)
-}
-
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	setfsgid(gid int) (prev int, err error)
-//sys	setfsuid(uid int) (prev int, err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-
-func timespecFromStatxTimestamp(x StatxTimestamp) Timespec {
-	return Timespec{
-		Sec:  x.Sec,
-		Nsec: int64(x.Nsec),
-	}
-}
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) error {
-	var r Statx_t
-	// Do it the glibc way, add AT_NO_AUTOMOUNT.
-	if err := Statx(fd, path, AT_NO_AUTOMOUNT|flags, STATX_BASIC_STATS, &r); err != nil {
-		return err
-	}
-
-	stat.Dev = Mkdev(r.Dev_major, r.Dev_minor)
-	stat.Ino = r.Ino
-	stat.Mode = uint32(r.Mode)
-	stat.Nlink = r.Nlink
-	stat.Uid = r.Uid
-	stat.Gid = r.Gid
-	stat.Rdev = Mkdev(r.Rdev_major, r.Rdev_minor)
-	// hope we don't get to process files so large to overflow these size
-	// fields...
-	stat.Size = int64(r.Size)
-	stat.Blksize = int32(r.Blksize)
-	stat.Blocks = int64(r.Blocks)
-	stat.Atim = timespecFromStatxTimestamp(r.Atime)
-	stat.Mtim = timespecFromStatxTimestamp(r.Mtime)
-	stat.Ctim = timespecFromStatxTimestamp(r.Ctime)
-
-	return nil
-}
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	return Fstatat(fd, "", stat, AT_EMPTY_PATH)
-}
-
-func Stat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, 0)
-}
-
-func Lchown(path string, uid int, gid int) (err error) {
-	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
-}
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
-}
-
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	return ENOSYS
-}
-
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func setTimespec(sec, nsec int64) Timespec {
-	return Timespec{Sec: sec, Nsec: nsec}
-}
-
-func setTimeval(sec, usec int64) Timeval {
-	return Timeval{Sec: sec, Usec: usec}
-}
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, nil, rlim)
-	return
-}
-
-func futimesat(dirfd int, path string, tv *[2]Timeval) (err error) {
-	if tv == nil {
-		return utimensat(dirfd, path, nil, 0)
-	}
-
-	ts := []Timespec{
-		NsecToTimespec(TimevalToNsec(tv[0])),
-		NsecToTimespec(TimevalToNsec(tv[1])),
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-}
-
-func Time(t *Time_t) (Time_t, error) {
-	var tv Timeval
-	err := Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-func Utime(path string, buf *Utimbuf) error {
-	tv := []Timeval{
-		{Sec: buf.Actime},
-		{Sec: buf.Modtime},
-	}
-	return Utimes(path, tv)
-}
-
-func utimes(path string, tv *[2]Timeval) (err error) {
-	if tv == nil {
-		return utimensat(AT_FDCWD, path, nil, 0)
-	}
-
-	ts := []Timespec{
-		NsecToTimespec(TimevalToNsec(tv[0])),
-		NsecToTimespec(TimevalToNsec(tv[1])),
-	}
-	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Era }
-
-func (r *PtraceRegs) SetPC(era uint64) { r.Era = era }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (msghdr *Msghdr) SetIovlen(length int) {
-	msghdr.Iovlen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
-	rsa.Service_name_len = uint64(length)
-}
-
-func Pause() error {
-	_, err := ppoll(nil, 0, nil, nil)
-	return err
-}
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	return Renameat2(olddirfd, oldpath, newdirfd, newpath, 0)
-}
-
-//sys	kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error)
-
-func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error {
-	cmdlineLen := len(cmdline)
-	if cmdlineLen > 0 {
-		// Account for the additional NULL byte added by
-		// BytePtrFromString in kexecFileLoad. The kexec_file_load
-		// syscall expects a NULL-terminated string.
-		cmdlineLen++
-	}
-	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
-}
-
-const SYS_FSTATAT = SYS_NEWFSTATAT
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
index 70963a9..27aee81 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -3,9 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips64 || mips64le)
+// +build linux
+// +build mips64 mips64le
 
 package unix
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -19,8 +23,8 @@ package unix
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 
@@ -29,18 +33,24 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return pselect6(nfd, r, w, e, ts, nil)
+	return Pselect(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -84,6 +94,30 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: sec, Usec: usec}
 }
 
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func Ioperm(from int, num int, on int) (err error) {
 	return ENOSYS
 }
@@ -186,3 +220,16 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
+
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index c218ebd..21d74e2 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips || mipsle)
+// +build linux
+// +build mips mipsle
 
 package unix
 
@@ -13,6 +15,8 @@ import (
 
 func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -23,18 +27,23 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 //sysnb	Getuid() (uid int)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -51,6 +60,7 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 //sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 
@@ -103,6 +113,29 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe() (p1 int, p2 int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
 //sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
 
 func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
@@ -149,6 +182,33 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
+//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = Prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
 func (r *PtraceRegs) PC() uint64 { return r.Epc }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
@@ -172,3 +232,12 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint32(length)
 }
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
index e6c4850..6f1fc58 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && ppc
+// +build linux,ppc
 
 package unix
 
@@ -11,6 +12,8 @@ import (
 	"unsafe"
 )
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
@@ -20,24 +23,30 @@ import (
 //sysnb	Geteuid() (euid int)
 //sysnb	Getgid() (gid int)
 //sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
 //sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -158,6 +167,33 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
+//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = Prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
 func (r *PtraceRegs) PC() uint32 { return r.Nip }
 
 func (r *PtraceRegs) SetPC(pc uint32) { r.Nip = pc }
@@ -182,6 +218,41 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint32(length)
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 //sys	syncFileRange2(fd int, flags int, off int64, n int64) (err error) = SYS_SYNC_FILE_RANGE2
 
 func SyncFileRange(fd int, off int64, n int64, flags int) error {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
index 7286a9a..5259a5f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -3,9 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (ppc64 || ppc64le)
+// +build linux
+// +build ppc64 ppc64le
 
 package unix
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -18,26 +22,33 @@ package unix
 //sysnb	Getgid() (gid int)
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
 //sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -93,6 +104,41 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 //sys	syncFileRange2(fd int, flags int, off int64, n int64) (err error) = SYS_SYNC_FILE_RANGE2
 
 func SyncFileRange(fd int, off int64, n int64, flags int) error {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
index 8cf3670..8ef821e 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
@@ -3,11 +3,19 @@
 // license that can be found in the LICENSE file.
 
 //go:build riscv64 && linux
+// +build riscv64,linux
 
 package unix
 
 import "unsafe"
 
+func EpollCreate(size int) (fd int, err error) {
+	if size <= 0 {
+		return -1, EINVAL
+	}
+	return EpollCreate1(0)
+}
+
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -21,9 +29,8 @@ import "unsafe"
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
 //sys	Listen(s int, n int) (err error)
-//sys	MemfdSecret(flags int) (fd int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
@@ -31,12 +38,17 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return pselect6(nfd, r, w, e, ts, nil)
+	return Pselect(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
@@ -60,6 +72,7 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 	return ENOSYS
 }
 
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -131,6 +144,30 @@ func utimes(path string, tv *[2]Timeval) (err error) {
 	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
 }
 
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func (r *PtraceRegs) PC() uint64 { return r.Pc }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
@@ -155,11 +192,27 @@ func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
 
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
 func Pause() error {
 	_, err := ppoll(nil, 0, nil, nil)
 	return err
 }
 
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	var ts *Timespec
+	if timeout >= 0 {
+		ts = new(Timespec)
+		*ts = NsecToTimespec(int64(timeout) * 1e6)
+	}
+	if len(fds) == 0 {
+		return ppoll(nil, 0, ts, nil)
+	}
+	return ppoll(&fds[0], len(fds), ts, nil)
+}
+
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
 	return Renameat2(olddirfd, oldpath, newdirfd, newpath, 0)
 }
@@ -177,15 +230,6 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
 	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
 }
 
-//sys	riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error)
-
-func RISCVHWProbe(pairs []RISCVHWProbePairs, set *CPUSet, flags uint) (err error) {
-	var setSize uintptr
-
-	if set != nil {
-		setSize = uintptr(unsafe.Sizeof(*set))
-	}
-	return riscvHWProbe(pairs, setSize, set, flags)
-}
-
-const SYS_FSTATAT = SYS_NEWFSTATAT
+// dup2 exists because func Dup3 in syscall_linux.go references
+// it in an unreachable path. dup2 isn't available on arm64.
+func dup2(oldfd int, newfd int) error
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
index 66f3121..a1c0574 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build s390x && linux
+// +build s390x,linux
 
 package unix
 
@@ -10,6 +11,8 @@ import (
 	"unsafe"
 )
 
+//sys	dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
@@ -22,17 +25,23 @@ import (
 //sysnb	Getgid() (gid int)
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
@@ -68,6 +77,30 @@ func setTimeval(sec, usec int64) Timeval {
 	return Timeval{Sec: sec, Usec: usec}
 }
 
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func Ioperm(from int, num int, on int) (err error) {
 	return ENOSYS
 }
@@ -139,6 +172,15 @@ const (
 	netSendMMsg    = 20
 )
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
 	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
 	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
@@ -282,6 +324,15 @@ func Shutdown(s, how int) error {
 	return nil
 }
 
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 //sys	kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error)
 
 func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
index 11d1f16..de14b88 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -3,11 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build sparc64 && linux
+// +build sparc64,linux
 
 package unix
 
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	dup2(oldfd int, newfd int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
 //sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
@@ -18,24 +20,31 @@ package unix
 //sysnb	Getgid() (gid int)
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
 //sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
@@ -110,3 +119,38 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) {
 	rsa.Service_name_len = uint64(length)
 }
+
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb	pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 8816209..853d5f0 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -13,6 +13,7 @@
 package unix
 
 import (
+	"runtime"
 	"syscall"
 	"unsafe"
 )
@@ -109,22 +110,14 @@ func direntNamlen(buf []byte) (uint64, bool) {
 	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
 }
 
-func SysctlUvmexp(name string) (*Uvmexp, error) {
-	mib, err := sysctlmib(name)
-	if err != nil {
-		return nil, err
-	}
-
-	n := uintptr(SizeofUvmexp)
-	var u Uvmexp
-	if err := sysctl(mib, (*byte)(unsafe.Pointer(&u)), &n, nil, 0); err != nil {
-		return nil, err
-	}
-	return &u, nil
-}
+//sysnb	pipe() (fd1 int, fd2 int, err error)
 
 func Pipe(p []int) (err error) {
-	return Pipe2(p, 0)
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
 }
 
 //sysnb	pipe2(p *[2]_C_int, flags int) (err error)
@@ -135,10 +128,8 @@ func Pipe2(p []int, flags int) error {
 	}
 	var pp [2]_C_int
 	err := pipe2(&pp, flags)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return err
 }
 
@@ -176,14 +167,19 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 	return -1, ENOSYS
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
-//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
 func IoctlGetPtmget(fd int, req uint) (*Ptmget, error) {
 	var value Ptmget
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	runtime.KeepAlive(value)
 	return &value, err
 }
 
@@ -258,7 +254,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	Chmod(path string, mode uint32) (err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	Dup(fd int) (nfd int, err error)
 //sys	Dup2(from int, to int) (err error)
@@ -322,8 +317,8 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
@@ -340,6 +335,7 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -356,16 +352,267 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
-const (
-	mremapFixed     = MAP_FIXED
-	mremapDontunmap = 0
-	mremapMaymove   = 0
-)
-
-//sys	mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) = SYS_MREMAP
-
-func mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (uintptr, error) {
-	return mremapNetBSD(oldaddr, oldlength, newaddr, newlength, flags)
-}
+/*
+ * Unimplemented
+ */
+// ____semctl13
+// __clone
+// __fhopen40
+// __fhstat40
+// __fhstatvfs140
+// __fstat30
+// __getcwd
+// __getfh30
+// __getlogin
+// __lstat30
+// __mount50
+// __msgctl13
+// __msync13
+// __ntp_gettime30
+// __posix_chown
+// __posix_fchown
+// __posix_lchown
+// __posix_rename
+// __setlogin
+// __shmctl13
+// __sigaction_sigtramp
+// __sigaltstack14
+// __sigpending14
+// __sigprocmask14
+// __sigsuspend14
+// __sigtimedwait
+// __stat30
+// __syscall
+// __vfork14
+// _ksem_close
+// _ksem_destroy
+// _ksem_getvalue
+// _ksem_init
+// _ksem_open
+// _ksem_post
+// _ksem_trywait
+// _ksem_unlink
+// _ksem_wait
+// _lwp_continue
+// _lwp_create
+// _lwp_ctl
+// _lwp_detach
+// _lwp_exit
+// _lwp_getname
+// _lwp_getprivate
+// _lwp_kill
+// _lwp_park
+// _lwp_self
+// _lwp_setname
+// _lwp_setprivate
+// _lwp_suspend
+// _lwp_unpark
+// _lwp_unpark_all
+// _lwp_wait
+// _lwp_wakeup
+// _pset_bind
+// _sched_getaffinity
+// _sched_getparam
+// _sched_setaffinity
+// _sched_setparam
+// acct
+// aio_cancel
+// aio_error
+// aio_fsync
+// aio_read
+// aio_return
+// aio_suspend
+// aio_write
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// compat_09_ogetdomainname
+// compat_09_osetdomainname
+// compat_09_ouname
+// compat_10_omsgsys
+// compat_10_osemsys
+// compat_10_oshmsys
+// compat_12_fstat12
+// compat_12_getdirentries
+// compat_12_lstat12
+// compat_12_msync
+// compat_12_oreboot
+// compat_12_oswapon
+// compat_12_stat12
+// compat_13_sigaction13
+// compat_13_sigaltstack13
+// compat_13_sigpending13
+// compat_13_sigprocmask13
+// compat_13_sigreturn13
+// compat_13_sigsuspend13
+// compat_14___semctl
+// compat_14_msgctl
+// compat_14_shmctl
+// compat_16___sigaction14
+// compat_16___sigreturn14
+// compat_20_fhstatfs
+// compat_20_fstatfs
+// compat_20_getfsstat
+// compat_20_statfs
+// compat_30___fhstat30
+// compat_30___fstat13
+// compat_30___lstat13
+// compat_30___stat13
+// compat_30_fhopen
+// compat_30_fhstat
+// compat_30_fhstatvfs1
+// compat_30_getdents
+// compat_30_getfh
+// compat_30_ntp_gettime
+// compat_30_socket
+// compat_40_mount
+// compat_43_fstat43
+// compat_43_lstat43
+// compat_43_oaccept
+// compat_43_ocreat
+// compat_43_oftruncate
+// compat_43_ogetdirentries
+// compat_43_ogetdtablesize
+// compat_43_ogethostid
+// compat_43_ogethostname
+// compat_43_ogetkerninfo
+// compat_43_ogetpagesize
+// compat_43_ogetpeername
+// compat_43_ogetrlimit
+// compat_43_ogetsockname
+// compat_43_okillpg
+// compat_43_olseek
+// compat_43_ommap
+// compat_43_oquota
+// compat_43_orecv
+// compat_43_orecvfrom
+// compat_43_orecvmsg
+// compat_43_osend
+// compat_43_osendmsg
+// compat_43_osethostid
+// compat_43_osethostname
+// compat_43_osetrlimit
+// compat_43_osigblock
+// compat_43_osigsetmask
+// compat_43_osigstack
+// compat_43_osigvec
+// compat_43_otruncate
+// compat_43_owait
+// compat_43_stat43
+// execve
+// extattr_delete_fd
+// extattr_delete_file
+// extattr_delete_link
+// extattr_get_fd
+// extattr_get_file
+// extattr_get_link
+// extattr_list_fd
+// extattr_list_file
+// extattr_list_link
+// extattr_set_fd
+// extattr_set_file
+// extattr_set_link
+// extattrctl
+// fchroot
+// fdatasync
+// fgetxattr
+// fktrace
+// flistxattr
+// fork
+// fremovexattr
+// fsetxattr
+// fstatvfs1
+// fsync_range
+// getcontext
+// getitimer
+// getvfsstat
+// getxattr
+// ktrace
+// lchflags
+// lchmod
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// lgetxattr
+// lio_listio
+// listxattr
+// llistxattr
+// lremovexattr
+// lseek
+// lsetxattr
+// lutimes
+// madvise
+// mincore
+// minherit
+// modctl
+// mq_close
+// mq_getattr
+// mq_notify
+// mq_open
+// mq_receive
+// mq_send
+// mq_setattr
+// mq_timedreceive
+// mq_timedsend
+// mq_unlink
+// mremap
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// ntp_adjtime
+// pmc_control
+// pmc_get_info
+// pollts
+// preadv
+// profil
+// pselect
+// pset_assign
+// pset_create
+// pset_destroy
+// ptrace
+// pwritev
+// quotactl
+// rasctl
+// readv
+// reboot
+// removexattr
+// sa_enable
+// sa_preempt
+// sa_register
+// sa_setconcurrency
+// sa_stacks
+// sa_yield
+// sbrk
+// sched_yield
+// semconfig
+// semget
+// semop
+// setcontext
+// setitimer
+// setxattr
+// shmat
+// shmdt
+// shmget
+// sstk
+// statvfs1
+// swapctl
+// sysarch
+// syscall
+// timer_create
+// timer_delete
+// timer_getoverrun
+// timer_gettime
+// timer_settime
+// undelete
+// utrace
+// uuidgen
+// vadvise
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
index 7a5eb57..5199d28 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && netbsd
+// +build 386,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
index 62d8957..70a9c52 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && netbsd
+// +build amd64,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
index ce6a068..3eb5942 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm && netbsd
+// +build arm,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go
index d46d689..fc6ccfd 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && netbsd
+// +build arm64,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index b86ded5..22b5503 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -81,22 +81,18 @@ func Pipe(p []int) (err error) {
 }
 
 //sysnb	pipe2(p *[2]_C_int, flags int) (err error)
-
 func Pipe2(p []int, flags int) error {
 	if len(p) != 2 {
 		return EINVAL
 	}
 	var pp [2]_C_int
 	err := pipe2(&pp, flags)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return err
 }
 
 //sys	Getdents(fd int, buf []byte) (n int, err error)
-
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	n, err = Getdents(fd, buf)
 	if err != nil || basep == nil {
@@ -137,49 +133,29 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var bufptr *Statfs_t
+	var _p0 unsafe.Pointer
 	var bufsize uintptr
 	if len(buf) > 0 {
-		bufptr = &buf[0]
+		_p0 = unsafe.Pointer(&buf[0])
 		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
 	}
-	return getfsstat(bufptr, bufsize, flags)
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
 }
 
-//sysnb	getresuid(ruid *_C_int, euid *_C_int, suid *_C_int)
-//sysnb	getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int)
-
-func Getresuid() (ruid, euid, suid int) {
-	var r, e, s _C_int
-	getresuid(&r, &e, &s)
-	return int(r), int(e), int(s)
-}
-
-func Getresgid() (rgid, egid, sgid int) {
-	var r, e, s _C_int
-	getresgid(&r, &e, &s)
-	return int(r), int(e), int(s)
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
 }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
-//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
-//sys	fcntl(fd int, cmd int, arg int) (n int, err error)
-//sys	fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) = SYS_FCNTL
-
-// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
-func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
-	return fcntl(int(fd), cmd, arg)
-}
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, err := fcntlPtr(int(fd), cmd, unsafe.Pointer(lk))
-	return err
-}
-
 //sys	ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
 
 func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
@@ -245,7 +221,6 @@ func Uname(uname *Utsname) error {
 //sys	Chmod(path string, mode uint32) (err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	Dup(fd int) (nfd int, err error)
 //sys	Dup2(from int, to int) (err error)
@@ -293,13 +268,12 @@ func Uname(uname *Utsname) error {
 //sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
 //sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
@@ -319,6 +293,7 @@ func Uname(uname *Utsname) error {
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setrtable(rtable int) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
@@ -336,7 +311,80 @@ func Uname(uname *Utsname) error {
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
-//sys	pledge(promises *byte, execpromises *byte) (err error)
-//sys	unveil(path *byte, flags *byte) (err error)
+
+/*
+ * Unimplemented
+ */
+// __getcwd
+// __semctl
+// __syscall
+// __sysctl
+// adjfreq
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// closefrom
+// execve
+// fhopen
+// fhstat
+// fhstatfs
+// fork
+// futimens
+// getfh
+// getgid
+// getitimer
+// getlogin
+// getresgid
+// getresuid
+// getthrid
+// ktrace
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// mincore
+// minherit
+// mount
+// mquery
+// msgctl
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// nnpfspioctl
+// preadv
+// profil
+// pwritev
+// quotactl
+// readv
+// reboot
+// renameat
+// rfork
+// sched_yield
+// semget
+// semop
+// setgroups
+// setitimer
+// setsockopt
+// shmat
+// shmctl
+// shmdt
+// shmget
+// sigaction
+// sigaltstack
+// sigpending
+// sigprocmask
+// sigreturn
+// sigsuspend
+// sysarch
+// syscall
+// threxit
+// thrsigdivert
+// thrsleep
+// thrwakeup
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
index 9ddc89f..6baabcd 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && openbsd
+// +build 386,openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
index 70a3c96..bab2536 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && openbsd
+// +build amd64,openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
index 265caa8..8eed3c4 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm && openbsd
+// +build arm,openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go
index ac4fda1..483dde9 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && openbsd
+// +build arm64,openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go
deleted file mode 100644
index 0a451e6..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build openbsd
-
-package unix
-
-import _ "unsafe"
-
-// Implemented in the runtime package (runtime/sys_openbsd3.go)
-func syscall_syscall(fn, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
-func syscall_syscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
-func syscall_syscall10(fn, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10 uintptr) (r1, r2 uintptr, err Errno)
-func syscall_rawSyscall(fn, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
-func syscall_rawSyscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
-
-//go:linkname syscall_syscall syscall.syscall
-//go:linkname syscall_syscall6 syscall.syscall6
-//go:linkname syscall_syscall10 syscall.syscall10
-//go:linkname syscall_rawSyscall syscall.rawSyscall
-//go:linkname syscall_rawSyscall6 syscall.rawSyscall6
-
-func syscall_syscall9(fn, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno) {
-	return syscall_syscall10(fn, a1, a2, a3, a4, a5, a6, a7, a8, a9, 0)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
index 1378489..30f2853 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
@@ -26,10 +26,6 @@ func (msghdr *Msghdr) SetControllen(length int) {
 	msghdr.Controllen = uint32(length)
 }
 
-func (msghdr *Msghdr) SetIovlen(length int) {
-	msghdr.Iovlen = uint32(length)
-}
-
 func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go
deleted file mode 100644
index 30a308c..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build ppc64 && openbsd
-
-package unix
-
-func setTimespec(sec, nsec int64) Timespec {
-	return Timespec{Sec: sec, Nsec: nsec}
-}
-
-func setTimeval(sec, usec int64) Timeval {
-	return Timeval{Sec: sec, Usec: usec}
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (msghdr *Msghdr) SetIovlen(length int) {
-	msghdr.Iovlen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of openbsd/ppc64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go
deleted file mode 100644
index ea95433..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build riscv64 && openbsd
-
-package unix
-
-func setTimespec(sec, nsec int64) Timespec {
-	return Timespec{Sec: sec, Nsec: nsec}
-}
-
-func setTimeval(sec, usec int64) Timeval {
-	return Timeval{Sec: sec, Usec: usec}
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (msghdr *Msghdr) SetIovlen(length int) {
-	msghdr.Iovlen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of openbsd/riscv64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
index abc3955..d2a6495 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -66,10 +66,8 @@ func Pipe(p []int) (err error) {
 	if n != 0 {
 		return err
 	}
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return nil
 }
 
@@ -81,10 +79,8 @@ func Pipe2(p []int, flags int) error {
 	}
 	var pp [2]_C_int
 	err := pipe2(&pp, flags)
-	if err == nil {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
 	return err
 }
 
@@ -96,7 +92,9 @@ func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
 }
 
@@ -109,7 +107,9 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
 }
 
@@ -128,8 +128,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	if n > 0 {
 		sl += _Socklen(n) + 1
 	}
-	if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
-		// Check sl > 3 so we don't change unnamed socket behavior.
+	if sa.raw.Path[0] == '@' {
 		sa.raw.Path[0] = 0
 		// Don't count trailing NUL for abstract address.
 		sl--
@@ -158,7 +157,7 @@ func GetsockoptString(fd, level, opt int) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return ByteSliceToString(buf[:vallen]), nil
+	return string(buf[:vallen-1]), nil
 }
 
 const ImplementsGetwd = true
@@ -409,7 +408,8 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -417,7 +417,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		sa := new(SockaddrInet4)
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 
 	case AF_INET6:
@@ -426,7 +428,9 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
 		sa.ZoneId = pp.Scope_id
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 	}
 	return nil, EAFNOSUPPORT
@@ -451,59 +455,77 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 
 //sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_recvmsg
 
-func recvmsgRaw(fd int, iov []Iovec, oob []byte, flags int, rsa *RawSockaddrAny) (n, oobn int, recvflags int, err error) {
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(rsa))
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
 	msg.Namelen = uint32(SizeofSockaddrAny)
-	var dummy byte
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
 	if len(oob) > 0 {
 		// receive at least one normal byte
-		if emptyIovecs(iov) {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
 		}
 		msg.Accrightslen = int32(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = recvmsg(fd, &msg, flags); n == -1 {
 		return
 	}
 	oobn = int(msg.Accrightslen)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
+	return
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
 	return
 }
 
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_sendmsg
 
-func sendmsgN(fd int, iov []Iovec, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
 	var msg Msghdr
 	msg.Name = (*byte)(unsafe.Pointer(ptr))
 	msg.Namelen = uint32(salen)
-	var dummy byte
-	var empty bool
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
 	if len(oob) > 0 {
 		// send at least one normal byte
-		empty = emptyIovecs(iov)
-		if empty {
-			var iova [1]Iovec
-			iova[0].Base = &dummy
-			iova[0].SetLen(1)
-			iov = iova[:]
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
 		}
 		msg.Accrightslen = int32(len(oob))
 	}
-	if len(iov) > 0 {
-		msg.Iov = &iov[0]
-		msg.SetIovlen(len(iov))
-	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
 	if n, err = sendmsg(fd, &msg, flags); err != nil {
 		return 0, err
 	}
-	if len(oob) > 0 && empty {
+	if len(oob) > 0 && len(p) == 0 {
 		n = 0
 	}
 	return n, nil
@@ -546,26 +568,22 @@ func Minor(dev uint64) uint32 {
  * Expose the ioctl function
  */
 
-//sys	ioctlRet(fd int, req int, arg uintptr) (ret int, err error) = libc.ioctl
-//sys	ioctlPtrRet(fd int, req int, arg unsafe.Pointer) (ret int, err error) = libc.ioctl
+//sys	ioctlRet(fd int, req uint, arg uintptr) (ret int, err error) = libc.ioctl
 
-func ioctl(fd int, req int, arg uintptr) (err error) {
+func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, err = ioctlRet(fd, req, arg)
 	return err
 }
 
-func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
-	_, err = ioctlPtrRet(fd, req, arg)
+func IoctlSetTermio(fd int, req uint, value *Termio) error {
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
 	return err
 }
 
-func IoctlSetTermio(fd int, req int, value *Termio) error {
-	return ioctlPtr(fd, req, unsafe.Pointer(value))
-}
-
-func IoctlGetTermio(fd int, req int) (*Termio, error) {
+func IoctlGetTermio(fd int, req uint) (*Termio, error) {
 	var value Termio
-	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
@@ -594,7 +612,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Chmod(path string, mode uint32) (err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
 //sys	Creat(path string, mode uint32) (fd int, err error)
 //sys	Dup(fd int) (nfd int, err error)
@@ -623,7 +640,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Getpriority(which int, who int) (n int, err error)
 //sysnb	Getrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 //sysnb	Getuid() (uid int)
 //sys	Kill(pid int, signum syscall.Signal) (err error)
@@ -649,8 +665,8 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
 //sys	Pause() (err error)
-//sys	pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Rename(from string, to string) (err error)
@@ -666,6 +682,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Setuid(uid int) (err error)
 //sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
@@ -699,6 +716,38 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
 // Event Ports
 
 type fileObjCookie struct {
@@ -710,20 +759,8 @@ type fileObjCookie struct {
 type EventPort struct {
 	port  int
 	mu    sync.Mutex
-	fds   map[uintptr]*fileObjCookie
+	fds   map[uintptr]interface{}
 	paths map[string]*fileObjCookie
-	// The user cookie presents an interesting challenge from a memory management perspective.
-	// There are two paths by which we can discover that it is no longer in use:
-	// 1. The user calls port_dissociate before any events fire
-	// 2. An event fires and we return it to the user
-	// The tricky situation is if the event has fired in the kernel but
-	// the user hasn't requested/received it yet.
-	// If the user wants to port_dissociate before the event has been processed,
-	// we should handle things gracefully. To do so, we need to keep an extra
-	// reference to the cookie around until the event is processed
-	// thus the otherwise seemingly extraneous "cookies" map
-	// The key of this map is a pointer to the corresponding fCookie
-	cookies map[*fileObjCookie]struct{}
 }
 
 // PortEvent is an abstraction of the port_event C struct.
@@ -747,10 +784,9 @@ func NewEventPort() (*EventPort, error) {
 		return nil, err
 	}
 	e := &EventPort{
-		port:    port,
-		fds:     make(map[uintptr]*fileObjCookie),
-		paths:   make(map[string]*fileObjCookie),
-		cookies: make(map[*fileObjCookie]struct{}),
+		port:  port,
+		fds:   make(map[uintptr]interface{}),
+		paths: make(map[string]*fileObjCookie),
 	}
 	return e, nil
 }
@@ -765,14 +801,9 @@ func NewEventPort() (*EventPort, error) {
 func (e *EventPort) Close() error {
 	e.mu.Lock()
 	defer e.mu.Unlock()
-	err := Close(e.port)
-	if err != nil {
-		return err
-	}
 	e.fds = nil
 	e.paths = nil
-	e.cookies = nil
-	return nil
+	return Close(e.port)
 }
 
 // PathIsWatched checks to see if path is associated with this EventPort.
@@ -799,16 +830,16 @@ func (e *EventPort) AssociatePath(path string, stat os.FileInfo, events int, coo
 	if _, found := e.paths[path]; found {
 		return fmt.Errorf("%v is already associated with this Event Port", path)
 	}
-	fCookie, err := createFileObjCookie(path, stat, cookie)
+	fobj, err := createFileObj(path, stat)
 	if err != nil {
 		return err
 	}
-	_, err = port_associate(e.port, PORT_SOURCE_FILE, uintptr(unsafe.Pointer(fCookie.fobj)), events, (*byte)(unsafe.Pointer(fCookie)))
+	fCookie := &fileObjCookie{fobj, cookie}
+	_, err = port_associate(e.port, PORT_SOURCE_FILE, uintptr(unsafe.Pointer(fobj)), events, (*byte)(unsafe.Pointer(&fCookie.cookie)))
 	if err != nil {
 		return err
 	}
 	e.paths[path] = fCookie
-	e.cookies[fCookie] = struct{}{}
 	return nil
 }
 
@@ -821,19 +852,11 @@ func (e *EventPort) DissociatePath(path string) error {
 		return fmt.Errorf("%v is not associated with this Event Port", path)
 	}
 	_, err := port_dissociate(e.port, PORT_SOURCE_FILE, uintptr(unsafe.Pointer(f.fobj)))
-	// If the path is no longer associated with this event port (ENOENT)
-	// we should delete it from our map. We can still return ENOENT to the caller.
-	// But we need to save the cookie
-	if err != nil && err != ENOENT {
+	if err != nil {
 		return err
 	}
-	if err == nil {
-		// dissociate was successful, safe to delete the cookie
-		fCookie := e.paths[path]
-		delete(e.cookies, fCookie)
-	}
 	delete(e.paths, path)
-	return err
+	return nil
 }
 
 // AssociateFd wraps calls to port_associate(3c) on file descriptors.
@@ -843,16 +866,12 @@ func (e *EventPort) AssociateFd(fd uintptr, events int, cookie interface{}) erro
 	if _, found := e.fds[fd]; found {
 		return fmt.Errorf("%v is already associated with this Event Port", fd)
 	}
-	fCookie, err := createFileObjCookie("", nil, cookie)
+	pcookie := &cookie
+	_, err := port_associate(e.port, PORT_SOURCE_FD, fd, events, (*byte)(unsafe.Pointer(pcookie)))
 	if err != nil {
 		return err
 	}
-	_, err = port_associate(e.port, PORT_SOURCE_FD, fd, events, (*byte)(unsafe.Pointer(fCookie)))
-	if err != nil {
-		return err
-	}
-	e.fds[fd] = fCookie
-	e.cookies[fCookie] = struct{}{}
+	e.fds[fd] = pcookie
 	return nil
 }
 
@@ -865,37 +884,28 @@ func (e *EventPort) DissociateFd(fd uintptr) error {
 		return fmt.Errorf("%v is not associated with this Event Port", fd)
 	}
 	_, err := port_dissociate(e.port, PORT_SOURCE_FD, fd)
-	if err != nil && err != ENOENT {
+	if err != nil {
 		return err
 	}
-	if err == nil {
-		// dissociate was successful, safe to delete the cookie
-		fCookie := e.fds[fd]
-		delete(e.cookies, fCookie)
-	}
 	delete(e.fds, fd)
-	return err
+	return nil
 }
 
-func createFileObjCookie(name string, stat os.FileInfo, cookie interface{}) (*fileObjCookie, error) {
-	fCookie := new(fileObjCookie)
-	fCookie.cookie = cookie
-	if name != "" && stat != nil {
-		fCookie.fobj = new(fileObj)
-		bs, err := ByteSliceFromString(name)
-		if err != nil {
-			return nil, err
-		}
-		fCookie.fobj.Name = (*int8)(unsafe.Pointer(&bs[0]))
-		s := stat.Sys().(*syscall.Stat_t)
-		fCookie.fobj.Atim.Sec = s.Atim.Sec
-		fCookie.fobj.Atim.Nsec = s.Atim.Nsec
-		fCookie.fobj.Mtim.Sec = s.Mtim.Sec
-		fCookie.fobj.Mtim.Nsec = s.Mtim.Nsec
-		fCookie.fobj.Ctim.Sec = s.Ctim.Sec
-		fCookie.fobj.Ctim.Nsec = s.Ctim.Nsec
+func createFileObj(name string, stat os.FileInfo) (*fileObj, error) {
+	fobj := new(fileObj)
+	bs, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
 	}
-	return fCookie, nil
+	fobj.Name = (*int8)(unsafe.Pointer(&bs[0]))
+	s := stat.Sys().(*syscall.Stat_t)
+	fobj.Atim.Sec = s.Atim.Sec
+	fobj.Atim.Nsec = s.Atim.Nsec
+	fobj.Mtim.Sec = s.Mtim.Sec
+	fobj.Mtim.Nsec = s.Mtim.Nsec
+	fobj.Ctim.Sec = s.Ctim.Sec
+	fobj.Ctim.Nsec = s.Ctim.Nsec
+	return fobj, nil
 }
 
 // GetOne wraps port_get(3c) and returns a single PortEvent.
@@ -906,54 +916,26 @@ func (e *EventPort) GetOne(t *Timespec) (*PortEvent, error) {
 		return nil, err
 	}
 	p := new(PortEvent)
+	p.Events = pe.Events
+	p.Source = pe.Source
 	e.mu.Lock()
 	defer e.mu.Unlock()
-	err = e.peIntToExt(pe, p)
-	if err != nil {
-		return nil, err
+	switch pe.Source {
+	case PORT_SOURCE_FD:
+		p.Fd = uintptr(pe.Object)
+		cookie := (*interface{})(unsafe.Pointer(pe.User))
+		p.Cookie = *cookie
+		delete(e.fds, p.Fd)
+	case PORT_SOURCE_FILE:
+		p.fobj = (*fileObj)(unsafe.Pointer(uintptr(pe.Object)))
+		p.Path = BytePtrToString((*byte)(unsafe.Pointer(p.fobj.Name)))
+		cookie := (*interface{})(unsafe.Pointer(pe.User))
+		p.Cookie = *cookie
+		delete(e.paths, p.Path)
 	}
 	return p, nil
 }
 
-// peIntToExt converts a cgo portEvent struct into the friendlier PortEvent
-// NOTE: Always call this function while holding the e.mu mutex
-func (e *EventPort) peIntToExt(peInt *portEvent, peExt *PortEvent) error {
-	if e.cookies == nil {
-		return fmt.Errorf("this EventPort is already closed")
-	}
-	peExt.Events = peInt.Events
-	peExt.Source = peInt.Source
-	fCookie := (*fileObjCookie)(unsafe.Pointer(peInt.User))
-	_, found := e.cookies[fCookie]
-
-	if !found {
-		panic("unexpected event port address; may be due to kernel bug; see https://go.dev/issue/54254")
-	}
-	peExt.Cookie = fCookie.cookie
-	delete(e.cookies, fCookie)
-
-	switch peInt.Source {
-	case PORT_SOURCE_FD:
-		peExt.Fd = uintptr(peInt.Object)
-		// Only remove the fds entry if it exists and this cookie matches
-		if fobj, ok := e.fds[peExt.Fd]; ok {
-			if fobj == fCookie {
-				delete(e.fds, peExt.Fd)
-			}
-		}
-	case PORT_SOURCE_FILE:
-		peExt.fobj = fCookie.fobj
-		peExt.Path = BytePtrToString((*byte)(unsafe.Pointer(peExt.fobj.Name)))
-		// Only remove the paths entry if it exists and this cookie matches
-		if fobj, ok := e.paths[peExt.Path]; ok {
-			if fobj == fCookie {
-				delete(e.paths, peExt.Path)
-			}
-		}
-	}
-	return nil
-}
-
 // Pending wraps port_getn(3c) and returns how many events are pending.
 func (e *EventPort) Pending() (int, error) {
 	var n uint32 = 0
@@ -975,7 +957,7 @@ func (e *EventPort) Get(s []PortEvent, min int, timeout *Timespec) (int, error)
 	got := uint32(min)
 	max := uint32(len(s))
 	var err error
-	ps := make([]portEvent, max)
+	ps := make([]portEvent, max, max)
 	_, err = port_getn(e.port, &ps[0], max, &got, timeout)
 	// got will be trustworthy with ETIME, but not any other error.
 	if err != nil && err != ETIME {
@@ -983,209 +965,22 @@ func (e *EventPort) Get(s []PortEvent, min int, timeout *Timespec) (int, error)
 	}
 	e.mu.Lock()
 	defer e.mu.Unlock()
-	valid := 0
 	for i := 0; i < int(got); i++ {
-		err2 := e.peIntToExt(&ps[i], &s[i])
-		if err2 != nil {
-			if valid == 0 && err == nil {
-				// If err2 is the only error and there are no valid events
-				// to return, return it to the caller.
-				err = err2
-			}
-			break
-		}
-		valid = i + 1
-	}
-	return valid, err
-}
-
-//sys	putmsg(fd int, clptr *strbuf, dataptr *strbuf, flags int) (err error)
-
-func Putmsg(fd int, cl []byte, data []byte, flags int) (err error) {
-	var clp, datap *strbuf
-	if len(cl) > 0 {
-		clp = &strbuf{
-			Len: int32(len(cl)),
-			Buf: (*int8)(unsafe.Pointer(&cl[0])),
+		s[i].Events = ps[i].Events
+		s[i].Source = ps[i].Source
+		switch ps[i].Source {
+		case PORT_SOURCE_FD:
+			s[i].Fd = uintptr(ps[i].Object)
+			cookie := (*interface{})(unsafe.Pointer(ps[i].User))
+			s[i].Cookie = *cookie
+			delete(e.fds, s[i].Fd)
+		case PORT_SOURCE_FILE:
+			s[i].fobj = (*fileObj)(unsafe.Pointer(uintptr(ps[i].Object)))
+			s[i].Path = BytePtrToString((*byte)(unsafe.Pointer(s[i].fobj.Name)))
+			cookie := (*interface{})(unsafe.Pointer(ps[i].User))
+			s[i].Cookie = *cookie
+			delete(e.paths, s[i].Path)
 		}
 	}
-	if len(data) > 0 {
-		datap = &strbuf{
-			Len: int32(len(data)),
-			Buf: (*int8)(unsafe.Pointer(&data[0])),
-		}
-	}
-	return putmsg(fd, clp, datap, flags)
-}
-
-//sys	getmsg(fd int, clptr *strbuf, dataptr *strbuf, flags *int) (err error)
-
-func Getmsg(fd int, cl []byte, data []byte) (retCl []byte, retData []byte, flags int, err error) {
-	var clp, datap *strbuf
-	if len(cl) > 0 {
-		clp = &strbuf{
-			Maxlen: int32(len(cl)),
-			Buf:    (*int8)(unsafe.Pointer(&cl[0])),
-		}
-	}
-	if len(data) > 0 {
-		datap = &strbuf{
-			Maxlen: int32(len(data)),
-			Buf:    (*int8)(unsafe.Pointer(&data[0])),
-		}
-	}
-
-	if err = getmsg(fd, clp, datap, &flags); err != nil {
-		return nil, nil, 0, err
-	}
-
-	if len(cl) > 0 {
-		retCl = cl[:clp.Len]
-	}
-	if len(data) > 0 {
-		retData = data[:datap.Len]
-	}
-	return retCl, retData, flags, nil
-}
-
-func IoctlSetIntRetInt(fd int, req int, arg int) (int, error) {
-	return ioctlRet(fd, req, uintptr(arg))
-}
-
-func IoctlSetString(fd int, req int, val string) error {
-	bs := make([]byte, len(val)+1)
-	copy(bs[:len(bs)-1], val)
-	err := ioctlPtr(fd, req, unsafe.Pointer(&bs[0]))
-	runtime.KeepAlive(&bs[0])
-	return err
-}
-
-// Lifreq Helpers
-
-func (l *Lifreq) SetName(name string) error {
-	if len(name) >= len(l.Name) {
-		return fmt.Errorf("name cannot be more than %d characters", len(l.Name)-1)
-	}
-	for i := range name {
-		l.Name[i] = int8(name[i])
-	}
-	return nil
-}
-
-func (l *Lifreq) SetLifruInt(d int) {
-	*(*int)(unsafe.Pointer(&l.Lifru[0])) = d
-}
-
-func (l *Lifreq) GetLifruInt() int {
-	return *(*int)(unsafe.Pointer(&l.Lifru[0]))
-}
-
-func (l *Lifreq) SetLifruUint(d uint) {
-	*(*uint)(unsafe.Pointer(&l.Lifru[0])) = d
-}
-
-func (l *Lifreq) GetLifruUint() uint {
-	return *(*uint)(unsafe.Pointer(&l.Lifru[0]))
-}
-
-func IoctlLifreq(fd int, req int, l *Lifreq) error {
-	return ioctlPtr(fd, req, unsafe.Pointer(l))
-}
-
-// Strioctl Helpers
-
-func (s *Strioctl) SetInt(i int) {
-	s.Len = int32(unsafe.Sizeof(i))
-	s.Dp = (*int8)(unsafe.Pointer(&i))
-}
-
-func IoctlSetStrioctlRetInt(fd int, req int, s *Strioctl) (int, error) {
-	return ioctlPtrRet(fd, req, unsafe.Pointer(s))
-}
-
-// Ucred Helpers
-// See ucred(3c) and getpeerucred(3c)
-
-//sys	getpeerucred(fd uintptr, ucred *uintptr) (err error)
-//sys	ucredFree(ucred uintptr) = ucred_free
-//sys	ucredGet(pid int) (ucred uintptr, err error) = ucred_get
-//sys	ucredGeteuid(ucred uintptr) (uid int) = ucred_geteuid
-//sys	ucredGetegid(ucred uintptr) (gid int) = ucred_getegid
-//sys	ucredGetruid(ucred uintptr) (uid int) = ucred_getruid
-//sys	ucredGetrgid(ucred uintptr) (gid int) = ucred_getrgid
-//sys	ucredGetsuid(ucred uintptr) (uid int) = ucred_getsuid
-//sys	ucredGetsgid(ucred uintptr) (gid int) = ucred_getsgid
-//sys	ucredGetpid(ucred uintptr) (pid int) = ucred_getpid
-
-// Ucred is an opaque struct that holds user credentials.
-type Ucred struct {
-	ucred uintptr
-}
-
-// We need to ensure that ucredFree is called on the underlying ucred
-// when the Ucred is garbage collected.
-func ucredFinalizer(u *Ucred) {
-	ucredFree(u.ucred)
-}
-
-func GetPeerUcred(fd uintptr) (*Ucred, error) {
-	var ucred uintptr
-	err := getpeerucred(fd, &ucred)
-	if err != nil {
-		return nil, err
-	}
-	result := &Ucred{
-		ucred: ucred,
-	}
-	// set the finalizer on the result so that the ucred will be freed
-	runtime.SetFinalizer(result, ucredFinalizer)
-	return result, nil
-}
-
-func UcredGet(pid int) (*Ucred, error) {
-	ucred, err := ucredGet(pid)
-	if err != nil {
-		return nil, err
-	}
-	result := &Ucred{
-		ucred: ucred,
-	}
-	// set the finalizer on the result so that the ucred will be freed
-	runtime.SetFinalizer(result, ucredFinalizer)
-	return result, nil
-}
-
-func (u *Ucred) Geteuid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGeteuid(u.ucred)
-}
-
-func (u *Ucred) Getruid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetruid(u.ucred)
-}
-
-func (u *Ucred) Getsuid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetsuid(u.ucred)
-}
-
-func (u *Ucred) Getegid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetegid(u.ucred)
-}
-
-func (u *Ucred) Getrgid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetrgid(u.ucred)
-}
-
-func (u *Ucred) Getsgid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetsgid(u.ucred)
-}
-
-func (u *Ucred) Getpid() int {
-	defer runtime.KeepAlive(u)
-	return ucredGetpid(u.ucred)
+	return int(got), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
index e02d8ce..0bd25ef 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
index 4e92e5a..cf296a2 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package unix
 
@@ -12,6 +13,8 @@ import (
 	"sync"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
 var (
@@ -114,7 +117,11 @@ func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (d
 	}
 
 	// Use unsafe to convert addr into a []byte.
-	b := unsafe.Slice((*byte)(unsafe.Pointer(addr)), length)
+	var b []byte
+	hdr := (*unsafeheader.Slice)(unsafe.Pointer(&b))
+	hdr.Data = unsafe.Pointer(addr)
+	hdr.Cap = length
+	hdr.Len = length
 
 	// Register mapping in m and return it.
 	p := &b[cap(b)-1]
@@ -146,23 +153,6 @@ func (m *mmapper) Munmap(data []byte) (err error) {
 	return nil
 }
 
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
-func MmapPtr(fd int, offset int64, addr unsafe.Pointer, length uintptr, prot int, flags int) (ret unsafe.Pointer, err error) {
-	xaddr, err := mapper.mmap(uintptr(addr), length, prot, flags, fd, offset)
-	return unsafe.Pointer(xaddr), err
-}
-
-func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) {
-	return mapper.munmap(uintptr(addr), length)
-}
-
 func Read(fd int, p []byte) (n int, err error) {
 	n, err = read(fd, p)
 	if raceenabled {
@@ -187,30 +177,6 @@ func Write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	n, err = pread(fd, p, offset)
-	if raceenabled {
-		if n > 0 {
-			raceWriteRange(unsafe.Pointer(&p[0]), n)
-		}
-		if err == nil {
-			raceAcquire(unsafe.Pointer(&ioSync))
-		}
-	}
-	return
-}
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = pwrite(fd, p, offset)
-	if raceenabled && n > 0 {
-		raceReadRange(unsafe.Pointer(&p[0]), n)
-	}
-	return
-}
-
 // For testing: clients can set this flag to force
 // creation of IPv6 sockets to return EAFNOSUPPORT.
 var SocketDisableIPv6 bool
@@ -347,142 +313,16 @@ func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
 	return
 }
 
-// Recvmsg receives a message from a socket using the recvmsg system call. The
-// received non-control data will be written to p, and any "out of band"
-// control data will be written to oob. The flags are passed to recvmsg.
-//
-// The results are:
-//   - n is the number of non-control data bytes read into p
-//   - oobn is the number of control data bytes read into oob; this may be interpreted using [ParseSocketControlMessage]
-//   - recvflags is flags returned by recvmsg
-//   - from is the address of the sender
-//
-// If the underlying socket type is not SOCK_DGRAM, a received message
-// containing oob data and a single '\0' of non-control data is treated as if
-// the message contained only control data, i.e. n will be zero on return.
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var iov [1]Iovec
-	if len(p) > 0 {
-		iov[0].Base = &p[0]
-		iov[0].SetLen(len(p))
-	}
-	var rsa RawSockaddrAny
-	n, oobn, recvflags, err = recvmsgRaw(fd, iov[:], oob, flags, &rsa)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(fd, &rsa)
-	}
-	return
-}
-
-// RecvmsgBuffers receives a message from a socket using the recvmsg system
-// call. This function is equivalent to Recvmsg, but non-control data read is
-// scattered into the buffers slices.
-func RecvmsgBuffers(fd int, buffers [][]byte, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	iov := make([]Iovec, len(buffers))
-	for i := range buffers {
-		if len(buffers[i]) > 0 {
-			iov[i].Base = &buffers[i][0]
-			iov[i].SetLen(len(buffers[i]))
-		} else {
-			iov[i].Base = (*byte)(unsafe.Pointer(&_zero))
-		}
-	}
-	var rsa RawSockaddrAny
-	n, oobn, recvflags, err = recvmsgRaw(fd, iov, oob, flags, &rsa)
-	if err == nil && rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(fd, &rsa)
-	}
-	return
-}
-
-// Sendmsg sends a message on a socket to an address using the sendmsg system
-// call. This function is equivalent to SendmsgN, but does not return the
-// number of bytes actually sent.
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-// SendmsgN sends a message on a socket to an address using the sendmsg system
-// call. p contains the non-control data to send, and oob contains the "out of
-// band" control data. The flags are passed to sendmsg. The number of
-// non-control bytes actually written to the socket is returned.
-//
-// Some socket types do not support sending control data without accompanying
-// non-control data. If p is empty, and oob contains control data, and the
-// underlying socket type is not SOCK_DGRAM, p will be treated as containing a
-// single '\0' and the return value will indicate zero bytes sent.
-//
-// The Go function Recvmsg, if called with an empty p and a non-empty oob,
-// will read and ignore this additional '\0'.  If the message is received by
-// code that does not use Recvmsg, or that does not use Go at all, that code
-// will need to be written to expect and ignore the additional '\0'.
-//
-// If you need to send non-empty oob with p actually empty, and if the
-// underlying socket type supports it, you can do so via a raw system call as
-// follows:
-//
-//	msg := &unix.Msghdr{
-//	    Control: &oob[0],
-//	}
-//	msg.SetControllen(len(oob))
-//	n, _, errno := unix.Syscall(unix.SYS_SENDMSG, uintptr(fd), uintptr(unsafe.Pointer(msg)), flags)
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var iov [1]Iovec
-	if len(p) > 0 {
-		iov[0].Base = &p[0]
-		iov[0].SetLen(len(p))
-	}
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	return sendmsgN(fd, iov[:], oob, ptr, salen, flags)
-}
-
-// SendmsgBuffers sends a message on a socket to an address using the sendmsg
-// system call. This function is equivalent to SendmsgN, but the non-control
-// data is gathered from buffers.
-func SendmsgBuffers(fd int, buffers [][]byte, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	iov := make([]Iovec, len(buffers))
-	for i := range buffers {
-		if len(buffers[i]) > 0 {
-			iov[i].Base = &buffers[i][0]
-			iov[i].SetLen(len(buffers[i]))
-		} else {
-			iov[i].Base = (*byte)(unsafe.Pointer(&_zero))
-		}
-	}
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	return sendmsgN(fd, iov, oob, ptr, salen, flags)
-}
-
 func Send(s int, buf []byte, flags int) (err error) {
 	return sendto(s, buf, flags, nil, 0)
 }
 
 func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return err
-		}
+	ptr, n, err := to.sockaddr()
+	if err != nil {
+		return err
 	}
-	return sendto(fd, p, flags, ptr, salen)
+	return sendto(fd, p, flags, ptr, n)
 }
 
 func SetsockoptByte(fd, level, opt int, value byte) (err error) {
@@ -557,9 +397,6 @@ func SetNonblock(fd int, nonblocking bool) (err error) {
 	if err != nil {
 		return err
 	}
-	if (flag&O_NONBLOCK != 0) == nonblocking {
-		return nil
-	}
 	if nonblocking {
 		flag |= O_NONBLOCK
 	} else {
@@ -596,20 +433,3 @@ func Lutimes(path string, tv []Timeval) error {
 	}
 	return UtimesNanoAt(AT_FDCWD, path, ts, AT_SYMLINK_NOFOLLOW)
 }
-
-// emptyIovecs reports whether there are no bytes in the slice of Iovec.
-func emptyIovecs(iov []Iovec) bool {
-	for i := range iov {
-		if iov[i].Len > 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// Setrlimit sets a resource limit.
-func Setrlimit(resource int, rlim *Rlimit) error {
-	// Just call the syscall version, because as of Go 1.21
-	// it will affect starting a new process.
-	return syscall.Setrlimit(resource, (*syscall.Rlimit)(rlim))
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_gc.go b/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
index 05c95bc..5898e9a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (darwin || dragonfly || freebsd || (linux && !ppc64 && !ppc64le) || netbsd || openbsd || solaris) && gc
+//go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && gc && !ppc64le && !ppc64
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build gc
+// +build !ppc64le
+// +build !ppc64
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go
index 23f39b7..f6f707a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (ppc64le || ppc64) && gc
+// +build linux
+// +build ppc64le ppc64
+// +build gc
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
index 7bf5c04..1ffd8bf 100644
--- a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
@@ -3,229 +3,30 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x
-
-// Many of the following syscalls are not available on all versions of z/OS.
-// Some missing calls have legacy implementations/simulations but others
-// will be missing completely. To achieve consistent failing behaviour on
-// legacy systems, we first test the function pointer via a safeloading
-// mechanism to see if the function exists on a given system. Then execution
-// is branched to either continue the function call, or return an error.
+// +build zos,s390x
 
 package unix
 
 import (
 	"bytes"
-	"fmt"
-	"os"
-	"reflect"
-	"regexp"
 	"runtime"
 	"sort"
-	"strings"
 	"sync"
 	"syscall"
 	"unsafe"
 )
 
-//go:noescape
-func initZosLibVec()
-
-//go:noescape
-func GetZosLibVec() uintptr
-
-func init() {
-	initZosLibVec()
-	r0, _, _ := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS_____GETENV_A<<4, uintptr(unsafe.Pointer(&([]byte("__ZOS_XSYSTRACE\x00"))[0])))
-	if r0 != 0 {
-		n, _, _ := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___ATOI_A<<4, r0)
-		ZosTraceLevel = int(n)
-		r0, _, _ := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS_____GETENV_A<<4, uintptr(unsafe.Pointer(&([]byte("__ZOS_XSYSTRACEFD\x00"))[0])))
-		if r0 != 0 {
-			fd, _, _ := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___ATOI_A<<4, r0)
-			f := os.NewFile(fd, "zostracefile")
-			if f != nil {
-				ZosTracefile = f
-			}
-		}
-
-	}
-}
-
-//go:noescape
-func CallLeFuncWithErr(funcdesc uintptr, parms ...uintptr) (ret, errno2 uintptr, err Errno)
-
-//go:noescape
-func CallLeFuncWithPtrReturn(funcdesc uintptr, parms ...uintptr) (ret, errno2 uintptr, err Errno)
-
-// -------------------------------
-// pointer validity test
-// good pointer returns 0
-// bad pointer returns 1
-//
-//go:nosplit
-func ptrtest(uintptr) uint64
-
-// Load memory at ptr location with error handling if the location is invalid
-//
-//go:noescape
-func safeload(ptr uintptr) (value uintptr, error uintptr)
-
 const (
-	entrypointLocationOffset = 8 // From function descriptor
-
-	xplinkEyecatcher   = 0x00c300c500c500f1 // ".C.E.E.1"
-	eyecatcherOffset   = 16                 // From function entrypoint (negative)
-	ppa1LocationOffset = 8                  // From function entrypoint (negative)
-
-	nameLenOffset = 0x14 // From PPA1 start
-	nameOffset    = 0x16 // From PPA1 start
+	O_CLOEXEC = 0       // Dummy value (not supported).
+	AF_LOCAL  = AF_UNIX // AF_LOCAL is an alias for AF_UNIX
 )
 
-func getPpaOffset(funcptr uintptr) int64 {
-	entrypoint, err := safeload(funcptr + entrypointLocationOffset)
-	if err != 0 {
-		return -1
-	}
-
-	// XPLink functions have ".C.E.E.1" as the first 8 bytes (EBCDIC)
-	val, err := safeload(entrypoint - eyecatcherOffset)
-	if err != 0 {
-		return -1
-	}
-	if val != xplinkEyecatcher {
-		return -1
-	}
-
-	ppaoff, err := safeload(entrypoint - ppa1LocationOffset)
-	if err != 0 {
-		return -1
-	}
-
-	ppaoff >>= 32
-	return int64(ppaoff)
-}
-
-//-------------------------------
-// function descriptor pointer validity test
-// good pointer returns 0
-// bad pointer returns 1
-
-// TODO: currently mksyscall_zos_s390x.go generate empty string for funcName
-// have correct funcName pass to the funcptrtest function
-func funcptrtest(funcptr uintptr, funcName string) uint64 {
-	entrypoint, err := safeload(funcptr + entrypointLocationOffset)
-	if err != 0 {
-		return 1
-	}
-
-	ppaoff := getPpaOffset(funcptr)
-	if ppaoff == -1 {
-		return 1
-	}
-
-	// PPA1 offset value is from the start of the entire function block, not the entrypoint
-	ppa1 := (entrypoint - eyecatcherOffset) + uintptr(ppaoff)
-
-	nameLen, err := safeload(ppa1 + nameLenOffset)
-	if err != 0 {
-		return 1
-	}
-
-	nameLen >>= 48
-	if nameLen > 128 {
-		return 1
-	}
-
-	// no function name input to argument end here
-	if funcName == "" {
-		return 0
-	}
-
-	var funcname [128]byte
-	for i := 0; i < int(nameLen); i += 8 {
-		v, err := safeload(ppa1 + nameOffset + uintptr(i))
-		if err != 0 {
-			return 1
-		}
-		funcname[i] = byte(v >> 56)
-		funcname[i+1] = byte(v >> 48)
-		funcname[i+2] = byte(v >> 40)
-		funcname[i+3] = byte(v >> 32)
-		funcname[i+4] = byte(v >> 24)
-		funcname[i+5] = byte(v >> 16)
-		funcname[i+6] = byte(v >> 8)
-		funcname[i+7] = byte(v)
-	}
-
-	runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___E2A_L<<4, // __e2a_l
-		[]uintptr{uintptr(unsafe.Pointer(&funcname[0])), nameLen})
-
-	name := string(funcname[:nameLen])
-	if name != funcName {
-		return 1
-	}
-
-	return 0
-}
-
-// For detection of capabilities on a system.
-// Is function descriptor f a valid function?
-func isValidLeFunc(f uintptr) error {
-	ret := funcptrtest(f, "")
-	if ret != 0 {
-		return fmt.Errorf("Bad pointer, not an LE function ")
-	}
-	return nil
-}
-
-// Retrieve function name from descriptor
-func getLeFuncName(f uintptr) (string, error) {
-	// assume it has been checked, only check ppa1 validity here
-	entry := ((*[2]uintptr)(unsafe.Pointer(f)))[1]
-	preamp := ((*[4]uint32)(unsafe.Pointer(entry - eyecatcherOffset)))
-
-	offsetPpa1 := preamp[2]
-	if offsetPpa1 > 0x0ffff {
-		return "", fmt.Errorf("PPA1 offset seems too big 0x%x\n", offsetPpa1)
-	}
-
-	ppa1 := uintptr(unsafe.Pointer(preamp)) + uintptr(offsetPpa1)
-	res := ptrtest(ppa1)
-	if res != 0 {
-		return "", fmt.Errorf("PPA1 address not valid")
-	}
-
-	size := *(*uint16)(unsafe.Pointer(ppa1 + nameLenOffset))
-	if size > 128 {
-		return "", fmt.Errorf("Function name seems too long, length=%d\n", size)
-	}
-
-	var name [128]byte
-	funcname := (*[128]byte)(unsafe.Pointer(ppa1 + nameOffset))
-	copy(name[0:size], funcname[0:size])
-
-	runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___E2A_L<<4, // __e2a_l
-		[]uintptr{uintptr(unsafe.Pointer(&name[0])), uintptr(size)})
-
-	return string(name[:size]), nil
-}
-
-// Check z/OS version
-func zosLeVersion() (version, release uint32) {
-	p1 := (*(*uintptr)(unsafe.Pointer(uintptr(1208)))) >> 32
-	p1 = *(*uintptr)(unsafe.Pointer(uintptr(p1 + 88)))
-	p1 = *(*uintptr)(unsafe.Pointer(uintptr(p1 + 8)))
-	p1 = *(*uintptr)(unsafe.Pointer(uintptr(p1 + 984)))
-	vrm := *(*uint32)(unsafe.Pointer(p1 + 80))
-	version = (vrm & 0x00ff0000) >> 16
-	release = (vrm & 0x0000ff00) >> 8
-	return
-}
-
-// returns a zos C FILE * for stdio fd 0, 1, 2
-func ZosStdioFilep(fd int32) uintptr {
-	return uintptr(*(*uint64)(unsafe.Pointer(uintptr(*(*uint64)(unsafe.Pointer(uintptr(*(*uint64)(unsafe.Pointer(uintptr(uint64(*(*uint32)(unsafe.Pointer(uintptr(1208)))) + 80))) + uint64((fd+2)<<3))))))))
-}
+func syscall_syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
+func syscall_rawsyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
+func syscall_syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
+func syscall_rawsyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
+func syscall_syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
+func syscall_rawsyscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
 
 func copyStat(stat *Stat_t, statLE *Stat_LE_t) {
 	stat.Dev = uint64(statLE.Dev)
@@ -254,28 +55,7 @@ func (d *Dirent) NameString() string {
 	if d == nil {
 		return ""
 	}
-	s := string(d.Name[:])
-	idx := strings.IndexByte(s, 0)
-	if idx == -1 {
-		return s
-	} else {
-		return s[:idx]
-	}
-}
-
-func DecodeData(dest []byte, sz int, val uint64) {
-	for i := 0; i < sz; i++ {
-		dest[sz-1-i] = byte((val >> (uint64(i * 8))) & 0xff)
-	}
-}
-
-func EncodeData(data []byte) uint64 {
-	var value uint64
-	sz := len(data)
-	for i := 0; i < sz; i++ {
-		value |= uint64(data[i]) << uint64(((sz - i - 1) * 8))
-	}
-	return value
+	return string(d.Name[:d.Namlen])
 }
 
 func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
@@ -355,7 +135,8 @@ func anyToSockaddr(_ int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < int(pp.Len) && pp.Path[n] != 0 {
 			n++
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -398,43 +179,6 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
-func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept4(fd, &rsa, &len, flags)
-	if err != nil {
-		return
-	}
-	if len > SizeofSockaddrAny {
-		panic("RawSockaddrAny too small")
-	}
-	// TODO(neeilan): Remove 0 in call
-	sa, err = anyToSockaddr(0, &rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Ctermid() (tty string, err error) {
-	var termdev [1025]byte
-	runtime.EnterSyscall()
-	r0, err2, err1 := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___CTERMID_A<<4, uintptr(unsafe.Pointer(&termdev[0])))
-	runtime.ExitSyscall()
-	if r0 == 0 {
-		return "", fmt.Errorf("%s (errno2=0x%x)\n", err1.Error(), err2)
-	}
-	s := string(termdev[:])
-	idx := strings.Index(s, string(rune(0)))
-	if idx == -1 {
-		tty = s
-	} else {
-		tty = s[:idx]
-	}
-	return
-}
-
 func (iov *Iovec) SetLen(length int) {
 	iov.Len = uint64(length)
 }
@@ -448,16 +192,11 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 }
 
 //sys   fcntl(fd int, cmd int, arg int) (val int, err error)
-//sys   Flistxattr(fd int, dest []byte) (sz int, err error) = SYS___FLISTXATTR_A
-//sys   Fremovexattr(fd int, attr string) (err error) = SYS___FREMOVEXATTR_A
 //sys	read(fd int, p []byte) (n int, err error)
+//sys   readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
 //sys	write(fd int, p []byte) (n int, err error)
 
-//sys   Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) = SYS___FGETXATTR_A
-//sys   Fsetxattr(fd int, attr string, data []byte, flag int) (err error) = SYS___FSETXATTR_A
-
 //sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = SYS___ACCEPT_A
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) = SYS___ACCEPT4_A
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = SYS___BIND_A
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = SYS___CONNECT_A
 //sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
@@ -468,19 +207,13 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 //sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
 //sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = SYS___GETPEERNAME_A
 //sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = SYS___GETSOCKNAME_A
-//sys   Removexattr(path string, attr string) (err error) = SYS___REMOVEXATTR_A
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = SYS___RECVFROM_A
 //sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = SYS___SENDTO_A
 //sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = SYS___RECVMSG_A
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = SYS___SENDMSG_A
 //sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) = SYS_MMAP
 //sys   munmap(addr uintptr, length uintptr) (err error) = SYS_MUNMAP
-//sys   ioctl(fd int, req int, arg uintptr) (err error) = SYS_IOCTL
-//sys   ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) = SYS_IOCTL
-//sys	shmat(id int, addr uintptr, flag int) (ret uintptr, err error) = SYS_SHMAT
-//sys	shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error) = SYS_SHMCTL64
-//sys	shmdt(addr uintptr) (err error) = SYS_SHMDT
-//sys	shmget(key int, size int, flag int) (id int, err error) = SYS_SHMGET
+//sys   ioctl(fd int, req uint, arg uintptr) (err error) = SYS_IOCTL
 
 //sys   Access(path string, mode uint32) (err error) = SYS___ACCESS_A
 //sys   Chdir(path string) (err error) = SYS___CHDIR_A
@@ -489,31 +222,14 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 //sys   Creat(path string, mode uint32) (fd int, err error) = SYS___CREAT_A
 //sys	Dup(oldfd int) (fd int, err error)
 //sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Dup3(oldfd int, newfd int, flags int) (err error) = SYS_DUP3
-//sys	Dirfd(dirp uintptr) (fd int, err error) = SYS_DIRFD
-//sys	EpollCreate(size int) (fd int, err error) = SYS_EPOLL_CREATE
-//sys	EpollCreate1(flags int) (fd int, err error) = SYS_EPOLL_CREATE1
-//sys	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) = SYS_EPOLL_CTL
-//sys	EpollPwait(epfd int, events []EpollEvent, msec int, sigmask *int) (n int, err error) = SYS_EPOLL_PWAIT
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_WAIT
 //sys	Errno2() (er2 int) = SYS___ERRNO2
-//sys	Eventfd(initval uint, flags int) (fd int, err error) = SYS_EVENTFD
+//sys	Err2ad() (eadd *int) = SYS___ERR2AD
 //sys	Exit(code int)
-//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error) = SYS___FACCESSAT_A
-
-func Faccessat2(dirfd int, path string, mode uint32, flags int) (err error) {
-	return Faccessat(dirfd, path, mode, flags)
-}
-
 //sys	Fchdir(fd int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) = SYS___FCHMODAT_A
 //sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fchownat(fd int, path string, uid int, gid int, flags int) (err error) = SYS___FCHOWNAT_A
 //sys	FcntlInt(fd uintptr, cmd int, arg int) (retval int, err error) = SYS_FCNTL
-//sys	Fdatasync(fd int) (err error) = SYS_FDATASYNC
 //sys	fstat(fd int, stat *Stat_LE_t) (err error)
-//sys	fstatat(dirfd int, path string, stat *Stat_LE_t, flags int) (err error) = SYS___FSTATAT_A
 
 func Fstat(fd int, stat *Stat_t) (err error) {
 	var statLE Stat_LE_t
@@ -522,208 +238,28 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 	return
 }
 
-func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
-	var statLE Stat_LE_t
-	err = fstatat(dirfd, path, &statLE, flags)
-	copyStat(stat, &statLE)
-	return
-}
-
-func impl_Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___GETXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)))
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_GetxattrAddr() *(func(path string, attr string, dest []byte) (sz int, err error))
-
-var Getxattr = enter_Getxattr
-
-func enter_Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	funcref := get_GetxattrAddr()
-	if validGetxattr() {
-		*funcref = impl_Getxattr
-	} else {
-		*funcref = error_Getxattr
-	}
-	return (*funcref)(path, attr, dest)
-}
-
-func error_Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	return -1, ENOSYS
-}
-
-func validGetxattr() bool {
-	if funcptrtest(GetZosLibVec()+SYS___GETXATTR_A<<4, "") == 0 {
-		if name, err := getLeFuncName(GetZosLibVec() + SYS___GETXATTR_A<<4); err == nil {
-			return name == "__getxattr_a"
-		}
-	}
-	return false
-}
-
-//sys   Lgetxattr(link string, attr string, dest []byte) (sz int, err error) = SYS___LGETXATTR_A
-//sys   Lsetxattr(path string, attr string, data []byte, flags int) (err error) = SYS___LSETXATTR_A
-
-func impl_Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SETXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_SetxattrAddr() *(func(path string, attr string, data []byte, flags int) (err error))
-
-var Setxattr = enter_Setxattr
-
-func enter_Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	funcref := get_SetxattrAddr()
-	if validSetxattr() {
-		*funcref = impl_Setxattr
-	} else {
-		*funcref = error_Setxattr
-	}
-	return (*funcref)(path, attr, data, flags)
-}
-
-func error_Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	return ENOSYS
-}
-
-func validSetxattr() bool {
-	if funcptrtest(GetZosLibVec()+SYS___SETXATTR_A<<4, "") == 0 {
-		if name, err := getLeFuncName(GetZosLibVec() + SYS___SETXATTR_A<<4); err == nil {
-			return name == "__setxattr_a"
-		}
-	}
-	return false
-}
-
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error) = SYS_FSTATFS
 //sys	Fstatvfs(fd int, stat *Statvfs_t) (err error) = SYS_FSTATVFS
 //sys	Fsync(fd int) (err error)
-//sys	Futimes(fd int, tv []Timeval) (err error) = SYS_FUTIMES
-//sys	Futimesat(dirfd int, path string, tv []Timeval) (err error) = SYS___FUTIMESAT_A
 //sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getrandom(buf []byte, flags int) (n int, err error) = SYS_GETRANDOM
-//sys	InotifyInit() (fd int, err error) = SYS_INOTIFY_INIT
-//sys	InotifyInit1(flags int) (fd int, err error) = SYS_INOTIFY_INIT1
-//sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) = SYS___INOTIFY_ADD_WATCH_A
-//sys	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) = SYS_INOTIFY_RM_WATCH
-//sys   Listxattr(path string, dest []byte) (sz int, err error) = SYS___LISTXATTR_A
-//sys   Llistxattr(path string, dest []byte) (sz int, err error) = SYS___LLISTXATTR_A
-//sys   Lremovexattr(path string, attr string) (err error) = SYS___LREMOVEXATTR_A
-//sys	Lutimes(path string, tv []Timeval) (err error) = SYS___LUTIMES_A
+//sys   Getpagesize() (pgsize int) = SYS_GETPAGESIZE
 //sys   Mprotect(b []byte, prot int) (err error) = SYS_MPROTECT
 //sys   Msync(b []byte, flags int) (err error) = SYS_MSYNC
-//sys   Console2(cmsg *ConsMsg2, modstr *byte, concmd *uint32) (err error) = SYS___CONSOLE2
-
-// Pipe2 begin
-
-//go:nosplit
-func getPipe2Addr() *(func([]int, int) error)
-
-var Pipe2 = pipe2Enter
-
-func pipe2Enter(p []int, flags int) (err error) {
-	if funcptrtest(GetZosLibVec()+SYS_PIPE2<<4, "") == 0 {
-		*getPipe2Addr() = pipe2Impl
-	} else {
-		*getPipe2Addr() = pipe2Error
-	}
-	return (*getPipe2Addr())(p, flags)
-}
-
-func pipe2Impl(p []int, flags int) (err error) {
-	var pp [2]_C_int
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_PIPE2<<4, uintptr(unsafe.Pointer(&pp[0])), uintptr(flags))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	} else {
-		p[0] = int(pp[0])
-		p[1] = int(pp[1])
-	}
-	return
-}
-func pipe2Error(p []int, flags int) (err error) {
-	return fmt.Errorf("Pipe2 is not available on this system")
-}
-
-// Pipe2 end
-
 //sys   Poll(fds []PollFd, timeout int) (n int, err error) = SYS_POLL
-
-func Readdir(dir uintptr) (dirent *Dirent, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___READDIR_A<<4, uintptr(dir))
-	runtime.ExitSyscall()
-	dirent = (*Dirent)(unsafe.Pointer(r0))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//sys	Readdir_r(dirp uintptr, entry *direntLE, result **direntLE) (err error) = SYS___READDIR_R_A
-//sys	Statfs(path string, buf *Statfs_t) (err error) = SYS___STATFS_A
-//sys	Syncfs(fd int) (err error) = SYS_SYNCFS
 //sys   Times(tms *Tms) (ticks uintptr, err error) = SYS_TIMES
 //sys   W_Getmntent(buff *byte, size int) (lastsys int, err error) = SYS_W_GETMNTENT
 //sys   W_Getmntent_A(buff *byte, size int) (lastsys int, err error) = SYS___W_GETMNTENT_A
 
 //sys   mount_LE(path string, filesystem string, fstype string, mtm uint32, parmlen int32, parm string) (err error) = SYS___MOUNT_A
-//sys   unmount_LE(filesystem string, mtm int) (err error) = SYS___UMOUNT_A
+//sys   unmount(filesystem string, mtm int) (err error) = SYS___UMOUNT_A
 //sys   Chroot(path string) (err error) = SYS___CHROOT_A
 //sys   Select(nmsgsfds int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (ret int, err error) = SYS_SELECT
-//sysnb Uname(buf *Utsname) (err error) = SYS_____OSNAME_A
-//sys   Unshare(flags int) (err error) = SYS_UNSHARE
+//sysnb Uname(buf *Utsname) (err error) = SYS___UNAME_A
 
 func Ptsname(fd int) (name string, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___PTSNAME_A<<4, uintptr(fd))
-	runtime.ExitSyscall()
-	if r0 == 0 {
-		err = errnoErr2(e1, e2)
-	} else {
-		name = u2s(unsafe.Pointer(r0))
+	r0, _, e1 := syscall_syscall(SYS___PTSNAME_A, uintptr(fd), 0, 0)
+	name = u2s(unsafe.Pointer(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -738,23 +274,23 @@ func u2s(cstr unsafe.Pointer) string {
 }
 
 func Close(fd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_CLOSE<<4, uintptr(fd))
-	runtime.ExitSyscall()
+	_, _, e1 := syscall_syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	for i := 0; e1 == EAGAIN && i < 10; i++ {
-		runtime.EnterSyscall()
-		CallLeFuncWithErr(GetZosLibVec()+SYS_USLEEP<<4, uintptr(10))
-		runtime.ExitSyscall()
-		runtime.EnterSyscall()
-		r0, e2, e1 = CallLeFuncWithErr(GetZosLibVec()+SYS_CLOSE<<4, uintptr(fd))
-		runtime.ExitSyscall()
+		_, _, _ = syscall_syscall(SYS_USLEEP, uintptr(10), 0, 0)
+		_, _, e1 = syscall_syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	}
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
 // Dummy function: there are no semantics for Madvise on z/OS
 func Madvise(b []byte, advice int) (err error) {
 	return
@@ -768,16 +304,9 @@ func Munmap(b []byte) (err error) {
 	return mapper.Munmap(b)
 }
 
-func MmapPtr(fd int, offset int64, addr unsafe.Pointer, length uintptr, prot int, flags int) (ret unsafe.Pointer, err error) {
-	xaddr, err := mapper.mmap(uintptr(addr), length, prot, flags, fd, offset)
-	return unsafe.Pointer(xaddr), err
-}
-
-func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) {
-	return mapper.munmap(uintptr(addr), length)
-}
-
 //sys   Gethostname(buf []byte) (err error) = SYS___GETHOSTNAME_A
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
 //sysnb	Getgid() (gid int)
 //sysnb	Getpid() (pid int)
 //sysnb	Getpgid(pid int) (pgid int, err error) = SYS_GETPGID
@@ -804,14 +333,11 @@ func Getrusage(who int, rusage *Rusage) (err error) {
 	return
 }
 
-//sys	Getegid() (egid int) = SYS_GETEGID
-//sys	Geteuid() (euid int) = SYS_GETEUID
 //sysnb Getsid(pid int) (sid int, err error) = SYS_GETSID
 //sysnb	Getuid() (uid int)
 //sysnb	Kill(pid int, sig Signal) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error) = SYS___LCHOWN_A
 //sys	Link(path string, link string) (err error) = SYS___LINK_A
-//sys	Linkat(oldDirFd int, oldPath string, newDirFd int, newPath string, flags int) (err error) = SYS___LINKAT_A
 //sys	Listen(s int, n int) (err error)
 //sys	lstat(path string, stat *Stat_LE_t) (err error) = SYS___LSTAT_A
 
@@ -822,150 +348,15 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	return
 }
 
-// for checking symlinks begins with $VERSION/ $SYSNAME/ $SYSSYMR/ $SYSSYMA/
-func isSpecialPath(path []byte) (v bool) {
-	var special = [4][8]byte{
-		{'V', 'E', 'R', 'S', 'I', 'O', 'N', '/'},
-		{'S', 'Y', 'S', 'N', 'A', 'M', 'E', '/'},
-		{'S', 'Y', 'S', 'S', 'Y', 'M', 'R', '/'},
-		{'S', 'Y', 'S', 'S', 'Y', 'M', 'A', '/'}}
-
-	var i, j int
-	for i = 0; i < len(special); i++ {
-		for j = 0; j < len(special[i]); j++ {
-			if path[j] != special[i][j] {
-				break
-			}
-		}
-		if j == len(special[i]) {
-			return true
-		}
-	}
-	return false
-}
-
-func realpath(srcpath string, abspath []byte) (pathlen int, errno int) {
-	var source [1024]byte
-	copy(source[:], srcpath)
-	source[len(srcpath)] = 0
-	ret := runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___REALPATH_A<<4, //__realpath_a()
-		[]uintptr{uintptr(unsafe.Pointer(&source[0])),
-			uintptr(unsafe.Pointer(&abspath[0]))})
-	if ret != 0 {
-		index := bytes.IndexByte(abspath[:], byte(0))
-		if index != -1 {
-			return index, 0
-		}
-	} else {
-		errptr := (*int)(unsafe.Pointer(runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___ERRNO<<4, []uintptr{}))) //__errno()
-		return 0, *errptr
-	}
-	return 0, 245 // EBADDATA   245
-}
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	n = int(runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___READLINK_A<<4,
-		[]uintptr{uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf))}))
-	runtime.KeepAlive(unsafe.Pointer(_p0))
-	if n == -1 {
-		value := *(*int32)(unsafe.Pointer(runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___ERRNO<<4, []uintptr{})))
-		err = errnoErr(Errno(value))
-	} else {
-		if buf[0] == '$' {
-			if isSpecialPath(buf[1:9]) {
-				cnt, err1 := realpath(path, buf)
-				if err1 == 0 {
-					n = cnt
-				}
-			}
-		}
-	}
-	return
-}
-
-func impl_Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___READLINKAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	runtime.ExitSyscall()
-	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-		return n, err
-	} else {
-		if buf[0] == '$' {
-			if isSpecialPath(buf[1:9]) {
-				cnt, err1 := realpath(path, buf)
-				if err1 == 0 {
-					n = cnt
-				}
-			}
-		}
-	}
-	return
-}
-
-//go:nosplit
-func get_ReadlinkatAddr() *(func(dirfd int, path string, buf []byte) (n int, err error))
-
-var Readlinkat = enter_Readlinkat
-
-func enter_Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	funcref := get_ReadlinkatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___READLINKAT_A<<4, "") == 0 {
-		*funcref = impl_Readlinkat
-	} else {
-		*funcref = error_Readlinkat
-	}
-	return (*funcref)(dirfd, path, buf)
-}
-
-func error_Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	n = -1
-	err = ENOSYS
-	return
-}
-
 //sys	Mkdir(path string, mode uint32) (err error) = SYS___MKDIR_A
-//sys	Mkdirat(dirfd int, path string, mode uint32) (err error) = SYS___MKDIRAT_A
 //sys   Mkfifo(path string, mode uint32) (err error) = SYS___MKFIFO_A
 //sys	Mknod(path string, mode uint32, dev int) (err error) = SYS___MKNOD_A
-//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error) = SYS___MKNODAT_A
-//sys	PivotRoot(newroot string, oldroot string) (err error) = SYS___PIVOT_ROOT_A
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) = SYS___PRCTL_A
-//sysnb	Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT
+//sys	Readlink(path string, buf []byte) (n int, err error) = SYS___READLINK_A
 //sys	Rename(from string, to string) (err error) = SYS___RENAME_A
-//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) = SYS___RENAMEAT_A
-//sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) = SYS___RENAMEAT2_A
 //sys	Rmdir(path string) (err error) = SYS___RMDIR_A
 //sys   Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Setegid(egid int) (err error) = SYS_SETEGID
-//sys	Seteuid(euid int) (err error) = SYS_SETEUID
-//sys	Sethostname(p []byte) (err error) = SYS___SETHOSTNAME_A
-//sys   Setns(fd int, nstype int) (err error) = SYS_SETNS
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setpgid(pid int, pgid int) (err error) = SYS_SETPGID
 //sysnb	Setrlimit(resource int, lim *Rlimit) (err error)
@@ -985,57 +376,32 @@ func Stat(path string, sta *Stat_t) (err error) {
 }
 
 //sys	Symlink(path string, link string) (err error) = SYS___SYMLINK_A
-//sys	Symlinkat(oldPath string, dirfd int, newPath string) (err error) = SYS___SYMLINKAT_A
 //sys	Sync() = SYS_SYNC
 //sys	Truncate(path string, length int64) (err error) = SYS___TRUNCATE_A
 //sys	Tcgetattr(fildes int, termptr *Termios) (err error) = SYS_TCGETATTR
 //sys	Tcsetattr(fildes int, when int, termptr *Termios) (err error) = SYS_TCSETATTR
 //sys	Umask(mask int) (oldmask int)
 //sys	Unlink(path string) (err error) = SYS___UNLINK_A
-//sys	Unlinkat(dirfd int, path string, flags int) (err error) = SYS___UNLINKAT_A
 //sys	Utime(path string, utim *Utimbuf) (err error) = SYS___UTIME_A
 
 //sys	open(path string, mode int, perm uint32) (fd int, err error) = SYS___OPEN_A
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
-	if mode&O_ACCMODE == 0 {
-		mode |= O_RDONLY
-	}
 	return open(path, mode, perm)
 }
 
-//sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) = SYS___OPENAT_A
-
-func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	if flags&O_ACCMODE == 0 {
-		flags |= O_RDONLY
+func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
+	wd, err := Getwd()
+	if err != nil {
+		return err
 	}
-	return openat(dirfd, path, flags, mode)
-}
 
-//sys	openat2(dirfd int, path string, open_how *OpenHow, size int) (fd int, err error) = SYS___OPENAT2_A
-
-func Openat2(dirfd int, path string, how *OpenHow) (fd int, err error) {
-	if how.Flags&O_ACCMODE == 0 {
-		how.Flags |= O_RDONLY
+	if err := Fchdir(dirfd); err != nil {
+		return err
 	}
-	return openat2(dirfd, path, how, SizeofOpenHow)
-}
+	defer Chdir(wd)
 
-func ZosFdToPath(dirfd int) (path string, err error) {
-	var buffer [1024]byte
-	runtime.EnterSyscall()
-	ret, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_W_IOCTL<<4, uintptr(dirfd), 17, 1024, uintptr(unsafe.Pointer(&buffer[0])))
-	runtime.ExitSyscall()
-	if ret == 0 {
-		zb := bytes.IndexByte(buffer[:], 0)
-		if zb == -1 {
-			zb = len(buffer)
-		}
-		CallLeFuncWithErr(GetZosLibVec()+SYS___E2A_L<<4, uintptr(unsafe.Pointer(&buffer[0])), uintptr(zb))
-		return string(buffer[:zb]), nil
-	}
-	return "", errnoErr2(e1, e2)
+	return Mkfifo(path, mode)
 }
 
 //sys	remove(path string) (err error)
@@ -1053,12 +419,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		p = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___GETCWD_A<<4, uintptr(p), uintptr(len(buf)))
-	runtime.ExitSyscall()
+	_, _, e := syscall_syscall(SYS___GETCWD_A, uintptr(p), uintptr(len(buf)), 0)
 	n = clen(buf) + 1
-	if r0 == 0 {
-		err = errnoErr2(e1, e2)
+	if e != 0 {
+		err = errnoErr(e)
 	}
 	return
 }
@@ -1172,41 +536,9 @@ func (w WaitStatus) StopSignal() Signal {
 
 func (w WaitStatus) TrapCause() int { return -1 }
 
-//sys	waitid(idType int, id int, info *Siginfo, options int) (err error)
-
-func Waitid(idType int, id int, info *Siginfo, options int, rusage *Rusage) (err error) {
-	return waitid(idType, id, info, options)
-}
-
 //sys	waitpid(pid int, wstatus *_C_int, options int) (wpid int, err error)
 
-func impl_Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_WAIT4<<4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)))
-	runtime.ExitSyscall()
-	wpid = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_Wait4Addr() *(func(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error))
-
-var Wait4 = enter_Wait4
-
-func enter_Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	funcref := get_Wait4Addr()
-	if funcptrtest(GetZosLibVec()+SYS_WAIT4<<4, "") == 0 {
-		*funcref = impl_Wait4
-	} else {
-		*funcref = legacyWait4
-	}
-	return (*funcref)(pid, wstatus, options, rusage)
-}
-
-func legacyWait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
 	// TODO(mundaym): z/OS doesn't have wait4. I don't think getrusage does what we want.
 	// At the moment rusage will not be touched.
 	var status _C_int
@@ -1263,54 +595,13 @@ func Pipe(p []int) (err error) {
 //sys	utimes(path string, timeval *[2]Timeval) (err error) = SYS___UTIMES_A
 
 func Utimes(path string, tv []Timeval) (err error) {
-	if tv == nil {
-		return utimes(path, nil)
-	}
 	if len(tv) != 2 {
 		return EINVAL
 	}
 	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
-//sys	utimensat(dirfd int, path string, ts *[2]Timespec, flags int) (err error) = SYS___UTIMENSAT_A
-
-func validUtimensat() bool {
-	if funcptrtest(GetZosLibVec()+SYS___UTIMENSAT_A<<4, "") == 0 {
-		if name, err := getLeFuncName(GetZosLibVec() + SYS___UTIMENSAT_A<<4); err == nil {
-			return name == "__utimensat_a"
-		}
-	}
-	return false
-}
-
-// Begin UtimesNano
-
-//go:nosplit
-func get_UtimesNanoAddr() *(func(path string, ts []Timespec) (err error))
-
-var UtimesNano = enter_UtimesNano
-
-func enter_UtimesNano(path string, ts []Timespec) (err error) {
-	funcref := get_UtimesNanoAddr()
-	if validUtimensat() {
-		*funcref = utimesNanoImpl
-	} else {
-		*funcref = legacyUtimesNano
-	}
-	return (*funcref)(path, ts)
-}
-
-func utimesNanoImpl(path string, ts []Timespec) (err error) {
-	if ts == nil {
-		return utimensat(AT_FDCWD, path, nil, 0)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-}
-
-func legacyUtimesNano(path string, ts []Timespec) (err error) {
+func UtimesNano(path string, ts []Timespec) error {
 	if len(ts) != 2 {
 		return EINVAL
 	}
@@ -1323,70 +614,6 @@ func legacyUtimesNano(path string, ts []Timespec) (err error) {
 	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
-// End UtimesNano
-
-// Begin UtimesNanoAt
-
-//go:nosplit
-func get_UtimesNanoAtAddr() *(func(dirfd int, path string, ts []Timespec, flags int) (err error))
-
-var UtimesNanoAt = enter_UtimesNanoAt
-
-func enter_UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) (err error) {
-	funcref := get_UtimesNanoAtAddr()
-	if validUtimensat() {
-		*funcref = utimesNanoAtImpl
-	} else {
-		*funcref = legacyUtimesNanoAt
-	}
-	return (*funcref)(dirfd, path, ts, flags)
-}
-
-func utimesNanoAtImpl(dirfd int, path string, ts []Timespec, flags int) (err error) {
-	if ts == nil {
-		return utimensat(dirfd, path, nil, flags)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
-}
-
-func legacyUtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) (err error) {
-	if path[0] != '/' {
-		dirPath, err := ZosFdToPath(dirfd)
-		if err != nil {
-			return err
-		}
-		path = dirPath + "/" + path
-	}
-	if flags == AT_SYMLINK_NOFOLLOW {
-		if len(ts) != 2 {
-			return EINVAL
-		}
-
-		if ts[0].Nsec >= 5e8 {
-			ts[0].Sec++
-		}
-		ts[0].Nsec = 0
-		if ts[1].Nsec >= 5e8 {
-			ts[1].Sec++
-		}
-		ts[1].Nsec = 0
-
-		// Not as efficient as it could be because Timespec and
-		// Timeval have different types in the different OSes
-		tv := []Timeval{
-			NsecToTimeval(TimespecToNsec(ts[0])),
-			NsecToTimeval(TimespecToNsec(ts[1])),
-		}
-		return Lutimes(path, tv)
-	}
-	return UtimesNano(path, ts)
-}
-
-// End UtimesNanoAt
-
 func Getsockname(fd int) (sa Sockaddr, err error) {
 	var rsa RawSockaddrAny
 	var len _Socklen = SizeofSockaddrAny
@@ -1891,7 +1118,7 @@ func GetsockoptString(fd, level, opt int) (string, error) {
 		return "", err
 	}
 
-	return ByteSliceToString(buf[:vallen]), nil
+	return string(buf[:vallen-1]), nil
 }
 
 func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
@@ -1978,13 +1205,10 @@ func Opendir(name string) (uintptr, error) {
 	if err != nil {
 		return 0, err
 	}
-	err = nil
-	runtime.EnterSyscall()
-	dir, e2, e1 := CallLeFuncWithPtrReturn(GetZosLibVec()+SYS___OPENDIR_A<<4, uintptr(unsafe.Pointer(p)))
-	runtime.ExitSyscall()
+	dir, _, e := syscall_syscall(SYS___OPENDIR_A, uintptr(unsafe.Pointer(p)), 0, 0)
 	runtime.KeepAlive(unsafe.Pointer(p))
-	if dir == 0 {
-		err = errnoErr2(e1, e2)
+	if e != 0 {
+		err = errnoErr(e)
 	}
 	return dir, err
 }
@@ -1992,27 +1216,43 @@ func Opendir(name string) (uintptr, error) {
 // clearsyscall.Errno resets the errno value to 0.
 func clearErrno()
 
+func Readdir(dir uintptr) (*Dirent, error) {
+	var ent Dirent
+	var res uintptr
+	// __readdir_r_a returns errno at the end of the directory stream, rather than 0.
+	// Therefore to avoid false positives we clear errno before calling it.
+
+	// TODO(neeilan): Commented this out to get sys/unix compiling on z/OS. Uncomment and fix. Error: "undefined: clearsyscall"
+	//clearsyscall.Errno() // TODO(mundaym): check pre-emption rules.
+
+	e, _, _ := syscall_syscall(SYS___READDIR_R_A, dir, uintptr(unsafe.Pointer(&ent)), uintptr(unsafe.Pointer(&res)))
+	var err error
+	if e != 0 {
+		err = errnoErr(Errno(e))
+	}
+	if res == 0 {
+		return nil, err
+	}
+	return &ent, err
+}
+
 func Closedir(dir uintptr) error {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_CLOSEDIR<<4, dir)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		return errnoErr2(e1, e2)
+	_, _, e := syscall_syscall(SYS_CLOSEDIR, dir, 0, 0)
+	if e != 0 {
+		return errnoErr(e)
 	}
 	return nil
 }
 
 func Seekdir(dir uintptr, pos int) {
-	runtime.EnterSyscall()
-	CallLeFuncWithErr(GetZosLibVec()+SYS_SEEKDIR<<4, dir, uintptr(pos))
-	runtime.ExitSyscall()
+	_, _, _ = syscall_syscall(SYS_SEEKDIR, dir, uintptr(pos), 0)
 }
 
 func Telldir(dir uintptr) (int, error) {
-	p, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_TELLDIR<<4, dir)
+	p, _, e := syscall_syscall(SYS_TELLDIR, dir, 0, 0)
 	pos := int(p)
-	if int64(p) == -1 {
-		return pos, errnoErr2(e1, e2)
+	if pos == -1 {
+		return pos, errnoErr(e)
 	}
 	return pos, nil
 }
@@ -2027,55 +1267,19 @@ func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
 	*(*int64)(unsafe.Pointer(&flock[4])) = lk.Start
 	*(*int64)(unsafe.Pointer(&flock[12])) = lk.Len
 	*(*int32)(unsafe.Pointer(&flock[20])) = lk.Pid
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCNTL<<4, fd, uintptr(cmd), uintptr(unsafe.Pointer(&flock)))
-	runtime.ExitSyscall()
+	_, _, errno := syscall_syscall(SYS_FCNTL, fd, uintptr(cmd), uintptr(unsafe.Pointer(&flock)))
 	lk.Type = *(*int16)(unsafe.Pointer(&flock[0]))
 	lk.Whence = *(*int16)(unsafe.Pointer(&flock[2]))
 	lk.Start = *(*int64)(unsafe.Pointer(&flock[4]))
 	lk.Len = *(*int64)(unsafe.Pointer(&flock[12]))
 	lk.Pid = *(*int32)(unsafe.Pointer(&flock[20]))
-	if r0 == 0 {
+	if errno == 0 {
 		return nil
 	}
-	return errnoErr2(e1, e2)
+	return errno
 }
 
-func impl_Flock(fd int, how int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FLOCK<<4, uintptr(fd), uintptr(how))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FlockAddr() *(func(fd int, how int) (err error))
-
-var Flock = enter_Flock
-
-func validFlock(fp uintptr) bool {
-	if funcptrtest(GetZosLibVec()+SYS_FLOCK<<4, "") == 0 {
-		if name, err := getLeFuncName(GetZosLibVec() + SYS_FLOCK<<4); err == nil {
-			return name == "flock"
-		}
-	}
-	return false
-}
-
-func enter_Flock(fd int, how int) (err error) {
-	funcref := get_FlockAddr()
-	if validFlock(GetZosLibVec() + SYS_FLOCK<<4) {
-		*funcref = impl_Flock
-	} else {
-		*funcref = legacyFlock
-	}
-	return (*funcref)(fd, how)
-}
-
-func legacyFlock(fd int, how int) error {
+func Flock(fd int, how int) error {
 
 	var flock_type int16
 	var fcntl_cmd int
@@ -2109,51 +1313,41 @@ func legacyFlock(fd int, how int) error {
 }
 
 func Mlock(b []byte) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MLOCKALL<<4, _BPX_NONSWAP)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MLOCKALL, _BPX_NONSWAP, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 func Mlock2(b []byte, flags int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MLOCKALL<<4, _BPX_NONSWAP)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MLOCKALL, _BPX_NONSWAP, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 func Mlockall(flags int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MLOCKALL<<4, _BPX_NONSWAP)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MLOCKALL, _BPX_NONSWAP, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 func Munlock(b []byte) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MLOCKALL<<4, _BPX_SWAP)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MLOCKALL, _BPX_SWAP, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 func Munlockall() (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MLOCKALL<<4, _BPX_SWAP)
-	runtime.ExitSyscall()
-	if r0 != 0 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MLOCKALL, _BPX_SWAP, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2184,104 +1378,15 @@ func ClockGettime(clockid int32, ts *Timespec) error {
 	return nil
 }
 
-// Chtag
-
-//go:nosplit
-func get_ChtagAddr() *(func(path string, ccsid uint64, textbit uint64) error)
-
-var Chtag = enter_Chtag
-
-func enter_Chtag(path string, ccsid uint64, textbit uint64) error {
-	funcref := get_ChtagAddr()
-	if validSetxattr() {
-		*funcref = impl_Chtag
-	} else {
-		*funcref = legacy_Chtag
+func Statfs(path string, stat *Statfs_t) (err error) {
+	fd, err := open(path, O_RDONLY, 0)
+	defer Close(fd)
+	if err != nil {
+		return err
 	}
-	return (*funcref)(path, ccsid, textbit)
+	return Fstatfs(fd, stat)
 }
 
-func legacy_Chtag(path string, ccsid uint64, textbit uint64) error {
-	tag := ccsid<<16 | textbit<<15
-	var tag_buff [8]byte
-	DecodeData(tag_buff[:], 8, tag)
-	return Setxattr(path, "filetag", tag_buff[:], XATTR_REPLACE)
-}
-
-func impl_Chtag(path string, ccsid uint64, textbit uint64) error {
-	tag := ccsid<<16 | textbit<<15
-	var tag_buff [4]byte
-	DecodeData(tag_buff[:], 4, tag)
-	return Setxattr(path, "system.filetag", tag_buff[:], XATTR_REPLACE)
-}
-
-// End of Chtag
-
-// Nanosleep
-
-//go:nosplit
-func get_NanosleepAddr() *(func(time *Timespec, leftover *Timespec) error)
-
-var Nanosleep = enter_Nanosleep
-
-func enter_Nanosleep(time *Timespec, leftover *Timespec) error {
-	funcref := get_NanosleepAddr()
-	if funcptrtest(GetZosLibVec()+SYS_NANOSLEEP<<4, "") == 0 {
-		*funcref = impl_Nanosleep
-	} else {
-		*funcref = legacyNanosleep
-	}
-	return (*funcref)(time, leftover)
-}
-
-func impl_Nanosleep(time *Timespec, leftover *Timespec) error {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_NANOSLEEP<<4, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		return errnoErr2(e1, e2)
-	}
-	return nil
-}
-
-func legacyNanosleep(time *Timespec, leftover *Timespec) error {
-	t0 := runtime.Nanotime1()
-	var secrem uint32
-	var nsecrem uint32
-	total := time.Sec*1000000000 + time.Nsec
-	elapsed := runtime.Nanotime1() - t0
-	var rv int32
-	var rc int32
-	var err error
-	// repeatedly sleep for 1 second until less than 1 second left
-	for total-elapsed > 1000000000 {
-		rv, rc, _ = BpxCondTimedWait(uint32(1), uint32(0), uint32(CW_CONDVAR), &secrem, &nsecrem)
-		if rv != 0 && rc != 112 { // 112 is EAGAIN
-			if leftover != nil && rc == 120 { // 120 is EINTR
-				leftover.Sec = int64(secrem)
-				leftover.Nsec = int64(nsecrem)
-			}
-			err = Errno(rc)
-			return err
-		}
-		elapsed = runtime.Nanotime1() - t0
-	}
-	// sleep the remainder
-	if total > elapsed {
-		rv, rc, _ = BpxCondTimedWait(uint32(0), uint32(total-elapsed), uint32(CW_CONDVAR), &secrem, &nsecrem)
-	}
-	if leftover != nil && rc == 120 {
-		leftover.Sec = int64(secrem)
-		leftover.Nsec = int64(nsecrem)
-	}
-	if rv != 0 && rc != 112 {
-		err = Errno(rc)
-	}
-	return err
-}
-
-// End of Nanosleep
-
 var (
 	Stdin  = 0
 	Stdout = 1
@@ -2296,9 +1401,6 @@ var (
 	errENOENT error = syscall.ENOENT
 )
 
-var ZosTraceLevel int
-var ZosTracefile *os.File
-
 var (
 	signalNameMapOnce sync.Once
 	signalNameMap     map[string]syscall.Signal
@@ -2320,56 +1422,6 @@ func errnoErr(e Errno) error {
 	return e
 }
 
-var reg *regexp.Regexp
-
-// enhanced with zos specific errno2
-func errnoErr2(e Errno, e2 uintptr) error {
-	switch e {
-	case 0:
-		return nil
-	case EAGAIN:
-		return errEAGAIN
-		/*
-			Allow the retrieval of errno2 for EINVAL and ENOENT on zos
-				case EINVAL:
-					return errEINVAL
-				case ENOENT:
-					return errENOENT
-		*/
-	}
-	if ZosTraceLevel > 0 {
-		var name string
-		if reg == nil {
-			reg = regexp.MustCompile("(^unix\\.[^/]+$|.*\\/unix\\.[^/]+$)")
-		}
-		i := 1
-		pc, file, line, ok := runtime.Caller(i)
-		if ok {
-			name = runtime.FuncForPC(pc).Name()
-		}
-		for ok && reg.MatchString(runtime.FuncForPC(pc).Name()) {
-			i += 1
-			pc, file, line, ok = runtime.Caller(i)
-		}
-		if ok {
-			if ZosTracefile == nil {
-				ZosConsolePrintf("From %s:%d\n", file, line)
-				ZosConsolePrintf("%s: %s (errno2=0x%x)\n", name, e.Error(), e2)
-			} else {
-				fmt.Fprintf(ZosTracefile, "From %s:%d\n", file, line)
-				fmt.Fprintf(ZosTracefile, "%s: %s (errno2=0x%x)\n", name, e.Error(), e2)
-			}
-		} else {
-			if ZosTracefile == nil {
-				ZosConsolePrintf("%s (errno2=0x%x)\n", e.Error(), e2)
-			} else {
-				fmt.Fprintf(ZosTracefile, "%s (errno2=0x%x)\n", e.Error(), e2)
-			}
-		}
-	}
-	return e
-}
-
 // ErrnoName returns the error name for error number e.
 func ErrnoName(e Errno) string {
 	i := sort.Search(len(errorList), func(i int) bool {
@@ -2428,9 +1480,6 @@ func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (d
 		return nil, EINVAL
 	}
 
-	// Set __MAP_64 by default
-	flags |= __MAP_64
-
 	// Map the requested memory.
 	addr, errno := m.mmap(0, uintptr(length), prot, flags, fd, offset)
 	if errno != nil {
@@ -2735,479 +1784,46 @@ func Exec(argv0 string, argv []string, envv []string) error {
 	return syscall.Exec(argv0, argv, envv)
 }
 
-func Getag(path string) (ccsid uint16, flag uint16, err error) {
-	var val [8]byte
-	sz, err := Getxattr(path, "ccsid", val[:])
-	if err != nil {
-		return
-	}
-	ccsid = uint16(EncodeData(val[0:sz]))
-	sz, err = Getxattr(path, "flags", val[:])
-	if err != nil {
-		return
-	}
-	flag = uint16(EncodeData(val[0:sz]) >> 15)
-	return
-}
-
-// Mount begin
-func impl_Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	var _p3 *byte
-	_p3, err = BytePtrFromString(data)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MOUNT1_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(_p3)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_MountAddr() *(func(source string, target string, fstype string, flags uintptr, data string) (err error))
-
-var Mount = enter_Mount
-
-func enter_Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
-	funcref := get_MountAddr()
-	if validMount() {
-		*funcref = impl_Mount
-	} else {
-		*funcref = legacyMount
-	}
-	return (*funcref)(source, target, fstype, flags, data)
-}
-
-func legacyMount(source string, target string, fstype string, flags uintptr, data string) (err error) {
+func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
 	if needspace := 8 - len(fstype); needspace <= 0 {
-		fstype = fstype[0:8]
+		fstype = fstype[:8]
 	} else {
-		fstype += "        "[0:needspace]
+		fstype += "        "[:needspace]
 	}
 	return mount_LE(target, source, fstype, uint32(flags), int32(len(data)), data)
 }
 
-func validMount() bool {
-	if funcptrtest(GetZosLibVec()+SYS___MOUNT1_A<<4, "") == 0 {
-		if name, err := getLeFuncName(GetZosLibVec() + SYS___MOUNT1_A<<4); err == nil {
-			return name == "__mount1_a"
-		}
-	}
-	return false
-}
-
-// Mount end
-
-// Unmount begin
-func impl_Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UMOUNT2_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_UnmountAddr() *(func(target string, flags int) (err error))
-
-var Unmount = enter_Unmount
-
-func enter_Unmount(target string, flags int) (err error) {
-	funcref := get_UnmountAddr()
-	if funcptrtest(GetZosLibVec()+SYS___UMOUNT2_A<<4, "") == 0 {
-		*funcref = impl_Unmount
-	} else {
-		*funcref = legacyUnmount
-	}
-	return (*funcref)(target, flags)
-}
-
-func legacyUnmount(name string, mtm int) (err error) {
+func Unmount(name string, mtm int) (err error) {
 	// mountpoint is always a full path and starts with a '/'
 	// check if input string is not a mountpoint but a filesystem name
 	if name[0] != '/' {
-		return unmount_LE(name, mtm)
+		return unmount(name, mtm)
 	}
 	// treat name as mountpoint
 	b2s := func(arr []byte) string {
-		var str string
-		for i := 0; i < len(arr); i++ {
-			if arr[i] == 0 {
-				str = string(arr[:i])
-				break
-			}
+		nulli := bytes.IndexByte(arr, 0)
+		if nulli == -1 {
+			return string(arr)
+		} else {
+			return string(arr[:nulli])
 		}
-		return str
 	}
 	var buffer struct {
 		header W_Mnth
 		fsinfo [64]W_Mntent
 	}
-	fs_count, err := W_Getmntent_A((*byte)(unsafe.Pointer(&buffer)), int(unsafe.Sizeof(buffer)))
-	if err == nil {
-		err = EINVAL
-		for i := 0; i < fs_count; i++ {
-			if b2s(buffer.fsinfo[i].Mountpoint[:]) == name {
-				err = unmount_LE(b2s(buffer.fsinfo[i].Fsname[:]), mtm)
-				break
-			}
-		}
-	} else if fs_count == 0 {
-		err = EINVAL
-	}
-	return err
-}
-
-// Unmount end
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	reclen, ok := direntReclen(buf)
-	if !ok {
-		return 0, false
-	}
-	return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
-
-func direntLeToDirentUnix(dirent *direntLE, dir uintptr, path string) (Dirent, error) {
-	var d Dirent
-
-	d.Ino = uint64(dirent.Ino)
-	offset, err := Telldir(dir)
-	if err != nil {
-		return d, err
-	}
-
-	d.Off = int64(offset)
-	s := string(bytes.Split(dirent.Name[:], []byte{0})[0])
-	copy(d.Name[:], s)
-
-	d.Reclen = uint16(24 + len(d.NameString()))
-	var st Stat_t
-	path = path + "/" + s
-	err = Lstat(path, &st)
-	if err != nil {
-		return d, err
-	}
-
-	d.Type = uint8(st.Mode >> 24)
-	return d, err
-}
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	// Simulation of Getdirentries port from the Darwin implementation.
-	// COMMENTS FROM DARWIN:
-	// It's not the full required semantics, but should handle the case
-	// of calling Getdirentries or ReadDirent repeatedly.
-	// It won't handle assigning the results of lseek to *basep, or handle
-	// the directory being edited underfoot.
-
-	skip, err := Seek(fd, 0, 1 /* SEEK_CUR */)
-	if err != nil {
-		return 0, err
-	}
-
-	// Get path from fd to avoid unavailable call (fdopendir)
-	path, err := ZosFdToPath(fd)
-	if err != nil {
-		return 0, err
-	}
-	d, err := Opendir(path)
-	if err != nil {
-		return 0, err
-	}
-	defer Closedir(d)
-
-	var cnt int64
-	for {
-		var entryLE direntLE
-		var entrypLE *direntLE
-		e := Readdir_r(d, &entryLE, &entrypLE)
-		if e != nil {
-			return n, e
-		}
-		if entrypLE == nil {
-			break
-		}
-		if skip > 0 {
-			skip--
-			cnt++
-			continue
-		}
-
-		// Dirent on zos has a different structure
-		entry, e := direntLeToDirentUnix(&entryLE, d, path)
-		if e != nil {
-			return n, e
-		}
-
-		reclen := int(entry.Reclen)
-		if reclen > len(buf) {
-			// Not enough room. Return for now.
-			// The counter will let us know where we should start up again.
-			// Note: this strategy for suspending in the middle and
-			// restarting is O(n^2) in the length of the directory. Oh well.
-			break
-		}
-
-		// Copy entry into return buffer.
-		s := unsafe.Slice((*byte)(unsafe.Pointer(&entry)), reclen)
-		copy(buf, s)
-
-		buf = buf[reclen:]
-		n += reclen
-		cnt++
-	}
-	// Set the seek offset of the input fd to record
-	// how many files we've already returned.
-	_, err = Seek(fd, cnt, 0 /* SEEK_SET */)
-	if err != nil {
-		return n, err
-	}
-
-	return n, nil
-}
-
-func Err2ad() (eadd *int) {
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS___ERR2AD<<4)
-	eadd = (*int)(unsafe.Pointer(r0))
-	return
-}
-
-func ZosConsolePrintf(format string, v ...interface{}) (int, error) {
-	type __cmsg struct {
-		_            uint16
-		_            [2]uint8
-		__msg_length uint32
-		__msg        uintptr
-		_            [4]uint8
-	}
-	msg := fmt.Sprintf(format, v...)
-	strptr := unsafe.Pointer((*reflect.StringHeader)(unsafe.Pointer(&msg)).Data)
-	len := (*reflect.StringHeader)(unsafe.Pointer(&msg)).Len
-	cmsg := __cmsg{__msg_length: uint32(len), __msg: uintptr(strptr)}
-	cmd := uint32(0)
-	runtime.EnterSyscall()
-	rc, err2, err1 := CallLeFuncWithErr(GetZosLibVec()+SYS_____CONSOLE_A<<4, uintptr(unsafe.Pointer(&cmsg)), 0, uintptr(unsafe.Pointer(&cmd)))
-	runtime.ExitSyscall()
-	if rc != 0 {
-		return 0, fmt.Errorf("%s (errno2=0x%x)\n", err1.Error(), err2)
-	}
-	return 0, nil
-}
-func ZosStringToEbcdicBytes(str string, nullterm bool) (ebcdicBytes []byte) {
-	if nullterm {
-		ebcdicBytes = []byte(str + "\x00")
-	} else {
-		ebcdicBytes = []byte(str)
-	}
-	A2e(ebcdicBytes)
-	return
-}
-func ZosEbcdicBytesToString(b []byte, trimRight bool) (str string) {
-	res := make([]byte, len(b))
-	copy(res, b)
-	E2a(res)
-	if trimRight {
-		str = string(bytes.TrimRight(res, " \x00"))
-	} else {
-		str = string(res)
-	}
-	return
-}
-
-func fdToPath(dirfd int) (path string, err error) {
-	var buffer [1024]byte
-	// w_ctrl()
-	ret := runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS_W_IOCTL<<4,
-		[]uintptr{uintptr(dirfd), 17, 1024, uintptr(unsafe.Pointer(&buffer[0]))})
-	if ret == 0 {
-		zb := bytes.IndexByte(buffer[:], 0)
-		if zb == -1 {
-			zb = len(buffer)
-		}
-		// __e2a_l()
-		runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___E2A_L<<4,
-			[]uintptr{uintptr(unsafe.Pointer(&buffer[0])), uintptr(zb)})
-		return string(buffer[:zb]), nil
-	}
-	// __errno()
-	errno := int(*(*int32)(unsafe.Pointer(runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___ERRNO<<4,
-		[]uintptr{}))))
-	// __errno2()
-	errno2 := int(runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS___ERRNO2<<4,
-		[]uintptr{}))
-	// strerror_r()
-	ret = runtime.CallLeFuncByPtr(runtime.XplinkLibvec+SYS_STRERROR_R<<4,
-		[]uintptr{uintptr(errno), uintptr(unsafe.Pointer(&buffer[0])), 1024})
-	if ret == 0 {
-		zb := bytes.IndexByte(buffer[:], 0)
-		if zb == -1 {
-			zb = len(buffer)
-		}
-		return "", fmt.Errorf("%s (errno2=0x%x)", buffer[:zb], errno2)
-	} else {
-		return "", fmt.Errorf("fdToPath errno %d (errno2=0x%x)", errno, errno2)
-	}
-}
-
-func impl_Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKFIFOAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_MkfifoatAddr() *(func(dirfd int, path string, mode uint32) (err error))
-
-var Mkfifoat = enter_Mkfifoat
-
-func enter_Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	funcref := get_MkfifoatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___MKFIFOAT_A<<4, "") == 0 {
-		*funcref = impl_Mkfifoat
-	} else {
-		*funcref = legacy_Mkfifoat
-	}
-	return (*funcref)(dirfd, path, mode)
-}
-
-func legacy_Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	dirname, err := ZosFdToPath(dirfd)
+	fsCount, err := W_Getmntent_A((*byte)(unsafe.Pointer(&buffer)), int(unsafe.Sizeof(buffer)))
 	if err != nil {
 		return err
 	}
-	return Mkfifo(dirname+"/"+path, mode)
-}
-
-//sys	Posix_openpt(oflag int) (fd int, err error) = SYS_POSIX_OPENPT
-//sys	Grantpt(fildes int) (rc int, err error) = SYS_GRANTPT
-//sys	Unlockpt(fildes int) (rc int, err error) = SYS_UNLOCKPT
-
-func fcntlAsIs(fd uintptr, cmd int, arg uintptr) (val int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCNTL<<4, uintptr(fd), uintptr(cmd), arg)
-	runtime.ExitSyscall()
-	val = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if fsCount == 0 {
+		return EINVAL
 	}
-	return
-}
-
-func Fcntl(fd uintptr, cmd int, op interface{}) (ret int, err error) {
-	switch op.(type) {
-	case *Flock_t:
-		err = FcntlFlock(fd, cmd, op.(*Flock_t))
-		if err != nil {
-			ret = -1
-		}
-		return
-	case int:
-		return FcntlInt(fd, cmd, op.(int))
-	case *F_cnvrt:
-		return fcntlAsIs(fd, cmd, uintptr(unsafe.Pointer(op.(*F_cnvrt))))
-	case unsafe.Pointer:
-		return fcntlAsIs(fd, cmd, uintptr(op.(unsafe.Pointer)))
-	default:
-		return -1, EINVAL
-	}
-	return
-}
-
-func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	return sendfile(outfd, infd, offset, count)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	// TODO: use LE call instead if the call is implemented
-	originalOffset, err := Seek(infd, 0, SEEK_CUR)
-	if err != nil {
-		return -1, err
-	}
-	//start reading data from in_fd
-	if offset != nil {
-		_, err := Seek(infd, *offset, SEEK_SET)
-		if err != nil {
-			return -1, err
+	for i := 0; i < fsCount; i++ {
+		if b2s(buffer.fsinfo[i].Mountpoint[:]) == name {
+			err = unmount(b2s(buffer.fsinfo[i].Fsname[:]), mtm)
+			break
 		}
 	}
-
-	buf := make([]byte, count)
-	readBuf := make([]byte, 0)
-	var n int = 0
-	for i := 0; i < count; i += n {
-		n, err := Read(infd, buf)
-		if n == 0 {
-			if err != nil {
-				return -1, err
-			} else { // EOF
-				break
-			}
-		}
-		readBuf = append(readBuf, buf...)
-		buf = buf[0:0]
-	}
-
-	n2, err := Write(outfd, readBuf)
-	if err != nil {
-		return -1, err
-	}
-
-	//When sendfile() returns, this variable will be set to the
-	// offset of the byte following the last byte that was read.
-	if offset != nil {
-		*offset = *offset + int64(n)
-		// If offset is not NULL, then sendfile() does not modify the file
-		// offset of in_fd
-		_, err := Seek(infd, originalOffset, SEEK_SET)
-		if err != nil {
-			return -1, err
-		}
-	}
-	return n2, nil
+	return err
 }
diff --git a/vendor/golang.org/x/sys/unix/sysvshm_linux.go b/vendor/golang.org/x/sys/unix/sysvshm_linux.go
deleted file mode 100644
index 4fcd38d..0000000
--- a/vendor/golang.org/x/sys/unix/sysvshm_linux.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux
-
-package unix
-
-import "runtime"
-
-// SysvShmCtl performs control operations on the shared memory segment
-// specified by id.
-func SysvShmCtl(id, cmd int, desc *SysvShmDesc) (result int, err error) {
-	if runtime.GOARCH == "arm" ||
-		runtime.GOARCH == "mips64" || runtime.GOARCH == "mips64le" {
-		cmd |= ipc_64
-	}
-
-	return shmctl(id, cmd, desc)
-}
diff --git a/vendor/golang.org/x/sys/unix/sysvshm_unix.go b/vendor/golang.org/x/sys/unix/sysvshm_unix.go
deleted file mode 100644
index 672d6b0..0000000
--- a/vendor/golang.org/x/sys/unix/sysvshm_unix.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (darwin && !ios) || linux || zos
-
-package unix
-
-import "unsafe"
-
-// SysvShmAttach attaches the Sysv shared memory segment associated with the
-// shared memory identifier id.
-func SysvShmAttach(id int, addr uintptr, flag int) ([]byte, error) {
-	addr, errno := shmat(id, addr, flag)
-	if errno != nil {
-		return nil, errno
-	}
-
-	// Retrieve the size of the shared memory to enable slice creation
-	var info SysvShmDesc
-
-	_, err := SysvShmCtl(id, IPC_STAT, &info)
-	if err != nil {
-		// release the shared memory if we can't find the size
-
-		// ignoring error from shmdt as there's nothing sensible to return here
-		shmdt(addr)
-		return nil, err
-	}
-
-	// Use unsafe to convert addr into a []byte.
-	b := unsafe.Slice((*byte)(unsafe.Pointer(addr)), int(info.Segsz))
-	return b, nil
-}
-
-// SysvShmDetach unmaps the shared memory slice returned from SysvShmAttach.
-//
-// It is not safe to use the slice after calling this function.
-func SysvShmDetach(data []byte) error {
-	if len(data) == 0 {
-		return EINVAL
-	}
-
-	return shmdt(uintptr(unsafe.Pointer(&data[0])))
-}
-
-// SysvShmGet returns the Sysv shared memory identifier associated with key.
-// If the IPC_CREAT flag is specified a new segment is created.
-func SysvShmGet(key, size, flag int) (id int, err error) {
-	return shmget(key, size, flag)
-}
diff --git a/vendor/golang.org/x/sys/unix/sysvshm_unix_other.go b/vendor/golang.org/x/sys/unix/sysvshm_unix_other.go
deleted file mode 100644
index 8b7977a..0000000
--- a/vendor/golang.org/x/sys/unix/sysvshm_unix_other.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (darwin && !ios) || zos
-
-package unix
-
-// SysvShmCtl performs control operations on the shared memory segment
-// specified by id.
-func SysvShmCtl(id, cmd int, desc *SysvShmDesc) (result int, err error) {
-	return shmctl(id, cmd, desc)
-}
diff --git a/vendor/golang.org/x/sys/unix/timestruct.go b/vendor/golang.org/x/sys/unix/timestruct.go
index 7997b19..3d89304 100644
--- a/vendor/golang.org/x/sys/unix/timestruct.go
+++ b/vendor/golang.org/x/sys/unix/timestruct.go
@@ -3,12 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
 package unix
 
 import "time"
 
-// TimespecToNsec returns the time stored in ts as nanoseconds.
+// TimespecToNSec returns the time stored in ts as nanoseconds.
 func TimespecToNsec(ts Timespec) int64 { return ts.Nano() }
 
 // NsecToTimespec converts a number of nanoseconds into a Timespec.
diff --git a/vendor/golang.org/x/sys/unix/unveil_openbsd.go b/vendor/golang.org/x/sys/unix/unveil_openbsd.go
index cb7e598..168d5ae 100644
--- a/vendor/golang.org/x/sys/unix/unveil_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/unveil_openbsd.go
@@ -4,48 +4,39 @@
 
 package unix
 
-import "fmt"
+import (
+	"syscall"
+	"unsafe"
+)
 
 // Unveil implements the unveil syscall.
 // For more information see unveil(2).
 // Note that the special case of blocking further
 // unveil calls is handled by UnveilBlock.
 func Unveil(path string, flags string) error {
-	if err := supportsUnveil(); err != nil {
-		return err
-	}
-	pathPtr, err := BytePtrFromString(path)
+	pathPtr, err := syscall.BytePtrFromString(path)
 	if err != nil {
 		return err
 	}
-	flagsPtr, err := BytePtrFromString(flags)
+	flagsPtr, err := syscall.BytePtrFromString(flags)
 	if err != nil {
 		return err
 	}
-	return unveil(pathPtr, flagsPtr)
+	_, _, e := syscall.Syscall(SYS_UNVEIL, uintptr(unsafe.Pointer(pathPtr)), uintptr(unsafe.Pointer(flagsPtr)), 0)
+	if e != 0 {
+		return e
+	}
+	return nil
 }
 
 // UnveilBlock blocks future unveil calls.
 // For more information see unveil(2).
 func UnveilBlock() error {
-	if err := supportsUnveil(); err != nil {
-		return err
+	// Both pointers must be nil.
+	var pathUnsafe, flagsUnsafe unsafe.Pointer
+	_, _, e := syscall.Syscall(SYS_UNVEIL, uintptr(pathUnsafe), uintptr(flagsUnsafe), 0)
+	if e != 0 {
+		return e
 	}
-	return unveil(nil, nil)
-}
-
-// supportsUnveil checks for availability of the unveil(2) system call based
-// on the running OpenBSD version.
-func supportsUnveil() error {
-	maj, min, err := majmin()
-	if err != nil {
-		return err
-	}
-
-	// unveil is not available before 6.4
-	if maj < 6 || (maj == 6 && min <= 3) {
-		return fmt.Errorf("cannot call Unveil on OpenBSD %d.%d", maj, min)
-	}
-
 	return nil
 }
diff --git a/vendor/golang.org/x/sys/unix/vgetrandom_linux.go b/vendor/golang.org/x/sys/unix/vgetrandom_linux.go
deleted file mode 100644
index 07ac8e0..0000000
--- a/vendor/golang.org/x/sys/unix/vgetrandom_linux.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && go1.24
-
-package unix
-
-import _ "unsafe"
-
-//go:linkname vgetrandom runtime.vgetrandom
-//go:noescape
-func vgetrandom(p []byte, flags uint32) (ret int, supported bool)
diff --git a/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go b/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go
deleted file mode 100644
index 297e97b..0000000
--- a/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !linux || !go1.24
-
-package unix
-
-func vgetrandom(p []byte, flags uint32) (ret int, supported bool) {
-	return -1, false
-}
diff --git a/vendor/golang.org/x/sys/unix/xattr_bsd.go b/vendor/golang.org/x/sys/unix/xattr_bsd.go
index e168793..25df1e3 100644
--- a/vendor/golang.org/x/sys/unix/xattr_bsd.go
+++ b/vendor/golang.org/x/sys/unix/xattr_bsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build freebsd || netbsd
+// +build freebsd netbsd
 
 package unix
 
@@ -35,14 +36,9 @@ func xattrnamespace(fullattr string) (ns int, attr string, err error) {
 func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
 	if len(dest) > idx {
 		return unsafe.Pointer(&dest[idx])
+	} else {
+		return unsafe.Pointer(_zero)
 	}
-	if dest != nil {
-		// extattr_get_file and extattr_list_file treat NULL differently from
-		// a non-NULL pointer of length zero. Preserve the property of nilness,
-		// even if we can't use dest directly.
-		return unsafe.Pointer(&_zero)
-	}
-	return nil
 }
 
 // FreeBSD and NetBSD implement their own syscalls to handle extended attributes
@@ -164,12 +160,13 @@ func Lremovexattr(link string, attr string) (err error) {
 }
 
 func Listxattr(file string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
 	destsiz := len(dest)
 
 	// FreeBSD won't allow you to list xattrs from multiple namespaces
-	s, pos := 0, 0
+	s := 0
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ListxattrNS(file, nsid, dest[pos:])
+		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
 
 		/* Errors accessing system attrs are ignored so that
 		 * we can implement the Linux-like behavior of omitting errors that
@@ -178,102 +175,66 @@ func Listxattr(file string, dest []byte) (sz int, err error) {
 		 * Linux will still error if we ask for user attributes on a file that
 		 * we don't have read permissions on, so don't ignore those errors
 		 */
-		if e != nil {
-			if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-				continue
-			}
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
 			return s, e
 		}
 
 		s += stmp
-		pos = s
-		if pos > destsiz {
-			pos = destsiz
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
 		}
-	}
-
-	return s, nil
-}
-
-func ListxattrNS(file string, nsid int, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
-	if e != nil {
-		return 0, err
+		d = initxattrdest(dest, s)
 	}
 
 	return s, nil
 }
 
 func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
 	destsiz := len(dest)
 
-	s, pos := 0, 0
+	s := 0
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := FlistxattrNS(fd, nsid, dest[pos:])
-
-		if e != nil {
-			if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-				continue
-			}
+		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
 			return s, e
 		}
 
 		s += stmp
-		pos = s
-		if pos > destsiz {
-			pos = destsiz
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
 		}
-	}
-
-	return s, nil
-}
-
-func FlistxattrNS(fd int, nsid int, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
-	if e != nil {
-		return 0, err
+		d = initxattrdest(dest, s)
 	}
 
 	return s, nil
 }
 
 func Llistxattr(link string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
 	destsiz := len(dest)
 
-	s, pos := 0, 0
+	s := 0
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := LlistxattrNS(link, nsid, dest[pos:])
-
-		if e != nil {
-			if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-				continue
-			}
+		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
 			return s, e
 		}
 
 		s += stmp
-		pos = s
-		if pos > destsiz {
-			pos = destsiz
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
 		}
-	}
-
-	return s, nil
-}
-
-func LlistxattrNS(link string, nsid int, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
-	if e != nil {
-		return 0, err
+		d = initxattrdest(dest, s)
 	}
 
 	return s, nil
diff --git a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go
index 2fb219d..ca9799b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && aix
+// +build ppc,aix
 
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -maix32 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go
index b0e6f5c..200c8c2 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && aix
+// +build ppc64,aix
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -maix64 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
index d73c465..a3a45fe 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && darwin
+// +build amd64,darwin
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -11,1613 +12,1556 @@ package unix
 import "syscall"
 
 const (
-	AF_APPLETALK                            = 0x10
-	AF_CCITT                                = 0xa
-	AF_CHAOS                                = 0x5
-	AF_CNT                                  = 0x15
-	AF_COIP                                 = 0x14
-	AF_DATAKIT                              = 0x9
-	AF_DECnet                               = 0xc
-	AF_DLI                                  = 0xd
-	AF_E164                                 = 0x1c
-	AF_ECMA                                 = 0x8
-	AF_HYLINK                               = 0xf
-	AF_IEEE80211                            = 0x25
-	AF_IMPLINK                              = 0x3
-	AF_INET                                 = 0x2
-	AF_INET6                                = 0x1e
-	AF_IPX                                  = 0x17
-	AF_ISDN                                 = 0x1c
-	AF_ISO                                  = 0x7
-	AF_LAT                                  = 0xe
-	AF_LINK                                 = 0x12
-	AF_LOCAL                                = 0x1
-	AF_MAX                                  = 0x29
-	AF_NATM                                 = 0x1f
-	AF_NDRV                                 = 0x1b
-	AF_NETBIOS                              = 0x21
-	AF_NS                                   = 0x6
-	AF_OSI                                  = 0x7
-	AF_PPP                                  = 0x22
-	AF_PUP                                  = 0x4
-	AF_RESERVED_36                          = 0x24
-	AF_ROUTE                                = 0x11
-	AF_SIP                                  = 0x18
-	AF_SNA                                  = 0xb
-	AF_SYSTEM                               = 0x20
-	AF_SYS_CONTROL                          = 0x2
-	AF_UNIX                                 = 0x1
-	AF_UNSPEC                               = 0x0
-	AF_UTUN                                 = 0x26
-	AF_VSOCK                                = 0x28
-	ALTWERASE                               = 0x200
-	ATTR_BIT_MAP_COUNT                      = 0x5
-	ATTR_CMN_ACCESSMASK                     = 0x20000
-	ATTR_CMN_ACCTIME                        = 0x1000
-	ATTR_CMN_ADDEDTIME                      = 0x10000000
-	ATTR_CMN_BKUPTIME                       = 0x2000
-	ATTR_CMN_CHGTIME                        = 0x800
-	ATTR_CMN_CRTIME                         = 0x200
-	ATTR_CMN_DATA_PROTECT_FLAGS             = 0x40000000
-	ATTR_CMN_DEVID                          = 0x2
-	ATTR_CMN_DOCUMENT_ID                    = 0x100000
-	ATTR_CMN_ERROR                          = 0x20000000
-	ATTR_CMN_EXTENDED_SECURITY              = 0x400000
-	ATTR_CMN_FILEID                         = 0x2000000
-	ATTR_CMN_FLAGS                          = 0x40000
-	ATTR_CMN_FNDRINFO                       = 0x4000
-	ATTR_CMN_FSID                           = 0x4
-	ATTR_CMN_FULLPATH                       = 0x8000000
-	ATTR_CMN_GEN_COUNT                      = 0x80000
-	ATTR_CMN_GRPID                          = 0x10000
-	ATTR_CMN_GRPUUID                        = 0x1000000
-	ATTR_CMN_MODTIME                        = 0x400
-	ATTR_CMN_NAME                           = 0x1
-	ATTR_CMN_NAMEDATTRCOUNT                 = 0x80000
-	ATTR_CMN_NAMEDATTRLIST                  = 0x100000
-	ATTR_CMN_OBJID                          = 0x20
-	ATTR_CMN_OBJPERMANENTID                 = 0x40
-	ATTR_CMN_OBJTAG                         = 0x10
-	ATTR_CMN_OBJTYPE                        = 0x8
-	ATTR_CMN_OWNERID                        = 0x8000
-	ATTR_CMN_PARENTID                       = 0x4000000
-	ATTR_CMN_PAROBJID                       = 0x80
-	ATTR_CMN_RETURNED_ATTRS                 = 0x80000000
-	ATTR_CMN_SCRIPT                         = 0x100
-	ATTR_CMN_SETMASK                        = 0x51c7ff00
-	ATTR_CMN_USERACCESS                     = 0x200000
-	ATTR_CMN_UUID                           = 0x800000
-	ATTR_CMN_VALIDMASK                      = 0xffffffff
-	ATTR_CMN_VOLSETMASK                     = 0x6700
-	ATTR_FILE_ALLOCSIZE                     = 0x4
-	ATTR_FILE_CLUMPSIZE                     = 0x10
-	ATTR_FILE_DATAALLOCSIZE                 = 0x400
-	ATTR_FILE_DATAEXTENTS                   = 0x800
-	ATTR_FILE_DATALENGTH                    = 0x200
-	ATTR_FILE_DEVTYPE                       = 0x20
-	ATTR_FILE_FILETYPE                      = 0x40
-	ATTR_FILE_FORKCOUNT                     = 0x80
-	ATTR_FILE_FORKLIST                      = 0x100
-	ATTR_FILE_IOBLOCKSIZE                   = 0x8
-	ATTR_FILE_LINKCOUNT                     = 0x1
-	ATTR_FILE_RSRCALLOCSIZE                 = 0x2000
-	ATTR_FILE_RSRCEXTENTS                   = 0x4000
-	ATTR_FILE_RSRCLENGTH                    = 0x1000
-	ATTR_FILE_SETMASK                       = 0x20
-	ATTR_FILE_TOTALSIZE                     = 0x2
-	ATTR_FILE_VALIDMASK                     = 0x37ff
-	ATTR_VOL_ALLOCATIONCLUMP                = 0x40
-	ATTR_VOL_ATTRIBUTES                     = 0x40000000
-	ATTR_VOL_CAPABILITIES                   = 0x20000
-	ATTR_VOL_DIRCOUNT                       = 0x400
-	ATTR_VOL_ENCODINGSUSED                  = 0x10000
-	ATTR_VOL_FILECOUNT                      = 0x200
-	ATTR_VOL_FSTYPE                         = 0x1
-	ATTR_VOL_INFO                           = 0x80000000
-	ATTR_VOL_IOBLOCKSIZE                    = 0x80
-	ATTR_VOL_MAXOBJCOUNT                    = 0x800
-	ATTR_VOL_MINALLOCATION                  = 0x20
-	ATTR_VOL_MOUNTEDDEVICE                  = 0x8000
-	ATTR_VOL_MOUNTFLAGS                     = 0x4000
-	ATTR_VOL_MOUNTPOINT                     = 0x1000
-	ATTR_VOL_NAME                           = 0x2000
-	ATTR_VOL_OBJCOUNT                       = 0x100
-	ATTR_VOL_QUOTA_SIZE                     = 0x10000000
-	ATTR_VOL_RESERVED_SIZE                  = 0x20000000
-	ATTR_VOL_SETMASK                        = 0x80002000
-	ATTR_VOL_SIGNATURE                      = 0x2
-	ATTR_VOL_SIZE                           = 0x4
-	ATTR_VOL_SPACEAVAIL                     = 0x10
-	ATTR_VOL_SPACEFREE                      = 0x8
-	ATTR_VOL_SPACEUSED                      = 0x800000
-	ATTR_VOL_UUID                           = 0x40000
-	ATTR_VOL_VALIDMASK                      = 0xf087ffff
-	B0                                      = 0x0
-	B110                                    = 0x6e
-	B115200                                 = 0x1c200
-	B1200                                   = 0x4b0
-	B134                                    = 0x86
-	B14400                                  = 0x3840
-	B150                                    = 0x96
-	B1800                                   = 0x708
-	B19200                                  = 0x4b00
-	B200                                    = 0xc8
-	B230400                                 = 0x38400
-	B2400                                   = 0x960
-	B28800                                  = 0x7080
-	B300                                    = 0x12c
-	B38400                                  = 0x9600
-	B4800                                   = 0x12c0
-	B50                                     = 0x32
-	B57600                                  = 0xe100
-	B600                                    = 0x258
-	B7200                                   = 0x1c20
-	B75                                     = 0x4b
-	B76800                                  = 0x12c00
-	B9600                                   = 0x2580
-	BIOCFLUSH                               = 0x20004268
-	BIOCGBLEN                               = 0x40044266
-	BIOCGDLT                                = 0x4004426a
-	BIOCGDLTLIST                            = 0xc00c4279
-	BIOCGETIF                               = 0x4020426b
-	BIOCGHDRCMPLT                           = 0x40044274
-	BIOCGRSIG                               = 0x40044272
-	BIOCGRTIMEOUT                           = 0x4010426e
-	BIOCGSEESENT                            = 0x40044276
-	BIOCGSTATS                              = 0x4008426f
-	BIOCIMMEDIATE                           = 0x80044270
-	BIOCPROMISC                             = 0x20004269
-	BIOCSBLEN                               = 0xc0044266
-	BIOCSDLT                                = 0x80044278
-	BIOCSETF                                = 0x80104267
-	BIOCSETFNR                              = 0x8010427e
-	BIOCSETIF                               = 0x8020426c
-	BIOCSHDRCMPLT                           = 0x80044275
-	BIOCSRSIG                               = 0x80044273
-	BIOCSRTIMEOUT                           = 0x8010426d
-	BIOCSSEESENT                            = 0x80044277
-	BIOCVERSION                             = 0x40044271
-	BPF_A                                   = 0x10
-	BPF_ABS                                 = 0x20
-	BPF_ADD                                 = 0x0
-	BPF_ALIGNMENT                           = 0x4
-	BPF_ALU                                 = 0x4
-	BPF_AND                                 = 0x50
-	BPF_B                                   = 0x10
-	BPF_DIV                                 = 0x30
-	BPF_H                                   = 0x8
-	BPF_IMM                                 = 0x0
-	BPF_IND                                 = 0x40
-	BPF_JA                                  = 0x0
-	BPF_JEQ                                 = 0x10
-	BPF_JGE                                 = 0x30
-	BPF_JGT                                 = 0x20
-	BPF_JMP                                 = 0x5
-	BPF_JSET                                = 0x40
-	BPF_K                                   = 0x0
-	BPF_LD                                  = 0x0
-	BPF_LDX                                 = 0x1
-	BPF_LEN                                 = 0x80
-	BPF_LSH                                 = 0x60
-	BPF_MAJOR_VERSION                       = 0x1
-	BPF_MAXBUFSIZE                          = 0x80000
-	BPF_MAXINSNS                            = 0x200
-	BPF_MEM                                 = 0x60
-	BPF_MEMWORDS                            = 0x10
-	BPF_MINBUFSIZE                          = 0x20
-	BPF_MINOR_VERSION                       = 0x1
-	BPF_MISC                                = 0x7
-	BPF_MSH                                 = 0xa0
-	BPF_MUL                                 = 0x20
-	BPF_NEG                                 = 0x80
-	BPF_OR                                  = 0x40
-	BPF_RELEASE                             = 0x30bb6
-	BPF_RET                                 = 0x6
-	BPF_RSH                                 = 0x70
-	BPF_ST                                  = 0x2
-	BPF_STX                                 = 0x3
-	BPF_SUB                                 = 0x10
-	BPF_TAX                                 = 0x0
-	BPF_TXA                                 = 0x80
-	BPF_W                                   = 0x0
-	BPF_X                                   = 0x8
-	BRKINT                                  = 0x2
-	BS0                                     = 0x0
-	BS1                                     = 0x8000
-	BSDLY                                   = 0x8000
-	CFLUSH                                  = 0xf
-	CLOCAL                                  = 0x8000
-	CLOCK_MONOTONIC                         = 0x6
-	CLOCK_MONOTONIC_RAW                     = 0x4
-	CLOCK_MONOTONIC_RAW_APPROX              = 0x5
-	CLOCK_PROCESS_CPUTIME_ID                = 0xc
-	CLOCK_REALTIME                          = 0x0
-	CLOCK_THREAD_CPUTIME_ID                 = 0x10
-	CLOCK_UPTIME_RAW                        = 0x8
-	CLOCK_UPTIME_RAW_APPROX                 = 0x9
-	CLONE_NOFOLLOW                          = 0x1
-	CLONE_NOOWNERCOPY                       = 0x2
-	CONNECT_DATA_AUTHENTICATED              = 0x4
-	CONNECT_DATA_IDEMPOTENT                 = 0x2
-	CONNECT_RESUME_ON_READ_WRITE            = 0x1
-	CR0                                     = 0x0
-	CR1                                     = 0x1000
-	CR2                                     = 0x2000
-	CR3                                     = 0x3000
-	CRDLY                                   = 0x3000
-	CREAD                                   = 0x800
-	CRTSCTS                                 = 0x30000
-	CS5                                     = 0x0
-	CS6                                     = 0x100
-	CS7                                     = 0x200
-	CS8                                     = 0x300
-	CSIZE                                   = 0x300
-	CSTART                                  = 0x11
-	CSTATUS                                 = 0x14
-	CSTOP                                   = 0x13
-	CSTOPB                                  = 0x400
-	CSUSP                                   = 0x1a
-	CTLIOCGINFO                             = 0xc0644e03
-	CTL_HW                                  = 0x6
-	CTL_KERN                                = 0x1
-	CTL_MAXNAME                             = 0xc
-	CTL_NET                                 = 0x4
-	DLT_A429                                = 0xb8
-	DLT_A653_ICM                            = 0xb9
-	DLT_AIRONET_HEADER                      = 0x78
-	DLT_AOS                                 = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394              = 0x8a
-	DLT_ARCNET                              = 0x7
-	DLT_ARCNET_LINUX                        = 0x81
-	DLT_ATM_CLIP                            = 0x13
-	DLT_ATM_RFC1483                         = 0xb
-	DLT_AURORA                              = 0x7e
-	DLT_AX25                                = 0x3
-	DLT_AX25_KISS                           = 0xca
-	DLT_BACNET_MS_TP                        = 0xa5
-	DLT_BLUETOOTH_HCI_H4                    = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR          = 0xc9
-	DLT_CAN20B                              = 0xbe
-	DLT_CAN_SOCKETCAN                       = 0xe3
-	DLT_CHAOS                               = 0x5
-	DLT_CHDLC                               = 0x68
-	DLT_CISCO_IOS                           = 0x76
-	DLT_C_HDLC                              = 0x68
-	DLT_C_HDLC_WITH_DIR                     = 0xcd
-	DLT_DBUS                                = 0xe7
-	DLT_DECT                                = 0xdd
-	DLT_DOCSIS                              = 0x8f
-	DLT_DVB_CI                              = 0xeb
-	DLT_ECONET                              = 0x73
-	DLT_EN10MB                              = 0x1
-	DLT_EN3MB                               = 0x2
-	DLT_ENC                                 = 0x6d
-	DLT_ERF                                 = 0xc5
-	DLT_ERF_ETH                             = 0xaf
-	DLT_ERF_POS                             = 0xb0
-	DLT_FC_2                                = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS              = 0xe1
-	DLT_FDDI                                = 0xa
-	DLT_FLEXRAY                             = 0xd2
-	DLT_FRELAY                              = 0x6b
-	DLT_FRELAY_WITH_DIR                     = 0xce
-	DLT_GCOM_SERIAL                         = 0xad
-	DLT_GCOM_T1E1                           = 0xac
-	DLT_GPF_F                               = 0xab
-	DLT_GPF_T                               = 0xaa
-	DLT_GPRS_LLC                            = 0xa9
-	DLT_GSMTAP_ABIS                         = 0xda
-	DLT_GSMTAP_UM                           = 0xd9
-	DLT_HHDLC                               = 0x79
-	DLT_IBM_SN                              = 0x92
-	DLT_IBM_SP                              = 0x91
-	DLT_IEEE802                             = 0x6
-	DLT_IEEE802_11                          = 0x69
-	DLT_IEEE802_11_RADIO                    = 0x7f
-	DLT_IEEE802_11_RADIO_AVS                = 0xa3
-	DLT_IEEE802_15_4                        = 0xc3
-	DLT_IEEE802_15_4_LINUX                  = 0xbf
-	DLT_IEEE802_15_4_NOFCS                  = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY             = 0xd7
-	DLT_IEEE802_16_MAC_CPS                  = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO            = 0xc1
-	DLT_IPFILTER                            = 0x74
-	DLT_IPMB                                = 0xc7
-	DLT_IPMB_LINUX                          = 0xd1
-	DLT_IPNET                               = 0xe2
-	DLT_IPOIB                               = 0xf2
-	DLT_IPV4                                = 0xe4
-	DLT_IPV6                                = 0xe5
-	DLT_IP_OVER_FC                          = 0x7a
-	DLT_JUNIPER_ATM1                        = 0x89
-	DLT_JUNIPER_ATM2                        = 0x87
-	DLT_JUNIPER_ATM_CEMIC                   = 0xee
-	DLT_JUNIPER_CHDLC                       = 0xb5
-	DLT_JUNIPER_ES                          = 0x84
-	DLT_JUNIPER_ETHER                       = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL                = 0xea
-	DLT_JUNIPER_FRELAY                      = 0xb4
-	DLT_JUNIPER_GGSN                        = 0x85
-	DLT_JUNIPER_ISM                         = 0xc2
-	DLT_JUNIPER_MFR                         = 0x86
-	DLT_JUNIPER_MLFR                        = 0x83
-	DLT_JUNIPER_MLPPP                       = 0x82
-	DLT_JUNIPER_MONITOR                     = 0xa4
-	DLT_JUNIPER_PIC_PEER                    = 0xae
-	DLT_JUNIPER_PPP                         = 0xb3
-	DLT_JUNIPER_PPPOE                       = 0xa7
-	DLT_JUNIPER_PPPOE_ATM                   = 0xa8
-	DLT_JUNIPER_SERVICES                    = 0x88
-	DLT_JUNIPER_SRX_E2E                     = 0xe9
-	DLT_JUNIPER_ST                          = 0xc8
-	DLT_JUNIPER_VP                          = 0xb7
-	DLT_JUNIPER_VS                          = 0xe8
-	DLT_LAPB_WITH_DIR                       = 0xcf
-	DLT_LAPD                                = 0xcb
-	DLT_LIN                                 = 0xd4
-	DLT_LINUX_EVDEV                         = 0xd8
-	DLT_LINUX_IRDA                          = 0x90
-	DLT_LINUX_LAPD                          = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION             = 0xa6
-	DLT_LINUX_SLL                           = 0x71
-	DLT_LOOP                                = 0x6c
-	DLT_LTALK                               = 0x72
-	DLT_MATCHING_MAX                        = 0x10a
-	DLT_MATCHING_MIN                        = 0x68
-	DLT_MFR                                 = 0xb6
-	DLT_MOST                                = 0xd3
-	DLT_MPEG_2_TS                           = 0xf3
-	DLT_MPLS                                = 0xdb
-	DLT_MTP2                                = 0x8c
-	DLT_MTP2_WITH_PHDR                      = 0x8b
-	DLT_MTP3                                = 0x8d
-	DLT_MUX27010                            = 0xec
-	DLT_NETANALYZER                         = 0xf0
-	DLT_NETANALYZER_TRANSPARENT             = 0xf1
-	DLT_NFC_LLCP                            = 0xf5
-	DLT_NFLOG                               = 0xef
-	DLT_NG40                                = 0xf4
-	DLT_NULL                                = 0x0
-	DLT_PCI_EXP                             = 0x7d
-	DLT_PFLOG                               = 0x75
-	DLT_PFSYNC                              = 0x12
-	DLT_PPI                                 = 0xc0
-	DLT_PPP                                 = 0x9
-	DLT_PPP_BSDOS                           = 0x10
-	DLT_PPP_ETHER                           = 0x33
-	DLT_PPP_PPPD                            = 0xa6
-	DLT_PPP_SERIAL                          = 0x32
-	DLT_PPP_WITH_DIR                        = 0xcc
-	DLT_PPP_WITH_DIRECTION                  = 0xa6
-	DLT_PRISM_HEADER                        = 0x77
-	DLT_PRONET                              = 0x4
-	DLT_RAIF1                               = 0xc6
-	DLT_RAW                                 = 0xc
-	DLT_RIO                                 = 0x7c
-	DLT_SCCP                                = 0x8e
-	DLT_SITA                                = 0xc4
-	DLT_SLIP                                = 0x8
-	DLT_SLIP_BSDOS                          = 0xf
-	DLT_STANAG_5066_D_PDU                   = 0xed
-	DLT_SUNATM                              = 0x7b
-	DLT_SYMANTEC_FIREWALL                   = 0x63
-	DLT_TZSP                                = 0x80
-	DLT_USB                                 = 0xba
-	DLT_USB_DARWIN                          = 0x10a
-	DLT_USB_LINUX                           = 0xbd
-	DLT_USB_LINUX_MMAPPED                   = 0xdc
-	DLT_USER0                               = 0x93
-	DLT_USER1                               = 0x94
-	DLT_USER10                              = 0x9d
-	DLT_USER11                              = 0x9e
-	DLT_USER12                              = 0x9f
-	DLT_USER13                              = 0xa0
-	DLT_USER14                              = 0xa1
-	DLT_USER15                              = 0xa2
-	DLT_USER2                               = 0x95
-	DLT_USER3                               = 0x96
-	DLT_USER4                               = 0x97
-	DLT_USER5                               = 0x98
-	DLT_USER6                               = 0x99
-	DLT_USER7                               = 0x9a
-	DLT_USER8                               = 0x9b
-	DLT_USER9                               = 0x9c
-	DLT_WIHART                              = 0xdf
-	DLT_X2E_SERIAL                          = 0xd5
-	DLT_X2E_XORAYA                          = 0xd6
-	DT_BLK                                  = 0x6
-	DT_CHR                                  = 0x2
-	DT_DIR                                  = 0x4
-	DT_FIFO                                 = 0x1
-	DT_LNK                                  = 0xa
-	DT_REG                                  = 0x8
-	DT_SOCK                                 = 0xc
-	DT_UNKNOWN                              = 0x0
-	DT_WHT                                  = 0xe
-	ECHO                                    = 0x8
-	ECHOCTL                                 = 0x40
-	ECHOE                                   = 0x2
-	ECHOK                                   = 0x4
-	ECHOKE                                  = 0x1
-	ECHONL                                  = 0x10
-	ECHOPRT                                 = 0x20
-	EVFILT_AIO                              = -0x3
-	EVFILT_EXCEPT                           = -0xf
-	EVFILT_FS                               = -0x9
-	EVFILT_MACHPORT                         = -0x8
-	EVFILT_PROC                             = -0x5
-	EVFILT_READ                             = -0x1
-	EVFILT_SIGNAL                           = -0x6
-	EVFILT_SYSCOUNT                         = 0x11
-	EVFILT_THREADMARKER                     = 0x11
-	EVFILT_TIMER                            = -0x7
-	EVFILT_USER                             = -0xa
-	EVFILT_VM                               = -0xc
-	EVFILT_VNODE                            = -0x4
-	EVFILT_WRITE                            = -0x2
-	EV_ADD                                  = 0x1
-	EV_CLEAR                                = 0x20
-	EV_DELETE                               = 0x2
-	EV_DISABLE                              = 0x8
-	EV_DISPATCH                             = 0x80
-	EV_DISPATCH2                            = 0x180
-	EV_ENABLE                               = 0x4
-	EV_EOF                                  = 0x8000
-	EV_ERROR                                = 0x4000
-	EV_FLAG0                                = 0x1000
-	EV_FLAG1                                = 0x2000
-	EV_ONESHOT                              = 0x10
-	EV_OOBAND                               = 0x2000
-	EV_POLL                                 = 0x1000
-	EV_RECEIPT                              = 0x40
-	EV_SYSFLAGS                             = 0xf000
-	EV_UDATA_SPECIFIC                       = 0x100
-	EV_VANISHED                             = 0x200
-	EXTA                                    = 0x4b00
-	EXTB                                    = 0x9600
-	EXTPROC                                 = 0x800
-	FD_CLOEXEC                              = 0x1
-	FD_SETSIZE                              = 0x400
-	FF0                                     = 0x0
-	FF1                                     = 0x4000
-	FFDLY                                   = 0x4000
-	FLUSHO                                  = 0x800000
-	FSOPT_ATTR_CMN_EXTENDED                 = 0x20
-	FSOPT_NOFOLLOW                          = 0x1
-	FSOPT_NOINMEMUPDATE                     = 0x2
-	FSOPT_PACK_INVAL_ATTRS                  = 0x8
-	FSOPT_REPORT_FULLSIZE                   = 0x4
-	FSOPT_RETURN_REALDEV                    = 0x200
-	F_ADDFILESIGS                           = 0x3d
-	F_ADDFILESIGS_FOR_DYLD_SIM              = 0x53
-	F_ADDFILESIGS_INFO                      = 0x67
-	F_ADDFILESIGS_RETURN                    = 0x61
-	F_ADDFILESUPPL                          = 0x68
-	F_ADDSIGS                               = 0x3b
-	F_ALLOCATEALL                           = 0x4
-	F_ALLOCATECONTIG                        = 0x2
-	F_BARRIERFSYNC                          = 0x55
-	F_CHECK_LV                              = 0x62
-	F_CHKCLEAN                              = 0x29
-	F_DUPFD                                 = 0x0
-	F_DUPFD_CLOEXEC                         = 0x43
-	F_FINDSIGS                              = 0x4e
-	F_FLUSH_DATA                            = 0x28
-	F_FREEZE_FS                             = 0x35
-	F_FULLFSYNC                             = 0x33
-	F_GETCODEDIR                            = 0x48
-	F_GETFD                                 = 0x1
-	F_GETFL                                 = 0x3
-	F_GETLK                                 = 0x7
-	F_GETLKPID                              = 0x42
-	F_GETNOSIGPIPE                          = 0x4a
-	F_GETOWN                                = 0x5
-	F_GETPATH                               = 0x32
-	F_GETPATH_MTMINFO                       = 0x47
-	F_GETPATH_NOFIRMLINK                    = 0x66
-	F_GETPROTECTIONCLASS                    = 0x3f
-	F_GETPROTECTIONLEVEL                    = 0x4d
-	F_GETSIGSINFO                           = 0x69
-	F_GLOBAL_NOCACHE                        = 0x37
-	F_LOG2PHYS                              = 0x31
-	F_LOG2PHYS_EXT                          = 0x41
-	F_NOCACHE                               = 0x30
-	F_NODIRECT                              = 0x3e
-	F_OK                                    = 0x0
-	F_PATHPKG_CHECK                         = 0x34
-	F_PEOFPOSMODE                           = 0x3
-	F_PREALLOCATE                           = 0x2a
-	F_PUNCHHOLE                             = 0x63
-	F_RDADVISE                              = 0x2c
-	F_RDAHEAD                               = 0x2d
-	F_RDLCK                                 = 0x1
-	F_SETBACKINGSTORE                       = 0x46
-	F_SETFD                                 = 0x2
-	F_SETFL                                 = 0x4
-	F_SETLK                                 = 0x8
-	F_SETLKW                                = 0x9
-	F_SETLKWTIMEOUT                         = 0xa
-	F_SETNOSIGPIPE                          = 0x49
-	F_SETOWN                                = 0x6
-	F_SETPROTECTIONCLASS                    = 0x40
-	F_SETSIZE                               = 0x2b
-	F_SINGLE_WRITER                         = 0x4c
-	F_SPECULATIVE_READ                      = 0x65
-	F_THAW_FS                               = 0x36
-	F_TRANSCODEKEY                          = 0x4b
-	F_TRIM_ACTIVE_FILE                      = 0x64
-	F_UNLCK                                 = 0x2
-	F_VOLPOSMODE                            = 0x4
-	F_WRLCK                                 = 0x3
-	HUPCL                                   = 0x4000
-	HW_MACHINE                              = 0x1
-	ICANON                                  = 0x100
-	ICMP6_FILTER                            = 0x12
-	ICRNL                                   = 0x100
-	IEXTEN                                  = 0x400
-	IFF_ALLMULTI                            = 0x200
-	IFF_ALTPHYS                             = 0x4000
-	IFF_BROADCAST                           = 0x2
-	IFF_DEBUG                               = 0x4
-	IFF_LINK0                               = 0x1000
-	IFF_LINK1                               = 0x2000
-	IFF_LINK2                               = 0x4000
-	IFF_LOOPBACK                            = 0x8
-	IFF_MULTICAST                           = 0x8000
-	IFF_NOARP                               = 0x80
-	IFF_NOTRAILERS                          = 0x20
-	IFF_OACTIVE                             = 0x400
-	IFF_POINTOPOINT                         = 0x10
-	IFF_PROMISC                             = 0x100
-	IFF_RUNNING                             = 0x40
-	IFF_SIMPLEX                             = 0x800
-	IFF_UP                                  = 0x1
-	IFNAMSIZ                                = 0x10
-	IFT_1822                                = 0x2
-	IFT_6LOWPAN                             = 0x40
-	IFT_AAL5                                = 0x31
-	IFT_ARCNET                              = 0x23
-	IFT_ARCNETPLUS                          = 0x24
-	IFT_ATM                                 = 0x25
-	IFT_BRIDGE                              = 0xd1
-	IFT_CARP                                = 0xf8
-	IFT_CELLULAR                            = 0xff
-	IFT_CEPT                                = 0x13
-	IFT_DS3                                 = 0x1e
-	IFT_ENC                                 = 0xf4
-	IFT_EON                                 = 0x19
-	IFT_ETHER                               = 0x6
-	IFT_FAITH                               = 0x38
-	IFT_FDDI                                = 0xf
-	IFT_FRELAY                              = 0x20
-	IFT_FRELAYDCE                           = 0x2c
-	IFT_GIF                                 = 0x37
-	IFT_HDH1822                             = 0x3
-	IFT_HIPPI                               = 0x2f
-	IFT_HSSI                                = 0x2e
-	IFT_HY                                  = 0xe
-	IFT_IEEE1394                            = 0x90
-	IFT_IEEE8023ADLAG                       = 0x88
-	IFT_ISDNBASIC                           = 0x14
-	IFT_ISDNPRIMARY                         = 0x15
-	IFT_ISO88022LLC                         = 0x29
-	IFT_ISO88023                            = 0x7
-	IFT_ISO88024                            = 0x8
-	IFT_ISO88025                            = 0x9
-	IFT_ISO88026                            = 0xa
-	IFT_L2VLAN                              = 0x87
-	IFT_LAPB                                = 0x10
-	IFT_LOCALTALK                           = 0x2a
-	IFT_LOOP                                = 0x18
-	IFT_MIOX25                              = 0x26
-	IFT_MODEM                               = 0x30
-	IFT_NSIP                                = 0x1b
-	IFT_OTHER                               = 0x1
-	IFT_P10                                 = 0xc
-	IFT_P80                                 = 0xd
-	IFT_PARA                                = 0x22
-	IFT_PDP                                 = 0xff
-	IFT_PFLOG                               = 0xf5
-	IFT_PFSYNC                              = 0xf6
-	IFT_PKTAP                               = 0xfe
-	IFT_PPP                                 = 0x17
-	IFT_PROPMUX                             = 0x36
-	IFT_PROPVIRTUAL                         = 0x35
-	IFT_PTPSERIAL                           = 0x16
-	IFT_RS232                               = 0x21
-	IFT_SDLC                                = 0x11
-	IFT_SIP                                 = 0x1f
-	IFT_SLIP                                = 0x1c
-	IFT_SMDSDXI                             = 0x2b
-	IFT_SMDSICIP                            = 0x34
-	IFT_SONET                               = 0x27
-	IFT_SONETPATH                           = 0x32
-	IFT_SONETVT                             = 0x33
-	IFT_STARLAN                             = 0xb
-	IFT_STF                                 = 0x39
-	IFT_T1                                  = 0x12
-	IFT_ULTRA                               = 0x1d
-	IFT_V35                                 = 0x2d
-	IFT_X25                                 = 0x5
-	IFT_X25DDN                              = 0x4
-	IFT_X25PLE                              = 0x28
-	IFT_XETHER                              = 0x1a
-	IGNBRK                                  = 0x1
-	IGNCR                                   = 0x80
-	IGNPAR                                  = 0x4
-	IMAXBEL                                 = 0x2000
-	INLCR                                   = 0x40
-	INPCK                                   = 0x10
-	IN_CLASSA_HOST                          = 0xffffff
-	IN_CLASSA_MAX                           = 0x80
-	IN_CLASSA_NET                           = 0xff000000
-	IN_CLASSA_NSHIFT                        = 0x18
-	IN_CLASSB_HOST                          = 0xffff
-	IN_CLASSB_MAX                           = 0x10000
-	IN_CLASSB_NET                           = 0xffff0000
-	IN_CLASSB_NSHIFT                        = 0x10
-	IN_CLASSC_HOST                          = 0xff
-	IN_CLASSC_NET                           = 0xffffff00
-	IN_CLASSC_NSHIFT                        = 0x8
-	IN_CLASSD_HOST                          = 0xfffffff
-	IN_CLASSD_NET                           = 0xf0000000
-	IN_CLASSD_NSHIFT                        = 0x1c
-	IN_LINKLOCALNETNUM                      = 0xa9fe0000
-	IN_LOOPBACKNET                          = 0x7f
-	IOCTL_VM_SOCKETS_GET_LOCAL_CID          = 0x400473d1
-	IPPROTO_3PC                             = 0x22
-	IPPROTO_ADFS                            = 0x44
-	IPPROTO_AH                              = 0x33
-	IPPROTO_AHIP                            = 0x3d
-	IPPROTO_APES                            = 0x63
-	IPPROTO_ARGUS                           = 0xd
-	IPPROTO_AX25                            = 0x5d
-	IPPROTO_BHA                             = 0x31
-	IPPROTO_BLT                             = 0x1e
-	IPPROTO_BRSATMON                        = 0x4c
-	IPPROTO_CFTP                            = 0x3e
-	IPPROTO_CHAOS                           = 0x10
-	IPPROTO_CMTP                            = 0x26
-	IPPROTO_CPHB                            = 0x49
-	IPPROTO_CPNX                            = 0x48
-	IPPROTO_DDP                             = 0x25
-	IPPROTO_DGP                             = 0x56
-	IPPROTO_DIVERT                          = 0xfe
-	IPPROTO_DONE                            = 0x101
-	IPPROTO_DSTOPTS                         = 0x3c
-	IPPROTO_EGP                             = 0x8
-	IPPROTO_EMCON                           = 0xe
-	IPPROTO_ENCAP                           = 0x62
-	IPPROTO_EON                             = 0x50
-	IPPROTO_ESP                             = 0x32
-	IPPROTO_ETHERIP                         = 0x61
-	IPPROTO_FRAGMENT                        = 0x2c
-	IPPROTO_GGP                             = 0x3
-	IPPROTO_GMTP                            = 0x64
-	IPPROTO_GRE                             = 0x2f
-	IPPROTO_HELLO                           = 0x3f
-	IPPROTO_HMP                             = 0x14
-	IPPROTO_HOPOPTS                         = 0x0
-	IPPROTO_ICMP                            = 0x1
-	IPPROTO_ICMPV6                          = 0x3a
-	IPPROTO_IDP                             = 0x16
-	IPPROTO_IDPR                            = 0x23
-	IPPROTO_IDRP                            = 0x2d
-	IPPROTO_IGMP                            = 0x2
-	IPPROTO_IGP                             = 0x55
-	IPPROTO_IGRP                            = 0x58
-	IPPROTO_IL                              = 0x28
-	IPPROTO_INLSP                           = 0x34
-	IPPROTO_INP                             = 0x20
-	IPPROTO_IP                              = 0x0
-	IPPROTO_IPCOMP                          = 0x6c
-	IPPROTO_IPCV                            = 0x47
-	IPPROTO_IPEIP                           = 0x5e
-	IPPROTO_IPIP                            = 0x4
-	IPPROTO_IPPC                            = 0x43
-	IPPROTO_IPV4                            = 0x4
-	IPPROTO_IPV6                            = 0x29
-	IPPROTO_IRTP                            = 0x1c
-	IPPROTO_KRYPTOLAN                       = 0x41
-	IPPROTO_LARP                            = 0x5b
-	IPPROTO_LEAF1                           = 0x19
-	IPPROTO_LEAF2                           = 0x1a
-	IPPROTO_MAX                             = 0x100
-	IPPROTO_MAXID                           = 0x34
-	IPPROTO_MEAS                            = 0x13
-	IPPROTO_MHRP                            = 0x30
-	IPPROTO_MICP                            = 0x5f
-	IPPROTO_MTP                             = 0x5c
-	IPPROTO_MUX                             = 0x12
-	IPPROTO_ND                              = 0x4d
-	IPPROTO_NHRP                            = 0x36
-	IPPROTO_NONE                            = 0x3b
-	IPPROTO_NSP                             = 0x1f
-	IPPROTO_NVPII                           = 0xb
-	IPPROTO_OSPFIGP                         = 0x59
-	IPPROTO_PGM                             = 0x71
-	IPPROTO_PIGP                            = 0x9
-	IPPROTO_PIM                             = 0x67
-	IPPROTO_PRM                             = 0x15
-	IPPROTO_PUP                             = 0xc
-	IPPROTO_PVP                             = 0x4b
-	IPPROTO_RAW                             = 0xff
-	IPPROTO_RCCMON                          = 0xa
-	IPPROTO_RDP                             = 0x1b
-	IPPROTO_ROUTING                         = 0x2b
-	IPPROTO_RSVP                            = 0x2e
-	IPPROTO_RVD                             = 0x42
-	IPPROTO_SATEXPAK                        = 0x40
-	IPPROTO_SATMON                          = 0x45
-	IPPROTO_SCCSP                           = 0x60
-	IPPROTO_SCTP                            = 0x84
-	IPPROTO_SDRP                            = 0x2a
-	IPPROTO_SEP                             = 0x21
-	IPPROTO_SRPC                            = 0x5a
-	IPPROTO_ST                              = 0x7
-	IPPROTO_SVMTP                           = 0x52
-	IPPROTO_SWIPE                           = 0x35
-	IPPROTO_TCF                             = 0x57
-	IPPROTO_TCP                             = 0x6
-	IPPROTO_TP                              = 0x1d
-	IPPROTO_TPXX                            = 0x27
-	IPPROTO_TRUNK1                          = 0x17
-	IPPROTO_TRUNK2                          = 0x18
-	IPPROTO_TTP                             = 0x54
-	IPPROTO_UDP                             = 0x11
-	IPPROTO_VINES                           = 0x53
-	IPPROTO_VISA                            = 0x46
-	IPPROTO_VMTP                            = 0x51
-	IPPROTO_WBEXPAK                         = 0x4f
-	IPPROTO_WBMON                           = 0x4e
-	IPPROTO_WSN                             = 0x4a
-	IPPROTO_XNET                            = 0xf
-	IPPROTO_XTP                             = 0x24
-	IPV6_2292DSTOPTS                        = 0x17
-	IPV6_2292HOPLIMIT                       = 0x14
-	IPV6_2292HOPOPTS                        = 0x16
-	IPV6_2292NEXTHOP                        = 0x15
-	IPV6_2292PKTINFO                        = 0x13
-	IPV6_2292PKTOPTIONS                     = 0x19
-	IPV6_2292RTHDR                          = 0x18
-	IPV6_3542DSTOPTS                        = 0x32
-	IPV6_3542HOPLIMIT                       = 0x2f
-	IPV6_3542HOPOPTS                        = 0x31
-	IPV6_3542NEXTHOP                        = 0x30
-	IPV6_3542PKTINFO                        = 0x2e
-	IPV6_3542RTHDR                          = 0x33
-	IPV6_ADDR_MC_FLAGS_PREFIX               = 0x20
-	IPV6_ADDR_MC_FLAGS_TRANSIENT            = 0x10
-	IPV6_ADDR_MC_FLAGS_UNICAST_BASED        = 0x30
-	IPV6_AUTOFLOWLABEL                      = 0x3b
-	IPV6_BINDV6ONLY                         = 0x1b
-	IPV6_BOUND_IF                           = 0x7d
-	IPV6_CHECKSUM                           = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS             = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP             = 0x1
-	IPV6_DEFHLIM                            = 0x40
-	IPV6_DONTFRAG                           = 0x3e
-	IPV6_DSTOPTS                            = 0x32
-	IPV6_FAITH                              = 0x1d
-	IPV6_FLOWINFO_MASK                      = 0xffffff0f
-	IPV6_FLOWLABEL_MASK                     = 0xffff0f00
-	IPV6_FLOW_ECN_MASK                      = 0x3000
-	IPV6_FRAGTTL                            = 0x3c
-	IPV6_FW_ADD                             = 0x1e
-	IPV6_FW_DEL                             = 0x1f
-	IPV6_FW_FLUSH                           = 0x20
-	IPV6_FW_GET                             = 0x22
-	IPV6_FW_ZERO                            = 0x21
-	IPV6_HLIMDEC                            = 0x1
-	IPV6_HOPLIMIT                           = 0x2f
-	IPV6_HOPOPTS                            = 0x31
-	IPV6_IPSEC_POLICY                       = 0x1c
-	IPV6_JOIN_GROUP                         = 0xc
-	IPV6_LEAVE_GROUP                        = 0xd
-	IPV6_MAXHLIM                            = 0xff
-	IPV6_MAXOPTHDR                          = 0x800
-	IPV6_MAXPACKET                          = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER               = 0x200
-	IPV6_MAX_MEMBERSHIPS                    = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER                = 0x80
-	IPV6_MIN_MEMBERSHIPS                    = 0x1f
-	IPV6_MMTU                               = 0x500
-	IPV6_MSFILTER                           = 0x4a
-	IPV6_MULTICAST_HOPS                     = 0xa
-	IPV6_MULTICAST_IF                       = 0x9
-	IPV6_MULTICAST_LOOP                     = 0xb
-	IPV6_NEXTHOP                            = 0x30
-	IPV6_PATHMTU                            = 0x2c
-	IPV6_PKTINFO                            = 0x2e
-	IPV6_PORTRANGE                          = 0xe
-	IPV6_PORTRANGE_DEFAULT                  = 0x0
-	IPV6_PORTRANGE_HIGH                     = 0x1
-	IPV6_PORTRANGE_LOW                      = 0x2
-	IPV6_PREFER_TEMPADDR                    = 0x3f
-	IPV6_RECVDSTOPTS                        = 0x28
-	IPV6_RECVHOPLIMIT                       = 0x25
-	IPV6_RECVHOPOPTS                        = 0x27
-	IPV6_RECVPATHMTU                        = 0x2b
-	IPV6_RECVPKTINFO                        = 0x3d
-	IPV6_RECVRTHDR                          = 0x26
-	IPV6_RECVTCLASS                         = 0x23
-	IPV6_RTHDR                              = 0x33
-	IPV6_RTHDRDSTOPTS                       = 0x39
-	IPV6_RTHDR_LOOSE                        = 0x0
-	IPV6_RTHDR_STRICT                       = 0x1
-	IPV6_RTHDR_TYPE_0                       = 0x0
-	IPV6_SOCKOPT_RESERVED1                  = 0x3
-	IPV6_TCLASS                             = 0x24
-	IPV6_UNICAST_HOPS                       = 0x4
-	IPV6_USE_MIN_MTU                        = 0x2a
-	IPV6_V6ONLY                             = 0x1b
-	IPV6_VERSION                            = 0x60
-	IPV6_VERSION_MASK                       = 0xf0
-	IP_ADD_MEMBERSHIP                       = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP                = 0x46
-	IP_BLOCK_SOURCE                         = 0x48
-	IP_BOUND_IF                             = 0x19
-	IP_DEFAULT_MULTICAST_LOOP               = 0x1
-	IP_DEFAULT_MULTICAST_TTL                = 0x1
-	IP_DF                                   = 0x4000
-	IP_DONTFRAG                             = 0x1c
-	IP_DROP_MEMBERSHIP                      = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP               = 0x47
-	IP_DUMMYNET_CONFIGURE                   = 0x3c
-	IP_DUMMYNET_DEL                         = 0x3d
-	IP_DUMMYNET_FLUSH                       = 0x3e
-	IP_DUMMYNET_GET                         = 0x40
-	IP_FAITH                                = 0x16
-	IP_FW_ADD                               = 0x28
-	IP_FW_DEL                               = 0x29
-	IP_FW_FLUSH                             = 0x2a
-	IP_FW_GET                               = 0x2c
-	IP_FW_RESETLOG                          = 0x2d
-	IP_FW_ZERO                              = 0x2b
-	IP_HDRINCL                              = 0x2
-	IP_IPSEC_POLICY                         = 0x15
-	IP_MAXPACKET                            = 0xffff
-	IP_MAX_GROUP_SRC_FILTER                 = 0x200
-	IP_MAX_MEMBERSHIPS                      = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER                 = 0x80
-	IP_MAX_SOCK_SRC_FILTER                  = 0x80
-	IP_MF                                   = 0x2000
-	IP_MIN_MEMBERSHIPS                      = 0x1f
-	IP_MSFILTER                             = 0x4a
-	IP_MSS                                  = 0x240
-	IP_MULTICAST_IF                         = 0x9
-	IP_MULTICAST_IFINDEX                    = 0x42
-	IP_MULTICAST_LOOP                       = 0xb
-	IP_MULTICAST_TTL                        = 0xa
-	IP_MULTICAST_VIF                        = 0xe
-	IP_NAT__XXX                             = 0x37
-	IP_OFFMASK                              = 0x1fff
-	IP_OLD_FW_ADD                           = 0x32
-	IP_OLD_FW_DEL                           = 0x33
-	IP_OLD_FW_FLUSH                         = 0x34
-	IP_OLD_FW_GET                           = 0x36
-	IP_OLD_FW_RESETLOG                      = 0x38
-	IP_OLD_FW_ZERO                          = 0x35
-	IP_OPTIONS                              = 0x1
-	IP_PKTINFO                              = 0x1a
-	IP_PORTRANGE                            = 0x13
-	IP_PORTRANGE_DEFAULT                    = 0x0
-	IP_PORTRANGE_HIGH                       = 0x1
-	IP_PORTRANGE_LOW                        = 0x2
-	IP_RECVDSTADDR                          = 0x7
-	IP_RECVIF                               = 0x14
-	IP_RECVOPTS                             = 0x5
-	IP_RECVPKTINFO                          = 0x1a
-	IP_RECVRETOPTS                          = 0x6
-	IP_RECVTOS                              = 0x1b
-	IP_RECVTTL                              = 0x18
-	IP_RETOPTS                              = 0x8
-	IP_RF                                   = 0x8000
-	IP_RSVP_OFF                             = 0x10
-	IP_RSVP_ON                              = 0xf
-	IP_RSVP_VIF_OFF                         = 0x12
-	IP_RSVP_VIF_ON                          = 0x11
-	IP_STRIPHDR                             = 0x17
-	IP_TOS                                  = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND               = 0x41
-	IP_TTL                                  = 0x4
-	IP_UNBLOCK_SOURCE                       = 0x49
-	ISIG                                    = 0x80
-	ISTRIP                                  = 0x20
-	IUTF8                                   = 0x4000
-	IXANY                                   = 0x800
-	IXOFF                                   = 0x400
-	IXON                                    = 0x200
-	KERN_HOSTNAME                           = 0xa
-	KERN_OSRELEASE                          = 0x2
-	KERN_OSTYPE                             = 0x1
-	KERN_VERSION                            = 0x4
-	LOCAL_PEERCRED                          = 0x1
-	LOCAL_PEEREPID                          = 0x3
-	LOCAL_PEEREUUID                         = 0x5
-	LOCAL_PEERPID                           = 0x2
-	LOCAL_PEERTOKEN                         = 0x6
-	LOCAL_PEERUUID                          = 0x4
-	LOCK_EX                                 = 0x2
-	LOCK_NB                                 = 0x4
-	LOCK_SH                                 = 0x1
-	LOCK_UN                                 = 0x8
-	MADV_CAN_REUSE                          = 0x9
-	MADV_DONTNEED                           = 0x4
-	MADV_FREE                               = 0x5
-	MADV_FREE_REUSABLE                      = 0x7
-	MADV_FREE_REUSE                         = 0x8
-	MADV_NORMAL                             = 0x0
-	MADV_PAGEOUT                            = 0xa
-	MADV_RANDOM                             = 0x1
-	MADV_SEQUENTIAL                         = 0x2
-	MADV_WILLNEED                           = 0x3
-	MADV_ZERO_WIRED_PAGES                   = 0x6
-	MAP_32BIT                               = 0x8000
-	MAP_ANON                                = 0x1000
-	MAP_ANONYMOUS                           = 0x1000
-	MAP_COPY                                = 0x2
-	MAP_FILE                                = 0x0
-	MAP_FIXED                               = 0x10
-	MAP_HASSEMAPHORE                        = 0x200
-	MAP_JIT                                 = 0x800
-	MAP_NOCACHE                             = 0x400
-	MAP_NOEXTEND                            = 0x100
-	MAP_NORESERVE                           = 0x40
-	MAP_PRIVATE                             = 0x2
-	MAP_RENAME                              = 0x20
-	MAP_RESERVED0080                        = 0x80
-	MAP_RESILIENT_CODESIGN                  = 0x2000
-	MAP_RESILIENT_MEDIA                     = 0x4000
-	MAP_SHARED                              = 0x1
-	MAP_TRANSLATED_ALLOW_EXECUTE            = 0x20000
-	MAP_UNIX03                              = 0x40000
-	MCAST_BLOCK_SOURCE                      = 0x54
-	MCAST_EXCLUDE                           = 0x2
-	MCAST_INCLUDE                           = 0x1
-	MCAST_JOIN_GROUP                        = 0x50
-	MCAST_JOIN_SOURCE_GROUP                 = 0x52
-	MCAST_LEAVE_GROUP                       = 0x51
-	MCAST_LEAVE_SOURCE_GROUP                = 0x53
-	MCAST_UNBLOCK_SOURCE                    = 0x55
-	MCAST_UNDEFINED                         = 0x0
-	MCL_CURRENT                             = 0x1
-	MCL_FUTURE                              = 0x2
-	MNT_ASYNC                               = 0x40
-	MNT_AUTOMOUNTED                         = 0x400000
-	MNT_CMDFLAGS                            = 0xf0000
-	MNT_CPROTECT                            = 0x80
-	MNT_DEFWRITE                            = 0x2000000
-	MNT_DONTBROWSE                          = 0x100000
-	MNT_DOVOLFS                             = 0x8000
-	MNT_DWAIT                               = 0x4
-	MNT_EXPORTED                            = 0x100
-	MNT_EXT_ROOT_DATA_VOL                   = 0x1
-	MNT_FORCE                               = 0x80000
-	MNT_IGNORE_OWNERSHIP                    = 0x200000
-	MNT_JOURNALED                           = 0x800000
-	MNT_LOCAL                               = 0x1000
-	MNT_MULTILABEL                          = 0x4000000
-	MNT_NOATIME                             = 0x10000000
-	MNT_NOBLOCK                             = 0x20000
-	MNT_NODEV                               = 0x10
-	MNT_NOEXEC                              = 0x4
-	MNT_NOSUID                              = 0x8
-	MNT_NOUSERXATTR                         = 0x1000000
-	MNT_NOWAIT                              = 0x2
-	MNT_QUARANTINE                          = 0x400
-	MNT_QUOTA                               = 0x2000
-	MNT_RDONLY                              = 0x1
-	MNT_RELOAD                              = 0x40000
-	MNT_REMOVABLE                           = 0x200
-	MNT_ROOTFS                              = 0x4000
-	MNT_SNAPSHOT                            = 0x40000000
-	MNT_STRICTATIME                         = 0x80000000
-	MNT_SYNCHRONOUS                         = 0x2
-	MNT_UNION                               = 0x20
-	MNT_UNKNOWNPERMISSIONS                  = 0x200000
-	MNT_UPDATE                              = 0x10000
-	MNT_VISFLAGMASK                         = 0xd7f0f7ff
-	MNT_WAIT                                = 0x1
-	MSG_CTRUNC                              = 0x20
-	MSG_DONTROUTE                           = 0x4
-	MSG_DONTWAIT                            = 0x80
-	MSG_EOF                                 = 0x100
-	MSG_EOR                                 = 0x8
-	MSG_FLUSH                               = 0x400
-	MSG_HAVEMORE                            = 0x2000
-	MSG_HOLD                                = 0x800
-	MSG_NEEDSA                              = 0x10000
-	MSG_NOSIGNAL                            = 0x80000
-	MSG_OOB                                 = 0x1
-	MSG_PEEK                                = 0x2
-	MSG_RCVMORE                             = 0x4000
-	MSG_SEND                                = 0x1000
-	MSG_TRUNC                               = 0x10
-	MSG_WAITALL                             = 0x40
-	MSG_WAITSTREAM                          = 0x200
-	MS_ASYNC                                = 0x1
-	MS_DEACTIVATE                           = 0x8
-	MS_INVALIDATE                           = 0x2
-	MS_KILLPAGES                            = 0x4
-	MS_SYNC                                 = 0x10
-	NAME_MAX                                = 0xff
-	NET_RT_DUMP                             = 0x1
-	NET_RT_DUMP2                            = 0x7
-	NET_RT_FLAGS                            = 0x2
-	NET_RT_FLAGS_PRIV                       = 0xa
-	NET_RT_IFLIST                           = 0x3
-	NET_RT_IFLIST2                          = 0x6
-	NET_RT_MAXID                            = 0xb
-	NET_RT_STAT                             = 0x4
-	NET_RT_TRASH                            = 0x5
-	NFDBITS                                 = 0x20
-	NL0                                     = 0x0
-	NL1                                     = 0x100
-	NL2                                     = 0x200
-	NL3                                     = 0x300
-	NLDLY                                   = 0x300
-	NOFLSH                                  = 0x80000000
-	NOKERNINFO                              = 0x2000000
-	NOTE_ABSOLUTE                           = 0x8
-	NOTE_ATTRIB                             = 0x8
-	NOTE_BACKGROUND                         = 0x40
-	NOTE_CHILD                              = 0x4
-	NOTE_CRITICAL                           = 0x20
-	NOTE_DELETE                             = 0x1
-	NOTE_EXEC                               = 0x20000000
-	NOTE_EXIT                               = 0x80000000
-	NOTE_EXITSTATUS                         = 0x4000000
-	NOTE_EXIT_CSERROR                       = 0x40000
-	NOTE_EXIT_DECRYPTFAIL                   = 0x10000
-	NOTE_EXIT_DETAIL                        = 0x2000000
-	NOTE_EXIT_DETAIL_MASK                   = 0x70000
-	NOTE_EXIT_MEMORY                        = 0x20000
-	NOTE_EXIT_REPARENTED                    = 0x80000
-	NOTE_EXTEND                             = 0x4
-	NOTE_FFAND                              = 0x40000000
-	NOTE_FFCOPY                             = 0xc0000000
-	NOTE_FFCTRLMASK                         = 0xc0000000
-	NOTE_FFLAGSMASK                         = 0xffffff
-	NOTE_FFNOP                              = 0x0
-	NOTE_FFOR                               = 0x80000000
-	NOTE_FORK                               = 0x40000000
-	NOTE_FUNLOCK                            = 0x100
-	NOTE_LEEWAY                             = 0x10
-	NOTE_LINK                               = 0x10
-	NOTE_LOWAT                              = 0x1
-	NOTE_MACHTIME                           = 0x100
-	NOTE_MACH_CONTINUOUS_TIME               = 0x80
-	NOTE_NONE                               = 0x80
-	NOTE_NSECONDS                           = 0x4
-	NOTE_OOB                                = 0x2
-	NOTE_PCTRLMASK                          = -0x100000
-	NOTE_PDATAMASK                          = 0xfffff
-	NOTE_REAP                               = 0x10000000
-	NOTE_RENAME                             = 0x20
-	NOTE_REVOKE                             = 0x40
-	NOTE_SECONDS                            = 0x1
-	NOTE_SIGNAL                             = 0x8000000
-	NOTE_TRACK                              = 0x1
-	NOTE_TRACKERR                           = 0x2
-	NOTE_TRIGGER                            = 0x1000000
-	NOTE_USECONDS                           = 0x2
-	NOTE_VM_ERROR                           = 0x10000000
-	NOTE_VM_PRESSURE                        = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE       = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE              = 0x40000000
-	NOTE_WRITE                              = 0x2
-	OCRNL                                   = 0x10
-	OFDEL                                   = 0x20000
-	OFILL                                   = 0x80
-	ONLCR                                   = 0x2
-	ONLRET                                  = 0x40
-	ONOCR                                   = 0x20
-	ONOEOT                                  = 0x8
-	OPOST                                   = 0x1
-	OXTABS                                  = 0x4
-	O_ACCMODE                               = 0x3
-	O_ALERT                                 = 0x20000000
-	O_APPEND                                = 0x8
-	O_ASYNC                                 = 0x40
-	O_CLOEXEC                               = 0x1000000
-	O_CREAT                                 = 0x200
-	O_DIRECTORY                             = 0x100000
-	O_DP_GETRAWENCRYPTED                    = 0x1
-	O_DP_GETRAWUNENCRYPTED                  = 0x2
-	O_DSYNC                                 = 0x400000
-	O_EVTONLY                               = 0x8000
-	O_EXCL                                  = 0x800
-	O_EXLOCK                                = 0x20
-	O_FSYNC                                 = 0x80
-	O_NDELAY                                = 0x4
-	O_NOCTTY                                = 0x20000
-	O_NOFOLLOW                              = 0x100
-	O_NOFOLLOW_ANY                          = 0x20000000
-	O_NONBLOCK                              = 0x4
-	O_POPUP                                 = 0x80000000
-	O_RDONLY                                = 0x0
-	O_RDWR                                  = 0x2
-	O_SHLOCK                                = 0x10
-	O_SYMLINK                               = 0x200000
-	O_SYNC                                  = 0x80
-	O_TRUNC                                 = 0x400
-	O_WRONLY                                = 0x1
-	PARENB                                  = 0x1000
-	PARMRK                                  = 0x8
-	PARODD                                  = 0x2000
-	PENDIN                                  = 0x20000000
-	PRIO_PGRP                               = 0x1
-	PRIO_PROCESS                            = 0x0
-	PRIO_USER                               = 0x2
-	PROT_EXEC                               = 0x4
-	PROT_NONE                               = 0x0
-	PROT_READ                               = 0x1
-	PROT_WRITE                              = 0x2
-	PT_ATTACH                               = 0xa
-	PT_ATTACHEXC                            = 0xe
-	PT_CONTINUE                             = 0x7
-	PT_DENY_ATTACH                          = 0x1f
-	PT_DETACH                               = 0xb
-	PT_FIRSTMACH                            = 0x20
-	PT_FORCEQUOTA                           = 0x1e
-	PT_KILL                                 = 0x8
-	PT_READ_D                               = 0x2
-	PT_READ_I                               = 0x1
-	PT_READ_U                               = 0x3
-	PT_SIGEXC                               = 0xc
-	PT_STEP                                 = 0x9
-	PT_THUPDATE                             = 0xd
-	PT_TRACE_ME                             = 0x0
-	PT_WRITE_D                              = 0x5
-	PT_WRITE_I                              = 0x4
-	PT_WRITE_U                              = 0x6
-	RENAME_EXCL                             = 0x4
-	RENAME_NOFOLLOW_ANY                     = 0x10
-	RENAME_RESERVED1                        = 0x8
-	RENAME_SECLUDE                          = 0x1
-	RENAME_SWAP                             = 0x2
-	RLIMIT_AS                               = 0x5
-	RLIMIT_CORE                             = 0x4
-	RLIMIT_CPU                              = 0x0
-	RLIMIT_CPU_USAGE_MONITOR                = 0x2
-	RLIMIT_DATA                             = 0x2
-	RLIMIT_FSIZE                            = 0x1
-	RLIMIT_MEMLOCK                          = 0x6
-	RLIMIT_NOFILE                           = 0x8
-	RLIMIT_NPROC                            = 0x7
-	RLIMIT_RSS                              = 0x5
-	RLIMIT_STACK                            = 0x3
-	RLIM_INFINITY                           = 0x7fffffffffffffff
-	RTAX_AUTHOR                             = 0x6
-	RTAX_BRD                                = 0x7
-	RTAX_DST                                = 0x0
-	RTAX_GATEWAY                            = 0x1
-	RTAX_GENMASK                            = 0x3
-	RTAX_IFA                                = 0x5
-	RTAX_IFP                                = 0x4
-	RTAX_MAX                                = 0x8
-	RTAX_NETMASK                            = 0x2
-	RTA_AUTHOR                              = 0x40
-	RTA_BRD                                 = 0x80
-	RTA_DST                                 = 0x1
-	RTA_GATEWAY                             = 0x2
-	RTA_GENMASK                             = 0x8
-	RTA_IFA                                 = 0x20
-	RTA_IFP                                 = 0x10
-	RTA_NETMASK                             = 0x4
-	RTF_BLACKHOLE                           = 0x1000
-	RTF_BROADCAST                           = 0x400000
-	RTF_CLONING                             = 0x100
-	RTF_CONDEMNED                           = 0x2000000
-	RTF_DEAD                                = 0x20000000
-	RTF_DELCLONE                            = 0x80
-	RTF_DONE                                = 0x40
-	RTF_DYNAMIC                             = 0x10
-	RTF_GATEWAY                             = 0x2
-	RTF_GLOBAL                              = 0x40000000
-	RTF_HOST                                = 0x4
-	RTF_IFREF                               = 0x4000000
-	RTF_IFSCOPE                             = 0x1000000
-	RTF_LLDATA                              = 0x400
-	RTF_LLINFO                              = 0x400
-	RTF_LOCAL                               = 0x200000
-	RTF_MODIFIED                            = 0x20
-	RTF_MULTICAST                           = 0x800000
-	RTF_NOIFREF                             = 0x2000
-	RTF_PINNED                              = 0x100000
-	RTF_PRCLONING                           = 0x10000
-	RTF_PROTO1                              = 0x8000
-	RTF_PROTO2                              = 0x4000
-	RTF_PROTO3                              = 0x40000
-	RTF_PROXY                               = 0x8000000
-	RTF_REJECT                              = 0x8
-	RTF_ROUTER                              = 0x10000000
-	RTF_STATIC                              = 0x800
-	RTF_UP                                  = 0x1
-	RTF_WASCLONED                           = 0x20000
-	RTF_XRESOLVE                            = 0x200
-	RTM_ADD                                 = 0x1
-	RTM_CHANGE                              = 0x3
-	RTM_DELADDR                             = 0xd
-	RTM_DELETE                              = 0x2
-	RTM_DELMADDR                            = 0x10
-	RTM_GET                                 = 0x4
-	RTM_GET2                                = 0x14
-	RTM_IFINFO                              = 0xe
-	RTM_IFINFO2                             = 0x12
-	RTM_LOCK                                = 0x8
-	RTM_LOSING                              = 0x5
-	RTM_MISS                                = 0x7
-	RTM_NEWADDR                             = 0xc
-	RTM_NEWMADDR                            = 0xf
-	RTM_NEWMADDR2                           = 0x13
-	RTM_OLDADD                              = 0x9
-	RTM_OLDDEL                              = 0xa
-	RTM_REDIRECT                            = 0x6
-	RTM_RESOLVE                             = 0xb
-	RTM_RTTUNIT                             = 0xf4240
-	RTM_VERSION                             = 0x5
-	RTV_EXPIRE                              = 0x4
-	RTV_HOPCOUNT                            = 0x2
-	RTV_MTU                                 = 0x1
-	RTV_RPIPE                               = 0x8
-	RTV_RTT                                 = 0x40
-	RTV_RTTVAR                              = 0x80
-	RTV_SPIPE                               = 0x10
-	RTV_SSTHRESH                            = 0x20
-	RUSAGE_CHILDREN                         = -0x1
-	RUSAGE_SELF                             = 0x0
-	SAE_ASSOCID_ALL                         = 0xffffffff
-	SAE_ASSOCID_ANY                         = 0x0
-	SAE_CONNID_ALL                          = 0xffffffff
-	SAE_CONNID_ANY                          = 0x0
-	SCM_CREDS                               = 0x3
-	SCM_RIGHTS                              = 0x1
-	SCM_TIMESTAMP                           = 0x2
-	SCM_TIMESTAMP_MONOTONIC                 = 0x4
-	SEEK_CUR                                = 0x1
-	SEEK_DATA                               = 0x4
-	SEEK_END                                = 0x2
-	SEEK_HOLE                               = 0x3
-	SEEK_SET                                = 0x0
-	SF_APPEND                               = 0x40000
-	SF_ARCHIVED                             = 0x10000
-	SF_DATALESS                             = 0x40000000
-	SF_FIRMLINK                             = 0x800000
-	SF_IMMUTABLE                            = 0x20000
-	SF_NOUNLINK                             = 0x100000
-	SF_RESTRICTED                           = 0x80000
-	SF_SETTABLE                             = 0x3fff0000
-	SF_SUPPORTED                            = 0x9f0000
-	SF_SYNTHETIC                            = 0xc0000000
-	SHUT_RD                                 = 0x0
-	SHUT_RDWR                               = 0x2
-	SHUT_WR                                 = 0x1
-	SIOCADDMULTI                            = 0x80206931
-	SIOCAIFADDR                             = 0x8040691a
-	SIOCARPIPLL                             = 0xc0206928
-	SIOCATMARK                              = 0x40047307
-	SIOCAUTOADDR                            = 0xc0206926
-	SIOCAUTONETMASK                         = 0x80206927
-	SIOCDELMULTI                            = 0x80206932
-	SIOCDIFADDR                             = 0x80206919
-	SIOCDIFPHYADDR                          = 0x80206941
-	SIOCGDRVSPEC                            = 0xc028697b
-	SIOCGETVLAN                             = 0xc020697f
-	SIOCGHIWAT                              = 0x40047301
-	SIOCGIF6LOWPAN                          = 0xc02069c5
-	SIOCGIFADDR                             = 0xc0206921
-	SIOCGIFALTMTU                           = 0xc0206948
-	SIOCGIFASYNCMAP                         = 0xc020697c
-	SIOCGIFBOND                             = 0xc0206947
-	SIOCGIFBRDADDR                          = 0xc0206923
-	SIOCGIFCAP                              = 0xc020695b
-	SIOCGIFCONF                             = 0xc00c6924
-	SIOCGIFDEVMTU                           = 0xc0206944
-	SIOCGIFDSTADDR                          = 0xc0206922
-	SIOCGIFFLAGS                            = 0xc0206911
-	SIOCGIFFUNCTIONALTYPE                   = 0xc02069ad
-	SIOCGIFGENERIC                          = 0xc020693a
-	SIOCGIFKPI                              = 0xc0206987
-	SIOCGIFMAC                              = 0xc0206982
-	SIOCGIFMEDIA                            = 0xc02c6938
-	SIOCGIFMETRIC                           = 0xc0206917
-	SIOCGIFMTU                              = 0xc0206933
-	SIOCGIFNETMASK                          = 0xc0206925
-	SIOCGIFPDSTADDR                         = 0xc0206940
-	SIOCGIFPHYS                             = 0xc0206935
-	SIOCGIFPSRCADDR                         = 0xc020693f
-	SIOCGIFSTATUS                           = 0xc331693d
-	SIOCGIFVLAN                             = 0xc020697f
-	SIOCGIFWAKEFLAGS                        = 0xc0206988
-	SIOCGIFXMEDIA                           = 0xc02c6948
-	SIOCGLOWAT                              = 0x40047303
-	SIOCGPGRP                               = 0x40047309
-	SIOCIFCREATE                            = 0xc0206978
-	SIOCIFCREATE2                           = 0xc020697a
-	SIOCIFDESTROY                           = 0x80206979
-	SIOCIFGCLONERS                          = 0xc0106981
-	SIOCRSLVMULTI                           = 0xc010693b
-	SIOCSDRVSPEC                            = 0x8028697b
-	SIOCSETVLAN                             = 0x8020697e
-	SIOCSHIWAT                              = 0x80047300
-	SIOCSIF6LOWPAN                          = 0x802069c4
-	SIOCSIFADDR                             = 0x8020690c
-	SIOCSIFALTMTU                           = 0x80206945
-	SIOCSIFASYNCMAP                         = 0x8020697d
-	SIOCSIFBOND                             = 0x80206946
-	SIOCSIFBRDADDR                          = 0x80206913
-	SIOCSIFCAP                              = 0x8020695a
-	SIOCSIFDSTADDR                          = 0x8020690e
-	SIOCSIFFLAGS                            = 0x80206910
-	SIOCSIFGENERIC                          = 0x80206939
-	SIOCSIFKPI                              = 0x80206986
-	SIOCSIFLLADDR                           = 0x8020693c
-	SIOCSIFMAC                              = 0x80206983
-	SIOCSIFMEDIA                            = 0xc0206937
-	SIOCSIFMETRIC                           = 0x80206918
-	SIOCSIFMTU                              = 0x80206934
-	SIOCSIFNETMASK                          = 0x80206916
-	SIOCSIFPHYADDR                          = 0x8040693e
-	SIOCSIFPHYS                             = 0x80206936
-	SIOCSIFVLAN                             = 0x8020697e
-	SIOCSLOWAT                              = 0x80047302
-	SIOCSPGRP                               = 0x80047308
-	SOCK_DGRAM                              = 0x2
-	SOCK_MAXADDRLEN                         = 0xff
-	SOCK_RAW                                = 0x3
-	SOCK_RDM                                = 0x4
-	SOCK_SEQPACKET                          = 0x5
-	SOCK_STREAM                             = 0x1
-	SOL_LOCAL                               = 0x0
-	SOL_SOCKET                              = 0xffff
-	SOMAXCONN                               = 0x80
-	SO_ACCEPTCONN                           = 0x2
-	SO_BROADCAST                            = 0x20
-	SO_DEBUG                                = 0x1
-	SO_DONTROUTE                            = 0x10
-	SO_DONTTRUNC                            = 0x2000
-	SO_ERROR                                = 0x1007
-	SO_KEEPALIVE                            = 0x8
-	SO_LABEL                                = 0x1010
-	SO_LINGER                               = 0x80
-	SO_LINGER_SEC                           = 0x1080
-	SO_NETSVC_MARKING_LEVEL                 = 0x1119
-	SO_NET_SERVICE_TYPE                     = 0x1116
-	SO_NKE                                  = 0x1021
-	SO_NOADDRERR                            = 0x1023
-	SO_NOSIGPIPE                            = 0x1022
-	SO_NOTIFYCONFLICT                       = 0x1026
-	SO_NP_EXTENSIONS                        = 0x1083
-	SO_NREAD                                = 0x1020
-	SO_NUMRCVPKT                            = 0x1112
-	SO_NWRITE                               = 0x1024
-	SO_OOBINLINE                            = 0x100
-	SO_PEERLABEL                            = 0x1011
-	SO_RANDOMPORT                           = 0x1082
-	SO_RCVBUF                               = 0x1002
-	SO_RCVLOWAT                             = 0x1004
-	SO_RCVTIMEO                             = 0x1006
-	SO_REUSEADDR                            = 0x4
-	SO_REUSEPORT                            = 0x200
-	SO_REUSESHAREUID                        = 0x1025
-	SO_SNDBUF                               = 0x1001
-	SO_SNDLOWAT                             = 0x1003
-	SO_SNDTIMEO                             = 0x1005
-	SO_TIMESTAMP                            = 0x400
-	SO_TIMESTAMP_MONOTONIC                  = 0x800
-	SO_TRACKER_ATTRIBUTE_FLAGS_APP_APPROVED = 0x1
-	SO_TRACKER_ATTRIBUTE_FLAGS_DOMAIN_SHORT = 0x4
-	SO_TRACKER_ATTRIBUTE_FLAGS_TRACKER      = 0x2
-	SO_TRACKER_TRANSPARENCY_VERSION         = 0x3
-	SO_TYPE                                 = 0x1008
-	SO_UPCALLCLOSEWAIT                      = 0x1027
-	SO_USELOOPBACK                          = 0x40
-	SO_WANTMORE                             = 0x4000
-	SO_WANTOOBFLAG                          = 0x8000
-	S_IEXEC                                 = 0x40
-	S_IFBLK                                 = 0x6000
-	S_IFCHR                                 = 0x2000
-	S_IFDIR                                 = 0x4000
-	S_IFIFO                                 = 0x1000
-	S_IFLNK                                 = 0xa000
-	S_IFMT                                  = 0xf000
-	S_IFREG                                 = 0x8000
-	S_IFSOCK                                = 0xc000
-	S_IFWHT                                 = 0xe000
-	S_IREAD                                 = 0x100
-	S_IRGRP                                 = 0x20
-	S_IROTH                                 = 0x4
-	S_IRUSR                                 = 0x100
-	S_IRWXG                                 = 0x38
-	S_IRWXO                                 = 0x7
-	S_IRWXU                                 = 0x1c0
-	S_ISGID                                 = 0x400
-	S_ISTXT                                 = 0x200
-	S_ISUID                                 = 0x800
-	S_ISVTX                                 = 0x200
-	S_IWGRP                                 = 0x10
-	S_IWOTH                                 = 0x2
-	S_IWRITE                                = 0x80
-	S_IWUSR                                 = 0x80
-	S_IXGRP                                 = 0x8
-	S_IXOTH                                 = 0x1
-	S_IXUSR                                 = 0x40
-	TAB0                                    = 0x0
-	TAB1                                    = 0x400
-	TAB2                                    = 0x800
-	TAB3                                    = 0x4
-	TABDLY                                  = 0xc04
-	TCIFLUSH                                = 0x1
-	TCIOFF                                  = 0x3
-	TCIOFLUSH                               = 0x3
-	TCION                                   = 0x4
-	TCOFLUSH                                = 0x2
-	TCOOFF                                  = 0x1
-	TCOON                                   = 0x2
-	TCPOPT_CC                               = 0xb
-	TCPOPT_CCECHO                           = 0xd
-	TCPOPT_CCNEW                            = 0xc
-	TCPOPT_EOL                              = 0x0
-	TCPOPT_FASTOPEN                         = 0x22
-	TCPOPT_MAXSEG                           = 0x2
-	TCPOPT_NOP                              = 0x1
-	TCPOPT_SACK                             = 0x5
-	TCPOPT_SACK_HDR                         = 0x1010500
-	TCPOPT_SACK_PERMITTED                   = 0x4
-	TCPOPT_SACK_PERMIT_HDR                  = 0x1010402
-	TCPOPT_SIGNATURE                        = 0x13
-	TCPOPT_TIMESTAMP                        = 0x8
-	TCPOPT_TSTAMP_HDR                       = 0x101080a
-	TCPOPT_WINDOW                           = 0x3
-	TCP_CONNECTIONTIMEOUT                   = 0x20
-	TCP_CONNECTION_INFO                     = 0x106
-	TCP_ENABLE_ECN                          = 0x104
-	TCP_FASTOPEN                            = 0x105
-	TCP_KEEPALIVE                           = 0x10
-	TCP_KEEPCNT                             = 0x102
-	TCP_KEEPINTVL                           = 0x101
-	TCP_MAXHLEN                             = 0x3c
-	TCP_MAXOLEN                             = 0x28
-	TCP_MAXSEG                              = 0x2
-	TCP_MAXWIN                              = 0xffff
-	TCP_MAX_SACK                            = 0x4
-	TCP_MAX_WINSHIFT                        = 0xe
-	TCP_MINMSS                              = 0xd8
-	TCP_MSS                                 = 0x200
-	TCP_NODELAY                             = 0x1
-	TCP_NOOPT                               = 0x8
-	TCP_NOPUSH                              = 0x4
-	TCP_NOTSENT_LOWAT                       = 0x201
-	TCP_RXT_CONNDROPTIME                    = 0x80
-	TCP_RXT_FINDROP                         = 0x100
-	TCP_SENDMOREACKS                        = 0x103
-	TCSAFLUSH                               = 0x2
-	TIOCCBRK                                = 0x2000747a
-	TIOCCDTR                                = 0x20007478
-	TIOCCONS                                = 0x80047462
-	TIOCDCDTIMESTAMP                        = 0x40107458
-	TIOCDRAIN                               = 0x2000745e
-	TIOCDSIMICROCODE                        = 0x20007455
-	TIOCEXCL                                = 0x2000740d
-	TIOCEXT                                 = 0x80047460
-	TIOCFLUSH                               = 0x80047410
-	TIOCGDRAINWAIT                          = 0x40047456
-	TIOCGETA                                = 0x40487413
-	TIOCGETD                                = 0x4004741a
-	TIOCGPGRP                               = 0x40047477
-	TIOCGWINSZ                              = 0x40087468
-	TIOCIXOFF                               = 0x20007480
-	TIOCIXON                                = 0x20007481
-	TIOCMBIC                                = 0x8004746b
-	TIOCMBIS                                = 0x8004746c
-	TIOCMGDTRWAIT                           = 0x4004745a
-	TIOCMGET                                = 0x4004746a
-	TIOCMODG                                = 0x40047403
-	TIOCMODS                                = 0x80047404
-	TIOCMSDTRWAIT                           = 0x8004745b
-	TIOCMSET                                = 0x8004746d
-	TIOCM_CAR                               = 0x40
-	TIOCM_CD                                = 0x40
-	TIOCM_CTS                               = 0x20
-	TIOCM_DSR                               = 0x100
-	TIOCM_DTR                               = 0x2
-	TIOCM_LE                                = 0x1
-	TIOCM_RI                                = 0x80
-	TIOCM_RNG                               = 0x80
-	TIOCM_RTS                               = 0x4
-	TIOCM_SR                                = 0x10
-	TIOCM_ST                                = 0x8
-	TIOCNOTTY                               = 0x20007471
-	TIOCNXCL                                = 0x2000740e
-	TIOCOUTQ                                = 0x40047473
-	TIOCPKT                                 = 0x80047470
-	TIOCPKT_DATA                            = 0x0
-	TIOCPKT_DOSTOP                          = 0x20
-	TIOCPKT_FLUSHREAD                       = 0x1
-	TIOCPKT_FLUSHWRITE                      = 0x2
-	TIOCPKT_IOCTL                           = 0x40
-	TIOCPKT_NOSTOP                          = 0x10
-	TIOCPKT_START                           = 0x8
-	TIOCPKT_STOP                            = 0x4
-	TIOCPTYGNAME                            = 0x40807453
-	TIOCPTYGRANT                            = 0x20007454
-	TIOCPTYUNLK                             = 0x20007452
-	TIOCREMOTE                              = 0x80047469
-	TIOCSBRK                                = 0x2000747b
-	TIOCSCONS                               = 0x20007463
-	TIOCSCTTY                               = 0x20007461
-	TIOCSDRAINWAIT                          = 0x80047457
-	TIOCSDTR                                = 0x20007479
-	TIOCSETA                                = 0x80487414
-	TIOCSETAF                               = 0x80487416
-	TIOCSETAW                               = 0x80487415
-	TIOCSETD                                = 0x8004741b
-	TIOCSIG                                 = 0x2000745f
-	TIOCSPGRP                               = 0x80047476
-	TIOCSTART                               = 0x2000746e
-	TIOCSTAT                                = 0x20007465
-	TIOCSTI                                 = 0x80017472
-	TIOCSTOP                                = 0x2000746f
-	TIOCSWINSZ                              = 0x80087467
-	TIOCTIMESTAMP                           = 0x40107459
-	TIOCUCNTL                               = 0x80047466
-	TOSTOP                                  = 0x400000
-	UF_APPEND                               = 0x4
-	UF_COMPRESSED                           = 0x20
-	UF_DATAVAULT                            = 0x80
-	UF_HIDDEN                               = 0x8000
-	UF_IMMUTABLE                            = 0x2
-	UF_NODUMP                               = 0x1
-	UF_OPAQUE                               = 0x8
-	UF_SETTABLE                             = 0xffff
-	UF_TRACKED                              = 0x40
-	VDISCARD                                = 0xf
-	VDSUSP                                  = 0xb
-	VEOF                                    = 0x0
-	VEOL                                    = 0x1
-	VEOL2                                   = 0x2
-	VERASE                                  = 0x3
-	VINTR                                   = 0x8
-	VKILL                                   = 0x5
-	VLNEXT                                  = 0xe
-	VMADDR_CID_ANY                          = 0xffffffff
-	VMADDR_CID_HOST                         = 0x2
-	VMADDR_CID_HYPERVISOR                   = 0x0
-	VMADDR_CID_RESERVED                     = 0x1
-	VMADDR_PORT_ANY                         = 0xffffffff
-	VMIN                                    = 0x10
-	VM_LOADAVG                              = 0x2
-	VM_MACHFACTOR                           = 0x4
-	VM_MAXID                                = 0x6
-	VM_METER                                = 0x1
-	VM_SWAPUSAGE                            = 0x5
-	VQUIT                                   = 0x9
-	VREPRINT                                = 0x6
-	VSTART                                  = 0xc
-	VSTATUS                                 = 0x12
-	VSTOP                                   = 0xd
-	VSUSP                                   = 0xa
-	VT0                                     = 0x0
-	VT1                                     = 0x10000
-	VTDLY                                   = 0x10000
-	VTIME                                   = 0x11
-	VWERASE                                 = 0x4
-	WCONTINUED                              = 0x10
-	WCOREFLAG                               = 0x80
-	WEXITED                                 = 0x4
-	WNOHANG                                 = 0x1
-	WNOWAIT                                 = 0x20
-	WORDSIZE                                = 0x40
-	WSTOPPED                                = 0x8
-	WUNTRACED                               = 0x2
-	XATTR_CREATE                            = 0x2
-	XATTR_NODEFAULT                         = 0x10
-	XATTR_NOFOLLOW                          = 0x1
-	XATTR_NOSECURITY                        = 0x8
-	XATTR_REPLACE                           = 0x4
-	XATTR_SHOWCOMPRESSION                   = 0x20
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x29
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_SYS_CONTROL                    = 0x2
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	AF_VSOCK                          = 0x28
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x51c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CLONE_NOFOLLOW                    = 0x1
+	CLONE_NOOWNERCOPY                 = 0x2
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTLIOCGINFO                       = 0xc0644e03
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0x10a
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_DARWIN                    = 0x10a
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x11
+	EVFILT_THREADMARKER               = 0x11
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	FSOPT_RETURN_REALDEV              = 0x200
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_INFO                = 0x67
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDFILESUPPL                    = 0x68
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPATH_NOFIRMLINK              = 0x66
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GETSIGSINFO                     = 0x69
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_SPECULATIVE_READ                = 0x65
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_6LOWPAN                       = 0x40
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_3542DSTOPTS                  = 0x32
+	IPV6_3542HOPLIMIT                 = 0x2f
+	IPV6_3542HOPOPTS                  = 0x31
+	IPV6_3542NEXTHOP                  = 0x30
+	IPV6_3542PKTINFO                  = 0x2e
+	IPV6_3542RTHDR                    = 0x33
+	IPV6_ADDR_MC_FLAGS_PREFIX         = 0x20
+	IPV6_ADDR_MC_FLAGS_TRANSIENT      = 0x10
+	IPV6_ADDR_MC_FLAGS_UNICAST_BASED  = 0x30
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x3000
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x3d
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x39
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DONTFRAG                       = 0x1c
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCAL_PEERCRED                    = 0x1
+	LOCAL_PEEREPID                    = 0x3
+	LOCAL_PEEREUUID                   = 0x5
+	LOCAL_PEERPID                     = 0x2
+	LOCAL_PEERTOKEN                   = 0x6
+	LOCAL_PEERUUID                    = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_32BIT                         = 0x8000
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MAP_TRANSLATED_ALLOW_EXECUTE      = 0x20000
+	MAP_UNIX03                        = 0x40000
+	MCAST_BLOCK_SOURCE                = 0x54
+	MCAST_EXCLUDE                     = 0x2
+	MCAST_INCLUDE                     = 0x1
+	MCAST_JOIN_GROUP                  = 0x50
+	MCAST_JOIN_SOURCE_GROUP           = 0x52
+	MCAST_LEAVE_GROUP                 = 0x51
+	MCAST_LEAVE_SOURCE_GROUP          = 0x53
+	MCAST_UNBLOCK_SOURCE              = 0x55
+	MCAST_UNDEFINED                   = 0x0
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_EXT_ROOT_DATA_VOL             = 0x1
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_REMOVABLE                     = 0x200
+	MNT_ROOTFS                        = 0x4000
+	MNT_SNAPSHOT                      = 0x40000000
+	MNT_STRICTATIME                   = 0x80000000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0xd7f0f7ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_NOSIGNAL                      = 0x80000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_FLAGS_PRIV                 = 0xa
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xb
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NFDBITS                           = 0x20
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACHTIME                     = 0x100
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NOFOLLOW_ANY                    = 0x20000000
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DEAD                          = 0x20000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_GLOBAL                        = 0x40000000
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLDATA                        = 0x400
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SEEK_CUR                          = 0x1
+	SEEK_DATA                         = 0x4
+	SEEK_END                          = 0x2
+	SEEK_HOLE                         = 0x3
+	SEEK_SET                          = 0x0
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIF6LOWPAN                    = 0xc02069c5
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFFUNCTIONALTYPE             = 0xc02069ad
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGIFXMEDIA                     = 0xc02c6948
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIF6LOWPAN                    = 0x802069c4
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_LOCAL                         = 0x0
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
 )
 
 // Errors
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
index 4a55a40..31009d7 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && darwin
+// +build arm64,darwin
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -11,1613 +12,1556 @@ package unix
 import "syscall"
 
 const (
-	AF_APPLETALK                            = 0x10
-	AF_CCITT                                = 0xa
-	AF_CHAOS                                = 0x5
-	AF_CNT                                  = 0x15
-	AF_COIP                                 = 0x14
-	AF_DATAKIT                              = 0x9
-	AF_DECnet                               = 0xc
-	AF_DLI                                  = 0xd
-	AF_E164                                 = 0x1c
-	AF_ECMA                                 = 0x8
-	AF_HYLINK                               = 0xf
-	AF_IEEE80211                            = 0x25
-	AF_IMPLINK                              = 0x3
-	AF_INET                                 = 0x2
-	AF_INET6                                = 0x1e
-	AF_IPX                                  = 0x17
-	AF_ISDN                                 = 0x1c
-	AF_ISO                                  = 0x7
-	AF_LAT                                  = 0xe
-	AF_LINK                                 = 0x12
-	AF_LOCAL                                = 0x1
-	AF_MAX                                  = 0x29
-	AF_NATM                                 = 0x1f
-	AF_NDRV                                 = 0x1b
-	AF_NETBIOS                              = 0x21
-	AF_NS                                   = 0x6
-	AF_OSI                                  = 0x7
-	AF_PPP                                  = 0x22
-	AF_PUP                                  = 0x4
-	AF_RESERVED_36                          = 0x24
-	AF_ROUTE                                = 0x11
-	AF_SIP                                  = 0x18
-	AF_SNA                                  = 0xb
-	AF_SYSTEM                               = 0x20
-	AF_SYS_CONTROL                          = 0x2
-	AF_UNIX                                 = 0x1
-	AF_UNSPEC                               = 0x0
-	AF_UTUN                                 = 0x26
-	AF_VSOCK                                = 0x28
-	ALTWERASE                               = 0x200
-	ATTR_BIT_MAP_COUNT                      = 0x5
-	ATTR_CMN_ACCESSMASK                     = 0x20000
-	ATTR_CMN_ACCTIME                        = 0x1000
-	ATTR_CMN_ADDEDTIME                      = 0x10000000
-	ATTR_CMN_BKUPTIME                       = 0x2000
-	ATTR_CMN_CHGTIME                        = 0x800
-	ATTR_CMN_CRTIME                         = 0x200
-	ATTR_CMN_DATA_PROTECT_FLAGS             = 0x40000000
-	ATTR_CMN_DEVID                          = 0x2
-	ATTR_CMN_DOCUMENT_ID                    = 0x100000
-	ATTR_CMN_ERROR                          = 0x20000000
-	ATTR_CMN_EXTENDED_SECURITY              = 0x400000
-	ATTR_CMN_FILEID                         = 0x2000000
-	ATTR_CMN_FLAGS                          = 0x40000
-	ATTR_CMN_FNDRINFO                       = 0x4000
-	ATTR_CMN_FSID                           = 0x4
-	ATTR_CMN_FULLPATH                       = 0x8000000
-	ATTR_CMN_GEN_COUNT                      = 0x80000
-	ATTR_CMN_GRPID                          = 0x10000
-	ATTR_CMN_GRPUUID                        = 0x1000000
-	ATTR_CMN_MODTIME                        = 0x400
-	ATTR_CMN_NAME                           = 0x1
-	ATTR_CMN_NAMEDATTRCOUNT                 = 0x80000
-	ATTR_CMN_NAMEDATTRLIST                  = 0x100000
-	ATTR_CMN_OBJID                          = 0x20
-	ATTR_CMN_OBJPERMANENTID                 = 0x40
-	ATTR_CMN_OBJTAG                         = 0x10
-	ATTR_CMN_OBJTYPE                        = 0x8
-	ATTR_CMN_OWNERID                        = 0x8000
-	ATTR_CMN_PARENTID                       = 0x4000000
-	ATTR_CMN_PAROBJID                       = 0x80
-	ATTR_CMN_RETURNED_ATTRS                 = 0x80000000
-	ATTR_CMN_SCRIPT                         = 0x100
-	ATTR_CMN_SETMASK                        = 0x51c7ff00
-	ATTR_CMN_USERACCESS                     = 0x200000
-	ATTR_CMN_UUID                           = 0x800000
-	ATTR_CMN_VALIDMASK                      = 0xffffffff
-	ATTR_CMN_VOLSETMASK                     = 0x6700
-	ATTR_FILE_ALLOCSIZE                     = 0x4
-	ATTR_FILE_CLUMPSIZE                     = 0x10
-	ATTR_FILE_DATAALLOCSIZE                 = 0x400
-	ATTR_FILE_DATAEXTENTS                   = 0x800
-	ATTR_FILE_DATALENGTH                    = 0x200
-	ATTR_FILE_DEVTYPE                       = 0x20
-	ATTR_FILE_FILETYPE                      = 0x40
-	ATTR_FILE_FORKCOUNT                     = 0x80
-	ATTR_FILE_FORKLIST                      = 0x100
-	ATTR_FILE_IOBLOCKSIZE                   = 0x8
-	ATTR_FILE_LINKCOUNT                     = 0x1
-	ATTR_FILE_RSRCALLOCSIZE                 = 0x2000
-	ATTR_FILE_RSRCEXTENTS                   = 0x4000
-	ATTR_FILE_RSRCLENGTH                    = 0x1000
-	ATTR_FILE_SETMASK                       = 0x20
-	ATTR_FILE_TOTALSIZE                     = 0x2
-	ATTR_FILE_VALIDMASK                     = 0x37ff
-	ATTR_VOL_ALLOCATIONCLUMP                = 0x40
-	ATTR_VOL_ATTRIBUTES                     = 0x40000000
-	ATTR_VOL_CAPABILITIES                   = 0x20000
-	ATTR_VOL_DIRCOUNT                       = 0x400
-	ATTR_VOL_ENCODINGSUSED                  = 0x10000
-	ATTR_VOL_FILECOUNT                      = 0x200
-	ATTR_VOL_FSTYPE                         = 0x1
-	ATTR_VOL_INFO                           = 0x80000000
-	ATTR_VOL_IOBLOCKSIZE                    = 0x80
-	ATTR_VOL_MAXOBJCOUNT                    = 0x800
-	ATTR_VOL_MINALLOCATION                  = 0x20
-	ATTR_VOL_MOUNTEDDEVICE                  = 0x8000
-	ATTR_VOL_MOUNTFLAGS                     = 0x4000
-	ATTR_VOL_MOUNTPOINT                     = 0x1000
-	ATTR_VOL_NAME                           = 0x2000
-	ATTR_VOL_OBJCOUNT                       = 0x100
-	ATTR_VOL_QUOTA_SIZE                     = 0x10000000
-	ATTR_VOL_RESERVED_SIZE                  = 0x20000000
-	ATTR_VOL_SETMASK                        = 0x80002000
-	ATTR_VOL_SIGNATURE                      = 0x2
-	ATTR_VOL_SIZE                           = 0x4
-	ATTR_VOL_SPACEAVAIL                     = 0x10
-	ATTR_VOL_SPACEFREE                      = 0x8
-	ATTR_VOL_SPACEUSED                      = 0x800000
-	ATTR_VOL_UUID                           = 0x40000
-	ATTR_VOL_VALIDMASK                      = 0xf087ffff
-	B0                                      = 0x0
-	B110                                    = 0x6e
-	B115200                                 = 0x1c200
-	B1200                                   = 0x4b0
-	B134                                    = 0x86
-	B14400                                  = 0x3840
-	B150                                    = 0x96
-	B1800                                   = 0x708
-	B19200                                  = 0x4b00
-	B200                                    = 0xc8
-	B230400                                 = 0x38400
-	B2400                                   = 0x960
-	B28800                                  = 0x7080
-	B300                                    = 0x12c
-	B38400                                  = 0x9600
-	B4800                                   = 0x12c0
-	B50                                     = 0x32
-	B57600                                  = 0xe100
-	B600                                    = 0x258
-	B7200                                   = 0x1c20
-	B75                                     = 0x4b
-	B76800                                  = 0x12c00
-	B9600                                   = 0x2580
-	BIOCFLUSH                               = 0x20004268
-	BIOCGBLEN                               = 0x40044266
-	BIOCGDLT                                = 0x4004426a
-	BIOCGDLTLIST                            = 0xc00c4279
-	BIOCGETIF                               = 0x4020426b
-	BIOCGHDRCMPLT                           = 0x40044274
-	BIOCGRSIG                               = 0x40044272
-	BIOCGRTIMEOUT                           = 0x4010426e
-	BIOCGSEESENT                            = 0x40044276
-	BIOCGSTATS                              = 0x4008426f
-	BIOCIMMEDIATE                           = 0x80044270
-	BIOCPROMISC                             = 0x20004269
-	BIOCSBLEN                               = 0xc0044266
-	BIOCSDLT                                = 0x80044278
-	BIOCSETF                                = 0x80104267
-	BIOCSETFNR                              = 0x8010427e
-	BIOCSETIF                               = 0x8020426c
-	BIOCSHDRCMPLT                           = 0x80044275
-	BIOCSRSIG                               = 0x80044273
-	BIOCSRTIMEOUT                           = 0x8010426d
-	BIOCSSEESENT                            = 0x80044277
-	BIOCVERSION                             = 0x40044271
-	BPF_A                                   = 0x10
-	BPF_ABS                                 = 0x20
-	BPF_ADD                                 = 0x0
-	BPF_ALIGNMENT                           = 0x4
-	BPF_ALU                                 = 0x4
-	BPF_AND                                 = 0x50
-	BPF_B                                   = 0x10
-	BPF_DIV                                 = 0x30
-	BPF_H                                   = 0x8
-	BPF_IMM                                 = 0x0
-	BPF_IND                                 = 0x40
-	BPF_JA                                  = 0x0
-	BPF_JEQ                                 = 0x10
-	BPF_JGE                                 = 0x30
-	BPF_JGT                                 = 0x20
-	BPF_JMP                                 = 0x5
-	BPF_JSET                                = 0x40
-	BPF_K                                   = 0x0
-	BPF_LD                                  = 0x0
-	BPF_LDX                                 = 0x1
-	BPF_LEN                                 = 0x80
-	BPF_LSH                                 = 0x60
-	BPF_MAJOR_VERSION                       = 0x1
-	BPF_MAXBUFSIZE                          = 0x80000
-	BPF_MAXINSNS                            = 0x200
-	BPF_MEM                                 = 0x60
-	BPF_MEMWORDS                            = 0x10
-	BPF_MINBUFSIZE                          = 0x20
-	BPF_MINOR_VERSION                       = 0x1
-	BPF_MISC                                = 0x7
-	BPF_MSH                                 = 0xa0
-	BPF_MUL                                 = 0x20
-	BPF_NEG                                 = 0x80
-	BPF_OR                                  = 0x40
-	BPF_RELEASE                             = 0x30bb6
-	BPF_RET                                 = 0x6
-	BPF_RSH                                 = 0x70
-	BPF_ST                                  = 0x2
-	BPF_STX                                 = 0x3
-	BPF_SUB                                 = 0x10
-	BPF_TAX                                 = 0x0
-	BPF_TXA                                 = 0x80
-	BPF_W                                   = 0x0
-	BPF_X                                   = 0x8
-	BRKINT                                  = 0x2
-	BS0                                     = 0x0
-	BS1                                     = 0x8000
-	BSDLY                                   = 0x8000
-	CFLUSH                                  = 0xf
-	CLOCAL                                  = 0x8000
-	CLOCK_MONOTONIC                         = 0x6
-	CLOCK_MONOTONIC_RAW                     = 0x4
-	CLOCK_MONOTONIC_RAW_APPROX              = 0x5
-	CLOCK_PROCESS_CPUTIME_ID                = 0xc
-	CLOCK_REALTIME                          = 0x0
-	CLOCK_THREAD_CPUTIME_ID                 = 0x10
-	CLOCK_UPTIME_RAW                        = 0x8
-	CLOCK_UPTIME_RAW_APPROX                 = 0x9
-	CLONE_NOFOLLOW                          = 0x1
-	CLONE_NOOWNERCOPY                       = 0x2
-	CONNECT_DATA_AUTHENTICATED              = 0x4
-	CONNECT_DATA_IDEMPOTENT                 = 0x2
-	CONNECT_RESUME_ON_READ_WRITE            = 0x1
-	CR0                                     = 0x0
-	CR1                                     = 0x1000
-	CR2                                     = 0x2000
-	CR3                                     = 0x3000
-	CRDLY                                   = 0x3000
-	CREAD                                   = 0x800
-	CRTSCTS                                 = 0x30000
-	CS5                                     = 0x0
-	CS6                                     = 0x100
-	CS7                                     = 0x200
-	CS8                                     = 0x300
-	CSIZE                                   = 0x300
-	CSTART                                  = 0x11
-	CSTATUS                                 = 0x14
-	CSTOP                                   = 0x13
-	CSTOPB                                  = 0x400
-	CSUSP                                   = 0x1a
-	CTLIOCGINFO                             = 0xc0644e03
-	CTL_HW                                  = 0x6
-	CTL_KERN                                = 0x1
-	CTL_MAXNAME                             = 0xc
-	CTL_NET                                 = 0x4
-	DLT_A429                                = 0xb8
-	DLT_A653_ICM                            = 0xb9
-	DLT_AIRONET_HEADER                      = 0x78
-	DLT_AOS                                 = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394              = 0x8a
-	DLT_ARCNET                              = 0x7
-	DLT_ARCNET_LINUX                        = 0x81
-	DLT_ATM_CLIP                            = 0x13
-	DLT_ATM_RFC1483                         = 0xb
-	DLT_AURORA                              = 0x7e
-	DLT_AX25                                = 0x3
-	DLT_AX25_KISS                           = 0xca
-	DLT_BACNET_MS_TP                        = 0xa5
-	DLT_BLUETOOTH_HCI_H4                    = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR          = 0xc9
-	DLT_CAN20B                              = 0xbe
-	DLT_CAN_SOCKETCAN                       = 0xe3
-	DLT_CHAOS                               = 0x5
-	DLT_CHDLC                               = 0x68
-	DLT_CISCO_IOS                           = 0x76
-	DLT_C_HDLC                              = 0x68
-	DLT_C_HDLC_WITH_DIR                     = 0xcd
-	DLT_DBUS                                = 0xe7
-	DLT_DECT                                = 0xdd
-	DLT_DOCSIS                              = 0x8f
-	DLT_DVB_CI                              = 0xeb
-	DLT_ECONET                              = 0x73
-	DLT_EN10MB                              = 0x1
-	DLT_EN3MB                               = 0x2
-	DLT_ENC                                 = 0x6d
-	DLT_ERF                                 = 0xc5
-	DLT_ERF_ETH                             = 0xaf
-	DLT_ERF_POS                             = 0xb0
-	DLT_FC_2                                = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS              = 0xe1
-	DLT_FDDI                                = 0xa
-	DLT_FLEXRAY                             = 0xd2
-	DLT_FRELAY                              = 0x6b
-	DLT_FRELAY_WITH_DIR                     = 0xce
-	DLT_GCOM_SERIAL                         = 0xad
-	DLT_GCOM_T1E1                           = 0xac
-	DLT_GPF_F                               = 0xab
-	DLT_GPF_T                               = 0xaa
-	DLT_GPRS_LLC                            = 0xa9
-	DLT_GSMTAP_ABIS                         = 0xda
-	DLT_GSMTAP_UM                           = 0xd9
-	DLT_HHDLC                               = 0x79
-	DLT_IBM_SN                              = 0x92
-	DLT_IBM_SP                              = 0x91
-	DLT_IEEE802                             = 0x6
-	DLT_IEEE802_11                          = 0x69
-	DLT_IEEE802_11_RADIO                    = 0x7f
-	DLT_IEEE802_11_RADIO_AVS                = 0xa3
-	DLT_IEEE802_15_4                        = 0xc3
-	DLT_IEEE802_15_4_LINUX                  = 0xbf
-	DLT_IEEE802_15_4_NOFCS                  = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY             = 0xd7
-	DLT_IEEE802_16_MAC_CPS                  = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO            = 0xc1
-	DLT_IPFILTER                            = 0x74
-	DLT_IPMB                                = 0xc7
-	DLT_IPMB_LINUX                          = 0xd1
-	DLT_IPNET                               = 0xe2
-	DLT_IPOIB                               = 0xf2
-	DLT_IPV4                                = 0xe4
-	DLT_IPV6                                = 0xe5
-	DLT_IP_OVER_FC                          = 0x7a
-	DLT_JUNIPER_ATM1                        = 0x89
-	DLT_JUNIPER_ATM2                        = 0x87
-	DLT_JUNIPER_ATM_CEMIC                   = 0xee
-	DLT_JUNIPER_CHDLC                       = 0xb5
-	DLT_JUNIPER_ES                          = 0x84
-	DLT_JUNIPER_ETHER                       = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL                = 0xea
-	DLT_JUNIPER_FRELAY                      = 0xb4
-	DLT_JUNIPER_GGSN                        = 0x85
-	DLT_JUNIPER_ISM                         = 0xc2
-	DLT_JUNIPER_MFR                         = 0x86
-	DLT_JUNIPER_MLFR                        = 0x83
-	DLT_JUNIPER_MLPPP                       = 0x82
-	DLT_JUNIPER_MONITOR                     = 0xa4
-	DLT_JUNIPER_PIC_PEER                    = 0xae
-	DLT_JUNIPER_PPP                         = 0xb3
-	DLT_JUNIPER_PPPOE                       = 0xa7
-	DLT_JUNIPER_PPPOE_ATM                   = 0xa8
-	DLT_JUNIPER_SERVICES                    = 0x88
-	DLT_JUNIPER_SRX_E2E                     = 0xe9
-	DLT_JUNIPER_ST                          = 0xc8
-	DLT_JUNIPER_VP                          = 0xb7
-	DLT_JUNIPER_VS                          = 0xe8
-	DLT_LAPB_WITH_DIR                       = 0xcf
-	DLT_LAPD                                = 0xcb
-	DLT_LIN                                 = 0xd4
-	DLT_LINUX_EVDEV                         = 0xd8
-	DLT_LINUX_IRDA                          = 0x90
-	DLT_LINUX_LAPD                          = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION             = 0xa6
-	DLT_LINUX_SLL                           = 0x71
-	DLT_LOOP                                = 0x6c
-	DLT_LTALK                               = 0x72
-	DLT_MATCHING_MAX                        = 0x10a
-	DLT_MATCHING_MIN                        = 0x68
-	DLT_MFR                                 = 0xb6
-	DLT_MOST                                = 0xd3
-	DLT_MPEG_2_TS                           = 0xf3
-	DLT_MPLS                                = 0xdb
-	DLT_MTP2                                = 0x8c
-	DLT_MTP2_WITH_PHDR                      = 0x8b
-	DLT_MTP3                                = 0x8d
-	DLT_MUX27010                            = 0xec
-	DLT_NETANALYZER                         = 0xf0
-	DLT_NETANALYZER_TRANSPARENT             = 0xf1
-	DLT_NFC_LLCP                            = 0xf5
-	DLT_NFLOG                               = 0xef
-	DLT_NG40                                = 0xf4
-	DLT_NULL                                = 0x0
-	DLT_PCI_EXP                             = 0x7d
-	DLT_PFLOG                               = 0x75
-	DLT_PFSYNC                              = 0x12
-	DLT_PPI                                 = 0xc0
-	DLT_PPP                                 = 0x9
-	DLT_PPP_BSDOS                           = 0x10
-	DLT_PPP_ETHER                           = 0x33
-	DLT_PPP_PPPD                            = 0xa6
-	DLT_PPP_SERIAL                          = 0x32
-	DLT_PPP_WITH_DIR                        = 0xcc
-	DLT_PPP_WITH_DIRECTION                  = 0xa6
-	DLT_PRISM_HEADER                        = 0x77
-	DLT_PRONET                              = 0x4
-	DLT_RAIF1                               = 0xc6
-	DLT_RAW                                 = 0xc
-	DLT_RIO                                 = 0x7c
-	DLT_SCCP                                = 0x8e
-	DLT_SITA                                = 0xc4
-	DLT_SLIP                                = 0x8
-	DLT_SLIP_BSDOS                          = 0xf
-	DLT_STANAG_5066_D_PDU                   = 0xed
-	DLT_SUNATM                              = 0x7b
-	DLT_SYMANTEC_FIREWALL                   = 0x63
-	DLT_TZSP                                = 0x80
-	DLT_USB                                 = 0xba
-	DLT_USB_DARWIN                          = 0x10a
-	DLT_USB_LINUX                           = 0xbd
-	DLT_USB_LINUX_MMAPPED                   = 0xdc
-	DLT_USER0                               = 0x93
-	DLT_USER1                               = 0x94
-	DLT_USER10                              = 0x9d
-	DLT_USER11                              = 0x9e
-	DLT_USER12                              = 0x9f
-	DLT_USER13                              = 0xa0
-	DLT_USER14                              = 0xa1
-	DLT_USER15                              = 0xa2
-	DLT_USER2                               = 0x95
-	DLT_USER3                               = 0x96
-	DLT_USER4                               = 0x97
-	DLT_USER5                               = 0x98
-	DLT_USER6                               = 0x99
-	DLT_USER7                               = 0x9a
-	DLT_USER8                               = 0x9b
-	DLT_USER9                               = 0x9c
-	DLT_WIHART                              = 0xdf
-	DLT_X2E_SERIAL                          = 0xd5
-	DLT_X2E_XORAYA                          = 0xd6
-	DT_BLK                                  = 0x6
-	DT_CHR                                  = 0x2
-	DT_DIR                                  = 0x4
-	DT_FIFO                                 = 0x1
-	DT_LNK                                  = 0xa
-	DT_REG                                  = 0x8
-	DT_SOCK                                 = 0xc
-	DT_UNKNOWN                              = 0x0
-	DT_WHT                                  = 0xe
-	ECHO                                    = 0x8
-	ECHOCTL                                 = 0x40
-	ECHOE                                   = 0x2
-	ECHOK                                   = 0x4
-	ECHOKE                                  = 0x1
-	ECHONL                                  = 0x10
-	ECHOPRT                                 = 0x20
-	EVFILT_AIO                              = -0x3
-	EVFILT_EXCEPT                           = -0xf
-	EVFILT_FS                               = -0x9
-	EVFILT_MACHPORT                         = -0x8
-	EVFILT_PROC                             = -0x5
-	EVFILT_READ                             = -0x1
-	EVFILT_SIGNAL                           = -0x6
-	EVFILT_SYSCOUNT                         = 0x11
-	EVFILT_THREADMARKER                     = 0x11
-	EVFILT_TIMER                            = -0x7
-	EVFILT_USER                             = -0xa
-	EVFILT_VM                               = -0xc
-	EVFILT_VNODE                            = -0x4
-	EVFILT_WRITE                            = -0x2
-	EV_ADD                                  = 0x1
-	EV_CLEAR                                = 0x20
-	EV_DELETE                               = 0x2
-	EV_DISABLE                              = 0x8
-	EV_DISPATCH                             = 0x80
-	EV_DISPATCH2                            = 0x180
-	EV_ENABLE                               = 0x4
-	EV_EOF                                  = 0x8000
-	EV_ERROR                                = 0x4000
-	EV_FLAG0                                = 0x1000
-	EV_FLAG1                                = 0x2000
-	EV_ONESHOT                              = 0x10
-	EV_OOBAND                               = 0x2000
-	EV_POLL                                 = 0x1000
-	EV_RECEIPT                              = 0x40
-	EV_SYSFLAGS                             = 0xf000
-	EV_UDATA_SPECIFIC                       = 0x100
-	EV_VANISHED                             = 0x200
-	EXTA                                    = 0x4b00
-	EXTB                                    = 0x9600
-	EXTPROC                                 = 0x800
-	FD_CLOEXEC                              = 0x1
-	FD_SETSIZE                              = 0x400
-	FF0                                     = 0x0
-	FF1                                     = 0x4000
-	FFDLY                                   = 0x4000
-	FLUSHO                                  = 0x800000
-	FSOPT_ATTR_CMN_EXTENDED                 = 0x20
-	FSOPT_NOFOLLOW                          = 0x1
-	FSOPT_NOINMEMUPDATE                     = 0x2
-	FSOPT_PACK_INVAL_ATTRS                  = 0x8
-	FSOPT_REPORT_FULLSIZE                   = 0x4
-	FSOPT_RETURN_REALDEV                    = 0x200
-	F_ADDFILESIGS                           = 0x3d
-	F_ADDFILESIGS_FOR_DYLD_SIM              = 0x53
-	F_ADDFILESIGS_INFO                      = 0x67
-	F_ADDFILESIGS_RETURN                    = 0x61
-	F_ADDFILESUPPL                          = 0x68
-	F_ADDSIGS                               = 0x3b
-	F_ALLOCATEALL                           = 0x4
-	F_ALLOCATECONTIG                        = 0x2
-	F_BARRIERFSYNC                          = 0x55
-	F_CHECK_LV                              = 0x62
-	F_CHKCLEAN                              = 0x29
-	F_DUPFD                                 = 0x0
-	F_DUPFD_CLOEXEC                         = 0x43
-	F_FINDSIGS                              = 0x4e
-	F_FLUSH_DATA                            = 0x28
-	F_FREEZE_FS                             = 0x35
-	F_FULLFSYNC                             = 0x33
-	F_GETCODEDIR                            = 0x48
-	F_GETFD                                 = 0x1
-	F_GETFL                                 = 0x3
-	F_GETLK                                 = 0x7
-	F_GETLKPID                              = 0x42
-	F_GETNOSIGPIPE                          = 0x4a
-	F_GETOWN                                = 0x5
-	F_GETPATH                               = 0x32
-	F_GETPATH_MTMINFO                       = 0x47
-	F_GETPATH_NOFIRMLINK                    = 0x66
-	F_GETPROTECTIONCLASS                    = 0x3f
-	F_GETPROTECTIONLEVEL                    = 0x4d
-	F_GETSIGSINFO                           = 0x69
-	F_GLOBAL_NOCACHE                        = 0x37
-	F_LOG2PHYS                              = 0x31
-	F_LOG2PHYS_EXT                          = 0x41
-	F_NOCACHE                               = 0x30
-	F_NODIRECT                              = 0x3e
-	F_OK                                    = 0x0
-	F_PATHPKG_CHECK                         = 0x34
-	F_PEOFPOSMODE                           = 0x3
-	F_PREALLOCATE                           = 0x2a
-	F_PUNCHHOLE                             = 0x63
-	F_RDADVISE                              = 0x2c
-	F_RDAHEAD                               = 0x2d
-	F_RDLCK                                 = 0x1
-	F_SETBACKINGSTORE                       = 0x46
-	F_SETFD                                 = 0x2
-	F_SETFL                                 = 0x4
-	F_SETLK                                 = 0x8
-	F_SETLKW                                = 0x9
-	F_SETLKWTIMEOUT                         = 0xa
-	F_SETNOSIGPIPE                          = 0x49
-	F_SETOWN                                = 0x6
-	F_SETPROTECTIONCLASS                    = 0x40
-	F_SETSIZE                               = 0x2b
-	F_SINGLE_WRITER                         = 0x4c
-	F_SPECULATIVE_READ                      = 0x65
-	F_THAW_FS                               = 0x36
-	F_TRANSCODEKEY                          = 0x4b
-	F_TRIM_ACTIVE_FILE                      = 0x64
-	F_UNLCK                                 = 0x2
-	F_VOLPOSMODE                            = 0x4
-	F_WRLCK                                 = 0x3
-	HUPCL                                   = 0x4000
-	HW_MACHINE                              = 0x1
-	ICANON                                  = 0x100
-	ICMP6_FILTER                            = 0x12
-	ICRNL                                   = 0x100
-	IEXTEN                                  = 0x400
-	IFF_ALLMULTI                            = 0x200
-	IFF_ALTPHYS                             = 0x4000
-	IFF_BROADCAST                           = 0x2
-	IFF_DEBUG                               = 0x4
-	IFF_LINK0                               = 0x1000
-	IFF_LINK1                               = 0x2000
-	IFF_LINK2                               = 0x4000
-	IFF_LOOPBACK                            = 0x8
-	IFF_MULTICAST                           = 0x8000
-	IFF_NOARP                               = 0x80
-	IFF_NOTRAILERS                          = 0x20
-	IFF_OACTIVE                             = 0x400
-	IFF_POINTOPOINT                         = 0x10
-	IFF_PROMISC                             = 0x100
-	IFF_RUNNING                             = 0x40
-	IFF_SIMPLEX                             = 0x800
-	IFF_UP                                  = 0x1
-	IFNAMSIZ                                = 0x10
-	IFT_1822                                = 0x2
-	IFT_6LOWPAN                             = 0x40
-	IFT_AAL5                                = 0x31
-	IFT_ARCNET                              = 0x23
-	IFT_ARCNETPLUS                          = 0x24
-	IFT_ATM                                 = 0x25
-	IFT_BRIDGE                              = 0xd1
-	IFT_CARP                                = 0xf8
-	IFT_CELLULAR                            = 0xff
-	IFT_CEPT                                = 0x13
-	IFT_DS3                                 = 0x1e
-	IFT_ENC                                 = 0xf4
-	IFT_EON                                 = 0x19
-	IFT_ETHER                               = 0x6
-	IFT_FAITH                               = 0x38
-	IFT_FDDI                                = 0xf
-	IFT_FRELAY                              = 0x20
-	IFT_FRELAYDCE                           = 0x2c
-	IFT_GIF                                 = 0x37
-	IFT_HDH1822                             = 0x3
-	IFT_HIPPI                               = 0x2f
-	IFT_HSSI                                = 0x2e
-	IFT_HY                                  = 0xe
-	IFT_IEEE1394                            = 0x90
-	IFT_IEEE8023ADLAG                       = 0x88
-	IFT_ISDNBASIC                           = 0x14
-	IFT_ISDNPRIMARY                         = 0x15
-	IFT_ISO88022LLC                         = 0x29
-	IFT_ISO88023                            = 0x7
-	IFT_ISO88024                            = 0x8
-	IFT_ISO88025                            = 0x9
-	IFT_ISO88026                            = 0xa
-	IFT_L2VLAN                              = 0x87
-	IFT_LAPB                                = 0x10
-	IFT_LOCALTALK                           = 0x2a
-	IFT_LOOP                                = 0x18
-	IFT_MIOX25                              = 0x26
-	IFT_MODEM                               = 0x30
-	IFT_NSIP                                = 0x1b
-	IFT_OTHER                               = 0x1
-	IFT_P10                                 = 0xc
-	IFT_P80                                 = 0xd
-	IFT_PARA                                = 0x22
-	IFT_PDP                                 = 0xff
-	IFT_PFLOG                               = 0xf5
-	IFT_PFSYNC                              = 0xf6
-	IFT_PKTAP                               = 0xfe
-	IFT_PPP                                 = 0x17
-	IFT_PROPMUX                             = 0x36
-	IFT_PROPVIRTUAL                         = 0x35
-	IFT_PTPSERIAL                           = 0x16
-	IFT_RS232                               = 0x21
-	IFT_SDLC                                = 0x11
-	IFT_SIP                                 = 0x1f
-	IFT_SLIP                                = 0x1c
-	IFT_SMDSDXI                             = 0x2b
-	IFT_SMDSICIP                            = 0x34
-	IFT_SONET                               = 0x27
-	IFT_SONETPATH                           = 0x32
-	IFT_SONETVT                             = 0x33
-	IFT_STARLAN                             = 0xb
-	IFT_STF                                 = 0x39
-	IFT_T1                                  = 0x12
-	IFT_ULTRA                               = 0x1d
-	IFT_V35                                 = 0x2d
-	IFT_X25                                 = 0x5
-	IFT_X25DDN                              = 0x4
-	IFT_X25PLE                              = 0x28
-	IFT_XETHER                              = 0x1a
-	IGNBRK                                  = 0x1
-	IGNCR                                   = 0x80
-	IGNPAR                                  = 0x4
-	IMAXBEL                                 = 0x2000
-	INLCR                                   = 0x40
-	INPCK                                   = 0x10
-	IN_CLASSA_HOST                          = 0xffffff
-	IN_CLASSA_MAX                           = 0x80
-	IN_CLASSA_NET                           = 0xff000000
-	IN_CLASSA_NSHIFT                        = 0x18
-	IN_CLASSB_HOST                          = 0xffff
-	IN_CLASSB_MAX                           = 0x10000
-	IN_CLASSB_NET                           = 0xffff0000
-	IN_CLASSB_NSHIFT                        = 0x10
-	IN_CLASSC_HOST                          = 0xff
-	IN_CLASSC_NET                           = 0xffffff00
-	IN_CLASSC_NSHIFT                        = 0x8
-	IN_CLASSD_HOST                          = 0xfffffff
-	IN_CLASSD_NET                           = 0xf0000000
-	IN_CLASSD_NSHIFT                        = 0x1c
-	IN_LINKLOCALNETNUM                      = 0xa9fe0000
-	IN_LOOPBACKNET                          = 0x7f
-	IOCTL_VM_SOCKETS_GET_LOCAL_CID          = 0x400473d1
-	IPPROTO_3PC                             = 0x22
-	IPPROTO_ADFS                            = 0x44
-	IPPROTO_AH                              = 0x33
-	IPPROTO_AHIP                            = 0x3d
-	IPPROTO_APES                            = 0x63
-	IPPROTO_ARGUS                           = 0xd
-	IPPROTO_AX25                            = 0x5d
-	IPPROTO_BHA                             = 0x31
-	IPPROTO_BLT                             = 0x1e
-	IPPROTO_BRSATMON                        = 0x4c
-	IPPROTO_CFTP                            = 0x3e
-	IPPROTO_CHAOS                           = 0x10
-	IPPROTO_CMTP                            = 0x26
-	IPPROTO_CPHB                            = 0x49
-	IPPROTO_CPNX                            = 0x48
-	IPPROTO_DDP                             = 0x25
-	IPPROTO_DGP                             = 0x56
-	IPPROTO_DIVERT                          = 0xfe
-	IPPROTO_DONE                            = 0x101
-	IPPROTO_DSTOPTS                         = 0x3c
-	IPPROTO_EGP                             = 0x8
-	IPPROTO_EMCON                           = 0xe
-	IPPROTO_ENCAP                           = 0x62
-	IPPROTO_EON                             = 0x50
-	IPPROTO_ESP                             = 0x32
-	IPPROTO_ETHERIP                         = 0x61
-	IPPROTO_FRAGMENT                        = 0x2c
-	IPPROTO_GGP                             = 0x3
-	IPPROTO_GMTP                            = 0x64
-	IPPROTO_GRE                             = 0x2f
-	IPPROTO_HELLO                           = 0x3f
-	IPPROTO_HMP                             = 0x14
-	IPPROTO_HOPOPTS                         = 0x0
-	IPPROTO_ICMP                            = 0x1
-	IPPROTO_ICMPV6                          = 0x3a
-	IPPROTO_IDP                             = 0x16
-	IPPROTO_IDPR                            = 0x23
-	IPPROTO_IDRP                            = 0x2d
-	IPPROTO_IGMP                            = 0x2
-	IPPROTO_IGP                             = 0x55
-	IPPROTO_IGRP                            = 0x58
-	IPPROTO_IL                              = 0x28
-	IPPROTO_INLSP                           = 0x34
-	IPPROTO_INP                             = 0x20
-	IPPROTO_IP                              = 0x0
-	IPPROTO_IPCOMP                          = 0x6c
-	IPPROTO_IPCV                            = 0x47
-	IPPROTO_IPEIP                           = 0x5e
-	IPPROTO_IPIP                            = 0x4
-	IPPROTO_IPPC                            = 0x43
-	IPPROTO_IPV4                            = 0x4
-	IPPROTO_IPV6                            = 0x29
-	IPPROTO_IRTP                            = 0x1c
-	IPPROTO_KRYPTOLAN                       = 0x41
-	IPPROTO_LARP                            = 0x5b
-	IPPROTO_LEAF1                           = 0x19
-	IPPROTO_LEAF2                           = 0x1a
-	IPPROTO_MAX                             = 0x100
-	IPPROTO_MAXID                           = 0x34
-	IPPROTO_MEAS                            = 0x13
-	IPPROTO_MHRP                            = 0x30
-	IPPROTO_MICP                            = 0x5f
-	IPPROTO_MTP                             = 0x5c
-	IPPROTO_MUX                             = 0x12
-	IPPROTO_ND                              = 0x4d
-	IPPROTO_NHRP                            = 0x36
-	IPPROTO_NONE                            = 0x3b
-	IPPROTO_NSP                             = 0x1f
-	IPPROTO_NVPII                           = 0xb
-	IPPROTO_OSPFIGP                         = 0x59
-	IPPROTO_PGM                             = 0x71
-	IPPROTO_PIGP                            = 0x9
-	IPPROTO_PIM                             = 0x67
-	IPPROTO_PRM                             = 0x15
-	IPPROTO_PUP                             = 0xc
-	IPPROTO_PVP                             = 0x4b
-	IPPROTO_RAW                             = 0xff
-	IPPROTO_RCCMON                          = 0xa
-	IPPROTO_RDP                             = 0x1b
-	IPPROTO_ROUTING                         = 0x2b
-	IPPROTO_RSVP                            = 0x2e
-	IPPROTO_RVD                             = 0x42
-	IPPROTO_SATEXPAK                        = 0x40
-	IPPROTO_SATMON                          = 0x45
-	IPPROTO_SCCSP                           = 0x60
-	IPPROTO_SCTP                            = 0x84
-	IPPROTO_SDRP                            = 0x2a
-	IPPROTO_SEP                             = 0x21
-	IPPROTO_SRPC                            = 0x5a
-	IPPROTO_ST                              = 0x7
-	IPPROTO_SVMTP                           = 0x52
-	IPPROTO_SWIPE                           = 0x35
-	IPPROTO_TCF                             = 0x57
-	IPPROTO_TCP                             = 0x6
-	IPPROTO_TP                              = 0x1d
-	IPPROTO_TPXX                            = 0x27
-	IPPROTO_TRUNK1                          = 0x17
-	IPPROTO_TRUNK2                          = 0x18
-	IPPROTO_TTP                             = 0x54
-	IPPROTO_UDP                             = 0x11
-	IPPROTO_VINES                           = 0x53
-	IPPROTO_VISA                            = 0x46
-	IPPROTO_VMTP                            = 0x51
-	IPPROTO_WBEXPAK                         = 0x4f
-	IPPROTO_WBMON                           = 0x4e
-	IPPROTO_WSN                             = 0x4a
-	IPPROTO_XNET                            = 0xf
-	IPPROTO_XTP                             = 0x24
-	IPV6_2292DSTOPTS                        = 0x17
-	IPV6_2292HOPLIMIT                       = 0x14
-	IPV6_2292HOPOPTS                        = 0x16
-	IPV6_2292NEXTHOP                        = 0x15
-	IPV6_2292PKTINFO                        = 0x13
-	IPV6_2292PKTOPTIONS                     = 0x19
-	IPV6_2292RTHDR                          = 0x18
-	IPV6_3542DSTOPTS                        = 0x32
-	IPV6_3542HOPLIMIT                       = 0x2f
-	IPV6_3542HOPOPTS                        = 0x31
-	IPV6_3542NEXTHOP                        = 0x30
-	IPV6_3542PKTINFO                        = 0x2e
-	IPV6_3542RTHDR                          = 0x33
-	IPV6_ADDR_MC_FLAGS_PREFIX               = 0x20
-	IPV6_ADDR_MC_FLAGS_TRANSIENT            = 0x10
-	IPV6_ADDR_MC_FLAGS_UNICAST_BASED        = 0x30
-	IPV6_AUTOFLOWLABEL                      = 0x3b
-	IPV6_BINDV6ONLY                         = 0x1b
-	IPV6_BOUND_IF                           = 0x7d
-	IPV6_CHECKSUM                           = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS             = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP             = 0x1
-	IPV6_DEFHLIM                            = 0x40
-	IPV6_DONTFRAG                           = 0x3e
-	IPV6_DSTOPTS                            = 0x32
-	IPV6_FAITH                              = 0x1d
-	IPV6_FLOWINFO_MASK                      = 0xffffff0f
-	IPV6_FLOWLABEL_MASK                     = 0xffff0f00
-	IPV6_FLOW_ECN_MASK                      = 0x3000
-	IPV6_FRAGTTL                            = 0x3c
-	IPV6_FW_ADD                             = 0x1e
-	IPV6_FW_DEL                             = 0x1f
-	IPV6_FW_FLUSH                           = 0x20
-	IPV6_FW_GET                             = 0x22
-	IPV6_FW_ZERO                            = 0x21
-	IPV6_HLIMDEC                            = 0x1
-	IPV6_HOPLIMIT                           = 0x2f
-	IPV6_HOPOPTS                            = 0x31
-	IPV6_IPSEC_POLICY                       = 0x1c
-	IPV6_JOIN_GROUP                         = 0xc
-	IPV6_LEAVE_GROUP                        = 0xd
-	IPV6_MAXHLIM                            = 0xff
-	IPV6_MAXOPTHDR                          = 0x800
-	IPV6_MAXPACKET                          = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER               = 0x200
-	IPV6_MAX_MEMBERSHIPS                    = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER                = 0x80
-	IPV6_MIN_MEMBERSHIPS                    = 0x1f
-	IPV6_MMTU                               = 0x500
-	IPV6_MSFILTER                           = 0x4a
-	IPV6_MULTICAST_HOPS                     = 0xa
-	IPV6_MULTICAST_IF                       = 0x9
-	IPV6_MULTICAST_LOOP                     = 0xb
-	IPV6_NEXTHOP                            = 0x30
-	IPV6_PATHMTU                            = 0x2c
-	IPV6_PKTINFO                            = 0x2e
-	IPV6_PORTRANGE                          = 0xe
-	IPV6_PORTRANGE_DEFAULT                  = 0x0
-	IPV6_PORTRANGE_HIGH                     = 0x1
-	IPV6_PORTRANGE_LOW                      = 0x2
-	IPV6_PREFER_TEMPADDR                    = 0x3f
-	IPV6_RECVDSTOPTS                        = 0x28
-	IPV6_RECVHOPLIMIT                       = 0x25
-	IPV6_RECVHOPOPTS                        = 0x27
-	IPV6_RECVPATHMTU                        = 0x2b
-	IPV6_RECVPKTINFO                        = 0x3d
-	IPV6_RECVRTHDR                          = 0x26
-	IPV6_RECVTCLASS                         = 0x23
-	IPV6_RTHDR                              = 0x33
-	IPV6_RTHDRDSTOPTS                       = 0x39
-	IPV6_RTHDR_LOOSE                        = 0x0
-	IPV6_RTHDR_STRICT                       = 0x1
-	IPV6_RTHDR_TYPE_0                       = 0x0
-	IPV6_SOCKOPT_RESERVED1                  = 0x3
-	IPV6_TCLASS                             = 0x24
-	IPV6_UNICAST_HOPS                       = 0x4
-	IPV6_USE_MIN_MTU                        = 0x2a
-	IPV6_V6ONLY                             = 0x1b
-	IPV6_VERSION                            = 0x60
-	IPV6_VERSION_MASK                       = 0xf0
-	IP_ADD_MEMBERSHIP                       = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP                = 0x46
-	IP_BLOCK_SOURCE                         = 0x48
-	IP_BOUND_IF                             = 0x19
-	IP_DEFAULT_MULTICAST_LOOP               = 0x1
-	IP_DEFAULT_MULTICAST_TTL                = 0x1
-	IP_DF                                   = 0x4000
-	IP_DONTFRAG                             = 0x1c
-	IP_DROP_MEMBERSHIP                      = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP               = 0x47
-	IP_DUMMYNET_CONFIGURE                   = 0x3c
-	IP_DUMMYNET_DEL                         = 0x3d
-	IP_DUMMYNET_FLUSH                       = 0x3e
-	IP_DUMMYNET_GET                         = 0x40
-	IP_FAITH                                = 0x16
-	IP_FW_ADD                               = 0x28
-	IP_FW_DEL                               = 0x29
-	IP_FW_FLUSH                             = 0x2a
-	IP_FW_GET                               = 0x2c
-	IP_FW_RESETLOG                          = 0x2d
-	IP_FW_ZERO                              = 0x2b
-	IP_HDRINCL                              = 0x2
-	IP_IPSEC_POLICY                         = 0x15
-	IP_MAXPACKET                            = 0xffff
-	IP_MAX_GROUP_SRC_FILTER                 = 0x200
-	IP_MAX_MEMBERSHIPS                      = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER                 = 0x80
-	IP_MAX_SOCK_SRC_FILTER                  = 0x80
-	IP_MF                                   = 0x2000
-	IP_MIN_MEMBERSHIPS                      = 0x1f
-	IP_MSFILTER                             = 0x4a
-	IP_MSS                                  = 0x240
-	IP_MULTICAST_IF                         = 0x9
-	IP_MULTICAST_IFINDEX                    = 0x42
-	IP_MULTICAST_LOOP                       = 0xb
-	IP_MULTICAST_TTL                        = 0xa
-	IP_MULTICAST_VIF                        = 0xe
-	IP_NAT__XXX                             = 0x37
-	IP_OFFMASK                              = 0x1fff
-	IP_OLD_FW_ADD                           = 0x32
-	IP_OLD_FW_DEL                           = 0x33
-	IP_OLD_FW_FLUSH                         = 0x34
-	IP_OLD_FW_GET                           = 0x36
-	IP_OLD_FW_RESETLOG                      = 0x38
-	IP_OLD_FW_ZERO                          = 0x35
-	IP_OPTIONS                              = 0x1
-	IP_PKTINFO                              = 0x1a
-	IP_PORTRANGE                            = 0x13
-	IP_PORTRANGE_DEFAULT                    = 0x0
-	IP_PORTRANGE_HIGH                       = 0x1
-	IP_PORTRANGE_LOW                        = 0x2
-	IP_RECVDSTADDR                          = 0x7
-	IP_RECVIF                               = 0x14
-	IP_RECVOPTS                             = 0x5
-	IP_RECVPKTINFO                          = 0x1a
-	IP_RECVRETOPTS                          = 0x6
-	IP_RECVTOS                              = 0x1b
-	IP_RECVTTL                              = 0x18
-	IP_RETOPTS                              = 0x8
-	IP_RF                                   = 0x8000
-	IP_RSVP_OFF                             = 0x10
-	IP_RSVP_ON                              = 0xf
-	IP_RSVP_VIF_OFF                         = 0x12
-	IP_RSVP_VIF_ON                          = 0x11
-	IP_STRIPHDR                             = 0x17
-	IP_TOS                                  = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND               = 0x41
-	IP_TTL                                  = 0x4
-	IP_UNBLOCK_SOURCE                       = 0x49
-	ISIG                                    = 0x80
-	ISTRIP                                  = 0x20
-	IUTF8                                   = 0x4000
-	IXANY                                   = 0x800
-	IXOFF                                   = 0x400
-	IXON                                    = 0x200
-	KERN_HOSTNAME                           = 0xa
-	KERN_OSRELEASE                          = 0x2
-	KERN_OSTYPE                             = 0x1
-	KERN_VERSION                            = 0x4
-	LOCAL_PEERCRED                          = 0x1
-	LOCAL_PEEREPID                          = 0x3
-	LOCAL_PEEREUUID                         = 0x5
-	LOCAL_PEERPID                           = 0x2
-	LOCAL_PEERTOKEN                         = 0x6
-	LOCAL_PEERUUID                          = 0x4
-	LOCK_EX                                 = 0x2
-	LOCK_NB                                 = 0x4
-	LOCK_SH                                 = 0x1
-	LOCK_UN                                 = 0x8
-	MADV_CAN_REUSE                          = 0x9
-	MADV_DONTNEED                           = 0x4
-	MADV_FREE                               = 0x5
-	MADV_FREE_REUSABLE                      = 0x7
-	MADV_FREE_REUSE                         = 0x8
-	MADV_NORMAL                             = 0x0
-	MADV_PAGEOUT                            = 0xa
-	MADV_RANDOM                             = 0x1
-	MADV_SEQUENTIAL                         = 0x2
-	MADV_WILLNEED                           = 0x3
-	MADV_ZERO_WIRED_PAGES                   = 0x6
-	MAP_32BIT                               = 0x8000
-	MAP_ANON                                = 0x1000
-	MAP_ANONYMOUS                           = 0x1000
-	MAP_COPY                                = 0x2
-	MAP_FILE                                = 0x0
-	MAP_FIXED                               = 0x10
-	MAP_HASSEMAPHORE                        = 0x200
-	MAP_JIT                                 = 0x800
-	MAP_NOCACHE                             = 0x400
-	MAP_NOEXTEND                            = 0x100
-	MAP_NORESERVE                           = 0x40
-	MAP_PRIVATE                             = 0x2
-	MAP_RENAME                              = 0x20
-	MAP_RESERVED0080                        = 0x80
-	MAP_RESILIENT_CODESIGN                  = 0x2000
-	MAP_RESILIENT_MEDIA                     = 0x4000
-	MAP_SHARED                              = 0x1
-	MAP_TRANSLATED_ALLOW_EXECUTE            = 0x20000
-	MAP_UNIX03                              = 0x40000
-	MCAST_BLOCK_SOURCE                      = 0x54
-	MCAST_EXCLUDE                           = 0x2
-	MCAST_INCLUDE                           = 0x1
-	MCAST_JOIN_GROUP                        = 0x50
-	MCAST_JOIN_SOURCE_GROUP                 = 0x52
-	MCAST_LEAVE_GROUP                       = 0x51
-	MCAST_LEAVE_SOURCE_GROUP                = 0x53
-	MCAST_UNBLOCK_SOURCE                    = 0x55
-	MCAST_UNDEFINED                         = 0x0
-	MCL_CURRENT                             = 0x1
-	MCL_FUTURE                              = 0x2
-	MNT_ASYNC                               = 0x40
-	MNT_AUTOMOUNTED                         = 0x400000
-	MNT_CMDFLAGS                            = 0xf0000
-	MNT_CPROTECT                            = 0x80
-	MNT_DEFWRITE                            = 0x2000000
-	MNT_DONTBROWSE                          = 0x100000
-	MNT_DOVOLFS                             = 0x8000
-	MNT_DWAIT                               = 0x4
-	MNT_EXPORTED                            = 0x100
-	MNT_EXT_ROOT_DATA_VOL                   = 0x1
-	MNT_FORCE                               = 0x80000
-	MNT_IGNORE_OWNERSHIP                    = 0x200000
-	MNT_JOURNALED                           = 0x800000
-	MNT_LOCAL                               = 0x1000
-	MNT_MULTILABEL                          = 0x4000000
-	MNT_NOATIME                             = 0x10000000
-	MNT_NOBLOCK                             = 0x20000
-	MNT_NODEV                               = 0x10
-	MNT_NOEXEC                              = 0x4
-	MNT_NOSUID                              = 0x8
-	MNT_NOUSERXATTR                         = 0x1000000
-	MNT_NOWAIT                              = 0x2
-	MNT_QUARANTINE                          = 0x400
-	MNT_QUOTA                               = 0x2000
-	MNT_RDONLY                              = 0x1
-	MNT_RELOAD                              = 0x40000
-	MNT_REMOVABLE                           = 0x200
-	MNT_ROOTFS                              = 0x4000
-	MNT_SNAPSHOT                            = 0x40000000
-	MNT_STRICTATIME                         = 0x80000000
-	MNT_SYNCHRONOUS                         = 0x2
-	MNT_UNION                               = 0x20
-	MNT_UNKNOWNPERMISSIONS                  = 0x200000
-	MNT_UPDATE                              = 0x10000
-	MNT_VISFLAGMASK                         = 0xd7f0f7ff
-	MNT_WAIT                                = 0x1
-	MSG_CTRUNC                              = 0x20
-	MSG_DONTROUTE                           = 0x4
-	MSG_DONTWAIT                            = 0x80
-	MSG_EOF                                 = 0x100
-	MSG_EOR                                 = 0x8
-	MSG_FLUSH                               = 0x400
-	MSG_HAVEMORE                            = 0x2000
-	MSG_HOLD                                = 0x800
-	MSG_NEEDSA                              = 0x10000
-	MSG_NOSIGNAL                            = 0x80000
-	MSG_OOB                                 = 0x1
-	MSG_PEEK                                = 0x2
-	MSG_RCVMORE                             = 0x4000
-	MSG_SEND                                = 0x1000
-	MSG_TRUNC                               = 0x10
-	MSG_WAITALL                             = 0x40
-	MSG_WAITSTREAM                          = 0x200
-	MS_ASYNC                                = 0x1
-	MS_DEACTIVATE                           = 0x8
-	MS_INVALIDATE                           = 0x2
-	MS_KILLPAGES                            = 0x4
-	MS_SYNC                                 = 0x10
-	NAME_MAX                                = 0xff
-	NET_RT_DUMP                             = 0x1
-	NET_RT_DUMP2                            = 0x7
-	NET_RT_FLAGS                            = 0x2
-	NET_RT_FLAGS_PRIV                       = 0xa
-	NET_RT_IFLIST                           = 0x3
-	NET_RT_IFLIST2                          = 0x6
-	NET_RT_MAXID                            = 0xb
-	NET_RT_STAT                             = 0x4
-	NET_RT_TRASH                            = 0x5
-	NFDBITS                                 = 0x20
-	NL0                                     = 0x0
-	NL1                                     = 0x100
-	NL2                                     = 0x200
-	NL3                                     = 0x300
-	NLDLY                                   = 0x300
-	NOFLSH                                  = 0x80000000
-	NOKERNINFO                              = 0x2000000
-	NOTE_ABSOLUTE                           = 0x8
-	NOTE_ATTRIB                             = 0x8
-	NOTE_BACKGROUND                         = 0x40
-	NOTE_CHILD                              = 0x4
-	NOTE_CRITICAL                           = 0x20
-	NOTE_DELETE                             = 0x1
-	NOTE_EXEC                               = 0x20000000
-	NOTE_EXIT                               = 0x80000000
-	NOTE_EXITSTATUS                         = 0x4000000
-	NOTE_EXIT_CSERROR                       = 0x40000
-	NOTE_EXIT_DECRYPTFAIL                   = 0x10000
-	NOTE_EXIT_DETAIL                        = 0x2000000
-	NOTE_EXIT_DETAIL_MASK                   = 0x70000
-	NOTE_EXIT_MEMORY                        = 0x20000
-	NOTE_EXIT_REPARENTED                    = 0x80000
-	NOTE_EXTEND                             = 0x4
-	NOTE_FFAND                              = 0x40000000
-	NOTE_FFCOPY                             = 0xc0000000
-	NOTE_FFCTRLMASK                         = 0xc0000000
-	NOTE_FFLAGSMASK                         = 0xffffff
-	NOTE_FFNOP                              = 0x0
-	NOTE_FFOR                               = 0x80000000
-	NOTE_FORK                               = 0x40000000
-	NOTE_FUNLOCK                            = 0x100
-	NOTE_LEEWAY                             = 0x10
-	NOTE_LINK                               = 0x10
-	NOTE_LOWAT                              = 0x1
-	NOTE_MACHTIME                           = 0x100
-	NOTE_MACH_CONTINUOUS_TIME               = 0x80
-	NOTE_NONE                               = 0x80
-	NOTE_NSECONDS                           = 0x4
-	NOTE_OOB                                = 0x2
-	NOTE_PCTRLMASK                          = -0x100000
-	NOTE_PDATAMASK                          = 0xfffff
-	NOTE_REAP                               = 0x10000000
-	NOTE_RENAME                             = 0x20
-	NOTE_REVOKE                             = 0x40
-	NOTE_SECONDS                            = 0x1
-	NOTE_SIGNAL                             = 0x8000000
-	NOTE_TRACK                              = 0x1
-	NOTE_TRACKERR                           = 0x2
-	NOTE_TRIGGER                            = 0x1000000
-	NOTE_USECONDS                           = 0x2
-	NOTE_VM_ERROR                           = 0x10000000
-	NOTE_VM_PRESSURE                        = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE       = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE              = 0x40000000
-	NOTE_WRITE                              = 0x2
-	OCRNL                                   = 0x10
-	OFDEL                                   = 0x20000
-	OFILL                                   = 0x80
-	ONLCR                                   = 0x2
-	ONLRET                                  = 0x40
-	ONOCR                                   = 0x20
-	ONOEOT                                  = 0x8
-	OPOST                                   = 0x1
-	OXTABS                                  = 0x4
-	O_ACCMODE                               = 0x3
-	O_ALERT                                 = 0x20000000
-	O_APPEND                                = 0x8
-	O_ASYNC                                 = 0x40
-	O_CLOEXEC                               = 0x1000000
-	O_CREAT                                 = 0x200
-	O_DIRECTORY                             = 0x100000
-	O_DP_GETRAWENCRYPTED                    = 0x1
-	O_DP_GETRAWUNENCRYPTED                  = 0x2
-	O_DSYNC                                 = 0x400000
-	O_EVTONLY                               = 0x8000
-	O_EXCL                                  = 0x800
-	O_EXLOCK                                = 0x20
-	O_FSYNC                                 = 0x80
-	O_NDELAY                                = 0x4
-	O_NOCTTY                                = 0x20000
-	O_NOFOLLOW                              = 0x100
-	O_NOFOLLOW_ANY                          = 0x20000000
-	O_NONBLOCK                              = 0x4
-	O_POPUP                                 = 0x80000000
-	O_RDONLY                                = 0x0
-	O_RDWR                                  = 0x2
-	O_SHLOCK                                = 0x10
-	O_SYMLINK                               = 0x200000
-	O_SYNC                                  = 0x80
-	O_TRUNC                                 = 0x400
-	O_WRONLY                                = 0x1
-	PARENB                                  = 0x1000
-	PARMRK                                  = 0x8
-	PARODD                                  = 0x2000
-	PENDIN                                  = 0x20000000
-	PRIO_PGRP                               = 0x1
-	PRIO_PROCESS                            = 0x0
-	PRIO_USER                               = 0x2
-	PROT_EXEC                               = 0x4
-	PROT_NONE                               = 0x0
-	PROT_READ                               = 0x1
-	PROT_WRITE                              = 0x2
-	PT_ATTACH                               = 0xa
-	PT_ATTACHEXC                            = 0xe
-	PT_CONTINUE                             = 0x7
-	PT_DENY_ATTACH                          = 0x1f
-	PT_DETACH                               = 0xb
-	PT_FIRSTMACH                            = 0x20
-	PT_FORCEQUOTA                           = 0x1e
-	PT_KILL                                 = 0x8
-	PT_READ_D                               = 0x2
-	PT_READ_I                               = 0x1
-	PT_READ_U                               = 0x3
-	PT_SIGEXC                               = 0xc
-	PT_STEP                                 = 0x9
-	PT_THUPDATE                             = 0xd
-	PT_TRACE_ME                             = 0x0
-	PT_WRITE_D                              = 0x5
-	PT_WRITE_I                              = 0x4
-	PT_WRITE_U                              = 0x6
-	RENAME_EXCL                             = 0x4
-	RENAME_NOFOLLOW_ANY                     = 0x10
-	RENAME_RESERVED1                        = 0x8
-	RENAME_SECLUDE                          = 0x1
-	RENAME_SWAP                             = 0x2
-	RLIMIT_AS                               = 0x5
-	RLIMIT_CORE                             = 0x4
-	RLIMIT_CPU                              = 0x0
-	RLIMIT_CPU_USAGE_MONITOR                = 0x2
-	RLIMIT_DATA                             = 0x2
-	RLIMIT_FSIZE                            = 0x1
-	RLIMIT_MEMLOCK                          = 0x6
-	RLIMIT_NOFILE                           = 0x8
-	RLIMIT_NPROC                            = 0x7
-	RLIMIT_RSS                              = 0x5
-	RLIMIT_STACK                            = 0x3
-	RLIM_INFINITY                           = 0x7fffffffffffffff
-	RTAX_AUTHOR                             = 0x6
-	RTAX_BRD                                = 0x7
-	RTAX_DST                                = 0x0
-	RTAX_GATEWAY                            = 0x1
-	RTAX_GENMASK                            = 0x3
-	RTAX_IFA                                = 0x5
-	RTAX_IFP                                = 0x4
-	RTAX_MAX                                = 0x8
-	RTAX_NETMASK                            = 0x2
-	RTA_AUTHOR                              = 0x40
-	RTA_BRD                                 = 0x80
-	RTA_DST                                 = 0x1
-	RTA_GATEWAY                             = 0x2
-	RTA_GENMASK                             = 0x8
-	RTA_IFA                                 = 0x20
-	RTA_IFP                                 = 0x10
-	RTA_NETMASK                             = 0x4
-	RTF_BLACKHOLE                           = 0x1000
-	RTF_BROADCAST                           = 0x400000
-	RTF_CLONING                             = 0x100
-	RTF_CONDEMNED                           = 0x2000000
-	RTF_DEAD                                = 0x20000000
-	RTF_DELCLONE                            = 0x80
-	RTF_DONE                                = 0x40
-	RTF_DYNAMIC                             = 0x10
-	RTF_GATEWAY                             = 0x2
-	RTF_GLOBAL                              = 0x40000000
-	RTF_HOST                                = 0x4
-	RTF_IFREF                               = 0x4000000
-	RTF_IFSCOPE                             = 0x1000000
-	RTF_LLDATA                              = 0x400
-	RTF_LLINFO                              = 0x400
-	RTF_LOCAL                               = 0x200000
-	RTF_MODIFIED                            = 0x20
-	RTF_MULTICAST                           = 0x800000
-	RTF_NOIFREF                             = 0x2000
-	RTF_PINNED                              = 0x100000
-	RTF_PRCLONING                           = 0x10000
-	RTF_PROTO1                              = 0x8000
-	RTF_PROTO2                              = 0x4000
-	RTF_PROTO3                              = 0x40000
-	RTF_PROXY                               = 0x8000000
-	RTF_REJECT                              = 0x8
-	RTF_ROUTER                              = 0x10000000
-	RTF_STATIC                              = 0x800
-	RTF_UP                                  = 0x1
-	RTF_WASCLONED                           = 0x20000
-	RTF_XRESOLVE                            = 0x200
-	RTM_ADD                                 = 0x1
-	RTM_CHANGE                              = 0x3
-	RTM_DELADDR                             = 0xd
-	RTM_DELETE                              = 0x2
-	RTM_DELMADDR                            = 0x10
-	RTM_GET                                 = 0x4
-	RTM_GET2                                = 0x14
-	RTM_IFINFO                              = 0xe
-	RTM_IFINFO2                             = 0x12
-	RTM_LOCK                                = 0x8
-	RTM_LOSING                              = 0x5
-	RTM_MISS                                = 0x7
-	RTM_NEWADDR                             = 0xc
-	RTM_NEWMADDR                            = 0xf
-	RTM_NEWMADDR2                           = 0x13
-	RTM_OLDADD                              = 0x9
-	RTM_OLDDEL                              = 0xa
-	RTM_REDIRECT                            = 0x6
-	RTM_RESOLVE                             = 0xb
-	RTM_RTTUNIT                             = 0xf4240
-	RTM_VERSION                             = 0x5
-	RTV_EXPIRE                              = 0x4
-	RTV_HOPCOUNT                            = 0x2
-	RTV_MTU                                 = 0x1
-	RTV_RPIPE                               = 0x8
-	RTV_RTT                                 = 0x40
-	RTV_RTTVAR                              = 0x80
-	RTV_SPIPE                               = 0x10
-	RTV_SSTHRESH                            = 0x20
-	RUSAGE_CHILDREN                         = -0x1
-	RUSAGE_SELF                             = 0x0
-	SAE_ASSOCID_ALL                         = 0xffffffff
-	SAE_ASSOCID_ANY                         = 0x0
-	SAE_CONNID_ALL                          = 0xffffffff
-	SAE_CONNID_ANY                          = 0x0
-	SCM_CREDS                               = 0x3
-	SCM_RIGHTS                              = 0x1
-	SCM_TIMESTAMP                           = 0x2
-	SCM_TIMESTAMP_MONOTONIC                 = 0x4
-	SEEK_CUR                                = 0x1
-	SEEK_DATA                               = 0x4
-	SEEK_END                                = 0x2
-	SEEK_HOLE                               = 0x3
-	SEEK_SET                                = 0x0
-	SF_APPEND                               = 0x40000
-	SF_ARCHIVED                             = 0x10000
-	SF_DATALESS                             = 0x40000000
-	SF_FIRMLINK                             = 0x800000
-	SF_IMMUTABLE                            = 0x20000
-	SF_NOUNLINK                             = 0x100000
-	SF_RESTRICTED                           = 0x80000
-	SF_SETTABLE                             = 0x3fff0000
-	SF_SUPPORTED                            = 0x9f0000
-	SF_SYNTHETIC                            = 0xc0000000
-	SHUT_RD                                 = 0x0
-	SHUT_RDWR                               = 0x2
-	SHUT_WR                                 = 0x1
-	SIOCADDMULTI                            = 0x80206931
-	SIOCAIFADDR                             = 0x8040691a
-	SIOCARPIPLL                             = 0xc0206928
-	SIOCATMARK                              = 0x40047307
-	SIOCAUTOADDR                            = 0xc0206926
-	SIOCAUTONETMASK                         = 0x80206927
-	SIOCDELMULTI                            = 0x80206932
-	SIOCDIFADDR                             = 0x80206919
-	SIOCDIFPHYADDR                          = 0x80206941
-	SIOCGDRVSPEC                            = 0xc028697b
-	SIOCGETVLAN                             = 0xc020697f
-	SIOCGHIWAT                              = 0x40047301
-	SIOCGIF6LOWPAN                          = 0xc02069c5
-	SIOCGIFADDR                             = 0xc0206921
-	SIOCGIFALTMTU                           = 0xc0206948
-	SIOCGIFASYNCMAP                         = 0xc020697c
-	SIOCGIFBOND                             = 0xc0206947
-	SIOCGIFBRDADDR                          = 0xc0206923
-	SIOCGIFCAP                              = 0xc020695b
-	SIOCGIFCONF                             = 0xc00c6924
-	SIOCGIFDEVMTU                           = 0xc0206944
-	SIOCGIFDSTADDR                          = 0xc0206922
-	SIOCGIFFLAGS                            = 0xc0206911
-	SIOCGIFFUNCTIONALTYPE                   = 0xc02069ad
-	SIOCGIFGENERIC                          = 0xc020693a
-	SIOCGIFKPI                              = 0xc0206987
-	SIOCGIFMAC                              = 0xc0206982
-	SIOCGIFMEDIA                            = 0xc02c6938
-	SIOCGIFMETRIC                           = 0xc0206917
-	SIOCGIFMTU                              = 0xc0206933
-	SIOCGIFNETMASK                          = 0xc0206925
-	SIOCGIFPDSTADDR                         = 0xc0206940
-	SIOCGIFPHYS                             = 0xc0206935
-	SIOCGIFPSRCADDR                         = 0xc020693f
-	SIOCGIFSTATUS                           = 0xc331693d
-	SIOCGIFVLAN                             = 0xc020697f
-	SIOCGIFWAKEFLAGS                        = 0xc0206988
-	SIOCGIFXMEDIA                           = 0xc02c6948
-	SIOCGLOWAT                              = 0x40047303
-	SIOCGPGRP                               = 0x40047309
-	SIOCIFCREATE                            = 0xc0206978
-	SIOCIFCREATE2                           = 0xc020697a
-	SIOCIFDESTROY                           = 0x80206979
-	SIOCIFGCLONERS                          = 0xc0106981
-	SIOCRSLVMULTI                           = 0xc010693b
-	SIOCSDRVSPEC                            = 0x8028697b
-	SIOCSETVLAN                             = 0x8020697e
-	SIOCSHIWAT                              = 0x80047300
-	SIOCSIF6LOWPAN                          = 0x802069c4
-	SIOCSIFADDR                             = 0x8020690c
-	SIOCSIFALTMTU                           = 0x80206945
-	SIOCSIFASYNCMAP                         = 0x8020697d
-	SIOCSIFBOND                             = 0x80206946
-	SIOCSIFBRDADDR                          = 0x80206913
-	SIOCSIFCAP                              = 0x8020695a
-	SIOCSIFDSTADDR                          = 0x8020690e
-	SIOCSIFFLAGS                            = 0x80206910
-	SIOCSIFGENERIC                          = 0x80206939
-	SIOCSIFKPI                              = 0x80206986
-	SIOCSIFLLADDR                           = 0x8020693c
-	SIOCSIFMAC                              = 0x80206983
-	SIOCSIFMEDIA                            = 0xc0206937
-	SIOCSIFMETRIC                           = 0x80206918
-	SIOCSIFMTU                              = 0x80206934
-	SIOCSIFNETMASK                          = 0x80206916
-	SIOCSIFPHYADDR                          = 0x8040693e
-	SIOCSIFPHYS                             = 0x80206936
-	SIOCSIFVLAN                             = 0x8020697e
-	SIOCSLOWAT                              = 0x80047302
-	SIOCSPGRP                               = 0x80047308
-	SOCK_DGRAM                              = 0x2
-	SOCK_MAXADDRLEN                         = 0xff
-	SOCK_RAW                                = 0x3
-	SOCK_RDM                                = 0x4
-	SOCK_SEQPACKET                          = 0x5
-	SOCK_STREAM                             = 0x1
-	SOL_LOCAL                               = 0x0
-	SOL_SOCKET                              = 0xffff
-	SOMAXCONN                               = 0x80
-	SO_ACCEPTCONN                           = 0x2
-	SO_BROADCAST                            = 0x20
-	SO_DEBUG                                = 0x1
-	SO_DONTROUTE                            = 0x10
-	SO_DONTTRUNC                            = 0x2000
-	SO_ERROR                                = 0x1007
-	SO_KEEPALIVE                            = 0x8
-	SO_LABEL                                = 0x1010
-	SO_LINGER                               = 0x80
-	SO_LINGER_SEC                           = 0x1080
-	SO_NETSVC_MARKING_LEVEL                 = 0x1119
-	SO_NET_SERVICE_TYPE                     = 0x1116
-	SO_NKE                                  = 0x1021
-	SO_NOADDRERR                            = 0x1023
-	SO_NOSIGPIPE                            = 0x1022
-	SO_NOTIFYCONFLICT                       = 0x1026
-	SO_NP_EXTENSIONS                        = 0x1083
-	SO_NREAD                                = 0x1020
-	SO_NUMRCVPKT                            = 0x1112
-	SO_NWRITE                               = 0x1024
-	SO_OOBINLINE                            = 0x100
-	SO_PEERLABEL                            = 0x1011
-	SO_RANDOMPORT                           = 0x1082
-	SO_RCVBUF                               = 0x1002
-	SO_RCVLOWAT                             = 0x1004
-	SO_RCVTIMEO                             = 0x1006
-	SO_REUSEADDR                            = 0x4
-	SO_REUSEPORT                            = 0x200
-	SO_REUSESHAREUID                        = 0x1025
-	SO_SNDBUF                               = 0x1001
-	SO_SNDLOWAT                             = 0x1003
-	SO_SNDTIMEO                             = 0x1005
-	SO_TIMESTAMP                            = 0x400
-	SO_TIMESTAMP_MONOTONIC                  = 0x800
-	SO_TRACKER_ATTRIBUTE_FLAGS_APP_APPROVED = 0x1
-	SO_TRACKER_ATTRIBUTE_FLAGS_DOMAIN_SHORT = 0x4
-	SO_TRACKER_ATTRIBUTE_FLAGS_TRACKER      = 0x2
-	SO_TRACKER_TRANSPARENCY_VERSION         = 0x3
-	SO_TYPE                                 = 0x1008
-	SO_UPCALLCLOSEWAIT                      = 0x1027
-	SO_USELOOPBACK                          = 0x40
-	SO_WANTMORE                             = 0x4000
-	SO_WANTOOBFLAG                          = 0x8000
-	S_IEXEC                                 = 0x40
-	S_IFBLK                                 = 0x6000
-	S_IFCHR                                 = 0x2000
-	S_IFDIR                                 = 0x4000
-	S_IFIFO                                 = 0x1000
-	S_IFLNK                                 = 0xa000
-	S_IFMT                                  = 0xf000
-	S_IFREG                                 = 0x8000
-	S_IFSOCK                                = 0xc000
-	S_IFWHT                                 = 0xe000
-	S_IREAD                                 = 0x100
-	S_IRGRP                                 = 0x20
-	S_IROTH                                 = 0x4
-	S_IRUSR                                 = 0x100
-	S_IRWXG                                 = 0x38
-	S_IRWXO                                 = 0x7
-	S_IRWXU                                 = 0x1c0
-	S_ISGID                                 = 0x400
-	S_ISTXT                                 = 0x200
-	S_ISUID                                 = 0x800
-	S_ISVTX                                 = 0x200
-	S_IWGRP                                 = 0x10
-	S_IWOTH                                 = 0x2
-	S_IWRITE                                = 0x80
-	S_IWUSR                                 = 0x80
-	S_IXGRP                                 = 0x8
-	S_IXOTH                                 = 0x1
-	S_IXUSR                                 = 0x40
-	TAB0                                    = 0x0
-	TAB1                                    = 0x400
-	TAB2                                    = 0x800
-	TAB3                                    = 0x4
-	TABDLY                                  = 0xc04
-	TCIFLUSH                                = 0x1
-	TCIOFF                                  = 0x3
-	TCIOFLUSH                               = 0x3
-	TCION                                   = 0x4
-	TCOFLUSH                                = 0x2
-	TCOOFF                                  = 0x1
-	TCOON                                   = 0x2
-	TCPOPT_CC                               = 0xb
-	TCPOPT_CCECHO                           = 0xd
-	TCPOPT_CCNEW                            = 0xc
-	TCPOPT_EOL                              = 0x0
-	TCPOPT_FASTOPEN                         = 0x22
-	TCPOPT_MAXSEG                           = 0x2
-	TCPOPT_NOP                              = 0x1
-	TCPOPT_SACK                             = 0x5
-	TCPOPT_SACK_HDR                         = 0x1010500
-	TCPOPT_SACK_PERMITTED                   = 0x4
-	TCPOPT_SACK_PERMIT_HDR                  = 0x1010402
-	TCPOPT_SIGNATURE                        = 0x13
-	TCPOPT_TIMESTAMP                        = 0x8
-	TCPOPT_TSTAMP_HDR                       = 0x101080a
-	TCPOPT_WINDOW                           = 0x3
-	TCP_CONNECTIONTIMEOUT                   = 0x20
-	TCP_CONNECTION_INFO                     = 0x106
-	TCP_ENABLE_ECN                          = 0x104
-	TCP_FASTOPEN                            = 0x105
-	TCP_KEEPALIVE                           = 0x10
-	TCP_KEEPCNT                             = 0x102
-	TCP_KEEPINTVL                           = 0x101
-	TCP_MAXHLEN                             = 0x3c
-	TCP_MAXOLEN                             = 0x28
-	TCP_MAXSEG                              = 0x2
-	TCP_MAXWIN                              = 0xffff
-	TCP_MAX_SACK                            = 0x4
-	TCP_MAX_WINSHIFT                        = 0xe
-	TCP_MINMSS                              = 0xd8
-	TCP_MSS                                 = 0x200
-	TCP_NODELAY                             = 0x1
-	TCP_NOOPT                               = 0x8
-	TCP_NOPUSH                              = 0x4
-	TCP_NOTSENT_LOWAT                       = 0x201
-	TCP_RXT_CONNDROPTIME                    = 0x80
-	TCP_RXT_FINDROP                         = 0x100
-	TCP_SENDMOREACKS                        = 0x103
-	TCSAFLUSH                               = 0x2
-	TIOCCBRK                                = 0x2000747a
-	TIOCCDTR                                = 0x20007478
-	TIOCCONS                                = 0x80047462
-	TIOCDCDTIMESTAMP                        = 0x40107458
-	TIOCDRAIN                               = 0x2000745e
-	TIOCDSIMICROCODE                        = 0x20007455
-	TIOCEXCL                                = 0x2000740d
-	TIOCEXT                                 = 0x80047460
-	TIOCFLUSH                               = 0x80047410
-	TIOCGDRAINWAIT                          = 0x40047456
-	TIOCGETA                                = 0x40487413
-	TIOCGETD                                = 0x4004741a
-	TIOCGPGRP                               = 0x40047477
-	TIOCGWINSZ                              = 0x40087468
-	TIOCIXOFF                               = 0x20007480
-	TIOCIXON                                = 0x20007481
-	TIOCMBIC                                = 0x8004746b
-	TIOCMBIS                                = 0x8004746c
-	TIOCMGDTRWAIT                           = 0x4004745a
-	TIOCMGET                                = 0x4004746a
-	TIOCMODG                                = 0x40047403
-	TIOCMODS                                = 0x80047404
-	TIOCMSDTRWAIT                           = 0x8004745b
-	TIOCMSET                                = 0x8004746d
-	TIOCM_CAR                               = 0x40
-	TIOCM_CD                                = 0x40
-	TIOCM_CTS                               = 0x20
-	TIOCM_DSR                               = 0x100
-	TIOCM_DTR                               = 0x2
-	TIOCM_LE                                = 0x1
-	TIOCM_RI                                = 0x80
-	TIOCM_RNG                               = 0x80
-	TIOCM_RTS                               = 0x4
-	TIOCM_SR                                = 0x10
-	TIOCM_ST                                = 0x8
-	TIOCNOTTY                               = 0x20007471
-	TIOCNXCL                                = 0x2000740e
-	TIOCOUTQ                                = 0x40047473
-	TIOCPKT                                 = 0x80047470
-	TIOCPKT_DATA                            = 0x0
-	TIOCPKT_DOSTOP                          = 0x20
-	TIOCPKT_FLUSHREAD                       = 0x1
-	TIOCPKT_FLUSHWRITE                      = 0x2
-	TIOCPKT_IOCTL                           = 0x40
-	TIOCPKT_NOSTOP                          = 0x10
-	TIOCPKT_START                           = 0x8
-	TIOCPKT_STOP                            = 0x4
-	TIOCPTYGNAME                            = 0x40807453
-	TIOCPTYGRANT                            = 0x20007454
-	TIOCPTYUNLK                             = 0x20007452
-	TIOCREMOTE                              = 0x80047469
-	TIOCSBRK                                = 0x2000747b
-	TIOCSCONS                               = 0x20007463
-	TIOCSCTTY                               = 0x20007461
-	TIOCSDRAINWAIT                          = 0x80047457
-	TIOCSDTR                                = 0x20007479
-	TIOCSETA                                = 0x80487414
-	TIOCSETAF                               = 0x80487416
-	TIOCSETAW                               = 0x80487415
-	TIOCSETD                                = 0x8004741b
-	TIOCSIG                                 = 0x2000745f
-	TIOCSPGRP                               = 0x80047476
-	TIOCSTART                               = 0x2000746e
-	TIOCSTAT                                = 0x20007465
-	TIOCSTI                                 = 0x80017472
-	TIOCSTOP                                = 0x2000746f
-	TIOCSWINSZ                              = 0x80087467
-	TIOCTIMESTAMP                           = 0x40107459
-	TIOCUCNTL                               = 0x80047466
-	TOSTOP                                  = 0x400000
-	UF_APPEND                               = 0x4
-	UF_COMPRESSED                           = 0x20
-	UF_DATAVAULT                            = 0x80
-	UF_HIDDEN                               = 0x8000
-	UF_IMMUTABLE                            = 0x2
-	UF_NODUMP                               = 0x1
-	UF_OPAQUE                               = 0x8
-	UF_SETTABLE                             = 0xffff
-	UF_TRACKED                              = 0x40
-	VDISCARD                                = 0xf
-	VDSUSP                                  = 0xb
-	VEOF                                    = 0x0
-	VEOL                                    = 0x1
-	VEOL2                                   = 0x2
-	VERASE                                  = 0x3
-	VINTR                                   = 0x8
-	VKILL                                   = 0x5
-	VLNEXT                                  = 0xe
-	VMADDR_CID_ANY                          = 0xffffffff
-	VMADDR_CID_HOST                         = 0x2
-	VMADDR_CID_HYPERVISOR                   = 0x0
-	VMADDR_CID_RESERVED                     = 0x1
-	VMADDR_PORT_ANY                         = 0xffffffff
-	VMIN                                    = 0x10
-	VM_LOADAVG                              = 0x2
-	VM_MACHFACTOR                           = 0x4
-	VM_MAXID                                = 0x6
-	VM_METER                                = 0x1
-	VM_SWAPUSAGE                            = 0x5
-	VQUIT                                   = 0x9
-	VREPRINT                                = 0x6
-	VSTART                                  = 0xc
-	VSTATUS                                 = 0x12
-	VSTOP                                   = 0xd
-	VSUSP                                   = 0xa
-	VT0                                     = 0x0
-	VT1                                     = 0x10000
-	VTDLY                                   = 0x10000
-	VTIME                                   = 0x11
-	VWERASE                                 = 0x4
-	WCONTINUED                              = 0x10
-	WCOREFLAG                               = 0x80
-	WEXITED                                 = 0x4
-	WNOHANG                                 = 0x1
-	WNOWAIT                                 = 0x20
-	WORDSIZE                                = 0x40
-	WSTOPPED                                = 0x8
-	WUNTRACED                               = 0x2
-	XATTR_CREATE                            = 0x2
-	XATTR_NODEFAULT                         = 0x10
-	XATTR_NOFOLLOW                          = 0x1
-	XATTR_NOSECURITY                        = 0x8
-	XATTR_REPLACE                           = 0x4
-	XATTR_SHOWCOMPRESSION                   = 0x20
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x29
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_SYS_CONTROL                    = 0x2
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	AF_VSOCK                          = 0x28
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x51c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CLONE_NOFOLLOW                    = 0x1
+	CLONE_NOOWNERCOPY                 = 0x2
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTLIOCGINFO                       = 0xc0644e03
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0x10a
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_DARWIN                    = 0x10a
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x11
+	EVFILT_THREADMARKER               = 0x11
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	FSOPT_RETURN_REALDEV              = 0x200
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_INFO                = 0x67
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDFILESUPPL                    = 0x68
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPATH_NOFIRMLINK              = 0x66
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GETSIGSINFO                     = 0x69
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_SPECULATIVE_READ                = 0x65
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_6LOWPAN                       = 0x40
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_3542DSTOPTS                  = 0x32
+	IPV6_3542HOPLIMIT                 = 0x2f
+	IPV6_3542HOPOPTS                  = 0x31
+	IPV6_3542NEXTHOP                  = 0x30
+	IPV6_3542PKTINFO                  = 0x2e
+	IPV6_3542RTHDR                    = 0x33
+	IPV6_ADDR_MC_FLAGS_PREFIX         = 0x20
+	IPV6_ADDR_MC_FLAGS_TRANSIENT      = 0x10
+	IPV6_ADDR_MC_FLAGS_UNICAST_BASED  = 0x30
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x3000
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x3d
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x39
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DONTFRAG                       = 0x1c
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCAL_PEERCRED                    = 0x1
+	LOCAL_PEEREPID                    = 0x3
+	LOCAL_PEEREUUID                   = 0x5
+	LOCAL_PEERPID                     = 0x2
+	LOCAL_PEERTOKEN                   = 0x6
+	LOCAL_PEERUUID                    = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_32BIT                         = 0x8000
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MAP_TRANSLATED_ALLOW_EXECUTE      = 0x20000
+	MAP_UNIX03                        = 0x40000
+	MCAST_BLOCK_SOURCE                = 0x54
+	MCAST_EXCLUDE                     = 0x2
+	MCAST_INCLUDE                     = 0x1
+	MCAST_JOIN_GROUP                  = 0x50
+	MCAST_JOIN_SOURCE_GROUP           = 0x52
+	MCAST_LEAVE_GROUP                 = 0x51
+	MCAST_LEAVE_SOURCE_GROUP          = 0x53
+	MCAST_UNBLOCK_SOURCE              = 0x55
+	MCAST_UNDEFINED                   = 0x0
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_EXT_ROOT_DATA_VOL             = 0x1
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_REMOVABLE                     = 0x200
+	MNT_ROOTFS                        = 0x4000
+	MNT_SNAPSHOT                      = 0x40000000
+	MNT_STRICTATIME                   = 0x80000000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0xd7f0f7ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_NOSIGNAL                      = 0x80000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_FLAGS_PRIV                 = 0xa
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xb
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NFDBITS                           = 0x20
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACHTIME                     = 0x100
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NOFOLLOW_ANY                    = 0x20000000
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DEAD                          = 0x20000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_GLOBAL                        = 0x40000000
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLDATA                        = 0x400
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SEEK_CUR                          = 0x1
+	SEEK_DATA                         = 0x4
+	SEEK_END                          = 0x2
+	SEEK_HOLE                         = 0x3
+	SEEK_SET                          = 0x0
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIF6LOWPAN                    = 0xc02069c5
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFFUNCTIONALTYPE             = 0xc02069ad
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGIFXMEDIA                     = 0xc02c6948
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIF6LOWPAN                    = 0x802069c4
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_LOCAL                         = 0x0
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
 )
 
 // Errors
diff --git a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
index c0e0f86..17bba0e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && dragonfly
+// +build amd64,dragonfly
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
index 6c69239..4409001 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && freebsd
+// +build 386,freebsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m32 _const.go
@@ -150,7 +151,6 @@ const (
 	BIOCSETF                       = 0x80084267
 	BIOCSETFNR                     = 0x80084282
 	BIOCSETIF                      = 0x8020426c
-	BIOCSETVLANPCP                 = 0x80044285
 	BIOCSETWF                      = 0x8008427b
 	BIOCSETZBUF                    = 0x800c4281
 	BIOCSHDRCMPLT                  = 0x80044275
@@ -447,7 +447,7 @@ const (
 	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
 	DLT_INFINIBAND                 = 0xf7
 	DLT_IPFILTER                   = 0x74
-	DLT_IPMB_KONTRON               = 0xc7
+	DLT_IPMB                       = 0xc7
 	DLT_IPMB_LINUX                 = 0xd1
 	DLT_IPMI_HPM_2                 = 0x104
 	DLT_IPNET                      = 0xe2
@@ -487,11 +487,10 @@ const (
 	DLT_LINUX_LAPD                 = 0xb1
 	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
 	DLT_LINUX_SLL                  = 0x71
-	DLT_LINUX_SLL2                 = 0x114
 	DLT_LOOP                       = 0x6c
 	DLT_LORATAP                    = 0x10e
 	DLT_LTALK                      = 0x72
-	DLT_MATCHING_MAX               = 0x114
+	DLT_MATCHING_MAX               = 0x113
 	DLT_MATCHING_MIN               = 0x68
 	DLT_MFR                        = 0xb6
 	DLT_MOST                       = 0xd3
@@ -735,7 +734,6 @@ const (
 	IPPROTO_CMTP                   = 0x26
 	IPPROTO_CPHB                   = 0x49
 	IPPROTO_CPNX                   = 0x48
-	IPPROTO_DCCP                   = 0x21
 	IPPROTO_DDP                    = 0x25
 	IPPROTO_DGP                    = 0x56
 	IPPROTO_DIVERT                 = 0x102
@@ -816,6 +814,7 @@ const (
 	IPPROTO_SCTP                   = 0x84
 	IPPROTO_SDRP                   = 0x2a
 	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
 	IPPROTO_SHIM6                  = 0x8c
 	IPPROTO_SKIP                   = 0x39
 	IPPROTO_SPACER                 = 0x7fff
@@ -912,7 +911,6 @@ const (
 	IPV6_V6ONLY                    = 0x1b
 	IPV6_VERSION                   = 0x60
 	IPV6_VERSION_MASK              = 0xf0
-	IPV6_VLAN_PCP                  = 0x4b
 	IP_ADD_MEMBERSHIP              = 0xc
 	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
 	IP_BINDANY                     = 0x18
@@ -991,12 +989,8 @@ const (
 	IP_TOS                         = 0x3
 	IP_TTL                         = 0x4
 	IP_UNBLOCK_SOURCE              = 0x49
-	IP_VLAN_PCP                    = 0x4b
 	ISIG                           = 0x80
 	ISTRIP                         = 0x20
-	ITIMER_PROF                    = 0x2
-	ITIMER_REAL                    = 0x0
-	ITIMER_VIRTUAL                 = 0x1
 	IXANY                          = 0x800
 	IXOFF                          = 0x400
 	IXON                           = 0x200
@@ -1006,6 +1000,7 @@ const (
 	KERN_VERSION                   = 0x4
 	LOCAL_CONNWAIT                 = 0x4
 	LOCAL_CREDS                    = 0x2
+	LOCAL_CREDS_PERSISTENT         = 0x3
 	LOCAL_PEERCRED                 = 0x1
 	LOCAL_VENDOR                   = 0x80000000
 	LOCK_EX                        = 0x2
@@ -1184,8 +1179,6 @@ const (
 	O_NONBLOCK                     = 0x4
 	O_RDONLY                       = 0x0
 	O_RDWR                         = 0x2
-	O_RESOLVE_BENEATH              = 0x800000
-	O_SEARCH                       = 0x40000
 	O_SHLOCK                       = 0x10
 	O_SYNC                         = 0x80
 	O_TRUNC                        = 0x400
@@ -1196,10 +1189,6 @@ const (
 	PARMRK                         = 0x8
 	PARODD                         = 0x2000
 	PENDIN                         = 0x20000000
-	PIOD_READ_D                    = 0x1
-	PIOD_READ_I                    = 0x3
-	PIOD_WRITE_D                   = 0x2
-	PIOD_WRITE_I                   = 0x4
 	PRIO_PGRP                      = 0x1
 	PRIO_PROCESS                   = 0x0
 	PRIO_USER                      = 0x2
@@ -1207,60 +1196,6 @@ const (
 	PROT_NONE                      = 0x0
 	PROT_READ                      = 0x1
 	PROT_WRITE                     = 0x2
-	PTRACE_DEFAULT                 = 0x1
-	PTRACE_EXEC                    = 0x1
-	PTRACE_FORK                    = 0x8
-	PTRACE_LWP                     = 0x10
-	PTRACE_SCE                     = 0x2
-	PTRACE_SCX                     = 0x4
-	PTRACE_SYSCALL                 = 0x6
-	PTRACE_VFORK                   = 0x20
-	PT_ATTACH                      = 0xa
-	PT_CLEARSTEP                   = 0x10
-	PT_CONTINUE                    = 0x7
-	PT_DETACH                      = 0xb
-	PT_FIRSTMACH                   = 0x40
-	PT_FOLLOW_FORK                 = 0x17
-	PT_GETDBREGS                   = 0x25
-	PT_GETFPREGS                   = 0x23
-	PT_GETFSBASE                   = 0x47
-	PT_GETGSBASE                   = 0x49
-	PT_GETLWPLIST                  = 0xf
-	PT_GETNUMLWPS                  = 0xe
-	PT_GETREGS                     = 0x21
-	PT_GETXMMREGS                  = 0x40
-	PT_GETXSTATE                   = 0x45
-	PT_GETXSTATE_INFO              = 0x44
-	PT_GET_EVENT_MASK              = 0x19
-	PT_GET_SC_ARGS                 = 0x1b
-	PT_GET_SC_RET                  = 0x1c
-	PT_IO                          = 0xc
-	PT_KILL                        = 0x8
-	PT_LWPINFO                     = 0xd
-	PT_LWP_EVENTS                  = 0x18
-	PT_READ_D                      = 0x2
-	PT_READ_I                      = 0x1
-	PT_RESUME                      = 0x13
-	PT_SETDBREGS                   = 0x26
-	PT_SETFPREGS                   = 0x24
-	PT_SETFSBASE                   = 0x48
-	PT_SETGSBASE                   = 0x4a
-	PT_SETREGS                     = 0x22
-	PT_SETSTEP                     = 0x11
-	PT_SETXMMREGS                  = 0x41
-	PT_SETXSTATE                   = 0x46
-	PT_SET_EVENT_MASK              = 0x1a
-	PT_STEP                        = 0x9
-	PT_SUSPEND                     = 0x12
-	PT_SYSCALL                     = 0x16
-	PT_TO_SCE                      = 0x14
-	PT_TO_SCX                      = 0x15
-	PT_TRACE_ME                    = 0x0
-	PT_VM_ENTRY                    = 0x29
-	PT_VM_TIMESTAMP                = 0x28
-	PT_WRITE_D                     = 0x5
-	PT_WRITE_I                     = 0x4
-	P_ZONEID                       = 0xc
 	RLIMIT_AS                      = 0xa
 	RLIMIT_CORE                    = 0x4
 	RLIMIT_CPU                     = 0x0
@@ -1385,12 +1320,10 @@ const (
 	SIOCGHWADDR                    = 0xc020693e
 	SIOCGI2C                       = 0xc020693d
 	SIOCGIFADDR                    = 0xc0206921
-	SIOCGIFALIAS                   = 0xc044692d
 	SIOCGIFBRDADDR                 = 0xc0206923
 	SIOCGIFCAP                     = 0xc020691f
 	SIOCGIFCONF                    = 0xc0086924
 	SIOCGIFDESCR                   = 0xc020692a
-	SIOCGIFDOWNREASON              = 0xc058699a
 	SIOCGIFDSTADDR                 = 0xc0206922
 	SIOCGIFFIB                     = 0xc020695c
 	SIOCGIFFLAGS                   = 0xc0206911
@@ -1481,7 +1414,6 @@ const (
 	SO_RCVBUF                      = 0x1002
 	SO_RCVLOWAT                    = 0x1004
 	SO_RCVTIMEO                    = 0x1006
-	SO_RERROR                      = 0x20000
 	SO_REUSEADDR                   = 0x4
 	SO_REUSEPORT                   = 0x200
 	SO_REUSEPORT_LB                = 0x10000
@@ -1540,40 +1472,22 @@ const (
 	TCOFLUSH                       = 0x2
 	TCOOFF                         = 0x1
 	TCOON                          = 0x2
-	TCPOPT_EOL                     = 0x0
-	TCPOPT_FAST_OPEN               = 0x22
-	TCPOPT_MAXSEG                  = 0x2
-	TCPOPT_NOP                     = 0x1
-	TCPOPT_PAD                     = 0x0
-	TCPOPT_SACK                    = 0x5
-	TCPOPT_SACK_PERMITTED          = 0x4
-	TCPOPT_SIGNATURE               = 0x13
-	TCPOPT_TIMESTAMP               = 0x8
-	TCPOPT_WINDOW                  = 0x3
 	TCP_BBR_ACK_COMP_ALG           = 0x448
-	TCP_BBR_ALGORITHM              = 0x43b
 	TCP_BBR_DRAIN_INC_EXTRA        = 0x43c
 	TCP_BBR_DRAIN_PG               = 0x42e
 	TCP_BBR_EXTRA_GAIN             = 0x449
-	TCP_BBR_EXTRA_STATE            = 0x453
-	TCP_BBR_FLOOR_MIN_TSO          = 0x454
-	TCP_BBR_HDWR_PACE              = 0x451
-	TCP_BBR_HOLD_TARGET            = 0x436
 	TCP_BBR_IWINTSO                = 0x42b
 	TCP_BBR_LOWGAIN_FD             = 0x436
 	TCP_BBR_LOWGAIN_HALF           = 0x435
 	TCP_BBR_LOWGAIN_THRESH         = 0x434
 	TCP_BBR_MAX_RTO                = 0x439
 	TCP_BBR_MIN_RTO                = 0x438
-	TCP_BBR_MIN_TOPACEOUT          = 0x455
 	TCP_BBR_ONE_RETRAN             = 0x431
 	TCP_BBR_PACE_CROSS             = 0x442
 	TCP_BBR_PACE_DEL_TAR           = 0x43f
-	TCP_BBR_PACE_OH                = 0x435
 	TCP_BBR_PACE_PER_SEC           = 0x43e
 	TCP_BBR_PACE_SEG_MAX           = 0x440
 	TCP_BBR_PACE_SEG_MIN           = 0x441
-	TCP_BBR_POLICER_DETECT         = 0x457
 	TCP_BBR_PROBE_RTT_GAIN         = 0x44d
 	TCP_BBR_PROBE_RTT_INT          = 0x430
 	TCP_BBR_PROBE_RTT_LEN          = 0x44e
@@ -1582,18 +1496,12 @@ const (
 	TCP_BBR_REC_OVER_HPTS          = 0x43a
 	TCP_BBR_RETRAN_WTSO            = 0x44b
 	TCP_BBR_RWND_IS_APP            = 0x42f
-	TCP_BBR_SEND_IWND_IN_TSO       = 0x44f
 	TCP_BBR_STARTUP_EXIT_EPOCH     = 0x43d
 	TCP_BBR_STARTUP_LOSS_EXIT      = 0x432
 	TCP_BBR_STARTUP_PG             = 0x42d
-	TCP_BBR_TMR_PACE_OH            = 0x448
-	TCP_BBR_TSLIMITS               = 0x434
-	TCP_BBR_TSTMP_RAISES           = 0x456
 	TCP_BBR_UNLIMITED              = 0x43b
 	TCP_BBR_USEDEL_RATE            = 0x437
 	TCP_BBR_USE_LOWGAIN            = 0x433
-	TCP_BBR_USE_RACK_CHEAT         = 0x450
-	TCP_BBR_UTTER_MAX_TSO          = 0x452
 	TCP_CA_NAME_MAX                = 0x10
 	TCP_CCALGOOPT                  = 0x41
 	TCP_CONGESTION                 = 0x40
@@ -1633,7 +1541,6 @@ const (
 	TCP_PCAP_OUT                   = 0x800
 	TCP_RACK_EARLY_RECOV           = 0x423
 	TCP_RACK_EARLY_SEG             = 0x424
-	TCP_RACK_GP_INCREASE           = 0x446
 	TCP_RACK_IDLE_REDUCE_HIGH      = 0x444
 	TCP_RACK_MIN_PACE              = 0x445
 	TCP_RACK_MIN_PACE_SEG          = 0x446
@@ -1647,6 +1554,7 @@ const (
 	TCP_RACK_PRR_SENDALOT          = 0x421
 	TCP_RACK_REORD_FADE            = 0x426
 	TCP_RACK_REORD_THRESH          = 0x425
+	TCP_RACK_SESS_CWV              = 0x42a
 	TCP_RACK_TLP_INC_VAR           = 0x429
 	TCP_RACK_TLP_REDUCE            = 0x41c
 	TCP_RACK_TLP_THRESH            = 0x427
@@ -1786,13 +1694,12 @@ const (
 	EIDRM           = syscall.Errno(0x52)
 	EILSEQ          = syscall.Errno(0x56)
 	EINPROGRESS     = syscall.Errno(0x24)
-	EINTEGRITY      = syscall.Errno(0x61)
 	EINTR           = syscall.Errno(0x4)
 	EINVAL          = syscall.Errno(0x16)
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x61)
+	ELAST           = syscall.Errno(0x60)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
@@ -1935,7 +1842,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1997,7 +1904,6 @@ var errorList = [...]struct {
 	{94, "ECAPMODE", "not permitted in capability mode"},
 	{95, "ENOTRECOVERABLE", "state not recoverable"},
 	{96, "EOWNERDEAD", "previous owner died"},
-	{97, "EINTEGRITY", "integrity check failed"},
 }
 
 // Signal table
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
index dd9163f..64520d3 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && freebsd
+// +build amd64,freebsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -150,7 +151,6 @@ const (
 	BIOCSETF                       = 0x80104267
 	BIOCSETFNR                     = 0x80104282
 	BIOCSETIF                      = 0x8020426c
-	BIOCSETVLANPCP                 = 0x80044285
 	BIOCSETWF                      = 0x8010427b
 	BIOCSETZBUF                    = 0x80184281
 	BIOCSHDRCMPLT                  = 0x80044275
@@ -447,7 +447,7 @@ const (
 	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
 	DLT_INFINIBAND                 = 0xf7
 	DLT_IPFILTER                   = 0x74
-	DLT_IPMB_KONTRON               = 0xc7
+	DLT_IPMB                       = 0xc7
 	DLT_IPMB_LINUX                 = 0xd1
 	DLT_IPMI_HPM_2                 = 0x104
 	DLT_IPNET                      = 0xe2
@@ -487,11 +487,10 @@ const (
 	DLT_LINUX_LAPD                 = 0xb1
 	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
 	DLT_LINUX_SLL                  = 0x71
-	DLT_LINUX_SLL2                 = 0x114
 	DLT_LOOP                       = 0x6c
 	DLT_LORATAP                    = 0x10e
 	DLT_LTALK                      = 0x72
-	DLT_MATCHING_MAX               = 0x114
+	DLT_MATCHING_MAX               = 0x113
 	DLT_MATCHING_MIN               = 0x68
 	DLT_MFR                        = 0xb6
 	DLT_MOST                       = 0xd3
@@ -735,7 +734,6 @@ const (
 	IPPROTO_CMTP                   = 0x26
 	IPPROTO_CPHB                   = 0x49
 	IPPROTO_CPNX                   = 0x48
-	IPPROTO_DCCP                   = 0x21
 	IPPROTO_DDP                    = 0x25
 	IPPROTO_DGP                    = 0x56
 	IPPROTO_DIVERT                 = 0x102
@@ -816,6 +814,7 @@ const (
 	IPPROTO_SCTP                   = 0x84
 	IPPROTO_SDRP                   = 0x2a
 	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
 	IPPROTO_SHIM6                  = 0x8c
 	IPPROTO_SKIP                   = 0x39
 	IPPROTO_SPACER                 = 0x7fff
@@ -912,7 +911,6 @@ const (
 	IPV6_V6ONLY                    = 0x1b
 	IPV6_VERSION                   = 0x60
 	IPV6_VERSION_MASK              = 0xf0
-	IPV6_VLAN_PCP                  = 0x4b
 	IP_ADD_MEMBERSHIP              = 0xc
 	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
 	IP_BINDANY                     = 0x18
@@ -991,12 +989,8 @@ const (
 	IP_TOS                         = 0x3
 	IP_TTL                         = 0x4
 	IP_UNBLOCK_SOURCE              = 0x49
-	IP_VLAN_PCP                    = 0x4b
 	ISIG                           = 0x80
 	ISTRIP                         = 0x20
-	ITIMER_PROF                    = 0x2
-	ITIMER_REAL                    = 0x0
-	ITIMER_VIRTUAL                 = 0x1
 	IXANY                          = 0x800
 	IXOFF                          = 0x400
 	IXON                           = 0x200
@@ -1006,6 +1000,7 @@ const (
 	KERN_VERSION                   = 0x4
 	LOCAL_CONNWAIT                 = 0x4
 	LOCAL_CREDS                    = 0x2
+	LOCAL_CREDS_PERSISTENT         = 0x3
 	LOCAL_PEERCRED                 = 0x1
 	LOCAL_VENDOR                   = 0x80000000
 	LOCK_EX                        = 0x2
@@ -1185,8 +1180,6 @@ const (
 	O_NONBLOCK                     = 0x4
 	O_RDONLY                       = 0x0
 	O_RDWR                         = 0x2
-	O_RESOLVE_BENEATH              = 0x800000
-	O_SEARCH                       = 0x40000
 	O_SHLOCK                       = 0x10
 	O_SYNC                         = 0x80
 	O_TRUNC                        = 0x400
@@ -1197,10 +1190,6 @@ const (
 	PARMRK                         = 0x8
 	PARODD                         = 0x2000
 	PENDIN                         = 0x20000000
-	PIOD_READ_D                    = 0x1
-	PIOD_READ_I                    = 0x3
-	PIOD_WRITE_D                   = 0x2
-	PIOD_WRITE_I                   = 0x4
 	PRIO_PGRP                      = 0x1
 	PRIO_PROCESS                   = 0x0
 	PRIO_USER                      = 0x2
@@ -1208,58 +1197,6 @@ const (
 	PROT_NONE                      = 0x0
 	PROT_READ                      = 0x1
 	PROT_WRITE                     = 0x2
-	PTRACE_DEFAULT                 = 0x1
-	PTRACE_EXEC                    = 0x1
-	PTRACE_FORK                    = 0x8
-	PTRACE_LWP                     = 0x10
-	PTRACE_SCE                     = 0x2
-	PTRACE_SCX                     = 0x4
-	PTRACE_SYSCALL                 = 0x6
-	PTRACE_VFORK                   = 0x20
-	PT_ATTACH                      = 0xa
-	PT_CLEARSTEP                   = 0x10
-	PT_CONTINUE                    = 0x7
-	PT_DETACH                      = 0xb
-	PT_FIRSTMACH                   = 0x40
-	PT_FOLLOW_FORK                 = 0x17
-	PT_GETDBREGS                   = 0x25
-	PT_GETFPREGS                   = 0x23
-	PT_GETFSBASE                   = 0x47
-	PT_GETGSBASE                   = 0x49
-	PT_GETLWPLIST                  = 0xf
-	PT_GETNUMLWPS                  = 0xe
-	PT_GETREGS                     = 0x21
-	PT_GETXSTATE                   = 0x45
-	PT_GETXSTATE_INFO              = 0x44
-	PT_GET_EVENT_MASK              = 0x19
-	PT_GET_SC_ARGS                 = 0x1b
-	PT_GET_SC_RET                  = 0x1c
-	PT_IO                          = 0xc
-	PT_KILL                        = 0x8
-	PT_LWPINFO                     = 0xd
-	PT_LWP_EVENTS                  = 0x18
-	PT_READ_D                      = 0x2
-	PT_READ_I                      = 0x1
-	PT_RESUME                      = 0x13
-	PT_SETDBREGS                   = 0x26
-	PT_SETFPREGS                   = 0x24
-	PT_SETFSBASE                   = 0x48
-	PT_SETGSBASE                   = 0x4a
-	PT_SETREGS                     = 0x22
-	PT_SETSTEP                     = 0x11
-	PT_SETXSTATE                   = 0x46
-	PT_SET_EVENT_MASK              = 0x1a
-	PT_STEP                        = 0x9
-	PT_SUSPEND                     = 0x12
-	PT_SYSCALL                     = 0x16
-	PT_TO_SCE                      = 0x14
-	PT_TO_SCX                      = 0x15
-	PT_TRACE_ME                    = 0x0
-	PT_VM_ENTRY                    = 0x29
-	PT_VM_TIMESTAMP                = 0x28
-	PT_WRITE_D                     = 0x5
-	PT_WRITE_I                     = 0x4
-	P_ZONEID                       = 0xc
 	RLIMIT_AS                      = 0xa
 	RLIMIT_CORE                    = 0x4
 	RLIMIT_CPU                     = 0x0
@@ -1384,12 +1321,10 @@ const (
 	SIOCGHWADDR                    = 0xc020693e
 	SIOCGI2C                       = 0xc020693d
 	SIOCGIFADDR                    = 0xc0206921
-	SIOCGIFALIAS                   = 0xc044692d
 	SIOCGIFBRDADDR                 = 0xc0206923
 	SIOCGIFCAP                     = 0xc020691f
 	SIOCGIFCONF                    = 0xc0106924
 	SIOCGIFDESCR                   = 0xc020692a
-	SIOCGIFDOWNREASON              = 0xc058699a
 	SIOCGIFDSTADDR                 = 0xc0206922
 	SIOCGIFFIB                     = 0xc020695c
 	SIOCGIFFLAGS                   = 0xc0206911
@@ -1480,7 +1415,6 @@ const (
 	SO_RCVBUF                      = 0x1002
 	SO_RCVLOWAT                    = 0x1004
 	SO_RCVTIMEO                    = 0x1006
-	SO_RERROR                      = 0x20000
 	SO_REUSEADDR                   = 0x4
 	SO_REUSEPORT                   = 0x200
 	SO_REUSEPORT_LB                = 0x10000
@@ -1539,40 +1473,22 @@ const (
 	TCOFLUSH                       = 0x2
 	TCOOFF                         = 0x1
 	TCOON                          = 0x2
-	TCPOPT_EOL                     = 0x0
-	TCPOPT_FAST_OPEN               = 0x22
-	TCPOPT_MAXSEG                  = 0x2
-	TCPOPT_NOP                     = 0x1
-	TCPOPT_PAD                     = 0x0
-	TCPOPT_SACK                    = 0x5
-	TCPOPT_SACK_PERMITTED          = 0x4
-	TCPOPT_SIGNATURE               = 0x13
-	TCPOPT_TIMESTAMP               = 0x8
-	TCPOPT_WINDOW                  = 0x3
 	TCP_BBR_ACK_COMP_ALG           = 0x448
-	TCP_BBR_ALGORITHM              = 0x43b
 	TCP_BBR_DRAIN_INC_EXTRA        = 0x43c
 	TCP_BBR_DRAIN_PG               = 0x42e
 	TCP_BBR_EXTRA_GAIN             = 0x449
-	TCP_BBR_EXTRA_STATE            = 0x453
-	TCP_BBR_FLOOR_MIN_TSO          = 0x454
-	TCP_BBR_HDWR_PACE              = 0x451
-	TCP_BBR_HOLD_TARGET            = 0x436
 	TCP_BBR_IWINTSO                = 0x42b
 	TCP_BBR_LOWGAIN_FD             = 0x436
 	TCP_BBR_LOWGAIN_HALF           = 0x435
 	TCP_BBR_LOWGAIN_THRESH         = 0x434
 	TCP_BBR_MAX_RTO                = 0x439
 	TCP_BBR_MIN_RTO                = 0x438
-	TCP_BBR_MIN_TOPACEOUT          = 0x455
 	TCP_BBR_ONE_RETRAN             = 0x431
 	TCP_BBR_PACE_CROSS             = 0x442
 	TCP_BBR_PACE_DEL_TAR           = 0x43f
-	TCP_BBR_PACE_OH                = 0x435
 	TCP_BBR_PACE_PER_SEC           = 0x43e
 	TCP_BBR_PACE_SEG_MAX           = 0x440
 	TCP_BBR_PACE_SEG_MIN           = 0x441
-	TCP_BBR_POLICER_DETECT         = 0x457
 	TCP_BBR_PROBE_RTT_GAIN         = 0x44d
 	TCP_BBR_PROBE_RTT_INT          = 0x430
 	TCP_BBR_PROBE_RTT_LEN          = 0x44e
@@ -1581,18 +1497,12 @@ const (
 	TCP_BBR_REC_OVER_HPTS          = 0x43a
 	TCP_BBR_RETRAN_WTSO            = 0x44b
 	TCP_BBR_RWND_IS_APP            = 0x42f
-	TCP_BBR_SEND_IWND_IN_TSO       = 0x44f
 	TCP_BBR_STARTUP_EXIT_EPOCH     = 0x43d
 	TCP_BBR_STARTUP_LOSS_EXIT      = 0x432
 	TCP_BBR_STARTUP_PG             = 0x42d
-	TCP_BBR_TMR_PACE_OH            = 0x448
-	TCP_BBR_TSLIMITS               = 0x434
-	TCP_BBR_TSTMP_RAISES           = 0x456
 	TCP_BBR_UNLIMITED              = 0x43b
 	TCP_BBR_USEDEL_RATE            = 0x437
 	TCP_BBR_USE_LOWGAIN            = 0x433
-	TCP_BBR_USE_RACK_CHEAT         = 0x450
-	TCP_BBR_UTTER_MAX_TSO          = 0x452
 	TCP_CA_NAME_MAX                = 0x10
 	TCP_CCALGOOPT                  = 0x41
 	TCP_CONGESTION                 = 0x40
@@ -1632,7 +1542,6 @@ const (
 	TCP_PCAP_OUT                   = 0x800
 	TCP_RACK_EARLY_RECOV           = 0x423
 	TCP_RACK_EARLY_SEG             = 0x424
-	TCP_RACK_GP_INCREASE           = 0x446
 	TCP_RACK_IDLE_REDUCE_HIGH      = 0x444
 	TCP_RACK_MIN_PACE              = 0x445
 	TCP_RACK_MIN_PACE_SEG          = 0x446
@@ -1646,6 +1555,7 @@ const (
 	TCP_RACK_PRR_SENDALOT          = 0x421
 	TCP_RACK_REORD_FADE            = 0x426
 	TCP_RACK_REORD_THRESH          = 0x425
+	TCP_RACK_SESS_CWV              = 0x42a
 	TCP_RACK_TLP_INC_VAR           = 0x429
 	TCP_RACK_TLP_REDUCE            = 0x41c
 	TCP_RACK_TLP_THRESH            = 0x427
@@ -1783,13 +1693,12 @@ const (
 	EIDRM           = syscall.Errno(0x52)
 	EILSEQ          = syscall.Errno(0x56)
 	EINPROGRESS     = syscall.Errno(0x24)
-	EINTEGRITY      = syscall.Errno(0x61)
 	EINTR           = syscall.Errno(0x4)
 	EINVAL          = syscall.Errno(0x16)
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x61)
+	ELAST           = syscall.Errno(0x60)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
@@ -1932,7 +1841,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1994,7 +1903,6 @@ var errorList = [...]struct {
 	{94, "ECAPMODE", "not permitted in capability mode"},
 	{95, "ENOTRECOVERABLE", "state not recoverable"},
 	{96, "EOWNERDEAD", "previous owner died"},
-	{97, "EINTEGRITY", "integrity check failed"},
 }
 
 // Signal table
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
index 493a2a7..99e9a0e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && freebsd
+// +build arm,freebsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- _const.go
@@ -150,7 +151,6 @@ const (
 	BIOCSETF                       = 0x80084267
 	BIOCSETFNR                     = 0x80084282
 	BIOCSETIF                      = 0x8020426c
-	BIOCSETVLANPCP                 = 0x80044285
 	BIOCSETWF                      = 0x8008427b
 	BIOCSETZBUF                    = 0x800c4281
 	BIOCSHDRCMPLT                  = 0x80044275
@@ -362,7 +362,7 @@ const (
 	CTL_KERN                       = 0x1
 	CTL_MAXNAME                    = 0x18
 	CTL_NET                        = 0x4
-	DIOCGATTR                      = 0xc148648e
+	DIOCGATTR                      = 0xc144648e
 	DIOCGDELETE                    = 0x80106488
 	DIOCGFLUSH                     = 0x20006487
 	DIOCGFRONTSTUFF                = 0x40086486
@@ -377,7 +377,7 @@ const (
 	DIOCGSTRIPESIZE                = 0x4008648b
 	DIOCSKERNELDUMP                = 0x804c6490
 	DIOCSKERNELDUMP_FREEBSD11      = 0x80046485
-	DIOCZONECMD                    = 0xc078648f
+	DIOCZONECMD                    = 0xc06c648f
 	DLT_A429                       = 0xb8
 	DLT_A653_ICM                   = 0xb9
 	DLT_AIRONET_HEADER             = 0x78
@@ -407,9 +407,7 @@ const (
 	DLT_C_HDLC_WITH_DIR            = 0xcd
 	DLT_DBUS                       = 0xe7
 	DLT_DECT                       = 0xdd
-	DLT_DISPLAYPORT_AUX            = 0x113
 	DLT_DOCSIS                     = 0x8f
-	DLT_DOCSIS31_XRA31             = 0x111
 	DLT_DVB_CI                     = 0xeb
 	DLT_ECONET                     = 0x73
 	DLT_EN10MB                     = 0x1
@@ -419,7 +417,6 @@ const (
 	DLT_ERF                        = 0xc5
 	DLT_ERF_ETH                    = 0xaf
 	DLT_ERF_POS                    = 0xb0
-	DLT_ETHERNET_MPACKET           = 0x112
 	DLT_FC_2                       = 0xe0
 	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
 	DLT_FDDI                       = 0xa
@@ -447,7 +444,7 @@ const (
 	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
 	DLT_INFINIBAND                 = 0xf7
 	DLT_IPFILTER                   = 0x74
-	DLT_IPMB_KONTRON               = 0xc7
+	DLT_IPMB                       = 0xc7
 	DLT_IPMB_LINUX                 = 0xd1
 	DLT_IPMI_HPM_2                 = 0x104
 	DLT_IPNET                      = 0xe2
@@ -487,11 +484,9 @@ const (
 	DLT_LINUX_LAPD                 = 0xb1
 	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
 	DLT_LINUX_SLL                  = 0x71
-	DLT_LINUX_SLL2                 = 0x114
 	DLT_LOOP                       = 0x6c
-	DLT_LORATAP                    = 0x10e
 	DLT_LTALK                      = 0x72
-	DLT_MATCHING_MAX               = 0x114
+	DLT_MATCHING_MAX               = 0x109
 	DLT_MATCHING_MIN               = 0x68
 	DLT_MFR                        = 0xb6
 	DLT_MOST                       = 0xd3
@@ -507,9 +502,7 @@ const (
 	DLT_NFC_LLCP                   = 0xf5
 	DLT_NFLOG                      = 0xef
 	DLT_NG40                       = 0xf4
-	DLT_NORDIC_BLE                 = 0x110
 	DLT_NULL                       = 0x0
-	DLT_OPENFLOW                   = 0x10b
 	DLT_PCI_EXP                    = 0x7d
 	DLT_PFLOG                      = 0x75
 	DLT_PFSYNC                     = 0x79
@@ -533,18 +526,15 @@ const (
 	DLT_RTAC_SERIAL                = 0xfa
 	DLT_SCCP                       = 0x8e
 	DLT_SCTP                       = 0xf8
-	DLT_SDLC                       = 0x10c
 	DLT_SITA                       = 0xc4
 	DLT_SLIP                       = 0x8
 	DLT_SLIP_BSDOS                 = 0xd
 	DLT_STANAG_5066_D_PDU          = 0xed
 	DLT_SUNATM                     = 0x7b
 	DLT_SYMANTEC_FIREWALL          = 0x63
-	DLT_TI_LLN_SNIFFER             = 0x10d
 	DLT_TZSP                       = 0x80
 	DLT_USB                        = 0xba
 	DLT_USBPCAP                    = 0xf9
-	DLT_USB_DARWIN                 = 0x10a
 	DLT_USB_FREEBSD                = 0xba
 	DLT_USB_LINUX                  = 0xbd
 	DLT_USB_LINUX_MMAPPED          = 0xdc
@@ -564,7 +554,6 @@ const (
 	DLT_USER7                      = 0x9a
 	DLT_USER8                      = 0x9b
 	DLT_USER9                      = 0x9c
-	DLT_VSOCK                      = 0x10f
 	DLT_WATTSTOPPER_DLM            = 0x107
 	DLT_WIHART                     = 0xdf
 	DLT_WIRESHARK_UPPER_PDU        = 0xfc
@@ -589,7 +578,6 @@ const (
 	ECHONL                         = 0x10
 	ECHOPRT                        = 0x20
 	EVFILT_AIO                     = -0x3
-	EVFILT_EMPTY                   = -0xd
 	EVFILT_FS                      = -0x9
 	EVFILT_LIO                     = -0xa
 	EVFILT_PROC                    = -0x5
@@ -597,12 +585,11 @@ const (
 	EVFILT_READ                    = -0x1
 	EVFILT_SENDFILE                = -0xc
 	EVFILT_SIGNAL                  = -0x6
-	EVFILT_SYSCOUNT                = 0xd
+	EVFILT_SYSCOUNT                = 0xc
 	EVFILT_TIMER                   = -0x7
 	EVFILT_USER                    = -0xb
 	EVFILT_VNODE                   = -0x4
 	EVFILT_WRITE                   = -0x2
-	EVNAMEMAP_NAME_SIZE            = 0x40
 	EV_ADD                         = 0x1
 	EV_CLEAR                       = 0x20
 	EV_DELETE                      = 0x2
@@ -619,7 +606,6 @@ const (
 	EV_RECEIPT                     = 0x40
 	EV_SYSFLAGS                    = 0xf000
 	EXTA                           = 0x4b00
-	EXTATTR_MAXNAMELEN             = 0xff
 	EXTATTR_NAMESPACE_EMPTY        = 0x0
 	EXTATTR_NAMESPACE_SYSTEM       = 0x2
 	EXTATTR_NAMESPACE_USER         = 0x1
@@ -661,7 +647,6 @@ const (
 	IEXTEN                         = 0x400
 	IFAN_ARRIVAL                   = 0x0
 	IFAN_DEPARTURE                 = 0x1
-	IFCAP_WOL_MAGIC                = 0x2000
 	IFF_ALLMULTI                   = 0x200
 	IFF_ALTPHYS                    = 0x4000
 	IFF_BROADCAST                  = 0x2
@@ -678,7 +663,6 @@ const (
 	IFF_MONITOR                    = 0x40000
 	IFF_MULTICAST                  = 0x8000
 	IFF_NOARP                      = 0x80
-	IFF_NOGROUP                    = 0x800000
 	IFF_OACTIVE                    = 0x400
 	IFF_POINTOPOINT                = 0x10
 	IFF_PPROMISC                   = 0x20000
@@ -735,7 +719,6 @@ const (
 	IPPROTO_CMTP                   = 0x26
 	IPPROTO_CPHB                   = 0x49
 	IPPROTO_CPNX                   = 0x48
-	IPPROTO_DCCP                   = 0x21
 	IPPROTO_DDP                    = 0x25
 	IPPROTO_DGP                    = 0x56
 	IPPROTO_DIVERT                 = 0x102
@@ -816,6 +799,7 @@ const (
 	IPPROTO_SCTP                   = 0x84
 	IPPROTO_SDRP                   = 0x2a
 	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
 	IPPROTO_SHIM6                  = 0x8c
 	IPPROTO_SKIP                   = 0x39
 	IPPROTO_SPACER                 = 0x7fff
@@ -853,7 +837,6 @@ const (
 	IPV6_DSTOPTS                   = 0x32
 	IPV6_FLOWID                    = 0x43
 	IPV6_FLOWINFO_MASK             = 0xffffff0f
-	IPV6_FLOWLABEL_LEN             = 0x14
 	IPV6_FLOWLABEL_MASK            = 0xffff0f00
 	IPV6_FLOWTYPE                  = 0x44
 	IPV6_FRAGTTL                   = 0x78
@@ -874,13 +857,13 @@ const (
 	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
 	IPV6_MAX_MEMBERSHIPS           = 0xfff
 	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
 	IPV6_MMTU                      = 0x500
 	IPV6_MSFILTER                  = 0x4a
 	IPV6_MULTICAST_HOPS            = 0xa
 	IPV6_MULTICAST_IF              = 0x9
 	IPV6_MULTICAST_LOOP            = 0xb
 	IPV6_NEXTHOP                   = 0x30
-	IPV6_ORIGDSTADDR               = 0x48
 	IPV6_PATHMTU                   = 0x2c
 	IPV6_PKTINFO                   = 0x2e
 	IPV6_PORTRANGE                 = 0xe
@@ -892,7 +875,6 @@ const (
 	IPV6_RECVFLOWID                = 0x46
 	IPV6_RECVHOPLIMIT              = 0x25
 	IPV6_RECVHOPOPTS               = 0x27
-	IPV6_RECVORIGDSTADDR           = 0x48
 	IPV6_RECVPATHMTU               = 0x2b
 	IPV6_RECVPKTINFO               = 0x24
 	IPV6_RECVRSSBUCKETID           = 0x47
@@ -912,7 +894,6 @@ const (
 	IPV6_V6ONLY                    = 0x1b
 	IPV6_VERSION                   = 0x60
 	IPV6_VERSION_MASK              = 0xf0
-	IPV6_VLAN_PCP                  = 0x4b
 	IP_ADD_MEMBERSHIP              = 0xc
 	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
 	IP_BINDANY                     = 0x18
@@ -954,8 +935,10 @@ const (
 	IP_MAX_MEMBERSHIPS             = 0xfff
 	IP_MAX_SOCK_MUTE_FILTER        = 0x80
 	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
 	IP_MF                          = 0x2000
 	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
 	IP_MSFILTER                    = 0x4a
 	IP_MSS                         = 0x240
 	IP_MULTICAST_IF                = 0x9
@@ -965,7 +948,6 @@ const (
 	IP_OFFMASK                     = 0x1fff
 	IP_ONESBCAST                   = 0x17
 	IP_OPTIONS                     = 0x1
-	IP_ORIGDSTADDR                 = 0x1b
 	IP_PORTRANGE                   = 0x13
 	IP_PORTRANGE_DEFAULT           = 0x0
 	IP_PORTRANGE_HIGH              = 0x1
@@ -974,7 +956,6 @@ const (
 	IP_RECVFLOWID                  = 0x5d
 	IP_RECVIF                      = 0x14
 	IP_RECVOPTS                    = 0x5
-	IP_RECVORIGDSTADDR             = 0x1b
 	IP_RECVRETOPTS                 = 0x6
 	IP_RECVRSSBUCKETID             = 0x5e
 	IP_RECVTOS                     = 0x44
@@ -991,12 +972,8 @@ const (
 	IP_TOS                         = 0x3
 	IP_TTL                         = 0x4
 	IP_UNBLOCK_SOURCE              = 0x49
-	IP_VLAN_PCP                    = 0x4b
 	ISIG                           = 0x80
 	ISTRIP                         = 0x20
-	ITIMER_PROF                    = 0x2
-	ITIMER_REAL                    = 0x0
-	ITIMER_VIRTUAL                 = 0x1
 	IXANY                          = 0x800
 	IXOFF                          = 0x400
 	IXON                           = 0x200
@@ -1006,6 +983,7 @@ const (
 	KERN_VERSION                   = 0x4
 	LOCAL_CONNWAIT                 = 0x4
 	LOCAL_CREDS                    = 0x2
+	LOCAL_CREDS_PERSISTENT         = 0x3
 	LOCAL_PEERCRED                 = 0x1
 	LOCAL_VENDOR                   = 0x80000000
 	LOCK_EX                        = 0x2
@@ -1093,12 +1071,10 @@ const (
 	MNT_SUSPEND                    = 0x4
 	MNT_SYNCHRONOUS                = 0x2
 	MNT_UNION                      = 0x20
-	MNT_UNTRUSTED                  = 0x800000000
 	MNT_UPDATE                     = 0x10000
-	MNT_UPDATEMASK                 = 0xad8d0807e
+	MNT_UPDATEMASK                 = 0x2d8d0807e
 	MNT_USER                       = 0x8000
-	MNT_VERIFIED                   = 0x400000000
-	MNT_VISFLAGMASK                = 0xffef0ffff
+	MNT_VISFLAGMASK                = 0x3fef0ffff
 	MNT_WAIT                       = 0x1
 	MSG_CMSG_CLOEXEC               = 0x40000
 	MSG_COMPAT                     = 0x8000
@@ -1127,7 +1103,6 @@ const (
 	NFDBITS                        = 0x20
 	NOFLSH                         = 0x80000000
 	NOKERNINFO                     = 0x2000000
-	NOTE_ABSTIME                   = 0x10
 	NOTE_ATTRIB                    = 0x8
 	NOTE_CHILD                     = 0x4
 	NOTE_CLOSE                     = 0x100
@@ -1184,8 +1159,6 @@ const (
 	O_NONBLOCK                     = 0x4
 	O_RDONLY                       = 0x0
 	O_RDWR                         = 0x2
-	O_RESOLVE_BENEATH              = 0x800000
-	O_SEARCH                       = 0x40000
 	O_SHLOCK                       = 0x10
 	O_SYNC                         = 0x80
 	O_TRUNC                        = 0x400
@@ -1196,10 +1169,6 @@ const (
 	PARMRK                         = 0x8
 	PARODD                         = 0x2000
 	PENDIN                         = 0x20000000
-	PIOD_READ_D                    = 0x1
-	PIOD_READ_I                    = 0x3
-	PIOD_WRITE_D                   = 0x2
-	PIOD_WRITE_I                   = 0x4
 	PRIO_PGRP                      = 0x1
 	PRIO_PROCESS                   = 0x0
 	PRIO_USER                      = 0x2
@@ -1207,53 +1176,6 @@ const (
 	PROT_NONE                      = 0x0
 	PROT_READ                      = 0x1
 	PROT_WRITE                     = 0x2
-	PTRACE_DEFAULT                 = 0x1
-	PTRACE_EXEC                    = 0x1
-	PTRACE_FORK                    = 0x8
-	PTRACE_LWP                     = 0x10
-	PTRACE_SCE                     = 0x2
-	PTRACE_SCX                     = 0x4
-	PTRACE_SYSCALL                 = 0x6
-	PTRACE_VFORK                   = 0x20
-	PT_ATTACH                      = 0xa
-	PT_CLEARSTEP                   = 0x10
-	PT_CONTINUE                    = 0x7
-	PT_DETACH                      = 0xb
-	PT_FIRSTMACH                   = 0x40
-	PT_FOLLOW_FORK                 = 0x17
-	PT_GETDBREGS                   = 0x25
-	PT_GETFPREGS                   = 0x23
-	PT_GETLWPLIST                  = 0xf
-	PT_GETNUMLWPS                  = 0xe
-	PT_GETREGS                     = 0x21
-	PT_GETVFPREGS                  = 0x40
-	PT_GET_EVENT_MASK              = 0x19
-	PT_GET_SC_ARGS                 = 0x1b
-	PT_GET_SC_RET                  = 0x1c
-	PT_IO                          = 0xc
-	PT_KILL                        = 0x8
-	PT_LWPINFO                     = 0xd
-	PT_LWP_EVENTS                  = 0x18
-	PT_READ_D                      = 0x2
-	PT_READ_I                      = 0x1
-	PT_RESUME                      = 0x13
-	PT_SETDBREGS                   = 0x26
-	PT_SETFPREGS                   = 0x24
-	PT_SETREGS                     = 0x22
-	PT_SETSTEP                     = 0x11
-	PT_SETVFPREGS                  = 0x41
-	PT_SET_EVENT_MASK              = 0x1a
-	PT_STEP                        = 0x9
-	PT_SUSPEND                     = 0x12
-	PT_SYSCALL                     = 0x16
-	PT_TO_SCE                      = 0x14
-	PT_TO_SCX                      = 0x15
-	PT_TRACE_ME                    = 0x0
-	PT_VM_ENTRY                    = 0x29
-	PT_VM_TIMESTAMP                = 0x28
-	PT_WRITE_D                     = 0x5
-	PT_WRITE_I                     = 0x4
-	P_ZONEID                       = 0xc
 	RLIMIT_AS                      = 0xa
 	RLIMIT_CORE                    = 0x4
 	RLIMIT_CPU                     = 0x0
@@ -1335,6 +1257,7 @@ const (
 	RTV_WEIGHT                     = 0x100
 	RT_ALL_FIBS                    = -0x1
 	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
 	RT_DEFAULT_FIB                 = 0x0
 	RT_HAS_GW                      = 0x80
 	RT_HAS_HEADER                  = 0x10
@@ -1344,17 +1267,15 @@ const (
 	RT_LLE_CACHE                   = 0x100
 	RT_MAY_LOOP                    = 0x8
 	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
 	RT_REJECT                      = 0x20
 	RUSAGE_CHILDREN                = -0x1
 	RUSAGE_SELF                    = 0x0
 	RUSAGE_THREAD                  = 0x1
 	SCM_BINTIME                    = 0x4
 	SCM_CREDS                      = 0x3
-	SCM_MONOTONIC                  = 0x6
-	SCM_REALTIME                   = 0x5
 	SCM_RIGHTS                     = 0x1
 	SCM_TIMESTAMP                  = 0x2
-	SCM_TIME_INFO                  = 0x7
 	SEEK_CUR                       = 0x1
 	SEEK_DATA                      = 0x3
 	SEEK_END                       = 0x2
@@ -1378,12 +1299,10 @@ const (
 	SIOCGHWADDR                    = 0xc020693e
 	SIOCGI2C                       = 0xc020693d
 	SIOCGIFADDR                    = 0xc0206921
-	SIOCGIFALIAS                   = 0xc044692d
 	SIOCGIFBRDADDR                 = 0xc0206923
 	SIOCGIFCAP                     = 0xc020691f
 	SIOCGIFCONF                    = 0xc0086924
 	SIOCGIFDESCR                   = 0xc020692a
-	SIOCGIFDOWNREASON              = 0xc058699a
 	SIOCGIFDSTADDR                 = 0xc0206922
 	SIOCGIFFIB                     = 0xc020695c
 	SIOCGIFFLAGS                   = 0xc0206911
@@ -1399,11 +1318,8 @@ const (
 	SIOCGIFPDSTADDR                = 0xc0206948
 	SIOCGIFPHYS                    = 0xc0206935
 	SIOCGIFPSRCADDR                = 0xc0206947
-	SIOCGIFRSSHASH                 = 0xc0186997
-	SIOCGIFRSSKEY                  = 0xc0946996
 	SIOCGIFSTATUS                  = 0xc331693b
 	SIOCGIFXMEDIA                  = 0xc028698b
-	SIOCGLANPCP                    = 0xc0206998
 	SIOCGLOWAT                     = 0x40047303
 	SIOCGPGRP                      = 0x40047309
 	SIOCGPRIVATE_0                 = 0xc0206950
@@ -1434,7 +1350,6 @@ const (
 	SIOCSIFPHYS                    = 0x80206936
 	SIOCSIFRVNET                   = 0xc020695b
 	SIOCSIFVNET                    = 0xc020695a
-	SIOCSLANPCP                    = 0x80206999
 	SIOCSLOWAT                     = 0x80047302
 	SIOCSPGRP                      = 0x80047308
 	SIOCSTUNFIB                    = 0x8020695f
@@ -1454,7 +1369,6 @@ const (
 	SO_BINTIME                     = 0x2000
 	SO_BROADCAST                   = 0x20
 	SO_DEBUG                       = 0x1
-	SO_DOMAIN                      = 0x1019
 	SO_DONTROUTE                   = 0x10
 	SO_ERROR                       = 0x1007
 	SO_KEEPALIVE                   = 0x8
@@ -1463,7 +1377,6 @@ const (
 	SO_LISTENINCQLEN               = 0x1013
 	SO_LISTENQLEN                  = 0x1012
 	SO_LISTENQLIMIT                = 0x1011
-	SO_MAX_PACING_RATE             = 0x1018
 	SO_NOSIGPIPE                   = 0x800
 	SO_NO_DDP                      = 0x8000
 	SO_NO_OFFLOAD                  = 0x4000
@@ -1474,22 +1387,13 @@ const (
 	SO_RCVBUF                      = 0x1002
 	SO_RCVLOWAT                    = 0x1004
 	SO_RCVTIMEO                    = 0x1006
-	SO_RERROR                      = 0x20000
 	SO_REUSEADDR                   = 0x4
 	SO_REUSEPORT                   = 0x200
-	SO_REUSEPORT_LB                = 0x10000
 	SO_SETFIB                      = 0x1014
 	SO_SNDBUF                      = 0x1001
 	SO_SNDLOWAT                    = 0x1003
 	SO_SNDTIMEO                    = 0x1005
 	SO_TIMESTAMP                   = 0x400
-	SO_TS_BINTIME                  = 0x1
-	SO_TS_CLOCK                    = 0x1017
-	SO_TS_CLOCK_MAX                = 0x3
-	SO_TS_DEFAULT                  = 0x0
-	SO_TS_MONOTONIC                = 0x3
-	SO_TS_REALTIME                 = 0x2
-	SO_TS_REALTIME_MICRO           = 0x0
 	SO_TYPE                        = 0x1008
 	SO_USELOOPBACK                 = 0x40
 	SO_USER_COOKIE                 = 0x1015
@@ -1533,69 +1437,10 @@ const (
 	TCOFLUSH                       = 0x2
 	TCOOFF                         = 0x1
 	TCOON                          = 0x2
-	TCPOPT_EOL                     = 0x0
-	TCPOPT_FAST_OPEN               = 0x22
-	TCPOPT_MAXSEG                  = 0x2
-	TCPOPT_NOP                     = 0x1
-	TCPOPT_PAD                     = 0x0
-	TCPOPT_SACK                    = 0x5
-	TCPOPT_SACK_PERMITTED          = 0x4
-	TCPOPT_SIGNATURE               = 0x13
-	TCPOPT_TIMESTAMP               = 0x8
-	TCPOPT_WINDOW                  = 0x3
-	TCP_BBR_ACK_COMP_ALG           = 0x448
-	TCP_BBR_ALGORITHM              = 0x43b
-	TCP_BBR_DRAIN_INC_EXTRA        = 0x43c
-	TCP_BBR_DRAIN_PG               = 0x42e
-	TCP_BBR_EXTRA_GAIN             = 0x449
-	TCP_BBR_EXTRA_STATE            = 0x453
-	TCP_BBR_FLOOR_MIN_TSO          = 0x454
-	TCP_BBR_HDWR_PACE              = 0x451
-	TCP_BBR_HOLD_TARGET            = 0x436
-	TCP_BBR_IWINTSO                = 0x42b
-	TCP_BBR_LOWGAIN_FD             = 0x436
-	TCP_BBR_LOWGAIN_HALF           = 0x435
-	TCP_BBR_LOWGAIN_THRESH         = 0x434
-	TCP_BBR_MAX_RTO                = 0x439
-	TCP_BBR_MIN_RTO                = 0x438
-	TCP_BBR_MIN_TOPACEOUT          = 0x455
-	TCP_BBR_ONE_RETRAN             = 0x431
-	TCP_BBR_PACE_CROSS             = 0x442
-	TCP_BBR_PACE_DEL_TAR           = 0x43f
-	TCP_BBR_PACE_OH                = 0x435
-	TCP_BBR_PACE_PER_SEC           = 0x43e
-	TCP_BBR_PACE_SEG_MAX           = 0x440
-	TCP_BBR_PACE_SEG_MIN           = 0x441
-	TCP_BBR_POLICER_DETECT         = 0x457
-	TCP_BBR_PROBE_RTT_GAIN         = 0x44d
-	TCP_BBR_PROBE_RTT_INT          = 0x430
-	TCP_BBR_PROBE_RTT_LEN          = 0x44e
-	TCP_BBR_RACK_RTT_USE           = 0x44a
-	TCP_BBR_RECFORCE               = 0x42c
-	TCP_BBR_REC_OVER_HPTS          = 0x43a
-	TCP_BBR_RETRAN_WTSO            = 0x44b
-	TCP_BBR_RWND_IS_APP            = 0x42f
-	TCP_BBR_SEND_IWND_IN_TSO       = 0x44f
-	TCP_BBR_STARTUP_EXIT_EPOCH     = 0x43d
-	TCP_BBR_STARTUP_LOSS_EXIT      = 0x432
-	TCP_BBR_STARTUP_PG             = 0x42d
-	TCP_BBR_TMR_PACE_OH            = 0x448
-	TCP_BBR_TSLIMITS               = 0x434
-	TCP_BBR_TSTMP_RAISES           = 0x456
-	TCP_BBR_UNLIMITED              = 0x43b
-	TCP_BBR_USEDEL_RATE            = 0x437
-	TCP_BBR_USE_LOWGAIN            = 0x433
-	TCP_BBR_USE_RACK_CHEAT         = 0x450
-	TCP_BBR_UTTER_MAX_TSO          = 0x452
 	TCP_CA_NAME_MAX                = 0x10
 	TCP_CCALGOOPT                  = 0x41
 	TCP_CONGESTION                 = 0x40
-	TCP_DATA_AFTER_CLOSE           = 0x44c
-	TCP_DELACK                     = 0x48
 	TCP_FASTOPEN                   = 0x401
-	TCP_FASTOPEN_MAX_COOKIE_LEN    = 0x10
-	TCP_FASTOPEN_MIN_COOKIE_LEN    = 0x4
-	TCP_FASTOPEN_PSK_LEN           = 0x10
 	TCP_FUNCTION_BLK               = 0x2000
 	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
 	TCP_INFO                       = 0x20
@@ -1603,12 +1448,6 @@ const (
 	TCP_KEEPIDLE                   = 0x100
 	TCP_KEEPINIT                   = 0x80
 	TCP_KEEPINTVL                  = 0x200
-	TCP_LOG                        = 0x22
-	TCP_LOGBUF                     = 0x23
-	TCP_LOGDUMP                    = 0x25
-	TCP_LOGDUMPID                  = 0x26
-	TCP_LOGID                      = 0x24
-	TCP_LOG_ID_LEN                 = 0x40
 	TCP_MAXBURST                   = 0x4
 	TCP_MAXHLEN                    = 0x3c
 	TCP_MAXOLEN                    = 0x28
@@ -1624,30 +1463,8 @@ const (
 	TCP_NOPUSH                     = 0x4
 	TCP_PCAP_IN                    = 0x1000
 	TCP_PCAP_OUT                   = 0x800
-	TCP_RACK_EARLY_RECOV           = 0x423
-	TCP_RACK_EARLY_SEG             = 0x424
-	TCP_RACK_GP_INCREASE           = 0x446
-	TCP_RACK_IDLE_REDUCE_HIGH      = 0x444
-	TCP_RACK_MIN_PACE              = 0x445
-	TCP_RACK_MIN_PACE_SEG          = 0x446
-	TCP_RACK_MIN_TO                = 0x422
-	TCP_RACK_PACE_ALWAYS           = 0x41f
-	TCP_RACK_PACE_MAX_SEG          = 0x41e
-	TCP_RACK_PACE_REDUCE           = 0x41d
-	TCP_RACK_PKT_DELAY             = 0x428
-	TCP_RACK_PROP                  = 0x41b
-	TCP_RACK_PROP_RATE             = 0x420
-	TCP_RACK_PRR_SENDALOT          = 0x421
-	TCP_RACK_REORD_FADE            = 0x426
-	TCP_RACK_REORD_THRESH          = 0x425
-	TCP_RACK_TLP_INC_VAR           = 0x429
-	TCP_RACK_TLP_REDUCE            = 0x41c
-	TCP_RACK_TLP_THRESH            = 0x427
-	TCP_RACK_TLP_USE               = 0x447
 	TCP_VENDOR                     = 0x80000000
 	TCSAFLUSH                      = 0x2
-	TIMER_ABSTIME                  = 0x1
-	TIMER_RELTIME                  = 0x0
 	TIOCCBRK                       = 0x2000747a
 	TIOCCDTR                       = 0x20007478
 	TIOCCONS                       = 0x80047462
@@ -1711,8 +1528,6 @@ const (
 	TIOCTIMESTAMP                  = 0x40107459
 	TIOCUCNTL                      = 0x80047466
 	TOSTOP                         = 0x400000
-	UTIME_NOW                      = -0x1
-	UTIME_OMIT                     = -0x2
 	VDISCARD                       = 0xf
 	VDSUSP                         = 0xb
 	VEOF                           = 0x0
@@ -1777,13 +1592,12 @@ const (
 	EIDRM           = syscall.Errno(0x52)
 	EILSEQ          = syscall.Errno(0x56)
 	EINPROGRESS     = syscall.Errno(0x24)
-	EINTEGRITY      = syscall.Errno(0x61)
 	EINTR           = syscall.Errno(0x4)
 	EINVAL          = syscall.Errno(0x16)
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x61)
+	ELAST           = syscall.Errno(0x60)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
@@ -1926,7 +1740,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1988,7 +1802,6 @@ var errorList = [...]struct {
 	{94, "ECAPMODE", "not permitted in capability mode"},
 	{95, "ENOTRECOVERABLE", "state not recoverable"},
 	{96, "EOWNERDEAD", "previous owner died"},
-	{97, "EINTEGRITY", "integrity check failed"},
 }
 
 // Signal table
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
index 8b437b3..4c83771 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && freebsd
+// +build arm64,freebsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -150,7 +151,6 @@ const (
 	BIOCSETF                       = 0x80104267
 	BIOCSETFNR                     = 0x80104282
 	BIOCSETIF                      = 0x8020426c
-	BIOCSETVLANPCP                 = 0x80044285
 	BIOCSETWF                      = 0x8010427b
 	BIOCSETZBUF                    = 0x80184281
 	BIOCSHDRCMPLT                  = 0x80044275
@@ -447,7 +447,7 @@ const (
 	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
 	DLT_INFINIBAND                 = 0xf7
 	DLT_IPFILTER                   = 0x74
-	DLT_IPMB_KONTRON               = 0xc7
+	DLT_IPMB                       = 0xc7
 	DLT_IPMB_LINUX                 = 0xd1
 	DLT_IPMI_HPM_2                 = 0x104
 	DLT_IPNET                      = 0xe2
@@ -487,11 +487,10 @@ const (
 	DLT_LINUX_LAPD                 = 0xb1
 	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
 	DLT_LINUX_SLL                  = 0x71
-	DLT_LINUX_SLL2                 = 0x114
 	DLT_LOOP                       = 0x6c
 	DLT_LORATAP                    = 0x10e
 	DLT_LTALK                      = 0x72
-	DLT_MATCHING_MAX               = 0x114
+	DLT_MATCHING_MAX               = 0x113
 	DLT_MATCHING_MIN               = 0x68
 	DLT_MFR                        = 0xb6
 	DLT_MOST                       = 0xd3
@@ -735,7 +734,6 @@ const (
 	IPPROTO_CMTP                   = 0x26
 	IPPROTO_CPHB                   = 0x49
 	IPPROTO_CPNX                   = 0x48
-	IPPROTO_DCCP                   = 0x21
 	IPPROTO_DDP                    = 0x25
 	IPPROTO_DGP                    = 0x56
 	IPPROTO_DIVERT                 = 0x102
@@ -816,6 +814,7 @@ const (
 	IPPROTO_SCTP                   = 0x84
 	IPPROTO_SDRP                   = 0x2a
 	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
 	IPPROTO_SHIM6                  = 0x8c
 	IPPROTO_SKIP                   = 0x39
 	IPPROTO_SPACER                 = 0x7fff
@@ -912,7 +911,6 @@ const (
 	IPV6_V6ONLY                    = 0x1b
 	IPV6_VERSION                   = 0x60
 	IPV6_VERSION_MASK              = 0xf0
-	IPV6_VLAN_PCP                  = 0x4b
 	IP_ADD_MEMBERSHIP              = 0xc
 	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
 	IP_BINDANY                     = 0x18
@@ -991,12 +989,8 @@ const (
 	IP_TOS                         = 0x3
 	IP_TTL                         = 0x4
 	IP_UNBLOCK_SOURCE              = 0x49
-	IP_VLAN_PCP                    = 0x4b
 	ISIG                           = 0x80
 	ISTRIP                         = 0x20
-	ITIMER_PROF                    = 0x2
-	ITIMER_REAL                    = 0x0
-	ITIMER_VIRTUAL                 = 0x1
 	IXANY                          = 0x800
 	IXOFF                          = 0x400
 	IXON                           = 0x200
@@ -1006,6 +1000,7 @@ const (
 	KERN_VERSION                   = 0x4
 	LOCAL_CONNWAIT                 = 0x4
 	LOCAL_CREDS                    = 0x2
+	LOCAL_CREDS_PERSISTENT         = 0x3
 	LOCAL_PEERCRED                 = 0x1
 	LOCAL_VENDOR                   = 0x80000000
 	LOCK_EX                        = 0x2
@@ -1185,8 +1180,6 @@ const (
 	O_NONBLOCK                     = 0x4
 	O_RDONLY                       = 0x0
 	O_RDWR                         = 0x2
-	O_RESOLVE_BENEATH              = 0x800000
-	O_SEARCH                       = 0x40000
 	O_SHLOCK                       = 0x10
 	O_SYNC                         = 0x80
 	O_TRUNC                        = 0x400
@@ -1197,10 +1190,6 @@ const (
 	PARMRK                         = 0x8
 	PARODD                         = 0x2000
 	PENDIN                         = 0x20000000
-	PIOD_READ_D                    = 0x1
-	PIOD_READ_I                    = 0x3
-	PIOD_WRITE_D                   = 0x2
-	PIOD_WRITE_I                   = 0x4
 	PRIO_PGRP                      = 0x1
 	PRIO_PROCESS                   = 0x0
 	PRIO_USER                      = 0x2
@@ -1208,51 +1197,6 @@ const (
 	PROT_NONE                      = 0x0
 	PROT_READ                      = 0x1
 	PROT_WRITE                     = 0x2
-	PTRACE_DEFAULT                 = 0x1
-	PTRACE_EXEC                    = 0x1
-	PTRACE_FORK                    = 0x8
-	PTRACE_LWP                     = 0x10
-	PTRACE_SCE                     = 0x2
-	PTRACE_SCX                     = 0x4
-	PTRACE_SYSCALL                 = 0x6
-	PTRACE_VFORK                   = 0x20
-	PT_ATTACH                      = 0xa
-	PT_CLEARSTEP                   = 0x10
-	PT_CONTINUE                    = 0x7
-	PT_DETACH                      = 0xb
-	PT_FIRSTMACH                   = 0x40
-	PT_FOLLOW_FORK                 = 0x17
-	PT_GETDBREGS                   = 0x25
-	PT_GETFPREGS                   = 0x23
-	PT_GETLWPLIST                  = 0xf
-	PT_GETNUMLWPS                  = 0xe
-	PT_GETREGS                     = 0x21
-	PT_GET_EVENT_MASK              = 0x19
-	PT_GET_SC_ARGS                 = 0x1b
-	PT_GET_SC_RET                  = 0x1c
-	PT_IO                          = 0xc
-	PT_KILL                        = 0x8
-	PT_LWPINFO                     = 0xd
-	PT_LWP_EVENTS                  = 0x18
-	PT_READ_D                      = 0x2
-	PT_READ_I                      = 0x1
-	PT_RESUME                      = 0x13
-	PT_SETDBREGS                   = 0x26
-	PT_SETFPREGS                   = 0x24
-	PT_SETREGS                     = 0x22
-	PT_SETSTEP                     = 0x11
-	PT_SET_EVENT_MASK              = 0x1a
-	PT_STEP                        = 0x9
-	PT_SUSPEND                     = 0x12
-	PT_SYSCALL                     = 0x16
-	PT_TO_SCE                      = 0x14
-	PT_TO_SCX                      = 0x15
-	PT_TRACE_ME                    = 0x0
-	PT_VM_ENTRY                    = 0x29
-	PT_VM_TIMESTAMP                = 0x28
-	PT_WRITE_D                     = 0x5
-	PT_WRITE_I                     = 0x4
-	P_ZONEID                       = 0xc
 	RLIMIT_AS                      = 0xa
 	RLIMIT_CORE                    = 0x4
 	RLIMIT_CPU                     = 0x0
@@ -1377,12 +1321,10 @@ const (
 	SIOCGHWADDR                    = 0xc020693e
 	SIOCGI2C                       = 0xc020693d
 	SIOCGIFADDR                    = 0xc0206921
-	SIOCGIFALIAS                   = 0xc044692d
 	SIOCGIFBRDADDR                 = 0xc0206923
 	SIOCGIFCAP                     = 0xc020691f
 	SIOCGIFCONF                    = 0xc0106924
 	SIOCGIFDESCR                   = 0xc020692a
-	SIOCGIFDOWNREASON              = 0xc058699a
 	SIOCGIFDSTADDR                 = 0xc0206922
 	SIOCGIFFIB                     = 0xc020695c
 	SIOCGIFFLAGS                   = 0xc0206911
@@ -1473,7 +1415,6 @@ const (
 	SO_RCVBUF                      = 0x1002
 	SO_RCVLOWAT                    = 0x1004
 	SO_RCVTIMEO                    = 0x1006
-	SO_RERROR                      = 0x20000
 	SO_REUSEADDR                   = 0x4
 	SO_REUSEPORT                   = 0x200
 	SO_REUSEPORT_LB                = 0x10000
@@ -1532,40 +1473,22 @@ const (
 	TCOFLUSH                       = 0x2
 	TCOOFF                         = 0x1
 	TCOON                          = 0x2
-	TCPOPT_EOL                     = 0x0
-	TCPOPT_FAST_OPEN               = 0x22
-	TCPOPT_MAXSEG                  = 0x2
-	TCPOPT_NOP                     = 0x1
-	TCPOPT_PAD                     = 0x0
-	TCPOPT_SACK                    = 0x5
-	TCPOPT_SACK_PERMITTED          = 0x4
-	TCPOPT_SIGNATURE               = 0x13
-	TCPOPT_TIMESTAMP               = 0x8
-	TCPOPT_WINDOW                  = 0x3
 	TCP_BBR_ACK_COMP_ALG           = 0x448
-	TCP_BBR_ALGORITHM              = 0x43b
 	TCP_BBR_DRAIN_INC_EXTRA        = 0x43c
 	TCP_BBR_DRAIN_PG               = 0x42e
 	TCP_BBR_EXTRA_GAIN             = 0x449
-	TCP_BBR_EXTRA_STATE            = 0x453
-	TCP_BBR_FLOOR_MIN_TSO          = 0x454
-	TCP_BBR_HDWR_PACE              = 0x451
-	TCP_BBR_HOLD_TARGET            = 0x436
 	TCP_BBR_IWINTSO                = 0x42b
 	TCP_BBR_LOWGAIN_FD             = 0x436
 	TCP_BBR_LOWGAIN_HALF           = 0x435
 	TCP_BBR_LOWGAIN_THRESH         = 0x434
 	TCP_BBR_MAX_RTO                = 0x439
 	TCP_BBR_MIN_RTO                = 0x438
-	TCP_BBR_MIN_TOPACEOUT          = 0x455
 	TCP_BBR_ONE_RETRAN             = 0x431
 	TCP_BBR_PACE_CROSS             = 0x442
 	TCP_BBR_PACE_DEL_TAR           = 0x43f
-	TCP_BBR_PACE_OH                = 0x435
 	TCP_BBR_PACE_PER_SEC           = 0x43e
 	TCP_BBR_PACE_SEG_MAX           = 0x440
 	TCP_BBR_PACE_SEG_MIN           = 0x441
-	TCP_BBR_POLICER_DETECT         = 0x457
 	TCP_BBR_PROBE_RTT_GAIN         = 0x44d
 	TCP_BBR_PROBE_RTT_INT          = 0x430
 	TCP_BBR_PROBE_RTT_LEN          = 0x44e
@@ -1574,18 +1497,12 @@ const (
 	TCP_BBR_REC_OVER_HPTS          = 0x43a
 	TCP_BBR_RETRAN_WTSO            = 0x44b
 	TCP_BBR_RWND_IS_APP            = 0x42f
-	TCP_BBR_SEND_IWND_IN_TSO       = 0x44f
 	TCP_BBR_STARTUP_EXIT_EPOCH     = 0x43d
 	TCP_BBR_STARTUP_LOSS_EXIT      = 0x432
 	TCP_BBR_STARTUP_PG             = 0x42d
-	TCP_BBR_TMR_PACE_OH            = 0x448
-	TCP_BBR_TSLIMITS               = 0x434
-	TCP_BBR_TSTMP_RAISES           = 0x456
 	TCP_BBR_UNLIMITED              = 0x43b
 	TCP_BBR_USEDEL_RATE            = 0x437
 	TCP_BBR_USE_LOWGAIN            = 0x433
-	TCP_BBR_USE_RACK_CHEAT         = 0x450
-	TCP_BBR_UTTER_MAX_TSO          = 0x452
 	TCP_CA_NAME_MAX                = 0x10
 	TCP_CCALGOOPT                  = 0x41
 	TCP_CONGESTION                 = 0x40
@@ -1625,7 +1542,6 @@ const (
 	TCP_PCAP_OUT                   = 0x800
 	TCP_RACK_EARLY_RECOV           = 0x423
 	TCP_RACK_EARLY_SEG             = 0x424
-	TCP_RACK_GP_INCREASE           = 0x446
 	TCP_RACK_IDLE_REDUCE_HIGH      = 0x444
 	TCP_RACK_MIN_PACE              = 0x445
 	TCP_RACK_MIN_PACE_SEG          = 0x446
@@ -1639,6 +1555,7 @@ const (
 	TCP_RACK_PRR_SENDALOT          = 0x421
 	TCP_RACK_REORD_FADE            = 0x426
 	TCP_RACK_REORD_THRESH          = 0x425
+	TCP_RACK_SESS_CWV              = 0x42a
 	TCP_RACK_TLP_INC_VAR           = 0x429
 	TCP_RACK_TLP_REDUCE            = 0x41c
 	TCP_RACK_TLP_THRESH            = 0x427
@@ -1777,13 +1694,12 @@ const (
 	EIDRM           = syscall.Errno(0x52)
 	EILSEQ          = syscall.Errno(0x56)
 	EINPROGRESS     = syscall.Errno(0x24)
-	EINTEGRITY      = syscall.Errno(0x61)
 	EINTR           = syscall.Errno(0x4)
 	EINVAL          = syscall.Errno(0x16)
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x61)
+	ELAST           = syscall.Errno(0x60)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
@@ -1926,7 +1842,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1988,7 +1904,6 @@ var errorList = [...]struct {
 	{94, "ECAPMODE", "not permitted in capability mode"},
 	{95, "ENOTRECOVERABLE", "state not recoverable"},
 	{96, "EOWNERDEAD", "previous owner died"},
-	{97, "EINTEGRITY", "integrity check failed"},
 }
 
 // Signal table
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_riscv64.go
deleted file mode 100644
index 67c02dd..0000000
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_riscv64.go
+++ /dev/null
@@ -1,2147 +0,0 @@
-// mkerrors.sh -m64
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && freebsd
-
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                   = 0x10
-	AF_ARP                         = 0x23
-	AF_ATM                         = 0x1e
-	AF_BLUETOOTH                   = 0x24
-	AF_CCITT                       = 0xa
-	AF_CHAOS                       = 0x5
-	AF_CNT                         = 0x15
-	AF_COIP                        = 0x14
-	AF_DATAKIT                     = 0x9
-	AF_DECnet                      = 0xc
-	AF_DLI                         = 0xd
-	AF_E164                        = 0x1a
-	AF_ECMA                        = 0x8
-	AF_HYLINK                      = 0xf
-	AF_HYPERV                      = 0x2b
-	AF_IEEE80211                   = 0x25
-	AF_IMPLINK                     = 0x3
-	AF_INET                        = 0x2
-	AF_INET6                       = 0x1c
-	AF_INET6_SDP                   = 0x2a
-	AF_INET_SDP                    = 0x28
-	AF_IPX                         = 0x17
-	AF_ISDN                        = 0x1a
-	AF_ISO                         = 0x7
-	AF_LAT                         = 0xe
-	AF_LINK                        = 0x12
-	AF_LOCAL                       = 0x1
-	AF_MAX                         = 0x2b
-	AF_NATM                        = 0x1d
-	AF_NETBIOS                     = 0x6
-	AF_NETGRAPH                    = 0x20
-	AF_OSI                         = 0x7
-	AF_PUP                         = 0x4
-	AF_ROUTE                       = 0x11
-	AF_SCLUSTER                    = 0x22
-	AF_SIP                         = 0x18
-	AF_SLOW                        = 0x21
-	AF_SNA                         = 0xb
-	AF_UNIX                        = 0x1
-	AF_UNSPEC                      = 0x0
-	AF_VENDOR00                    = 0x27
-	AF_VENDOR01                    = 0x29
-	AF_VENDOR03                    = 0x2d
-	AF_VENDOR04                    = 0x2f
-	AF_VENDOR05                    = 0x31
-	AF_VENDOR06                    = 0x33
-	AF_VENDOR07                    = 0x35
-	AF_VENDOR08                    = 0x37
-	AF_VENDOR09                    = 0x39
-	AF_VENDOR10                    = 0x3b
-	AF_VENDOR11                    = 0x3d
-	AF_VENDOR12                    = 0x3f
-	AF_VENDOR13                    = 0x41
-	AF_VENDOR14                    = 0x43
-	AF_VENDOR15                    = 0x45
-	AF_VENDOR16                    = 0x47
-	AF_VENDOR17                    = 0x49
-	AF_VENDOR18                    = 0x4b
-	AF_VENDOR19                    = 0x4d
-	AF_VENDOR20                    = 0x4f
-	AF_VENDOR21                    = 0x51
-	AF_VENDOR22                    = 0x53
-	AF_VENDOR23                    = 0x55
-	AF_VENDOR24                    = 0x57
-	AF_VENDOR25                    = 0x59
-	AF_VENDOR26                    = 0x5b
-	AF_VENDOR27                    = 0x5d
-	AF_VENDOR28                    = 0x5f
-	AF_VENDOR29                    = 0x61
-	AF_VENDOR30                    = 0x63
-	AF_VENDOR31                    = 0x65
-	AF_VENDOR32                    = 0x67
-	AF_VENDOR33                    = 0x69
-	AF_VENDOR34                    = 0x6b
-	AF_VENDOR35                    = 0x6d
-	AF_VENDOR36                    = 0x6f
-	AF_VENDOR37                    = 0x71
-	AF_VENDOR38                    = 0x73
-	AF_VENDOR39                    = 0x75
-	AF_VENDOR40                    = 0x77
-	AF_VENDOR41                    = 0x79
-	AF_VENDOR42                    = 0x7b
-	AF_VENDOR43                    = 0x7d
-	AF_VENDOR44                    = 0x7f
-	AF_VENDOR45                    = 0x81
-	AF_VENDOR46                    = 0x83
-	AF_VENDOR47                    = 0x85
-	ALTWERASE                      = 0x200
-	B0                             = 0x0
-	B1000000                       = 0xf4240
-	B110                           = 0x6e
-	B115200                        = 0x1c200
-	B1200                          = 0x4b0
-	B134                           = 0x86
-	B14400                         = 0x3840
-	B150                           = 0x96
-	B1500000                       = 0x16e360
-	B1800                          = 0x708
-	B19200                         = 0x4b00
-	B200                           = 0xc8
-	B2000000                       = 0x1e8480
-	B230400                        = 0x38400
-	B2400                          = 0x960
-	B2500000                       = 0x2625a0
-	B28800                         = 0x7080
-	B300                           = 0x12c
-	B3000000                       = 0x2dc6c0
-	B3500000                       = 0x3567e0
-	B38400                         = 0x9600
-	B4000000                       = 0x3d0900
-	B460800                        = 0x70800
-	B4800                          = 0x12c0
-	B50                            = 0x32
-	B500000                        = 0x7a120
-	B57600                         = 0xe100
-	B600                           = 0x258
-	B7200                          = 0x1c20
-	B75                            = 0x4b
-	B76800                         = 0x12c00
-	B921600                        = 0xe1000
-	B9600                          = 0x2580
-	BIOCFEEDBACK                   = 0x8004427c
-	BIOCFLUSH                      = 0x20004268
-	BIOCGBLEN                      = 0x40044266
-	BIOCGDIRECTION                 = 0x40044276
-	BIOCGDLT                       = 0x4004426a
-	BIOCGDLTLIST                   = 0xc0104279
-	BIOCGETBUFMODE                 = 0x4004427d
-	BIOCGETIF                      = 0x4020426b
-	BIOCGETZMAX                    = 0x4008427f
-	BIOCGHDRCMPLT                  = 0x40044274
-	BIOCGRSIG                      = 0x40044272
-	BIOCGRTIMEOUT                  = 0x4010426e
-	BIOCGSEESENT                   = 0x40044276
-	BIOCGSTATS                     = 0x4008426f
-	BIOCGTSTAMP                    = 0x40044283
-	BIOCIMMEDIATE                  = 0x80044270
-	BIOCLOCK                       = 0x2000427a
-	BIOCPROMISC                    = 0x20004269
-	BIOCROTZBUF                    = 0x40184280
-	BIOCSBLEN                      = 0xc0044266
-	BIOCSDIRECTION                 = 0x80044277
-	BIOCSDLT                       = 0x80044278
-	BIOCSETBUFMODE                 = 0x8004427e
-	BIOCSETF                       = 0x80104267
-	BIOCSETFNR                     = 0x80104282
-	BIOCSETIF                      = 0x8020426c
-	BIOCSETVLANPCP                 = 0x80044285
-	BIOCSETWF                      = 0x8010427b
-	BIOCSETZBUF                    = 0x80184281
-	BIOCSHDRCMPLT                  = 0x80044275
-	BIOCSRSIG                      = 0x80044273
-	BIOCSRTIMEOUT                  = 0x8010426d
-	BIOCSSEESENT                   = 0x80044277
-	BIOCSTSTAMP                    = 0x80044284
-	BIOCVERSION                    = 0x40044271
-	BPF_A                          = 0x10
-	BPF_ABS                        = 0x20
-	BPF_ADD                        = 0x0
-	BPF_ALIGNMENT                  = 0x8
-	BPF_ALU                        = 0x4
-	BPF_AND                        = 0x50
-	BPF_B                          = 0x10
-	BPF_BUFMODE_BUFFER             = 0x1
-	BPF_BUFMODE_ZBUF               = 0x2
-	BPF_DIV                        = 0x30
-	BPF_H                          = 0x8
-	BPF_IMM                        = 0x0
-	BPF_IND                        = 0x40
-	BPF_JA                         = 0x0
-	BPF_JEQ                        = 0x10
-	BPF_JGE                        = 0x30
-	BPF_JGT                        = 0x20
-	BPF_JMP                        = 0x5
-	BPF_JSET                       = 0x40
-	BPF_K                          = 0x0
-	BPF_LD                         = 0x0
-	BPF_LDX                        = 0x1
-	BPF_LEN                        = 0x80
-	BPF_LSH                        = 0x60
-	BPF_MAJOR_VERSION              = 0x1
-	BPF_MAXBUFSIZE                 = 0x80000
-	BPF_MAXINSNS                   = 0x200
-	BPF_MEM                        = 0x60
-	BPF_MEMWORDS                   = 0x10
-	BPF_MINBUFSIZE                 = 0x20
-	BPF_MINOR_VERSION              = 0x1
-	BPF_MISC                       = 0x7
-	BPF_MOD                        = 0x90
-	BPF_MSH                        = 0xa0
-	BPF_MUL                        = 0x20
-	BPF_NEG                        = 0x80
-	BPF_OR                         = 0x40
-	BPF_RELEASE                    = 0x30bb6
-	BPF_RET                        = 0x6
-	BPF_RSH                        = 0x70
-	BPF_ST                         = 0x2
-	BPF_STX                        = 0x3
-	BPF_SUB                        = 0x10
-	BPF_TAX                        = 0x0
-	BPF_TXA                        = 0x80
-	BPF_T_BINTIME                  = 0x2
-	BPF_T_BINTIME_FAST             = 0x102
-	BPF_T_BINTIME_MONOTONIC        = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
-	BPF_T_FAST                     = 0x100
-	BPF_T_FLAG_MASK                = 0x300
-	BPF_T_FORMAT_MASK              = 0x3
-	BPF_T_MICROTIME                = 0x0
-	BPF_T_MICROTIME_FAST           = 0x100
-	BPF_T_MICROTIME_MONOTONIC      = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
-	BPF_T_MONOTONIC                = 0x200
-	BPF_T_MONOTONIC_FAST           = 0x300
-	BPF_T_NANOTIME                 = 0x1
-	BPF_T_NANOTIME_FAST            = 0x101
-	BPF_T_NANOTIME_MONOTONIC       = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
-	BPF_T_NONE                     = 0x3
-	BPF_T_NORMAL                   = 0x0
-	BPF_W                          = 0x0
-	BPF_X                          = 0x8
-	BPF_XOR                        = 0xa0
-	BRKINT                         = 0x2
-	CAP_ACCEPT                     = 0x200000020000000
-	CAP_ACL_CHECK                  = 0x400000000010000
-	CAP_ACL_DELETE                 = 0x400000000020000
-	CAP_ACL_GET                    = 0x400000000040000
-	CAP_ACL_SET                    = 0x400000000080000
-	CAP_ALL0                       = 0x20007ffffffffff
-	CAP_ALL1                       = 0x4000000001fffff
-	CAP_BIND                       = 0x200000040000000
-	CAP_BINDAT                     = 0x200008000000400
-	CAP_CHFLAGSAT                  = 0x200000000001400
-	CAP_CONNECT                    = 0x200000080000000
-	CAP_CONNECTAT                  = 0x200010000000400
-	CAP_CREATE                     = 0x200000000000040
-	CAP_EVENT                      = 0x400000000000020
-	CAP_EXTATTR_DELETE             = 0x400000000001000
-	CAP_EXTATTR_GET                = 0x400000000002000
-	CAP_EXTATTR_LIST               = 0x400000000004000
-	CAP_EXTATTR_SET                = 0x400000000008000
-	CAP_FCHDIR                     = 0x200000000000800
-	CAP_FCHFLAGS                   = 0x200000000001000
-	CAP_FCHMOD                     = 0x200000000002000
-	CAP_FCHMODAT                   = 0x200000000002400
-	CAP_FCHOWN                     = 0x200000000004000
-	CAP_FCHOWNAT                   = 0x200000000004400
-	CAP_FCNTL                      = 0x200000000008000
-	CAP_FCNTL_ALL                  = 0x78
-	CAP_FCNTL_GETFL                = 0x8
-	CAP_FCNTL_GETOWN               = 0x20
-	CAP_FCNTL_SETFL                = 0x10
-	CAP_FCNTL_SETOWN               = 0x40
-	CAP_FEXECVE                    = 0x200000000000080
-	CAP_FLOCK                      = 0x200000000010000
-	CAP_FPATHCONF                  = 0x200000000020000
-	CAP_FSCK                       = 0x200000000040000
-	CAP_FSTAT                      = 0x200000000080000
-	CAP_FSTATAT                    = 0x200000000080400
-	CAP_FSTATFS                    = 0x200000000100000
-	CAP_FSYNC                      = 0x200000000000100
-	CAP_FTRUNCATE                  = 0x200000000000200
-	CAP_FUTIMES                    = 0x200000000200000
-	CAP_FUTIMESAT                  = 0x200000000200400
-	CAP_GETPEERNAME                = 0x200000100000000
-	CAP_GETSOCKNAME                = 0x200000200000000
-	CAP_GETSOCKOPT                 = 0x200000400000000
-	CAP_IOCTL                      = 0x400000000000080
-	CAP_IOCTLS_ALL                 = 0x7fffffffffffffff
-	CAP_KQUEUE                     = 0x400000000100040
-	CAP_KQUEUE_CHANGE              = 0x400000000100000
-	CAP_KQUEUE_EVENT               = 0x400000000000040
-	CAP_LINKAT_SOURCE              = 0x200020000000400
-	CAP_LINKAT_TARGET              = 0x200000000400400
-	CAP_LISTEN                     = 0x200000800000000
-	CAP_LOOKUP                     = 0x200000000000400
-	CAP_MAC_GET                    = 0x400000000000001
-	CAP_MAC_SET                    = 0x400000000000002
-	CAP_MKDIRAT                    = 0x200000000800400
-	CAP_MKFIFOAT                   = 0x200000001000400
-	CAP_MKNODAT                    = 0x200000002000400
-	CAP_MMAP                       = 0x200000000000010
-	CAP_MMAP_R                     = 0x20000000000001d
-	CAP_MMAP_RW                    = 0x20000000000001f
-	CAP_MMAP_RWX                   = 0x20000000000003f
-	CAP_MMAP_RX                    = 0x20000000000003d
-	CAP_MMAP_W                     = 0x20000000000001e
-	CAP_MMAP_WX                    = 0x20000000000003e
-	CAP_MMAP_X                     = 0x20000000000003c
-	CAP_PDGETPID                   = 0x400000000000200
-	CAP_PDKILL                     = 0x400000000000800
-	CAP_PDWAIT                     = 0x400000000000400
-	CAP_PEELOFF                    = 0x200001000000000
-	CAP_POLL_EVENT                 = 0x400000000000020
-	CAP_PREAD                      = 0x20000000000000d
-	CAP_PWRITE                     = 0x20000000000000e
-	CAP_READ                       = 0x200000000000001
-	CAP_RECV                       = 0x200000000000001
-	CAP_RENAMEAT_SOURCE            = 0x200000004000400
-	CAP_RENAMEAT_TARGET            = 0x200040000000400
-	CAP_RIGHTS_VERSION             = 0x0
-	CAP_RIGHTS_VERSION_00          = 0x0
-	CAP_SEEK                       = 0x20000000000000c
-	CAP_SEEK_TELL                  = 0x200000000000004
-	CAP_SEM_GETVALUE               = 0x400000000000004
-	CAP_SEM_POST                   = 0x400000000000008
-	CAP_SEM_WAIT                   = 0x400000000000010
-	CAP_SEND                       = 0x200000000000002
-	CAP_SETSOCKOPT                 = 0x200002000000000
-	CAP_SHUTDOWN                   = 0x200004000000000
-	CAP_SOCK_CLIENT                = 0x200007780000003
-	CAP_SOCK_SERVER                = 0x200007f60000003
-	CAP_SYMLINKAT                  = 0x200000008000400
-	CAP_TTYHOOK                    = 0x400000000000100
-	CAP_UNLINKAT                   = 0x200000010000400
-	CAP_UNUSED0_44                 = 0x200080000000000
-	CAP_UNUSED0_57                 = 0x300000000000000
-	CAP_UNUSED1_22                 = 0x400000000200000
-	CAP_UNUSED1_57                 = 0x500000000000000
-	CAP_WRITE                      = 0x200000000000002
-	CFLUSH                         = 0xf
-	CLOCAL                         = 0x8000
-	CLOCK_BOOTTIME                 = 0x5
-	CLOCK_MONOTONIC                = 0x4
-	CLOCK_MONOTONIC_COARSE         = 0xc
-	CLOCK_MONOTONIC_FAST           = 0xc
-	CLOCK_MONOTONIC_PRECISE        = 0xb
-	CLOCK_PROCESS_CPUTIME_ID       = 0xf
-	CLOCK_PROF                     = 0x2
-	CLOCK_REALTIME                 = 0x0
-	CLOCK_REALTIME_COARSE          = 0xa
-	CLOCK_REALTIME_FAST            = 0xa
-	CLOCK_REALTIME_PRECISE         = 0x9
-	CLOCK_SECOND                   = 0xd
-	CLOCK_THREAD_CPUTIME_ID        = 0xe
-	CLOCK_UPTIME                   = 0x5
-	CLOCK_UPTIME_FAST              = 0x8
-	CLOCK_UPTIME_PRECISE           = 0x7
-	CLOCK_VIRTUAL                  = 0x1
-	CPUSTATES                      = 0x5
-	CP_IDLE                        = 0x4
-	CP_INTR                        = 0x3
-	CP_NICE                        = 0x1
-	CP_SYS                         = 0x2
-	CP_USER                        = 0x0
-	CREAD                          = 0x800
-	CRTSCTS                        = 0x30000
-	CS5                            = 0x0
-	CS6                            = 0x100
-	CS7                            = 0x200
-	CS8                            = 0x300
-	CSIZE                          = 0x300
-	CSTART                         = 0x11
-	CSTATUS                        = 0x14
-	CSTOP                          = 0x13
-	CSTOPB                         = 0x400
-	CSUSP                          = 0x1a
-	CTL_HW                         = 0x6
-	CTL_KERN                       = 0x1
-	CTL_MAXNAME                    = 0x18
-	CTL_NET                        = 0x4
-	DIOCGATTR                      = 0xc148648e
-	DIOCGDELETE                    = 0x80106488
-	DIOCGFLUSH                     = 0x20006487
-	DIOCGFWHEADS                   = 0x40046483
-	DIOCGFWSECTORS                 = 0x40046482
-	DIOCGIDENT                     = 0x41006489
-	DIOCGKERNELDUMP                = 0xc0986492
-	DIOCGMEDIASIZE                 = 0x40086481
-	DIOCGPHYSPATH                  = 0x4400648d
-	DIOCGPROVIDERNAME              = 0x4400648a
-	DIOCGSECTORSIZE                = 0x40046480
-	DIOCGSTRIPEOFFSET              = 0x4008648c
-	DIOCGSTRIPESIZE                = 0x4008648b
-	DIOCSKERNELDUMP                = 0x80986491
-	DIOCSKERNELDUMP_FREEBSD11      = 0x80046485
-	DIOCSKERNELDUMP_FREEBSD12      = 0x80506490
-	DIOCZONECMD                    = 0xc080648f
-	DLT_A429                       = 0xb8
-	DLT_A653_ICM                   = 0xb9
-	DLT_AIRONET_HEADER             = 0x78
-	DLT_AOS                        = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
-	DLT_ARCNET                     = 0x7
-	DLT_ARCNET_LINUX               = 0x81
-	DLT_ATM_CLIP                   = 0x13
-	DLT_ATM_RFC1483                = 0xb
-	DLT_AURORA                     = 0x7e
-	DLT_AX25                       = 0x3
-	DLT_AX25_KISS                  = 0xca
-	DLT_BACNET_MS_TP               = 0xa5
-	DLT_BLUETOOTH_BREDR_BB         = 0xff
-	DLT_BLUETOOTH_HCI_H4           = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
-	DLT_BLUETOOTH_LE_LL            = 0xfb
-	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
-	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
-	DLT_CAN20B                     = 0xbe
-	DLT_CAN_SOCKETCAN              = 0xe3
-	DLT_CHAOS                      = 0x5
-	DLT_CHDLC                      = 0x68
-	DLT_CISCO_IOS                  = 0x76
-	DLT_CLASS_NETBSD_RAWAF         = 0x2240000
-	DLT_C_HDLC                     = 0x68
-	DLT_C_HDLC_WITH_DIR            = 0xcd
-	DLT_DBUS                       = 0xe7
-	DLT_DECT                       = 0xdd
-	DLT_DISPLAYPORT_AUX            = 0x113
-	DLT_DOCSIS                     = 0x8f
-	DLT_DOCSIS31_XRA31             = 0x111
-	DLT_DVB_CI                     = 0xeb
-	DLT_ECONET                     = 0x73
-	DLT_EN10MB                     = 0x1
-	DLT_EN3MB                      = 0x2
-	DLT_ENC                        = 0x6d
-	DLT_EPON                       = 0x103
-	DLT_ERF                        = 0xc5
-	DLT_ERF_ETH                    = 0xaf
-	DLT_ERF_POS                    = 0xb0
-	DLT_ETHERNET_MPACKET           = 0x112
-	DLT_FC_2                       = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
-	DLT_FDDI                       = 0xa
-	DLT_FLEXRAY                    = 0xd2
-	DLT_FRELAY                     = 0x6b
-	DLT_FRELAY_WITH_DIR            = 0xce
-	DLT_GCOM_SERIAL                = 0xad
-	DLT_GCOM_T1E1                  = 0xac
-	DLT_GPF_F                      = 0xab
-	DLT_GPF_T                      = 0xaa
-	DLT_GPRS_LLC                   = 0xa9
-	DLT_GSMTAP_ABIS                = 0xda
-	DLT_GSMTAP_UM                  = 0xd9
-	DLT_IBM_SN                     = 0x92
-	DLT_IBM_SP                     = 0x91
-	DLT_IEEE802                    = 0x6
-	DLT_IEEE802_11                 = 0x69
-	DLT_IEEE802_11_RADIO           = 0x7f
-	DLT_IEEE802_11_RADIO_AVS       = 0xa3
-	DLT_IEEE802_15_4               = 0xc3
-	DLT_IEEE802_15_4_LINUX         = 0xbf
-	DLT_IEEE802_15_4_NOFCS         = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
-	DLT_IEEE802_16_MAC_CPS         = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
-	DLT_INFINIBAND                 = 0xf7
-	DLT_IPFILTER                   = 0x74
-	DLT_IPMB_KONTRON               = 0xc7
-	DLT_IPMB_LINUX                 = 0xd1
-	DLT_IPMI_HPM_2                 = 0x104
-	DLT_IPNET                      = 0xe2
-	DLT_IPOIB                      = 0xf2
-	DLT_IPV4                       = 0xe4
-	DLT_IPV6                       = 0xe5
-	DLT_IP_OVER_FC                 = 0x7a
-	DLT_ISO_14443                  = 0x108
-	DLT_JUNIPER_ATM1               = 0x89
-	DLT_JUNIPER_ATM2               = 0x87
-	DLT_JUNIPER_ATM_CEMIC          = 0xee
-	DLT_JUNIPER_CHDLC              = 0xb5
-	DLT_JUNIPER_ES                 = 0x84
-	DLT_JUNIPER_ETHER              = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL       = 0xea
-	DLT_JUNIPER_FRELAY             = 0xb4
-	DLT_JUNIPER_GGSN               = 0x85
-	DLT_JUNIPER_ISM                = 0xc2
-	DLT_JUNIPER_MFR                = 0x86
-	DLT_JUNIPER_MLFR               = 0x83
-	DLT_JUNIPER_MLPPP              = 0x82
-	DLT_JUNIPER_MONITOR            = 0xa4
-	DLT_JUNIPER_PIC_PEER           = 0xae
-	DLT_JUNIPER_PPP                = 0xb3
-	DLT_JUNIPER_PPPOE              = 0xa7
-	DLT_JUNIPER_PPPOE_ATM          = 0xa8
-	DLT_JUNIPER_SERVICES           = 0x88
-	DLT_JUNIPER_SRX_E2E            = 0xe9
-	DLT_JUNIPER_ST                 = 0xc8
-	DLT_JUNIPER_VP                 = 0xb7
-	DLT_JUNIPER_VS                 = 0xe8
-	DLT_LAPB_WITH_DIR              = 0xcf
-	DLT_LAPD                       = 0xcb
-	DLT_LIN                        = 0xd4
-	DLT_LINUX_EVDEV                = 0xd8
-	DLT_LINUX_IRDA                 = 0x90
-	DLT_LINUX_LAPD                 = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
-	DLT_LINUX_SLL                  = 0x71
-	DLT_LINUX_SLL2                 = 0x114
-	DLT_LOOP                       = 0x6c
-	DLT_LORATAP                    = 0x10e
-	DLT_LTALK                      = 0x72
-	DLT_MATCHING_MAX               = 0x114
-	DLT_MATCHING_MIN               = 0x68
-	DLT_MFR                        = 0xb6
-	DLT_MOST                       = 0xd3
-	DLT_MPEG_2_TS                  = 0xf3
-	DLT_MPLS                       = 0xdb
-	DLT_MTP2                       = 0x8c
-	DLT_MTP2_WITH_PHDR             = 0x8b
-	DLT_MTP3                       = 0x8d
-	DLT_MUX27010                   = 0xec
-	DLT_NETANALYZER                = 0xf0
-	DLT_NETANALYZER_TRANSPARENT    = 0xf1
-	DLT_NETLINK                    = 0xfd
-	DLT_NFC_LLCP                   = 0xf5
-	DLT_NFLOG                      = 0xef
-	DLT_NG40                       = 0xf4
-	DLT_NORDIC_BLE                 = 0x110
-	DLT_NULL                       = 0x0
-	DLT_OPENFLOW                   = 0x10b
-	DLT_PCI_EXP                    = 0x7d
-	DLT_PFLOG                      = 0x75
-	DLT_PFSYNC                     = 0x79
-	DLT_PKTAP                      = 0x102
-	DLT_PPI                        = 0xc0
-	DLT_PPP                        = 0x9
-	DLT_PPP_BSDOS                  = 0xe
-	DLT_PPP_ETHER                  = 0x33
-	DLT_PPP_PPPD                   = 0xa6
-	DLT_PPP_SERIAL                 = 0x32
-	DLT_PPP_WITH_DIR               = 0xcc
-	DLT_PPP_WITH_DIRECTION         = 0xa6
-	DLT_PRISM_HEADER               = 0x77
-	DLT_PROFIBUS_DL                = 0x101
-	DLT_PRONET                     = 0x4
-	DLT_RAIF1                      = 0xc6
-	DLT_RAW                        = 0xc
-	DLT_RDS                        = 0x109
-	DLT_REDBACK_SMARTEDGE          = 0x20
-	DLT_RIO                        = 0x7c
-	DLT_RTAC_SERIAL                = 0xfa
-	DLT_SCCP                       = 0x8e
-	DLT_SCTP                       = 0xf8
-	DLT_SDLC                       = 0x10c
-	DLT_SITA                       = 0xc4
-	DLT_SLIP                       = 0x8
-	DLT_SLIP_BSDOS                 = 0xd
-	DLT_STANAG_5066_D_PDU          = 0xed
-	DLT_SUNATM                     = 0x7b
-	DLT_SYMANTEC_FIREWALL          = 0x63
-	DLT_TI_LLN_SNIFFER             = 0x10d
-	DLT_TZSP                       = 0x80
-	DLT_USB                        = 0xba
-	DLT_USBPCAP                    = 0xf9
-	DLT_USB_DARWIN                 = 0x10a
-	DLT_USB_FREEBSD                = 0xba
-	DLT_USB_LINUX                  = 0xbd
-	DLT_USB_LINUX_MMAPPED          = 0xdc
-	DLT_USER0                      = 0x93
-	DLT_USER1                      = 0x94
-	DLT_USER10                     = 0x9d
-	DLT_USER11                     = 0x9e
-	DLT_USER12                     = 0x9f
-	DLT_USER13                     = 0xa0
-	DLT_USER14                     = 0xa1
-	DLT_USER15                     = 0xa2
-	DLT_USER2                      = 0x95
-	DLT_USER3                      = 0x96
-	DLT_USER4                      = 0x97
-	DLT_USER5                      = 0x98
-	DLT_USER6                      = 0x99
-	DLT_USER7                      = 0x9a
-	DLT_USER8                      = 0x9b
-	DLT_USER9                      = 0x9c
-	DLT_VSOCK                      = 0x10f
-	DLT_WATTSTOPPER_DLM            = 0x107
-	DLT_WIHART                     = 0xdf
-	DLT_WIRESHARK_UPPER_PDU        = 0xfc
-	DLT_X2E_SERIAL                 = 0xd5
-	DLT_X2E_XORAYA                 = 0xd6
-	DLT_ZWAVE_R1_R2                = 0x105
-	DLT_ZWAVE_R3                   = 0x106
-	DT_BLK                         = 0x6
-	DT_CHR                         = 0x2
-	DT_DIR                         = 0x4
-	DT_FIFO                        = 0x1
-	DT_LNK                         = 0xa
-	DT_REG                         = 0x8
-	DT_SOCK                        = 0xc
-	DT_UNKNOWN                     = 0x0
-	DT_WHT                         = 0xe
-	ECHO                           = 0x8
-	ECHOCTL                        = 0x40
-	ECHOE                          = 0x2
-	ECHOK                          = 0x4
-	ECHOKE                         = 0x1
-	ECHONL                         = 0x10
-	ECHOPRT                        = 0x20
-	EHE_DEAD_PRIORITY              = -0x1
-	EVFILT_AIO                     = -0x3
-	EVFILT_EMPTY                   = -0xd
-	EVFILT_FS                      = -0x9
-	EVFILT_LIO                     = -0xa
-	EVFILT_PROC                    = -0x5
-	EVFILT_PROCDESC                = -0x8
-	EVFILT_READ                    = -0x1
-	EVFILT_SENDFILE                = -0xc
-	EVFILT_SIGNAL                  = -0x6
-	EVFILT_SYSCOUNT                = 0xd
-	EVFILT_TIMER                   = -0x7
-	EVFILT_USER                    = -0xb
-	EVFILT_VNODE                   = -0x4
-	EVFILT_WRITE                   = -0x2
-	EVNAMEMAP_NAME_SIZE            = 0x40
-	EV_ADD                         = 0x1
-	EV_CLEAR                       = 0x20
-	EV_DELETE                      = 0x2
-	EV_DISABLE                     = 0x8
-	EV_DISPATCH                    = 0x80
-	EV_DROP                        = 0x1000
-	EV_ENABLE                      = 0x4
-	EV_EOF                         = 0x8000
-	EV_ERROR                       = 0x4000
-	EV_FLAG1                       = 0x2000
-	EV_FLAG2                       = 0x4000
-	EV_FORCEONESHOT                = 0x100
-	EV_ONESHOT                     = 0x10
-	EV_RECEIPT                     = 0x40
-	EV_SYSFLAGS                    = 0xf000
-	EXTA                           = 0x4b00
-	EXTATTR_MAXNAMELEN             = 0xff
-	EXTATTR_NAMESPACE_EMPTY        = 0x0
-	EXTATTR_NAMESPACE_SYSTEM       = 0x2
-	EXTATTR_NAMESPACE_USER         = 0x1
-	EXTB                           = 0x9600
-	EXTPROC                        = 0x800
-	FD_CLOEXEC                     = 0x1
-	FD_NONE                        = -0xc8
-	FD_SETSIZE                     = 0x400
-	FLUSHO                         = 0x800000
-	F_ADD_SEALS                    = 0x13
-	F_CANCEL                       = 0x5
-	F_DUP2FD                       = 0xa
-	F_DUP2FD_CLOEXEC               = 0x12
-	F_DUPFD                        = 0x0
-	F_DUPFD_CLOEXEC                = 0x11
-	F_GETFD                        = 0x1
-	F_GETFL                        = 0x3
-	F_GETLK                        = 0xb
-	F_GETOWN                       = 0x5
-	F_GET_SEALS                    = 0x14
-	F_ISUNIONSTACK                 = 0x15
-	F_KINFO                        = 0x16
-	F_OGETLK                       = 0x7
-	F_OK                           = 0x0
-	F_OSETLK                       = 0x8
-	F_OSETLKW                      = 0x9
-	F_RDAHEAD                      = 0x10
-	F_RDLCK                        = 0x1
-	F_READAHEAD                    = 0xf
-	F_SEAL_GROW                    = 0x4
-	F_SEAL_SEAL                    = 0x1
-	F_SEAL_SHRINK                  = 0x2
-	F_SEAL_WRITE                   = 0x8
-	F_SETFD                        = 0x2
-	F_SETFL                        = 0x4
-	F_SETLK                        = 0xc
-	F_SETLKW                       = 0xd
-	F_SETLK_REMOTE                 = 0xe
-	F_SETOWN                       = 0x6
-	F_UNLCK                        = 0x2
-	F_UNLCKSYS                     = 0x4
-	F_WRLCK                        = 0x3
-	HUPCL                          = 0x4000
-	HW_MACHINE                     = 0x1
-	ICANON                         = 0x100
-	ICMP6_FILTER                   = 0x12
-	ICRNL                          = 0x100
-	IEXTEN                         = 0x400
-	IFAN_ARRIVAL                   = 0x0
-	IFAN_DEPARTURE                 = 0x1
-	IFCAP_WOL_MAGIC                = 0x2000
-	IFF_ALLMULTI                   = 0x200
-	IFF_ALTPHYS                    = 0x4000
-	IFF_BROADCAST                  = 0x2
-	IFF_CANTCHANGE                 = 0x218f72
-	IFF_CANTCONFIG                 = 0x10000
-	IFF_DEBUG                      = 0x4
-	IFF_DRV_OACTIVE                = 0x400
-	IFF_DRV_RUNNING                = 0x40
-	IFF_DYING                      = 0x200000
-	IFF_KNOWSEPOCH                 = 0x20
-	IFF_LINK0                      = 0x1000
-	IFF_LINK1                      = 0x2000
-	IFF_LINK2                      = 0x4000
-	IFF_LOOPBACK                   = 0x8
-	IFF_MONITOR                    = 0x40000
-	IFF_MULTICAST                  = 0x8000
-	IFF_NOARP                      = 0x80
-	IFF_NOGROUP                    = 0x800000
-	IFF_OACTIVE                    = 0x400
-	IFF_POINTOPOINT                = 0x10
-	IFF_PPROMISC                   = 0x20000
-	IFF_PROMISC                    = 0x100
-	IFF_RENAMING                   = 0x400000
-	IFF_RUNNING                    = 0x40
-	IFF_SIMPLEX                    = 0x800
-	IFF_STATICARP                  = 0x80000
-	IFF_UP                         = 0x1
-	IFNAMSIZ                       = 0x10
-	IFT_BRIDGE                     = 0xd1
-	IFT_CARP                       = 0xf8
-	IFT_IEEE1394                   = 0x90
-	IFT_INFINIBAND                 = 0xc7
-	IFT_L2VLAN                     = 0x87
-	IFT_L3IPVLAN                   = 0x88
-	IFT_PPP                        = 0x17
-	IFT_PROPVIRTUAL                = 0x35
-	IGNBRK                         = 0x1
-	IGNCR                          = 0x80
-	IGNPAR                         = 0x4
-	IMAXBEL                        = 0x2000
-	INLCR                          = 0x40
-	INPCK                          = 0x10
-	IN_CLASSA_HOST                 = 0xffffff
-	IN_CLASSA_MAX                  = 0x80
-	IN_CLASSA_NET                  = 0xff000000
-	IN_CLASSA_NSHIFT               = 0x18
-	IN_CLASSB_HOST                 = 0xffff
-	IN_CLASSB_MAX                  = 0x10000
-	IN_CLASSB_NET                  = 0xffff0000
-	IN_CLASSB_NSHIFT               = 0x10
-	IN_CLASSC_HOST                 = 0xff
-	IN_CLASSC_NET                  = 0xffffff00
-	IN_CLASSC_NSHIFT               = 0x8
-	IN_CLASSD_HOST                 = 0xfffffff
-	IN_CLASSD_NET                  = 0xf0000000
-	IN_CLASSD_NSHIFT               = 0x1c
-	IN_LOOPBACKNET                 = 0x7f
-	IN_NETMASK_DEFAULT             = 0xffffff00
-	IN_RFC3021_MASK                = 0xfffffffe
-	IPPROTO_3PC                    = 0x22
-	IPPROTO_ADFS                   = 0x44
-	IPPROTO_AH                     = 0x33
-	IPPROTO_AHIP                   = 0x3d
-	IPPROTO_APES                   = 0x63
-	IPPROTO_ARGUS                  = 0xd
-	IPPROTO_AX25                   = 0x5d
-	IPPROTO_BHA                    = 0x31
-	IPPROTO_BLT                    = 0x1e
-	IPPROTO_BRSATMON               = 0x4c
-	IPPROTO_CARP                   = 0x70
-	IPPROTO_CFTP                   = 0x3e
-	IPPROTO_CHAOS                  = 0x10
-	IPPROTO_CMTP                   = 0x26
-	IPPROTO_CPHB                   = 0x49
-	IPPROTO_CPNX                   = 0x48
-	IPPROTO_DCCP                   = 0x21
-	IPPROTO_DDP                    = 0x25
-	IPPROTO_DGP                    = 0x56
-	IPPROTO_DIVERT                 = 0x102
-	IPPROTO_DONE                   = 0x101
-	IPPROTO_DSTOPTS                = 0x3c
-	IPPROTO_EGP                    = 0x8
-	IPPROTO_EMCON                  = 0xe
-	IPPROTO_ENCAP                  = 0x62
-	IPPROTO_EON                    = 0x50
-	IPPROTO_ESP                    = 0x32
-	IPPROTO_ETHERIP                = 0x61
-	IPPROTO_FRAGMENT               = 0x2c
-	IPPROTO_GGP                    = 0x3
-	IPPROTO_GMTP                   = 0x64
-	IPPROTO_GRE                    = 0x2f
-	IPPROTO_HELLO                  = 0x3f
-	IPPROTO_HIP                    = 0x8b
-	IPPROTO_HMP                    = 0x14
-	IPPROTO_HOPOPTS                = 0x0
-	IPPROTO_ICMP                   = 0x1
-	IPPROTO_ICMPV6                 = 0x3a
-	IPPROTO_IDP                    = 0x16
-	IPPROTO_IDPR                   = 0x23
-	IPPROTO_IDRP                   = 0x2d
-	IPPROTO_IGMP                   = 0x2
-	IPPROTO_IGP                    = 0x55
-	IPPROTO_IGRP                   = 0x58
-	IPPROTO_IL                     = 0x28
-	IPPROTO_INLSP                  = 0x34
-	IPPROTO_INP                    = 0x20
-	IPPROTO_IP                     = 0x0
-	IPPROTO_IPCOMP                 = 0x6c
-	IPPROTO_IPCV                   = 0x47
-	IPPROTO_IPEIP                  = 0x5e
-	IPPROTO_IPIP                   = 0x4
-	IPPROTO_IPPC                   = 0x43
-	IPPROTO_IPV4                   = 0x4
-	IPPROTO_IPV6                   = 0x29
-	IPPROTO_IRTP                   = 0x1c
-	IPPROTO_KRYPTOLAN              = 0x41
-	IPPROTO_LARP                   = 0x5b
-	IPPROTO_LEAF1                  = 0x19
-	IPPROTO_LEAF2                  = 0x1a
-	IPPROTO_MAX                    = 0x100
-	IPPROTO_MEAS                   = 0x13
-	IPPROTO_MH                     = 0x87
-	IPPROTO_MHRP                   = 0x30
-	IPPROTO_MICP                   = 0x5f
-	IPPROTO_MOBILE                 = 0x37
-	IPPROTO_MPLS                   = 0x89
-	IPPROTO_MTP                    = 0x5c
-	IPPROTO_MUX                    = 0x12
-	IPPROTO_ND                     = 0x4d
-	IPPROTO_NHRP                   = 0x36
-	IPPROTO_NONE                   = 0x3b
-	IPPROTO_NSP                    = 0x1f
-	IPPROTO_NVPII                  = 0xb
-	IPPROTO_OLD_DIVERT             = 0xfe
-	IPPROTO_OSPFIGP                = 0x59
-	IPPROTO_PFSYNC                 = 0xf0
-	IPPROTO_PGM                    = 0x71
-	IPPROTO_PIGP                   = 0x9
-	IPPROTO_PIM                    = 0x67
-	IPPROTO_PRM                    = 0x15
-	IPPROTO_PUP                    = 0xc
-	IPPROTO_PVP                    = 0x4b
-	IPPROTO_RAW                    = 0xff
-	IPPROTO_RCCMON                 = 0xa
-	IPPROTO_RDP                    = 0x1b
-	IPPROTO_RESERVED_253           = 0xfd
-	IPPROTO_RESERVED_254           = 0xfe
-	IPPROTO_ROUTING                = 0x2b
-	IPPROTO_RSVP                   = 0x2e
-	IPPROTO_RVD                    = 0x42
-	IPPROTO_SATEXPAK               = 0x40
-	IPPROTO_SATMON                 = 0x45
-	IPPROTO_SCCSP                  = 0x60
-	IPPROTO_SCTP                   = 0x84
-	IPPROTO_SDRP                   = 0x2a
-	IPPROTO_SEND                   = 0x103
-	IPPROTO_SHIM6                  = 0x8c
-	IPPROTO_SKIP                   = 0x39
-	IPPROTO_SPACER                 = 0x7fff
-	IPPROTO_SRPC                   = 0x5a
-	IPPROTO_ST                     = 0x7
-	IPPROTO_SVMTP                  = 0x52
-	IPPROTO_SWIPE                  = 0x35
-	IPPROTO_TCF                    = 0x57
-	IPPROTO_TCP                    = 0x6
-	IPPROTO_TLSP                   = 0x38
-	IPPROTO_TP                     = 0x1d
-	IPPROTO_TPXX                   = 0x27
-	IPPROTO_TRUNK1                 = 0x17
-	IPPROTO_TRUNK2                 = 0x18
-	IPPROTO_TTP                    = 0x54
-	IPPROTO_UDP                    = 0x11
-	IPPROTO_UDPLITE                = 0x88
-	IPPROTO_VINES                  = 0x53
-	IPPROTO_VISA                   = 0x46
-	IPPROTO_VMTP                   = 0x51
-	IPPROTO_WBEXPAK                = 0x4f
-	IPPROTO_WBMON                  = 0x4e
-	IPPROTO_WSN                    = 0x4a
-	IPPROTO_XNET                   = 0xf
-	IPPROTO_XTP                    = 0x24
-	IPV6_AUTOFLOWLABEL             = 0x3b
-	IPV6_BINDANY                   = 0x40
-	IPV6_BINDMULTI                 = 0x41
-	IPV6_BINDV6ONLY                = 0x1b
-	IPV6_CHECKSUM                  = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
-	IPV6_DEFHLIM                   = 0x40
-	IPV6_DONTFRAG                  = 0x3e
-	IPV6_DSTOPTS                   = 0x32
-	IPV6_FLOWID                    = 0x43
-	IPV6_FLOWINFO_MASK             = 0xffffff0f
-	IPV6_FLOWLABEL_LEN             = 0x14
-	IPV6_FLOWLABEL_MASK            = 0xffff0f00
-	IPV6_FLOWTYPE                  = 0x44
-	IPV6_FRAGTTL                   = 0x78
-	IPV6_FW_ADD                    = 0x1e
-	IPV6_FW_DEL                    = 0x1f
-	IPV6_FW_FLUSH                  = 0x20
-	IPV6_FW_GET                    = 0x22
-	IPV6_FW_ZERO                   = 0x21
-	IPV6_HLIMDEC                   = 0x1
-	IPV6_HOPLIMIT                  = 0x2f
-	IPV6_HOPOPTS                   = 0x31
-	IPV6_IPSEC_POLICY              = 0x1c
-	IPV6_JOIN_GROUP                = 0xc
-	IPV6_LEAVE_GROUP               = 0xd
-	IPV6_MAXHLIM                   = 0xff
-	IPV6_MAXOPTHDR                 = 0x800
-	IPV6_MAXPACKET                 = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
-	IPV6_MAX_MEMBERSHIPS           = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
-	IPV6_MMTU                      = 0x500
-	IPV6_MSFILTER                  = 0x4a
-	IPV6_MULTICAST_HOPS            = 0xa
-	IPV6_MULTICAST_IF              = 0x9
-	IPV6_MULTICAST_LOOP            = 0xb
-	IPV6_NEXTHOP                   = 0x30
-	IPV6_ORIGDSTADDR               = 0x48
-	IPV6_PATHMTU                   = 0x2c
-	IPV6_PKTINFO                   = 0x2e
-	IPV6_PORTRANGE                 = 0xe
-	IPV6_PORTRANGE_DEFAULT         = 0x0
-	IPV6_PORTRANGE_HIGH            = 0x1
-	IPV6_PORTRANGE_LOW             = 0x2
-	IPV6_PREFER_TEMPADDR           = 0x3f
-	IPV6_RECVDSTOPTS               = 0x28
-	IPV6_RECVFLOWID                = 0x46
-	IPV6_RECVHOPLIMIT              = 0x25
-	IPV6_RECVHOPOPTS               = 0x27
-	IPV6_RECVORIGDSTADDR           = 0x48
-	IPV6_RECVPATHMTU               = 0x2b
-	IPV6_RECVPKTINFO               = 0x24
-	IPV6_RECVRSSBUCKETID           = 0x47
-	IPV6_RECVRTHDR                 = 0x26
-	IPV6_RECVTCLASS                = 0x39
-	IPV6_RSSBUCKETID               = 0x45
-	IPV6_RSS_LISTEN_BUCKET         = 0x42
-	IPV6_RTHDR                     = 0x33
-	IPV6_RTHDRDSTOPTS              = 0x23
-	IPV6_RTHDR_LOOSE               = 0x0
-	IPV6_RTHDR_STRICT              = 0x1
-	IPV6_RTHDR_TYPE_0              = 0x0
-	IPV6_SOCKOPT_RESERVED1         = 0x3
-	IPV6_TCLASS                    = 0x3d
-	IPV6_UNICAST_HOPS              = 0x4
-	IPV6_USE_MIN_MTU               = 0x2a
-	IPV6_V6ONLY                    = 0x1b
-	IPV6_VERSION                   = 0x60
-	IPV6_VERSION_MASK              = 0xf0
-	IPV6_VLAN_PCP                  = 0x4b
-	IP_ADD_MEMBERSHIP              = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
-	IP_BINDANY                     = 0x18
-	IP_BINDMULTI                   = 0x19
-	IP_BLOCK_SOURCE                = 0x48
-	IP_DEFAULT_MULTICAST_LOOP      = 0x1
-	IP_DEFAULT_MULTICAST_TTL       = 0x1
-	IP_DF                          = 0x4000
-	IP_DONTFRAG                    = 0x43
-	IP_DROP_MEMBERSHIP             = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
-	IP_DUMMYNET3                   = 0x31
-	IP_DUMMYNET_CONFIGURE          = 0x3c
-	IP_DUMMYNET_DEL                = 0x3d
-	IP_DUMMYNET_FLUSH              = 0x3e
-	IP_DUMMYNET_GET                = 0x40
-	IP_FLOWID                      = 0x5a
-	IP_FLOWTYPE                    = 0x5b
-	IP_FW3                         = 0x30
-	IP_FW_ADD                      = 0x32
-	IP_FW_DEL                      = 0x33
-	IP_FW_FLUSH                    = 0x34
-	IP_FW_GET                      = 0x36
-	IP_FW_NAT_CFG                  = 0x38
-	IP_FW_NAT_DEL                  = 0x39
-	IP_FW_NAT_GET_CONFIG           = 0x3a
-	IP_FW_NAT_GET_LOG              = 0x3b
-	IP_FW_RESETLOG                 = 0x37
-	IP_FW_TABLE_ADD                = 0x28
-	IP_FW_TABLE_DEL                = 0x29
-	IP_FW_TABLE_FLUSH              = 0x2a
-	IP_FW_TABLE_GETSIZE            = 0x2b
-	IP_FW_TABLE_LIST               = 0x2c
-	IP_FW_ZERO                     = 0x35
-	IP_HDRINCL                     = 0x2
-	IP_IPSEC_POLICY                = 0x15
-	IP_MAXPACKET                   = 0xffff
-	IP_MAX_GROUP_SRC_FILTER        = 0x200
-	IP_MAX_MEMBERSHIPS             = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER        = 0x80
-	IP_MAX_SOCK_SRC_FILTER         = 0x80
-	IP_MF                          = 0x2000
-	IP_MINTTL                      = 0x42
-	IP_MSFILTER                    = 0x4a
-	IP_MSS                         = 0x240
-	IP_MULTICAST_IF                = 0x9
-	IP_MULTICAST_LOOP              = 0xb
-	IP_MULTICAST_TTL               = 0xa
-	IP_MULTICAST_VIF               = 0xe
-	IP_OFFMASK                     = 0x1fff
-	IP_ONESBCAST                   = 0x17
-	IP_OPTIONS                     = 0x1
-	IP_ORIGDSTADDR                 = 0x1b
-	IP_PORTRANGE                   = 0x13
-	IP_PORTRANGE_DEFAULT           = 0x0
-	IP_PORTRANGE_HIGH              = 0x1
-	IP_PORTRANGE_LOW               = 0x2
-	IP_RECVDSTADDR                 = 0x7
-	IP_RECVFLOWID                  = 0x5d
-	IP_RECVIF                      = 0x14
-	IP_RECVOPTS                    = 0x5
-	IP_RECVORIGDSTADDR             = 0x1b
-	IP_RECVRETOPTS                 = 0x6
-	IP_RECVRSSBUCKETID             = 0x5e
-	IP_RECVTOS                     = 0x44
-	IP_RECVTTL                     = 0x41
-	IP_RETOPTS                     = 0x8
-	IP_RF                          = 0x8000
-	IP_RSSBUCKETID                 = 0x5c
-	IP_RSS_LISTEN_BUCKET           = 0x1a
-	IP_RSVP_OFF                    = 0x10
-	IP_RSVP_ON                     = 0xf
-	IP_RSVP_VIF_OFF                = 0x12
-	IP_RSVP_VIF_ON                 = 0x11
-	IP_SENDSRCADDR                 = 0x7
-	IP_TOS                         = 0x3
-	IP_TTL                         = 0x4
-	IP_UNBLOCK_SOURCE              = 0x49
-	IP_VLAN_PCP                    = 0x4b
-	ISIG                           = 0x80
-	ISTRIP                         = 0x20
-	ITIMER_PROF                    = 0x2
-	ITIMER_REAL                    = 0x0
-	ITIMER_VIRTUAL                 = 0x1
-	IXANY                          = 0x800
-	IXOFF                          = 0x400
-	IXON                           = 0x200
-	KERN_HOSTNAME                  = 0xa
-	KERN_OSRELEASE                 = 0x2
-	KERN_OSTYPE                    = 0x1
-	KERN_VERSION                   = 0x4
-	LOCAL_CONNWAIT                 = 0x4
-	LOCAL_CREDS                    = 0x2
-	LOCAL_CREDS_PERSISTENT         = 0x3
-	LOCAL_PEERCRED                 = 0x1
-	LOCAL_VENDOR                   = 0x80000000
-	LOCK_EX                        = 0x2
-	LOCK_NB                        = 0x4
-	LOCK_SH                        = 0x1
-	LOCK_UN                        = 0x8
-	MADV_AUTOSYNC                  = 0x7
-	MADV_CORE                      = 0x9
-	MADV_DONTNEED                  = 0x4
-	MADV_FREE                      = 0x5
-	MADV_NOCORE                    = 0x8
-	MADV_NORMAL                    = 0x0
-	MADV_NOSYNC                    = 0x6
-	MADV_PROTECT                   = 0xa
-	MADV_RANDOM                    = 0x1
-	MADV_SEQUENTIAL                = 0x2
-	MADV_WILLNEED                  = 0x3
-	MAP_32BIT                      = 0x80000
-	MAP_ALIGNED_SUPER              = 0x1000000
-	MAP_ALIGNMENT_MASK             = -0x1000000
-	MAP_ALIGNMENT_SHIFT            = 0x18
-	MAP_ANON                       = 0x1000
-	MAP_ANONYMOUS                  = 0x1000
-	MAP_COPY                       = 0x2
-	MAP_EXCL                       = 0x4000
-	MAP_FILE                       = 0x0
-	MAP_FIXED                      = 0x10
-	MAP_GUARD                      = 0x2000
-	MAP_HASSEMAPHORE               = 0x200
-	MAP_NOCORE                     = 0x20000
-	MAP_NOSYNC                     = 0x800
-	MAP_PREFAULT_READ              = 0x40000
-	MAP_PRIVATE                    = 0x2
-	MAP_RESERVED0020               = 0x20
-	MAP_RESERVED0040               = 0x40
-	MAP_RESERVED0080               = 0x80
-	MAP_RESERVED0100               = 0x100
-	MAP_SHARED                     = 0x1
-	MAP_STACK                      = 0x400
-	MCAST_BLOCK_SOURCE             = 0x54
-	MCAST_EXCLUDE                  = 0x2
-	MCAST_INCLUDE                  = 0x1
-	MCAST_JOIN_GROUP               = 0x50
-	MCAST_JOIN_SOURCE_GROUP        = 0x52
-	MCAST_LEAVE_GROUP              = 0x51
-	MCAST_LEAVE_SOURCE_GROUP       = 0x53
-	MCAST_UNBLOCK_SOURCE           = 0x55
-	MCAST_UNDEFINED                = 0x0
-	MCL_CURRENT                    = 0x1
-	MCL_FUTURE                     = 0x2
-	MFD_ALLOW_SEALING              = 0x2
-	MFD_CLOEXEC                    = 0x1
-	MFD_HUGETLB                    = 0x4
-	MFD_HUGE_16GB                  = -0x78000000
-	MFD_HUGE_16MB                  = 0x60000000
-	MFD_HUGE_1GB                   = 0x78000000
-	MFD_HUGE_1MB                   = 0x50000000
-	MFD_HUGE_256MB                 = 0x70000000
-	MFD_HUGE_2GB                   = 0x7c000000
-	MFD_HUGE_2MB                   = 0x54000000
-	MFD_HUGE_32MB                  = 0x64000000
-	MFD_HUGE_512KB                 = 0x4c000000
-	MFD_HUGE_512MB                 = 0x74000000
-	MFD_HUGE_64KB                  = 0x40000000
-	MFD_HUGE_8MB                   = 0x5c000000
-	MFD_HUGE_MASK                  = 0xfc000000
-	MFD_HUGE_SHIFT                 = 0x1a
-	MNT_ACLS                       = 0x8000000
-	MNT_ASYNC                      = 0x40
-	MNT_AUTOMOUNTED                = 0x200000000
-	MNT_BYFSID                     = 0x8000000
-	MNT_CMDFLAGS                   = 0x300d0f0000
-	MNT_DEFEXPORTED                = 0x200
-	MNT_DELEXPORT                  = 0x20000
-	MNT_EMPTYDIR                   = 0x2000000000
-	MNT_EXKERB                     = 0x800
-	MNT_EXPORTANON                 = 0x400
-	MNT_EXPORTED                   = 0x100
-	MNT_EXPUBLIC                   = 0x20000000
-	MNT_EXRDONLY                   = 0x80
-	MNT_EXTLS                      = 0x4000000000
-	MNT_EXTLSCERT                  = 0x8000000000
-	MNT_EXTLSCERTUSER              = 0x10000000000
-	MNT_FORCE                      = 0x80000
-	MNT_GJOURNAL                   = 0x2000000
-	MNT_IGNORE                     = 0x800000
-	MNT_LAZY                       = 0x3
-	MNT_LOCAL                      = 0x1000
-	MNT_MULTILABEL                 = 0x4000000
-	MNT_NFS4ACLS                   = 0x10
-	MNT_NOATIME                    = 0x10000000
-	MNT_NOCLUSTERR                 = 0x40000000
-	MNT_NOCLUSTERW                 = 0x80000000
-	MNT_NOCOVER                    = 0x1000000000
-	MNT_NOEXEC                     = 0x4
-	MNT_NONBUSY                    = 0x4000000
-	MNT_NOSUID                     = 0x8
-	MNT_NOSYMFOLLOW                = 0x400000
-	MNT_NOWAIT                     = 0x2
-	MNT_QUOTA                      = 0x2000
-	MNT_RDONLY                     = 0x1
-	MNT_RELOAD                     = 0x40000
-	MNT_ROOTFS                     = 0x4000
-	MNT_SNAPSHOT                   = 0x1000000
-	MNT_SOFTDEP                    = 0x200000
-	MNT_SUIDDIR                    = 0x100000
-	MNT_SUJ                        = 0x100000000
-	MNT_SUSPEND                    = 0x4
-	MNT_SYNCHRONOUS                = 0x2
-	MNT_UNION                      = 0x20
-	MNT_UNTRUSTED                  = 0x800000000
-	MNT_UPDATE                     = 0x10000
-	MNT_UPDATEMASK                 = 0xad8d0807e
-	MNT_USER                       = 0x8000
-	MNT_VERIFIED                   = 0x400000000
-	MNT_VISFLAGMASK                = 0xffef0ffff
-	MNT_WAIT                       = 0x1
-	MSG_CMSG_CLOEXEC               = 0x40000
-	MSG_COMPAT                     = 0x8000
-	MSG_CTRUNC                     = 0x20
-	MSG_DONTROUTE                  = 0x4
-	MSG_DONTWAIT                   = 0x80
-	MSG_EOF                        = 0x100
-	MSG_EOR                        = 0x8
-	MSG_NBIO                       = 0x4000
-	MSG_NOSIGNAL                   = 0x20000
-	MSG_NOTIFICATION               = 0x2000
-	MSG_OOB                        = 0x1
-	MSG_PEEK                       = 0x2
-	MSG_TRUNC                      = 0x10
-	MSG_WAITALL                    = 0x40
-	MSG_WAITFORONE                 = 0x80000
-	MS_ASYNC                       = 0x1
-	MS_INVALIDATE                  = 0x2
-	MS_SYNC                        = 0x0
-	NAME_MAX                       = 0xff
-	NET_RT_DUMP                    = 0x1
-	NET_RT_FLAGS                   = 0x2
-	NET_RT_IFLIST                  = 0x3
-	NET_RT_IFLISTL                 = 0x5
-	NET_RT_IFMALIST                = 0x4
-	NET_RT_NHGRP                   = 0x7
-	NET_RT_NHOP                    = 0x6
-	NFDBITS                        = 0x40
-	NOFLSH                         = 0x80000000
-	NOKERNINFO                     = 0x2000000
-	NOTE_ABSTIME                   = 0x10
-	NOTE_ATTRIB                    = 0x8
-	NOTE_CHILD                     = 0x4
-	NOTE_CLOSE                     = 0x100
-	NOTE_CLOSE_WRITE               = 0x200
-	NOTE_DELETE                    = 0x1
-	NOTE_EXEC                      = 0x20000000
-	NOTE_EXIT                      = 0x80000000
-	NOTE_EXTEND                    = 0x4
-	NOTE_FFAND                     = 0x40000000
-	NOTE_FFCOPY                    = 0xc0000000
-	NOTE_FFCTRLMASK                = 0xc0000000
-	NOTE_FFLAGSMASK                = 0xffffff
-	NOTE_FFNOP                     = 0x0
-	NOTE_FFOR                      = 0x80000000
-	NOTE_FILE_POLL                 = 0x2
-	NOTE_FORK                      = 0x40000000
-	NOTE_LINK                      = 0x10
-	NOTE_LOWAT                     = 0x1
-	NOTE_MSECONDS                  = 0x2
-	NOTE_NSECONDS                  = 0x8
-	NOTE_OPEN                      = 0x80
-	NOTE_PCTRLMASK                 = 0xf0000000
-	NOTE_PDATAMASK                 = 0xfffff
-	NOTE_READ                      = 0x400
-	NOTE_RENAME                    = 0x20
-	NOTE_REVOKE                    = 0x40
-	NOTE_SECONDS                   = 0x1
-	NOTE_TRACK                     = 0x1
-	NOTE_TRACKERR                  = 0x2
-	NOTE_TRIGGER                   = 0x1000000
-	NOTE_USECONDS                  = 0x4
-	NOTE_WRITE                     = 0x2
-	OCRNL                          = 0x10
-	ONLCR                          = 0x2
-	ONLRET                         = 0x40
-	ONOCR                          = 0x20
-	ONOEOT                         = 0x8
-	OPOST                          = 0x1
-	OXTABS                         = 0x4
-	O_ACCMODE                      = 0x3
-	O_APPEND                       = 0x8
-	O_ASYNC                        = 0x40
-	O_CLOEXEC                      = 0x100000
-	O_CREAT                        = 0x200
-	O_DIRECT                       = 0x10000
-	O_DIRECTORY                    = 0x20000
-	O_DSYNC                        = 0x1000000
-	O_EMPTY_PATH                   = 0x2000000
-	O_EXCL                         = 0x800
-	O_EXEC                         = 0x40000
-	O_EXLOCK                       = 0x20
-	O_FSYNC                        = 0x80
-	O_NDELAY                       = 0x4
-	O_NOCTTY                       = 0x8000
-	O_NOFOLLOW                     = 0x100
-	O_NONBLOCK                     = 0x4
-	O_PATH                         = 0x400000
-	O_RDONLY                       = 0x0
-	O_RDWR                         = 0x2
-	O_RESOLVE_BENEATH              = 0x800000
-	O_SEARCH                       = 0x40000
-	O_SHLOCK                       = 0x10
-	O_SYNC                         = 0x80
-	O_TRUNC                        = 0x400
-	O_TTY_INIT                     = 0x80000
-	O_VERIFY                       = 0x200000
-	O_WRONLY                       = 0x1
-	PARENB                         = 0x1000
-	PARMRK                         = 0x8
-	PARODD                         = 0x2000
-	PENDIN                         = 0x20000000
-	PIOD_READ_D                    = 0x1
-	PIOD_READ_I                    = 0x3
-	PIOD_WRITE_D                   = 0x2
-	PIOD_WRITE_I                   = 0x4
-	PRIO_PGRP                      = 0x1
-	PRIO_PROCESS                   = 0x0
-	PRIO_USER                      = 0x2
-	PROT_EXEC                      = 0x4
-	PROT_NONE                      = 0x0
-	PROT_READ                      = 0x1
-	PROT_WRITE                     = 0x2
-	PTRACE_DEFAULT                 = 0x1
-	PTRACE_EXEC                    = 0x1
-	PTRACE_FORK                    = 0x8
-	PTRACE_LWP                     = 0x10
-	PTRACE_SCE                     = 0x2
-	PTRACE_SCX                     = 0x4
-	PTRACE_SYSCALL                 = 0x6
-	PTRACE_VFORK                   = 0x20
-	PT_ATTACH                      = 0xa
-	PT_CLEARSTEP                   = 0x10
-	PT_CONTINUE                    = 0x7
-	PT_COREDUMP                    = 0x1d
-	PT_DETACH                      = 0xb
-	PT_FIRSTMACH                   = 0x40
-	PT_FOLLOW_FORK                 = 0x17
-	PT_GETDBREGS                   = 0x25
-	PT_GETFPREGS                   = 0x23
-	PT_GETLWPLIST                  = 0xf
-	PT_GETNUMLWPS                  = 0xe
-	PT_GETREGS                     = 0x21
-	PT_GET_EVENT_MASK              = 0x19
-	PT_GET_SC_ARGS                 = 0x1b
-	PT_GET_SC_RET                  = 0x1c
-	PT_IO                          = 0xc
-	PT_KILL                        = 0x8
-	PT_LWPINFO                     = 0xd
-	PT_LWP_EVENTS                  = 0x18
-	PT_READ_D                      = 0x2
-	PT_READ_I                      = 0x1
-	PT_RESUME                      = 0x13
-	PT_SETDBREGS                   = 0x26
-	PT_SETFPREGS                   = 0x24
-	PT_SETREGS                     = 0x22
-	PT_SETSTEP                     = 0x11
-	PT_SET_EVENT_MASK              = 0x1a
-	PT_STEP                        = 0x9
-	PT_SUSPEND                     = 0x12
-	PT_SYSCALL                     = 0x16
-	PT_TO_SCE                      = 0x14
-	PT_TO_SCX                      = 0x15
-	PT_TRACE_ME                    = 0x0
-	PT_VM_ENTRY                    = 0x29
-	PT_VM_TIMESTAMP                = 0x28
-	PT_WRITE_D                     = 0x5
-	PT_WRITE_I                     = 0x4
-	P_ZONEID                       = 0xc
-	RLIMIT_AS                      = 0xa
-	RLIMIT_CORE                    = 0x4
-	RLIMIT_CPU                     = 0x0
-	RLIMIT_DATA                    = 0x2
-	RLIMIT_FSIZE                   = 0x1
-	RLIMIT_MEMLOCK                 = 0x6
-	RLIMIT_NOFILE                  = 0x8
-	RLIMIT_NPROC                   = 0x7
-	RLIMIT_RSS                     = 0x5
-	RLIMIT_STACK                   = 0x3
-	RLIM_INFINITY                  = 0x7fffffffffffffff
-	RTAX_AUTHOR                    = 0x6
-	RTAX_BRD                       = 0x7
-	RTAX_DST                       = 0x0
-	RTAX_GATEWAY                   = 0x1
-	RTAX_GENMASK                   = 0x3
-	RTAX_IFA                       = 0x5
-	RTAX_IFP                       = 0x4
-	RTAX_MAX                       = 0x8
-	RTAX_NETMASK                   = 0x2
-	RTA_AUTHOR                     = 0x40
-	RTA_BRD                        = 0x80
-	RTA_DST                        = 0x1
-	RTA_GATEWAY                    = 0x2
-	RTA_GENMASK                    = 0x8
-	RTA_IFA                        = 0x20
-	RTA_IFP                        = 0x10
-	RTA_NETMASK                    = 0x4
-	RTF_BLACKHOLE                  = 0x1000
-	RTF_BROADCAST                  = 0x400000
-	RTF_DONE                       = 0x40
-	RTF_DYNAMIC                    = 0x10
-	RTF_FIXEDMTU                   = 0x80000
-	RTF_FMASK                      = 0x1004d808
-	RTF_GATEWAY                    = 0x2
-	RTF_GWFLAG_COMPAT              = 0x80000000
-	RTF_HOST                       = 0x4
-	RTF_LLDATA                     = 0x400
-	RTF_LLINFO                     = 0x400
-	RTF_LOCAL                      = 0x200000
-	RTF_MODIFIED                   = 0x20
-	RTF_MULTICAST                  = 0x800000
-	RTF_PINNED                     = 0x100000
-	RTF_PROTO1                     = 0x8000
-	RTF_PROTO2                     = 0x4000
-	RTF_PROTO3                     = 0x40000
-	RTF_REJECT                     = 0x8
-	RTF_STATIC                     = 0x800
-	RTF_STICKY                     = 0x10000000
-	RTF_UP                         = 0x1
-	RTF_XRESOLVE                   = 0x200
-	RTM_ADD                        = 0x1
-	RTM_CHANGE                     = 0x3
-	RTM_DELADDR                    = 0xd
-	RTM_DELETE                     = 0x2
-	RTM_DELMADDR                   = 0x10
-	RTM_GET                        = 0x4
-	RTM_IEEE80211                  = 0x12
-	RTM_IFANNOUNCE                 = 0x11
-	RTM_IFINFO                     = 0xe
-	RTM_LOCK                       = 0x8
-	RTM_LOSING                     = 0x5
-	RTM_MISS                       = 0x7
-	RTM_NEWADDR                    = 0xc
-	RTM_NEWMADDR                   = 0xf
-	RTM_REDIRECT                   = 0x6
-	RTM_RESOLVE                    = 0xb
-	RTM_RTTUNIT                    = 0xf4240
-	RTM_VERSION                    = 0x5
-	RTV_EXPIRE                     = 0x4
-	RTV_HOPCOUNT                   = 0x2
-	RTV_MTU                        = 0x1
-	RTV_RPIPE                      = 0x8
-	RTV_RTT                        = 0x40
-	RTV_RTTVAR                     = 0x80
-	RTV_SPIPE                      = 0x10
-	RTV_SSTHRESH                   = 0x20
-	RTV_WEIGHT                     = 0x100
-	RT_ALL_FIBS                    = -0x1
-	RT_BLACKHOLE                   = 0x40
-	RT_DEFAULT_FIB                 = 0x0
-	RT_DEFAULT_WEIGHT              = 0x1
-	RT_HAS_GW                      = 0x80
-	RT_HAS_HEADER                  = 0x10
-	RT_HAS_HEADER_BIT              = 0x4
-	RT_L2_ME                       = 0x4
-	RT_L2_ME_BIT                   = 0x2
-	RT_LLE_CACHE                   = 0x100
-	RT_MAX_WEIGHT                  = 0xffffff
-	RT_MAY_LOOP                    = 0x8
-	RT_MAY_LOOP_BIT                = 0x3
-	RT_REJECT                      = 0x20
-	RUSAGE_CHILDREN                = -0x1
-	RUSAGE_SELF                    = 0x0
-	RUSAGE_THREAD                  = 0x1
-	SCM_BINTIME                    = 0x4
-	SCM_CREDS                      = 0x3
-	SCM_CREDS2                     = 0x8
-	SCM_MONOTONIC                  = 0x6
-	SCM_REALTIME                   = 0x5
-	SCM_RIGHTS                     = 0x1
-	SCM_TIMESTAMP                  = 0x2
-	SCM_TIME_INFO                  = 0x7
-	SEEK_CUR                       = 0x1
-	SEEK_DATA                      = 0x3
-	SEEK_END                       = 0x2
-	SEEK_HOLE                      = 0x4
-	SEEK_SET                       = 0x0
-	SHUT_RD                        = 0x0
-	SHUT_RDWR                      = 0x2
-	SHUT_WR                        = 0x1
-	SIOCADDMULTI                   = 0x80206931
-	SIOCAIFADDR                    = 0x8040691a
-	SIOCAIFGROUP                   = 0x80286987
-	SIOCATMARK                     = 0x40047307
-	SIOCDELMULTI                   = 0x80206932
-	SIOCDIFADDR                    = 0x80206919
-	SIOCDIFGROUP                   = 0x80286989
-	SIOCDIFPHYADDR                 = 0x80206949
-	SIOCGDRVSPEC                   = 0xc028697b
-	SIOCGETSGCNT                   = 0xc0207210
-	SIOCGETVIFCNT                  = 0xc028720f
-	SIOCGHIWAT                     = 0x40047301
-	SIOCGHWADDR                    = 0xc020693e
-	SIOCGI2C                       = 0xc020693d
-	SIOCGIFADDR                    = 0xc0206921
-	SIOCGIFALIAS                   = 0xc044692d
-	SIOCGIFBRDADDR                 = 0xc0206923
-	SIOCGIFCAP                     = 0xc020691f
-	SIOCGIFCONF                    = 0xc0106924
-	SIOCGIFDATA                    = 0x8020692c
-	SIOCGIFDESCR                   = 0xc020692a
-	SIOCGIFDOWNREASON              = 0xc058699a
-	SIOCGIFDSTADDR                 = 0xc0206922
-	SIOCGIFFIB                     = 0xc020695c
-	SIOCGIFFLAGS                   = 0xc0206911
-	SIOCGIFGENERIC                 = 0xc020693a
-	SIOCGIFGMEMB                   = 0xc028698a
-	SIOCGIFGROUP                   = 0xc0286988
-	SIOCGIFINDEX                   = 0xc0206920
-	SIOCGIFMAC                     = 0xc0206926
-	SIOCGIFMEDIA                   = 0xc0306938
-	SIOCGIFMETRIC                  = 0xc0206917
-	SIOCGIFMTU                     = 0xc0206933
-	SIOCGIFNETMASK                 = 0xc0206925
-	SIOCGIFPDSTADDR                = 0xc0206948
-	SIOCGIFPHYS                    = 0xc0206935
-	SIOCGIFPSRCADDR                = 0xc0206947
-	SIOCGIFRSSHASH                 = 0xc0186997
-	SIOCGIFRSSKEY                  = 0xc0946996
-	SIOCGIFSTATUS                  = 0xc331693b
-	SIOCGIFXMEDIA                  = 0xc030698b
-	SIOCGLANPCP                    = 0xc0206998
-	SIOCGLOWAT                     = 0x40047303
-	SIOCGPGRP                      = 0x40047309
-	SIOCGPRIVATE_0                 = 0xc0206950
-	SIOCGPRIVATE_1                 = 0xc0206951
-	SIOCGTUNFIB                    = 0xc020695e
-	SIOCIFCREATE                   = 0xc020697a
-	SIOCIFCREATE2                  = 0xc020697c
-	SIOCIFDESTROY                  = 0x80206979
-	SIOCIFGCLONERS                 = 0xc0106978
-	SIOCSDRVSPEC                   = 0x8028697b
-	SIOCSHIWAT                     = 0x80047300
-	SIOCSIFADDR                    = 0x8020690c
-	SIOCSIFBRDADDR                 = 0x80206913
-	SIOCSIFCAP                     = 0x8020691e
-	SIOCSIFDESCR                   = 0x80206929
-	SIOCSIFDSTADDR                 = 0x8020690e
-	SIOCSIFFIB                     = 0x8020695d
-	SIOCSIFFLAGS                   = 0x80206910
-	SIOCSIFGENERIC                 = 0x80206939
-	SIOCSIFLLADDR                  = 0x8020693c
-	SIOCSIFMAC                     = 0x80206927
-	SIOCSIFMEDIA                   = 0xc0206937
-	SIOCSIFMETRIC                  = 0x80206918
-	SIOCSIFMTU                     = 0x80206934
-	SIOCSIFNAME                    = 0x80206928
-	SIOCSIFNETMASK                 = 0x80206916
-	SIOCSIFPHYADDR                 = 0x80406946
-	SIOCSIFPHYS                    = 0x80206936
-	SIOCSIFRVNET                   = 0xc020695b
-	SIOCSIFVNET                    = 0xc020695a
-	SIOCSLANPCP                    = 0x80206999
-	SIOCSLOWAT                     = 0x80047302
-	SIOCSPGRP                      = 0x80047308
-	SIOCSTUNFIB                    = 0x8020695f
-	SOCK_CLOEXEC                   = 0x10000000
-	SOCK_DGRAM                     = 0x2
-	SOCK_MAXADDRLEN                = 0xff
-	SOCK_NONBLOCK                  = 0x20000000
-	SOCK_RAW                       = 0x3
-	SOCK_RDM                       = 0x4
-	SOCK_SEQPACKET                 = 0x5
-	SOCK_STREAM                    = 0x1
-	SOL_LOCAL                      = 0x0
-	SOL_SOCKET                     = 0xffff
-	SOMAXCONN                      = 0x80
-	SO_ACCEPTCONN                  = 0x2
-	SO_ACCEPTFILTER                = 0x1000
-	SO_BINTIME                     = 0x2000
-	SO_BROADCAST                   = 0x20
-	SO_DEBUG                       = 0x1
-	SO_DOMAIN                      = 0x1019
-	SO_DONTROUTE                   = 0x10
-	SO_ERROR                       = 0x1007
-	SO_KEEPALIVE                   = 0x8
-	SO_LABEL                       = 0x1009
-	SO_LINGER                      = 0x80
-	SO_LISTENINCQLEN               = 0x1013
-	SO_LISTENQLEN                  = 0x1012
-	SO_LISTENQLIMIT                = 0x1011
-	SO_MAX_PACING_RATE             = 0x1018
-	SO_NOSIGPIPE                   = 0x800
-	SO_NO_DDP                      = 0x8000
-	SO_NO_OFFLOAD                  = 0x4000
-	SO_OOBINLINE                   = 0x100
-	SO_PEERLABEL                   = 0x1010
-	SO_PROTOCOL                    = 0x1016
-	SO_PROTOTYPE                   = 0x1016
-	SO_RCVBUF                      = 0x1002
-	SO_RCVLOWAT                    = 0x1004
-	SO_RCVTIMEO                    = 0x1006
-	SO_RERROR                      = 0x20000
-	SO_REUSEADDR                   = 0x4
-	SO_REUSEPORT                   = 0x200
-	SO_REUSEPORT_LB                = 0x10000
-	SO_SETFIB                      = 0x1014
-	SO_SNDBUF                      = 0x1001
-	SO_SNDLOWAT                    = 0x1003
-	SO_SNDTIMEO                    = 0x1005
-	SO_TIMESTAMP                   = 0x400
-	SO_TS_BINTIME                  = 0x1
-	SO_TS_CLOCK                    = 0x1017
-	SO_TS_CLOCK_MAX                = 0x3
-	SO_TS_DEFAULT                  = 0x0
-	SO_TS_MONOTONIC                = 0x3
-	SO_TS_REALTIME                 = 0x2
-	SO_TS_REALTIME_MICRO           = 0x0
-	SO_TYPE                        = 0x1008
-	SO_USELOOPBACK                 = 0x40
-	SO_USER_COOKIE                 = 0x1015
-	SO_VENDOR                      = 0x80000000
-	S_BLKSIZE                      = 0x200
-	S_IEXEC                        = 0x40
-	S_IFBLK                        = 0x6000
-	S_IFCHR                        = 0x2000
-	S_IFDIR                        = 0x4000
-	S_IFIFO                        = 0x1000
-	S_IFLNK                        = 0xa000
-	S_IFMT                         = 0xf000
-	S_IFREG                        = 0x8000
-	S_IFSOCK                       = 0xc000
-	S_IFWHT                        = 0xe000
-	S_IREAD                        = 0x100
-	S_IRGRP                        = 0x20
-	S_IROTH                        = 0x4
-	S_IRUSR                        = 0x100
-	S_IRWXG                        = 0x38
-	S_IRWXO                        = 0x7
-	S_IRWXU                        = 0x1c0
-	S_ISGID                        = 0x400
-	S_ISTXT                        = 0x200
-	S_ISUID                        = 0x800
-	S_ISVTX                        = 0x200
-	S_IWGRP                        = 0x10
-	S_IWOTH                        = 0x2
-	S_IWRITE                       = 0x80
-	S_IWUSR                        = 0x80
-	S_IXGRP                        = 0x8
-	S_IXOTH                        = 0x1
-	S_IXUSR                        = 0x40
-	TAB0                           = 0x0
-	TAB3                           = 0x4
-	TABDLY                         = 0x4
-	TCIFLUSH                       = 0x1
-	TCIOFF                         = 0x3
-	TCIOFLUSH                      = 0x3
-	TCION                          = 0x4
-	TCOFLUSH                       = 0x2
-	TCOOFF                         = 0x1
-	TCOON                          = 0x2
-	TCPOPT_EOL                     = 0x0
-	TCPOPT_FAST_OPEN               = 0x22
-	TCPOPT_MAXSEG                  = 0x2
-	TCPOPT_NOP                     = 0x1
-	TCPOPT_PAD                     = 0x0
-	TCPOPT_SACK                    = 0x5
-	TCPOPT_SACK_PERMITTED          = 0x4
-	TCPOPT_SIGNATURE               = 0x13
-	TCPOPT_TIMESTAMP               = 0x8
-	TCPOPT_WINDOW                  = 0x3
-	TCP_BBR_ACK_COMP_ALG           = 0x448
-	TCP_BBR_ALGORITHM              = 0x43b
-	TCP_BBR_DRAIN_INC_EXTRA        = 0x43c
-	TCP_BBR_DRAIN_PG               = 0x42e
-	TCP_BBR_EXTRA_GAIN             = 0x449
-	TCP_BBR_EXTRA_STATE            = 0x453
-	TCP_BBR_FLOOR_MIN_TSO          = 0x454
-	TCP_BBR_HDWR_PACE              = 0x451
-	TCP_BBR_HOLD_TARGET            = 0x436
-	TCP_BBR_IWINTSO                = 0x42b
-	TCP_BBR_LOWGAIN_FD             = 0x436
-	TCP_BBR_LOWGAIN_HALF           = 0x435
-	TCP_BBR_LOWGAIN_THRESH         = 0x434
-	TCP_BBR_MAX_RTO                = 0x439
-	TCP_BBR_MIN_RTO                = 0x438
-	TCP_BBR_MIN_TOPACEOUT          = 0x455
-	TCP_BBR_ONE_RETRAN             = 0x431
-	TCP_BBR_PACE_CROSS             = 0x442
-	TCP_BBR_PACE_DEL_TAR           = 0x43f
-	TCP_BBR_PACE_OH                = 0x435
-	TCP_BBR_PACE_PER_SEC           = 0x43e
-	TCP_BBR_PACE_SEG_MAX           = 0x440
-	TCP_BBR_PACE_SEG_MIN           = 0x441
-	TCP_BBR_POLICER_DETECT         = 0x457
-	TCP_BBR_PROBE_RTT_GAIN         = 0x44d
-	TCP_BBR_PROBE_RTT_INT          = 0x430
-	TCP_BBR_PROBE_RTT_LEN          = 0x44e
-	TCP_BBR_RACK_INIT_RATE         = 0x458
-	TCP_BBR_RACK_RTT_USE           = 0x44a
-	TCP_BBR_RECFORCE               = 0x42c
-	TCP_BBR_REC_OVER_HPTS          = 0x43a
-	TCP_BBR_RETRAN_WTSO            = 0x44b
-	TCP_BBR_RWND_IS_APP            = 0x42f
-	TCP_BBR_SEND_IWND_IN_TSO       = 0x44f
-	TCP_BBR_STARTUP_EXIT_EPOCH     = 0x43d
-	TCP_BBR_STARTUP_LOSS_EXIT      = 0x432
-	TCP_BBR_STARTUP_PG             = 0x42d
-	TCP_BBR_TMR_PACE_OH            = 0x448
-	TCP_BBR_TSLIMITS               = 0x434
-	TCP_BBR_TSTMP_RAISES           = 0x456
-	TCP_BBR_UNLIMITED              = 0x43b
-	TCP_BBR_USEDEL_RATE            = 0x437
-	TCP_BBR_USE_LOWGAIN            = 0x433
-	TCP_BBR_USE_RACK_CHEAT         = 0x450
-	TCP_BBR_USE_RACK_RR            = 0x450
-	TCP_BBR_UTTER_MAX_TSO          = 0x452
-	TCP_CA_NAME_MAX                = 0x10
-	TCP_CCALGOOPT                  = 0x41
-	TCP_CONGESTION                 = 0x40
-	TCP_DATA_AFTER_CLOSE           = 0x44c
-	TCP_DEFER_OPTIONS              = 0x470
-	TCP_DELACK                     = 0x48
-	TCP_FASTOPEN                   = 0x401
-	TCP_FASTOPEN_MAX_COOKIE_LEN    = 0x10
-	TCP_FASTOPEN_MIN_COOKIE_LEN    = 0x4
-	TCP_FASTOPEN_PSK_LEN           = 0x10
-	TCP_FAST_RSM_HACK              = 0x471
-	TCP_FIN_IS_RST                 = 0x49
-	TCP_FUNCTION_BLK               = 0x2000
-	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
-	TCP_HDWR_RATE_CAP              = 0x46a
-	TCP_HDWR_UP_ONLY               = 0x46c
-	TCP_IDLE_REDUCE                = 0x46
-	TCP_INFO                       = 0x20
-	TCP_IWND_NB                    = 0x2b
-	TCP_IWND_NSEG                  = 0x2c
-	TCP_KEEPCNT                    = 0x400
-	TCP_KEEPIDLE                   = 0x100
-	TCP_KEEPINIT                   = 0x80
-	TCP_KEEPINTVL                  = 0x200
-	TCP_LOG                        = 0x22
-	TCP_LOGBUF                     = 0x23
-	TCP_LOGDUMP                    = 0x25
-	TCP_LOGDUMPID                  = 0x26
-	TCP_LOGID                      = 0x24
-	TCP_LOGID_CNT                  = 0x2e
-	TCP_LOG_ID_LEN                 = 0x40
-	TCP_LOG_LIMIT                  = 0x4a
-	TCP_LOG_TAG                    = 0x2f
-	TCP_MAXBURST                   = 0x4
-	TCP_MAXHLEN                    = 0x3c
-	TCP_MAXOLEN                    = 0x28
-	TCP_MAXPEAKRATE                = 0x45
-	TCP_MAXSEG                     = 0x2
-	TCP_MAXUNACKTIME               = 0x44
-	TCP_MAXWIN                     = 0xffff
-	TCP_MAX_SACK                   = 0x4
-	TCP_MAX_WINSHIFT               = 0xe
-	TCP_MD5SIG                     = 0x10
-	TCP_MINMSS                     = 0xd8
-	TCP_MSS                        = 0x218
-	TCP_NODELAY                    = 0x1
-	TCP_NOOPT                      = 0x8
-	TCP_NOPUSH                     = 0x4
-	TCP_NO_PRR                     = 0x462
-	TCP_PACING_RATE_CAP            = 0x46b
-	TCP_PCAP_IN                    = 0x1000
-	TCP_PCAP_OUT                   = 0x800
-	TCP_PERF_INFO                  = 0x4e
-	TCP_PROC_ACCOUNTING            = 0x4c
-	TCP_RACK_ABC_VAL               = 0x46d
-	TCP_RACK_CHEAT_NOT_CONF_RATE   = 0x459
-	TCP_RACK_DO_DETECTION          = 0x449
-	TCP_RACK_EARLY_RECOV           = 0x423
-	TCP_RACK_EARLY_SEG             = 0x424
-	TCP_RACK_FORCE_MSEG            = 0x45d
-	TCP_RACK_GP_INCREASE           = 0x446
-	TCP_RACK_GP_INCREASE_CA        = 0x45a
-	TCP_RACK_GP_INCREASE_REC       = 0x45c
-	TCP_RACK_GP_INCREASE_SS        = 0x45b
-	TCP_RACK_IDLE_REDUCE_HIGH      = 0x444
-	TCP_RACK_MBUF_QUEUE            = 0x41a
-	TCP_RACK_MEASURE_CNT           = 0x46f
-	TCP_RACK_MIN_PACE              = 0x445
-	TCP_RACK_MIN_PACE_SEG          = 0x446
-	TCP_RACK_MIN_TO                = 0x422
-	TCP_RACK_NONRXT_CFG_RATE       = 0x463
-	TCP_RACK_NO_PUSH_AT_MAX        = 0x466
-	TCP_RACK_PACE_ALWAYS           = 0x41f
-	TCP_RACK_PACE_MAX_SEG          = 0x41e
-	TCP_RACK_PACE_RATE_CA          = 0x45e
-	TCP_RACK_PACE_RATE_REC         = 0x460
-	TCP_RACK_PACE_RATE_SS          = 0x45f
-	TCP_RACK_PACE_REDUCE           = 0x41d
-	TCP_RACK_PACE_TO_FILL          = 0x467
-	TCP_RACK_PACING_BETA           = 0x472
-	TCP_RACK_PACING_BETA_ECN       = 0x473
-	TCP_RACK_PKT_DELAY             = 0x428
-	TCP_RACK_PROFILE               = 0x469
-	TCP_RACK_PROP                  = 0x41b
-	TCP_RACK_PROP_RATE             = 0x420
-	TCP_RACK_PRR_SENDALOT          = 0x421
-	TCP_RACK_REORD_FADE            = 0x426
-	TCP_RACK_REORD_THRESH          = 0x425
-	TCP_RACK_RR_CONF               = 0x459
-	TCP_RACK_TIMER_SLOP            = 0x474
-	TCP_RACK_TLP_INC_VAR           = 0x429
-	TCP_RACK_TLP_REDUCE            = 0x41c
-	TCP_RACK_TLP_THRESH            = 0x427
-	TCP_RACK_TLP_USE               = 0x447
-	TCP_REC_ABC_VAL                = 0x46e
-	TCP_REMOTE_UDP_ENCAPS_PORT     = 0x47
-	TCP_REUSPORT_LB_NUMA           = 0x402
-	TCP_REUSPORT_LB_NUMA_CURDOM    = -0x1
-	TCP_REUSPORT_LB_NUMA_NODOM     = -0x2
-	TCP_RXTLS_ENABLE               = 0x29
-	TCP_RXTLS_MODE                 = 0x2a
-	TCP_SHARED_CWND_ALLOWED        = 0x4b
-	TCP_SHARED_CWND_ENABLE         = 0x464
-	TCP_SHARED_CWND_TIME_LIMIT     = 0x468
-	TCP_STATS                      = 0x21
-	TCP_TIMELY_DYN_ADJ             = 0x465
-	TCP_TLS_MODE_IFNET             = 0x2
-	TCP_TLS_MODE_NONE              = 0x0
-	TCP_TLS_MODE_SW                = 0x1
-	TCP_TLS_MODE_TOE               = 0x3
-	TCP_TXTLS_ENABLE               = 0x27
-	TCP_TXTLS_MODE                 = 0x28
-	TCP_USER_LOG                   = 0x30
-	TCP_USE_CMP_ACKS               = 0x4d
-	TCP_VENDOR                     = 0x80000000
-	TCSAFLUSH                      = 0x2
-	TIMER_ABSTIME                  = 0x1
-	TIMER_RELTIME                  = 0x0
-	TIOCCBRK                       = 0x2000747a
-	TIOCCDTR                       = 0x20007478
-	TIOCCONS                       = 0x80047462
-	TIOCDRAIN                      = 0x2000745e
-	TIOCEXCL                       = 0x2000740d
-	TIOCEXT                        = 0x80047460
-	TIOCFLUSH                      = 0x80047410
-	TIOCGDRAINWAIT                 = 0x40047456
-	TIOCGETA                       = 0x402c7413
-	TIOCGETD                       = 0x4004741a
-	TIOCGPGRP                      = 0x40047477
-	TIOCGPTN                       = 0x4004740f
-	TIOCGSID                       = 0x40047463
-	TIOCGWINSZ                     = 0x40087468
-	TIOCMBIC                       = 0x8004746b
-	TIOCMBIS                       = 0x8004746c
-	TIOCMGDTRWAIT                  = 0x4004745a
-	TIOCMGET                       = 0x4004746a
-	TIOCMSDTRWAIT                  = 0x8004745b
-	TIOCMSET                       = 0x8004746d
-	TIOCM_CAR                      = 0x40
-	TIOCM_CD                       = 0x40
-	TIOCM_CTS                      = 0x20
-	TIOCM_DCD                      = 0x40
-	TIOCM_DSR                      = 0x100
-	TIOCM_DTR                      = 0x2
-	TIOCM_LE                       = 0x1
-	TIOCM_RI                       = 0x80
-	TIOCM_RNG                      = 0x80
-	TIOCM_RTS                      = 0x4
-	TIOCM_SR                       = 0x10
-	TIOCM_ST                       = 0x8
-	TIOCNOTTY                      = 0x20007471
-	TIOCNXCL                       = 0x2000740e
-	TIOCOUTQ                       = 0x40047473
-	TIOCPKT                        = 0x80047470
-	TIOCPKT_DATA                   = 0x0
-	TIOCPKT_DOSTOP                 = 0x20
-	TIOCPKT_FLUSHREAD              = 0x1
-	TIOCPKT_FLUSHWRITE             = 0x2
-	TIOCPKT_IOCTL                  = 0x40
-	TIOCPKT_NOSTOP                 = 0x10
-	TIOCPKT_START                  = 0x8
-	TIOCPKT_STOP                   = 0x4
-	TIOCPTMASTER                   = 0x2000741c
-	TIOCSBRK                       = 0x2000747b
-	TIOCSCTTY                      = 0x20007461
-	TIOCSDRAINWAIT                 = 0x80047457
-	TIOCSDTR                       = 0x20007479
-	TIOCSETA                       = 0x802c7414
-	TIOCSETAF                      = 0x802c7416
-	TIOCSETAW                      = 0x802c7415
-	TIOCSETD                       = 0x8004741b
-	TIOCSIG                        = 0x2004745f
-	TIOCSPGRP                      = 0x80047476
-	TIOCSTART                      = 0x2000746e
-	TIOCSTAT                       = 0x20007465
-	TIOCSTI                        = 0x80017472
-	TIOCSTOP                       = 0x2000746f
-	TIOCSWINSZ                     = 0x80087467
-	TIOCTIMESTAMP                  = 0x40107459
-	TIOCUCNTL                      = 0x80047466
-	TOSTOP                         = 0x400000
-	UTIME_NOW                      = -0x1
-	UTIME_OMIT                     = -0x2
-	VDISCARD                       = 0xf
-	VDSUSP                         = 0xb
-	VEOF                           = 0x0
-	VEOL                           = 0x1
-	VEOL2                          = 0x2
-	VERASE                         = 0x3
-	VERASE2                        = 0x7
-	VINTR                          = 0x8
-	VKILL                          = 0x5
-	VLNEXT                         = 0xe
-	VMIN                           = 0x10
-	VQUIT                          = 0x9
-	VREPRINT                       = 0x6
-	VSTART                         = 0xc
-	VSTATUS                        = 0x12
-	VSTOP                          = 0xd
-	VSUSP                          = 0xa
-	VTIME                          = 0x11
-	VWERASE                        = 0x4
-	WCONTINUED                     = 0x4
-	WCOREFLAG                      = 0x80
-	WEXITED                        = 0x10
-	WLINUXCLONE                    = 0x80000000
-	WNOHANG                        = 0x1
-	WNOWAIT                        = 0x8
-	WSTOPPED                       = 0x2
-	WTRAPPED                       = 0x20
-	WUNTRACED                      = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTEGRITY      = syscall.Errno(0x61)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x61)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errorList = [...]struct {
-	num  syscall.Errno
-	name string
-	desc string
-}{
-	{1, "EPERM", "operation not permitted"},
-	{2, "ENOENT", "no such file or directory"},
-	{3, "ESRCH", "no such process"},
-	{4, "EINTR", "interrupted system call"},
-	{5, "EIO", "input/output error"},
-	{6, "ENXIO", "device not configured"},
-	{7, "E2BIG", "argument list too long"},
-	{8, "ENOEXEC", "exec format error"},
-	{9, "EBADF", "bad file descriptor"},
-	{10, "ECHILD", "no child processes"},
-	{11, "EDEADLK", "resource deadlock avoided"},
-	{12, "ENOMEM", "cannot allocate memory"},
-	{13, "EACCES", "permission denied"},
-	{14, "EFAULT", "bad address"},
-	{15, "ENOTBLK", "block device required"},
-	{16, "EBUSY", "device busy"},
-	{17, "EEXIST", "file exists"},
-	{18, "EXDEV", "cross-device link"},
-	{19, "ENODEV", "operation not supported by device"},
-	{20, "ENOTDIR", "not a directory"},
-	{21, "EISDIR", "is a directory"},
-	{22, "EINVAL", "invalid argument"},
-	{23, "ENFILE", "too many open files in system"},
-	{24, "EMFILE", "too many open files"},
-	{25, "ENOTTY", "inappropriate ioctl for device"},
-	{26, "ETXTBSY", "text file busy"},
-	{27, "EFBIG", "file too large"},
-	{28, "ENOSPC", "no space left on device"},
-	{29, "ESPIPE", "illegal seek"},
-	{30, "EROFS", "read-only file system"},
-	{31, "EMLINK", "too many links"},
-	{32, "EPIPE", "broken pipe"},
-	{33, "EDOM", "numerical argument out of domain"},
-	{34, "ERANGE", "result too large"},
-	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
-	{36, "EINPROGRESS", "operation now in progress"},
-	{37, "EALREADY", "operation already in progress"},
-	{38, "ENOTSOCK", "socket operation on non-socket"},
-	{39, "EDESTADDRREQ", "destination address required"},
-	{40, "EMSGSIZE", "message too long"},
-	{41, "EPROTOTYPE", "protocol wrong type for socket"},
-	{42, "ENOPROTOOPT", "protocol not available"},
-	{43, "EPROTONOSUPPORT", "protocol not supported"},
-	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
-	{45, "EOPNOTSUPP", "operation not supported"},
-	{46, "EPFNOSUPPORT", "protocol family not supported"},
-	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
-	{48, "EADDRINUSE", "address already in use"},
-	{49, "EADDRNOTAVAIL", "can't assign requested address"},
-	{50, "ENETDOWN", "network is down"},
-	{51, "ENETUNREACH", "network is unreachable"},
-	{52, "ENETRESET", "network dropped connection on reset"},
-	{53, "ECONNABORTED", "software caused connection abort"},
-	{54, "ECONNRESET", "connection reset by peer"},
-	{55, "ENOBUFS", "no buffer space available"},
-	{56, "EISCONN", "socket is already connected"},
-	{57, "ENOTCONN", "socket is not connected"},
-	{58, "ESHUTDOWN", "can't send after socket shutdown"},
-	{59, "ETOOMANYREFS", "too many references: can't splice"},
-	{60, "ETIMEDOUT", "operation timed out"},
-	{61, "ECONNREFUSED", "connection refused"},
-	{62, "ELOOP", "too many levels of symbolic links"},
-	{63, "ENAMETOOLONG", "file name too long"},
-	{64, "EHOSTDOWN", "host is down"},
-	{65, "EHOSTUNREACH", "no route to host"},
-	{66, "ENOTEMPTY", "directory not empty"},
-	{67, "EPROCLIM", "too many processes"},
-	{68, "EUSERS", "too many users"},
-	{69, "EDQUOT", "disc quota exceeded"},
-	{70, "ESTALE", "stale NFS file handle"},
-	{71, "EREMOTE", "too many levels of remote in path"},
-	{72, "EBADRPC", "RPC struct is bad"},
-	{73, "ERPCMISMATCH", "RPC version wrong"},
-	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
-	{75, "EPROGMISMATCH", "program version wrong"},
-	{76, "EPROCUNAVAIL", "bad procedure for program"},
-	{77, "ENOLCK", "no locks available"},
-	{78, "ENOSYS", "function not implemented"},
-	{79, "EFTYPE", "inappropriate file type or format"},
-	{80, "EAUTH", "authentication error"},
-	{81, "ENEEDAUTH", "need authenticator"},
-	{82, "EIDRM", "identifier removed"},
-	{83, "ENOMSG", "no message of desired type"},
-	{84, "EOVERFLOW", "value too large to be stored in data type"},
-	{85, "ECANCELED", "operation canceled"},
-	{86, "EILSEQ", "illegal byte sequence"},
-	{87, "ENOATTR", "attribute not found"},
-	{88, "EDOOFUS", "programming error"},
-	{89, "EBADMSG", "bad message"},
-	{90, "EMULTIHOP", "multihop attempted"},
-	{91, "ENOLINK", "link has been severed"},
-	{92, "EPROTO", "protocol error"},
-	{93, "ENOTCAPABLE", "capabilities insufficient"},
-	{94, "ECAPMODE", "not permitted in capability mode"},
-	{95, "ENOTRECOVERABLE", "state not recoverable"},
-	{96, "EOWNERDEAD", "previous owner died"},
-	{97, "EINTEGRITY", "integrity check failed"},
-}
-
-// Signal table
-var signalList = [...]struct {
-	num  syscall.Signal
-	name string
-	desc string
-}{
-	{1, "SIGHUP", "hangup"},
-	{2, "SIGINT", "interrupt"},
-	{3, "SIGQUIT", "quit"},
-	{4, "SIGILL", "illegal instruction"},
-	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
-	{7, "SIGEMT", "EMT trap"},
-	{8, "SIGFPE", "floating point exception"},
-	{9, "SIGKILL", "killed"},
-	{10, "SIGBUS", "bus error"},
-	{11, "SIGSEGV", "segmentation fault"},
-	{12, "SIGSYS", "bad system call"},
-	{13, "SIGPIPE", "broken pipe"},
-	{14, "SIGALRM", "alarm clock"},
-	{15, "SIGTERM", "terminated"},
-	{16, "SIGURG", "urgent I/O condition"},
-	{17, "SIGSTOP", "suspended (signal)"},
-	{18, "SIGTSTP", "suspended"},
-	{19, "SIGCONT", "continued"},
-	{20, "SIGCHLD", "child exited"},
-	{21, "SIGTTIN", "stopped (tty input)"},
-	{22, "SIGTTOU", "stopped (tty output)"},
-	{23, "SIGIO", "I/O possible"},
-	{24, "SIGXCPU", "cputime limit exceeded"},
-	{25, "SIGXFSZ", "filesize limit exceeded"},
-	{26, "SIGVTALRM", "virtual timer expired"},
-	{27, "SIGPROF", "profiling timer expired"},
-	{28, "SIGWINCH", "window size changes"},
-	{29, "SIGINFO", "information request"},
-	{30, "SIGUSR1", "user defined signal 1"},
-	{31, "SIGUSR2", "user defined signal 2"},
-	{32, "SIGTHR", "unknown signal"},
-	{33, "SIGLIBRT", "unknown signal"},
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 4f432bf..8894c4a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -1,6 +1,7 @@
-// Code generated by mkmerge; DO NOT EDIT.
+// Code generated by mkmerge.go; DO NOT EDIT.
 
 //go:build linux
+// +build linux
 
 package unix
 
@@ -37,8 +38,7 @@ const (
 	AF_KEY                                      = 0xf
 	AF_LLC                                      = 0x1a
 	AF_LOCAL                                    = 0x1
-	AF_MAX                                      = 0x2e
-	AF_MCTP                                     = 0x2d
+	AF_MAX                                      = 0x2d
 	AF_MPLS                                     = 0x1c
 	AF_NETBEUI                                  = 0xd
 	AF_NETLINK                                  = 0x10
@@ -69,7 +69,6 @@ const (
 	ALG_SET_DRBG_ENTROPY                        = 0x6
 	ALG_SET_IV                                  = 0x2
 	ALG_SET_KEY                                 = 0x1
-	ALG_SET_KEY_BY_KEY_SERIAL                   = 0x7
 	ALG_SET_OP                                  = 0x3
 	ANON_INODE_FS_MAGIC                         = 0x9041934
 	ARPHRD_6LOWPAN                              = 0x339
@@ -117,7 +116,6 @@ const (
 	ARPHRD_LAPB                                 = 0x204
 	ARPHRD_LOCALTLK                             = 0x305
 	ARPHRD_LOOPBACK                             = 0x304
-	ARPHRD_MCTP                                 = 0x122
 	ARPHRD_METRICOM                             = 0x17
 	ARPHRD_NETLINK                              = 0x338
 	ARPHRD_NETROM                               = 0x0
@@ -140,309 +138,6 @@ const (
 	ARPHRD_VOID                                 = 0xffff
 	ARPHRD_VSOCKMON                             = 0x33a
 	ARPHRD_X25                                  = 0x10f
-	AUDIT_ADD                                   = 0x3eb
-	AUDIT_ADD_RULE                              = 0x3f3
-	AUDIT_ALWAYS                                = 0x2
-	AUDIT_ANOM_ABEND                            = 0x6a5
-	AUDIT_ANOM_CREAT                            = 0x6a7
-	AUDIT_ANOM_LINK                             = 0x6a6
-	AUDIT_ANOM_PROMISCUOUS                      = 0x6a4
-	AUDIT_ARCH                                  = 0xb
-	AUDIT_ARCH_AARCH64                          = 0xc00000b7
-	AUDIT_ARCH_ALPHA                            = 0xc0009026
-	AUDIT_ARCH_ARCOMPACT                        = 0x4000005d
-	AUDIT_ARCH_ARCOMPACTBE                      = 0x5d
-	AUDIT_ARCH_ARCV2                            = 0x400000c3
-	AUDIT_ARCH_ARCV2BE                          = 0xc3
-	AUDIT_ARCH_ARM                              = 0x40000028
-	AUDIT_ARCH_ARMEB                            = 0x28
-	AUDIT_ARCH_C6X                              = 0x4000008c
-	AUDIT_ARCH_C6XBE                            = 0x8c
-	AUDIT_ARCH_CRIS                             = 0x4000004c
-	AUDIT_ARCH_CSKY                             = 0x400000fc
-	AUDIT_ARCH_FRV                              = 0x5441
-	AUDIT_ARCH_H8300                            = 0x2e
-	AUDIT_ARCH_HEXAGON                          = 0xa4
-	AUDIT_ARCH_I386                             = 0x40000003
-	AUDIT_ARCH_IA64                             = 0xc0000032
-	AUDIT_ARCH_LOONGARCH32                      = 0x40000102
-	AUDIT_ARCH_LOONGARCH64                      = 0xc0000102
-	AUDIT_ARCH_M32R                             = 0x58
-	AUDIT_ARCH_M68K                             = 0x4
-	AUDIT_ARCH_MICROBLAZE                       = 0xbd
-	AUDIT_ARCH_MIPS                             = 0x8
-	AUDIT_ARCH_MIPS64                           = 0x80000008
-	AUDIT_ARCH_MIPS64N32                        = 0xa0000008
-	AUDIT_ARCH_MIPSEL                           = 0x40000008
-	AUDIT_ARCH_MIPSEL64                         = 0xc0000008
-	AUDIT_ARCH_MIPSEL64N32                      = 0xe0000008
-	AUDIT_ARCH_NDS32                            = 0x400000a7
-	AUDIT_ARCH_NDS32BE                          = 0xa7
-	AUDIT_ARCH_NIOS2                            = 0x40000071
-	AUDIT_ARCH_OPENRISC                         = 0x5c
-	AUDIT_ARCH_PARISC                           = 0xf
-	AUDIT_ARCH_PARISC64                         = 0x8000000f
-	AUDIT_ARCH_PPC                              = 0x14
-	AUDIT_ARCH_PPC64                            = 0x80000015
-	AUDIT_ARCH_PPC64LE                          = 0xc0000015
-	AUDIT_ARCH_RISCV32                          = 0x400000f3
-	AUDIT_ARCH_RISCV64                          = 0xc00000f3
-	AUDIT_ARCH_S390                             = 0x16
-	AUDIT_ARCH_S390X                            = 0x80000016
-	AUDIT_ARCH_SH                               = 0x2a
-	AUDIT_ARCH_SH64                             = 0x8000002a
-	AUDIT_ARCH_SHEL                             = 0x4000002a
-	AUDIT_ARCH_SHEL64                           = 0xc000002a
-	AUDIT_ARCH_SPARC                            = 0x2
-	AUDIT_ARCH_SPARC64                          = 0x8000002b
-	AUDIT_ARCH_TILEGX                           = 0xc00000bf
-	AUDIT_ARCH_TILEGX32                         = 0x400000bf
-	AUDIT_ARCH_TILEPRO                          = 0x400000bc
-	AUDIT_ARCH_UNICORE                          = 0x4000006e
-	AUDIT_ARCH_X86_64                           = 0xc000003e
-	AUDIT_ARCH_XTENSA                           = 0x5e
-	AUDIT_ARG0                                  = 0xc8
-	AUDIT_ARG1                                  = 0xc9
-	AUDIT_ARG2                                  = 0xca
-	AUDIT_ARG3                                  = 0xcb
-	AUDIT_AVC                                   = 0x578
-	AUDIT_AVC_PATH                              = 0x57a
-	AUDIT_BITMASK_SIZE                          = 0x40
-	AUDIT_BIT_MASK                              = 0x8000000
-	AUDIT_BIT_TEST                              = 0x48000000
-	AUDIT_BPF                                   = 0x536
-	AUDIT_BPRM_FCAPS                            = 0x529
-	AUDIT_CAPSET                                = 0x52a
-	AUDIT_CLASS_CHATTR                          = 0x2
-	AUDIT_CLASS_CHATTR_32                       = 0x3
-	AUDIT_CLASS_DIR_WRITE                       = 0x0
-	AUDIT_CLASS_DIR_WRITE_32                    = 0x1
-	AUDIT_CLASS_READ                            = 0x4
-	AUDIT_CLASS_READ_32                         = 0x5
-	AUDIT_CLASS_SIGNAL                          = 0x8
-	AUDIT_CLASS_SIGNAL_32                       = 0x9
-	AUDIT_CLASS_WRITE                           = 0x6
-	AUDIT_CLASS_WRITE_32                        = 0x7
-	AUDIT_COMPARE_AUID_TO_EUID                  = 0x10
-	AUDIT_COMPARE_AUID_TO_FSUID                 = 0xe
-	AUDIT_COMPARE_AUID_TO_OBJ_UID               = 0x5
-	AUDIT_COMPARE_AUID_TO_SUID                  = 0xf
-	AUDIT_COMPARE_EGID_TO_FSGID                 = 0x17
-	AUDIT_COMPARE_EGID_TO_OBJ_GID               = 0x4
-	AUDIT_COMPARE_EGID_TO_SGID                  = 0x18
-	AUDIT_COMPARE_EUID_TO_FSUID                 = 0x12
-	AUDIT_COMPARE_EUID_TO_OBJ_UID               = 0x3
-	AUDIT_COMPARE_EUID_TO_SUID                  = 0x11
-	AUDIT_COMPARE_FSGID_TO_OBJ_GID              = 0x9
-	AUDIT_COMPARE_FSUID_TO_OBJ_UID              = 0x8
-	AUDIT_COMPARE_GID_TO_EGID                   = 0x14
-	AUDIT_COMPARE_GID_TO_FSGID                  = 0x15
-	AUDIT_COMPARE_GID_TO_OBJ_GID                = 0x2
-	AUDIT_COMPARE_GID_TO_SGID                   = 0x16
-	AUDIT_COMPARE_SGID_TO_FSGID                 = 0x19
-	AUDIT_COMPARE_SGID_TO_OBJ_GID               = 0x7
-	AUDIT_COMPARE_SUID_TO_FSUID                 = 0x13
-	AUDIT_COMPARE_SUID_TO_OBJ_UID               = 0x6
-	AUDIT_COMPARE_UID_TO_AUID                   = 0xa
-	AUDIT_COMPARE_UID_TO_EUID                   = 0xb
-	AUDIT_COMPARE_UID_TO_FSUID                  = 0xc
-	AUDIT_COMPARE_UID_TO_OBJ_UID                = 0x1
-	AUDIT_COMPARE_UID_TO_SUID                   = 0xd
-	AUDIT_CONFIG_CHANGE                         = 0x519
-	AUDIT_CWD                                   = 0x51b
-	AUDIT_DAEMON_ABORT                          = 0x4b2
-	AUDIT_DAEMON_CONFIG                         = 0x4b3
-	AUDIT_DAEMON_END                            = 0x4b1
-	AUDIT_DAEMON_START                          = 0x4b0
-	AUDIT_DEL                                   = 0x3ec
-	AUDIT_DEL_RULE                              = 0x3f4
-	AUDIT_DEVMAJOR                              = 0x64
-	AUDIT_DEVMINOR                              = 0x65
-	AUDIT_DIR                                   = 0x6b
-	AUDIT_DM_CTRL                               = 0x53a
-	AUDIT_DM_EVENT                              = 0x53b
-	AUDIT_EGID                                  = 0x6
-	AUDIT_EOE                                   = 0x528
-	AUDIT_EQUAL                                 = 0x40000000
-	AUDIT_EUID                                  = 0x2
-	AUDIT_EVENT_LISTENER                        = 0x537
-	AUDIT_EXE                                   = 0x70
-	AUDIT_EXECVE                                = 0x51d
-	AUDIT_EXIT                                  = 0x67
-	AUDIT_FAIL_PANIC                            = 0x2
-	AUDIT_FAIL_PRINTK                           = 0x1
-	AUDIT_FAIL_SILENT                           = 0x0
-	AUDIT_FANOTIFY                              = 0x533
-	AUDIT_FD_PAIR                               = 0x525
-	AUDIT_FEATURE_BITMAP_ALL                    = 0x7f
-	AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT          = 0x1
-	AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME      = 0x2
-	AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND         = 0x8
-	AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH        = 0x4
-	AUDIT_FEATURE_BITMAP_FILTER_FS              = 0x40
-	AUDIT_FEATURE_BITMAP_LOST_RESET             = 0x20
-	AUDIT_FEATURE_BITMAP_SESSIONID_FILTER       = 0x10
-	AUDIT_FEATURE_CHANGE                        = 0x530
-	AUDIT_FEATURE_LOGINUID_IMMUTABLE            = 0x1
-	AUDIT_FEATURE_ONLY_UNSET_LOGINUID           = 0x0
-	AUDIT_FEATURE_VERSION                       = 0x1
-	AUDIT_FIELD_COMPARE                         = 0x6f
-	AUDIT_FILETYPE                              = 0x6c
-	AUDIT_FILTERKEY                             = 0xd2
-	AUDIT_FILTER_ENTRY                          = 0x2
-	AUDIT_FILTER_EXCLUDE                        = 0x5
-	AUDIT_FILTER_EXIT                           = 0x4
-	AUDIT_FILTER_FS                             = 0x6
-	AUDIT_FILTER_PREPEND                        = 0x10
-	AUDIT_FILTER_TASK                           = 0x1
-	AUDIT_FILTER_TYPE                           = 0x5
-	AUDIT_FILTER_URING_EXIT                     = 0x7
-	AUDIT_FILTER_USER                           = 0x0
-	AUDIT_FILTER_WATCH                          = 0x3
-	AUDIT_FIRST_KERN_ANOM_MSG                   = 0x6a4
-	AUDIT_FIRST_USER_MSG                        = 0x44c
-	AUDIT_FIRST_USER_MSG2                       = 0x834
-	AUDIT_FSGID                                 = 0x8
-	AUDIT_FSTYPE                                = 0x1a
-	AUDIT_FSUID                                 = 0x4
-	AUDIT_GET                                   = 0x3e8
-	AUDIT_GET_FEATURE                           = 0x3fb
-	AUDIT_GID                                   = 0x5
-	AUDIT_GREATER_THAN                          = 0x20000000
-	AUDIT_GREATER_THAN_OR_EQUAL                 = 0x60000000
-	AUDIT_INODE                                 = 0x66
-	AUDIT_INTEGRITY_DATA                        = 0x708
-	AUDIT_INTEGRITY_EVM_XATTR                   = 0x70e
-	AUDIT_INTEGRITY_HASH                        = 0x70b
-	AUDIT_INTEGRITY_METADATA                    = 0x709
-	AUDIT_INTEGRITY_PCR                         = 0x70c
-	AUDIT_INTEGRITY_POLICY_RULE                 = 0x70f
-	AUDIT_INTEGRITY_RULE                        = 0x70d
-	AUDIT_INTEGRITY_STATUS                      = 0x70a
-	AUDIT_IPC                                   = 0x517
-	AUDIT_IPC_SET_PERM                          = 0x51f
-	AUDIT_IPE_ACCESS                            = 0x58c
-	AUDIT_IPE_CONFIG_CHANGE                     = 0x58d
-	AUDIT_IPE_POLICY_LOAD                       = 0x58e
-	AUDIT_KERNEL                                = 0x7d0
-	AUDIT_KERNEL_OTHER                          = 0x524
-	AUDIT_KERN_MODULE                           = 0x532
-	AUDIT_LAST_FEATURE                          = 0x1
-	AUDIT_LAST_KERN_ANOM_MSG                    = 0x707
-	AUDIT_LAST_USER_MSG                         = 0x4af
-	AUDIT_LAST_USER_MSG2                        = 0xbb7
-	AUDIT_LESS_THAN                             = 0x10000000
-	AUDIT_LESS_THAN_OR_EQUAL                    = 0x50000000
-	AUDIT_LIST                                  = 0x3ea
-	AUDIT_LIST_RULES                            = 0x3f5
-	AUDIT_LOGIN                                 = 0x3ee
-	AUDIT_LOGINUID                              = 0x9
-	AUDIT_LOGINUID_SET                          = 0x18
-	AUDIT_MAC_CALIPSO_ADD                       = 0x58a
-	AUDIT_MAC_CALIPSO_DEL                       = 0x58b
-	AUDIT_MAC_CIPSOV4_ADD                       = 0x57f
-	AUDIT_MAC_CIPSOV4_DEL                       = 0x580
-	AUDIT_MAC_CONFIG_CHANGE                     = 0x57d
-	AUDIT_MAC_IPSEC_ADDSA                       = 0x583
-	AUDIT_MAC_IPSEC_ADDSPD                      = 0x585
-	AUDIT_MAC_IPSEC_DELSA                       = 0x584
-	AUDIT_MAC_IPSEC_DELSPD                      = 0x586
-	AUDIT_MAC_IPSEC_EVENT                       = 0x587
-	AUDIT_MAC_MAP_ADD                           = 0x581
-	AUDIT_MAC_MAP_DEL                           = 0x582
-	AUDIT_MAC_POLICY_LOAD                       = 0x57b
-	AUDIT_MAC_STATUS                            = 0x57c
-	AUDIT_MAC_UNLBL_ALLOW                       = 0x57e
-	AUDIT_MAC_UNLBL_STCADD                      = 0x588
-	AUDIT_MAC_UNLBL_STCDEL                      = 0x589
-	AUDIT_MAKE_EQUIV                            = 0x3f7
-	AUDIT_MAX_FIELDS                            = 0x40
-	AUDIT_MAX_FIELD_COMPARE                     = 0x19
-	AUDIT_MAX_KEY_LEN                           = 0x100
-	AUDIT_MESSAGE_TEXT_MAX                      = 0x2170
-	AUDIT_MMAP                                  = 0x52b
-	AUDIT_MQ_GETSETATTR                         = 0x523
-	AUDIT_MQ_NOTIFY                             = 0x522
-	AUDIT_MQ_OPEN                               = 0x520
-	AUDIT_MQ_SENDRECV                           = 0x521
-	AUDIT_MSGTYPE                               = 0xc
-	AUDIT_NEGATE                                = 0x80000000
-	AUDIT_NETFILTER_CFG                         = 0x52d
-	AUDIT_NETFILTER_PKT                         = 0x52c
-	AUDIT_NEVER                                 = 0x0
-	AUDIT_NLGRP_MAX                             = 0x1
-	AUDIT_NOT_EQUAL                             = 0x30000000
-	AUDIT_NR_FILTERS                            = 0x8
-	AUDIT_OBJ_GID                               = 0x6e
-	AUDIT_OBJ_LEV_HIGH                          = 0x17
-	AUDIT_OBJ_LEV_LOW                           = 0x16
-	AUDIT_OBJ_PID                               = 0x526
-	AUDIT_OBJ_ROLE                              = 0x14
-	AUDIT_OBJ_TYPE                              = 0x15
-	AUDIT_OBJ_UID                               = 0x6d
-	AUDIT_OBJ_USER                              = 0x13
-	AUDIT_OPENAT2                               = 0x539
-	AUDIT_OPERATORS                             = 0x78000000
-	AUDIT_PATH                                  = 0x516
-	AUDIT_PERM                                  = 0x6a
-	AUDIT_PERM_ATTR                             = 0x8
-	AUDIT_PERM_EXEC                             = 0x1
-	AUDIT_PERM_READ                             = 0x4
-	AUDIT_PERM_WRITE                            = 0x2
-	AUDIT_PERS                                  = 0xa
-	AUDIT_PID                                   = 0x0
-	AUDIT_POSSIBLE                              = 0x1
-	AUDIT_PPID                                  = 0x12
-	AUDIT_PROCTITLE                             = 0x52f
-	AUDIT_REPLACE                               = 0x531
-	AUDIT_SADDR_FAM                             = 0x71
-	AUDIT_SECCOMP                               = 0x52e
-	AUDIT_SELINUX_ERR                           = 0x579
-	AUDIT_SESSIONID                             = 0x19
-	AUDIT_SET                                   = 0x3e9
-	AUDIT_SET_FEATURE                           = 0x3fa
-	AUDIT_SGID                                  = 0x7
-	AUDIT_SID_UNSET                             = 0xffffffff
-	AUDIT_SIGNAL_INFO                           = 0x3f2
-	AUDIT_SOCKADDR                              = 0x51a
-	AUDIT_SOCKETCALL                            = 0x518
-	AUDIT_STATUS_BACKLOG_LIMIT                  = 0x10
-	AUDIT_STATUS_BACKLOG_WAIT_TIME              = 0x20
-	AUDIT_STATUS_BACKLOG_WAIT_TIME_ACTUAL       = 0x80
-	AUDIT_STATUS_ENABLED                        = 0x1
-	AUDIT_STATUS_FAILURE                        = 0x2
-	AUDIT_STATUS_LOST                           = 0x40
-	AUDIT_STATUS_PID                            = 0x4
-	AUDIT_STATUS_RATE_LIMIT                     = 0x8
-	AUDIT_SUBJ_CLR                              = 0x11
-	AUDIT_SUBJ_ROLE                             = 0xe
-	AUDIT_SUBJ_SEN                              = 0x10
-	AUDIT_SUBJ_TYPE                             = 0xf
-	AUDIT_SUBJ_USER                             = 0xd
-	AUDIT_SUCCESS                               = 0x68
-	AUDIT_SUID                                  = 0x3
-	AUDIT_SYSCALL                               = 0x514
-	AUDIT_SYSCALL_CLASSES                       = 0x10
-	AUDIT_TIME_ADJNTPVAL                        = 0x535
-	AUDIT_TIME_INJOFFSET                        = 0x534
-	AUDIT_TRIM                                  = 0x3f6
-	AUDIT_TTY                                   = 0x527
-	AUDIT_TTY_GET                               = 0x3f8
-	AUDIT_TTY_SET                               = 0x3f9
-	AUDIT_UID                                   = 0x1
-	AUDIT_UID_UNSET                             = 0xffffffff
-	AUDIT_UNUSED_BITS                           = 0x7fffc00
-	AUDIT_URINGOP                               = 0x538
-	AUDIT_USER                                  = 0x3ed
-	AUDIT_USER_AVC                              = 0x453
-	AUDIT_USER_TTY                              = 0x464
-	AUDIT_VERSION_BACKLOG_LIMIT                 = 0x1
-	AUDIT_VERSION_BACKLOG_WAIT_TIME             = 0x2
-	AUDIT_VERSION_LATEST                        = 0x7f
-	AUDIT_WATCH                                 = 0x69
-	AUDIT_WATCH_INS                             = 0x3ef
-	AUDIT_WATCH_LIST                            = 0x3f1
-	AUDIT_WATCH_REM                             = 0x3f0
 	AUTOFS_SUPER_MAGIC                          = 0x187
 	B0                                          = 0x0
 	B110                                        = 0x3
@@ -460,7 +155,7 @@ const (
 	B600                                        = 0x8
 	B75                                         = 0x2
 	B9600                                       = 0xd
-	BCACHEFS_SUPER_MAGIC                        = 0xca451a4e
+	BALLOON_KVM_MAGIC                           = 0x13661366
 	BDEVFS_MAGIC                                = 0x62646576
 	BINDERFS_SUPER_MAGIC                        = 0x6c6f6f70
 	BINFMTFS_MAGIC                              = 0x42494e4d
@@ -484,31 +179,20 @@ const (
 	BPF_FROM_BE                                 = 0x8
 	BPF_FROM_LE                                 = 0x0
 	BPF_FS_MAGIC                                = 0xcafe4a11
-	BPF_F_AFTER                                 = 0x10
 	BPF_F_ALLOW_MULTI                           = 0x2
 	BPF_F_ALLOW_OVERRIDE                        = 0x1
 	BPF_F_ANY_ALIGNMENT                         = 0x2
-	BPF_F_BEFORE                                = 0x8
-	BPF_F_ID                                    = 0x20
-	BPF_F_NETFILTER_IP_DEFRAG                   = 0x1
 	BPF_F_QUERY_EFFECTIVE                       = 0x1
-	BPF_F_REDIRECT_FLAGS                        = 0x19
 	BPF_F_REPLACE                               = 0x4
 	BPF_F_SLEEPABLE                             = 0x10
 	BPF_F_STRICT_ALIGNMENT                      = 0x1
-	BPF_F_TEST_REG_INVARIANTS                   = 0x80
 	BPF_F_TEST_RND_HI32                         = 0x4
 	BPF_F_TEST_RUN_ON_CPU                       = 0x1
-	BPF_F_TEST_SKB_CHECKSUM_COMPLETE            = 0x4
 	BPF_F_TEST_STATE_FREQ                       = 0x8
-	BPF_F_TEST_XDP_LIVE_FRAMES                  = 0x2
-	BPF_F_XDP_DEV_BOUND_ONLY                    = 0x40
-	BPF_F_XDP_HAS_FRAGS                         = 0x20
 	BPF_H                                       = 0x8
 	BPF_IMM                                     = 0x0
 	BPF_IND                                     = 0x40
 	BPF_JA                                      = 0x0
-	BPF_JCOND                                   = 0xe0
 	BPF_JEQ                                     = 0x10
 	BPF_JGE                                     = 0x30
 	BPF_JGT                                     = 0x20
@@ -531,7 +215,6 @@ const (
 	BPF_MAJOR_VERSION                           = 0x1
 	BPF_MAXINSNS                                = 0x1000
 	BPF_MEM                                     = 0x60
-	BPF_MEMSX                                   = 0x80
 	BPF_MEMWORDS                                = 0x10
 	BPF_MINOR_VERSION                           = 0x1
 	BPF_MISC                                    = 0x7
@@ -575,27 +258,12 @@ const (
 	BUS_USB                                     = 0x3
 	BUS_VIRTUAL                                 = 0x6
 	CAN_BCM                                     = 0x2
-	CAN_BUS_OFF_THRESHOLD                       = 0x100
-	CAN_CTRLMODE_3_SAMPLES                      = 0x4
-	CAN_CTRLMODE_BERR_REPORTING                 = 0x10
-	CAN_CTRLMODE_CC_LEN8_DLC                    = 0x100
-	CAN_CTRLMODE_FD                             = 0x20
-	CAN_CTRLMODE_FD_NON_ISO                     = 0x80
-	CAN_CTRLMODE_LISTENONLY                     = 0x2
-	CAN_CTRLMODE_LOOPBACK                       = 0x1
-	CAN_CTRLMODE_ONE_SHOT                       = 0x8
-	CAN_CTRLMODE_PRESUME_ACK                    = 0x40
-	CAN_CTRLMODE_TDC_AUTO                       = 0x200
-	CAN_CTRLMODE_TDC_MANUAL                     = 0x400
 	CAN_EFF_FLAG                                = 0x80000000
 	CAN_EFF_ID_BITS                             = 0x1d
 	CAN_EFF_MASK                                = 0x1fffffff
-	CAN_ERROR_PASSIVE_THRESHOLD                 = 0x80
-	CAN_ERROR_WARNING_THRESHOLD                 = 0x60
 	CAN_ERR_ACK                                 = 0x20
 	CAN_ERR_BUSERROR                            = 0x80
 	CAN_ERR_BUSOFF                              = 0x40
-	CAN_ERR_CNT                                 = 0x200
 	CAN_ERR_CRTL                                = 0x4
 	CAN_ERR_CRTL_ACTIVE                         = 0x40
 	CAN_ERR_CRTL_RX_OVERFLOW                    = 0x1
@@ -664,13 +332,9 @@ const (
 	CAN_NPROTO                                  = 0x8
 	CAN_RAW                                     = 0x1
 	CAN_RAW_FILTER_MAX                          = 0x200
-	CAN_RAW_XL_VCID_RX_FILTER                   = 0x4
-	CAN_RAW_XL_VCID_TX_PASS                     = 0x2
-	CAN_RAW_XL_VCID_TX_SET                      = 0x1
 	CAN_RTR_FLAG                                = 0x40000000
 	CAN_SFF_ID_BITS                             = 0xb
 	CAN_SFF_MASK                                = 0x7ff
-	CAN_TERMINATION_DISABLED                    = 0x0
 	CAN_TP16                                    = 0x3
 	CAN_TP20                                    = 0x4
 	CAP_AUDIT_CONTROL                           = 0x1e
@@ -715,11 +379,9 @@ const (
 	CAP_SYS_TIME                                = 0x19
 	CAP_SYS_TTY_CONFIG                          = 0x1a
 	CAP_WAKE_ALARM                              = 0x23
-	CEPH_SUPER_MAGIC                            = 0xc36400
 	CFLUSH                                      = 0xf
 	CGROUP2_SUPER_MAGIC                         = 0x63677270
 	CGROUP_SUPER_MAGIC                          = 0x27e0eb
-	CIFS_SUPER_MAGIC                            = 0xff534d42
 	CLOCK_BOOTTIME                              = 0x7
 	CLOCK_BOOTTIME_ALARM                        = 0x9
 	CLOCK_DEFAULT                               = 0x0
@@ -790,10 +452,6 @@ const (
 	DEVLINK_GENL_MCGRP_CONFIG_NAME              = "config"
 	DEVLINK_GENL_NAME                           = "devlink"
 	DEVLINK_GENL_VERSION                        = 0x1
-	DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO            = 0x4
-	DEVLINK_PORT_FN_CAP_IPSEC_PACKET            = 0x8
-	DEVLINK_PORT_FN_CAP_MIGRATABLE              = 0x2
-	DEVLINK_PORT_FN_CAP_ROCE                    = 0x1
 	DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX           = 0x14
 	DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS  = 0x3
 	DEVMEM_MAGIC                                = 0x454d444d
@@ -814,7 +472,6 @@ const (
 	DM_DEV_WAIT                                 = 0xc138fd08
 	DM_DIR                                      = "mapper"
 	DM_GET_TARGET_VERSION                       = 0xc138fd11
-	DM_IMA_MEASUREMENT_FLAG                     = 0x80000
 	DM_INACTIVE_PRESENT_FLAG                    = 0x40
 	DM_INTERNAL_SUSPEND_FLAG                    = 0x40000
 	DM_IOCTL                                    = 0xfd
@@ -843,9 +500,9 @@ const (
 	DM_UUID_FLAG                                = 0x4000
 	DM_UUID_LEN                                 = 0x81
 	DM_VERSION                                  = 0xc138fd00
-	DM_VERSION_EXTRA                            = "-ioctl (2023-03-01)"
+	DM_VERSION_EXTRA                            = "-ioctl (2021-03-22)"
 	DM_VERSION_MAJOR                            = 0x4
-	DM_VERSION_MINOR                            = 0x30
+	DM_VERSION_MINOR                            = 0x2d
 	DM_VERSION_PATCHLEVEL                       = 0x0
 	DT_BLK                                      = 0x6
 	DT_CHR                                      = 0x2
@@ -861,55 +518,6 @@ const (
 	EFD_SEMAPHORE                               = 0x1
 	EFIVARFS_MAGIC                              = 0xde5e81e4
 	EFS_SUPER_MAGIC                             = 0x414a53
-	EM_386                                      = 0x3
-	EM_486                                      = 0x6
-	EM_68K                                      = 0x4
-	EM_860                                      = 0x7
-	EM_88K                                      = 0x5
-	EM_AARCH64                                  = 0xb7
-	EM_ALPHA                                    = 0x9026
-	EM_ALTERA_NIOS2                             = 0x71
-	EM_ARCOMPACT                                = 0x5d
-	EM_ARCV2                                    = 0xc3
-	EM_ARM                                      = 0x28
-	EM_BLACKFIN                                 = 0x6a
-	EM_BPF                                      = 0xf7
-	EM_CRIS                                     = 0x4c
-	EM_CSKY                                     = 0xfc
-	EM_CYGNUS_M32R                              = 0x9041
-	EM_CYGNUS_MN10300                           = 0xbeef
-	EM_FRV                                      = 0x5441
-	EM_H8_300                                   = 0x2e
-	EM_HEXAGON                                  = 0xa4
-	EM_IA_64                                    = 0x32
-	EM_LOONGARCH                                = 0x102
-	EM_M32                                      = 0x1
-	EM_M32R                                     = 0x58
-	EM_MICROBLAZE                               = 0xbd
-	EM_MIPS                                     = 0x8
-	EM_MIPS_RS3_LE                              = 0xa
-	EM_MIPS_RS4_BE                              = 0xa
-	EM_MN10300                                  = 0x59
-	EM_NDS32                                    = 0xa7
-	EM_NONE                                     = 0x0
-	EM_OPENRISC                                 = 0x5c
-	EM_PARISC                                   = 0xf
-	EM_PPC                                      = 0x14
-	EM_PPC64                                    = 0x15
-	EM_RISCV                                    = 0xf3
-	EM_S390                                     = 0x16
-	EM_S390_OLD                                 = 0xa390
-	EM_SH                                       = 0x2a
-	EM_SPARC                                    = 0x2
-	EM_SPARC32PLUS                              = 0x12
-	EM_SPARCV9                                  = 0x2b
-	EM_SPU                                      = 0x17
-	EM_TILEGX                                   = 0xbf
-	EM_TILEPRO                                  = 0xbc
-	EM_TI_C6000                                 = 0x8c
-	EM_UNICORE                                  = 0x6e
-	EM_X86_64                                   = 0x3e
-	EM_XTENSA                                   = 0x5e
 	ENCODING_DEFAULT                            = 0x0
 	ENCODING_FM_MARK                            = 0x3
 	ENCODING_FM_SPACE                           = 0x4
@@ -934,7 +542,6 @@ const (
 	EPOLL_CTL_ADD                               = 0x1
 	EPOLL_CTL_DEL                               = 0x2
 	EPOLL_CTL_MOD                               = 0x3
-	EPOLL_IOC_TYPE                              = 0x8a
 	EROFS_SUPER_MAGIC_V1                        = 0xe0f5e1e2
 	ESP_V4_FLOW                                 = 0xa
 	ESP_V6_FLOW                                 = 0xc
@@ -948,6 +555,9 @@ const (
 	ETHTOOL_FEC_OFF                             = 0x4
 	ETHTOOL_FEC_RS                              = 0x8
 	ETHTOOL_FLAG_ALL                            = 0x7
+	ETHTOOL_FLAG_COMPACT_BITSETS                = 0x1
+	ETHTOOL_FLAG_OMIT_REPLY                     = 0x2
+	ETHTOOL_FLAG_STATS                          = 0x4
 	ETHTOOL_FLASHDEV                            = 0x33
 	ETHTOOL_FLASH_MAX_FILENAME                  = 0x80
 	ETHTOOL_FWVERS_LEN                          = 0x20
@@ -1070,7 +680,6 @@ const (
 	ETH_P_CAIF                                  = 0xf7
 	ETH_P_CAN                                   = 0xc
 	ETH_P_CANFD                                 = 0xd
-	ETH_P_CANXL                                 = 0xe
 	ETH_P_CFM                                   = 0x8902
 	ETH_P_CONTROL                               = 0x16
 	ETH_P_CUST                                  = 0x6006
@@ -1082,12 +691,10 @@ const (
 	ETH_P_DNA_RT                                = 0x6003
 	ETH_P_DSA                                   = 0x1b
 	ETH_P_DSA_8021Q                             = 0xdadb
-	ETH_P_DSA_A5PSW                             = 0xe001
 	ETH_P_ECONET                                = 0x18
 	ETH_P_EDSA                                  = 0xdada
 	ETH_P_ERSPAN                                = 0x88be
 	ETH_P_ERSPAN2                               = 0x22eb
-	ETH_P_ETHERCAT                              = 0x88a4
 	ETH_P_FCOE                                  = 0x8906
 	ETH_P_FIP                                   = 0x8914
 	ETH_P_HDLC                                  = 0x19
@@ -1109,7 +716,6 @@ const (
 	ETH_P_LOOPBACK                              = 0x9000
 	ETH_P_MACSEC                                = 0x88e5
 	ETH_P_MAP                                   = 0xf9
-	ETH_P_MCTP                                  = 0xfa
 	ETH_P_MOBITEX                               = 0x15
 	ETH_P_MPLS_MC                               = 0x8848
 	ETH_P_MPLS_UC                               = 0x8847
@@ -1125,7 +731,6 @@ const (
 	ETH_P_PPP_MP                                = 0x8
 	ETH_P_PPP_SES                               = 0x8864
 	ETH_P_PREAUTH                               = 0x88c7
-	ETH_P_PROFINET                              = 0x8892
 	ETH_P_PRP                                   = 0x88fb
 	ETH_P_PUP                                   = 0x200
 	ETH_P_PUPAT                                 = 0x201
@@ -1133,7 +738,6 @@ const (
 	ETH_P_QINQ2                                 = 0x9200
 	ETH_P_QINQ3                                 = 0x9300
 	ETH_P_RARP                                  = 0x8035
-	ETH_P_REALTEK                               = 0x8899
 	ETH_P_SCA                                   = 0x6007
 	ETH_P_SLOW                                  = 0x8809
 	ETH_P_SNAP                                  = 0x5
@@ -1147,30 +751,13 @@ const (
 	ETH_P_WCCP                                  = 0x883e
 	ETH_P_X25                                   = 0x805
 	ETH_P_XDSA                                  = 0xf8
-	EV_ABS                                      = 0x3
-	EV_CNT                                      = 0x20
-	EV_FF                                       = 0x15
-	EV_FF_STATUS                                = 0x17
-	EV_KEY                                      = 0x1
-	EV_LED                                      = 0x11
-	EV_MAX                                      = 0x1f
-	EV_MSC                                      = 0x4
-	EV_PWR                                      = 0x16
-	EV_REL                                      = 0x2
-	EV_REP                                      = 0x14
-	EV_SND                                      = 0x12
-	EV_SW                                       = 0x5
-	EV_SYN                                      = 0x0
-	EV_VERSION                                  = 0x10001
 	EXABYTE_ENABLE_NEST                         = 0xf0
-	EXFAT_SUPER_MAGIC                           = 0x2011bab0
 	EXT2_SUPER_MAGIC                            = 0xef53
 	EXT3_SUPER_MAGIC                            = 0xef53
 	EXT4_SUPER_MAGIC                            = 0xef53
 	EXTA                                        = 0xe
 	EXTB                                        = 0xf
 	F2FS_SUPER_MAGIC                            = 0xf2f52010
-	FALLOC_FL_ALLOCATE_RANGE                    = 0x0
 	FALLOC_FL_COLLAPSE_RANGE                    = 0x8
 	FALLOC_FL_INSERT_RANGE                      = 0x20
 	FALLOC_FL_KEEP_SIZE                         = 0x1
@@ -1202,27 +789,17 @@ const (
 	FAN_DELETE_SELF                             = 0x400
 	FAN_DENY                                    = 0x2
 	FAN_ENABLE_AUDIT                            = 0x40
-	FAN_EPIDFD                                  = -0x2
 	FAN_EVENT_INFO_TYPE_DFID                    = 0x3
 	FAN_EVENT_INFO_TYPE_DFID_NAME               = 0x2
-	FAN_EVENT_INFO_TYPE_ERROR                   = 0x5
 	FAN_EVENT_INFO_TYPE_FID                     = 0x1
-	FAN_EVENT_INFO_TYPE_NEW_DFID_NAME           = 0xc
-	FAN_EVENT_INFO_TYPE_OLD_DFID_NAME           = 0xa
-	FAN_EVENT_INFO_TYPE_PIDFD                   = 0x4
 	FAN_EVENT_METADATA_LEN                      = 0x18
 	FAN_EVENT_ON_CHILD                          = 0x8000000
-	FAN_FS_ERROR                                = 0x8000
-	FAN_INFO                                    = 0x20
 	FAN_MARK_ADD                                = 0x1
 	FAN_MARK_DONT_FOLLOW                        = 0x4
-	FAN_MARK_EVICTABLE                          = 0x200
 	FAN_MARK_FILESYSTEM                         = 0x100
 	FAN_MARK_FLUSH                              = 0x80
-	FAN_MARK_IGNORE                             = 0x400
 	FAN_MARK_IGNORED_MASK                       = 0x20
 	FAN_MARK_IGNORED_SURV_MODIFY                = 0x40
-	FAN_MARK_IGNORE_SURV                        = 0x440
 	FAN_MARK_INODE                              = 0x0
 	FAN_MARK_MOUNT                              = 0x10
 	FAN_MARK_ONLYDIR                            = 0x8
@@ -1234,37 +811,22 @@ const (
 	FAN_MOVE_SELF                               = 0x800
 	FAN_NOFD                                    = -0x1
 	FAN_NONBLOCK                                = 0x2
-	FAN_NOPIDFD                                 = -0x1
 	FAN_ONDIR                                   = 0x40000000
 	FAN_OPEN                                    = 0x20
 	FAN_OPEN_EXEC                               = 0x1000
 	FAN_OPEN_EXEC_PERM                          = 0x40000
 	FAN_OPEN_PERM                               = 0x10000
 	FAN_Q_OVERFLOW                              = 0x4000
-	FAN_RENAME                                  = 0x10000000
 	FAN_REPORT_DFID_NAME                        = 0xc00
-	FAN_REPORT_DFID_NAME_TARGET                 = 0x1e00
 	FAN_REPORT_DIR_FID                          = 0x400
-	FAN_REPORT_FD_ERROR                         = 0x2000
 	FAN_REPORT_FID                              = 0x200
 	FAN_REPORT_NAME                             = 0x800
-	FAN_REPORT_PIDFD                            = 0x80
-	FAN_REPORT_TARGET_FID                       = 0x1000
 	FAN_REPORT_TID                              = 0x100
-	FAN_RESPONSE_INFO_AUDIT_RULE                = 0x1
-	FAN_RESPONSE_INFO_NONE                      = 0x0
 	FAN_UNLIMITED_MARKS                         = 0x20
 	FAN_UNLIMITED_QUEUE                         = 0x10
 	FD_CLOEXEC                                  = 0x1
 	FD_SETSIZE                                  = 0x400
 	FF0                                         = 0x0
-	FIB_RULE_DEV_DETACHED                       = 0x8
-	FIB_RULE_FIND_SADDR                         = 0x10000
-	FIB_RULE_IIF_DETACHED                       = 0x8
-	FIB_RULE_INVERT                             = 0x2
-	FIB_RULE_OIF_DETACHED                       = 0x10
-	FIB_RULE_PERMANENT                          = 0x1
-	FIB_RULE_UNRESOLVED                         = 0x4
 	FIDEDUPERANGE                               = 0xc0189436
 	FSCRYPT_KEY_DESCRIPTOR_SIZE                 = 0x8
 	FSCRYPT_KEY_DESC_PREFIX                     = "fscrypt:"
@@ -1283,10 +845,7 @@ const (
 	FSCRYPT_MODE_AES_128_CBC                    = 0x5
 	FSCRYPT_MODE_AES_128_CTS                    = 0x6
 	FSCRYPT_MODE_AES_256_CTS                    = 0x4
-	FSCRYPT_MODE_AES_256_HCTR2                  = 0xa
 	FSCRYPT_MODE_AES_256_XTS                    = 0x1
-	FSCRYPT_MODE_SM4_CTS                        = 0x8
-	FSCRYPT_MODE_SM4_XTS                        = 0x7
 	FSCRYPT_POLICY_FLAGS_PAD_16                 = 0x2
 	FSCRYPT_POLICY_FLAGS_PAD_32                 = 0x3
 	FSCRYPT_POLICY_FLAGS_PAD_4                  = 0x0
@@ -1305,6 +864,8 @@ const (
 	FS_ENCRYPTION_MODE_AES_256_GCM              = 0x2
 	FS_ENCRYPTION_MODE_AES_256_XTS              = 0x1
 	FS_ENCRYPTION_MODE_INVALID                  = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS         = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS         = 0x7
 	FS_IOC_ADD_ENCRYPTION_KEY                   = 0xc0506617
 	FS_IOC_GET_ENCRYPTION_KEY_STATUS            = 0xc080661a
 	FS_IOC_GET_ENCRYPTION_POLICY_EX             = 0xc0096616
@@ -1328,13 +889,10 @@ const (
 	FS_VERITY_METADATA_TYPE_DESCRIPTOR          = 0x2
 	FS_VERITY_METADATA_TYPE_MERKLE_TREE         = 0x1
 	FS_VERITY_METADATA_TYPE_SIGNATURE           = 0x3
-	FUSE_SUPER_MAGIC                            = 0x65735546
 	FUTEXFS_SUPER_MAGIC                         = 0xbad1dea
 	F_ADD_SEALS                                 = 0x409
-	F_CREATED_QUERY                             = 0x404
 	F_DUPFD                                     = 0x0
 	F_DUPFD_CLOEXEC                             = 0x406
-	F_DUPFD_QUERY                               = 0x403
 	F_EXLCK                                     = 0x4
 	F_GETFD                                     = 0x1
 	F_GETFL                                     = 0x3
@@ -1351,7 +909,6 @@ const (
 	F_OFD_SETLK                                 = 0x25
 	F_OFD_SETLKW                                = 0x26
 	F_OK                                        = 0x0
-	F_SEAL_EXEC                                 = 0x20
 	F_SEAL_FUTURE_WRITE                         = 0x10
 	F_SEAL_GROW                                 = 0x4
 	F_SEAL_SEAL                                 = 0x1
@@ -1444,7 +1001,7 @@ const (
 	IFA_F_STABLE_PRIVACY                        = 0x800
 	IFA_F_TEMPORARY                             = 0x1
 	IFA_F_TENTATIVE                             = 0x40
-	IFA_MAX                                     = 0xb
+	IFA_MAX                                     = 0xa
 	IFF_ALLMULTI                                = 0x200
 	IFF_ATTACH_QUEUE                            = 0x200
 	IFF_AUTOMEDIA                               = 0x4000
@@ -1464,7 +1021,6 @@ const (
 	IFF_NOARP                                   = 0x80
 	IFF_NOFILTER                                = 0x1000
 	IFF_NOTRAILERS                              = 0x20
-	IFF_NO_CARRIER                              = 0x40
 	IFF_NO_PI                                   = 0x1000
 	IFF_ONE_QUEUE                               = 0x2000
 	IFF_PERSIST                                 = 0x800
@@ -1554,7 +1110,6 @@ const (
 	IPPROTO_ROUTING                             = 0x2b
 	IPPROTO_RSVP                                = 0x2e
 	IPPROTO_SCTP                                = 0x84
-	IPPROTO_SMC                                 = 0x100
 	IPPROTO_TCP                                 = 0x6
 	IPPROTO_TP                                  = 0x1d
 	IPPROTO_UDP                                 = 0x11
@@ -1627,8 +1182,6 @@ const (
 	IPV6_UNICAST_IF                             = 0x4c
 	IPV6_USER_FLOW                              = 0xe
 	IPV6_V6ONLY                                 = 0x1a
-	IPV6_VERSION                                = 0x60
-	IPV6_VERSION_MASK                           = 0xf0
 	IPV6_XFRM_POLICY                            = 0x23
 	IP_ADD_MEMBERSHIP                           = 0x23
 	IP_ADD_SOURCE_MEMBERSHIP                    = 0x27
@@ -1643,7 +1196,6 @@ const (
 	IP_FREEBIND                                 = 0xf
 	IP_HDRINCL                                  = 0x3
 	IP_IPSEC_POLICY                             = 0x10
-	IP_LOCAL_PORT_RANGE                         = 0x33
 	IP_MAXPACKET                                = 0xffff
 	IP_MAX_MEMBERSHIPS                          = 0x14
 	IP_MF                                       = 0x2000
@@ -1670,7 +1222,6 @@ const (
 	IP_PMTUDISC_OMIT                            = 0x5
 	IP_PMTUDISC_PROBE                           = 0x3
 	IP_PMTUDISC_WANT                            = 0x1
-	IP_PROTOCOL                                 = 0x34
 	IP_RECVERR                                  = 0xb
 	IP_RECVERR_RFC4884                          = 0x1a
 	IP_RECVFRAGSIZE                             = 0x19
@@ -1691,21 +1242,15 @@ const (
 	IP_XFRM_POLICY                              = 0x11
 	ISOFS_SUPER_MAGIC                           = 0x9660
 	ISTRIP                                      = 0x20
-	ITIMER_PROF                                 = 0x2
-	ITIMER_REAL                                 = 0x0
-	ITIMER_VIRTUAL                              = 0x1
 	IUTF8                                       = 0x4000
 	IXANY                                       = 0x800
 	JFFS2_SUPER_MAGIC                           = 0x72b6
-	KCMPROTO_CONNECTED                          = 0x0
-	KCM_RECV_DISABLE                            = 0x1
 	KEXEC_ARCH_386                              = 0x30000
 	KEXEC_ARCH_68K                              = 0x40000
 	KEXEC_ARCH_AARCH64                          = 0xb70000
 	KEXEC_ARCH_ARM                              = 0x280000
 	KEXEC_ARCH_DEFAULT                          = 0x0
 	KEXEC_ARCH_IA_64                            = 0x320000
-	KEXEC_ARCH_LOONGARCH                        = 0x1020000
 	KEXEC_ARCH_MASK                             = 0xffff0000
 	KEXEC_ARCH_MIPS                             = 0x80000
 	KEXEC_ARCH_MIPS_LE                          = 0xa0000
@@ -1716,15 +1261,12 @@ const (
 	KEXEC_ARCH_S390                             = 0x160000
 	KEXEC_ARCH_SH                               = 0x2a0000
 	KEXEC_ARCH_X86_64                           = 0x3e0000
-	KEXEC_CRASH_HOTPLUG_SUPPORT                 = 0x8
-	KEXEC_FILE_DEBUG                            = 0x8
 	KEXEC_FILE_NO_INITRAMFS                     = 0x4
 	KEXEC_FILE_ON_CRASH                         = 0x2
 	KEXEC_FILE_UNLOAD                           = 0x1
 	KEXEC_ON_CRASH                              = 0x1
 	KEXEC_PRESERVE_CONTEXT                      = 0x2
 	KEXEC_SEGMENT_MAX                           = 0x10
-	KEXEC_UPDATE_ELFCOREHDR                     = 0x4
 	KEYCTL_ASSUME_AUTHORITY                     = 0x10
 	KEYCTL_CAPABILITIES                         = 0x1f
 	KEYCTL_CAPS0_BIG_KEY                        = 0x10
@@ -1791,27 +1333,6 @@ const (
 	KEY_SPEC_THREAD_KEYRING                     = -0x1
 	KEY_SPEC_USER_KEYRING                       = -0x4
 	KEY_SPEC_USER_SESSION_KEYRING               = -0x5
-	LANDLOCK_ACCESS_FS_EXECUTE                  = 0x1
-	LANDLOCK_ACCESS_FS_IOCTL_DEV                = 0x8000
-	LANDLOCK_ACCESS_FS_MAKE_BLOCK               = 0x800
-	LANDLOCK_ACCESS_FS_MAKE_CHAR                = 0x40
-	LANDLOCK_ACCESS_FS_MAKE_DIR                 = 0x80
-	LANDLOCK_ACCESS_FS_MAKE_FIFO                = 0x400
-	LANDLOCK_ACCESS_FS_MAKE_REG                 = 0x100
-	LANDLOCK_ACCESS_FS_MAKE_SOCK                = 0x200
-	LANDLOCK_ACCESS_FS_MAKE_SYM                 = 0x1000
-	LANDLOCK_ACCESS_FS_READ_DIR                 = 0x8
-	LANDLOCK_ACCESS_FS_READ_FILE                = 0x4
-	LANDLOCK_ACCESS_FS_REFER                    = 0x2000
-	LANDLOCK_ACCESS_FS_REMOVE_DIR               = 0x10
-	LANDLOCK_ACCESS_FS_REMOVE_FILE              = 0x20
-	LANDLOCK_ACCESS_FS_TRUNCATE                 = 0x4000
-	LANDLOCK_ACCESS_FS_WRITE_FILE               = 0x2
-	LANDLOCK_ACCESS_NET_BIND_TCP                = 0x1
-	LANDLOCK_ACCESS_NET_CONNECT_TCP             = 0x2
-	LANDLOCK_CREATE_RULESET_VERSION             = 0x1
-	LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET         = 0x1
-	LANDLOCK_SCOPE_SIGNAL                       = 0x2
 	LINUX_REBOOT_CMD_CAD_OFF                    = 0x0
 	LINUX_REBOOT_CMD_CAD_ON                     = 0x89abcdef
 	LINUX_REBOOT_CMD_HALT                       = 0xcdef0123
@@ -1827,7 +1348,6 @@ const (
 	LOCK_SH                                     = 0x1
 	LOCK_UN                                     = 0x8
 	LOOP_CLR_FD                                 = 0x4c01
-	LOOP_CONFIGURE                              = 0x4c0a
 	LOOP_CTL_ADD                                = 0x4c80
 	LOOP_CTL_GET_FREE                           = 0x4c82
 	LOOP_CTL_REMOVE                             = 0x4c81
@@ -1850,13 +1370,11 @@ const (
 	LWTUNNEL_IP_OPT_GENEVE_MAX                  = 0x3
 	LWTUNNEL_IP_OPT_VXLAN_MAX                   = 0x1
 	MADV_COLD                                   = 0x14
-	MADV_COLLAPSE                               = 0x19
 	MADV_DODUMP                                 = 0x11
 	MADV_DOFORK                                 = 0xb
 	MADV_DONTDUMP                               = 0x10
 	MADV_DONTFORK                               = 0xa
 	MADV_DONTNEED                               = 0x4
-	MADV_DONTNEED_LOCKED                        = 0x18
 	MADV_FREE                                   = 0x8
 	MADV_HUGEPAGE                               = 0xe
 	MADV_HWPOISON                               = 0x64
@@ -1865,31 +1383,15 @@ const (
 	MADV_NOHUGEPAGE                             = 0xf
 	MADV_NORMAL                                 = 0x0
 	MADV_PAGEOUT                                = 0x15
-	MADV_POPULATE_READ                          = 0x16
-	MADV_POPULATE_WRITE                         = 0x17
 	MADV_RANDOM                                 = 0x1
 	MADV_REMOVE                                 = 0x9
 	MADV_SEQUENTIAL                             = 0x2
 	MADV_UNMERGEABLE                            = 0xd
 	MADV_WILLNEED                               = 0x3
 	MADV_WIPEONFORK                             = 0x12
-	MAP_DROPPABLE                               = 0x8
 	MAP_FILE                                    = 0x0
 	MAP_FIXED                                   = 0x10
 	MAP_FIXED_NOREPLACE                         = 0x100000
-	MAP_HUGE_16GB                               = 0x88000000
-	MAP_HUGE_16KB                               = 0x38000000
-	MAP_HUGE_16MB                               = 0x60000000
-	MAP_HUGE_1GB                                = 0x78000000
-	MAP_HUGE_1MB                                = 0x50000000
-	MAP_HUGE_256MB                              = 0x70000000
-	MAP_HUGE_2GB                                = 0x7c000000
-	MAP_HUGE_2MB                                = 0x54000000
-	MAP_HUGE_32MB                               = 0x64000000
-	MAP_HUGE_512KB                              = 0x4c000000
-	MAP_HUGE_512MB                              = 0x74000000
-	MAP_HUGE_64KB                               = 0x40000000
-	MAP_HUGE_8MB                                = 0x5c000000
 	MAP_HUGE_MASK                               = 0x3f
 	MAP_HUGE_SHIFT                              = 0x1a
 	MAP_PRIVATE                                 = 0x2
@@ -1911,9 +1413,8 @@ const (
 	MEMWRITEOOB64                               = 0xc0184d15
 	MFD_ALLOW_SEALING                           = 0x2
 	MFD_CLOEXEC                                 = 0x1
-	MFD_EXEC                                    = 0x10
 	MFD_HUGETLB                                 = 0x4
-	MFD_HUGE_16GB                               = 0x88000000
+	MFD_HUGE_16GB                               = -0x78000000
 	MFD_HUGE_16MB                               = 0x60000000
 	MFD_HUGE_1GB                                = 0x78000000
 	MFD_HUGE_1MB                                = 0x50000000
@@ -1927,7 +1428,6 @@ const (
 	MFD_HUGE_8MB                                = 0x5c000000
 	MFD_HUGE_MASK                               = 0x3f
 	MFD_HUGE_SHIFT                              = 0x1a
-	MFD_NOEXEC_SEAL                             = 0x8
 	MINIX2_SUPER_MAGIC                          = 0x2468
 	MINIX2_SUPER_MAGIC2                         = 0x2478
 	MINIX3_SUPER_MAGIC                          = 0x4d5a
@@ -1936,27 +1436,8 @@ const (
 	MNT_DETACH                                  = 0x2
 	MNT_EXPIRE                                  = 0x4
 	MNT_FORCE                                   = 0x1
-	MNT_ID_REQ_SIZE_VER0                        = 0x18
-	MNT_ID_REQ_SIZE_VER1                        = 0x20
-	MNT_NS_INFO_SIZE_VER0                       = 0x10
-	MODULE_INIT_COMPRESSED_FILE                 = 0x4
 	MODULE_INIT_IGNORE_MODVERSIONS              = 0x1
 	MODULE_INIT_IGNORE_VERMAGIC                 = 0x2
-	MOUNT_ATTR_IDMAP                            = 0x100000
-	MOUNT_ATTR_NOATIME                          = 0x10
-	MOUNT_ATTR_NODEV                            = 0x4
-	MOUNT_ATTR_NODIRATIME                       = 0x80
-	MOUNT_ATTR_NOEXEC                           = 0x8
-	MOUNT_ATTR_NOSUID                           = 0x2
-	MOUNT_ATTR_NOSYMFOLLOW                      = 0x200000
-	MOUNT_ATTR_RDONLY                           = 0x1
-	MOUNT_ATTR_RELATIME                         = 0x0
-	MOUNT_ATTR_SIZE_VER0                        = 0x20
-	MOUNT_ATTR_STRICTATIME                      = 0x20
-	MOUNT_ATTR__ATIME                           = 0x70
-	MREMAP_DONTUNMAP                            = 0x4
-	MREMAP_FIXED                                = 0x2
-	MREMAP_MAYMOVE                              = 0x1
 	MSDOS_SUPER_MAGIC                           = 0x4d44
 	MSG_BATCH                                   = 0x40000
 	MSG_CMSG_CLOEXEC                            = 0x40000000
@@ -1974,7 +1455,6 @@ const (
 	MSG_PEEK                                    = 0x2
 	MSG_PROXY                                   = 0x10
 	MSG_RST                                     = 0x1000
-	MSG_SOCK_DEVMEM                             = 0x2000000
 	MSG_SYN                                     = 0x400
 	MSG_TRUNC                                   = 0x20
 	MSG_TRYHARD                                 = 0x4
@@ -2091,7 +1571,6 @@ const (
 	NFC_ATR_REQ_MAXSIZE                         = 0x40
 	NFC_ATR_RES_GB_MAXSIZE                      = 0x2f
 	NFC_ATR_RES_MAXSIZE                         = 0x40
-	NFC_ATS_MAXSIZE                             = 0x14
 	NFC_COMM_ACTIVE                             = 0x0
 	NFC_COMM_PASSIVE                            = 0x1
 	NFC_DEVICE_NAME_MAXSIZE                     = 0x8
@@ -2172,61 +1651,6 @@ const (
 	NFNL_SUBSYS_QUEUE                           = 0x3
 	NFNL_SUBSYS_ULOG                            = 0x4
 	NFS_SUPER_MAGIC                             = 0x6969
-	NFT_BITWISE_BOOL                            = 0x0
-	NFT_CHAIN_FLAGS                             = 0x7
-	NFT_CHAIN_MAXNAMELEN                        = 0x100
-	NFT_CT_MAX                                  = 0x17
-	NFT_DATA_RESERVED_MASK                      = 0xffffff00
-	NFT_DATA_VALUE_MAXLEN                       = 0x40
-	NFT_EXTHDR_OP_MAX                           = 0x4
-	NFT_FIB_RESULT_MAX                          = 0x3
-	NFT_INNER_MASK                              = 0xf
-	NFT_LOGLEVEL_MAX                            = 0x8
-	NFT_NAME_MAXLEN                             = 0x100
-	NFT_NG_MAX                                  = 0x1
-	NFT_OBJECT_CONNLIMIT                        = 0x5
-	NFT_OBJECT_COUNTER                          = 0x1
-	NFT_OBJECT_CT_EXPECT                        = 0x9
-	NFT_OBJECT_CT_HELPER                        = 0x3
-	NFT_OBJECT_CT_TIMEOUT                       = 0x7
-	NFT_OBJECT_LIMIT                            = 0x4
-	NFT_OBJECT_MAX                              = 0xa
-	NFT_OBJECT_QUOTA                            = 0x2
-	NFT_OBJECT_SECMARK                          = 0x8
-	NFT_OBJECT_SYNPROXY                         = 0xa
-	NFT_OBJECT_TUNNEL                           = 0x6
-	NFT_OBJECT_UNSPEC                           = 0x0
-	NFT_OBJ_MAXNAMELEN                          = 0x100
-	NFT_OSF_MAXGENRELEN                         = 0x10
-	NFT_QUEUE_FLAG_BYPASS                       = 0x1
-	NFT_QUEUE_FLAG_CPU_FANOUT                   = 0x2
-	NFT_QUEUE_FLAG_MASK                         = 0x3
-	NFT_REG32_COUNT                             = 0x10
-	NFT_REG32_SIZE                              = 0x4
-	NFT_REG_MAX                                 = 0x4
-	NFT_REG_SIZE                                = 0x10
-	NFT_REJECT_ICMPX_MAX                        = 0x3
-	NFT_RT_MAX                                  = 0x4
-	NFT_SECMARK_CTX_MAXLEN                      = 0x1000
-	NFT_SET_MAXNAMELEN                          = 0x100
-	NFT_SOCKET_MAX                              = 0x3
-	NFT_TABLE_F_MASK                            = 0x7
-	NFT_TABLE_MAXNAMELEN                        = 0x100
-	NFT_TRACETYPE_MAX                           = 0x3
-	NFT_TUNNEL_F_MASK                           = 0x7
-	NFT_TUNNEL_MAX                              = 0x1
-	NFT_TUNNEL_MODE_MAX                         = 0x2
-	NFT_USERDATA_MAXLEN                         = 0x100
-	NFT_XFRM_KEY_MAX                            = 0x6
-	NF_NAT_RANGE_MAP_IPS                        = 0x1
-	NF_NAT_RANGE_MASK                           = 0x7f
-	NF_NAT_RANGE_NETMAP                         = 0x40
-	NF_NAT_RANGE_PERSISTENT                     = 0x8
-	NF_NAT_RANGE_PROTO_OFFSET                   = 0x20
-	NF_NAT_RANGE_PROTO_RANDOM                   = 0x4
-	NF_NAT_RANGE_PROTO_RANDOM_ALL               = 0x14
-	NF_NAT_RANGE_PROTO_RANDOM_FULLY             = 0x10
-	NF_NAT_RANGE_PROTO_SPECIFIED                = 0x2
 	NILFS_SUPER_MAGIC                           = 0x3434
 	NL0                                         = 0x0
 	NL1                                         = 0x100
@@ -2245,7 +1669,6 @@ const (
 	NLM_F_ACK_TLVS                              = 0x200
 	NLM_F_APPEND                                = 0x800
 	NLM_F_ATOMIC                                = 0x400
-	NLM_F_BULK                                  = 0x200
 	NLM_F_CAPPED                                = 0x100
 	NLM_F_CREATE                                = 0x400
 	NLM_F_DUMP                                  = 0x300
@@ -2284,7 +1707,6 @@ const (
 	PACKET_FANOUT_DATA                          = 0x16
 	PACKET_FANOUT_EBPF                          = 0x7
 	PACKET_FANOUT_FLAG_DEFRAG                   = 0x8000
-	PACKET_FANOUT_FLAG_IGNORE_OUTGOING          = 0x4000
 	PACKET_FANOUT_FLAG_ROLLOVER                 = 0x1000
 	PACKET_FANOUT_FLAG_UNIQUEID                 = 0x2000
 	PACKET_FANOUT_HASH                          = 0x0
@@ -2320,7 +1742,6 @@ const (
 	PACKET_USER                                 = 0x6
 	PACKET_VERSION                              = 0xa
 	PACKET_VNET_HDR                             = 0xf
-	PACKET_VNET_HDR_SZ                          = 0x18
 	PARITY_CRC16_PR0                            = 0x2
 	PARITY_CRC16_PR0_CCITT                      = 0x4
 	PARITY_CRC16_PR1                            = 0x3
@@ -2338,7 +1759,6 @@ const (
 	PERF_ATTR_SIZE_VER5                         = 0x70
 	PERF_ATTR_SIZE_VER6                         = 0x78
 	PERF_ATTR_SIZE_VER7                         = 0x80
-	PERF_ATTR_SIZE_VER8                         = 0x88
 	PERF_AUX_FLAG_COLLISION                     = 0x8
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_CORESIGHT    = 0x0
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_RAW          = 0x100
@@ -2346,12 +1766,6 @@ const (
 	PERF_AUX_FLAG_PARTIAL                       = 0x4
 	PERF_AUX_FLAG_PMU_FORMAT_TYPE_MASK          = 0xff00
 	PERF_AUX_FLAG_TRUNCATED                     = 0x1
-	PERF_BRANCH_ENTRY_INFO_BITS_MAX             = 0x21
-	PERF_BR_ARM64_DEBUG_DATA                    = 0x7
-	PERF_BR_ARM64_DEBUG_EXIT                    = 0x5
-	PERF_BR_ARM64_DEBUG_HALT                    = 0x4
-	PERF_BR_ARM64_DEBUG_INST                    = 0x6
-	PERF_BR_ARM64_FIQ                           = 0x3
 	PERF_FLAG_FD_CLOEXEC                        = 0x8
 	PERF_FLAG_FD_NO_GROUP                       = 0x1
 	PERF_FLAG_FD_OUTPUT                         = 0x2
@@ -2363,29 +1777,19 @@ const (
 	PERF_MEM_BLK_DATA                           = 0x2
 	PERF_MEM_BLK_NA                             = 0x1
 	PERF_MEM_BLK_SHIFT                          = 0x28
-	PERF_MEM_HOPS_0                             = 0x1
-	PERF_MEM_HOPS_1                             = 0x2
-	PERF_MEM_HOPS_2                             = 0x3
-	PERF_MEM_HOPS_3                             = 0x4
-	PERF_MEM_HOPS_SHIFT                         = 0x2b
 	PERF_MEM_LOCK_LOCKED                        = 0x2
 	PERF_MEM_LOCK_NA                            = 0x1
 	PERF_MEM_LOCK_SHIFT                         = 0x18
 	PERF_MEM_LVLNUM_ANY_CACHE                   = 0xb
-	PERF_MEM_LVLNUM_CXL                         = 0x9
-	PERF_MEM_LVLNUM_IO                          = 0xa
 	PERF_MEM_LVLNUM_L1                          = 0x1
 	PERF_MEM_LVLNUM_L2                          = 0x2
-	PERF_MEM_LVLNUM_L2_MHB                      = 0x5
 	PERF_MEM_LVLNUM_L3                          = 0x3
 	PERF_MEM_LVLNUM_L4                          = 0x4
 	PERF_MEM_LVLNUM_LFB                         = 0xc
-	PERF_MEM_LVLNUM_MSC                         = 0x6
 	PERF_MEM_LVLNUM_NA                          = 0xf
 	PERF_MEM_LVLNUM_PMEM                        = 0xe
 	PERF_MEM_LVLNUM_RAM                         = 0xd
 	PERF_MEM_LVLNUM_SHIFT                       = 0x21
-	PERF_MEM_LVLNUM_UNC                         = 0x8
 	PERF_MEM_LVL_HIT                            = 0x2
 	PERF_MEM_LVL_IO                             = 0x1000
 	PERF_MEM_LVL_L1                             = 0x8
@@ -2410,7 +1814,6 @@ const (
 	PERF_MEM_REMOTE_REMOTE                      = 0x1
 	PERF_MEM_REMOTE_SHIFT                       = 0x25
 	PERF_MEM_SNOOPX_FWD                         = 0x1
-	PERF_MEM_SNOOPX_PEER                        = 0x2
 	PERF_MEM_SNOOPX_SHIFT                       = 0x26
 	PERF_MEM_SNOOP_HIT                          = 0x4
 	PERF_MEM_SNOOP_HITM                         = 0x10
@@ -2446,14 +1849,13 @@ const (
 	PERF_RECORD_MISC_USER                       = 0x2
 	PERF_SAMPLE_BRANCH_PLM_ALL                  = 0x7
 	PERF_SAMPLE_WEIGHT_TYPE                     = 0x1004000
-	PID_FS_MAGIC                                = 0x50494446
 	PIPEFS_MAGIC                                = 0x50495045
+	PPC_CMM_MAGIC                               = 0xc7571590
 	PPPIOCGNPMODE                               = 0xc008744c
 	PPPIOCNEWUNIT                               = 0xc004743e
 	PRIO_PGRP                                   = 0x1
 	PRIO_PROCESS                                = 0x0
 	PRIO_USER                                   = 0x2
-	PROCFS_IOCTL_MAGIC                          = 'f'
 	PROC_SUPER_MAGIC                            = 0x9fa0
 	PROT_EXEC                                   = 0x4
 	PROT_GROWSDOWN                              = 0x1000000
@@ -2485,7 +1887,6 @@ const (
 	PR_FP_EXC_UND                               = 0x40000
 	PR_FP_MODE_FR                               = 0x1
 	PR_FP_MODE_FRE                              = 0x2
-	PR_GET_AUXV                                 = 0x41555856
 	PR_GET_CHILD_SUBREAPER                      = 0x25
 	PR_GET_DUMPABLE                             = 0x3
 	PR_GET_ENDIAN                               = 0x13
@@ -2494,14 +1895,11 @@ const (
 	PR_GET_FP_MODE                              = 0x2e
 	PR_GET_IO_FLUSHER                           = 0x3a
 	PR_GET_KEEPCAPS                             = 0x7
-	PR_GET_MDWE                                 = 0x42
-	PR_GET_MEMORY_MERGE                         = 0x44
 	PR_GET_NAME                                 = 0x10
 	PR_GET_NO_NEW_PRIVS                         = 0x27
 	PR_GET_PDEATHSIG                            = 0x2
 	PR_GET_SECCOMP                              = 0x15
 	PR_GET_SECUREBITS                           = 0x1b
-	PR_GET_SHADOW_STACK_STATUS                  = 0x4a
 	PR_GET_SPECULATION_CTRL                     = 0x34
 	PR_GET_TAGGED_ADDR_CTRL                     = 0x38
 	PR_GET_THP_DISABLE                          = 0x2a
@@ -2510,7 +1908,6 @@ const (
 	PR_GET_TIMING                               = 0xd
 	PR_GET_TSC                                  = 0x19
 	PR_GET_UNALIGN                              = 0x5
-	PR_LOCK_SHADOW_STACK_STATUS                 = 0x4c
 	PR_MCE_KILL                                 = 0x21
 	PR_MCE_KILL_CLEAR                           = 0x0
 	PR_MCE_KILL_DEFAULT                         = 0x2
@@ -2518,8 +1915,6 @@ const (
 	PR_MCE_KILL_GET                             = 0x22
 	PR_MCE_KILL_LATE                            = 0x0
 	PR_MCE_KILL_SET                             = 0x1
-	PR_MDWE_NO_INHERIT                          = 0x2
-	PR_MDWE_REFUSE_EXEC_GAIN                    = 0x1
 	PR_MPX_DISABLE_MANAGEMENT                   = 0x2c
 	PR_MPX_ENABLE_MANAGEMENT                    = 0x2b
 	PR_MTE_TAG_MASK                             = 0x7fff8
@@ -2537,41 +1932,10 @@ const (
 	PR_PAC_GET_ENABLED_KEYS                     = 0x3d
 	PR_PAC_RESET_KEYS                           = 0x36
 	PR_PAC_SET_ENABLED_KEYS                     = 0x3c
-	PR_PMLEN_MASK                               = 0x7f000000
-	PR_PMLEN_SHIFT                              = 0x18
-	PR_PPC_DEXCR_CTRL_CLEAR                     = 0x4
-	PR_PPC_DEXCR_CTRL_CLEAR_ONEXEC              = 0x10
-	PR_PPC_DEXCR_CTRL_EDITABLE                  = 0x1
-	PR_PPC_DEXCR_CTRL_MASK                      = 0x1f
-	PR_PPC_DEXCR_CTRL_SET                       = 0x2
-	PR_PPC_DEXCR_CTRL_SET_ONEXEC                = 0x8
-	PR_PPC_DEXCR_IBRTPD                         = 0x1
-	PR_PPC_DEXCR_NPHIE                          = 0x3
-	PR_PPC_DEXCR_SBHE                           = 0x0
-	PR_PPC_DEXCR_SRAPD                          = 0x2
-	PR_PPC_GET_DEXCR                            = 0x48
-	PR_PPC_SET_DEXCR                            = 0x49
-	PR_RISCV_CTX_SW_FENCEI_OFF                  = 0x1
-	PR_RISCV_CTX_SW_FENCEI_ON                   = 0x0
-	PR_RISCV_SCOPE_PER_PROCESS                  = 0x0
-	PR_RISCV_SCOPE_PER_THREAD                   = 0x1
-	PR_RISCV_SET_ICACHE_FLUSH_CTX               = 0x47
-	PR_RISCV_V_GET_CONTROL                      = 0x46
-	PR_RISCV_V_SET_CONTROL                      = 0x45
-	PR_RISCV_V_VSTATE_CTRL_CUR_MASK             = 0x3
-	PR_RISCV_V_VSTATE_CTRL_DEFAULT              = 0x0
-	PR_RISCV_V_VSTATE_CTRL_INHERIT              = 0x10
-	PR_RISCV_V_VSTATE_CTRL_MASK                 = 0x1f
-	PR_RISCV_V_VSTATE_CTRL_NEXT_MASK            = 0xc
-	PR_RISCV_V_VSTATE_CTRL_OFF                  = 0x1
-	PR_RISCV_V_VSTATE_CTRL_ON                   = 0x2
 	PR_SCHED_CORE                               = 0x3e
 	PR_SCHED_CORE_CREATE                        = 0x1
 	PR_SCHED_CORE_GET                           = 0x0
 	PR_SCHED_CORE_MAX                           = 0x4
-	PR_SCHED_CORE_SCOPE_PROCESS_GROUP           = 0x2
-	PR_SCHED_CORE_SCOPE_THREAD                  = 0x0
-	PR_SCHED_CORE_SCOPE_THREAD_GROUP            = 0x1
 	PR_SCHED_CORE_SHARE_FROM                    = 0x3
 	PR_SCHED_CORE_SHARE_TO                      = 0x2
 	PR_SET_CHILD_SUBREAPER                      = 0x24
@@ -2582,8 +1946,6 @@ const (
 	PR_SET_FP_MODE                              = 0x2d
 	PR_SET_IO_FLUSHER                           = 0x39
 	PR_SET_KEEPCAPS                             = 0x8
-	PR_SET_MDWE                                 = 0x41
-	PR_SET_MEMORY_MERGE                         = 0x43
 	PR_SET_MM                                   = 0x23
 	PR_SET_MM_ARG_END                           = 0x9
 	PR_SET_MM_ARG_START                         = 0x8
@@ -2606,7 +1968,6 @@ const (
 	PR_SET_PTRACER                              = 0x59616d61
 	PR_SET_SECCOMP                              = 0x16
 	PR_SET_SECUREBITS                           = 0x1c
-	PR_SET_SHADOW_STACK_STATUS                  = 0x4b
 	PR_SET_SPECULATION_CTRL                     = 0x35
 	PR_SET_SYSCALL_USER_DISPATCH                = 0x3b
 	PR_SET_TAGGED_ADDR_CTRL                     = 0x37
@@ -2615,22 +1976,11 @@ const (
 	PR_SET_TIMING                               = 0xe
 	PR_SET_TSC                                  = 0x1a
 	PR_SET_UNALIGN                              = 0x6
-	PR_SET_VMA                                  = 0x53564d41
-	PR_SET_VMA_ANON_NAME                        = 0x0
-	PR_SHADOW_STACK_ENABLE                      = 0x1
-	PR_SHADOW_STACK_PUSH                        = 0x4
-	PR_SHADOW_STACK_WRITE                       = 0x2
-	PR_SME_GET_VL                               = 0x40
-	PR_SME_SET_VL                               = 0x3f
-	PR_SME_SET_VL_ONEXEC                        = 0x40000
-	PR_SME_VL_INHERIT                           = 0x20000
-	PR_SME_VL_LEN_MASK                          = 0xffff
 	PR_SPEC_DISABLE                             = 0x4
 	PR_SPEC_DISABLE_NOEXEC                      = 0x10
 	PR_SPEC_ENABLE                              = 0x2
 	PR_SPEC_FORCE_DISABLE                       = 0x8
 	PR_SPEC_INDIRECT_BRANCH                     = 0x1
-	PR_SPEC_L1D_FLUSH                           = 0x2
 	PR_SPEC_NOT_AFFECTED                        = 0x0
 	PR_SPEC_PRCTL                               = 0x1
 	PR_SPEC_STORE_BYPASS                        = 0x0
@@ -2651,28 +2001,6 @@ const (
 	PR_UNALIGN_NOPRINT                          = 0x1
 	PR_UNALIGN_SIGBUS                           = 0x2
 	PSTOREFS_MAGIC                              = 0x6165676c
-	PTP_CLK_MAGIC                               = '='
-	PTP_ENABLE_FEATURE                          = 0x1
-	PTP_EXTTS_EDGES                             = 0x6
-	PTP_EXTTS_EVENT_VALID                       = 0x1
-	PTP_EXTTS_V1_VALID_FLAGS                    = 0x7
-	PTP_EXTTS_VALID_FLAGS                       = 0x1f
-	PTP_EXT_OFFSET                              = 0x10
-	PTP_FALLING_EDGE                            = 0x4
-	PTP_MAX_SAMPLES                             = 0x19
-	PTP_PEROUT_DUTY_CYCLE                       = 0x2
-	PTP_PEROUT_ONE_SHOT                         = 0x1
-	PTP_PEROUT_PHASE                            = 0x4
-	PTP_PEROUT_V1_VALID_FLAGS                   = 0x0
-	PTP_PEROUT_VALID_FLAGS                      = 0x7
-	PTP_PIN_GETFUNC                             = 0xc0603d06
-	PTP_PIN_GETFUNC2                            = 0xc0603d0f
-	PTP_RISING_EDGE                             = 0x2
-	PTP_STRICT_FLAGS                            = 0x8
-	PTP_SYS_OFFSET_EXTENDED                     = 0xc4c03d09
-	PTP_SYS_OFFSET_EXTENDED2                    = 0xc4c03d12
-	PTP_SYS_OFFSET_PRECISE                      = 0xc0403d08
-	PTP_SYS_OFFSET_PRECISE2                     = 0xc0403d11
 	PTRACE_ATTACH                               = 0x10
 	PTRACE_CONT                                 = 0x7
 	PTRACE_DETACH                               = 0x11
@@ -2693,7 +2021,6 @@ const (
 	PTRACE_GETSIGMASK                           = 0x420a
 	PTRACE_GET_RSEQ_CONFIGURATION               = 0x420f
 	PTRACE_GET_SYSCALL_INFO                     = 0x420e
-	PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG     = 0x4211
 	PTRACE_INTERRUPT                            = 0x4207
 	PTRACE_KILL                                 = 0x8
 	PTRACE_LISTEN                               = 0x4208
@@ -2724,7 +2051,6 @@ const (
 	PTRACE_SETREGSET                            = 0x4205
 	PTRACE_SETSIGINFO                           = 0x4203
 	PTRACE_SETSIGMASK                           = 0x420b
-	PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG     = 0x4210
 	PTRACE_SINGLESTEP                           = 0x9
 	PTRACE_SYSCALL                              = 0x18
 	PTRACE_SYSCALL_INFO_ENTRY                   = 0x1
@@ -2732,10 +2058,6 @@ const (
 	PTRACE_SYSCALL_INFO_NONE                    = 0x0
 	PTRACE_SYSCALL_INFO_SECCOMP                 = 0x3
 	PTRACE_TRACEME                              = 0x0
-	P_ALL                                       = 0x0
-	P_PGID                                      = 0x2
-	P_PID                                       = 0x1
-	P_PIDFD                                     = 0x3
 	QNX4_SUPER_MAGIC                            = 0x2f
 	QNX6_SUPER_MAGIC                            = 0x68191122
 	RAMFS_MAGIC                                 = 0x858458f6
@@ -2768,9 +2090,8 @@ const (
 	RTAX_FEATURES                               = 0xc
 	RTAX_FEATURE_ALLFRAG                        = 0x8
 	RTAX_FEATURE_ECN                            = 0x1
-	RTAX_FEATURE_MASK                           = 0x1f
+	RTAX_FEATURE_MASK                           = 0xf
 	RTAX_FEATURE_SACK                           = 0x2
-	RTAX_FEATURE_TCP_USEC_TS                    = 0x10
 	RTAX_FEATURE_TIMESTAMP                      = 0x4
 	RTAX_HOPLIMIT                               = 0xa
 	RTAX_INITCWND                               = 0xb
@@ -2795,24 +2116,12 @@ const (
 	RTCF_NAT                                    = 0x800000
 	RTCF_VALVE                                  = 0x200000
 	RTC_AF                                      = 0x20
-	RTC_BSM_DIRECT                              = 0x1
-	RTC_BSM_DISABLED                            = 0x0
-	RTC_BSM_LEVEL                               = 0x2
-	RTC_BSM_STANDBY                             = 0x3
 	RTC_FEATURE_ALARM                           = 0x0
-	RTC_FEATURE_ALARM_RES_2S                    = 0x3
 	RTC_FEATURE_ALARM_RES_MINUTE                = 0x1
-	RTC_FEATURE_ALARM_WAKEUP_ONLY               = 0x7
-	RTC_FEATURE_BACKUP_SWITCH_MODE              = 0x6
-	RTC_FEATURE_CNT                             = 0x8
-	RTC_FEATURE_CORRECTION                      = 0x5
+	RTC_FEATURE_CNT                             = 0x3
 	RTC_FEATURE_NEED_WEEK_DAY                   = 0x2
-	RTC_FEATURE_UPDATE_INTERRUPT                = 0x4
 	RTC_IRQF                                    = 0x80
 	RTC_MAX_FREQ                                = 0x2000
-	RTC_PARAM_BACKUP_SWITCH_MODE                = 0x2
-	RTC_PARAM_CORRECTION                        = 0x1
-	RTC_PARAM_FEATURES                          = 0x0
 	RTC_PF                                      = 0x40
 	RTC_UF                                      = 0x10
 	RTF_ADDRCLASSMASK                           = 0xf8000000
@@ -2878,7 +2187,6 @@ const (
 	RTM_DELRULE                                 = 0x21
 	RTM_DELTCLASS                               = 0x29
 	RTM_DELTFILTER                              = 0x2d
-	RTM_DELTUNNEL                               = 0x79
 	RTM_DELVLAN                                 = 0x71
 	RTM_F_CLONED                                = 0x200
 	RTM_F_EQUALIZE                              = 0x400
@@ -2911,9 +2219,8 @@ const (
 	RTM_GETSTATS                                = 0x5e
 	RTM_GETTCLASS                               = 0x2a
 	RTM_GETTFILTER                              = 0x2e
-	RTM_GETTUNNEL                               = 0x7a
 	RTM_GETVLAN                                 = 0x72
-	RTM_MAX                                     = 0x7b
+	RTM_MAX                                     = 0x77
 	RTM_NEWACTION                               = 0x30
 	RTM_NEWADDR                                 = 0x14
 	RTM_NEWADDRLABEL                            = 0x48
@@ -2929,6 +2236,7 @@ const (
 	RTM_NEWNEXTHOP                              = 0x68
 	RTM_NEWNEXTHOPBUCKET                        = 0x74
 	RTM_NEWNSID                                 = 0x58
+	RTM_NEWNVLAN                                = 0x70
 	RTM_NEWPREFIX                               = 0x34
 	RTM_NEWQDISC                                = 0x24
 	RTM_NEWROUTE                                = 0x18
@@ -2936,14 +2244,11 @@ const (
 	RTM_NEWSTATS                                = 0x5c
 	RTM_NEWTCLASS                               = 0x28
 	RTM_NEWTFILTER                              = 0x2c
-	RTM_NEWTUNNEL                               = 0x78
-	RTM_NEWVLAN                                 = 0x70
-	RTM_NR_FAMILIES                             = 0x1b
-	RTM_NR_MSGTYPES                             = 0x6c
+	RTM_NR_FAMILIES                             = 0x1a
+	RTM_NR_MSGTYPES                             = 0x68
 	RTM_SETDCB                                  = 0x4f
 	RTM_SETLINK                                 = 0x13
 	RTM_SETNEIGHTBL                             = 0x43
-	RTM_SETSTATS                                = 0x5f
 	RTNH_ALIGNTO                                = 0x4
 	RTNH_COMPARE_MASK                           = 0x59
 	RTNH_F_DEAD                                 = 0x1
@@ -2986,70 +2291,19 @@ const (
 	RUSAGE_SELF                                 = 0x0
 	RUSAGE_THREAD                               = 0x1
 	RWF_APPEND                                  = 0x10
-	RWF_ATOMIC                                  = 0x40
 	RWF_DSYNC                                   = 0x2
 	RWF_HIPRI                                   = 0x1
-	RWF_NOAPPEND                                = 0x20
 	RWF_NOWAIT                                  = 0x8
-	RWF_SUPPORTED                               = 0x7f
+	RWF_SUPPORTED                               = 0x1f
 	RWF_SYNC                                    = 0x4
 	RWF_WRITE_LIFE_NOT_SET                      = 0x0
-	SCHED_BATCH                                 = 0x3
-	SCHED_DEADLINE                              = 0x6
-	SCHED_EXT                                   = 0x7
-	SCHED_FIFO                                  = 0x1
-	SCHED_FLAG_ALL                              = 0x7f
-	SCHED_FLAG_DL_OVERRUN                       = 0x4
-	SCHED_FLAG_KEEP_ALL                         = 0x18
-	SCHED_FLAG_KEEP_PARAMS                      = 0x10
-	SCHED_FLAG_KEEP_POLICY                      = 0x8
-	SCHED_FLAG_RECLAIM                          = 0x2
-	SCHED_FLAG_RESET_ON_FORK                    = 0x1
-	SCHED_FLAG_UTIL_CLAMP                       = 0x60
-	SCHED_FLAG_UTIL_CLAMP_MAX                   = 0x40
-	SCHED_FLAG_UTIL_CLAMP_MIN                   = 0x20
-	SCHED_IDLE                                  = 0x5
-	SCHED_NORMAL                                = 0x0
-	SCHED_RESET_ON_FORK                         = 0x40000000
-	SCHED_RR                                    = 0x2
 	SCM_CREDENTIALS                             = 0x2
-	SCM_PIDFD                                   = 0x4
 	SCM_RIGHTS                                  = 0x1
-	SCM_SECURITY                                = 0x3
 	SCM_TIMESTAMP                               = 0x1d
 	SC_LOG_FLUSH                                = 0x100000
-	SECCOMP_ADDFD_FLAG_SEND                     = 0x2
-	SECCOMP_ADDFD_FLAG_SETFD                    = 0x1
-	SECCOMP_FILTER_FLAG_LOG                     = 0x2
-	SECCOMP_FILTER_FLAG_NEW_LISTENER            = 0x8
-	SECCOMP_FILTER_FLAG_SPEC_ALLOW              = 0x4
-	SECCOMP_FILTER_FLAG_TSYNC                   = 0x1
-	SECCOMP_FILTER_FLAG_TSYNC_ESRCH             = 0x10
-	SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV      = 0x20
-	SECCOMP_GET_ACTION_AVAIL                    = 0x2
-	SECCOMP_GET_NOTIF_SIZES                     = 0x3
-	SECCOMP_IOCTL_NOTIF_RECV                    = 0xc0502100
-	SECCOMP_IOCTL_NOTIF_SEND                    = 0xc0182101
-	SECCOMP_IOC_MAGIC                           = '!'
 	SECCOMP_MODE_DISABLED                       = 0x0
 	SECCOMP_MODE_FILTER                         = 0x2
 	SECCOMP_MODE_STRICT                         = 0x1
-	SECCOMP_RET_ACTION                          = 0x7fff0000
-	SECCOMP_RET_ACTION_FULL                     = 0xffff0000
-	SECCOMP_RET_ALLOW                           = 0x7fff0000
-	SECCOMP_RET_DATA                            = 0xffff
-	SECCOMP_RET_ERRNO                           = 0x50000
-	SECCOMP_RET_KILL                            = 0x0
-	SECCOMP_RET_KILL_PROCESS                    = 0x80000000
-	SECCOMP_RET_KILL_THREAD                     = 0x0
-	SECCOMP_RET_LOG                             = 0x7ffc0000
-	SECCOMP_RET_TRACE                           = 0x7ff00000
-	SECCOMP_RET_TRAP                            = 0x30000
-	SECCOMP_RET_USER_NOTIF                      = 0x7fc00000
-	SECCOMP_SET_MODE_FILTER                     = 0x1
-	SECCOMP_SET_MODE_STRICT                     = 0x0
-	SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP          = 0x1
-	SECCOMP_USER_NOTIF_FLAG_CONTINUE            = 0x1
 	SECRETMEM_MAGIC                             = 0x5345434d
 	SECURITYFS_MAGIC                            = 0x73636673
 	SEEK_CUR                                    = 0x1
@@ -3118,9 +2372,6 @@ const (
 	SIOCGSTAMPNS                                = 0x8907
 	SIOCGSTAMPNS_OLD                            = 0x8907
 	SIOCGSTAMP_OLD                              = 0x8906
-	SIOCKCMATTACH                               = 0x89e0
-	SIOCKCMCLONE                                = 0x89e2
-	SIOCKCMUNATTACH                             = 0x89e1
 	SIOCOUTQNSD                                 = 0x894b
 	SIOCPROTOPRIVATE                            = 0x89e0
 	SIOCRTMSG                                   = 0x890d
@@ -3148,8 +2399,6 @@ const (
 	SIOCSMIIREG                                 = 0x8949
 	SIOCSRARP                                   = 0x8962
 	SIOCWANDEV                                  = 0x894a
-	SK_DIAG_BPF_STORAGE_MAX                     = 0x3
-	SK_DIAG_BPF_STORAGE_REQ_MAX                 = 0x1
 	SMACK_MAGIC                                 = 0x43415d53
 	SMART_AUTOSAVE                              = 0xd2
 	SMART_AUTO_OFFLINE                          = 0xdb
@@ -3165,23 +2414,14 @@ const (
 	SMART_STATUS                                = 0xda
 	SMART_WRITE_LOG_SECTOR                      = 0xd6
 	SMART_WRITE_THRESHOLDS                      = 0xd7
-	SMB2_SUPER_MAGIC                            = 0xfe534d42
 	SMB_SUPER_MAGIC                             = 0x517b
 	SOCKFS_MAGIC                                = 0x534f434b
-	SOCK_BUF_LOCK_MASK                          = 0x3
 	SOCK_DCCP                                   = 0x6
-	SOCK_DESTROY                                = 0x15
-	SOCK_DIAG_BY_FAMILY                         = 0x14
 	SOCK_IOC_TYPE                               = 0x89
 	SOCK_PACKET                                 = 0xa
 	SOCK_RAW                                    = 0x3
-	SOCK_RCVBUF_LOCK                            = 0x2
 	SOCK_RDM                                    = 0x4
 	SOCK_SEQPACKET                              = 0x5
-	SOCK_SNDBUF_LOCK                            = 0x1
-	SOCK_TXREHASH_DEFAULT                       = 0xff
-	SOCK_TXREHASH_DISABLED                      = 0x0
-	SOCK_TXREHASH_ENABLED                       = 0x1
 	SOL_AAL                                     = 0x109
 	SOL_ALG                                     = 0x117
 	SOL_ATM                                     = 0x108
@@ -3197,8 +2437,6 @@ const (
 	SOL_IUCV                                    = 0x115
 	SOL_KCM                                     = 0x119
 	SOL_LLC                                     = 0x10c
-	SOL_MCTP                                    = 0x11d
-	SOL_MPTCP                                   = 0x11c
 	SOL_NETBEUI                                 = 0x10b
 	SOL_NETLINK                                 = 0x10e
 	SOL_NFC                                     = 0x118
@@ -3208,12 +2446,9 @@ const (
 	SOL_RAW                                     = 0xff
 	SOL_RDS                                     = 0x114
 	SOL_RXRPC                                   = 0x110
-	SOL_SMC                                     = 0x11e
 	SOL_TCP                                     = 0x6
 	SOL_TIPC                                    = 0x10f
 	SOL_TLS                                     = 0x11a
-	SOL_UDP                                     = 0x11
-	SOL_VSOCK                                   = 0x11f
 	SOL_X25                                     = 0x106
 	SOL_XDP                                     = 0x11b
 	SOMAXCONN                                   = 0x1000
@@ -3243,8 +2478,6 @@ const (
 	SO_VM_SOCKETS_BUFFER_MIN_SIZE               = 0x1
 	SO_VM_SOCKETS_BUFFER_SIZE                   = 0x0
 	SO_VM_SOCKETS_CONNECT_TIMEOUT               = 0x6
-	SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW           = 0x8
-	SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD           = 0x6
 	SO_VM_SOCKETS_NONBLOCK_TXRX                 = 0x7
 	SO_VM_SOCKETS_PEER_HOST_VM_ID               = 0x3
 	SO_VM_SOCKETS_TRUSTED                       = 0x5
@@ -3265,24 +2498,19 @@ const (
 	STATX_ATTR_MOUNT_ROOT                       = 0x2000
 	STATX_ATTR_NODUMP                           = 0x40
 	STATX_ATTR_VERITY                           = 0x100000
-	STATX_ATTR_WRITE_ATOMIC                     = 0x400000
 	STATX_BASIC_STATS                           = 0x7ff
 	STATX_BLOCKS                                = 0x400
 	STATX_BTIME                                 = 0x800
 	STATX_CTIME                                 = 0x80
-	STATX_DIOALIGN                              = 0x2000
 	STATX_GID                                   = 0x10
 	STATX_INO                                   = 0x100
 	STATX_MNT_ID                                = 0x1000
-	STATX_MNT_ID_UNIQUE                         = 0x4000
 	STATX_MODE                                  = 0x2
 	STATX_MTIME                                 = 0x40
 	STATX_NLINK                                 = 0x4
 	STATX_SIZE                                  = 0x200
-	STATX_SUBVOL                                = 0x8000
 	STATX_TYPE                                  = 0x1
 	STATX_UID                                   = 0x8
-	STATX_WRITE_ATOMIC                          = 0x10000
 	STATX__RESERVED                             = 0x80000000
 	SYNC_FILE_RANGE_WAIT_AFTER                  = 0x4
 	SYNC_FILE_RANGE_WAIT_BEFORE                 = 0x1
@@ -3322,7 +2550,7 @@ const (
 	TASKSTATS_GENL_NAME                         = "TASKSTATS"
 	TASKSTATS_GENL_VERSION                      = 0x1
 	TASKSTATS_TYPE_MAX                          = 0x6
-	TASKSTATS_VERSION                           = 0xe
+	TASKSTATS_VERSION                           = 0xa
 	TCIFLUSH                                    = 0x0
 	TCIOFF                                      = 0x2
 	TCIOFLUSH                                   = 0x2
@@ -3364,7 +2592,6 @@ const (
 	TCP_MAX_WINSHIFT                            = 0xe
 	TCP_MD5SIG                                  = 0xe
 	TCP_MD5SIG_EXT                              = 0x20
-	TCP_MD5SIG_FLAG_IFINDEX                     = 0x2
 	TCP_MD5SIG_FLAG_PREFIX                      = 0x1
 	TCP_MD5SIG_MAXKEYLEN                        = 0x50
 	TCP_MSS                                     = 0x200
@@ -3489,7 +2716,6 @@ const (
 	TP_STATUS_COPY                              = 0x2
 	TP_STATUS_CSUMNOTREADY                      = 0x8
 	TP_STATUS_CSUM_VALID                        = 0x80
-	TP_STATUS_GSO_TCP                           = 0x100
 	TP_STATUS_KERNEL                            = 0x0
 	TP_STATUS_LOSING                            = 0x4
 	TP_STATUS_SENDING                           = 0x2
@@ -3504,19 +2730,6 @@ const (
 	TRACEFS_MAGIC                               = 0x74726163
 	TS_COMM_LEN                                 = 0x20
 	UDF_SUPER_MAGIC                             = 0x15013346
-	UDP_CORK                                    = 0x1
-	UDP_ENCAP                                   = 0x64
-	UDP_ENCAP_ESPINUDP                          = 0x2
-	UDP_ENCAP_ESPINUDP_NON_IKE                  = 0x1
-	UDP_ENCAP_GTP0                              = 0x4
-	UDP_ENCAP_GTP1U                             = 0x5
-	UDP_ENCAP_L2TPINUDP                         = 0x3
-	UDP_GRO                                     = 0x68
-	UDP_NO_CHECK6_RX                            = 0x66
-	UDP_NO_CHECK6_TX                            = 0x65
-	UDP_SEGMENT                                 = 0x67
-	UDP_V4_FLOW                                 = 0x2
-	UDP_V6_FLOW                                 = 0x6
 	UMOUNT_NOFOLLOW                             = 0x8
 	USBDEVICE_SUPER_MAGIC                       = 0x9fa2
 	UTIME_NOW                                   = 0x3fffffff
@@ -3559,13 +2772,6 @@ const (
 	WDIOS_TEMPPANIC                             = 0x4
 	WDIOS_UNKNOWN                               = -0x1
 	WEXITED                                     = 0x4
-	WGALLOWEDIP_A_MAX                           = 0x3
-	WGDEVICE_A_MAX                              = 0x8
-	WGPEER_A_MAX                                = 0xa
-	WG_CMD_MAX                                  = 0x1
-	WG_GENL_NAME                                = "wireguard"
-	WG_GENL_VERSION                             = 0x1
-	WG_KEY_LEN                                  = 0x20
 	WIN_ACKMEDIACHANGE                          = 0xdb
 	WIN_CHECKPOWERMODE1                         = 0xe5
 	WIN_CHECKPOWERMODE2                         = 0x98
@@ -3667,29 +2873,24 @@ const (
 	XDP_PACKET_HEADROOM                         = 0x100
 	XDP_PGOFF_RX_RING                           = 0x0
 	XDP_PGOFF_TX_RING                           = 0x80000000
-	XDP_PKT_CONTD                               = 0x1
 	XDP_RING_NEED_WAKEUP                        = 0x1
 	XDP_RX_RING                                 = 0x2
 	XDP_SHARED_UMEM                             = 0x1
 	XDP_STATISTICS                              = 0x7
-	XDP_TXMD_FLAGS_CHECKSUM                     = 0x2
-	XDP_TXMD_FLAGS_TIMESTAMP                    = 0x1
-	XDP_TX_METADATA                             = 0x2
 	XDP_TX_RING                                 = 0x3
 	XDP_UMEM_COMPLETION_RING                    = 0x6
 	XDP_UMEM_FILL_RING                          = 0x5
 	XDP_UMEM_PGOFF_COMPLETION_RING              = 0x180000000
 	XDP_UMEM_PGOFF_FILL_RING                    = 0x100000000
 	XDP_UMEM_REG                                = 0x4
-	XDP_UMEM_TX_METADATA_LEN                    = 0x4
-	XDP_UMEM_TX_SW_CSUM                         = 0x2
 	XDP_UMEM_UNALIGNED_CHUNK_FLAG               = 0x1
 	XDP_USE_NEED_WAKEUP                         = 0x8
-	XDP_USE_SG                                  = 0x10
 	XDP_ZEROCOPY                                = 0x4
 	XENFS_SUPER_MAGIC                           = 0xabba1974
 	XFS_SUPER_MAGIC                             = 0x58465342
+	Z3FOLD_MAGIC                                = 0x33
 	ZONEFS_MAGIC                                = 0x5a4f4653
+	ZSMALLOC_MAGIC                              = 0x58295829
 	_HIDIOCGRAWNAME_LEN                         = 0x80
 	_HIDIOCGRAWPHYS_LEN                         = 0x40
 	_HIDIOCGRAWUNIQ_LEN                         = 0x40
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 7520761..697811a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/386/include -m32
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m32
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
+// +build 386,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/386/include -m32 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80041270
 	BLKBSZSET                        = 0x40041271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80041272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -109,21 +99,17 @@ const (
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
 	IXON                             = 0x400
 	MAP_32BIT                        = 0x40
-	MAP_ABOVE4G                      = 0x80
 	MAP_ANON                         = 0x20
 	MAP_ANONYMOUS                    = 0x20
 	MAP_DENYWRITE                    = 0x800
@@ -147,7 +133,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc03c4d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -156,14 +141,9 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -240,20 +220,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x7434
 	PPPIOCXFERUNIT                   = 0x744e
 	PR_SET_PTRACER_ANY               = 0xffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETFPXREGS                = 0x12
 	PTRACE_GET_THREAD_AREA           = 0x19
@@ -284,8 +250,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4004700e
 	RTC_IRQP_READ                    = 0x8004700b
 	RTC_IRQP_SET                     = 0x4004700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x801c7011
@@ -300,18 +264,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -335,15 +293,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -359,23 +313,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -396,7 +346,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index c68acda..7d8d93b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/amd64/include -m64
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m64
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
+// +build amd64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/amd64/include -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -109,21 +99,17 @@ const (
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
 	IXON                             = 0x400
 	MAP_32BIT                        = 0x40
-	MAP_ABOVE4G                      = 0x80
 	MAP_ANON                         = 0x20
 	MAP_ANONYMOUS                    = 0x20
 	MAP_DENYWRITE                    = 0x800
@@ -147,7 +133,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -156,14 +141,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -240,20 +220,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x7434
 	PPPIOCXFERUNIT                   = 0x744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
 	PTRACE_ARCH_PRCTL                = 0x1e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETFPXREGS                = 0x12
@@ -285,8 +251,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4008700e
 	RTC_IRQP_READ                    = 0x8008700b
 	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x80207011
@@ -301,18 +265,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -336,15 +294,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -360,23 +314,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -397,7 +347,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index a8c607a..f707d50 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/arm/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
+// +build arm,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/arm/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80041270
 	BLKBSZSET                        = 0x40041271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80041272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x7434
 	PPPIOCXFERUNIT                   = 0x744e
 	PR_SET_PTRACER_ANY               = 0xffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
 	PTRACE_GETCRUNCHREGS             = 0x19
 	PTRACE_GETFDPIC                  = 0x1f
 	PTRACE_GETFDPIC_EXEC             = 0x0
@@ -290,8 +257,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4004700e
 	RTC_IRQP_READ                    = 0x8004700b
 	RTC_IRQP_SET                     = 0x4004700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x801c7011
@@ -306,18 +271,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -341,15 +300,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -365,23 +320,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -402,7 +353,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 18563dd..3a67a9c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/arm64/include -fsigned-char
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
+// +build arm64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/arm64/include -fsigned-char _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	ESR_MAGIC                        = 0x45535201
 	EXTPROC                          = 0x10000
@@ -89,7 +79,6 @@ const (
 	FICLONE                          = 0x40049409
 	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
-	FPMR_MAGIC                       = 0x46504d52
 	FPSIMD_MAGIC                     = 0x46508001
 	FS_IOC_ENABLE_VERITY             = 0x40806685
 	FS_IOC_GETFLAGS                  = 0x80086601
@@ -109,19 +98,15 @@ const (
 	F_SETOWN                         = 0x8
 	F_UNLCK                          = 0x2
 	F_WRLCK                          = 0x1
-	GCS_MAGIC                        = 0x47435300
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -149,7 +134,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -158,14 +142,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -209,7 +188,6 @@ const (
 	PERF_EVENT_IOC_SET_BPF           = 0x40042408
 	PERF_EVENT_IOC_SET_FILTER        = 0x40082406
 	PERF_EVENT_IOC_SET_OUTPUT        = 0x2405
-	POE_MAGIC                        = 0x504f4530
 	PPPIOCATTACH                     = 0x4004743d
 	PPPIOCATTCHAN                    = 0x40047438
 	PPPIOCBRIDGECHAN                 = 0x40047435
@@ -245,20 +223,6 @@ const (
 	PROT_BTI                         = 0x10
 	PROT_MTE                         = 0x20
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
 	PTRACE_PEEKMTETAGS               = 0x21
 	PTRACE_POKEMTETAGS               = 0x22
 	PTRACE_SYSEMU                    = 0x1f
@@ -283,8 +247,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4008700e
 	RTC_IRQP_READ                    = 0x8008700b
 	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x80207011
@@ -299,18 +261,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -334,15 +290,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -358,23 +310,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -395,7 +343,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
@@ -489,7 +436,6 @@ const (
 	TIOCSWINSZ                       = 0x5414
 	TIOCVHANGUP                      = 0x5437
 	TOSTOP                           = 0x100
-	TPIDR2_MAGIC                     = 0x54504902
 	TUNATTACHFILTER                  = 0x401054d5
 	TUNDETACHFILTER                  = 0x401054d6
 	TUNGETDEVNETNS                   = 0x54e3
@@ -561,8 +507,6 @@ const (
 	WORDSIZE                         = 0x40
 	XCASE                            = 0x4
 	XTABS                            = 0x1800
-	ZA_MAGIC                         = 0x54366345
-	ZT_MAGIC                         = 0x5a544e01
 	_HIDIOCGRAWNAME                  = 0x80804804
 	_HIDIOCGRAWPHYS                  = 0x80404805
 	_HIDIOCGRAWUNIQ                  = 0x80404808
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
deleted file mode 100644
index 22912cd..0000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
+++ /dev/null
@@ -1,865 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/loong64/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build loong64 && linux
-
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/loong64/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	B1000000                         = 0x1008
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1500000                         = 0x100a
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2500000                         = 0x100c
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
-	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
-	BOTHER                           = 0x1000
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIZE                            = 0x30
-	CSTOPB                           = 0x40
-	ECCGETLAYOUT                     = 0x81484d11
-	ECCGETSTATS                      = 0x80104d12
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	EFD_CLOEXEC                      = 0x80000
-	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
-	EPOLL_CLOEXEC                    = 0x80000
-	EXTPROC                          = 0x10000
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FICLONE                          = 0x40049409
-	FICLONERANGE                     = 0x4020940d
-	FLUSHO                           = 0x1000
-	FPU_CTX_MAGIC                    = 0x46505501
-	FS_IOC_ENABLE_VERITY             = 0x40806685
-	FS_IOC_GETFLAGS                  = 0x80086601
-	FS_IOC_GET_ENCRYPTION_NONCE      = 0x8010661b
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SETFLAGS                  = 0x40086602
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_RDLCK                          = 0x0
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HIDIOCGRAWINFO                   = 0x80084803
-	HIDIOCGRDESC                     = 0x90044802
-	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	IEXTEN                           = 0x8000
-	IN_CLOEXEC                       = 0x80000
-	IN_NONBLOCK                      = 0x800
-	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
-	ISIG                             = 0x1
-	IUCLC                            = 0x200
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LASX_CTX_MAGIC                   = 0x41535801
-	LBT_CTX_MAGIC                    = 0x42540001
-	LSX_CTX_MAGIC                    = 0x53580001
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_STACK                        = 0x20000
-	MAP_SYNC                         = 0x80000
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MEMERASE                         = 0x40084d02
-	MEMERASE64                       = 0x40104d14
-	MEMGETBADBLOCK                   = 0x40084d0b
-	MEMGETINFO                       = 0x80204d01
-	MEMGETOOBSEL                     = 0x80c84d0a
-	MEMGETREGIONCOUNT                = 0x80044d07
-	MEMISLOCKED                      = 0x80084d17
-	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
-	MEMREADOOB                       = 0xc0104d04
-	MEMSETBADBLOCK                   = 0x40084d0c
-	MEMUNLOCK                        = 0x40084d06
-	MEMWRITEOOB                      = 0xc0104d03
-	MTDFILEMODE                      = 0x4d13
-	NFDBITS                          = 0x40
-	NLDLY                            = 0x100
-	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
-	NS_GET_NSTYPE                    = 0xb703
-	NS_GET_OWNER_UID                 = 0xb704
-	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
-	NS_GET_USERNS                    = 0xb701
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	OTPERASE                         = 0x400c4d19
-	OTPGETREGIONCOUNT                = 0x40044d0e
-	OTPGETREGIONINFO                 = 0x400c4d0f
-	OTPLOCK                          = 0x800c4d10
-	OTPSELECT                        = 0x80044d0d
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	PARENB                           = 0x100
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PERF_EVENT_IOC_DISABLE           = 0x2401
-	PERF_EVENT_IOC_ENABLE            = 0x2400
-	PERF_EVENT_IOC_ID                = 0x80082407
-	PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b
-	PERF_EVENT_IOC_PAUSE_OUTPUT      = 0x40042409
-	PERF_EVENT_IOC_PERIOD            = 0x40082404
-	PERF_EVENT_IOC_QUERY_BPF         = 0xc008240a
-	PERF_EVENT_IOC_REFRESH           = 0x2402
-	PERF_EVENT_IOC_RESET             = 0x2403
-	PERF_EVENT_IOC_SET_BPF           = 0x40042408
-	PERF_EVENT_IOC_SET_FILTER        = 0x40082406
-	PERF_EVENT_IOC_SET_OUTPUT        = 0x2405
-	PPPIOCATTACH                     = 0x4004743d
-	PPPIOCATTCHAN                    = 0x40047438
-	PPPIOCBRIDGECHAN                 = 0x40047435
-	PPPIOCCONNECT                    = 0x4004743a
-	PPPIOCDETACH                     = 0x4004743c
-	PPPIOCDISCONN                    = 0x7439
-	PPPIOCGASYNCMAP                  = 0x80047458
-	PPPIOCGCHAN                      = 0x80047437
-	PPPIOCGDEBUG                     = 0x80047441
-	PPPIOCGFLAGS                     = 0x8004745a
-	PPPIOCGIDLE                      = 0x8010743f
-	PPPIOCGIDLE32                    = 0x8008743f
-	PPPIOCGIDLE64                    = 0x8010743f
-	PPPIOCGL2TPSTATS                 = 0x80487436
-	PPPIOCGMRU                       = 0x80047453
-	PPPIOCGRASYNCMAP                 = 0x80047455
-	PPPIOCGUNIT                      = 0x80047456
-	PPPIOCGXASYNCMAP                 = 0x80207450
-	PPPIOCSACTIVE                    = 0x40107446
-	PPPIOCSASYNCMAP                  = 0x40047457
-	PPPIOCSCOMPRESS                  = 0x4010744d
-	PPPIOCSDEBUG                     = 0x40047440
-	PPPIOCSFLAGS                     = 0x40047459
-	PPPIOCSMAXCID                    = 0x40047451
-	PPPIOCSMRRU                      = 0x4004743b
-	PPPIOCSMRU                       = 0x40047452
-	PPPIOCSNPMODE                    = 0x4008744b
-	PPPIOCSPASS                      = 0x40107447
-	PPPIOCSRASYNCMAP                 = 0x40047454
-	PPPIOCSXASYNCMAP                 = 0x4020744f
-	PPPIOCUNBRIDGECHAN               = 0x7434
-	PPPIOCXFERUNIT                   = 0x744e
-	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	RLIMIT_AS                        = 0x9
-	RLIMIT_MEMLOCK                   = 0x8
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_NPROC                     = 0x6
-	RLIMIT_RSS                       = 0x5
-	RNDADDENTROPY                    = 0x40085203
-	RNDADDTOENTCNT                   = 0x40045201
-	RNDCLEARPOOL                     = 0x5206
-	RNDGETENTCNT                     = 0x80045200
-	RNDGETPOOL                       = 0x80085202
-	RNDRESEEDCRNG                    = 0x5207
-	RNDZAPENTCNT                     = 0x5204
-	RTC_AIE_OFF                      = 0x7002
-	RTC_AIE_ON                       = 0x7001
-	RTC_ALM_READ                     = 0x80247008
-	RTC_ALM_SET                      = 0x40247007
-	RTC_EPOCH_READ                   = 0x8008700d
-	RTC_EPOCH_SET                    = 0x4008700e
-	RTC_IRQP_READ                    = 0x8008700b
-	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
-	RTC_PIE_OFF                      = 0x7006
-	RTC_PIE_ON                       = 0x7005
-	RTC_PLL_GET                      = 0x80207011
-	RTC_PLL_SET                      = 0x40207012
-	RTC_RD_TIME                      = 0x80247009
-	RTC_SET_TIME                     = 0x4024700a
-	RTC_UIE_OFF                      = 0x7004
-	RTC_UIE_ON                       = 0x7003
-	RTC_VL_CLR                       = 0x7014
-	RTC_VL_READ                      = 0x80047013
-	RTC_WIE_OFF                      = 0x7010
-	RTC_WIE_ON                       = 0x700f
-	RTC_WKALM_RD                     = 0x80287010
-	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPING_PKTINFO         = 0x3a
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
-	SCM_TXTIME                       = 0x3d
-	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
-	SFD_CLOEXEC                      = 0x80000
-	SFD_NONBLOCK                     = 0x800
-	SIOCATMARK                       = 0x8905
-	SIOCGPGRP                        = 0x8904
-	SIOCGSTAMPNS_NEW                 = 0x80108907
-	SIOCGSTAMP_NEW                   = 0x80108906
-	SIOCINQ                          = 0x541b
-	SIOCOUTQ                         = 0x5411
-	SIOCSPGRP                        = 0x8902
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_STREAM                      = 0x1
-	SOL_SOCKET                       = 0x1
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BINDTOIFINDEX                 = 0x3e
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
-	SO_BUSY_POLL                     = 0x2e
-	SO_BUSY_POLL_BUDGET              = 0x46
-	SO_CNX_ADVICE                    = 0x35
-	SO_COOKIE                        = 0x39
-	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_INCOMING_CPU                  = 0x31
-	SO_INCOMING_NAPI_ID              = 0x38
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_MEMINFO                       = 0x37
-	SO_NETNS_COOKIE                  = 0x47
-	SO_NOFCS                         = 0x2b
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
-	SO_PEERSEC                       = 0x1f
-	SO_PREFER_BUSY_POLL              = 0x45
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
-	SO_RCVTIMEO                      = 0x14
-	SO_RCVTIMEO_NEW                  = 0x42
-	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_SNDTIMEO_NEW                  = 0x43
-	SO_SNDTIMEO_OLD                  = 0x15
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPING_NEW              = 0x41
-	SO_TIMESTAMPING_OLD              = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TIMESTAMPNS_NEW               = 0x40
-	SO_TIMESTAMPNS_OLD               = 0x23
-	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
-	SO_TXTIME                        = 0x3d
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	SO_ZEROCOPY                      = 0x3c
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TFD_CLOEXEC                      = 0x80000
-	TFD_NONBLOCK                     = 0x800
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGISO7816                     = 0x80285442
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGPTPEER                      = 0x5441
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSISO7816                     = 0xc0285443
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETDEVNETNS                   = 0x54e3
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETCARRIER                    = 0x400454e2
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETFILTEREBPF                 = 0x800454e1
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETSTEERINGEBPF               = 0x800454e0
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	UBI_IOCATT                       = 0x40186f40
-	UBI_IOCDET                       = 0x40046f41
-	UBI_IOCEBCH                      = 0x40044f02
-	UBI_IOCEBER                      = 0x40044f01
-	UBI_IOCEBISMAP                   = 0x80044f05
-	UBI_IOCEBMAP                     = 0x40084f03
-	UBI_IOCEBUNMAP                   = 0x40044f04
-	UBI_IOCMKVOL                     = 0x40986f00
-	UBI_IOCRMVOL                     = 0x40046f01
-	UBI_IOCRNVOL                     = 0x51106f03
-	UBI_IOCRPEB                      = 0x40046f04
-	UBI_IOCRSVOL                     = 0x400c6f02
-	UBI_IOCSETVOLPROP                = 0x40104f06
-	UBI_IOCSPEB                      = 0x40046f05
-	UBI_IOCVOLCRBLK                  = 0x40804f07
-	UBI_IOCVOLRMBLK                  = 0x4f08
-	UBI_IOCVOLUP                     = 0x40084f00
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VMIN                             = 0x6
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WDIOC_GETBOOTSTATUS              = 0x80045702
-	WDIOC_GETPRETIMEOUT              = 0x80045709
-	WDIOC_GETSTATUS                  = 0x80045701
-	WDIOC_GETSUPPORT                 = 0x80285700
-	WDIOC_GETTEMP                    = 0x80045703
-	WDIOC_GETTIMELEFT                = 0x8004570a
-	WDIOC_GETTIMEOUT                 = 0x80045707
-	WDIOC_KEEPALIVE                  = 0x80045705
-	WDIOC_SETOPTIONS                 = 0x80045704
-	WORDSIZE                         = 0x40
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-	_HIDIOCGRAWNAME                  = 0x80804804
-	_HIDIOCGRAWPHYS                  = 0x80404805
-	_HIDIOCGRAWUNIQ                  = 0x80404808
-)
-
-// Errors
-const (
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EISCONN         = syscall.Errno(0x6a)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errorList = [...]struct {
-	num  syscall.Errno
-	name string
-	desc string
-}{
-	{1, "EPERM", "operation not permitted"},
-	{2, "ENOENT", "no such file or directory"},
-	{3, "ESRCH", "no such process"},
-	{4, "EINTR", "interrupted system call"},
-	{5, "EIO", "input/output error"},
-	{6, "ENXIO", "no such device or address"},
-	{7, "E2BIG", "argument list too long"},
-	{8, "ENOEXEC", "exec format error"},
-	{9, "EBADF", "bad file descriptor"},
-	{10, "ECHILD", "no child processes"},
-	{11, "EAGAIN", "resource temporarily unavailable"},
-	{12, "ENOMEM", "cannot allocate memory"},
-	{13, "EACCES", "permission denied"},
-	{14, "EFAULT", "bad address"},
-	{15, "ENOTBLK", "block device required"},
-	{16, "EBUSY", "device or resource busy"},
-	{17, "EEXIST", "file exists"},
-	{18, "EXDEV", "invalid cross-device link"},
-	{19, "ENODEV", "no such device"},
-	{20, "ENOTDIR", "not a directory"},
-	{21, "EISDIR", "is a directory"},
-	{22, "EINVAL", "invalid argument"},
-	{23, "ENFILE", "too many open files in system"},
-	{24, "EMFILE", "too many open files"},
-	{25, "ENOTTY", "inappropriate ioctl for device"},
-	{26, "ETXTBSY", "text file busy"},
-	{27, "EFBIG", "file too large"},
-	{28, "ENOSPC", "no space left on device"},
-	{29, "ESPIPE", "illegal seek"},
-	{30, "EROFS", "read-only file system"},
-	{31, "EMLINK", "too many links"},
-	{32, "EPIPE", "broken pipe"},
-	{33, "EDOM", "numerical argument out of domain"},
-	{34, "ERANGE", "numerical result out of range"},
-	{35, "EDEADLK", "resource deadlock avoided"},
-	{36, "ENAMETOOLONG", "file name too long"},
-	{37, "ENOLCK", "no locks available"},
-	{38, "ENOSYS", "function not implemented"},
-	{39, "ENOTEMPTY", "directory not empty"},
-	{40, "ELOOP", "too many levels of symbolic links"},
-	{42, "ENOMSG", "no message of desired type"},
-	{43, "EIDRM", "identifier removed"},
-	{44, "ECHRNG", "channel number out of range"},
-	{45, "EL2NSYNC", "level 2 not synchronized"},
-	{46, "EL3HLT", "level 3 halted"},
-	{47, "EL3RST", "level 3 reset"},
-	{48, "ELNRNG", "link number out of range"},
-	{49, "EUNATCH", "protocol driver not attached"},
-	{50, "ENOCSI", "no CSI structure available"},
-	{51, "EL2HLT", "level 2 halted"},
-	{52, "EBADE", "invalid exchange"},
-	{53, "EBADR", "invalid request descriptor"},
-	{54, "EXFULL", "exchange full"},
-	{55, "ENOANO", "no anode"},
-	{56, "EBADRQC", "invalid request code"},
-	{57, "EBADSLT", "invalid slot"},
-	{59, "EBFONT", "bad font file format"},
-	{60, "ENOSTR", "device not a stream"},
-	{61, "ENODATA", "no data available"},
-	{62, "ETIME", "timer expired"},
-	{63, "ENOSR", "out of streams resources"},
-	{64, "ENONET", "machine is not on the network"},
-	{65, "ENOPKG", "package not installed"},
-	{66, "EREMOTE", "object is remote"},
-	{67, "ENOLINK", "link has been severed"},
-	{68, "EADV", "advertise error"},
-	{69, "ESRMNT", "srmount error"},
-	{70, "ECOMM", "communication error on send"},
-	{71, "EPROTO", "protocol error"},
-	{72, "EMULTIHOP", "multihop attempted"},
-	{73, "EDOTDOT", "RFS specific error"},
-	{74, "EBADMSG", "bad message"},
-	{75, "EOVERFLOW", "value too large for defined data type"},
-	{76, "ENOTUNIQ", "name not unique on network"},
-	{77, "EBADFD", "file descriptor in bad state"},
-	{78, "EREMCHG", "remote address changed"},
-	{79, "ELIBACC", "can not access a needed shared library"},
-	{80, "ELIBBAD", "accessing a corrupted shared library"},
-	{81, "ELIBSCN", ".lib section in a.out corrupted"},
-	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
-	{83, "ELIBEXEC", "cannot exec a shared library directly"},
-	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
-	{85, "ERESTART", "interrupted system call should be restarted"},
-	{86, "ESTRPIPE", "streams pipe error"},
-	{87, "EUSERS", "too many users"},
-	{88, "ENOTSOCK", "socket operation on non-socket"},
-	{89, "EDESTADDRREQ", "destination address required"},
-	{90, "EMSGSIZE", "message too long"},
-	{91, "EPROTOTYPE", "protocol wrong type for socket"},
-	{92, "ENOPROTOOPT", "protocol not available"},
-	{93, "EPROTONOSUPPORT", "protocol not supported"},
-	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
-	{95, "ENOTSUP", "operation not supported"},
-	{96, "EPFNOSUPPORT", "protocol family not supported"},
-	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
-	{98, "EADDRINUSE", "address already in use"},
-	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
-	{100, "ENETDOWN", "network is down"},
-	{101, "ENETUNREACH", "network is unreachable"},
-	{102, "ENETRESET", "network dropped connection on reset"},
-	{103, "ECONNABORTED", "software caused connection abort"},
-	{104, "ECONNRESET", "connection reset by peer"},
-	{105, "ENOBUFS", "no buffer space available"},
-	{106, "EISCONN", "transport endpoint is already connected"},
-	{107, "ENOTCONN", "transport endpoint is not connected"},
-	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
-	{109, "ETOOMANYREFS", "too many references: cannot splice"},
-	{110, "ETIMEDOUT", "connection timed out"},
-	{111, "ECONNREFUSED", "connection refused"},
-	{112, "EHOSTDOWN", "host is down"},
-	{113, "EHOSTUNREACH", "no route to host"},
-	{114, "EALREADY", "operation already in progress"},
-	{115, "EINPROGRESS", "operation now in progress"},
-	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
-	{118, "ENOTNAM", "not a XENIX named type file"},
-	{119, "ENAVAIL", "no XENIX semaphores available"},
-	{120, "EISNAM", "is a named type file"},
-	{121, "EREMOTEIO", "remote I/O error"},
-	{122, "EDQUOT", "disk quota exceeded"},
-	{123, "ENOMEDIUM", "no medium found"},
-	{124, "EMEDIUMTYPE", "wrong medium type"},
-	{125, "ECANCELED", "operation canceled"},
-	{126, "ENOKEY", "required key not available"},
-	{127, "EKEYEXPIRED", "key has expired"},
-	{128, "EKEYREVOKED", "key has been revoked"},
-	{129, "EKEYREJECTED", "key was rejected by service"},
-	{130, "EOWNERDEAD", "owner died"},
-	{131, "ENOTRECOVERABLE", "state not recoverable"},
-	{132, "ERFKILL", "operation not possible due to RF-kill"},
-	{133, "EHWPOISON", "memory page has hardware error"},
-}
-
-// Signal table
-var signalList = [...]struct {
-	num  syscall.Signal
-	name string
-	desc string
-}{
-	{1, "SIGHUP", "hangup"},
-	{2, "SIGINT", "interrupt"},
-	{3, "SIGQUIT", "quit"},
-	{4, "SIGILL", "illegal instruction"},
-	{5, "SIGTRAP", "trace/breakpoint trap"},
-	{6, "SIGABRT", "aborted"},
-	{7, "SIGBUS", "bus error"},
-	{8, "SIGFPE", "floating point exception"},
-	{9, "SIGKILL", "killed"},
-	{10, "SIGUSR1", "user defined signal 1"},
-	{11, "SIGSEGV", "segmentation fault"},
-	{12, "SIGUSR2", "user defined signal 2"},
-	{13, "SIGPIPE", "broken pipe"},
-	{14, "SIGALRM", "alarm clock"},
-	{15, "SIGTERM", "terminated"},
-	{16, "SIGSTKFLT", "stack fault"},
-	{17, "SIGCHLD", "child exited"},
-	{18, "SIGCONT", "continued"},
-	{19, "SIGSTOP", "stopped (signal)"},
-	{20, "SIGTSTP", "stopped"},
-	{21, "SIGTTIN", "stopped (tty input)"},
-	{22, "SIGTTOU", "stopped (tty output)"},
-	{23, "SIGURG", "urgent I/O condition"},
-	{24, "SIGXCPU", "CPU time limit exceeded"},
-	{25, "SIGXFSZ", "file size limit exceeded"},
-	{26, "SIGVTALRM", "virtual timer expired"},
-	{27, "SIGPROF", "profiling timer expired"},
-	{28, "SIGWINCH", "window changed"},
-	{29, "SIGIO", "I/O possible"},
-	{30, "SIGPWR", "power failure"},
-	{31, "SIGSYS", "bad system call"},
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 29344eb..a7ccef5 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/mips/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
+// +build mips,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/mips/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x80
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x100
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x80
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x20007434
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PR_SET_PTRACER_ANY               = 0xffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GET_THREAD_AREA           = 0x19
 	PTRACE_GET_THREAD_AREA_3264      = 0xc4
@@ -283,8 +250,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8004700e
 	RTC_IRQP_READ                    = 0x4004700b
 	RTC_IRQP_SET                     = 0x8004700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x401c7011
@@ -299,18 +264,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x80
 	SIOCATMARK                       = 0x40047307
@@ -334,15 +293,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x20
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x1029
 	SO_DONTROUTE                     = 0x10
 	SO_ERROR                         = 0x1007
@@ -358,23 +313,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0x100
 	SO_PASSCRED                      = 0x11
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x12
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1e
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x1028
 	SO_RCVBUF                        = 0x1002
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x1004
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x1006
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x1006
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x4
 	SO_REUSEPORT                     = 0x200
 	SO_RXQ_OVFL                      = 0x28
@@ -396,7 +347,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x1008
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 20d51fb..f7b7cec 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/mips64/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
+// +build mips64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/mips64/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x80
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x100
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x80
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x20007434
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GET_THREAD_AREA           = 0x19
 	PTRACE_GET_THREAD_AREA_3264      = 0xc4
@@ -283,8 +250,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8008700e
 	RTC_IRQP_READ                    = 0x4008700b
 	RTC_IRQP_SET                     = 0x8008700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x40207011
@@ -299,18 +264,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x80
 	SIOCATMARK                       = 0x40047307
@@ -334,15 +293,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x20
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x1029
 	SO_DONTROUTE                     = 0x10
 	SO_ERROR                         = 0x1007
@@ -358,23 +313,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0x100
 	SO_PASSCRED                      = 0x11
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x12
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1e
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x1028
 	SO_RCVBUF                        = 0x1002
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x1004
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x1006
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x1006
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x4
 	SO_REUSEPORT                     = 0x200
 	SO_RXQ_OVFL                      = 0x28
@@ -396,7 +347,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x1008
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 321b609..4fcacf9 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/mips64le/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
+// +build mips64le,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/mips64le/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x80
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x100
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x80
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x20007434
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GET_THREAD_AREA           = 0x19
 	PTRACE_GET_THREAD_AREA_3264      = 0xc4
@@ -283,8 +250,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8008700e
 	RTC_IRQP_READ                    = 0x4008700b
 	RTC_IRQP_SET                     = 0x8008700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x40207011
@@ -299,18 +264,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x80
 	SIOCATMARK                       = 0x40047307
@@ -334,15 +293,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x20
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x1029
 	SO_DONTROUTE                     = 0x10
 	SO_ERROR                         = 0x1007
@@ -358,23 +313,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0x100
 	SO_PASSCRED                      = 0x11
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x12
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1e
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x1028
 	SO_RCVBUF                        = 0x1002
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x1004
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x1006
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x1006
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x4
 	SO_REUSEPORT                     = 0x200
 	SO_RXQ_OVFL                      = 0x28
@@ -396,7 +347,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x1008
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index 9bacdf1..6f6c223 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/mipsle/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
+// +build mipsle,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/mipsle/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x80
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x100
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x80
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x20007434
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PR_SET_PTRACER_ANY               = 0xffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GET_THREAD_AREA           = 0x19
 	PTRACE_GET_THREAD_AREA_3264      = 0xc4
@@ -283,8 +250,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8004700e
 	RTC_IRQP_READ                    = 0x4004700b
 	RTC_IRQP_SET                     = 0x8004700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x401c7011
@@ -299,18 +264,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x80
 	SIOCATMARK                       = 0x40047307
@@ -334,15 +293,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x20
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x1029
 	SO_DONTROUTE                     = 0x10
 	SO_ERROR                         = 0x1007
@@ -358,23 +313,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0x100
 	SO_PASSCRED                      = 0x11
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x12
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1e
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x1028
 	SO_RCVBUF                        = 0x1002
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x1004
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x1006
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x1006
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x4
 	SO_REUSEPORT                     = 0x200
 	SO_RXQ_OVFL                      = 0x28
@@ -396,7 +347,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x1008
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
index c224272..59e522b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/ppc/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
+// +build ppc,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x20
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000000
 	FF1                              = 0x4000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x4000
 	ICANON                           = 0x100
 	IEXTEN                           = 0x400
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x80
 	IUCLC                            = 0x1000
 	IXOFF                            = 0x400
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -155,14 +141,9 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x4
 	ONLCR                            = 0x2
@@ -240,20 +221,6 @@ const (
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PROT_SAO                         = 0x10
 	PR_SET_PTRACER_ANY               = 0xffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETEVRREGS                = 0x14
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETREGS64                 = 0x16
@@ -338,8 +305,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8004700e
 	RTC_IRQP_READ                    = 0x4004700b
 	RTC_IRQP_SET                     = 0x8004700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x401c7011
@@ -354,18 +319,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -389,15 +348,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -413,23 +368,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x14
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x15
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x10
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x12
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x12
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -450,7 +401,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 6270c8e..d4264a0 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/ppc64/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
+// +build ppc64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x20
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000000
 	FF1                              = 0x4000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x4000
 	ICANON                           = 0x100
 	IEXTEN                           = 0x400
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x80
 	IUCLC                            = 0x1000
 	IXOFF                            = 0x400
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -155,14 +141,9 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x4
 	ONLCR                            = 0x2
@@ -240,20 +221,6 @@ const (
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PROT_SAO                         = 0x10
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETEVRREGS                = 0x14
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETREGS64                 = 0x16
@@ -342,8 +309,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8008700e
 	RTC_IRQP_READ                    = 0x4008700b
 	RTC_IRQP_SET                     = 0x8008700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x40207011
@@ -358,18 +323,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -393,15 +352,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -417,23 +372,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x14
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x15
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x10
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x12
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x12
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -454,7 +405,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 9966c19..21cbec1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/ppc64le/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
+// +build ppc64le,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64le/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x20
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000000
 	FF1                              = 0x4000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x4000
 	ICANON                           = 0x100
 	IEXTEN                           = 0x400
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x80
 	IUCLC                            = 0x1000
 	IXOFF                            = 0x400
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -155,14 +141,9 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x4
 	ONLCR                            = 0x2
@@ -240,20 +221,6 @@ const (
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PROT_SAO                         = 0x10
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETEVRREGS                = 0x14
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETREGS64                 = 0x16
@@ -342,8 +309,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8008700e
 	RTC_IRQP_READ                    = 0x4008700b
 	RTC_IRQP_SET                     = 0x8008700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x40207011
@@ -358,18 +323,12 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -393,15 +352,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -417,23 +372,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x14
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x15
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x10
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x12
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x12
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -454,7 +405,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index 848e5fc..9b05bf1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/riscv64/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
+// +build riscv64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/riscv64/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,23 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x7434
 	PPPIOCXFERUNIT                   = 0x744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
-	PTRACE_GETFDPIC                  = 0x21
-	PTRACE_GETFDPIC_EXEC             = 0x0
-	PTRACE_GETFDPIC_INTERP           = 0x1
 	RLIMIT_AS                        = 0x9
 	RLIMIT_MEMLOCK                   = 0x8
 	RLIMIT_NOFILE                    = 0x7
@@ -274,8 +238,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4008700e
 	RTC_IRQP_READ                    = 0x8008700b
 	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x80207011
@@ -290,18 +252,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -325,15 +281,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -349,23 +301,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -386,7 +334,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 669b2ad..bd82ace 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/s390x/include -fsigned-char
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
+// +build s390x,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/s390x/include -fsigned-char _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/_const.go
 
 package unix
 
@@ -26,31 +27,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -78,8 +70,6 @@ const (
 	ECHOPRT                          = 0x400
 	EFD_CLOEXEC                      = 0x80000
 	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
 	EPOLL_CLOEXEC                    = 0x80000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -108,15 +98,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x80084803
 	HIDIOCGRDESC                     = 0x90044802
 	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x80000
 	IN_NONBLOCK                      = 0x800
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -144,7 +131,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
@@ -153,14 +139,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
 	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
 	NS_GET_USERNS                    = 0xb701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -237,20 +218,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x7434
 	PPPIOCXFERUNIT                   = 0x744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
 	PTRACE_DISABLE_TE                = 0x5010
 	PTRACE_ENABLE_TE                 = 0x5009
 	PTRACE_GET_LAST_BREAK            = 0x5006
@@ -346,8 +313,6 @@ const (
 	RTC_EPOCH_SET                    = 0x4008700e
 	RTC_IRQP_READ                    = 0x8008700b
 	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
 	RTC_PIE_OFF                      = 0x7006
 	RTC_PIE_ON                       = 0x7005
 	RTC_PLL_GET                      = 0x80207011
@@ -362,18 +327,12 @@ const (
 	RTC_WIE_ON                       = 0x700f
 	RTC_WKALM_RD                     = 0x80287010
 	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
 	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
 	SCM_TXTIME                       = 0x3d
 	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
 	SFD_CLOEXEC                      = 0x80000
 	SFD_NONBLOCK                     = 0x800
 	SIOCATMARK                       = 0x8905
@@ -397,15 +356,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x30
 	SO_BROADCAST                     = 0x6
 	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
 	SO_BUSY_POLL                     = 0x2e
 	SO_BUSY_POLL_BUDGET              = 0x46
 	SO_CNX_ADVICE                    = 0x35
 	SO_COOKIE                        = 0x39
 	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
 	SO_DOMAIN                        = 0x27
 	SO_DONTROUTE                     = 0x5
 	SO_ERROR                         = 0x4
@@ -421,23 +376,19 @@ const (
 	SO_NOFCS                         = 0x2b
 	SO_OOBINLINE                     = 0xa
 	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
 	SO_PASSSEC                       = 0x22
 	SO_PEEK_OFF                      = 0x2a
 	SO_PEERCRED                      = 0x11
 	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
 	SO_PEERSEC                       = 0x1f
 	SO_PREFER_BUSY_POLL              = 0x45
 	SO_PROTOCOL                      = 0x26
 	SO_RCVBUF                        = 0x8
 	SO_RCVBUFFORCE                   = 0x21
 	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
 	SO_RCVTIMEO                      = 0x14
 	SO_RCVTIMEO_NEW                  = 0x42
 	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
 	SO_REUSEADDR                     = 0x2
 	SO_REUSEPORT                     = 0xf
 	SO_RXQ_OVFL                      = 0x28
@@ -458,7 +409,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x40
 	SO_TIMESTAMPNS_OLD               = 0x23
 	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
 	SO_TXTIME                        = 0x3d
 	SO_TYPE                          = 0x3
 	SO_WIFI_STATUS                   = 0x29
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index 4834e57..1f8bded 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -1,10 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/sparc64/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
+// +build sparc64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/sparc64/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/_const.go
 
 package unix
 
@@ -29,31 +30,22 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
-	BLKDISCARD                       = 0x20001277
-	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
-	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
-	BLKIOMIN                         = 0x20001278
-	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
-	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
-	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
-	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -82,8 +74,6 @@ const (
 	EFD_CLOEXEC                      = 0x400000
 	EFD_NONBLOCK                     = 0x4000
 	EMT_TAGOVF                       = 0x1
-	EPIOCGPARAMS                     = 0x40088a02
-	EPIOCSPARAMS                     = 0x80088a01
 	EPOLL_CLOEXEC                    = 0x400000
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
@@ -112,15 +102,12 @@ const (
 	HIDIOCGRAWINFO                   = 0x40084803
 	HIDIOCGRDESC                     = 0x50044802
 	HIDIOCGRDESCSIZE                 = 0x40044801
-	HIDIOCREVOKE                     = 0x8004480d
 	HUPCL                            = 0x400
 	ICANON                           = 0x2
 	IEXTEN                           = 0x8000
 	IN_CLOEXEC                       = 0x400000
 	IN_NONBLOCK                      = 0x4000
 	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x200007b9
-	IPV6_FLOWINFO_MASK               = 0xfffffff
-	IPV6_FLOWLABEL_MASK              = 0xfffff
 	ISIG                             = 0x1
 	IUCLC                            = 0x200
 	IXOFF                            = 0x1000
@@ -149,7 +136,6 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
-	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
@@ -158,14 +144,9 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
 	NS_GET_PARENT                    = 0x2000b702
-	NS_GET_PID_FROM_PIDNS            = 0x4004b706
-	NS_GET_PID_IN_PIDNS              = 0x4004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x4004b707
-	NS_GET_TGID_IN_PIDNS             = 0x4004b709
 	NS_GET_USERNS                    = 0x2000b701
 	OLCUC                            = 0x2
 	ONLCR                            = 0x4
@@ -242,20 +223,6 @@ const (
 	PPPIOCUNBRIDGECHAN               = 0x20007434
 	PPPIOCXFERUNIT                   = 0x2000744e
 	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x40503d01
-	PTP_CLOCK_GETCAPS2               = 0x40503d0a
-	PTP_ENABLE_PPS                   = 0x80043d04
-	PTP_ENABLE_PPS2                  = 0x80043d0d
-	PTP_EXTTS_REQUEST                = 0x80103d02
-	PTP_EXTTS_REQUEST2               = 0x80103d0b
-	PTP_MASK_CLEAR_ALL               = 0x20003d13
-	PTP_MASK_EN_SINGLE               = 0x80043d14
-	PTP_PEROUT_REQUEST               = 0x80383d03
-	PTP_PEROUT_REQUEST2              = 0x80383d0c
-	PTP_PIN_SETFUNC                  = 0x80603d07
-	PTP_PIN_SETFUNC2                 = 0x80603d10
-	PTP_SYS_OFFSET                   = 0x83403d05
-	PTP_SYS_OFFSET2                  = 0x83403d0e
 	PTRACE_GETFPAREGS                = 0x14
 	PTRACE_GETFPREGS                 = 0xe
 	PTRACE_GETFPREGS64               = 0x19
@@ -337,8 +304,6 @@ const (
 	RTC_EPOCH_SET                    = 0x8008700e
 	RTC_IRQP_READ                    = 0x4008700b
 	RTC_IRQP_SET                     = 0x8008700c
-	RTC_PARAM_GET                    = 0x80187013
-	RTC_PARAM_SET                    = 0x80187014
 	RTC_PIE_OFF                      = 0x20007006
 	RTC_PIE_ON                       = 0x20007005
 	RTC_PLL_GET                      = 0x40207011
@@ -353,68 +318,14 @@ const (
 	RTC_WIE_ON                       = 0x2000700f
 	RTC_WKALM_RD                     = 0x40287010
 	RTC_WKALM_SET                    = 0x8028700f
-	SCM_DEVMEM_DMABUF                = 0x58
-	SCM_DEVMEM_LINEAR                = 0x57
 	SCM_TIMESTAMPING                 = 0x23
 	SCM_TIMESTAMPING_OPT_STATS       = 0x38
 	SCM_TIMESTAMPING_PKTINFO         = 0x3c
 	SCM_TIMESTAMPNS                  = 0x21
-	SCM_TS_OPT_ID                    = 0x5a
 	SCM_TXTIME                       = 0x3f
 	SCM_WIFI_STATUS                  = 0x25
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x80182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x80082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x80082104
 	SFD_CLOEXEC                      = 0x400000
 	SFD_NONBLOCK                     = 0x4000
-	SF_FP                            = 0x38
-	SF_I0                            = 0x20
-	SF_I1                            = 0x24
-	SF_I2                            = 0x28
-	SF_I3                            = 0x2c
-	SF_I4                            = 0x30
-	SF_I5                            = 0x34
-	SF_L0                            = 0x0
-	SF_L1                            = 0x4
-	SF_L2                            = 0x8
-	SF_L3                            = 0xc
-	SF_L4                            = 0x10
-	SF_L5                            = 0x14
-	SF_L6                            = 0x18
-	SF_L7                            = 0x1c
-	SF_PC                            = 0x3c
-	SF_RETP                          = 0x40
-	SF_V9_FP                         = 0x70
-	SF_V9_I0                         = 0x40
-	SF_V9_I1                         = 0x48
-	SF_V9_I2                         = 0x50
-	SF_V9_I3                         = 0x58
-	SF_V9_I4                         = 0x60
-	SF_V9_I5                         = 0x68
-	SF_V9_L0                         = 0x0
-	SF_V9_L1                         = 0x8
-	SF_V9_L2                         = 0x10
-	SF_V9_L3                         = 0x18
-	SF_V9_L4                         = 0x20
-	SF_V9_L5                         = 0x28
-	SF_V9_L6                         = 0x30
-	SF_V9_L7                         = 0x38
-	SF_V9_PC                         = 0x78
-	SF_V9_RETP                       = 0x80
-	SF_V9_XARG0                      = 0x88
-	SF_V9_XARG1                      = 0x90
-	SF_V9_XARG2                      = 0x98
-	SF_V9_XARG3                      = 0xa0
-	SF_V9_XARG4                      = 0xa8
-	SF_V9_XARG5                      = 0xb0
-	SF_V9_XXARG                      = 0xb8
-	SF_XARG0                         = 0x44
-	SF_XARG1                         = 0x48
-	SF_XARG2                         = 0x4c
-	SF_XARG3                         = 0x50
-	SF_XARG4                         = 0x54
-	SF_XARG5                         = 0x58
-	SF_XXARG                         = 0x5c
 	SIOCATMARK                       = 0x8905
 	SIOCGPGRP                        = 0x8904
 	SIOCGSTAMPNS_NEW                 = 0x40108907
@@ -436,15 +347,11 @@ const (
 	SO_BPF_EXTENSIONS                = 0x32
 	SO_BROADCAST                     = 0x20
 	SO_BSDCOMPAT                     = 0x400
-	SO_BUF_LOCK                      = 0x51
 	SO_BUSY_POLL                     = 0x30
 	SO_BUSY_POLL_BUDGET              = 0x49
 	SO_CNX_ADVICE                    = 0x37
 	SO_COOKIE                        = 0x3b
 	SO_DETACH_REUSEPORT_BPF          = 0x47
-	SO_DEVMEM_DMABUF                 = 0x58
-	SO_DEVMEM_DONTNEED               = 0x59
-	SO_DEVMEM_LINEAR                 = 0x57
 	SO_DOMAIN                        = 0x1029
 	SO_DONTROUTE                     = 0x10
 	SO_ERROR                         = 0x1007
@@ -460,23 +367,19 @@ const (
 	SO_NOFCS                         = 0x27
 	SO_OOBINLINE                     = 0x100
 	SO_PASSCRED                      = 0x2
-	SO_PASSPIDFD                     = 0x55
 	SO_PASSSEC                       = 0x1f
 	SO_PEEK_OFF                      = 0x26
 	SO_PEERCRED                      = 0x40
 	SO_PEERGROUPS                    = 0x3d
-	SO_PEERPIDFD                     = 0x56
 	SO_PEERSEC                       = 0x1e
 	SO_PREFER_BUSY_POLL              = 0x48
 	SO_PROTOCOL                      = 0x1028
 	SO_RCVBUF                        = 0x1002
 	SO_RCVBUFFORCE                   = 0x100b
 	SO_RCVLOWAT                      = 0x800
-	SO_RCVMARK                       = 0x54
 	SO_RCVTIMEO                      = 0x2000
 	SO_RCVTIMEO_NEW                  = 0x44
 	SO_RCVTIMEO_OLD                  = 0x2000
-	SO_RESERVE_MEM                   = 0x52
 	SO_REUSEADDR                     = 0x4
 	SO_REUSEPORT                     = 0x200
 	SO_RXQ_OVFL                      = 0x24
@@ -497,7 +400,6 @@ const (
 	SO_TIMESTAMPNS_NEW               = 0x42
 	SO_TIMESTAMPNS_OLD               = 0x21
 	SO_TIMESTAMP_NEW                 = 0x46
-	SO_TXREHASH                      = 0x53
 	SO_TXTIME                        = 0x3f
 	SO_TYPE                          = 0x1008
 	SO_WIFI_STATUS                   = 0x25
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
index 130085d..72f7420 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && netbsd
+// +build 386,netbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m32 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
index 84769a1..8d4eb0c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && netbsd
+// +build amd64,netbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
index 602ded0..9eef974 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && netbsd
+// +build arm,netbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -marm _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go
index efc0406..3b62ba1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && netbsd
+// +build arm64,netbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
index 5a6500f..6d56edc 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && openbsd
+// +build 386,openbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m32 _const.go
@@ -45,7 +46,6 @@ const (
 	AF_SNA                            = 0xb
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
-	ALTWERASE                         = 0x200
 	ARPHRD_ETHER                      = 0x1
 	ARPHRD_FRELAY                     = 0xf
 	ARPHRD_IEEE1394                   = 0x18
@@ -108,15 +108,6 @@ const (
 	BPF_DIRECTION_IN                  = 0x1
 	BPF_DIRECTION_OUT                 = 0x2
 	BPF_DIV                           = 0x30
-	BPF_FILDROP_CAPTURE               = 0x1
-	BPF_FILDROP_DROP                  = 0x2
-	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
 	BPF_IND                           = 0x40
@@ -145,7 +136,6 @@ const (
 	BPF_OR                            = 0x40
 	BPF_RELEASE                       = 0x30bb6
 	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
 	BPF_RSH                           = 0x70
 	BPF_ST                            = 0x2
 	BPF_STX                           = 0x3
@@ -157,12 +147,6 @@ const (
 	BRKINT                            = 0x2
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
-	CLOCK_BOOTTIME                    = 0x6
-	CLOCK_MONOTONIC                   = 0x3
-	CLOCK_PROCESS_CPUTIME_ID          = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_THREAD_CPUTIME_ID           = 0x4
-	CLOCK_UPTIME                      = 0x5
 	CPUSTATES                         = 0x6
 	CP_IDLE                           = 0x5
 	CP_INTR                           = 0x4
@@ -186,65 +170,7 @@ const (
 	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc100445d
-	DIOCADDRULE                       = 0xccc84404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xccc8441a
-	DIOCCLRIFFLAG                     = 0xc024445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0d04412
-	DIOCCLRSTATUS                     = 0xc0244416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1084460
-	DIOCGETQUEUE                      = 0xc100445f
-	DIOCGETQUEUES                     = 0xc100445e
-	DIOCGETRULE                       = 0xccc84407
-	DIOCGETRULES                      = 0xccc84406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0084454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0084419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0244457
-	DIOCKILLSRCNODES                  = 0xc068445b
-	DIOCKILLSTATES                    = 0xc0d04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc084444f
 	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0844450
-	DIOCRADDADDRS                     = 0xc44c4443
-	DIOCRADDTABLES                    = 0xc44c443d
-	DIOCRCLRADDRS                     = 0xc44c4442
-	DIOCRCLRASTATS                    = 0xc44c4448
-	DIOCRCLRTABLES                    = 0xc44c443c
-	DIOCRCLRTSTATS                    = 0xc44c4441
-	DIOCRDELADDRS                     = 0xc44c4444
-	DIOCRDELTABLES                    = 0xc44c443e
-	DIOCRGETADDRS                     = 0xc44c4446
-	DIOCRGETASTATS                    = 0xc44c4447
-	DIOCRGETTABLES                    = 0xc44c443f
-	DIOCRGETTSTATS                    = 0xc44c4440
-	DIOCRINADEFINE                    = 0xc44c444d
-	DIOCRSETADDRS                     = 0xc44c4445
-	DIOCRSETTFLAGS                    = 0xc44c444a
-	DIOCRTSTADDRS                     = 0xc44c4449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0244459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0244414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc00c4451
-	DIOCXCOMMIT                       = 0xc00c4452
-	DIOCXROLLBACK                     = 0xc00c4453
 	DLT_ARCNET                        = 0x7
 	DLT_ATM_RFC1483                   = 0xb
 	DLT_AX25                          = 0x3
@@ -260,7 +186,6 @@ const (
 	DLT_LOOP                          = 0xc
 	DLT_MPLS                          = 0xdb
 	DLT_NULL                          = 0x0
-	DLT_OPENFLOW                      = 0x10b
 	DLT_PFLOG                         = 0x75
 	DLT_PFSYNC                        = 0x12
 	DLT_PPP                           = 0x9
@@ -271,23 +196,6 @@ const (
 	DLT_RAW                           = 0xe
 	DLT_SLIP                          = 0x8
 	DLT_SLIP_BSDOS                    = 0xf
-	DLT_USBPCAP                       = 0xf9
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
 	DT_BLK                            = 0x6
 	DT_CHR                            = 0x2
 	DT_DIR                            = 0x4
@@ -307,8 +215,6 @@ const (
 	EMUL_ENABLED                      = 0x1
 	EMUL_NATIVE                       = 0x2
 	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
 	ETHERMIN                          = 0x2e
 	ETHERMTU                          = 0x5dc
 	ETHERTYPE_8023                    = 0x4
@@ -361,7 +267,6 @@ const (
 	ETHERTYPE_DN                      = 0x6003
 	ETHERTYPE_DOGFIGHT                = 0x1989
 	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
 	ETHERTYPE_ECMA                    = 0x803
 	ETHERTYPE_ENCRYPT                 = 0x803d
 	ETHERTYPE_ES                      = 0x805d
@@ -393,7 +298,6 @@ const (
 	ETHERTYPE_LLDP                    = 0x88cc
 	ETHERTYPE_LOGICRAFT               = 0x8148
 	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
 	ETHERTYPE_MATRA                   = 0x807a
 	ETHERTYPE_MAX                     = 0xffff
 	ETHERTYPE_MERIT                   = 0x807c
@@ -422,17 +326,15 @@ const (
 	ETHERTYPE_NCD                     = 0x8149
 	ETHERTYPE_NESTAR                  = 0x8006
 	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
 	ETHERTYPE_NOVELL                  = 0x8138
 	ETHERTYPE_NS                      = 0x600
 	ETHERTYPE_NSAT                    = 0x601
 	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
 	ETHERTYPE_NTRAILER                = 0x10
 	ETHERTYPE_OS9                     = 0x7007
 	ETHERTYPE_OS9NET                  = 0x7009
 	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PBB                     = 0x88e7
+	ETHERTYPE_PAE                     = 0x888e
 	ETHERTYPE_PCS                     = 0x4242
 	ETHERTYPE_PLANNING                = 0x8044
 	ETHERTYPE_PPP                     = 0x880b
@@ -507,40 +409,28 @@ const (
 	ETHER_CRC_POLY_LE                 = 0xedb88320
 	ETHER_HDR_LEN                     = 0xe
 	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_HARDMTU_LEN             = 0xff9b
 	ETHER_MAX_LEN                     = 0x5ee
 	ETHER_MIN_LEN                     = 0x40
 	ETHER_TYPE_LEN                    = 0x2
 	ETHER_VLAN_ENCAP_LEN              = 0x4
 	EVFILT_AIO                        = -0x3
-	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
+	EVFILT_SYSCOUNT                   = 0x7
 	EVFILT_TIMER                      = -0x7
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
-	EVL_ENCAPLEN                      = 0x4
-	EVL_PRIO_BITS                     = 0xd
-	EVL_PRIO_MAX                      = 0x7
-	EVL_VLID_MASK                     = 0xfff
-	EVL_VLID_MAX                      = 0xffe
-	EVL_VLID_MIN                      = 0x1
-	EVL_VLID_NULL                     = 0x0
 	EV_ADD                            = 0x1
 	EV_CLEAR                          = 0x20
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
 	EV_FLAG1                          = 0x2000
 	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
+	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
@@ -553,7 +443,6 @@ const (
 	F_GETFL                           = 0x3
 	F_GETLK                           = 0x7
 	F_GETOWN                          = 0x5
-	F_ISATTY                          = 0xb
 	F_OK                              = 0x0
 	F_RDLCK                           = 0x1
 	F_SETFD                           = 0x2
@@ -571,6 +460,7 @@ const (
 	IEXTEN                            = 0x400
 	IFAN_ARRIVAL                      = 0x0
 	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
 	IFF_ALLMULTI                      = 0x200
 	IFF_BROADCAST                     = 0x2
 	IFF_CANTCHANGE                    = 0x8e52
@@ -581,12 +471,12 @@ const (
 	IFF_LOOPBACK                      = 0x8
 	IFF_MULTICAST                     = 0x8000
 	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
 	IFF_OACTIVE                       = 0x400
 	IFF_POINTOPOINT                   = 0x10
 	IFF_PROMISC                       = 0x100
 	IFF_RUNNING                       = 0x40
 	IFF_SIMPLEX                       = 0x800
-	IFF_STATICARP                     = 0x20
 	IFF_UP                            = 0x1
 	IFNAMSIZ                          = 0x10
 	IFT_1822                          = 0x2
@@ -715,7 +605,6 @@ const (
 	IFT_LINEGROUP                     = 0xd2
 	IFT_LOCALTALK                     = 0x2a
 	IFT_LOOP                          = 0x18
-	IFT_MBIM                          = 0xfa
 	IFT_MEDIAMAILOVERIP               = 0x8b
 	IFT_MFSIGLINK                     = 0xa7
 	IFT_MIOX25                        = 0x26
@@ -806,7 +695,6 @@ const (
 	IFT_VOICEOVERCABLE                = 0xc6
 	IFT_VOICEOVERFRAMERELAY           = 0x99
 	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
 	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
@@ -841,6 +729,8 @@ const (
 	IPPROTO_AH                        = 0x33
 	IPPROTO_CARP                      = 0x70
 	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
 	IPPROTO_DONE                      = 0x101
 	IPPROTO_DSTOPTS                   = 0x3c
 	IPPROTO_EGP                       = 0x8
@@ -872,11 +762,9 @@ const (
 	IPPROTO_RAW                       = 0xff
 	IPPROTO_ROUTING                   = 0x2b
 	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_TCP                       = 0x6
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
 	IPV6_AUTH_LEVEL                   = 0x35
 	IPV6_AUTOFLOWLABEL                = 0x3b
 	IPV6_CHECKSUM                     = 0x1a
@@ -899,7 +787,6 @@ const (
 	IPV6_LEAVE_GROUP                  = 0xd
 	IPV6_MAXHLIM                      = 0xff
 	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MINHOPCOUNT                  = 0x41
 	IPV6_MMTU                         = 0x500
 	IPV6_MULTICAST_HOPS               = 0xa
 	IPV6_MULTICAST_IF                 = 0x9
@@ -939,12 +826,12 @@ const (
 	IP_DEFAULT_MULTICAST_LOOP         = 0x1
 	IP_DEFAULT_MULTICAST_TTL          = 0x1
 	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
 	IP_DROP_MEMBERSHIP                = 0xd
 	IP_ESP_NETWORK_LEVEL              = 0x16
 	IP_ESP_TRANS_LEVEL                = 0x15
 	IP_HDRINCL                        = 0x2
 	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPDEFTTL                       = 0x25
 	IP_IPSECFLOWINFO                  = 0x24
 	IP_IPSEC_LOCAL_AUTH               = 0x1b
 	IP_IPSEC_LOCAL_CRED               = 0x19
@@ -978,15 +865,10 @@ const (
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
 	IP_RTABLE                         = 0x1021
-	IP_SENDSRCADDR                    = 0x7
 	IP_TOS                            = 0x3
 	IP_TTL                            = 0x4
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
-	IUCLC                             = 0x1000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
@@ -1018,11 +900,10 @@ const (
 	MAP_INHERIT_COPY                  = 0x1
 	MAP_INHERIT_NONE                  = 0x2
 	MAP_INHERIT_SHARE                 = 0x0
-	MAP_INHERIT_ZERO                  = 0x3
-	MAP_NOEXTEND                      = 0x0
-	MAP_NORESERVE                     = 0x0
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
 	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x0
+	MAP_RENAME                        = 0x20
 	MAP_SHARED                        = 0x1
 	MAP_STACK                         = 0x4000
 	MAP_TRYFIXED                      = 0x0
@@ -1041,7 +922,6 @@ const (
 	MNT_NOATIME                       = 0x8000
 	MNT_NODEV                         = 0x10
 	MNT_NOEXEC                        = 0x4
-	MNT_NOPERM                        = 0x20
 	MNT_NOSUID                        = 0x8
 	MNT_NOWAIT                        = 0x2
 	MNT_QUOTA                         = 0x2000
@@ -1049,29 +929,13 @@ const (
 	MNT_RELOAD                        = 0x40000
 	MNT_ROOTFS                        = 0x4000
 	MNT_SOFTDEP                       = 0x4000000
-	MNT_STALLED                       = 0x100000
-	MNT_SWAPPABLE                     = 0x200000
 	MNT_SYNCHRONOUS                   = 0x2
 	MNT_UPDATE                        = 0x10000
 	MNT_VISFLAGMASK                   = 0x400ffff
 	MNT_WAIT                          = 0x1
 	MNT_WANTRDWR                      = 0x2000000
 	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
 	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -1082,7 +946,6 @@ const (
 	MSG_PEEK                          = 0x2
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x4
 	MS_SYNC                           = 0x2
@@ -1090,16 +953,12 @@ const (
 	NET_RT_DUMP                       = 0x1
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
+	NET_RT_MAXID                      = 0x6
 	NET_RT_STATS                      = 0x4
 	NET_RT_TABLE                      = 0x5
 	NFDBITS                           = 0x20
 	NOFLSH                            = 0x80000000
-	NOKERNINFO                        = 0x2000000
 	NOTE_ATTRIB                       = 0x8
-	NOTE_CHANGE                       = 0x1
 	NOTE_CHILD                        = 0x4
 	NOTE_DELETE                       = 0x1
 	NOTE_EOF                          = 0x2
@@ -1109,7 +968,6 @@ const (
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
 	NOTE_PCTRLMASK                    = 0xf0000000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_RENAME                       = 0x20
@@ -1119,13 +977,11 @@ const (
 	NOTE_TRUNCATE                     = 0x80
 	NOTE_WRITE                        = 0x2
 	OCRNL                             = 0x10
-	OLCUC                             = 0x20
 	ONLCR                             = 0x2
 	ONLRET                            = 0x80
 	ONOCR                             = 0x40
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
-	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_APPEND                          = 0x8
 	O_ASYNC                           = 0x40
@@ -1159,6 +1015,7 @@ const (
 	PROT_NONE                         = 0x0
 	PROT_READ                         = 0x1
 	PROT_WRITE                        = 0x2
+	PT_MASK                           = 0x3ff000
 	RLIMIT_CORE                       = 0x4
 	RLIMIT_CPU                        = 0x0
 	RLIMIT_DATA                       = 0x2
@@ -1170,25 +1027,19 @@ const (
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
-	RTAX_BFD                          = 0xb
 	RTAX_BRD                          = 0x7
-	RTAX_DNS                          = 0xc
 	RTAX_DST                          = 0x0
 	RTAX_GATEWAY                      = 0x1
 	RTAX_GENMASK                      = 0x3
 	RTAX_IFA                          = 0x5
 	RTAX_IFP                          = 0x4
 	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xf
+	RTAX_MAX                          = 0xb
 	RTAX_NETMASK                      = 0x2
-	RTAX_SEARCH                       = 0xe
 	RTAX_SRC                          = 0x8
 	RTAX_SRCMASK                      = 0x9
-	RTAX_STATIC                       = 0xd
 	RTA_AUTHOR                        = 0x40
-	RTA_BFD                           = 0x800
 	RTA_BRD                           = 0x80
-	RTA_DNS                           = 0x1000
 	RTA_DST                           = 0x1
 	RTA_GATEWAY                       = 0x2
 	RTA_GENMASK                       = 0x8
@@ -1196,57 +1047,49 @@ const (
 	RTA_IFP                           = 0x10
 	RTA_LABEL                         = 0x400
 	RTA_NETMASK                       = 0x4
-	RTA_SEARCH                        = 0x4000
 	RTA_SRC                           = 0x100
 	RTA_SRCMASK                       = 0x200
-	RTA_STATIC                        = 0x2000
 	RTF_ANNOUNCE                      = 0x4000
-	RTF_BFD                           = 0x1000000
 	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CACHED                        = 0x20000
 	RTF_CLONED                        = 0x10000
 	RTF_CLONING                       = 0x100
-	RTF_CONNECTED                     = 0x800000
 	RTF_DONE                          = 0x40
 	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x110fc08
+	RTF_FMASK                         = 0x10f808
 	RTF_GATEWAY                       = 0x2
 	RTF_HOST                          = 0x4
 	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
+	RTF_MASK                          = 0x80
 	RTF_MODIFIED                      = 0x20
 	RTF_MPATH                         = 0x40000
 	RTF_MPLS                          = 0x100000
-	RTF_MULTICAST                     = 0x200
 	RTF_PERMANENT_ARP                 = 0x2000
 	RTF_PROTO1                        = 0x8000
 	RTF_PROTO2                        = 0x4000
 	RTF_PROTO3                        = 0x2000
 	RTF_REJECT                        = 0x8
+	RTF_SOURCE                        = 0x20000
 	RTF_STATIC                        = 0x800
+	RTF_TUNNEL                        = 0x100000
 	RTF_UP                            = 0x1
 	RTF_USETRAILERS                   = 0x8000
-	RTM_80211INFO                     = 0x15
+	RTF_XRESOLVE                      = 0x200
 	RTM_ADD                           = 0x1
-	RTM_BFD                           = 0x12
 	RTM_CHANGE                        = 0x3
-	RTM_CHGADDRATTR                   = 0x14
 	RTM_DELADDR                       = 0xd
 	RTM_DELETE                        = 0x2
 	RTM_DESYNC                        = 0x10
 	RTM_GET                           = 0x4
 	RTM_IFANNOUNCE                    = 0xf
 	RTM_IFINFO                        = 0xe
-	RTM_INVALIDATE                    = 0x11
+	RTM_LOCK                          = 0x8
 	RTM_LOSING                        = 0x5
 	RTM_MAXSIZE                       = 0x800
 	RTM_MISS                          = 0x7
 	RTM_NEWADDR                       = 0xc
-	RTM_PROPOSAL                      = 0x13
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
+	RTM_RTTUNIT                       = 0xf4240
 	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
@@ -1256,74 +1099,67 @@ const (
 	RTV_RTTVAR                        = 0x80
 	RTV_SPIPE                         = 0x10
 	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_BITS                   = 0x8
-	RT_TABLEID_MASK                   = 0xff
 	RT_TABLEID_MAX                    = 0xff
 	RUSAGE_CHILDREN                   = -0x1
 	RUSAGE_SELF                       = 0x0
 	RUSAGE_THREAD                     = 0x1
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
 	SIOCADDMULTI                      = 0x80206931
 	SIOCAIFADDR                       = 0x8040691a
 	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
 	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x805c693c
-	SIOCBRDGADDL                      = 0x805c6949
-	SIOCBRDGADDS                      = 0x805c6941
-	SIOCBRDGARL                       = 0x808c694d
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
 	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x805c693d
-	SIOCBRDGDELS                      = 0x805c6942
-	SIOCBRDGFLUSH                     = 0x805c6948
-	SIOCBRDGFRL                       = 0x808c694e
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
 	SIOCBRDGGCACHE                    = 0xc0146941
 	SIOCBRDGGFD                       = 0xc0146952
 	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc05c693e
+	SIOCBRDGGIFFLGS                   = 0xc054693e
 	SIOCBRDGGMA                       = 0xc0146953
 	SIOCBRDGGPARAM                    = 0xc03c6958
 	SIOCBRDGGPRI                      = 0xc0146950
 	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
 	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc05c6942
+	SIOCBRDGIFS                       = 0xc0546942
 	SIOCBRDGRTS                       = 0xc0186943
 	SIOCBRDGSADDR                     = 0xc1286944
 	SIOCBRDGSCACHE                    = 0x80146940
 	SIOCBRDGSFD                       = 0x80146952
 	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x805c6955
-	SIOCBRDGSIFFLGS                   = 0x805c693f
-	SIOCBRDGSIFPRIO                   = 0x805c6954
-	SIOCBRDGSIFPROT                   = 0x805c694a
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
 	SIOCBRDGSMA                       = 0x80146953
 	SIOCBRDGSPRI                      = 0x80146950
 	SIOCBRDGSPROTO                    = 0x8014695a
 	SIOCBRDGSTO                       = 0x80146945
 	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELLABEL                      = 0x80206997
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
 	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPARENT                     = 0x802069b4
 	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDPWE3NEIGHBOR                 = 0x802069de
-	SIOCDVNETID                       = 0x802069af
+	SIOCDLIFADDR                      = 0x8218691e
 	SIOCGETKALIVE                     = 0xc01869a4
 	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETMPWCFG                     = 0xc02069ae
 	SIOCGETPFLOW                      = 0xc02069fe
 	SIOCGETPFSYNC                     = 0xc02069f8
 	SIOCGETSGCNT                      = 0xc0147534
 	SIOCGETVIFCNT                     = 0xc0147533
 	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
 	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
 	SIOCGIFBRDADDR                    = 0xc0206923
 	SIOCGIFCONF                       = 0xc0086924
 	SIOCGIFDATA                       = 0xc020691b
@@ -1332,53 +1168,40 @@ const (
 	SIOCGIFFLAGS                      = 0xc0206911
 	SIOCGIFGATTR                      = 0xc024698b
 	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGLIST                      = 0xc024698d
 	SIOCGIFGMEMB                      = 0xc024698a
 	SIOCGIFGROUP                      = 0xc0246988
 	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFLLPRIO                     = 0xc02069b6
-	SIOCGIFMEDIA                      = 0xc0386938
+	SIOCGIFMEDIA                      = 0xc0286936
 	SIOCGIFMETRIC                     = 0xc0206917
 	SIOCGIFMTU                        = 0xc020697e
 	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPAIR                       = 0xc02069b1
-	SIOCGIFPARENT                     = 0xc02069b3
+	SIOCGIFPDSTADDR                   = 0xc0206948
 	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
 	SIOCGIFRDOMAIN                    = 0xc02069a0
 	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFRXR                        = 0x802069aa
-	SIOCGIFSFFPAGE                    = 0xc1126939
+	SIOCGIFTIMESLOT                   = 0xc0206986
 	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
 	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYDF                     = 0xc02069c2
-	SIOCGLIFPHYECN                    = 0xc02069c8
 	SIOCGLIFPHYRTABLE                 = 0xc02069a2
 	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
 	SIOCGPGRP                         = 0x40047309
-	SIOCGPWE3                         = 0xc0206998
-	SIOCGPWE3CTRLWORD                 = 0xc02069dc
-	SIOCGPWE3FAT                      = 0xc02069dd
-	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
 	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGTXHPRIO                      = 0xc02069c6
-	SIOCGUMBINFO                      = 0xc02069be
-	SIOCGUMBPARAM                     = 0xc02069c0
 	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETFLOWID                   = 0xc02069c4
 	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFAFATTACH                    = 0x801169ab
-	SIOCIFAFDETACH                    = 0x801169ac
 	SIOCIFCREATE                      = 0x8020697a
 	SIOCIFDESTROY                     = 0x80206979
 	SIOCIFGCLONERS                    = 0xc00c6978
 	SIOCSETKALIVE                     = 0x801869a3
 	SIOCSETLABEL                      = 0x80206999
-	SIOCSETMPWCFG                     = 0x802069ad
 	SIOCSETPFLOW                      = 0x802069fd
 	SIOCSETPFSYNC                     = 0x802069f7
 	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
 	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
 	SIOCSIFBRDADDR                    = 0x80206913
 	SIOCSIFDESCR                      = 0x80206980
 	SIOCSIFDSTADDR                    = 0x8020690e
@@ -1386,37 +1209,25 @@ const (
 	SIOCSIFGATTR                      = 0x8024698c
 	SIOCSIFGENERIC                    = 0x80206939
 	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFLLPRIO                     = 0x802069b5
-	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMEDIA                      = 0xc0206935
 	SIOCSIFMETRIC                     = 0x80206918
 	SIOCSIFMTU                        = 0x8020697f
 	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPAIR                       = 0x802069b0
-	SIOCSIFPARENT                     = 0x802069b2
+	SIOCSIFPHYADDR                    = 0x80406946
 	SIOCSIFPRIORITY                   = 0x8020699b
 	SIOCSIFRDOMAIN                    = 0x8020699f
 	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
 	SIOCSIFXFLAGS                     = 0x8020699d
 	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYDF                     = 0x802069c1
-	SIOCSLIFPHYECN                    = 0x802069c7
 	SIOCSLIFPHYRTABLE                 = 0x802069a1
 	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
-	SIOCSPWE3CTRLWORD                 = 0x802069dc
-	SIOCSPWE3FAT                      = 0x802069dd
-	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
 	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSTXHPRIO                      = 0x802069c5
-	SIOCSUMBPARAM                     = 0x802069bf
 	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETFLOWID                   = 0x802069c3
 	SIOCSVNETID                       = 0x802069a6
-	SOCK_CLOEXEC                      = 0x8000
 	SOCK_DGRAM                        = 0x2
-	SOCK_DNS                          = 0x1000
-	SOCK_NONBLOCK                     = 0x4000
 	SOCK_RAW                          = 0x3
 	SOCK_RDM                          = 0x4
 	SOCK_SEQPACKET                    = 0x5
@@ -1427,7 +1238,6 @@ const (
 	SO_BINDANY                        = 0x1000
 	SO_BROADCAST                      = 0x20
 	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
 	SO_DONTROUTE                      = 0x10
 	SO_ERROR                          = 0x1007
 	SO_KEEPALIVE                      = 0x8
@@ -1435,7 +1245,6 @@ const (
 	SO_NETPROC                        = 0x1020
 	SO_OOBINLINE                      = 0x100
 	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
@@ -1449,7 +1258,6 @@ const (
 	SO_TIMESTAMP                      = 0x800
 	SO_TYPE                           = 0x1008
 	SO_USELOOPBACK                    = 0x40
-	SO_ZEROIZE                        = 0x2000
 	S_BLKSIZE                         = 0x200
 	S_IEXEC                           = 0x40
 	S_IFBLK                           = 0x6000
@@ -1479,24 +1287,9 @@ const (
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
 	TCIFLUSH                          = 0x1
-	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
-	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
-	TCOOFF                            = 0x1
-	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
+	TCP_MAXBURST                      = 0x4
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
 	TCP_MAX_SACK                      = 0x3
@@ -1505,15 +1298,11 @@ const (
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
+	TCP_NSTATES                       = 0xb
 	TCP_SACK_ENABLE                   = 0x8
 	TCSAFLUSH                         = 0x2
-	TIMER_ABSTIME                     = 0x1
-	TIMER_RELTIME                     = 0x0
 	TIOCCBRK                          = 0x2000747a
 	TIOCCDTR                          = 0x20007478
-	TIOCCHKVERAUTH                    = 0x2000741e
-	TIOCCLRVERAUTH                    = 0x2000741d
 	TIOCCONS                          = 0x80047462
 	TIOCDRAIN                         = 0x2000745e
 	TIOCEXCL                          = 0x2000740d
@@ -1568,21 +1357,17 @@ const (
 	TIOCSETAF                         = 0x802c7416
 	TIOCSETAW                         = 0x802c7415
 	TIOCSETD                          = 0x8004741b
-	TIOCSETVERAUTH                    = 0x8004741c
 	TIOCSFLAGS                        = 0x8004745c
 	TIOCSIG                           = 0x8004745f
 	TIOCSPGRP                         = 0x80047476
 	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
 	TIOCSTOP                          = 0x2000746f
 	TIOCSTSTAMP                       = 0x8008745a
 	TIOCSWINSZ                        = 0x80087467
 	TIOCUCNTL                         = 0x80047466
-	TIOCUCNTL_CBRK                    = 0x7a
-	TIOCUCNTL_SBRK                    = 0x7b
 	TOSTOP                            = 0x400000
-	UTIME_NOW                         = -0x2
-	UTIME_OMIT                        = -0x1
 	VDISCARD                          = 0xf
 	VDSUSP                            = 0xb
 	VEOF                              = 0x0
@@ -1593,19 +1378,6 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
-	VM_ANONMIN                        = 0x7
-	VM_LOADAVG                        = 0x2
-	VM_MALLOC_CONF                    = 0xc
-	VM_MAXID                          = 0xd
-	VM_MAXSLP                         = 0xa
-	VM_METER                          = 0x1
-	VM_NKMEMPAGES                     = 0x6
-	VM_PSSTRINGS                      = 0x3
-	VM_SWAPENCRYPT                    = 0x5
-	VM_USPACE                         = 0xb
-	VM_UVMEXP                         = 0x4
-	VM_VNODEMIN                       = 0x9
-	VM_VTEXTMIN                       = 0x8
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1618,8 +1390,8 @@ const (
 	WCONTINUED                        = 0x8
 	WCOREFLAG                         = 0x80
 	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
 	WUNTRACED                         = 0x2
-	XCASE                             = 0x1000000
 )
 
 // Errors
@@ -1633,7 +1405,6 @@ const (
 	EALREADY        = syscall.Errno(0x25)
 	EAUTH           = syscall.Errno(0x50)
 	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x5c)
 	EBADRPC         = syscall.Errno(0x48)
 	EBUSY           = syscall.Errno(0x10)
 	ECANCELED       = syscall.Errno(0x58)
@@ -1660,7 +1431,7 @@ const (
 	EIPSEC          = syscall.Errno(0x52)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5f)
+	ELAST           = syscall.Errno(0x5b)
 	ELOOP           = syscall.Errno(0x3e)
 	EMEDIUMTYPE     = syscall.Errno(0x56)
 	EMFILE          = syscall.Errno(0x18)
@@ -1688,14 +1459,12 @@ const (
 	ENOTCONN        = syscall.Errno(0x39)
 	ENOTDIR         = syscall.Errno(0x14)
 	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5d)
 	ENOTSOCK        = syscall.Errno(0x26)
 	ENOTSUP         = syscall.Errno(0x5b)
 	ENOTTY          = syscall.Errno(0x19)
 	ENXIO           = syscall.Errno(0x6)
 	EOPNOTSUPP      = syscall.Errno(0x2d)
 	EOVERFLOW       = syscall.Errno(0x57)
-	EOWNERDEAD      = syscall.Errno(0x5e)
 	EPERM           = syscall.Errno(0x1)
 	EPFNOSUPPORT    = syscall.Errno(0x2e)
 	EPIPE           = syscall.Errno(0x20)
@@ -1703,7 +1472,6 @@ const (
 	EPROCUNAVAIL    = syscall.Errno(0x4c)
 	EPROGMISMATCH   = syscall.Errno(0x4b)
 	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5f)
 	EPROTONOSUPPORT = syscall.Errno(0x2b)
 	EPROTOTYPE      = syscall.Errno(0x29)
 	ERANGE          = syscall.Errno(0x22)
@@ -1800,7 +1568,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EAGAIN", "resource temporarily unavailable"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1856,11 +1624,7 @@ var errorList = [...]struct {
 	{88, "ECANCELED", "operation canceled"},
 	{89, "EIDRM", "identifier removed"},
 	{90, "ENOMSG", "no message of desired type"},
-	{91, "ENOTSUP", "not supported"},
-	{92, "EBADMSG", "bad message"},
-	{93, "ENOTRECOVERABLE", "state not recoverable"},
-	{94, "EOWNERDEAD", "previous owner died"},
-	{95, "ELAST", "protocol error"},
+	{91, "ELAST", "not supported"},
 }
 
 // Signal table
@@ -1874,7 +1638,7 @@ var signalList = [...]struct {
 	{3, "SIGQUIT", "quit"},
 	{4, "SIGILL", "illegal instruction"},
 	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
+	{6, "SIGABRT", "abort trap"},
 	{7, "SIGEMT", "EMT trap"},
 	{8, "SIGFPE", "floating point exception"},
 	{9, "SIGKILL", "killed"},
@@ -1901,5 +1665,4 @@ var signalList = [...]struct {
 	{30, "SIGUSR1", "user defined signal 1"},
 	{31, "SIGUSR2", "user defined signal 2"},
 	{32, "SIGTHR", "thread AST"},
-	{28672, "SIGSTKSZ", "unknown signal"},
 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
index a5aeeb9..25cb609 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && openbsd
+// +build amd64,openbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -108,15 +109,6 @@ const (
 	BPF_DIRECTION_IN                  = 0x1
 	BPF_DIRECTION_OUT                 = 0x2
 	BPF_DIV                           = 0x30
-	BPF_FILDROP_CAPTURE               = 0x1
-	BPF_FILDROP_DROP                  = 0x2
-	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
 	BPF_IND                           = 0x40
@@ -145,7 +137,6 @@ const (
 	BPF_OR                            = 0x40
 	BPF_RELEASE                       = 0x30bb6
 	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
 	BPF_RSH                           = 0x70
 	BPF_ST                            = 0x2
 	BPF_STX                           = 0x3
@@ -186,65 +177,7 @@ const (
 	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc110445d
-	DIOCADDRULE                       = 0xcd604404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xcd60441a
-	DIOCCLRIFFLAG                     = 0xc028445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0e04412
-	DIOCCLRSTATUS                     = 0xc0284416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1204460
-	DIOCGETQUEUE                      = 0xc110445f
-	DIOCGETQUEUES                     = 0xc110445e
-	DIOCGETRULE                       = 0xcd604407
-	DIOCGETRULES                      = 0xcd604406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0104454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0104419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0284457
-	DIOCKILLSRCNODES                  = 0xc080445b
-	DIOCKILLSTATES                    = 0xc0e04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc088444f
 	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0884450
-	DIOCRADDADDRS                     = 0xc4504443
-	DIOCRADDTABLES                    = 0xc450443d
-	DIOCRCLRADDRS                     = 0xc4504442
-	DIOCRCLRASTATS                    = 0xc4504448
-	DIOCRCLRTABLES                    = 0xc450443c
-	DIOCRCLRTSTATS                    = 0xc4504441
-	DIOCRDELADDRS                     = 0xc4504444
-	DIOCRDELTABLES                    = 0xc450443e
-	DIOCRGETADDRS                     = 0xc4504446
-	DIOCRGETASTATS                    = 0xc4504447
-	DIOCRGETTABLES                    = 0xc450443f
-	DIOCRGETTSTATS                    = 0xc4504440
-	DIOCRINADEFINE                    = 0xc450444d
-	DIOCRSETADDRS                     = 0xc4504445
-	DIOCRSETTFLAGS                    = 0xc450444a
-	DIOCRTSTADDRS                     = 0xc4504449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0284459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0284414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc0104451
-	DIOCXCOMMIT                       = 0xc0104452
-	DIOCXROLLBACK                     = 0xc0104453
 	DLT_ARCNET                        = 0x7
 	DLT_ATM_RFC1483                   = 0xb
 	DLT_AX25                          = 0x3
@@ -307,8 +240,6 @@ const (
 	EMUL_ENABLED                      = 0x1
 	EMUL_NATIVE                       = 0x2
 	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
 	ETHERMIN                          = 0x2e
 	ETHERMTU                          = 0x5dc
 	ETHERTYPE_8023                    = 0x4
@@ -361,7 +292,6 @@ const (
 	ETHERTYPE_DN                      = 0x6003
 	ETHERTYPE_DOGFIGHT                = 0x1989
 	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
 	ETHERTYPE_ECMA                    = 0x803
 	ETHERTYPE_ENCRYPT                 = 0x803d
 	ETHERTYPE_ES                      = 0x805d
@@ -393,7 +323,6 @@ const (
 	ETHERTYPE_LLDP                    = 0x88cc
 	ETHERTYPE_LOGICRAFT               = 0x8148
 	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
 	ETHERTYPE_MATRA                   = 0x807a
 	ETHERTYPE_MAX                     = 0xffff
 	ETHERTYPE_MERIT                   = 0x807c
@@ -422,17 +351,15 @@ const (
 	ETHERTYPE_NCD                     = 0x8149
 	ETHERTYPE_NESTAR                  = 0x8006
 	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
 	ETHERTYPE_NOVELL                  = 0x8138
 	ETHERTYPE_NS                      = 0x600
 	ETHERTYPE_NSAT                    = 0x601
 	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
 	ETHERTYPE_NTRAILER                = 0x10
 	ETHERTYPE_OS9                     = 0x7007
 	ETHERTYPE_OS9NET                  = 0x7009
 	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PBB                     = 0x88e7
+	ETHERTYPE_PAE                     = 0x888e
 	ETHERTYPE_PCS                     = 0x4242
 	ETHERTYPE_PLANNING                = 0x8044
 	ETHERTYPE_PPP                     = 0x880b
@@ -514,11 +441,10 @@ const (
 	ETHER_VLAN_ENCAP_LEN              = 0x4
 	EVFILT_AIO                        = -0x3
 	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
+	EVFILT_SYSCOUNT                   = 0x8
 	EVFILT_TIMER                      = -0x7
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
@@ -540,7 +466,7 @@ const (
 	EV_FLAG1                          = 0x2000
 	EV_ONESHOT                        = 0x10
 	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
+	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
@@ -806,7 +732,6 @@ const (
 	IFT_VOICEOVERCABLE                = 0xc6
 	IFT_VOICEOVERFRAMERELAY           = 0x99
 	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
 	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
@@ -872,11 +797,9 @@ const (
 	IPPROTO_RAW                       = 0xff
 	IPPROTO_ROUTING                   = 0x2b
 	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_TCP                       = 0x6
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
 	IPV6_AUTH_LEVEL                   = 0x35
 	IPV6_AUTOFLOWLABEL                = 0x3b
 	IPV6_CHECKSUM                     = 0x1a
@@ -983,9 +906,6 @@ const (
 	IP_TTL                            = 0x4
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
 	IUCLC                             = 0x1000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
@@ -1050,26 +970,12 @@ const (
 	MNT_ROOTFS                        = 0x4000
 	MNT_SOFTDEP                       = 0x4000000
 	MNT_STALLED                       = 0x100000
-	MNT_SWAPPABLE                     = 0x200000
 	MNT_SYNCHRONOUS                   = 0x2
 	MNT_UPDATE                        = 0x10000
 	MNT_VISFLAGMASK                   = 0x400ffff
 	MNT_WAIT                          = 0x1
 	MNT_WANTRDWR                      = 0x2000000
 	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
 	MSG_BCAST                         = 0x100
 	MSG_CMSG_CLOEXEC                  = 0x800
 	MSG_CTRUNC                        = 0x20
@@ -1082,7 +988,6 @@ const (
 	MSG_PEEK                          = 0x2
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x4
 	MS_SYNC                           = 0x2
@@ -1091,8 +996,7 @@ const (
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
 	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
+	NET_RT_MAXID                      = 0x7
 	NET_RT_STATS                      = 0x4
 	NET_RT_TABLE                      = 0x5
 	NFDBITS                           = 0x20
@@ -1109,7 +1013,6 @@ const (
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
 	NOTE_PCTRLMASK                    = 0xf0000000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_RENAME                       = 0x20
@@ -1227,11 +1130,9 @@ const (
 	RTF_STATIC                        = 0x800
 	RTF_UP                            = 0x1
 	RTF_USETRAILERS                   = 0x8000
-	RTM_80211INFO                     = 0x15
 	RTM_ADD                           = 0x1
 	RTM_BFD                           = 0x12
 	RTM_CHANGE                        = 0x3
-	RTM_CHGADDRATTR                   = 0x14
 	RTM_DELADDR                       = 0xd
 	RTM_DELETE                        = 0x2
 	RTM_DESYNC                        = 0x10
@@ -1239,6 +1140,7 @@ const (
 	RTM_IFANNOUNCE                    = 0xf
 	RTM_IFINFO                        = 0xe
 	RTM_INVALIDATE                    = 0x11
+	RTM_LOCK                          = 0x8
 	RTM_LOSING                        = 0x5
 	RTM_MAXSIZE                       = 0x800
 	RTM_MISS                          = 0x7
@@ -1246,7 +1148,7 @@ const (
 	RTM_PROPOSAL                      = 0x13
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
+	RTM_RTTUNIT                       = 0xf4240
 	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
@@ -1264,9 +1166,6 @@ const (
 	RUSAGE_THREAD                     = 0x1
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
@@ -1283,37 +1182,35 @@ const (
 	SIOCBRDGDELS                      = 0x80606942
 	SIOCBRDGFLUSH                     = 0x80606948
 	SIOCBRDGFRL                       = 0x808c694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGCACHE                    = 0xc0186941
+	SIOCBRDGGFD                       = 0xc0186952
+	SIOCBRDGGHT                       = 0xc0186951
 	SIOCBRDGGIFFLGS                   = 0xc060693e
-	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGMA                       = 0xc0186953
 	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGPRI                      = 0xc0186950
 	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGGTO                       = 0xc0186946
 	SIOCBRDGIFS                       = 0xc0606942
 	SIOCBRDGRTS                       = 0xc0206943
 	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSCACHE                    = 0x80186940
+	SIOCBRDGSFD                       = 0x80186952
+	SIOCBRDGSHT                       = 0x80186951
 	SIOCBRDGSIFCOST                   = 0x80606955
 	SIOCBRDGSIFFLGS                   = 0x8060693f
 	SIOCBRDGSIFPRIO                   = 0x80606954
 	SIOCBRDGSIFPROT                   = 0x8060694a
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELLABEL                      = 0x80206997
+	SIOCBRDGSMA                       = 0x80186953
+	SIOCBRDGSPRI                      = 0x80186950
+	SIOCBRDGSPROTO                    = 0x8018695a
+	SIOCBRDGSTO                       = 0x80186945
+	SIOCBRDGSTXHC                     = 0x80186959
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
 	SIOCDIFGROUP                      = 0x80286989
 	SIOCDIFPARENT                     = 0x802069b4
 	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDPWE3NEIGHBOR                 = 0x802069de
 	SIOCDVNETID                       = 0x802069af
 	SIOCGETKALIVE                     = 0xc01869a4
 	SIOCGETLABEL                      = 0x8020699a
@@ -1332,7 +1229,6 @@ const (
 	SIOCGIFFLAGS                      = 0xc0206911
 	SIOCGIFGATTR                      = 0xc028698b
 	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGLIST                      = 0xc028698d
 	SIOCGIFGMEMB                      = 0xc028698a
 	SIOCGIFGROUP                      = 0xc0286988
 	SIOCGIFHARDMTU                    = 0xc02069a5
@@ -1347,21 +1243,13 @@ const (
 	SIOCGIFRDOMAIN                    = 0xc02069a0
 	SIOCGIFRTLABEL                    = 0xc0206983
 	SIOCGIFRXR                        = 0x802069aa
-	SIOCGIFSFFPAGE                    = 0xc1126939
 	SIOCGIFXFLAGS                     = 0xc020699e
 	SIOCGLIFPHYADDR                   = 0xc218694b
 	SIOCGLIFPHYDF                     = 0xc02069c2
-	SIOCGLIFPHYECN                    = 0xc02069c8
 	SIOCGLIFPHYRTABLE                 = 0xc02069a2
 	SIOCGLIFPHYTTL                    = 0xc02069a9
 	SIOCGPGRP                         = 0x40047309
-	SIOCGPWE3                         = 0xc0206998
-	SIOCGPWE3CTRLWORD                 = 0xc02069dc
-	SIOCGPWE3FAT                      = 0xc02069dd
-	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
 	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGTXHPRIO                      = 0xc02069c6
 	SIOCGUMBINFO                      = 0xc02069be
 	SIOCGUMBPARAM                     = 0xc02069c0
 	SIOCGVH                           = 0xc02069f6
@@ -1399,20 +1287,19 @@ const (
 	SIOCSIFXFLAGS                     = 0x8020699d
 	SIOCSLIFPHYADDR                   = 0x8218694a
 	SIOCSLIFPHYDF                     = 0x802069c1
-	SIOCSLIFPHYECN                    = 0x802069c7
 	SIOCSLIFPHYRTABLE                 = 0x802069a1
 	SIOCSLIFPHYTTL                    = 0x802069a8
 	SIOCSPGRP                         = 0x80047308
-	SIOCSPWE3CTRLWORD                 = 0x802069dc
-	SIOCSPWE3FAT                      = 0x802069dd
-	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
 	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSTXHPRIO                      = 0x802069c5
 	SIOCSUMBPARAM                     = 0x802069bf
 	SIOCSVH                           = 0xc02069f5
 	SIOCSVNETFLOWID                   = 0x802069c3
 	SIOCSVNETID                       = 0x802069a6
+	SIOCSWGDPID                       = 0xc018695b
+	SIOCSWGMAXFLOW                    = 0xc0186960
+	SIOCSWGMAXGROUP                   = 0xc018695d
+	SIOCSWSDPID                       = 0x8018695c
+	SIOCSWSPORTNO                     = 0xc060695f
 	SOCK_CLOEXEC                      = 0x8000
 	SOCK_DGRAM                        = 0x2
 	SOCK_DNS                          = 0x1000
@@ -1427,7 +1314,6 @@ const (
 	SO_BINDANY                        = 0x1000
 	SO_BROADCAST                      = 0x20
 	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
 	SO_DONTROUTE                      = 0x10
 	SO_ERROR                          = 0x1007
 	SO_KEEPALIVE                      = 0x8
@@ -1435,7 +1321,6 @@ const (
 	SO_NETPROC                        = 0x1020
 	SO_OOBINLINE                      = 0x100
 	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
@@ -1485,18 +1370,7 @@ const (
 	TCOFLUSH                          = 0x2
 	TCOOFF                            = 0x1
 	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
+	TCP_MAXBURST                      = 0x4
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
 	TCP_MAX_SACK                      = 0x3
@@ -1505,11 +1379,8 @@ const (
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
 	TCP_SACK_ENABLE                   = 0x8
 	TCSAFLUSH                         = 0x2
-	TIMER_ABSTIME                     = 0x1
-	TIMER_RELTIME                     = 0x0
 	TIOCCBRK                          = 0x2000747a
 	TIOCCDTR                          = 0x20007478
 	TIOCCHKVERAUTH                    = 0x2000741e
@@ -1574,6 +1445,7 @@ const (
 	TIOCSPGRP                         = 0x80047476
 	TIOCSTART                         = 0x2000746e
 	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
 	TIOCSTOP                          = 0x2000746f
 	TIOCSTSTAMP                       = 0x8008745a
 	TIOCSWINSZ                        = 0x80087467
@@ -1595,8 +1467,7 @@ const (
 	VMIN                              = 0x10
 	VM_ANONMIN                        = 0x7
 	VM_LOADAVG                        = 0x2
-	VM_MALLOC_CONF                    = 0xc
-	VM_MAXID                          = 0xd
+	VM_MAXID                          = 0xc
 	VM_MAXSLP                         = 0xa
 	VM_METER                          = 0x1
 	VM_NKMEMPAGES                     = 0x6
@@ -1874,7 +1745,7 @@ var signalList = [...]struct {
 	{3, "SIGQUIT", "quit"},
 	{4, "SIGILL", "illegal instruction"},
 	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
+	{6, "SIGABRT", "abort trap"},
 	{7, "SIGEMT", "EMT trap"},
 	{8, "SIGFPE", "floating point exception"},
 	{9, "SIGKILL", "killed"},
@@ -1901,5 +1772,4 @@ var signalList = [...]struct {
 	{30, "SIGUSR1", "user defined signal 1"},
 	{31, "SIGUSR2", "user defined signal 2"},
 	{32, "SIGTHR", "thread AST"},
-	{28672, "SIGSTKSZ", "unknown signal"},
 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
index 0e9748a..aef6c08 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && openbsd
+// +build arm,openbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- _const.go
@@ -45,7 +46,6 @@ const (
 	AF_SNA                            = 0xb
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
-	ALTWERASE                         = 0x200
 	ARPHRD_ETHER                      = 0x1
 	ARPHRD_FRELAY                     = 0xf
 	ARPHRD_IEEE1394                   = 0x18
@@ -82,7 +82,7 @@ const (
 	BIOCGFILDROP                      = 0x40044278
 	BIOCGHDRCMPLT                     = 0x40044274
 	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGRTIMEOUT                     = 0x400c426e
 	BIOCGSTATS                        = 0x4008426f
 	BIOCIMMEDIATE                     = 0x80044270
 	BIOCLOCK                          = 0x20004276
@@ -96,7 +96,7 @@ const (
 	BIOCSFILDROP                      = 0x80044279
 	BIOCSHDRCMPLT                     = 0x80044275
 	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSRTIMEOUT                     = 0x800c426d
 	BIOCVERSION                       = 0x40044271
 	BPF_A                             = 0x10
 	BPF_ABS                           = 0x20
@@ -108,15 +108,6 @@ const (
 	BPF_DIRECTION_IN                  = 0x1
 	BPF_DIRECTION_OUT                 = 0x2
 	BPF_DIV                           = 0x30
-	BPF_FILDROP_CAPTURE               = 0x1
-	BPF_FILDROP_DROP                  = 0x2
-	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
 	BPF_IND                           = 0x40
@@ -145,7 +136,6 @@ const (
 	BPF_OR                            = 0x40
 	BPF_RELEASE                       = 0x30bb6
 	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
 	BPF_RSH                           = 0x70
 	BPF_ST                            = 0x2
 	BPF_STX                           = 0x3
@@ -157,12 +147,6 @@ const (
 	BRKINT                            = 0x2
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
-	CLOCK_BOOTTIME                    = 0x6
-	CLOCK_MONOTONIC                   = 0x3
-	CLOCK_PROCESS_CPUTIME_ID          = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_THREAD_CPUTIME_ID           = 0x4
-	CLOCK_UPTIME                      = 0x5
 	CPUSTATES                         = 0x6
 	CP_IDLE                           = 0x5
 	CP_INTR                           = 0x4
@@ -186,65 +170,7 @@ const (
 	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc100445d
-	DIOCADDRULE                       = 0xcce04404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xcce0441a
-	DIOCCLRIFFLAG                     = 0xc024445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0d04412
-	DIOCCLRSTATUS                     = 0xc0244416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1084460
-	DIOCGETQUEUE                      = 0xc100445f
-	DIOCGETQUEUES                     = 0xc100445e
-	DIOCGETRULE                       = 0xcce04407
-	DIOCGETRULES                      = 0xcce04406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0084454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0084419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0244457
-	DIOCKILLSRCNODES                  = 0xc068445b
-	DIOCKILLSTATES                    = 0xc0d04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc088444f
 	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0884450
-	DIOCRADDADDRS                     = 0xc44c4443
-	DIOCRADDTABLES                    = 0xc44c443d
-	DIOCRCLRADDRS                     = 0xc44c4442
-	DIOCRCLRASTATS                    = 0xc44c4448
-	DIOCRCLRTABLES                    = 0xc44c443c
-	DIOCRCLRTSTATS                    = 0xc44c4441
-	DIOCRDELADDRS                     = 0xc44c4444
-	DIOCRDELTABLES                    = 0xc44c443e
-	DIOCRGETADDRS                     = 0xc44c4446
-	DIOCRGETASTATS                    = 0xc44c4447
-	DIOCRGETTABLES                    = 0xc44c443f
-	DIOCRGETTSTATS                    = 0xc44c4440
-	DIOCRINADEFINE                    = 0xc44c444d
-	DIOCRSETADDRS                     = 0xc44c4445
-	DIOCRSETTFLAGS                    = 0xc44c444a
-	DIOCRTSTADDRS                     = 0xc44c4449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0244459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0244414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc00c4451
-	DIOCXCOMMIT                       = 0xc00c4452
-	DIOCXROLLBACK                     = 0xc00c4453
 	DLT_ARCNET                        = 0x7
 	DLT_ATM_RFC1483                   = 0xb
 	DLT_AX25                          = 0x3
@@ -260,7 +186,6 @@ const (
 	DLT_LOOP                          = 0xc
 	DLT_MPLS                          = 0xdb
 	DLT_NULL                          = 0x0
-	DLT_OPENFLOW                      = 0x10b
 	DLT_PFLOG                         = 0x75
 	DLT_PFSYNC                        = 0x12
 	DLT_PPP                           = 0x9
@@ -271,23 +196,6 @@ const (
 	DLT_RAW                           = 0xe
 	DLT_SLIP                          = 0x8
 	DLT_SLIP_BSDOS                    = 0xf
-	DLT_USBPCAP                       = 0xf9
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
 	DT_BLK                            = 0x6
 	DT_CHR                            = 0x2
 	DT_DIR                            = 0x4
@@ -307,8 +215,6 @@ const (
 	EMUL_ENABLED                      = 0x1
 	EMUL_NATIVE                       = 0x2
 	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
 	ETHERMIN                          = 0x2e
 	ETHERMTU                          = 0x5dc
 	ETHERTYPE_8023                    = 0x4
@@ -361,7 +267,6 @@ const (
 	ETHERTYPE_DN                      = 0x6003
 	ETHERTYPE_DOGFIGHT                = 0x1989
 	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
 	ETHERTYPE_ECMA                    = 0x803
 	ETHERTYPE_ENCRYPT                 = 0x803d
 	ETHERTYPE_ES                      = 0x805d
@@ -393,7 +298,6 @@ const (
 	ETHERTYPE_LLDP                    = 0x88cc
 	ETHERTYPE_LOGICRAFT               = 0x8148
 	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
 	ETHERTYPE_MATRA                   = 0x807a
 	ETHERTYPE_MAX                     = 0xffff
 	ETHERTYPE_MERIT                   = 0x807c
@@ -422,17 +326,15 @@ const (
 	ETHERTYPE_NCD                     = 0x8149
 	ETHERTYPE_NESTAR                  = 0x8006
 	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
 	ETHERTYPE_NOVELL                  = 0x8138
 	ETHERTYPE_NS                      = 0x600
 	ETHERTYPE_NSAT                    = 0x601
 	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
 	ETHERTYPE_NTRAILER                = 0x10
 	ETHERTYPE_OS9                     = 0x7007
 	ETHERTYPE_OS9NET                  = 0x7009
 	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PBB                     = 0x88e7
+	ETHERTYPE_PAE                     = 0x888e
 	ETHERTYPE_PCS                     = 0x4242
 	ETHERTYPE_PLANNING                = 0x8044
 	ETHERTYPE_PPP                     = 0x880b
@@ -507,40 +409,28 @@ const (
 	ETHER_CRC_POLY_LE                 = 0xedb88320
 	ETHER_HDR_LEN                     = 0xe
 	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_HARDMTU_LEN             = 0xff9b
 	ETHER_MAX_LEN                     = 0x5ee
 	ETHER_MIN_LEN                     = 0x40
 	ETHER_TYPE_LEN                    = 0x2
 	ETHER_VLAN_ENCAP_LEN              = 0x4
 	EVFILT_AIO                        = -0x3
-	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
+	EVFILT_SYSCOUNT                   = 0x7
 	EVFILT_TIMER                      = -0x7
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
-	EVL_ENCAPLEN                      = 0x4
-	EVL_PRIO_BITS                     = 0xd
-	EVL_PRIO_MAX                      = 0x7
-	EVL_VLID_MASK                     = 0xfff
-	EVL_VLID_MAX                      = 0xffe
-	EVL_VLID_MIN                      = 0x1
-	EVL_VLID_NULL                     = 0x0
 	EV_ADD                            = 0x1
 	EV_CLEAR                          = 0x20
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
 	EV_FLAG1                          = 0x2000
 	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
+	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
@@ -553,8 +443,6 @@ const (
 	F_GETFL                           = 0x3
 	F_GETLK                           = 0x7
 	F_GETOWN                          = 0x5
-	F_ISATTY                          = 0xb
-	F_OK                              = 0x0
 	F_RDLCK                           = 0x1
 	F_SETFD                           = 0x2
 	F_SETFL                           = 0x4
@@ -571,6 +459,7 @@ const (
 	IEXTEN                            = 0x400
 	IFAN_ARRIVAL                      = 0x0
 	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
 	IFF_ALLMULTI                      = 0x200
 	IFF_BROADCAST                     = 0x2
 	IFF_CANTCHANGE                    = 0x8e52
@@ -581,12 +470,12 @@ const (
 	IFF_LOOPBACK                      = 0x8
 	IFF_MULTICAST                     = 0x8000
 	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
 	IFF_OACTIVE                       = 0x400
 	IFF_POINTOPOINT                   = 0x10
 	IFF_PROMISC                       = 0x100
 	IFF_RUNNING                       = 0x40
 	IFF_SIMPLEX                       = 0x800
-	IFF_STATICARP                     = 0x20
 	IFF_UP                            = 0x1
 	IFNAMSIZ                          = 0x10
 	IFT_1822                          = 0x2
@@ -715,7 +604,6 @@ const (
 	IFT_LINEGROUP                     = 0xd2
 	IFT_LOCALTALK                     = 0x2a
 	IFT_LOOP                          = 0x18
-	IFT_MBIM                          = 0xfa
 	IFT_MEDIAMAILOVERIP               = 0x8b
 	IFT_MFSIGLINK                     = 0xa7
 	IFT_MIOX25                        = 0x26
@@ -806,7 +694,6 @@ const (
 	IFT_VOICEOVERCABLE                = 0xc6
 	IFT_VOICEOVERFRAMERELAY           = 0x99
 	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
 	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
@@ -841,6 +728,8 @@ const (
 	IPPROTO_AH                        = 0x33
 	IPPROTO_CARP                      = 0x70
 	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
 	IPPROTO_DONE                      = 0x101
 	IPPROTO_DSTOPTS                   = 0x3c
 	IPPROTO_EGP                       = 0x8
@@ -872,11 +761,9 @@ const (
 	IPPROTO_RAW                       = 0xff
 	IPPROTO_ROUTING                   = 0x2b
 	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_TCP                       = 0x6
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
 	IPV6_AUTH_LEVEL                   = 0x35
 	IPV6_AUTOFLOWLABEL                = 0x3b
 	IPV6_CHECKSUM                     = 0x1a
@@ -899,7 +786,6 @@ const (
 	IPV6_LEAVE_GROUP                  = 0xd
 	IPV6_MAXHLIM                      = 0xff
 	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MINHOPCOUNT                  = 0x41
 	IPV6_MMTU                         = 0x500
 	IPV6_MULTICAST_HOPS               = 0xa
 	IPV6_MULTICAST_IF                 = 0x9
@@ -939,12 +825,12 @@ const (
 	IP_DEFAULT_MULTICAST_LOOP         = 0x1
 	IP_DEFAULT_MULTICAST_TTL          = 0x1
 	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
 	IP_DROP_MEMBERSHIP                = 0xd
 	IP_ESP_NETWORK_LEVEL              = 0x16
 	IP_ESP_TRANS_LEVEL                = 0x15
 	IP_HDRINCL                        = 0x2
 	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPDEFTTL                       = 0x25
 	IP_IPSECFLOWINFO                  = 0x24
 	IP_IPSEC_LOCAL_AUTH               = 0x1b
 	IP_IPSEC_LOCAL_CRED               = 0x19
@@ -978,15 +864,10 @@ const (
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
 	IP_RTABLE                         = 0x1021
-	IP_SENDSRCADDR                    = 0x7
 	IP_TOS                            = 0x3
 	IP_TTL                            = 0x4
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
-	IUCLC                             = 0x1000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
@@ -1041,7 +922,6 @@ const (
 	MNT_NOATIME                       = 0x8000
 	MNT_NODEV                         = 0x10
 	MNT_NOEXEC                        = 0x4
-	MNT_NOPERM                        = 0x20
 	MNT_NOSUID                        = 0x8
 	MNT_NOWAIT                        = 0x2
 	MNT_QUOTA                         = 0x2000
@@ -1049,27 +929,12 @@ const (
 	MNT_RELOAD                        = 0x40000
 	MNT_ROOTFS                        = 0x4000
 	MNT_SOFTDEP                       = 0x4000000
-	MNT_STALLED                       = 0x100000
-	MNT_SWAPPABLE                     = 0x200000
 	MNT_SYNCHRONOUS                   = 0x2
 	MNT_UPDATE                        = 0x10000
 	MNT_VISFLAGMASK                   = 0x400ffff
 	MNT_WAIT                          = 0x1
 	MNT_WANTRDWR                      = 0x2000000
 	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
 	MSG_BCAST                         = 0x100
 	MSG_CMSG_CLOEXEC                  = 0x800
 	MSG_CTRUNC                        = 0x20
@@ -1082,7 +947,6 @@ const (
 	MSG_PEEK                          = 0x2
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x4
 	MS_SYNC                           = 0x2
@@ -1090,16 +954,12 @@ const (
 	NET_RT_DUMP                       = 0x1
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
+	NET_RT_MAXID                      = 0x6
 	NET_RT_STATS                      = 0x4
 	NET_RT_TABLE                      = 0x5
 	NFDBITS                           = 0x20
 	NOFLSH                            = 0x80000000
-	NOKERNINFO                        = 0x2000000
 	NOTE_ATTRIB                       = 0x8
-	NOTE_CHANGE                       = 0x1
 	NOTE_CHILD                        = 0x4
 	NOTE_DELETE                       = 0x1
 	NOTE_EOF                          = 0x2
@@ -1109,7 +969,6 @@ const (
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
 	NOTE_PCTRLMASK                    = 0xf0000000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_RENAME                       = 0x20
@@ -1119,13 +978,11 @@ const (
 	NOTE_TRUNCATE                     = 0x80
 	NOTE_WRITE                        = 0x2
 	OCRNL                             = 0x10
-	OLCUC                             = 0x20
 	ONLCR                             = 0x2
 	ONLRET                            = 0x80
 	ONOCR                             = 0x40
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
-	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_APPEND                          = 0x8
 	O_ASYNC                           = 0x40
@@ -1170,25 +1027,19 @@ const (
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
-	RTAX_BFD                          = 0xb
 	RTAX_BRD                          = 0x7
-	RTAX_DNS                          = 0xc
 	RTAX_DST                          = 0x0
 	RTAX_GATEWAY                      = 0x1
 	RTAX_GENMASK                      = 0x3
 	RTAX_IFA                          = 0x5
 	RTAX_IFP                          = 0x4
 	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xf
+	RTAX_MAX                          = 0xb
 	RTAX_NETMASK                      = 0x2
-	RTAX_SEARCH                       = 0xe
 	RTAX_SRC                          = 0x8
 	RTAX_SRCMASK                      = 0x9
-	RTAX_STATIC                       = 0xd
 	RTA_AUTHOR                        = 0x40
-	RTA_BFD                           = 0x800
 	RTA_BRD                           = 0x80
-	RTA_DNS                           = 0x1000
 	RTA_DST                           = 0x1
 	RTA_GATEWAY                       = 0x2
 	RTA_GENMASK                       = 0x8
@@ -1196,29 +1047,24 @@ const (
 	RTA_IFP                           = 0x10
 	RTA_LABEL                         = 0x400
 	RTA_NETMASK                       = 0x4
-	RTA_SEARCH                        = 0x4000
 	RTA_SRC                           = 0x100
 	RTA_SRCMASK                       = 0x200
-	RTA_STATIC                        = 0x2000
 	RTF_ANNOUNCE                      = 0x4000
-	RTF_BFD                           = 0x1000000
 	RTF_BLACKHOLE                     = 0x1000
 	RTF_BROADCAST                     = 0x400000
-	RTF_CACHED                        = 0x20000
 	RTF_CLONED                        = 0x10000
 	RTF_CLONING                       = 0x100
-	RTF_CONNECTED                     = 0x800000
 	RTF_DONE                          = 0x40
 	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x110fc08
+	RTF_FMASK                         = 0x70f808
 	RTF_GATEWAY                       = 0x2
 	RTF_HOST                          = 0x4
 	RTF_LLINFO                        = 0x400
 	RTF_LOCAL                         = 0x200000
+	RTF_MASK                          = 0x80
 	RTF_MODIFIED                      = 0x20
 	RTF_MPATH                         = 0x40000
 	RTF_MPLS                          = 0x100000
-	RTF_MULTICAST                     = 0x200
 	RTF_PERMANENT_ARP                 = 0x2000
 	RTF_PROTO1                        = 0x8000
 	RTF_PROTO2                        = 0x4000
@@ -1227,26 +1073,23 @@ const (
 	RTF_STATIC                        = 0x800
 	RTF_UP                            = 0x1
 	RTF_USETRAILERS                   = 0x8000
-	RTM_80211INFO                     = 0x15
+	RTF_XRESOLVE                      = 0x200
 	RTM_ADD                           = 0x1
-	RTM_BFD                           = 0x12
 	RTM_CHANGE                        = 0x3
-	RTM_CHGADDRATTR                   = 0x14
 	RTM_DELADDR                       = 0xd
 	RTM_DELETE                        = 0x2
 	RTM_DESYNC                        = 0x10
 	RTM_GET                           = 0x4
 	RTM_IFANNOUNCE                    = 0xf
 	RTM_IFINFO                        = 0xe
-	RTM_INVALIDATE                    = 0x11
+	RTM_LOCK                          = 0x8
 	RTM_LOSING                        = 0x5
 	RTM_MAXSIZE                       = 0x800
 	RTM_MISS                          = 0x7
 	RTM_NEWADDR                       = 0xc
-	RTM_PROPOSAL                      = 0x13
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
+	RTM_RTTUNIT                       = 0xf4240
 	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
@@ -1256,74 +1099,67 @@ const (
 	RTV_RTTVAR                        = 0x80
 	RTV_SPIPE                         = 0x10
 	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_BITS                   = 0x8
-	RT_TABLEID_MASK                   = 0xff
 	RT_TABLEID_MAX                    = 0xff
 	RUSAGE_CHILDREN                   = -0x1
 	RUSAGE_SELF                       = 0x0
 	RUSAGE_THREAD                     = 0x1
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
 	SIOCADDMULTI                      = 0x80206931
 	SIOCAIFADDR                       = 0x8040691a
 	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
 	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8060693c
-	SIOCBRDGADDL                      = 0x80606949
-	SIOCBRDGADDS                      = 0x80606941
-	SIOCBRDGARL                       = 0x808c694d
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
 	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8060693d
-	SIOCBRDGDELS                      = 0x80606942
-	SIOCBRDGFLUSH                     = 0x80606948
-	SIOCBRDGFRL                       = 0x808c694e
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
 	SIOCBRDGGCACHE                    = 0xc0146941
 	SIOCBRDGGFD                       = 0xc0146952
 	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc060693e
+	SIOCBRDGGIFFLGS                   = 0xc054693e
 	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc0406958
+	SIOCBRDGGPARAM                    = 0xc03c6958
 	SIOCBRDGGPRI                      = 0xc0146950
 	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
 	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0606942
+	SIOCBRDGIFS                       = 0xc0546942
 	SIOCBRDGRTS                       = 0xc0186943
 	SIOCBRDGSADDR                     = 0xc1286944
 	SIOCBRDGSCACHE                    = 0x80146940
 	SIOCBRDGSFD                       = 0x80146952
 	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80606955
-	SIOCBRDGSIFFLGS                   = 0x8060693f
-	SIOCBRDGSIFPRIO                   = 0x80606954
-	SIOCBRDGSIFPROT                   = 0x8060694a
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
 	SIOCBRDGSMA                       = 0x80146953
 	SIOCBRDGSPRI                      = 0x80146950
 	SIOCBRDGSPROTO                    = 0x8014695a
 	SIOCBRDGSTO                       = 0x80146945
 	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELLABEL                      = 0x80206997
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
 	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPARENT                     = 0x802069b4
 	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDPWE3NEIGHBOR                 = 0x802069de
-	SIOCDVNETID                       = 0x802069af
+	SIOCDLIFADDR                      = 0x8218691e
 	SIOCGETKALIVE                     = 0xc01869a4
 	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETMPWCFG                     = 0xc02069ae
 	SIOCGETPFLOW                      = 0xc02069fe
 	SIOCGETPFSYNC                     = 0xc02069f8
 	SIOCGETSGCNT                      = 0xc0147534
 	SIOCGETVIFCNT                     = 0xc0147533
 	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
 	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
 	SIOCGIFBRDADDR                    = 0xc0206923
 	SIOCGIFCONF                       = 0xc0086924
 	SIOCGIFDATA                       = 0xc020691b
@@ -1332,53 +1168,41 @@ const (
 	SIOCGIFFLAGS                      = 0xc0206911
 	SIOCGIFGATTR                      = 0xc024698b
 	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGLIST                      = 0xc024698d
 	SIOCGIFGMEMB                      = 0xc024698a
 	SIOCGIFGROUP                      = 0xc0246988
 	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFLLPRIO                     = 0xc02069b6
-	SIOCGIFMEDIA                      = 0xc0386938
+	SIOCGIFMEDIA                      = 0xc0286936
 	SIOCGIFMETRIC                     = 0xc0206917
 	SIOCGIFMTU                        = 0xc020697e
 	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPAIR                       = 0xc02069b1
-	SIOCGIFPARENT                     = 0xc02069b3
+	SIOCGIFPDSTADDR                   = 0xc0206948
 	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
 	SIOCGIFRDOMAIN                    = 0xc02069a0
 	SIOCGIFRTLABEL                    = 0xc0206983
 	SIOCGIFRXR                        = 0x802069aa
-	SIOCGIFSFFPAGE                    = 0xc1126939
+	SIOCGIFTIMESLOT                   = 0xc0206986
 	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
 	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYDF                     = 0xc02069c2
-	SIOCGLIFPHYECN                    = 0xc02069c8
 	SIOCGLIFPHYRTABLE                 = 0xc02069a2
 	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
 	SIOCGPGRP                         = 0x40047309
-	SIOCGPWE3                         = 0xc0206998
-	SIOCGPWE3CTRLWORD                 = 0xc02069dc
-	SIOCGPWE3FAT                      = 0xc02069dd
-	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
 	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGTXHPRIO                      = 0xc02069c6
-	SIOCGUMBINFO                      = 0xc02069be
-	SIOCGUMBPARAM                     = 0xc02069c0
 	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETFLOWID                   = 0xc02069c4
 	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFAFATTACH                    = 0x801169ab
-	SIOCIFAFDETACH                    = 0x801169ac
 	SIOCIFCREATE                      = 0x8020697a
 	SIOCIFDESTROY                     = 0x80206979
 	SIOCIFGCLONERS                    = 0xc00c6978
 	SIOCSETKALIVE                     = 0x801869a3
 	SIOCSETLABEL                      = 0x80206999
-	SIOCSETMPWCFG                     = 0x802069ad
 	SIOCSETPFLOW                      = 0x802069fd
 	SIOCSETPFSYNC                     = 0x802069f7
 	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
 	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
 	SIOCSIFBRDADDR                    = 0x80206913
 	SIOCSIFDESCR                      = 0x80206980
 	SIOCSIFDSTADDR                    = 0x8020690e
@@ -1386,36 +1210,26 @@ const (
 	SIOCSIFGATTR                      = 0x8024698c
 	SIOCSIFGENERIC                    = 0x80206939
 	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFLLPRIO                     = 0x802069b5
-	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMEDIA                      = 0xc0206935
 	SIOCSIFMETRIC                     = 0x80206918
 	SIOCSIFMTU                        = 0x8020697f
 	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPAIR                       = 0x802069b0
-	SIOCSIFPARENT                     = 0x802069b2
+	SIOCSIFPHYADDR                    = 0x80406946
 	SIOCSIFPRIORITY                   = 0x8020699b
 	SIOCSIFRDOMAIN                    = 0x8020699f
 	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
 	SIOCSIFXFLAGS                     = 0x8020699d
 	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYDF                     = 0x802069c1
-	SIOCSLIFPHYECN                    = 0x802069c7
 	SIOCSLIFPHYRTABLE                 = 0x802069a1
 	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
-	SIOCSPWE3CTRLWORD                 = 0x802069dc
-	SIOCSPWE3FAT                      = 0x802069dd
-	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
 	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSTXHPRIO                      = 0x802069c5
-	SIOCSUMBPARAM                     = 0x802069bf
 	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETFLOWID                   = 0x802069c3
 	SIOCSVNETID                       = 0x802069a6
 	SOCK_CLOEXEC                      = 0x8000
 	SOCK_DGRAM                        = 0x2
-	SOCK_DNS                          = 0x1000
 	SOCK_NONBLOCK                     = 0x4000
 	SOCK_RAW                          = 0x3
 	SOCK_RDM                          = 0x4
@@ -1427,7 +1241,6 @@ const (
 	SO_BINDANY                        = 0x1000
 	SO_BROADCAST                      = 0x20
 	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
 	SO_DONTROUTE                      = 0x10
 	SO_ERROR                          = 0x1007
 	SO_KEEPALIVE                      = 0x8
@@ -1435,7 +1248,6 @@ const (
 	SO_NETPROC                        = 0x1020
 	SO_OOBINLINE                      = 0x100
 	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
@@ -1449,7 +1261,6 @@ const (
 	SO_TIMESTAMP                      = 0x800
 	SO_TYPE                           = 0x1008
 	SO_USELOOPBACK                    = 0x40
-	SO_ZEROIZE                        = 0x2000
 	S_BLKSIZE                         = 0x200
 	S_IEXEC                           = 0x40
 	S_IFBLK                           = 0x6000
@@ -1479,24 +1290,9 @@ const (
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
 	TCIFLUSH                          = 0x1
-	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
-	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
-	TCOOFF                            = 0x1
-	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
+	TCP_MAXBURST                      = 0x4
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
 	TCP_MAX_SACK                      = 0x3
@@ -1505,15 +1301,11 @@ const (
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
+	TCP_NSTATES                       = 0xb
 	TCP_SACK_ENABLE                   = 0x8
 	TCSAFLUSH                         = 0x2
-	TIMER_ABSTIME                     = 0x1
-	TIMER_RELTIME                     = 0x0
 	TIOCCBRK                          = 0x2000747a
 	TIOCCDTR                          = 0x20007478
-	TIOCCHKVERAUTH                    = 0x2000741e
-	TIOCCLRVERAUTH                    = 0x2000741d
 	TIOCCONS                          = 0x80047462
 	TIOCDRAIN                         = 0x2000745e
 	TIOCEXCL                          = 0x2000740d
@@ -1529,7 +1321,7 @@ const (
 	TIOCGFLAGS                        = 0x4004745d
 	TIOCGPGRP                         = 0x40047477
 	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x4010745b
+	TIOCGTSTAMP                       = 0x400c745b
 	TIOCGWINSZ                        = 0x40087468
 	TIOCMBIC                          = 0x8004746b
 	TIOCMBIS                          = 0x8004746c
@@ -1568,21 +1360,17 @@ const (
 	TIOCSETAF                         = 0x802c7416
 	TIOCSETAW                         = 0x802c7415
 	TIOCSETD                          = 0x8004741b
-	TIOCSETVERAUTH                    = 0x8004741c
 	TIOCSFLAGS                        = 0x8004745c
 	TIOCSIG                           = 0x8004745f
 	TIOCSPGRP                         = 0x80047476
 	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
 	TIOCSTOP                          = 0x2000746f
 	TIOCSTSTAMP                       = 0x8008745a
 	TIOCSWINSZ                        = 0x80087467
 	TIOCUCNTL                         = 0x80047466
-	TIOCUCNTL_CBRK                    = 0x7a
-	TIOCUCNTL_SBRK                    = 0x7b
 	TOSTOP                            = 0x400000
-	UTIME_NOW                         = -0x2
-	UTIME_OMIT                        = -0x1
 	VDISCARD                          = 0xf
 	VDSUSP                            = 0xb
 	VEOF                              = 0x0
@@ -1593,19 +1381,6 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
-	VM_ANONMIN                        = 0x7
-	VM_LOADAVG                        = 0x2
-	VM_MALLOC_CONF                    = 0xc
-	VM_MAXID                          = 0xd
-	VM_MAXSLP                         = 0xa
-	VM_METER                          = 0x1
-	VM_NKMEMPAGES                     = 0x6
-	VM_PSSTRINGS                      = 0x3
-	VM_SWAPENCRYPT                    = 0x5
-	VM_USPACE                         = 0xb
-	VM_UVMEXP                         = 0x4
-	VM_VNODEMIN                       = 0x9
-	VM_VTEXTMIN                       = 0x8
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1619,7 +1394,6 @@ const (
 	WCOREFLAG                         = 0x80
 	WNOHANG                           = 0x1
 	WUNTRACED                         = 0x2
-	XCASE                             = 0x1000000
 )
 
 // Errors
@@ -1633,7 +1407,6 @@ const (
 	EALREADY        = syscall.Errno(0x25)
 	EAUTH           = syscall.Errno(0x50)
 	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x5c)
 	EBADRPC         = syscall.Errno(0x48)
 	EBUSY           = syscall.Errno(0x10)
 	ECANCELED       = syscall.Errno(0x58)
@@ -1660,7 +1433,7 @@ const (
 	EIPSEC          = syscall.Errno(0x52)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5f)
+	ELAST           = syscall.Errno(0x5b)
 	ELOOP           = syscall.Errno(0x3e)
 	EMEDIUMTYPE     = syscall.Errno(0x56)
 	EMFILE          = syscall.Errno(0x18)
@@ -1688,14 +1461,12 @@ const (
 	ENOTCONN        = syscall.Errno(0x39)
 	ENOTDIR         = syscall.Errno(0x14)
 	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5d)
 	ENOTSOCK        = syscall.Errno(0x26)
 	ENOTSUP         = syscall.Errno(0x5b)
 	ENOTTY          = syscall.Errno(0x19)
 	ENXIO           = syscall.Errno(0x6)
 	EOPNOTSUPP      = syscall.Errno(0x2d)
 	EOVERFLOW       = syscall.Errno(0x57)
-	EOWNERDEAD      = syscall.Errno(0x5e)
 	EPERM           = syscall.Errno(0x1)
 	EPFNOSUPPORT    = syscall.Errno(0x2e)
 	EPIPE           = syscall.Errno(0x20)
@@ -1703,7 +1474,6 @@ const (
 	EPROCUNAVAIL    = syscall.Errno(0x4c)
 	EPROGMISMATCH   = syscall.Errno(0x4b)
 	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5f)
 	EPROTONOSUPPORT = syscall.Errno(0x2b)
 	EPROTOTYPE      = syscall.Errno(0x29)
 	ERANGE          = syscall.Errno(0x22)
@@ -1800,7 +1570,7 @@ var errorList = [...]struct {
 	{32, "EPIPE", "broken pipe"},
 	{33, "EDOM", "numerical argument out of domain"},
 	{34, "ERANGE", "result too large"},
-	{35, "EAGAIN", "resource temporarily unavailable"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
 	{36, "EINPROGRESS", "operation now in progress"},
 	{37, "EALREADY", "operation already in progress"},
 	{38, "ENOTSOCK", "socket operation on non-socket"},
@@ -1856,11 +1626,7 @@ var errorList = [...]struct {
 	{88, "ECANCELED", "operation canceled"},
 	{89, "EIDRM", "identifier removed"},
 	{90, "ENOMSG", "no message of desired type"},
-	{91, "ENOTSUP", "not supported"},
-	{92, "EBADMSG", "bad message"},
-	{93, "ENOTRECOVERABLE", "state not recoverable"},
-	{94, "EOWNERDEAD", "previous owner died"},
-	{95, "ELAST", "protocol error"},
+	{91, "ELAST", "not supported"},
 }
 
 // Signal table
@@ -1874,7 +1640,7 @@ var signalList = [...]struct {
 	{3, "SIGQUIT", "quit"},
 	{4, "SIGILL", "illegal instruction"},
 	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
+	{6, "SIGABRT", "abort trap"},
 	{7, "SIGEMT", "EMT trap"},
 	{8, "SIGFPE", "floating point exception"},
 	{9, "SIGKILL", "killed"},
@@ -1901,5 +1667,4 @@ var signalList = [...]struct {
 	{30, "SIGUSR1", "user defined signal 1"},
 	{31, "SIGUSR2", "user defined signal 2"},
 	{32, "SIGTHR", "thread AST"},
-	{28672, "SIGSTKSZ", "unknown signal"},
 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
index 4f4449a..90de7df 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && openbsd
+// +build arm64,openbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -111,12 +112,6 @@ const (
 	BPF_FILDROP_CAPTURE               = 0x1
 	BPF_FILDROP_DROP                  = 0x2
 	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
 	BPF_IND                           = 0x40
@@ -145,7 +140,6 @@ const (
 	BPF_OR                            = 0x40
 	BPF_RELEASE                       = 0x30bb6
 	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
 	BPF_RSH                           = 0x70
 	BPF_ST                            = 0x2
 	BPF_STX                           = 0x3
@@ -186,65 +180,7 @@ const (
 	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc110445d
-	DIOCADDRULE                       = 0xcd604404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xcd60441a
-	DIOCCLRIFFLAG                     = 0xc028445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0e04412
-	DIOCCLRSTATUS                     = 0xc0284416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1204460
-	DIOCGETQUEUE                      = 0xc110445f
-	DIOCGETQUEUES                     = 0xc110445e
-	DIOCGETRULE                       = 0xcd604407
-	DIOCGETRULES                      = 0xcd604406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0104454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0104419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0284457
-	DIOCKILLSRCNODES                  = 0xc080445b
-	DIOCKILLSTATES                    = 0xc0e04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc088444f
 	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0884450
-	DIOCRADDADDRS                     = 0xc4504443
-	DIOCRADDTABLES                    = 0xc450443d
-	DIOCRCLRADDRS                     = 0xc4504442
-	DIOCRCLRASTATS                    = 0xc4504448
-	DIOCRCLRTABLES                    = 0xc450443c
-	DIOCRCLRTSTATS                    = 0xc4504441
-	DIOCRDELADDRS                     = 0xc4504444
-	DIOCRDELTABLES                    = 0xc450443e
-	DIOCRGETADDRS                     = 0xc4504446
-	DIOCRGETASTATS                    = 0xc4504447
-	DIOCRGETTABLES                    = 0xc450443f
-	DIOCRGETTSTATS                    = 0xc4504440
-	DIOCRINADEFINE                    = 0xc450444d
-	DIOCRSETADDRS                     = 0xc4504445
-	DIOCRSETTFLAGS                    = 0xc450444a
-	DIOCRTSTADDRS                     = 0xc4504449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0284459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0284414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc0104451
-	DIOCXCOMMIT                       = 0xc0104452
-	DIOCXROLLBACK                     = 0xc0104453
 	DLT_ARCNET                        = 0x7
 	DLT_ATM_RFC1483                   = 0xb
 	DLT_AX25                          = 0x3
@@ -307,8 +243,6 @@ const (
 	EMUL_ENABLED                      = 0x1
 	EMUL_NATIVE                       = 0x2
 	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
 	ETHERMIN                          = 0x2e
 	ETHERMTU                          = 0x5dc
 	ETHERTYPE_8023                    = 0x4
@@ -361,7 +295,6 @@ const (
 	ETHERTYPE_DN                      = 0x6003
 	ETHERTYPE_DOGFIGHT                = 0x1989
 	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
 	ETHERTYPE_ECMA                    = 0x803
 	ETHERTYPE_ENCRYPT                 = 0x803d
 	ETHERTYPE_ES                      = 0x805d
@@ -393,7 +326,6 @@ const (
 	ETHERTYPE_LLDP                    = 0x88cc
 	ETHERTYPE_LOGICRAFT               = 0x8148
 	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
 	ETHERTYPE_MATRA                   = 0x807a
 	ETHERTYPE_MAX                     = 0xffff
 	ETHERTYPE_MERIT                   = 0x807c
@@ -422,16 +354,15 @@ const (
 	ETHERTYPE_NCD                     = 0x8149
 	ETHERTYPE_NESTAR                  = 0x8006
 	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
 	ETHERTYPE_NOVELL                  = 0x8138
 	ETHERTYPE_NS                      = 0x600
 	ETHERTYPE_NSAT                    = 0x601
 	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
 	ETHERTYPE_NTRAILER                = 0x10
 	ETHERTYPE_OS9                     = 0x7007
 	ETHERTYPE_OS9NET                  = 0x7009
 	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
 	ETHERTYPE_PBB                     = 0x88e7
 	ETHERTYPE_PCS                     = 0x4242
 	ETHERTYPE_PLANNING                = 0x8044
@@ -514,11 +445,10 @@ const (
 	ETHER_VLAN_ENCAP_LEN              = 0x4
 	EVFILT_AIO                        = -0x3
 	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
+	EVFILT_SYSCOUNT                   = 0x8
 	EVFILT_TIMER                      = -0x7
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
@@ -540,7 +470,7 @@ const (
 	EV_FLAG1                          = 0x2000
 	EV_ONESHOT                        = 0x10
 	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
+	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
@@ -806,7 +736,6 @@ const (
 	IFT_VOICEOVERCABLE                = 0xc6
 	IFT_VOICEOVERFRAMERELAY           = 0x99
 	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
 	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
@@ -872,11 +801,9 @@ const (
 	IPPROTO_RAW                       = 0xff
 	IPPROTO_ROUTING                   = 0x2b
 	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_TCP                       = 0x6
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
 	IPV6_AUTH_LEVEL                   = 0x35
 	IPV6_AUTOFLOWLABEL                = 0x3b
 	IPV6_CHECKSUM                     = 0x1a
@@ -983,9 +910,6 @@ const (
 	IP_TTL                            = 0x4
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
 	IUCLC                             = 0x1000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
@@ -1057,19 +981,6 @@ const (
 	MNT_WAIT                          = 0x1
 	MNT_WANTRDWR                      = 0x2000000
 	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
 	MSG_BCAST                         = 0x100
 	MSG_CMSG_CLOEXEC                  = 0x800
 	MSG_CTRUNC                        = 0x20
@@ -1082,7 +993,6 @@ const (
 	MSG_PEEK                          = 0x2
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x4
 	MS_SYNC                           = 0x2
@@ -1091,8 +1001,7 @@ const (
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
 	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
+	NET_RT_MAXID                      = 0x7
 	NET_RT_STATS                      = 0x4
 	NET_RT_TABLE                      = 0x5
 	NFDBITS                           = 0x20
@@ -1109,7 +1018,6 @@ const (
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
 	NOTE_PCTRLMASK                    = 0xf0000000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_RENAME                       = 0x20
@@ -1246,7 +1154,7 @@ const (
 	RTM_PROPOSAL                      = 0x13
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
+	RTM_RTTUNIT                       = 0xf4240
 	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
@@ -1264,9 +1172,6 @@ const (
 	RUSAGE_THREAD                     = 0x1
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
@@ -1283,30 +1188,30 @@ const (
 	SIOCBRDGDELS                      = 0x80606942
 	SIOCBRDGFLUSH                     = 0x80606948
 	SIOCBRDGFRL                       = 0x808c694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGCACHE                    = 0xc0186941
+	SIOCBRDGGFD                       = 0xc0186952
+	SIOCBRDGGHT                       = 0xc0186951
 	SIOCBRDGGIFFLGS                   = 0xc060693e
-	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGMA                       = 0xc0186953
 	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGPRI                      = 0xc0186950
 	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGGTO                       = 0xc0186946
 	SIOCBRDGIFS                       = 0xc0606942
 	SIOCBRDGRTS                       = 0xc0206943
 	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSCACHE                    = 0x80186940
+	SIOCBRDGSFD                       = 0x80186952
+	SIOCBRDGSHT                       = 0x80186951
 	SIOCBRDGSIFCOST                   = 0x80606955
 	SIOCBRDGSIFFLGS                   = 0x8060693f
 	SIOCBRDGSIFPRIO                   = 0x80606954
 	SIOCBRDGSIFPROT                   = 0x8060694a
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCBRDGSMA                       = 0x80186953
+	SIOCBRDGSPRI                      = 0x80186950
+	SIOCBRDGSPROTO                    = 0x8018695a
+	SIOCBRDGSTO                       = 0x80186945
+	SIOCBRDGSTXHC                     = 0x80186959
 	SIOCDELLABEL                      = 0x80206997
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
@@ -1359,7 +1264,6 @@ const (
 	SIOCGPWE3CTRLWORD                 = 0xc02069dc
 	SIOCGPWE3FAT                      = 0xc02069dd
 	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
 	SIOCGSPPPPARAMS                   = 0xc0206994
 	SIOCGTXHPRIO                      = 0xc02069c6
 	SIOCGUMBINFO                      = 0xc02069be
@@ -1406,13 +1310,17 @@ const (
 	SIOCSPWE3CTRLWORD                 = 0x802069dc
 	SIOCSPWE3FAT                      = 0x802069dd
 	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
 	SIOCSSPPPPARAMS                   = 0x80206993
 	SIOCSTXHPRIO                      = 0x802069c5
 	SIOCSUMBPARAM                     = 0x802069bf
 	SIOCSVH                           = 0xc02069f5
 	SIOCSVNETFLOWID                   = 0x802069c3
 	SIOCSVNETID                       = 0x802069a6
+	SIOCSWGDPID                       = 0xc018695b
+	SIOCSWGMAXFLOW                    = 0xc0186960
+	SIOCSWGMAXGROUP                   = 0xc018695d
+	SIOCSWSDPID                       = 0x8018695c
+	SIOCSWSPORTNO                     = 0xc060695f
 	SOCK_CLOEXEC                      = 0x8000
 	SOCK_DGRAM                        = 0x2
 	SOCK_DNS                          = 0x1000
@@ -1427,7 +1335,6 @@ const (
 	SO_BINDANY                        = 0x1000
 	SO_BROADCAST                      = 0x20
 	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
 	SO_DONTROUTE                      = 0x10
 	SO_ERROR                          = 0x1007
 	SO_KEEPALIVE                      = 0x8
@@ -1435,7 +1342,6 @@ const (
 	SO_NETPROC                        = 0x1020
 	SO_OOBINLINE                      = 0x100
 	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
@@ -1485,18 +1391,7 @@ const (
 	TCOFLUSH                          = 0x2
 	TCOOFF                            = 0x1
 	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
+	TCP_MAXBURST                      = 0x4
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
 	TCP_MAX_SACK                      = 0x3
@@ -1505,7 +1400,6 @@ const (
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
 	TCP_SACK_ENABLE                   = 0x8
 	TCSAFLUSH                         = 0x2
 	TIMER_ABSTIME                     = 0x1
@@ -1874,7 +1768,7 @@ var signalList = [...]struct {
 	{3, "SIGQUIT", "quit"},
 	{4, "SIGILL", "illegal instruction"},
 	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
+	{6, "SIGABRT", "abort trap"},
 	{7, "SIGEMT", "EMT trap"},
 	{8, "SIGFPE", "floating point exception"},
 	{9, "SIGKILL", "killed"},
@@ -1901,5 +1795,4 @@ var signalList = [...]struct {
 	{30, "SIGUSR1", "user defined signal 1"},
 	{31, "SIGUSR2", "user defined signal 2"},
 	{32, "SIGTHR", "thread AST"},
-	{28672, "SIGSTKSZ", "unknown signal"},
 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
index 76a363f..f1154ff 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && openbsd
+// +build mips64,openbsd
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
@@ -111,12 +112,6 @@ const (
 	BPF_FILDROP_CAPTURE               = 0x1
 	BPF_FILDROP_DROP                  = 0x2
 	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
 	BPF_IND                           = 0x40
@@ -145,7 +140,6 @@ const (
 	BPF_OR                            = 0x40
 	BPF_RELEASE                       = 0x30bb6
 	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
 	BPF_RSH                           = 0x70
 	BPF_ST                            = 0x2
 	BPF_STX                           = 0x3
@@ -307,8 +301,6 @@ const (
 	EMUL_ENABLED                      = 0x1
 	EMUL_NATIVE                       = 0x2
 	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
 	ETHERMIN                          = 0x2e
 	ETHERMTU                          = 0x5dc
 	ETHERTYPE_8023                    = 0x4
@@ -361,7 +353,6 @@ const (
 	ETHERTYPE_DN                      = 0x6003
 	ETHERTYPE_DOGFIGHT                = 0x1989
 	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
 	ETHERTYPE_ECMA                    = 0x803
 	ETHERTYPE_ENCRYPT                 = 0x803d
 	ETHERTYPE_ES                      = 0x805d
@@ -422,16 +413,15 @@ const (
 	ETHERTYPE_NCD                     = 0x8149
 	ETHERTYPE_NESTAR                  = 0x8006
 	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
 	ETHERTYPE_NOVELL                  = 0x8138
 	ETHERTYPE_NS                      = 0x600
 	ETHERTYPE_NSAT                    = 0x601
 	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
 	ETHERTYPE_NTRAILER                = 0x10
 	ETHERTYPE_OS9                     = 0x7007
 	ETHERTYPE_OS9NET                  = 0x7009
 	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
 	ETHERTYPE_PBB                     = 0x88e7
 	ETHERTYPE_PCS                     = 0x4242
 	ETHERTYPE_PLANNING                = 0x8044
@@ -514,11 +504,10 @@ const (
 	ETHER_VLAN_ENCAP_LEN              = 0x4
 	EVFILT_AIO                        = -0x3
 	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
+	EVFILT_SYSCOUNT                   = 0x8
 	EVFILT_TIMER                      = -0x7
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
@@ -540,7 +529,7 @@ const (
 	EV_FLAG1                          = 0x2000
 	EV_ONESHOT                        = 0x10
 	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
+	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
@@ -806,7 +795,6 @@ const (
 	IFT_VOICEOVERCABLE                = 0xc6
 	IFT_VOICEOVERFRAMERELAY           = 0x99
 	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
 	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
@@ -872,7 +860,6 @@ const (
 	IPPROTO_RAW                       = 0xff
 	IPPROTO_ROUTING                   = 0x2b
 	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_TCP                       = 0x6
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_UDP                       = 0x11
@@ -983,9 +970,6 @@ const (
 	IP_TTL                            = 0x4
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
 	IUCLC                             = 0x1000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
@@ -1057,19 +1041,6 @@ const (
 	MNT_WAIT                          = 0x1
 	MNT_WANTRDWR                      = 0x2000000
 	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
 	MSG_BCAST                         = 0x100
 	MSG_CMSG_CLOEXEC                  = 0x800
 	MSG_CTRUNC                        = 0x20
@@ -1082,7 +1053,6 @@ const (
 	MSG_PEEK                          = 0x2
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x4
 	MS_SYNC                           = 0x2
@@ -1091,8 +1061,7 @@ const (
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
 	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
+	NET_RT_MAXID                      = 0x7
 	NET_RT_STATS                      = 0x4
 	NET_RT_TABLE                      = 0x5
 	NFDBITS                           = 0x20
@@ -1109,7 +1078,6 @@ const (
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
 	NOTE_PCTRLMASK                    = 0xf0000000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_RENAME                       = 0x20
@@ -1246,7 +1214,7 @@ const (
 	RTM_PROPOSAL                      = 0x13
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
+	RTM_RTTUNIT                       = 0xf4240
 	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
@@ -1264,9 +1232,6 @@ const (
 	RUSAGE_THREAD                     = 0x1
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
@@ -1283,30 +1248,30 @@ const (
 	SIOCBRDGDELS                      = 0x80606942
 	SIOCBRDGFLUSH                     = 0x80606948
 	SIOCBRDGFRL                       = 0x808c694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGCACHE                    = 0xc0186941
+	SIOCBRDGGFD                       = 0xc0186952
+	SIOCBRDGGHT                       = 0xc0186951
 	SIOCBRDGGIFFLGS                   = 0xc060693e
-	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGMA                       = 0xc0186953
 	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGPRI                      = 0xc0186950
 	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGGTO                       = 0xc0186946
 	SIOCBRDGIFS                       = 0xc0606942
 	SIOCBRDGRTS                       = 0xc0206943
 	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSCACHE                    = 0x80186940
+	SIOCBRDGSFD                       = 0x80186952
+	SIOCBRDGSHT                       = 0x80186951
 	SIOCBRDGSIFCOST                   = 0x80606955
 	SIOCBRDGSIFFLGS                   = 0x8060693f
 	SIOCBRDGSIFPRIO                   = 0x80606954
 	SIOCBRDGSIFPROT                   = 0x8060694a
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCBRDGSMA                       = 0x80186953
+	SIOCBRDGSPRI                      = 0x80186950
+	SIOCBRDGSPROTO                    = 0x8018695a
+	SIOCBRDGSTO                       = 0x80186945
+	SIOCBRDGSTXHC                     = 0x80186959
 	SIOCDELLABEL                      = 0x80206997
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
@@ -1413,6 +1378,11 @@ const (
 	SIOCSVH                           = 0xc02069f5
 	SIOCSVNETFLOWID                   = 0x802069c3
 	SIOCSVNETID                       = 0x802069a6
+	SIOCSWGDPID                       = 0xc018695b
+	SIOCSWGMAXFLOW                    = 0xc0186960
+	SIOCSWGMAXGROUP                   = 0xc018695d
+	SIOCSWSDPID                       = 0x8018695c
+	SIOCSWSPORTNO                     = 0xc060695f
 	SOCK_CLOEXEC                      = 0x8000
 	SOCK_DGRAM                        = 0x2
 	SOCK_DNS                          = 0x1000
@@ -1485,18 +1455,7 @@ const (
 	TCOFLUSH                          = 0x2
 	TCOOFF                            = 0x1
 	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
+	TCP_MAXBURST                      = 0x4
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
 	TCP_MAX_SACK                      = 0x3
@@ -1874,7 +1833,7 @@ var signalList = [...]struct {
 	{3, "SIGQUIT", "quit"},
 	{4, "SIGILL", "illegal instruction"},
 	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGIOT", "abort trap"},
+	{6, "SIGABRT", "abort trap"},
 	{7, "SIGEMT", "EMT trap"},
 	{8, "SIGFPE", "floating point exception"},
 	{9, "SIGKILL", "killed"},
@@ -1901,5 +1860,4 @@ var signalList = [...]struct {
 	{30, "SIGUSR1", "user defined signal 1"},
 	{31, "SIGUSR2", "user defined signal 2"},
 	{32, "SIGTHR", "thread AST"},
-	{81920, "SIGSTKSZ", "unknown signal"},
 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go
deleted file mode 100644
index 43ca0cd..0000000
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go
+++ /dev/null
@@ -1,1904 +0,0 @@
-// mkerrors.sh -m64
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build ppc64 && openbsd
-
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ALTWERASE                         = 0x200
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc010427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80104277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_FILDROP_CAPTURE               = 0x1
-	BPF_FILDROP_DROP                  = 0x2
-	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_BOOTTIME                    = 0x6
-	CLOCK_MONOTONIC                   = 0x3
-	CLOCK_PROCESS_CPUTIME_ID          = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_THREAD_CPUTIME_ID           = 0x4
-	CLOCK_UPTIME                      = 0x5
-	CPUSTATES                         = 0x6
-	CP_IDLE                           = 0x5
-	CP_INTR                           = 0x4
-	CP_NICE                           = 0x1
-	CP_SPIN                           = 0x3
-	CP_SYS                            = 0x2
-	CP_USER                           = 0x0
-	CREAD                             = 0x800
-	CRTSCTS                           = 0x10000
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_HW                            = 0x6
-	CTL_KERN                          = 0x1
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc110445d
-	DIOCADDRULE                       = 0xcd604404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xcd60441a
-	DIOCCLRIFFLAG                     = 0xc028445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0e04412
-	DIOCCLRSTATUS                     = 0xc0284416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1204460
-	DIOCGETQUEUE                      = 0xc110445f
-	DIOCGETQUEUES                     = 0xc110445e
-	DIOCGETRULE                       = 0xcd604407
-	DIOCGETRULES                      = 0xcd604406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0104454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0104419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0284457
-	DIOCKILLSRCNODES                  = 0xc080445b
-	DIOCKILLSTATES                    = 0xc0e04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc088444f
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0884450
-	DIOCRADDADDRS                     = 0xc4504443
-	DIOCRADDTABLES                    = 0xc450443d
-	DIOCRCLRADDRS                     = 0xc4504442
-	DIOCRCLRASTATS                    = 0xc4504448
-	DIOCRCLRTABLES                    = 0xc450443c
-	DIOCRCLRTSTATS                    = 0xc4504441
-	DIOCRDELADDRS                     = 0xc4504444
-	DIOCRDELTABLES                    = 0xc450443e
-	DIOCRGETADDRS                     = 0xc4504446
-	DIOCRGETASTATS                    = 0xc4504447
-	DIOCRGETTABLES                    = 0xc450443f
-	DIOCRGETTSTATS                    = 0xc4504440
-	DIOCRINADEFINE                    = 0xc450444d
-	DIOCRSETADDRS                     = 0xc4504445
-	DIOCRSETTFLAGS                    = 0xc450444a
-	DIOCRTSTADDRS                     = 0xc4504449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0284459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0284414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc0104451
-	DIOCXCOMMIT                       = 0xc0104452
-	DIOCXROLLBACK                     = 0xc0104453
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_OPENFLOW                      = 0x10b
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_USBPCAP                       = 0xf9
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PBB                     = 0x88e7
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_HARDMTU_LEN             = 0xff9b
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EVL_ENCAPLEN                      = 0x4
-	EVL_PRIO_BITS                     = 0xd
-	EVL_PRIO_MAX                      = 0x7
-	EVL_VLID_MASK                     = 0xfff
-	EVL_VLID_MAX                      = 0xffe
-	EVL_VLID_MIN                      = 0x1
-	EVL_VLID_NULL                     = 0x0
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_ISATTY                          = 0xb
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	HW_MACHINE                        = 0x1
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_STATICARP                     = 0x20
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MBIM                          = 0xfa
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xfffffff
-	IPV6_FLOWLABEL_MASK               = 0xfffff
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MINHOPCOUNT                  = 0x41
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPDEFTTL                       = 0x25
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
-	IUCLC                             = 0x1000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	KERN_HOSTNAME                     = 0xa
-	KERN_OSRELEASE                    = 0x2
-	KERN_OSTYPE                       = 0x1
-	KERN_VERSION                      = 0x4
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_CONCEAL                       = 0x8000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0xfff7
-	MAP_HASSEMAPHORE                  = 0x0
-	MAP_INHERIT                       = 0x0
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_INHERIT_ZERO                  = 0x3
-	MAP_NOEXTEND                      = 0x0
-	MAP_NORESERVE                     = 0x0
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x0
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x4000
-	MAP_TRYFIXED                      = 0x0
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MNT_ASYNC                         = 0x40
-	MNT_DEFEXPORTED                   = 0x200
-	MNT_DELEXPORT                     = 0x20000
-	MNT_DOOMED                        = 0x8000000
-	MNT_EXPORTANON                    = 0x400
-	MNT_EXPORTED                      = 0x100
-	MNT_EXRDONLY                      = 0x80
-	MNT_FORCE                         = 0x80000
-	MNT_LAZY                          = 0x3
-	MNT_LOCAL                         = 0x1000
-	MNT_NOATIME                       = 0x8000
-	MNT_NODEV                         = 0x10
-	MNT_NOEXEC                        = 0x4
-	MNT_NOPERM                        = 0x20
-	MNT_NOSUID                        = 0x8
-	MNT_NOWAIT                        = 0x2
-	MNT_QUOTA                         = 0x2000
-	MNT_RDONLY                        = 0x1
-	MNT_RELOAD                        = 0x40000
-	MNT_ROOTFS                        = 0x4000
-	MNT_SOFTDEP                       = 0x4000000
-	MNT_STALLED                       = 0x100000
-	MNT_SWAPPABLE                     = 0x200000
-	MNT_SYNCHRONOUS                   = 0x2
-	MNT_UPDATE                        = 0x10000
-	MNT_VISFLAGMASK                   = 0x400ffff
-	MNT_WAIT                          = 0x1
-	MNT_WANTRDWR                      = 0x2000000
-	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITFORONE                    = 0x1000
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NFDBITS                           = 0x20
-	NOFLSH                            = 0x80000000
-	NOKERNINFO                        = 0x2000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHANGE                       = 0x1
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OLCUC                             = 0x20
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	OXTABS                            = 0x4
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_MEMLOCK                    = 0x6
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_NPROC                      = 0x7
-	RLIMIT_RSS                        = 0x5
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BFD                          = 0xb
-	RTAX_BRD                          = 0x7
-	RTAX_DNS                          = 0xc
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xf
-	RTAX_NETMASK                      = 0x2
-	RTAX_SEARCH                       = 0xe
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTAX_STATIC                       = 0xd
-	RTA_AUTHOR                        = 0x40
-	RTA_BFD                           = 0x800
-	RTA_BRD                           = 0x80
-	RTA_DNS                           = 0x1000
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SEARCH                        = 0x4000
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTA_STATIC                        = 0x2000
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BFD                           = 0x1000000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CACHED                        = 0x20000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_CONNECTED                     = 0x800000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x110fc08
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_MULTICAST                     = 0x200
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTM_80211INFO                     = 0x15
-	RTM_ADD                           = 0x1
-	RTM_BFD                           = 0x12
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDRATTR                   = 0x14
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_INVALIDATE                    = 0x11
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_PROPOSAL                      = 0x13
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_BITS                   = 0x8
-	RT_TABLEID_MASK                   = 0xff
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8060693c
-	SIOCBRDGADDL                      = 0x80606949
-	SIOCBRDGADDS                      = 0x80606941
-	SIOCBRDGARL                       = 0x808c694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8060693d
-	SIOCBRDGDELS                      = 0x80606942
-	SIOCBRDGFLUSH                     = 0x80606948
-	SIOCBRDGFRL                       = 0x808c694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc060693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0606942
-	SIOCBRDGRTS                       = 0xc0206943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80606955
-	SIOCBRDGSIFFLGS                   = 0x8060693f
-	SIOCBRDGSIFPRIO                   = 0x80606954
-	SIOCBRDGSIFPROT                   = 0x8060694a
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELLABEL                      = 0x80206997
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPARENT                     = 0x802069b4
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDPWE3NEIGHBOR                 = 0x802069de
-	SIOCDVNETID                       = 0x802069af
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETMPWCFG                     = 0xc02069ae
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc028698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGLIST                      = 0xc028698d
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFLLPRIO                     = 0xc02069b6
-	SIOCGIFMEDIA                      = 0xc0406938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPAIR                       = 0xc02069b1
-	SIOCGIFPARENT                     = 0xc02069b3
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFRXR                        = 0x802069aa
-	SIOCGIFSFFPAGE                    = 0xc1126939
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYDF                     = 0xc02069c2
-	SIOCGLIFPHYECN                    = 0xc02069c8
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPWE3                         = 0xc0206998
-	SIOCGPWE3CTRLWORD                 = 0xc02069dc
-	SIOCGPWE3FAT                      = 0xc02069dd
-	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGTXHPRIO                      = 0xc02069c6
-	SIOCGUMBINFO                      = 0xc02069be
-	SIOCGUMBPARAM                     = 0xc02069c0
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETFLOWID                   = 0xc02069c4
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFAFATTACH                    = 0x801169ab
-	SIOCIFAFDETACH                    = 0x801169ac
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETMPWCFG                     = 0x802069ad
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8028698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFLLPRIO                     = 0x802069b5
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPAIR                       = 0x802069b0
-	SIOCSIFPARENT                     = 0x802069b2
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYDF                     = 0x802069c1
-	SIOCSLIFPHYECN                    = 0x802069c7
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSPGRP                         = 0x80047308
-	SIOCSPWE3CTRLWORD                 = 0x802069dc
-	SIOCSPWE3FAT                      = 0x802069dd
-	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSTXHPRIO                      = 0x802069c5
-	SIOCSUMBPARAM                     = 0x802069bf
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETFLOWID                   = 0x802069c3
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_CLOEXEC                      = 0x8000
-	SOCK_DGRAM                        = 0x2
-	SOCK_DNS                          = 0x1000
-	SOCK_NONBLOCK                     = 0x4000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_ZEROIZE                        = 0x2000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFF                            = 0x3
-	TCIOFLUSH                         = 0x3
-	TCION                             = 0x4
-	TCOFLUSH                          = 0x2
-	TCOOFF                            = 0x1
-	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIMER_ABSTIME                     = 0x1
-	TIMER_RELTIME                     = 0x0
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCHKVERAUTH                    = 0x2000741e
-	TIOCCLRVERAUTH                    = 0x2000741d
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x4010745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSETVERAUTH                    = 0x8004741c
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCUCNTL_CBRK                    = 0x7a
-	TIOCUCNTL_SBRK                    = 0x7b
-	TOSTOP                            = 0x400000
-	UTIME_NOW                         = -0x2
-	UTIME_OMIT                        = -0x1
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VM_ANONMIN                        = 0x7
-	VM_LOADAVG                        = 0x2
-	VM_MALLOC_CONF                    = 0xc
-	VM_MAXID                          = 0xd
-	VM_MAXSLP                         = 0xa
-	VM_METER                          = 0x1
-	VM_NKMEMPAGES                     = 0x6
-	VM_PSSTRINGS                      = 0x3
-	VM_SWAPENCRYPT                    = 0x5
-	VM_USPACE                         = 0xb
-	VM_UVMEXP                         = 0x4
-	VM_VNODEMIN                       = 0x9
-	VM_VTEXTMIN                       = 0x8
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WUNTRACED                         = 0x2
-	XCASE                             = 0x1000000
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x5c)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5f)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5d)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EOWNERDEAD      = syscall.Errno(0x5e)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5f)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errorList = [...]struct {
-	num  syscall.Errno
-	name string
-	desc string
-}{
-	{1, "EPERM", "operation not permitted"},
-	{2, "ENOENT", "no such file or directory"},
-	{3, "ESRCH", "no such process"},
-	{4, "EINTR", "interrupted system call"},
-	{5, "EIO", "input/output error"},
-	{6, "ENXIO", "device not configured"},
-	{7, "E2BIG", "argument list too long"},
-	{8, "ENOEXEC", "exec format error"},
-	{9, "EBADF", "bad file descriptor"},
-	{10, "ECHILD", "no child processes"},
-	{11, "EDEADLK", "resource deadlock avoided"},
-	{12, "ENOMEM", "cannot allocate memory"},
-	{13, "EACCES", "permission denied"},
-	{14, "EFAULT", "bad address"},
-	{15, "ENOTBLK", "block device required"},
-	{16, "EBUSY", "device busy"},
-	{17, "EEXIST", "file exists"},
-	{18, "EXDEV", "cross-device link"},
-	{19, "ENODEV", "operation not supported by device"},
-	{20, "ENOTDIR", "not a directory"},
-	{21, "EISDIR", "is a directory"},
-	{22, "EINVAL", "invalid argument"},
-	{23, "ENFILE", "too many open files in system"},
-	{24, "EMFILE", "too many open files"},
-	{25, "ENOTTY", "inappropriate ioctl for device"},
-	{26, "ETXTBSY", "text file busy"},
-	{27, "EFBIG", "file too large"},
-	{28, "ENOSPC", "no space left on device"},
-	{29, "ESPIPE", "illegal seek"},
-	{30, "EROFS", "read-only file system"},
-	{31, "EMLINK", "too many links"},
-	{32, "EPIPE", "broken pipe"},
-	{33, "EDOM", "numerical argument out of domain"},
-	{34, "ERANGE", "result too large"},
-	{35, "EAGAIN", "resource temporarily unavailable"},
-	{36, "EINPROGRESS", "operation now in progress"},
-	{37, "EALREADY", "operation already in progress"},
-	{38, "ENOTSOCK", "socket operation on non-socket"},
-	{39, "EDESTADDRREQ", "destination address required"},
-	{40, "EMSGSIZE", "message too long"},
-	{41, "EPROTOTYPE", "protocol wrong type for socket"},
-	{42, "ENOPROTOOPT", "protocol not available"},
-	{43, "EPROTONOSUPPORT", "protocol not supported"},
-	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
-	{45, "EOPNOTSUPP", "operation not supported"},
-	{46, "EPFNOSUPPORT", "protocol family not supported"},
-	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
-	{48, "EADDRINUSE", "address already in use"},
-	{49, "EADDRNOTAVAIL", "can't assign requested address"},
-	{50, "ENETDOWN", "network is down"},
-	{51, "ENETUNREACH", "network is unreachable"},
-	{52, "ENETRESET", "network dropped connection on reset"},
-	{53, "ECONNABORTED", "software caused connection abort"},
-	{54, "ECONNRESET", "connection reset by peer"},
-	{55, "ENOBUFS", "no buffer space available"},
-	{56, "EISCONN", "socket is already connected"},
-	{57, "ENOTCONN", "socket is not connected"},
-	{58, "ESHUTDOWN", "can't send after socket shutdown"},
-	{59, "ETOOMANYREFS", "too many references: can't splice"},
-	{60, "ETIMEDOUT", "operation timed out"},
-	{61, "ECONNREFUSED", "connection refused"},
-	{62, "ELOOP", "too many levels of symbolic links"},
-	{63, "ENAMETOOLONG", "file name too long"},
-	{64, "EHOSTDOWN", "host is down"},
-	{65, "EHOSTUNREACH", "no route to host"},
-	{66, "ENOTEMPTY", "directory not empty"},
-	{67, "EPROCLIM", "too many processes"},
-	{68, "EUSERS", "too many users"},
-	{69, "EDQUOT", "disk quota exceeded"},
-	{70, "ESTALE", "stale NFS file handle"},
-	{71, "EREMOTE", "too many levels of remote in path"},
-	{72, "EBADRPC", "RPC struct is bad"},
-	{73, "ERPCMISMATCH", "RPC version wrong"},
-	{74, "EPROGUNAVAIL", "RPC program not available"},
-	{75, "EPROGMISMATCH", "program version wrong"},
-	{76, "EPROCUNAVAIL", "bad procedure for program"},
-	{77, "ENOLCK", "no locks available"},
-	{78, "ENOSYS", "function not implemented"},
-	{79, "EFTYPE", "inappropriate file type or format"},
-	{80, "EAUTH", "authentication error"},
-	{81, "ENEEDAUTH", "need authenticator"},
-	{82, "EIPSEC", "IPsec processing failure"},
-	{83, "ENOATTR", "attribute not found"},
-	{84, "EILSEQ", "illegal byte sequence"},
-	{85, "ENOMEDIUM", "no medium found"},
-	{86, "EMEDIUMTYPE", "wrong medium type"},
-	{87, "EOVERFLOW", "value too large to be stored in data type"},
-	{88, "ECANCELED", "operation canceled"},
-	{89, "EIDRM", "identifier removed"},
-	{90, "ENOMSG", "no message of desired type"},
-	{91, "ENOTSUP", "not supported"},
-	{92, "EBADMSG", "bad message"},
-	{93, "ENOTRECOVERABLE", "state not recoverable"},
-	{94, "EOWNERDEAD", "previous owner died"},
-	{95, "ELAST", "protocol error"},
-}
-
-// Signal table
-var signalList = [...]struct {
-	num  syscall.Signal
-	name string
-	desc string
-}{
-	{1, "SIGHUP", "hangup"},
-	{2, "SIGINT", "interrupt"},
-	{3, "SIGQUIT", "quit"},
-	{4, "SIGILL", "illegal instruction"},
-	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGABRT", "abort trap"},
-	{7, "SIGEMT", "EMT trap"},
-	{8, "SIGFPE", "floating point exception"},
-	{9, "SIGKILL", "killed"},
-	{10, "SIGBUS", "bus error"},
-	{11, "SIGSEGV", "segmentation fault"},
-	{12, "SIGSYS", "bad system call"},
-	{13, "SIGPIPE", "broken pipe"},
-	{14, "SIGALRM", "alarm clock"},
-	{15, "SIGTERM", "terminated"},
-	{16, "SIGURG", "urgent I/O condition"},
-	{17, "SIGSTOP", "suspended (signal)"},
-	{18, "SIGTSTP", "suspended"},
-	{19, "SIGCONT", "continued"},
-	{20, "SIGCHLD", "child exited"},
-	{21, "SIGTTIN", "stopped (tty input)"},
-	{22, "SIGTTOU", "stopped (tty output)"},
-	{23, "SIGIO", "I/O possible"},
-	{24, "SIGXCPU", "cputime limit exceeded"},
-	{25, "SIGXFSZ", "filesize limit exceeded"},
-	{26, "SIGVTALRM", "virtual timer expired"},
-	{27, "SIGPROF", "profiling timer expired"},
-	{28, "SIGWINCH", "window size changes"},
-	{29, "SIGINFO", "information request"},
-	{30, "SIGUSR1", "user defined signal 1"},
-	{31, "SIGUSR2", "user defined signal 2"},
-	{32, "SIGTHR", "thread AST"},
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go
deleted file mode 100644
index b1b8bb2..0000000
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go
+++ /dev/null
@@ -1,1903 +0,0 @@
-// mkerrors.sh -m64
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && openbsd
-
-// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ALTWERASE                         = 0x200
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc010427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80104277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_FILDROP_CAPTURE               = 0x1
-	BPF_FILDROP_DROP                  = 0x2
-	BPF_FILDROP_PASS                  = 0x0
-	BPF_F_DIR_IN                      = 0x10
-	BPF_F_DIR_MASK                    = 0x30
-	BPF_F_DIR_OUT                     = 0x20
-	BPF_F_DIR_SHIFT                   = 0x4
-	BPF_F_FLOWID                      = 0x8
-	BPF_F_PRI_MASK                    = 0x7
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RND                           = 0xc0
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_BOOTTIME                    = 0x6
-	CLOCK_MONOTONIC                   = 0x3
-	CLOCK_PROCESS_CPUTIME_ID          = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_THREAD_CPUTIME_ID           = 0x4
-	CLOCK_UPTIME                      = 0x5
-	CPUSTATES                         = 0x6
-	CP_IDLE                           = 0x5
-	CP_INTR                           = 0x4
-	CP_NICE                           = 0x1
-	CP_SPIN                           = 0x3
-	CP_SYS                            = 0x2
-	CP_USER                           = 0x0
-	CREAD                             = 0x800
-	CRTSCTS                           = 0x10000
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_HW                            = 0x6
-	CTL_KERN                          = 0x1
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCADDQUEUE                      = 0xc110445d
-	DIOCADDRULE                       = 0xcd604404
-	DIOCADDSTATE                      = 0xc1084425
-	DIOCCHANGERULE                    = 0xcd60441a
-	DIOCCLRIFFLAG                     = 0xc028445a
-	DIOCCLRSRCNODES                   = 0x20004455
-	DIOCCLRSTATES                     = 0xc0e04412
-	DIOCCLRSTATUS                     = 0xc0284416
-	DIOCGETLIMIT                      = 0xc0084427
-	DIOCGETQSTATS                     = 0xc1204460
-	DIOCGETQUEUE                      = 0xc110445f
-	DIOCGETQUEUES                     = 0xc110445e
-	DIOCGETRULE                       = 0xcd604407
-	DIOCGETRULES                      = 0xcd604406
-	DIOCGETRULESET                    = 0xc444443b
-	DIOCGETRULESETS                   = 0xc444443a
-	DIOCGETSRCNODES                   = 0xc0104454
-	DIOCGETSTATE                      = 0xc1084413
-	DIOCGETSTATES                     = 0xc0104419
-	DIOCGETSTATUS                     = 0xc1e84415
-	DIOCGETSYNFLWATS                  = 0xc0084463
-	DIOCGETTIMEOUT                    = 0xc008441e
-	DIOCIGETIFACES                    = 0xc0284457
-	DIOCKILLSRCNODES                  = 0xc080445b
-	DIOCKILLSTATES                    = 0xc0e04429
-	DIOCNATLOOK                       = 0xc0504417
-	DIOCOSFPADD                       = 0xc088444f
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DIOCOSFPGET                       = 0xc0884450
-	DIOCRADDADDRS                     = 0xc4504443
-	DIOCRADDTABLES                    = 0xc450443d
-	DIOCRCLRADDRS                     = 0xc4504442
-	DIOCRCLRASTATS                    = 0xc4504448
-	DIOCRCLRTABLES                    = 0xc450443c
-	DIOCRCLRTSTATS                    = 0xc4504441
-	DIOCRDELADDRS                     = 0xc4504444
-	DIOCRDELTABLES                    = 0xc450443e
-	DIOCRGETADDRS                     = 0xc4504446
-	DIOCRGETASTATS                    = 0xc4504447
-	DIOCRGETTABLES                    = 0xc450443f
-	DIOCRGETTSTATS                    = 0xc4504440
-	DIOCRINADEFINE                    = 0xc450444d
-	DIOCRSETADDRS                     = 0xc4504445
-	DIOCRSETTFLAGS                    = 0xc450444a
-	DIOCRTSTADDRS                     = 0xc4504449
-	DIOCSETDEBUG                      = 0xc0044418
-	DIOCSETHOSTID                     = 0xc0044456
-	DIOCSETIFFLAG                     = 0xc0284459
-	DIOCSETLIMIT                      = 0xc0084428
-	DIOCSETREASS                      = 0xc004445c
-	DIOCSETSTATUSIF                   = 0xc0284414
-	DIOCSETSYNCOOKIES                 = 0xc0014462
-	DIOCSETSYNFLWATS                  = 0xc0084461
-	DIOCSETTIMEOUT                    = 0xc008441d
-	DIOCSTART                         = 0x20004401
-	DIOCSTOP                          = 0x20004402
-	DIOCXBEGIN                        = 0xc0104451
-	DIOCXCOMMIT                       = 0xc0104452
-	DIOCXROLLBACK                     = 0xc0104453
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_OPENFLOW                      = 0x10b
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_USBPCAP                       = 0xf9
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETH64_8021_RSVD_MASK              = 0xfffffffffff0
-	ETH64_8021_RSVD_PREFIX            = 0x180c2000000
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_EAPOL                   = 0x888e
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MACSEC                  = 0x88e5
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NHRP                    = 0x2001
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NSH                     = 0x984f
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PBB                     = 0x88e7
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_HARDMTU_LEN             = 0xff9b
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_DEVICE                     = -0x8
-	EVFILT_EXCEPT                     = -0x9
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x9
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EVL_ENCAPLEN                      = 0x4
-	EVL_PRIO_BITS                     = 0xd
-	EVL_PRIO_MAX                      = 0x7
-	EVL_VLID_MASK                     = 0xfff
-	EVL_VLID_MAX                      = 0xffe
-	EVL_VLID_MIN                      = 0x1
-	EVL_VLID_NULL                     = 0x0
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf800
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_ISATTY                          = 0xb
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	HW_MACHINE                        = 0x1
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_STATICARP                     = 0x20
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MBIM                          = 0xfa
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_WIREGUARD                     = 0xfb
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MINHOPCOUNT                  = 0x41
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPDEFTTL                       = 0x25
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	ITIMER_PROF                       = 0x2
-	ITIMER_REAL                       = 0x0
-	ITIMER_VIRTUAL                    = 0x1
-	IUCLC                             = 0x1000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	KERN_HOSTNAME                     = 0xa
-	KERN_OSRELEASE                    = 0x2
-	KERN_OSTYPE                       = 0x1
-	KERN_VERSION                      = 0x4
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_CONCEAL                       = 0x8000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0xfff7
-	MAP_HASSEMAPHORE                  = 0x0
-	MAP_INHERIT                       = 0x0
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_INHERIT_ZERO                  = 0x3
-	MAP_NOEXTEND                      = 0x0
-	MAP_NORESERVE                     = 0x0
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x0
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x4000
-	MAP_TRYFIXED                      = 0x0
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MNT_ASYNC                         = 0x40
-	MNT_DEFEXPORTED                   = 0x200
-	MNT_DELEXPORT                     = 0x20000
-	MNT_DOOMED                        = 0x8000000
-	MNT_EXPORTANON                    = 0x400
-	MNT_EXPORTED                      = 0x100
-	MNT_EXRDONLY                      = 0x80
-	MNT_FORCE                         = 0x80000
-	MNT_LAZY                          = 0x3
-	MNT_LOCAL                         = 0x1000
-	MNT_NOATIME                       = 0x8000
-	MNT_NODEV                         = 0x10
-	MNT_NOEXEC                        = 0x4
-	MNT_NOPERM                        = 0x20
-	MNT_NOSUID                        = 0x8
-	MNT_NOWAIT                        = 0x2
-	MNT_QUOTA                         = 0x2000
-	MNT_RDONLY                        = 0x1
-	MNT_RELOAD                        = 0x40000
-	MNT_ROOTFS                        = 0x4000
-	MNT_SOFTDEP                       = 0x4000000
-	MNT_STALLED                       = 0x100000
-	MNT_SWAPPABLE                     = 0x200000
-	MNT_SYNCHRONOUS                   = 0x2
-	MNT_UPDATE                        = 0x10000
-	MNT_VISFLAGMASK                   = 0x400ffff
-	MNT_WAIT                          = 0x1
-	MNT_WANTRDWR                      = 0x2000000
-	MNT_WXALLOWED                     = 0x800
-	MOUNT_AFS                         = "afs"
-	MOUNT_CD9660                      = "cd9660"
-	MOUNT_EXT2FS                      = "ext2fs"
-	MOUNT_FFS                         = "ffs"
-	MOUNT_FUSEFS                      = "fuse"
-	MOUNT_MFS                         = "mfs"
-	MOUNT_MSDOS                       = "msdos"
-	MOUNT_NCPFS                       = "ncpfs"
-	MOUNT_NFS                         = "nfs"
-	MOUNT_NTFS                        = "ntfs"
-	MOUNT_TMPFS                       = "tmpfs"
-	MOUNT_UDF                         = "udf"
-	MOUNT_UFS                         = "ffs"
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFNAMES                    = 0x6
-	NET_RT_MAXID                      = 0x8
-	NET_RT_SOURCE                     = 0x7
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NFDBITS                           = 0x20
-	NOFLSH                            = 0x80000000
-	NOKERNINFO                        = 0x2000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHANGE                       = 0x1
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x4
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OLCUC                             = 0x20
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	OXTABS                            = 0x4
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_MEMLOCK                    = 0x6
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_NPROC                      = 0x7
-	RLIMIT_RSS                        = 0x5
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BFD                          = 0xb
-	RTAX_BRD                          = 0x7
-	RTAX_DNS                          = 0xc
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xf
-	RTAX_NETMASK                      = 0x2
-	RTAX_SEARCH                       = 0xe
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTAX_STATIC                       = 0xd
-	RTA_AUTHOR                        = 0x40
-	RTA_BFD                           = 0x800
-	RTA_BRD                           = 0x80
-	RTA_DNS                           = 0x1000
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SEARCH                        = 0x4000
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTA_STATIC                        = 0x2000
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BFD                           = 0x1000000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CACHED                        = 0x20000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_CONNECTED                     = 0x800000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x110fc08
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_MULTICAST                     = 0x200
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTM_80211INFO                     = 0x15
-	RTM_ADD                           = 0x1
-	RTM_BFD                           = 0x12
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDRATTR                   = 0x14
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_INVALIDATE                    = 0x11
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_PROPOSAL                      = 0x13
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_SOURCE                        = 0x16
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_BITS                   = 0x8
-	RT_TABLEID_MASK                   = 0xff
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SEEK_CUR                          = 0x1
-	SEEK_END                          = 0x2
-	SEEK_SET                          = 0x0
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8060693c
-	SIOCBRDGADDL                      = 0x80606949
-	SIOCBRDGADDS                      = 0x80606941
-	SIOCBRDGARL                       = 0x808c694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8060693d
-	SIOCBRDGDELS                      = 0x80606942
-	SIOCBRDGFLUSH                     = 0x80606948
-	SIOCBRDGFRL                       = 0x808c694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc060693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0606942
-	SIOCBRDGRTS                       = 0xc0206943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80606955
-	SIOCBRDGSIFFLGS                   = 0x8060693f
-	SIOCBRDGSIFPRIO                   = 0x80606954
-	SIOCBRDGSIFPROT                   = 0x8060694a
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELLABEL                      = 0x80206997
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPARENT                     = 0x802069b4
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDPWE3NEIGHBOR                 = 0x802069de
-	SIOCDVNETID                       = 0x802069af
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETMPWCFG                     = 0xc02069ae
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc028698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGLIST                      = 0xc028698d
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFLLPRIO                     = 0xc02069b6
-	SIOCGIFMEDIA                      = 0xc0406938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPAIR                       = 0xc02069b1
-	SIOCGIFPARENT                     = 0xc02069b3
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFRXR                        = 0x802069aa
-	SIOCGIFSFFPAGE                    = 0xc1126939
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYDF                     = 0xc02069c2
-	SIOCGLIFPHYECN                    = 0xc02069c8
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPWE3                         = 0xc0206998
-	SIOCGPWE3CTRLWORD                 = 0xc02069dc
-	SIOCGPWE3FAT                      = 0xc02069dd
-	SIOCGPWE3NEIGHBOR                 = 0xc21869de
-	SIOCGRXHPRIO                      = 0xc02069db
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGTXHPRIO                      = 0xc02069c6
-	SIOCGUMBINFO                      = 0xc02069be
-	SIOCGUMBPARAM                     = 0xc02069c0
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETFLOWID                   = 0xc02069c4
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFAFATTACH                    = 0x801169ab
-	SIOCIFAFDETACH                    = 0x801169ac
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETMPWCFG                     = 0x802069ad
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8028698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFLLPRIO                     = 0x802069b5
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPAIR                       = 0x802069b0
-	SIOCSIFPARENT                     = 0x802069b2
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYDF                     = 0x802069c1
-	SIOCSLIFPHYECN                    = 0x802069c7
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSPGRP                         = 0x80047308
-	SIOCSPWE3CTRLWORD                 = 0x802069dc
-	SIOCSPWE3FAT                      = 0x802069dd
-	SIOCSPWE3NEIGHBOR                 = 0x821869de
-	SIOCSRXHPRIO                      = 0x802069db
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSTXHPRIO                      = 0x802069c5
-	SIOCSUMBPARAM                     = 0x802069bf
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETFLOWID                   = 0x802069c3
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_CLOEXEC                      = 0x8000
-	SOCK_DGRAM                        = 0x2
-	SOCK_DNS                          = 0x1000
-	SOCK_NONBLOCK                     = 0x4000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DOMAIN                         = 0x1024
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_PROTOCOL                       = 0x1025
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_ZEROIZE                        = 0x2000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFF                            = 0x3
-	TCIOFLUSH                         = 0x3
-	TCION                             = 0x4
-	TCOFLUSH                          = 0x2
-	TCOOFF                            = 0x1
-	TCOON                             = 0x2
-	TCPOPT_EOL                        = 0x0
-	TCPOPT_MAXSEG                     = 0x2
-	TCPOPT_NOP                        = 0x1
-	TCPOPT_SACK                       = 0x5
-	TCPOPT_SACK_HDR                   = 0x1010500
-	TCPOPT_SACK_PERMITTED             = 0x4
-	TCPOPT_SACK_PERMIT_HDR            = 0x1010402
-	TCPOPT_SIGNATURE                  = 0x13
-	TCPOPT_TIMESTAMP                  = 0x8
-	TCPOPT_TSTAMP_HDR                 = 0x101080a
-	TCPOPT_WINDOW                     = 0x3
-	TCP_INFO                          = 0x9
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_SACKHOLE_LIMIT                = 0x80
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIMER_ABSTIME                     = 0x1
-	TIMER_RELTIME                     = 0x0
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCHKVERAUTH                    = 0x2000741e
-	TIOCCLRVERAUTH                    = 0x2000741d
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x4010745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSETVERAUTH                    = 0x8004741c
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCUCNTL_CBRK                    = 0x7a
-	TIOCUCNTL_SBRK                    = 0x7b
-	TOSTOP                            = 0x400000
-	UTIME_NOW                         = -0x2
-	UTIME_OMIT                        = -0x1
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VM_ANONMIN                        = 0x7
-	VM_LOADAVG                        = 0x2
-	VM_MALLOC_CONF                    = 0xc
-	VM_MAXID                          = 0xd
-	VM_MAXSLP                         = 0xa
-	VM_METER                          = 0x1
-	VM_NKMEMPAGES                     = 0x6
-	VM_PSSTRINGS                      = 0x3
-	VM_SWAPENCRYPT                    = 0x5
-	VM_USPACE                         = 0xb
-	VM_UVMEXP                         = 0x4
-	VM_VNODEMIN                       = 0x9
-	VM_VTEXTMIN                       = 0x8
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WUNTRACED                         = 0x2
-	XCASE                             = 0x1000000
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x5c)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5f)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5d)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EOWNERDEAD      = syscall.Errno(0x5e)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5f)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errorList = [...]struct {
-	num  syscall.Errno
-	name string
-	desc string
-}{
-	{1, "EPERM", "operation not permitted"},
-	{2, "ENOENT", "no such file or directory"},
-	{3, "ESRCH", "no such process"},
-	{4, "EINTR", "interrupted system call"},
-	{5, "EIO", "input/output error"},
-	{6, "ENXIO", "device not configured"},
-	{7, "E2BIG", "argument list too long"},
-	{8, "ENOEXEC", "exec format error"},
-	{9, "EBADF", "bad file descriptor"},
-	{10, "ECHILD", "no child processes"},
-	{11, "EDEADLK", "resource deadlock avoided"},
-	{12, "ENOMEM", "cannot allocate memory"},
-	{13, "EACCES", "permission denied"},
-	{14, "EFAULT", "bad address"},
-	{15, "ENOTBLK", "block device required"},
-	{16, "EBUSY", "device busy"},
-	{17, "EEXIST", "file exists"},
-	{18, "EXDEV", "cross-device link"},
-	{19, "ENODEV", "operation not supported by device"},
-	{20, "ENOTDIR", "not a directory"},
-	{21, "EISDIR", "is a directory"},
-	{22, "EINVAL", "invalid argument"},
-	{23, "ENFILE", "too many open files in system"},
-	{24, "EMFILE", "too many open files"},
-	{25, "ENOTTY", "inappropriate ioctl for device"},
-	{26, "ETXTBSY", "text file busy"},
-	{27, "EFBIG", "file too large"},
-	{28, "ENOSPC", "no space left on device"},
-	{29, "ESPIPE", "illegal seek"},
-	{30, "EROFS", "read-only file system"},
-	{31, "EMLINK", "too many links"},
-	{32, "EPIPE", "broken pipe"},
-	{33, "EDOM", "numerical argument out of domain"},
-	{34, "ERANGE", "result too large"},
-	{35, "EAGAIN", "resource temporarily unavailable"},
-	{36, "EINPROGRESS", "operation now in progress"},
-	{37, "EALREADY", "operation already in progress"},
-	{38, "ENOTSOCK", "socket operation on non-socket"},
-	{39, "EDESTADDRREQ", "destination address required"},
-	{40, "EMSGSIZE", "message too long"},
-	{41, "EPROTOTYPE", "protocol wrong type for socket"},
-	{42, "ENOPROTOOPT", "protocol not available"},
-	{43, "EPROTONOSUPPORT", "protocol not supported"},
-	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
-	{45, "EOPNOTSUPP", "operation not supported"},
-	{46, "EPFNOSUPPORT", "protocol family not supported"},
-	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
-	{48, "EADDRINUSE", "address already in use"},
-	{49, "EADDRNOTAVAIL", "can't assign requested address"},
-	{50, "ENETDOWN", "network is down"},
-	{51, "ENETUNREACH", "network is unreachable"},
-	{52, "ENETRESET", "network dropped connection on reset"},
-	{53, "ECONNABORTED", "software caused connection abort"},
-	{54, "ECONNRESET", "connection reset by peer"},
-	{55, "ENOBUFS", "no buffer space available"},
-	{56, "EISCONN", "socket is already connected"},
-	{57, "ENOTCONN", "socket is not connected"},
-	{58, "ESHUTDOWN", "can't send after socket shutdown"},
-	{59, "ETOOMANYREFS", "too many references: can't splice"},
-	{60, "ETIMEDOUT", "operation timed out"},
-	{61, "ECONNREFUSED", "connection refused"},
-	{62, "ELOOP", "too many levels of symbolic links"},
-	{63, "ENAMETOOLONG", "file name too long"},
-	{64, "EHOSTDOWN", "host is down"},
-	{65, "EHOSTUNREACH", "no route to host"},
-	{66, "ENOTEMPTY", "directory not empty"},
-	{67, "EPROCLIM", "too many processes"},
-	{68, "EUSERS", "too many users"},
-	{69, "EDQUOT", "disk quota exceeded"},
-	{70, "ESTALE", "stale NFS file handle"},
-	{71, "EREMOTE", "too many levels of remote in path"},
-	{72, "EBADRPC", "RPC struct is bad"},
-	{73, "ERPCMISMATCH", "RPC version wrong"},
-	{74, "EPROGUNAVAIL", "RPC program not available"},
-	{75, "EPROGMISMATCH", "program version wrong"},
-	{76, "EPROCUNAVAIL", "bad procedure for program"},
-	{77, "ENOLCK", "no locks available"},
-	{78, "ENOSYS", "function not implemented"},
-	{79, "EFTYPE", "inappropriate file type or format"},
-	{80, "EAUTH", "authentication error"},
-	{81, "ENEEDAUTH", "need authenticator"},
-	{82, "EIPSEC", "IPsec processing failure"},
-	{83, "ENOATTR", "attribute not found"},
-	{84, "EILSEQ", "illegal byte sequence"},
-	{85, "ENOMEDIUM", "no medium found"},
-	{86, "EMEDIUMTYPE", "wrong medium type"},
-	{87, "EOVERFLOW", "value too large to be stored in data type"},
-	{88, "ECANCELED", "operation canceled"},
-	{89, "EIDRM", "identifier removed"},
-	{90, "ENOMSG", "no message of desired type"},
-	{91, "ENOTSUP", "not supported"},
-	{92, "EBADMSG", "bad message"},
-	{93, "ENOTRECOVERABLE", "state not recoverable"},
-	{94, "EOWNERDEAD", "previous owner died"},
-	{95, "ELAST", "protocol error"},
-}
-
-// Signal table
-var signalList = [...]struct {
-	num  syscall.Signal
-	name string
-	desc string
-}{
-	{1, "SIGHUP", "hangup"},
-	{2, "SIGINT", "interrupt"},
-	{3, "SIGQUIT", "quit"},
-	{4, "SIGILL", "illegal instruction"},
-	{5, "SIGTRAP", "trace/BPT trap"},
-	{6, "SIGABRT", "abort trap"},
-	{7, "SIGEMT", "EMT trap"},
-	{8, "SIGFPE", "floating point exception"},
-	{9, "SIGKILL", "killed"},
-	{10, "SIGBUS", "bus error"},
-	{11, "SIGSEGV", "segmentation fault"},
-	{12, "SIGSYS", "bad system call"},
-	{13, "SIGPIPE", "broken pipe"},
-	{14, "SIGALRM", "alarm clock"},
-	{15, "SIGTERM", "terminated"},
-	{16, "SIGURG", "urgent I/O condition"},
-	{17, "SIGSTOP", "suspended (signal)"},
-	{18, "SIGTSTP", "suspended"},
-	{19, "SIGCONT", "continued"},
-	{20, "SIGCHLD", "child exited"},
-	{21, "SIGTTIN", "stopped (tty input)"},
-	{22, "SIGTTOU", "stopped (tty output)"},
-	{23, "SIGIO", "I/O possible"},
-	{24, "SIGXCPU", "cputime limit exceeded"},
-	{25, "SIGXFSZ", "filesize limit exceeded"},
-	{26, "SIGVTALRM", "virtual timer expired"},
-	{27, "SIGPROF", "profiling timer expired"},
-	{28, "SIGWINCH", "window size changes"},
-	{29, "SIGINFO", "information request"},
-	{30, "SIGUSR1", "user defined signal 1"},
-	{31, "SIGUSR2", "user defined signal 2"},
-	{32, "SIGTHR", "thread AST"},
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
index d2ddd31..1afee6a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs -- -m64 _const.go
diff --git a/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go
index 1ec2b14..fc7d050 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 // Hand edited based on zerrors_linux_s390x.go
 // TODO: auto-generate.
@@ -10,99 +11,41 @@
 package unix
 
 const (
-	BRKINT                   = 0x0001
-	CLOCAL                   = 0x1
-	CLOCK_MONOTONIC          = 0x1
-	CLOCK_PROCESS_CPUTIME_ID = 0x2
-	CLOCK_REALTIME           = 0x0
-	CLOCK_THREAD_CPUTIME_ID  = 0x3
-	CLONE_NEWIPC             = 0x08000000
-	CLONE_NEWNET             = 0x40000000
-	CLONE_NEWNS              = 0x00020000
-	CLONE_NEWPID             = 0x20000000
-	CLONE_NEWUTS             = 0x04000000
-	CLONE_PARENT             = 0x00008000
-	CS8                      = 0x0030
-	CSIZE                    = 0x0030
-	ECHO                     = 0x00000008
-	ECHONL                   = 0x00000001
-	EFD_SEMAPHORE            = 0x00002000
-	EFD_CLOEXEC              = 0x00001000
-	EFD_NONBLOCK             = 0x00000004
-	EPOLL_CLOEXEC            = 0x00001000
-	EPOLL_CTL_ADD            = 0
-	EPOLL_CTL_MOD            = 1
-	EPOLL_CTL_DEL            = 2
-	EPOLLRDNORM              = 0x0001
-	EPOLLRDBAND              = 0x0002
-	EPOLLIN                  = 0x0003
-	EPOLLOUT                 = 0x0004
-	EPOLLWRBAND              = 0x0008
-	EPOLLPRI                 = 0x0010
-	EPOLLERR                 = 0x0020
-	EPOLLHUP                 = 0x0040
-	EPOLLEXCLUSIVE           = 0x20000000
-	EPOLLONESHOT             = 0x40000000
-	FD_CLOEXEC               = 0x01
-	FD_CLOFORK               = 0x02
-	FD_SETSIZE               = 0x800
-	FNDELAY                  = 0x04
-	F_CLOSFD                 = 9
-	F_CONTROL_CVT            = 13
-	F_DUPFD                  = 0
-	F_DUPFD2                 = 8
-	F_GETFD                  = 1
-	F_GETFL                  = 259
-	F_GETLK                  = 5
-	F_GETOWN                 = 10
-	F_OK                     = 0x0
-	F_RDLCK                  = 1
-	F_SETFD                  = 2
-	F_SETFL                  = 4
-	F_SETLK                  = 6
-	F_SETLKW                 = 7
-	F_SETOWN                 = 11
-	F_SETTAG                 = 12
-	F_UNLCK                  = 3
-	F_WRLCK                  = 2
-	FSTYPE_ZFS               = 0xe9 //"Z"
-	FSTYPE_HFS               = 0xc8 //"H"
-	FSTYPE_NFS               = 0xd5 //"N"
-	FSTYPE_TFS               = 0xe3 //"T"
-	FSTYPE_AUTOMOUNT         = 0xc1 //"A"
-	GRND_NONBLOCK            = 1
-	GRND_RANDOM              = 2
-	HUPCL                    = 0x0100 // Hang up on last close
-	IN_CLOEXEC               = 0x00001000
-	IN_NONBLOCK              = 0x00000004
-	IN_ACCESS                = 0x00000001
-	IN_MODIFY                = 0x00000002
-	IN_ATTRIB                = 0x00000004
-	IN_CLOSE_WRITE           = 0x00000008
-	IN_CLOSE_NOWRITE         = 0x00000010
-	IN_OPEN                  = 0x00000020
-	IN_MOVED_FROM            = 0x00000040
-	IN_MOVED_TO              = 0x00000080
-	IN_CREATE                = 0x00000100
-	IN_DELETE                = 0x00000200
-	IN_DELETE_SELF           = 0x00000400
-	IN_MOVE_SELF             = 0x00000800
-	IN_UNMOUNT               = 0x00002000
-	IN_Q_OVERFLOW            = 0x00004000
-	IN_IGNORED               = 0x00008000
-	IN_CLOSE                 = (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)
-	IN_MOVE                  = (IN_MOVED_FROM | IN_MOVED_TO)
-	IN_ALL_EVENTS            = (IN_ACCESS | IN_MODIFY | IN_ATTRIB |
-		IN_CLOSE | IN_OPEN | IN_MOVE |
-		IN_CREATE | IN_DELETE | IN_DELETE_SELF |
-		IN_MOVE_SELF)
-	IN_ONLYDIR                      = 0x01000000
-	IN_DONT_FOLLOW                  = 0x02000000
-	IN_EXCL_UNLINK                  = 0x04000000
-	IN_MASK_CREATE                  = 0x10000000
-	IN_MASK_ADD                     = 0x20000000
-	IN_ISDIR                        = 0x40000000
-	IN_ONESHOT                      = 0x80000000
+	BRKINT                          = 0x0001
+	CLOCK_MONOTONIC                 = 0x1
+	CLOCK_PROCESS_CPUTIME_ID        = 0x2
+	CLOCK_REALTIME                  = 0x0
+	CLOCK_THREAD_CPUTIME_ID         = 0x3
+	CS8                             = 0x0030
+	CSIZE                           = 0x0030
+	ECHO                            = 0x00000008
+	ECHONL                          = 0x00000001
+	FD_CLOEXEC                      = 0x01
+	FD_CLOFORK                      = 0x02
+	FNDELAY                         = 0x04
+	F_CLOSFD                        = 9
+	F_CONTROL_CVT                   = 13
+	F_DUPFD                         = 0
+	F_DUPFD2                        = 8
+	F_GETFD                         = 1
+	F_GETFL                         = 259
+	F_GETLK                         = 5
+	F_GETOWN                        = 10
+	F_OK                            = 0x0
+	F_RDLCK                         = 1
+	F_SETFD                         = 2
+	F_SETFL                         = 4
+	F_SETLK                         = 6
+	F_SETLKW                        = 7
+	F_SETOWN                        = 11
+	F_SETTAG                        = 12
+	F_UNLCK                         = 3
+	F_WRLCK                         = 2
+	FSTYPE_ZFS                      = 0xe9 //"Z"
+	FSTYPE_HFS                      = 0xc8 //"H"
+	FSTYPE_NFS                      = 0xd5 //"N"
+	FSTYPE_TFS                      = 0xe3 //"T"
+	FSTYPE_AUTOMOUNT                = 0xc1 //"A"
 	IP6F_MORE_FRAG                  = 0x0001
 	IP6F_OFF_MASK                   = 0xfff8
 	IP6F_RESERVED_MASK              = 0x0006
@@ -210,18 +153,10 @@ const (
 	IP_PKTINFO                      = 101
 	IP_RECVPKTINFO                  = 102
 	IP_TOS                          = 2
-	IP_TTL                          = 14
+	IP_TTL                          = 3
 	IP_UNBLOCK_SOURCE               = 11
-	ICMP6_FILTER                    = 1
-	MCAST_INCLUDE                   = 0
-	MCAST_EXCLUDE                   = 1
-	MCAST_JOIN_GROUP                = 40
-	MCAST_LEAVE_GROUP               = 41
-	MCAST_JOIN_SOURCE_GROUP         = 42
-	MCAST_LEAVE_SOURCE_GROUP        = 43
-	MCAST_BLOCK_SOURCE              = 44
-	MCAST_UNBLOCK_SOURCE            = 46
 	ICANON                          = 0x0010
+	ICMP6_FILTER                    = 0x26
 	ICRNL                           = 0x0002
 	IEXTEN                          = 0x0020
 	IGNBRK                          = 0x0004
@@ -231,10 +166,10 @@ const (
 	ISTRIP                          = 0x0080
 	IXON                            = 0x0200
 	IXOFF                           = 0x0100
-	LOCK_SH                         = 0x1
-	LOCK_EX                         = 0x2
-	LOCK_NB                         = 0x4
-	LOCK_UN                         = 0x8
+	LOCK_SH                         = 0x1 // Not exist on zOS
+	LOCK_EX                         = 0x2 // Not exist on zOS
+	LOCK_NB                         = 0x4 // Not exist on zOS
+	LOCK_UN                         = 0x8 // Not exist on zOS
 	POLLIN                          = 0x0003
 	POLLOUT                         = 0x0004
 	POLLPRI                         = 0x0010
@@ -248,29 +183,15 @@ const (
 	MAP_PRIVATE                     = 0x1 // changes are private
 	MAP_SHARED                      = 0x2 // changes are shared
 	MAP_FIXED                       = 0x4 // place exactly
-	__MAP_MEGA                      = 0x8
-	__MAP_64                        = 0x10
-	MAP_ANON                        = 0x20
-	MAP_ANONYMOUS                   = 0x20
+	MCAST_JOIN_GROUP                = 40
+	MCAST_LEAVE_GROUP               = 41
+	MCAST_JOIN_SOURCE_GROUP         = 42
+	MCAST_LEAVE_SOURCE_GROUP        = 43
+	MCAST_BLOCK_SOURCE              = 44
+	MCAST_UNBLOCK_SOURCE            = 45
 	MS_SYNC                         = 0x1 // msync - synchronous writes
 	MS_ASYNC                        = 0x2 // asynchronous writes
 	MS_INVALIDATE                   = 0x4 // invalidate mappings
-	MS_BIND                         = 0x00001000
-	MS_MOVE                         = 0x00002000
-	MS_NOSUID                       = 0x00000002
-	MS_PRIVATE                      = 0x00040000
-	MS_REC                          = 0x00004000
-	MS_REMOUNT                      = 0x00008000
-	MS_RDONLY                       = 0x00000001
-	MS_UNBINDABLE                   = 0x00020000
-	MNT_DETACH                      = 0x00000004
-	ZOSDSFS_SUPER_MAGIC             = 0x44534653 // zOS DSFS
-	NFS_SUPER_MAGIC                 = 0x6969     // NFS
-	NSFS_MAGIC                      = 0x6e736673 // PROCNS
-	PROC_SUPER_MAGIC                = 0x9fa0     // proc FS
-	ZOSTFS_SUPER_MAGIC              = 0x544653   // zOS TFS
-	ZOSUFS_SUPER_MAGIC              = 0x554653   // zOS UFS
-	ZOSZFS_SUPER_MAGIC              = 0x5A4653   // zOS ZFS
 	MTM_RDONLY                      = 0x80000000
 	MTM_RDWR                        = 0x40000000
 	MTM_UMOUNT                      = 0x10000000
@@ -285,20 +206,13 @@ const (
 	MTM_REMOUNT                     = 0x00000100
 	MTM_NOSECURITY                  = 0x00000080
 	NFDBITS                         = 0x20
-	ONLRET                          = 0x0020 // NL performs CR function
 	O_ACCMODE                       = 0x03
 	O_APPEND                        = 0x08
 	O_ASYNCSIG                      = 0x0200
 	O_CREAT                         = 0x80
-	O_DIRECT                        = 0x00002000
-	O_NOFOLLOW                      = 0x00004000
-	O_DIRECTORY                     = 0x00008000
-	O_PATH                          = 0x00080000
-	O_CLOEXEC                       = 0x00001000
 	O_EXCL                          = 0x40
 	O_GETFL                         = 0x0F
 	O_LARGEFILE                     = 0x0400
-	O_NDELAY                        = 0x4
 	O_NONBLOCK                      = 0x04
 	O_RDONLY                        = 0x02
 	O_RDWR                          = 0x03
@@ -335,7 +249,6 @@ const (
 	AF_IUCV                         = 17
 	AF_LAT                          = 14
 	AF_LINK                         = 18
-	AF_LOCAL                        = AF_UNIX // AF_LOCAL is an alias for AF_UNIX
 	AF_MAX                          = 30
 	AF_NBS                          = 7
 	AF_NDD                          = 23
@@ -373,33 +286,15 @@ const (
 	RLIMIT_AS                       = 5
 	RLIMIT_NOFILE                   = 6
 	RLIMIT_MEMLIMIT                 = 7
-	RLIMIT_MEMLOCK                  = 0x8
 	RLIM_INFINITY                   = 2147483647
-	SCHED_FIFO                      = 0x2
-	SCM_CREDENTIALS                 = 0x2
 	SCM_RIGHTS                      = 0x01
 	SF_CLOSE                        = 0x00000002
 	SF_REUSE                        = 0x00000001
-	SHM_RND                         = 0x2
-	SHM_RDONLY                      = 0x1
-	SHMLBA                          = 0x1000
-	IPC_STAT                        = 0x3
-	IPC_SET                         = 0x2
-	IPC_RMID                        = 0x1
-	IPC_PRIVATE                     = 0x0
-	IPC_CREAT                       = 0x1000000
-	__IPC_MEGA                      = 0x4000000
-	__IPC_SHAREAS                   = 0x20000000
-	__IPC_BELOWBAR                  = 0x10000000
-	IPC_EXCL                        = 0x2000000
-	__IPC_GIGA                      = 0x8000000
 	SHUT_RD                         = 0
 	SHUT_RDWR                       = 2
 	SHUT_WR                         = 1
-	SOCK_CLOEXEC                    = 0x00001000
 	SOCK_CONN_DGRAM                 = 6
 	SOCK_DGRAM                      = 2
-	SOCK_NONBLOCK                   = 0x800
 	SOCK_RAW                        = 3
 	SOCK_RDM                        = 4
 	SOCK_SEQPACKET                  = 5
@@ -484,6 +379,8 @@ const (
 	S_IFMST                         = 0x00FF0000
 	TCP_KEEPALIVE                   = 0x8
 	TCP_NODELAY                     = 0x1
+	TCP_INFO                        = 0xb
+	TCP_USER_TIMEOUT                = 0x1
 	TIOCGWINSZ                      = 0x4008a368
 	TIOCSWINSZ                      = 0x8008a367
 	TIOCSBRK                        = 0x2000a77b
@@ -531,10 +428,7 @@ const (
 	VSUSP                           = 9
 	VTIME                           = 10
 	WCONTINUED                      = 0x4
-	WEXITED                         = 0x8
 	WNOHANG                         = 0x1
-	WNOWAIT                         = 0x20
-	WSTOPPED                        = 0x10
 	WUNTRACED                       = 0x2
 	_BPX_SWAP                       = 1
 	_BPX_NONSWAP                    = 2
@@ -559,30 +453,8 @@ const (
 	MADV_FREE                       = 15 // for Linux compatibility -- no zos semantics
 	MADV_WIPEONFORK                 = 16 // for Linux compatibility -- no zos semantics
 	MADV_KEEPONFORK                 = 17 // for Linux compatibility -- no zos semantics
-	AT_SYMLINK_FOLLOW               = 0x400
-	AT_SYMLINK_NOFOLLOW             = 0x100
-	XATTR_CREATE                    = 0x1
-	XATTR_REPLACE                   = 0x2
-	P_PID                           = 0
-	P_PGID                          = 1
-	P_ALL                           = 2
-	PR_SET_NAME                     = 15
-	PR_GET_NAME                     = 16
-	PR_SET_NO_NEW_PRIVS             = 38
-	PR_GET_NO_NEW_PRIVS             = 39
-	PR_SET_DUMPABLE                 = 4
-	PR_GET_DUMPABLE                 = 3
-	PR_SET_PDEATHSIG                = 1
-	PR_GET_PDEATHSIG                = 2
-	PR_SET_CHILD_SUBREAPER          = 36
-	PR_GET_CHILD_SUBREAPER          = 37
-	AT_FDCWD                        = -100
-	AT_EACCESS                      = 0x200
-	AT_EMPTY_PATH                   = 0x1000
-	AT_REMOVEDIR                    = 0x200
-	RENAME_NOREPLACE                = 1 << 0
-	ST_RDONLY                       = 1
-	ST_NOSUID                       = 2
+	AT_SYMLINK_NOFOLLOW             = 1  // for Unix  compatibility -- no zos semantics
+	AT_FDCWD                        = 2  // for Unix  compatibility -- no zos semantics
 )
 
 const (
@@ -605,7 +477,6 @@ const (
 	EMLINK             = Errno(125)
 	ENAMETOOLONG       = Errno(126)
 	ENFILE             = Errno(127)
-	ENOATTR            = Errno(265)
 	ENODEV             = Errno(128)
 	ENOENT             = Errno(129)
 	ENOEXEC            = Errno(130)
@@ -830,7 +701,7 @@ var errorList = [...]struct {
 	{145, "EDC5145I", "The parameter list is too long, or the message to receive was too large for the buffer."},
 	{146, "EDC5146I", "Too many levels of symbolic links."},
 	{147, "EDC5147I", "Illegal byte sequence."},
-	{148, "EDC5148I", "The named attribute or data not available."},
+	{148, "", ""},
 	{149, "EDC5149I", "Value Overflow Error."},
 	{150, "EDC5150I", "UNIX System Services is not active."},
 	{151, "EDC5151I", "Dynamic allocation error."},
@@ -873,7 +744,6 @@ var errorList = [...]struct {
 	{259, "EDC5259I", "A CUN_RS_NO_CONVERSION error was issued by Unicode Services."},
 	{260, "EDC5260I", "A CUN_RS_TABLE_NOT_ALIGNED error was issued by Unicode Services."},
 	{262, "EDC5262I", "An iconv() function encountered an unexpected error while using Unicode Services."},
-	{265, "EDC5265I", "The named attribute not available."},
 	{1000, "EDC8000I", "A bad socket-call constant was found in the IUCV header."},
 	{1001, "EDC8001I", "An error was found in the IUCV header."},
 	{1002, "EDC8002I", "A socket descriptor is out of range."},
diff --git a/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
index 586317c..bd001a6 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
@@ -1,6 +1,8 @@
 // Code generated by linux/mkall.go generatePtracePair("arm", "arm64"). DO NOT EDIT.
 
 //go:build linux && (arm || arm64)
+// +build linux
+// +build arm arm64
 
 package unix
 
@@ -13,12 +15,12 @@ type PtraceRegsArm struct {
 
 // PtraceGetRegsArm fetches the registers used by arm binaries.
 func PtraceGetRegsArm(pid int, regsout *PtraceRegsArm) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsArm sets the registers used by arm binaries.
 func PtraceSetRegsArm(pid int, regs *PtraceRegsArm) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
 
 // PtraceRegsArm64 is the registers used by arm64 binaries.
@@ -31,10 +33,10 @@ type PtraceRegsArm64 struct {
 
 // PtraceGetRegsArm64 fetches the registers used by arm64 binaries.
 func PtraceGetRegsArm64(pid int, regsout *PtraceRegsArm64) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsArm64 sets the registers used by arm64 binaries.
 func PtraceSetRegsArm64(pid int, regs *PtraceRegsArm64) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
index 834d285..6cb6d68 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
@@ -7,11 +7,11 @@ import "unsafe"
 // PtraceGetRegSetArm64 fetches the registers used by arm64 binaries.
 func PtraceGetRegSetArm64(pid, addr int, regsout *PtraceRegsArm64) error {
 	iovec := Iovec{(*byte)(unsafe.Pointer(regsout)), uint64(unsafe.Sizeof(*regsout))}
-	return ptracePtr(PTRACE_GETREGSET, pid, uintptr(addr), unsafe.Pointer(&iovec))
+	return ptrace(PTRACE_GETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec)))
 }
 
 // PtraceSetRegSetArm64 sets the registers used by arm64 binaries.
 func PtraceSetRegSetArm64(pid, addr int, regs *PtraceRegsArm64) error {
 	iovec := Iovec{(*byte)(unsafe.Pointer(regs)), uint64(unsafe.Sizeof(*regs))}
-	return ptracePtr(PTRACE_SETREGSET, pid, uintptr(addr), unsafe.Pointer(&iovec))
+	return ptrace(PTRACE_SETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec)))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
index d7c881b..c34d063 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
@@ -1,6 +1,8 @@
 // Code generated by linux/mkall.go generatePtracePair("mips", "mips64"). DO NOT EDIT.
 
 //go:build linux && (mips || mips64)
+// +build linux
+// +build mips mips64
 
 package unix
 
@@ -19,12 +21,12 @@ type PtraceRegsMips struct {
 
 // PtraceGetRegsMips fetches the registers used by mips binaries.
 func PtraceGetRegsMips(pid int, regsout *PtraceRegsMips) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsMips sets the registers used by mips binaries.
 func PtraceSetRegsMips(pid int, regs *PtraceRegsMips) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
 
 // PtraceRegsMips64 is the registers used by mips64 binaries.
@@ -40,10 +42,10 @@ type PtraceRegsMips64 struct {
 
 // PtraceGetRegsMips64 fetches the registers used by mips64 binaries.
 func PtraceGetRegsMips64(pid int, regsout *PtraceRegsMips64) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsMips64 sets the registers used by mips64 binaries.
 func PtraceSetRegsMips64(pid int, regs *PtraceRegsMips64) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
index 2d2de5d..3ccf0c0 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
@@ -1,6 +1,8 @@
 // Code generated by linux/mkall.go generatePtracePair("mipsle", "mips64le"). DO NOT EDIT.
 
 //go:build linux && (mipsle || mips64le)
+// +build linux
+// +build mipsle mips64le
 
 package unix
 
@@ -19,12 +21,12 @@ type PtraceRegsMipsle struct {
 
 // PtraceGetRegsMipsle fetches the registers used by mipsle binaries.
 func PtraceGetRegsMipsle(pid int, regsout *PtraceRegsMipsle) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsMipsle sets the registers used by mipsle binaries.
 func PtraceSetRegsMipsle(pid int, regs *PtraceRegsMipsle) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
 
 // PtraceRegsMips64le is the registers used by mips64le binaries.
@@ -40,10 +42,10 @@ type PtraceRegsMips64le struct {
 
 // PtraceGetRegsMips64le fetches the registers used by mips64le binaries.
 func PtraceGetRegsMips64le(pid int, regsout *PtraceRegsMips64le) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsMips64le sets the registers used by mips64le binaries.
 func PtraceSetRegsMips64le(pid int, regs *PtraceRegsMips64le) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
index 5adc79f..7d65857 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
@@ -1,6 +1,8 @@
 // Code generated by linux/mkall.go generatePtracePair("386", "amd64"). DO NOT EDIT.
 
 //go:build linux && (386 || amd64)
+// +build linux
+// +build 386 amd64
 
 package unix
 
@@ -29,12 +31,12 @@ type PtraceRegs386 struct {
 
 // PtraceGetRegs386 fetches the registers used by 386 binaries.
 func PtraceGetRegs386(pid int, regsout *PtraceRegs386) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegs386 sets the registers used by 386 binaries.
 func PtraceSetRegs386(pid int, regs *PtraceRegs386) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
 
 // PtraceRegsAmd64 is the registers used by amd64 binaries.
@@ -70,10 +72,10 @@ type PtraceRegsAmd64 struct {
 
 // PtraceGetRegsAmd64 fetches the registers used by amd64 binaries.
 func PtraceGetRegsAmd64(pid int, regsout *PtraceRegsAmd64) error {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
 
 // PtraceSetRegsAmd64 sets the registers used by amd64 binaries.
 func PtraceSetRegsAmd64(pid int, regs *PtraceRegsAmd64) error {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
 }
diff --git a/vendor/golang.org/x/sys/unix/zsymaddr_zos_s390x.s b/vendor/golang.org/x/sys/unix/zsymaddr_zos_s390x.s
deleted file mode 100644
index b77ff5d..0000000
--- a/vendor/golang.org/x/sys/unix/zsymaddr_zos_s390x.s
+++ /dev/null
@@ -1,364 +0,0 @@
-// go run mksyscall_zos_s390x.go -o_sysnum zsysnum_zos_s390x.go -o_syscall zsyscall_zos_s390x.go -i_syscall syscall_zos_s390x.go -o_asm zsymaddr_zos_s390x.s
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build zos && s390x
-#include "textflag.h"
-
-//  provide the address of function variable to be fixed up.
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FlistxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Flistxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FremovexattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fremovexattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FgetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fgetxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FsetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fsetxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_accept4Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·accept4(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_RemovexattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Removexattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_Dup3Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Dup3(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_DirfdAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Dirfd(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EpollCreateAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·EpollCreate(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EpollCreate1Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·EpollCreate1(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EpollCtlAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·EpollCtl(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EpollPwaitAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·EpollPwait(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EpollWaitAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·EpollWait(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_EventfdAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Eventfd(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FaccessatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Faccessat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FchmodatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fchmodat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FchownatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fchownat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FdatasyncAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fdatasync(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_fstatatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·fstatat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LgetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Lgetxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LsetxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Lsetxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FstatfsAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Fstatfs(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FutimesAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Futimes(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_FutimesatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Futimesat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_GetrandomAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Getrandom(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_InotifyInitAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·InotifyInit(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_InotifyInit1Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·InotifyInit1(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_InotifyAddWatchAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·InotifyAddWatch(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_InotifyRmWatchAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·InotifyRmWatch(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_ListxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Listxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LlistxattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Llistxattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LremovexattrAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Lremovexattr(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LutimesAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Lutimes(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_StatfsAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Statfs(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_SyncfsAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Syncfs(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_UnshareAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Unshare(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_LinkatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Linkat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_MkdiratAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Mkdirat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_MknodatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Mknodat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_PivotRootAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·PivotRoot(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_PrctlAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Prctl(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_PrlimitAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Prlimit(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_RenameatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Renameat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_Renameat2Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Renameat2(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_SethostnameAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Sethostname(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_SetnsAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Setns(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_SymlinkatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Symlinkat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_UnlinkatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·Unlinkat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_openatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·openat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_openat2Addr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·openat2(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-TEXT ·get_utimensatAddr(SB), NOSPLIT|NOFRAME, $0-8
-	MOVD $·utimensat(SB), R8
-	MOVD R8, ret+0(FP)
-	RET
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
index 6ea64a3..91a23cc 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build aix && ppc
+// +build aix,ppc
 
 package unix
 
@@ -16,7 +17,6 @@ int getdirent(int, uintptr_t, size_t);
 int wait4(int, uintptr_t, int, uintptr_t);
 int ioctl(int, int, uintptr_t);
 int fcntl(uintptr_t, int, uintptr_t);
-int fsync_range(int, int, long long, long long);
 int acct(uintptr_t);
 int chdir(uintptr_t);
 int chroot(uintptr_t);
@@ -29,6 +29,7 @@ int fchmod(int, unsigned int);
 int fchmodat(int, uintptr_t, unsigned int, int);
 int fchownat(int, uintptr_t, int, int, int);
 int fdatasync(int);
+int fsync(int);
 int getpgid(int);
 int getpgrp();
 int getpid();
@@ -123,6 +124,7 @@ int utime(uintptr_t, uintptr_t);
 unsigned long long getsystemcfg(int);
 int umount(uintptr_t);
 int getrlimit64(int, uintptr_t);
+int setrlimit64(int, uintptr_t);
 long long lseek64(int, long long, int);
 uintptr_t mmap(uintptr_t, uintptr_t, int, int, int, long long);
 
@@ -211,7 +213,7 @@ func wait4(pid Pid_t, status *_C_int, options int, rusage *Rusage) (wpid Pid_t,
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req int, arg uintptr) (err error) {
+func ioctl(fd int, req uint, arg uintptr) (err error) {
 	r0, er := C.ioctl(C.int(fd), C.int(req), C.uintptr_t(arg))
 	if r0 == -1 && er != nil {
 		err = er
@@ -221,16 +223,6 @@ func ioctl(fd int, req int, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
-	r0, er := C.ioctl(C.int(fd), C.int(req), C.uintptr_t(uintptr(arg)))
-	if r0 == -1 && er != nil {
-		err = er
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func FcntlInt(fd uintptr, cmd int, arg int) (r int, err error) {
 	r0, er := C.fcntl(C.uintptr_t(fd), C.int(cmd), C.uintptr_t(arg))
 	r = int(r0)
@@ -263,16 +255,6 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func fsyncRange(fd int, how int, start int64, length int64) (err error) {
-	r0, er := C.fsync_range(C.int(fd), C.int(how), C.longlong(start), C.longlong(length))
-	if r0 == -1 && er != nil {
-		err = er
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	_p0 := uintptr(unsafe.Pointer(C.CString(path)))
 	r0, er := C.acct(C.uintptr_t(_p0))
@@ -397,6 +379,16 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fsync(fd int) (err error) {
+	r0, er := C.fsync(C.int(fd))
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getpgid(pid int) (pgid int, err error) {
 	r0, er := C.getpgid(C.int(pid))
 	pgid = int(r0)
@@ -816,6 +808,28 @@ func write(fd int, p []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, er := C.read(C.int(fd), C.uintptr_t(uintptr(unsafe.Pointer(p))), C.size_t(np))
+	n = int(r0)
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, er := C.write(C.int(fd), C.uintptr_t(uintptr(unsafe.Pointer(p))), C.size_t(np))
+	n = int(r0)
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup2(oldfd int, newfd int) (err error) {
 	r0, er := C.dup2(C.int(oldfd), C.int(newfd))
 	if r0 == -1 && er != nil {
@@ -961,7 +975,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
@@ -978,7 +992,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
@@ -1440,6 +1454,16 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	r0, er := C.setrlimit64(C.int(resource), C.uintptr_t(uintptr(unsafe.Pointer(rlim))))
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Seek(fd int, offset int64, whence int) (off int64, err error) {
 	r0, er := C.lseek64(C.int(fd), C.longlong(offset), C.int(whence))
 	off = int64(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
index 99ee439..33c2609 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build aix && ppc64
+// +build aix,ppc64
 
 package unix
 
@@ -92,18 +93,8 @@ func wait4(pid Pid_t, status *_C_int, options int, rusage *Rusage) (wpid Pid_t,
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req int, arg uintptr) (err error) {
-	_, e1 := callioctl(fd, req, arg)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
-	_, e1 := callioctl_ptr(fd, req, arg)
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, e1 := callioctl(fd, int(req), arg)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -144,16 +135,6 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func fsyncRange(fd int, how int, start int64, length int64) (err error) {
-	_, e1 := callfsync_range(fd, how, start, length)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -302,6 +283,16 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fsync(fd int) (err error) {
+	_, e1 := callfsync(fd)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getpgid(pid int) (pgid int, err error) {
 	r0, e1 := callgetpgid(pid)
 	pgid = int(r0)
@@ -761,6 +752,28 @@ func write(fd int, p []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, e1 := callread(fd, uintptr(unsafe.Pointer(p)), np)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, e1 := callwrite(fd, uintptr(unsafe.Pointer(p)), np)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup2(oldfd int, newfd int) (err error) {
 	_, e1 := calldup2(oldfd, newfd)
 	if e1 != 0 {
@@ -918,7 +931,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
@@ -933,7 +946,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
@@ -1399,6 +1412,16 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, e1 := callsetrlimit(resource, uintptr(unsafe.Pointer(rlim)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Seek(fd int, offset int64, whence int) (off int64, err error) {
 	r0, e1 := calllseek(fd, offset, whence)
 	off = int64(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
index b68a783..8b737fa 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build aix && ppc64 && gc
+// +build aix,ppc64,gc
 
 package unix
 
@@ -17,7 +18,6 @@ import (
 //go:cgo_import_dynamic libc_wait4 wait4 "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_fcntl fcntl "libc.a/shr_64.o"
-//go:cgo_import_dynamic libc_fsync_range fsync_range "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_acct acct "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_chdir chdir "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_chroot chroot "libc.a/shr_64.o"
@@ -30,6 +30,7 @@ import (
 //go:cgo_import_dynamic libc_fchmodat fchmodat "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_fchownat fchownat "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_fdatasync fdatasync "libc.a/shr_64.o"
+//go:cgo_import_dynamic libc_fsync fsync "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_getpgid getpgid "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_getpgrp getpgrp "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_getpid getpid "libc.a/shr_64.o"
@@ -123,6 +124,7 @@ import (
 //go:cgo_import_dynamic libc_getsystemcfg getsystemcfg "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_umount umount "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_getrlimit getrlimit "libc.a/shr_64.o"
+//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_lseek lseek "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_mmap64 mmap64 "libc.a/shr_64.o"
 
@@ -134,7 +136,6 @@ import (
 //go:linkname libc_wait4 libc_wait4
 //go:linkname libc_ioctl libc_ioctl
 //go:linkname libc_fcntl libc_fcntl
-//go:linkname libc_fsync_range libc_fsync_range
 //go:linkname libc_acct libc_acct
 //go:linkname libc_chdir libc_chdir
 //go:linkname libc_chroot libc_chroot
@@ -147,6 +148,7 @@ import (
 //go:linkname libc_fchmodat libc_fchmodat
 //go:linkname libc_fchownat libc_fchownat
 //go:linkname libc_fdatasync libc_fdatasync
+//go:linkname libc_fsync libc_fsync
 //go:linkname libc_getpgid libc_getpgid
 //go:linkname libc_getpgrp libc_getpgrp
 //go:linkname libc_getpid libc_getpid
@@ -240,6 +242,7 @@ import (
 //go:linkname libc_getsystemcfg libc_getsystemcfg
 //go:linkname libc_umount libc_umount
 //go:linkname libc_getrlimit libc_getrlimit
+//go:linkname libc_setrlimit libc_setrlimit
 //go:linkname libc_lseek libc_lseek
 //go:linkname libc_mmap64 libc_mmap64
 
@@ -254,7 +257,6 @@ var (
 	libc_wait4,
 	libc_ioctl,
 	libc_fcntl,
-	libc_fsync_range,
 	libc_acct,
 	libc_chdir,
 	libc_chroot,
@@ -267,6 +269,7 @@ var (
 	libc_fchmodat,
 	libc_fchownat,
 	libc_fdatasync,
+	libc_fsync,
 	libc_getpgid,
 	libc_getpgrp,
 	libc_getpid,
@@ -360,6 +363,7 @@ var (
 	libc_getsystemcfg,
 	libc_umount,
 	libc_getrlimit,
+	libc_setrlimit,
 	libc_lseek,
 	libc_mmap64 syscallFunc
 )
@@ -419,13 +423,6 @@ func callioctl(fd int, req int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callioctl_ptr(fd int, req int, arg unsafe.Pointer) (r1 uintptr, e1 Errno) {
-	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_ioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_fcntl)), 3, fd, uintptr(cmd), arg, 0, 0, 0)
 	return
@@ -433,13 +430,6 @@ func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callfsync_range(fd int, how int, start int64, length int64) (r1 uintptr, e1 Errno) {
-	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_fsync_range)), 4, uintptr(fd), uintptr(how), uintptr(start), uintptr(length), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func callacct(_p0 uintptr) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_acct)), 1, _p0, 0, 0, 0, 0, 0)
 	return
@@ -524,6 +514,13 @@ func callfdatasync(fd int) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callfsync(fd int) (r1 uintptr, e1 Errno) {
+	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_fsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func callgetpgid(pid int) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = rawSyscall6(uintptr(unsafe.Pointer(&libc_getpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
 	return
@@ -1175,6 +1172,13 @@ func callgetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callsetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
+	r1, _, e1 = rawSyscall6(uintptr(unsafe.Pointer(&libc_setrlimit)), 2, uintptr(resource), rlim, 0, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func calllseek(fd int, offset int64, whence int) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_lseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
 	return
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
index 0a87450..3c26091 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build aix && ppc64 && gccgo
+// +build aix,ppc64,gccgo
 
 package unix
 
@@ -15,7 +16,6 @@ int getdirent(int, uintptr_t, size_t);
 int wait4(int, uintptr_t, int, uintptr_t);
 int ioctl(int, int, uintptr_t);
 int fcntl(uintptr_t, int, uintptr_t);
-int fsync_range(int, int, long long, long long);
 int acct(uintptr_t);
 int chdir(uintptr_t);
 int chroot(uintptr_t);
@@ -28,6 +28,7 @@ int fchmod(int, unsigned int);
 int fchmodat(int, uintptr_t, unsigned int, int);
 int fchownat(int, uintptr_t, int, int, int);
 int fdatasync(int);
+int fsync(int);
 int getpgid(int);
 int getpgrp();
 int getpid();
@@ -122,6 +123,7 @@ int utime(uintptr_t, uintptr_t);
 unsigned long long getsystemcfg(int);
 int umount(uintptr_t);
 int getrlimit(int, uintptr_t);
+int setrlimit(int, uintptr_t);
 long long lseek(int, long long, int);
 uintptr_t mmap64(uintptr_t, uintptr_t, int, int, int, long long);
 
@@ -129,7 +131,6 @@ uintptr_t mmap64(uintptr_t, uintptr_t, int, int, int, long long);
 import "C"
 import (
 	"syscall"
-	"unsafe"
 )
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
@@ -190,14 +191,6 @@ func callioctl(fd int, req int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callioctl_ptr(fd int, req int, arg unsafe.Pointer) (r1 uintptr, e1 Errno) {
-	r1 = uintptr(C.ioctl(C.int(fd), C.int(req), C.uintptr_t(uintptr(arg))))
-	e1 = syscall.GetErrno()
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.fcntl(C.uintptr_t(fd), C.int(cmd), C.uintptr_t(arg)))
 	e1 = syscall.GetErrno()
@@ -206,14 +199,6 @@ func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callfsync_range(fd int, how int, start int64, length int64) (r1 uintptr, e1 Errno) {
-	r1 = uintptr(C.fsync_range(C.int(fd), C.int(how), C.longlong(start), C.longlong(length)))
-	e1 = syscall.GetErrno()
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func callacct(_p0 uintptr) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.acct(C.uintptr_t(_p0)))
 	e1 = syscall.GetErrno()
@@ -310,6 +295,14 @@ func callfdatasync(fd int) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callfsync(fd int) (r1 uintptr, e1 Errno) {
+	r1 = uintptr(C.fsync(C.int(fd)))
+	e1 = syscall.GetErrno()
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func callgetpgid(pid int) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.getpgid(C.int(pid)))
 	e1 = syscall.GetErrno()
@@ -1054,6 +1047,14 @@ func callgetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callsetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
+	r1 = uintptr(C.setrlimit(C.int(resource), C.uintptr_t(rlim)))
+	e1 = syscall.GetErrno()
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func calllseek(fd int, offset int64, whence int) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.lseek(C.int(fd), C.longlong(offset), C.int(whence)))
 	e1 = syscall.GetErrno()
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go
new file mode 100644
index 0000000..a06eb09
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go
@@ -0,0 +1,40 @@
+// go run mksyscall.go -tags darwin,amd64,go1.13 syscall_darwin.1_13.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+//go:build darwin && amd64 && go1.13
+// +build darwin,amd64,go1.13
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func closedir(dir uintptr) (err error) {
+	_, _, e1 := syscall_syscall(libc_closedir_trampoline_addr, uintptr(dir), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_closedir_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_closedir closedir "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno) {
+	r0, _, _ := syscall_syscall(libc_readdir_r_trampoline_addr, uintptr(dir), uintptr(unsafe.Pointer(entry)), uintptr(unsafe.Pointer(result)))
+	res = Errno(r0)
+	return
+}
+
+var libc_readdir_r_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readdir_r readdir_r "/usr/lib/libSystem.B.dylib"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s
new file mode 100644
index 0000000..d6c3e25
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s
@@ -0,0 +1,25 @@
+// go run mkasm_darwin.go amd64
+// Code generated by the command above; DO NOT EDIT.
+
+//go:build go1.13
+// +build go1.13
+
+#include "textflag.h"
+
+TEXT libc_fdopendir_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_fdopendir(SB)
+
+GLOBL	·libc_fdopendir_trampoline_addr(SB), RODATA, $8
+DATA	·libc_fdopendir_trampoline_addr(SB)/8, $libc_fdopendir_trampoline<>(SB)
+
+TEXT libc_closedir_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_closedir(SB)
+
+GLOBL	·libc_closedir_trampoline_addr(SB), RODATA, $8
+DATA	·libc_closedir_trampoline_addr(SB)/8, $libc_closedir_trampoline<>(SB)
+
+TEXT libc_readdir_r_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readdir_r(SB)
+
+GLOBL	·libc_readdir_r_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readdir_r_trampoline_addr(SB)/8, $libc_readdir_r_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index 813c05b..d4efe8d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags darwin,amd64 syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
+// go run mksyscall.go -tags darwin,amd64,go1.12 syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
-//go:build darwin && amd64
+//go:build darwin && amd64 && go1.12
+// +build darwin,amd64,go1.12
 
 package unix
 
@@ -462,32 +463,6 @@ var libc_munlockall_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func closedir(dir uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_closedir_trampoline_addr, uintptr(dir), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_closedir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_closedir closedir "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno) {
-	r0, _, _ := syscall_syscall(libc_readdir_r_trampoline_addr, uintptr(dir), uintptr(unsafe.Pointer(entry)), uintptr(unsafe.Pointer(result)))
-	res = Errno(r0)
-	return
-}
-
-var libc_readdir_r_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readdir_r readdir_r "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe(p *[2]int32) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_pipe_trampoline_addr, uintptr(unsafe.Pointer(p)), 0, 0)
 	if e1 != 0 {
@@ -668,22 +643,17 @@ var libc_flistxattr_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
+	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimensat_trampoline_addr uintptr
+var libc_setattrlist_trampoline_addr uintptr
 
-//go:cgo_import_dynamic libc_utimensat utimensat "/usr/lib/libSystem.B.dylib"
+//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -730,64 +700,6 @@ var libc_ioctl_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func renamexNp(from string, to string, flag uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_renamex_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renamex_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renamex_np renamex_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_renameatx_np_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), uintptr(flag), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renameatx_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameatx_np renameatx_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -808,59 +720,6 @@ var libc_sysctl_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pthread_chdir_np(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pthread_chdir_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pthread_fchdir_np(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pthread_fchdir_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error) {
-	var _p0 unsafe.Pointer
-	if len(iov) > 0 {
-		_p0 = unsafe.Pointer(&iov[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall9(libc_connectx_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(endpoints)), uintptr(associd), uintptr(flags), uintptr(_p0), uintptr(len(iov)), uintptr(unsafe.Pointer(n)), uintptr(unsafe.Pointer(connid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_connectx_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connectx connectx "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) {
 	_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
 	if e1 != 0 {
@@ -875,65 +734,6 @@ var libc_sendfile_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func shmat(id int, addr uintptr, flag int) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmat_trampoline_addr, uintptr(id), uintptr(addr), uintptr(flag))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmat shmat "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmctl_trampoline_addr, uintptr(id), uintptr(cmd), uintptr(unsafe.Pointer(buf)))
-	result = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmctl shmctl "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmdt(addr uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_shmdt_trampoline_addr, uintptr(addr), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmdt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmdt shmdt "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmget(key int, size int, flag int) (id int, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmget_trampoline_addr, uintptr(key), uintptr(size), uintptr(flag))
-	id = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmget_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmget shmget "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1779,30 +1579,6 @@ var libc_mknod_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Open(path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1863,7 +1639,7 @@ var libc_pathconf_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1884,7 +1660,7 @@ var libc_pread_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -2094,31 +1870,6 @@ var libc_select_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(attrBuf) > 0 {
-		_p1 = unsafe.Pointer(&attrBuf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(attrlist)), uintptr(_p1), uintptr(len(attrBuf)), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setattrlist_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setegid(egid int) (err error) {
 	_, _, e1 := syscall_syscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
 	if e1 != 0 {
@@ -2250,6 +2001,20 @@ var libc_setreuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_setrlimit_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_setrlimit setrlimit "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
 	pid = int(r0)
@@ -2512,14 +2277,8 @@ var libc_munmap_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func readv(fd int, iovecs []Iovec) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2527,20 +2286,10 @@ func readv(fd int, iovecs []Iovec) (n int, err error) {
 	return
 }
 
-var libc_readv_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readv readv "/usr/lib/libSystem.B.dylib"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2548,52 +2297,6 @@ func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
 	return
 }
 
-var libc_preadv_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_preadv preadv "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writev(fd int, iovecs []Iovec) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_writev_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_writev writev "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pwritev_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwritev pwritev "/usr/lib/libSystem.B.dylib"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
index fda3285..bc169c2 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
@@ -1,799 +1,859 @@
-// go run mkasm.go darwin amd64
+// go run mkasm_darwin.go amd64
 // Code generated by the command above; DO NOT EDIT.
 
+//go:build go1.12
+// +build go1.12
+
 #include "textflag.h"
 
-TEXT libc_fdopendir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fdopendir(SB)
-GLOBL	·libc_fdopendir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fdopendir_trampoline_addr(SB)/8, $libc_fdopendir_trampoline<>(SB)
-
 TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getgroups(SB)
+
 GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
 
 TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setgroups(SB)
+
 GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
 
 TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_wait4(SB)
+
 GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
 DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
 
 TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_accept(SB)
+
 GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
 DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
 
 TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_bind(SB)
+
 GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
 DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
 
 TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_connect(SB)
+
 GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
 DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
 
 TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_socket(SB)
+
 GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
 DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
 
 TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsockopt(SB)
+
 GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
 
 TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsockopt(SB)
+
 GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
 
 TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpeername(SB)
+
 GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
 
 TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsockname(SB)
+
 GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
 
 TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_shutdown(SB)
+
 GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
 
 TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_socketpair(SB)
+
 GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
 DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
 
 TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_recvfrom(SB)
+
 GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
 DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
 
 TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendto(SB)
+
 GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
 
 TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_recvmsg(SB)
+
 GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
 DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
 
 TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendmsg(SB)
+
 GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
 
 TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kevent(SB)
+
 GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
 
 TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_utimes(SB)
+
 GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
 DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
 
 TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_futimes(SB)
+
 GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
 DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
 
 TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_poll(SB)
+
 GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
 DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
 
 TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_madvise(SB)
+
 GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
 DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
 
 TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mlock(SB)
+
 GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
 
 TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mlockall(SB)
+
 GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
 
 TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mprotect(SB)
+
 GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
 
 TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_msync(SB)
+
 GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
 
 TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
+
 GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
 
 TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
+
 GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
 
-TEXT libc_closedir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_closedir(SB)
-GLOBL	·libc_closedir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_closedir_trampoline_addr(SB)/8, $libc_closedir_trampoline<>(SB)
-
-TEXT libc_readdir_r_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readdir_r(SB)
-GLOBL	·libc_readdir_r_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readdir_r_trampoline_addr(SB)/8, $libc_readdir_r_trampoline<>(SB)
-
 TEXT libc_pipe_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
+
 GLOBL	·libc_pipe_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pipe_trampoline_addr(SB)/8, $libc_pipe_trampoline<>(SB)
 
 TEXT libc_getxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getxattr(SB)
+
 GLOBL	·libc_getxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getxattr_trampoline_addr(SB)/8, $libc_getxattr_trampoline<>(SB)
 
 TEXT libc_fgetxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fgetxattr(SB)
+
 GLOBL	·libc_fgetxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fgetxattr_trampoline_addr(SB)/8, $libc_fgetxattr_trampoline<>(SB)
 
 TEXT libc_setxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setxattr(SB)
+
 GLOBL	·libc_setxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setxattr_trampoline_addr(SB)/8, $libc_setxattr_trampoline<>(SB)
 
 TEXT libc_fsetxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fsetxattr(SB)
+
 GLOBL	·libc_fsetxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fsetxattr_trampoline_addr(SB)/8, $libc_fsetxattr_trampoline<>(SB)
 
 TEXT libc_removexattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_removexattr(SB)
+
 GLOBL	·libc_removexattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_removexattr_trampoline_addr(SB)/8, $libc_removexattr_trampoline<>(SB)
 
 TEXT libc_fremovexattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fremovexattr(SB)
+
 GLOBL	·libc_fremovexattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fremovexattr_trampoline_addr(SB)/8, $libc_fremovexattr_trampoline<>(SB)
 
 TEXT libc_listxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
+
 GLOBL	·libc_listxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_listxattr_trampoline_addr(SB)/8, $libc_listxattr_trampoline<>(SB)
 
 TEXT libc_flistxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+
 GLOBL	·libc_flistxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_flistxattr_trampoline_addr(SB)/8, $libc_flistxattr_trampoline<>(SB)
 
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
+TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
+
+GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
 
 TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fcntl(SB)
+
 GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
 
 TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
+
 GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
 
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
+
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
 
-TEXT libc_renamex_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renamex_np(SB)
-GLOBL	·libc_renamex_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renamex_np_trampoline_addr(SB)/8, $libc_renamex_np_trampoline<>(SB)
-
-TEXT libc_renameatx_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameatx_np(SB)
-GLOBL	·libc_renameatx_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameatx_np_trampoline_addr(SB)/8, $libc_renameatx_np_trampoline<>(SB)
-
 TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sysctl(SB)
+
 GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
 
-TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pthread_chdir_np(SB)
-GLOBL	·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
-
-TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pthread_fchdir_np(SB)
-GLOBL	·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
-
-TEXT libc_connectx_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connectx(SB)
-GLOBL	·libc_connectx_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connectx_trampoline_addr(SB)/8, $libc_connectx_trampoline<>(SB)
-
 TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendfile(SB)
+
 GLOBL	·libc_sendfile_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendfile_trampoline_addr(SB)/8, $libc_sendfile_trampoline<>(SB)
 
-TEXT libc_shmat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmat(SB)
-GLOBL	·libc_shmat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmat_trampoline_addr(SB)/8, $libc_shmat_trampoline<>(SB)
-
-TEXT libc_shmctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmctl(SB)
-GLOBL	·libc_shmctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmctl_trampoline_addr(SB)/8, $libc_shmctl_trampoline<>(SB)
-
-TEXT libc_shmdt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmdt(SB)
-GLOBL	·libc_shmdt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmdt_trampoline_addr(SB)/8, $libc_shmdt_trampoline<>(SB)
-
-TEXT libc_shmget_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmget(SB)
-GLOBL	·libc_shmget_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmget_trampoline_addr(SB)/8, $libc_shmget_trampoline<>(SB)
-
 TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_access(SB)
+
 GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
 DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
 
 TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_adjtime(SB)
+
 GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
 DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
 
 TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chdir(SB)
+
 GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
 
 TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chflags(SB)
+
 GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
 
 TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chmod(SB)
+
 GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
 
 TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chown(SB)
+
 GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
 
 TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chroot(SB)
+
 GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
 
 TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clock_gettime(SB)
+
 GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
 
 TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_close(SB)
+
 GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
 DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
 
 TEXT libc_clonefile_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clonefile(SB)
+
 GLOBL	·libc_clonefile_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clonefile_trampoline_addr(SB)/8, $libc_clonefile_trampoline<>(SB)
 
 TEXT libc_clonefileat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clonefileat(SB)
+
 GLOBL	·libc_clonefileat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clonefileat_trampoline_addr(SB)/8, $libc_clonefileat_trampoline<>(SB)
 
 TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_dup(SB)
+
 GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
 DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
 
 TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_dup2(SB)
+
 GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
 DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
 
 TEXT libc_exchangedata_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_exchangedata(SB)
+
 GLOBL	·libc_exchangedata_trampoline_addr(SB), RODATA, $8
 DATA	·libc_exchangedata_trampoline_addr(SB)/8, $libc_exchangedata_trampoline<>(SB)
 
 TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_exit(SB)
+
 GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
 DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
 
 TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_faccessat(SB)
+
 GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
 
 TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchdir(SB)
+
 GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
 
 TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchflags(SB)
+
 GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
 
 TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchmod(SB)
+
 GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
 
 TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchmodat(SB)
+
 GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
 
 TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchown(SB)
+
 GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
 
 TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchownat(SB)
+
 GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
 
 TEXT libc_fclonefileat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fclonefileat(SB)
+
 GLOBL	·libc_fclonefileat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fclonefileat_trampoline_addr(SB)/8, $libc_fclonefileat_trampoline<>(SB)
 
 TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_flock(SB)
+
 GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
 
 TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fpathconf(SB)
+
 GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
 
 TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
+
 GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
 
 TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+
 GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
 
 TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getcwd(SB)
+
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
 TEXT libc_getdtablesize_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
+
 GLOBL	·libc_getdtablesize_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getdtablesize_trampoline_addr(SB)/8, $libc_getdtablesize_trampoline<>(SB)
 
 TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getegid(SB)
+
 GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
 
 TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_geteuid(SB)
+
 GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
 
 TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getgid(SB)
+
 GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
 
 TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpgid(SB)
+
 GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
 
 TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpgrp(SB)
+
 GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
 
 TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpid(SB)
+
 GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
 
 TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getppid(SB)
+
 GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
 
 TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpriority(SB)
+
 GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
 
 TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getrlimit(SB)
+
 GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
 
 TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getrusage(SB)
+
 GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
 
 TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsid(SB)
+
 GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
 
 TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_gettimeofday(SB)
+
 GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
 DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
 
 TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getuid(SB)
+
 GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
 
 TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_issetugid(SB)
+
 GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
 
 TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kqueue(SB)
+
 GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
 
 TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lchown(SB)
+
 GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
 
 TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_link(SB)
+
 GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
 DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
 
 TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_linkat(SB)
+
 GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
 
 TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_listen(SB)
+
 GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
 DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
 
 TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkdir(SB)
+
 GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
 
 TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkdirat(SB)
+
 GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
 
 TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkfifo(SB)
+
 GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
 
 TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mknod(SB)
+
 GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
 
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
 TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_open(SB)
+
 GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
 DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
 
 TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_openat(SB)
+
 GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
 
 TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pathconf(SB)
+
 GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
 
 TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pread(SB)
+
 GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
 
 TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pwrite(SB)
+
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
+
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
 DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
 
 TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_readlink(SB)
+
 GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
 
 TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_readlinkat(SB)
+
 GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
 
 TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_rename(SB)
+
 GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
 DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
 
 TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_renameat(SB)
+
 GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
 
 TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_revoke(SB)
+
 GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
 DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
 
 TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_rmdir(SB)
+
 GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
 
 TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lseek(SB)
+
 GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
 
 TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_select(SB)
+
 GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
 DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
 
-TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setattrlist(SB)
-GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
-
 TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setegid(SB)
+
 GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
 
 TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_seteuid(SB)
+
 GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
 
 TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setgid(SB)
+
 GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
 
 TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setlogin(SB)
+
 GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
 
 TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setpgid(SB)
+
 GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
 
 TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setpriority(SB)
+
 GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
 
 TEXT libc_setprivexec_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setprivexec(SB)
+
 GLOBL	·libc_setprivexec_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setprivexec_trampoline_addr(SB)/8, $libc_setprivexec_trampoline<>(SB)
 
 TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setregid(SB)
+
 GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
 
 TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setreuid(SB)
+
 GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
 
+TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setrlimit(SB)
+
+GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
+
 TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsid(SB)
+
 GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
 
 TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_settimeofday(SB)
+
 GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
 DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
 
 TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setuid(SB)
+
 GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
 
 TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_symlink(SB)
+
 GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
 
 TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_symlinkat(SB)
+
 GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
 
 TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sync(SB)
+
 GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
 
 TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_truncate(SB)
+
 GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
 DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
 
 TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_umask(SB)
+
 GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
 DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
 
 TEXT libc_undelete_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_undelete(SB)
+
 GLOBL	·libc_undelete_trampoline_addr(SB), RODATA, $8
 DATA	·libc_undelete_trampoline_addr(SB)/8, $libc_undelete_trampoline<>(SB)
 
 TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unlink(SB)
+
 GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
 
 TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unlinkat(SB)
+
 GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
 
 TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unmount(SB)
+
 GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
 
 TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_write(SB)
+
 GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
 DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
 
 TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mmap(SB)
+
 GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
 
 TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munmap(SB)
+
 GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
 
-TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readv(SB)
-GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
-
-TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_preadv(SB)
-GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
-DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
-
-TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_writev(SB)
-GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
-DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
-
-TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwritev(SB)
-GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
-
 TEXT libc_fstat64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstat64(SB)
+
 GLOBL	·libc_fstat64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstat64_trampoline_addr(SB)/8, $libc_fstat64_trampoline<>(SB)
 
 TEXT libc_fstatat64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstatat64(SB)
+
 GLOBL	·libc_fstatat64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstatat64_trampoline_addr(SB)/8, $libc_fstatat64_trampoline<>(SB)
 
 TEXT libc_fstatfs64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstatfs64(SB)
+
 GLOBL	·libc_fstatfs64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstatfs64_trampoline_addr(SB)/8, $libc_fstatfs64_trampoline<>(SB)
 
 TEXT libc_getfsstat64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getfsstat64(SB)
+
 GLOBL	·libc_getfsstat64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getfsstat64_trampoline_addr(SB)/8, $libc_getfsstat64_trampoline<>(SB)
 
 TEXT libc_lstat64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lstat64(SB)
+
 GLOBL	·libc_lstat64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lstat64_trampoline_addr(SB)/8, $libc_lstat64_trampoline<>(SB)
 
 TEXT libc_ptrace_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ptrace(SB)
+
 GLOBL	·libc_ptrace_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ptrace_trampoline_addr(SB)/8, $libc_ptrace_trampoline<>(SB)
 
 TEXT libc_stat64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_stat64(SB)
+
 GLOBL	·libc_stat64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_stat64_trampoline_addr(SB)/8, $libc_stat64_trampoline<>(SB)
 
 TEXT libc_statfs64_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_statfs64(SB)
+
 GLOBL	·libc_statfs64_trampoline_addr(SB), RODATA, $8
 DATA	·libc_statfs64_trampoline_addr(SB)/8, $libc_statfs64_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go
new file mode 100644
index 0000000..cec595d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go
@@ -0,0 +1,40 @@
+// go run mksyscall.go -tags darwin,arm64,go1.13 syscall_darwin.1_13.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+//go:build darwin && arm64 && go1.13
+// +build darwin,arm64,go1.13
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func closedir(dir uintptr) (err error) {
+	_, _, e1 := syscall_syscall(libc_closedir_trampoline_addr, uintptr(dir), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_closedir_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_closedir closedir "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno) {
+	r0, _, _ := syscall_syscall(libc_readdir_r_trampoline_addr, uintptr(dir), uintptr(unsafe.Pointer(entry)), uintptr(unsafe.Pointer(result)))
+	res = Errno(r0)
+	return
+}
+
+var libc_readdir_r_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readdir_r readdir_r "/usr/lib/libSystem.B.dylib"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s
new file mode 100644
index 0000000..3579897
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s
@@ -0,0 +1,25 @@
+// go run mkasm_darwin.go arm64
+// Code generated by the command above; DO NOT EDIT.
+
+//go:build go1.13
+// +build go1.13
+
+#include "textflag.h"
+
+TEXT libc_fdopendir_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_fdopendir(SB)
+
+GLOBL	·libc_fdopendir_trampoline_addr(SB), RODATA, $8
+DATA	·libc_fdopendir_trampoline_addr(SB)/8, $libc_fdopendir_trampoline<>(SB)
+
+TEXT libc_closedir_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_closedir(SB)
+
+GLOBL	·libc_closedir_trampoline_addr(SB), RODATA, $8
+DATA	·libc_closedir_trampoline_addr(SB)/8, $libc_closedir_trampoline<>(SB)
+
+TEXT libc_readdir_r_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readdir_r(SB)
+
+GLOBL	·libc_readdir_r_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readdir_r_trampoline_addr(SB)/8, $libc_readdir_r_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index e6f58f3..f2ee2bd 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags darwin,arm64 syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
+// go run mksyscall.go -tags darwin,arm64,go1.12 syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
-//go:build darwin && arm64
+//go:build darwin && arm64 && go1.12
+// +build darwin,arm64,go1.12
 
 package unix
 
@@ -462,32 +463,6 @@ var libc_munlockall_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func closedir(dir uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_closedir_trampoline_addr, uintptr(dir), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_closedir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_closedir closedir "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno) {
-	r0, _, _ := syscall_syscall(libc_readdir_r_trampoline_addr, uintptr(dir), uintptr(unsafe.Pointer(entry)), uintptr(unsafe.Pointer(result)))
-	res = Errno(r0)
-	return
-}
-
-var libc_readdir_r_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readdir_r readdir_r "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe(p *[2]int32) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_pipe_trampoline_addr, uintptr(unsafe.Pointer(p)), 0, 0)
 	if e1 != 0 {
@@ -668,22 +643,17 @@ var libc_flistxattr_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
+	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimensat_trampoline_addr uintptr
+var libc_setattrlist_trampoline_addr uintptr
 
-//go:cgo_import_dynamic libc_utimensat utimensat "/usr/lib/libSystem.B.dylib"
+//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -730,64 +700,6 @@ var libc_ioctl_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func renamexNp(from string, to string, flag uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_renamex_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renamex_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renamex_np renamex_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_renameatx_np_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), uintptr(flag), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renameatx_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameatx_np renameatx_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -808,59 +720,6 @@ var libc_sysctl_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pthread_chdir_np(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pthread_chdir_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pthread_fchdir_np(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pthread_fchdir_np_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error) {
-	var _p0 unsafe.Pointer
-	if len(iov) > 0 {
-		_p0 = unsafe.Pointer(&iov[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall9(libc_connectx_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(endpoints)), uintptr(associd), uintptr(flags), uintptr(_p0), uintptr(len(iov)), uintptr(unsafe.Pointer(n)), uintptr(unsafe.Pointer(connid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_connectx_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connectx connectx "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) {
 	_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
 	if e1 != 0 {
@@ -875,65 +734,6 @@ var libc_sendfile_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func shmat(id int, addr uintptr, flag int) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmat_trampoline_addr, uintptr(id), uintptr(addr), uintptr(flag))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmat shmat "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmctl_trampoline_addr, uintptr(id), uintptr(cmd), uintptr(unsafe.Pointer(buf)))
-	result = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmctl shmctl "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmdt(addr uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_shmdt_trampoline_addr, uintptr(addr), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmdt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmdt shmdt "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmget(key int, size int, flag int) (id int, err error) {
-	r0, _, e1 := syscall_syscall(libc_shmget_trampoline_addr, uintptr(key), uintptr(size), uintptr(flag))
-	id = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shmget_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shmget shmget "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1779,30 +1579,6 @@ var libc_mknod_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Open(path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1863,7 +1639,7 @@ var libc_pathconf_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1884,7 +1660,7 @@ var libc_pread_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -2094,31 +1870,6 @@ var libc_select_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(attrBuf) > 0 {
-		_p1 = unsafe.Pointer(&attrBuf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(attrlist)), uintptr(_p1), uintptr(len(attrBuf)), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setattrlist_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setegid(egid int) (err error) {
 	_, _, e1 := syscall_syscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
 	if e1 != 0 {
@@ -2250,6 +2001,20 @@ var libc_setreuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_setrlimit_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_setrlimit setrlimit "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
 	pid = int(r0)
@@ -2512,14 +2277,8 @@ var libc_munmap_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func readv(fd int, iovecs []Iovec) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2527,20 +2286,10 @@ func readv(fd int, iovecs []Iovec) (n int, err error) {
 	return
 }
 
-var libc_readv_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readv readv "/usr/lib/libSystem.B.dylib"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2548,52 +2297,6 @@ func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
 	return
 }
 
-var libc_preadv_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_preadv preadv "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writev(fd int, iovecs []Iovec) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_writev_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_writev writev "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(iovecs) > 0 {
-		_p0 = unsafe.Pointer(&iovecs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pwritev_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwritev pwritev "/usr/lib/libSystem.B.dylib"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
index 7f8998b..33e1977 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
@@ -1,799 +1,859 @@
-// go run mkasm.go darwin arm64
+// go run mkasm_darwin.go arm64
 // Code generated by the command above; DO NOT EDIT.
 
+//go:build go1.12
+// +build go1.12
+
 #include "textflag.h"
 
-TEXT libc_fdopendir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fdopendir(SB)
-GLOBL	·libc_fdopendir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fdopendir_trampoline_addr(SB)/8, $libc_fdopendir_trampoline<>(SB)
-
 TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getgroups(SB)
+
 GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
 
 TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setgroups(SB)
+
 GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
 
 TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_wait4(SB)
+
 GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
 DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
 
 TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_accept(SB)
+
 GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
 DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
 
 TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_bind(SB)
+
 GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
 DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
 
 TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_connect(SB)
+
 GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
 DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
 
 TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_socket(SB)
+
 GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
 DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
 
 TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsockopt(SB)
+
 GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
 
 TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsockopt(SB)
+
 GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
 
 TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpeername(SB)
+
 GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
 
 TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsockname(SB)
+
 GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
 
 TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_shutdown(SB)
+
 GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
 
 TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_socketpair(SB)
+
 GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
 DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
 
 TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_recvfrom(SB)
+
 GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
 DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
 
 TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendto(SB)
+
 GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
 
 TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_recvmsg(SB)
+
 GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
 DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
 
 TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendmsg(SB)
+
 GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
 
 TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kevent(SB)
+
 GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
 
 TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_utimes(SB)
+
 GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
 DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
 
 TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_futimes(SB)
+
 GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
 DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
 
 TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_poll(SB)
+
 GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
 DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
 
 TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_madvise(SB)
+
 GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
 DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
 
 TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mlock(SB)
+
 GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
 
 TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mlockall(SB)
+
 GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
 
 TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mprotect(SB)
+
 GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
 
 TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_msync(SB)
+
 GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
 
 TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
+
 GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
 
 TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
+
 GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
 
-TEXT libc_closedir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_closedir(SB)
-GLOBL	·libc_closedir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_closedir_trampoline_addr(SB)/8, $libc_closedir_trampoline<>(SB)
-
-TEXT libc_readdir_r_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readdir_r(SB)
-GLOBL	·libc_readdir_r_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readdir_r_trampoline_addr(SB)/8, $libc_readdir_r_trampoline<>(SB)
-
 TEXT libc_pipe_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
+
 GLOBL	·libc_pipe_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pipe_trampoline_addr(SB)/8, $libc_pipe_trampoline<>(SB)
 
 TEXT libc_getxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getxattr(SB)
+
 GLOBL	·libc_getxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getxattr_trampoline_addr(SB)/8, $libc_getxattr_trampoline<>(SB)
 
 TEXT libc_fgetxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fgetxattr(SB)
+
 GLOBL	·libc_fgetxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fgetxattr_trampoline_addr(SB)/8, $libc_fgetxattr_trampoline<>(SB)
 
 TEXT libc_setxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setxattr(SB)
+
 GLOBL	·libc_setxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setxattr_trampoline_addr(SB)/8, $libc_setxattr_trampoline<>(SB)
 
 TEXT libc_fsetxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fsetxattr(SB)
+
 GLOBL	·libc_fsetxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fsetxattr_trampoline_addr(SB)/8, $libc_fsetxattr_trampoline<>(SB)
 
 TEXT libc_removexattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_removexattr(SB)
+
 GLOBL	·libc_removexattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_removexattr_trampoline_addr(SB)/8, $libc_removexattr_trampoline<>(SB)
 
 TEXT libc_fremovexattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fremovexattr(SB)
+
 GLOBL	·libc_fremovexattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fremovexattr_trampoline_addr(SB)/8, $libc_fremovexattr_trampoline<>(SB)
 
 TEXT libc_listxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
+
 GLOBL	·libc_listxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_listxattr_trampoline_addr(SB)/8, $libc_listxattr_trampoline<>(SB)
 
 TEXT libc_flistxattr_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+
 GLOBL	·libc_flistxattr_trampoline_addr(SB), RODATA, $8
 DATA	·libc_flistxattr_trampoline_addr(SB)/8, $libc_flistxattr_trampoline<>(SB)
 
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
+TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
+
+GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
 
 TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fcntl(SB)
+
 GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
 
 TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
+
 GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
 
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
+
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
 
-TEXT libc_renamex_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renamex_np(SB)
-GLOBL	·libc_renamex_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renamex_np_trampoline_addr(SB)/8, $libc_renamex_np_trampoline<>(SB)
-
-TEXT libc_renameatx_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameatx_np(SB)
-GLOBL	·libc_renameatx_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameatx_np_trampoline_addr(SB)/8, $libc_renameatx_np_trampoline<>(SB)
-
 TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sysctl(SB)
+
 GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
 
-TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pthread_chdir_np(SB)
-GLOBL	·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
-
-TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pthread_fchdir_np(SB)
-GLOBL	·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
-
-TEXT libc_connectx_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connectx(SB)
-GLOBL	·libc_connectx_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connectx_trampoline_addr(SB)/8, $libc_connectx_trampoline<>(SB)
-
 TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sendfile(SB)
+
 GLOBL	·libc_sendfile_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sendfile_trampoline_addr(SB)/8, $libc_sendfile_trampoline<>(SB)
 
-TEXT libc_shmat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmat(SB)
-GLOBL	·libc_shmat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmat_trampoline_addr(SB)/8, $libc_shmat_trampoline<>(SB)
-
-TEXT libc_shmctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmctl(SB)
-GLOBL	·libc_shmctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmctl_trampoline_addr(SB)/8, $libc_shmctl_trampoline<>(SB)
-
-TEXT libc_shmdt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmdt(SB)
-GLOBL	·libc_shmdt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmdt_trampoline_addr(SB)/8, $libc_shmdt_trampoline<>(SB)
-
-TEXT libc_shmget_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shmget(SB)
-GLOBL	·libc_shmget_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shmget_trampoline_addr(SB)/8, $libc_shmget_trampoline<>(SB)
-
 TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_access(SB)
+
 GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
 DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
 
 TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_adjtime(SB)
+
 GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
 DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
 
 TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chdir(SB)
+
 GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
 
 TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chflags(SB)
+
 GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
 
 TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chmod(SB)
+
 GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
 
 TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chown(SB)
+
 GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
 
 TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_chroot(SB)
+
 GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
 DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
 
 TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clock_gettime(SB)
+
 GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
 
 TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_close(SB)
+
 GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
 DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
 
 TEXT libc_clonefile_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clonefile(SB)
+
 GLOBL	·libc_clonefile_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clonefile_trampoline_addr(SB)/8, $libc_clonefile_trampoline<>(SB)
 
 TEXT libc_clonefileat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_clonefileat(SB)
+
 GLOBL	·libc_clonefileat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_clonefileat_trampoline_addr(SB)/8, $libc_clonefileat_trampoline<>(SB)
 
 TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_dup(SB)
+
 GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
 DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
 
 TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_dup2(SB)
+
 GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
 DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
 
 TEXT libc_exchangedata_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_exchangedata(SB)
+
 GLOBL	·libc_exchangedata_trampoline_addr(SB), RODATA, $8
 DATA	·libc_exchangedata_trampoline_addr(SB)/8, $libc_exchangedata_trampoline<>(SB)
 
 TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_exit(SB)
+
 GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
 DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
 
 TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_faccessat(SB)
+
 GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
 
 TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchdir(SB)
+
 GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
 
 TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchflags(SB)
+
 GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
 
 TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchmod(SB)
+
 GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
 
 TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchmodat(SB)
+
 GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
 
 TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchown(SB)
+
 GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
 
 TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fchownat(SB)
+
 GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
 
 TEXT libc_fclonefileat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fclonefileat(SB)
+
 GLOBL	·libc_fclonefileat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fclonefileat_trampoline_addr(SB)/8, $libc_fclonefileat_trampoline<>(SB)
 
 TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_flock(SB)
+
 GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
 DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
 
 TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fpathconf(SB)
+
 GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
 
 TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
+
 GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
 
 TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+
 GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
 
 TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getcwd(SB)
+
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
 TEXT libc_getdtablesize_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
+
 GLOBL	·libc_getdtablesize_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getdtablesize_trampoline_addr(SB)/8, $libc_getdtablesize_trampoline<>(SB)
 
 TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getegid(SB)
+
 GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
 
 TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_geteuid(SB)
+
 GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
 
 TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getgid(SB)
+
 GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
 
 TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpgid(SB)
+
 GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
 
 TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpgrp(SB)
+
 GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
 
 TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpid(SB)
+
 GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
 
 TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getppid(SB)
+
 GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
 
 TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getpriority(SB)
+
 GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
 
 TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getrlimit(SB)
+
 GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
 
 TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getrusage(SB)
+
 GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
 
 TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getsid(SB)
+
 GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
 
 TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_gettimeofday(SB)
+
 GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
 DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
 
 TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getuid(SB)
+
 GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
 
 TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_issetugid(SB)
+
 GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
 
 TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_kqueue(SB)
+
 GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
 DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
 
 TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lchown(SB)
+
 GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
 
 TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_link(SB)
+
 GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
 DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
 
 TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_linkat(SB)
+
 GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
 
 TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_listen(SB)
+
 GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
 DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
 
 TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkdir(SB)
+
 GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
 
 TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkdirat(SB)
+
 GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
 
 TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mkfifo(SB)
+
 GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
 
 TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mknod(SB)
+
 GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
 
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
 TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_open(SB)
+
 GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
 DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
 
 TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_openat(SB)
+
 GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
 
 TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pathconf(SB)
+
 GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
 
 TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pread(SB)
+
 GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
 
 TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_pwrite(SB)
+
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
+
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
 DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
 
 TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_readlink(SB)
+
 GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
 
 TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_readlinkat(SB)
+
 GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
 
 TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_rename(SB)
+
 GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
 DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
 
 TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_renameat(SB)
+
 GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
 
 TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_revoke(SB)
+
 GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
 DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
 
 TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_rmdir(SB)
+
 GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
 DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
 
 TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lseek(SB)
+
 GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
 
 TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_select(SB)
+
 GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
 DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
 
-TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setattrlist(SB)
-GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
-
 TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setegid(SB)
+
 GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
 
 TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_seteuid(SB)
+
 GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
 
 TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setgid(SB)
+
 GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
 
 TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setlogin(SB)
+
 GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
 
 TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setpgid(SB)
+
 GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
 
 TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setpriority(SB)
+
 GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
 
 TEXT libc_setprivexec_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setprivexec(SB)
+
 GLOBL	·libc_setprivexec_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setprivexec_trampoline_addr(SB)/8, $libc_setprivexec_trampoline<>(SB)
 
 TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setregid(SB)
+
 GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
 
 TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setreuid(SB)
+
 GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
 
+TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setrlimit(SB)
+
+GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
+
 TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsid(SB)
+
 GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
 
 TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_settimeofday(SB)
+
 GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
 DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
 
 TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setuid(SB)
+
 GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
 
 TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_symlink(SB)
+
 GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
 
 TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_symlinkat(SB)
+
 GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
 
 TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_sync(SB)
+
 GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
 DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
 
 TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_truncate(SB)
+
 GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
 DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
 
 TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_umask(SB)
+
 GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
 DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
 
 TEXT libc_undelete_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_undelete(SB)
+
 GLOBL	·libc_undelete_trampoline_addr(SB), RODATA, $8
 DATA	·libc_undelete_trampoline_addr(SB)/8, $libc_undelete_trampoline<>(SB)
 
 TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unlink(SB)
+
 GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
 
 TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unlinkat(SB)
+
 GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
 
 TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_unmount(SB)
+
 GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
 DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
 
 TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_write(SB)
+
 GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
 DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
 
 TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_mmap(SB)
+
 GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
 DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
 
 TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_munmap(SB)
+
 GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
 DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
 
-TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readv(SB)
-GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
-
-TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_preadv(SB)
-GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
-DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
-
-TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_writev(SB)
-GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
-DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
-
-TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwritev(SB)
-GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
-
 TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstat(SB)
+
 GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
 
 TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstatat(SB)
+
 GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
 
 TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_fstatfs(SB)
+
 GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
 DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
 
 TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_getfsstat(SB)
+
 GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
 
 TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_lstat(SB)
+
 GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
 
 TEXT libc_ptrace_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ptrace(SB)
+
 GLOBL	·libc_ptrace_trampoline_addr(SB), RODATA, $8
 DATA	·libc_ptrace_trampoline_addr(SB)/8, $libc_ptrace_trampoline<>(SB)
 
 TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_stat(SB)
+
 GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
 DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
 
 TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_statfs(SB)
+
 GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
 DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
index aad65fc..1b6eedf 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build dragonfly && amd64
+// +build dragonfly,amd64
 
 package unix
 
@@ -435,16 +436,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -561,16 +552,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1409,6 +1390,16 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1641,6 +1632,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	nfd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
index c009639..3e9bddb 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build freebsd && 386
+// +build freebsd,386
 
 package unix
 
@@ -387,16 +388,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -423,16 +414,6 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -563,16 +544,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -941,7 +912,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstat(fd int, stat *Stat_t) (err error) {
+func fstat(fd int, stat *stat_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -951,7 +922,17 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -966,7 +947,22 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
+func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatfs(fd int, stat *statfs_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -976,6 +972,16 @@ func Fstatfs(fd int, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatfs_freebsd12(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -996,7 +1002,7 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
+func getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
 		_p0 = unsafe.Pointer(&buf[0])
@@ -1013,6 +1019,23 @@ func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getdirentries_freebsd12(fd int, buf []byte, basep *uint64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES_FREEBSD12, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
 	size = int(r0)
@@ -1234,6 +1257,21 @@ func Listen(s int, backlog int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func lstat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdir(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1279,13 +1317,43 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
+func mknod(path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), uintptr(dev>>32), 0)
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat(fd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat_freebsd12(fd int, path string, mode uint32, dev uint64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), uintptr(dev>>32), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1352,7 +1420,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1369,7 +1437,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1644,6 +1712,16 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1675,7 +1753,22 @@ func Setuid(uid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Statfs(path string, stat *Statfs_t) (err error) {
+func stat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func statfs(path string, stat *statfs_freebsd11_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1690,6 +1783,21 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func statfs_freebsd12(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS_FREEBSD12, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Symlink(path string, link string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1861,6 +1969,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	nfd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
index 7664df7..c72a462 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build freebsd && amd64
+// +build freebsd,amd64
 
 package unix
 
@@ -387,16 +388,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -423,16 +414,6 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -563,16 +544,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -941,7 +912,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstat(fd int, stat *Stat_t) (err error) {
+func fstat(fd int, stat *stat_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -951,7 +922,17 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -966,7 +947,22 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
+func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatfs(fd int, stat *statfs_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -976,6 +972,16 @@ func Fstatfs(fd int, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatfs_freebsd12(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -996,7 +1002,7 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
+func getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
 		_p0 = unsafe.Pointer(&buf[0])
@@ -1013,6 +1019,23 @@ func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getdirentries_freebsd12(fd int, buf []byte, basep *uint64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES_FREEBSD12, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
 	size = int(r0)
@@ -1234,6 +1257,21 @@ func Listen(s int, backlog int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func lstat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdir(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1279,7 +1317,22 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
+func mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat(fd int, path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1294,6 +1347,21 @@ func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func mknodat_freebsd12(fd int, path string, mode uint32, dev uint64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1352,7 +1420,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1369,7 +1437,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1644,6 +1712,16 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1675,7 +1753,22 @@ func Setuid(uid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Statfs(path string, stat *Statfs_t) (err error) {
+func stat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func statfs(path string, stat *statfs_freebsd11_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1690,6 +1783,21 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func statfs_freebsd12(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS_FREEBSD12, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Symlink(path string, link string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1861,6 +1969,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	nfd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
index ae09918..530d5df 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build freebsd && arm
+// +build freebsd,arm
 
 package unix
 
@@ -350,6 +351,22 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
@@ -387,32 +404,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -423,16 +414,6 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -563,16 +544,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -941,7 +912,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstat(fd int, stat *Stat_t) (err error) {
+func fstat(fd int, stat *stat_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -951,7 +922,17 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -966,7 +947,22 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
+func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatfs(fd int, stat *statfs_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -976,6 +972,16 @@ func Fstatfs(fd int, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatfs_freebsd12(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -996,7 +1002,7 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
+func getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
 		_p0 = unsafe.Pointer(&buf[0])
@@ -1013,6 +1019,23 @@ func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getdirentries_freebsd12(fd int, buf []byte, basep *uint64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES_FREEBSD12, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
 	size = int(r0)
@@ -1234,6 +1257,21 @@ func Listen(s int, backlog int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func lstat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdir(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1279,13 +1317,43 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
+func mknod(path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, uintptr(dev), uintptr(dev>>32))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat(fd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat_freebsd12(fd int, path string, mode uint32, dev uint64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1352,7 +1420,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1369,7 +1437,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1644,6 +1712,16 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1675,7 +1753,22 @@ func Setuid(uid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Statfs(path string, stat *Statfs_t) (err error) {
+func stat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func statfs(path string, stat *statfs_freebsd11_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1690,6 +1783,21 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func statfs_freebsd12(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS_FREEBSD12, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Symlink(path string, link string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1861,6 +1969,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	nfd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
index 11fd5d4..71e7df9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build freebsd && arm64
+// +build freebsd,arm64
 
 package unix
 
@@ -387,16 +388,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -423,16 +414,6 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -563,16 +544,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -941,7 +912,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstat(fd int, stat *Stat_t) (err error) {
+func fstat(fd int, stat *stat_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -951,7 +922,17 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -966,7 +947,22 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
+func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstatfs(fd int, stat *statfs_freebsd11_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -976,6 +972,16 @@ func Fstatfs(fd int, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatfs_freebsd12(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -996,7 +1002,7 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
+func getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
 		_p0 = unsafe.Pointer(&buf[0])
@@ -1013,6 +1019,23 @@ func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getdirentries_freebsd12(fd int, buf []byte, basep *uint64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES_FREEBSD12, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
 	size = int(r0)
@@ -1234,6 +1257,21 @@ func Listen(s int, backlog int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func lstat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdir(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1279,7 +1317,22 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
+func mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mknodat(fd int, path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1294,6 +1347,21 @@ func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func mknodat_freebsd12(fd int, path string, mode uint32, dev uint64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT_FREEBSD12, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1352,7 +1420,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1369,7 +1437,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1644,6 +1712,16 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1675,7 +1753,22 @@ func Setuid(uid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Statfs(path string, stat *Statfs_t) (err error) {
+func stat(path string, stat *stat_freebsd11_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func statfs(path string, stat *statfs_freebsd11_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
@@ -1690,6 +1783,21 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func statfs_freebsd12(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS_FREEBSD12, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Symlink(path string, link string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1861,6 +1969,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	nfd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
deleted file mode 100644
index c3d2d65..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
+++ /dev/null
@@ -1,1886 +0,0 @@
-// go run mksyscall.go -tags freebsd,riscv64 syscall_bsd.go syscall_freebsd.go syscall_freebsd_riscv64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build freebsd && riscv64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, behav int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Msync(b []byte, flags int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CapEnter() (err error) {
-	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
-	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func capRightsLimit(fd int, rightsp *CapRights) (err error) {
-	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdirentries(fd int, buf []byte, basep *uint64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(fd int, path string, mode uint32, dev uint64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(fromfd int, from string, tofd int, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
index c698cbc..af5cb06 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build illumos && amd64
+// +build illumos,amd64
 
 package unix
 
@@ -14,19 +15,25 @@ import (
 //go:cgo_import_dynamic libc_writev writev "libc.so"
 //go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
 //go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so"
+//go:cgo_import_dynamic libc_putmsg putmsg "libc.so"
+//go:cgo_import_dynamic libc_getmsg getmsg "libc.so"
 
 //go:linkname procreadv libc_readv
 //go:linkname procpreadv libc_preadv
 //go:linkname procwritev libc_writev
 //go:linkname procpwritev libc_pwritev
 //go:linkname procaccept4 libc_accept4
+//go:linkname procputmsg libc_putmsg
+//go:linkname procgetmsg libc_getmsg
 
 var (
 	procreadv,
 	procpreadv,
 	procwritev,
 	procpwritev,
-	procaccept4 syscallFunc
+	procaccept4,
+	procputmsg,
+	procgetmsg syscallFunc
 )
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
@@ -39,7 +46,7 @@ func readv(fd int, iovs []Iovec) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procreadv)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(iovs)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -54,7 +61,7 @@ func preadv(fd int, iovs []Iovec, off int64) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpreadv)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(iovs)), uintptr(off), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -69,7 +76,7 @@ func writev(fd int, iovs []Iovec) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwritev)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(iovs)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -84,7 +91,7 @@ func pwritev(fd int, iovs []Iovec, off int64) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpwritev)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(iovs)), uintptr(off), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -95,7 +102,27 @@ func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int,
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept4)), 4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func putmsg(fd int, clptr *strbuf, dataptr *strbuf, flags int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procputmsg)), 4, uintptr(fd), uintptr(unsafe.Pointer(clptr)), uintptr(unsafe.Pointer(dataptr)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getmsg(fd int, clptr *strbuf, dataptr *strbuf, flags *int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetmsg)), 4, uintptr(fd), uintptr(unsafe.Pointer(clptr)), uintptr(unsafe.Pointer(dataptr)), uintptr(unsafe.Pointer(flags)), 0, 0)
+	if e1 != 0 {
+		err = e1
 	}
 	return
 }
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 5cc1e8e..2dbe3da 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -1,6 +1,7 @@
-// Code generated by mkmerge; DO NOT EDIT.
+// Code generated by mkmerge.go; DO NOT EDIT.
 
 //go:build linux
+// +build linux
 
 package unix
 
@@ -37,21 +38,6 @@ func fchmodat(dirfd int, path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func fchmodat2(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT2, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -124,16 +110,6 @@ func openat2(dirfd int, path string, open_how *OpenHow, size int) (fd int, err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
 	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
@@ -245,16 +221,6 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Waitid(idType int, id int, info *Siginfo, options int, rusage *Rusage) (err error) {
-	_, _, e1 := Syscall6(SYS_WAITID, uintptr(idType), uintptr(id), uintptr(unsafe.Pointer(info)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
 	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	ret = int(r0)
@@ -393,16 +359,6 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(arg)
@@ -443,21 +399,6 @@ func mount(source string, target string, fstype string, flags uintptr, data *byt
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func mountSetattr(dirfd int, pathname string, flags uint, attr *MountAttr, size uintptr) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT_SETATTR, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(unsafe.Pointer(attr)), uintptr(size), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -561,17 +502,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockAdjtime(clockid int32, buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_CLOCK_ADJTIME, uintptr(clockid), uintptr(unsafe.Pointer(buf)), 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func ClockGetres(clockid int32, res *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0)
 	if e1 != 0 {
@@ -592,16 +522,6 @@ func ClockGettime(clockid int32, time *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockSettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_SETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) {
 	_, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0)
 	if e1 != 0 {
@@ -873,59 +793,6 @@ func Fsync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fsmount(fd int, flags int, mountAttrs int) (fsfd int, err error) {
-	r0, _, e1 := Syscall(SYS_FSMOUNT, uintptr(fd), uintptr(flags), uintptr(mountAttrs))
-	fsfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsopen(fsName string, flags int) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsName)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_FSOPEN, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fspick(dirfd int, pathName string, flags int) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathName)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_FSPICK, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fsconfig(fd int, cmd uint, key *byte, value *byte, aux int) (err error) {
-	_, _, e1 := Syscall6(SYS_FSCONFIG, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(value)), uintptr(aux), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Getdents(fd int, buf []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
@@ -981,6 +848,23 @@ func Getpriority(which int, who int) (prio int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getrusage(who int, rusage *Rusage) (err error) {
 	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
@@ -1286,26 +1170,6 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func MoveMount(fromDirfd int, fromPathName string, toDirfd int, toPathName string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fromPathName)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(toPathName)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOVE_MOUNT, uintptr(fromDirfd), uintptr(unsafe.Pointer(_p0)), uintptr(toDirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1316,22 +1180,6 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func OpenTree(dfd int, fileName string, flags uint) (r int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fileName)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN_TREE, uintptr(dfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	r = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
 	fd = int(r0)
@@ -1363,6 +1211,16 @@ func PivotRoot(newroot string, putold string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	if e1 != 0 {
@@ -1373,7 +1231,7 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error) {
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
 	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
 	n = int(r0)
 	if e1 != 0 {
@@ -1751,6 +1609,28 @@ func exitThread(code int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func readv(fd int, iovs []Iovec) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(iovs) > 0 {
@@ -1863,17 +1743,6 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldaddr), uintptr(oldlength), uintptr(newlength), uintptr(flags), uintptr(newaddr), 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Madvise(b []byte, advice int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
@@ -2076,163 +1945,8 @@ func ProcessVMWritev(pid int, localIov []Iovec, remoteIov []RemoteIovec, flags u
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func PidfdOpen(pid int, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_PIDFD_OPEN, uintptr(pid), uintptr(flags), 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PidfdGetfd(pidfd int, targetfd int, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_PIDFD_GETFD, uintptr(pidfd), uintptr(targetfd), uintptr(flags))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PidfdSendSignal(pidfd int, sig Signal, info *Siginfo, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_PIDFD_SEND_SIGNAL, uintptr(pidfd), uintptr(sig), uintptr(unsafe.Pointer(info)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmat(id int, addr uintptr, flag int) (ret uintptr, err error) {
-	r0, _, e1 := Syscall(SYS_SHMAT, uintptr(id), uintptr(addr), uintptr(flag))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error) {
-	r0, _, e1 := Syscall(SYS_SHMCTL, uintptr(id), uintptr(cmd), uintptr(unsafe.Pointer(buf)))
-	result = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmdt(addr uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_SHMDT, uintptr(addr), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmget(key int, size int, flag int) (id int, err error) {
-	r0, _, e1 := Syscall(SYS_SHMGET, uintptr(key), uintptr(size), uintptr(flag))
-	id = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getitimer(which int, currValue *Itimerval) (err error) {
-	_, _, e1 := Syscall(SYS_GETITIMER, uintptr(which), uintptr(unsafe.Pointer(currValue)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setitimer(which int, newValue *Itimerval, oldValue *Itimerval) (err error) {
-	_, _, e1 := Syscall(SYS_SETITIMER, uintptr(which), uintptr(unsafe.Pointer(newValue)), uintptr(unsafe.Pointer(oldValue)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func rtSigprocmask(how int, set *Sigset_t, oldset *Sigset_t, sigsetsize uintptr) (err error) {
-	_, _, e1 := RawSyscall6(SYS_RT_SIGPROCMASK, uintptr(how), uintptr(unsafe.Pointer(set)), uintptr(unsafe.Pointer(oldset)), uintptr(sigsetsize), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	RawSyscallNoError(SYS_GETRESUID, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	RawSyscallNoError(SYS_GETRESGID, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func schedSetattr(pid int, attr *SchedAttr, flags uint) (err error) {
-	_, _, e1 := Syscall(SYS_SCHED_SETATTR, uintptr(pid), uintptr(unsafe.Pointer(attr)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func schedGetattr(pid int, attr *SchedAttr, size uint, flags uint) (err error) {
-	_, _, e1 := Syscall6(SYS_SCHED_GETATTR, uintptr(pid), uintptr(unsafe.Pointer(attr)), uintptr(size), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) (err error) {
-	_, _, e1 := Syscall6(SYS_CACHESTAT, uintptr(fd), uintptr(unsafe.Pointer(crange)), uintptr(unsafe.Pointer(cstat)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mseal(b []byte, flags uint) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MSEAL, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 4def3e9..e37096e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -l32 -tags linux,386 syscall_linux.go syscall_linux_386.go syscall_linux_alarm.go
+// go run mksyscall.go -l32 -tags linux,386 syscall_linux.go syscall_linux_386.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && 386
+// +build linux,386
 
 package unix
 
@@ -45,6 +46,37 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -149,6 +181,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -199,7 +242,7 @@ func Lstat(path string, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -216,7 +259,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -286,6 +329,46 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
 	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
 	n = int(r0)
@@ -410,6 +493,16 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -476,9 +569,9 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index fef2bc8..c62e1d0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,amd64 syscall_linux.go syscall_linux_amd64.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,amd64 syscall_linux.go syscall_linux_amd64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && amd64
+// +build linux,amd64
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -214,17 +236,6 @@ func Listen(s int, n int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func MemfdSecret(flags int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_MEMFD_SECRET, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Pause() (err error) {
 	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
 	if e1 != 0 {
@@ -235,7 +246,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -252,7 +263,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -333,6 +344,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -404,6 +465,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -628,6 +700,27 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(cmdline)
@@ -640,14 +733,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index a9fd76a..076754d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && arm
+// +build linux,arm
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -213,6 +235,27 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -297,6 +340,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Lchown(path string, uid int, gid int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -411,6 +465,46 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -497,7 +591,7 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -514,7 +608,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -577,6 +671,27 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func armSyncFileRange(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_ARM_SYNC_FILE_RANGE, uintptr(fd), uintptr(flags), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index 4600650..e893f98 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && arm64
+// +build linux,arm64
 
 package unix
 
@@ -179,18 +180,7 @@ func Listen(s int, n int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func MemfdSecret(flags int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_MEMFD_SECRET, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -207,7 +197,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -288,6 +278,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -349,6 +389,17 @@ func Truncate(path string, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
deleted file mode 100644
index c8987d2..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
+++ /dev/null
@@ -1,486 +0,0 @@
-// go run mksyscall.go -tags linux,loong64 syscall_linux.go syscall_linux_loong64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build linux && loong64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) {
-	_, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setfsgid(gid int) (prev int, err error) {
-	r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	prev = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setfsuid(uid int) (prev int, err error) {
-	r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	prev = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(cmdline)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_KEXEC_FILE_LOAD, uintptr(kernelFd), uintptr(initrdFd), uintptr(cmdlineLen), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index 921f430..4703cf3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -b32 -arm -tags linux,mips syscall_linux.go syscall_linux_mipsx.go syscall_linux_alarm.go
+// go run mksyscall.go -b32 -arm -tags linux,mips syscall_linux.go syscall_linux_mipsx.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && mips
+// +build linux,mips
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -149,7 +171,7 @@ func Listen(s int, n int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -166,7 +188,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -247,6 +269,46 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -303,6 +365,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -471,6 +544,17 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -622,6 +706,18 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
 	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
 	xaddr = uintptr(r0)
@@ -643,9 +739,19 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index 44f0678..a134f9a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,mips64 syscall_linux.go syscall_linux_mips64x.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,mips64 syscall_linux.go syscall_linux_mips64x.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && mips64
+// +build linux,mips64
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -179,7 +201,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -196,7 +218,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -277,6 +299,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -348,6 +420,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -637,9 +720,9 @@ func stat(path string, st *stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index e7fa0ab..b1fff2d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && mips64le
+// +build linux,mips64le
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -179,7 +201,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -196,7 +218,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -277,6 +299,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -348,6 +420,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -634,3 +717,14 @@ func stat(path string, st *stat_t) (err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index 8c51256..d13d6da 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -l32 -arm -tags linux,mipsle syscall_linux.go syscall_linux_mipsx.go syscall_linux_alarm.go
+// go run mksyscall.go -l32 -arm -tags linux,mipsle syscall_linux.go syscall_linux_mipsx.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && mipsle
+// +build linux,mipsle
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -149,7 +171,7 @@ func Listen(s int, n int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -166,7 +188,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -247,6 +269,46 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -303,6 +365,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -471,6 +544,17 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -622,6 +706,18 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
 	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
 	xaddr = uintptr(r0)
@@ -643,9 +739,19 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
index 7392fd4..927cf1a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -b32 -tags linux,ppc syscall_linux.go syscall_linux_ppc.go syscall_linux_alarm.go
+// go run mksyscall.go -b32 -tags linux,ppc syscall_linux.go syscall_linux_ppc.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && ppc
+// +build linux,ppc
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -139,6 +161,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -209,7 +242,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -226,7 +259,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -307,6 +340,46 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -368,6 +441,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -623,6 +707,37 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func syncFileRange2(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(flags), uintptr(off>>32), uintptr(off), uintptr(n>>32), uintptr(n))
 	if e1 != 0 {
@@ -645,14 +760,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 4118043..da8ec03 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,ppc64 syscall_linux.go syscall_linux_ppc64x.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,ppc64 syscall_linux.go syscall_linux_ppc64x.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && ppc64
+// +build linux,ppc64
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -169,6 +191,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -239,7 +272,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -256,7 +289,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -348,6 +381,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -424,6 +507,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -669,6 +763,27 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func syncFileRange2(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(flags), uintptr(off), uintptr(n), 0, 0)
 	if e1 != 0 {
@@ -691,14 +806,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index 40c6ce7..083f493 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,ppc64le syscall_linux.go syscall_linux_ppc64x.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,ppc64le syscall_linux.go syscall_linux_ppc64x.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && ppc64le
+// +build linux,ppc64le
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -169,6 +191,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -239,7 +272,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -256,7 +289,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -348,6 +381,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -424,6 +507,17 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -669,6 +763,27 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func syncFileRange2(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(flags), uintptr(off), uintptr(n), 0, 0)
 	if e1 != 0 {
@@ -691,14 +806,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
index 2cfe34a..63b393b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && riscv64
+// +build linux,riscv64
 
 package unix
 
@@ -179,18 +180,7 @@ func Listen(s int, n int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func MemfdSecret(flags int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_MEMFD_SECRET, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -207,7 +197,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -268,6 +258,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -329,6 +369,17 @@ func Truncate(path string, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -530,19 +581,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error) {
-	var _p0 unsafe.Pointer
-	if len(pairs) > 0 {
-		_p0 = unsafe.Pointer(&pairs[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_RISCV_HWPROBE, uintptr(_p0), uintptr(len(pairs)), uintptr(cpuCount), uintptr(unsafe.Pointer(cpus)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index 61e6f07..bb34740 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,s390x syscall_linux.go syscall_linux_s390x.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,s390x syscall_linux.go syscall_linux_s390x.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && s390x
+// +build linux,s390x
 
 package unix
 
@@ -45,6 +46,27 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -169,6 +191,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Lchown(path string, uid int, gid int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -209,7 +242,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -226,7 +259,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -318,6 +351,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
 	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
 	n = int64(r0)
@@ -470,6 +553,17 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(cmdline)
@@ -482,14 +576,3 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
index 834b842..8edc517 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -tags linux,sparc64 syscall_linux.go syscall_linux_sparc64.go syscall_linux_alarm.go
+// go run mksyscall.go -tags linux,sparc64 syscall_linux.go syscall_linux_sparc64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build linux && sparc64
+// +build linux,sparc64
 
 package unix
 
@@ -72,6 +73,16 @@ func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -169,6 +180,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Lchown(path string, uid int, gid int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -219,7 +241,7 @@ func Pause() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -236,7 +258,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -328,6 +350,56 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -404,6 +476,17 @@ func Truncate(path string, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -638,9 +721,19 @@ func utimes(path string, times *[2]Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Alarm(seconds uint) (remaining uint, err error) {
-	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
-	remaining = uint(r0)
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
index e91ebc1..4726ab3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build netbsd && 386
+// +build netbsd,386
 
 package unix
 
@@ -350,6 +351,18 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
@@ -404,16 +417,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -530,16 +533,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1349,7 +1342,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1366,7 +1359,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1606,6 +1599,16 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1823,6 +1826,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1835,14 +1860,3 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
index be28bab..fe71456 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build netbsd && amd64
+// +build netbsd,amd64
 
 package unix
 
@@ -350,6 +351,18 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
@@ -404,16 +417,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -530,16 +533,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1349,7 +1342,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1366,7 +1359,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1606,6 +1599,16 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1823,6 +1826,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1835,14 +1860,3 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
index fb587e8..0b5b2f0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build netbsd && arm
+// +build netbsd,arm
 
 package unix
 
@@ -350,6 +351,18 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
@@ -404,16 +417,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -530,16 +533,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1349,7 +1342,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1366,7 +1359,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1606,6 +1599,16 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1823,6 +1826,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1835,14 +1860,3 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
index d576438..bfca286 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build netbsd && arm64
+// +build netbsd,arm64
 
 package unix
 
@@ -350,6 +351,18 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
@@ -404,16 +417,6 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -530,16 +533,6 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Close(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1349,7 +1342,7 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1366,7 +1359,7 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
@@ -1606,6 +1599,16 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1823,6 +1826,28 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1835,14 +1860,3 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index 1851df1..8f80f4a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -l32 -openbsd -libc -tags openbsd,386 syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
+// go run mksyscall.go -l32 -openbsd -tags openbsd,386 syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build openbsd && 386
+// +build openbsd,386
 
 package unix
 
@@ -15,7 +16,7 @@ var _ syscall.Errno
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -23,28 +24,20 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	return
 }
 
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -52,14 +45,10 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 	return
 }
 
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -67,42 +56,30 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -110,94 +87,66 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	return
 }
 
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
@@ -207,7 +156,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -215,10 +164,6 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
@@ -228,21 +173,17 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -250,14 +191,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -265,14 +202,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -280,10 +213,6 @@ func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, ne
 	return
 }
 
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func utimes(path string, timeval *[2]Timeval) (err error) {
@@ -292,35 +221,27 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -328,10 +249,6 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	return
 }
 
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Madvise(b []byte, behav int) (err error) {
@@ -341,17 +258,13 @@ func Madvise(b []byte, behav int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlock(b []byte) (err error) {
@@ -361,31 +274,23 @@ func Mlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mprotect(b []byte, prot int) (err error) {
@@ -395,17 +300,13 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Msync(b []byte, flags int) (err error) {
@@ -415,17 +316,13 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlock(b []byte) (err error) {
@@ -435,45 +332,33 @@ func Munlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -483,7 +368,7 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -491,10 +376,6 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getcwd(buf []byte) (n int, err error) {
@@ -504,7 +385,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -512,50 +393,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -571,37 +412,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -611,7 +422,7 @@ func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -619,10 +430,6 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
 	return
 }
 
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Access(path string, mode uint32) (err error) {
@@ -631,31 +438,23 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chdir(path string) (err error) {
@@ -664,17 +463,13 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chflags(path string, flags int) (err error) {
@@ -683,17 +478,13 @@ func Chflags(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chmod(path string, mode uint32) (err error) {
@@ -702,17 +493,13 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chown(path string, uid int, gid int) (err error) {
@@ -721,17 +508,13 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chroot(path string) (err error) {
@@ -740,49 +523,27 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -790,49 +551,33 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -841,59 +586,43 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -902,31 +631,23 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
@@ -935,35 +656,27 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -971,24 +684,16 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	return
 }
 
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
@@ -997,99 +702,71 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), uintptr(length>>32))
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1097,50 +774,34 @@ func Getpgid(pid int) (pgid int, err error) {
 	return
 }
 
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
 	pgrp = int(r0)
 	return
 }
 
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
 	prio = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1148,28 +809,20 @@ func Getpriority(which int, who int) (prio int, err error) {
 	return
 }
 
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
 	rtable = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1177,28 +830,20 @@ func Getrtable() (rtable int, err error) {
 	return
 }
 
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1206,66 +851,46 @@ func Getsid(pid int) (sid int, err error) {
 	return
 }
 
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1273,10 +898,6 @@ func Kqueue() (fd int, err error) {
 	return
 }
 
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lchown(path string, uid int, gid int) (err error) {
@@ -1285,17 +906,13 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Link(path string, link string) (err error) {
@@ -1309,17 +926,13 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
@@ -1333,31 +946,23 @@ func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err er
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lstat(path string, stat *Stat_t) (err error) {
@@ -1366,17 +971,13 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdir(path string, mode uint32) (err error) {
@@ -1385,17 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
@@ -1404,17 +1001,13 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifo(path string, mode uint32) (err error) {
@@ -1423,17 +1016,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
@@ -1442,17 +1031,13 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKFIFOAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknod(path string, mode uint32, dev int) (err error) {
@@ -1461,17 +1046,13 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
@@ -1480,55 +1061,23 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
@@ -1537,7 +1086,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1545,10 +1094,6 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
@@ -1557,7 +1102,7 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1565,10 +1110,6 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Pathconf(path string, name int) (val int, err error) {
@@ -1577,7 +1118,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1585,20 +1126,16 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1606,20 +1143,16 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1627,10 +1160,6 @@ func pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func read(fd int, p []byte) (n int, err error) {
@@ -1640,7 +1169,7 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1648,10 +1177,6 @@ func read(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -1666,7 +1191,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1674,10 +1199,6 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
@@ -1692,7 +1213,7 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1700,10 +1221,6 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -1717,17 +1234,13 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Renameat(fromfd int, from string, tofd int, to string) (err error) {
@@ -1741,17 +1254,13 @@ func Renameat(fromfd int, from string, tofd int, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Revoke(path string) (err error) {
@@ -1760,17 +1269,13 @@ func Revoke(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rmdir(path string) (err error) {
@@ -1779,21 +1284,17 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := syscall_syscall6(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
 	newoffset = int64(int64(r1)<<32 | int64(r0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1801,14 +1302,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1816,52 +1313,36 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	return
 }
 
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setlogin(name string) (err error) {
@@ -1870,119 +1351,97 @@ func Setlogin(name string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresuid_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1990,38 +1449,26 @@ func Setsid() (pid int, err error) {
 	return
 }
 
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Stat(path string, stat *Stat_t) (err error) {
@@ -2030,17 +1477,13 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Statfs(path string, stat *Statfs_t) (err error) {
@@ -2049,17 +1492,13 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlink(path string, link string) (err error) {
@@ -2073,17 +1512,13 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
@@ -2097,31 +1532,23 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Truncate(path string, length int64) (err error) {
@@ -2130,29 +1557,21 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
 	oldmask = int(r0)
 	return
 }
 
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlink(path string) (err error) {
@@ -2161,17 +1580,13 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlinkat(dirfd int, path string, flags int) (err error) {
@@ -2180,17 +1595,13 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unmount(path string, flags int) (err error) {
@@ -2199,17 +1610,13 @@ func Unmount(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func write(fd int, p []byte) (n int, err error) {
@@ -2219,7 +1626,7 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2227,14 +1634,10 @@ func write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall9(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2242,28 +1645,20 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	return
 }
 
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2271,9 +1666,16 @@ func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
 	return
 }
 
-var libc_getfsstat_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -2283,41 +1685,9 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
deleted file mode 100644
index 0b43c69..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd 386
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getgroups_trampoline_addr(SB)/4, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setgroups_trampoline_addr(SB)/4, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $4
-DATA	·libc_wait4_trampoline_addr(SB)/4, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $4
-DATA	·libc_accept_trampoline_addr(SB)/4, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $4
-DATA	·libc_bind_trampoline_addr(SB)/4, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $4
-DATA	·libc_connect_trampoline_addr(SB)/4, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $4
-DATA	·libc_socket_trampoline_addr(SB)/4, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsockopt_trampoline_addr(SB)/4, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setsockopt_trampoline_addr(SB)/4, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpeername_trampoline_addr(SB)/4, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsockname_trampoline_addr(SB)/4, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_shutdown_trampoline_addr(SB)/4, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $4
-DATA	·libc_socketpair_trampoline_addr(SB)/4, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $4
-DATA	·libc_recvfrom_trampoline_addr(SB)/4, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sendto_trampoline_addr(SB)/4, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $4
-DATA	·libc_recvmsg_trampoline_addr(SB)/4, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sendmsg_trampoline_addr(SB)/4, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kevent_trampoline_addr(SB)/4, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $4
-DATA	·libc_utimes_trampoline_addr(SB)/4, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $4
-DATA	·libc_futimes_trampoline_addr(SB)/4, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $4
-DATA	·libc_poll_trampoline_addr(SB)/4, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $4
-DATA	·libc_madvise_trampoline_addr(SB)/4, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mlock_trampoline_addr(SB)/4, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mlockall_trampoline_addr(SB)/4, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mprotect_trampoline_addr(SB)/4, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_msync_trampoline_addr(SB)/4, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munlock_trampoline_addr(SB)/4, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munlockall_trampoline_addr(SB)/4, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pipe2_trampoline_addr(SB)/4, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getdents_trampoline_addr(SB)/4, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ioctl_trampoline_addr(SB)/4, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ppoll_trampoline_addr(SB)/4, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $4
-DATA	·libc_access_trampoline_addr(SB)/4, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $4
-DATA	·libc_adjtime_trampoline_addr(SB)/4, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chdir_trampoline_addr(SB)/4, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chflags_trampoline_addr(SB)/4, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chmod_trampoline_addr(SB)/4, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chown_trampoline_addr(SB)/4, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chroot_trampoline_addr(SB)/4, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $4
-DATA	·libc_clock_gettime_trampoline_addr(SB)/4, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $4
-DATA	·libc_close_trampoline_addr(SB)/4, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup_trampoline_addr(SB)/4, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup2_trampoline_addr(SB)/4, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup3_trampoline_addr(SB)/4, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_exit_trampoline_addr(SB)/4, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_faccessat_trampoline_addr(SB)/4, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchdir_trampoline_addr(SB)/4, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchflags_trampoline_addr(SB)/4, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchmod_trampoline_addr(SB)/4, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchmodat_trampoline_addr(SB)/4, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchown_trampoline_addr(SB)/4, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchownat_trampoline_addr(SB)/4, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_flock_trampoline_addr(SB)/4, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fpathconf_trampoline_addr(SB)/4, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstat_trampoline_addr(SB)/4, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstatat_trampoline_addr(SB)/4, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstatfs_trampoline_addr(SB)/4, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fsync_trampoline_addr(SB)/4, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ftruncate_trampoline_addr(SB)/4, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getegid_trampoline_addr(SB)/4, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_geteuid_trampoline_addr(SB)/4, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getgid_trampoline_addr(SB)/4, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpgid_trampoline_addr(SB)/4, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpgrp_trampoline_addr(SB)/4, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpid_trampoline_addr(SB)/4, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getppid_trampoline_addr(SB)/4, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpriority_trampoline_addr(SB)/4, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrlimit_trampoline_addr(SB)/4, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrtable_trampoline_addr(SB)/4, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrusage_trampoline_addr(SB)/4, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsid_trampoline_addr(SB)/4, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $4
-DATA	·libc_gettimeofday_trampoline_addr(SB)/4, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getuid_trampoline_addr(SB)/4, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_issetugid_trampoline_addr(SB)/4, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kill_trampoline_addr(SB)/4, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kqueue_trampoline_addr(SB)/4, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lchown_trampoline_addr(SB)/4, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $4
-DATA	·libc_link_trampoline_addr(SB)/4, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_linkat_trampoline_addr(SB)/4, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $4
-DATA	·libc_listen_trampoline_addr(SB)/4, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lstat_trampoline_addr(SB)/4, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkdir_trampoline_addr(SB)/4, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkdirat_trampoline_addr(SB)/4, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkfifo_trampoline_addr(SB)/4, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkfifoat_trampoline_addr(SB)/4, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mknod_trampoline_addr(SB)/4, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mknodat_trampoline_addr(SB)/4, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mount_trampoline_addr(SB)/4, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $4
-DATA	·libc_nanosleep_trampoline_addr(SB)/4, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $4
-DATA	·libc_open_trampoline_addr(SB)/4, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_openat_trampoline_addr(SB)/4, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pathconf_trampoline_addr(SB)/4, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pread_trampoline_addr(SB)/4, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pwrite_trampoline_addr(SB)/4, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $4
-DATA	·libc_read_trampoline_addr(SB)/4, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_readlink_trampoline_addr(SB)/4, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_readlinkat_trampoline_addr(SB)/4, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $4
-DATA	·libc_rename_trampoline_addr(SB)/4, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_renameat_trampoline_addr(SB)/4, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $4
-DATA	·libc_revoke_trampoline_addr(SB)/4, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_rmdir_trampoline_addr(SB)/4, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lseek_trampoline_addr(SB)/4, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $4
-DATA	·libc_select_trampoline_addr(SB)/4, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setegid_trampoline_addr(SB)/4, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_seteuid_trampoline_addr(SB)/4, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setgid_trampoline_addr(SB)/4, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setlogin_trampoline_addr(SB)/4, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setpgid_trampoline_addr(SB)/4, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setpriority_trampoline_addr(SB)/4, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setregid_trampoline_addr(SB)/4, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setreuid_trampoline_addr(SB)/4, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setresgid_trampoline_addr(SB)/4, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setresuid_trampoline_addr(SB)/4, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setrtable_trampoline_addr(SB)/4, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setsid_trampoline_addr(SB)/4, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $4
-DATA	·libc_settimeofday_trampoline_addr(SB)/4, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setuid_trampoline_addr(SB)/4, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_stat_trampoline_addr(SB)/4, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $4
-DATA	·libc_statfs_trampoline_addr(SB)/4, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_symlink_trampoline_addr(SB)/4, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_symlinkat_trampoline_addr(SB)/4, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sync_trampoline_addr(SB)/4, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $4
-DATA	·libc_truncate_trampoline_addr(SB)/4, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $4
-DATA	·libc_umask_trampoline_addr(SB)/4, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unlink_trampoline_addr(SB)/4, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unlinkat_trampoline_addr(SB)/4, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unmount_trampoline_addr(SB)/4, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $4
-DATA	·libc_write_trampoline_addr(SB)/4, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mmap_trampoline_addr(SB)/4, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munmap_trampoline_addr(SB)/4, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getfsstat_trampoline_addr(SB)/4, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_utimensat_trampoline_addr(SB)/4, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pledge_trampoline_addr(SB)/4, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unveil_trampoline_addr(SB)/4, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index e1ec0db..3a47aca 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -openbsd -libc -tags openbsd,amd64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
+// go run mksyscall.go -openbsd -tags openbsd,amd64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build openbsd && amd64
+// +build openbsd,amd64
 
 package unix
 
@@ -15,7 +16,7 @@ var _ syscall.Errno
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -23,28 +24,20 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	return
 }
 
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -52,14 +45,10 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 	return
 }
 
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -67,42 +56,30 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -110,94 +87,66 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	return
 }
 
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
@@ -207,7 +156,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -215,10 +164,6 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
@@ -228,21 +173,17 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -250,14 +191,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -265,14 +202,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -280,10 +213,6 @@ func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, ne
 	return
 }
 
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func utimes(path string, timeval *[2]Timeval) (err error) {
@@ -292,35 +221,27 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -328,10 +249,6 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	return
 }
 
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Madvise(b []byte, behav int) (err error) {
@@ -341,17 +258,13 @@ func Madvise(b []byte, behav int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlock(b []byte) (err error) {
@@ -361,31 +274,23 @@ func Mlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mprotect(b []byte, prot int) (err error) {
@@ -395,17 +300,13 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Msync(b []byte, flags int) (err error) {
@@ -415,17 +316,13 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlock(b []byte) (err error) {
@@ -435,45 +332,33 @@ func Munlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -483,7 +368,7 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -491,10 +376,6 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getcwd(buf []byte) (n int, err error) {
@@ -504,7 +385,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -512,50 +393,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -571,37 +412,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -611,7 +422,7 @@ func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -619,10 +430,6 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
 	return
 }
 
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Access(path string, mode uint32) (err error) {
@@ -631,31 +438,23 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chdir(path string) (err error) {
@@ -664,17 +463,13 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chflags(path string, flags int) (err error) {
@@ -683,17 +478,13 @@ func Chflags(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chmod(path string, mode uint32) (err error) {
@@ -702,17 +493,13 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chown(path string, uid int, gid int) (err error) {
@@ -721,17 +508,13 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chroot(path string) (err error) {
@@ -740,49 +523,27 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -790,49 +551,33 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -841,59 +586,43 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -902,31 +631,23 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
@@ -935,35 +656,27 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -971,24 +684,16 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	return
 }
 
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
@@ -997,99 +702,71 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1097,50 +774,34 @@ func Getpgid(pid int) (pgid int, err error) {
 	return
 }
 
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
 	pgrp = int(r0)
 	return
 }
 
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
 	prio = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1148,28 +809,20 @@ func Getpriority(which int, who int) (prio int, err error) {
 	return
 }
 
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
 	rtable = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1177,28 +830,20 @@ func Getrtable() (rtable int, err error) {
 	return
 }
 
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1206,66 +851,46 @@ func Getsid(pid int) (sid int, err error) {
 	return
 }
 
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1273,10 +898,6 @@ func Kqueue() (fd int, err error) {
 	return
 }
 
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lchown(path string, uid int, gid int) (err error) {
@@ -1285,17 +906,13 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Link(path string, link string) (err error) {
@@ -1309,17 +926,13 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
@@ -1333,31 +946,23 @@ func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err er
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lstat(path string, stat *Stat_t) (err error) {
@@ -1366,17 +971,13 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdir(path string, mode uint32) (err error) {
@@ -1385,17 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
@@ -1404,17 +1001,13 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifo(path string, mode uint32) (err error) {
@@ -1423,17 +1016,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
@@ -1442,17 +1031,13 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKFIFOAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknod(path string, mode uint32, dev int) (err error) {
@@ -1461,17 +1046,13 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
@@ -1480,55 +1061,23 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
@@ -1537,7 +1086,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1545,10 +1094,6 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
@@ -1557,7 +1102,7 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1565,10 +1110,6 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Pathconf(path string, name int) (val int, err error) {
@@ -1577,7 +1118,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1585,20 +1126,16 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1606,20 +1143,16 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1627,10 +1160,6 @@ func pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func read(fd int, p []byte) (n int, err error) {
@@ -1640,7 +1169,7 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1648,10 +1177,6 @@ func read(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -1666,7 +1191,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1674,10 +1199,6 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
@@ -1692,7 +1213,7 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1700,10 +1221,6 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -1717,17 +1234,13 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Renameat(fromfd int, from string, tofd int, to string) (err error) {
@@ -1741,17 +1254,13 @@ func Renameat(fromfd int, from string, tofd int, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Revoke(path string) (err error) {
@@ -1760,17 +1269,13 @@ func Revoke(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rmdir(path string) (err error) {
@@ -1779,21 +1284,17 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := syscall_syscall(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(whence))
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
 	newoffset = int64(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1801,14 +1302,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1816,52 +1313,36 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	return
 }
 
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setlogin(name string) (err error) {
@@ -1870,119 +1351,97 @@ func Setlogin(name string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresuid_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1990,38 +1449,26 @@ func Setsid() (pid int, err error) {
 	return
 }
 
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Stat(path string, stat *Stat_t) (err error) {
@@ -2030,17 +1477,13 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Statfs(path string, stat *Statfs_t) (err error) {
@@ -2049,17 +1492,13 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlink(path string, link string) (err error) {
@@ -2073,17 +1512,13 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
@@ -2097,31 +1532,23 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Truncate(path string, length int64) (err error) {
@@ -2130,29 +1557,21 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
 	oldmask = int(r0)
 	return
 }
 
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlink(path string) (err error) {
@@ -2161,17 +1580,13 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlinkat(dirfd int, path string, flags int) (err error) {
@@ -2180,17 +1595,13 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unmount(path string, flags int) (err error) {
@@ -2199,17 +1610,13 @@ func Unmount(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func write(fd int, p []byte) (n int, err error) {
@@ -2219,7 +1626,7 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2227,14 +1634,10 @@ func write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall6(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2242,28 +1645,20 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	return
 }
 
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2271,9 +1666,16 @@ func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
 	return
 }
 
-var libc_getfsstat_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -2283,41 +1685,9 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
deleted file mode 100644
index 880c6d6..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd amd64
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
-DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
-DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
-DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
-DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pipe2_trampoline_addr(SB)/8, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getdents_trampoline_addr(SB)/8, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ppoll_trampoline_addr(SB)/8, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
-DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
-DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup3_trampoline_addr(SB)/8, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrtable_trampoline_addr(SB)/8, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
-DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
-DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifoat_trampoline_addr(SB)/8, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $8
-DATA	·libc_nanosleep_trampoline_addr(SB)/8, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
-DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
-DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
-DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
-DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresgid_trampoline_addr(SB)/8, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrtable_trampoline_addr(SB)/8, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
-DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
-DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pledge_trampoline_addr(SB)/8, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unveil_trampoline_addr(SB)/8, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
index 7c8452a..883a9b4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -l32 -openbsd -arm -libc -tags openbsd,arm syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm.go
+// go run mksyscall.go -l32 -openbsd -arm -tags openbsd,arm syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build openbsd && arm
+// +build openbsd,arm
 
 package unix
 
@@ -15,7 +16,7 @@ var _ syscall.Errno
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -23,28 +24,20 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	return
 }
 
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -52,14 +45,10 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 	return
 }
 
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -67,42 +56,30 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -110,94 +87,66 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	return
 }
 
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
@@ -207,7 +156,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -215,10 +164,6 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
@@ -228,21 +173,17 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -250,14 +191,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -265,14 +202,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -280,10 +213,6 @@ func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, ne
 	return
 }
 
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func utimes(path string, timeval *[2]Timeval) (err error) {
@@ -292,35 +221,27 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -328,10 +249,6 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	return
 }
 
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Madvise(b []byte, behav int) (err error) {
@@ -341,17 +258,13 @@ func Madvise(b []byte, behav int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlock(b []byte) (err error) {
@@ -361,31 +274,23 @@ func Mlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mprotect(b []byte, prot int) (err error) {
@@ -395,17 +300,13 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Msync(b []byte, flags int) (err error) {
@@ -415,17 +316,13 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlock(b []byte) (err error) {
@@ -435,45 +332,33 @@ func Munlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -483,7 +368,7 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -491,10 +376,6 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getcwd(buf []byte) (n int, err error) {
@@ -504,7 +385,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -512,50 +393,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -571,37 +412,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -611,7 +422,7 @@ func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -619,10 +430,6 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
 	return
 }
 
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Access(path string, mode uint32) (err error) {
@@ -631,31 +438,23 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chdir(path string) (err error) {
@@ -664,17 +463,13 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chflags(path string, flags int) (err error) {
@@ -683,17 +478,13 @@ func Chflags(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chmod(path string, mode uint32) (err error) {
@@ -702,17 +493,13 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chown(path string, uid int, gid int) (err error) {
@@ -721,17 +508,13 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chroot(path string) (err error) {
@@ -740,49 +523,27 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -790,49 +551,33 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -841,59 +586,43 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -902,31 +631,23 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
@@ -935,35 +656,27 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -971,24 +684,16 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	return
 }
 
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
@@ -997,99 +702,71 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall6(libc_ftruncate_trampoline_addr, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1097,50 +774,34 @@ func Getpgid(pid int) (pgid int, err error) {
 	return
 }
 
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
 	pgrp = int(r0)
 	return
 }
 
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
 	prio = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1148,28 +809,20 @@ func Getpriority(which int, who int) (prio int, err error) {
 	return
 }
 
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
 	rtable = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1177,28 +830,20 @@ func Getrtable() (rtable int, err error) {
 	return
 }
 
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1206,66 +851,46 @@ func Getsid(pid int) (sid int, err error) {
 	return
 }
 
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1273,10 +898,6 @@ func Kqueue() (fd int, err error) {
 	return
 }
 
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lchown(path string, uid int, gid int) (err error) {
@@ -1285,17 +906,13 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Link(path string, link string) (err error) {
@@ -1309,17 +926,13 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
@@ -1333,31 +946,23 @@ func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err er
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lstat(path string, stat *Stat_t) (err error) {
@@ -1366,17 +971,13 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdir(path string, mode uint32) (err error) {
@@ -1385,17 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
@@ -1404,17 +1001,13 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifo(path string, mode uint32) (err error) {
@@ -1423,17 +1016,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
@@ -1442,17 +1031,13 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKFIFOAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknod(path string, mode uint32, dev int) (err error) {
@@ -1461,17 +1046,13 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
@@ -1480,55 +1061,23 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
@@ -1537,7 +1086,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1545,10 +1094,6 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
@@ -1557,7 +1102,7 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1565,10 +1110,6 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Pathconf(path string, name int) (val int, err error) {
@@ -1577,7 +1118,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1585,20 +1126,16 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1606,20 +1143,16 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1627,10 +1160,6 @@ func pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func read(fd int, p []byte) (n int, err error) {
@@ -1640,7 +1169,7 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1648,10 +1177,6 @@ func read(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -1666,7 +1191,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1674,10 +1199,6 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
@@ -1692,7 +1213,7 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1700,10 +1221,6 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -1717,17 +1234,13 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Renameat(fromfd int, from string, tofd int, to string) (err error) {
@@ -1741,17 +1254,13 @@ func Renameat(fromfd int, from string, tofd int, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Revoke(path string) (err error) {
@@ -1760,17 +1269,13 @@ func Revoke(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rmdir(path string) (err error) {
@@ -1779,21 +1284,17 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := syscall_syscall6(libc_lseek_trampoline_addr, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
 	newoffset = int64(int64(r1)<<32 | int64(r0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1801,14 +1302,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1816,52 +1313,36 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	return
 }
 
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setlogin(name string) (err error) {
@@ -1870,119 +1351,97 @@ func Setlogin(name string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresuid_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1990,38 +1449,26 @@ func Setsid() (pid int, err error) {
 	return
 }
 
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Stat(path string, stat *Stat_t) (err error) {
@@ -2030,17 +1477,13 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Statfs(path string, stat *Statfs_t) (err error) {
@@ -2049,17 +1492,13 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlink(path string, link string) (err error) {
@@ -2073,17 +1512,13 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
@@ -2097,31 +1532,23 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Truncate(path string, length int64) (err error) {
@@ -2130,29 +1557,21 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
 	oldmask = int(r0)
 	return
 }
 
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlink(path string) (err error) {
@@ -2161,17 +1580,13 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlinkat(dirfd int, path string, flags int) (err error) {
@@ -2180,17 +1595,13 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unmount(path string, flags int) (err error) {
@@ -2199,17 +1610,13 @@ func Unmount(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func write(fd int, p []byte) (n int, err error) {
@@ -2219,7 +1626,7 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2227,14 +1634,10 @@ func write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall9(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2242,28 +1645,20 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	return
 }
 
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2271,9 +1666,16 @@ func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
 	return
 }
 
-var libc_getfsstat_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -2283,41 +1685,9 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
deleted file mode 100644
index b8ef95b..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd arm
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getgroups_trampoline_addr(SB)/4, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setgroups_trampoline_addr(SB)/4, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $4
-DATA	·libc_wait4_trampoline_addr(SB)/4, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $4
-DATA	·libc_accept_trampoline_addr(SB)/4, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $4
-DATA	·libc_bind_trampoline_addr(SB)/4, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $4
-DATA	·libc_connect_trampoline_addr(SB)/4, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $4
-DATA	·libc_socket_trampoline_addr(SB)/4, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsockopt_trampoline_addr(SB)/4, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setsockopt_trampoline_addr(SB)/4, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpeername_trampoline_addr(SB)/4, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsockname_trampoline_addr(SB)/4, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_shutdown_trampoline_addr(SB)/4, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $4
-DATA	·libc_socketpair_trampoline_addr(SB)/4, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $4
-DATA	·libc_recvfrom_trampoline_addr(SB)/4, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sendto_trampoline_addr(SB)/4, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $4
-DATA	·libc_recvmsg_trampoline_addr(SB)/4, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sendmsg_trampoline_addr(SB)/4, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kevent_trampoline_addr(SB)/4, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $4
-DATA	·libc_utimes_trampoline_addr(SB)/4, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $4
-DATA	·libc_futimes_trampoline_addr(SB)/4, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $4
-DATA	·libc_poll_trampoline_addr(SB)/4, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $4
-DATA	·libc_madvise_trampoline_addr(SB)/4, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mlock_trampoline_addr(SB)/4, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mlockall_trampoline_addr(SB)/4, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mprotect_trampoline_addr(SB)/4, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_msync_trampoline_addr(SB)/4, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munlock_trampoline_addr(SB)/4, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munlockall_trampoline_addr(SB)/4, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pipe2_trampoline_addr(SB)/4, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getdents_trampoline_addr(SB)/4, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ioctl_trampoline_addr(SB)/4, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ppoll_trampoline_addr(SB)/4, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $4
-DATA	·libc_access_trampoline_addr(SB)/4, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $4
-DATA	·libc_adjtime_trampoline_addr(SB)/4, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chdir_trampoline_addr(SB)/4, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chflags_trampoline_addr(SB)/4, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chmod_trampoline_addr(SB)/4, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chown_trampoline_addr(SB)/4, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $4
-DATA	·libc_chroot_trampoline_addr(SB)/4, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $4
-DATA	·libc_clock_gettime_trampoline_addr(SB)/4, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $4
-DATA	·libc_close_trampoline_addr(SB)/4, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup_trampoline_addr(SB)/4, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup2_trampoline_addr(SB)/4, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $4
-DATA	·libc_dup3_trampoline_addr(SB)/4, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_exit_trampoline_addr(SB)/4, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_faccessat_trampoline_addr(SB)/4, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchdir_trampoline_addr(SB)/4, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchflags_trampoline_addr(SB)/4, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchmod_trampoline_addr(SB)/4, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchmodat_trampoline_addr(SB)/4, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchown_trampoline_addr(SB)/4, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fchownat_trampoline_addr(SB)/4, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $4
-DATA	·libc_flock_trampoline_addr(SB)/4, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fpathconf_trampoline_addr(SB)/4, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstat_trampoline_addr(SB)/4, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstatat_trampoline_addr(SB)/4, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fstatfs_trampoline_addr(SB)/4, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_fsync_trampoline_addr(SB)/4, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $4
-DATA	·libc_ftruncate_trampoline_addr(SB)/4, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getegid_trampoline_addr(SB)/4, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_geteuid_trampoline_addr(SB)/4, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getgid_trampoline_addr(SB)/4, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpgid_trampoline_addr(SB)/4, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpgrp_trampoline_addr(SB)/4, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpid_trampoline_addr(SB)/4, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getppid_trampoline_addr(SB)/4, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getpriority_trampoline_addr(SB)/4, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrlimit_trampoline_addr(SB)/4, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrtable_trampoline_addr(SB)/4, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getrusage_trampoline_addr(SB)/4, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getsid_trampoline_addr(SB)/4, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $4
-DATA	·libc_gettimeofday_trampoline_addr(SB)/4, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getuid_trampoline_addr(SB)/4, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_issetugid_trampoline_addr(SB)/4, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kill_trampoline_addr(SB)/4, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $4
-DATA	·libc_kqueue_trampoline_addr(SB)/4, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lchown_trampoline_addr(SB)/4, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $4
-DATA	·libc_link_trampoline_addr(SB)/4, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_linkat_trampoline_addr(SB)/4, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $4
-DATA	·libc_listen_trampoline_addr(SB)/4, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lstat_trampoline_addr(SB)/4, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkdir_trampoline_addr(SB)/4, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkdirat_trampoline_addr(SB)/4, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkfifo_trampoline_addr(SB)/4, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mkfifoat_trampoline_addr(SB)/4, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mknod_trampoline_addr(SB)/4, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mknodat_trampoline_addr(SB)/4, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mount_trampoline_addr(SB)/4, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $4
-DATA	·libc_nanosleep_trampoline_addr(SB)/4, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $4
-DATA	·libc_open_trampoline_addr(SB)/4, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_openat_trampoline_addr(SB)/4, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pathconf_trampoline_addr(SB)/4, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pread_trampoline_addr(SB)/4, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pwrite_trampoline_addr(SB)/4, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $4
-DATA	·libc_read_trampoline_addr(SB)/4, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_readlink_trampoline_addr(SB)/4, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_readlinkat_trampoline_addr(SB)/4, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $4
-DATA	·libc_rename_trampoline_addr(SB)/4, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_renameat_trampoline_addr(SB)/4, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $4
-DATA	·libc_revoke_trampoline_addr(SB)/4, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $4
-DATA	·libc_rmdir_trampoline_addr(SB)/4, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $4
-DATA	·libc_lseek_trampoline_addr(SB)/4, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $4
-DATA	·libc_select_trampoline_addr(SB)/4, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setegid_trampoline_addr(SB)/4, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_seteuid_trampoline_addr(SB)/4, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setgid_trampoline_addr(SB)/4, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setlogin_trampoline_addr(SB)/4, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setpgid_trampoline_addr(SB)/4, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setpriority_trampoline_addr(SB)/4, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setregid_trampoline_addr(SB)/4, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setreuid_trampoline_addr(SB)/4, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setresgid_trampoline_addr(SB)/4, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setresuid_trampoline_addr(SB)/4, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setrtable_trampoline_addr(SB)/4, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setsid_trampoline_addr(SB)/4, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $4
-DATA	·libc_settimeofday_trampoline_addr(SB)/4, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setuid_trampoline_addr(SB)/4, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_stat_trampoline_addr(SB)/4, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $4
-DATA	·libc_statfs_trampoline_addr(SB)/4, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_symlink_trampoline_addr(SB)/4, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_symlinkat_trampoline_addr(SB)/4, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $4
-DATA	·libc_sync_trampoline_addr(SB)/4, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $4
-DATA	·libc_truncate_trampoline_addr(SB)/4, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $4
-DATA	·libc_umask_trampoline_addr(SB)/4, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unlink_trampoline_addr(SB)/4, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unlinkat_trampoline_addr(SB)/4, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unmount_trampoline_addr(SB)/4, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $4
-DATA	·libc_write_trampoline_addr(SB)/4, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $4
-DATA	·libc_mmap_trampoline_addr(SB)/4, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $4
-DATA	·libc_munmap_trampoline_addr(SB)/4, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_getfsstat_trampoline_addr(SB)/4, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $4
-DATA	·libc_utimensat_trampoline_addr(SB)/4, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $4
-DATA	·libc_pledge_trampoline_addr(SB)/4, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $4
-DATA	·libc_unveil_trampoline_addr(SB)/4, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
index 2ffdf86..aac7fdc 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -openbsd -libc -tags openbsd,arm64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm64.go
+// go run mksyscall.go -openbsd -tags openbsd,arm64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build openbsd && arm64
+// +build openbsd,arm64
 
 package unix
 
@@ -15,7 +16,7 @@ var _ syscall.Errno
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -23,28 +24,20 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	return
 }
 
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -52,14 +45,10 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 	return
 }
 
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -67,42 +56,30 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -110,94 +87,66 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	return
 }
 
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
@@ -207,7 +156,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -215,10 +164,6 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
@@ -228,21 +173,17 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -250,14 +191,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -265,14 +202,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -280,10 +213,6 @@ func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, ne
 	return
 }
 
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func utimes(path string, timeval *[2]Timeval) (err error) {
@@ -292,35 +221,27 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -328,10 +249,6 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	return
 }
 
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Madvise(b []byte, behav int) (err error) {
@@ -341,17 +258,13 @@ func Madvise(b []byte, behav int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlock(b []byte) (err error) {
@@ -361,31 +274,23 @@ func Mlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mprotect(b []byte, prot int) (err error) {
@@ -395,17 +300,13 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Msync(b []byte, flags int) (err error) {
@@ -415,17 +316,13 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlock(b []byte) (err error) {
@@ -435,45 +332,33 @@ func Munlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -483,7 +368,7 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -491,10 +376,6 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getcwd(buf []byte) (n int, err error) {
@@ -504,7 +385,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -512,50 +393,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -571,37 +412,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -611,7 +422,7 @@ func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -619,10 +430,6 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
 	return
 }
 
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Access(path string, mode uint32) (err error) {
@@ -631,31 +438,23 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chdir(path string) (err error) {
@@ -664,17 +463,13 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chflags(path string, flags int) (err error) {
@@ -683,17 +478,13 @@ func Chflags(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chmod(path string, mode uint32) (err error) {
@@ -702,17 +493,13 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chown(path string, uid int, gid int) (err error) {
@@ -721,17 +508,13 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chroot(path string) (err error) {
@@ -740,49 +523,27 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -790,49 +551,33 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -841,59 +586,43 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -902,31 +631,23 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
@@ -935,35 +656,27 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -971,24 +684,16 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	return
 }
 
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
@@ -997,99 +702,71 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1097,50 +774,34 @@ func Getpgid(pid int) (pgid int, err error) {
 	return
 }
 
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
 	pgrp = int(r0)
 	return
 }
 
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
 	prio = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1148,28 +809,20 @@ func Getpriority(which int, who int) (prio int, err error) {
 	return
 }
 
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
 	rtable = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1177,28 +830,20 @@ func Getrtable() (rtable int, err error) {
 	return
 }
 
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1206,66 +851,46 @@ func Getsid(pid int) (sid int, err error) {
 	return
 }
 
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1273,10 +898,6 @@ func Kqueue() (fd int, err error) {
 	return
 }
 
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lchown(path string, uid int, gid int) (err error) {
@@ -1285,17 +906,13 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Link(path string, link string) (err error) {
@@ -1309,17 +926,13 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
@@ -1333,31 +946,23 @@ func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err er
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lstat(path string, stat *Stat_t) (err error) {
@@ -1366,17 +971,13 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdir(path string, mode uint32) (err error) {
@@ -1385,17 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
@@ -1404,17 +1001,13 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifo(path string, mode uint32) (err error) {
@@ -1423,17 +1016,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
@@ -1442,17 +1031,13 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKFIFOAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknod(path string, mode uint32, dev int) (err error) {
@@ -1461,17 +1046,13 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
@@ -1480,55 +1061,23 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
@@ -1537,7 +1086,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1545,10 +1094,6 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
@@ -1557,7 +1102,7 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1565,10 +1110,6 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Pathconf(path string, name int) (val int, err error) {
@@ -1577,7 +1118,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1585,20 +1126,16 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1606,20 +1143,16 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1627,10 +1160,6 @@ func pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func read(fd int, p []byte) (n int, err error) {
@@ -1640,7 +1169,7 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1648,10 +1177,6 @@ func read(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -1666,7 +1191,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1674,10 +1199,6 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
@@ -1692,7 +1213,7 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1700,10 +1221,6 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -1717,17 +1234,13 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Renameat(fromfd int, from string, tofd int, to string) (err error) {
@@ -1741,17 +1254,13 @@ func Renameat(fromfd int, from string, tofd int, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Revoke(path string) (err error) {
@@ -1760,17 +1269,13 @@ func Revoke(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rmdir(path string) (err error) {
@@ -1779,21 +1284,17 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := syscall_syscall(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(whence))
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
 	newoffset = int64(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1801,14 +1302,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1816,52 +1313,36 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	return
 }
 
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setlogin(name string) (err error) {
@@ -1870,119 +1351,97 @@ func Setlogin(name string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresuid_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1990,38 +1449,26 @@ func Setsid() (pid int, err error) {
 	return
 }
 
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Stat(path string, stat *Stat_t) (err error) {
@@ -2030,17 +1477,13 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Statfs(path string, stat *Statfs_t) (err error) {
@@ -2049,17 +1492,13 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlink(path string, link string) (err error) {
@@ -2073,17 +1512,13 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
@@ -2097,31 +1532,23 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Truncate(path string, length int64) (err error) {
@@ -2130,29 +1557,21 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
 	oldmask = int(r0)
 	return
 }
 
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlink(path string) (err error) {
@@ -2161,17 +1580,13 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlinkat(dirfd int, path string, flags int) (err error) {
@@ -2180,17 +1595,13 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unmount(path string, flags int) (err error) {
@@ -2199,17 +1610,13 @@ func Unmount(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func write(fd int, p []byte) (n int, err error) {
@@ -2219,7 +1626,7 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2227,14 +1634,10 @@ func write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall6(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2242,28 +1645,20 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	return
 }
 
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2271,9 +1666,16 @@ func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
 	return
 }
 
-var libc_getfsstat_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -2283,41 +1685,9 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
deleted file mode 100644
index 2af3b5c..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd arm64
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
-DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
-DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
-DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
-DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pipe2_trampoline_addr(SB)/8, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getdents_trampoline_addr(SB)/8, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ppoll_trampoline_addr(SB)/8, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
-DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
-DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup3_trampoline_addr(SB)/8, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrtable_trampoline_addr(SB)/8, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
-DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
-DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifoat_trampoline_addr(SB)/8, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $8
-DATA	·libc_nanosleep_trampoline_addr(SB)/8, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
-DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
-DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
-DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
-DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresgid_trampoline_addr(SB)/8, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrtable_trampoline_addr(SB)/8, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
-DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
-DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pledge_trampoline_addr(SB)/8, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unveil_trampoline_addr(SB)/8, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
index 1da08d5..8776187 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
@@ -1,7 +1,8 @@
-// go run mksyscall.go -openbsd -libc -tags openbsd,mips64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_mips64.go
+// go run mksyscall.go -openbsd -tags openbsd,mips64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_mips64.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build openbsd && mips64
+// +build openbsd,mips64
 
 package unix
 
@@ -15,7 +16,7 @@ var _ syscall.Errno
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -23,28 +24,20 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	return
 }
 
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -52,14 +45,10 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 	return
 }
 
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -67,42 +56,30 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -110,94 +87,66 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	return
 }
 
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
@@ -207,7 +156,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -215,10 +164,6 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
@@ -228,21 +173,17 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -250,14 +191,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -265,14 +202,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -280,10 +213,6 @@ func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, ne
 	return
 }
 
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func utimes(path string, timeval *[2]Timeval) (err error) {
@@ -292,35 +221,27 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -328,10 +249,6 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	return
 }
 
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Madvise(b []byte, behav int) (err error) {
@@ -341,17 +258,13 @@ func Madvise(b []byte, behav int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlock(b []byte) (err error) {
@@ -361,31 +274,23 @@ func Mlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mprotect(b []byte, prot int) (err error) {
@@ -395,17 +300,13 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Msync(b []byte, flags int) (err error) {
@@ -415,17 +316,13 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlock(b []byte) (err error) {
@@ -435,45 +332,33 @@ func Munlock(b []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getdents(fd int, buf []byte) (n int, err error) {
@@ -483,7 +368,7 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -491,10 +376,6 @@ func Getdents(fd int, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getcwd(buf []byte) (n int, err error) {
@@ -504,7 +385,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -512,50 +393,10 @@ func Getcwd(buf []byte) (n int, err error) {
 	return
 }
 
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -571,37 +412,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -611,7 +422,7 @@ func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -619,10 +430,6 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
 	return
 }
 
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Access(path string, mode uint32) (err error) {
@@ -631,31 +438,23 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chdir(path string) (err error) {
@@ -664,17 +463,13 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chflags(path string, flags int) (err error) {
@@ -683,17 +478,13 @@ func Chflags(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chmod(path string, mode uint32) (err error) {
@@ -702,17 +493,13 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chown(path string, uid int, gid int) (err error) {
@@ -721,17 +508,13 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Chroot(path string) (err error) {
@@ -740,49 +523,27 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -790,49 +551,33 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -841,59 +586,43 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
@@ -902,31 +631,23 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
@@ -935,35 +656,27 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -971,24 +684,16 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	return
 }
 
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
@@ -997,99 +702,71 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1097,50 +774,34 @@ func Getpgid(pid int) (pgid int, err error) {
 	return
 }
 
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
 	pgrp = int(r0)
 	return
 }
 
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
 	prio = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1148,28 +809,20 @@ func Getpriority(which int, who int) (prio int, err error) {
 	return
 }
 
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
 	rtable = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1177,28 +830,20 @@ func Getrtable() (rtable int, err error) {
 	return
 }
 
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1206,66 +851,46 @@ func Getsid(pid int) (sid int, err error) {
 	return
 }
 
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1273,10 +898,6 @@ func Kqueue() (fd int, err error) {
 	return
 }
 
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lchown(path string, uid int, gid int) (err error) {
@@ -1285,17 +906,13 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Link(path string, link string) (err error) {
@@ -1309,17 +926,13 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
@@ -1333,31 +946,23 @@ func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err er
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Lstat(path string, stat *Stat_t) (err error) {
@@ -1366,17 +971,13 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdir(path string, mode uint32) (err error) {
@@ -1385,17 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
@@ -1404,17 +1001,13 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifo(path string, mode uint32) (err error) {
@@ -1423,17 +1016,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
@@ -1442,17 +1031,13 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	_, _, e1 := Syscall(SYS_MKFIFOAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknod(path string, mode uint32, dev int) (err error) {
@@ -1461,17 +1046,13 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
@@ -1480,55 +1061,23 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
@@ -1537,7 +1086,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1545,10 +1094,6 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
@@ -1557,7 +1102,7 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1565,10 +1110,6 @@ func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	return
 }
 
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Pathconf(path string, name int) (val int, err error) {
@@ -1577,7 +1118,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1585,20 +1126,16 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1606,20 +1143,16 @@ func pread(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
 		_p0 = unsafe.Pointer(&p[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1627,10 +1160,6 @@ func pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return
 }
 
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func read(fd int, p []byte) (n int, err error) {
@@ -1640,7 +1169,7 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1648,10 +1177,6 @@ func read(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlink(path string, buf []byte) (n int, err error) {
@@ -1666,7 +1191,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1674,10 +1199,6 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
@@ -1692,7 +1213,7 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	} else {
 		_p1 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1700,10 +1221,6 @@ func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
 	return
 }
 
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -1717,17 +1234,13 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Renameat(fromfd int, from string, tofd int, to string) (err error) {
@@ -1741,17 +1254,13 @@ func Renameat(fromfd int, from string, tofd int, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Revoke(path string) (err error) {
@@ -1760,17 +1269,13 @@ func Revoke(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rmdir(path string) (err error) {
@@ -1779,21 +1284,17 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := syscall_syscall(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(whence))
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
 	newoffset = int64(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1801,14 +1302,10 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1816,52 +1313,36 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	return
 }
 
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setlogin(name string) (err error) {
@@ -1870,119 +1351,97 @@ func Setlogin(name string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setresuid_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1990,38 +1449,26 @@ func Setsid() (pid int, err error) {
 	return
 }
 
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Stat(path string, stat *Stat_t) (err error) {
@@ -2030,17 +1477,13 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Statfs(path string, stat *Statfs_t) (err error) {
@@ -2049,17 +1492,13 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlink(path string, link string) (err error) {
@@ -2073,17 +1512,13 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
@@ -2097,31 +1532,23 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Truncate(path string, length int64) (err error) {
@@ -2130,29 +1557,21 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
 	oldmask = int(r0)
 	return
 }
 
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlink(path string) (err error) {
@@ -2161,17 +1580,13 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unlinkat(dirfd int, path string, flags int) (err error) {
@@ -2180,17 +1595,13 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Unmount(path string, flags int) (err error) {
@@ -2199,17 +1610,13 @@ func Unmount(path string, flags int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func write(fd int, p []byte) (n int, err error) {
@@ -2219,7 +1626,7 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2227,14 +1634,10 @@ func write(fd int, p []byte) (n int, err error) {
 	return
 }
 
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall6(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2242,28 +1645,20 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	return
 }
 
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
 
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -2271,9 +1666,16 @@ func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
 	return
 }
 
-var libc_getfsstat_trampoline_addr uintptr
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
@@ -2283,41 +1685,9 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	if err != nil {
 		return
 	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
 	return
 }
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
deleted file mode 100644
index b7a2513..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd mips64
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
-DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
-DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
-DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
-DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pipe2_trampoline_addr(SB)/8, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getdents_trampoline_addr(SB)/8, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ppoll_trampoline_addr(SB)/8, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
-DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
-DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup3_trampoline_addr(SB)/8, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrtable_trampoline_addr(SB)/8, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
-DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
-DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifoat_trampoline_addr(SB)/8, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $8
-DATA	·libc_nanosleep_trampoline_addr(SB)/8, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
-DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
-DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
-DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
-DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresgid_trampoline_addr(SB)/8, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrtable_trampoline_addr(SB)/8, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
-DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
-DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pledge_trampoline_addr(SB)/8, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unveil_trampoline_addr(SB)/8, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
deleted file mode 100644
index 6e85b0a..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
+++ /dev/null
@@ -1,2323 +0,0 @@
-// go run mksyscall.go -openbsd -libc -tags openbsd,ppc64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_ppc64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build openbsd && ppc64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, behav int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Msync(b []byte, flags int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
-	return
-}
-
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
-	rtable = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(fromfd int, from string, tofd int, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := syscall_syscall(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall6(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getfsstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
deleted file mode 100644
index f15dadf..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
+++ /dev/null
@@ -1,838 +0,0 @@
-// go run mkasm.go openbsd ppc64
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getgroups(SB)
-	RET
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setgroups(SB)
-	RET
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_wait4(SB)
-	RET
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
-DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_accept(SB)
-	RET
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
-DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_bind(SB)
-	RET
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
-DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_connect(SB)
-	RET
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_socket(SB)
-	RET
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getsockopt(SB)
-	RET
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setsockopt(SB)
-	RET
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getpeername(SB)
-	RET
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getsockname(SB)
-	RET
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_shutdown(SB)
-	RET
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_socketpair(SB)
-	RET
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_recvfrom(SB)
-	RET
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_sendto(SB)
-	RET
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_recvmsg(SB)
-	RET
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_sendmsg(SB)
-	RET
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_kevent(SB)
-	RET
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_utimes(SB)
-	RET
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_futimes(SB)
-	RET
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_poll(SB)
-	RET
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_madvise(SB)
-	RET
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
-DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mlock(SB)
-	RET
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mlockall(SB)
-	RET
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mprotect(SB)
-	RET
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_msync(SB)
-	RET
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_munlock(SB)
-	RET
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_munlockall(SB)
-	RET
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_pipe2(SB)
-	RET
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pipe2_trampoline_addr(SB)/8, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getdents(SB)
-	RET
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getdents_trampoline_addr(SB)/8, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getcwd(SB)
-	RET
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getresuid(SB)
-	RET
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getresgid(SB)
-	RET
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_ioctl(SB)
-	RET
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_sysctl(SB)
-	RET
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fcntl(SB)
-	RET
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_ppoll(SB)
-	RET
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ppoll_trampoline_addr(SB)/8, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_access(SB)
-	RET
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
-DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_adjtime(SB)
-	RET
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_chdir(SB)
-	RET
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_chflags(SB)
-	RET
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_chmod(SB)
-	RET
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_chown(SB)
-	RET
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_chroot(SB)
-	RET
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_clock_gettime(SB)
-	RET
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_close(SB)
-	RET
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
-DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_dup(SB)
-	RET
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_dup2(SB)
-	RET
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_dup3(SB)
-	RET
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup3_trampoline_addr(SB)/8, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_exit(SB)
-	RET
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_faccessat(SB)
-	RET
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchdir(SB)
-	RET
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchflags(SB)
-	RET
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchmod(SB)
-	RET
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchmodat(SB)
-	RET
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchown(SB)
-	RET
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fchownat(SB)
-	RET
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_flock(SB)
-	RET
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fpathconf(SB)
-	RET
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fstat(SB)
-	RET
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fstatat(SB)
-	RET
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fstatfs(SB)
-	RET
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_fsync(SB)
-	RET
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_ftruncate(SB)
-	RET
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getegid(SB)
-	RET
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_geteuid(SB)
-	RET
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getgid(SB)
-	RET
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getpgid(SB)
-	RET
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getpgrp(SB)
-	RET
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getpid(SB)
-	RET
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getppid(SB)
-	RET
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getpriority(SB)
-	RET
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getrlimit(SB)
-	RET
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getrtable(SB)
-	RET
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrtable_trampoline_addr(SB)/8, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getrusage(SB)
-	RET
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getsid(SB)
-	RET
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_gettimeofday(SB)
-	RET
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getuid(SB)
-	RET
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_issetugid(SB)
-	RET
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_kill(SB)
-	RET
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_kqueue(SB)
-	RET
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_lchown(SB)
-	RET
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_link(SB)
-	RET
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
-DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_linkat(SB)
-	RET
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_listen(SB)
-	RET
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
-DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_lstat(SB)
-	RET
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mkdir(SB)
-	RET
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mkdirat(SB)
-	RET
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mkfifo(SB)
-	RET
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mkfifoat(SB)
-	RET
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifoat_trampoline_addr(SB)/8, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mknod(SB)
-	RET
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mknodat(SB)
-	RET
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mount(SB)
-	RET
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_nanosleep(SB)
-	RET
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $8
-DATA	·libc_nanosleep_trampoline_addr(SB)/8, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_open(SB)
-	RET
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
-DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_openat(SB)
-	RET
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_pathconf(SB)
-	RET
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_pread(SB)
-	RET
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_pwrite(SB)
-	RET
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_read(SB)
-	RET
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
-DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_readlink(SB)
-	RET
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_readlinkat(SB)
-	RET
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_rename(SB)
-	RET
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_renameat(SB)
-	RET
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_revoke(SB)
-	RET
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
-DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_rmdir(SB)
-	RET
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_lseek(SB)
-	RET
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_select(SB)
-	RET
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
-DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setegid(SB)
-	RET
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_seteuid(SB)
-	RET
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setgid(SB)
-	RET
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setlogin(SB)
-	RET
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setpgid(SB)
-	RET
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setpriority(SB)
-	RET
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setregid(SB)
-	RET
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setreuid(SB)
-	RET
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setresgid(SB)
-	RET
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresgid_trampoline_addr(SB)/8, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setresuid(SB)
-	RET
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setrtable(SB)
-	RET
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrtable_trampoline_addr(SB)/8, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setsid(SB)
-	RET
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_settimeofday(SB)
-	RET
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setuid(SB)
-	RET
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_stat(SB)
-	RET
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_statfs(SB)
-	RET
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_symlink(SB)
-	RET
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_symlinkat(SB)
-	RET
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_sync(SB)
-	RET
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_truncate(SB)
-	RET
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_umask(SB)
-	RET
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
-DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_unlink(SB)
-	RET
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_unlinkat(SB)
-	RET
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_unmount(SB)
-	RET
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_write(SB)
-	RET
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
-DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_mmap(SB)
-	RET
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_munmap(SB)
-	RET
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_getfsstat(SB)
-	RET
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_utimensat(SB)
-	RET
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_pledge(SB)
-	RET
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pledge_trampoline_addr(SB)/8, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_unveil(SB)
-	RET
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unveil_trampoline_addr(SB)/8, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
deleted file mode 100644
index 28b487d..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
+++ /dev/null
@@ -1,2323 +0,0 @@
-// go run mksyscall.go -openbsd -libc -tags openbsd,riscv64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_riscv64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build openbsd && riscv64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgroups_trampoline_addr, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setgroups_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_wait4_trampoline_addr, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_wait4_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_accept_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_accept_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_accept accept "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_bind_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_bind_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_bind bind "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := syscall_syscall(libc_connect_trampoline_addr, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_connect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_connect connect "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_socket_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_socket_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socket socket "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := syscall_syscall6(libc_getsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := syscall_syscall6(libc_setsockopt_trampoline_addr, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setsockopt_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getpeername_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpeername_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpeername getpeername "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getsockname_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsockname_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_shutdown_trampoline_addr, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_shutdown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_shutdown shutdown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := syscall_rawSyscall6(libc_socketpair_trampoline_addr, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_socketpair_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_socketpair socketpair "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_recvfrom_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_recvfrom_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_sendto_trampoline_addr, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sendto_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendto sendto "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_recvmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_recvmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_sendmsg_trampoline_addr, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sendmsg_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_kevent_trampoline_addr, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kevent_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kevent kevent "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_utimes_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_utimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_futimes_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_futimes_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_futimes futimes "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_poll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_poll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_poll poll "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, behav int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_madvise_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(behav))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_madvise_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_mlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_mlockall_trampoline_addr, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_mprotect_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mprotect_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Msync(b []byte, flags int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_msync_trampoline_addr, uintptr(_p0), uintptr(len(b)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_msync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_msync msync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall(libc_munlock_trampoline_addr, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munlock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := syscall_syscall(libc_munlockall_trampoline_addr, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munlockall_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_pipe2_trampoline_addr, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pipe2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_getdents_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getdents_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_getcwd_trampoline_addr, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getcwd_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
-	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
-	return
-}
-
-var libc_getresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
-	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
-	return
-}
-
-var libc_getresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ioctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fcntl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ppoll_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ppoll ppoll "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_access_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_access_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_access access "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := syscall_syscall(libc_adjtime_trampoline_addr, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_adjtime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chflags_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chflags chflags "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chmod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_chroot_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_chroot_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_clock_gettime_trampoline_addr, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_clock_gettime_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_clock_gettime clock_gettime "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_close_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_close_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_close close "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_dup_trampoline_addr, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup2_trampoline_addr, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup2_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(from int, to int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_dup3_trampoline_addr, uintptr(from), uintptr(to), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_dup3_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_dup3 dup3 "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	syscall_syscall(libc_exit_trampoline_addr, uintptr(code), 0, 0)
-	return
-}
-
-var libc_exit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_faccessat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_faccessat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchdir_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchflags_trampoline_addr, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchflags_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchflags fchflags "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchmod_trampoline_addr, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchmod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fchmodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchmodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fchown_trampoline_addr, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fchownat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fchownat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := syscall_syscall(libc_flock_trampoline_addr, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_flock_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_flock flock "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := syscall_syscall(libc_fpathconf_trampoline_addr, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fpathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_fstatat_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstatat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := syscall_syscall(libc_fstatfs_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fstatfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fstatfs fstatfs "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := syscall_syscall(libc_fsync_trampoline_addr, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_fsync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := syscall_syscall(libc_ftruncate_trampoline_addr, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_ftruncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getegid_trampoline_addr, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-var libc_getegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_geteuid_trampoline_addr, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-var libc_geteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getgid_trampoline_addr, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-var libc_getgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getpgid_trampoline_addr, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpgrp_trampoline_addr, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-var libc_getpgrp_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getpid_trampoline_addr, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-var libc_getpid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getppid_trampoline_addr, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-var libc_getppid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getpriority_trampoline_addr, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrtable() (rtable int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getrtable_trampoline_addr, 0, 0, 0)
-	rtable = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrtable getrtable "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_getrusage_trampoline_addr, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getrusage_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_getsid_trampoline_addr, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_gettimeofday_trampoline_addr, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_gettimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := syscall_rawSyscall(libc_getuid_trampoline_addr, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-var libc_getuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := syscall_syscall(libc_issetugid_trampoline_addr, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-var libc_issetugid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_issetugid issetugid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := syscall_syscall(libc_kill_trampoline_addr, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kill_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := syscall_syscall(libc_kqueue_trampoline_addr, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_kqueue_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_kqueue kqueue "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_lchown_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lchown_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_link_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_link_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_link link "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_linkat_trampoline_addr, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_linkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_linkat linkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := syscall_syscall(libc_listen_trampoline_addr, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_listen_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_listen listen "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_lstat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkdirat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkdirat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkfifo_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkfifo_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mkfifoat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mkfifoat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_mknod_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mknod_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mknodat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mknodat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(fsType)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(dir)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mount mount "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_nanosleep_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall(libc_open_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_open_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_open open "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall6(libc_openat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_openat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall_syscall(libc_pathconf_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pathconf_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pread_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pread_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_pwrite_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pwrite_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_read_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_read_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_read read "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_readlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_readlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall6(libc_readlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_readlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_readlinkat readlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_rename_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_rename_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(fromfd int, from string, tofd int, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_renameat_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_renameat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_revoke_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_revoke_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_revoke revoke "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_rmdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_rmdir_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := syscall_syscall(libc_lseek_trampoline_addr, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_lseek_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := syscall_syscall6(libc_select_trampoline_addr, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_select_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_select select "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setegid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_seteuid_trampoline_addr, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_seteuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setgid_trampoline_addr, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_setlogin_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setlogin_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setlogin setlogin "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setpgid_trampoline_addr, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setpgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := syscall_syscall(libc_setpriority_trampoline_addr, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setpriority_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setregid_trampoline_addr, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setregid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setreuid_trampoline_addr, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setreuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresgid_trampoline_addr, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setresgid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresgid setresgid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setresuid_trampoline_addr, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setresuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setresuid setresuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrtable(rtable int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrtable_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrtable setrtable "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setsid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_settimeofday_trampoline_addr, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_settimeofday_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_settimeofday settimeofday "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setuid_trampoline_addr, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setuid_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_stat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_stat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_statfs_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_statfs_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_statfs statfs "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_symlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_symlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_symlinkat_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_symlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_symlinkat symlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := syscall_syscall(libc_sync_trampoline_addr, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_sync_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_truncate_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_truncate_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := syscall_syscall(libc_umask_trampoline_addr, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-var libc_umask_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unlink_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unlink_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unlinkat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unlinkat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall(libc_unmount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unmount_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unmount unmount "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := syscall_syscall(libc_write_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_write_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_write write "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := syscall_syscall6(libc_mmap_trampoline_addr, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_mmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_munmap_trampoline_addr, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_munmap_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getfsstat(stat *Statfs_t, bufsize uintptr, flags int) (n int, err error) {
-	r0, _, e1 := syscall_syscall(libc_getfsstat_trampoline_addr, uintptr(unsafe.Pointer(stat)), uintptr(bufsize), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_getfsstat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_getfsstat getfsstat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := syscall_syscall6(libc_utimensat_trampoline_addr, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_utimensat_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pledge(promises *byte, execpromises *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_pledge_trampoline_addr, uintptr(unsafe.Pointer(promises)), uintptr(unsafe.Pointer(execpromises)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_pledge_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_pledge pledge "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unveil(path *byte, flags *byte) (err error) {
-	_, _, e1 := syscall_syscall(libc_unveil_trampoline_addr, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(flags)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_unveil_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_unveil unveil "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
deleted file mode 100644
index 1e7f321..0000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
+++ /dev/null
@@ -1,699 +0,0 @@
-// go run mkasm.go openbsd riscv64
-// Code generated by the command above; DO NOT EDIT.
-
-#include "textflag.h"
-
-TEXT libc_getgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgroups(SB)
-GLOBL	·libc_getgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgroups_trampoline_addr(SB)/8, $libc_getgroups_trampoline<>(SB)
-
-TEXT libc_setgroups_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgroups(SB)
-GLOBL	·libc_setgroups_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgroups_trampoline_addr(SB)/8, $libc_setgroups_trampoline<>(SB)
-
-TEXT libc_wait4_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_wait4(SB)
-GLOBL	·libc_wait4_trampoline_addr(SB), RODATA, $8
-DATA	·libc_wait4_trampoline_addr(SB)/8, $libc_wait4_trampoline<>(SB)
-
-TEXT libc_accept_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_accept(SB)
-GLOBL	·libc_accept_trampoline_addr(SB), RODATA, $8
-DATA	·libc_accept_trampoline_addr(SB)/8, $libc_accept_trampoline<>(SB)
-
-TEXT libc_bind_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_bind(SB)
-GLOBL	·libc_bind_trampoline_addr(SB), RODATA, $8
-DATA	·libc_bind_trampoline_addr(SB)/8, $libc_bind_trampoline<>(SB)
-
-TEXT libc_connect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_connect(SB)
-GLOBL	·libc_connect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_connect_trampoline_addr(SB)/8, $libc_connect_trampoline<>(SB)
-
-TEXT libc_socket_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socket(SB)
-GLOBL	·libc_socket_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socket_trampoline_addr(SB)/8, $libc_socket_trampoline<>(SB)
-
-TEXT libc_getsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockopt(SB)
-GLOBL	·libc_getsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockopt_trampoline_addr(SB)/8, $libc_getsockopt_trampoline<>(SB)
-
-TEXT libc_setsockopt_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsockopt(SB)
-GLOBL	·libc_setsockopt_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsockopt_trampoline_addr(SB)/8, $libc_setsockopt_trampoline<>(SB)
-
-TEXT libc_getpeername_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpeername(SB)
-GLOBL	·libc_getpeername_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpeername_trampoline_addr(SB)/8, $libc_getpeername_trampoline<>(SB)
-
-TEXT libc_getsockname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsockname(SB)
-GLOBL	·libc_getsockname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsockname_trampoline_addr(SB)/8, $libc_getsockname_trampoline<>(SB)
-
-TEXT libc_shutdown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_shutdown(SB)
-GLOBL	·libc_shutdown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_shutdown_trampoline_addr(SB)/8, $libc_shutdown_trampoline<>(SB)
-
-TEXT libc_socketpair_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_socketpair(SB)
-GLOBL	·libc_socketpair_trampoline_addr(SB), RODATA, $8
-DATA	·libc_socketpair_trampoline_addr(SB)/8, $libc_socketpair_trampoline<>(SB)
-
-TEXT libc_recvfrom_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvfrom(SB)
-GLOBL	·libc_recvfrom_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvfrom_trampoline_addr(SB)/8, $libc_recvfrom_trampoline<>(SB)
-
-TEXT libc_sendto_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendto(SB)
-GLOBL	·libc_sendto_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendto_trampoline_addr(SB)/8, $libc_sendto_trampoline<>(SB)
-
-TEXT libc_recvmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_recvmsg(SB)
-GLOBL	·libc_recvmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_recvmsg_trampoline_addr(SB)/8, $libc_recvmsg_trampoline<>(SB)
-
-TEXT libc_sendmsg_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sendmsg(SB)
-GLOBL	·libc_sendmsg_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sendmsg_trampoline_addr(SB)/8, $libc_sendmsg_trampoline<>(SB)
-
-TEXT libc_kevent_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kevent(SB)
-GLOBL	·libc_kevent_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kevent_trampoline_addr(SB)/8, $libc_kevent_trampoline<>(SB)
-
-TEXT libc_utimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimes(SB)
-GLOBL	·libc_utimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimes_trampoline_addr(SB)/8, $libc_utimes_trampoline<>(SB)
-
-TEXT libc_futimes_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_futimes(SB)
-GLOBL	·libc_futimes_trampoline_addr(SB), RODATA, $8
-DATA	·libc_futimes_trampoline_addr(SB)/8, $libc_futimes_trampoline<>(SB)
-
-TEXT libc_poll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_poll(SB)
-GLOBL	·libc_poll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_poll_trampoline_addr(SB)/8, $libc_poll_trampoline<>(SB)
-
-TEXT libc_madvise_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_madvise(SB)
-GLOBL	·libc_madvise_trampoline_addr(SB), RODATA, $8
-DATA	·libc_madvise_trampoline_addr(SB)/8, $libc_madvise_trampoline<>(SB)
-
-TEXT libc_mlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlock(SB)
-GLOBL	·libc_mlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlock_trampoline_addr(SB)/8, $libc_mlock_trampoline<>(SB)
-
-TEXT libc_mlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mlockall(SB)
-GLOBL	·libc_mlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mlockall_trampoline_addr(SB)/8, $libc_mlockall_trampoline<>(SB)
-
-TEXT libc_mprotect_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mprotect(SB)
-GLOBL	·libc_mprotect_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mprotect_trampoline_addr(SB)/8, $libc_mprotect_trampoline<>(SB)
-
-TEXT libc_msync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_msync(SB)
-GLOBL	·libc_msync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_msync_trampoline_addr(SB)/8, $libc_msync_trampoline<>(SB)
-
-TEXT libc_munlock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlock(SB)
-GLOBL	·libc_munlock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlock_trampoline_addr(SB)/8, $libc_munlock_trampoline<>(SB)
-
-TEXT libc_munlockall_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munlockall(SB)
-GLOBL	·libc_munlockall_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munlockall_trampoline_addr(SB)/8, $libc_munlockall_trampoline<>(SB)
-
-TEXT libc_pipe2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pipe2(SB)
-GLOBL	·libc_pipe2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pipe2_trampoline_addr(SB)/8, $libc_pipe2_trampoline<>(SB)
-
-TEXT libc_getdents_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getdents(SB)
-GLOBL	·libc_getdents_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getdents_trampoline_addr(SB)/8, $libc_getdents_trampoline<>(SB)
-
-TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getcwd(SB)
-GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
-
-TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresuid(SB)
-GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
-
-TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getresgid(SB)
-GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
-
-TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ioctl(SB)
-GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB)
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fcntl(SB)
-GLOBL	·libc_fcntl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-
-TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ppoll(SB)
-GLOBL	·libc_ppoll_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ppoll_trampoline_addr(SB)/8, $libc_ppoll_trampoline<>(SB)
-
-TEXT libc_access_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_access(SB)
-GLOBL	·libc_access_trampoline_addr(SB), RODATA, $8
-DATA	·libc_access_trampoline_addr(SB)/8, $libc_access_trampoline<>(SB)
-
-TEXT libc_adjtime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_adjtime(SB)
-GLOBL	·libc_adjtime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_adjtime_trampoline_addr(SB)/8, $libc_adjtime_trampoline<>(SB)
-
-TEXT libc_chdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chdir(SB)
-GLOBL	·libc_chdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chdir_trampoline_addr(SB)/8, $libc_chdir_trampoline<>(SB)
-
-TEXT libc_chflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chflags(SB)
-GLOBL	·libc_chflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chflags_trampoline_addr(SB)/8, $libc_chflags_trampoline<>(SB)
-
-TEXT libc_chmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chmod(SB)
-GLOBL	·libc_chmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chmod_trampoline_addr(SB)/8, $libc_chmod_trampoline<>(SB)
-
-TEXT libc_chown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chown(SB)
-GLOBL	·libc_chown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chown_trampoline_addr(SB)/8, $libc_chown_trampoline<>(SB)
-
-TEXT libc_chroot_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_chroot(SB)
-GLOBL	·libc_chroot_trampoline_addr(SB), RODATA, $8
-DATA	·libc_chroot_trampoline_addr(SB)/8, $libc_chroot_trampoline<>(SB)
-
-TEXT libc_clock_gettime_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_clock_gettime(SB)
-GLOBL	·libc_clock_gettime_trampoline_addr(SB), RODATA, $8
-DATA	·libc_clock_gettime_trampoline_addr(SB)/8, $libc_clock_gettime_trampoline<>(SB)
-
-TEXT libc_close_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_close(SB)
-GLOBL	·libc_close_trampoline_addr(SB), RODATA, $8
-DATA	·libc_close_trampoline_addr(SB)/8, $libc_close_trampoline<>(SB)
-
-TEXT libc_dup_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup(SB)
-GLOBL	·libc_dup_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup_trampoline_addr(SB)/8, $libc_dup_trampoline<>(SB)
-
-TEXT libc_dup2_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup2(SB)
-GLOBL	·libc_dup2_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup2_trampoline_addr(SB)/8, $libc_dup2_trampoline<>(SB)
-
-TEXT libc_dup3_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_dup3(SB)
-GLOBL	·libc_dup3_trampoline_addr(SB), RODATA, $8
-DATA	·libc_dup3_trampoline_addr(SB)/8, $libc_dup3_trampoline<>(SB)
-
-TEXT libc_exit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_exit(SB)
-GLOBL	·libc_exit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_exit_trampoline_addr(SB)/8, $libc_exit_trampoline<>(SB)
-
-TEXT libc_faccessat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_faccessat(SB)
-GLOBL	·libc_faccessat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_faccessat_trampoline_addr(SB)/8, $libc_faccessat_trampoline<>(SB)
-
-TEXT libc_fchdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchdir(SB)
-GLOBL	·libc_fchdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchdir_trampoline_addr(SB)/8, $libc_fchdir_trampoline<>(SB)
-
-TEXT libc_fchflags_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchflags(SB)
-GLOBL	·libc_fchflags_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchflags_trampoline_addr(SB)/8, $libc_fchflags_trampoline<>(SB)
-
-TEXT libc_fchmod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmod(SB)
-GLOBL	·libc_fchmod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmod_trampoline_addr(SB)/8, $libc_fchmod_trampoline<>(SB)
-
-TEXT libc_fchmodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchmodat(SB)
-GLOBL	·libc_fchmodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchmodat_trampoline_addr(SB)/8, $libc_fchmodat_trampoline<>(SB)
-
-TEXT libc_fchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchown(SB)
-GLOBL	·libc_fchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchown_trampoline_addr(SB)/8, $libc_fchown_trampoline<>(SB)
-
-TEXT libc_fchownat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fchownat(SB)
-GLOBL	·libc_fchownat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fchownat_trampoline_addr(SB)/8, $libc_fchownat_trampoline<>(SB)
-
-TEXT libc_flock_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_flock(SB)
-GLOBL	·libc_flock_trampoline_addr(SB), RODATA, $8
-DATA	·libc_flock_trampoline_addr(SB)/8, $libc_flock_trampoline<>(SB)
-
-TEXT libc_fpathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fpathconf(SB)
-GLOBL	·libc_fpathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fpathconf_trampoline_addr(SB)/8, $libc_fpathconf_trampoline<>(SB)
-
-TEXT libc_fstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstat(SB)
-GLOBL	·libc_fstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstat_trampoline_addr(SB)/8, $libc_fstat_trampoline<>(SB)
-
-TEXT libc_fstatat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatat(SB)
-GLOBL	·libc_fstatat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatat_trampoline_addr(SB)/8, $libc_fstatat_trampoline<>(SB)
-
-TEXT libc_fstatfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fstatfs(SB)
-GLOBL	·libc_fstatfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fstatfs_trampoline_addr(SB)/8, $libc_fstatfs_trampoline<>(SB)
-
-TEXT libc_fsync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_fsync(SB)
-GLOBL	·libc_fsync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_fsync_trampoline_addr(SB)/8, $libc_fsync_trampoline<>(SB)
-
-TEXT libc_ftruncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_ftruncate(SB)
-GLOBL	·libc_ftruncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_ftruncate_trampoline_addr(SB)/8, $libc_ftruncate_trampoline<>(SB)
-
-TEXT libc_getegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getegid(SB)
-GLOBL	·libc_getegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getegid_trampoline_addr(SB)/8, $libc_getegid_trampoline<>(SB)
-
-TEXT libc_geteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_geteuid(SB)
-GLOBL	·libc_geteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_geteuid_trampoline_addr(SB)/8, $libc_geteuid_trampoline<>(SB)
-
-TEXT libc_getgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getgid(SB)
-GLOBL	·libc_getgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getgid_trampoline_addr(SB)/8, $libc_getgid_trampoline<>(SB)
-
-TEXT libc_getpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgid(SB)
-GLOBL	·libc_getpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgid_trampoline_addr(SB)/8, $libc_getpgid_trampoline<>(SB)
-
-TEXT libc_getpgrp_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpgrp(SB)
-GLOBL	·libc_getpgrp_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpgrp_trampoline_addr(SB)/8, $libc_getpgrp_trampoline<>(SB)
-
-TEXT libc_getpid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpid(SB)
-GLOBL	·libc_getpid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpid_trampoline_addr(SB)/8, $libc_getpid_trampoline<>(SB)
-
-TEXT libc_getppid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getppid(SB)
-GLOBL	·libc_getppid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getppid_trampoline_addr(SB)/8, $libc_getppid_trampoline<>(SB)
-
-TEXT libc_getpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getpriority(SB)
-GLOBL	·libc_getpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getpriority_trampoline_addr(SB)/8, $libc_getpriority_trampoline<>(SB)
-
-TEXT libc_getrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrlimit(SB)
-GLOBL	·libc_getrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrlimit_trampoline_addr(SB)/8, $libc_getrlimit_trampoline<>(SB)
-
-TEXT libc_getrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrtable(SB)
-GLOBL	·libc_getrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrtable_trampoline_addr(SB)/8, $libc_getrtable_trampoline<>(SB)
-
-TEXT libc_getrusage_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getrusage(SB)
-GLOBL	·libc_getrusage_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getrusage_trampoline_addr(SB)/8, $libc_getrusage_trampoline<>(SB)
-
-TEXT libc_getsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getsid(SB)
-GLOBL	·libc_getsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getsid_trampoline_addr(SB)/8, $libc_getsid_trampoline<>(SB)
-
-TEXT libc_gettimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_gettimeofday(SB)
-GLOBL	·libc_gettimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_gettimeofday_trampoline_addr(SB)/8, $libc_gettimeofday_trampoline<>(SB)
-
-TEXT libc_getuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getuid(SB)
-GLOBL	·libc_getuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getuid_trampoline_addr(SB)/8, $libc_getuid_trampoline<>(SB)
-
-TEXT libc_issetugid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_issetugid(SB)
-GLOBL	·libc_issetugid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_issetugid_trampoline_addr(SB)/8, $libc_issetugid_trampoline<>(SB)
-
-TEXT libc_kill_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kill(SB)
-GLOBL	·libc_kill_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kill_trampoline_addr(SB)/8, $libc_kill_trampoline<>(SB)
-
-TEXT libc_kqueue_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_kqueue(SB)
-GLOBL	·libc_kqueue_trampoline_addr(SB), RODATA, $8
-DATA	·libc_kqueue_trampoline_addr(SB)/8, $libc_kqueue_trampoline<>(SB)
-
-TEXT libc_lchown_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lchown(SB)
-GLOBL	·libc_lchown_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lchown_trampoline_addr(SB)/8, $libc_lchown_trampoline<>(SB)
-
-TEXT libc_link_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_link(SB)
-GLOBL	·libc_link_trampoline_addr(SB), RODATA, $8
-DATA	·libc_link_trampoline_addr(SB)/8, $libc_link_trampoline<>(SB)
-
-TEXT libc_linkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_linkat(SB)
-GLOBL	·libc_linkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_linkat_trampoline_addr(SB)/8, $libc_linkat_trampoline<>(SB)
-
-TEXT libc_listen_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_listen(SB)
-GLOBL	·libc_listen_trampoline_addr(SB), RODATA, $8
-DATA	·libc_listen_trampoline_addr(SB)/8, $libc_listen_trampoline<>(SB)
-
-TEXT libc_lstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lstat(SB)
-GLOBL	·libc_lstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lstat_trampoline_addr(SB)/8, $libc_lstat_trampoline<>(SB)
-
-TEXT libc_mkdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdir(SB)
-GLOBL	·libc_mkdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdir_trampoline_addr(SB)/8, $libc_mkdir_trampoline<>(SB)
-
-TEXT libc_mkdirat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkdirat(SB)
-GLOBL	·libc_mkdirat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkdirat_trampoline_addr(SB)/8, $libc_mkdirat_trampoline<>(SB)
-
-TEXT libc_mkfifo_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifo(SB)
-GLOBL	·libc_mkfifo_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifo_trampoline_addr(SB)/8, $libc_mkfifo_trampoline<>(SB)
-
-TEXT libc_mkfifoat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mkfifoat(SB)
-GLOBL	·libc_mkfifoat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mkfifoat_trampoline_addr(SB)/8, $libc_mkfifoat_trampoline<>(SB)
-
-TEXT libc_mknod_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknod(SB)
-GLOBL	·libc_mknod_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknod_trampoline_addr(SB)/8, $libc_mknod_trampoline<>(SB)
-
-TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mknodat(SB)
-GLOBL	·libc_mknodat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB)
-
-TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mount(SB)
-GLOBL	·libc_mount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB)
-
-TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_nanosleep(SB)
-GLOBL	·libc_nanosleep_trampoline_addr(SB), RODATA, $8
-DATA	·libc_nanosleep_trampoline_addr(SB)/8, $libc_nanosleep_trampoline<>(SB)
-
-TEXT libc_open_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_open(SB)
-GLOBL	·libc_open_trampoline_addr(SB), RODATA, $8
-DATA	·libc_open_trampoline_addr(SB)/8, $libc_open_trampoline<>(SB)
-
-TEXT libc_openat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_openat(SB)
-GLOBL	·libc_openat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_openat_trampoline_addr(SB)/8, $libc_openat_trampoline<>(SB)
-
-TEXT libc_pathconf_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pathconf(SB)
-GLOBL	·libc_pathconf_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pathconf_trampoline_addr(SB)/8, $libc_pathconf_trampoline<>(SB)
-
-TEXT libc_pread_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pread(SB)
-GLOBL	·libc_pread_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pread_trampoline_addr(SB)/8, $libc_pread_trampoline<>(SB)
-
-TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pwrite(SB)
-GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
-
-TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_read(SB)
-GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
-DATA	·libc_read_trampoline_addr(SB)/8, $libc_read_trampoline<>(SB)
-
-TEXT libc_readlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlink(SB)
-GLOBL	·libc_readlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlink_trampoline_addr(SB)/8, $libc_readlink_trampoline<>(SB)
-
-TEXT libc_readlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_readlinkat(SB)
-GLOBL	·libc_readlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_readlinkat_trampoline_addr(SB)/8, $libc_readlinkat_trampoline<>(SB)
-
-TEXT libc_rename_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rename(SB)
-GLOBL	·libc_rename_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rename_trampoline_addr(SB)/8, $libc_rename_trampoline<>(SB)
-
-TEXT libc_renameat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_renameat(SB)
-GLOBL	·libc_renameat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_renameat_trampoline_addr(SB)/8, $libc_renameat_trampoline<>(SB)
-
-TEXT libc_revoke_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_revoke(SB)
-GLOBL	·libc_revoke_trampoline_addr(SB), RODATA, $8
-DATA	·libc_revoke_trampoline_addr(SB)/8, $libc_revoke_trampoline<>(SB)
-
-TEXT libc_rmdir_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_rmdir(SB)
-GLOBL	·libc_rmdir_trampoline_addr(SB), RODATA, $8
-DATA	·libc_rmdir_trampoline_addr(SB)/8, $libc_rmdir_trampoline<>(SB)
-
-TEXT libc_lseek_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_lseek(SB)
-GLOBL	·libc_lseek_trampoline_addr(SB), RODATA, $8
-DATA	·libc_lseek_trampoline_addr(SB)/8, $libc_lseek_trampoline<>(SB)
-
-TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_select(SB)
-GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
-DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
-
-TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setegid(SB)
-GLOBL	·libc_setegid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setegid_trampoline_addr(SB)/8, $libc_setegid_trampoline<>(SB)
-
-TEXT libc_seteuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_seteuid(SB)
-GLOBL	·libc_seteuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_seteuid_trampoline_addr(SB)/8, $libc_seteuid_trampoline<>(SB)
-
-TEXT libc_setgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setgid(SB)
-GLOBL	·libc_setgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setgid_trampoline_addr(SB)/8, $libc_setgid_trampoline<>(SB)
-
-TEXT libc_setlogin_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setlogin(SB)
-GLOBL	·libc_setlogin_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setlogin_trampoline_addr(SB)/8, $libc_setlogin_trampoline<>(SB)
-
-TEXT libc_setpgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpgid(SB)
-GLOBL	·libc_setpgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpgid_trampoline_addr(SB)/8, $libc_setpgid_trampoline<>(SB)
-
-TEXT libc_setpriority_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setpriority(SB)
-GLOBL	·libc_setpriority_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setpriority_trampoline_addr(SB)/8, $libc_setpriority_trampoline<>(SB)
-
-TEXT libc_setregid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setregid(SB)
-GLOBL	·libc_setregid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setregid_trampoline_addr(SB)/8, $libc_setregid_trampoline<>(SB)
-
-TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setreuid(SB)
-GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
-
-TEXT libc_setresgid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresgid(SB)
-GLOBL	·libc_setresgid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresgid_trampoline_addr(SB)/8, $libc_setresgid_trampoline<>(SB)
-
-TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setresuid(SB)
-GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
-
-TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrtable(SB)
-GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrtable_trampoline_addr(SB)/8, $libc_setrtable_trampoline<>(SB)
-
-TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setsid(SB)
-GLOBL	·libc_setsid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setsid_trampoline_addr(SB)/8, $libc_setsid_trampoline<>(SB)
-
-TEXT libc_settimeofday_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_settimeofday(SB)
-GLOBL	·libc_settimeofday_trampoline_addr(SB), RODATA, $8
-DATA	·libc_settimeofday_trampoline_addr(SB)/8, $libc_settimeofday_trampoline<>(SB)
-
-TEXT libc_setuid_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setuid(SB)
-GLOBL	·libc_setuid_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setuid_trampoline_addr(SB)/8, $libc_setuid_trampoline<>(SB)
-
-TEXT libc_stat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_stat(SB)
-GLOBL	·libc_stat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_stat_trampoline_addr(SB)/8, $libc_stat_trampoline<>(SB)
-
-TEXT libc_statfs_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_statfs(SB)
-GLOBL	·libc_statfs_trampoline_addr(SB), RODATA, $8
-DATA	·libc_statfs_trampoline_addr(SB)/8, $libc_statfs_trampoline<>(SB)
-
-TEXT libc_symlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlink(SB)
-GLOBL	·libc_symlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlink_trampoline_addr(SB)/8, $libc_symlink_trampoline<>(SB)
-
-TEXT libc_symlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_symlinkat(SB)
-GLOBL	·libc_symlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_symlinkat_trampoline_addr(SB)/8, $libc_symlinkat_trampoline<>(SB)
-
-TEXT libc_sync_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sync(SB)
-GLOBL	·libc_sync_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sync_trampoline_addr(SB)/8, $libc_sync_trampoline<>(SB)
-
-TEXT libc_truncate_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_truncate(SB)
-GLOBL	·libc_truncate_trampoline_addr(SB), RODATA, $8
-DATA	·libc_truncate_trampoline_addr(SB)/8, $libc_truncate_trampoline<>(SB)
-
-TEXT libc_umask_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_umask(SB)
-GLOBL	·libc_umask_trampoline_addr(SB), RODATA, $8
-DATA	·libc_umask_trampoline_addr(SB)/8, $libc_umask_trampoline<>(SB)
-
-TEXT libc_unlink_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlink(SB)
-GLOBL	·libc_unlink_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlink_trampoline_addr(SB)/8, $libc_unlink_trampoline<>(SB)
-
-TEXT libc_unlinkat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unlinkat(SB)
-GLOBL	·libc_unlinkat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unlinkat_trampoline_addr(SB)/8, $libc_unlinkat_trampoline<>(SB)
-
-TEXT libc_unmount_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unmount(SB)
-GLOBL	·libc_unmount_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unmount_trampoline_addr(SB)/8, $libc_unmount_trampoline<>(SB)
-
-TEXT libc_write_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_write(SB)
-GLOBL	·libc_write_trampoline_addr(SB), RODATA, $8
-DATA	·libc_write_trampoline_addr(SB)/8, $libc_write_trampoline<>(SB)
-
-TEXT libc_mmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_mmap(SB)
-GLOBL	·libc_mmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_mmap_trampoline_addr(SB)/8, $libc_mmap_trampoline<>(SB)
-
-TEXT libc_munmap_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_munmap(SB)
-GLOBL	·libc_munmap_trampoline_addr(SB), RODATA, $8
-DATA	·libc_munmap_trampoline_addr(SB)/8, $libc_munmap_trampoline<>(SB)
-
-TEXT libc_getfsstat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_getfsstat(SB)
-GLOBL	·libc_getfsstat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_getfsstat_trampoline_addr(SB)/8, $libc_getfsstat_trampoline<>(SB)
-
-TEXT libc_utimensat_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_utimensat(SB)
-GLOBL	·libc_utimensat_trampoline_addr(SB), RODATA, $8
-DATA	·libc_utimensat_trampoline_addr(SB)/8, $libc_utimensat_trampoline<>(SB)
-
-TEXT libc_pledge_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_pledge(SB)
-GLOBL	·libc_pledge_trampoline_addr(SB), RODATA, $8
-DATA	·libc_pledge_trampoline_addr(SB)/8, $libc_pledge_trampoline<>(SB)
-
-TEXT libc_unveil_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_unveil(SB)
-GLOBL	·libc_unveil_trampoline_addr(SB), RODATA, $8
-DATA	·libc_unveil_trampoline_addr(SB)/8, $libc_unveil_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
index c654541..b5f926c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build solaris && amd64
+// +build solaris,amd64
 
 package unix
 
@@ -37,7 +38,6 @@ import (
 //go:cgo_import_dynamic libc_chmod chmod "libc.so"
 //go:cgo_import_dynamic libc_chown chown "libc.so"
 //go:cgo_import_dynamic libc_chroot chroot "libc.so"
-//go:cgo_import_dynamic libc_clockgettime clockgettime "libc.so"
 //go:cgo_import_dynamic libc_close close "libc.so"
 //go:cgo_import_dynamic libc_creat creat "libc.so"
 //go:cgo_import_dynamic libc_dup dup "libc.so"
@@ -66,7 +66,6 @@ import (
 //go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
 //go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
 //go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-//go:cgo_import_dynamic libc_getsid getsid "libc.so"
 //go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
 //go:cgo_import_dynamic libc_getuid getuid "libc.so"
 //go:cgo_import_dynamic libc_kill kill "libc.so"
@@ -109,6 +108,7 @@ import (
 //go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
 //go:cgo_import_dynamic libc_setregid setregid "libc.so"
 //go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
+//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
 //go:cgo_import_dynamic libc_setsid setsid "libc.so"
 //go:cgo_import_dynamic libc_setuid setuid "libc.so"
 //go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
@@ -141,23 +141,11 @@ import (
 //go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
 //go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
 //go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
-//go:cgo_import_dynamic libc_getpeerucred getpeerucred "libc.so"
-//go:cgo_import_dynamic libc_ucred_get ucred_get "libc.so"
-//go:cgo_import_dynamic libc_ucred_geteuid ucred_geteuid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getegid ucred_getegid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getruid ucred_getruid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getrgid ucred_getrgid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getsuid ucred_getsuid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getsgid ucred_getsgid "libc.so"
-//go:cgo_import_dynamic libc_ucred_getpid ucred_getpid "libc.so"
-//go:cgo_import_dynamic libc_ucred_free ucred_free "libc.so"
 //go:cgo_import_dynamic libc_port_create port_create "libc.so"
 //go:cgo_import_dynamic libc_port_associate port_associate "libc.so"
 //go:cgo_import_dynamic libc_port_dissociate port_dissociate "libc.so"
 //go:cgo_import_dynamic libc_port_get port_get "libc.so"
 //go:cgo_import_dynamic libc_port_getn port_getn "libc.so"
-//go:cgo_import_dynamic libc_putmsg putmsg "libc.so"
-//go:cgo_import_dynamic libc_getmsg getmsg "libc.so"
 
 //go:linkname procpipe libc_pipe
 //go:linkname procpipe2 libc_pipe2
@@ -186,7 +174,6 @@ import (
 //go:linkname procChmod libc_chmod
 //go:linkname procChown libc_chown
 //go:linkname procChroot libc_chroot
-//go:linkname procClockGettime libc_clockgettime
 //go:linkname procClose libc_close
 //go:linkname procCreat libc_creat
 //go:linkname procDup libc_dup
@@ -215,7 +202,6 @@ import (
 //go:linkname procGetpriority libc_getpriority
 //go:linkname procGetrlimit libc_getrlimit
 //go:linkname procGetrusage libc_getrusage
-//go:linkname procGetsid libc_getsid
 //go:linkname procGettimeofday libc_gettimeofday
 //go:linkname procGetuid libc_getuid
 //go:linkname procKill libc_kill
@@ -241,8 +227,8 @@ import (
 //go:linkname procOpenat libc_openat
 //go:linkname procPathconf libc_pathconf
 //go:linkname procPause libc_pause
-//go:linkname procpread libc_pread
-//go:linkname procpwrite libc_pwrite
+//go:linkname procPread libc_pread
+//go:linkname procPwrite libc_pwrite
 //go:linkname procread libc_read
 //go:linkname procReadlink libc_readlink
 //go:linkname procRename libc_rename
@@ -258,6 +244,7 @@ import (
 //go:linkname procSetpriority libc_setpriority
 //go:linkname procSetregid libc_setregid
 //go:linkname procSetreuid libc_setreuid
+//go:linkname procSetrlimit libc_setrlimit
 //go:linkname procSetsid libc_setsid
 //go:linkname procSetuid libc_setuid
 //go:linkname procshutdown libc_shutdown
@@ -290,23 +277,11 @@ import (
 //go:linkname procgetpeername libc_getpeername
 //go:linkname procsetsockopt libc_setsockopt
 //go:linkname procrecvfrom libc_recvfrom
-//go:linkname procgetpeerucred libc_getpeerucred
-//go:linkname procucred_get libc_ucred_get
-//go:linkname procucred_geteuid libc_ucred_geteuid
-//go:linkname procucred_getegid libc_ucred_getegid
-//go:linkname procucred_getruid libc_ucred_getruid
-//go:linkname procucred_getrgid libc_ucred_getrgid
-//go:linkname procucred_getsuid libc_ucred_getsuid
-//go:linkname procucred_getsgid libc_ucred_getsgid
-//go:linkname procucred_getpid libc_ucred_getpid
-//go:linkname procucred_free libc_ucred_free
 //go:linkname procport_create libc_port_create
 //go:linkname procport_associate libc_port_associate
 //go:linkname procport_dissociate libc_port_dissociate
 //go:linkname procport_get libc_port_get
 //go:linkname procport_getn libc_port_getn
-//go:linkname procputmsg libc_putmsg
-//go:linkname procgetmsg libc_getmsg
 
 var (
 	procpipe,
@@ -336,7 +311,6 @@ var (
 	procChmod,
 	procChown,
 	procChroot,
-	procClockGettime,
 	procClose,
 	procCreat,
 	procDup,
@@ -365,7 +339,6 @@ var (
 	procGetpriority,
 	procGetrlimit,
 	procGetrusage,
-	procGetsid,
 	procGettimeofday,
 	procGetuid,
 	procKill,
@@ -391,8 +364,8 @@ var (
 	procOpenat,
 	procPathconf,
 	procPause,
-	procpread,
-	procpwrite,
+	procPread,
+	procPwrite,
 	procread,
 	procReadlink,
 	procRename,
@@ -408,6 +381,7 @@ var (
 	procSetpriority,
 	procSetregid,
 	procSetreuid,
+	procSetrlimit,
 	procSetsid,
 	procSetuid,
 	procshutdown,
@@ -440,23 +414,11 @@ var (
 	procgetpeername,
 	procsetsockopt,
 	procrecvfrom,
-	procgetpeerucred,
-	procucred_get,
-	procucred_geteuid,
-	procucred_getegid,
-	procucred_getruid,
-	procucred_getrgid,
-	procucred_getsuid,
-	procucred_getsgid,
-	procucred_getpid,
-	procucred_free,
 	procport_create,
 	procport_associate,
 	procport_dissociate,
 	procport_get,
-	procport_getn,
-	procputmsg,
-	procgetmsg syscallFunc
+	procport_getn syscallFunc
 )
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
@@ -465,7 +427,7 @@ func pipe(p *[2]_C_int) (n int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procpipe)), 1, uintptr(unsafe.Pointer(p)), 0, 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -475,7 +437,7 @@ func pipe(p *[2]_C_int) (n int, err error) {
 func pipe2(p *[2]_C_int, flags int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procpipe2)), 2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -485,7 +447,7 @@ func pipe2(p *[2]_C_int, flags int) (err error) {
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -500,7 +462,7 @@ func Getcwd(buf []byte) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -511,7 +473,7 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -521,7 +483,7 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 func setgroups(ngid int, gid *_Gid_t) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -532,7 +494,7 @@ func wait4(pid int32, statusp *_C_int, options int, rusage *Rusage) (wpid int32,
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwait4)), 4, uintptr(pid), uintptr(unsafe.Pointer(statusp)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
 	wpid = int32(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -547,7 +509,7 @@ func gethostname(buf []byte) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -562,7 +524,7 @@ func utimes(path string, times *[2]Timeval) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -577,7 +539,7 @@ func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -588,7 +550,7 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
 	val = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -598,7 +560,7 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -609,7 +571,7 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -620,7 +582,7 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_recvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -631,7 +593,7 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -641,7 +603,7 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 func acct(path *byte) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -672,22 +634,11 @@ func __minor(version int, dev uint64) (val uint) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlRet(fd int, req int, arg uintptr) (ret int, err error) {
+func ioctlRet(fd int, req uint, arg uintptr) (ret int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
 	ret = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtrRet(fd int, req int, arg unsafe.Pointer) (ret int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -698,7 +649,7 @@ func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpoll)), 3, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -713,7 +664,7 @@ func Access(path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -723,7 +674,7 @@ func Access(path string, mode uint32) (err error) {
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -738,7 +689,7 @@ func Chdir(path string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -753,7 +704,7 @@ func Chmod(path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -768,7 +719,7 @@ func Chown(path string, uid int, gid int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -783,17 +734,7 @@ func Chroot(path string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClockGettime)), 2, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -803,7 +744,7 @@ func ClockGettime(clockid int32, time *Timespec) (err error) {
 func Close(fd int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -819,7 +760,7 @@ func Creat(path string, mode uint32) (fd int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -830,7 +771,7 @@ func Dup(fd int) (nfd int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -840,7 +781,7 @@ func Dup(fd int) (nfd int, err error) {
 func Dup2(oldfd int, newfd int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -862,7 +803,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFaccessat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -872,7 +813,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 func Fchdir(fd int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -882,7 +823,7 @@ func Fchdir(fd int) (err error) {
 func Fchmod(fd int, mode uint32) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -897,7 +838,7 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -907,7 +848,7 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -922,7 +863,7 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -932,7 +873,7 @@ func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 func Fdatasync(fd int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -942,7 +883,7 @@ func Fdatasync(fd int) (err error) {
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFlock)), 2, uintptr(fd), uintptr(how), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -953,7 +894,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
 	val = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -963,7 +904,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 func Fstat(fd int, stat *Stat_t) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -978,7 +919,7 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -988,7 +929,7 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
 func Fstatvfs(fd int, vfsstat *Statvfs_t) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatvfs)), 2, uintptr(fd), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1003,7 +944,7 @@ func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1030,7 +971,7 @@ func Getpgid(pid int) (pgid int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1041,7 +982,7 @@ func Getpgrp() (pgid int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
 	pgid = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1076,7 +1017,7 @@ func Getpriority(which int, who int) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1086,7 +1027,7 @@ func Getpriority(which int, who int) (n int, err error) {
 func Getrlimit(which int, lim *Rlimit) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1096,18 +1037,7 @@ func Getrlimit(which int, lim *Rlimit) (err error) {
 func Getrusage(who int, rusage *Rusage) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetsid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1117,7 +1047,7 @@ func Getsid(pid int) (sid int, err error) {
 func Gettimeofday(tv *Timeval) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1135,7 +1065,7 @@ func Getuid() (uid int) {
 func Kill(pid int, signum syscall.Signal) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1150,7 +1080,7 @@ func Lchown(path string, uid int, gid int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1170,7 +1100,7 @@ func Link(path string, link string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1180,7 +1110,7 @@ func Link(path string, link string) (err error) {
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_llisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1195,7 +1125,7 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1209,7 +1139,7 @@ func Madvise(b []byte, advice int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1224,7 +1154,7 @@ func Mkdir(path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1239,7 +1169,7 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1254,7 +1184,7 @@ func Mkfifo(path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1269,7 +1199,7 @@ func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1284,7 +1214,7 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1299,7 +1229,7 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1313,7 +1243,7 @@ func Mlock(b []byte) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1323,7 +1253,7 @@ func Mlock(b []byte) (err error) {
 func Mlockall(flags int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1337,7 +1267,7 @@ func Mprotect(b []byte, prot int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1351,7 +1281,7 @@ func Msync(b []byte, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMsync)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(flags), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1365,7 +1295,7 @@ func Munlock(b []byte) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1375,7 +1305,7 @@ func Munlock(b []byte) (err error) {
 func Munlockall() (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1385,7 +1315,7 @@ func Munlockall() (err error) {
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1401,7 +1331,7 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1417,7 +1347,7 @@ func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1433,7 +1363,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
 	val = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1443,37 +1373,37 @@ func Pathconf(path string, name int) (val int, err error) {
 func Pause() (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pread(fd int, p []byte, offset int64) (n int, err error) {
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwrite(fd int, p []byte, offset int64) (n int, err error) {
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1488,7 +1418,7 @@ func read(fd int, p []byte) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1508,7 +1438,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1528,7 +1458,7 @@ func Rename(from string, to string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1548,7 +1478,7 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1563,7 +1493,7 @@ func Rmdir(path string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1574,7 +1504,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
 	newoffset = int64(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1585,7 +1515,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSelect)), 5, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1595,7 +1525,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 func Setegid(egid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1605,7 +1535,7 @@ func Setegid(egid int) (err error) {
 func Seteuid(euid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1615,7 +1545,7 @@ func Seteuid(euid int) (err error) {
 func Setgid(gid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1629,7 +1559,7 @@ func Sethostname(p []byte) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1639,7 +1569,7 @@ func Sethostname(p []byte) (err error) {
 func Setpgid(pid int, pgid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1649,7 +1579,7 @@ func Setpgid(pid int, pgid int) (err error) {
 func Setpriority(which int, who int, prio int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1659,7 +1589,7 @@ func Setpriority(which int, who int, prio int) (err error) {
 func Setregid(rgid int, egid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1669,7 +1599,17 @@ func Setregid(rgid int, egid int) (err error) {
 func Setreuid(ruid int, euid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
 	}
 	return
 }
@@ -1680,7 +1620,7 @@ func Setsid() (pid int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1690,7 +1630,7 @@ func Setsid() (pid int, err error) {
 func Setuid(uid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1700,7 +1640,7 @@ func Setuid(uid int) (err error) {
 func Shutdown(s int, how int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1715,7 +1655,7 @@ func Stat(path string, stat *Stat_t) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1730,7 +1670,7 @@ func Statvfs(path string, vfsstat *Statvfs_t) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStatvfs)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1750,7 +1690,7 @@ func Symlink(path string, link string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1760,7 +1700,7 @@ func Symlink(path string, link string) (err error) {
 func Sync() (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1771,7 +1711,7 @@ func Sysconf(which int) (n int64, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSysconf)), 1, uintptr(which), 0, 0, 0, 0, 0)
 	n = int64(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1782,7 +1722,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
 	ticks = uintptr(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1797,7 +1737,7 @@ func Truncate(path string, length int64) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1807,7 +1747,7 @@ func Truncate(path string, length int64) (err error) {
 func Fsync(fd int) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1817,7 +1757,7 @@ func Fsync(fd int) (err error) {
 func Ftruncate(fd int, length int64) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1835,7 +1775,7 @@ func Umask(mask int) (oldmask int) {
 func Uname(buf *Utsname) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1850,7 +1790,7 @@ func Unmount(target string, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1865,7 +1805,7 @@ func Unlink(path string) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1880,7 +1820,7 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1890,7 +1830,7 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
 func Ustat(dev int, ubuf *Ustat_t) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1905,7 +1845,7 @@ func Utime(path string, buf *Utimbuf) (err error) {
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1915,7 +1855,7 @@ func Utime(path string, buf *Utimbuf) (err error) {
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_bind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1925,7 +1865,7 @@ func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_connect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1936,7 +1876,7 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
 	ret = uintptr(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1946,7 +1886,7 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 func munmap(addr uintptr, length uintptr) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1957,7 +1897,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendfile)), 4, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
 	written = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1971,7 +1911,7 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	}
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1982,7 +1922,7 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -1992,7 +1932,7 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2007,7 +1947,7 @@ func write(fd int, p []byte) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2017,7 +1957,7 @@ func write(fd int, p []byte) (n int, err error) {
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_getsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2027,7 +1967,7 @@ func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2037,7 +1977,7 @@ func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2052,102 +1992,18 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getpeerucred(fd uintptr, ucred *uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetpeerucred)), 2, uintptr(fd), uintptr(unsafe.Pointer(ucred)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGet(pid int) (ucred uintptr, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procucred_get)), 1, uintptr(pid), 0, 0, 0, 0, 0)
-	ucred = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGeteuid(ucred uintptr) (uid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_geteuid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetegid(ucred uintptr) (gid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getegid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetruid(ucred uintptr) (uid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getruid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetrgid(ucred uintptr) (gid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getrgid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetsuid(ucred uintptr) (uid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getsuid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetsgid(ucred uintptr) (gid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getsgid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredGetpid(ucred uintptr) (pid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procucred_getpid)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ucredFree(ucred uintptr) {
-	sysvicall6(uintptr(unsafe.Pointer(&procucred_free)), 1, uintptr(ucred), 0, 0, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func port_create() (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procport_create)), 0, 0, 0, 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2158,7 +2014,7 @@ func port_associate(port int, source int, object uintptr, events int, user *byte
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procport_associate)), 5, uintptr(port), uintptr(source), uintptr(object), uintptr(events), uintptr(unsafe.Pointer(user)), 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2169,7 +2025,7 @@ func port_dissociate(port int, source int, object uintptr) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procport_dissociate)), 3, uintptr(port), uintptr(source), uintptr(object), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2180,7 +2036,7 @@ func port_get(port int, pe *portEvent, timeout *Timespec) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procport_get)), 3, uintptr(port), uintptr(unsafe.Pointer(pe)), uintptr(unsafe.Pointer(timeout)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
@@ -2191,27 +2047,7 @@ func port_getn(port int, pe *portEvent, max uint32, nget *uint32, timeout *Times
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procport_getn)), 5, uintptr(port), uintptr(unsafe.Pointer(pe)), uintptr(max), uintptr(unsafe.Pointer(nget)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func putmsg(fd int, clptr *strbuf, dataptr *strbuf, flags int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procputmsg)), 4, uintptr(fd), uintptr(unsafe.Pointer(clptr)), uintptr(unsafe.Pointer(dataptr)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getmsg(fd int, clptr *strbuf, dataptr *strbuf, flags *int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetmsg)), 4, uintptr(fd), uintptr(unsafe.Pointer(clptr)), uintptr(unsafe.Pointer(dataptr)), uintptr(unsafe.Pointer(flags)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+		err = e1
 	}
 	return
 }
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
index 7ccf66b..f207945 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
@@ -1,110 +1,28 @@
-// go run mksyscall_zos_s390x.go -o_sysnum zsysnum_zos_s390x.go -o_syscall zsyscall_zos_s390x.go -i_syscall syscall_zos_s390x.go -o_asm zsymaddr_zos_s390x.s
+// go run mksyscall.go -tags zos,s390x syscall_zos_s390x.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 package unix
 
 import (
-	"runtime"
-	"syscall"
 	"unsafe"
 )
 
-var _ syscall.Errno
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCNTL<<4, uintptr(fd), uintptr(cmd), uintptr(arg))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
 	val = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Flistxattr(fd int, dest []byte) (sz int, err error) {
-	var _p0 unsafe.Pointer
-	if len(dest) > 0 {
-		_p0 = unsafe.Pointer(&dest[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FLISTXATTR_A<<4, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
-	runtime.ExitSyscall()
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FlistxattrAddr() *(func(fd int, dest []byte) (sz int, err error))
-
-var Flistxattr = enter_Flistxattr
-
-func enter_Flistxattr(fd int, dest []byte) (sz int, err error) {
-	funcref := get_FlistxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FLISTXATTR_A<<4, "") == 0 {
-		*funcref = impl_Flistxattr
-	} else {
-		*funcref = error_Flistxattr
-	}
-	return (*funcref)(fd, dest)
-}
-
-func error_Flistxattr(fd int, dest []byte) (sz int, err error) {
-	sz = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Fremovexattr(fd int, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FREMOVEXATTR_A<<4, uintptr(fd), uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FremovexattrAddr() *(func(fd int, attr string) (err error))
-
-var Fremovexattr = enter_Fremovexattr
-
-func enter_Fremovexattr(fd int, attr string) (err error) {
-	funcref := get_FremovexattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FREMOVEXATTR_A<<4, "") == 0 {
-		*funcref = impl_Fremovexattr
-	} else {
-		*funcref = error_Fremovexattr
-	}
-	return (*funcref)(fd, attr)
-}
-
-func error_Fremovexattr(fd int, attr string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -112,12 +30,21 @@ func read(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_READ<<4, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := syscall_syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -131,159 +58,31 @@ func write(fd int, p []byte) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_WRITE<<4, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FGETXATTR_A<<4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	runtime.ExitSyscall()
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FgetxattrAddr() *(func(fd int, attr string, dest []byte) (sz int, err error))
-
-var Fgetxattr = enter_Fgetxattr
-
-func enter_Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
-	funcref := get_FgetxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FGETXATTR_A<<4, "") == 0 {
-		*funcref = impl_Fgetxattr
-	} else {
-		*funcref = error_Fgetxattr
-	}
-	return (*funcref)(fd, attr, dest)
-}
-
-func error_Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
-	sz = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Fsetxattr(fd int, attr string, data []byte, flag int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(data) > 0 {
-		_p1 = unsafe.Pointer(&data[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FSETXATTR_A<<4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(data)), uintptr(flag))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FsetxattrAddr() *(func(fd int, attr string, data []byte, flag int) (err error))
-
-var Fsetxattr = enter_Fsetxattr
-
-func enter_Fsetxattr(fd int, attr string, data []byte, flag int) (err error) {
-	funcref := get_FsetxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FSETXATTR_A<<4, "") == 0 {
-		*funcref = impl_Fsetxattr
-	} else {
-		*funcref = error_Fsetxattr
-	}
-	return (*funcref)(fd, attr, data, flag)
-}
-
-func error_Fsetxattr(fd int, attr string, data []byte, flag int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___ACCEPT_A<<4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___ACCEPT_A, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___ACCEPT4_A<<4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_accept4Addr() *(func(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error))
-
-var accept4 = enter_accept4
-
-func enter_accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	funcref := get_accept4Addr()
-	if funcptrtest(GetZosLibVec()+SYS___ACCEPT4_A<<4, "") == 0 {
-		*funcref = impl_accept4
-	} else {
-		*funcref = error_accept4
-	}
-	return (*funcref)(s, rsa, addrlen, flags)
-}
-
-func error_accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___BIND_A<<4, uintptr(s), uintptr(addr), uintptr(addrlen))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___BIND_A, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -291,11 +90,9 @@ func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CONNECT_A<<4, uintptr(s), uintptr(addr), uintptr(addrlen))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___CONNECT_A, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -303,10 +100,10 @@ func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETGROUPS<<4, uintptr(n), uintptr(unsafe.Pointer(list)))
+	r0, _, e1 := syscall_rawsyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
 	nn = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -314,9 +111,9 @@ func getgroups(n int, list *_Gid_t) (nn int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setgroups(n int, list *_Gid_t) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETGROUPS<<4, uintptr(n), uintptr(unsafe.Pointer(list)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -324,11 +121,9 @@ func setgroups(n int, list *_Gid_t) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETSOCKOPT<<4, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -336,11 +131,9 @@ func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETSOCKOPT<<4, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -348,10 +141,10 @@ func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr)
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SOCKET<<4, uintptr(domain), uintptr(typ), uintptr(proto))
+	r0, _, e1 := syscall_rawsyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
 	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -359,9 +152,9 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SOCKETPAIR<<4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -369,9 +162,9 @@ func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___GETPEERNAME_A<<4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS___GETPEERNAME_A, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -379,57 +172,15 @@ func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___GETSOCKNAME_A<<4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS___GETSOCKNAME_A, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___REMOVEXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_RemovexattrAddr() *(func(path string, attr string) (err error))
-
-var Removexattr = enter_Removexattr
-
-func enter_Removexattr(path string, attr string) (err error) {
-	funcref := get_RemovexattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___REMOVEXATTR_A<<4, "") == 0 {
-		*funcref = impl_Removexattr
-	} else {
-		*funcref = error_Removexattr
-	}
-	return (*funcref)(path, attr)
-}
-
-func error_Removexattr(path string, attr string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -437,12 +188,10 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RECVFROM_A<<4, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall6(SYS___RECVFROM_A, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -456,11 +205,9 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SENDTO_A<<4, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall6(SYS___SENDTO_A, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -468,12 +215,10 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RECVMSG_A<<4, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___RECVMSG_A, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -481,12 +226,10 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SENDMSG_A<<4, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___SENDMSG_A, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -494,12 +237,10 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_MMAP<<4, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
 	ret = uintptr(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -507,86 +248,19 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_MUNMAP<<4, uintptr(addr), uintptr(length))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req int, arg uintptr) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_IOCTL<<4, uintptr(fd), uintptr(req), uintptr(arg))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_IOCTL<<4, uintptr(fd), uintptr(req), uintptr(arg))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmat(id int, addr uintptr, flag int) (ret uintptr, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SHMAT<<4, uintptr(id), uintptr(addr), uintptr(flag))
-	runtime.ExitSyscall()
-	ret = uintptr(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmctl(id int, cmd int, buf *SysvShmDesc) (result int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SHMCTL64<<4, uintptr(id), uintptr(cmd), uintptr(unsafe.Pointer(buf)))
-	runtime.ExitSyscall()
-	result = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmdt(addr uintptr) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SHMDT<<4, uintptr(addr))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func shmget(key int, size int, flag int) (id int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SHMGET<<4, uintptr(key), uintptr(size), uintptr(flag))
-	runtime.ExitSyscall()
-	id = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := syscall_syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -599,11 +273,9 @@ func Access(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___ACCESS_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___ACCESS_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -616,11 +288,9 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CHDIR_A<<4, uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___CHDIR_A, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -633,11 +303,9 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CHOWN_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___CHOWN_A, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -650,11 +318,9 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CHMOD_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___CHMOD_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -667,12 +333,10 @@ func Creat(path string, mode uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CREAT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___CREAT_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -680,12 +344,10 @@ func Creat(path string, mode uint32) (fd int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup(oldfd int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_DUP<<4, uintptr(oldfd))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -693,359 +355,42 @@ func Dup(oldfd int) (fd int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Dup2(oldfd int, newfd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_DUP2<<4, uintptr(oldfd), uintptr(newfd))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Dup3(oldfd int, newfd int, flags int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_DUP3<<4, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_Dup3Addr() *(func(oldfd int, newfd int, flags int) (err error))
-
-var Dup3 = enter_Dup3
-
-func enter_Dup3(oldfd int, newfd int, flags int) (err error) {
-	funcref := get_Dup3Addr()
-	if funcptrtest(GetZosLibVec()+SYS_DUP3<<4, "") == 0 {
-		*funcref = impl_Dup3
-	} else {
-		*funcref = error_Dup3
-	}
-	return (*funcref)(oldfd, newfd, flags)
-}
-
-func error_Dup3(oldfd int, newfd int, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Dirfd(dirp uintptr) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_DIRFD<<4, uintptr(dirp))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_DirfdAddr() *(func(dirp uintptr) (fd int, err error))
-
-var Dirfd = enter_Dirfd
-
-func enter_Dirfd(dirp uintptr) (fd int, err error) {
-	funcref := get_DirfdAddr()
-	if funcptrtest(GetZosLibVec()+SYS_DIRFD<<4, "") == 0 {
-		*funcref = impl_Dirfd
-	} else {
-		*funcref = error_Dirfd
-	}
-	return (*funcref)(dirp)
-}
-
-func error_Dirfd(dirp uintptr) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_EpollCreate(size int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EPOLL_CREATE<<4, uintptr(size))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EpollCreateAddr() *(func(size int) (fd int, err error))
-
-var EpollCreate = enter_EpollCreate
-
-func enter_EpollCreate(size int) (fd int, err error) {
-	funcref := get_EpollCreateAddr()
-	if funcptrtest(GetZosLibVec()+SYS_EPOLL_CREATE<<4, "") == 0 {
-		*funcref = impl_EpollCreate
-	} else {
-		*funcref = error_EpollCreate
-	}
-	return (*funcref)(size)
-}
-
-func error_EpollCreate(size int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_EpollCreate1(flags int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EPOLL_CREATE1<<4, uintptr(flags))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EpollCreate1Addr() *(func(flags int) (fd int, err error))
-
-var EpollCreate1 = enter_EpollCreate1
-
-func enter_EpollCreate1(flags int) (fd int, err error) {
-	funcref := get_EpollCreate1Addr()
-	if funcptrtest(GetZosLibVec()+SYS_EPOLL_CREATE1<<4, "") == 0 {
-		*funcref = impl_EpollCreate1
-	} else {
-		*funcref = error_EpollCreate1
-	}
-	return (*funcref)(flags)
-}
-
-func error_EpollCreate1(flags int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EPOLL_CTL<<4, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EpollCtlAddr() *(func(epfd int, op int, fd int, event *EpollEvent) (err error))
-
-var EpollCtl = enter_EpollCtl
-
-func enter_EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	funcref := get_EpollCtlAddr()
-	if funcptrtest(GetZosLibVec()+SYS_EPOLL_CTL<<4, "") == 0 {
-		*funcref = impl_EpollCtl
-	} else {
-		*funcref = error_EpollCtl
-	}
-	return (*funcref)(epfd, op, fd, event)
-}
-
-func error_EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_EpollPwait(epfd int, events []EpollEvent, msec int, sigmask *int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EPOLL_PWAIT<<4, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), uintptr(unsafe.Pointer(sigmask)))
-	runtime.ExitSyscall()
-	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EpollPwaitAddr() *(func(epfd int, events []EpollEvent, msec int, sigmask *int) (n int, err error))
-
-var EpollPwait = enter_EpollPwait
-
-func enter_EpollPwait(epfd int, events []EpollEvent, msec int, sigmask *int) (n int, err error) {
-	funcref := get_EpollPwaitAddr()
-	if funcptrtest(GetZosLibVec()+SYS_EPOLL_PWAIT<<4, "") == 0 {
-		*funcref = impl_EpollPwait
-	} else {
-		*funcref = error_EpollPwait
-	}
-	return (*funcref)(epfd, events, msec, sigmask)
-}
-
-func error_EpollPwait(epfd int, events []EpollEvent, msec int, sigmask *int) (n int, err error) {
-	n = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EPOLL_WAIT<<4, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec))
-	runtime.ExitSyscall()
-	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EpollWaitAddr() *(func(epfd int, events []EpollEvent, msec int) (n int, err error))
-
-var EpollWait = enter_EpollWait
-
-func enter_EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	funcref := get_EpollWaitAddr()
-	if funcptrtest(GetZosLibVec()+SYS_EPOLL_WAIT<<4, "") == 0 {
-		*funcref = impl_EpollWait
-	} else {
-		*funcref = error_EpollWait
-	}
-	return (*funcref)(epfd, events, msec)
-}
-
-func error_EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	n = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Errno2() (er2 int) {
-	runtime.EnterSyscall()
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS___ERRNO2<<4)
-	runtime.ExitSyscall()
-	er2 = int(r0)
+	uer2, _, _ := syscall_syscall(SYS___ERRNO2, 0, 0, 0)
+	er2 = int(uer2)
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Eventfd(initval uint, flags int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_EVENTFD<<4, uintptr(initval), uintptr(flags))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_EventfdAddr() *(func(initval uint, flags int) (fd int, err error))
-
-var Eventfd = enter_Eventfd
-
-func enter_Eventfd(initval uint, flags int) (fd int, err error) {
-	funcref := get_EventfdAddr()
-	if funcptrtest(GetZosLibVec()+SYS_EVENTFD<<4, "") == 0 {
-		*funcref = impl_Eventfd
-	} else {
-		*funcref = error_Eventfd
-	}
-	return (*funcref)(initval, flags)
-}
-
-func error_Eventfd(initval uint, flags int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
+func Err2ad() (eadd *int) {
+	ueadd, _, _ := syscall_syscall(SYS___ERR2AD, 0, 0, 0)
+	eadd = (*int)(unsafe.Pointer(ueadd))
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Exit(code int) {
-	runtime.EnterSyscall()
-	CallLeFuncWithErr(GetZosLibVec()+SYS_EXIT<<4, uintptr(code))
-	runtime.ExitSyscall()
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FACCESSAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FaccessatAddr() *(func(dirfd int, path string, mode uint32, flags int) (err error))
-
-var Faccessat = enter_Faccessat
-
-func enter_Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	funcref := get_FaccessatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FACCESSAT_A<<4, "") == 0 {
-		*funcref = impl_Faccessat
-	} else {
-		*funcref = error_Faccessat
-	}
-	return (*funcref)(dirfd, path, mode, flags)
-}
-
-func error_Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	err = ENOSYS
+	syscall_syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchdir(fd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCHDIR<<4, uintptr(fd))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -1053,333 +398,50 @@ func Fchdir(fd int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fchmod(fd int, mode uint32) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCHMOD<<4, uintptr(fd), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FCHMODAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FchmodatAddr() *(func(dirfd int, path string, mode uint32, flags int) (err error))
-
-var Fchmodat = enter_Fchmodat
-
-func enter_Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	funcref := get_FchmodatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FCHMODAT_A<<4, "") == 0 {
-		*funcref = impl_Fchmodat
-	} else {
-		*funcref = error_Fchmodat
-	}
-	return (*funcref)(dirfd, path, mode, flags)
-}
-
-func error_Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchown(fd int, uid int, gid int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCHOWN<<4, uintptr(fd), uintptr(uid), uintptr(gid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Fchownat(fd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FCHOWNAT_A<<4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FchownatAddr() *(func(fd int, path string, uid int, gid int, flags int) (err error))
-
-var Fchownat = enter_Fchownat
-
-func enter_Fchownat(fd int, path string, uid int, gid int, flags int) (err error) {
-	funcref := get_FchownatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FCHOWNAT_A<<4, "") == 0 {
-		*funcref = impl_Fchownat
-	} else {
-		*funcref = error_Fchownat
-	}
-	return (*funcref)(fd, path, uid, gid, flags)
-}
-
-func error_Fchownat(fd int, path string, uid int, gid int, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func FcntlInt(fd uintptr, cmd int, arg int) (retval int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FCNTL<<4, uintptr(fd), uintptr(cmd), uintptr(arg))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
 	retval = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Fdatasync(fd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FDATASYNC<<4, uintptr(fd))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FdatasyncAddr() *(func(fd int) (err error))
-
-var Fdatasync = enter_Fdatasync
-
-func enter_Fdatasync(fd int) (err error) {
-	funcref := get_FdatasyncAddr()
-	if funcptrtest(GetZosLibVec()+SYS_FDATASYNC<<4, "") == 0 {
-		*funcref = impl_Fdatasync
-	} else {
-		*funcref = error_Fdatasync
-	}
-	return (*funcref)(fd)
-}
-
-func error_Fdatasync(fd int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func fstat(fd int, stat *Stat_LE_t) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FSTAT<<4, uintptr(fd), uintptr(unsafe.Pointer(stat)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_fstatat(dirfd int, path string, stat *Stat_LE_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FSTATAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_fstatatAddr() *(func(dirfd int, path string, stat *Stat_LE_t, flags int) (err error))
-
-var fstatat = enter_fstatat
-
-func enter_fstatat(dirfd int, path string, stat *Stat_LE_t, flags int) (err error) {
-	funcref := get_fstatatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FSTATAT_A<<4, "") == 0 {
-		*funcref = impl_fstatat
-	} else {
-		*funcref = error_fstatat
-	}
-	return (*funcref)(dirfd, path, stat, flags)
-}
-
-func error_fstatat(dirfd int, path string, stat *Stat_LE_t, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LGETXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)))
-	runtime.ExitSyscall()
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LgetxattrAddr() *(func(link string, attr string, dest []byte) (sz int, err error))
-
-var Lgetxattr = enter_Lgetxattr
-
-func enter_Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
-	funcref := get_LgetxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LGETXATTR_A<<4, "") == 0 {
-		*funcref = impl_Lgetxattr
-	} else {
-		*funcref = error_Lgetxattr
-	}
-	return (*funcref)(link, attr, dest)
-}
-
-func error_Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
-	sz = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LSETXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LsetxattrAddr() *(func(path string, attr string, data []byte, flags int) (err error))
-
-var Lsetxattr = enter_Lsetxattr
-
-func enter_Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
-	funcref := get_LsetxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LSETXATTR_A<<4, "") == 0 {
-		*funcref = impl_Lsetxattr
-	} else {
-		*funcref = error_Lsetxattr
-	}
-	return (*funcref)(path, attr, data, flags)
-}
-
-func error_Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Fstatfs(fd int, buf *Statfs_t) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FSTATFS<<4, uintptr(fd), uintptr(unsafe.Pointer(buf)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FstatfsAddr() *(func(fd int, buf *Statfs_t) (err error))
-
-var Fstatfs = enter_Fstatfs
-
-func enter_Fstatfs(fd int, buf *Statfs_t) (err error) {
-	funcref := get_FstatfsAddr()
-	if funcptrtest(GetZosLibVec()+SYS_FSTATFS<<4, "") == 0 {
-		*funcref = impl_Fstatfs
-	} else {
-		*funcref = error_Fstatfs
-	}
-	return (*funcref)(fd, buf)
-}
-
-func error_Fstatfs(fd int, buf *Statfs_t) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fstatvfs(fd int, stat *Statvfs_t) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FSTATVFS<<4, uintptr(fd), uintptr(unsafe.Pointer(stat)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FSTATVFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -1387,461 +449,28 @@ func Fstatvfs(fd int, stat *Statvfs_t) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fsync(fd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FSYNC<<4, uintptr(fd))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Futimes(fd int, tv []Timeval) (err error) {
-	var _p0 unsafe.Pointer
-	if len(tv) > 0 {
-		_p0 = unsafe.Pointer(&tv[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FUTIMES<<4, uintptr(fd), uintptr(_p0), uintptr(len(tv)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FutimesAddr() *(func(fd int, tv []Timeval) (err error))
-
-var Futimes = enter_Futimes
-
-func enter_Futimes(fd int, tv []Timeval) (err error) {
-	funcref := get_FutimesAddr()
-	if funcptrtest(GetZosLibVec()+SYS_FUTIMES<<4, "") == 0 {
-		*funcref = impl_Futimes
-	} else {
-		*funcref = error_Futimes
-	}
-	return (*funcref)(fd, tv)
-}
-
-func error_Futimes(fd int, tv []Timeval) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Futimesat(dirfd int, path string, tv []Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(tv) > 0 {
-		_p1 = unsafe.Pointer(&tv[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___FUTIMESAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(tv)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_FutimesatAddr() *(func(dirfd int, path string, tv []Timeval) (err error))
-
-var Futimesat = enter_Futimesat
-
-func enter_Futimesat(dirfd int, path string, tv []Timeval) (err error) {
-	funcref := get_FutimesatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___FUTIMESAT_A<<4, "") == 0 {
-		*funcref = impl_Futimesat
-	} else {
-		*funcref = error_Futimesat
-	}
-	return (*funcref)(dirfd, path, tv)
-}
-
-func error_Futimesat(dirfd int, path string, tv []Timeval) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Ftruncate(fd int, length int64) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_FTRUNCATE<<4, uintptr(fd), uintptr(length))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETRANDOM<<4, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	runtime.ExitSyscall()
-	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_GetrandomAddr() *(func(buf []byte, flags int) (n int, err error))
-
-var Getrandom = enter_Getrandom
-
-func enter_Getrandom(buf []byte, flags int) (n int, err error) {
-	funcref := get_GetrandomAddr()
-	if funcptrtest(GetZosLibVec()+SYS_GETRANDOM<<4, "") == 0 {
-		*funcref = impl_Getrandom
-	} else {
-		*funcref = error_Getrandom
-	}
-	return (*funcref)(buf, flags)
-}
-
-func error_Getrandom(buf []byte, flags int) (n int, err error) {
-	n = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_InotifyInit() (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec() + SYS_INOTIFY_INIT<<4)
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_InotifyInitAddr() *(func() (fd int, err error))
-
-var InotifyInit = enter_InotifyInit
-
-func enter_InotifyInit() (fd int, err error) {
-	funcref := get_InotifyInitAddr()
-	if funcptrtest(GetZosLibVec()+SYS_INOTIFY_INIT<<4, "") == 0 {
-		*funcref = impl_InotifyInit
-	} else {
-		*funcref = error_InotifyInit
-	}
-	return (*funcref)()
-}
-
-func error_InotifyInit() (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_InotifyInit1(flags int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_INOTIFY_INIT1<<4, uintptr(flags))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_InotifyInit1Addr() *(func(flags int) (fd int, err error))
-
-var InotifyInit1 = enter_InotifyInit1
-
-func enter_InotifyInit1(flags int) (fd int, err error) {
-	funcref := get_InotifyInit1Addr()
-	if funcptrtest(GetZosLibVec()+SYS_INOTIFY_INIT1<<4, "") == 0 {
-		*funcref = impl_InotifyInit1
-	} else {
-		*funcref = error_InotifyInit1
-	}
-	return (*funcref)(flags)
-}
-
-func error_InotifyInit1(flags int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___INOTIFY_ADD_WATCH_A<<4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	runtime.ExitSyscall()
-	watchdesc = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_InotifyAddWatchAddr() *(func(fd int, pathname string, mask uint32) (watchdesc int, err error))
-
-var InotifyAddWatch = enter_InotifyAddWatch
-
-func enter_InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	funcref := get_InotifyAddWatchAddr()
-	if funcptrtest(GetZosLibVec()+SYS___INOTIFY_ADD_WATCH_A<<4, "") == 0 {
-		*funcref = impl_InotifyAddWatch
-	} else {
-		*funcref = error_InotifyAddWatch
-	}
-	return (*funcref)(fd, pathname, mask)
-}
-
-func error_InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	watchdesc = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_INOTIFY_RM_WATCH<<4, uintptr(fd), uintptr(watchdesc))
-	runtime.ExitSyscall()
-	success = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_InotifyRmWatchAddr() *(func(fd int, watchdesc uint32) (success int, err error))
-
-var InotifyRmWatch = enter_InotifyRmWatch
-
-func enter_InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	funcref := get_InotifyRmWatchAddr()
-	if funcptrtest(GetZosLibVec()+SYS_INOTIFY_RM_WATCH<<4, "") == 0 {
-		*funcref = impl_InotifyRmWatch
-	} else {
-		*funcref = error_InotifyRmWatch
-	}
-	return (*funcref)(fd, watchdesc)
-}
-
-func error_InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	success = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LISTXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	runtime.ExitSyscall()
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_ListxattrAddr() *(func(path string, dest []byte) (sz int, err error))
-
-var Listxattr = enter_Listxattr
-
-func enter_Listxattr(path string, dest []byte) (sz int, err error) {
-	funcref := get_ListxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LISTXATTR_A<<4, "") == 0 {
-		*funcref = impl_Listxattr
-	} else {
-		*funcref = error_Listxattr
-	}
-	return (*funcref)(path, dest)
-}
-
-func error_Listxattr(path string, dest []byte) (sz int, err error) {
-	sz = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Llistxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LLISTXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	runtime.ExitSyscall()
-	sz = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LlistxattrAddr() *(func(path string, dest []byte) (sz int, err error))
-
-var Llistxattr = enter_Llistxattr
-
-func enter_Llistxattr(path string, dest []byte) (sz int, err error) {
-	funcref := get_LlistxattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LLISTXATTR_A<<4, "") == 0 {
-		*funcref = impl_Llistxattr
-	} else {
-		*funcref = error_Llistxattr
-	}
-	return (*funcref)(path, dest)
-}
-
-func error_Llistxattr(path string, dest []byte) (sz int, err error) {
-	sz = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Lremovexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LREMOVEXATTR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LremovexattrAddr() *(func(path string, attr string) (err error))
-
-var Lremovexattr = enter_Lremovexattr
-
-func enter_Lremovexattr(path string, attr string) (err error) {
-	funcref := get_LremovexattrAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LREMOVEXATTR_A<<4, "") == 0 {
-		*funcref = impl_Lremovexattr
-	} else {
-		*funcref = error_Lremovexattr
-	}
-	return (*funcref)(path, attr)
-}
-
-func error_Lremovexattr(path string, attr string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Lutimes(path string, tv []Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(tv) > 0 {
-		_p1 = unsafe.Pointer(&tv[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LUTIMES_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(tv)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LutimesAddr() *(func(path string, tv []Timeval) (err error))
-
-var Lutimes = enter_Lutimes
-
-func enter_Lutimes(path string, tv []Timeval) (err error) {
-	funcref := get_LutimesAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LUTIMES_A<<4, "") == 0 {
-		*funcref = impl_Lutimes
-	} else {
-		*funcref = error_Lutimes
-	}
-	return (*funcref)(path, tv)
-}
-
-func error_Lutimes(path string, tv []Timeval) (err error) {
-	err = ENOSYS
+func Getpagesize() (pgsize int) {
+	r0, _, _ := syscall_syscall(SYS_GETPAGESIZE, 0, 0, 0)
+	pgsize = int(r0)
 	return
 }
 
@@ -1854,11 +483,9 @@ func Mprotect(b []byte, prot int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_MPROTECT<<4, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -1872,23 +499,9 @@ func Msync(b []byte, flags int) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_MSYNC<<4, uintptr(_p0), uintptr(len(b)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Console2(cmsg *ConsMsg2, modstr *byte, concmd *uint32) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CONSOLE2<<4, uintptr(unsafe.Pointer(cmsg)), uintptr(unsafe.Pointer(modstr)), uintptr(unsafe.Pointer(concmd)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -1902,106 +515,21 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_POLL<<4, uintptr(_p0), uintptr(len(fds)), uintptr(timeout))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_POLL, uintptr(_p0), uintptr(len(fds)), uintptr(timeout))
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Readdir_r(dirp uintptr, entry *direntLE, result **direntLE) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___READDIR_R_A<<4, uintptr(dirp), uintptr(unsafe.Pointer(entry)), uintptr(unsafe.Pointer(result)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___STATFS_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_StatfsAddr() *(func(path string, buf *Statfs_t) (err error))
-
-var Statfs = enter_Statfs
-
-func enter_Statfs(path string, buf *Statfs_t) (err error) {
-	funcref := get_StatfsAddr()
-	if funcptrtest(GetZosLibVec()+SYS___STATFS_A<<4, "") == 0 {
-		*funcref = impl_Statfs
-	} else {
-		*funcref = error_Statfs
-	}
-	return (*funcref)(path, buf)
-}
-
-func error_Statfs(path string, buf *Statfs_t) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Syncfs(fd int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SYNCFS<<4, uintptr(fd))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_SyncfsAddr() *(func(fd int) (err error))
-
-var Syncfs = enter_Syncfs
-
-func enter_Syncfs(fd int) (err error) {
-	funcref := get_SyncfsAddr()
-	if funcptrtest(GetZosLibVec()+SYS_SYNCFS<<4, "") == 0 {
-		*funcref = impl_Syncfs
-	} else {
-		*funcref = error_Syncfs
-	}
-	return (*funcref)(fd)
-}
-
-func error_Syncfs(fd int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Times(tms *Tms) (ticks uintptr, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_TIMES<<4, uintptr(unsafe.Pointer(tms)))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
 	ticks = uintptr(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2009,12 +537,10 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func W_Getmntent(buff *byte, size int) (lastsys int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_W_GETMNTENT<<4, uintptr(unsafe.Pointer(buff)), uintptr(size))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_W_GETMNTENT, uintptr(unsafe.Pointer(buff)), uintptr(size), 0)
 	lastsys = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2022,12 +548,10 @@ func W_Getmntent(buff *byte, size int) (lastsys int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func W_Getmntent_A(buff *byte, size int) (lastsys int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___W_GETMNTENT_A<<4, uintptr(unsafe.Pointer(buff)), uintptr(size))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___W_GETMNTENT_A, uintptr(unsafe.Pointer(buff)), uintptr(size), 0)
 	lastsys = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2055,28 +579,24 @@ func mount_LE(path string, filesystem string, fstype string, mtm uint32, parmlen
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MOUNT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(mtm), uintptr(parmlen), uintptr(unsafe.Pointer(_p3)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall6(SYS___MOUNT_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(mtm), uintptr(parmlen), uintptr(unsafe.Pointer(_p3)))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func unmount_LE(filesystem string, mtm int) (err error) {
+func unmount(filesystem string, mtm int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(filesystem)
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UMOUNT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mtm))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___UMOUNT_A, uintptr(unsafe.Pointer(_p0)), uintptr(mtm), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2089,24 +609,9 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___CHROOT_A<<4, uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nmsgsfds int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (ret int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SELECT<<4, uintptr(nmsgsfds), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)))
-	runtime.ExitSyscall()
-	ret = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___CHROOT_A, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2114,47 +619,15 @@ func Select(nmsgsfds int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (ret i
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Uname(buf *Utsname) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_____OSNAME_A<<4, uintptr(unsafe.Pointer(buf)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS___UNAME_A, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Unshare(flags int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_UNSHARE<<4, uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_UnshareAddr() *(func(flags int) (err error))
-
-var Unshare = enter_Unshare
-
-func enter_Unshare(flags int) (err error) {
-	funcref := get_UnshareAddr()
-	if funcptrtest(GetZosLibVec()+SYS_UNSHARE<<4, "") == 0 {
-		*funcref = impl_Unshare
-	} else {
-		*funcref = error_Unshare
-	}
-	return (*funcref)(flags)
-}
-
-func error_Unshare(flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Gethostname(buf []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
@@ -2162,79 +635,9 @@ func Gethostname(buf []byte) (err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___GETHOSTNAME_A<<4, uintptr(_p0), uintptr(len(buf)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETGID<<4)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETPID<<4)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETPGID<<4, uintptr(pid))
-	pgid = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (pid int) {
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETPPID<<4)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETPRIORITY<<4, uintptr(which), uintptr(who))
-	runtime.ExitSyscall()
-	prio = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETRLIMIT<<4, uintptr(resource), uintptr(unsafe.Pointer(rlim)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrusage(who int, rusage *rusage_zos) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETRUSAGE<<4, uintptr(who), uintptr(unsafe.Pointer(rusage)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___GETHOSTNAME_A, uintptr(_p0), uintptr(len(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2242,30 +645,92 @@ func getrusage(who int, rusage *rusage_zos) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	runtime.EnterSyscall()
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETEGID<<4)
-	runtime.ExitSyscall()
+	r0, _, _ := syscall_rawsyscall(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Geteuid() (euid int) {
-	runtime.EnterSyscall()
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETEUID<<4)
-	runtime.ExitSyscall()
-	euid = int(r0)
+func Geteuid() (uid int) {
+	r0, _, _ := syscall_rawsyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := syscall_rawsyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := syscall_rawsyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := syscall_rawsyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (pid int) {
+	r0, _, _ := syscall_rawsyscall(SYS_GETPPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := syscall_syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := syscall_rawsyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrusage(who int, rusage *rusage_zos) (err error) {
+	_, _, e1 := syscall_rawsyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getsid(pid int) (sid int, err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETSID<<4, uintptr(pid))
+	r0, _, e1 := syscall_rawsyscall(SYS_GETSID, uintptr(pid), 0, 0)
 	sid = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2273,7 +738,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec() + SYS_GETUID<<4)
+	r0, _, _ := syscall_rawsyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -2281,9 +746,9 @@ func Getuid() (uid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Kill(pid int, sig Signal) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_KILL<<4, uintptr(pid), uintptr(sig))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2296,11 +761,9 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LCHOWN_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___LCHOWN_A, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2318,65 +781,19 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LINK_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___LINK_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Linkat(oldDirFd int, oldPath string, newDirFd int, newPath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldPath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newPath)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LINKAT_A<<4, uintptr(oldDirFd), uintptr(unsafe.Pointer(_p0)), uintptr(newDirFd), uintptr(unsafe.Pointer(_p1)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_LinkatAddr() *(func(oldDirFd int, oldPath string, newDirFd int, newPath string, flags int) (err error))
-
-var Linkat = enter_Linkat
-
-func enter_Linkat(oldDirFd int, oldPath string, newDirFd int, newPath string, flags int) (err error) {
-	funcref := get_LinkatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___LINKAT_A<<4, "") == 0 {
-		*funcref = impl_Linkat
-	} else {
-		*funcref = error_Linkat
-	}
-	return (*funcref)(oldDirFd, oldPath, newDirFd, newPath, flags)
-}
-
-func error_Linkat(oldDirFd int, oldPath string, newDirFd int, newPath string, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Listen(s int, n int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_LISTEN<<4, uintptr(s), uintptr(n))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2389,11 +806,9 @@ func lstat(path string, stat *Stat_LE_t) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___LSTAT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___LSTAT_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2406,65 +821,24 @@ func Mkdir(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKDIR_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MKDIR_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKDIRAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_MkdiratAddr() *(func(dirfd int, path string, mode uint32) (err error))
-
-var Mkdirat = enter_Mkdirat
-
-func enter_Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	funcref := get_MkdiratAddr()
-	if funcptrtest(GetZosLibVec()+SYS___MKDIRAT_A<<4, "") == 0 {
-		*funcref = impl_Mkdirat
-	} else {
-		*funcref = error_Mkdirat
-	}
-	return (*funcref)(dirfd, path, mode)
-}
-
-func error_Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKFIFO_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MKFIFO_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2477,96 +851,15 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKNOD_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___MKNOD_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___MKNODAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_MknodatAddr() *(func(dirfd int, path string, mode uint32, dev int) (err error))
-
-var Mknodat = enter_Mknodat
-
-func enter_Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	funcref := get_MknodatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___MKNODAT_A<<4, "") == 0 {
-		*funcref = impl_Mknodat
-	} else {
-		*funcref = error_Mknodat
-	}
-	return (*funcref)(dirfd, path, mode, dev)
-}
-
-func error_Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_PivotRoot(newroot string, oldroot string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(oldroot)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___PIVOT_ROOT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_PivotRootAddr() *(func(newroot string, oldroot string) (err error))
-
-var PivotRoot = enter_PivotRoot
-
-func enter_PivotRoot(newroot string, oldroot string) (err error) {
-	funcref := get_PivotRootAddr()
-	if funcptrtest(GetZosLibVec()+SYS___PIVOT_ROOT_A<<4, "") == 0 {
-		*funcref = impl_PivotRoot
-	} else {
-		*funcref = error_PivotRoot
-	}
-	return (*funcref)(newroot, oldroot)
-}
-
-func error_PivotRoot(newroot string, oldroot string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -2574,12 +867,10 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_PREAD<<4, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2593,78 +884,36 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_PWRITE<<4, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___PRCTL_A<<4, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-//go:nosplit
-func get_PrctlAddr() *(func(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error))
-
-var Prctl = enter_Prctl
-
-func enter_Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	funcref := get_PrctlAddr()
-	if funcptrtest(GetZosLibVec()+SYS___PRCTL_A<<4, "") == 0 {
-		*funcref = impl_Prctl
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
 	} else {
-		*funcref = error_Prctl
+		_p1 = unsafe.Pointer(&_zero)
 	}
-	return (*funcref)(option, arg2, arg3, arg4, arg5)
-}
-
-func error_Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_PRLIMIT<<4, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	r0, _, e1 := syscall_syscall(SYS___READLINK_A, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
-//go:nosplit
-func get_PrlimitAddr() *(func(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error))
-
-var Prlimit = enter_Prlimit
-
-func enter_Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	funcref := get_PrlimitAddr()
-	if funcptrtest(GetZosLibVec()+SYS_PRLIMIT<<4, "") == 0 {
-		*funcref = impl_Prlimit
-	} else {
-		*funcref = error_Prlimit
-	}
-	return (*funcref)(pid, resource, newlimit, old)
-}
-
-func error_Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	err = ENOSYS
-	return
-}
-
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Rename(from string, to string) (err error) {
@@ -2678,112 +927,24 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RENAME_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___RENAME_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RENAMEAT_A<<4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_RenameatAddr() *(func(olddirfd int, oldpath string, newdirfd int, newpath string) (err error))
-
-var Renameat = enter_Renameat
-
-func enter_Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	funcref := get_RenameatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___RENAMEAT_A<<4, "") == 0 {
-		*funcref = impl_Renameat
-	} else {
-		*funcref = error_Renameat
-	}
-	return (*funcref)(olddirfd, oldpath, newdirfd, newpath)
-}
-
-func error_Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RENAMEAT2_A<<4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_Renameat2Addr() *(func(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error))
-
-var Renameat2 = enter_Renameat2
-
-func enter_Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
-	funcref := get_Renameat2Addr()
-	if funcptrtest(GetZosLibVec()+SYS___RENAMEAT2_A<<4, "") == 0 {
-		*funcref = impl_Renameat2
-	} else {
-		*funcref = error_Renameat2
-	}
-	return (*funcref)(olddirfd, oldpath, newdirfd, newpath, flags)
-}
-
-func error_Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Rmdir(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___RMDIR_A<<4, uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___RMDIR_A, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2791,118 +952,20 @@ func Rmdir(path string) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_LSEEK<<4, uintptr(fd), uintptr(offset), uintptr(whence))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
 	off = int64(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setegid(egid int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETEGID<<4, uintptr(egid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETEUID<<4, uintptr(euid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SETHOSTNAME_A<<4, uintptr(_p0), uintptr(len(p)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_SethostnameAddr() *(func(p []byte) (err error))
-
-var Sethostname = enter_Sethostname
-
-func enter_Sethostname(p []byte) (err error) {
-	funcref := get_SethostnameAddr()
-	if funcptrtest(GetZosLibVec()+SYS___SETHOSTNAME_A<<4, "") == 0 {
-		*funcref = impl_Sethostname
-	} else {
-		*funcref = error_Sethostname
-	}
-	return (*funcref)(p)
-}
-
-func error_Sethostname(p []byte) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_Setns(fd int, nstype int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETNS<<4, uintptr(fd), uintptr(nstype))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_SetnsAddr() *(func(fd int, nstype int) (err error))
-
-var Setns = enter_Setns
-
-func enter_Setns(fd int, nstype int) (err error) {
-	funcref := get_SetnsAddr()
-	if funcptrtest(GetZosLibVec()+SYS_SETNS<<4, "") == 0 {
-		*funcref = impl_Setns
-	} else {
-		*funcref = error_Setns
-	}
-	return (*funcref)(fd, nstype)
-}
-
-func error_Setns(fd int, nstype int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setpriority(which int, who int, prio int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETPRIORITY<<4, uintptr(which), uintptr(who), uintptr(prio))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2910,9 +973,9 @@ func Setpriority(which int, who int, prio int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setpgid(pid int, pgid int) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETPGID<<4, uintptr(pid), uintptr(pgid))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2920,9 +983,9 @@ func Setpgid(pid int, pgid int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setrlimit(resource int, lim *Rlimit) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETRLIMIT<<4, uintptr(resource), uintptr(unsafe.Pointer(lim)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2930,9 +993,9 @@ func Setrlimit(resource int, lim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setregid(rgid int, egid int) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETREGID<<4, uintptr(rgid), uintptr(egid))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2940,9 +1003,9 @@ func Setregid(rgid int, egid int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setreuid(ruid int, euid int) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETREUID<<4, uintptr(ruid), uintptr(euid))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2950,10 +1013,10 @@ func Setreuid(ruid int, euid int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setsid() (pid int, err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec() + SYS_SETSID<<4)
+	r0, _, e1 := syscall_rawsyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2961,11 +1024,9 @@ func Setsid() (pid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setuid(uid int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETUID<<4, uintptr(uid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2973,11 +1034,9 @@ func Setuid(uid int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setgid(uid int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SETGID<<4, uintptr(uid))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_SETGID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -2985,11 +1044,9 @@ func Setgid(uid int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Shutdown(fd int, how int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_SHUTDOWN<<4, uintptr(fd), uintptr(how))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3002,11 +1059,9 @@ func stat(path string, statLE *Stat_LE_t) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___STAT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(statLE)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___STAT_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(statLE)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3024,63 +1079,17 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SYMLINK_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___SYMLINK_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Symlinkat(oldPath string, dirfd int, newPath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldPath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newPath)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___SYMLINKAT_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(dirfd), uintptr(unsafe.Pointer(_p1)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_SymlinkatAddr() *(func(oldPath string, dirfd int, newPath string) (err error))
-
-var Symlinkat = enter_Symlinkat
-
-func enter_Symlinkat(oldPath string, dirfd int, newPath string) (err error) {
-	funcref := get_SymlinkatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___SYMLINKAT_A<<4, "") == 0 {
-		*funcref = impl_Symlinkat
-	} else {
-		*funcref = error_Symlinkat
-	}
-	return (*funcref)(oldPath, dirfd, newPath)
-}
-
-func error_Symlinkat(oldPath string, dirfd int, newPath string) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Sync() {
-	runtime.EnterSyscall()
-	CallLeFuncWithErr(GetZosLibVec() + SYS_SYNC<<4)
-	runtime.ExitSyscall()
+	syscall_syscall(SYS_SYNC, 0, 0, 0)
 	return
 }
 
@@ -3092,11 +1101,9 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___TRUNCATE_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(length))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___TRUNCATE_A, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3104,11 +1111,9 @@ func Truncate(path string, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Tcgetattr(fildes int, termptr *Termios) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_TCGETATTR<<4, uintptr(fildes), uintptr(unsafe.Pointer(termptr)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_TCGETATTR, uintptr(fildes), uintptr(unsafe.Pointer(termptr)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3116,11 +1121,9 @@ func Tcgetattr(fildes int, termptr *Termios) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Tcsetattr(fildes int, when int, termptr *Termios) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_TCSETATTR<<4, uintptr(fildes), uintptr(when), uintptr(unsafe.Pointer(termptr)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_TCSETATTR, uintptr(fildes), uintptr(when), uintptr(unsafe.Pointer(termptr)))
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3128,9 +1131,7 @@ func Tcsetattr(fildes int, when int, termptr *Termios) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	runtime.EnterSyscall()
-	r0, _, _ := CallLeFuncWithErr(GetZosLibVec()+SYS_UMASK<<4, uintptr(mask))
-	runtime.ExitSyscall()
+	r0, _, _ := syscall_syscall(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -3143,65 +1144,24 @@ func Unlink(path string) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UNLINK_A<<4, uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___UNLINK_A, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UNLINKAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_UnlinkatAddr() *(func(dirfd int, path string, flags int) (err error))
-
-var Unlinkat = enter_Unlinkat
-
-func enter_Unlinkat(dirfd int, path string, flags int) (err error) {
-	funcref := get_UnlinkatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___UNLINKAT_A<<4, "") == 0 {
-		*funcref = impl_Unlinkat
-	} else {
-		*funcref = error_Unlinkat
-	}
-	return (*funcref)(dirfd, path, flags)
-}
-
-func error_Unlinkat(dirfd int, path string, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Utime(path string, utim *Utimbuf) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UTIME_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(utim)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___UTIME_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(utim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3214,119 +1174,25 @@ func open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___OPEN_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS___OPEN_A, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
 	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___OPENAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_openatAddr() *(func(dirfd int, path string, flags int, mode uint32) (fd int, err error))
-
-var openat = enter_openat
-
-func enter_openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	funcref := get_openatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___OPENAT_A<<4, "") == 0 {
-		*funcref = impl_openat
-	} else {
-		*funcref = error_openat
-	}
-	return (*funcref)(dirfd, path, flags, mode)
-}
-
-func error_openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func impl_openat2(dirfd int, path string, open_how *OpenHow, size int) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___OPENAT2_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(open_how)), uintptr(size))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_openat2Addr() *(func(dirfd int, path string, open_how *OpenHow, size int) (fd int, err error))
-
-var openat2 = enter_openat2
-
-func enter_openat2(dirfd int, path string, open_how *OpenHow, size int) (fd int, err error) {
-	funcref := get_openat2Addr()
-	if funcptrtest(GetZosLibVec()+SYS___OPENAT2_A<<4, "") == 0 {
-		*funcref = impl_openat2
-	} else {
-		*funcref = error_openat2
-	}
-	return (*funcref)(dirfd, path, open_how, size)
-}
-
-func error_openat2(dirfd int, path string, open_how *OpenHow, size int) (fd int, err error) {
-	fd = -1
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func remove(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_REMOVE<<4, uintptr(unsafe.Pointer(_p0)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func waitid(idType int, id int, info *Siginfo, options int) (err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_WAITID<<4, uintptr(idType), uintptr(id), uintptr(unsafe.Pointer(info)), uintptr(options))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3334,12 +1200,10 @@ func waitid(idType int, id int, info *Siginfo, options int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func waitpid(pid int, wstatus *_C_int, options int) (wpid int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_WAITPID<<4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options))
-	runtime.ExitSyscall()
+	r0, _, e1 := syscall_syscall(SYS_WAITPID, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options))
 	wpid = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3347,9 +1211,9 @@ func waitpid(pid int, wstatus *_C_int, options int) (wpid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func gettimeofday(tv *timeval_zos) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GETTIMEOFDAY<<4, uintptr(unsafe.Pointer(tv)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3357,9 +1221,9 @@ func gettimeofday(tv *timeval_zos) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func pipe(p *[2]_C_int) (err error) {
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_PIPE<<4, uintptr(unsafe.Pointer(p)))
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_rawsyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
@@ -3372,87 +1236,20 @@ func utimes(path string, timeval *[2]Timeval) (err error) {
 	if err != nil {
 		return
 	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UTIMES_A<<4, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+	_, _, e1 := syscall_syscall(SYS___UTIMES_A, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func impl_utimensat(dirfd int, path string, ts *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS___UTIMENSAT_A<<4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(ts)), uintptr(flags))
-	runtime.ExitSyscall()
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-//go:nosplit
-func get_utimensatAddr() *(func(dirfd int, path string, ts *[2]Timespec, flags int) (err error))
-
-var utimensat = enter_utimensat
-
-func enter_utimensat(dirfd int, path string, ts *[2]Timespec, flags int) (err error) {
-	funcref := get_utimensatAddr()
-	if funcptrtest(GetZosLibVec()+SYS___UTIMENSAT_A<<4, "") == 0 {
-		*funcref = impl_utimensat
-	} else {
-		*funcref = error_utimensat
-	}
-	return (*funcref)(dirfd, path, ts, flags)
-}
-
-func error_utimensat(dirfd int, path string, ts *[2]Timespec, flags int) (err error) {
-	err = ENOSYS
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Posix_openpt(oflag int) (fd int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_POSIX_OPENPT<<4, uintptr(oflag))
-	runtime.ExitSyscall()
-	fd = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Grantpt(fildes int) (rc int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_GRANTPT<<4, uintptr(fildes))
-	runtime.ExitSyscall()
-	rc = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlockpt(fildes int) (rc int, err error) {
-	runtime.EnterSyscall()
-	r0, e2, e1 := CallLeFuncWithErr(GetZosLibVec()+SYS_UNLOCKPT<<4, uintptr(fildes))
-	runtime.ExitSyscall()
-	rc = int(r0)
-	if int64(r0) == -1 {
-		err = errnoErr2(e1, e2)
+func Select(nmsgsfds int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (ret int, err error) {
+	r0, _, e1 := syscall_syscall6(SYS_SELECT, uintptr(nmsgsfds), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
 	return
 }
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
index 3a58ae8..9e9d0b2 100644
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build 386 && openbsd
+// +build 386,openbsd
 
 package unix
 
@@ -16,7 +17,6 @@ var sysctlMib = []mibentry{
 	{"ddb.max_line", []_C_int{9, 3}},
 	{"ddb.max_width", []_C_int{9, 2}},
 	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.profile", []_C_int{9, 9}},
 	{"ddb.radix", []_C_int{9, 1}},
 	{"ddb.tab_stop_width", []_C_int{9, 4}},
 	{"ddb.trigger", []_C_int{9, 8}},
@@ -33,37 +33,29 @@ var sysctlMib = []mibentry{
 	{"hw.ncpufound", []_C_int{6, 21}},
 	{"hw.ncpuonline", []_C_int{6, 25}},
 	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.perfpolicy", []_C_int{6, 23}},
 	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
 	{"hw.product", []_C_int{6, 15}},
 	{"hw.serialno", []_C_int{6, 17}},
 	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.smt", []_C_int{6, 24}},
 	{"hw.usermem", []_C_int{6, 20}},
 	{"hw.uuid", []_C_int{6, 18}},
 	{"hw.vendor", []_C_int{6, 14}},
 	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
-	{"kern.allowkmem", []_C_int{1, 52}},
+	{"kern.arandom", []_C_int{1, 37}},
 	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.audio", []_C_int{1, 84}},
 	{"kern.boottime", []_C_int{1, 21}},
 	{"kern.bufcachepercent", []_C_int{1, 72}},
 	{"kern.ccpu", []_C_int{1, 45}},
 	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
 	{"kern.consdev", []_C_int{1, 75}},
 	{"kern.cp_time", []_C_int{1, 40}},
 	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cpustats", []_C_int{1, 85}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
 	{"kern.domainname", []_C_int{1, 22}},
 	{"kern.file", []_C_int{1, 73}},
 	{"kern.forkstat", []_C_int{1, 42}},
 	{"kern.fscale", []_C_int{1, 46}},
 	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.global_ptrace", []_C_int{1, 81}},
 	{"kern.hostid", []_C_int{1, 11}},
 	{"kern.hostname", []_C_int{1, 10}},
 	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
@@ -86,16 +78,17 @@ var sysctlMib = []mibentry{
 	{"kern.ngroups", []_C_int{1, 18}},
 	{"kern.nosuidcoredump", []_C_int{1, 32}},
 	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
 	{"kern.nthreads", []_C_int{1, 26}},
 	{"kern.numvnodes", []_C_int{1, 58}},
 	{"kern.osrelease", []_C_int{1, 2}},
 	{"kern.osrevision", []_C_int{1, 3}},
 	{"kern.ostype", []_C_int{1, 1}},
 	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
 	{"kern.pool_debug", []_C_int{1, 77}},
 	{"kern.posix1version", []_C_int{1, 17}},
 	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
 	{"kern.rawpartition", []_C_int{1, 24}},
 	{"kern.saved_ids", []_C_int{1, 20}},
 	{"kern.securelevel", []_C_int{1, 9}},
@@ -113,20 +106,21 @@ var sysctlMib = []mibentry{
 	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
 	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
 	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
 	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
 	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
 	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
 	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
 	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
 	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
 	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
+	{"kern.vnode", []_C_int{1, 13}},
 	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
 	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"kern.witnesswatch", []_C_int{1, 53}},
-	{"kern.wxabort", []_C_int{1, 74}},
 	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
 	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
 	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
@@ -154,9 +148,7 @@ var sysctlMib = []mibentry{
 	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
 	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
 	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpdown", []_C_int{4, 2, 0, 40}},
 	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.arptimeout", []_C_int{4, 2, 0, 39}},
 	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
 	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
 	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
@@ -165,10 +157,8 @@ var sysctlMib = []mibentry{
 	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
 	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
 	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtmfc", []_C_int{4, 2, 0, 37}},
 	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
 	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mrtvif", []_C_int{4, 2, 0, 38}},
 	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
 	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
 	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
@@ -185,7 +175,9 @@ var sysctlMib = []mibentry{
 	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
 	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
 	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
 	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
 	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
 	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
 	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
@@ -199,7 +191,6 @@ var sysctlMib = []mibentry{
 	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
 	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
 	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rootonly", []_C_int{4, 2, 6, 24}},
 	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
 	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
 	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
@@ -207,12 +198,9 @@ var sysctlMib = []mibentry{
 	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
 	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
 	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.tcp.synhashsize", []_C_int{4, 2, 6, 25}},
-	{"net.inet.tcp.synuselimit", []_C_int{4, 2, 6, 23}},
 	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
 	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
 	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.rootonly", []_C_int{4, 2, 17, 6}},
 	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
 	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
 	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
@@ -225,8 +213,13 @@ var sysctlMib = []mibentry{
 	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
 	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
 	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
 	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
 	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
 	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
 	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
 	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
@@ -239,19 +232,20 @@ var sysctlMib = []mibentry{
 	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
 	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
 	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
 	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtmfc", []_C_int{4, 24, 17, 53}},
-	{"net.inet6.ip6.mrtmif", []_C_int{4, 24, 17, 52}},
 	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
 	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
 	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
 	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
 	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
 	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.soiikey", []_C_int{4, 24, 17, 54}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
 	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
 	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
 	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
 	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
 	{"net.key.spd_dump", []_C_int{4, 30, 2}},
 	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
@@ -260,12 +254,12 @@ var sysctlMib = []mibentry{
 	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
 	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
 	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
 	{"net.mpls.ttl", []_C_int{4, 33, 2}},
 	{"net.pflow.stats", []_C_int{4, 34, 1}},
 	{"net.pipex.enable", []_C_int{4, 35, 1}},
 	{"vm.anonmin", []_C_int{2, 7}},
 	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.malloc_conf", []_C_int{2, 12}},
 	{"vm.maxslp", []_C_int{2, 10}},
 	{"vm.nkmempages", []_C_int{2, 6}},
 	{"vm.psstrings", []_C_int{2, 3}},
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
index dcb7a0e..adecd09 100644
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build amd64 && openbsd
+// +build amd64,openbsd
 
 package unix
 
@@ -35,29 +36,23 @@ var sysctlMib = []mibentry{
 	{"hw.pagesize", []_C_int{6, 7}},
 	{"hw.perfpolicy", []_C_int{6, 23}},
 	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
 	{"hw.product", []_C_int{6, 15}},
 	{"hw.serialno", []_C_int{6, 17}},
 	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.smt", []_C_int{6, 24}},
 	{"hw.usermem", []_C_int{6, 20}},
 	{"hw.uuid", []_C_int{6, 18}},
 	{"hw.vendor", []_C_int{6, 14}},
 	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
 	{"kern.allowkmem", []_C_int{1, 52}},
 	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.audio", []_C_int{1, 84}},
 	{"kern.boottime", []_C_int{1, 21}},
 	{"kern.bufcachepercent", []_C_int{1, 72}},
 	{"kern.ccpu", []_C_int{1, 45}},
 	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
 	{"kern.consdev", []_C_int{1, 75}},
 	{"kern.cp_time", []_C_int{1, 40}},
 	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cpustats", []_C_int{1, 85}},
+	{"kern.dnsjackport", []_C_int{1, 13}},
 	{"kern.domainname", []_C_int{1, 22}},
 	{"kern.file", []_C_int{1, 73}},
 	{"kern.forkstat", []_C_int{1, 42}},
@@ -86,13 +81,13 @@ var sysctlMib = []mibentry{
 	{"kern.ngroups", []_C_int{1, 18}},
 	{"kern.nosuidcoredump", []_C_int{1, 32}},
 	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
 	{"kern.nthreads", []_C_int{1, 26}},
 	{"kern.numvnodes", []_C_int{1, 58}},
 	{"kern.osrelease", []_C_int{1, 2}},
 	{"kern.osrevision", []_C_int{1, 3}},
 	{"kern.ostype", []_C_int{1, 1}},
 	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
 	{"kern.pool_debug", []_C_int{1, 77}},
 	{"kern.posix1version", []_C_int{1, 17}},
 	{"kern.proc", []_C_int{1, 66}},
@@ -113,19 +108,15 @@ var sysctlMib = []mibentry{
 	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
 	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
 	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
 	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
 	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
 	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
 	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
 	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
 	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
 	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
 	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
 	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"kern.witnesswatch", []_C_int{1, 53}},
 	{"kern.wxabort", []_C_int{1, 74}},
 	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
 	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
@@ -185,6 +176,7 @@ var sysctlMib = []mibentry{
 	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
 	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
 	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
 	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
 	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
 	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
@@ -260,12 +252,12 @@ var sysctlMib = []mibentry{
 	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
 	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
 	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
 	{"net.mpls.ttl", []_C_int{4, 33, 2}},
 	{"net.pflow.stats", []_C_int{4, 34, 1}},
 	{"net.pipex.enable", []_C_int{4, 35, 1}},
 	{"vm.anonmin", []_C_int{2, 7}},
 	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.malloc_conf", []_C_int{2, 12}},
 	{"vm.maxslp", []_C_int{2, 10}},
 	{"vm.nkmempages", []_C_int{2, 6}},
 	{"vm.psstrings", []_C_int{2, 3}},
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
index db5a7bf..8ea52a4 100644
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build arm && openbsd
+// +build arm,openbsd
 
 package unix
 
@@ -16,7 +17,6 @@ var sysctlMib = []mibentry{
 	{"ddb.max_line", []_C_int{9, 3}},
 	{"ddb.max_width", []_C_int{9, 2}},
 	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.profile", []_C_int{9, 9}},
 	{"ddb.radix", []_C_int{9, 1}},
 	{"ddb.tab_stop_width", []_C_int{9, 4}},
 	{"ddb.trigger", []_C_int{9, 8}},
@@ -33,37 +33,29 @@ var sysctlMib = []mibentry{
 	{"hw.ncpufound", []_C_int{6, 21}},
 	{"hw.ncpuonline", []_C_int{6, 25}},
 	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.perfpolicy", []_C_int{6, 23}},
 	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
 	{"hw.product", []_C_int{6, 15}},
 	{"hw.serialno", []_C_int{6, 17}},
 	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.smt", []_C_int{6, 24}},
 	{"hw.usermem", []_C_int{6, 20}},
 	{"hw.uuid", []_C_int{6, 18}},
 	{"hw.vendor", []_C_int{6, 14}},
 	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
-	{"kern.allowkmem", []_C_int{1, 52}},
+	{"kern.arandom", []_C_int{1, 37}},
 	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.audio", []_C_int{1, 84}},
 	{"kern.boottime", []_C_int{1, 21}},
 	{"kern.bufcachepercent", []_C_int{1, 72}},
 	{"kern.ccpu", []_C_int{1, 45}},
 	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
 	{"kern.consdev", []_C_int{1, 75}},
 	{"kern.cp_time", []_C_int{1, 40}},
 	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cpustats", []_C_int{1, 85}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
 	{"kern.domainname", []_C_int{1, 22}},
 	{"kern.file", []_C_int{1, 73}},
 	{"kern.forkstat", []_C_int{1, 42}},
 	{"kern.fscale", []_C_int{1, 46}},
 	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.global_ptrace", []_C_int{1, 81}},
 	{"kern.hostid", []_C_int{1, 11}},
 	{"kern.hostname", []_C_int{1, 10}},
 	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
@@ -86,16 +78,17 @@ var sysctlMib = []mibentry{
 	{"kern.ngroups", []_C_int{1, 18}},
 	{"kern.nosuidcoredump", []_C_int{1, 32}},
 	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
 	{"kern.nthreads", []_C_int{1, 26}},
 	{"kern.numvnodes", []_C_int{1, 58}},
 	{"kern.osrelease", []_C_int{1, 2}},
 	{"kern.osrevision", []_C_int{1, 3}},
 	{"kern.ostype", []_C_int{1, 1}},
 	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
 	{"kern.pool_debug", []_C_int{1, 77}},
 	{"kern.posix1version", []_C_int{1, 17}},
 	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
 	{"kern.rawpartition", []_C_int{1, 24}},
 	{"kern.saved_ids", []_C_int{1, 20}},
 	{"kern.securelevel", []_C_int{1, 9}},
@@ -113,20 +106,21 @@ var sysctlMib = []mibentry{
 	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
 	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
 	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
 	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
 	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
 	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
 	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
 	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
 	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
 	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
+	{"kern.vnode", []_C_int{1, 13}},
 	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
 	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"kern.witnesswatch", []_C_int{1, 53}},
-	{"kern.wxabort", []_C_int{1, 74}},
 	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
 	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
 	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
@@ -154,9 +148,7 @@ var sysctlMib = []mibentry{
 	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
 	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
 	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpdown", []_C_int{4, 2, 0, 40}},
 	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.arptimeout", []_C_int{4, 2, 0, 39}},
 	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
 	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
 	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
@@ -165,10 +157,8 @@ var sysctlMib = []mibentry{
 	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
 	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
 	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtmfc", []_C_int{4, 2, 0, 37}},
 	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
 	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mrtvif", []_C_int{4, 2, 0, 38}},
 	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
 	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
 	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
@@ -185,7 +175,9 @@ var sysctlMib = []mibentry{
 	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
 	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
 	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
 	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
 	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
 	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
 	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
@@ -199,7 +191,6 @@ var sysctlMib = []mibentry{
 	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
 	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
 	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rootonly", []_C_int{4, 2, 6, 24}},
 	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
 	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
 	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
@@ -207,12 +198,9 @@ var sysctlMib = []mibentry{
 	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
 	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
 	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.tcp.synhashsize", []_C_int{4, 2, 6, 25}},
-	{"net.inet.tcp.synuselimit", []_C_int{4, 2, 6, 23}},
 	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
 	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
 	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.rootonly", []_C_int{4, 2, 17, 6}},
 	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
 	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
 	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
@@ -225,8 +213,13 @@ var sysctlMib = []mibentry{
 	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
 	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
 	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
 	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
 	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
 	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
 	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
 	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
@@ -239,19 +232,20 @@ var sysctlMib = []mibentry{
 	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
 	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
 	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
 	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtmfc", []_C_int{4, 24, 17, 53}},
-	{"net.inet6.ip6.mrtmif", []_C_int{4, 24, 17, 52}},
 	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
 	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
 	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
 	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
 	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
 	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.soiikey", []_C_int{4, 24, 17, 54}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
 	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
 	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
 	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
 	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
 	{"net.key.spd_dump", []_C_int{4, 30, 2}},
 	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
@@ -260,12 +254,12 @@ var sysctlMib = []mibentry{
 	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
 	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
 	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
 	{"net.mpls.ttl", []_C_int{4, 33, 2}},
 	{"net.pflow.stats", []_C_int{4, 34, 1}},
 	{"net.pipex.enable", []_C_int{4, 35, 1}},
 	{"vm.anonmin", []_C_int{2, 7}},
 	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.malloc_conf", []_C_int{2, 12}},
 	{"vm.maxslp", []_C_int{2, 10}},
 	{"vm.nkmempages", []_C_int{2, 6}},
 	{"vm.psstrings", []_C_int{2, 3}},
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
index 7be575a..154b57a 100644
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build arm64 && openbsd
+// +build arm64,openbsd
 
 package unix
 
@@ -35,7 +36,6 @@ var sysctlMib = []mibentry{
 	{"hw.pagesize", []_C_int{6, 7}},
 	{"hw.perfpolicy", []_C_int{6, 23}},
 	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
 	{"hw.product", []_C_int{6, 15}},
 	{"hw.serialno", []_C_int{6, 17}},
 	{"hw.setperf", []_C_int{6, 13}},
@@ -44,7 +44,6 @@ var sysctlMib = []mibentry{
 	{"hw.uuid", []_C_int{6, 18}},
 	{"hw.vendor", []_C_int{6, 14}},
 	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
 	{"kern.allowkmem", []_C_int{1, 52}},
 	{"kern.argmax", []_C_int{1, 8}},
 	{"kern.audio", []_C_int{1, 84}},
@@ -52,8 +51,6 @@ var sysctlMib = []mibentry{
 	{"kern.bufcachepercent", []_C_int{1, 72}},
 	{"kern.ccpu", []_C_int{1, 45}},
 	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
 	{"kern.consdev", []_C_int{1, 75}},
 	{"kern.cp_time", []_C_int{1, 40}},
 	{"kern.cp_time2", []_C_int{1, 71}},
@@ -86,13 +83,13 @@ var sysctlMib = []mibentry{
 	{"kern.ngroups", []_C_int{1, 18}},
 	{"kern.nosuidcoredump", []_C_int{1, 32}},
 	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
 	{"kern.nthreads", []_C_int{1, 26}},
 	{"kern.numvnodes", []_C_int{1, 58}},
 	{"kern.osrelease", []_C_int{1, 2}},
 	{"kern.osrevision", []_C_int{1, 3}},
 	{"kern.ostype", []_C_int{1, 1}},
 	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
 	{"kern.pool_debug", []_C_int{1, 77}},
 	{"kern.posix1version", []_C_int{1, 17}},
 	{"kern.proc", []_C_int{1, 66}},
@@ -113,16 +110,13 @@ var sysctlMib = []mibentry{
 	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
 	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
 	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
 	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
 	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
 	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
 	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
 	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
 	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
 	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
 	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
 	{"kern.watchdog.period", []_C_int{1, 64, 1}},
 	{"kern.witnesswatch", []_C_int{1, 53}},
@@ -185,6 +179,7 @@ var sysctlMib = []mibentry{
 	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
 	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
 	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
 	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
 	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
 	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
@@ -260,6 +255,7 @@ var sysctlMib = []mibentry{
 	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
 	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
 	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
 	{"net.mpls.ttl", []_C_int{4, 33, 2}},
 	{"net.pflow.stats", []_C_int{4, 34, 1}},
 	{"net.pipex.enable", []_C_int{4, 35, 1}},
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
index d6e3174..d96bb2b 100644
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build mips64 && openbsd
+// +build mips64,openbsd
 
 package unix
 
@@ -35,7 +36,6 @@ var sysctlMib = []mibentry{
 	{"hw.pagesize", []_C_int{6, 7}},
 	{"hw.perfpolicy", []_C_int{6, 23}},
 	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
 	{"hw.product", []_C_int{6, 15}},
 	{"hw.serialno", []_C_int{6, 17}},
 	{"hw.setperf", []_C_int{6, 13}},
@@ -86,6 +86,7 @@ var sysctlMib = []mibentry{
 	{"kern.ngroups", []_C_int{1, 18}},
 	{"kern.nosuidcoredump", []_C_int{1, 32}},
 	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
 	{"kern.nthreads", []_C_int{1, 26}},
 	{"kern.numvnodes", []_C_int{1, 58}},
 	{"kern.osrelease", []_C_int{1, 2}},
@@ -122,7 +123,6 @@ var sysctlMib = []mibentry{
 	{"kern.ttycount", []_C_int{1, 57}},
 	{"kern.utc_offset", []_C_int{1, 88}},
 	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
 	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
 	{"kern.watchdog.period", []_C_int{1, 64, 1}},
 	{"kern.witnesswatch", []_C_int{1, 53}},
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go
deleted file mode 100644
index ee97157..0000000
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go
+++ /dev/null
@@ -1,280 +0,0 @@
-// go run mksysctl_openbsd.go
-// Code generated by the command above; DO NOT EDIT.
-
-//go:build ppc64 && openbsd
-
-package unix
-
-type mibentry struct {
-	ctlname string
-	ctloid  []_C_int
-}
-
-var sysctlMib = []mibentry{
-	{"ddb.console", []_C_int{9, 6}},
-	{"ddb.log", []_C_int{9, 7}},
-	{"ddb.max_line", []_C_int{9, 3}},
-	{"ddb.max_width", []_C_int{9, 2}},
-	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.profile", []_C_int{9, 9}},
-	{"ddb.radix", []_C_int{9, 1}},
-	{"ddb.tab_stop_width", []_C_int{9, 4}},
-	{"ddb.trigger", []_C_int{9, 8}},
-	{"fs.posix.setuid", []_C_int{3, 1, 1}},
-	{"hw.allowpowerdown", []_C_int{6, 22}},
-	{"hw.byteorder", []_C_int{6, 4}},
-	{"hw.cpuspeed", []_C_int{6, 12}},
-	{"hw.diskcount", []_C_int{6, 10}},
-	{"hw.disknames", []_C_int{6, 8}},
-	{"hw.diskstats", []_C_int{6, 9}},
-	{"hw.machine", []_C_int{6, 1}},
-	{"hw.model", []_C_int{6, 2}},
-	{"hw.ncpu", []_C_int{6, 3}},
-	{"hw.ncpufound", []_C_int{6, 21}},
-	{"hw.ncpuonline", []_C_int{6, 25}},
-	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.perfpolicy", []_C_int{6, 23}},
-	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
-	{"hw.product", []_C_int{6, 15}},
-	{"hw.serialno", []_C_int{6, 17}},
-	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.smt", []_C_int{6, 24}},
-	{"hw.usermem", []_C_int{6, 20}},
-	{"hw.uuid", []_C_int{6, 18}},
-	{"hw.vendor", []_C_int{6, 14}},
-	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
-	{"kern.allowkmem", []_C_int{1, 52}},
-	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.audio", []_C_int{1, 84}},
-	{"kern.boottime", []_C_int{1, 21}},
-	{"kern.bufcachepercent", []_C_int{1, 72}},
-	{"kern.ccpu", []_C_int{1, 45}},
-	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
-	{"kern.consdev", []_C_int{1, 75}},
-	{"kern.cp_time", []_C_int{1, 40}},
-	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cpustats", []_C_int{1, 85}},
-	{"kern.domainname", []_C_int{1, 22}},
-	{"kern.file", []_C_int{1, 73}},
-	{"kern.forkstat", []_C_int{1, 42}},
-	{"kern.fscale", []_C_int{1, 46}},
-	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.global_ptrace", []_C_int{1, 81}},
-	{"kern.hostid", []_C_int{1, 11}},
-	{"kern.hostname", []_C_int{1, 10}},
-	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
-	{"kern.job_control", []_C_int{1, 19}},
-	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
-	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
-	{"kern.maxclusters", []_C_int{1, 67}},
-	{"kern.maxfiles", []_C_int{1, 7}},
-	{"kern.maxlocksperuid", []_C_int{1, 70}},
-	{"kern.maxpartitions", []_C_int{1, 23}},
-	{"kern.maxproc", []_C_int{1, 6}},
-	{"kern.maxthread", []_C_int{1, 25}},
-	{"kern.maxvnodes", []_C_int{1, 5}},
-	{"kern.mbstat", []_C_int{1, 59}},
-	{"kern.msgbuf", []_C_int{1, 48}},
-	{"kern.msgbufsize", []_C_int{1, 38}},
-	{"kern.nchstats", []_C_int{1, 41}},
-	{"kern.netlivelocks", []_C_int{1, 76}},
-	{"kern.nfiles", []_C_int{1, 56}},
-	{"kern.ngroups", []_C_int{1, 18}},
-	{"kern.nosuidcoredump", []_C_int{1, 32}},
-	{"kern.nprocs", []_C_int{1, 47}},
-	{"kern.nthreads", []_C_int{1, 26}},
-	{"kern.numvnodes", []_C_int{1, 58}},
-	{"kern.osrelease", []_C_int{1, 2}},
-	{"kern.osrevision", []_C_int{1, 3}},
-	{"kern.ostype", []_C_int{1, 1}},
-	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
-	{"kern.pool_debug", []_C_int{1, 77}},
-	{"kern.posix1version", []_C_int{1, 17}},
-	{"kern.proc", []_C_int{1, 66}},
-	{"kern.rawpartition", []_C_int{1, 24}},
-	{"kern.saved_ids", []_C_int{1, 20}},
-	{"kern.securelevel", []_C_int{1, 9}},
-	{"kern.seminfo", []_C_int{1, 61}},
-	{"kern.shminfo", []_C_int{1, 62}},
-	{"kern.somaxconn", []_C_int{1, 28}},
-	{"kern.sominconn", []_C_int{1, 29}},
-	{"kern.splassert", []_C_int{1, 54}},
-	{"kern.stackgap_random", []_C_int{1, 50}},
-	{"kern.sysvipc_info", []_C_int{1, 51}},
-	{"kern.sysvmsg", []_C_int{1, 34}},
-	{"kern.sysvsem", []_C_int{1, 35}},
-	{"kern.sysvshm", []_C_int{1, 36}},
-	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
-	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
-	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
-	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
-	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
-	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
-	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
-	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
-	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
-	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
-	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
-	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
-	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"kern.witnesswatch", []_C_int{1, 53}},
-	{"kern.wxabort", []_C_int{1, 74}},
-	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
-	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
-	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
-	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
-	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
-	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
-	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
-	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
-	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
-	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
-	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
-	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
-	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
-	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
-	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
-	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
-	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
-	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
-	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
-	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
-	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
-	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
-	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
-	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
-	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
-	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
-	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpdown", []_C_int{4, 2, 0, 40}},
-	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.arptimeout", []_C_int{4, 2, 0, 39}},
-	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
-	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
-	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
-	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
-	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
-	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
-	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
-	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtmfc", []_C_int{4, 2, 0, 37}},
-	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
-	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mrtvif", []_C_int{4, 2, 0, 38}},
-	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
-	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
-	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
-	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
-	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
-	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
-	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
-	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
-	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
-	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
-	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
-	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
-	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
-	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
-	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
-	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
-	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
-	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
-	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
-	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
-	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
-	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
-	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
-	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
-	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
-	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
-	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
-	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
-	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
-	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rootonly", []_C_int{4, 2, 6, 24}},
-	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
-	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
-	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
-	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
-	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
-	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
-	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.tcp.synhashsize", []_C_int{4, 2, 6, 25}},
-	{"net.inet.tcp.synuselimit", []_C_int{4, 2, 6, 23}},
-	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
-	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
-	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.rootonly", []_C_int{4, 2, 17, 6}},
-	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
-	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
-	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
-	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
-	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
-	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
-	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
-	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
-	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
-	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
-	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
-	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
-	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
-	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
-	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
-	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
-	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
-	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
-	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
-	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
-	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
-	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
-	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
-	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
-	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
-	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
-	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtmfc", []_C_int{4, 24, 17, 53}},
-	{"net.inet6.ip6.mrtmif", []_C_int{4, 24, 17, 52}},
-	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
-	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
-	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
-	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
-	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
-	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.soiikey", []_C_int{4, 24, 17, 54}},
-	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
-	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
-	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
-	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
-	{"net.key.spd_dump", []_C_int{4, 30, 2}},
-	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
-	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
-	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
-	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
-	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
-	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
-	{"net.mpls.ttl", []_C_int{4, 33, 2}},
-	{"net.pflow.stats", []_C_int{4, 34, 1}},
-	{"net.pipex.enable", []_C_int{4, 35, 1}},
-	{"vm.anonmin", []_C_int{2, 7}},
-	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.malloc_conf", []_C_int{2, 12}},
-	{"vm.maxslp", []_C_int{2, 10}},
-	{"vm.nkmempages", []_C_int{2, 6}},
-	{"vm.psstrings", []_C_int{2, 3}},
-	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
-	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
-	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
-	{"vm.uspace", []_C_int{2, 11}},
-	{"vm.uvmexp", []_C_int{2, 4}},
-	{"vm.vmmeter", []_C_int{2, 1}},
-	{"vm.vnodemin", []_C_int{2, 9}},
-	{"vm.vtextmin", []_C_int{2, 8}},
-}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go
deleted file mode 100644
index 35c3b91..0000000
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go
+++ /dev/null
@@ -1,281 +0,0 @@
-// go run mksysctl_openbsd.go
-// Code generated by the command above; DO NOT EDIT.
-
-//go:build riscv64 && openbsd
-
-package unix
-
-type mibentry struct {
-	ctlname string
-	ctloid  []_C_int
-}
-
-var sysctlMib = []mibentry{
-	{"ddb.console", []_C_int{9, 6}},
-	{"ddb.log", []_C_int{9, 7}},
-	{"ddb.max_line", []_C_int{9, 3}},
-	{"ddb.max_width", []_C_int{9, 2}},
-	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.profile", []_C_int{9, 9}},
-	{"ddb.radix", []_C_int{9, 1}},
-	{"ddb.tab_stop_width", []_C_int{9, 4}},
-	{"ddb.trigger", []_C_int{9, 8}},
-	{"fs.posix.setuid", []_C_int{3, 1, 1}},
-	{"hw.allowpowerdown", []_C_int{6, 22}},
-	{"hw.byteorder", []_C_int{6, 4}},
-	{"hw.cpuspeed", []_C_int{6, 12}},
-	{"hw.diskcount", []_C_int{6, 10}},
-	{"hw.disknames", []_C_int{6, 8}},
-	{"hw.diskstats", []_C_int{6, 9}},
-	{"hw.machine", []_C_int{6, 1}},
-	{"hw.model", []_C_int{6, 2}},
-	{"hw.ncpu", []_C_int{6, 3}},
-	{"hw.ncpufound", []_C_int{6, 21}},
-	{"hw.ncpuonline", []_C_int{6, 25}},
-	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.perfpolicy", []_C_int{6, 23}},
-	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.power", []_C_int{6, 26}},
-	{"hw.product", []_C_int{6, 15}},
-	{"hw.serialno", []_C_int{6, 17}},
-	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.smt", []_C_int{6, 24}},
-	{"hw.usermem", []_C_int{6, 20}},
-	{"hw.uuid", []_C_int{6, 18}},
-	{"hw.vendor", []_C_int{6, 14}},
-	{"hw.version", []_C_int{6, 16}},
-	{"kern.allowdt", []_C_int{1, 65}},
-	{"kern.allowkmem", []_C_int{1, 52}},
-	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.audio", []_C_int{1, 84}},
-	{"kern.boottime", []_C_int{1, 21}},
-	{"kern.bufcachepercent", []_C_int{1, 72}},
-	{"kern.ccpu", []_C_int{1, 45}},
-	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consbuf", []_C_int{1, 83}},
-	{"kern.consbufsize", []_C_int{1, 82}},
-	{"kern.consdev", []_C_int{1, 75}},
-	{"kern.cp_time", []_C_int{1, 40}},
-	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cpustats", []_C_int{1, 85}},
-	{"kern.domainname", []_C_int{1, 22}},
-	{"kern.file", []_C_int{1, 73}},
-	{"kern.forkstat", []_C_int{1, 42}},
-	{"kern.fscale", []_C_int{1, 46}},
-	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.global_ptrace", []_C_int{1, 81}},
-	{"kern.hostid", []_C_int{1, 11}},
-	{"kern.hostname", []_C_int{1, 10}},
-	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
-	{"kern.job_control", []_C_int{1, 19}},
-	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
-	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
-	{"kern.maxclusters", []_C_int{1, 67}},
-	{"kern.maxfiles", []_C_int{1, 7}},
-	{"kern.maxlocksperuid", []_C_int{1, 70}},
-	{"kern.maxpartitions", []_C_int{1, 23}},
-	{"kern.maxproc", []_C_int{1, 6}},
-	{"kern.maxthread", []_C_int{1, 25}},
-	{"kern.maxvnodes", []_C_int{1, 5}},
-	{"kern.mbstat", []_C_int{1, 59}},
-	{"kern.msgbuf", []_C_int{1, 48}},
-	{"kern.msgbufsize", []_C_int{1, 38}},
-	{"kern.nchstats", []_C_int{1, 41}},
-	{"kern.netlivelocks", []_C_int{1, 76}},
-	{"kern.nfiles", []_C_int{1, 56}},
-	{"kern.ngroups", []_C_int{1, 18}},
-	{"kern.nosuidcoredump", []_C_int{1, 32}},
-	{"kern.nprocs", []_C_int{1, 47}},
-	{"kern.nselcoll", []_C_int{1, 43}},
-	{"kern.nthreads", []_C_int{1, 26}},
-	{"kern.numvnodes", []_C_int{1, 58}},
-	{"kern.osrelease", []_C_int{1, 2}},
-	{"kern.osrevision", []_C_int{1, 3}},
-	{"kern.ostype", []_C_int{1, 1}},
-	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pfstatus", []_C_int{1, 86}},
-	{"kern.pool_debug", []_C_int{1, 77}},
-	{"kern.posix1version", []_C_int{1, 17}},
-	{"kern.proc", []_C_int{1, 66}},
-	{"kern.rawpartition", []_C_int{1, 24}},
-	{"kern.saved_ids", []_C_int{1, 20}},
-	{"kern.securelevel", []_C_int{1, 9}},
-	{"kern.seminfo", []_C_int{1, 61}},
-	{"kern.shminfo", []_C_int{1, 62}},
-	{"kern.somaxconn", []_C_int{1, 28}},
-	{"kern.sominconn", []_C_int{1, 29}},
-	{"kern.splassert", []_C_int{1, 54}},
-	{"kern.stackgap_random", []_C_int{1, 50}},
-	{"kern.sysvipc_info", []_C_int{1, 51}},
-	{"kern.sysvmsg", []_C_int{1, 34}},
-	{"kern.sysvsem", []_C_int{1, 35}},
-	{"kern.sysvshm", []_C_int{1, 36}},
-	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
-	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
-	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
-	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.timeout_stats", []_C_int{1, 87}},
-	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
-	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
-	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
-	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
-	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
-	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.utc_offset", []_C_int{1, 88}},
-	{"kern.version", []_C_int{1, 4}},
-	{"kern.video", []_C_int{1, 89}},
-	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
-	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"kern.witnesswatch", []_C_int{1, 53}},
-	{"kern.wxabort", []_C_int{1, 74}},
-	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
-	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
-	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
-	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
-	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
-	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
-	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
-	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
-	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
-	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
-	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
-	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
-	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
-	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
-	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
-	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
-	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
-	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
-	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
-	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
-	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
-	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
-	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
-	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
-	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
-	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
-	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpdown", []_C_int{4, 2, 0, 40}},
-	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.arptimeout", []_C_int{4, 2, 0, 39}},
-	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
-	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
-	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
-	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
-	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
-	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
-	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
-	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtmfc", []_C_int{4, 2, 0, 37}},
-	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
-	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mrtvif", []_C_int{4, 2, 0, 38}},
-	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
-	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
-	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
-	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
-	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
-	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
-	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
-	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
-	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
-	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
-	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
-	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
-	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
-	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
-	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
-	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
-	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
-	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
-	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
-	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
-	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
-	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
-	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
-	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
-	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
-	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
-	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
-	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
-	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
-	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rootonly", []_C_int{4, 2, 6, 24}},
-	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
-	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
-	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
-	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
-	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
-	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
-	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.tcp.synhashsize", []_C_int{4, 2, 6, 25}},
-	{"net.inet.tcp.synuselimit", []_C_int{4, 2, 6, 23}},
-	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
-	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
-	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.rootonly", []_C_int{4, 2, 17, 6}},
-	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
-	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
-	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
-	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
-	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
-	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
-	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
-	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
-	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
-	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
-	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
-	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
-	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
-	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
-	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
-	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
-	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
-	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
-	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
-	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
-	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
-	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
-	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
-	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
-	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
-	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
-	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtmfc", []_C_int{4, 24, 17, 53}},
-	{"net.inet6.ip6.mrtmif", []_C_int{4, 24, 17, 52}},
-	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
-	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
-	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
-	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
-	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
-	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.soiikey", []_C_int{4, 24, 17, 54}},
-	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
-	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
-	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
-	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
-	{"net.key.spd_dump", []_C_int{4, 30, 2}},
-	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
-	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
-	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
-	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
-	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
-	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
-	{"net.mpls.ttl", []_C_int{4, 33, 2}},
-	{"net.pflow.stats", []_C_int{4, 34, 1}},
-	{"net.pipex.enable", []_C_int{4, 35, 1}},
-	{"vm.anonmin", []_C_int{2, 7}},
-	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.malloc_conf", []_C_int{2, 12}},
-	{"vm.maxslp", []_C_int{2, 10}},
-	{"vm.nkmempages", []_C_int{2, 6}},
-	{"vm.psstrings", []_C_int{2, 3}},
-	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
-	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
-	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
-	{"vm.uspace", []_C_int{2, 11}},
-	{"vm.uvmexp", []_C_int{2, 4}},
-	{"vm.vmmeter", []_C_int{2, 1}},
-	{"vm.vnodemin", []_C_int{2, 9}},
-	{"vm.vtextmin", []_C_int{2, 8}},
-}
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
index 5edda76..f8298ff 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && darwin
+// +build amd64,darwin
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
index 0dc9e8b..5eb433b 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && darwin
+// +build arm64,darwin
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
index 308ddf3..703675c 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && dragonfly
+// +build amd64,dragonfly
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
index 418664e..59d5dfc 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
@@ -1,7 +1,8 @@
-// go run mksysnum.go https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12
+// go run mksysnum.go https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && freebsd
+// +build 386,freebsd
 
 package unix
 
@@ -18,9 +19,10 @@ const (
 	SYS_UNLINK                   = 10  // { int unlink(char *path); }
 	SYS_CHDIR                    = 12  // { int chdir(char *path); }
 	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
 	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
 	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_BREAK                    = 17  // { caddr_t break(char *nsize); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break obreak_args int
 	SYS_GETPID                   = 20  // { pid_t getpid(void); }
 	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, int flags, caddr_t data); }
 	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
@@ -41,6 +43,7 @@ const (
 	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
 	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
 	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
 	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
 	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, size_t offset, u_int scale); }
 	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, int facs, int pid); }
@@ -55,14 +58,15 @@ const (
 	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
 	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, size_t count); }
 	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK                    = 60  // { int umask(int newmask); }
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args int
 	SYS_CHROOT                   = 61  // { int chroot(char *path); }
 	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, int flags); }
 	SYS_VFORK                    = 66  // { int vfork(void); }
 	SYS_SBRK                     = 69  // { int sbrk(int incr); }
 	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise ovadvise_args int
 	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, int prot); }
 	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, int behav); }
 	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, char *vec); }
 	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
@@ -120,10 +124,14 @@ const (
 	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
 	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
 	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
 	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
 	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
 	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, struct rlimit *rlp); } getrlimit __getrlimit_args int
 	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, struct rlimit *rlp); } setrlimit __setrlimit_args int
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
 	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } __sysctl sysctl_args int
 	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
 	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
@@ -135,12 +143,12 @@ const (
 	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, size_t nsops); }
 	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
 	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV                   = 227 // { ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGRCV                   = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, int shmflg); }
 	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
 	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, int shmflg); }
 	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( clockid_t clock_id, const struct timespec *tp); }
 	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, struct timespec *tp); }
 	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, struct sigevent *evp, int *timerid); }
 	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
@@ -149,44 +157,50 @@ const (
 	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
 	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
 	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate(struct ffclock_estimate *cest); }
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate(struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( struct ffclock_estimate *cest); }
 	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id, int which, clockid_t *clock_id); }
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,int which, clockid_t *clock_id); }
 	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
 	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, int inherit); }
 	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, int timeout); }
 	SYS_ISSETUGID                = 253 // { int issetugid(void); }
 	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
 	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
 	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb* const *acb_list, int nent, struct sigevent *sig); }
+	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, size_t count); }
 	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
 	SYS_LUTIMES                  = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
 	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
 	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat *stat); }
 	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
 	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
 	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
 	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
 	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
 	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat *stat); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
 	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
 	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
 	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
 	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
 	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend( struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
 	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
 	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
 	SYS_YIELD                    = 321 // { int yield(void); }
 	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
 	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, size_t buflen); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
 	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
 	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
 	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
@@ -212,13 +226,14 @@ const (
 	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, acl_type_t type, struct acl *aclp); }
 	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, struct acl *aclp); }
 	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete( struct aiocb **aiocbp, struct timespec *timeout); }
 	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
 	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
 	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
 	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
@@ -236,6 +251,10 @@ const (
 	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, int count); }
 	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
 	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, int call, void *arg); }
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
+	SYS_STATFS                   = 396 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
 	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
 	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
 	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
@@ -248,14 +267,14 @@ const (
 	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
 	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, struct mac *mac_p); }
 	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, struct mac *mac_p); }
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( const char *path, int attrnamespace, const char *attrname); }
 	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, char **envv, struct mac *mac_p); }
 	SYS_SIGACTION                = 416 // { int sigaction(int sig, const struct sigaction *act, struct sigaction *oact); }
-	SYS_SIGRETURN                = 417 // { int sigreturn(const struct __ucontext *sigcntxp); }
+	SYS_SIGRETURN                = 417 // { int sigreturn( const struct __ucontext *sigcntxp); }
 	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext(const struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( const struct __ucontext *ucp); }
 	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, const struct __ucontext *ucp); }
 	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
 	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, acl_type_t type, struct acl *aclp); }
@@ -269,10 +288,10 @@ const (
 	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
 	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
 	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( const char *path, int attrnamespace, void *data, size_t nbytes); }
 	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, const struct timespec *abstime); }
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend(const struct timespec *timeout); }
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( const struct timespec *timeout); }
 	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
 	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
 	SYS_AUDIT                    = 445 // { int audit(const void *record, u_int length); }
@@ -281,17 +300,17 @@ const (
 	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
 	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
 	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
 	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
 	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, u_long val, void *uaddr1, void *uaddr2); }
 	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, int param_size); }
 	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
 	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, mode_t mode, const struct mq_attr *attr); }
-	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd, const struct mq_attr *attr, struct mq_attr *oattr); }
-	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd, char *msg_ptr, size_t msg_len, unsigned *msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd, const struct sigevent *sigev); }
+	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd,		const struct mq_attr *attr,		struct mq_attr *oattr); }
+	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd,	char *msg_ptr, size_t msg_len,	unsigned *msg_prio,			const struct timespec *abs_timeout); }
+	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd,		const char *msg_ptr, size_t msg_len,unsigned msg_prio,			const struct timespec *abs_timeout);}
+	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd,		const struct sigevent *sigev); }
 	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
 	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
 	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
@@ -300,7 +319,7 @@ const (
 	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
 	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
 	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr *from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr * from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
 	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset); }
 	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset); }
 	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
@@ -319,12 +338,14 @@ const (
 	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, int flag); }
 	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag); }
 	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, char **envv); }
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
 	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, struct timeval *times); }
 	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); }
 	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
 	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
 	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, mode_t mode); }
-	SYS_READLINKAT               = 500 // { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); }
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, size_t bufsize); }
 	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, char *new); }
 	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, char *path2); }
 	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
@@ -370,24 +391,7 @@ const (
 	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *set); }
 	SYS_FUTIMENS                 = 546 // { int futimens(int fd, struct timespec *times); }
 	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, char *path, struct timespec *times, int flag); }
+	SYS_NUMA_GETAFFINITY         = 548 // { int numa_getaffinity(cpuwhich_t which, id_t id, struct vm_domain_policy_entry *policy); }
+	SYS_NUMA_SETAFFINITY         = 549 // { int numa_setaffinity(cpuwhich_t which, id_t id, const struct vm_domain_policy_entry *policy); }
 	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
-	SYS_FSTAT                    = 551 // { int fstat(int fd, struct stat *sb); }
-	SYS_FSTATAT                  = 552 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
-	SYS_FHSTAT                   = 553 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES            = 554 // { ssize_t getdirentries(int fd, char *buf, size_t count, off_t *basep); }
-	SYS_STATFS                   = 555 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS                  = 556 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFSSTAT                = 557 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
-	SYS_FHSTATFS                 = 558 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_MKNODAT                  = 559 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
-	SYS_KEVENT                   = 560 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_CPUSET_GETDOMAIN         = 561 // { int cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int *policy); }
-	SYS_CPUSET_SETDOMAIN         = 562 // { int cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int policy); }
-	SYS_GETRANDOM                = 563 // { int getrandom(void *buf, size_t buflen, unsigned int flags); }
-	SYS_GETFHAT                  = 564 // { int getfhat(int fd, char *path, struct fhandle *fhp, int flags); }
-	SYS_FHLINK                   = 565 // { int fhlink(struct fhandle *fhp, const char *to); }
-	SYS_FHLINKAT                 = 566 // { int fhlinkat(struct fhandle *fhp, int tofd, const char *to,); }
-	SYS_FHREADLINK               = 567 // { int fhreadlink(struct fhandle *fhp, char *buf, size_t bufsize); }
-	SYS___SYSCTLBYNAME           = 570 // { int __sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_CLOSE_RANGE              = 575 // { int close_range(u_int lowfd, u_int highfd, int flags); }
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
index 34d0b86..342d471 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
@@ -1,7 +1,8 @@
-// go run mksysnum.go https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12
+// go run mksysnum.go https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && freebsd
+// +build amd64,freebsd
 
 package unix
 
@@ -18,9 +19,10 @@ const (
 	SYS_UNLINK                   = 10  // { int unlink(char *path); }
 	SYS_CHDIR                    = 12  // { int chdir(char *path); }
 	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
 	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
 	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_BREAK                    = 17  // { caddr_t break(char *nsize); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break obreak_args int
 	SYS_GETPID                   = 20  // { pid_t getpid(void); }
 	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, int flags, caddr_t data); }
 	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
@@ -41,6 +43,7 @@ const (
 	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
 	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
 	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
 	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
 	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, size_t offset, u_int scale); }
 	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, int facs, int pid); }
@@ -55,14 +58,15 @@ const (
 	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
 	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, size_t count); }
 	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK                    = 60  // { int umask(int newmask); }
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args int
 	SYS_CHROOT                   = 61  // { int chroot(char *path); }
 	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, int flags); }
 	SYS_VFORK                    = 66  // { int vfork(void); }
 	SYS_SBRK                     = 69  // { int sbrk(int incr); }
 	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise ovadvise_args int
 	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, int prot); }
 	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, int behav); }
 	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, char *vec); }
 	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
@@ -120,10 +124,14 @@ const (
 	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
 	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
 	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
 	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
 	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
 	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, struct rlimit *rlp); } getrlimit __getrlimit_args int
 	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, struct rlimit *rlp); } setrlimit __setrlimit_args int
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
 	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } __sysctl sysctl_args int
 	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
 	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
@@ -135,12 +143,12 @@ const (
 	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, size_t nsops); }
 	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
 	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV                   = 227 // { ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGRCV                   = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, int shmflg); }
 	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
 	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, int shmflg); }
 	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( clockid_t clock_id, const struct timespec *tp); }
 	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, struct timespec *tp); }
 	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, struct sigevent *evp, int *timerid); }
 	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
@@ -149,44 +157,50 @@ const (
 	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
 	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
 	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate(struct ffclock_estimate *cest); }
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate(struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( struct ffclock_estimate *cest); }
 	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id, int which, clockid_t *clock_id); }
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,int which, clockid_t *clock_id); }
 	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
 	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, int inherit); }
 	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, int timeout); }
 	SYS_ISSETUGID                = 253 // { int issetugid(void); }
 	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
 	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
 	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb* const *acb_list, int nent, struct sigevent *sig); }
+	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, size_t count); }
 	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
 	SYS_LUTIMES                  = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
 	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
 	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat *stat); }
 	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
 	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
 	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
 	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
 	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
 	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat *stat); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
 	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
 	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
 	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
 	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
 	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend( struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
 	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
 	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
 	SYS_YIELD                    = 321 // { int yield(void); }
 	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
 	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, size_t buflen); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
 	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
 	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
 	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
@@ -212,13 +226,14 @@ const (
 	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, acl_type_t type, struct acl *aclp); }
 	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, struct acl *aclp); }
 	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete( struct aiocb **aiocbp, struct timespec *timeout); }
 	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
 	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
 	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
 	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
@@ -236,6 +251,10 @@ const (
 	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, int count); }
 	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
 	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, int call, void *arg); }
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
+	SYS_STATFS                   = 396 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
 	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
 	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
 	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
@@ -248,14 +267,14 @@ const (
 	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
 	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, struct mac *mac_p); }
 	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, struct mac *mac_p); }
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( const char *path, int attrnamespace, const char *attrname); }
 	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, char **envv, struct mac *mac_p); }
 	SYS_SIGACTION                = 416 // { int sigaction(int sig, const struct sigaction *act, struct sigaction *oact); }
-	SYS_SIGRETURN                = 417 // { int sigreturn(const struct __ucontext *sigcntxp); }
+	SYS_SIGRETURN                = 417 // { int sigreturn( const struct __ucontext *sigcntxp); }
 	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext(const struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( const struct __ucontext *ucp); }
 	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, const struct __ucontext *ucp); }
 	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
 	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, acl_type_t type, struct acl *aclp); }
@@ -269,10 +288,10 @@ const (
 	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
 	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
 	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( const char *path, int attrnamespace, void *data, size_t nbytes); }
 	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, const struct timespec *abstime); }
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend(const struct timespec *timeout); }
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( const struct timespec *timeout); }
 	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
 	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
 	SYS_AUDIT                    = 445 // { int audit(const void *record, u_int length); }
@@ -281,17 +300,17 @@ const (
 	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
 	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
 	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
 	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
 	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, u_long val, void *uaddr1, void *uaddr2); }
 	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, int param_size); }
 	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
 	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, mode_t mode, const struct mq_attr *attr); }
-	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd, const struct mq_attr *attr, struct mq_attr *oattr); }
-	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd, char *msg_ptr, size_t msg_len, unsigned *msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd, const struct sigevent *sigev); }
+	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd,		const struct mq_attr *attr,		struct mq_attr *oattr); }
+	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd,	char *msg_ptr, size_t msg_len,	unsigned *msg_prio,			const struct timespec *abs_timeout); }
+	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd,		const char *msg_ptr, size_t msg_len,unsigned msg_prio,			const struct timespec *abs_timeout);}
+	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd,		const struct sigevent *sigev); }
 	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
 	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
 	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
@@ -300,7 +319,7 @@ const (
 	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
 	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
 	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr *from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr * from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
 	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset); }
 	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset); }
 	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
@@ -319,12 +338,14 @@ const (
 	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, int flag); }
 	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag); }
 	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, char **envv); }
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
 	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, struct timeval *times); }
 	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); }
 	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
 	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
 	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, mode_t mode); }
-	SYS_READLINKAT               = 500 // { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); }
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, size_t bufsize); }
 	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, char *new); }
 	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, char *path2); }
 	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
@@ -370,24 +391,7 @@ const (
 	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *set); }
 	SYS_FUTIMENS                 = 546 // { int futimens(int fd, struct timespec *times); }
 	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, char *path, struct timespec *times, int flag); }
+	SYS_NUMA_GETAFFINITY         = 548 // { int numa_getaffinity(cpuwhich_t which, id_t id, struct vm_domain_policy_entry *policy); }
+	SYS_NUMA_SETAFFINITY         = 549 // { int numa_setaffinity(cpuwhich_t which, id_t id, const struct vm_domain_policy_entry *policy); }
 	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
-	SYS_FSTAT                    = 551 // { int fstat(int fd, struct stat *sb); }
-	SYS_FSTATAT                  = 552 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
-	SYS_FHSTAT                   = 553 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES            = 554 // { ssize_t getdirentries(int fd, char *buf, size_t count, off_t *basep); }
-	SYS_STATFS                   = 555 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS                  = 556 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFSSTAT                = 557 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
-	SYS_FHSTATFS                 = 558 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_MKNODAT                  = 559 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
-	SYS_KEVENT                   = 560 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_CPUSET_GETDOMAIN         = 561 // { int cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int *policy); }
-	SYS_CPUSET_SETDOMAIN         = 562 // { int cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int policy); }
-	SYS_GETRANDOM                = 563 // { int getrandom(void *buf, size_t buflen, unsigned int flags); }
-	SYS_GETFHAT                  = 564 // { int getfhat(int fd, char *path, struct fhandle *fhp, int flags); }
-	SYS_FHLINK                   = 565 // { int fhlink(struct fhandle *fhp, const char *to); }
-	SYS_FHLINKAT                 = 566 // { int fhlinkat(struct fhandle *fhp, int tofd, const char *to,); }
-	SYS_FHREADLINK               = 567 // { int fhreadlink(struct fhandle *fhp, char *buf, size_t bufsize); }
-	SYS___SYSCTLBYNAME           = 570 // { int __sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_CLOSE_RANGE              = 575 // { int close_range(u_int lowfd, u_int highfd, int flags); }
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
index b71cf45..e2e3d72 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
@@ -1,7 +1,8 @@
-// go run mksysnum.go https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12
+// go run mksysnum.go https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && freebsd
+// +build arm,freebsd
 
 package unix
 
@@ -18,9 +19,10 @@ const (
 	SYS_UNLINK                   = 10  // { int unlink(char *path); }
 	SYS_CHDIR                    = 12  // { int chdir(char *path); }
 	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
 	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
 	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_BREAK                    = 17  // { caddr_t break(char *nsize); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break obreak_args int
 	SYS_GETPID                   = 20  // { pid_t getpid(void); }
 	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, int flags, caddr_t data); }
 	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
@@ -41,6 +43,7 @@ const (
 	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
 	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
 	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
 	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
 	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, size_t offset, u_int scale); }
 	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, int facs, int pid); }
@@ -55,14 +58,15 @@ const (
 	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
 	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, size_t count); }
 	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK                    = 60  // { int umask(int newmask); }
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args int
 	SYS_CHROOT                   = 61  // { int chroot(char *path); }
 	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, int flags); }
 	SYS_VFORK                    = 66  // { int vfork(void); }
 	SYS_SBRK                     = 69  // { int sbrk(int incr); }
 	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise ovadvise_args int
 	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, int prot); }
 	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, int behav); }
 	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, char *vec); }
 	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
@@ -120,10 +124,14 @@ const (
 	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
 	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
 	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
 	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
 	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
 	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, struct rlimit *rlp); } getrlimit __getrlimit_args int
 	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, struct rlimit *rlp); } setrlimit __setrlimit_args int
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
 	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } __sysctl sysctl_args int
 	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
 	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
@@ -135,12 +143,12 @@ const (
 	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, size_t nsops); }
 	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
 	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV                   = 227 // { ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGRCV                   = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, int shmflg); }
 	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
 	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, int shmflg); }
 	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( clockid_t clock_id, const struct timespec *tp); }
 	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, struct timespec *tp); }
 	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, struct sigevent *evp, int *timerid); }
 	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
@@ -149,44 +157,50 @@ const (
 	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
 	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
 	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate(struct ffclock_estimate *cest); }
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate(struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( struct ffclock_estimate *cest); }
 	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id, int which, clockid_t *clock_id); }
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,int which, clockid_t *clock_id); }
 	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
 	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, int inherit); }
 	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, int timeout); }
 	SYS_ISSETUGID                = 253 // { int issetugid(void); }
 	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
 	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
 	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb* const *acb_list, int nent, struct sigevent *sig); }
+	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, size_t count); }
 	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
 	SYS_LUTIMES                  = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
 	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
 	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat *stat); }
 	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
 	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
 	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
 	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
 	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
 	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat *stat); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
 	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
 	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
 	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
 	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
 	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend( struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
 	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
 	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
 	SYS_YIELD                    = 321 // { int yield(void); }
 	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
 	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, size_t buflen); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
 	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
 	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
 	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
@@ -212,13 +226,14 @@ const (
 	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, acl_type_t type, struct acl *aclp); }
 	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, struct acl *aclp); }
 	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete( struct aiocb **aiocbp, struct timespec *timeout); }
 	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
 	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
 	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
 	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
@@ -236,6 +251,10 @@ const (
 	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, int count); }
 	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
 	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, int call, void *arg); }
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
+	SYS_STATFS                   = 396 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
 	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
 	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
 	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
@@ -248,14 +267,14 @@ const (
 	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
 	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, struct mac *mac_p); }
 	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, struct mac *mac_p); }
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( const char *path, int attrnamespace, const char *attrname); }
 	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, char **envv, struct mac *mac_p); }
 	SYS_SIGACTION                = 416 // { int sigaction(int sig, const struct sigaction *act, struct sigaction *oact); }
-	SYS_SIGRETURN                = 417 // { int sigreturn(const struct __ucontext *sigcntxp); }
+	SYS_SIGRETURN                = 417 // { int sigreturn( const struct __ucontext *sigcntxp); }
 	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext(const struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( const struct __ucontext *ucp); }
 	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, const struct __ucontext *ucp); }
 	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
 	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, acl_type_t type, struct acl *aclp); }
@@ -269,10 +288,10 @@ const (
 	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
 	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
 	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( const char *path, int attrnamespace, void *data, size_t nbytes); }
 	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, const struct timespec *abstime); }
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend(const struct timespec *timeout); }
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( const struct timespec *timeout); }
 	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
 	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
 	SYS_AUDIT                    = 445 // { int audit(const void *record, u_int length); }
@@ -281,17 +300,17 @@ const (
 	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
 	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
 	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
 	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
 	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, u_long val, void *uaddr1, void *uaddr2); }
 	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, int param_size); }
 	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
 	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, mode_t mode, const struct mq_attr *attr); }
-	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd, const struct mq_attr *attr, struct mq_attr *oattr); }
-	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd, char *msg_ptr, size_t msg_len, unsigned *msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd, const struct sigevent *sigev); }
+	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd,		const struct mq_attr *attr,		struct mq_attr *oattr); }
+	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd,	char *msg_ptr, size_t msg_len,	unsigned *msg_prio,			const struct timespec *abs_timeout); }
+	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd,		const char *msg_ptr, size_t msg_len,unsigned msg_prio,			const struct timespec *abs_timeout);}
+	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd,		const struct sigevent *sigev); }
 	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
 	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
 	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
@@ -300,7 +319,7 @@ const (
 	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
 	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
 	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr *from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr * from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
 	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset); }
 	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset); }
 	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
@@ -319,12 +338,14 @@ const (
 	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, int flag); }
 	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag); }
 	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, char **envv); }
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
 	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, struct timeval *times); }
 	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); }
 	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
 	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
 	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, mode_t mode); }
-	SYS_READLINKAT               = 500 // { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); }
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, size_t bufsize); }
 	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, char *new); }
 	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, char *path2); }
 	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
@@ -370,24 +391,7 @@ const (
 	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *set); }
 	SYS_FUTIMENS                 = 546 // { int futimens(int fd, struct timespec *times); }
 	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, char *path, struct timespec *times, int flag); }
+	SYS_NUMA_GETAFFINITY         = 548 // { int numa_getaffinity(cpuwhich_t which, id_t id, struct vm_domain_policy_entry *policy); }
+	SYS_NUMA_SETAFFINITY         = 549 // { int numa_setaffinity(cpuwhich_t which, id_t id, const struct vm_domain_policy_entry *policy); }
 	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
-	SYS_FSTAT                    = 551 // { int fstat(int fd, struct stat *sb); }
-	SYS_FSTATAT                  = 552 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
-	SYS_FHSTAT                   = 553 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES            = 554 // { ssize_t getdirentries(int fd, char *buf, size_t count, off_t *basep); }
-	SYS_STATFS                   = 555 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS                  = 556 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFSSTAT                = 557 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
-	SYS_FHSTATFS                 = 558 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_MKNODAT                  = 559 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
-	SYS_KEVENT                   = 560 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_CPUSET_GETDOMAIN         = 561 // { int cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int *policy); }
-	SYS_CPUSET_SETDOMAIN         = 562 // { int cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int policy); }
-	SYS_GETRANDOM                = 563 // { int getrandom(void *buf, size_t buflen, unsigned int flags); }
-	SYS_GETFHAT                  = 564 // { int getfhat(int fd, char *path, struct fhandle *fhp, int flags); }
-	SYS_FHLINK                   = 565 // { int fhlink(struct fhandle *fhp, const char *to); }
-	SYS_FHLINKAT                 = 566 // { int fhlinkat(struct fhandle *fhp, int tofd, const char *to,); }
-	SYS_FHREADLINK               = 567 // { int fhreadlink(struct fhandle *fhp, char *buf, size_t bufsize); }
-	SYS___SYSCTLBYNAME           = 570 // { int __sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_CLOSE_RANGE              = 575 // { int close_range(u_int lowfd, u_int highfd, int flags); }
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
index e32df1c..61ad5ca 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
@@ -1,7 +1,8 @@
-// go run mksysnum.go https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12
+// go run mksysnum.go https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && freebsd
+// +build arm64,freebsd
 
 package unix
 
@@ -18,9 +19,10 @@ const (
 	SYS_UNLINK                   = 10  // { int unlink(char *path); }
 	SYS_CHDIR                    = 12  // { int chdir(char *path); }
 	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
 	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
 	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_BREAK                    = 17  // { caddr_t break(char *nsize); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break obreak_args int
 	SYS_GETPID                   = 20  // { pid_t getpid(void); }
 	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, int flags, caddr_t data); }
 	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
@@ -41,6 +43,7 @@ const (
 	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
 	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
 	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
 	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
 	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, size_t offset, u_int scale); }
 	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, int facs, int pid); }
@@ -55,14 +58,15 @@ const (
 	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
 	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, size_t count); }
 	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK                    = 60  // { int umask(int newmask); }
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args int
 	SYS_CHROOT                   = 61  // { int chroot(char *path); }
 	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, int flags); }
 	SYS_VFORK                    = 66  // { int vfork(void); }
 	SYS_SBRK                     = 69  // { int sbrk(int incr); }
 	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise ovadvise_args int
 	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, int prot); }
 	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, int behav); }
 	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, char *vec); }
 	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
@@ -120,10 +124,14 @@ const (
 	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
 	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
 	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
 	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
 	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
 	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, struct rlimit *rlp); } getrlimit __getrlimit_args int
 	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, struct rlimit *rlp); } setrlimit __setrlimit_args int
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
 	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } __sysctl sysctl_args int
 	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
 	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
@@ -135,12 +143,12 @@ const (
 	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, size_t nsops); }
 	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
 	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV                   = 227 // { ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGRCV                   = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, int shmflg); }
 	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
 	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, int shmflg); }
 	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( clockid_t clock_id, const struct timespec *tp); }
 	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, struct timespec *tp); }
 	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, struct sigevent *evp, int *timerid); }
 	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
@@ -149,44 +157,50 @@ const (
 	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
 	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
 	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate(struct ffclock_estimate *cest); }
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate(struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( struct ffclock_estimate *cest); }
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( struct ffclock_estimate *cest); }
 	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id, int which, clockid_t *clock_id); }
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,int which, clockid_t *clock_id); }
 	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
 	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, int inherit); }
 	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, int timeout); }
 	SYS_ISSETUGID                = 253 // { int issetugid(void); }
 	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
 	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
 	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb* const *acb_list, int nent, struct sigevent *sig); }
+	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, size_t count); }
 	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
 	SYS_LUTIMES                  = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
 	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
 	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
 	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat *stat); }
 	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
 	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
 	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
 	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
 	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
 	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat *stat); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
 	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
 	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
 	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
 	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
 	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend( struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
 	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
 	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
 	SYS_YIELD                    = 321 // { int yield(void); }
 	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
 	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, size_t buflen); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
 	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
 	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
 	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
@@ -212,13 +226,14 @@ const (
 	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, acl_type_t type, struct acl *aclp); }
 	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, struct acl *aclp); }
 	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete( struct aiocb **aiocbp, struct timespec *timeout); }
 	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
 	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
 	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
 	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
 	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
@@ -236,6 +251,10 @@ const (
 	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, int count); }
 	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
 	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, int call, void *arg); }
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
+	SYS_STATFS                   = 396 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
 	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
 	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
 	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
@@ -248,14 +267,14 @@ const (
 	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
 	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, struct mac *mac_p); }
 	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, struct mac *mac_p); }
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( const char *path, int attrnamespace, const char *attrname); }
 	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, char **envv, struct mac *mac_p); }
 	SYS_SIGACTION                = 416 // { int sigaction(int sig, const struct sigaction *act, struct sigaction *oact); }
-	SYS_SIGRETURN                = 417 // { int sigreturn(const struct __ucontext *sigcntxp); }
+	SYS_SIGRETURN                = 417 // { int sigreturn( const struct __ucontext *sigcntxp); }
 	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext(const struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( const struct __ucontext *ucp); }
 	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, const struct __ucontext *ucp); }
 	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
 	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, acl_type_t type, struct acl *aclp); }
@@ -269,10 +288,10 @@ const (
 	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
 	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
 	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( const char *path, int attrnamespace, void *data, size_t nbytes); }
 	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, const struct timespec *abstime); }
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend(const struct timespec *timeout); }
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( const struct timespec *timeout); }
 	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
 	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
 	SYS_AUDIT                    = 445 // { int audit(const void *record, u_int length); }
@@ -281,17 +300,17 @@ const (
 	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
 	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
 	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( struct auditinfo_addr *auditinfo_addr, u_int length); }
 	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
 	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, u_long val, void *uaddr1, void *uaddr2); }
 	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, int param_size); }
 	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
 	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, mode_t mode, const struct mq_attr *attr); }
-	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd, const struct mq_attr *attr, struct mq_attr *oattr); }
-	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd, char *msg_ptr, size_t msg_len, unsigned *msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd, const struct sigevent *sigev); }
+	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd,		const struct mq_attr *attr,		struct mq_attr *oattr); }
+	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd,	char *msg_ptr, size_t msg_len,	unsigned *msg_prio,			const struct timespec *abs_timeout); }
+	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd,		const char *msg_ptr, size_t msg_len,unsigned msg_prio,			const struct timespec *abs_timeout);}
+	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd,		const struct sigevent *sigev); }
 	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
 	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
 	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
@@ -300,7 +319,7 @@ const (
 	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
 	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
 	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr *from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr * from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
 	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset); }
 	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset); }
 	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
@@ -319,12 +338,14 @@ const (
 	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, int flag); }
 	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag); }
 	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, char **envv); }
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
 	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, struct timeval *times); }
 	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); }
 	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
 	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
 	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, mode_t mode); }
-	SYS_READLINKAT               = 500 // { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); }
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, size_t bufsize); }
 	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, char *new); }
 	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, char *path2); }
 	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
@@ -370,24 +391,7 @@ const (
 	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *set); }
 	SYS_FUTIMENS                 = 546 // { int futimens(int fd, struct timespec *times); }
 	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, char *path, struct timespec *times, int flag); }
+	SYS_NUMA_GETAFFINITY         = 548 // { int numa_getaffinity(cpuwhich_t which, id_t id, struct vm_domain_policy_entry *policy); }
+	SYS_NUMA_SETAFFINITY         = 549 // { int numa_setaffinity(cpuwhich_t which, id_t id, const struct vm_domain_policy_entry *policy); }
 	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
-	SYS_FSTAT                    = 551 // { int fstat(int fd, struct stat *sb); }
-	SYS_FSTATAT                  = 552 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
-	SYS_FHSTAT                   = 553 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES            = 554 // { ssize_t getdirentries(int fd, char *buf, size_t count, off_t *basep); }
-	SYS_STATFS                   = 555 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS                  = 556 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFSSTAT                = 557 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
-	SYS_FHSTATFS                 = 558 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_MKNODAT                  = 559 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
-	SYS_KEVENT                   = 560 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_CPUSET_GETDOMAIN         = 561 // { int cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int *policy); }
-	SYS_CPUSET_SETDOMAIN         = 562 // { int cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int policy); }
-	SYS_GETRANDOM                = 563 // { int getrandom(void *buf, size_t buflen, unsigned int flags); }
-	SYS_GETFHAT                  = 564 // { int getfhat(int fd, char *path, struct fhandle *fhp, int flags); }
-	SYS_FHLINK                   = 565 // { int fhlink(struct fhandle *fhp, const char *to); }
-	SYS_FHLINKAT                 = 566 // { int fhlinkat(struct fhandle *fhp, int tofd, const char *to,); }
-	SYS_FHREADLINK               = 567 // { int fhreadlink(struct fhandle *fhp, char *buf, size_t bufsize); }
-	SYS___SYSCTLBYNAME           = 570 // { int __sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_CLOSE_RANGE              = 575 // { int close_range(u_int lowfd, u_int highfd, int flags); }
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_riscv64.go
deleted file mode 100644
index 15ad611..0000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_riscv64.go
+++ /dev/null
@@ -1,393 +0,0 @@
-// go run mksysnum.go https://cgit.freebsd.org/src/plain/sys/kern/syscalls.master?h=stable/12
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit sys_exit_args void
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, int options, struct rusage *rusage); }
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_BREAK                    = 17  // { caddr_t break(char *nsize); }
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, int flags, caddr_t data); }
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, int flags); }
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, size_t len, int flags, struct sockaddr * __restrict from, __socklen_t * __restrict fromlenaddr); }
-	SYS_ACCEPT                   = 30  // { int accept(int s, struct sockaddr * __restrict name, __socklen_t * __restrict anamelen); }
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, struct sockaddr * __restrict asa, __socklen_t * __restrict alen); }
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, struct sockaddr * __restrict asa, __socklen_t * __restrict alen); }
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, size_t offset, u_int scale); }
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, int facs, int pid); }
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, size_t count); }
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK                    = 60  // { int umask(int newmask); }
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, int flags); }
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); }
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, struct itimerval *itv); }
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, int prio); }
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, int namelen); }
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, int namelen); }
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, caddr_t val, int valsize); }
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, caddr_t val, int *avalsize); }
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, struct timezone *tzp); }
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, int tolen); }
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, struct timeval *tptr); }
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, struct timeval *olddelta); }
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, caddr_t arg); }
-	SYS_NLM_SYSCALL              = 154 // { int nlm_syscall(int debug_level, int grace_period, int addr_count, char **addrs); }
-	SYS_NFSSVC                   = 155 // { int nfssvc(int flag, caddr_t argp); }
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, struct fhandle *fhp); }
-	SYS_GETFH                    = 161 // { int getfh(char *fname, struct fhandle *fhp); }
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, struct rtprio *rtp); }
-	SYS_SEMSYS                   = 169 // { int semsys(int which, int a2, int a3, int a4, int a5); }
-	SYS_MSGSYS                   = 170 // { int msgsys(int which, int a2, int a3, int a4, int a5, int a6); }
-	SYS_SHMSYS                   = 171 // { int shmsys(int which, int a2, int a3, int a4); }
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, struct rlimit *rlp); } getrlimit __getrlimit_args int
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, struct rlimit *rlp); } setrlimit __setrlimit_args int
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } __sysctl sysctl_args int
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET                   = 221 // { int semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV                   = 227 // { ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
-	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, int shmflg); }
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, struct sigevent *evp, int *timerid); }
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct itimerspec *value); }
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate(struct ffclock_estimate *cest); }
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate(struct ffclock_estimate *cest); }
-	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id, int which, clockid_t *clock_id); }
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, int inherit); }
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
-	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, struct aiocb* const *acb_list, int nent, struct sigevent *sig); }
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, struct timeval *tptr); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, u_int iovcnt, off_t offset); }
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, struct module_stat* stat); }
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct kld_file_stat *stat); }
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
-	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
-	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, size_t buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, void *data); }
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, const sigset_t *set, sigset_t *oset); }
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, siginfo_t *info, const struct timespec *timeout); }
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, siginfo_t *info); }
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, acl_type_t type); }
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, struct acl *aclp); }
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, unsigned int iovcnt, int flags); }
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, struct mac *mac_p); }
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, char *value, int len); }
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, u_long flags); }
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, int count); }
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, int call, void *arg); }
-	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
-	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
-	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
-	SYS_KSEM_TRYWAIT             = 403 // { int ksem_trywait(semid_t id); }
-	SYS_KSEM_INIT                = 404 // { int ksem_init(semid_t *idp, unsigned int value); }
-	SYS_KSEM_OPEN                = 405 // { int ksem_open(semid_t *idp, const char *name, int oflag, mode_t mode, unsigned int value); }
-	SYS_KSEM_UNLINK              = 406 // { int ksem_unlink(const char *name); }
-	SYS_KSEM_GETVALUE            = 407 // { int ksem_getvalue(semid_t id, int *val); }
-	SYS_KSEM_DESTROY             = 408 // { int ksem_destroy(semid_t id); }
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, struct mac *mac_p); }
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, char **envv, struct mac *mac_p); }
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, const struct sigaction *act, struct sigaction *oact); }
-	SYS_SIGRETURN                = 417 // { int sigreturn(const struct __ucontext *sigcntxp); }
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext(const struct __ucontext *ucp); }
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, const struct __ucontext *ucp); }
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, acl_type_t type); }
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, acl_type_t type, struct acl *aclp); }
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, int *sig); }
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, int flags); }
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, const struct timespec *abstime); }
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend(const struct timespec *timeout); }
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, u_int length); }
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, u_int length); }
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, u_int length); }
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, u_long val, void *uaddr1, void *uaddr2); }
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, int param_size); }
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, mode_t mode, const struct mq_attr *attr); }
-	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd, const struct mq_attr *attr, struct mq_attr *oattr); }
-	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd, char *msg_ptr, size_t msg_len, unsigned *msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abs_timeout); }
-	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd, const struct sigevent *sigev); }
-	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_AIO_FSYNC                = 465 // { int aio_fsync(int op, struct aiocb *aiocbp); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, lwpid_t lwpid, struct rtprio *rtp); }
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, caddr_t to, __socklen_t tolen, struct sctp_sndrcvinfo *sinfo, int flags); }
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, struct sockaddr *from, __socklen_t *fromlenaddr, struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset); }
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset); }
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, int whence); }
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, mode_t mode); }
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, cpusetid_t setid); }
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, cpuwhich_t which, id_t id, cpusetid_t *setid); }
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *mask); }
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, const cpuset_t *mask); }
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, int flag); }
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag); }
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, char **envv); }
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, struct timeval *times); }
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); }
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, mode_t mode); }
-	SYS_READLINKAT               = 500 // { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); }
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, char *new); }
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, char *path2); }
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_GSSD_SYSCALL             = 505 // { int gssd_syscall(char *path); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, unsigned int iovcnt, int flags); }
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, unsigned int iovcnt, int flags); }
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS___SEMCTL                 = 510 // { int __semctl(int semid, int semnum, int cmd, union semun *arg); }
-	SYS_MSGCTL                   = 511 // { int msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_SHMCTL                   = 512 // { int shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS___CAP_RIGHTS_GET         = 515 // { int __cap_rights_get(int version, int fd, cap_rights_t *rightsp); }
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *sm); }
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, size_t namelen); }
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); }
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); }
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); }
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); }
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); }
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, off_t offset, off_t len); }
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, off_t len, int advice); }
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *wrusage, siginfo_t *info); }
-	SYS_CAP_RIGHTS_LIMIT         = 533 // { int cap_rights_limit(int fd, cap_rights_t *rightsp); }
-	SYS_CAP_IOCTLS_LIMIT         = 534 // { int cap_ioctls_limit(int fd, const u_long *cmds, size_t ncmds); }
-	SYS_CAP_IOCTLS_GET           = 535 // { ssize_t cap_ioctls_get(int fd, u_long *cmds, size_t maxcmds); }
-	SYS_CAP_FCNTLS_LIMIT         = 536 // { int cap_fcntls_limit(int fd, uint32_t fcntlrights); }
-	SYS_CAP_FCNTLS_GET           = 537 // { int cap_fcntls_get(int fd, uint32_t *fcntlrightsp); }
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, int namelen); }
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, int namelen); }
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, u_long flags, int atflag); }
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, struct sockaddr * __restrict name, __socklen_t * __restrict anamelen, int flags); }
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_AIO_MLOCK                = 543 // { int aio_mlock(struct aiocb *aiocbp); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, int com, void *data); }
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *set); }
-	SYS_FUTIMENS                 = 546 // { int futimens(int fd, struct timespec *times); }
-	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, char *path, struct timespec *times, int flag); }
-	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
-	SYS_FSTAT                    = 551 // { int fstat(int fd, struct stat *sb); }
-	SYS_FSTATAT                  = 552 // { int fstatat(int fd, char *path, struct stat *buf, int flag); }
-	SYS_FHSTAT                   = 553 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES            = 554 // { ssize_t getdirentries(int fd, char *buf, size_t count, off_t *basep); }
-	SYS_STATFS                   = 555 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS                  = 556 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFSSTAT                = 557 // { int getfsstat(struct statfs *buf, long bufsize, int mode); }
-	SYS_FHSTATFS                 = 558 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_MKNODAT                  = 559 // { int mknodat(int fd, char *path, mode_t mode, dev_t dev); }
-	SYS_KEVENT                   = 560 // { int kevent(int fd, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_CPUSET_GETDOMAIN         = 561 // { int cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int *policy); }
-	SYS_CPUSET_SETDOMAIN         = 562 // { int cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *mask, int policy); }
-	SYS_GETRANDOM                = 563 // { int getrandom(void *buf, size_t buflen, unsigned int flags); }
-	SYS_GETFHAT                  = 564 // { int getfhat(int fd, char *path, struct fhandle *fhp, int flags); }
-	SYS_FHLINK                   = 565 // { int fhlink(struct fhandle *fhp, const char *to); }
-	SYS_FHLINKAT                 = 566 // { int fhlinkat(struct fhandle *fhp, int tofd, const char *to,); }
-	SYS_FHREADLINK               = 567 // { int fhreadlink(struct fhandle *fhp, char *buf, size_t bufsize); }
-	SYS___SYSCTLBYNAME           = 570 // { int __sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_CLOSE_RANGE              = 575 // { int close_range(u_int lowfd, u_int highfd, int flags); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
index c79aaff..aa7ce85 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/386/include -m32 /tmp/386/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -m32 /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
+// +build 386,linux
 
 package unix
 
@@ -443,23 +444,4 @@ const (
 	SYS_LANDLOCK_ADD_RULE            = 445
 	SYS_LANDLOCK_RESTRICT_SELF       = 446
 	SYS_MEMFD_SECRET                 = 447
-	SYS_PROCESS_MRELEASE             = 448
-	SYS_FUTEX_WAITV                  = 449
-	SYS_SET_MEMPOLICY_HOME_NODE      = 450
-	SYS_CACHESTAT                    = 451
-	SYS_FCHMODAT2                    = 452
-	SYS_MAP_SHADOW_STACK             = 453
-	SYS_FUTEX_WAKE                   = 454
-	SYS_FUTEX_WAIT                   = 455
-	SYS_FUTEX_REQUEUE                = 456
-	SYS_STATMOUNT                    = 457
-	SYS_LISTMOUNT                    = 458
-	SYS_LSM_GET_SELF_ATTR            = 459
-	SYS_LSM_SET_SELF_ATTR            = 460
-	SYS_LSM_LIST_MODULES             = 461
-	SYS_MSEAL                        = 462
-	SYS_SETXATTRAT                   = 463
-	SYS_GETXATTRAT                   = 464
-	SYS_LISTXATTRAT                  = 465
-	SYS_REMOVEXATTRAT                = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
index 5eb4506..b830326 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/amd64/include -m64 /tmp/amd64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -m64 /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
+// +build amd64,linux
 
 package unix
 
@@ -341,7 +342,6 @@ const (
 	SYS_STATX                   = 332
 	SYS_IO_PGETEVENTS           = 333
 	SYS_RSEQ                    = 334
-	SYS_URETPROBE               = 335
 	SYS_PIDFD_SEND_SIGNAL       = 424
 	SYS_IO_URING_SETUP          = 425
 	SYS_IO_URING_ENTER          = 426
@@ -366,23 +366,4 @@ const (
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
 	SYS_MEMFD_SECRET            = 447
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
index 05e5029..d75f65a 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -1,12 +1,12 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/arm/include /tmp/arm/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
+// +build arm,linux
 
 package unix
 
 const (
-	SYS_SYSCALL_MASK                 = 0
 	SYS_RESTART_SYSCALL              = 0
 	SYS_EXIT                         = 1
 	SYS_FORK                         = 2
@@ -407,23 +407,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET      = 444
 	SYS_LANDLOCK_ADD_RULE            = 445
 	SYS_LANDLOCK_RESTRICT_SELF       = 446
-	SYS_PROCESS_MRELEASE             = 448
-	SYS_FUTEX_WAITV                  = 449
-	SYS_SET_MEMPOLICY_HOME_NODE      = 450
-	SYS_CACHESTAT                    = 451
-	SYS_FCHMODAT2                    = 452
-	SYS_MAP_SHADOW_STACK             = 453
-	SYS_FUTEX_WAKE                   = 454
-	SYS_FUTEX_WAIT                   = 455
-	SYS_FUTEX_REQUEUE                = 456
-	SYS_STATMOUNT                    = 457
-	SYS_LISTMOUNT                    = 458
-	SYS_LSM_GET_SELF_ATTR            = 459
-	SYS_LSM_SET_SELF_ATTR            = 460
-	SYS_LSM_LIST_MODULES             = 461
-	SYS_MSEAL                        = 462
-	SYS_SETXATTRAT                   = 463
-	SYS_GETXATTRAT                   = 464
-	SYS_LISTXATTRAT                  = 465
-	SYS_REMOVEXATTRAT                = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
index 38c53ec..8b02f09 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/arm64/include -fsigned-char /tmp/arm64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
+// +build arm64,linux
 
 package unix
 
@@ -85,7 +86,7 @@ const (
 	SYS_SPLICE                  = 76
 	SYS_TEE                     = 77
 	SYS_READLINKAT              = 78
-	SYS_NEWFSTATAT              = 79
+	SYS_FSTATAT                 = 79
 	SYS_FSTAT                   = 80
 	SYS_SYNC                    = 81
 	SYS_FSYNC                   = 82
@@ -310,23 +311,4 @@ const (
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
 	SYS_MEMFD_SECRET            = 447
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
deleted file mode 100644
index 31d2e71..0000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
+++ /dev/null
@@ -1,328 +0,0 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/loong64/include /tmp/loong64/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build loong64 && linux
-
-package unix
-
-const (
-	SYS_IO_SETUP                = 0
-	SYS_IO_DESTROY              = 1
-	SYS_IO_SUBMIT               = 2
-	SYS_IO_CANCEL               = 3
-	SYS_IO_GETEVENTS            = 4
-	SYS_SETXATTR                = 5
-	SYS_LSETXATTR               = 6
-	SYS_FSETXATTR               = 7
-	SYS_GETXATTR                = 8
-	SYS_LGETXATTR               = 9
-	SYS_FGETXATTR               = 10
-	SYS_LISTXATTR               = 11
-	SYS_LLISTXATTR              = 12
-	SYS_FLISTXATTR              = 13
-	SYS_REMOVEXATTR             = 14
-	SYS_LREMOVEXATTR            = 15
-	SYS_FREMOVEXATTR            = 16
-	SYS_GETCWD                  = 17
-	SYS_LOOKUP_DCOOKIE          = 18
-	SYS_EVENTFD2                = 19
-	SYS_EPOLL_CREATE1           = 20
-	SYS_EPOLL_CTL               = 21
-	SYS_EPOLL_PWAIT             = 22
-	SYS_DUP                     = 23
-	SYS_DUP3                    = 24
-	SYS_FCNTL                   = 25
-	SYS_INOTIFY_INIT1           = 26
-	SYS_INOTIFY_ADD_WATCH       = 27
-	SYS_INOTIFY_RM_WATCH        = 28
-	SYS_IOCTL                   = 29
-	SYS_IOPRIO_SET              = 30
-	SYS_IOPRIO_GET              = 31
-	SYS_FLOCK                   = 32
-	SYS_MKNODAT                 = 33
-	SYS_MKDIRAT                 = 34
-	SYS_UNLINKAT                = 35
-	SYS_SYMLINKAT               = 36
-	SYS_LINKAT                  = 37
-	SYS_UMOUNT2                 = 39
-	SYS_MOUNT                   = 40
-	SYS_PIVOT_ROOT              = 41
-	SYS_NFSSERVCTL              = 42
-	SYS_STATFS                  = 43
-	SYS_FSTATFS                 = 44
-	SYS_TRUNCATE                = 45
-	SYS_FTRUNCATE               = 46
-	SYS_FALLOCATE               = 47
-	SYS_FACCESSAT               = 48
-	SYS_CHDIR                   = 49
-	SYS_FCHDIR                  = 50
-	SYS_CHROOT                  = 51
-	SYS_FCHMOD                  = 52
-	SYS_FCHMODAT                = 53
-	SYS_FCHOWNAT                = 54
-	SYS_FCHOWN                  = 55
-	SYS_OPENAT                  = 56
-	SYS_CLOSE                   = 57
-	SYS_VHANGUP                 = 58
-	SYS_PIPE2                   = 59
-	SYS_QUOTACTL                = 60
-	SYS_GETDENTS64              = 61
-	SYS_LSEEK                   = 62
-	SYS_READ                    = 63
-	SYS_WRITE                   = 64
-	SYS_READV                   = 65
-	SYS_WRITEV                  = 66
-	SYS_PREAD64                 = 67
-	SYS_PWRITE64                = 68
-	SYS_PREADV                  = 69
-	SYS_PWRITEV                 = 70
-	SYS_SENDFILE                = 71
-	SYS_PSELECT6                = 72
-	SYS_PPOLL                   = 73
-	SYS_SIGNALFD4               = 74
-	SYS_VMSPLICE                = 75
-	SYS_SPLICE                  = 76
-	SYS_TEE                     = 77
-	SYS_READLINKAT              = 78
-	SYS_NEWFSTATAT              = 79
-	SYS_FSTAT                   = 80
-	SYS_SYNC                    = 81
-	SYS_FSYNC                   = 82
-	SYS_FDATASYNC               = 83
-	SYS_SYNC_FILE_RANGE         = 84
-	SYS_TIMERFD_CREATE          = 85
-	SYS_TIMERFD_SETTIME         = 86
-	SYS_TIMERFD_GETTIME         = 87
-	SYS_UTIMENSAT               = 88
-	SYS_ACCT                    = 89
-	SYS_CAPGET                  = 90
-	SYS_CAPSET                  = 91
-	SYS_PERSONALITY             = 92
-	SYS_EXIT                    = 93
-	SYS_EXIT_GROUP              = 94
-	SYS_WAITID                  = 95
-	SYS_SET_TID_ADDRESS         = 96
-	SYS_UNSHARE                 = 97
-	SYS_FUTEX                   = 98
-	SYS_SET_ROBUST_LIST         = 99
-	SYS_GET_ROBUST_LIST         = 100
-	SYS_NANOSLEEP               = 101
-	SYS_GETITIMER               = 102
-	SYS_SETITIMER               = 103
-	SYS_KEXEC_LOAD              = 104
-	SYS_INIT_MODULE             = 105
-	SYS_DELETE_MODULE           = 106
-	SYS_TIMER_CREATE            = 107
-	SYS_TIMER_GETTIME           = 108
-	SYS_TIMER_GETOVERRUN        = 109
-	SYS_TIMER_SETTIME           = 110
-	SYS_TIMER_DELETE            = 111
-	SYS_CLOCK_SETTIME           = 112
-	SYS_CLOCK_GETTIME           = 113
-	SYS_CLOCK_GETRES            = 114
-	SYS_CLOCK_NANOSLEEP         = 115
-	SYS_SYSLOG                  = 116
-	SYS_PTRACE                  = 117
-	SYS_SCHED_SETPARAM          = 118
-	SYS_SCHED_SETSCHEDULER      = 119
-	SYS_SCHED_GETSCHEDULER      = 120
-	SYS_SCHED_GETPARAM          = 121
-	SYS_SCHED_SETAFFINITY       = 122
-	SYS_SCHED_GETAFFINITY       = 123
-	SYS_SCHED_YIELD             = 124
-	SYS_SCHED_GET_PRIORITY_MAX  = 125
-	SYS_SCHED_GET_PRIORITY_MIN  = 126
-	SYS_SCHED_RR_GET_INTERVAL   = 127
-	SYS_RESTART_SYSCALL         = 128
-	SYS_KILL                    = 129
-	SYS_TKILL                   = 130
-	SYS_TGKILL                  = 131
-	SYS_SIGALTSTACK             = 132
-	SYS_RT_SIGSUSPEND           = 133
-	SYS_RT_SIGACTION            = 134
-	SYS_RT_SIGPROCMASK          = 135
-	SYS_RT_SIGPENDING           = 136
-	SYS_RT_SIGTIMEDWAIT         = 137
-	SYS_RT_SIGQUEUEINFO         = 138
-	SYS_RT_SIGRETURN            = 139
-	SYS_SETPRIORITY             = 140
-	SYS_GETPRIORITY             = 141
-	SYS_REBOOT                  = 142
-	SYS_SETREGID                = 143
-	SYS_SETGID                  = 144
-	SYS_SETREUID                = 145
-	SYS_SETUID                  = 146
-	SYS_SETRESUID               = 147
-	SYS_GETRESUID               = 148
-	SYS_SETRESGID               = 149
-	SYS_GETRESGID               = 150
-	SYS_SETFSUID                = 151
-	SYS_SETFSGID                = 152
-	SYS_TIMES                   = 153
-	SYS_SETPGID                 = 154
-	SYS_GETPGID                 = 155
-	SYS_GETSID                  = 156
-	SYS_SETSID                  = 157
-	SYS_GETGROUPS               = 158
-	SYS_SETGROUPS               = 159
-	SYS_UNAME                   = 160
-	SYS_SETHOSTNAME             = 161
-	SYS_SETDOMAINNAME           = 162
-	SYS_GETRUSAGE               = 165
-	SYS_UMASK                   = 166
-	SYS_PRCTL                   = 167
-	SYS_GETCPU                  = 168
-	SYS_GETTIMEOFDAY            = 169
-	SYS_SETTIMEOFDAY            = 170
-	SYS_ADJTIMEX                = 171
-	SYS_GETPID                  = 172
-	SYS_GETPPID                 = 173
-	SYS_GETUID                  = 174
-	SYS_GETEUID                 = 175
-	SYS_GETGID                  = 176
-	SYS_GETEGID                 = 177
-	SYS_GETTID                  = 178
-	SYS_SYSINFO                 = 179
-	SYS_MQ_OPEN                 = 180
-	SYS_MQ_UNLINK               = 181
-	SYS_MQ_TIMEDSEND            = 182
-	SYS_MQ_TIMEDRECEIVE         = 183
-	SYS_MQ_NOTIFY               = 184
-	SYS_MQ_GETSETATTR           = 185
-	SYS_MSGGET                  = 186
-	SYS_MSGCTL                  = 187
-	SYS_MSGRCV                  = 188
-	SYS_MSGSND                  = 189
-	SYS_SEMGET                  = 190
-	SYS_SEMCTL                  = 191
-	SYS_SEMTIMEDOP              = 192
-	SYS_SEMOP                   = 193
-	SYS_SHMGET                  = 194
-	SYS_SHMCTL                  = 195
-	SYS_SHMAT                   = 196
-	SYS_SHMDT                   = 197
-	SYS_SOCKET                  = 198
-	SYS_SOCKETPAIR              = 199
-	SYS_BIND                    = 200
-	SYS_LISTEN                  = 201
-	SYS_ACCEPT                  = 202
-	SYS_CONNECT                 = 203
-	SYS_GETSOCKNAME             = 204
-	SYS_GETPEERNAME             = 205
-	SYS_SENDTO                  = 206
-	SYS_RECVFROM                = 207
-	SYS_SETSOCKOPT              = 208
-	SYS_GETSOCKOPT              = 209
-	SYS_SHUTDOWN                = 210
-	SYS_SENDMSG                 = 211
-	SYS_RECVMSG                 = 212
-	SYS_READAHEAD               = 213
-	SYS_BRK                     = 214
-	SYS_MUNMAP                  = 215
-	SYS_MREMAP                  = 216
-	SYS_ADD_KEY                 = 217
-	SYS_REQUEST_KEY             = 218
-	SYS_KEYCTL                  = 219
-	SYS_CLONE                   = 220
-	SYS_EXECVE                  = 221
-	SYS_MMAP                    = 222
-	SYS_FADVISE64               = 223
-	SYS_SWAPON                  = 224
-	SYS_SWAPOFF                 = 225
-	SYS_MPROTECT                = 226
-	SYS_MSYNC                   = 227
-	SYS_MLOCK                   = 228
-	SYS_MUNLOCK                 = 229
-	SYS_MLOCKALL                = 230
-	SYS_MUNLOCKALL              = 231
-	SYS_MINCORE                 = 232
-	SYS_MADVISE                 = 233
-	SYS_REMAP_FILE_PAGES        = 234
-	SYS_MBIND                   = 235
-	SYS_GET_MEMPOLICY           = 236
-	SYS_SET_MEMPOLICY           = 237
-	SYS_MIGRATE_PAGES           = 238
-	SYS_MOVE_PAGES              = 239
-	SYS_RT_TGSIGQUEUEINFO       = 240
-	SYS_PERF_EVENT_OPEN         = 241
-	SYS_ACCEPT4                 = 242
-	SYS_RECVMMSG                = 243
-	SYS_ARCH_SPECIFIC_SYSCALL   = 244
-	SYS_WAIT4                   = 260
-	SYS_PRLIMIT64               = 261
-	SYS_FANOTIFY_INIT           = 262
-	SYS_FANOTIFY_MARK           = 263
-	SYS_NAME_TO_HANDLE_AT       = 264
-	SYS_OPEN_BY_HANDLE_AT       = 265
-	SYS_CLOCK_ADJTIME           = 266
-	SYS_SYNCFS                  = 267
-	SYS_SETNS                   = 268
-	SYS_SENDMMSG                = 269
-	SYS_PROCESS_VM_READV        = 270
-	SYS_PROCESS_VM_WRITEV       = 271
-	SYS_KCMP                    = 272
-	SYS_FINIT_MODULE            = 273
-	SYS_SCHED_SETATTR           = 274
-	SYS_SCHED_GETATTR           = 275
-	SYS_RENAMEAT2               = 276
-	SYS_SECCOMP                 = 277
-	SYS_GETRANDOM               = 278
-	SYS_MEMFD_CREATE            = 279
-	SYS_BPF                     = 280
-	SYS_EXECVEAT                = 281
-	SYS_USERFAULTFD             = 282
-	SYS_MEMBARRIER              = 283
-	SYS_MLOCK2                  = 284
-	SYS_COPY_FILE_RANGE         = 285
-	SYS_PREADV2                 = 286
-	SYS_PWRITEV2                = 287
-	SYS_PKEY_MPROTECT           = 288
-	SYS_PKEY_ALLOC              = 289
-	SYS_PKEY_FREE               = 290
-	SYS_STATX                   = 291
-	SYS_IO_PGETEVENTS           = 292
-	SYS_RSEQ                    = 293
-	SYS_KEXEC_FILE_LOAD         = 294
-	SYS_PIDFD_SEND_SIGNAL       = 424
-	SYS_IO_URING_SETUP          = 425
-	SYS_IO_URING_ENTER          = 426
-	SYS_IO_URING_REGISTER       = 427
-	SYS_OPEN_TREE               = 428
-	SYS_MOVE_MOUNT              = 429
-	SYS_FSOPEN                  = 430
-	SYS_FSCONFIG                = 431
-	SYS_FSMOUNT                 = 432
-	SYS_FSPICK                  = 433
-	SYS_PIDFD_OPEN              = 434
-	SYS_CLONE3                  = 435
-	SYS_CLOSE_RANGE             = 436
-	SYS_OPENAT2                 = 437
-	SYS_PIDFD_GETFD             = 438
-	SYS_FACCESSAT2              = 439
-	SYS_PROCESS_MADVISE         = 440
-	SYS_EPOLL_PWAIT2            = 441
-	SYS_MOUNT_SETATTR           = 442
-	SYS_QUOTACTL_FD             = 443
-	SYS_LANDLOCK_CREATE_RULESET = 444
-	SYS_LANDLOCK_ADD_RULE       = 445
-	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
index f4184a3..026695a 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips/include /tmp/mips/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
+// +build mips,linux
 
 package unix
 
@@ -427,23 +428,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET      = 4444
 	SYS_LANDLOCK_ADD_RULE            = 4445
 	SYS_LANDLOCK_RESTRICT_SELF       = 4446
-	SYS_PROCESS_MRELEASE             = 4448
-	SYS_FUTEX_WAITV                  = 4449
-	SYS_SET_MEMPOLICY_HOME_NODE      = 4450
-	SYS_CACHESTAT                    = 4451
-	SYS_FCHMODAT2                    = 4452
-	SYS_MAP_SHADOW_STACK             = 4453
-	SYS_FUTEX_WAKE                   = 4454
-	SYS_FUTEX_WAIT                   = 4455
-	SYS_FUTEX_REQUEUE                = 4456
-	SYS_STATMOUNT                    = 4457
-	SYS_LISTMOUNT                    = 4458
-	SYS_LSM_GET_SELF_ATTR            = 4459
-	SYS_LSM_SET_SELF_ATTR            = 4460
-	SYS_LSM_LIST_MODULES             = 4461
-	SYS_MSEAL                        = 4462
-	SYS_SETXATTRAT                   = 4463
-	SYS_GETXATTRAT                   = 4464
-	SYS_LISTXATTRAT                  = 4465
-	SYS_REMOVEXATTRAT                = 4466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
index 05b9962..7320ba9 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips64/include /tmp/mips64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
+// +build mips64,linux
 
 package unix
 
@@ -357,23 +358,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 5444
 	SYS_LANDLOCK_ADD_RULE       = 5445
 	SYS_LANDLOCK_RESTRICT_SELF  = 5446
-	SYS_PROCESS_MRELEASE        = 5448
-	SYS_FUTEX_WAITV             = 5449
-	SYS_SET_MEMPOLICY_HOME_NODE = 5450
-	SYS_CACHESTAT               = 5451
-	SYS_FCHMODAT2               = 5452
-	SYS_MAP_SHADOW_STACK        = 5453
-	SYS_FUTEX_WAKE              = 5454
-	SYS_FUTEX_WAIT              = 5455
-	SYS_FUTEX_REQUEUE           = 5456
-	SYS_STATMOUNT               = 5457
-	SYS_LISTMOUNT               = 5458
-	SYS_LSM_GET_SELF_ATTR       = 5459
-	SYS_LSM_SET_SELF_ATTR       = 5460
-	SYS_LSM_LIST_MODULES        = 5461
-	SYS_MSEAL                   = 5462
-	SYS_SETXATTRAT              = 5463
-	SYS_GETXATTRAT              = 5464
-	SYS_LISTXATTRAT             = 5465
-	SYS_REMOVEXATTRAT           = 5466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
index 43a256e..45082dd 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips64le/include /tmp/mips64le/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
+// +build mips64le,linux
 
 package unix
 
@@ -357,23 +358,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 5444
 	SYS_LANDLOCK_ADD_RULE       = 5445
 	SYS_LANDLOCK_RESTRICT_SELF  = 5446
-	SYS_PROCESS_MRELEASE        = 5448
-	SYS_FUTEX_WAITV             = 5449
-	SYS_SET_MEMPOLICY_HOME_NODE = 5450
-	SYS_CACHESTAT               = 5451
-	SYS_FCHMODAT2               = 5452
-	SYS_MAP_SHADOW_STACK        = 5453
-	SYS_FUTEX_WAKE              = 5454
-	SYS_FUTEX_WAIT              = 5455
-	SYS_FUTEX_REQUEUE           = 5456
-	SYS_STATMOUNT               = 5457
-	SYS_LISTMOUNT               = 5458
-	SYS_LSM_GET_SELF_ATTR       = 5459
-	SYS_LSM_SET_SELF_ATTR       = 5460
-	SYS_LSM_LIST_MODULES        = 5461
-	SYS_MSEAL                   = 5462
-	SYS_SETXATTRAT              = 5463
-	SYS_GETXATTRAT              = 5464
-	SYS_LISTXATTRAT             = 5465
-	SYS_REMOVEXATTRAT           = 5466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
index eea5ddf..570a857 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mipsle/include /tmp/mipsle/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
+// +build mipsle,linux
 
 package unix
 
@@ -427,23 +428,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET      = 4444
 	SYS_LANDLOCK_ADD_RULE            = 4445
 	SYS_LANDLOCK_RESTRICT_SELF       = 4446
-	SYS_PROCESS_MRELEASE             = 4448
-	SYS_FUTEX_WAITV                  = 4449
-	SYS_SET_MEMPOLICY_HOME_NODE      = 4450
-	SYS_CACHESTAT                    = 4451
-	SYS_FCHMODAT2                    = 4452
-	SYS_MAP_SHADOW_STACK             = 4453
-	SYS_FUTEX_WAKE                   = 4454
-	SYS_FUTEX_WAIT                   = 4455
-	SYS_FUTEX_REQUEUE                = 4456
-	SYS_STATMOUNT                    = 4457
-	SYS_LISTMOUNT                    = 4458
-	SYS_LSM_GET_SELF_ATTR            = 4459
-	SYS_LSM_SET_SELF_ATTR            = 4460
-	SYS_LSM_LIST_MODULES             = 4461
-	SYS_MSEAL                        = 4462
-	SYS_SETXATTRAT                   = 4463
-	SYS_GETXATTRAT                   = 4464
-	SYS_LISTXATTRAT                  = 4465
-	SYS_REMOVEXATTRAT                = 4466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
index 0d777bf..638498d 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc/include /tmp/ppc/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
+// +build ppc,linux
 
 package unix
 
@@ -434,23 +435,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET      = 444
 	SYS_LANDLOCK_ADD_RULE            = 445
 	SYS_LANDLOCK_RESTRICT_SELF       = 446
-	SYS_PROCESS_MRELEASE             = 448
-	SYS_FUTEX_WAITV                  = 449
-	SYS_SET_MEMPOLICY_HOME_NODE      = 450
-	SYS_CACHESTAT                    = 451
-	SYS_FCHMODAT2                    = 452
-	SYS_MAP_SHADOW_STACK             = 453
-	SYS_FUTEX_WAKE                   = 454
-	SYS_FUTEX_WAIT                   = 455
-	SYS_FUTEX_REQUEUE                = 456
-	SYS_STATMOUNT                    = 457
-	SYS_LISTMOUNT                    = 458
-	SYS_LSM_GET_SELF_ATTR            = 459
-	SYS_LSM_SET_SELF_ATTR            = 460
-	SYS_LSM_LIST_MODULES             = 461
-	SYS_MSEAL                        = 462
-	SYS_SETXATTRAT                   = 463
-	SYS_GETXATTRAT                   = 464
-	SYS_LISTXATTRAT                  = 465
-	SYS_REMOVEXATTRAT                = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
index b446365..702beeb 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc64/include /tmp/ppc64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
+// +build ppc64,linux
 
 package unix
 
@@ -406,23 +407,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
index 0c7d21c..bfc87ea 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc64le/include /tmp/ppc64le/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
+// +build ppc64le,linux
 
 package unix
 
@@ -406,23 +407,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
index 8405391..a390e14 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/riscv64/include /tmp/riscv64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
+// +build riscv64,linux
 
 package unix
 
@@ -84,7 +85,7 @@ const (
 	SYS_SPLICE                  = 76
 	SYS_TEE                     = 77
 	SYS_READLINKAT              = 78
-	SYS_NEWFSTATAT              = 79
+	SYS_FSTATAT                 = 79
 	SYS_FSTAT                   = 80
 	SYS_SYNC                    = 81
 	SYS_FSYNC                   = 82
@@ -250,8 +251,6 @@ const (
 	SYS_ACCEPT4                 = 242
 	SYS_RECVMMSG                = 243
 	SYS_ARCH_SPECIFIC_SYSCALL   = 244
-	SYS_RISCV_HWPROBE           = 258
-	SYS_RISCV_FLUSH_ICACHE      = 259
 	SYS_WAIT4                   = 260
 	SYS_PRLIMIT64               = 261
 	SYS_FANOTIFY_INIT           = 262
@@ -310,24 +309,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_MEMFD_SECRET            = 447
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
index fcf1b79..3e791e6 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/s390x/include -fsigned-char /tmp/s390x/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
+// +build s390x,linux
 
 package unix
 
@@ -371,24 +372,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_MEMFD_SECRET            = 447
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
index 52d15b5..78802a5 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
@@ -1,7 +1,8 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/sparc64/include /tmp/sparc64/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
+// +build sparc64,linux
 
 package unix
 
@@ -385,23 +386,4 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
-	SYS_PROCESS_MRELEASE        = 448
-	SYS_FUTEX_WAITV             = 449
-	SYS_SET_MEMPOLICY_HOME_NODE = 450
-	SYS_CACHESTAT               = 451
-	SYS_FCHMODAT2               = 452
-	SYS_MAP_SHADOW_STACK        = 453
-	SYS_FUTEX_WAKE              = 454
-	SYS_FUTEX_WAIT              = 455
-	SYS_FUTEX_REQUEUE           = 456
-	SYS_STATMOUNT               = 457
-	SYS_LISTMOUNT               = 458
-	SYS_LSM_GET_SELF_ATTR       = 459
-	SYS_LSM_SET_SELF_ATTR       = 460
-	SYS_LSM_LIST_MODULES        = 461
-	SYS_MSEAL                   = 462
-	SYS_SETXATTRAT              = 463
-	SYS_GETXATTRAT              = 464
-	SYS_LISTXATTRAT             = 465
-	SYS_REMOVEXATTRAT           = 466
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
index b2aa8cd..3a6699e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && netbsd
+// +build 386,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
index 524a1b1..5677cd4 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && netbsd
+// +build amd64,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
index d59b943..e784cb6 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && netbsd
+// +build arm,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go
index 31e771d..bd4952e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build arm64 && netbsd
+// +build arm64,netbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
index 9fd77c6..817edbf 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
@@ -2,10 +2,10 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && openbsd
+// +build 386,openbsd
 
 package unix
 
-// Deprecated: Use libc wrappers instead of direct syscalls.
 const (
 	SYS_EXIT           = 1   // { void sys_exit(int rval); }
 	SYS_FORK           = 2   // { int sys_fork(void); }
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
index af10af2..ea45361 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
@@ -2,10 +2,10 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && openbsd
+// +build amd64,openbsd
 
 package unix
 
-// Deprecated: Use libc wrappers instead of direct syscalls.
 const (
 	SYS_EXIT           = 1   // { void sys_exit(int rval); }
 	SYS_FORK           = 2   // { int sys_fork(void); }
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
index cc2028a..467971e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
@@ -2,10 +2,10 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && openbsd
+// +build arm,openbsd
 
 package unix
 
-// Deprecated: Use libc wrappers instead of direct syscalls.
 const (
 	SYS_EXIT           = 1   // { void sys_exit(int rval); }
 	SYS_FORK           = 2   // { int sys_fork(void); }
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
index c06dd44..32eec5e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
@@ -2,10 +2,10 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && openbsd
+// +build arm64,openbsd
 
 package unix
 
-// Deprecated: Use libc wrappers instead of direct syscalls.
 const (
 	SYS_EXIT           = 1   // { void sys_exit(int rval); }
 	SYS_FORK           = 2   // { int sys_fork(void); }
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
index 9ddbf3e..a37f773 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
@@ -2,10 +2,10 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && openbsd
+// +build mips64,openbsd
 
 package unix
 
-// Deprecated: Use libc wrappers instead of direct syscalls.
 const (
 	SYS_EXIT           = 1   // { void sys_exit(int rval); }
 	SYS_FORK           = 2   // { int sys_fork(void); }
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go
deleted file mode 100644
index 19a6ee4..0000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go
+++ /dev/null
@@ -1,217 +0,0 @@
-// go run mksysnum.go https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build ppc64 && openbsd
-
-package unix
-
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN           = 5   // { int sys_open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS_GETENTROPY     = 7   // { int sys_getentropy(void *buf, size_t nbyte); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, size_t psize); }
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, struct rusage *rusage); }
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, int flags, void *data); }
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, int data); }
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int amode); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, const struct sigaction *nsa, struct sigaction *osa); }
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, u_long com, ... void *data); }
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, const char *link); }
-	SYS_READLINK       = 58  // { ssize_t sys_readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, int flags); }
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, struct statfs *buf); }
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, struct statfs *buf); }
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, struct timezone *tzp); }
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, const struct timezone *tzp); }
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, struct itimerval *itv); }
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, int behav); }
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, const struct timeval *tptr); }
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, const struct timeval *tptr); }
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, pid_t pgid); }
-	SYS_FUTEX          = 83  // { int sys_futex(uint32_t *f, int op, int val, const struct timespec *timeout, uint32_t *g); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, const struct timespec *times, int flag); }
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, const struct timespec *times); }
-	SYS_KBIND          = 86  // { int sys_kbind(const struct __kbind *param, size_t psize, int64_t proc_cookie); }
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS_ACCEPT4        = 93  // { int sys_accept4(int s, struct sockaddr *name, socklen_t *anamelen, int flags); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, clockid_t clock_id, const struct timespec *tp, void *lock, const int *abort); }
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_PIPE2          = 101 // { int sys_pipe2(int *fdp, int flags); }
-	SYS_DUP3           = 102 // { int sys_dup3(int from, int to, int flags); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_CHFLAGSAT      = 107 // { int sys_chflagsat(int fd, const char *path, u_int flags, int atflags); }
-	SYS_PLEDGE         = 108 // { int sys_pledge(const char *promises, const char *execpromises); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_SENDSYSLOG     = 112 // { int sys_sendsyslog(const char *buf, size_t nbyte, int flags); }
-	SYS_UNVEIL         = 114 // { int sys_unveil(const char *path, const char *permissions); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_THRKILL        = 119 // { int sys_thrkill(pid_t tid, int signum, void *tcb); }
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_KILL           = 122 // { int sys_kill(int pid, int signum); }
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_GETLOGIN_R     = 141 // { int sys_getlogin_r(char *namebuf, u_int namelen); }
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, int uid, char *arg); }
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, size_t nbyte, int pad, off_t offset); }
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, size_t nbyte, int pad, off_t offset); }
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, long pad, off_t pos); }
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, int whence); }
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, off_t length); }
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS_SYSCTL         = 202 // { int sys_sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, size_t len); }
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, int inherit); }
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, const struct iovec *iovp, int iovcnt, int pad, off_t offset); }
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, const struct iovec *iovp, int iovcnt, int pad, off_t offset); }
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, int flags, int fd, long pad, off_t pos); }
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, struct sigaltstack *oss); }
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, struct stat *sb); }
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, union semun *arg); }
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, int n); }
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, siginfo_t *info, const struct timespec *timeout); }
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, int64_t *oldfreq); }
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, uid_t uid, gid_t gid, int flag); }
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, const char *path2, int flag); }
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, mode_t mode, dev_t dev); }
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, ... mode_t mode); }
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, char *buf, size_t count); }
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, const char *link); }
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, int flag); }
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go
deleted file mode 100644
index 05192a7..0000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// go run mksysnum.go https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && openbsd
-
-package unix
-
-// Deprecated: Use libc wrappers instead of direct syscalls.
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN           = 5   // { int sys_open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS_GETENTROPY     = 7   // { int sys_getentropy(void *buf, size_t nbyte); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, size_t psize); }
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, struct rusage *rusage); }
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, int flags, void *data); }
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, int data); }
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int amode); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, const struct sigaction *nsa, struct sigaction *osa); }
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, u_long com, ... void *data); }
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, const char *link); }
-	SYS_READLINK       = 58  // { ssize_t sys_readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, int flags); }
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, struct statfs *buf); }
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, struct statfs *buf); }
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, struct timezone *tzp); }
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, const struct timezone *tzp); }
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, struct itimerval *itv); }
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, int behav); }
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, const struct timeval *tptr); }
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, const struct timeval *tptr); }
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, pid_t pgid); }
-	SYS_FUTEX          = 83  // { int sys_futex(uint32_t *f, int op, int val, const struct timespec *timeout, uint32_t *g); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, const struct timespec *times, int flag); }
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, const struct timespec *times); }
-	SYS_KBIND          = 86  // { int sys_kbind(const struct __kbind *param, size_t psize, int64_t proc_cookie); }
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS_ACCEPT4        = 93  // { int sys_accept4(int s, struct sockaddr *name, socklen_t *anamelen, int flags); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, clockid_t clock_id, const struct timespec *tp, void *lock, const int *abort); }
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_PIPE2          = 101 // { int sys_pipe2(int *fdp, int flags); }
-	SYS_DUP3           = 102 // { int sys_dup3(int from, int to, int flags); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_CHFLAGSAT      = 107 // { int sys_chflagsat(int fd, const char *path, u_int flags, int atflags); }
-	SYS_PLEDGE         = 108 // { int sys_pledge(const char *promises, const char *execpromises); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_SENDSYSLOG     = 112 // { int sys_sendsyslog(const char *buf, size_t nbyte, int flags); }
-	SYS_UNVEIL         = 114 // { int sys_unveil(const char *path, const char *permissions); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_THRKILL        = 119 // { int sys_thrkill(pid_t tid, int signum, void *tcb); }
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_KILL           = 122 // { int sys_kill(int pid, int signum); }
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_GETLOGIN_R     = 141 // { int sys_getlogin_r(char *namebuf, u_int namelen); }
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, int uid, char *arg); }
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, size_t nbyte, int pad, off_t offset); }
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, size_t nbyte, int pad, off_t offset); }
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, long pad, off_t pos); }
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, int whence); }
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, off_t length); }
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS_SYSCTL         = 202 // { int sys_sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, size_t len); }
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, int inherit); }
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, const struct iovec *iovp, int iovcnt, int pad, off_t offset); }
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, const struct iovec *iovp, int iovcnt, int pad, off_t offset); }
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, int flags, int fd, long pad, off_t pos); }
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, struct sigaltstack *oss); }
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, struct stat *sb); }
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, union semun *arg); }
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, int n); }
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, siginfo_t *info, const struct timespec *timeout); }
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, int64_t *oldfreq); }
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, uid_t uid, gid_t gid, int flag); }
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, const char *path2, int flag); }
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, mode_t mode, dev_t dev); }
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, ... mode_t mode); }
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, char *buf, size_t count); }
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, const char *link); }
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, int flag); }
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go
index 5e8c263..073daad 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go
@@ -1,2852 +1,2670 @@
-// go run mksyscall_zos_s390x.go -o_sysnum zsysnum_zos_s390x.go -o_syscall zsyscall_zos_s390x.go -i_syscall syscall_zos_s390x.go -o_asm zsymaddr_zos_s390x.s
-// Code generated by the command above; see README.md. DO NOT EDIT.
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 package unix
 
-const (
-	SYS_LOG                             = 0x17  // 23
-	SYS_COSH                            = 0x18  // 24
-	SYS_TANH                            = 0x19  // 25
-	SYS_EXP                             = 0x1A  // 26
-	SYS_MODF                            = 0x1B  // 27
-	SYS_LOG10                           = 0x1C  // 28
-	SYS_FREXP                           = 0x1D  // 29
-	SYS_LDEXP                           = 0x1E  // 30
-	SYS_CEIL                            = 0x1F  // 31
-	SYS_POW                             = 0x20  // 32
-	SYS_SQRT                            = 0x21  // 33
-	SYS_FLOOR                           = 0x22  // 34
-	SYS_J1                              = 0x23  // 35
-	SYS_FABS                            = 0x24  // 36
-	SYS_FMOD                            = 0x25  // 37
-	SYS_J0                              = 0x26  // 38
-	SYS_YN                              = 0x27  // 39
-	SYS_JN                              = 0x28  // 40
-	SYS_Y0                              = 0x29  // 41
-	SYS_Y1                              = 0x2A  // 42
-	SYS_HYPOT                           = 0x2B  // 43
-	SYS_ERF                             = 0x2C  // 44
-	SYS_ERFC                            = 0x2D  // 45
-	SYS_GAMMA                           = 0x2E  // 46
-	SYS_ISALPHA                         = 0x30  // 48
-	SYS_ISALNUM                         = 0x31  // 49
-	SYS_ISLOWER                         = 0x32  // 50
-	SYS_ISCNTRL                         = 0x33  // 51
-	SYS_ISDIGIT                         = 0x34  // 52
-	SYS_ISGRAPH                         = 0x35  // 53
-	SYS_ISUPPER                         = 0x36  // 54
-	SYS_ISPRINT                         = 0x37  // 55
-	SYS_ISPUNCT                         = 0x38  // 56
-	SYS_ISSPACE                         = 0x39  // 57
-	SYS_SETLOCAL                        = 0x3A  // 58
-	SYS_SETLOCALE                       = 0x3A  // 58
-	SYS_ISXDIGIT                        = 0x3B  // 59
-	SYS_TOLOWER                         = 0x3C  // 60
-	SYS_TOUPPER                         = 0x3D  // 61
-	SYS_ASIN                            = 0x3E  // 62
-	SYS_SIN                             = 0x3F  // 63
-	SYS_COS                             = 0x40  // 64
-	SYS_TAN                             = 0x41  // 65
-	SYS_SINH                            = 0x42  // 66
-	SYS_ACOS                            = 0x43  // 67
-	SYS_ATAN                            = 0x44  // 68
-	SYS_ATAN2                           = 0x45  // 69
-	SYS_FTELL                           = 0x46  // 70
-	SYS_FGETPOS                         = 0x47  // 71
-	SYS_FSEEK                           = 0x48  // 72
-	SYS_FSETPOS                         = 0x49  // 73
-	SYS_FERROR                          = 0x4A  // 74
-	SYS_REWIND                          = 0x4B  // 75
-	SYS_CLEARERR                        = 0x4C  // 76
-	SYS_FEOF                            = 0x4D  // 77
-	SYS_ATOL                            = 0x4E  // 78
-	SYS_PERROR                          = 0x4F  // 79
-	SYS_ATOF                            = 0x50  // 80
-	SYS_ATOI                            = 0x51  // 81
-	SYS_RAND                            = 0x52  // 82
-	SYS_STRTOD                          = 0x53  // 83
-	SYS_STRTOL                          = 0x54  // 84
-	SYS_STRTOUL                         = 0x55  // 85
-	SYS_MALLOC                          = 0x56  // 86
-	SYS_SRAND                           = 0x57  // 87
-	SYS_CALLOC                          = 0x58  // 88
-	SYS_FREE                            = 0x59  // 89
-	SYS_EXIT                            = 0x5A  // 90
-	SYS_REALLOC                         = 0x5B  // 91
-	SYS_ABORT                           = 0x5C  // 92
-	SYS___ABORT                         = 0x5C  // 92
-	SYS_ATEXIT                          = 0x5D  // 93
-	SYS_RAISE                           = 0x5E  // 94
-	SYS_SETJMP                          = 0x5F  // 95
-	SYS_LONGJMP                         = 0x60  // 96
-	SYS_SIGNAL                          = 0x61  // 97
-	SYS_TMPNAM                          = 0x62  // 98
-	SYS_REMOVE                          = 0x63  // 99
-	SYS_RENAME                          = 0x64  // 100
-	SYS_TMPFILE                         = 0x65  // 101
-	SYS_FREOPEN                         = 0x66  // 102
-	SYS_FCLOSE                          = 0x67  // 103
-	SYS_FFLUSH                          = 0x68  // 104
-	SYS_FOPEN                           = 0x69  // 105
-	SYS_FSCANF                          = 0x6A  // 106
-	SYS_SETBUF                          = 0x6B  // 107
-	SYS_SETVBUF                         = 0x6C  // 108
-	SYS_FPRINTF                         = 0x6D  // 109
-	SYS_SSCANF                          = 0x6E  // 110
-	SYS_PRINTF                          = 0x6F  // 111
-	SYS_SCANF                           = 0x70  // 112
-	SYS_SPRINTF                         = 0x71  // 113
-	SYS_FGETC                           = 0x72  // 114
-	SYS_VFPRINTF                        = 0x73  // 115
-	SYS_VPRINTF                         = 0x74  // 116
-	SYS_VSPRINTF                        = 0x75  // 117
-	SYS_GETC                            = 0x76  // 118
-	SYS_FGETS                           = 0x77  // 119
-	SYS_FPUTC                           = 0x78  // 120
-	SYS_FPUTS                           = 0x79  // 121
-	SYS_PUTCHAR                         = 0x7A  // 122
-	SYS_GETCHAR                         = 0x7B  // 123
-	SYS_GETS                            = 0x7C  // 124
-	SYS_PUTC                            = 0x7D  // 125
-	SYS_FWRITE                          = 0x7E  // 126
-	SYS_PUTS                            = 0x7F  // 127
-	SYS_UNGETC                          = 0x80  // 128
-	SYS_FREAD                           = 0x81  // 129
-	SYS_WCSTOMBS                        = 0x82  // 130
-	SYS_MBTOWC                          = 0x83  // 131
-	SYS_WCTOMB                          = 0x84  // 132
-	SYS_MBSTOWCS                        = 0x85  // 133
-	SYS_WCSCPY                          = 0x86  // 134
-	SYS_WCSCAT                          = 0x87  // 135
-	SYS_WCSCHR                          = 0x88  // 136
-	SYS_WCSCMP                          = 0x89  // 137
-	SYS_WCSNCMP                         = 0x8A  // 138
-	SYS_WCSCSPN                         = 0x8B  // 139
-	SYS_WCSLEN                          = 0x8C  // 140
-	SYS_WCSNCAT                         = 0x8D  // 141
-	SYS_WCSSPN                          = 0x8E  // 142
-	SYS_WCSNCPY                         = 0x8F  // 143
-	SYS_ABS                             = 0x90  // 144
-	SYS_DIV                             = 0x91  // 145
-	SYS_LABS                            = 0x92  // 146
-	SYS_STRNCPY                         = 0x93  // 147
-	SYS_MEMCPY                          = 0x94  // 148
-	SYS_MEMMOVE                         = 0x95  // 149
-	SYS_STRCPY                          = 0x96  // 150
-	SYS_STRCMP                          = 0x97  // 151
-	SYS_STRCAT                          = 0x98  // 152
-	SYS_STRNCAT                         = 0x99  // 153
-	SYS_MEMCMP                          = 0x9A  // 154
-	SYS_MEMCHR                          = 0x9B  // 155
-	SYS_STRCOLL                         = 0x9C  // 156
-	SYS_STRNCMP                         = 0x9D  // 157
-	SYS_STRXFRM                         = 0x9E  // 158
-	SYS_STRRCHR                         = 0x9F  // 159
-	SYS_STRCHR                          = 0xA0  // 160
-	SYS_STRCSPN                         = 0xA1  // 161
-	SYS_STRPBRK                         = 0xA2  // 162
-	SYS_MEMSET                          = 0xA3  // 163
-	SYS_STRSPN                          = 0xA4  // 164
-	SYS_STRSTR                          = 0xA5  // 165
-	SYS_STRTOK                          = 0xA6  // 166
-	SYS_DIFFTIME                        = 0xA7  // 167
-	SYS_STRERROR                        = 0xA8  // 168
-	SYS_STRLEN                          = 0xA9  // 169
-	SYS_CLOCK                           = 0xAA  // 170
-	SYS_CTIME                           = 0xAB  // 171
-	SYS_MKTIME                          = 0xAC  // 172
-	SYS_TIME                            = 0xAD  // 173
-	SYS_ASCTIME                         = 0xAE  // 174
-	SYS_MBLEN                           = 0xAF  // 175
-	SYS_GMTIME                          = 0xB0  // 176
-	SYS_LOCALTIM                        = 0xB1  // 177
-	SYS_LOCALTIME                       = 0xB1  // 177
-	SYS_STRFTIME                        = 0xB2  // 178
-	SYS___GETCB                         = 0xB4  // 180
-	SYS_FUPDATE                         = 0xB5  // 181
-	SYS___FUPDT                         = 0xB5  // 181
-	SYS_CLRMEMF                         = 0xBD  // 189
-	SYS___CLRMF                         = 0xBD  // 189
-	SYS_FETCHEP                         = 0xBF  // 191
-	SYS___FTCHEP                        = 0xBF  // 191
-	SYS_FLDATA                          = 0xC1  // 193
-	SYS___FLDATA                        = 0xC1  // 193
-	SYS_DYNFREE                         = 0xC2  // 194
-	SYS___DYNFRE                        = 0xC2  // 194
-	SYS_DYNALLOC                        = 0xC3  // 195
-	SYS___DYNALL                        = 0xC3  // 195
-	SYS___CDUMP                         = 0xC4  // 196
-	SYS_CSNAP                           = 0xC5  // 197
-	SYS___CSNAP                         = 0xC5  // 197
-	SYS_CTRACE                          = 0xC6  // 198
-	SYS___CTRACE                        = 0xC6  // 198
-	SYS___CTEST                         = 0xC7  // 199
-	SYS_SETENV                          = 0xC8  // 200
-	SYS___SETENV                        = 0xC8  // 200
-	SYS_CLEARENV                        = 0xC9  // 201
-	SYS___CLRENV                        = 0xC9  // 201
-	SYS___REGCOMP_STD                   = 0xEA  // 234
-	SYS_NL_LANGINFO                     = 0xFC  // 252
-	SYS_GETSYNTX                        = 0xFD  // 253
-	SYS_ISBLANK                         = 0xFE  // 254
-	SYS___ISBLNK                        = 0xFE  // 254
-	SYS_ISWALNUM                        = 0xFF  // 255
-	SYS_ISWALPHA                        = 0x100 // 256
-	SYS_ISWBLANK                        = 0x101 // 257
-	SYS___ISWBLK                        = 0x101 // 257
-	SYS_ISWCNTRL                        = 0x102 // 258
-	SYS_ISWDIGIT                        = 0x103 // 259
-	SYS_ISWGRAPH                        = 0x104 // 260
-	SYS_ISWLOWER                        = 0x105 // 261
-	SYS_ISWPRINT                        = 0x106 // 262
-	SYS_ISWPUNCT                        = 0x107 // 263
-	SYS_ISWSPACE                        = 0x108 // 264
-	SYS_ISWUPPER                        = 0x109 // 265
-	SYS_ISWXDIGI                        = 0x10A // 266
-	SYS_ISWXDIGIT                       = 0x10A // 266
-	SYS_WCTYPE                          = 0x10B // 267
-	SYS_ISWCTYPE                        = 0x10C // 268
-	SYS_TOWLOWER                        = 0x10D // 269
-	SYS_TOWUPPER                        = 0x10E // 270
-	SYS_MBSINIT                         = 0x10F // 271
-	SYS_WCTOB                           = 0x110 // 272
-	SYS_MBRLEN                          = 0x111 // 273
-	SYS_MBRTOWC                         = 0x112 // 274
-	SYS_MBSRTOWC                        = 0x113 // 275
-	SYS_MBSRTOWCS                       = 0x113 // 275
-	SYS_WCRTOMB                         = 0x114 // 276
-	SYS_WCSRTOMB                        = 0x115 // 277
-	SYS_WCSRTOMBS                       = 0x115 // 277
-	SYS___CSID                          = 0x116 // 278
-	SYS___WCSID                         = 0x117 // 279
-	SYS_STRPTIME                        = 0x118 // 280
-	SYS___STRPTM                        = 0x118 // 280
-	SYS_STRFMON                         = 0x119 // 281
-	SYS___RPMTCH                        = 0x11A // 282
-	SYS_WCSSTR                          = 0x11B // 283
-	SYS_WCSTOK                          = 0x12C // 300
-	SYS_WCSTOL                          = 0x12D // 301
-	SYS_WCSTOD                          = 0x12E // 302
-	SYS_WCSTOUL                         = 0x12F // 303
-	SYS_WCSCOLL                         = 0x130 // 304
-	SYS_WCSXFRM                         = 0x131 // 305
-	SYS_WCSWIDTH                        = 0x132 // 306
-	SYS_WCWIDTH                         = 0x133 // 307
-	SYS_WCSFTIME                        = 0x134 // 308
-	SYS_SWPRINTF                        = 0x135 // 309
-	SYS_VSWPRINT                        = 0x136 // 310
-	SYS_VSWPRINTF                       = 0x136 // 310
-	SYS_SWSCANF                         = 0x137 // 311
-	SYS_REGCOMP                         = 0x138 // 312
-	SYS_REGEXEC                         = 0x139 // 313
-	SYS_REGFREE                         = 0x13A // 314
-	SYS_REGERROR                        = 0x13B // 315
-	SYS_FGETWC                          = 0x13C // 316
-	SYS_FGETWS                          = 0x13D // 317
-	SYS_FPUTWC                          = 0x13E // 318
-	SYS_FPUTWS                          = 0x13F // 319
-	SYS_GETWC                           = 0x140 // 320
-	SYS_GETWCHAR                        = 0x141 // 321
-	SYS_PUTWC                           = 0x142 // 322
-	SYS_PUTWCHAR                        = 0x143 // 323
-	SYS_UNGETWC                         = 0x144 // 324
-	SYS_ICONV_OPEN                      = 0x145 // 325
-	SYS_ICONV                           = 0x146 // 326
-	SYS_ICONV_CLOSE                     = 0x147 // 327
-	SYS_ISMCCOLLEL                      = 0x14C // 332
-	SYS_STRTOCOLL                       = 0x14D // 333
-	SYS_COLLTOSTR                       = 0x14E // 334
-	SYS_COLLEQUIV                       = 0x14F // 335
-	SYS_COLLRANGE                       = 0x150 // 336
-	SYS_CCLASS                          = 0x151 // 337
-	SYS_COLLORDER                       = 0x152 // 338
-	SYS___DEMANGLE                      = 0x154 // 340
-	SYS_FDOPEN                          = 0x155 // 341
-	SYS___ERRNO                         = 0x156 // 342
-	SYS___ERRNO2                        = 0x157 // 343
-	SYS___TERROR                        = 0x158 // 344
-	SYS_MAXCOLL                         = 0x169 // 361
-	SYS_GETMCCOLL                       = 0x16A // 362
-	SYS_GETWMCCOLL                      = 0x16B // 363
-	SYS___ERR2AD                        = 0x16C // 364
-	SYS_DLLQUERYFN                      = 0x16D // 365
-	SYS_DLLQUERYVAR                     = 0x16E // 366
-	SYS_DLLFREE                         = 0x16F // 367
-	SYS_DLLLOAD                         = 0x170 // 368
-	SYS__EXIT                           = 0x174 // 372
-	SYS_ACCESS                          = 0x175 // 373
-	SYS_ALARM                           = 0x176 // 374
-	SYS_CFGETISPEED                     = 0x177 // 375
-	SYS_CFGETOSPEED                     = 0x178 // 376
-	SYS_CFSETISPEED                     = 0x179 // 377
-	SYS_CFSETOSPEED                     = 0x17A // 378
-	SYS_CHDIR                           = 0x17B // 379
-	SYS_CHMOD                           = 0x17C // 380
-	SYS_CHOWN                           = 0x17D // 381
-	SYS_CLOSE                           = 0x17E // 382
-	SYS_CLOSEDIR                        = 0x17F // 383
-	SYS_CREAT                           = 0x180 // 384
-	SYS_CTERMID                         = 0x181 // 385
-	SYS_DUP                             = 0x182 // 386
-	SYS_DUP2                            = 0x183 // 387
-	SYS_EXECL                           = 0x184 // 388
-	SYS_EXECLE                          = 0x185 // 389
-	SYS_EXECLP                          = 0x186 // 390
-	SYS_EXECV                           = 0x187 // 391
-	SYS_EXECVE                          = 0x188 // 392
-	SYS_EXECVP                          = 0x189 // 393
-	SYS_FCHMOD                          = 0x18A // 394
-	SYS_FCHOWN                          = 0x18B // 395
-	SYS_FCNTL                           = 0x18C // 396
-	SYS_FILENO                          = 0x18D // 397
-	SYS_FORK                            = 0x18E // 398
-	SYS_FPATHCONF                       = 0x18F // 399
-	SYS_FSTAT                           = 0x190 // 400
-	SYS_FSYNC                           = 0x191 // 401
-	SYS_FTRUNCATE                       = 0x192 // 402
-	SYS_GETCWD                          = 0x193 // 403
-	SYS_GETEGID                         = 0x194 // 404
-	SYS_GETEUID                         = 0x195 // 405
-	SYS_GETGID                          = 0x196 // 406
-	SYS_GETGRGID                        = 0x197 // 407
-	SYS_GETGRNAM                        = 0x198 // 408
-	SYS_GETGROUPS                       = 0x199 // 409
-	SYS_GETLOGIN                        = 0x19A // 410
-	SYS_W_GETMNTENT                     = 0x19B // 411
-	SYS_GETPGRP                         = 0x19C // 412
-	SYS_GETPID                          = 0x19D // 413
-	SYS_GETPPID                         = 0x19E // 414
-	SYS_GETPWNAM                        = 0x19F // 415
-	SYS_GETPWUID                        = 0x1A0 // 416
-	SYS_GETUID                          = 0x1A1 // 417
-	SYS_W_IOCTL                         = 0x1A2 // 418
-	SYS_ISATTY                          = 0x1A3 // 419
-	SYS_KILL                            = 0x1A4 // 420
-	SYS_LINK                            = 0x1A5 // 421
-	SYS_LSEEK                           = 0x1A6 // 422
-	SYS_LSTAT                           = 0x1A7 // 423
-	SYS_MKDIR                           = 0x1A8 // 424
-	SYS_MKFIFO                          = 0x1A9 // 425
-	SYS_MKNOD                           = 0x1AA // 426
-	SYS_MOUNT                           = 0x1AB // 427
-	SYS_OPEN                            = 0x1AC // 428
-	SYS_OPENDIR                         = 0x1AD // 429
-	SYS_PATHCONF                        = 0x1AE // 430
-	SYS_PAUSE                           = 0x1AF // 431
-	SYS_PIPE                            = 0x1B0 // 432
-	SYS_W_GETPSENT                      = 0x1B1 // 433
-	SYS_READ                            = 0x1B2 // 434
-	SYS_READDIR                         = 0x1B3 // 435
-	SYS_READLINK                        = 0x1B4 // 436
-	SYS_REWINDDIR                       = 0x1B5 // 437
-	SYS_RMDIR                           = 0x1B6 // 438
-	SYS_SETEGID                         = 0x1B7 // 439
-	SYS_SETEUID                         = 0x1B8 // 440
-	SYS_SETGID                          = 0x1B9 // 441
-	SYS_SETPGID                         = 0x1BA // 442
-	SYS_SETSID                          = 0x1BB // 443
-	SYS_SETUID                          = 0x1BC // 444
-	SYS_SIGACTION                       = 0x1BD // 445
-	SYS_SIGADDSET                       = 0x1BE // 446
-	SYS_SIGDELSET                       = 0x1BF // 447
-	SYS_SIGEMPTYSET                     = 0x1C0 // 448
-	SYS_SIGFILLSET                      = 0x1C1 // 449
-	SYS_SIGISMEMBER                     = 0x1C2 // 450
-	SYS_SIGLONGJMP                      = 0x1C3 // 451
-	SYS_SIGPENDING                      = 0x1C4 // 452
-	SYS_SIGPROCMASK                     = 0x1C5 // 453
-	SYS_SIGSETJMP                       = 0x1C6 // 454
-	SYS_SIGSUSPEND                      = 0x1C7 // 455
-	SYS_SLEEP                           = 0x1C8 // 456
-	SYS_STAT                            = 0x1C9 // 457
-	SYS_W_STATFS                        = 0x1CA // 458
-	SYS_SYMLINK                         = 0x1CB // 459
-	SYS_SYSCONF                         = 0x1CC // 460
-	SYS_TCDRAIN                         = 0x1CD // 461
-	SYS_TCFLOW                          = 0x1CE // 462
-	SYS_TCFLUSH                         = 0x1CF // 463
-	SYS_TCGETATTR                       = 0x1D0 // 464
-	SYS_TCGETPGRP                       = 0x1D1 // 465
-	SYS_TCSENDBREAK                     = 0x1D2 // 466
-	SYS_TCSETATTR                       = 0x1D3 // 467
-	SYS_TCSETPGRP                       = 0x1D4 // 468
-	SYS_TIMES                           = 0x1D5 // 469
-	SYS_TTYNAME                         = 0x1D6 // 470
-	SYS_TZSET                           = 0x1D7 // 471
-	SYS_UMASK                           = 0x1D8 // 472
-	SYS_UMOUNT                          = 0x1D9 // 473
-	SYS_UNAME                           = 0x1DA // 474
-	SYS_UNLINK                          = 0x1DB // 475
-	SYS_UTIME                           = 0x1DC // 476
-	SYS_WAIT                            = 0x1DD // 477
-	SYS_WAITPID                         = 0x1DE // 478
-	SYS_WRITE                           = 0x1DF // 479
-	SYS_CHAUDIT                         = 0x1E0 // 480
-	SYS_FCHAUDIT                        = 0x1E1 // 481
-	SYS_GETGROUPSBYNAME                 = 0x1E2 // 482
-	SYS_SIGWAIT                         = 0x1E3 // 483
-	SYS_PTHREAD_EXIT                    = 0x1E4 // 484
-	SYS_PTHREAD_KILL                    = 0x1E5 // 485
-	SYS_PTHREAD_ATTR_INIT               = 0x1E6 // 486
-	SYS_PTHREAD_ATTR_DESTROY            = 0x1E7 // 487
-	SYS_PTHREAD_ATTR_SETSTACKSIZE       = 0x1E8 // 488
-	SYS_PTHREAD_ATTR_GETSTACKSIZE       = 0x1E9 // 489
-	SYS_PTHREAD_ATTR_SETDETACHSTATE     = 0x1EA // 490
-	SYS_PTHREAD_ATTR_GETDETACHSTATE     = 0x1EB // 491
-	SYS_PTHREAD_ATTR_SETWEIGHT_NP       = 0x1EC // 492
-	SYS_PTHREAD_ATTR_GETWEIGHT_NP       = 0x1ED // 493
-	SYS_PTHREAD_CANCEL                  = 0x1EE // 494
-	SYS_PTHREAD_CLEANUP_PUSH            = 0x1EF // 495
-	SYS_PTHREAD_CLEANUP_POP             = 0x1F0 // 496
-	SYS_PTHREAD_CONDATTR_INIT           = 0x1F1 // 497
-	SYS_PTHREAD_CONDATTR_DESTROY        = 0x1F2 // 498
-	SYS_PTHREAD_COND_INIT               = 0x1F3 // 499
-	SYS_PTHREAD_COND_DESTROY            = 0x1F4 // 500
-	SYS_PTHREAD_COND_SIGNAL             = 0x1F5 // 501
-	SYS_PTHREAD_COND_BROADCAST          = 0x1F6 // 502
-	SYS_PTHREAD_COND_WAIT               = 0x1F7 // 503
-	SYS_PTHREAD_COND_TIMEDWAIT          = 0x1F8 // 504
-	SYS_PTHREAD_CREATE                  = 0x1F9 // 505
-	SYS_PTHREAD_DETACH                  = 0x1FA // 506
-	SYS_PTHREAD_EQUAL                   = 0x1FB // 507
-	SYS_PTHREAD_GETSPECIFIC             = 0x1FC // 508
-	SYS_PTHREAD_JOIN                    = 0x1FD // 509
-	SYS_PTHREAD_KEY_CREATE              = 0x1FE // 510
-	SYS_PTHREAD_MUTEXATTR_INIT          = 0x1FF // 511
-	SYS_PTHREAD_MUTEXATTR_DESTROY       = 0x200 // 512
-	SYS_PTHREAD_MUTEXATTR_SETKIND_NP    = 0x201 // 513
-	SYS_PTHREAD_MUTEXATTR_GETKIND_NP    = 0x202 // 514
-	SYS_PTHREAD_MUTEX_INIT              = 0x203 // 515
-	SYS_PTHREAD_MUTEX_DESTROY           = 0x204 // 516
-	SYS_PTHREAD_MUTEX_LOCK              = 0x205 // 517
-	SYS_PTHREAD_MUTEX_TRYLOCK           = 0x206 // 518
-	SYS_PTHREAD_MUTEX_UNLOCK            = 0x207 // 519
-	SYS_PTHREAD_ONCE                    = 0x209 // 521
-	SYS_PTHREAD_SELF                    = 0x20A // 522
-	SYS_PTHREAD_SETINTR                 = 0x20B // 523
-	SYS_PTHREAD_SETINTRTYPE             = 0x20C // 524
-	SYS_PTHREAD_SETSPECIFIC             = 0x20D // 525
-	SYS_PTHREAD_TESTINTR                = 0x20E // 526
-	SYS_PTHREAD_YIELD                   = 0x20F // 527
-	SYS_TW_OPEN                         = 0x210 // 528
-	SYS_TW_FCNTL                        = 0x211 // 529
-	SYS_PTHREAD_JOIN_D4_NP              = 0x212 // 530
-	SYS_PTHREAD_CONDATTR_SETKIND_NP     = 0x213 // 531
-	SYS_PTHREAD_CONDATTR_GETKIND_NP     = 0x214 // 532
-	SYS_EXTLINK_NP                      = 0x215 // 533
-	SYS___PASSWD                        = 0x216 // 534
-	SYS_SETGROUPS                       = 0x217 // 535
-	SYS_INITGROUPS                      = 0x218 // 536
-	SYS_WCSPBRK                         = 0x23F // 575
-	SYS_WCSRCHR                         = 0x240 // 576
-	SYS_SVC99                           = 0x241 // 577
-	SYS___SVC99                         = 0x241 // 577
-	SYS_WCSWCS                          = 0x242 // 578
-	SYS_LOCALECO                        = 0x243 // 579
-	SYS_LOCALECONV                      = 0x243 // 579
-	SYS___LIBREL                        = 0x244 // 580
-	SYS_RELEASE                         = 0x245 // 581
-	SYS___RLSE                          = 0x245 // 581
-	SYS_FLOCATE                         = 0x246 // 582
-	SYS___FLOCT                         = 0x246 // 582
-	SYS_FDELREC                         = 0x247 // 583
-	SYS___FDLREC                        = 0x247 // 583
-	SYS_FETCH                           = 0x248 // 584
-	SYS___FETCH                         = 0x248 // 584
-	SYS_QSORT                           = 0x249 // 585
-	SYS_GETENV                          = 0x24A // 586
-	SYS_SYSTEM                          = 0x24B // 587
-	SYS_BSEARCH                         = 0x24C // 588
-	SYS_LDIV                            = 0x24D // 589
-	SYS___THROW                         = 0x25E // 606
-	SYS___RETHROW                       = 0x25F // 607
-	SYS___CLEANUPCATCH                  = 0x260 // 608
-	SYS___CATCHMATCH                    = 0x261 // 609
-	SYS___CLEAN2UPCATCH                 = 0x262 // 610
-	SYS_PUTENV                          = 0x26A // 618
-	SYS___GETENV                        = 0x26F // 623
-	SYS_GETPRIORITY                     = 0x270 // 624
-	SYS_NICE                            = 0x271 // 625
-	SYS_SETPRIORITY                     = 0x272 // 626
-	SYS_GETITIMER                       = 0x273 // 627
-	SYS_SETITIMER                       = 0x274 // 628
-	SYS_MSGCTL                          = 0x275 // 629
-	SYS_MSGGET                          = 0x276 // 630
-	SYS_MSGRCV                          = 0x277 // 631
-	SYS_MSGSND                          = 0x278 // 632
-	SYS_MSGXRCV                         = 0x279 // 633
-	SYS___MSGXR                         = 0x279 // 633
-	SYS_SEMCTL                          = 0x27A // 634
-	SYS_SEMGET                          = 0x27B // 635
-	SYS_SEMOP                           = 0x27C // 636
-	SYS_SHMAT                           = 0x27D // 637
-	SYS_SHMCTL                          = 0x27E // 638
-	SYS_SHMDT                           = 0x27F // 639
-	SYS_SHMGET                          = 0x280 // 640
-	SYS___GETIPC                        = 0x281 // 641
-	SYS_SETGRENT                        = 0x282 // 642
-	SYS_GETGRENT                        = 0x283 // 643
-	SYS_ENDGRENT                        = 0x284 // 644
-	SYS_SETPWENT                        = 0x285 // 645
-	SYS_GETPWENT                        = 0x286 // 646
-	SYS_ENDPWENT                        = 0x287 // 647
-	SYS_BSD_SIGNAL                      = 0x288 // 648
-	SYS_KILLPG                          = 0x289 // 649
-	SYS_SIGALTSTACK                     = 0x28A // 650
-	SYS_SIGHOLD                         = 0x28B // 651
-	SYS_SIGIGNORE                       = 0x28C // 652
-	SYS_SIGINTERRUPT                    = 0x28D // 653
-	SYS_SIGPAUSE                        = 0x28E // 654
-	SYS_SIGRELSE                        = 0x28F // 655
-	SYS_SIGSET                          = 0x290 // 656
-	SYS_SIGSTACK                        = 0x291 // 657
-	SYS_GETRLIMIT                       = 0x292 // 658
-	SYS_SETRLIMIT                       = 0x293 // 659
-	SYS_GETRUSAGE                       = 0x294 // 660
-	SYS_MMAP                            = 0x295 // 661
-	SYS_MPROTECT                        = 0x296 // 662
-	SYS_MSYNC                           = 0x297 // 663
-	SYS_MUNMAP                          = 0x298 // 664
-	SYS_CONFSTR                         = 0x299 // 665
-	SYS_GETOPT                          = 0x29A // 666
-	SYS_LCHOWN                          = 0x29B // 667
-	SYS_TRUNCATE                        = 0x29C // 668
-	SYS_GETSUBOPT                       = 0x29D // 669
-	SYS_SETPGRP                         = 0x29E // 670
-	SYS___GDERR                         = 0x29F // 671
-	SYS___TZONE                         = 0x2A0 // 672
-	SYS___DLGHT                         = 0x2A1 // 673
-	SYS___OPARGF                        = 0x2A2 // 674
-	SYS___OPOPTF                        = 0x2A3 // 675
-	SYS___OPINDF                        = 0x2A4 // 676
-	SYS___OPERRF                        = 0x2A5 // 677
-	SYS_GETDATE                         = 0x2A6 // 678
-	SYS_WAIT3                           = 0x2A7 // 679
-	SYS_WAITID                          = 0x2A8 // 680
-	SYS___CATTRM                        = 0x2A9 // 681
-	SYS___GDTRM                         = 0x2AA // 682
-	SYS___RNDTRM                        = 0x2AB // 683
-	SYS_CRYPT                           = 0x2AC // 684
-	SYS_ENCRYPT                         = 0x2AD // 685
-	SYS_SETKEY                          = 0x2AE // 686
-	SYS___CNVBLK                        = 0x2AF // 687
-	SYS___CRYTRM                        = 0x2B0 // 688
-	SYS___ECRTRM                        = 0x2B1 // 689
-	SYS_DRAND48                         = 0x2B2 // 690
-	SYS_ERAND48                         = 0x2B3 // 691
-	SYS_FSTATVFS                        = 0x2B4 // 692
-	SYS_STATVFS                         = 0x2B5 // 693
-	SYS_CATCLOSE                        = 0x2B6 // 694
-	SYS_CATGETS                         = 0x2B7 // 695
-	SYS_CATOPEN                         = 0x2B8 // 696
-	SYS_BCMP                            = 0x2B9 // 697
-	SYS_BCOPY                           = 0x2BA // 698
-	SYS_BZERO                           = 0x2BB // 699
-	SYS_FFS                             = 0x2BC // 700
-	SYS_INDEX                           = 0x2BD // 701
-	SYS_RINDEX                          = 0x2BE // 702
-	SYS_STRCASECMP                      = 0x2BF // 703
-	SYS_STRDUP                          = 0x2C0 // 704
-	SYS_STRNCASECMP                     = 0x2C1 // 705
-	SYS_INITSTATE                       = 0x2C2 // 706
-	SYS_SETSTATE                        = 0x2C3 // 707
-	SYS_RANDOM                          = 0x2C4 // 708
-	SYS_SRANDOM                         = 0x2C5 // 709
-	SYS_HCREATE                         = 0x2C6 // 710
-	SYS_HDESTROY                        = 0x2C7 // 711
-	SYS_HSEARCH                         = 0x2C8 // 712
-	SYS_LFIND                           = 0x2C9 // 713
-	SYS_LSEARCH                         = 0x2CA // 714
-	SYS_TDELETE                         = 0x2CB // 715
-	SYS_TFIND                           = 0x2CC // 716
-	SYS_TSEARCH                         = 0x2CD // 717
-	SYS_TWALK                           = 0x2CE // 718
-	SYS_INSQUE                          = 0x2CF // 719
-	SYS_REMQUE                          = 0x2D0 // 720
-	SYS_POPEN                           = 0x2D1 // 721
-	SYS_PCLOSE                          = 0x2D2 // 722
-	SYS_SWAB                            = 0x2D3 // 723
-	SYS_MEMCCPY                         = 0x2D4 // 724
-	SYS_GETPAGESIZE                     = 0x2D8 // 728
-	SYS_FCHDIR                          = 0x2D9 // 729
-	SYS___OCLCK                         = 0x2DA // 730
-	SYS___ATOE                          = 0x2DB // 731
-	SYS___ATOE_L                        = 0x2DC // 732
-	SYS___ETOA                          = 0x2DD // 733
-	SYS___ETOA_L                        = 0x2DE // 734
-	SYS_SETUTXENT                       = 0x2DF // 735
-	SYS_GETUTXENT                       = 0x2E0 // 736
-	SYS_ENDUTXENT                       = 0x2E1 // 737
-	SYS_GETUTXID                        = 0x2E2 // 738
-	SYS_GETUTXLINE                      = 0x2E3 // 739
-	SYS_PUTUTXLINE                      = 0x2E4 // 740
-	SYS_FMTMSG                          = 0x2E5 // 741
-	SYS_JRAND48                         = 0x2E6 // 742
-	SYS_LRAND48                         = 0x2E7 // 743
-	SYS_MRAND48                         = 0x2E8 // 744
-	SYS_NRAND48                         = 0x2E9 // 745
-	SYS_LCONG48                         = 0x2EA // 746
-	SYS_SRAND48                         = 0x2EB // 747
-	SYS_SEED48                          = 0x2EC // 748
-	SYS_ISASCII                         = 0x2ED // 749
-	SYS_TOASCII                         = 0x2EE // 750
-	SYS_A64L                            = 0x2EF // 751
-	SYS_L64A                            = 0x2F0 // 752
-	SYS_UALARM                          = 0x2F1 // 753
-	SYS_USLEEP                          = 0x2F2 // 754
-	SYS___UTXTRM                        = 0x2F3 // 755
-	SYS___SRCTRM                        = 0x2F4 // 756
-	SYS_FTIME                           = 0x2F5 // 757
-	SYS_GETTIMEOFDAY                    = 0x2F6 // 758
-	SYS_DBM_CLEARERR                    = 0x2F7 // 759
-	SYS_DBM_CLOSE                       = 0x2F8 // 760
-	SYS_DBM_DELETE                      = 0x2F9 // 761
-	SYS_DBM_ERROR                       = 0x2FA // 762
-	SYS_DBM_FETCH                       = 0x2FB // 763
-	SYS_DBM_FIRSTKEY                    = 0x2FC // 764
-	SYS_DBM_NEXTKEY                     = 0x2FD // 765
-	SYS_DBM_OPEN                        = 0x2FE // 766
-	SYS_DBM_STORE                       = 0x2FF // 767
-	SYS___NDMTRM                        = 0x300 // 768
-	SYS_FTOK                            = 0x301 // 769
-	SYS_BASENAME                        = 0x302 // 770
-	SYS_DIRNAME                         = 0x303 // 771
-	SYS_GETDTABLESIZE                   = 0x304 // 772
-	SYS_MKSTEMP                         = 0x305 // 773
-	SYS_MKTEMP                          = 0x306 // 774
-	SYS_NFTW                            = 0x307 // 775
-	SYS_GETWD                           = 0x308 // 776
-	SYS_LOCKF                           = 0x309 // 777
-	SYS__LONGJMP                        = 0x30D // 781
-	SYS__SETJMP                         = 0x30E // 782
-	SYS_VFORK                           = 0x30F // 783
-	SYS_WORDEXP                         = 0x310 // 784
-	SYS_WORDFREE                        = 0x311 // 785
-	SYS_GETPGID                         = 0x312 // 786
-	SYS_GETSID                          = 0x313 // 787
-	SYS___UTMPXNAME                     = 0x314 // 788
-	SYS_CUSERID                         = 0x315 // 789
-	SYS_GETPASS                         = 0x316 // 790
-	SYS_FNMATCH                         = 0x317 // 791
-	SYS_FTW                             = 0x318 // 792
-	SYS_GETW                            = 0x319 // 793
-	SYS_GLOB                            = 0x31A // 794
-	SYS_GLOBFREE                        = 0x31B // 795
-	SYS_PUTW                            = 0x31C // 796
-	SYS_SEEKDIR                         = 0x31D // 797
-	SYS_TELLDIR                         = 0x31E // 798
-	SYS_TEMPNAM                         = 0x31F // 799
-	SYS_ACOSH                           = 0x320 // 800
-	SYS_ASINH                           = 0x321 // 801
-	SYS_ATANH                           = 0x322 // 802
-	SYS_CBRT                            = 0x323 // 803
-	SYS_EXPM1                           = 0x324 // 804
-	SYS_ILOGB                           = 0x325 // 805
-	SYS_LOGB                            = 0x326 // 806
-	SYS_LOG1P                           = 0x327 // 807
-	SYS_NEXTAFTER                       = 0x328 // 808
-	SYS_RINT                            = 0x329 // 809
-	SYS_REMAINDER                       = 0x32A // 810
-	SYS_SCALB                           = 0x32B // 811
-	SYS_LGAMMA                          = 0x32C // 812
-	SYS_TTYSLOT                         = 0x32D // 813
-	SYS_GETTIMEOFDAY_R                  = 0x32E // 814
-	SYS_SYNC                            = 0x32F // 815
-	SYS_SPAWN                           = 0x330 // 816
-	SYS_SPAWNP                          = 0x331 // 817
-	SYS_GETLOGIN_UU                     = 0x332 // 818
-	SYS_ECVT                            = 0x333 // 819
-	SYS_FCVT                            = 0x334 // 820
-	SYS_GCVT                            = 0x335 // 821
-	SYS_ACCEPT                          = 0x336 // 822
-	SYS_BIND                            = 0x337 // 823
-	SYS_CONNECT                         = 0x338 // 824
-	SYS_ENDHOSTENT                      = 0x339 // 825
-	SYS_ENDPROTOENT                     = 0x33A // 826
-	SYS_ENDSERVENT                      = 0x33B // 827
-	SYS_GETHOSTBYADDR_R                 = 0x33C // 828
-	SYS_GETHOSTBYADDR                   = 0x33D // 829
-	SYS_GETHOSTBYNAME_R                 = 0x33E // 830
-	SYS_GETHOSTBYNAME                   = 0x33F // 831
-	SYS_GETHOSTENT                      = 0x340 // 832
-	SYS_GETHOSTID                       = 0x341 // 833
-	SYS_GETHOSTNAME                     = 0x342 // 834
-	SYS_GETNETBYADDR                    = 0x343 // 835
-	SYS_GETNETBYNAME                    = 0x344 // 836
-	SYS_GETNETENT                       = 0x345 // 837
-	SYS_GETPEERNAME                     = 0x346 // 838
-	SYS_GETPROTOBYNAME                  = 0x347 // 839
-	SYS_GETPROTOBYNUMBER                = 0x348 // 840
-	SYS_GETPROTOENT                     = 0x349 // 841
-	SYS_GETSERVBYNAME                   = 0x34A // 842
-	SYS_GETSERVBYPORT                   = 0x34B // 843
-	SYS_GETSERVENT                      = 0x34C // 844
-	SYS_GETSOCKNAME                     = 0x34D // 845
-	SYS_GETSOCKOPT                      = 0x34E // 846
-	SYS_INET_ADDR                       = 0x34F // 847
-	SYS_INET_LNAOF                      = 0x350 // 848
-	SYS_INET_MAKEADDR                   = 0x351 // 849
-	SYS_INET_NETOF                      = 0x352 // 850
-	SYS_INET_NETWORK                    = 0x353 // 851
-	SYS_INET_NTOA                       = 0x354 // 852
-	SYS_IOCTL                           = 0x355 // 853
-	SYS_LISTEN                          = 0x356 // 854
-	SYS_READV                           = 0x357 // 855
-	SYS_RECV                            = 0x358 // 856
-	SYS_RECVFROM                        = 0x359 // 857
-	SYS_SELECT                          = 0x35B // 859
-	SYS_SELECTEX                        = 0x35C // 860
-	SYS_SEND                            = 0x35D // 861
-	SYS_SENDTO                          = 0x35F // 863
-	SYS_SETHOSTENT                      = 0x360 // 864
-	SYS_SETNETENT                       = 0x361 // 865
-	SYS_SETPEER                         = 0x362 // 866
-	SYS_SETPROTOENT                     = 0x363 // 867
-	SYS_SETSERVENT                      = 0x364 // 868
-	SYS_SETSOCKOPT                      = 0x365 // 869
-	SYS_SHUTDOWN                        = 0x366 // 870
-	SYS_SOCKET                          = 0x367 // 871
-	SYS_SOCKETPAIR                      = 0x368 // 872
-	SYS_WRITEV                          = 0x369 // 873
-	SYS_CHROOT                          = 0x36A // 874
-	SYS_W_STATVFS                       = 0x36B // 875
-	SYS_ULIMIT                          = 0x36C // 876
-	SYS_ISNAN                           = 0x36D // 877
-	SYS_UTIMES                          = 0x36E // 878
-	SYS___H_ERRNO                       = 0x36F // 879
-	SYS_ENDNETENT                       = 0x370 // 880
-	SYS_CLOSELOG                        = 0x371 // 881
-	SYS_OPENLOG                         = 0x372 // 882
-	SYS_SETLOGMASK                      = 0x373 // 883
-	SYS_SYSLOG                          = 0x374 // 884
-	SYS_PTSNAME                         = 0x375 // 885
-	SYS_SETREUID                        = 0x376 // 886
-	SYS_SETREGID                        = 0x377 // 887
-	SYS_REALPATH                        = 0x378 // 888
-	SYS___SIGNGAM                       = 0x379 // 889
-	SYS_GRANTPT                         = 0x37A // 890
-	SYS_UNLOCKPT                        = 0x37B // 891
-	SYS_TCGETSID                        = 0x37C // 892
-	SYS___TCGETCP                       = 0x37D // 893
-	SYS___TCSETCP                       = 0x37E // 894
-	SYS___TCSETTABLES                   = 0x37F // 895
-	SYS_POLL                            = 0x380 // 896
-	SYS_REXEC                           = 0x381 // 897
-	SYS___ISASCII2                      = 0x382 // 898
-	SYS___TOASCII2                      = 0x383 // 899
-	SYS_CHPRIORITY                      = 0x384 // 900
-	SYS_PTHREAD_ATTR_SETSYNCTYPE_NP     = 0x385 // 901
-	SYS_PTHREAD_ATTR_GETSYNCTYPE_NP     = 0x386 // 902
-	SYS_PTHREAD_SET_LIMIT_NP            = 0x387 // 903
-	SYS___STNETENT                      = 0x388 // 904
-	SYS___STPROTOENT                    = 0x389 // 905
-	SYS___STSERVENT                     = 0x38A // 906
-	SYS___STHOSTENT                     = 0x38B // 907
-	SYS_NLIST                           = 0x38C // 908
-	SYS___IPDBCS                        = 0x38D // 909
-	SYS___IPDSPX                        = 0x38E // 910
-	SYS___IPMSGC                        = 0x38F // 911
-	SYS___SELECT1                       = 0x390 // 912
-	SYS_PTHREAD_SECURITY_NP             = 0x391 // 913
-	SYS___CHECK_RESOURCE_AUTH_NP        = 0x392 // 914
-	SYS___CONVERT_ID_NP                 = 0x393 // 915
-	SYS___OPENVMREL                     = 0x394 // 916
-	SYS_WMEMCHR                         = 0x395 // 917
-	SYS_WMEMCMP                         = 0x396 // 918
-	SYS_WMEMCPY                         = 0x397 // 919
-	SYS_WMEMMOVE                        = 0x398 // 920
-	SYS_WMEMSET                         = 0x399 // 921
-	SYS___FPUTWC                        = 0x400 // 1024
-	SYS___PUTWC                         = 0x401 // 1025
-	SYS___PWCHAR                        = 0x402 // 1026
-	SYS___WCSFTM                        = 0x403 // 1027
-	SYS___WCSTOK                        = 0x404 // 1028
-	SYS___WCWDTH                        = 0x405 // 1029
-	SYS_T_ACCEPT                        = 0x409 // 1033
-	SYS_T_ALLOC                         = 0x40A // 1034
-	SYS_T_BIND                          = 0x40B // 1035
-	SYS_T_CLOSE                         = 0x40C // 1036
-	SYS_T_CONNECT                       = 0x40D // 1037
-	SYS_T_ERROR                         = 0x40E // 1038
-	SYS_T_FREE                          = 0x40F // 1039
-	SYS_T_GETINFO                       = 0x410 // 1040
-	SYS_T_GETPROTADDR                   = 0x411 // 1041
-	SYS_T_GETSTATE                      = 0x412 // 1042
-	SYS_T_LISTEN                        = 0x413 // 1043
-	SYS_T_LOOK                          = 0x414 // 1044
-	SYS_T_OPEN                          = 0x415 // 1045
-	SYS_T_OPTMGMT                       = 0x416 // 1046
-	SYS_T_RCV                           = 0x417 // 1047
-	SYS_T_RCVCONNECT                    = 0x418 // 1048
-	SYS_T_RCVDIS                        = 0x419 // 1049
-	SYS_T_RCVREL                        = 0x41A // 1050
-	SYS_T_RCVUDATA                      = 0x41B // 1051
-	SYS_T_RCVUDERR                      = 0x41C // 1052
-	SYS_T_SND                           = 0x41D // 1053
-	SYS_T_SNDDIS                        = 0x41E // 1054
-	SYS_T_SNDREL                        = 0x41F // 1055
-	SYS_T_SNDUDATA                      = 0x420 // 1056
-	SYS_T_STRERROR                      = 0x421 // 1057
-	SYS_T_SYNC                          = 0x422 // 1058
-	SYS_T_UNBIND                        = 0x423 // 1059
-	SYS___T_ERRNO                       = 0x424 // 1060
-	SYS___RECVMSG2                      = 0x425 // 1061
-	SYS___SENDMSG2                      = 0x426 // 1062
-	SYS_FATTACH                         = 0x427 // 1063
-	SYS_FDETACH                         = 0x428 // 1064
-	SYS_GETMSG                          = 0x429 // 1065
-	SYS_GETPMSG                         = 0x42A // 1066
-	SYS_ISASTREAM                       = 0x42B // 1067
-	SYS_PUTMSG                          = 0x42C // 1068
-	SYS_PUTPMSG                         = 0x42D // 1069
-	SYS___ISPOSIXON                     = 0x42E // 1070
-	SYS___OPENMVSREL                    = 0x42F // 1071
-	SYS_GETCONTEXT                      = 0x430 // 1072
-	SYS_SETCONTEXT                      = 0x431 // 1073
-	SYS_MAKECONTEXT                     = 0x432 // 1074
-	SYS_SWAPCONTEXT                     = 0x433 // 1075
-	SYS_PTHREAD_GETSPECIFIC_D8_NP       = 0x434 // 1076
-	SYS_GETCLIENTID                     = 0x470 // 1136
-	SYS___GETCLIENTID                   = 0x471 // 1137
-	SYS_GETSTABLESIZE                   = 0x472 // 1138
-	SYS_GETIBMOPT                       = 0x473 // 1139
-	SYS_GETIBMSOCKOPT                   = 0x474 // 1140
-	SYS_GIVESOCKET                      = 0x475 // 1141
-	SYS_IBMSFLUSH                       = 0x476 // 1142
-	SYS_MAXDESC                         = 0x477 // 1143
-	SYS_SETIBMOPT                       = 0x478 // 1144
-	SYS_SETIBMSOCKOPT                   = 0x479 // 1145
-	SYS_SOCK_DEBUG                      = 0x47A // 1146
-	SYS_SOCK_DO_TESTSTOR                = 0x47D // 1149
-	SYS_TAKESOCKET                      = 0x47E // 1150
-	SYS___SERVER_INIT                   = 0x47F // 1151
-	SYS___SERVER_PWU                    = 0x480 // 1152
-	SYS_PTHREAD_TAG_NP                  = 0x481 // 1153
-	SYS___CONSOLE                       = 0x482 // 1154
-	SYS___WSINIT                        = 0x483 // 1155
-	SYS___IPTCPN                        = 0x489 // 1161
-	SYS___SMF_RECORD                    = 0x48A // 1162
-	SYS___IPHOST                        = 0x48B // 1163
-	SYS___IPNODE                        = 0x48C // 1164
-	SYS___SERVER_CLASSIFY_CREATE        = 0x48D // 1165
-	SYS___SERVER_CLASSIFY_DESTROY       = 0x48E // 1166
-	SYS___SERVER_CLASSIFY_RESET         = 0x48F // 1167
-	SYS___SERVER_CLASSIFY               = 0x490 // 1168
-	SYS___HEAPRPT                       = 0x496 // 1174
-	SYS___FNWSA                         = 0x49B // 1179
-	SYS___SPAWN2                        = 0x49D // 1181
-	SYS___SPAWNP2                       = 0x49E // 1182
-	SYS___GDRR                          = 0x4A1 // 1185
-	SYS___HRRNO                         = 0x4A2 // 1186
-	SYS___OPRG                          = 0x4A3 // 1187
-	SYS___OPRR                          = 0x4A4 // 1188
-	SYS___OPND                          = 0x4A5 // 1189
-	SYS___OPPT                          = 0x4A6 // 1190
-	SYS___SIGGM                         = 0x4A7 // 1191
-	SYS___DGHT                          = 0x4A8 // 1192
-	SYS___TZNE                          = 0x4A9 // 1193
-	SYS___TZZN                          = 0x4AA // 1194
-	SYS___TRRNO                         = 0x4AF // 1199
-	SYS___ENVN                          = 0x4B0 // 1200
-	SYS___MLOCKALL                      = 0x4B1 // 1201
-	SYS_CREATEWO                        = 0x4B2 // 1202
-	SYS_CREATEWORKUNIT                  = 0x4B2 // 1202
-	SYS_CONTINUE                        = 0x4B3 // 1203
-	SYS_CONTINUEWORKUNIT                = 0x4B3 // 1203
-	SYS_CONNECTW                        = 0x4B4 // 1204
-	SYS_CONNECTWORKMGR                  = 0x4B4 // 1204
-	SYS_CONNECTS                        = 0x4B5 // 1205
-	SYS_CONNECTSERVER                   = 0x4B5 // 1205
-	SYS_DISCONNE                        = 0x4B6 // 1206
-	SYS_DISCONNECTSERVER                = 0x4B6 // 1206
-	SYS_JOINWORK                        = 0x4B7 // 1207
-	SYS_JOINWORKUNIT                    = 0x4B7 // 1207
-	SYS_LEAVEWOR                        = 0x4B8 // 1208
-	SYS_LEAVEWORKUNIT                   = 0x4B8 // 1208
-	SYS_DELETEWO                        = 0x4B9 // 1209
-	SYS_DELETEWORKUNIT                  = 0x4B9 // 1209
-	SYS_QUERYMET                        = 0x4BA // 1210
-	SYS_QUERYMETRICS                    = 0x4BA // 1210
-	SYS_QUERYSCH                        = 0x4BB // 1211
-	SYS_QUERYSCHENV                     = 0x4BB // 1211
-	SYS_CHECKSCH                        = 0x4BC // 1212
-	SYS_CHECKSCHENV                     = 0x4BC // 1212
-	SYS___PID_AFFINITY                  = 0x4BD // 1213
-	SYS___ASINH_B                       = 0x4BE // 1214
-	SYS___ATAN_B                        = 0x4BF // 1215
-	SYS___CBRT_B                        = 0x4C0 // 1216
-	SYS___CEIL_B                        = 0x4C1 // 1217
-	SYS_COPYSIGN                        = 0x4C2 // 1218
-	SYS___COS_B                         = 0x4C3 // 1219
-	SYS___ERF_B                         = 0x4C4 // 1220
-	SYS___ERFC_B                        = 0x4C5 // 1221
-	SYS___EXPM1_B                       = 0x4C6 // 1222
-	SYS___FABS_B                        = 0x4C7 // 1223
-	SYS_FINITE                          = 0x4C8 // 1224
-	SYS___FLOOR_B                       = 0x4C9 // 1225
-	SYS___FREXP_B                       = 0x4CA // 1226
-	SYS___ILOGB_B                       = 0x4CB // 1227
-	SYS___ISNAN_B                       = 0x4CC // 1228
-	SYS___LDEXP_B                       = 0x4CD // 1229
-	SYS___LOG1P_B                       = 0x4CE // 1230
-	SYS___LOGB_B                        = 0x4CF // 1231
-	SYS_MATHERR                         = 0x4D0 // 1232
-	SYS___MODF_B                        = 0x4D1 // 1233
-	SYS___NEXTAFTER_B                   = 0x4D2 // 1234
-	SYS___RINT_B                        = 0x4D3 // 1235
-	SYS_SCALBN                          = 0x4D4 // 1236
-	SYS_SIGNIFIC                        = 0x4D5 // 1237
-	SYS_SIGNIFICAND                     = 0x4D5 // 1237
-	SYS___SIN_B                         = 0x4D6 // 1238
-	SYS___TAN_B                         = 0x4D7 // 1239
-	SYS___TANH_B                        = 0x4D8 // 1240
-	SYS___ACOS_B                        = 0x4D9 // 1241
-	SYS___ACOSH_B                       = 0x4DA // 1242
-	SYS___ASIN_B                        = 0x4DB // 1243
-	SYS___ATAN2_B                       = 0x4DC // 1244
-	SYS___ATANH_B                       = 0x4DD // 1245
-	SYS___COSH_B                        = 0x4DE // 1246
-	SYS___EXP_B                         = 0x4DF // 1247
-	SYS___FMOD_B                        = 0x4E0 // 1248
-	SYS___GAMMA_B                       = 0x4E1 // 1249
-	SYS_GAMMA_R                         = 0x4E2 // 1250
-	SYS___HYPOT_B                       = 0x4E3 // 1251
-	SYS___J0_B                          = 0x4E4 // 1252
-	SYS___Y0_B                          = 0x4E5 // 1253
-	SYS___J1_B                          = 0x4E6 // 1254
-	SYS___Y1_B                          = 0x4E7 // 1255
-	SYS___JN_B                          = 0x4E8 // 1256
-	SYS___YN_B                          = 0x4E9 // 1257
-	SYS___LGAMMA_B                      = 0x4EA // 1258
-	SYS_LGAMMA_R                        = 0x4EB // 1259
-	SYS___LOG_B                         = 0x4EC // 1260
-	SYS___LOG10_B                       = 0x4ED // 1261
-	SYS___POW_B                         = 0x4EE // 1262
-	SYS___REMAINDER_B                   = 0x4EF // 1263
-	SYS___SCALB_B                       = 0x4F0 // 1264
-	SYS___SINH_B                        = 0x4F1 // 1265
-	SYS___SQRT_B                        = 0x4F2 // 1266
-	SYS___OPENDIR2                      = 0x4F3 // 1267
-	SYS___READDIR2                      = 0x4F4 // 1268
-	SYS___LOGIN                         = 0x4F5 // 1269
-	SYS___OPEN_STAT                     = 0x4F6 // 1270
-	SYS_ACCEPT_AND_RECV                 = 0x4F7 // 1271
-	SYS___FP_SETMODE                    = 0x4F8 // 1272
-	SYS___SIGACTIONSET                  = 0x4FB // 1275
-	SYS___UCREATE                       = 0x4FC // 1276
-	SYS___UMALLOC                       = 0x4FD // 1277
-	SYS___UFREE                         = 0x4FE // 1278
-	SYS___UHEAPREPORT                   = 0x4FF // 1279
-	SYS___ISBFP                         = 0x500 // 1280
-	SYS___FP_CAST                       = 0x501 // 1281
-	SYS___CERTIFICATE                   = 0x502 // 1282
-	SYS_SEND_FILE                       = 0x503 // 1283
-	SYS_AIO_CANCEL                      = 0x504 // 1284
-	SYS_AIO_ERROR                       = 0x505 // 1285
-	SYS_AIO_READ                        = 0x506 // 1286
-	SYS_AIO_RETURN                      = 0x507 // 1287
-	SYS_AIO_SUSPEND                     = 0x508 // 1288
-	SYS_AIO_WRITE                       = 0x509 // 1289
-	SYS_PTHREAD_MUTEXATTR_GETPSHARED    = 0x50A // 1290
-	SYS_PTHREAD_MUTEXATTR_SETPSHARED    = 0x50B // 1291
-	SYS_PTHREAD_RWLOCK_DESTROY          = 0x50C // 1292
-	SYS_PTHREAD_RWLOCK_INIT             = 0x50D // 1293
-	SYS_PTHREAD_RWLOCK_RDLOCK           = 0x50E // 1294
-	SYS_PTHREAD_RWLOCK_TRYRDLOCK        = 0x50F // 1295
-	SYS_PTHREAD_RWLOCK_TRYWRLOCK        = 0x510 // 1296
-	SYS_PTHREAD_RWLOCK_UNLOCK           = 0x511 // 1297
-	SYS_PTHREAD_RWLOCK_WRLOCK           = 0x512 // 1298
-	SYS_PTHREAD_RWLOCKATTR_GETPSHARED   = 0x513 // 1299
-	SYS_PTHREAD_RWLOCKATTR_SETPSHARED   = 0x514 // 1300
-	SYS_PTHREAD_RWLOCKATTR_INIT         = 0x515 // 1301
-	SYS_PTHREAD_RWLOCKATTR_DESTROY      = 0x516 // 1302
-	SYS___CTTBL                         = 0x517 // 1303
-	SYS_PTHREAD_MUTEXATTR_SETTYPE       = 0x518 // 1304
-	SYS_PTHREAD_MUTEXATTR_GETTYPE       = 0x519 // 1305
-	SYS___FP_CLR_FLAG                   = 0x51A // 1306
-	SYS___FP_READ_FLAG                  = 0x51B // 1307
-	SYS___FP_RAISE_XCP                  = 0x51C // 1308
-	SYS___FP_CLASS                      = 0x51D // 1309
-	SYS___FP_FINITE                     = 0x51E // 1310
-	SYS___FP_ISNAN                      = 0x51F // 1311
-	SYS___FP_UNORDERED                  = 0x520 // 1312
-	SYS___FP_READ_RND                   = 0x521 // 1313
-	SYS___FP_READ_RND_B                 = 0x522 // 1314
-	SYS___FP_SWAP_RND                   = 0x523 // 1315
-	SYS___FP_SWAP_RND_B                 = 0x524 // 1316
-	SYS___FP_LEVEL                      = 0x525 // 1317
-	SYS___FP_BTOH                       = 0x526 // 1318
-	SYS___FP_HTOB                       = 0x527 // 1319
-	SYS___FPC_RD                        = 0x528 // 1320
-	SYS___FPC_WR                        = 0x529 // 1321
-	SYS___FPC_RW                        = 0x52A // 1322
-	SYS___FPC_SM                        = 0x52B // 1323
-	SYS___FPC_RS                        = 0x52C // 1324
-	SYS_SIGTIMEDWAIT                    = 0x52D // 1325
-	SYS_SIGWAITINFO                     = 0x52E // 1326
-	SYS___CHKBFP                        = 0x52F // 1327
-	SYS___W_PIOCTL                      = 0x59E // 1438
-	SYS___OSENV                         = 0x59F // 1439
-	SYS_EXPORTWO                        = 0x5A1 // 1441
-	SYS_EXPORTWORKUNIT                  = 0x5A1 // 1441
-	SYS_UNDOEXPO                        = 0x5A2 // 1442
-	SYS_UNDOEXPORTWORKUNIT              = 0x5A2 // 1442
-	SYS_IMPORTWO                        = 0x5A3 // 1443
-	SYS_IMPORTWORKUNIT                  = 0x5A3 // 1443
-	SYS_UNDOIMPO                        = 0x5A4 // 1444
-	SYS_UNDOIMPORTWORKUNIT              = 0x5A4 // 1444
-	SYS_EXTRACTW                        = 0x5A5 // 1445
-	SYS_EXTRACTWORKUNIT                 = 0x5A5 // 1445
-	SYS___CPL                           = 0x5A6 // 1446
-	SYS___MAP_INIT                      = 0x5A7 // 1447
-	SYS___MAP_SERVICE                   = 0x5A8 // 1448
-	SYS_SIGQUEUE                        = 0x5A9 // 1449
-	SYS___MOUNT                         = 0x5AA // 1450
-	SYS___GETUSERID                     = 0x5AB // 1451
-	SYS___IPDOMAINNAME                  = 0x5AC // 1452
-	SYS_QUERYENC                        = 0x5AD // 1453
-	SYS_QUERYWORKUNITCLASSIFICATION     = 0x5AD // 1453
-	SYS_CONNECTE                        = 0x5AE // 1454
-	SYS_CONNECTEXPORTIMPORT             = 0x5AE // 1454
-	SYS___FP_SWAPMODE                   = 0x5AF // 1455
-	SYS_STRTOLL                         = 0x5B0 // 1456
-	SYS_STRTOULL                        = 0x5B1 // 1457
-	SYS___DSA_PREV                      = 0x5B2 // 1458
-	SYS___EP_FIND                       = 0x5B3 // 1459
-	SYS___SERVER_THREADS_QUERY          = 0x5B4 // 1460
-	SYS___MSGRCV_TIMED                  = 0x5B7 // 1463
-	SYS___SEMOP_TIMED                   = 0x5B8 // 1464
-	SYS___GET_CPUID                     = 0x5B9 // 1465
-	SYS___GET_SYSTEM_SETTINGS           = 0x5BA // 1466
-	SYS_FTELLO                          = 0x5C8 // 1480
-	SYS_FSEEKO                          = 0x5C9 // 1481
-	SYS_LLDIV                           = 0x5CB // 1483
-	SYS_WCSTOLL                         = 0x5CC // 1484
-	SYS_WCSTOULL                        = 0x5CD // 1485
-	SYS_LLABS                           = 0x5CE // 1486
-	SYS___CONSOLE2                      = 0x5D2 // 1490
-	SYS_INET_NTOP                       = 0x5D3 // 1491
-	SYS_INET_PTON                       = 0x5D4 // 1492
-	SYS___RES                           = 0x5D6 // 1494
-	SYS_RES_MKQUERY                     = 0x5D7 // 1495
-	SYS_RES_INIT                        = 0x5D8 // 1496
-	SYS_RES_QUERY                       = 0x5D9 // 1497
-	SYS_RES_SEARCH                      = 0x5DA // 1498
-	SYS_RES_SEND                        = 0x5DB // 1499
-	SYS_RES_QUERYDOMAIN                 = 0x5DC // 1500
-	SYS_DN_EXPAND                       = 0x5DD // 1501
-	SYS_DN_SKIPNAME                     = 0x5DE // 1502
-	SYS_DN_COMP                         = 0x5DF // 1503
-	SYS_ASCTIME_R                       = 0x5E0 // 1504
-	SYS_CTIME_R                         = 0x5E1 // 1505
-	SYS_GMTIME_R                        = 0x5E2 // 1506
-	SYS_LOCALTIME_R                     = 0x5E3 // 1507
-	SYS_RAND_R                          = 0x5E4 // 1508
-	SYS_STRTOK_R                        = 0x5E5 // 1509
-	SYS_READDIR_R                       = 0x5E6 // 1510
-	SYS_GETGRGID_R                      = 0x5E7 // 1511
-	SYS_GETGRNAM_R                      = 0x5E8 // 1512
-	SYS_GETLOGIN_R                      = 0x5E9 // 1513
-	SYS_GETPWNAM_R                      = 0x5EA // 1514
-	SYS_GETPWUID_R                      = 0x5EB // 1515
-	SYS_TTYNAME_R                       = 0x5EC // 1516
-	SYS_PTHREAD_ATFORK                  = 0x5ED // 1517
-	SYS_PTHREAD_ATTR_GETGUARDSIZE       = 0x5EE // 1518
-	SYS_PTHREAD_ATTR_GETSTACKADDR       = 0x5EF // 1519
-	SYS_PTHREAD_ATTR_SETGUARDSIZE       = 0x5F0 // 1520
-	SYS_PTHREAD_ATTR_SETSTACKADDR       = 0x5F1 // 1521
-	SYS_PTHREAD_CONDATTR_GETPSHARED     = 0x5F2 // 1522
-	SYS_PTHREAD_CONDATTR_SETPSHARED     = 0x5F3 // 1523
-	SYS_PTHREAD_GETCONCURRENCY          = 0x5F4 // 1524
-	SYS_PTHREAD_KEY_DELETE              = 0x5F5 // 1525
-	SYS_PTHREAD_SETCONCURRENCY          = 0x5F6 // 1526
-	SYS_PTHREAD_SIGMASK                 = 0x5F7 // 1527
-	SYS___DISCARDDATA                   = 0x5F8 // 1528
-	SYS_PTHREAD_ATTR_GETSCHEDPARAM      = 0x5F9 // 1529
-	SYS_PTHREAD_ATTR_SETSCHEDPARAM      = 0x5FA // 1530
-	SYS_PTHREAD_ATTR_GETDETACHSTATE_U98 = 0x5FB // 1531
-	SYS_PTHREAD_ATTR_SETDETACHSTATE_U98 = 0x5FC // 1532
-	SYS_PTHREAD_DETACH_U98              = 0x5FD // 1533
-	SYS_PTHREAD_GETSPECIFIC_U98         = 0x5FE // 1534
-	SYS_PTHREAD_SETCANCELSTATE          = 0x5FF // 1535
-	SYS_PTHREAD_SETCANCELTYPE           = 0x600 // 1536
-	SYS_PTHREAD_TESTCANCEL              = 0x601 // 1537
-	SYS___ATANF_B                       = 0x602 // 1538
-	SYS___ATANL_B                       = 0x603 // 1539
-	SYS___CEILF_B                       = 0x604 // 1540
-	SYS___CEILL_B                       = 0x605 // 1541
-	SYS___COSF_B                        = 0x606 // 1542
-	SYS___COSL_B                        = 0x607 // 1543
-	SYS___FABSF_B                       = 0x608 // 1544
-	SYS___FABSL_B                       = 0x609 // 1545
-	SYS___FLOORF_B                      = 0x60A // 1546
-	SYS___FLOORL_B                      = 0x60B // 1547
-	SYS___FREXPF_B                      = 0x60C // 1548
-	SYS___FREXPL_B                      = 0x60D // 1549
-	SYS___LDEXPF_B                      = 0x60E // 1550
-	SYS___LDEXPL_B                      = 0x60F // 1551
-	SYS___SINF_B                        = 0x610 // 1552
-	SYS___SINL_B                        = 0x611 // 1553
-	SYS___TANF_B                        = 0x612 // 1554
-	SYS___TANL_B                        = 0x613 // 1555
-	SYS___TANHF_B                       = 0x614 // 1556
-	SYS___TANHL_B                       = 0x615 // 1557
-	SYS___ACOSF_B                       = 0x616 // 1558
-	SYS___ACOSL_B                       = 0x617 // 1559
-	SYS___ASINF_B                       = 0x618 // 1560
-	SYS___ASINL_B                       = 0x619 // 1561
-	SYS___ATAN2F_B                      = 0x61A // 1562
-	SYS___ATAN2L_B                      = 0x61B // 1563
-	SYS___COSHF_B                       = 0x61C // 1564
-	SYS___COSHL_B                       = 0x61D // 1565
-	SYS___EXPF_B                        = 0x61E // 1566
-	SYS___EXPL_B                        = 0x61F // 1567
-	SYS___LOGF_B                        = 0x620 // 1568
-	SYS___LOGL_B                        = 0x621 // 1569
-	SYS___LOG10F_B                      = 0x622 // 1570
-	SYS___LOG10L_B                      = 0x623 // 1571
-	SYS___POWF_B                        = 0x624 // 1572
-	SYS___POWL_B                        = 0x625 // 1573
-	SYS___SINHF_B                       = 0x626 // 1574
-	SYS___SINHL_B                       = 0x627 // 1575
-	SYS___SQRTF_B                       = 0x628 // 1576
-	SYS___SQRTL_B                       = 0x629 // 1577
-	SYS___ABSF_B                        = 0x62A // 1578
-	SYS___ABS_B                         = 0x62B // 1579
-	SYS___ABSL_B                        = 0x62C // 1580
-	SYS___FMODF_B                       = 0x62D // 1581
-	SYS___FMODL_B                       = 0x62E // 1582
-	SYS___MODFF_B                       = 0x62F // 1583
-	SYS___MODFL_B                       = 0x630 // 1584
-	SYS_ABSF                            = 0x631 // 1585
-	SYS_ABSL                            = 0x632 // 1586
-	SYS_ACOSF                           = 0x633 // 1587
-	SYS_ACOSL                           = 0x634 // 1588
-	SYS_ASINF                           = 0x635 // 1589
-	SYS_ASINL                           = 0x636 // 1590
-	SYS_ATAN2F                          = 0x637 // 1591
-	SYS_ATAN2L                          = 0x638 // 1592
-	SYS_ATANF                           = 0x639 // 1593
-	SYS_ATANL                           = 0x63A // 1594
-	SYS_CEILF                           = 0x63B // 1595
-	SYS_CEILL                           = 0x63C // 1596
-	SYS_COSF                            = 0x63D // 1597
-	SYS_COSL                            = 0x63E // 1598
-	SYS_COSHF                           = 0x63F // 1599
-	SYS_COSHL                           = 0x640 // 1600
-	SYS_EXPF                            = 0x641 // 1601
-	SYS_EXPL                            = 0x642 // 1602
-	SYS_TANHF                           = 0x643 // 1603
-	SYS_TANHL                           = 0x644 // 1604
-	SYS_LOG10F                          = 0x645 // 1605
-	SYS_LOG10L                          = 0x646 // 1606
-	SYS_LOGF                            = 0x647 // 1607
-	SYS_LOGL                            = 0x648 // 1608
-	SYS_POWF                            = 0x649 // 1609
-	SYS_POWL                            = 0x64A // 1610
-	SYS_SINF                            = 0x64B // 1611
-	SYS_SINL                            = 0x64C // 1612
-	SYS_SQRTF                           = 0x64D // 1613
-	SYS_SQRTL                           = 0x64E // 1614
-	SYS_SINHF                           = 0x64F // 1615
-	SYS_SINHL                           = 0x650 // 1616
-	SYS_TANF                            = 0x651 // 1617
-	SYS_TANL                            = 0x652 // 1618
-	SYS_FABSF                           = 0x653 // 1619
-	SYS_FABSL                           = 0x654 // 1620
-	SYS_FLOORF                          = 0x655 // 1621
-	SYS_FLOORL                          = 0x656 // 1622
-	SYS_FMODF                           = 0x657 // 1623
-	SYS_FMODL                           = 0x658 // 1624
-	SYS_FREXPF                          = 0x659 // 1625
-	SYS_FREXPL                          = 0x65A // 1626
-	SYS_LDEXPF                          = 0x65B // 1627
-	SYS_LDEXPL                          = 0x65C // 1628
-	SYS_MODFF                           = 0x65D // 1629
-	SYS_MODFL                           = 0x65E // 1630
-	SYS_BTOWC                           = 0x65F // 1631
-	SYS___CHATTR                        = 0x660 // 1632
-	SYS___FCHATTR                       = 0x661 // 1633
-	SYS___TOCCSID                       = 0x662 // 1634
-	SYS___CSNAMETYPE                    = 0x663 // 1635
-	SYS___TOCSNAME                      = 0x664 // 1636
-	SYS___CCSIDTYPE                     = 0x665 // 1637
-	SYS___AE_CORRESTBL_QUERY            = 0x666 // 1638
-	SYS___AE_AUTOCONVERT_STATE          = 0x667 // 1639
-	SYS_DN_FIND                         = 0x668 // 1640
-	SYS___GETHOSTBYADDR_A               = 0x669 // 1641
-	SYS___GETHOSTBYNAME_A               = 0x66A // 1642
-	SYS___RES_INIT_A                    = 0x66B // 1643
-	SYS___GETHOSTBYADDR_R_A             = 0x66C // 1644
-	SYS___GETHOSTBYNAME_R_A             = 0x66D // 1645
-	SYS___CHARMAP_INIT_A                = 0x66E // 1646
-	SYS___MBLEN_A                       = 0x66F // 1647
-	SYS___MBLEN_SB_A                    = 0x670 // 1648
-	SYS___MBLEN_STD_A                   = 0x671 // 1649
-	SYS___MBLEN_UTF                     = 0x672 // 1650
-	SYS___MBSTOWCS_A                    = 0x673 // 1651
-	SYS___MBSTOWCS_STD_A                = 0x674 // 1652
-	SYS___MBTOWC_A                      = 0x675 // 1653
-	SYS___MBTOWC_ISO1                   = 0x676 // 1654
-	SYS___MBTOWC_SBCS                   = 0x677 // 1655
-	SYS___MBTOWC_MBCS                   = 0x678 // 1656
-	SYS___MBTOWC_UTF                    = 0x679 // 1657
-	SYS___WCSTOMBS_A                    = 0x67A // 1658
-	SYS___WCSTOMBS_STD_A                = 0x67B // 1659
-	SYS___WCSWIDTH_A                    = 0x67C // 1660
-	SYS___GETGRGID_R_A                  = 0x67D // 1661
-	SYS___WCSWIDTH_STD_A                = 0x67E // 1662
-	SYS___WCSWIDTH_ASIA                 = 0x67F // 1663
-	SYS___CSID_A                        = 0x680 // 1664
-	SYS___CSID_STD_A                    = 0x681 // 1665
-	SYS___WCSID_A                       = 0x682 // 1666
-	SYS___WCSID_STD_A                   = 0x683 // 1667
-	SYS___WCTOMB_A                      = 0x684 // 1668
-	SYS___WCTOMB_ISO1                   = 0x685 // 1669
-	SYS___WCTOMB_STD_A                  = 0x686 // 1670
-	SYS___WCTOMB_UTF                    = 0x687 // 1671
-	SYS___WCWIDTH_A                     = 0x688 // 1672
-	SYS___GETGRNAM_R_A                  = 0x689 // 1673
-	SYS___WCWIDTH_STD_A                 = 0x68A // 1674
-	SYS___WCWIDTH_ASIA                  = 0x68B // 1675
-	SYS___GETPWNAM_R_A                  = 0x68C // 1676
-	SYS___GETPWUID_R_A                  = 0x68D // 1677
-	SYS___GETLOGIN_R_A                  = 0x68E // 1678
-	SYS___TTYNAME_R_A                   = 0x68F // 1679
-	SYS___READDIR_R_A                   = 0x690 // 1680
-	SYS___E2A_S                         = 0x691 // 1681
-	SYS___FNMATCH_A                     = 0x692 // 1682
-	SYS___FNMATCH_C_A                   = 0x693 // 1683
-	SYS___EXECL_A                       = 0x694 // 1684
-	SYS___FNMATCH_STD_A                 = 0x695 // 1685
-	SYS___REGCOMP_A                     = 0x696 // 1686
-	SYS___REGCOMP_STD_A                 = 0x697 // 1687
-	SYS___REGERROR_A                    = 0x698 // 1688
-	SYS___REGERROR_STD_A                = 0x699 // 1689
-	SYS___REGEXEC_A                     = 0x69A // 1690
-	SYS___REGEXEC_STD_A                 = 0x69B // 1691
-	SYS___REGFREE_A                     = 0x69C // 1692
-	SYS___REGFREE_STD_A                 = 0x69D // 1693
-	SYS___STRCOLL_A                     = 0x69E // 1694
-	SYS___STRCOLL_C_A                   = 0x69F // 1695
-	SYS___EXECLE_A                      = 0x6A0 // 1696
-	SYS___STRCOLL_STD_A                 = 0x6A1 // 1697
-	SYS___STRXFRM_A                     = 0x6A2 // 1698
-	SYS___STRXFRM_C_A                   = 0x6A3 // 1699
-	SYS___EXECLP_A                      = 0x6A4 // 1700
-	SYS___STRXFRM_STD_A                 = 0x6A5 // 1701
-	SYS___WCSCOLL_A                     = 0x6A6 // 1702
-	SYS___WCSCOLL_C_A                   = 0x6A7 // 1703
-	SYS___WCSCOLL_STD_A                 = 0x6A8 // 1704
-	SYS___WCSXFRM_A                     = 0x6A9 // 1705
-	SYS___WCSXFRM_C_A                   = 0x6AA // 1706
-	SYS___WCSXFRM_STD_A                 = 0x6AB // 1707
-	SYS___COLLATE_INIT_A                = 0x6AC // 1708
-	SYS___WCTYPE_A                      = 0x6AD // 1709
-	SYS___GET_WCTYPE_STD_A              = 0x6AE // 1710
-	SYS___CTYPE_INIT_A                  = 0x6AF // 1711
-	SYS___ISWCTYPE_A                    = 0x6B0 // 1712
-	SYS___EXECV_A                       = 0x6B1 // 1713
-	SYS___IS_WCTYPE_STD_A               = 0x6B2 // 1714
-	SYS___TOWLOWER_A                    = 0x6B3 // 1715
-	SYS___TOWLOWER_STD_A                = 0x6B4 // 1716
-	SYS___TOWUPPER_A                    = 0x6B5 // 1717
-	SYS___TOWUPPER_STD_A                = 0x6B6 // 1718
-	SYS___LOCALE_INIT_A                 = 0x6B7 // 1719
-	SYS___LOCALECONV_A                  = 0x6B8 // 1720
-	SYS___LOCALECONV_STD_A              = 0x6B9 // 1721
-	SYS___NL_LANGINFO_A                 = 0x6BA // 1722
-	SYS___NL_LNAGINFO_STD_A             = 0x6BB // 1723
-	SYS___MONETARY_INIT_A               = 0x6BC // 1724
-	SYS___STRFMON_A                     = 0x6BD // 1725
-	SYS___STRFMON_STD_A                 = 0x6BE // 1726
-	SYS___GETADDRINFO_A                 = 0x6BF // 1727
-	SYS___CATGETS_A                     = 0x6C0 // 1728
-	SYS___EXECVE_A                      = 0x6C1 // 1729
-	SYS___EXECVP_A                      = 0x6C2 // 1730
-	SYS___SPAWN_A                       = 0x6C3 // 1731
-	SYS___GETNAMEINFO_A                 = 0x6C4 // 1732
-	SYS___SPAWNP_A                      = 0x6C5 // 1733
-	SYS___NUMERIC_INIT_A                = 0x6C6 // 1734
-	SYS___RESP_INIT_A                   = 0x6C7 // 1735
-	SYS___RPMATCH_A                     = 0x6C8 // 1736
-	SYS___RPMATCH_C_A                   = 0x6C9 // 1737
-	SYS___RPMATCH_STD_A                 = 0x6CA // 1738
-	SYS___TIME_INIT_A                   = 0x6CB // 1739
-	SYS___STRFTIME_A                    = 0x6CC // 1740
-	SYS___STRFTIME_STD_A                = 0x6CD // 1741
-	SYS___STRPTIME_A                    = 0x6CE // 1742
-	SYS___STRPTIME_STD_A                = 0x6CF // 1743
-	SYS___WCSFTIME_A                    = 0x6D0 // 1744
-	SYS___WCSFTIME_STD_A                = 0x6D1 // 1745
-	SYS_____SPAWN2_A                    = 0x6D2 // 1746
-	SYS_____SPAWNP2_A                   = 0x6D3 // 1747
-	SYS___SYNTAX_INIT_A                 = 0x6D4 // 1748
-	SYS___TOD_INIT_A                    = 0x6D5 // 1749
-	SYS___NL_CSINFO_A                   = 0x6D6 // 1750
-	SYS___NL_MONINFO_A                  = 0x6D7 // 1751
-	SYS___NL_NUMINFO_A                  = 0x6D8 // 1752
-	SYS___NL_RESPINFO_A                 = 0x6D9 // 1753
-	SYS___NL_TIMINFO_A                  = 0x6DA // 1754
-	SYS___IF_NAMETOINDEX_A              = 0x6DB // 1755
-	SYS___IF_INDEXTONAME_A              = 0x6DC // 1756
-	SYS___PRINTF_A                      = 0x6DD // 1757
-	SYS___ICONV_OPEN_A                  = 0x6DE // 1758
-	SYS___DLLLOAD_A                     = 0x6DF // 1759
-	SYS___DLLQUERYFN_A                  = 0x6E0 // 1760
-	SYS___DLLQUERYVAR_A                 = 0x6E1 // 1761
-	SYS_____CHATTR_A                    = 0x6E2 // 1762
-	SYS___E2A_L                         = 0x6E3 // 1763
-	SYS_____TOCCSID_A                   = 0x6E4 // 1764
-	SYS_____TOCSNAME_A                  = 0x6E5 // 1765
-	SYS_____CCSIDTYPE_A                 = 0x6E6 // 1766
-	SYS_____CSNAMETYPE_A                = 0x6E7 // 1767
-	SYS___CHMOD_A                       = 0x6E8 // 1768
-	SYS___MKDIR_A                       = 0x6E9 // 1769
-	SYS___STAT_A                        = 0x6EA // 1770
-	SYS___STAT_O_A                      = 0x6EB // 1771
-	SYS___MKFIFO_A                      = 0x6EC // 1772
-	SYS_____OPEN_STAT_A                 = 0x6ED // 1773
-	SYS___LSTAT_A                       = 0x6EE // 1774
-	SYS___LSTAT_O_A                     = 0x6EF // 1775
-	SYS___MKNOD_A                       = 0x6F0 // 1776
-	SYS___MOUNT_A                       = 0x6F1 // 1777
-	SYS___UMOUNT_A                      = 0x6F2 // 1778
-	SYS___CHAUDIT_A                     = 0x6F4 // 1780
-	SYS___W_GETMNTENT_A                 = 0x6F5 // 1781
-	SYS___CREAT_A                       = 0x6F6 // 1782
-	SYS___OPEN_A                        = 0x6F7 // 1783
-	SYS___SETLOCALE_A                   = 0x6F9 // 1785
-	SYS___FPRINTF_A                     = 0x6FA // 1786
-	SYS___SPRINTF_A                     = 0x6FB // 1787
-	SYS___VFPRINTF_A                    = 0x6FC // 1788
-	SYS___VPRINTF_A                     = 0x6FD // 1789
-	SYS___VSPRINTF_A                    = 0x6FE // 1790
-	SYS___VSWPRINTF_A                   = 0x6FF // 1791
-	SYS___SWPRINTF_A                    = 0x700 // 1792
-	SYS___FSCANF_A                      = 0x701 // 1793
-	SYS___SCANF_A                       = 0x702 // 1794
-	SYS___SSCANF_A                      = 0x703 // 1795
-	SYS___SWSCANF_A                     = 0x704 // 1796
-	SYS___ATOF_A                        = 0x705 // 1797
-	SYS___ATOI_A                        = 0x706 // 1798
-	SYS___ATOL_A                        = 0x707 // 1799
-	SYS___STRTOD_A                      = 0x708 // 1800
-	SYS___STRTOL_A                      = 0x709 // 1801
-	SYS___STRTOUL_A                     = 0x70A // 1802
-	SYS_____AE_CORRESTBL_QUERY_A        = 0x70B // 1803
-	SYS___A64L_A                        = 0x70C // 1804
-	SYS___ECVT_A                        = 0x70D // 1805
-	SYS___FCVT_A                        = 0x70E // 1806
-	SYS___GCVT_A                        = 0x70F // 1807
-	SYS___L64A_A                        = 0x710 // 1808
-	SYS___STRERROR_A                    = 0x711 // 1809
-	SYS___PERROR_A                      = 0x712 // 1810
-	SYS___FETCH_A                       = 0x713 // 1811
-	SYS___GETENV_A                      = 0x714 // 1812
-	SYS___MKSTEMP_A                     = 0x717 // 1815
-	SYS___PTSNAME_A                     = 0x718 // 1816
-	SYS___PUTENV_A                      = 0x719 // 1817
-	SYS___REALPATH_A                    = 0x71A // 1818
-	SYS___SETENV_A                      = 0x71B // 1819
-	SYS___SYSTEM_A                      = 0x71C // 1820
-	SYS___GETOPT_A                      = 0x71D // 1821
-	SYS___CATOPEN_A                     = 0x71E // 1822
-	SYS___ACCESS_A                      = 0x71F // 1823
-	SYS___CHDIR_A                       = 0x720 // 1824
-	SYS___CHOWN_A                       = 0x721 // 1825
-	SYS___CHROOT_A                      = 0x722 // 1826
-	SYS___GETCWD_A                      = 0x723 // 1827
-	SYS___GETWD_A                       = 0x724 // 1828
-	SYS___LCHOWN_A                      = 0x725 // 1829
-	SYS___LINK_A                        = 0x726 // 1830
-	SYS___PATHCONF_A                    = 0x727 // 1831
-	SYS___IF_NAMEINDEX_A                = 0x728 // 1832
-	SYS___READLINK_A                    = 0x729 // 1833
-	SYS___RMDIR_A                       = 0x72A // 1834
-	SYS___STATVFS_A                     = 0x72B // 1835
-	SYS___SYMLINK_A                     = 0x72C // 1836
-	SYS___TRUNCATE_A                    = 0x72D // 1837
-	SYS___UNLINK_A                      = 0x72E // 1838
-	SYS___GAI_STRERROR_A                = 0x72F // 1839
-	SYS___EXTLINK_NP_A                  = 0x730 // 1840
-	SYS___ISALNUM_A                     = 0x731 // 1841
-	SYS___ISALPHA_A                     = 0x732 // 1842
-	SYS___A2E_S                         = 0x733 // 1843
-	SYS___ISCNTRL_A                     = 0x734 // 1844
-	SYS___ISDIGIT_A                     = 0x735 // 1845
-	SYS___ISGRAPH_A                     = 0x736 // 1846
-	SYS___ISLOWER_A                     = 0x737 // 1847
-	SYS___ISPRINT_A                     = 0x738 // 1848
-	SYS___ISPUNCT_A                     = 0x739 // 1849
-	SYS___ISSPACE_A                     = 0x73A // 1850
-	SYS___ISUPPER_A                     = 0x73B // 1851
-	SYS___ISXDIGIT_A                    = 0x73C // 1852
-	SYS___TOLOWER_A                     = 0x73D // 1853
-	SYS___TOUPPER_A                     = 0x73E // 1854
-	SYS___ISWALNUM_A                    = 0x73F // 1855
-	SYS___ISWALPHA_A                    = 0x740 // 1856
-	SYS___A2E_L                         = 0x741 // 1857
-	SYS___ISWCNTRL_A                    = 0x742 // 1858
-	SYS___ISWDIGIT_A                    = 0x743 // 1859
-	SYS___ISWGRAPH_A                    = 0x744 // 1860
-	SYS___ISWLOWER_A                    = 0x745 // 1861
-	SYS___ISWPRINT_A                    = 0x746 // 1862
-	SYS___ISWPUNCT_A                    = 0x747 // 1863
-	SYS___ISWSPACE_A                    = 0x748 // 1864
-	SYS___ISWUPPER_A                    = 0x749 // 1865
-	SYS___ISWXDIGIT_A                   = 0x74A // 1866
-	SYS___CONFSTR_A                     = 0x74B // 1867
-	SYS___FTOK_A                        = 0x74C // 1868
-	SYS___MKTEMP_A                      = 0x74D // 1869
-	SYS___FDOPEN_A                      = 0x74E // 1870
-	SYS___FLDATA_A                      = 0x74F // 1871
-	SYS___REMOVE_A                      = 0x750 // 1872
-	SYS___RENAME_A                      = 0x751 // 1873
-	SYS___TMPNAM_A                      = 0x752 // 1874
-	SYS___FOPEN_A                       = 0x753 // 1875
-	SYS___FREOPEN_A                     = 0x754 // 1876
-	SYS___CUSERID_A                     = 0x755 // 1877
-	SYS___POPEN_A                       = 0x756 // 1878
-	SYS___TEMPNAM_A                     = 0x757 // 1879
-	SYS___FTW_A                         = 0x758 // 1880
-	SYS___GETGRENT_A                    = 0x759 // 1881
-	SYS___GETGRGID_A                    = 0x75A // 1882
-	SYS___GETGRNAM_A                    = 0x75B // 1883
-	SYS___GETGROUPSBYNAME_A             = 0x75C // 1884
-	SYS___GETHOSTENT_A                  = 0x75D // 1885
-	SYS___GETHOSTNAME_A                 = 0x75E // 1886
-	SYS___GETLOGIN_A                    = 0x75F // 1887
-	SYS___INET_NTOP_A                   = 0x760 // 1888
-	SYS___GETPASS_A                     = 0x761 // 1889
-	SYS___GETPWENT_A                    = 0x762 // 1890
-	SYS___GETPWNAM_A                    = 0x763 // 1891
-	SYS___GETPWUID_A                    = 0x764 // 1892
-	SYS_____CHECK_RESOURCE_AUTH_NP_A    = 0x765 // 1893
-	SYS___CHECKSCHENV_A                 = 0x766 // 1894
-	SYS___CONNECTSERVER_A               = 0x767 // 1895
-	SYS___CONNECTWORKMGR_A              = 0x768 // 1896
-	SYS_____CONSOLE_A                   = 0x769 // 1897
-	SYS___CREATEWORKUNIT_A              = 0x76A // 1898
-	SYS___CTERMID_A                     = 0x76B // 1899
-	SYS___FMTMSG_A                      = 0x76C // 1900
-	SYS___INITGROUPS_A                  = 0x76D // 1901
-	SYS_____LOGIN_A                     = 0x76E // 1902
-	SYS___MSGRCV_A                      = 0x76F // 1903
-	SYS___MSGSND_A                      = 0x770 // 1904
-	SYS___MSGXRCV_A                     = 0x771 // 1905
-	SYS___NFTW_A                        = 0x772 // 1906
-	SYS_____PASSWD_A                    = 0x773 // 1907
-	SYS___PTHREAD_SECURITY_NP_A         = 0x774 // 1908
-	SYS___QUERYMETRICS_A                = 0x775 // 1909
-	SYS___QUERYSCHENV                   = 0x776 // 1910
-	SYS___READV_A                       = 0x777 // 1911
-	SYS_____SERVER_CLASSIFY_A           = 0x778 // 1912
-	SYS_____SERVER_INIT_A               = 0x779 // 1913
-	SYS_____SERVER_PWU_A                = 0x77A // 1914
-	SYS___STRCASECMP_A                  = 0x77B // 1915
-	SYS___STRNCASECMP_A                 = 0x77C // 1916
-	SYS___TTYNAME_A                     = 0x77D // 1917
-	SYS___UNAME_A                       = 0x77E // 1918
-	SYS___UTIMES_A                      = 0x77F // 1919
-	SYS___W_GETPSENT_A                  = 0x780 // 1920
-	SYS___WRITEV_A                      = 0x781 // 1921
-	SYS___W_STATFS_A                    = 0x782 // 1922
-	SYS___W_STATVFS_A                   = 0x783 // 1923
-	SYS___FPUTC_A                       = 0x784 // 1924
-	SYS___PUTCHAR_A                     = 0x785 // 1925
-	SYS___PUTS_A                        = 0x786 // 1926
-	SYS___FGETS_A                       = 0x787 // 1927
-	SYS___GETS_A                        = 0x788 // 1928
-	SYS___FPUTS_A                       = 0x789 // 1929
-	SYS___FREAD_A                       = 0x78A // 1930
-	SYS___FWRITE_A                      = 0x78B // 1931
-	SYS___OPEN_O_A                      = 0x78C // 1932
-	SYS___ISASCII                       = 0x78D // 1933
-	SYS___CREAT_O_A                     = 0x78E // 1934
-	SYS___ENVNA                         = 0x78F // 1935
-	SYS___PUTC_A                        = 0x790 // 1936
-	SYS___AE_THREAD_SETMODE             = 0x791 // 1937
-	SYS___AE_THREAD_SWAPMODE            = 0x792 // 1938
-	SYS___GETNETBYADDR_A                = 0x793 // 1939
-	SYS___GETNETBYNAME_A                = 0x794 // 1940
-	SYS___GETNETENT_A                   = 0x795 // 1941
-	SYS___GETPROTOBYNAME_A              = 0x796 // 1942
-	SYS___GETPROTOBYNUMBER_A            = 0x797 // 1943
-	SYS___GETPROTOENT_A                 = 0x798 // 1944
-	SYS___GETSERVBYNAME_A               = 0x799 // 1945
-	SYS___GETSERVBYPORT_A               = 0x79A // 1946
-	SYS___GETSERVENT_A                  = 0x79B // 1947
-	SYS___ASCTIME_A                     = 0x79C // 1948
-	SYS___CTIME_A                       = 0x79D // 1949
-	SYS___GETDATE_A                     = 0x79E // 1950
-	SYS___TZSET_A                       = 0x79F // 1951
-	SYS___UTIME_A                       = 0x7A0 // 1952
-	SYS___ASCTIME_R_A                   = 0x7A1 // 1953
-	SYS___CTIME_R_A                     = 0x7A2 // 1954
-	SYS___STRTOLL_A                     = 0x7A3 // 1955
-	SYS___STRTOULL_A                    = 0x7A4 // 1956
-	SYS___FPUTWC_A                      = 0x7A5 // 1957
-	SYS___PUTWC_A                       = 0x7A6 // 1958
-	SYS___PUTWCHAR_A                    = 0x7A7 // 1959
-	SYS___FPUTWS_A                      = 0x7A8 // 1960
-	SYS___UNGETWC_A                     = 0x7A9 // 1961
-	SYS___FGETWC_A                      = 0x7AA // 1962
-	SYS___GETWC_A                       = 0x7AB // 1963
-	SYS___GETWCHAR_A                    = 0x7AC // 1964
-	SYS___FGETWS_A                      = 0x7AD // 1965
-	SYS___GETTIMEOFDAY_A                = 0x7AE // 1966
-	SYS___GMTIME_A                      = 0x7AF // 1967
-	SYS___GMTIME_R_A                    = 0x7B0 // 1968
-	SYS___LOCALTIME_A                   = 0x7B1 // 1969
-	SYS___LOCALTIME_R_A                 = 0x7B2 // 1970
-	SYS___MKTIME_A                      = 0x7B3 // 1971
-	SYS___TZZNA                         = 0x7B4 // 1972
-	SYS_UNATEXIT                        = 0x7B5 // 1973
-	SYS___CEE3DMP_A                     = 0x7B6 // 1974
-	SYS___CDUMP_A                       = 0x7B7 // 1975
-	SYS___CSNAP_A                       = 0x7B8 // 1976
-	SYS___CTEST_A                       = 0x7B9 // 1977
-	SYS___CTRACE_A                      = 0x7BA // 1978
-	SYS___VSWPRNTF2_A                   = 0x7BB // 1979
-	SYS___INET_PTON_A                   = 0x7BC // 1980
-	SYS___SYSLOG_A                      = 0x7BD // 1981
-	SYS___CRYPT_A                       = 0x7BE // 1982
-	SYS_____OPENDIR2_A                  = 0x7BF // 1983
-	SYS_____READDIR2_A                  = 0x7C0 // 1984
-	SYS___OPENDIR_A                     = 0x7C2 // 1986
-	SYS___READDIR_A                     = 0x7C3 // 1987
-	SYS_PREAD                           = 0x7C7 // 1991
-	SYS_PWRITE                          = 0x7C8 // 1992
-	SYS_M_CREATE_LAYOUT                 = 0x7C9 // 1993
-	SYS_M_DESTROY_LAYOUT                = 0x7CA // 1994
-	SYS_M_GETVALUES_LAYOUT              = 0x7CB // 1995
-	SYS_M_SETVALUES_LAYOUT              = 0x7CC // 1996
-	SYS_M_TRANSFORM_LAYOUT              = 0x7CD // 1997
-	SYS_M_WTRANSFORM_LAYOUT             = 0x7CE // 1998
-	SYS_FWPRINTF                        = 0x7D1 // 2001
-	SYS_WPRINTF                         = 0x7D2 // 2002
-	SYS_VFWPRINT                        = 0x7D3 // 2003
-	SYS_VFWPRINTF                       = 0x7D3 // 2003
-	SYS_VWPRINTF                        = 0x7D4 // 2004
-	SYS_FWSCANF                         = 0x7D5 // 2005
-	SYS_WSCANF                          = 0x7D6 // 2006
-	SYS_WCTRANS                         = 0x7D7 // 2007
-	SYS_TOWCTRAN                        = 0x7D8 // 2008
-	SYS_TOWCTRANS                       = 0x7D8 // 2008
-	SYS___WCSTOD_A                      = 0x7D9 // 2009
-	SYS___WCSTOL_A                      = 0x7DA // 2010
-	SYS___WCSTOUL_A                     = 0x7DB // 2011
-	SYS___BASENAME_A                    = 0x7DC // 2012
-	SYS___DIRNAME_A                     = 0x7DD // 2013
-	SYS___GLOB_A                        = 0x7DE // 2014
-	SYS_FWIDE                           = 0x7DF // 2015
-	SYS___OSNAME                        = 0x7E0 // 2016
-	SYS_____OSNAME_A                    = 0x7E1 // 2017
-	SYS___BTOWC_A                       = 0x7E4 // 2020
-	SYS___WCTOB_A                       = 0x7E5 // 2021
-	SYS___DBM_OPEN_A                    = 0x7E6 // 2022
-	SYS___VFPRINTF2_A                   = 0x7E7 // 2023
-	SYS___VPRINTF2_A                    = 0x7E8 // 2024
-	SYS___VSPRINTF2_A                   = 0x7E9 // 2025
-	SYS___CEIL_H                        = 0x7EA // 2026
-	SYS___FLOOR_H                       = 0x7EB // 2027
-	SYS___MODF_H                        = 0x7EC // 2028
-	SYS___FABS_H                        = 0x7ED // 2029
-	SYS___J0_H                          = 0x7EE // 2030
-	SYS___J1_H                          = 0x7EF // 2031
-	SYS___JN_H                          = 0x7F0 // 2032
-	SYS___Y0_H                          = 0x7F1 // 2033
-	SYS___Y1_H                          = 0x7F2 // 2034
-	SYS___YN_H                          = 0x7F3 // 2035
-	SYS___CEILF_H                       = 0x7F4 // 2036
-	SYS___CEILL_H                       = 0x7F5 // 2037
-	SYS___FLOORF_H                      = 0x7F6 // 2038
-	SYS___FLOORL_H                      = 0x7F7 // 2039
-	SYS___MODFF_H                       = 0x7F8 // 2040
-	SYS___MODFL_H                       = 0x7F9 // 2041
-	SYS___FABSF_H                       = 0x7FA // 2042
-	SYS___FABSL_H                       = 0x7FB // 2043
-	SYS___MALLOC24                      = 0x7FC // 2044
-	SYS___MALLOC31                      = 0x7FD // 2045
-	SYS_ACL_INIT                        = 0x7FE // 2046
-	SYS_ACL_FREE                        = 0x7FF // 2047
-	SYS_ACL_FIRST_ENTRY                 = 0x800 // 2048
-	SYS_ACL_GET_ENTRY                   = 0x801 // 2049
-	SYS_ACL_VALID                       = 0x802 // 2050
-	SYS_ACL_CREATE_ENTRY                = 0x803 // 2051
-	SYS_ACL_DELETE_ENTRY                = 0x804 // 2052
-	SYS_ACL_UPDATE_ENTRY                = 0x805 // 2053
-	SYS_ACL_DELETE_FD                   = 0x806 // 2054
-	SYS_ACL_DELETE_FILE                 = 0x807 // 2055
-	SYS_ACL_GET_FD                      = 0x808 // 2056
-	SYS_ACL_GET_FILE                    = 0x809 // 2057
-	SYS_ACL_SET_FD                      = 0x80A // 2058
-	SYS_ACL_SET_FILE                    = 0x80B // 2059
-	SYS_ACL_FROM_TEXT                   = 0x80C // 2060
-	SYS_ACL_TO_TEXT                     = 0x80D // 2061
-	SYS_ACL_SORT                        = 0x80E // 2062
-	SYS___SHUTDOWN_REGISTRATION         = 0x80F // 2063
-	SYS___ERFL_B                        = 0x810 // 2064
-	SYS___ERFCL_B                       = 0x811 // 2065
-	SYS___LGAMMAL_B                     = 0x812 // 2066
-	SYS___SETHOOKEVENTS                 = 0x813 // 2067
-	SYS_IF_NAMETOINDEX                  = 0x814 // 2068
-	SYS_IF_INDEXTONAME                  = 0x815 // 2069
-	SYS_IF_NAMEINDEX                    = 0x816 // 2070
-	SYS_IF_FREENAMEINDEX                = 0x817 // 2071
-	SYS_GETADDRINFO                     = 0x818 // 2072
-	SYS_GETNAMEINFO                     = 0x819 // 2073
-	SYS_FREEADDRINFO                    = 0x81A // 2074
-	SYS_GAI_STRERROR                    = 0x81B // 2075
-	SYS_REXEC_AF                        = 0x81C // 2076
-	SYS___POE                           = 0x81D // 2077
-	SYS___DYNALLOC_A                    = 0x81F // 2079
-	SYS___DYNFREE_A                     = 0x820 // 2080
-	SYS___RES_QUERY_A                   = 0x821 // 2081
-	SYS___RES_SEARCH_A                  = 0x822 // 2082
-	SYS___RES_QUERYDOMAIN_A             = 0x823 // 2083
-	SYS___RES_MKQUERY_A                 = 0x824 // 2084
-	SYS___RES_SEND_A                    = 0x825 // 2085
-	SYS___DN_EXPAND_A                   = 0x826 // 2086
-	SYS___DN_SKIPNAME_A                 = 0x827 // 2087
-	SYS___DN_COMP_A                     = 0x828 // 2088
-	SYS___DN_FIND_A                     = 0x829 // 2089
-	SYS___NLIST_A                       = 0x82A // 2090
-	SYS_____TCGETCP_A                   = 0x82B // 2091
-	SYS_____TCSETCP_A                   = 0x82C // 2092
-	SYS_____W_PIOCTL_A                  = 0x82E // 2094
-	SYS___INET_ADDR_A                   = 0x82F // 2095
-	SYS___INET_NTOA_A                   = 0x830 // 2096
-	SYS___INET_NETWORK_A                = 0x831 // 2097
-	SYS___ACCEPT_A                      = 0x832 // 2098
-	SYS___ACCEPT_AND_RECV_A             = 0x833 // 2099
-	SYS___BIND_A                        = 0x834 // 2100
-	SYS___CONNECT_A                     = 0x835 // 2101
-	SYS___GETPEERNAME_A                 = 0x836 // 2102
-	SYS___GETSOCKNAME_A                 = 0x837 // 2103
-	SYS___RECVFROM_A                    = 0x838 // 2104
-	SYS___SENDTO_A                      = 0x839 // 2105
-	SYS___SENDMSG_A                     = 0x83A // 2106
-	SYS___RECVMSG_A                     = 0x83B // 2107
-	SYS_____LCHATTR_A                   = 0x83C // 2108
-	SYS___CABEND                        = 0x83D // 2109
-	SYS___LE_CIB_GET                    = 0x83E // 2110
-	SYS___SET_LAA_FOR_JIT               = 0x83F // 2111
-	SYS___LCHATTR                       = 0x840 // 2112
-	SYS___WRITEDOWN                     = 0x841 // 2113
-	SYS_PTHREAD_MUTEX_INIT2             = 0x842 // 2114
-	SYS___ACOSHF_B                      = 0x843 // 2115
-	SYS___ACOSHL_B                      = 0x844 // 2116
-	SYS___ASINHF_B                      = 0x845 // 2117
-	SYS___ASINHL_B                      = 0x846 // 2118
-	SYS___ATANHF_B                      = 0x847 // 2119
-	SYS___ATANHL_B                      = 0x848 // 2120
-	SYS___CBRTF_B                       = 0x849 // 2121
-	SYS___CBRTL_B                       = 0x84A // 2122
-	SYS___COPYSIGNF_B                   = 0x84B // 2123
-	SYS___COPYSIGNL_B                   = 0x84C // 2124
-	SYS___COTANF_B                      = 0x84D // 2125
-	SYS___COTAN_B                       = 0x84E // 2126
-	SYS___COTANL_B                      = 0x84F // 2127
-	SYS___EXP2F_B                       = 0x850 // 2128
-	SYS___EXP2L_B                       = 0x851 // 2129
-	SYS___EXPM1F_B                      = 0x852 // 2130
-	SYS___EXPM1L_B                      = 0x853 // 2131
-	SYS___FDIMF_B                       = 0x854 // 2132
-	SYS___FDIM_B                        = 0x855 // 2133
-	SYS___FDIML_B                       = 0x856 // 2134
-	SYS___HYPOTF_B                      = 0x857 // 2135
-	SYS___HYPOTL_B                      = 0x858 // 2136
-	SYS___LOG1PF_B                      = 0x859 // 2137
-	SYS___LOG1PL_B                      = 0x85A // 2138
-	SYS___LOG2F_B                       = 0x85B // 2139
-	SYS___LOG2_B                        = 0x85C // 2140
-	SYS___LOG2L_B                       = 0x85D // 2141
-	SYS___REMAINDERF_B                  = 0x85E // 2142
-	SYS___REMAINDERL_B                  = 0x85F // 2143
-	SYS___REMQUOF_B                     = 0x860 // 2144
-	SYS___REMQUO_B                      = 0x861 // 2145
-	SYS___REMQUOL_B                     = 0x862 // 2146
-	SYS___TGAMMAF_B                     = 0x863 // 2147
-	SYS___TGAMMA_B                      = 0x864 // 2148
-	SYS___TGAMMAL_B                     = 0x865 // 2149
-	SYS___TRUNCF_B                      = 0x866 // 2150
-	SYS___TRUNC_B                       = 0x867 // 2151
-	SYS___TRUNCL_B                      = 0x868 // 2152
-	SYS___LGAMMAF_B                     = 0x869 // 2153
-	SYS___LROUNDF_B                     = 0x86A // 2154
-	SYS___LROUND_B                      = 0x86B // 2155
-	SYS___ERFF_B                        = 0x86C // 2156
-	SYS___ERFCF_B                       = 0x86D // 2157
-	SYS_ACOSHF                          = 0x86E // 2158
-	SYS_ACOSHL                          = 0x86F // 2159
-	SYS_ASINHF                          = 0x870 // 2160
-	SYS_ASINHL                          = 0x871 // 2161
-	SYS_ATANHF                          = 0x872 // 2162
-	SYS_ATANHL                          = 0x873 // 2163
-	SYS_CBRTF                           = 0x874 // 2164
-	SYS_CBRTL                           = 0x875 // 2165
-	SYS_COPYSIGNF                       = 0x876 // 2166
-	SYS_CPYSIGNF                        = 0x876 // 2166
-	SYS_COPYSIGNL                       = 0x877 // 2167
-	SYS_CPYSIGNL                        = 0x877 // 2167
-	SYS_COTANF                          = 0x878 // 2168
-	SYS___COTANF                        = 0x878 // 2168
-	SYS_COTAN                           = 0x879 // 2169
-	SYS___COTAN                         = 0x879 // 2169
-	SYS_COTANL                          = 0x87A // 2170
-	SYS___COTANL                        = 0x87A // 2170
-	SYS_EXP2F                           = 0x87B // 2171
-	SYS_EXP2L                           = 0x87C // 2172
-	SYS_EXPM1F                          = 0x87D // 2173
-	SYS_EXPM1L                          = 0x87E // 2174
-	SYS_FDIMF                           = 0x87F // 2175
-	SYS_FDIM                            = 0x881 // 2177
-	SYS_FDIML                           = 0x882 // 2178
-	SYS_HYPOTF                          = 0x883 // 2179
-	SYS_HYPOTL                          = 0x884 // 2180
-	SYS_LOG1PF                          = 0x885 // 2181
-	SYS_LOG1PL                          = 0x886 // 2182
-	SYS_LOG2F                           = 0x887 // 2183
-	SYS_LOG2                            = 0x888 // 2184
-	SYS_LOG2L                           = 0x889 // 2185
-	SYS_REMAINDERF                      = 0x88A // 2186
-	SYS_REMAINDF                        = 0x88A // 2186
-	SYS_REMAINDERL                      = 0x88B // 2187
-	SYS_REMAINDL                        = 0x88B // 2187
-	SYS_REMQUOF                         = 0x88C // 2188
-	SYS_REMQUO                          = 0x88D // 2189
-	SYS_REMQUOL                         = 0x88E // 2190
-	SYS_TGAMMAF                         = 0x88F // 2191
-	SYS_TGAMMA                          = 0x890 // 2192
-	SYS_TGAMMAL                         = 0x891 // 2193
-	SYS_TRUNCF                          = 0x892 // 2194
-	SYS_TRUNC                           = 0x893 // 2195
-	SYS_TRUNCL                          = 0x894 // 2196
-	SYS_LGAMMAF                         = 0x895 // 2197
-	SYS_LGAMMAL                         = 0x896 // 2198
-	SYS_LROUNDF                         = 0x897 // 2199
-	SYS_LROUND                          = 0x898 // 2200
-	SYS_ERFF                            = 0x899 // 2201
-	SYS_ERFL                            = 0x89A // 2202
-	SYS_ERFCF                           = 0x89B // 2203
-	SYS_ERFCL                           = 0x89C // 2204
-	SYS___EXP2_B                        = 0x89D // 2205
-	SYS_EXP2                            = 0x89E // 2206
-	SYS___FAR_JUMP                      = 0x89F // 2207
-	SYS___TCGETATTR_A                   = 0x8A1 // 2209
-	SYS___TCSETATTR_A                   = 0x8A2 // 2210
-	SYS___SUPERKILL                     = 0x8A4 // 2212
-	SYS___LE_CONDITION_TOKEN_BUILD      = 0x8A5 // 2213
-	SYS___LE_MSG_ADD_INSERT             = 0x8A6 // 2214
-	SYS___LE_MSG_GET                    = 0x8A7 // 2215
-	SYS___LE_MSG_GET_AND_WRITE          = 0x8A8 // 2216
-	SYS___LE_MSG_WRITE                  = 0x8A9 // 2217
-	SYS___ITOA                          = 0x8AA // 2218
-	SYS___UTOA                          = 0x8AB // 2219
-	SYS___LTOA                          = 0x8AC // 2220
-	SYS___ULTOA                         = 0x8AD // 2221
-	SYS___LLTOA                         = 0x8AE // 2222
-	SYS___ULLTOA                        = 0x8AF // 2223
-	SYS___ITOA_A                        = 0x8B0 // 2224
-	SYS___UTOA_A                        = 0x8B1 // 2225
-	SYS___LTOA_A                        = 0x8B2 // 2226
-	SYS___ULTOA_A                       = 0x8B3 // 2227
-	SYS___LLTOA_A                       = 0x8B4 // 2228
-	SYS___ULLTOA_A                      = 0x8B5 // 2229
-	SYS_____GETENV_A                    = 0x8C3 // 2243
-	SYS___REXEC_A                       = 0x8C4 // 2244
-	SYS___REXEC_AF_A                    = 0x8C5 // 2245
-	SYS___GETUTXENT_A                   = 0x8C6 // 2246
-	SYS___GETUTXID_A                    = 0x8C7 // 2247
-	SYS___GETUTXLINE_A                  = 0x8C8 // 2248
-	SYS___PUTUTXLINE_A                  = 0x8C9 // 2249
-	SYS_____UTMPXNAME_A                 = 0x8CA // 2250
-	SYS___PUTC_UNLOCKED_A               = 0x8CB // 2251
-	SYS___PUTCHAR_UNLOCKED_A            = 0x8CC // 2252
-	SYS___SNPRINTF_A                    = 0x8CD // 2253
-	SYS___VSNPRINTF_A                   = 0x8CE // 2254
-	SYS___DLOPEN_A                      = 0x8D0 // 2256
-	SYS___DLSYM_A                       = 0x8D1 // 2257
-	SYS___DLERROR_A                     = 0x8D2 // 2258
-	SYS_FLOCKFILE                       = 0x8D3 // 2259
-	SYS_FTRYLOCKFILE                    = 0x8D4 // 2260
-	SYS_FUNLOCKFILE                     = 0x8D5 // 2261
-	SYS_GETC_UNLOCKED                   = 0x8D6 // 2262
-	SYS_GETCHAR_UNLOCKED                = 0x8D7 // 2263
-	SYS_PUTC_UNLOCKED                   = 0x8D8 // 2264
-	SYS_PUTCHAR_UNLOCKED                = 0x8D9 // 2265
-	SYS_SNPRINTF                        = 0x8DA // 2266
-	SYS_VSNPRINTF                       = 0x8DB // 2267
-	SYS_DLOPEN                          = 0x8DD // 2269
-	SYS_DLSYM                           = 0x8DE // 2270
-	SYS_DLCLOSE                         = 0x8DF // 2271
-	SYS_DLERROR                         = 0x8E0 // 2272
-	SYS___SET_EXCEPTION_HANDLER         = 0x8E2 // 2274
-	SYS___RESET_EXCEPTION_HANDLER       = 0x8E3 // 2275
-	SYS___VHM_EVENT                     = 0x8E4 // 2276
-	SYS___ABS_H                         = 0x8E6 // 2278
-	SYS___ABSF_H                        = 0x8E7 // 2279
-	SYS___ABSL_H                        = 0x8E8 // 2280
-	SYS___ACOS_H                        = 0x8E9 // 2281
-	SYS___ACOSF_H                       = 0x8EA // 2282
-	SYS___ACOSL_H                       = 0x8EB // 2283
-	SYS___ACOSH_H                       = 0x8EC // 2284
-	SYS___ASIN_H                        = 0x8ED // 2285
-	SYS___ASINF_H                       = 0x8EE // 2286
-	SYS___ASINL_H                       = 0x8EF // 2287
-	SYS___ASINH_H                       = 0x8F0 // 2288
-	SYS___ATAN_H                        = 0x8F1 // 2289
-	SYS___ATANF_H                       = 0x8F2 // 2290
-	SYS___ATANL_H                       = 0x8F3 // 2291
-	SYS___ATANH_H                       = 0x8F4 // 2292
-	SYS___ATANHF_H                      = 0x8F5 // 2293
-	SYS___ATANHL_H                      = 0x8F6 // 2294
-	SYS___ATAN2_H                       = 0x8F7 // 2295
-	SYS___ATAN2F_H                      = 0x8F8 // 2296
-	SYS___ATAN2L_H                      = 0x8F9 // 2297
-	SYS___CBRT_H                        = 0x8FA // 2298
-	SYS___COPYSIGNF_H                   = 0x8FB // 2299
-	SYS___COPYSIGNL_H                   = 0x8FC // 2300
-	SYS___COS_H                         = 0x8FD // 2301
-	SYS___COSF_H                        = 0x8FE // 2302
-	SYS___COSL_H                        = 0x8FF // 2303
-	SYS___COSHF_H                       = 0x900 // 2304
-	SYS___COSHL_H                       = 0x901 // 2305
-	SYS___COTAN_H                       = 0x902 // 2306
-	SYS___COTANF_H                      = 0x903 // 2307
-	SYS___COTANL_H                      = 0x904 // 2308
-	SYS___ERF_H                         = 0x905 // 2309
-	SYS___ERFF_H                        = 0x906 // 2310
-	SYS___ERFL_H                        = 0x907 // 2311
-	SYS___ERFC_H                        = 0x908 // 2312
-	SYS___ERFCF_H                       = 0x909 // 2313
-	SYS___ERFCL_H                       = 0x90A // 2314
-	SYS___EXP_H                         = 0x90B // 2315
-	SYS___EXPF_H                        = 0x90C // 2316
-	SYS___EXPL_H                        = 0x90D // 2317
-	SYS___EXPM1_H                       = 0x90E // 2318
-	SYS___FDIM_H                        = 0x90F // 2319
-	SYS___FDIMF_H                       = 0x910 // 2320
-	SYS___FDIML_H                       = 0x911 // 2321
-	SYS___FMOD_H                        = 0x912 // 2322
-	SYS___FMODF_H                       = 0x913 // 2323
-	SYS___FMODL_H                       = 0x914 // 2324
-	SYS___GAMMA_H                       = 0x915 // 2325
-	SYS___HYPOT_H                       = 0x916 // 2326
-	SYS___ILOGB_H                       = 0x917 // 2327
-	SYS___LGAMMA_H                      = 0x918 // 2328
-	SYS___LGAMMAF_H                     = 0x919 // 2329
-	SYS___LOG_H                         = 0x91A // 2330
-	SYS___LOGF_H                        = 0x91B // 2331
-	SYS___LOGL_H                        = 0x91C // 2332
-	SYS___LOGB_H                        = 0x91D // 2333
-	SYS___LOG2_H                        = 0x91E // 2334
-	SYS___LOG2F_H                       = 0x91F // 2335
-	SYS___LOG2L_H                       = 0x920 // 2336
-	SYS___LOG1P_H                       = 0x921 // 2337
-	SYS___LOG10_H                       = 0x922 // 2338
-	SYS___LOG10F_H                      = 0x923 // 2339
-	SYS___LOG10L_H                      = 0x924 // 2340
-	SYS___LROUND_H                      = 0x925 // 2341
-	SYS___LROUNDF_H                     = 0x926 // 2342
-	SYS___NEXTAFTER_H                   = 0x927 // 2343
-	SYS___POW_H                         = 0x928 // 2344
-	SYS___POWF_H                        = 0x929 // 2345
-	SYS___POWL_H                        = 0x92A // 2346
-	SYS___REMAINDER_H                   = 0x92B // 2347
-	SYS___RINT_H                        = 0x92C // 2348
-	SYS___SCALB_H                       = 0x92D // 2349
-	SYS___SIN_H                         = 0x92E // 2350
-	SYS___SINF_H                        = 0x92F // 2351
-	SYS___SINL_H                        = 0x930 // 2352
-	SYS___SINH_H                        = 0x931 // 2353
-	SYS___SINHF_H                       = 0x932 // 2354
-	SYS___SINHL_H                       = 0x933 // 2355
-	SYS___SQRT_H                        = 0x934 // 2356
-	SYS___SQRTF_H                       = 0x935 // 2357
-	SYS___SQRTL_H                       = 0x936 // 2358
-	SYS___TAN_H                         = 0x937 // 2359
-	SYS___TANF_H                        = 0x938 // 2360
-	SYS___TANL_H                        = 0x939 // 2361
-	SYS___TANH_H                        = 0x93A // 2362
-	SYS___TANHF_H                       = 0x93B // 2363
-	SYS___TANHL_H                       = 0x93C // 2364
-	SYS___TGAMMA_H                      = 0x93D // 2365
-	SYS___TGAMMAF_H                     = 0x93E // 2366
-	SYS___TRUNC_H                       = 0x93F // 2367
-	SYS___TRUNCF_H                      = 0x940 // 2368
-	SYS___TRUNCL_H                      = 0x941 // 2369
-	SYS___COSH_H                        = 0x942 // 2370
-	SYS___LE_DEBUG_SET_RESUME_MCH       = 0x943 // 2371
-	SYS_VFSCANF                         = 0x944 // 2372
-	SYS_VSCANF                          = 0x946 // 2374
-	SYS_VSSCANF                         = 0x948 // 2376
-	SYS_VFWSCANF                        = 0x94A // 2378
-	SYS_VWSCANF                         = 0x94C // 2380
-	SYS_VSWSCANF                        = 0x94E // 2382
-	SYS_IMAXABS                         = 0x950 // 2384
-	SYS_IMAXDIV                         = 0x951 // 2385
-	SYS_STRTOIMAX                       = 0x952 // 2386
-	SYS_STRTOUMAX                       = 0x953 // 2387
-	SYS_WCSTOIMAX                       = 0x954 // 2388
-	SYS_WCSTOUMAX                       = 0x955 // 2389
-	SYS_ATOLL                           = 0x956 // 2390
-	SYS_STRTOF                          = 0x957 // 2391
-	SYS_STRTOLD                         = 0x958 // 2392
-	SYS_WCSTOF                          = 0x959 // 2393
-	SYS_WCSTOLD                         = 0x95A // 2394
-	SYS_INET6_RTH_SPACE                 = 0x95B // 2395
-	SYS_INET6_RTH_INIT                  = 0x95C // 2396
-	SYS_INET6_RTH_ADD                   = 0x95D // 2397
-	SYS_INET6_RTH_REVERSE               = 0x95E // 2398
-	SYS_INET6_RTH_SEGMENTS              = 0x95F // 2399
-	SYS_INET6_RTH_GETADDR               = 0x960 // 2400
-	SYS_INET6_OPT_INIT                  = 0x961 // 2401
-	SYS_INET6_OPT_APPEND                = 0x962 // 2402
-	SYS_INET6_OPT_FINISH                = 0x963 // 2403
-	SYS_INET6_OPT_SET_VAL               = 0x964 // 2404
-	SYS_INET6_OPT_NEXT                  = 0x965 // 2405
-	SYS_INET6_OPT_FIND                  = 0x966 // 2406
-	SYS_INET6_OPT_GET_VAL               = 0x967 // 2407
-	SYS___POW_I                         = 0x987 // 2439
-	SYS___POW_I_B                       = 0x988 // 2440
-	SYS___POW_I_H                       = 0x989 // 2441
-	SYS___POW_II                        = 0x98A // 2442
-	SYS___POW_II_B                      = 0x98B // 2443
-	SYS___POW_II_H                      = 0x98C // 2444
-	SYS_CABS                            = 0x98E // 2446
-	SYS___CABS_B                        = 0x98F // 2447
-	SYS___CABS_H                        = 0x990 // 2448
-	SYS_CABSF                           = 0x991 // 2449
-	SYS___CABSF_B                       = 0x992 // 2450
-	SYS___CABSF_H                       = 0x993 // 2451
-	SYS_CABSL                           = 0x994 // 2452
-	SYS___CABSL_B                       = 0x995 // 2453
-	SYS___CABSL_H                       = 0x996 // 2454
-	SYS_CACOS                           = 0x997 // 2455
-	SYS___CACOS_B                       = 0x998 // 2456
-	SYS___CACOS_H                       = 0x999 // 2457
-	SYS_CACOSF                          = 0x99A // 2458
-	SYS___CACOSF_B                      = 0x99B // 2459
-	SYS___CACOSF_H                      = 0x99C // 2460
-	SYS_CACOSL                          = 0x99D // 2461
-	SYS___CACOSL_B                      = 0x99E // 2462
-	SYS___CACOSL_H                      = 0x99F // 2463
-	SYS_CACOSH                          = 0x9A0 // 2464
-	SYS___CACOSH_B                      = 0x9A1 // 2465
-	SYS___CACOSH_H                      = 0x9A2 // 2466
-	SYS_CACOSHF                         = 0x9A3 // 2467
-	SYS___CACOSHF_B                     = 0x9A4 // 2468
-	SYS___CACOSHF_H                     = 0x9A5 // 2469
-	SYS_CACOSHL                         = 0x9A6 // 2470
-	SYS___CACOSHL_B                     = 0x9A7 // 2471
-	SYS___CACOSHL_H                     = 0x9A8 // 2472
-	SYS_CARG                            = 0x9A9 // 2473
-	SYS___CARG_B                        = 0x9AA // 2474
-	SYS___CARG_H                        = 0x9AB // 2475
-	SYS_CARGF                           = 0x9AC // 2476
-	SYS___CARGF_B                       = 0x9AD // 2477
-	SYS___CARGF_H                       = 0x9AE // 2478
-	SYS_CARGL                           = 0x9AF // 2479
-	SYS___CARGL_B                       = 0x9B0 // 2480
-	SYS___CARGL_H                       = 0x9B1 // 2481
-	SYS_CASIN                           = 0x9B2 // 2482
-	SYS___CASIN_B                       = 0x9B3 // 2483
-	SYS___CASIN_H                       = 0x9B4 // 2484
-	SYS_CASINF                          = 0x9B5 // 2485
-	SYS___CASINF_B                      = 0x9B6 // 2486
-	SYS___CASINF_H                      = 0x9B7 // 2487
-	SYS_CASINL                          = 0x9B8 // 2488
-	SYS___CASINL_B                      = 0x9B9 // 2489
-	SYS___CASINL_H                      = 0x9BA // 2490
-	SYS_CASINH                          = 0x9BB // 2491
-	SYS___CASINH_B                      = 0x9BC // 2492
-	SYS___CASINH_H                      = 0x9BD // 2493
-	SYS_CASINHF                         = 0x9BE // 2494
-	SYS___CASINHF_B                     = 0x9BF // 2495
-	SYS___CASINHF_H                     = 0x9C0 // 2496
-	SYS_CASINHL                         = 0x9C1 // 2497
-	SYS___CASINHL_B                     = 0x9C2 // 2498
-	SYS___CASINHL_H                     = 0x9C3 // 2499
-	SYS_CATAN                           = 0x9C4 // 2500
-	SYS___CATAN_B                       = 0x9C5 // 2501
-	SYS___CATAN_H                       = 0x9C6 // 2502
-	SYS_CATANF                          = 0x9C7 // 2503
-	SYS___CATANF_B                      = 0x9C8 // 2504
-	SYS___CATANF_H                      = 0x9C9 // 2505
-	SYS_CATANL                          = 0x9CA // 2506
-	SYS___CATANL_B                      = 0x9CB // 2507
-	SYS___CATANL_H                      = 0x9CC // 2508
-	SYS_CATANH                          = 0x9CD // 2509
-	SYS___CATANH_B                      = 0x9CE // 2510
-	SYS___CATANH_H                      = 0x9CF // 2511
-	SYS_CATANHF                         = 0x9D0 // 2512
-	SYS___CATANHF_B                     = 0x9D1 // 2513
-	SYS___CATANHF_H                     = 0x9D2 // 2514
-	SYS_CATANHL                         = 0x9D3 // 2515
-	SYS___CATANHL_B                     = 0x9D4 // 2516
-	SYS___CATANHL_H                     = 0x9D5 // 2517
-	SYS_CCOS                            = 0x9D6 // 2518
-	SYS___CCOS_B                        = 0x9D7 // 2519
-	SYS___CCOS_H                        = 0x9D8 // 2520
-	SYS_CCOSF                           = 0x9D9 // 2521
-	SYS___CCOSF_B                       = 0x9DA // 2522
-	SYS___CCOSF_H                       = 0x9DB // 2523
-	SYS_CCOSL                           = 0x9DC // 2524
-	SYS___CCOSL_B                       = 0x9DD // 2525
-	SYS___CCOSL_H                       = 0x9DE // 2526
-	SYS_CCOSH                           = 0x9DF // 2527
-	SYS___CCOSH_B                       = 0x9E0 // 2528
-	SYS___CCOSH_H                       = 0x9E1 // 2529
-	SYS_CCOSHF                          = 0x9E2 // 2530
-	SYS___CCOSHF_B                      = 0x9E3 // 2531
-	SYS___CCOSHF_H                      = 0x9E4 // 2532
-	SYS_CCOSHL                          = 0x9E5 // 2533
-	SYS___CCOSHL_B                      = 0x9E6 // 2534
-	SYS___CCOSHL_H                      = 0x9E7 // 2535
-	SYS_CEXP                            = 0x9E8 // 2536
-	SYS___CEXP_B                        = 0x9E9 // 2537
-	SYS___CEXP_H                        = 0x9EA // 2538
-	SYS_CEXPF                           = 0x9EB // 2539
-	SYS___CEXPF_B                       = 0x9EC // 2540
-	SYS___CEXPF_H                       = 0x9ED // 2541
-	SYS_CEXPL                           = 0x9EE // 2542
-	SYS___CEXPL_B                       = 0x9EF // 2543
-	SYS___CEXPL_H                       = 0x9F0 // 2544
-	SYS_CIMAG                           = 0x9F1 // 2545
-	SYS___CIMAG_B                       = 0x9F2 // 2546
-	SYS___CIMAG_H                       = 0x9F3 // 2547
-	SYS_CIMAGF                          = 0x9F4 // 2548
-	SYS___CIMAGF_B                      = 0x9F5 // 2549
-	SYS___CIMAGF_H                      = 0x9F6 // 2550
-	SYS_CIMAGL                          = 0x9F7 // 2551
-	SYS___CIMAGL_B                      = 0x9F8 // 2552
-	SYS___CIMAGL_H                      = 0x9F9 // 2553
-	SYS___CLOG                          = 0x9FA // 2554
-	SYS___CLOG_B                        = 0x9FB // 2555
-	SYS___CLOG_H                        = 0x9FC // 2556
-	SYS_CLOGF                           = 0x9FD // 2557
-	SYS___CLOGF_B                       = 0x9FE // 2558
-	SYS___CLOGF_H                       = 0x9FF // 2559
-	SYS_CLOGL                           = 0xA00 // 2560
-	SYS___CLOGL_B                       = 0xA01 // 2561
-	SYS___CLOGL_H                       = 0xA02 // 2562
-	SYS_CONJ                            = 0xA03 // 2563
-	SYS___CONJ_B                        = 0xA04 // 2564
-	SYS___CONJ_H                        = 0xA05 // 2565
-	SYS_CONJF                           = 0xA06 // 2566
-	SYS___CONJF_B                       = 0xA07 // 2567
-	SYS___CONJF_H                       = 0xA08 // 2568
-	SYS_CONJL                           = 0xA09 // 2569
-	SYS___CONJL_B                       = 0xA0A // 2570
-	SYS___CONJL_H                       = 0xA0B // 2571
-	SYS_CPOW                            = 0xA0C // 2572
-	SYS___CPOW_B                        = 0xA0D // 2573
-	SYS___CPOW_H                        = 0xA0E // 2574
-	SYS_CPOWF                           = 0xA0F // 2575
-	SYS___CPOWF_B                       = 0xA10 // 2576
-	SYS___CPOWF_H                       = 0xA11 // 2577
-	SYS_CPOWL                           = 0xA12 // 2578
-	SYS___CPOWL_B                       = 0xA13 // 2579
-	SYS___CPOWL_H                       = 0xA14 // 2580
-	SYS_CPROJ                           = 0xA15 // 2581
-	SYS___CPROJ_B                       = 0xA16 // 2582
-	SYS___CPROJ_H                       = 0xA17 // 2583
-	SYS_CPROJF                          = 0xA18 // 2584
-	SYS___CPROJF_B                      = 0xA19 // 2585
-	SYS___CPROJF_H                      = 0xA1A // 2586
-	SYS_CPROJL                          = 0xA1B // 2587
-	SYS___CPROJL_B                      = 0xA1C // 2588
-	SYS___CPROJL_H                      = 0xA1D // 2589
-	SYS_CREAL                           = 0xA1E // 2590
-	SYS___CREAL_B                       = 0xA1F // 2591
-	SYS___CREAL_H                       = 0xA20 // 2592
-	SYS_CREALF                          = 0xA21 // 2593
-	SYS___CREALF_B                      = 0xA22 // 2594
-	SYS___CREALF_H                      = 0xA23 // 2595
-	SYS_CREALL                          = 0xA24 // 2596
-	SYS___CREALL_B                      = 0xA25 // 2597
-	SYS___CREALL_H                      = 0xA26 // 2598
-	SYS_CSIN                            = 0xA27 // 2599
-	SYS___CSIN_B                        = 0xA28 // 2600
-	SYS___CSIN_H                        = 0xA29 // 2601
-	SYS_CSINF                           = 0xA2A // 2602
-	SYS___CSINF_B                       = 0xA2B // 2603
-	SYS___CSINF_H                       = 0xA2C // 2604
-	SYS_CSINL                           = 0xA2D // 2605
-	SYS___CSINL_B                       = 0xA2E // 2606
-	SYS___CSINL_H                       = 0xA2F // 2607
-	SYS_CSINH                           = 0xA30 // 2608
-	SYS___CSINH_B                       = 0xA31 // 2609
-	SYS___CSINH_H                       = 0xA32 // 2610
-	SYS_CSINHF                          = 0xA33 // 2611
-	SYS___CSINHF_B                      = 0xA34 // 2612
-	SYS___CSINHF_H                      = 0xA35 // 2613
-	SYS_CSINHL                          = 0xA36 // 2614
-	SYS___CSINHL_B                      = 0xA37 // 2615
-	SYS___CSINHL_H                      = 0xA38 // 2616
-	SYS_CSQRT                           = 0xA39 // 2617
-	SYS___CSQRT_B                       = 0xA3A // 2618
-	SYS___CSQRT_H                       = 0xA3B // 2619
-	SYS_CSQRTF                          = 0xA3C // 2620
-	SYS___CSQRTF_B                      = 0xA3D // 2621
-	SYS___CSQRTF_H                      = 0xA3E // 2622
-	SYS_CSQRTL                          = 0xA3F // 2623
-	SYS___CSQRTL_B                      = 0xA40 // 2624
-	SYS___CSQRTL_H                      = 0xA41 // 2625
-	SYS_CTAN                            = 0xA42 // 2626
-	SYS___CTAN_B                        = 0xA43 // 2627
-	SYS___CTAN_H                        = 0xA44 // 2628
-	SYS_CTANF                           = 0xA45 // 2629
-	SYS___CTANF_B                       = 0xA46 // 2630
-	SYS___CTANF_H                       = 0xA47 // 2631
-	SYS_CTANL                           = 0xA48 // 2632
-	SYS___CTANL_B                       = 0xA49 // 2633
-	SYS___CTANL_H                       = 0xA4A // 2634
-	SYS_CTANH                           = 0xA4B // 2635
-	SYS___CTANH_B                       = 0xA4C // 2636
-	SYS___CTANH_H                       = 0xA4D // 2637
-	SYS_CTANHF                          = 0xA4E // 2638
-	SYS___CTANHF_B                      = 0xA4F // 2639
-	SYS___CTANHF_H                      = 0xA50 // 2640
-	SYS_CTANHL                          = 0xA51 // 2641
-	SYS___CTANHL_B                      = 0xA52 // 2642
-	SYS___CTANHL_H                      = 0xA53 // 2643
-	SYS___ACOSHF_H                      = 0xA54 // 2644
-	SYS___ACOSHL_H                      = 0xA55 // 2645
-	SYS___ASINHF_H                      = 0xA56 // 2646
-	SYS___ASINHL_H                      = 0xA57 // 2647
-	SYS___CBRTF_H                       = 0xA58 // 2648
-	SYS___CBRTL_H                       = 0xA59 // 2649
-	SYS___COPYSIGN_B                    = 0xA5A // 2650
-	SYS___EXPM1F_H                      = 0xA5B // 2651
-	SYS___EXPM1L_H                      = 0xA5C // 2652
-	SYS___EXP2_H                        = 0xA5D // 2653
-	SYS___EXP2F_H                       = 0xA5E // 2654
-	SYS___EXP2L_H                       = 0xA5F // 2655
-	SYS___LOG1PF_H                      = 0xA60 // 2656
-	SYS___LOG1PL_H                      = 0xA61 // 2657
-	SYS___LGAMMAL_H                     = 0xA62 // 2658
-	SYS_FMA                             = 0xA63 // 2659
-	SYS___FMA_B                         = 0xA64 // 2660
-	SYS___FMA_H                         = 0xA65 // 2661
-	SYS_FMAF                            = 0xA66 // 2662
-	SYS___FMAF_B                        = 0xA67 // 2663
-	SYS___FMAF_H                        = 0xA68 // 2664
-	SYS_FMAL                            = 0xA69 // 2665
-	SYS___FMAL_B                        = 0xA6A // 2666
-	SYS___FMAL_H                        = 0xA6B // 2667
-	SYS_FMAX                            = 0xA6C // 2668
-	SYS___FMAX_B                        = 0xA6D // 2669
-	SYS___FMAX_H                        = 0xA6E // 2670
-	SYS_FMAXF                           = 0xA6F // 2671
-	SYS___FMAXF_B                       = 0xA70 // 2672
-	SYS___FMAXF_H                       = 0xA71 // 2673
-	SYS_FMAXL                           = 0xA72 // 2674
-	SYS___FMAXL_B                       = 0xA73 // 2675
-	SYS___FMAXL_H                       = 0xA74 // 2676
-	SYS_FMIN                            = 0xA75 // 2677
-	SYS___FMIN_B                        = 0xA76 // 2678
-	SYS___FMIN_H                        = 0xA77 // 2679
-	SYS_FMINF                           = 0xA78 // 2680
-	SYS___FMINF_B                       = 0xA79 // 2681
-	SYS___FMINF_H                       = 0xA7A // 2682
-	SYS_FMINL                           = 0xA7B // 2683
-	SYS___FMINL_B                       = 0xA7C // 2684
-	SYS___FMINL_H                       = 0xA7D // 2685
-	SYS_ILOGBF                          = 0xA7E // 2686
-	SYS___ILOGBF_B                      = 0xA7F // 2687
-	SYS___ILOGBF_H                      = 0xA80 // 2688
-	SYS_ILOGBL                          = 0xA81 // 2689
-	SYS___ILOGBL_B                      = 0xA82 // 2690
-	SYS___ILOGBL_H                      = 0xA83 // 2691
-	SYS_LLRINT                          = 0xA84 // 2692
-	SYS___LLRINT_B                      = 0xA85 // 2693
-	SYS___LLRINT_H                      = 0xA86 // 2694
-	SYS_LLRINTF                         = 0xA87 // 2695
-	SYS___LLRINTF_B                     = 0xA88 // 2696
-	SYS___LLRINTF_H                     = 0xA89 // 2697
-	SYS_LLRINTL                         = 0xA8A // 2698
-	SYS___LLRINTL_B                     = 0xA8B // 2699
-	SYS___LLRINTL_H                     = 0xA8C // 2700
-	SYS_LLROUND                         = 0xA8D // 2701
-	SYS___LLROUND_B                     = 0xA8E // 2702
-	SYS___LLROUND_H                     = 0xA8F // 2703
-	SYS_LLROUNDF                        = 0xA90 // 2704
-	SYS___LLROUNDF_B                    = 0xA91 // 2705
-	SYS___LLROUNDF_H                    = 0xA92 // 2706
-	SYS_LLROUNDL                        = 0xA93 // 2707
-	SYS___LLROUNDL_B                    = 0xA94 // 2708
-	SYS___LLROUNDL_H                    = 0xA95 // 2709
-	SYS_LOGBF                           = 0xA96 // 2710
-	SYS___LOGBF_B                       = 0xA97 // 2711
-	SYS___LOGBF_H                       = 0xA98 // 2712
-	SYS_LOGBL                           = 0xA99 // 2713
-	SYS___LOGBL_B                       = 0xA9A // 2714
-	SYS___LOGBL_H                       = 0xA9B // 2715
-	SYS_LRINT                           = 0xA9C // 2716
-	SYS___LRINT_B                       = 0xA9D // 2717
-	SYS___LRINT_H                       = 0xA9E // 2718
-	SYS_LRINTF                          = 0xA9F // 2719
-	SYS___LRINTF_B                      = 0xAA0 // 2720
-	SYS___LRINTF_H                      = 0xAA1 // 2721
-	SYS_LRINTL                          = 0xAA2 // 2722
-	SYS___LRINTL_B                      = 0xAA3 // 2723
-	SYS___LRINTL_H                      = 0xAA4 // 2724
-	SYS_LROUNDL                         = 0xAA5 // 2725
-	SYS___LROUNDL_B                     = 0xAA6 // 2726
-	SYS___LROUNDL_H                     = 0xAA7 // 2727
-	SYS_NAN                             = 0xAA8 // 2728
-	SYS___NAN_B                         = 0xAA9 // 2729
-	SYS_NANF                            = 0xAAA // 2730
-	SYS___NANF_B                        = 0xAAB // 2731
-	SYS_NANL                            = 0xAAC // 2732
-	SYS___NANL_B                        = 0xAAD // 2733
-	SYS_NEARBYINT                       = 0xAAE // 2734
-	SYS___NEARBYINT_B                   = 0xAAF // 2735
-	SYS___NEARBYINT_H                   = 0xAB0 // 2736
-	SYS_NEARBYINTF                      = 0xAB1 // 2737
-	SYS___NEARBYINTF_B                  = 0xAB2 // 2738
-	SYS___NEARBYINTF_H                  = 0xAB3 // 2739
-	SYS_NEARBYINTL                      = 0xAB4 // 2740
-	SYS___NEARBYINTL_B                  = 0xAB5 // 2741
-	SYS___NEARBYINTL_H                  = 0xAB6 // 2742
-	SYS_NEXTAFTERF                      = 0xAB7 // 2743
-	SYS___NEXTAFTERF_B                  = 0xAB8 // 2744
-	SYS___NEXTAFTERF_H                  = 0xAB9 // 2745
-	SYS_NEXTAFTERL                      = 0xABA // 2746
-	SYS___NEXTAFTERL_B                  = 0xABB // 2747
-	SYS___NEXTAFTERL_H                  = 0xABC // 2748
-	SYS_NEXTTOWARD                      = 0xABD // 2749
-	SYS___NEXTTOWARD_B                  = 0xABE // 2750
-	SYS___NEXTTOWARD_H                  = 0xABF // 2751
-	SYS_NEXTTOWARDF                     = 0xAC0 // 2752
-	SYS___NEXTTOWARDF_B                 = 0xAC1 // 2753
-	SYS___NEXTTOWARDF_H                 = 0xAC2 // 2754
-	SYS_NEXTTOWARDL                     = 0xAC3 // 2755
-	SYS___NEXTTOWARDL_B                 = 0xAC4 // 2756
-	SYS___NEXTTOWARDL_H                 = 0xAC5 // 2757
-	SYS___REMAINDERF_H                  = 0xAC6 // 2758
-	SYS___REMAINDERL_H                  = 0xAC7 // 2759
-	SYS___REMQUO_H                      = 0xAC8 // 2760
-	SYS___REMQUOF_H                     = 0xAC9 // 2761
-	SYS___REMQUOL_H                     = 0xACA // 2762
-	SYS_RINTF                           = 0xACB // 2763
-	SYS___RINTF_B                       = 0xACC // 2764
-	SYS_RINTL                           = 0xACD // 2765
-	SYS___RINTL_B                       = 0xACE // 2766
-	SYS_ROUND                           = 0xACF // 2767
-	SYS___ROUND_B                       = 0xAD0 // 2768
-	SYS___ROUND_H                       = 0xAD1 // 2769
-	SYS_ROUNDF                          = 0xAD2 // 2770
-	SYS___ROUNDF_B                      = 0xAD3 // 2771
-	SYS___ROUNDF_H                      = 0xAD4 // 2772
-	SYS_ROUNDL                          = 0xAD5 // 2773
-	SYS___ROUNDL_B                      = 0xAD6 // 2774
-	SYS___ROUNDL_H                      = 0xAD7 // 2775
-	SYS_SCALBLN                         = 0xAD8 // 2776
-	SYS___SCALBLN_B                     = 0xAD9 // 2777
-	SYS___SCALBLN_H                     = 0xADA // 2778
-	SYS_SCALBLNF                        = 0xADB // 2779
-	SYS___SCALBLNF_B                    = 0xADC // 2780
-	SYS___SCALBLNF_H                    = 0xADD // 2781
-	SYS_SCALBLNL                        = 0xADE // 2782
-	SYS___SCALBLNL_B                    = 0xADF // 2783
-	SYS___SCALBLNL_H                    = 0xAE0 // 2784
-	SYS___SCALBN_B                      = 0xAE1 // 2785
-	SYS___SCALBN_H                      = 0xAE2 // 2786
-	SYS_SCALBNF                         = 0xAE3 // 2787
-	SYS___SCALBNF_B                     = 0xAE4 // 2788
-	SYS___SCALBNF_H                     = 0xAE5 // 2789
-	SYS_SCALBNL                         = 0xAE6 // 2790
-	SYS___SCALBNL_B                     = 0xAE7 // 2791
-	SYS___SCALBNL_H                     = 0xAE8 // 2792
-	SYS___TGAMMAL_H                     = 0xAE9 // 2793
-	SYS_FECLEAREXCEPT                   = 0xAEA // 2794
-	SYS_FEGETENV                        = 0xAEB // 2795
-	SYS_FEGETEXCEPTFLAG                 = 0xAEC // 2796
-	SYS_FEGETROUND                      = 0xAED // 2797
-	SYS_FEHOLDEXCEPT                    = 0xAEE // 2798
-	SYS_FERAISEEXCEPT                   = 0xAEF // 2799
-	SYS_FESETENV                        = 0xAF0 // 2800
-	SYS_FESETEXCEPTFLAG                 = 0xAF1 // 2801
-	SYS_FESETROUND                      = 0xAF2 // 2802
-	SYS_FETESTEXCEPT                    = 0xAF3 // 2803
-	SYS_FEUPDATEENV                     = 0xAF4 // 2804
-	SYS___COPYSIGN_H                    = 0xAF5 // 2805
-	SYS___HYPOTF_H                      = 0xAF6 // 2806
-	SYS___HYPOTL_H                      = 0xAF7 // 2807
-	SYS___CLASS                         = 0xAFA // 2810
-	SYS___CLASS_B                       = 0xAFB // 2811
-	SYS___CLASS_H                       = 0xAFC // 2812
-	SYS___ISBLANK_A                     = 0xB2E // 2862
-	SYS___ISWBLANK_A                    = 0xB2F // 2863
-	SYS___LROUND_FIXUP                  = 0xB30 // 2864
-	SYS___LROUNDF_FIXUP                 = 0xB31 // 2865
-	SYS_SCHED_YIELD                     = 0xB32 // 2866
-	SYS_STRERROR_R                      = 0xB33 // 2867
-	SYS_UNSETENV                        = 0xB34 // 2868
-	SYS___LGAMMA_H_C99                  = 0xB38 // 2872
-	SYS___LGAMMA_B_C99                  = 0xB39 // 2873
-	SYS___LGAMMA_R_C99                  = 0xB3A // 2874
-	SYS___FTELL2                        = 0xB3B // 2875
-	SYS___FSEEK2                        = 0xB3C // 2876
-	SYS___STATIC_REINIT                 = 0xB3D // 2877
-	SYS_PTHREAD_ATTR_GETSTACK           = 0xB3E // 2878
-	SYS_PTHREAD_ATTR_SETSTACK           = 0xB3F // 2879
-	SYS___TGAMMA_H_C99                  = 0xB78 // 2936
-	SYS___TGAMMAF_H_C99                 = 0xB79 // 2937
-	SYS___LE_TRACEBACK                  = 0xB7A // 2938
-	SYS___MUST_STAY_CLEAN               = 0xB7C // 2940
-	SYS___O_ENV                         = 0xB7D // 2941
-	SYS_ACOSD32                         = 0xB7E // 2942
-	SYS_ACOSD64                         = 0xB7F // 2943
-	SYS_ACOSD128                        = 0xB80 // 2944
-	SYS_ACOSHD32                        = 0xB81 // 2945
-	SYS_ACOSHD64                        = 0xB82 // 2946
-	SYS_ACOSHD128                       = 0xB83 // 2947
-	SYS_ASIND32                         = 0xB84 // 2948
-	SYS_ASIND64                         = 0xB85 // 2949
-	SYS_ASIND128                        = 0xB86 // 2950
-	SYS_ASINHD32                        = 0xB87 // 2951
-	SYS_ASINHD64                        = 0xB88 // 2952
-	SYS_ASINHD128                       = 0xB89 // 2953
-	SYS_ATAND32                         = 0xB8A // 2954
-	SYS_ATAND64                         = 0xB8B // 2955
-	SYS_ATAND128                        = 0xB8C // 2956
-	SYS_ATAN2D32                        = 0xB8D // 2957
-	SYS_ATAN2D64                        = 0xB8E // 2958
-	SYS_ATAN2D128                       = 0xB8F // 2959
-	SYS_ATANHD32                        = 0xB90 // 2960
-	SYS_ATANHD64                        = 0xB91 // 2961
-	SYS_ATANHD128                       = 0xB92 // 2962
-	SYS_CBRTD32                         = 0xB93 // 2963
-	SYS_CBRTD64                         = 0xB94 // 2964
-	SYS_CBRTD128                        = 0xB95 // 2965
-	SYS_CEILD32                         = 0xB96 // 2966
-	SYS_CEILD64                         = 0xB97 // 2967
-	SYS_CEILD128                        = 0xB98 // 2968
-	SYS___CLASS2                        = 0xB99 // 2969
-	SYS___CLASS2_B                      = 0xB9A // 2970
-	SYS___CLASS2_H                      = 0xB9B // 2971
-	SYS_COPYSIGND32                     = 0xB9C // 2972
-	SYS_COPYSIGND64                     = 0xB9D // 2973
-	SYS_COPYSIGND128                    = 0xB9E // 2974
-	SYS_COSD32                          = 0xB9F // 2975
-	SYS_COSD64                          = 0xBA0 // 2976
-	SYS_COSD128                         = 0xBA1 // 2977
-	SYS_COSHD32                         = 0xBA2 // 2978
-	SYS_COSHD64                         = 0xBA3 // 2979
-	SYS_COSHD128                        = 0xBA4 // 2980
-	SYS_ERFD32                          = 0xBA5 // 2981
-	SYS_ERFD64                          = 0xBA6 // 2982
-	SYS_ERFD128                         = 0xBA7 // 2983
-	SYS_ERFCD32                         = 0xBA8 // 2984
-	SYS_ERFCD64                         = 0xBA9 // 2985
-	SYS_ERFCD128                        = 0xBAA // 2986
-	SYS_EXPD32                          = 0xBAB // 2987
-	SYS_EXPD64                          = 0xBAC // 2988
-	SYS_EXPD128                         = 0xBAD // 2989
-	SYS_EXP2D32                         = 0xBAE // 2990
-	SYS_EXP2D64                         = 0xBAF // 2991
-	SYS_EXP2D128                        = 0xBB0 // 2992
-	SYS_EXPM1D32                        = 0xBB1 // 2993
-	SYS_EXPM1D64                        = 0xBB2 // 2994
-	SYS_EXPM1D128                       = 0xBB3 // 2995
-	SYS_FABSD32                         = 0xBB4 // 2996
-	SYS_FABSD64                         = 0xBB5 // 2997
-	SYS_FABSD128                        = 0xBB6 // 2998
-	SYS_FDIMD32                         = 0xBB7 // 2999
-	SYS_FDIMD64                         = 0xBB8 // 3000
-	SYS_FDIMD128                        = 0xBB9 // 3001
-	SYS_FE_DEC_GETROUND                 = 0xBBA // 3002
-	SYS_FE_DEC_SETROUND                 = 0xBBB // 3003
-	SYS_FLOORD32                        = 0xBBC // 3004
-	SYS_FLOORD64                        = 0xBBD // 3005
-	SYS_FLOORD128                       = 0xBBE // 3006
-	SYS_FMAD32                          = 0xBBF // 3007
-	SYS_FMAD64                          = 0xBC0 // 3008
-	SYS_FMAD128                         = 0xBC1 // 3009
-	SYS_FMAXD32                         = 0xBC2 // 3010
-	SYS_FMAXD64                         = 0xBC3 // 3011
-	SYS_FMAXD128                        = 0xBC4 // 3012
-	SYS_FMIND32                         = 0xBC5 // 3013
-	SYS_FMIND64                         = 0xBC6 // 3014
-	SYS_FMIND128                        = 0xBC7 // 3015
-	SYS_FMODD32                         = 0xBC8 // 3016
-	SYS_FMODD64                         = 0xBC9 // 3017
-	SYS_FMODD128                        = 0xBCA // 3018
-	SYS___FP_CAST_D                     = 0xBCB // 3019
-	SYS_FREXPD32                        = 0xBCC // 3020
-	SYS_FREXPD64                        = 0xBCD // 3021
-	SYS_FREXPD128                       = 0xBCE // 3022
-	SYS_HYPOTD32                        = 0xBCF // 3023
-	SYS_HYPOTD64                        = 0xBD0 // 3024
-	SYS_HYPOTD128                       = 0xBD1 // 3025
-	SYS_ILOGBD32                        = 0xBD2 // 3026
-	SYS_ILOGBD64                        = 0xBD3 // 3027
-	SYS_ILOGBD128                       = 0xBD4 // 3028
-	SYS_LDEXPD32                        = 0xBD5 // 3029
-	SYS_LDEXPD64                        = 0xBD6 // 3030
-	SYS_LDEXPD128                       = 0xBD7 // 3031
-	SYS_LGAMMAD32                       = 0xBD8 // 3032
-	SYS_LGAMMAD64                       = 0xBD9 // 3033
-	SYS_LGAMMAD128                      = 0xBDA // 3034
-	SYS_LLRINTD32                       = 0xBDB // 3035
-	SYS_LLRINTD64                       = 0xBDC // 3036
-	SYS_LLRINTD128                      = 0xBDD // 3037
-	SYS_LLROUNDD32                      = 0xBDE // 3038
-	SYS_LLROUNDD64                      = 0xBDF // 3039
-	SYS_LLROUNDD128                     = 0xBE0 // 3040
-	SYS_LOGD32                          = 0xBE1 // 3041
-	SYS_LOGD64                          = 0xBE2 // 3042
-	SYS_LOGD128                         = 0xBE3 // 3043
-	SYS_LOG10D32                        = 0xBE4 // 3044
-	SYS_LOG10D64                        = 0xBE5 // 3045
-	SYS_LOG10D128                       = 0xBE6 // 3046
-	SYS_LOG1PD32                        = 0xBE7 // 3047
-	SYS_LOG1PD64                        = 0xBE8 // 3048
-	SYS_LOG1PD128                       = 0xBE9 // 3049
-	SYS_LOG2D32                         = 0xBEA // 3050
-	SYS_LOG2D64                         = 0xBEB // 3051
-	SYS_LOG2D128                        = 0xBEC // 3052
-	SYS_LOGBD32                         = 0xBED // 3053
-	SYS_LOGBD64                         = 0xBEE // 3054
-	SYS_LOGBD128                        = 0xBEF // 3055
-	SYS_LRINTD32                        = 0xBF0 // 3056
-	SYS_LRINTD64                        = 0xBF1 // 3057
-	SYS_LRINTD128                       = 0xBF2 // 3058
-	SYS_LROUNDD32                       = 0xBF3 // 3059
-	SYS_LROUNDD64                       = 0xBF4 // 3060
-	SYS_LROUNDD128                      = 0xBF5 // 3061
-	SYS_MODFD32                         = 0xBF6 // 3062
-	SYS_MODFD64                         = 0xBF7 // 3063
-	SYS_MODFD128                        = 0xBF8 // 3064
-	SYS_NAND32                          = 0xBF9 // 3065
-	SYS_NAND64                          = 0xBFA // 3066
-	SYS_NAND128                         = 0xBFB // 3067
-	SYS_NEARBYINTD32                    = 0xBFC // 3068
-	SYS_NEARBYINTD64                    = 0xBFD // 3069
-	SYS_NEARBYINTD128                   = 0xBFE // 3070
-	SYS_NEXTAFTERD32                    = 0xBFF // 3071
-	SYS_NEXTAFTERD64                    = 0xC00 // 3072
-	SYS_NEXTAFTERD128                   = 0xC01 // 3073
-	SYS_NEXTTOWARDD32                   = 0xC02 // 3074
-	SYS_NEXTTOWARDD64                   = 0xC03 // 3075
-	SYS_NEXTTOWARDD128                  = 0xC04 // 3076
-	SYS_POWD32                          = 0xC05 // 3077
-	SYS_POWD64                          = 0xC06 // 3078
-	SYS_POWD128                         = 0xC07 // 3079
-	SYS_QUANTIZED32                     = 0xC08 // 3080
-	SYS_QUANTIZED64                     = 0xC09 // 3081
-	SYS_QUANTIZED128                    = 0xC0A // 3082
-	SYS_REMAINDERD32                    = 0xC0B // 3083
-	SYS_REMAINDERD64                    = 0xC0C // 3084
-	SYS_REMAINDERD128                   = 0xC0D // 3085
-	SYS___REMQUOD32                     = 0xC0E // 3086
-	SYS___REMQUOD64                     = 0xC0F // 3087
-	SYS___REMQUOD128                    = 0xC10 // 3088
-	SYS_RINTD32                         = 0xC11 // 3089
-	SYS_RINTD64                         = 0xC12 // 3090
-	SYS_RINTD128                        = 0xC13 // 3091
-	SYS_ROUNDD32                        = 0xC14 // 3092
-	SYS_ROUNDD64                        = 0xC15 // 3093
-	SYS_ROUNDD128                       = 0xC16 // 3094
-	SYS_SAMEQUANTUMD32                  = 0xC17 // 3095
-	SYS_SAMEQUANTUMD64                  = 0xC18 // 3096
-	SYS_SAMEQUANTUMD128                 = 0xC19 // 3097
-	SYS_SCALBLND32                      = 0xC1A // 3098
-	SYS_SCALBLND64                      = 0xC1B // 3099
-	SYS_SCALBLND128                     = 0xC1C // 3100
-	SYS_SCALBND32                       = 0xC1D // 3101
-	SYS_SCALBND64                       = 0xC1E // 3102
-	SYS_SCALBND128                      = 0xC1F // 3103
-	SYS_SIND32                          = 0xC20 // 3104
-	SYS_SIND64                          = 0xC21 // 3105
-	SYS_SIND128                         = 0xC22 // 3106
-	SYS_SINHD32                         = 0xC23 // 3107
-	SYS_SINHD64                         = 0xC24 // 3108
-	SYS_SINHD128                        = 0xC25 // 3109
-	SYS_SQRTD32                         = 0xC26 // 3110
-	SYS_SQRTD64                         = 0xC27 // 3111
-	SYS_SQRTD128                        = 0xC28 // 3112
-	SYS_STRTOD32                        = 0xC29 // 3113
-	SYS_STRTOD64                        = 0xC2A // 3114
-	SYS_STRTOD128                       = 0xC2B // 3115
-	SYS_TAND32                          = 0xC2C // 3116
-	SYS_TAND64                          = 0xC2D // 3117
-	SYS_TAND128                         = 0xC2E // 3118
-	SYS_TANHD32                         = 0xC2F // 3119
-	SYS_TANHD64                         = 0xC30 // 3120
-	SYS_TANHD128                        = 0xC31 // 3121
-	SYS_TGAMMAD32                       = 0xC32 // 3122
-	SYS_TGAMMAD64                       = 0xC33 // 3123
-	SYS_TGAMMAD128                      = 0xC34 // 3124
-	SYS_TRUNCD32                        = 0xC3E // 3134
-	SYS_TRUNCD64                        = 0xC3F // 3135
-	SYS_TRUNCD128                       = 0xC40 // 3136
-	SYS_WCSTOD32                        = 0xC41 // 3137
-	SYS_WCSTOD64                        = 0xC42 // 3138
-	SYS_WCSTOD128                       = 0xC43 // 3139
-	SYS___CODEPAGE_INFO                 = 0xC64 // 3172
-	SYS_POSIX_OPENPT                    = 0xC66 // 3174
-	SYS_PSELECT                         = 0xC67 // 3175
-	SYS_SOCKATMARK                      = 0xC68 // 3176
-	SYS_AIO_FSYNC                       = 0xC69 // 3177
-	SYS_LIO_LISTIO                      = 0xC6A // 3178
-	SYS___ATANPID32                     = 0xC6B // 3179
-	SYS___ATANPID64                     = 0xC6C // 3180
-	SYS___ATANPID128                    = 0xC6D // 3181
-	SYS___COSPID32                      = 0xC6E // 3182
-	SYS___COSPID64                      = 0xC6F // 3183
-	SYS___COSPID128                     = 0xC70 // 3184
-	SYS___SINPID32                      = 0xC71 // 3185
-	SYS___SINPID64                      = 0xC72 // 3186
-	SYS___SINPID128                     = 0xC73 // 3187
-	SYS_SETIPV4SOURCEFILTER             = 0xC76 // 3190
-	SYS_GETIPV4SOURCEFILTER             = 0xC77 // 3191
-	SYS_SETSOURCEFILTER                 = 0xC78 // 3192
-	SYS_GETSOURCEFILTER                 = 0xC79 // 3193
-	SYS_FWRITE_UNLOCKED                 = 0xC7A // 3194
-	SYS_FREAD_UNLOCKED                  = 0xC7B // 3195
-	SYS_FGETS_UNLOCKED                  = 0xC7C // 3196
-	SYS_GETS_UNLOCKED                   = 0xC7D // 3197
-	SYS_FPUTS_UNLOCKED                  = 0xC7E // 3198
-	SYS_PUTS_UNLOCKED                   = 0xC7F // 3199
-	SYS_FGETC_UNLOCKED                  = 0xC80 // 3200
-	SYS_FPUTC_UNLOCKED                  = 0xC81 // 3201
-	SYS_DLADDR                          = 0xC82 // 3202
-	SYS_SHM_OPEN                        = 0xC8C // 3212
-	SYS_SHM_UNLINK                      = 0xC8D // 3213
-	SYS___CLASS2F                       = 0xC91 // 3217
-	SYS___CLASS2L                       = 0xC92 // 3218
-	SYS___CLASS2F_B                     = 0xC93 // 3219
-	SYS___CLASS2F_H                     = 0xC94 // 3220
-	SYS___CLASS2L_B                     = 0xC95 // 3221
-	SYS___CLASS2L_H                     = 0xC96 // 3222
-	SYS___CLASS2D32                     = 0xC97 // 3223
-	SYS___CLASS2D64                     = 0xC98 // 3224
-	SYS___CLASS2D128                    = 0xC99 // 3225
-	SYS___TOCSNAME2                     = 0xC9A // 3226
-	SYS___D1TOP                         = 0xC9B // 3227
-	SYS___D2TOP                         = 0xC9C // 3228
-	SYS___D4TOP                         = 0xC9D // 3229
-	SYS___PTOD1                         = 0xC9E // 3230
-	SYS___PTOD2                         = 0xC9F // 3231
-	SYS___PTOD4                         = 0xCA0 // 3232
-	SYS_CLEARERR_UNLOCKED               = 0xCA1 // 3233
-	SYS_FDELREC_UNLOCKED                = 0xCA2 // 3234
-	SYS_FEOF_UNLOCKED                   = 0xCA3 // 3235
-	SYS_FERROR_UNLOCKED                 = 0xCA4 // 3236
-	SYS_FFLUSH_UNLOCKED                 = 0xCA5 // 3237
-	SYS_FGETPOS_UNLOCKED                = 0xCA6 // 3238
-	SYS_FGETWC_UNLOCKED                 = 0xCA7 // 3239
-	SYS_FGETWS_UNLOCKED                 = 0xCA8 // 3240
-	SYS_FILENO_UNLOCKED                 = 0xCA9 // 3241
-	SYS_FLDATA_UNLOCKED                 = 0xCAA // 3242
-	SYS_FLOCATE_UNLOCKED                = 0xCAB // 3243
-	SYS_FPRINTF_UNLOCKED                = 0xCAC // 3244
-	SYS_FPUTWC_UNLOCKED                 = 0xCAD // 3245
-	SYS_FPUTWS_UNLOCKED                 = 0xCAE // 3246
-	SYS_FSCANF_UNLOCKED                 = 0xCAF // 3247
-	SYS_FSEEK_UNLOCKED                  = 0xCB0 // 3248
-	SYS_FSEEKO_UNLOCKED                 = 0xCB1 // 3249
-	SYS_FSETPOS_UNLOCKED                = 0xCB3 // 3251
-	SYS_FTELL_UNLOCKED                  = 0xCB4 // 3252
-	SYS_FTELLO_UNLOCKED                 = 0xCB5 // 3253
-	SYS_FUPDATE_UNLOCKED                = 0xCB7 // 3255
-	SYS_FWIDE_UNLOCKED                  = 0xCB8 // 3256
-	SYS_FWPRINTF_UNLOCKED               = 0xCB9 // 3257
-	SYS_FWSCANF_UNLOCKED                = 0xCBA // 3258
-	SYS_GETWC_UNLOCKED                  = 0xCBB // 3259
-	SYS_GETWCHAR_UNLOCKED               = 0xCBC // 3260
-	SYS_PERROR_UNLOCKED                 = 0xCBD // 3261
-	SYS_PRINTF_UNLOCKED                 = 0xCBE // 3262
-	SYS_PUTWC_UNLOCKED                  = 0xCBF // 3263
-	SYS_PUTWCHAR_UNLOCKED               = 0xCC0 // 3264
-	SYS_REWIND_UNLOCKED                 = 0xCC1 // 3265
-	SYS_SCANF_UNLOCKED                  = 0xCC2 // 3266
-	SYS_UNGETC_UNLOCKED                 = 0xCC3 // 3267
-	SYS_UNGETWC_UNLOCKED                = 0xCC4 // 3268
-	SYS_VFPRINTF_UNLOCKED               = 0xCC5 // 3269
-	SYS_VFSCANF_UNLOCKED                = 0xCC7 // 3271
-	SYS_VFWPRINTF_UNLOCKED              = 0xCC9 // 3273
-	SYS_VFWSCANF_UNLOCKED               = 0xCCB // 3275
-	SYS_VPRINTF_UNLOCKED                = 0xCCD // 3277
-	SYS_VSCANF_UNLOCKED                 = 0xCCF // 3279
-	SYS_VWPRINTF_UNLOCKED               = 0xCD1 // 3281
-	SYS_VWSCANF_UNLOCKED                = 0xCD3 // 3283
-	SYS_WPRINTF_UNLOCKED                = 0xCD5 // 3285
-	SYS_WSCANF_UNLOCKED                 = 0xCD6 // 3286
-	SYS_ASCTIME64                       = 0xCD7 // 3287
-	SYS_ASCTIME64_R                     = 0xCD8 // 3288
-	SYS_CTIME64                         = 0xCD9 // 3289
-	SYS_CTIME64_R                       = 0xCDA // 3290
-	SYS_DIFFTIME64                      = 0xCDB // 3291
-	SYS_GMTIME64                        = 0xCDC // 3292
-	SYS_GMTIME64_R                      = 0xCDD // 3293
-	SYS_LOCALTIME64                     = 0xCDE // 3294
-	SYS_LOCALTIME64_R                   = 0xCDF // 3295
-	SYS_MKTIME64                        = 0xCE0 // 3296
-	SYS_TIME64                          = 0xCE1 // 3297
-	SYS___LOGIN_APPLID                  = 0xCE2 // 3298
-	SYS___PASSWD_APPLID                 = 0xCE3 // 3299
-	SYS_PTHREAD_SECURITY_APPLID_NP      = 0xCE4 // 3300
-	SYS___GETTHENT                      = 0xCE5 // 3301
-	SYS_FREEIFADDRS                     = 0xCE6 // 3302
-	SYS_GETIFADDRS                      = 0xCE7 // 3303
-	SYS_POSIX_FALLOCATE                 = 0xCE8 // 3304
-	SYS_POSIX_MEMALIGN                  = 0xCE9 // 3305
-	SYS_SIZEOF_ALLOC                    = 0xCEA // 3306
-	SYS_RESIZE_ALLOC                    = 0xCEB // 3307
-	SYS_FREAD_NOUPDATE                  = 0xCEC // 3308
-	SYS_FREAD_NOUPDATE_UNLOCKED         = 0xCED // 3309
-	SYS_FGETPOS64                       = 0xCEE // 3310
-	SYS_FSEEK64                         = 0xCEF // 3311
-	SYS_FSEEKO64                        = 0xCF0 // 3312
-	SYS_FSETPOS64                       = 0xCF1 // 3313
-	SYS_FTELL64                         = 0xCF2 // 3314
-	SYS_FTELLO64                        = 0xCF3 // 3315
-	SYS_FGETPOS64_UNLOCKED              = 0xCF4 // 3316
-	SYS_FSEEK64_UNLOCKED                = 0xCF5 // 3317
-	SYS_FSEEKO64_UNLOCKED               = 0xCF6 // 3318
-	SYS_FSETPOS64_UNLOCKED              = 0xCF7 // 3319
-	SYS_FTELL64_UNLOCKED                = 0xCF8 // 3320
-	SYS_FTELLO64_UNLOCKED               = 0xCF9 // 3321
-	SYS_FOPEN_UNLOCKED                  = 0xCFA // 3322
-	SYS_FREOPEN_UNLOCKED                = 0xCFB // 3323
-	SYS_FDOPEN_UNLOCKED                 = 0xCFC // 3324
-	SYS_TMPFILE_UNLOCKED                = 0xCFD // 3325
-	SYS___MOSERVICES                    = 0xD3D // 3389
-	SYS___GETTOD                        = 0xD3E // 3390
-	SYS_C16RTOMB                        = 0xD40 // 3392
-	SYS_C32RTOMB                        = 0xD41 // 3393
-	SYS_MBRTOC16                        = 0xD42 // 3394
-	SYS_MBRTOC32                        = 0xD43 // 3395
-	SYS_QUANTEXPD32                     = 0xD44 // 3396
-	SYS_QUANTEXPD64                     = 0xD45 // 3397
-	SYS_QUANTEXPD128                    = 0xD46 // 3398
-	SYS___LOCALE_CTL                    = 0xD47 // 3399
-	SYS___SMF_RECORD2                   = 0xD48 // 3400
-	SYS_FOPEN64                         = 0xD49 // 3401
-	SYS_FOPEN64_UNLOCKED                = 0xD4A // 3402
-	SYS_FREOPEN64                       = 0xD4B // 3403
-	SYS_FREOPEN64_UNLOCKED              = 0xD4C // 3404
-	SYS_TMPFILE64                       = 0xD4D // 3405
-	SYS_TMPFILE64_UNLOCKED              = 0xD4E // 3406
-	SYS_GETDATE64                       = 0xD4F // 3407
-	SYS_GETTIMEOFDAY64                  = 0xD50 // 3408
-	SYS_BIND2ADDRSEL                    = 0xD59 // 3417
-	SYS_INET6_IS_SRCADDR                = 0xD5A // 3418
-	SYS___GETGRGID1                     = 0xD5B // 3419
-	SYS___GETGRNAM1                     = 0xD5C // 3420
-	SYS___FBUFSIZE                      = 0xD60 // 3424
-	SYS___FPENDING                      = 0xD61 // 3425
-	SYS___FLBF                          = 0xD62 // 3426
-	SYS___FREADABLE                     = 0xD63 // 3427
-	SYS___FWRITABLE                     = 0xD64 // 3428
-	SYS___FREADING                      = 0xD65 // 3429
-	SYS___FWRITING                      = 0xD66 // 3430
-	SYS___FSETLOCKING                   = 0xD67 // 3431
-	SYS__FLUSHLBF                       = 0xD68 // 3432
-	SYS___FPURGE                        = 0xD69 // 3433
-	SYS___FREADAHEAD                    = 0xD6A // 3434
-	SYS___FSETERR                       = 0xD6B // 3435
-	SYS___FPENDING_UNLOCKED             = 0xD6C // 3436
-	SYS___FREADING_UNLOCKED             = 0xD6D // 3437
-	SYS___FWRITING_UNLOCKED             = 0xD6E // 3438
-	SYS__FLUSHLBF_UNLOCKED              = 0xD6F // 3439
-	SYS___FPURGE_UNLOCKED               = 0xD70 // 3440
-	SYS___FREADAHEAD_UNLOCKED           = 0xD71 // 3441
-	SYS___LE_CEEGTJS                    = 0xD72 // 3442
-	SYS___LE_RECORD_DUMP                = 0xD73 // 3443
-	SYS_FSTAT64                         = 0xD74 // 3444
-	SYS_LSTAT64                         = 0xD75 // 3445
-	SYS_STAT64                          = 0xD76 // 3446
-	SYS___READDIR2_64                   = 0xD77 // 3447
-	SYS___OPEN_STAT64                   = 0xD78 // 3448
-	SYS_FTW64                           = 0xD79 // 3449
-	SYS_NFTW64                          = 0xD7A // 3450
-	SYS_UTIME64                         = 0xD7B // 3451
-	SYS_UTIMES64                        = 0xD7C // 3452
-	SYS___GETIPC64                      = 0xD7D // 3453
-	SYS_MSGCTL64                        = 0xD7E // 3454
-	SYS_SEMCTL64                        = 0xD7F // 3455
-	SYS_SHMCTL64                        = 0xD80 // 3456
-	SYS_MSGXRCV64                       = 0xD81 // 3457
-	SYS___MGXR64                        = 0xD81 // 3457
-	SYS_W_GETPSENT64                    = 0xD82 // 3458
-	SYS_PTHREAD_COND_TIMEDWAIT64        = 0xD83 // 3459
-	SYS_FTIME64                         = 0xD85 // 3461
-	SYS_GETUTXENT64                     = 0xD86 // 3462
-	SYS_GETUTXID64                      = 0xD87 // 3463
-	SYS_GETUTXLINE64                    = 0xD88 // 3464
-	SYS_PUTUTXLINE64                    = 0xD89 // 3465
-	SYS_NEWLOCALE                       = 0xD8A // 3466
-	SYS_FREELOCALE                      = 0xD8B // 3467
-	SYS_USELOCALE                       = 0xD8C // 3468
-	SYS_DUPLOCALE                       = 0xD8D // 3469
-	SYS___CHATTR64                      = 0xD9C // 3484
-	SYS___LCHATTR64                     = 0xD9D // 3485
-	SYS___FCHATTR64                     = 0xD9E // 3486
-	SYS_____CHATTR64_A                  = 0xD9F // 3487
-	SYS_____LCHATTR64_A                 = 0xDA0 // 3488
-	SYS___LE_CEEUSGD                    = 0xDA1 // 3489
-	SYS___LE_IFAM_CON                   = 0xDA2 // 3490
-	SYS___LE_IFAM_DSC                   = 0xDA3 // 3491
-	SYS___LE_IFAM_GET                   = 0xDA4 // 3492
-	SYS___LE_IFAM_QRY                   = 0xDA5 // 3493
-	SYS_ALIGNED_ALLOC                   = 0xDA6 // 3494
-	SYS_ACCEPT4                         = 0xDA7 // 3495
-	SYS___ACCEPT4_A                     = 0xDA8 // 3496
-	SYS_COPYFILERANGE                   = 0xDA9 // 3497
-	SYS_GETLINE                         = 0xDAA // 3498
-	SYS___GETLINE_A                     = 0xDAB // 3499
-	SYS_DIRFD                           = 0xDAC // 3500
-	SYS_CLOCK_GETTIME                   = 0xDAD // 3501
-	SYS_DUP3                            = 0xDAE // 3502
-	SYS_EPOLL_CREATE                    = 0xDAF // 3503
-	SYS_EPOLL_CREATE1                   = 0xDB0 // 3504
-	SYS_EPOLL_CTL                       = 0xDB1 // 3505
-	SYS_EPOLL_WAIT                      = 0xDB2 // 3506
-	SYS_EPOLL_PWAIT                     = 0xDB3 // 3507
-	SYS_EVENTFD                         = 0xDB4 // 3508
-	SYS_STATFS                          = 0xDB5 // 3509
-	SYS___STATFS_A                      = 0xDB6 // 3510
-	SYS_FSTATFS                         = 0xDB7 // 3511
-	SYS_INOTIFY_INIT                    = 0xDB8 // 3512
-	SYS_INOTIFY_INIT1                   = 0xDB9 // 3513
-	SYS_INOTIFY_ADD_WATCH               = 0xDBA // 3514
-	SYS___INOTIFY_ADD_WATCH_A           = 0xDBB // 3515
-	SYS_INOTIFY_RM_WATCH                = 0xDBC // 3516
-	SYS_PIPE2                           = 0xDBD // 3517
-	SYS_PIVOT_ROOT                      = 0xDBE // 3518
-	SYS___PIVOT_ROOT_A                  = 0xDBF // 3519
-	SYS_PRCTL                           = 0xDC0 // 3520
-	SYS_PRLIMIT                         = 0xDC1 // 3521
-	SYS_SETHOSTNAME                     = 0xDC2 // 3522
-	SYS___SETHOSTNAME_A                 = 0xDC3 // 3523
-	SYS_SETRESUID                       = 0xDC4 // 3524
-	SYS_SETRESGID                       = 0xDC5 // 3525
-	SYS_PTHREAD_CONDATTR_GETCLOCK       = 0xDC6 // 3526
-	SYS_FLOCK                           = 0xDC7 // 3527
-	SYS_FGETXATTR                       = 0xDC8 // 3528
-	SYS___FGETXATTR_A                   = 0xDC9 // 3529
-	SYS_FLISTXATTR                      = 0xDCA // 3530
-	SYS___FLISTXATTR_A                  = 0xDCB // 3531
-	SYS_FREMOVEXATTR                    = 0xDCC // 3532
-	SYS___FREMOVEXATTR_A                = 0xDCD // 3533
-	SYS_FSETXATTR                       = 0xDCE // 3534
-	SYS___FSETXATTR_A                   = 0xDCF // 3535
-	SYS_GETXATTR                        = 0xDD0 // 3536
-	SYS___GETXATTR_A                    = 0xDD1 // 3537
-	SYS_LGETXATTR                       = 0xDD2 // 3538
-	SYS___LGETXATTR_A                   = 0xDD3 // 3539
-	SYS_LISTXATTR                       = 0xDD4 // 3540
-	SYS___LISTXATTR_A                   = 0xDD5 // 3541
-	SYS_LLISTXATTR                      = 0xDD6 // 3542
-	SYS___LLISTXATTR_A                  = 0xDD7 // 3543
-	SYS_LREMOVEXATTR                    = 0xDD8 // 3544
-	SYS___LREMOVEXATTR_A                = 0xDD9 // 3545
-	SYS_LSETXATTR                       = 0xDDA // 3546
-	SYS___LSETXATTR_A                   = 0xDDB // 3547
-	SYS_REMOVEXATTR                     = 0xDDC // 3548
-	SYS___REMOVEXATTR_A                 = 0xDDD // 3549
-	SYS_SETXATTR                        = 0xDDE // 3550
-	SYS___SETXATTR_A                    = 0xDDF // 3551
-	SYS_FDATASYNC                       = 0xDE0 // 3552
-	SYS_SYNCFS                          = 0xDE1 // 3553
-	SYS_FUTIMES                         = 0xDE2 // 3554
-	SYS_FUTIMESAT                       = 0xDE3 // 3555
-	SYS___FUTIMESAT_A                   = 0xDE4 // 3556
-	SYS_LUTIMES                         = 0xDE5 // 3557
-	SYS___LUTIMES_A                     = 0xDE6 // 3558
-	SYS_INET_ATON                       = 0xDE7 // 3559
-	SYS_GETRANDOM                       = 0xDE8 // 3560
-	SYS_GETTID                          = 0xDE9 // 3561
-	SYS_MEMFD_CREATE                    = 0xDEA // 3562
-	SYS___MEMFD_CREATE_A                = 0xDEB // 3563
-	SYS_FACCESSAT                       = 0xDEC // 3564
-	SYS___FACCESSAT_A                   = 0xDED // 3565
-	SYS_FCHMODAT                        = 0xDEE // 3566
-	SYS___FCHMODAT_A                    = 0xDEF // 3567
-	SYS_FCHOWNAT                        = 0xDF0 // 3568
-	SYS___FCHOWNAT_A                    = 0xDF1 // 3569
-	SYS_FSTATAT                         = 0xDF2 // 3570
-	SYS___FSTATAT_A                     = 0xDF3 // 3571
-	SYS_LINKAT                          = 0xDF4 // 3572
-	SYS___LINKAT_A                      = 0xDF5 // 3573
-	SYS_MKDIRAT                         = 0xDF6 // 3574
-	SYS___MKDIRAT_A                     = 0xDF7 // 3575
-	SYS_MKFIFOAT                        = 0xDF8 // 3576
-	SYS___MKFIFOAT_A                    = 0xDF9 // 3577
-	SYS_MKNODAT                         = 0xDFA // 3578
-	SYS___MKNODAT_A                     = 0xDFB // 3579
-	SYS_OPENAT                          = 0xDFC // 3580
-	SYS___OPENAT_A                      = 0xDFD // 3581
-	SYS_READLINKAT                      = 0xDFE // 3582
-	SYS___READLINKAT_A                  = 0xDFF // 3583
-	SYS_RENAMEAT                        = 0xE00 // 3584
-	SYS___RENAMEAT_A                    = 0xE01 // 3585
-	SYS_RENAMEAT2                       = 0xE02 // 3586
-	SYS___RENAMEAT2_A                   = 0xE03 // 3587
-	SYS_SYMLINKAT                       = 0xE04 // 3588
-	SYS___SYMLINKAT_A                   = 0xE05 // 3589
-	SYS_UNLINKAT                        = 0xE06 // 3590
-	SYS___UNLINKAT_A                    = 0xE07 // 3591
-	SYS_SYSINFO                         = 0xE08 // 3592
-	SYS_WAIT4                           = 0xE0A // 3594
-	SYS_CLONE                           = 0xE0B // 3595
-	SYS_UNSHARE                         = 0xE0C // 3596
-	SYS_SETNS                           = 0xE0D // 3597
-	SYS_CAPGET                          = 0xE0E // 3598
-	SYS_CAPSET                          = 0xE0F // 3599
-	SYS_STRCHRNUL                       = 0xE10 // 3600
-	SYS_PTHREAD_CONDATTR_SETCLOCK       = 0xE12 // 3602
-	SYS_OPEN_BY_HANDLE_AT               = 0xE13 // 3603
-	SYS___OPEN_BY_HANDLE_AT_A           = 0xE14 // 3604
-	SYS___INET_ATON_A                   = 0xE15 // 3605
-	SYS_MOUNT1                          = 0xE16 // 3606
-	SYS___MOUNT1_A                      = 0xE17 // 3607
-	SYS_UMOUNT1                         = 0xE18 // 3608
-	SYS___UMOUNT1_A                     = 0xE19 // 3609
-	SYS_UMOUNT2                         = 0xE1A // 3610
-	SYS___UMOUNT2_A                     = 0xE1B // 3611
-	SYS___PRCTL_A                       = 0xE1C // 3612
-	SYS_LOCALTIME_R2                    = 0xE1D // 3613
-	SYS___LOCALTIME_R2_A                = 0xE1E // 3614
-	SYS_OPENAT2                         = 0xE1F // 3615
-	SYS___OPENAT2_A                     = 0xE20 // 3616
-	SYS___LE_CEEMICT                    = 0xE21 // 3617
-	SYS_GETENTROPY                      = 0xE22 // 3618
-	SYS_NANOSLEEP                       = 0xE23 // 3619
-	SYS_UTIMENSAT                       = 0xE24 // 3620
-	SYS___UTIMENSAT_A                   = 0xE25 // 3621
-	SYS_ASPRINTF                        = 0xE26 // 3622
-	SYS___ASPRINTF_A                    = 0xE27 // 3623
-	SYS_VASPRINTF                       = 0xE28 // 3624
-	SYS___VASPRINTF_A                   = 0xE29 // 3625
-	SYS_DPRINTF                         = 0xE2A // 3626
-	SYS___DPRINTF_A                     = 0xE2B // 3627
-	SYS_GETOPT_LONG                     = 0xE2C // 3628
-	SYS___GETOPT_LONG_A                 = 0xE2D // 3629
-	SYS_PSIGNAL                         = 0xE2E // 3630
-	SYS___PSIGNAL_A                     = 0xE2F // 3631
-	SYS_PSIGNAL_UNLOCKED                = 0xE30 // 3632
-	SYS___PSIGNAL_UNLOCKED_A            = 0xE31 // 3633
-	SYS_FSTATAT_O                       = 0xE32 // 3634
-	SYS___FSTATAT_O_A                   = 0xE33 // 3635
-	SYS_FSTATAT64                       = 0xE34 // 3636
-	SYS___FSTATAT64_A                   = 0xE35 // 3637
-	SYS___CHATTRAT                      = 0xE36 // 3638
-	SYS_____CHATTRAT_A                  = 0xE37 // 3639
-	SYS___CHATTRAT64                    = 0xE38 // 3640
-	SYS_____CHATTRAT64_A                = 0xE39 // 3641
-	SYS_MADVISE                         = 0xE3A // 3642
-	SYS___AUTHENTICATE                  = 0xE3B // 3643
+// TODO: auto-generate.
 
+const (
+	SYS_ACOSD128                        = 0xB80
+	SYS_ACOSD32                         = 0xB7E
+	SYS_ACOSD64                         = 0xB7F
+	SYS_ACOSHD128                       = 0xB83
+	SYS_ACOSHD32                        = 0xB81
+	SYS_ACOSHD64                        = 0xB82
+	SYS_AIO_FSYNC                       = 0xC69
+	SYS_ASCTIME                         = 0x0AE
+	SYS_ASCTIME64                       = 0xCD7
+	SYS_ASCTIME64_R                     = 0xCD8
+	SYS_ASIND128                        = 0xB86
+	SYS_ASIND32                         = 0xB84
+	SYS_ASIND64                         = 0xB85
+	SYS_ASINHD128                       = 0xB89
+	SYS_ASINHD32                        = 0xB87
+	SYS_ASINHD64                        = 0xB88
+	SYS_ATAN2D128                       = 0xB8F
+	SYS_ATAN2D32                        = 0xB8D
+	SYS_ATAN2D64                        = 0xB8E
+	SYS_ATAND128                        = 0xB8C
+	SYS_ATAND32                         = 0xB8A
+	SYS_ATAND64                         = 0xB8B
+	SYS_ATANHD128                       = 0xB92
+	SYS_ATANHD32                        = 0xB90
+	SYS_ATANHD64                        = 0xB91
+	SYS_BIND2ADDRSEL                    = 0xD59
+	SYS_C16RTOMB                        = 0xD40
+	SYS_C32RTOMB                        = 0xD41
+	SYS_CBRTD128                        = 0xB95
+	SYS_CBRTD32                         = 0xB93
+	SYS_CBRTD64                         = 0xB94
+	SYS_CEILD128                        = 0xB98
+	SYS_CEILD32                         = 0xB96
+	SYS_CEILD64                         = 0xB97
+	SYS_CLEARENV                        = 0x0C9
+	SYS_CLEARERR_UNLOCKED               = 0xCA1
+	SYS_CLOCK                           = 0x0AA
+	SYS_CLOGL                           = 0xA00
+	SYS_CLRMEMF                         = 0x0BD
+	SYS_CONJ                            = 0xA03
+	SYS_CONJF                           = 0xA06
+	SYS_CONJL                           = 0xA09
+	SYS_COPYSIGND128                    = 0xB9E
+	SYS_COPYSIGND32                     = 0xB9C
+	SYS_COPYSIGND64                     = 0xB9D
+	SYS_COSD128                         = 0xBA1
+	SYS_COSD32                          = 0xB9F
+	SYS_COSD64                          = 0xBA0
+	SYS_COSHD128                        = 0xBA4
+	SYS_COSHD32                         = 0xBA2
+	SYS_COSHD64                         = 0xBA3
+	SYS_CPOW                            = 0xA0C
+	SYS_CPOWF                           = 0xA0F
+	SYS_CPOWL                           = 0xA12
+	SYS_CPROJ                           = 0xA15
+	SYS_CPROJF                          = 0xA18
+	SYS_CPROJL                          = 0xA1B
+	SYS_CREAL                           = 0xA1E
+	SYS_CREALF                          = 0xA21
+	SYS_CREALL                          = 0xA24
+	SYS_CSIN                            = 0xA27
+	SYS_CSINF                           = 0xA2A
+	SYS_CSINH                           = 0xA30
+	SYS_CSINHF                          = 0xA33
+	SYS_CSINHL                          = 0xA36
+	SYS_CSINL                           = 0xA2D
+	SYS_CSNAP                           = 0x0C5
+	SYS_CSQRT                           = 0xA39
+	SYS_CSQRTF                          = 0xA3C
+	SYS_CSQRTL                          = 0xA3F
+	SYS_CTAN                            = 0xA42
+	SYS_CTANF                           = 0xA45
+	SYS_CTANH                           = 0xA4B
+	SYS_CTANHF                          = 0xA4E
+	SYS_CTANHL                          = 0xA51
+	SYS_CTANL                           = 0xA48
+	SYS_CTIME                           = 0x0AB
+	SYS_CTIME64                         = 0xCD9
+	SYS_CTIME64_R                       = 0xCDA
+	SYS_CTRACE                          = 0x0C6
+	SYS_DIFFTIME                        = 0x0A7
+	SYS_DIFFTIME64                      = 0xCDB
+	SYS_DLADDR                          = 0xC82
+	SYS_DYNALLOC                        = 0x0C3
+	SYS_DYNFREE                         = 0x0C2
+	SYS_ERFCD128                        = 0xBAA
+	SYS_ERFCD32                         = 0xBA8
+	SYS_ERFCD64                         = 0xBA9
+	SYS_ERFD128                         = 0xBA7
+	SYS_ERFD32                          = 0xBA5
+	SYS_ERFD64                          = 0xBA6
+	SYS_EXP2D128                        = 0xBB0
+	SYS_EXP2D32                         = 0xBAE
+	SYS_EXP2D64                         = 0xBAF
+	SYS_EXPD128                         = 0xBAD
+	SYS_EXPD32                          = 0xBAB
+	SYS_EXPD64                          = 0xBAC
+	SYS_EXPM1D128                       = 0xBB3
+	SYS_EXPM1D32                        = 0xBB1
+	SYS_EXPM1D64                        = 0xBB2
+	SYS_FABSD128                        = 0xBB6
+	SYS_FABSD32                         = 0xBB4
+	SYS_FABSD64                         = 0xBB5
+	SYS_FDELREC_UNLOCKED                = 0xCA2
+	SYS_FDIMD128                        = 0xBB9
+	SYS_FDIMD32                         = 0xBB7
+	SYS_FDIMD64                         = 0xBB8
+	SYS_FDOPEN_UNLOCKED                 = 0xCFC
+	SYS_FECLEAREXCEPT                   = 0xAEA
+	SYS_FEGETENV                        = 0xAEB
+	SYS_FEGETEXCEPTFLAG                 = 0xAEC
+	SYS_FEGETROUND                      = 0xAED
+	SYS_FEHOLDEXCEPT                    = 0xAEE
+	SYS_FEOF_UNLOCKED                   = 0xCA3
+	SYS_FERAISEEXCEPT                   = 0xAEF
+	SYS_FERROR_UNLOCKED                 = 0xCA4
+	SYS_FESETENV                        = 0xAF0
+	SYS_FESETEXCEPTFLAG                 = 0xAF1
+	SYS_FESETROUND                      = 0xAF2
+	SYS_FETCHEP                         = 0x0BF
+	SYS_FETESTEXCEPT                    = 0xAF3
+	SYS_FEUPDATEENV                     = 0xAF4
+	SYS_FE_DEC_GETROUND                 = 0xBBA
+	SYS_FE_DEC_SETROUND                 = 0xBBB
+	SYS_FFLUSH_UNLOCKED                 = 0xCA5
+	SYS_FGETC_UNLOCKED                  = 0xC80
+	SYS_FGETPOS64                       = 0xCEE
+	SYS_FGETPOS64_UNLOCKED              = 0xCF4
+	SYS_FGETPOS_UNLOCKED                = 0xCA6
+	SYS_FGETS_UNLOCKED                  = 0xC7C
+	SYS_FGETWC_UNLOCKED                 = 0xCA7
+	SYS_FGETWS_UNLOCKED                 = 0xCA8
+	SYS_FILENO_UNLOCKED                 = 0xCA9
+	SYS_FLDATA                          = 0x0C1
+	SYS_FLDATA_UNLOCKED                 = 0xCAA
+	SYS_FLOCATE_UNLOCKED                = 0xCAB
+	SYS_FLOORD128                       = 0xBBE
+	SYS_FLOORD32                        = 0xBBC
+	SYS_FLOORD64                        = 0xBBD
+	SYS_FMA                             = 0xA63
+	SYS_FMAD128                         = 0xBC1
+	SYS_FMAD32                          = 0xBBF
+	SYS_FMAD64                          = 0xBC0
+	SYS_FMAF                            = 0xA66
+	SYS_FMAL                            = 0xA69
+	SYS_FMAX                            = 0xA6C
+	SYS_FMAXD128                        = 0xBC4
+	SYS_FMAXD32                         = 0xBC2
+	SYS_FMAXD64                         = 0xBC3
+	SYS_FMAXF                           = 0xA6F
+	SYS_FMAXL                           = 0xA72
+	SYS_FMIN                            = 0xA75
+	SYS_FMIND128                        = 0xBC7
+	SYS_FMIND32                         = 0xBC5
+	SYS_FMIND64                         = 0xBC6
+	SYS_FMINF                           = 0xA78
+	SYS_FMINL                           = 0xA7B
+	SYS_FMODD128                        = 0xBCA
+	SYS_FMODD32                         = 0xBC8
+	SYS_FMODD64                         = 0xBC9
+	SYS_FOPEN64                         = 0xD49
+	SYS_FOPEN64_UNLOCKED                = 0xD4A
+	SYS_FOPEN_UNLOCKED                  = 0xCFA
+	SYS_FPRINTF_UNLOCKED                = 0xCAC
+	SYS_FPUTC_UNLOCKED                  = 0xC81
+	SYS_FPUTS_UNLOCKED                  = 0xC7E
+	SYS_FPUTWC_UNLOCKED                 = 0xCAD
+	SYS_FPUTWS_UNLOCKED                 = 0xCAE
+	SYS_FREAD_NOUPDATE                  = 0xCEC
+	SYS_FREAD_NOUPDATE_UNLOCKED         = 0xCED
+	SYS_FREAD_UNLOCKED                  = 0xC7B
+	SYS_FREEIFADDRS                     = 0xCE6
+	SYS_FREOPEN64                       = 0xD4B
+	SYS_FREOPEN64_UNLOCKED              = 0xD4C
+	SYS_FREOPEN_UNLOCKED                = 0xCFB
+	SYS_FREXPD128                       = 0xBCE
+	SYS_FREXPD32                        = 0xBCC
+	SYS_FREXPD64                        = 0xBCD
+	SYS_FSCANF_UNLOCKED                 = 0xCAF
+	SYS_FSEEK64                         = 0xCEF
+	SYS_FSEEK64_UNLOCKED                = 0xCF5
+	SYS_FSEEKO64                        = 0xCF0
+	SYS_FSEEKO64_UNLOCKED               = 0xCF6
+	SYS_FSEEKO_UNLOCKED                 = 0xCB1
+	SYS_FSEEK_UNLOCKED                  = 0xCB0
+	SYS_FSETPOS64                       = 0xCF1
+	SYS_FSETPOS64_UNLOCKED              = 0xCF7
+	SYS_FSETPOS_UNLOCKED                = 0xCB3
+	SYS_FTELL64                         = 0xCF2
+	SYS_FTELL64_UNLOCKED                = 0xCF8
+	SYS_FTELLO64                        = 0xCF3
+	SYS_FTELLO64_UNLOCKED               = 0xCF9
+	SYS_FTELLO_UNLOCKED                 = 0xCB5
+	SYS_FTELL_UNLOCKED                  = 0xCB4
+	SYS_FUPDATE                         = 0x0B5
+	SYS_FUPDATE_UNLOCKED                = 0xCB7
+	SYS_FWIDE_UNLOCKED                  = 0xCB8
+	SYS_FWPRINTF_UNLOCKED               = 0xCB9
+	SYS_FWRITE_UNLOCKED                 = 0xC7A
+	SYS_FWSCANF_UNLOCKED                = 0xCBA
+	SYS_GETDATE64                       = 0xD4F
+	SYS_GETIFADDRS                      = 0xCE7
+	SYS_GETIPV4SOURCEFILTER             = 0xC77
+	SYS_GETSOURCEFILTER                 = 0xC79
+	SYS_GETSYNTX                        = 0x0FD
+	SYS_GETS_UNLOCKED                   = 0xC7D
+	SYS_GETTIMEOFDAY64                  = 0xD50
+	SYS_GETWCHAR_UNLOCKED               = 0xCBC
+	SYS_GETWC_UNLOCKED                  = 0xCBB
+	SYS_GMTIME                          = 0x0B0
+	SYS_GMTIME64                        = 0xCDC
+	SYS_GMTIME64_R                      = 0xCDD
+	SYS_HYPOTD128                       = 0xBD1
+	SYS_HYPOTD32                        = 0xBCF
+	SYS_HYPOTD64                        = 0xBD0
+	SYS_ILOGBD128                       = 0xBD4
+	SYS_ILOGBD32                        = 0xBD2
+	SYS_ILOGBD64                        = 0xBD3
+	SYS_ILOGBF                          = 0xA7E
+	SYS_ILOGBL                          = 0xA81
+	SYS_INET6_IS_SRCADDR                = 0xD5A
+	SYS_ISBLANK                         = 0x0FE
+	SYS_ISWALNUM                        = 0x0FF
+	SYS_LDEXPD128                       = 0xBD7
+	SYS_LDEXPD32                        = 0xBD5
+	SYS_LDEXPD64                        = 0xBD6
+	SYS_LGAMMAD128                      = 0xBDA
+	SYS_LGAMMAD32                       = 0xBD8
+	SYS_LGAMMAD64                       = 0xBD9
+	SYS_LIO_LISTIO                      = 0xC6A
+	SYS_LLRINT                          = 0xA84
+	SYS_LLRINTD128                      = 0xBDD
+	SYS_LLRINTD32                       = 0xBDB
+	SYS_LLRINTD64                       = 0xBDC
+	SYS_LLRINTF                         = 0xA87
+	SYS_LLRINTL                         = 0xA8A
+	SYS_LLROUND                         = 0xA8D
+	SYS_LLROUNDD128                     = 0xBE0
+	SYS_LLROUNDD32                      = 0xBDE
+	SYS_LLROUNDD64                      = 0xBDF
+	SYS_LLROUNDF                        = 0xA90
+	SYS_LLROUNDL                        = 0xA93
+	SYS_LOCALTIM                        = 0x0B1
+	SYS_LOCALTIME                       = 0x0B1
+	SYS_LOCALTIME64                     = 0xCDE
+	SYS_LOCALTIME64_R                   = 0xCDF
+	SYS_LOG10D128                       = 0xBE6
+	SYS_LOG10D32                        = 0xBE4
+	SYS_LOG10D64                        = 0xBE5
+	SYS_LOG1PD128                       = 0xBE9
+	SYS_LOG1PD32                        = 0xBE7
+	SYS_LOG1PD64                        = 0xBE8
+	SYS_LOG2D128                        = 0xBEC
+	SYS_LOG2D32                         = 0xBEA
+	SYS_LOG2D64                         = 0xBEB
+	SYS_LOGBD128                        = 0xBEF
+	SYS_LOGBD32                         = 0xBED
+	SYS_LOGBD64                         = 0xBEE
+	SYS_LOGBF                           = 0xA96
+	SYS_LOGBL                           = 0xA99
+	SYS_LOGD128                         = 0xBE3
+	SYS_LOGD32                          = 0xBE1
+	SYS_LOGD64                          = 0xBE2
+	SYS_LRINT                           = 0xA9C
+	SYS_LRINTD128                       = 0xBF2
+	SYS_LRINTD32                        = 0xBF0
+	SYS_LRINTD64                        = 0xBF1
+	SYS_LRINTF                          = 0xA9F
+	SYS_LRINTL                          = 0xAA2
+	SYS_LROUNDD128                      = 0xBF5
+	SYS_LROUNDD32                       = 0xBF3
+	SYS_LROUNDD64                       = 0xBF4
+	SYS_LROUNDL                         = 0xAA5
+	SYS_MBLEN                           = 0x0AF
+	SYS_MBRTOC16                        = 0xD42
+	SYS_MBRTOC32                        = 0xD43
+	SYS_MEMSET                          = 0x0A3
+	SYS_MKTIME                          = 0x0AC
+	SYS_MKTIME64                        = 0xCE0
+	SYS_MODFD128                        = 0xBF8
+	SYS_MODFD32                         = 0xBF6
+	SYS_MODFD64                         = 0xBF7
+	SYS_NAN                             = 0xAA8
+	SYS_NAND128                         = 0xBFB
+	SYS_NAND32                          = 0xBF9
+	SYS_NAND64                          = 0xBFA
+	SYS_NANF                            = 0xAAA
+	SYS_NANL                            = 0xAAC
+	SYS_NEARBYINT                       = 0xAAE
+	SYS_NEARBYINTD128                   = 0xBFE
+	SYS_NEARBYINTD32                    = 0xBFC
+	SYS_NEARBYINTD64                    = 0xBFD
+	SYS_NEARBYINTF                      = 0xAB1
+	SYS_NEARBYINTL                      = 0xAB4
+	SYS_NEXTAFTERD128                   = 0xC01
+	SYS_NEXTAFTERD32                    = 0xBFF
+	SYS_NEXTAFTERD64                    = 0xC00
+	SYS_NEXTAFTERF                      = 0xAB7
+	SYS_NEXTAFTERL                      = 0xABA
+	SYS_NEXTTOWARD                      = 0xABD
+	SYS_NEXTTOWARDD128                  = 0xC04
+	SYS_NEXTTOWARDD32                   = 0xC02
+	SYS_NEXTTOWARDD64                   = 0xC03
+	SYS_NEXTTOWARDF                     = 0xAC0
+	SYS_NEXTTOWARDL                     = 0xAC3
+	SYS_NL_LANGINFO                     = 0x0FC
+	SYS_PERROR_UNLOCKED                 = 0xCBD
+	SYS_POSIX_FALLOCATE                 = 0xCE8
+	SYS_POSIX_MEMALIGN                  = 0xCE9
+	SYS_POSIX_OPENPT                    = 0xC66
+	SYS_POWD128                         = 0xC07
+	SYS_POWD32                          = 0xC05
+	SYS_POWD64                          = 0xC06
+	SYS_PRINTF_UNLOCKED                 = 0xCBE
+	SYS_PSELECT                         = 0xC67
+	SYS_PTHREAD_ATTR_GETSTACK           = 0xB3E
+	SYS_PTHREAD_ATTR_SETSTACK           = 0xB3F
+	SYS_PTHREAD_SECURITY_APPLID_NP      = 0xCE4
+	SYS_PUTS_UNLOCKED                   = 0xC7F
+	SYS_PUTWCHAR_UNLOCKED               = 0xCC0
+	SYS_PUTWC_UNLOCKED                  = 0xCBF
+	SYS_QUANTEXPD128                    = 0xD46
+	SYS_QUANTEXPD32                     = 0xD44
+	SYS_QUANTEXPD64                     = 0xD45
+	SYS_QUANTIZED128                    = 0xC0A
+	SYS_QUANTIZED32                     = 0xC08
+	SYS_QUANTIZED64                     = 0xC09
+	SYS_REMAINDERD128                   = 0xC0D
+	SYS_REMAINDERD32                    = 0xC0B
+	SYS_REMAINDERD64                    = 0xC0C
+	SYS_RESIZE_ALLOC                    = 0xCEB
+	SYS_REWIND_UNLOCKED                 = 0xCC1
+	SYS_RINTD128                        = 0xC13
+	SYS_RINTD32                         = 0xC11
+	SYS_RINTD64                         = 0xC12
+	SYS_RINTF                           = 0xACB
+	SYS_RINTL                           = 0xACD
+	SYS_ROUND                           = 0xACF
+	SYS_ROUNDD128                       = 0xC16
+	SYS_ROUNDD32                        = 0xC14
+	SYS_ROUNDD64                        = 0xC15
+	SYS_ROUNDF                          = 0xAD2
+	SYS_ROUNDL                          = 0xAD5
+	SYS_SAMEQUANTUMD128                 = 0xC19
+	SYS_SAMEQUANTUMD32                  = 0xC17
+	SYS_SAMEQUANTUMD64                  = 0xC18
+	SYS_SCALBLN                         = 0xAD8
+	SYS_SCALBLND128                     = 0xC1C
+	SYS_SCALBLND32                      = 0xC1A
+	SYS_SCALBLND64                      = 0xC1B
+	SYS_SCALBLNF                        = 0xADB
+	SYS_SCALBLNL                        = 0xADE
+	SYS_SCALBND128                      = 0xC1F
+	SYS_SCALBND32                       = 0xC1D
+	SYS_SCALBND64                       = 0xC1E
+	SYS_SCALBNF                         = 0xAE3
+	SYS_SCALBNL                         = 0xAE6
+	SYS_SCANF_UNLOCKED                  = 0xCC2
+	SYS_SCHED_YIELD                     = 0xB32
+	SYS_SETENV                          = 0x0C8
+	SYS_SETIPV4SOURCEFILTER             = 0xC76
+	SYS_SETSOURCEFILTER                 = 0xC78
+	SYS_SHM_OPEN                        = 0xC8C
+	SYS_SHM_UNLINK                      = 0xC8D
+	SYS_SIND128                         = 0xC22
+	SYS_SIND32                          = 0xC20
+	SYS_SIND64                          = 0xC21
+	SYS_SINHD128                        = 0xC25
+	SYS_SINHD32                         = 0xC23
+	SYS_SINHD64                         = 0xC24
+	SYS_SIZEOF_ALLOC                    = 0xCEA
+	SYS_SOCKATMARK                      = 0xC68
+	SYS_SQRTD128                        = 0xC28
+	SYS_SQRTD32                         = 0xC26
+	SYS_SQRTD64                         = 0xC27
+	SYS_STRCHR                          = 0x0A0
+	SYS_STRCSPN                         = 0x0A1
+	SYS_STRERROR                        = 0x0A8
+	SYS_STRERROR_R                      = 0xB33
+	SYS_STRFTIME                        = 0x0B2
+	SYS_STRLEN                          = 0x0A9
+	SYS_STRPBRK                         = 0x0A2
+	SYS_STRSPN                          = 0x0A4
+	SYS_STRSTR                          = 0x0A5
+	SYS_STRTOD128                       = 0xC2B
+	SYS_STRTOD32                        = 0xC29
+	SYS_STRTOD64                        = 0xC2A
+	SYS_STRTOK                          = 0x0A6
+	SYS_TAND128                         = 0xC2E
+	SYS_TAND32                          = 0xC2C
+	SYS_TAND64                          = 0xC2D
+	SYS_TANHD128                        = 0xC31
+	SYS_TANHD32                         = 0xC2F
+	SYS_TANHD64                         = 0xC30
+	SYS_TGAMMAD128                      = 0xC34
+	SYS_TGAMMAD32                       = 0xC32
+	SYS_TGAMMAD64                       = 0xC33
+	SYS_TIME                            = 0x0AD
+	SYS_TIME64                          = 0xCE1
+	SYS_TMPFILE64                       = 0xD4D
+	SYS_TMPFILE64_UNLOCKED              = 0xD4E
+	SYS_TMPFILE_UNLOCKED                = 0xCFD
+	SYS_TRUNCD128                       = 0xC40
+	SYS_TRUNCD32                        = 0xC3E
+	SYS_TRUNCD64                        = 0xC3F
+	SYS_UNGETC_UNLOCKED                 = 0xCC3
+	SYS_UNGETWC_UNLOCKED                = 0xCC4
+	SYS_UNSETENV                        = 0xB34
+	SYS_VFPRINTF_UNLOCKED               = 0xCC5
+	SYS_VFSCANF_UNLOCKED                = 0xCC7
+	SYS_VFWPRINTF_UNLOCKED              = 0xCC9
+	SYS_VFWSCANF_UNLOCKED               = 0xCCB
+	SYS_VPRINTF_UNLOCKED                = 0xCCD
+	SYS_VSCANF_UNLOCKED                 = 0xCCF
+	SYS_VWPRINTF_UNLOCKED               = 0xCD1
+	SYS_VWSCANF_UNLOCKED                = 0xCD3
+	SYS_WCSTOD128                       = 0xC43
+	SYS_WCSTOD32                        = 0xC41
+	SYS_WCSTOD64                        = 0xC42
+	SYS_WPRINTF_UNLOCKED                = 0xCD5
+	SYS_WSCANF_UNLOCKED                 = 0xCD6
+	SYS__FLUSHLBF                       = 0xD68
+	SYS__FLUSHLBF_UNLOCKED              = 0xD6F
+	SYS___ACOSHF_H                      = 0xA54
+	SYS___ACOSHL_H                      = 0xA55
+	SYS___ASINHF_H                      = 0xA56
+	SYS___ASINHL_H                      = 0xA57
+	SYS___ATANPID128                    = 0xC6D
+	SYS___ATANPID32                     = 0xC6B
+	SYS___ATANPID64                     = 0xC6C
+	SYS___CBRTF_H                       = 0xA58
+	SYS___CBRTL_H                       = 0xA59
+	SYS___CDUMP                         = 0x0C4
+	SYS___CLASS                         = 0xAFA
+	SYS___CLASS2                        = 0xB99
+	SYS___CLASS2D128                    = 0xC99
+	SYS___CLASS2D32                     = 0xC97
+	SYS___CLASS2D64                     = 0xC98
+	SYS___CLASS2F                       = 0xC91
+	SYS___CLASS2F_B                     = 0xC93
+	SYS___CLASS2F_H                     = 0xC94
+	SYS___CLASS2L                       = 0xC92
+	SYS___CLASS2L_B                     = 0xC95
+	SYS___CLASS2L_H                     = 0xC96
+	SYS___CLASS2_B                      = 0xB9A
+	SYS___CLASS2_H                      = 0xB9B
+	SYS___CLASS_B                       = 0xAFB
+	SYS___CLASS_H                       = 0xAFC
+	SYS___CLOGL_B                       = 0xA01
+	SYS___CLOGL_H                       = 0xA02
+	SYS___CLRENV                        = 0x0C9
+	SYS___CLRMF                         = 0x0BD
+	SYS___CODEPAGE_INFO                 = 0xC64
+	SYS___CONJF_B                       = 0xA07
+	SYS___CONJF_H                       = 0xA08
+	SYS___CONJL_B                       = 0xA0A
+	SYS___CONJL_H                       = 0xA0B
+	SYS___CONJ_B                        = 0xA04
+	SYS___CONJ_H                        = 0xA05
+	SYS___COPYSIGN_B                    = 0xA5A
+	SYS___COPYSIGN_H                    = 0xAF5
+	SYS___COSPID128                     = 0xC70
+	SYS___COSPID32                      = 0xC6E
+	SYS___COSPID64                      = 0xC6F
+	SYS___CPOWF_B                       = 0xA10
+	SYS___CPOWF_H                       = 0xA11
+	SYS___CPOWL_B                       = 0xA13
+	SYS___CPOWL_H                       = 0xA14
+	SYS___CPOW_B                        = 0xA0D
+	SYS___CPOW_H                        = 0xA0E
+	SYS___CPROJF_B                      = 0xA19
+	SYS___CPROJF_H                      = 0xA1A
+	SYS___CPROJL_B                      = 0xA1C
+	SYS___CPROJL_H                      = 0xA1D
+	SYS___CPROJ_B                       = 0xA16
+	SYS___CPROJ_H                       = 0xA17
+	SYS___CREALF_B                      = 0xA22
+	SYS___CREALF_H                      = 0xA23
+	SYS___CREALL_B                      = 0xA25
+	SYS___CREALL_H                      = 0xA26
+	SYS___CREAL_B                       = 0xA1F
+	SYS___CREAL_H                       = 0xA20
+	SYS___CSINF_B                       = 0xA2B
+	SYS___CSINF_H                       = 0xA2C
+	SYS___CSINHF_B                      = 0xA34
+	SYS___CSINHF_H                      = 0xA35
+	SYS___CSINHL_B                      = 0xA37
+	SYS___CSINHL_H                      = 0xA38
+	SYS___CSINH_B                       = 0xA31
+	SYS___CSINH_H                       = 0xA32
+	SYS___CSINL_B                       = 0xA2E
+	SYS___CSINL_H                       = 0xA2F
+	SYS___CSIN_B                        = 0xA28
+	SYS___CSIN_H                        = 0xA29
+	SYS___CSNAP                         = 0x0C5
+	SYS___CSQRTF_B                      = 0xA3D
+	SYS___CSQRTF_H                      = 0xA3E
+	SYS___CSQRTL_B                      = 0xA40
+	SYS___CSQRTL_H                      = 0xA41
+	SYS___CSQRT_B                       = 0xA3A
+	SYS___CSQRT_H                       = 0xA3B
+	SYS___CTANF_B                       = 0xA46
+	SYS___CTANF_H                       = 0xA47
+	SYS___CTANHF_B                      = 0xA4F
+	SYS___CTANHF_H                      = 0xA50
+	SYS___CTANHL_B                      = 0xA52
+	SYS___CTANHL_H                      = 0xA53
+	SYS___CTANH_B                       = 0xA4C
+	SYS___CTANH_H                       = 0xA4D
+	SYS___CTANL_B                       = 0xA49
+	SYS___CTANL_H                       = 0xA4A
+	SYS___CTAN_B                        = 0xA43
+	SYS___CTAN_H                        = 0xA44
+	SYS___CTEST                         = 0x0C7
+	SYS___CTRACE                        = 0x0C6
+	SYS___D1TOP                         = 0xC9B
+	SYS___D2TOP                         = 0xC9C
+	SYS___D4TOP                         = 0xC9D
+	SYS___DYNALL                        = 0x0C3
+	SYS___DYNFRE                        = 0x0C2
+	SYS___EXP2F_H                       = 0xA5E
+	SYS___EXP2L_H                       = 0xA5F
+	SYS___EXP2_H                        = 0xA5D
+	SYS___EXPM1F_H                      = 0xA5B
+	SYS___EXPM1L_H                      = 0xA5C
+	SYS___FBUFSIZE                      = 0xD60
+	SYS___FLBF                          = 0xD62
+	SYS___FLDATA                        = 0x0C1
+	SYS___FMAF_B                        = 0xA67
+	SYS___FMAF_H                        = 0xA68
+	SYS___FMAL_B                        = 0xA6A
+	SYS___FMAL_H                        = 0xA6B
+	SYS___FMAXF_B                       = 0xA70
+	SYS___FMAXF_H                       = 0xA71
+	SYS___FMAXL_B                       = 0xA73
+	SYS___FMAXL_H                       = 0xA74
+	SYS___FMAX_B                        = 0xA6D
+	SYS___FMAX_H                        = 0xA6E
+	SYS___FMA_B                         = 0xA64
+	SYS___FMA_H                         = 0xA65
+	SYS___FMINF_B                       = 0xA79
+	SYS___FMINF_H                       = 0xA7A
+	SYS___FMINL_B                       = 0xA7C
+	SYS___FMINL_H                       = 0xA7D
+	SYS___FMIN_B                        = 0xA76
+	SYS___FMIN_H                        = 0xA77
+	SYS___FPENDING                      = 0xD61
+	SYS___FPENDING_UNLOCKED             = 0xD6C
+	SYS___FPURGE                        = 0xD69
+	SYS___FPURGE_UNLOCKED               = 0xD70
+	SYS___FP_CAST_D                     = 0xBCB
+	SYS___FREADABLE                     = 0xD63
+	SYS___FREADAHEAD                    = 0xD6A
+	SYS___FREADAHEAD_UNLOCKED           = 0xD71
+	SYS___FREADING                      = 0xD65
+	SYS___FREADING_UNLOCKED             = 0xD6D
+	SYS___FSEEK2                        = 0xB3C
+	SYS___FSETERR                       = 0xD6B
+	SYS___FSETLOCKING                   = 0xD67
+	SYS___FTCHEP                        = 0x0BF
+	SYS___FTELL2                        = 0xB3B
+	SYS___FUPDT                         = 0x0B5
+	SYS___FWRITABLE                     = 0xD64
+	SYS___FWRITING                      = 0xD66
+	SYS___FWRITING_UNLOCKED             = 0xD6E
+	SYS___GETCB                         = 0x0B4
+	SYS___GETGRGID1                     = 0xD5B
+	SYS___GETGRNAM1                     = 0xD5C
+	SYS___GETTHENT                      = 0xCE5
+	SYS___GETTOD                        = 0xD3E
+	SYS___HYPOTF_H                      = 0xAF6
+	SYS___HYPOTL_H                      = 0xAF7
+	SYS___ILOGBF_B                      = 0xA7F
+	SYS___ILOGBF_H                      = 0xA80
+	SYS___ILOGBL_B                      = 0xA82
+	SYS___ILOGBL_H                      = 0xA83
+	SYS___ISBLANK_A                     = 0xB2E
+	SYS___ISBLNK                        = 0x0FE
+	SYS___ISWBLANK_A                    = 0xB2F
+	SYS___LE_CEEGTJS                    = 0xD72
+	SYS___LE_TRACEBACK                  = 0xB7A
+	SYS___LGAMMAL_H                     = 0xA62
+	SYS___LGAMMA_B_C99                  = 0xB39
+	SYS___LGAMMA_H_C99                  = 0xB38
+	SYS___LGAMMA_R_C99                  = 0xB3A
+	SYS___LLRINTF_B                     = 0xA88
+	SYS___LLRINTF_H                     = 0xA89
+	SYS___LLRINTL_B                     = 0xA8B
+	SYS___LLRINTL_H                     = 0xA8C
+	SYS___LLRINT_B                      = 0xA85
+	SYS___LLRINT_H                      = 0xA86
+	SYS___LLROUNDF_B                    = 0xA91
+	SYS___LLROUNDF_H                    = 0xA92
+	SYS___LLROUNDL_B                    = 0xA94
+	SYS___LLROUNDL_H                    = 0xA95
+	SYS___LLROUND_B                     = 0xA8E
+	SYS___LLROUND_H                     = 0xA8F
+	SYS___LOCALE_CTL                    = 0xD47
+	SYS___LOG1PF_H                      = 0xA60
+	SYS___LOG1PL_H                      = 0xA61
+	SYS___LOGBF_B                       = 0xA97
+	SYS___LOGBF_H                       = 0xA98
+	SYS___LOGBL_B                       = 0xA9A
+	SYS___LOGBL_H                       = 0xA9B
+	SYS___LOGIN_APPLID                  = 0xCE2
+	SYS___LRINTF_B                      = 0xAA0
+	SYS___LRINTF_H                      = 0xAA1
+	SYS___LRINTL_B                      = 0xAA3
+	SYS___LRINTL_H                      = 0xAA4
+	SYS___LRINT_B                       = 0xA9D
+	SYS___LRINT_H                       = 0xA9E
+	SYS___LROUNDF_FIXUP                 = 0xB31
+	SYS___LROUNDL_B                     = 0xAA6
+	SYS___LROUNDL_H                     = 0xAA7
+	SYS___LROUND_FIXUP                  = 0xB30
+	SYS___MOSERVICES                    = 0xD3D
+	SYS___MUST_STAY_CLEAN               = 0xB7C
+	SYS___NANF_B                        = 0xAAB
+	SYS___NANL_B                        = 0xAAD
+	SYS___NAN_B                         = 0xAA9
+	SYS___NEARBYINTF_B                  = 0xAB2
+	SYS___NEARBYINTF_H                  = 0xAB3
+	SYS___NEARBYINTL_B                  = 0xAB5
+	SYS___NEARBYINTL_H                  = 0xAB6
+	SYS___NEARBYINT_B                   = 0xAAF
+	SYS___NEARBYINT_H                   = 0xAB0
+	SYS___NEXTAFTERF_B                  = 0xAB8
+	SYS___NEXTAFTERF_H                  = 0xAB9
+	SYS___NEXTAFTERL_B                  = 0xABB
+	SYS___NEXTAFTERL_H                  = 0xABC
+	SYS___NEXTTOWARDF_B                 = 0xAC1
+	SYS___NEXTTOWARDF_H                 = 0xAC2
+	SYS___NEXTTOWARDL_B                 = 0xAC4
+	SYS___NEXTTOWARDL_H                 = 0xAC5
+	SYS___NEXTTOWARD_B                  = 0xABE
+	SYS___NEXTTOWARD_H                  = 0xABF
+	SYS___O_ENV                         = 0xB7D
+	SYS___PASSWD_APPLID                 = 0xCE3
+	SYS___PTOD1                         = 0xC9E
+	SYS___PTOD2                         = 0xC9F
+	SYS___PTOD4                         = 0xCA0
+	SYS___REGCOMP_STD                   = 0x0EA
+	SYS___REMAINDERF_H                  = 0xAC6
+	SYS___REMAINDERL_H                  = 0xAC7
+	SYS___REMQUOD128                    = 0xC10
+	SYS___REMQUOD32                     = 0xC0E
+	SYS___REMQUOD64                     = 0xC0F
+	SYS___REMQUOF_H                     = 0xAC9
+	SYS___REMQUOL_H                     = 0xACA
+	SYS___REMQUO_H                      = 0xAC8
+	SYS___RINTF_B                       = 0xACC
+	SYS___RINTL_B                       = 0xACE
+	SYS___ROUNDF_B                      = 0xAD3
+	SYS___ROUNDF_H                      = 0xAD4
+	SYS___ROUNDL_B                      = 0xAD6
+	SYS___ROUNDL_H                      = 0xAD7
+	SYS___ROUND_B                       = 0xAD0
+	SYS___ROUND_H                       = 0xAD1
+	SYS___SCALBLNF_B                    = 0xADC
+	SYS___SCALBLNF_H                    = 0xADD
+	SYS___SCALBLNL_B                    = 0xADF
+	SYS___SCALBLNL_H                    = 0xAE0
+	SYS___SCALBLN_B                     = 0xAD9
+	SYS___SCALBLN_H                     = 0xADA
+	SYS___SCALBNF_B                     = 0xAE4
+	SYS___SCALBNF_H                     = 0xAE5
+	SYS___SCALBNL_B                     = 0xAE7
+	SYS___SCALBNL_H                     = 0xAE8
+	SYS___SCALBN_B                      = 0xAE1
+	SYS___SCALBN_H                      = 0xAE2
+	SYS___SETENV                        = 0x0C8
+	SYS___SINPID128                     = 0xC73
+	SYS___SINPID32                      = 0xC71
+	SYS___SINPID64                      = 0xC72
+	SYS___SMF_RECORD2                   = 0xD48
+	SYS___STATIC_REINIT                 = 0xB3D
+	SYS___TGAMMAF_H_C99                 = 0xB79
+	SYS___TGAMMAL_H                     = 0xAE9
+	SYS___TGAMMA_H_C99                  = 0xB78
+	SYS___TOCSNAME2                     = 0xC9A
+	SYS_CEIL                            = 0x01F
+	SYS_CHAUDIT                         = 0x1E0
+	SYS_EXP                             = 0x01A
+	SYS_FCHAUDIT                        = 0x1E1
+	SYS_FREXP                           = 0x01D
+	SYS_GETGROUPSBYNAME                 = 0x1E2
+	SYS_GETPWUID                        = 0x1A0
+	SYS_GETUID                          = 0x1A1
+	SYS_ISATTY                          = 0x1A3
+	SYS_KILL                            = 0x1A4
+	SYS_LDEXP                           = 0x01E
+	SYS_LINK                            = 0x1A5
+	SYS_LOG10                           = 0x01C
+	SYS_LSEEK                           = 0x1A6
+	SYS_LSTAT                           = 0x1A7
+	SYS_MKDIR                           = 0x1A8
+	SYS_MKFIFO                          = 0x1A9
+	SYS_MKNOD                           = 0x1AA
+	SYS_MODF                            = 0x01B
+	SYS_MOUNT                           = 0x1AB
+	SYS_OPEN                            = 0x1AC
+	SYS_OPENDIR                         = 0x1AD
+	SYS_PATHCONF                        = 0x1AE
+	SYS_PAUSE                           = 0x1AF
+	SYS_PIPE                            = 0x1B0
+	SYS_PTHREAD_ATTR_DESTROY            = 0x1E7
+	SYS_PTHREAD_ATTR_GETDETACHSTATE     = 0x1EB
+	SYS_PTHREAD_ATTR_GETSTACKSIZE       = 0x1E9
+	SYS_PTHREAD_ATTR_GETWEIGHT_NP       = 0x1ED
+	SYS_PTHREAD_ATTR_INIT               = 0x1E6
+	SYS_PTHREAD_ATTR_SETDETACHSTATE     = 0x1EA
+	SYS_PTHREAD_ATTR_SETSTACKSIZE       = 0x1E8
+	SYS_PTHREAD_ATTR_SETWEIGHT_NP       = 0x1EC
+	SYS_PTHREAD_CANCEL                  = 0x1EE
+	SYS_PTHREAD_CLEANUP_POP             = 0x1F0
+	SYS_PTHREAD_CLEANUP_PUSH            = 0x1EF
+	SYS_PTHREAD_CONDATTR_DESTROY        = 0x1F2
+	SYS_PTHREAD_CONDATTR_INIT           = 0x1F1
+	SYS_PTHREAD_COND_BROADCAST          = 0x1F6
+	SYS_PTHREAD_COND_DESTROY            = 0x1F4
+	SYS_PTHREAD_COND_INIT               = 0x1F3
+	SYS_PTHREAD_COND_SIGNAL             = 0x1F5
+	SYS_PTHREAD_COND_TIMEDWAIT          = 0x1F8
+	SYS_PTHREAD_COND_WAIT               = 0x1F7
+	SYS_PTHREAD_CREATE                  = 0x1F9
+	SYS_PTHREAD_DETACH                  = 0x1FA
+	SYS_PTHREAD_EQUAL                   = 0x1FB
+	SYS_PTHREAD_EXIT                    = 0x1E4
+	SYS_PTHREAD_GETSPECIFIC             = 0x1FC
+	SYS_PTHREAD_JOIN                    = 0x1FD
+	SYS_PTHREAD_KEY_CREATE              = 0x1FE
+	SYS_PTHREAD_KILL                    = 0x1E5
+	SYS_PTHREAD_MUTEXATTR_INIT          = 0x1FF
+	SYS_READ                            = 0x1B2
+	SYS_READDIR                         = 0x1B3
+	SYS_READLINK                        = 0x1B4
+	SYS_REWINDDIR                       = 0x1B5
+	SYS_RMDIR                           = 0x1B6
+	SYS_SETEGID                         = 0x1B7
+	SYS_SETEUID                         = 0x1B8
+	SYS_SETGID                          = 0x1B9
+	SYS_SETPGID                         = 0x1BA
+	SYS_SETSID                          = 0x1BB
+	SYS_SETUID                          = 0x1BC
+	SYS_SIGACTION                       = 0x1BD
+	SYS_SIGADDSET                       = 0x1BE
+	SYS_SIGDELSET                       = 0x1BF
+	SYS_SIGEMPTYSET                     = 0x1C0
+	SYS_SIGFILLSET                      = 0x1C1
+	SYS_SIGISMEMBER                     = 0x1C2
+	SYS_SIGLONGJMP                      = 0x1C3
+	SYS_SIGPENDING                      = 0x1C4
+	SYS_SIGPROCMASK                     = 0x1C5
+	SYS_SIGSETJMP                       = 0x1C6
+	SYS_SIGSUSPEND                      = 0x1C7
+	SYS_SIGWAIT                         = 0x1E3
+	SYS_SLEEP                           = 0x1C8
+	SYS_STAT                            = 0x1C9
+	SYS_SYMLINK                         = 0x1CB
+	SYS_SYSCONF                         = 0x1CC
+	SYS_TCDRAIN                         = 0x1CD
+	SYS_TCFLOW                          = 0x1CE
+	SYS_TCFLUSH                         = 0x1CF
+	SYS_TCGETATTR                       = 0x1D0
+	SYS_TCGETPGRP                       = 0x1D1
+	SYS_TCSENDBREAK                     = 0x1D2
+	SYS_TCSETATTR                       = 0x1D3
+	SYS_TCSETPGRP                       = 0x1D4
+	SYS_TIMES                           = 0x1D5
+	SYS_TTYNAME                         = 0x1D6
+	SYS_TZSET                           = 0x1D7
+	SYS_UMASK                           = 0x1D8
+	SYS_UMOUNT                          = 0x1D9
+	SYS_UNAME                           = 0x1DA
+	SYS_UNLINK                          = 0x1DB
+	SYS_UTIME                           = 0x1DC
+	SYS_WAIT                            = 0x1DD
+	SYS_WAITPID                         = 0x1DE
+	SYS_WRITE                           = 0x1DF
+	SYS_W_GETPSENT                      = 0x1B1
+	SYS_W_IOCTL                         = 0x1A2
+	SYS_W_STATFS                        = 0x1CA
+	SYS_A64L                            = 0x2EF
+	SYS_BCMP                            = 0x2B9
+	SYS_BCOPY                           = 0x2BA
+	SYS_BZERO                           = 0x2BB
+	SYS_CATCLOSE                        = 0x2B6
+	SYS_CATGETS                         = 0x2B7
+	SYS_CATOPEN                         = 0x2B8
+	SYS_CRYPT                           = 0x2AC
+	SYS_DBM_CLEARERR                    = 0x2F7
+	SYS_DBM_CLOSE                       = 0x2F8
+	SYS_DBM_DELETE                      = 0x2F9
+	SYS_DBM_ERROR                       = 0x2FA
+	SYS_DBM_FETCH                       = 0x2FB
+	SYS_DBM_FIRSTKEY                    = 0x2FC
+	SYS_DBM_NEXTKEY                     = 0x2FD
+	SYS_DBM_OPEN                        = 0x2FE
+	SYS_DBM_STORE                       = 0x2FF
+	SYS_DRAND48                         = 0x2B2
+	SYS_ENCRYPT                         = 0x2AD
+	SYS_ENDUTXENT                       = 0x2E1
+	SYS_ERAND48                         = 0x2B3
+	SYS_ERF                             = 0x02C
+	SYS_ERFC                            = 0x02D
+	SYS_FCHDIR                          = 0x2D9
+	SYS_FFS                             = 0x2BC
+	SYS_FMTMSG                          = 0x2E5
+	SYS_FSTATVFS                        = 0x2B4
+	SYS_FTIME                           = 0x2F5
+	SYS_GAMMA                           = 0x02E
+	SYS_GETDATE                         = 0x2A6
+	SYS_GETPAGESIZE                     = 0x2D8
+	SYS_GETTIMEOFDAY                    = 0x2F6
+	SYS_GETUTXENT                       = 0x2E0
+	SYS_GETUTXID                        = 0x2E2
+	SYS_GETUTXLINE                      = 0x2E3
+	SYS_HCREATE                         = 0x2C6
+	SYS_HDESTROY                        = 0x2C7
+	SYS_HSEARCH                         = 0x2C8
+	SYS_HYPOT                           = 0x02B
+	SYS_INDEX                           = 0x2BD
+	SYS_INITSTATE                       = 0x2C2
+	SYS_INSQUE                          = 0x2CF
+	SYS_ISASCII                         = 0x2ED
+	SYS_JRAND48                         = 0x2E6
+	SYS_L64A                            = 0x2F0
+	SYS_LCONG48                         = 0x2EA
+	SYS_LFIND                           = 0x2C9
+	SYS_LRAND48                         = 0x2E7
+	SYS_LSEARCH                         = 0x2CA
+	SYS_MEMCCPY                         = 0x2D4
+	SYS_MRAND48                         = 0x2E8
+	SYS_NRAND48                         = 0x2E9
+	SYS_PCLOSE                          = 0x2D2
+	SYS_POPEN                           = 0x2D1
+	SYS_PUTUTXLINE                      = 0x2E4
+	SYS_RANDOM                          = 0x2C4
+	SYS_REMQUE                          = 0x2D0
+	SYS_RINDEX                          = 0x2BE
+	SYS_SEED48                          = 0x2EC
+	SYS_SETKEY                          = 0x2AE
+	SYS_SETSTATE                        = 0x2C3
+	SYS_SETUTXENT                       = 0x2DF
+	SYS_SRAND48                         = 0x2EB
+	SYS_SRANDOM                         = 0x2C5
+	SYS_STATVFS                         = 0x2B5
+	SYS_STRCASECMP                      = 0x2BF
+	SYS_STRDUP                          = 0x2C0
+	SYS_STRNCASECMP                     = 0x2C1
+	SYS_SWAB                            = 0x2D3
+	SYS_TDELETE                         = 0x2CB
+	SYS_TFIND                           = 0x2CC
+	SYS_TOASCII                         = 0x2EE
+	SYS_TSEARCH                         = 0x2CD
+	SYS_TWALK                           = 0x2CE
+	SYS_UALARM                          = 0x2F1
+	SYS_USLEEP                          = 0x2F2
+	SYS_WAIT3                           = 0x2A7
+	SYS_WAITID                          = 0x2A8
+	SYS_Y1                              = 0x02A
+	SYS___ATOE                          = 0x2DB
+	SYS___ATOE_L                        = 0x2DC
+	SYS___CATTRM                        = 0x2A9
+	SYS___CNVBLK                        = 0x2AF
+	SYS___CRYTRM                        = 0x2B0
+	SYS___DLGHT                         = 0x2A1
+	SYS___ECRTRM                        = 0x2B1
+	SYS___ETOA                          = 0x2DD
+	SYS___ETOA_L                        = 0x2DE
+	SYS___GDTRM                         = 0x2AA
+	SYS___OCLCK                         = 0x2DA
+	SYS___OPARGF                        = 0x2A2
+	SYS___OPERRF                        = 0x2A5
+	SYS___OPINDF                        = 0x2A4
+	SYS___OPOPTF                        = 0x2A3
+	SYS___RNDTRM                        = 0x2AB
+	SYS___SRCTRM                        = 0x2F4
+	SYS___TZONE                         = 0x2A0
+	SYS___UTXTRM                        = 0x2F3
+	SYS_ASIN                            = 0x03E
+	SYS_ISXDIGIT                        = 0x03B
+	SYS_SETLOCAL                        = 0x03A
+	SYS_SETLOCALE                       = 0x03A
+	SYS_SIN                             = 0x03F
+	SYS_TOLOWER                         = 0x03C
+	SYS_TOUPPER                         = 0x03D
+	SYS_ACCEPT_AND_RECV                 = 0x4F7
+	SYS_ATOL                            = 0x04E
+	SYS_CHECKSCH                        = 0x4BC
+	SYS_CHECKSCHENV                     = 0x4BC
+	SYS_CLEARERR                        = 0x04C
+	SYS_CONNECTS                        = 0x4B5
+	SYS_CONNECTSERVER                   = 0x4B5
+	SYS_CONNECTW                        = 0x4B4
+	SYS_CONNECTWORKMGR                  = 0x4B4
+	SYS_CONTINUE                        = 0x4B3
+	SYS_CONTINUEWORKUNIT                = 0x4B3
+	SYS_COPYSIGN                        = 0x4C2
+	SYS_CREATEWO                        = 0x4B2
+	SYS_CREATEWORKUNIT                  = 0x4B2
+	SYS_DELETEWO                        = 0x4B9
+	SYS_DELETEWORKUNIT                  = 0x4B9
+	SYS_DISCONNE                        = 0x4B6
+	SYS_DISCONNECTSERVER                = 0x4B6
+	SYS_FEOF                            = 0x04D
+	SYS_FERROR                          = 0x04A
+	SYS_FINITE                          = 0x4C8
+	SYS_GAMMA_R                         = 0x4E2
+	SYS_JOINWORK                        = 0x4B7
+	SYS_JOINWORKUNIT                    = 0x4B7
+	SYS_LEAVEWOR                        = 0x4B8
+	SYS_LEAVEWORKUNIT                   = 0x4B8
+	SYS_LGAMMA_R                        = 0x4EB
+	SYS_MATHERR                         = 0x4D0
+	SYS_PERROR                          = 0x04F
+	SYS_QUERYMET                        = 0x4BA
+	SYS_QUERYMETRICS                    = 0x4BA
+	SYS_QUERYSCH                        = 0x4BB
+	SYS_QUERYSCHENV                     = 0x4BB
+	SYS_REWIND                          = 0x04B
+	SYS_SCALBN                          = 0x4D4
+	SYS_SIGNIFIC                        = 0x4D5
+	SYS_SIGNIFICAND                     = 0x4D5
+	SYS___ACOSH_B                       = 0x4DA
+	SYS___ACOS_B                        = 0x4D9
+	SYS___ASINH_B                       = 0x4BE
+	SYS___ASIN_B                        = 0x4DB
+	SYS___ATAN2_B                       = 0x4DC
+	SYS___ATANH_B                       = 0x4DD
+	SYS___ATAN_B                        = 0x4BF
+	SYS___CBRT_B                        = 0x4C0
+	SYS___CEIL_B                        = 0x4C1
+	SYS___COSH_B                        = 0x4DE
+	SYS___COS_B                         = 0x4C3
+	SYS___DGHT                          = 0x4A8
+	SYS___ENVN                          = 0x4B0
+	SYS___ERFC_B                        = 0x4C5
+	SYS___ERF_B                         = 0x4C4
+	SYS___EXPM1_B                       = 0x4C6
+	SYS___EXP_B                         = 0x4DF
+	SYS___FABS_B                        = 0x4C7
+	SYS___FLOOR_B                       = 0x4C9
+	SYS___FMOD_B                        = 0x4E0
+	SYS___FP_SETMODE                    = 0x4F8
+	SYS___FREXP_B                       = 0x4CA
+	SYS___GAMMA_B                       = 0x4E1
+	SYS___GDRR                          = 0x4A1
+	SYS___HRRNO                         = 0x4A2
+	SYS___HYPOT_B                       = 0x4E3
+	SYS___ILOGB_B                       = 0x4CB
+	SYS___ISNAN_B                       = 0x4CC
+	SYS___J0_B                          = 0x4E4
+	SYS___J1_B                          = 0x4E6
+	SYS___JN_B                          = 0x4E8
+	SYS___LDEXP_B                       = 0x4CD
+	SYS___LGAMMA_B                      = 0x4EA
+	SYS___LOG10_B                       = 0x4ED
+	SYS___LOG1P_B                       = 0x4CE
+	SYS___LOGB_B                        = 0x4CF
+	SYS___LOGIN                         = 0x4F5
+	SYS___LOG_B                         = 0x4EC
+	SYS___MLOCKALL                      = 0x4B1
+	SYS___MODF_B                        = 0x4D1
+	SYS___NEXTAFTER_B                   = 0x4D2
+	SYS___OPENDIR2                      = 0x4F3
+	SYS___OPEN_STAT                     = 0x4F6
+	SYS___OPND                          = 0x4A5
+	SYS___OPPT                          = 0x4A6
+	SYS___OPRG                          = 0x4A3
+	SYS___OPRR                          = 0x4A4
+	SYS___PID_AFFINITY                  = 0x4BD
+	SYS___POW_B                         = 0x4EE
+	SYS___READDIR2                      = 0x4F4
+	SYS___REMAINDER_B                   = 0x4EF
+	SYS___RINT_B                        = 0x4D3
+	SYS___SCALB_B                       = 0x4F0
+	SYS___SIGACTIONSET                  = 0x4FB
+	SYS___SIGGM                         = 0x4A7
+	SYS___SINH_B                        = 0x4F1
+	SYS___SIN_B                         = 0x4D6
+	SYS___SQRT_B                        = 0x4F2
+	SYS___TANH_B                        = 0x4D8
+	SYS___TAN_B                         = 0x4D7
+	SYS___TRRNO                         = 0x4AF
+	SYS___TZNE                          = 0x4A9
+	SYS___TZZN                          = 0x4AA
+	SYS___UCREATE                       = 0x4FC
+	SYS___UFREE                         = 0x4FE
+	SYS___UHEAPREPORT                   = 0x4FF
+	SYS___UMALLOC                       = 0x4FD
+	SYS___Y0_B                          = 0x4E5
+	SYS___Y1_B                          = 0x4E7
+	SYS___YN_B                          = 0x4E9
+	SYS_ABORT                           = 0x05C
+	SYS_ASCTIME_R                       = 0x5E0
+	SYS_ATEXIT                          = 0x05D
+	SYS_CONNECTE                        = 0x5AE
+	SYS_CONNECTEXPORTIMPORT             = 0x5AE
+	SYS_CTIME_R                         = 0x5E1
+	SYS_DN_COMP                         = 0x5DF
+	SYS_DN_EXPAND                       = 0x5DD
+	SYS_DN_SKIPNAME                     = 0x5DE
+	SYS_EXIT                            = 0x05A
+	SYS_EXPORTWO                        = 0x5A1
+	SYS_EXPORTWORKUNIT                  = 0x5A1
+	SYS_EXTRACTW                        = 0x5A5
+	SYS_EXTRACTWORKUNIT                 = 0x5A5
+	SYS_FSEEKO                          = 0x5C9
+	SYS_FTELLO                          = 0x5C8
+	SYS_GETGRGID_R                      = 0x5E7
+	SYS_GETGRNAM_R                      = 0x5E8
+	SYS_GETLOGIN_R                      = 0x5E9
+	SYS_GETPWNAM_R                      = 0x5EA
+	SYS_GETPWUID_R                      = 0x5EB
+	SYS_GMTIME_R                        = 0x5E2
+	SYS_IMPORTWO                        = 0x5A3
+	SYS_IMPORTWORKUNIT                  = 0x5A3
+	SYS_INET_NTOP                       = 0x5D3
+	SYS_INET_PTON                       = 0x5D4
+	SYS_LLABS                           = 0x5CE
+	SYS_LLDIV                           = 0x5CB
+	SYS_LOCALTIME_R                     = 0x5E3
+	SYS_PTHREAD_ATFORK                  = 0x5ED
+	SYS_PTHREAD_ATTR_GETDETACHSTATE_U98 = 0x5FB
+	SYS_PTHREAD_ATTR_GETGUARDSIZE       = 0x5EE
+	SYS_PTHREAD_ATTR_GETSCHEDPARAM      = 0x5F9
+	SYS_PTHREAD_ATTR_GETSTACKADDR       = 0x5EF
+	SYS_PTHREAD_ATTR_SETDETACHSTATE_U98 = 0x5FC
+	SYS_PTHREAD_ATTR_SETGUARDSIZE       = 0x5F0
+	SYS_PTHREAD_ATTR_SETSCHEDPARAM      = 0x5FA
+	SYS_PTHREAD_ATTR_SETSTACKADDR       = 0x5F1
+	SYS_PTHREAD_CONDATTR_GETPSHARED     = 0x5F2
+	SYS_PTHREAD_CONDATTR_SETPSHARED     = 0x5F3
+	SYS_PTHREAD_DETACH_U98              = 0x5FD
+	SYS_PTHREAD_GETCONCURRENCY          = 0x5F4
+	SYS_PTHREAD_GETSPECIFIC_U98         = 0x5FE
+	SYS_PTHREAD_KEY_DELETE              = 0x5F5
+	SYS_PTHREAD_SETCANCELSTATE          = 0x5FF
+	SYS_PTHREAD_SETCONCURRENCY          = 0x5F6
+	SYS_PTHREAD_SIGMASK                 = 0x5F7
+	SYS_QUERYENC                        = 0x5AD
+	SYS_QUERYWORKUNITCLASSIFICATION     = 0x5AD
+	SYS_RAISE                           = 0x05E
+	SYS_RAND_R                          = 0x5E4
+	SYS_READDIR_R                       = 0x5E6
+	SYS_REALLOC                         = 0x05B
+	SYS_RES_INIT                        = 0x5D8
+	SYS_RES_MKQUERY                     = 0x5D7
+	SYS_RES_QUERY                       = 0x5D9
+	SYS_RES_QUERYDOMAIN                 = 0x5DC
+	SYS_RES_SEARCH                      = 0x5DA
+	SYS_RES_SEND                        = 0x5DB
+	SYS_SETJMP                          = 0x05F
+	SYS_SIGQUEUE                        = 0x5A9
+	SYS_STRTOK_R                        = 0x5E5
+	SYS_STRTOLL                         = 0x5B0
+	SYS_STRTOULL                        = 0x5B1
+	SYS_TTYNAME_R                       = 0x5EC
+	SYS_UNDOEXPO                        = 0x5A2
+	SYS_UNDOEXPORTWORKUNIT              = 0x5A2
+	SYS_UNDOIMPO                        = 0x5A4
+	SYS_UNDOIMPORTWORKUNIT              = 0x5A4
+	SYS_WCSTOLL                         = 0x5CC
+	SYS_WCSTOULL                        = 0x5CD
+	SYS___ABORT                         = 0x05C
+	SYS___CONSOLE2                      = 0x5D2
+	SYS___CPL                           = 0x5A6
+	SYS___DISCARDDATA                   = 0x5F8
+	SYS___DSA_PREV                      = 0x5B2
+	SYS___EP_FIND                       = 0x5B3
+	SYS___FP_SWAPMODE                   = 0x5AF
+	SYS___GETUSERID                     = 0x5AB
+	SYS___GET_CPUID                     = 0x5B9
+	SYS___GET_SYSTEM_SETTINGS           = 0x5BA
+	SYS___IPDOMAINNAME                  = 0x5AC
+	SYS___MAP_INIT                      = 0x5A7
+	SYS___MAP_SERVICE                   = 0x5A8
+	SYS___MOUNT                         = 0x5AA
+	SYS___MSGRCV_TIMED                  = 0x5B7
+	SYS___RES                           = 0x5D6
+	SYS___SEMOP_TIMED                   = 0x5B8
+	SYS___SERVER_THREADS_QUERY          = 0x5B4
+	SYS_FPRINTF                         = 0x06D
+	SYS_FSCANF                          = 0x06A
+	SYS_PRINTF                          = 0x06F
+	SYS_SETBUF                          = 0x06B
+	SYS_SETVBUF                         = 0x06C
+	SYS_SSCANF                          = 0x06E
+	SYS___CATGETS_A                     = 0x6C0
+	SYS___CHAUDIT_A                     = 0x6F4
+	SYS___CHMOD_A                       = 0x6E8
+	SYS___COLLATE_INIT_A                = 0x6AC
+	SYS___CREAT_A                       = 0x6F6
+	SYS___CTYPE_INIT_A                  = 0x6AF
+	SYS___DLLLOAD_A                     = 0x6DF
+	SYS___DLLQUERYFN_A                  = 0x6E0
+	SYS___DLLQUERYVAR_A                 = 0x6E1
+	SYS___E2A_L                         = 0x6E3
+	SYS___EXECLE_A                      = 0x6A0
+	SYS___EXECLP_A                      = 0x6A4
+	SYS___EXECVE_A                      = 0x6C1
+	SYS___EXECVP_A                      = 0x6C2
+	SYS___EXECV_A                       = 0x6B1
+	SYS___FPRINTF_A                     = 0x6FA
+	SYS___GETADDRINFO_A                 = 0x6BF
+	SYS___GETNAMEINFO_A                 = 0x6C4
+	SYS___GET_WCTYPE_STD_A              = 0x6AE
+	SYS___ICONV_OPEN_A                  = 0x6DE
+	SYS___IF_INDEXTONAME_A              = 0x6DC
+	SYS___IF_NAMETOINDEX_A              = 0x6DB
+	SYS___ISWCTYPE_A                    = 0x6B0
+	SYS___IS_WCTYPE_STD_A               = 0x6B2
+	SYS___LOCALECONV_A                  = 0x6B8
+	SYS___LOCALECONV_STD_A              = 0x6B9
+	SYS___LOCALE_INIT_A                 = 0x6B7
+	SYS___LSTAT_A                       = 0x6EE
+	SYS___LSTAT_O_A                     = 0x6EF
+	SYS___MKDIR_A                       = 0x6E9
+	SYS___MKFIFO_A                      = 0x6EC
+	SYS___MKNOD_A                       = 0x6F0
+	SYS___MONETARY_INIT_A               = 0x6BC
+	SYS___MOUNT_A                       = 0x6F1
+	SYS___NL_CSINFO_A                   = 0x6D6
+	SYS___NL_LANGINFO_A                 = 0x6BA
+	SYS___NL_LNAGINFO_STD_A             = 0x6BB
+	SYS___NL_MONINFO_A                  = 0x6D7
+	SYS___NL_NUMINFO_A                  = 0x6D8
+	SYS___NL_RESPINFO_A                 = 0x6D9
+	SYS___NL_TIMINFO_A                  = 0x6DA
+	SYS___NUMERIC_INIT_A                = 0x6C6
+	SYS___OPEN_A                        = 0x6F7
+	SYS___PRINTF_A                      = 0x6DD
+	SYS___RESP_INIT_A                   = 0x6C7
+	SYS___RPMATCH_A                     = 0x6C8
+	SYS___RPMATCH_C_A                   = 0x6C9
+	SYS___RPMATCH_STD_A                 = 0x6CA
+	SYS___SETLOCALE_A                   = 0x6F9
+	SYS___SPAWNP_A                      = 0x6C5
+	SYS___SPAWN_A                       = 0x6C3
+	SYS___SPRINTF_A                     = 0x6FB
+	SYS___STAT_A                        = 0x6EA
+	SYS___STAT_O_A                      = 0x6EB
+	SYS___STRCOLL_STD_A                 = 0x6A1
+	SYS___STRFMON_A                     = 0x6BD
+	SYS___STRFMON_STD_A                 = 0x6BE
+	SYS___STRFTIME_A                    = 0x6CC
+	SYS___STRFTIME_STD_A                = 0x6CD
+	SYS___STRPTIME_A                    = 0x6CE
+	SYS___STRPTIME_STD_A                = 0x6CF
+	SYS___STRXFRM_A                     = 0x6A2
+	SYS___STRXFRM_C_A                   = 0x6A3
+	SYS___STRXFRM_STD_A                 = 0x6A5
+	SYS___SYNTAX_INIT_A                 = 0x6D4
+	SYS___TIME_INIT_A                   = 0x6CB
+	SYS___TOD_INIT_A                    = 0x6D5
+	SYS___TOWLOWER_A                    = 0x6B3
+	SYS___TOWLOWER_STD_A                = 0x6B4
+	SYS___TOWUPPER_A                    = 0x6B5
+	SYS___TOWUPPER_STD_A                = 0x6B6
+	SYS___UMOUNT_A                      = 0x6F2
+	SYS___VFPRINTF_A                    = 0x6FC
+	SYS___VPRINTF_A                     = 0x6FD
+	SYS___VSPRINTF_A                    = 0x6FE
+	SYS___VSWPRINTF_A                   = 0x6FF
+	SYS___WCSCOLL_A                     = 0x6A6
+	SYS___WCSCOLL_C_A                   = 0x6A7
+	SYS___WCSCOLL_STD_A                 = 0x6A8
+	SYS___WCSFTIME_A                    = 0x6D0
+	SYS___WCSFTIME_STD_A                = 0x6D1
+	SYS___WCSXFRM_A                     = 0x6A9
+	SYS___WCSXFRM_C_A                   = 0x6AA
+	SYS___WCSXFRM_STD_A                 = 0x6AB
+	SYS___WCTYPE_A                      = 0x6AD
+	SYS___W_GETMNTENT_A                 = 0x6F5
+	SYS_____CCSIDTYPE_A                 = 0x6E6
+	SYS_____CHATTR_A                    = 0x6E2
+	SYS_____CSNAMETYPE_A                = 0x6E7
+	SYS_____OPEN_STAT_A                 = 0x6ED
+	SYS_____SPAWN2_A                    = 0x6D2
+	SYS_____SPAWNP2_A                   = 0x6D3
+	SYS_____TOCCSID_A                   = 0x6E4
+	SYS_____TOCSNAME_A                  = 0x6E5
+	SYS_ACL_FREE                        = 0x7FF
+	SYS_ACL_INIT                        = 0x7FE
+	SYS_FWIDE                           = 0x7DF
+	SYS_FWPRINTF                        = 0x7D1
+	SYS_FWRITE                          = 0x07E
+	SYS_FWSCANF                         = 0x7D5
+	SYS_GETCHAR                         = 0x07B
+	SYS_GETS                            = 0x07C
+	SYS_M_CREATE_LAYOUT                 = 0x7C9
+	SYS_M_DESTROY_LAYOUT                = 0x7CA
+	SYS_M_GETVALUES_LAYOUT              = 0x7CB
+	SYS_M_SETVALUES_LAYOUT              = 0x7CC
+	SYS_M_TRANSFORM_LAYOUT              = 0x7CD
+	SYS_M_WTRANSFORM_LAYOUT             = 0x7CE
+	SYS_PREAD                           = 0x7C7
+	SYS_PUTC                            = 0x07D
+	SYS_PUTCHAR                         = 0x07A
+	SYS_PUTS                            = 0x07F
+	SYS_PWRITE                          = 0x7C8
+	SYS_TOWCTRAN                        = 0x7D8
+	SYS_TOWCTRANS                       = 0x7D8
+	SYS_UNATEXIT                        = 0x7B5
+	SYS_VFWPRINT                        = 0x7D3
+	SYS_VFWPRINTF                       = 0x7D3
+	SYS_VWPRINTF                        = 0x7D4
+	SYS_WCTRANS                         = 0x7D7
+	SYS_WPRINTF                         = 0x7D2
+	SYS_WSCANF                          = 0x7D6
+	SYS___ASCTIME_R_A                   = 0x7A1
+	SYS___BASENAME_A                    = 0x7DC
+	SYS___BTOWC_A                       = 0x7E4
+	SYS___CDUMP_A                       = 0x7B7
+	SYS___CEE3DMP_A                     = 0x7B6
+	SYS___CEILF_H                       = 0x7F4
+	SYS___CEILL_H                       = 0x7F5
+	SYS___CEIL_H                        = 0x7EA
+	SYS___CRYPT_A                       = 0x7BE
+	SYS___CSNAP_A                       = 0x7B8
+	SYS___CTEST_A                       = 0x7B9
+	SYS___CTIME_R_A                     = 0x7A2
+	SYS___CTRACE_A                      = 0x7BA
+	SYS___DBM_OPEN_A                    = 0x7E6
+	SYS___DIRNAME_A                     = 0x7DD
+	SYS___FABSF_H                       = 0x7FA
+	SYS___FABSL_H                       = 0x7FB
+	SYS___FABS_H                        = 0x7ED
+	SYS___FGETWC_A                      = 0x7AA
+	SYS___FGETWS_A                      = 0x7AD
+	SYS___FLOORF_H                      = 0x7F6
+	SYS___FLOORL_H                      = 0x7F7
+	SYS___FLOOR_H                       = 0x7EB
+	SYS___FPUTWC_A                      = 0x7A5
+	SYS___FPUTWS_A                      = 0x7A8
+	SYS___GETTIMEOFDAY_A                = 0x7AE
+	SYS___GETWCHAR_A                    = 0x7AC
+	SYS___GETWC_A                       = 0x7AB
+	SYS___GLOB_A                        = 0x7DE
+	SYS___GMTIME_A                      = 0x7AF
+	SYS___GMTIME_R_A                    = 0x7B0
+	SYS___INET_PTON_A                   = 0x7BC
+	SYS___J0_H                          = 0x7EE
+	SYS___J1_H                          = 0x7EF
+	SYS___JN_H                          = 0x7F0
+	SYS___LOCALTIME_A                   = 0x7B1
+	SYS___LOCALTIME_R_A                 = 0x7B2
+	SYS___MALLOC24                      = 0x7FC
+	SYS___MALLOC31                      = 0x7FD
+	SYS___MKTIME_A                      = 0x7B3
+	SYS___MODFF_H                       = 0x7F8
+	SYS___MODFL_H                       = 0x7F9
+	SYS___MODF_H                        = 0x7EC
+	SYS___OPENDIR_A                     = 0x7C2
+	SYS___OSNAME                        = 0x7E0
+	SYS___PUTWCHAR_A                    = 0x7A7
+	SYS___PUTWC_A                       = 0x7A6
+	SYS___READDIR_A                     = 0x7C3
+	SYS___STRTOLL_A                     = 0x7A3
+	SYS___STRTOULL_A                    = 0x7A4
+	SYS___SYSLOG_A                      = 0x7BD
+	SYS___TZZNA                         = 0x7B4
+	SYS___UNGETWC_A                     = 0x7A9
+	SYS___UTIME_A                       = 0x7A0
+	SYS___VFPRINTF2_A                   = 0x7E7
+	SYS___VPRINTF2_A                    = 0x7E8
+	SYS___VSPRINTF2_A                   = 0x7E9
+	SYS___VSWPRNTF2_A                   = 0x7BB
+	SYS___WCSTOD_A                      = 0x7D9
+	SYS___WCSTOL_A                      = 0x7DA
+	SYS___WCSTOUL_A                     = 0x7DB
+	SYS___WCTOB_A                       = 0x7E5
+	SYS___Y0_H                          = 0x7F1
+	SYS___Y1_H                          = 0x7F2
+	SYS___YN_H                          = 0x7F3
+	SYS_____OPENDIR2_A                  = 0x7BF
+	SYS_____OSNAME_A                    = 0x7E1
+	SYS_____READDIR2_A                  = 0x7C0
+	SYS_DLCLOSE                         = 0x8DF
+	SYS_DLERROR                         = 0x8E0
+	SYS_DLOPEN                          = 0x8DD
+	SYS_DLSYM                           = 0x8DE
+	SYS_FLOCKFILE                       = 0x8D3
+	SYS_FTRYLOCKFILE                    = 0x8D4
+	SYS_FUNLOCKFILE                     = 0x8D5
+	SYS_GETCHAR_UNLOCKED                = 0x8D7
+	SYS_GETC_UNLOCKED                   = 0x8D6
+	SYS_PUTCHAR_UNLOCKED                = 0x8D9
+	SYS_PUTC_UNLOCKED                   = 0x8D8
+	SYS_SNPRINTF                        = 0x8DA
+	SYS_VSNPRINTF                       = 0x8DB
+	SYS_WCSCSPN                         = 0x08B
+	SYS_WCSLEN                          = 0x08C
+	SYS_WCSNCAT                         = 0x08D
+	SYS_WCSNCMP                         = 0x08A
+	SYS_WCSNCPY                         = 0x08F
+	SYS_WCSSPN                          = 0x08E
+	SYS___ABSF_H                        = 0x8E7
+	SYS___ABSL_H                        = 0x8E8
+	SYS___ABS_H                         = 0x8E6
+	SYS___ACOSF_H                       = 0x8EA
+	SYS___ACOSH_H                       = 0x8EC
+	SYS___ACOSL_H                       = 0x8EB
+	SYS___ACOS_H                        = 0x8E9
+	SYS___ASINF_H                       = 0x8EE
+	SYS___ASINH_H                       = 0x8F0
+	SYS___ASINL_H                       = 0x8EF
+	SYS___ASIN_H                        = 0x8ED
+	SYS___ATAN2F_H                      = 0x8F8
+	SYS___ATAN2L_H                      = 0x8F9
+	SYS___ATAN2_H                       = 0x8F7
+	SYS___ATANF_H                       = 0x8F2
+	SYS___ATANHF_H                      = 0x8F5
+	SYS___ATANHL_H                      = 0x8F6
+	SYS___ATANH_H                       = 0x8F4
+	SYS___ATANL_H                       = 0x8F3
+	SYS___ATAN_H                        = 0x8F1
+	SYS___CBRT_H                        = 0x8FA
+	SYS___COPYSIGNF_H                   = 0x8FB
+	SYS___COPYSIGNL_H                   = 0x8FC
+	SYS___COSF_H                        = 0x8FE
+	SYS___COSL_H                        = 0x8FF
+	SYS___COS_H                         = 0x8FD
+	SYS___DLERROR_A                     = 0x8D2
+	SYS___DLOPEN_A                      = 0x8D0
+	SYS___DLSYM_A                       = 0x8D1
+	SYS___GETUTXENT_A                   = 0x8C6
+	SYS___GETUTXID_A                    = 0x8C7
+	SYS___GETUTXLINE_A                  = 0x8C8
+	SYS___ITOA                          = 0x8AA
+	SYS___ITOA_A                        = 0x8B0
+	SYS___LE_CONDITION_TOKEN_BUILD      = 0x8A5
+	SYS___LE_MSG_ADD_INSERT             = 0x8A6
+	SYS___LE_MSG_GET                    = 0x8A7
+	SYS___LE_MSG_GET_AND_WRITE          = 0x8A8
+	SYS___LE_MSG_WRITE                  = 0x8A9
+	SYS___LLTOA                         = 0x8AE
+	SYS___LLTOA_A                       = 0x8B4
+	SYS___LTOA                          = 0x8AC
+	SYS___LTOA_A                        = 0x8B2
+	SYS___PUTCHAR_UNLOCKED_A            = 0x8CC
+	SYS___PUTC_UNLOCKED_A               = 0x8CB
+	SYS___PUTUTXLINE_A                  = 0x8C9
+	SYS___RESET_EXCEPTION_HANDLER       = 0x8E3
+	SYS___REXEC_A                       = 0x8C4
+	SYS___REXEC_AF_A                    = 0x8C5
+	SYS___SET_EXCEPTION_HANDLER         = 0x8E2
+	SYS___SNPRINTF_A                    = 0x8CD
+	SYS___SUPERKILL                     = 0x8A4
+	SYS___TCGETATTR_A                   = 0x8A1
+	SYS___TCSETATTR_A                   = 0x8A2
+	SYS___ULLTOA                        = 0x8AF
+	SYS___ULLTOA_A                      = 0x8B5
+	SYS___ULTOA                         = 0x8AD
+	SYS___ULTOA_A                       = 0x8B3
+	SYS___UTOA                          = 0x8AB
+	SYS___UTOA_A                        = 0x8B1
+	SYS___VHM_EVENT                     = 0x8E4
+	SYS___VSNPRINTF_A                   = 0x8CE
+	SYS_____GETENV_A                    = 0x8C3
+	SYS_____UTMPXNAME_A                 = 0x8CA
+	SYS_CACOSH                          = 0x9A0
+	SYS_CACOSHF                         = 0x9A3
+	SYS_CACOSHL                         = 0x9A6
+	SYS_CARG                            = 0x9A9
+	SYS_CARGF                           = 0x9AC
+	SYS_CARGL                           = 0x9AF
+	SYS_CASIN                           = 0x9B2
+	SYS_CASINF                          = 0x9B5
+	SYS_CASINH                          = 0x9BB
+	SYS_CASINHF                         = 0x9BE
+	SYS_CASINHL                         = 0x9C1
+	SYS_CASINL                          = 0x9B8
+	SYS_CATAN                           = 0x9C4
+	SYS_CATANF                          = 0x9C7
+	SYS_CATANH                          = 0x9CD
+	SYS_CATANHF                         = 0x9D0
+	SYS_CATANHL                         = 0x9D3
+	SYS_CATANL                          = 0x9CA
+	SYS_CCOS                            = 0x9D6
+	SYS_CCOSF                           = 0x9D9
+	SYS_CCOSH                           = 0x9DF
+	SYS_CCOSHF                          = 0x9E2
+	SYS_CCOSHL                          = 0x9E5
+	SYS_CCOSL                           = 0x9DC
+	SYS_CEXP                            = 0x9E8
+	SYS_CEXPF                           = 0x9EB
+	SYS_CEXPL                           = 0x9EE
+	SYS_CIMAG                           = 0x9F1
+	SYS_CIMAGF                          = 0x9F4
+	SYS_CIMAGL                          = 0x9F7
+	SYS_CLOGF                           = 0x9FD
+	SYS_MEMCHR                          = 0x09B
+	SYS_MEMCMP                          = 0x09A
+	SYS_STRCOLL                         = 0x09C
+	SYS_STRNCMP                         = 0x09D
+	SYS_STRRCHR                         = 0x09F
+	SYS_STRXFRM                         = 0x09E
+	SYS___CACOSHF_B                     = 0x9A4
+	SYS___CACOSHF_H                     = 0x9A5
+	SYS___CACOSHL_B                     = 0x9A7
+	SYS___CACOSHL_H                     = 0x9A8
+	SYS___CACOSH_B                      = 0x9A1
+	SYS___CACOSH_H                      = 0x9A2
+	SYS___CARGF_B                       = 0x9AD
+	SYS___CARGF_H                       = 0x9AE
+	SYS___CARGL_B                       = 0x9B0
+	SYS___CARGL_H                       = 0x9B1
+	SYS___CARG_B                        = 0x9AA
+	SYS___CARG_H                        = 0x9AB
+	SYS___CASINF_B                      = 0x9B6
+	SYS___CASINF_H                      = 0x9B7
+	SYS___CASINHF_B                     = 0x9BF
+	SYS___CASINHF_H                     = 0x9C0
+	SYS___CASINHL_B                     = 0x9C2
+	SYS___CASINHL_H                     = 0x9C3
+	SYS___CASINH_B                      = 0x9BC
+	SYS___CASINH_H                      = 0x9BD
+	SYS___CASINL_B                      = 0x9B9
+	SYS___CASINL_H                      = 0x9BA
+	SYS___CASIN_B                       = 0x9B3
+	SYS___CASIN_H                       = 0x9B4
+	SYS___CATANF_B                      = 0x9C8
+	SYS___CATANF_H                      = 0x9C9
+	SYS___CATANHF_B                     = 0x9D1
+	SYS___CATANHF_H                     = 0x9D2
+	SYS___CATANHL_B                     = 0x9D4
+	SYS___CATANHL_H                     = 0x9D5
+	SYS___CATANH_B                      = 0x9CE
+	SYS___CATANH_H                      = 0x9CF
+	SYS___CATANL_B                      = 0x9CB
+	SYS___CATANL_H                      = 0x9CC
+	SYS___CATAN_B                       = 0x9C5
+	SYS___CATAN_H                       = 0x9C6
+	SYS___CCOSF_B                       = 0x9DA
+	SYS___CCOSF_H                       = 0x9DB
+	SYS___CCOSHF_B                      = 0x9E3
+	SYS___CCOSHF_H                      = 0x9E4
+	SYS___CCOSHL_B                      = 0x9E6
+	SYS___CCOSHL_H                      = 0x9E7
+	SYS___CCOSH_B                       = 0x9E0
+	SYS___CCOSH_H                       = 0x9E1
+	SYS___CCOSL_B                       = 0x9DD
+	SYS___CCOSL_H                       = 0x9DE
+	SYS___CCOS_B                        = 0x9D7
+	SYS___CCOS_H                        = 0x9D8
+	SYS___CEXPF_B                       = 0x9EC
+	SYS___CEXPF_H                       = 0x9ED
+	SYS___CEXPL_B                       = 0x9EF
+	SYS___CEXPL_H                       = 0x9F0
+	SYS___CEXP_B                        = 0x9E9
+	SYS___CEXP_H                        = 0x9EA
+	SYS___CIMAGF_B                      = 0x9F5
+	SYS___CIMAGF_H                      = 0x9F6
+	SYS___CIMAGL_B                      = 0x9F8
+	SYS___CIMAGL_H                      = 0x9F9
+	SYS___CIMAG_B                       = 0x9F2
+	SYS___CIMAG_H                       = 0x9F3
+	SYS___CLOG                          = 0x9FA
+	SYS___CLOGF_B                       = 0x9FE
+	SYS___CLOGF_H                       = 0x9FF
+	SYS___CLOG_B                        = 0x9FB
+	SYS___CLOG_H                        = 0x9FC
+	SYS_ISWCTYPE                        = 0x10C
+	SYS_ISWXDIGI                        = 0x10A
+	SYS_ISWXDIGIT                       = 0x10A
+	SYS_MBSINIT                         = 0x10F
+	SYS_TOWLOWER                        = 0x10D
+	SYS_TOWUPPER                        = 0x10E
+	SYS_WCTYPE                          = 0x10B
+	SYS_WCSSTR                          = 0x11B
+	SYS___RPMTCH                        = 0x11A
+	SYS_WCSTOD                          = 0x12E
+	SYS_WCSTOK                          = 0x12C
+	SYS_WCSTOL                          = 0x12D
+	SYS_WCSTOUL                         = 0x12F
+	SYS_FGETWC                          = 0x13C
+	SYS_FGETWS                          = 0x13D
+	SYS_FPUTWC                          = 0x13E
+	SYS_FPUTWS                          = 0x13F
+	SYS_REGERROR                        = 0x13B
+	SYS_REGFREE                         = 0x13A
+	SYS_COLLEQUIV                       = 0x14F
+	SYS_COLLTOSTR                       = 0x14E
+	SYS_ISMCCOLLEL                      = 0x14C
+	SYS_STRTOCOLL                       = 0x14D
+	SYS_DLLFREE                         = 0x16F
+	SYS_DLLQUERYFN                      = 0x16D
+	SYS_DLLQUERYVAR                     = 0x16E
+	SYS_GETMCCOLL                       = 0x16A
+	SYS_GETWMCCOLL                      = 0x16B
+	SYS___ERR2AD                        = 0x16C
+	SYS_CFSETOSPEED                     = 0x17A
+	SYS_CHDIR                           = 0x17B
+	SYS_CHMOD                           = 0x17C
+	SYS_CHOWN                           = 0x17D
+	SYS_CLOSE                           = 0x17E
+	SYS_CLOSEDIR                        = 0x17F
+	SYS_LOG                             = 0x017
+	SYS_COSH                            = 0x018
+	SYS_FCHMOD                          = 0x18A
+	SYS_FCHOWN                          = 0x18B
+	SYS_FCNTL                           = 0x18C
+	SYS_FILENO                          = 0x18D
+	SYS_FORK                            = 0x18E
+	SYS_FPATHCONF                       = 0x18F
+	SYS_GETLOGIN                        = 0x19A
+	SYS_GETPGRP                         = 0x19C
+	SYS_GETPID                          = 0x19D
+	SYS_GETPPID                         = 0x19E
+	SYS_GETPWNAM                        = 0x19F
+	SYS_TANH                            = 0x019
+	SYS_W_GETMNTENT                     = 0x19B
+	SYS_POW                             = 0x020
+	SYS_PTHREAD_SELF                    = 0x20A
+	SYS_PTHREAD_SETINTR                 = 0x20B
+	SYS_PTHREAD_SETINTRTYPE             = 0x20C
+	SYS_PTHREAD_SETSPECIFIC             = 0x20D
+	SYS_PTHREAD_TESTINTR                = 0x20E
+	SYS_PTHREAD_YIELD                   = 0x20F
+	SYS_SQRT                            = 0x021
+	SYS_FLOOR                           = 0x022
+	SYS_J1                              = 0x023
+	SYS_WCSPBRK                         = 0x23F
+	SYS_BSEARCH                         = 0x24C
+	SYS_FABS                            = 0x024
+	SYS_GETENV                          = 0x24A
+	SYS_LDIV                            = 0x24D
+	SYS_SYSTEM                          = 0x24B
+	SYS_FMOD                            = 0x025
+	SYS___RETHROW                       = 0x25F
+	SYS___THROW                         = 0x25E
+	SYS_J0                              = 0x026
+	SYS_PUTENV                          = 0x26A
+	SYS___GETENV                        = 0x26F
+	SYS_SEMCTL                          = 0x27A
+	SYS_SEMGET                          = 0x27B
+	SYS_SEMOP                           = 0x27C
+	SYS_SHMAT                           = 0x27D
+	SYS_SHMCTL                          = 0x27E
+	SYS_SHMDT                           = 0x27F
+	SYS_YN                              = 0x027
+	SYS_JN                              = 0x028
+	SYS_SIGALTSTACK                     = 0x28A
+	SYS_SIGHOLD                         = 0x28B
+	SYS_SIGIGNORE                       = 0x28C
+	SYS_SIGINTERRUPT                    = 0x28D
+	SYS_SIGPAUSE                        = 0x28E
+	SYS_SIGRELSE                        = 0x28F
+	SYS_GETOPT                          = 0x29A
+	SYS_GETSUBOPT                       = 0x29D
+	SYS_LCHOWN                          = 0x29B
+	SYS_SETPGRP                         = 0x29E
+	SYS_TRUNCATE                        = 0x29C
+	SYS_Y0                              = 0x029
+	SYS___GDERR                         = 0x29F
+	SYS_ISALPHA                         = 0x030
+	SYS_VFORK                           = 0x30F
+	SYS__LONGJMP                        = 0x30D
+	SYS__SETJMP                         = 0x30E
+	SYS_GLOB                            = 0x31A
+	SYS_GLOBFREE                        = 0x31B
+	SYS_ISALNUM                         = 0x031
+	SYS_PUTW                            = 0x31C
+	SYS_SEEKDIR                         = 0x31D
+	SYS_TELLDIR                         = 0x31E
+	SYS_TEMPNAM                         = 0x31F
+	SYS_GETTIMEOFDAY_R                  = 0x32E
+	SYS_ISLOWER                         = 0x032
+	SYS_LGAMMA                          = 0x32C
+	SYS_REMAINDER                       = 0x32A
+	SYS_SCALB                           = 0x32B
+	SYS_SYNC                            = 0x32F
+	SYS_TTYSLOT                         = 0x32D
+	SYS_ENDPROTOENT                     = 0x33A
+	SYS_ENDSERVENT                      = 0x33B
+	SYS_GETHOSTBYADDR                   = 0x33D
+	SYS_GETHOSTBYADDR_R                 = 0x33C
+	SYS_GETHOSTBYNAME                   = 0x33F
+	SYS_GETHOSTBYNAME_R                 = 0x33E
+	SYS_ISCNTRL                         = 0x033
+	SYS_GETSERVBYNAME                   = 0x34A
+	SYS_GETSERVBYPORT                   = 0x34B
+	SYS_GETSERVENT                      = 0x34C
+	SYS_GETSOCKNAME                     = 0x34D
+	SYS_GETSOCKOPT                      = 0x34E
+	SYS_INET_ADDR                       = 0x34F
+	SYS_ISDIGIT                         = 0x034
+	SYS_ISGRAPH                         = 0x035
+	SYS_SELECT                          = 0x35B
+	SYS_SELECTEX                        = 0x35C
+	SYS_SEND                            = 0x35D
+	SYS_SENDTO                          = 0x35F
+	SYS_CHROOT                          = 0x36A
+	SYS_ISNAN                           = 0x36D
+	SYS_ISUPPER                         = 0x036
+	SYS_ULIMIT                          = 0x36C
+	SYS_UTIMES                          = 0x36E
+	SYS_W_STATVFS                       = 0x36B
+	SYS___H_ERRNO                       = 0x36F
+	SYS_GRANTPT                         = 0x37A
+	SYS_ISPRINT                         = 0x037
+	SYS_TCGETSID                        = 0x37C
+	SYS_UNLOCKPT                        = 0x37B
+	SYS___TCGETCP                       = 0x37D
+	SYS___TCSETCP                       = 0x37E
+	SYS___TCSETTABLES                   = 0x37F
+	SYS_ISPUNCT                         = 0x038
+	SYS_NLIST                           = 0x38C
+	SYS___IPDBCS                        = 0x38D
+	SYS___IPDSPX                        = 0x38E
+	SYS___IPMSGC                        = 0x38F
+	SYS___STHOSTENT                     = 0x38B
+	SYS___STSERVENT                     = 0x38A
+	SYS_ISSPACE                         = 0x039
+	SYS_COS                             = 0x040
+	SYS_T_ALLOC                         = 0x40A
+	SYS_T_BIND                          = 0x40B
+	SYS_T_CLOSE                         = 0x40C
+	SYS_T_CONNECT                       = 0x40D
+	SYS_T_ERROR                         = 0x40E
+	SYS_T_FREE                          = 0x40F
+	SYS_TAN                             = 0x041
+	SYS_T_RCVREL                        = 0x41A
+	SYS_T_RCVUDATA                      = 0x41B
+	SYS_T_RCVUDERR                      = 0x41C
+	SYS_T_SND                           = 0x41D
+	SYS_T_SNDDIS                        = 0x41E
+	SYS_T_SNDREL                        = 0x41F
+	SYS_GETPMSG                         = 0x42A
+	SYS_ISASTREAM                       = 0x42B
+	SYS_PUTMSG                          = 0x42C
+	SYS_PUTPMSG                         = 0x42D
+	SYS_SINH                            = 0x042
+	SYS___ISPOSIXON                     = 0x42E
+	SYS___OPENMVSREL                    = 0x42F
+	SYS_ACOS                            = 0x043
+	SYS_ATAN                            = 0x044
+	SYS_ATAN2                           = 0x045
+	SYS_FTELL                           = 0x046
+	SYS_FGETPOS                         = 0x047
+	SYS_SOCK_DEBUG                      = 0x47A
+	SYS_SOCK_DO_TESTSTOR                = 0x47D
+	SYS_TAKESOCKET                      = 0x47E
+	SYS___SERVER_INIT                   = 0x47F
+	SYS_FSEEK                           = 0x048
+	SYS___IPHOST                        = 0x48B
+	SYS___IPNODE                        = 0x48C
+	SYS___SERVER_CLASSIFY_CREATE        = 0x48D
+	SYS___SERVER_CLASSIFY_DESTROY       = 0x48E
+	SYS___SERVER_CLASSIFY_RESET         = 0x48F
+	SYS___SMF_RECORD                    = 0x48A
+	SYS_FSETPOS                         = 0x049
+	SYS___FNWSA                         = 0x49B
+	SYS___SPAWN2                        = 0x49D
+	SYS___SPAWNP2                       = 0x49E
+	SYS_ATOF                            = 0x050
+	SYS_PTHREAD_MUTEXATTR_GETPSHARED    = 0x50A
+	SYS_PTHREAD_MUTEXATTR_SETPSHARED    = 0x50B
+	SYS_PTHREAD_RWLOCK_DESTROY          = 0x50C
+	SYS_PTHREAD_RWLOCK_INIT             = 0x50D
+	SYS_PTHREAD_RWLOCK_RDLOCK           = 0x50E
+	SYS_PTHREAD_RWLOCK_TRYRDLOCK        = 0x50F
+	SYS_ATOI                            = 0x051
+	SYS___FP_CLASS                      = 0x51D
+	SYS___FP_CLR_FLAG                   = 0x51A
+	SYS___FP_FINITE                     = 0x51E
+	SYS___FP_ISNAN                      = 0x51F
+	SYS___FP_RAISE_XCP                  = 0x51C
+	SYS___FP_READ_FLAG                  = 0x51B
+	SYS_RAND                            = 0x052
+	SYS_SIGTIMEDWAIT                    = 0x52D
+	SYS_SIGWAITINFO                     = 0x52E
+	SYS___CHKBFP                        = 0x52F
+	SYS___FPC_RS                        = 0x52C
+	SYS___FPC_RW                        = 0x52A
+	SYS___FPC_SM                        = 0x52B
+	SYS_STRTOD                          = 0x053
+	SYS_STRTOL                          = 0x054
+	SYS_STRTOUL                         = 0x055
+	SYS_MALLOC                          = 0x056
+	SYS_SRAND                           = 0x057
+	SYS_CALLOC                          = 0x058
+	SYS_FREE                            = 0x059
+	SYS___OSENV                         = 0x59F
+	SYS___W_PIOCTL                      = 0x59E
+	SYS_LONGJMP                         = 0x060
+	SYS___FLOORF_B                      = 0x60A
+	SYS___FLOORL_B                      = 0x60B
+	SYS___FREXPF_B                      = 0x60C
+	SYS___FREXPL_B                      = 0x60D
+	SYS___LDEXPF_B                      = 0x60E
+	SYS___LDEXPL_B                      = 0x60F
+	SYS_SIGNAL                          = 0x061
+	SYS___ATAN2F_B                      = 0x61A
+	SYS___ATAN2L_B                      = 0x61B
+	SYS___COSHF_B                       = 0x61C
+	SYS___COSHL_B                       = 0x61D
+	SYS___EXPF_B                        = 0x61E
+	SYS___EXPL_B                        = 0x61F
+	SYS_TMPNAM                          = 0x062
+	SYS___ABSF_B                        = 0x62A
+	SYS___ABSL_B                        = 0x62C
+	SYS___ABS_B                         = 0x62B
+	SYS___FMODF_B                       = 0x62D
+	SYS___FMODL_B                       = 0x62E
+	SYS___MODFF_B                       = 0x62F
+	SYS_ATANL                           = 0x63A
+	SYS_CEILF                           = 0x63B
+	SYS_CEILL                           = 0x63C
+	SYS_COSF                            = 0x63D
+	SYS_COSHF                           = 0x63F
+	SYS_COSL                            = 0x63E
+	SYS_REMOVE                          = 0x063
+	SYS_POWL                            = 0x64A
+	SYS_RENAME                          = 0x064
+	SYS_SINF                            = 0x64B
+	SYS_SINHF                           = 0x64F
+	SYS_SINL                            = 0x64C
+	SYS_SQRTF                           = 0x64D
+	SYS_SQRTL                           = 0x64E
+	SYS_BTOWC                           = 0x65F
+	SYS_FREXPL                          = 0x65A
+	SYS_LDEXPF                          = 0x65B
+	SYS_LDEXPL                          = 0x65C
+	SYS_MODFF                           = 0x65D
+	SYS_MODFL                           = 0x65E
+	SYS_TMPFILE                         = 0x065
+	SYS_FREOPEN                         = 0x066
+	SYS___CHARMAP_INIT_A                = 0x66E
+	SYS___GETHOSTBYADDR_R_A             = 0x66C
+	SYS___GETHOSTBYNAME_A               = 0x66A
+	SYS___GETHOSTBYNAME_R_A             = 0x66D
+	SYS___MBLEN_A                       = 0x66F
+	SYS___RES_INIT_A                    = 0x66B
+	SYS_FCLOSE                          = 0x067
+	SYS___GETGRGID_R_A                  = 0x67D
+	SYS___WCSTOMBS_A                    = 0x67A
+	SYS___WCSTOMBS_STD_A                = 0x67B
+	SYS___WCSWIDTH_A                    = 0x67C
+	SYS___WCSWIDTH_ASIA                 = 0x67F
+	SYS___WCSWIDTH_STD_A                = 0x67E
+	SYS_FFLUSH                          = 0x068
+	SYS___GETLOGIN_R_A                  = 0x68E
+	SYS___GETPWNAM_R_A                  = 0x68C
+	SYS___GETPWUID_R_A                  = 0x68D
+	SYS___TTYNAME_R_A                   = 0x68F
+	SYS___WCWIDTH_ASIA                  = 0x68B
+	SYS___WCWIDTH_STD_A                 = 0x68A
+	SYS_FOPEN                           = 0x069
+	SYS___REGEXEC_A                     = 0x69A
+	SYS___REGEXEC_STD_A                 = 0x69B
+	SYS___REGFREE_A                     = 0x69C
+	SYS___REGFREE_STD_A                 = 0x69D
+	SYS___STRCOLL_A                     = 0x69E
+	SYS___STRCOLL_C_A                   = 0x69F
+	SYS_SCANF                           = 0x070
+	SYS___A64L_A                        = 0x70C
+	SYS___ECVT_A                        = 0x70D
+	SYS___FCVT_A                        = 0x70E
+	SYS___GCVT_A                        = 0x70F
+	SYS___STRTOUL_A                     = 0x70A
+	SYS_____AE_CORRESTBL_QUERY_A        = 0x70B
+	SYS_SPRINTF                         = 0x071
+	SYS___ACCESS_A                      = 0x71F
+	SYS___CATOPEN_A                     = 0x71E
+	SYS___GETOPT_A                      = 0x71D
+	SYS___REALPATH_A                    = 0x71A
+	SYS___SETENV_A                      = 0x71B
+	SYS___SYSTEM_A                      = 0x71C
+	SYS_FGETC                           = 0x072
+	SYS___GAI_STRERROR_A                = 0x72F
+	SYS___RMDIR_A                       = 0x72A
+	SYS___STATVFS_A                     = 0x72B
+	SYS___SYMLINK_A                     = 0x72C
+	SYS___TRUNCATE_A                    = 0x72D
+	SYS___UNLINK_A                      = 0x72E
+	SYS_VFPRINTF                        = 0x073
+	SYS___ISSPACE_A                     = 0x73A
+	SYS___ISUPPER_A                     = 0x73B
+	SYS___ISWALNUM_A                    = 0x73F
+	SYS___ISXDIGIT_A                    = 0x73C
+	SYS___TOLOWER_A                     = 0x73D
+	SYS___TOUPPER_A                     = 0x73E
+	SYS_VPRINTF                         = 0x074
+	SYS___CONFSTR_A                     = 0x74B
+	SYS___FDOPEN_A                      = 0x74E
+	SYS___FLDATA_A                      = 0x74F
+	SYS___FTOK_A                        = 0x74C
+	SYS___ISWXDIGIT_A                   = 0x74A
+	SYS___MKTEMP_A                      = 0x74D
+	SYS_VSPRINTF                        = 0x075
+	SYS___GETGRGID_A                    = 0x75A
+	SYS___GETGRNAM_A                    = 0x75B
+	SYS___GETGROUPSBYNAME_A             = 0x75C
+	SYS___GETHOSTENT_A                  = 0x75D
+	SYS___GETHOSTNAME_A                 = 0x75E
+	SYS___GETLOGIN_A                    = 0x75F
+	SYS_GETC                            = 0x076
+	SYS___CREATEWORKUNIT_A              = 0x76A
+	SYS___CTERMID_A                     = 0x76B
+	SYS___FMTMSG_A                      = 0x76C
+	SYS___INITGROUPS_A                  = 0x76D
+	SYS___MSGRCV_A                      = 0x76F
+	SYS_____LOGIN_A                     = 0x76E
+	SYS_FGETS                           = 0x077
+	SYS___STRCASECMP_A                  = 0x77B
+	SYS___STRNCASECMP_A                 = 0x77C
+	SYS___TTYNAME_A                     = 0x77D
+	SYS___UNAME_A                       = 0x77E
+	SYS___UTIMES_A                      = 0x77F
+	SYS_____SERVER_PWU_A                = 0x77A
+	SYS_FPUTC                           = 0x078
+	SYS___CREAT_O_A                     = 0x78E
+	SYS___ENVNA                         = 0x78F
+	SYS___FREAD_A                       = 0x78A
+	SYS___FWRITE_A                      = 0x78B
+	SYS___ISASCII                       = 0x78D
+	SYS___OPEN_O_A                      = 0x78C
+	SYS_FPUTS                           = 0x079
+	SYS___ASCTIME_A                     = 0x79C
+	SYS___CTIME_A                       = 0x79D
+	SYS___GETDATE_A                     = 0x79E
+	SYS___GETSERVBYPORT_A               = 0x79A
+	SYS___GETSERVENT_A                  = 0x79B
+	SYS___TZSET_A                       = 0x79F
+	SYS_ACL_FROM_TEXT                   = 0x80C
+	SYS_ACL_SET_FD                      = 0x80A
+	SYS_ACL_SET_FILE                    = 0x80B
+	SYS_ACL_SORT                        = 0x80E
+	SYS_ACL_TO_TEXT                     = 0x80D
+	SYS_UNGETC                          = 0x080
+	SYS___SHUTDOWN_REGISTRATION         = 0x80F
+	SYS_FREAD                           = 0x081
+	SYS_FREEADDRINFO                    = 0x81A
+	SYS_GAI_STRERROR                    = 0x81B
+	SYS_REXEC_AF                        = 0x81C
+	SYS___DYNALLOC_A                    = 0x81F
+	SYS___POE                           = 0x81D
+	SYS_WCSTOMBS                        = 0x082
+	SYS___INET_ADDR_A                   = 0x82F
+	SYS___NLIST_A                       = 0x82A
+	SYS_____TCGETCP_A                   = 0x82B
+	SYS_____TCSETCP_A                   = 0x82C
+	SYS_____W_PIOCTL_A                  = 0x82E
+	SYS_MBTOWC                          = 0x083
+	SYS___CABEND                        = 0x83D
+	SYS___LE_CIB_GET                    = 0x83E
+	SYS___RECVMSG_A                     = 0x83B
+	SYS___SENDMSG_A                     = 0x83A
+	SYS___SET_LAA_FOR_JIT               = 0x83F
+	SYS_____LCHATTR_A                   = 0x83C
+	SYS_WCTOMB                          = 0x084
+	SYS___CBRTL_B                       = 0x84A
+	SYS___COPYSIGNF_B                   = 0x84B
+	SYS___COPYSIGNL_B                   = 0x84C
+	SYS___COTANF_B                      = 0x84D
+	SYS___COTANL_B                      = 0x84F
+	SYS___COTAN_B                       = 0x84E
+	SYS_MBSTOWCS                        = 0x085
+	SYS___LOG1PL_B                      = 0x85A
+	SYS___LOG2F_B                       = 0x85B
+	SYS___LOG2L_B                       = 0x85D
+	SYS___LOG2_B                        = 0x85C
+	SYS___REMAINDERF_B                  = 0x85E
+	SYS___REMAINDERL_B                  = 0x85F
+	SYS_ACOSHF                          = 0x86E
+	SYS_ACOSHL                          = 0x86F
+	SYS_WCSCPY                          = 0x086
+	SYS___ERFCF_B                       = 0x86D
+	SYS___ERFF_B                        = 0x86C
+	SYS___LROUNDF_B                     = 0x86A
+	SYS___LROUND_B                      = 0x86B
+	SYS_COTANL                          = 0x87A
+	SYS_EXP2F                           = 0x87B
+	SYS_EXP2L                           = 0x87C
+	SYS_EXPM1F                          = 0x87D
+	SYS_EXPM1L                          = 0x87E
+	SYS_FDIMF                           = 0x87F
+	SYS_WCSCAT                          = 0x087
+	SYS___COTANL                        = 0x87A
+	SYS_REMAINDERF                      = 0x88A
+	SYS_REMAINDERL                      = 0x88B
+	SYS_REMAINDF                        = 0x88A
+	SYS_REMAINDL                        = 0x88B
+	SYS_REMQUO                          = 0x88D
+	SYS_REMQUOF                         = 0x88C
+	SYS_REMQUOL                         = 0x88E
+	SYS_TGAMMAF                         = 0x88F
+	SYS_WCSCHR                          = 0x088
+	SYS_ERFCF                           = 0x89B
+	SYS_ERFCL                           = 0x89C
+	SYS_ERFL                            = 0x89A
+	SYS_EXP2                            = 0x89E
+	SYS_WCSCMP                          = 0x089
+	SYS___EXP2_B                        = 0x89D
+	SYS___FAR_JUMP                      = 0x89F
+	SYS_ABS                             = 0x090
+	SYS___ERFCL_H                       = 0x90A
+	SYS___EXPF_H                        = 0x90C
+	SYS___EXPL_H                        = 0x90D
+	SYS___EXPM1_H                       = 0x90E
+	SYS___EXP_H                         = 0x90B
+	SYS___FDIM_H                        = 0x90F
+	SYS_DIV                             = 0x091
+	SYS___LOG2F_H                       = 0x91F
+	SYS___LOG2_H                        = 0x91E
+	SYS___LOGB_H                        = 0x91D
+	SYS___LOGF_H                        = 0x91B
+	SYS___LOGL_H                        = 0x91C
+	SYS___LOG_H                         = 0x91A
+	SYS_LABS                            = 0x092
+	SYS___POWL_H                        = 0x92A
+	SYS___REMAINDER_H                   = 0x92B
+	SYS___RINT_H                        = 0x92C
+	SYS___SCALB_H                       = 0x92D
+	SYS___SINF_H                        = 0x92F
+	SYS___SIN_H                         = 0x92E
+	SYS_STRNCPY                         = 0x093
+	SYS___TANHF_H                       = 0x93B
+	SYS___TANHL_H                       = 0x93C
+	SYS___TANH_H                        = 0x93A
+	SYS___TGAMMAF_H                     = 0x93E
+	SYS___TGAMMA_H                      = 0x93D
+	SYS___TRUNC_H                       = 0x93F
+	SYS_MEMCPY                          = 0x094
+	SYS_VFWSCANF                        = 0x94A
+	SYS_VSWSCANF                        = 0x94E
+	SYS_VWSCANF                         = 0x94C
+	SYS_INET6_RTH_ADD                   = 0x95D
+	SYS_INET6_RTH_INIT                  = 0x95C
+	SYS_INET6_RTH_REVERSE               = 0x95E
+	SYS_INET6_RTH_SEGMENTS              = 0x95F
+	SYS_INET6_RTH_SPACE                 = 0x95B
+	SYS_MEMMOVE                         = 0x095
+	SYS_WCSTOLD                         = 0x95A
+	SYS_STRCPY                          = 0x096
+	SYS_STRCMP                          = 0x097
+	SYS_CABS                            = 0x98E
+	SYS_STRCAT                          = 0x098
+	SYS___CABS_B                        = 0x98F
+	SYS___POW_II                        = 0x98A
+	SYS___POW_II_B                      = 0x98B
+	SYS___POW_II_H                      = 0x98C
+	SYS_CACOSF                          = 0x99A
+	SYS_CACOSL                          = 0x99D
+	SYS_STRNCAT                         = 0x099
+	SYS___CACOSF_B                      = 0x99B
+	SYS___CACOSF_H                      = 0x99C
+	SYS___CACOSL_B                      = 0x99E
+	SYS___CACOSL_H                      = 0x99F
+	SYS_ISWALPHA                        = 0x100
+	SYS_ISWBLANK                        = 0x101
+	SYS___ISWBLK                        = 0x101
+	SYS_ISWCNTRL                        = 0x102
+	SYS_ISWDIGIT                        = 0x103
+	SYS_ISWGRAPH                        = 0x104
+	SYS_ISWLOWER                        = 0x105
+	SYS_ISWPRINT                        = 0x106
+	SYS_ISWPUNCT                        = 0x107
+	SYS_ISWSPACE                        = 0x108
+	SYS_ISWUPPER                        = 0x109
+	SYS_WCTOB                           = 0x110
+	SYS_MBRLEN                          = 0x111
+	SYS_MBRTOWC                         = 0x112
+	SYS_MBSRTOWC                        = 0x113
+	SYS_MBSRTOWCS                       = 0x113
+	SYS_WCRTOMB                         = 0x114
+	SYS_WCSRTOMB                        = 0x115
+	SYS_WCSRTOMBS                       = 0x115
+	SYS___CSID                          = 0x116
+	SYS___WCSID                         = 0x117
+	SYS_STRPTIME                        = 0x118
+	SYS___STRPTM                        = 0x118
+	SYS_STRFMON                         = 0x119
+	SYS_WCSCOLL                         = 0x130
+	SYS_WCSXFRM                         = 0x131
+	SYS_WCSWIDTH                        = 0x132
+	SYS_WCWIDTH                         = 0x133
+	SYS_WCSFTIME                        = 0x134
+	SYS_SWPRINTF                        = 0x135
+	SYS_VSWPRINT                        = 0x136
+	SYS_VSWPRINTF                       = 0x136
+	SYS_SWSCANF                         = 0x137
+	SYS_REGCOMP                         = 0x138
+	SYS_REGEXEC                         = 0x139
+	SYS_GETWC                           = 0x140
+	SYS_GETWCHAR                        = 0x141
+	SYS_PUTWC                           = 0x142
+	SYS_PUTWCHAR                        = 0x143
+	SYS_UNGETWC                         = 0x144
+	SYS_ICONV_OPEN                      = 0x145
+	SYS_ICONV                           = 0x146
+	SYS_ICONV_CLOSE                     = 0x147
+	SYS_COLLRANGE                       = 0x150
+	SYS_CCLASS                          = 0x151
+	SYS_COLLORDER                       = 0x152
+	SYS___DEMANGLE                      = 0x154
+	SYS_FDOPEN                          = 0x155
+	SYS___ERRNO                         = 0x156
+	SYS___ERRNO2                        = 0x157
+	SYS___TERROR                        = 0x158
+	SYS_MAXCOLL                         = 0x169
+	SYS_DLLLOAD                         = 0x170
+	SYS__EXIT                           = 0x174
+	SYS_ACCESS                          = 0x175
+	SYS_ALARM                           = 0x176
+	SYS_CFGETISPEED                     = 0x177
+	SYS_CFGETOSPEED                     = 0x178
+	SYS_CFSETISPEED                     = 0x179
+	SYS_CREAT                           = 0x180
+	SYS_CTERMID                         = 0x181
+	SYS_DUP                             = 0x182
+	SYS_DUP2                            = 0x183
+	SYS_EXECL                           = 0x184
+	SYS_EXECLE                          = 0x185
+	SYS_EXECLP                          = 0x186
+	SYS_EXECV                           = 0x187
+	SYS_EXECVE                          = 0x188
+	SYS_EXECVP                          = 0x189
+	SYS_FSTAT                           = 0x190
+	SYS_FSYNC                           = 0x191
+	SYS_FTRUNCATE                       = 0x192
+	SYS_GETCWD                          = 0x193
+	SYS_GETEGID                         = 0x194
+	SYS_GETEUID                         = 0x195
+	SYS_GETGID                          = 0x196
+	SYS_GETGRGID                        = 0x197
+	SYS_GETGRNAM                        = 0x198
+	SYS_GETGROUPS                       = 0x199
+	SYS_PTHREAD_MUTEXATTR_DESTROY       = 0x200
+	SYS_PTHREAD_MUTEXATTR_SETKIND_NP    = 0x201
+	SYS_PTHREAD_MUTEXATTR_GETKIND_NP    = 0x202
+	SYS_PTHREAD_MUTEX_INIT              = 0x203
+	SYS_PTHREAD_MUTEX_DESTROY           = 0x204
+	SYS_PTHREAD_MUTEX_LOCK              = 0x205
+	SYS_PTHREAD_MUTEX_TRYLOCK           = 0x206
+	SYS_PTHREAD_MUTEX_UNLOCK            = 0x207
+	SYS_PTHREAD_ONCE                    = 0x209
+	SYS_TW_OPEN                         = 0x210
+	SYS_TW_FCNTL                        = 0x211
+	SYS_PTHREAD_JOIN_D4_NP              = 0x212
+	SYS_PTHREAD_CONDATTR_SETKIND_NP     = 0x213
+	SYS_PTHREAD_CONDATTR_GETKIND_NP     = 0x214
+	SYS_EXTLINK_NP                      = 0x215
+	SYS___PASSWD                        = 0x216
+	SYS_SETGROUPS                       = 0x217
+	SYS_INITGROUPS                      = 0x218
+	SYS_WCSRCHR                         = 0x240
+	SYS_SVC99                           = 0x241
+	SYS___SVC99                         = 0x241
+	SYS_WCSWCS                          = 0x242
+	SYS_LOCALECO                        = 0x243
+	SYS_LOCALECONV                      = 0x243
+	SYS___LIBREL                        = 0x244
+	SYS_RELEASE                         = 0x245
+	SYS___RLSE                          = 0x245
+	SYS_FLOCATE                         = 0x246
+	SYS___FLOCT                         = 0x246
+	SYS_FDELREC                         = 0x247
+	SYS___FDLREC                        = 0x247
+	SYS_FETCH                           = 0x248
+	SYS___FETCH                         = 0x248
+	SYS_QSORT                           = 0x249
+	SYS___CLEANUPCATCH                  = 0x260
+	SYS___CATCHMATCH                    = 0x261
+	SYS___CLEAN2UPCATCH                 = 0x262
+	SYS_GETPRIORITY                     = 0x270
+	SYS_NICE                            = 0x271
+	SYS_SETPRIORITY                     = 0x272
+	SYS_GETITIMER                       = 0x273
+	SYS_SETITIMER                       = 0x274
+	SYS_MSGCTL                          = 0x275
+	SYS_MSGGET                          = 0x276
+	SYS_MSGRCV                          = 0x277
+	SYS_MSGSND                          = 0x278
+	SYS_MSGXRCV                         = 0x279
+	SYS___MSGXR                         = 0x279
+	SYS_SHMGET                          = 0x280
+	SYS___GETIPC                        = 0x281
+	SYS_SETGRENT                        = 0x282
+	SYS_GETGRENT                        = 0x283
+	SYS_ENDGRENT                        = 0x284
+	SYS_SETPWENT                        = 0x285
+	SYS_GETPWENT                        = 0x286
+	SYS_ENDPWENT                        = 0x287
+	SYS_BSD_SIGNAL                      = 0x288
+	SYS_KILLPG                          = 0x289
+	SYS_SIGSET                          = 0x290
+	SYS_SIGSTACK                        = 0x291
+	SYS_GETRLIMIT                       = 0x292
+	SYS_SETRLIMIT                       = 0x293
+	SYS_GETRUSAGE                       = 0x294
+	SYS_MMAP                            = 0x295
+	SYS_MPROTECT                        = 0x296
+	SYS_MSYNC                           = 0x297
+	SYS_MUNMAP                          = 0x298
+	SYS_CONFSTR                         = 0x299
+	SYS___NDMTRM                        = 0x300
+	SYS_FTOK                            = 0x301
+	SYS_BASENAME                        = 0x302
+	SYS_DIRNAME                         = 0x303
+	SYS_GETDTABLESIZE                   = 0x304
+	SYS_MKSTEMP                         = 0x305
+	SYS_MKTEMP                          = 0x306
+	SYS_NFTW                            = 0x307
+	SYS_GETWD                           = 0x308
+	SYS_LOCKF                           = 0x309
+	SYS_WORDEXP                         = 0x310
+	SYS_WORDFREE                        = 0x311
+	SYS_GETPGID                         = 0x312
+	SYS_GETSID                          = 0x313
+	SYS___UTMPXNAME                     = 0x314
+	SYS_CUSERID                         = 0x315
+	SYS_GETPASS                         = 0x316
+	SYS_FNMATCH                         = 0x317
+	SYS_FTW                             = 0x318
+	SYS_GETW                            = 0x319
+	SYS_ACOSH                           = 0x320
+	SYS_ASINH                           = 0x321
+	SYS_ATANH                           = 0x322
+	SYS_CBRT                            = 0x323
+	SYS_EXPM1                           = 0x324
+	SYS_ILOGB                           = 0x325
+	SYS_LOGB                            = 0x326
+	SYS_LOG1P                           = 0x327
+	SYS_NEXTAFTER                       = 0x328
+	SYS_RINT                            = 0x329
+	SYS_SPAWN                           = 0x330
+	SYS_SPAWNP                          = 0x331
+	SYS_GETLOGIN_UU                     = 0x332
+	SYS_ECVT                            = 0x333
+	SYS_FCVT                            = 0x334
+	SYS_GCVT                            = 0x335
+	SYS_ACCEPT                          = 0x336
+	SYS_BIND                            = 0x337
+	SYS_CONNECT                         = 0x338
+	SYS_ENDHOSTENT                      = 0x339
+	SYS_GETHOSTENT                      = 0x340
+	SYS_GETHOSTID                       = 0x341
+	SYS_GETHOSTNAME                     = 0x342
+	SYS_GETNETBYADDR                    = 0x343
+	SYS_GETNETBYNAME                    = 0x344
+	SYS_GETNETENT                       = 0x345
+	SYS_GETPEERNAME                     = 0x346
+	SYS_GETPROTOBYNAME                  = 0x347
+	SYS_GETPROTOBYNUMBER                = 0x348
+	SYS_GETPROTOENT                     = 0x349
+	SYS_INET_LNAOF                      = 0x350
+	SYS_INET_MAKEADDR                   = 0x351
+	SYS_INET_NETOF                      = 0x352
+	SYS_INET_NETWORK                    = 0x353
+	SYS_INET_NTOA                       = 0x354
+	SYS_IOCTL                           = 0x355
+	SYS_LISTEN                          = 0x356
+	SYS_READV                           = 0x357
+	SYS_RECV                            = 0x358
+	SYS_RECVFROM                        = 0x359
+	SYS_SETHOSTENT                      = 0x360
+	SYS_SETNETENT                       = 0x361
+	SYS_SETPEER                         = 0x362
+	SYS_SETPROTOENT                     = 0x363
+	SYS_SETSERVENT                      = 0x364
+	SYS_SETSOCKOPT                      = 0x365
+	SYS_SHUTDOWN                        = 0x366
+	SYS_SOCKET                          = 0x367
+	SYS_SOCKETPAIR                      = 0x368
+	SYS_WRITEV                          = 0x369
+	SYS_ENDNETENT                       = 0x370
+	SYS_CLOSELOG                        = 0x371
+	SYS_OPENLOG                         = 0x372
+	SYS_SETLOGMASK                      = 0x373
+	SYS_SYSLOG                          = 0x374
+	SYS_PTSNAME                         = 0x375
+	SYS_SETREUID                        = 0x376
+	SYS_SETREGID                        = 0x377
+	SYS_REALPATH                        = 0x378
+	SYS___SIGNGAM                       = 0x379
+	SYS_POLL                            = 0x380
+	SYS_REXEC                           = 0x381
+	SYS___ISASCII2                      = 0x382
+	SYS___TOASCII2                      = 0x383
+	SYS_CHPRIORITY                      = 0x384
+	SYS_PTHREAD_ATTR_SETSYNCTYPE_NP     = 0x385
+	SYS_PTHREAD_ATTR_GETSYNCTYPE_NP     = 0x386
+	SYS_PTHREAD_SET_LIMIT_NP            = 0x387
+	SYS___STNETENT                      = 0x388
+	SYS___STPROTOENT                    = 0x389
+	SYS___SELECT1                       = 0x390
+	SYS_PTHREAD_SECURITY_NP             = 0x391
+	SYS___CHECK_RESOURCE_AUTH_NP        = 0x392
+	SYS___CONVERT_ID_NP                 = 0x393
+	SYS___OPENVMREL                     = 0x394
+	SYS_WMEMCHR                         = 0x395
+	SYS_WMEMCMP                         = 0x396
+	SYS_WMEMCPY                         = 0x397
+	SYS_WMEMMOVE                        = 0x398
+	SYS_WMEMSET                         = 0x399
+	SYS___FPUTWC                        = 0x400
+	SYS___PUTWC                         = 0x401
+	SYS___PWCHAR                        = 0x402
+	SYS___WCSFTM                        = 0x403
+	SYS___WCSTOK                        = 0x404
+	SYS___WCWDTH                        = 0x405
+	SYS_T_ACCEPT                        = 0x409
+	SYS_T_GETINFO                       = 0x410
+	SYS_T_GETPROTADDR                   = 0x411
+	SYS_T_GETSTATE                      = 0x412
+	SYS_T_LISTEN                        = 0x413
+	SYS_T_LOOK                          = 0x414
+	SYS_T_OPEN                          = 0x415
+	SYS_T_OPTMGMT                       = 0x416
+	SYS_T_RCV                           = 0x417
+	SYS_T_RCVCONNECT                    = 0x418
+	SYS_T_RCVDIS                        = 0x419
+	SYS_T_SNDUDATA                      = 0x420
+	SYS_T_STRERROR                      = 0x421
+	SYS_T_SYNC                          = 0x422
+	SYS_T_UNBIND                        = 0x423
+	SYS___T_ERRNO                       = 0x424
+	SYS___RECVMSG2                      = 0x425
+	SYS___SENDMSG2                      = 0x426
+	SYS_FATTACH                         = 0x427
+	SYS_FDETACH                         = 0x428
+	SYS_GETMSG                          = 0x429
+	SYS_GETCONTEXT                      = 0x430
+	SYS_SETCONTEXT                      = 0x431
+	SYS_MAKECONTEXT                     = 0x432
+	SYS_SWAPCONTEXT                     = 0x433
+	SYS_PTHREAD_GETSPECIFIC_D8_NP       = 0x434
+	SYS_GETCLIENTID                     = 0x470
+	SYS___GETCLIENTID                   = 0x471
+	SYS_GETSTABLESIZE                   = 0x472
+	SYS_GETIBMOPT                       = 0x473
+	SYS_GETIBMSOCKOPT                   = 0x474
+	SYS_GIVESOCKET                      = 0x475
+	SYS_IBMSFLUSH                       = 0x476
+	SYS_MAXDESC                         = 0x477
+	SYS_SETIBMOPT                       = 0x478
+	SYS_SETIBMSOCKOPT                   = 0x479
+	SYS___SERVER_PWU                    = 0x480
+	SYS_PTHREAD_TAG_NP                  = 0x481
+	SYS___CONSOLE                       = 0x482
+	SYS___WSINIT                        = 0x483
+	SYS___IPTCPN                        = 0x489
+	SYS___SERVER_CLASSIFY               = 0x490
+	SYS___HEAPRPT                       = 0x496
+	SYS___ISBFP                         = 0x500
+	SYS___FP_CAST                       = 0x501
+	SYS___CERTIFICATE                   = 0x502
+	SYS_SEND_FILE                       = 0x503
+	SYS_AIO_CANCEL                      = 0x504
+	SYS_AIO_ERROR                       = 0x505
+	SYS_AIO_READ                        = 0x506
+	SYS_AIO_RETURN                      = 0x507
+	SYS_AIO_SUSPEND                     = 0x508
+	SYS_AIO_WRITE                       = 0x509
+	SYS_PTHREAD_RWLOCK_TRYWRLOCK        = 0x510
+	SYS_PTHREAD_RWLOCK_UNLOCK           = 0x511
+	SYS_PTHREAD_RWLOCK_WRLOCK           = 0x512
+	SYS_PTHREAD_RWLOCKATTR_GETPSHARED   = 0x513
+	SYS_PTHREAD_RWLOCKATTR_SETPSHARED   = 0x514
+	SYS_PTHREAD_RWLOCKATTR_INIT         = 0x515
+	SYS_PTHREAD_RWLOCKATTR_DESTROY      = 0x516
+	SYS___CTTBL                         = 0x517
+	SYS_PTHREAD_MUTEXATTR_SETTYPE       = 0x518
+	SYS_PTHREAD_MUTEXATTR_GETTYPE       = 0x519
+	SYS___FP_UNORDERED                  = 0x520
+	SYS___FP_READ_RND                   = 0x521
+	SYS___FP_READ_RND_B                 = 0x522
+	SYS___FP_SWAP_RND                   = 0x523
+	SYS___FP_SWAP_RND_B                 = 0x524
+	SYS___FP_LEVEL                      = 0x525
+	SYS___FP_BTOH                       = 0x526
+	SYS___FP_HTOB                       = 0x527
+	SYS___FPC_RD                        = 0x528
+	SYS___FPC_WR                        = 0x529
+	SYS_PTHREAD_SETCANCELTYPE           = 0x600
+	SYS_PTHREAD_TESTCANCEL              = 0x601
+	SYS___ATANF_B                       = 0x602
+	SYS___ATANL_B                       = 0x603
+	SYS___CEILF_B                       = 0x604
+	SYS___CEILL_B                       = 0x605
+	SYS___COSF_B                        = 0x606
+	SYS___COSL_B                        = 0x607
+	SYS___FABSF_B                       = 0x608
+	SYS___FABSL_B                       = 0x609
+	SYS___SINF_B                        = 0x610
+	SYS___SINL_B                        = 0x611
+	SYS___TANF_B                        = 0x612
+	SYS___TANL_B                        = 0x613
+	SYS___TANHF_B                       = 0x614
+	SYS___TANHL_B                       = 0x615
+	SYS___ACOSF_B                       = 0x616
+	SYS___ACOSL_B                       = 0x617
+	SYS___ASINF_B                       = 0x618
+	SYS___ASINL_B                       = 0x619
+	SYS___LOGF_B                        = 0x620
+	SYS___LOGL_B                        = 0x621
+	SYS___LOG10F_B                      = 0x622
+	SYS___LOG10L_B                      = 0x623
+	SYS___POWF_B                        = 0x624
+	SYS___POWL_B                        = 0x625
+	SYS___SINHF_B                       = 0x626
+	SYS___SINHL_B                       = 0x627
+	SYS___SQRTF_B                       = 0x628
+	SYS___SQRTL_B                       = 0x629
+	SYS___MODFL_B                       = 0x630
+	SYS_ABSF                            = 0x631
+	SYS_ABSL                            = 0x632
+	SYS_ACOSF                           = 0x633
+	SYS_ACOSL                           = 0x634
+	SYS_ASINF                           = 0x635
+	SYS_ASINL                           = 0x636
+	SYS_ATAN2F                          = 0x637
+	SYS_ATAN2L                          = 0x638
+	SYS_ATANF                           = 0x639
+	SYS_COSHL                           = 0x640
+	SYS_EXPF                            = 0x641
+	SYS_EXPL                            = 0x642
+	SYS_TANHF                           = 0x643
+	SYS_TANHL                           = 0x644
+	SYS_LOG10F                          = 0x645
+	SYS_LOG10L                          = 0x646
+	SYS_LOGF                            = 0x647
+	SYS_LOGL                            = 0x648
+	SYS_POWF                            = 0x649
+	SYS_SINHL                           = 0x650
+	SYS_TANF                            = 0x651
+	SYS_TANL                            = 0x652
+	SYS_FABSF                           = 0x653
+	SYS_FABSL                           = 0x654
+	SYS_FLOORF                          = 0x655
+	SYS_FLOORL                          = 0x656
+	SYS_FMODF                           = 0x657
+	SYS_FMODL                           = 0x658
+	SYS_FREXPF                          = 0x659
+	SYS___CHATTR                        = 0x660
+	SYS___FCHATTR                       = 0x661
+	SYS___TOCCSID                       = 0x662
+	SYS___CSNAMETYPE                    = 0x663
+	SYS___TOCSNAME                      = 0x664
+	SYS___CCSIDTYPE                     = 0x665
+	SYS___AE_CORRESTBL_QUERY            = 0x666
+	SYS___AE_AUTOCONVERT_STATE          = 0x667
+	SYS_DN_FIND                         = 0x668
+	SYS___GETHOSTBYADDR_A               = 0x669
+	SYS___MBLEN_SB_A                    = 0x670
+	SYS___MBLEN_STD_A                   = 0x671
+	SYS___MBLEN_UTF                     = 0x672
+	SYS___MBSTOWCS_A                    = 0x673
+	SYS___MBSTOWCS_STD_A                = 0x674
+	SYS___MBTOWC_A                      = 0x675
+	SYS___MBTOWC_ISO1                   = 0x676
+	SYS___MBTOWC_SBCS                   = 0x677
+	SYS___MBTOWC_MBCS                   = 0x678
+	SYS___MBTOWC_UTF                    = 0x679
+	SYS___CSID_A                        = 0x680
+	SYS___CSID_STD_A                    = 0x681
+	SYS___WCSID_A                       = 0x682
+	SYS___WCSID_STD_A                   = 0x683
+	SYS___WCTOMB_A                      = 0x684
+	SYS___WCTOMB_ISO1                   = 0x685
+	SYS___WCTOMB_STD_A                  = 0x686
+	SYS___WCTOMB_UTF                    = 0x687
+	SYS___WCWIDTH_A                     = 0x688
+	SYS___GETGRNAM_R_A                  = 0x689
+	SYS___READDIR_R_A                   = 0x690
+	SYS___E2A_S                         = 0x691
+	SYS___FNMATCH_A                     = 0x692
+	SYS___FNMATCH_C_A                   = 0x693
+	SYS___EXECL_A                       = 0x694
+	SYS___FNMATCH_STD_A                 = 0x695
+	SYS___REGCOMP_A                     = 0x696
+	SYS___REGCOMP_STD_A                 = 0x697
+	SYS___REGERROR_A                    = 0x698
+	SYS___REGERROR_STD_A                = 0x699
+	SYS___SWPRINTF_A                    = 0x700
+	SYS___FSCANF_A                      = 0x701
+	SYS___SCANF_A                       = 0x702
+	SYS___SSCANF_A                      = 0x703
+	SYS___SWSCANF_A                     = 0x704
+	SYS___ATOF_A                        = 0x705
+	SYS___ATOI_A                        = 0x706
+	SYS___ATOL_A                        = 0x707
+	SYS___STRTOD_A                      = 0x708
+	SYS___STRTOL_A                      = 0x709
+	SYS___L64A_A                        = 0x710
+	SYS___STRERROR_A                    = 0x711
+	SYS___PERROR_A                      = 0x712
+	SYS___FETCH_A                       = 0x713
+	SYS___GETENV_A                      = 0x714
+	SYS___MKSTEMP_A                     = 0x717
+	SYS___PTSNAME_A                     = 0x718
+	SYS___PUTENV_A                      = 0x719
+	SYS___CHDIR_A                       = 0x720
+	SYS___CHOWN_A                       = 0x721
+	SYS___CHROOT_A                      = 0x722
+	SYS___GETCWD_A                      = 0x723
+	SYS___GETWD_A                       = 0x724
+	SYS___LCHOWN_A                      = 0x725
+	SYS___LINK_A                        = 0x726
+	SYS___PATHCONF_A                    = 0x727
+	SYS___IF_NAMEINDEX_A                = 0x728
+	SYS___READLINK_A                    = 0x729
+	SYS___EXTLINK_NP_A                  = 0x730
+	SYS___ISALNUM_A                     = 0x731
+	SYS___ISALPHA_A                     = 0x732
+	SYS___A2E_S                         = 0x733
+	SYS___ISCNTRL_A                     = 0x734
+	SYS___ISDIGIT_A                     = 0x735
+	SYS___ISGRAPH_A                     = 0x736
+	SYS___ISLOWER_A                     = 0x737
+	SYS___ISPRINT_A                     = 0x738
+	SYS___ISPUNCT_A                     = 0x739
+	SYS___ISWALPHA_A                    = 0x740
+	SYS___A2E_L                         = 0x741
+	SYS___ISWCNTRL_A                    = 0x742
+	SYS___ISWDIGIT_A                    = 0x743
+	SYS___ISWGRAPH_A                    = 0x744
+	SYS___ISWLOWER_A                    = 0x745
+	SYS___ISWPRINT_A                    = 0x746
+	SYS___ISWPUNCT_A                    = 0x747
+	SYS___ISWSPACE_A                    = 0x748
+	SYS___ISWUPPER_A                    = 0x749
+	SYS___REMOVE_A                      = 0x750
+	SYS___RENAME_A                      = 0x751
+	SYS___TMPNAM_A                      = 0x752
+	SYS___FOPEN_A                       = 0x753
+	SYS___FREOPEN_A                     = 0x754
+	SYS___CUSERID_A                     = 0x755
+	SYS___POPEN_A                       = 0x756
+	SYS___TEMPNAM_A                     = 0x757
+	SYS___FTW_A                         = 0x758
+	SYS___GETGRENT_A                    = 0x759
+	SYS___INET_NTOP_A                   = 0x760
+	SYS___GETPASS_A                     = 0x761
+	SYS___GETPWENT_A                    = 0x762
+	SYS___GETPWNAM_A                    = 0x763
+	SYS___GETPWUID_A                    = 0x764
+	SYS_____CHECK_RESOURCE_AUTH_NP_A    = 0x765
+	SYS___CHECKSCHENV_A                 = 0x766
+	SYS___CONNECTSERVER_A               = 0x767
+	SYS___CONNECTWORKMGR_A              = 0x768
+	SYS_____CONSOLE_A                   = 0x769
+	SYS___MSGSND_A                      = 0x770
+	SYS___MSGXRCV_A                     = 0x771
+	SYS___NFTW_A                        = 0x772
+	SYS_____PASSWD_A                    = 0x773
+	SYS___PTHREAD_SECURITY_NP_A         = 0x774
+	SYS___QUERYMETRICS_A                = 0x775
+	SYS___QUERYSCHENV                   = 0x776
+	SYS___READV_A                       = 0x777
+	SYS_____SERVER_CLASSIFY_A           = 0x778
+	SYS_____SERVER_INIT_A               = 0x779
+	SYS___W_GETPSENT_A                  = 0x780
+	SYS___WRITEV_A                      = 0x781
+	SYS___W_STATFS_A                    = 0x782
+	SYS___W_STATVFS_A                   = 0x783
+	SYS___FPUTC_A                       = 0x784
+	SYS___PUTCHAR_A                     = 0x785
+	SYS___PUTS_A                        = 0x786
+	SYS___FGETS_A                       = 0x787
+	SYS___GETS_A                        = 0x788
+	SYS___FPUTS_A                       = 0x789
+	SYS___PUTC_A                        = 0x790
+	SYS___AE_THREAD_SETMODE             = 0x791
+	SYS___AE_THREAD_SWAPMODE            = 0x792
+	SYS___GETNETBYADDR_A                = 0x793
+	SYS___GETNETBYNAME_A                = 0x794
+	SYS___GETNETENT_A                   = 0x795
+	SYS___GETPROTOBYNAME_A              = 0x796
+	SYS___GETPROTOBYNUMBER_A            = 0x797
+	SYS___GETPROTOENT_A                 = 0x798
+	SYS___GETSERVBYNAME_A               = 0x799
+	SYS_ACL_FIRST_ENTRY                 = 0x800
+	SYS_ACL_GET_ENTRY                   = 0x801
+	SYS_ACL_VALID                       = 0x802
+	SYS_ACL_CREATE_ENTRY                = 0x803
+	SYS_ACL_DELETE_ENTRY                = 0x804
+	SYS_ACL_UPDATE_ENTRY                = 0x805
+	SYS_ACL_DELETE_FD                   = 0x806
+	SYS_ACL_DELETE_FILE                 = 0x807
+	SYS_ACL_GET_FD                      = 0x808
+	SYS_ACL_GET_FILE                    = 0x809
+	SYS___ERFL_B                        = 0x810
+	SYS___ERFCL_B                       = 0x811
+	SYS___LGAMMAL_B                     = 0x812
+	SYS___SETHOOKEVENTS                 = 0x813
+	SYS_IF_NAMETOINDEX                  = 0x814
+	SYS_IF_INDEXTONAME                  = 0x815
+	SYS_IF_NAMEINDEX                    = 0x816
+	SYS_IF_FREENAMEINDEX                = 0x817
+	SYS_GETADDRINFO                     = 0x818
+	SYS_GETNAMEINFO                     = 0x819
+	SYS___DYNFREE_A                     = 0x820
+	SYS___RES_QUERY_A                   = 0x821
+	SYS___RES_SEARCH_A                  = 0x822
+	SYS___RES_QUERYDOMAIN_A             = 0x823
+	SYS___RES_MKQUERY_A                 = 0x824
+	SYS___RES_SEND_A                    = 0x825
+	SYS___DN_EXPAND_A                   = 0x826
+	SYS___DN_SKIPNAME_A                 = 0x827
+	SYS___DN_COMP_A                     = 0x828
+	SYS___DN_FIND_A                     = 0x829
+	SYS___INET_NTOA_A                   = 0x830
+	SYS___INET_NETWORK_A                = 0x831
+	SYS___ACCEPT_A                      = 0x832
+	SYS___ACCEPT_AND_RECV_A             = 0x833
+	SYS___BIND_A                        = 0x834
+	SYS___CONNECT_A                     = 0x835
+	SYS___GETPEERNAME_A                 = 0x836
+	SYS___GETSOCKNAME_A                 = 0x837
+	SYS___RECVFROM_A                    = 0x838
+	SYS___SENDTO_A                      = 0x839
+	SYS___LCHATTR                       = 0x840
+	SYS___WRITEDOWN                     = 0x841
+	SYS_PTHREAD_MUTEX_INIT2             = 0x842
+	SYS___ACOSHF_B                      = 0x843
+	SYS___ACOSHL_B                      = 0x844
+	SYS___ASINHF_B                      = 0x845
+	SYS___ASINHL_B                      = 0x846
+	SYS___ATANHF_B                      = 0x847
+	SYS___ATANHL_B                      = 0x848
+	SYS___CBRTF_B                       = 0x849
+	SYS___EXP2F_B                       = 0x850
+	SYS___EXP2L_B                       = 0x851
+	SYS___EXPM1F_B                      = 0x852
+	SYS___EXPM1L_B                      = 0x853
+	SYS___FDIMF_B                       = 0x854
+	SYS___FDIM_B                        = 0x855
+	SYS___FDIML_B                       = 0x856
+	SYS___HYPOTF_B                      = 0x857
+	SYS___HYPOTL_B                      = 0x858
+	SYS___LOG1PF_B                      = 0x859
+	SYS___REMQUOF_B                     = 0x860
+	SYS___REMQUO_B                      = 0x861
+	SYS___REMQUOL_B                     = 0x862
+	SYS___TGAMMAF_B                     = 0x863
+	SYS___TGAMMA_B                      = 0x864
+	SYS___TGAMMAL_B                     = 0x865
+	SYS___TRUNCF_B                      = 0x866
+	SYS___TRUNC_B                       = 0x867
+	SYS___TRUNCL_B                      = 0x868
+	SYS___LGAMMAF_B                     = 0x869
+	SYS_ASINHF                          = 0x870
+	SYS_ASINHL                          = 0x871
+	SYS_ATANHF                          = 0x872
+	SYS_ATANHL                          = 0x873
+	SYS_CBRTF                           = 0x874
+	SYS_CBRTL                           = 0x875
+	SYS_COPYSIGNF                       = 0x876
+	SYS_CPYSIGNF                        = 0x876
+	SYS_COPYSIGNL                       = 0x877
+	SYS_CPYSIGNL                        = 0x877
+	SYS_COTANF                          = 0x878
+	SYS___COTANF                        = 0x878
+	SYS_COTAN                           = 0x879
+	SYS___COTAN                         = 0x879
+	SYS_FDIM                            = 0x881
+	SYS_FDIML                           = 0x882
+	SYS_HYPOTF                          = 0x883
+	SYS_HYPOTL                          = 0x884
+	SYS_LOG1PF                          = 0x885
+	SYS_LOG1PL                          = 0x886
+	SYS_LOG2F                           = 0x887
+	SYS_LOG2                            = 0x888
+	SYS_LOG2L                           = 0x889
+	SYS_TGAMMA                          = 0x890
+	SYS_TGAMMAL                         = 0x891
+	SYS_TRUNCF                          = 0x892
+	SYS_TRUNC                           = 0x893
+	SYS_TRUNCL                          = 0x894
+	SYS_LGAMMAF                         = 0x895
+	SYS_LGAMMAL                         = 0x896
+	SYS_LROUNDF                         = 0x897
+	SYS_LROUND                          = 0x898
+	SYS_ERFF                            = 0x899
+	SYS___COSHF_H                       = 0x900
+	SYS___COSHL_H                       = 0x901
+	SYS___COTAN_H                       = 0x902
+	SYS___COTANF_H                      = 0x903
+	SYS___COTANL_H                      = 0x904
+	SYS___ERF_H                         = 0x905
+	SYS___ERFF_H                        = 0x906
+	SYS___ERFL_H                        = 0x907
+	SYS___ERFC_H                        = 0x908
+	SYS___ERFCF_H                       = 0x909
+	SYS___FDIMF_H                       = 0x910
+	SYS___FDIML_H                       = 0x911
+	SYS___FMOD_H                        = 0x912
+	SYS___FMODF_H                       = 0x913
+	SYS___FMODL_H                       = 0x914
+	SYS___GAMMA_H                       = 0x915
+	SYS___HYPOT_H                       = 0x916
+	SYS___ILOGB_H                       = 0x917
+	SYS___LGAMMA_H                      = 0x918
+	SYS___LGAMMAF_H                     = 0x919
+	SYS___LOG2L_H                       = 0x920
+	SYS___LOG1P_H                       = 0x921
+	SYS___LOG10_H                       = 0x922
+	SYS___LOG10F_H                      = 0x923
+	SYS___LOG10L_H                      = 0x924
+	SYS___LROUND_H                      = 0x925
+	SYS___LROUNDF_H                     = 0x926
+	SYS___NEXTAFTER_H                   = 0x927
+	SYS___POW_H                         = 0x928
+	SYS___POWF_H                        = 0x929
+	SYS___SINL_H                        = 0x930
+	SYS___SINH_H                        = 0x931
+	SYS___SINHF_H                       = 0x932
+	SYS___SINHL_H                       = 0x933
+	SYS___SQRT_H                        = 0x934
+	SYS___SQRTF_H                       = 0x935
+	SYS___SQRTL_H                       = 0x936
+	SYS___TAN_H                         = 0x937
+	SYS___TANF_H                        = 0x938
+	SYS___TANL_H                        = 0x939
+	SYS___TRUNCF_H                      = 0x940
+	SYS___TRUNCL_H                      = 0x941
+	SYS___COSH_H                        = 0x942
+	SYS___LE_DEBUG_SET_RESUME_MCH       = 0x943
+	SYS_VFSCANF                         = 0x944
+	SYS_VSCANF                          = 0x946
+	SYS_VSSCANF                         = 0x948
+	SYS_IMAXABS                         = 0x950
+	SYS_IMAXDIV                         = 0x951
+	SYS_STRTOIMAX                       = 0x952
+	SYS_STRTOUMAX                       = 0x953
+	SYS_WCSTOIMAX                       = 0x954
+	SYS_WCSTOUMAX                       = 0x955
+	SYS_ATOLL                           = 0x956
+	SYS_STRTOF                          = 0x957
+	SYS_STRTOLD                         = 0x958
+	SYS_WCSTOF                          = 0x959
+	SYS_INET6_RTH_GETADDR               = 0x960
+	SYS_INET6_OPT_INIT                  = 0x961
+	SYS_INET6_OPT_APPEND                = 0x962
+	SYS_INET6_OPT_FINISH                = 0x963
+	SYS_INET6_OPT_SET_VAL               = 0x964
+	SYS_INET6_OPT_NEXT                  = 0x965
+	SYS_INET6_OPT_FIND                  = 0x966
+	SYS_INET6_OPT_GET_VAL               = 0x967
+	SYS___POW_I                         = 0x987
+	SYS___POW_I_B                       = 0x988
+	SYS___POW_I_H                       = 0x989
+	SYS___CABS_H                        = 0x990
+	SYS_CABSF                           = 0x991
+	SYS___CABSF_B                       = 0x992
+	SYS___CABSF_H                       = 0x993
+	SYS_CABSL                           = 0x994
+	SYS___CABSL_B                       = 0x995
+	SYS___CABSL_H                       = 0x996
+	SYS_CACOS                           = 0x997
+	SYS___CACOS_B                       = 0x998
+	SYS___CACOS_H                       = 0x999
 )
diff --git a/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go
index 3e6d57c..7a8161c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && aix
+// +build ppc,aix
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go
index 3a219bd..07ed733 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && aix
+// +build ppc64,aix
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index 17c53bd..4c8dc0b 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && darwin
+// +build amd64,darwin
 
 package unix
 
@@ -150,16 +151,6 @@ type Dirent struct {
 	_       [3]byte
 }
 
-type Attrlist struct {
-	Bitmapcount uint16
-	Reserved    uint16
-	Commonattr  uint32
-	Volattr     uint32
-	Dirattr     uint32
-	Fileattr    uint32
-	Forkattr    uint32
-}
-
 const (
 	PathMax = 0x400
 )
@@ -218,107 +209,8 @@ type RawSockaddrCtl struct {
 	Sc_reserved [5]uint32
 }
 
-type RawSockaddrVM struct {
-	Len       uint8
-	Family    uint8
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-}
-
-type XVSockPCB struct {
-	Xv_len           uint32
-	Xv_vsockpp       uint64
-	Xvp_local_cid    uint32
-	Xvp_local_port   uint32
-	Xvp_remote_cid   uint32
-	Xvp_remote_port  uint32
-	Xvp_rxcnt        uint32
-	Xvp_txcnt        uint32
-	Xvp_peer_rxhiwat uint32
-	Xvp_peer_rxcnt   uint32
-	Xvp_last_pid     int32
-	Xvp_gencnt       uint64
-	Xv_socket        XSocket
-	_                [4]byte
-}
-
-type XSocket struct {
-	Xso_len      uint32
-	Xso_so       uint32
-	So_type      int16
-	So_options   int16
-	So_linger    int16
-	So_state     int16
-	So_pcb       uint32
-	Xso_protocol int32
-	Xso_family   int32
-	So_qlen      int16
-	So_incqlen   int16
-	So_qlimit    int16
-	So_timeo     int16
-	So_error     uint16
-	So_pgid      int32
-	So_oobmark   uint32
-	So_rcv       XSockbuf
-	So_snd       XSockbuf
-	So_uid       uint32
-}
-
-type XSocket64 struct {
-	Xso_len      uint32
-	_            [8]byte
-	So_type      int16
-	So_options   int16
-	So_linger    int16
-	So_state     int16
-	_            [8]byte
-	Xso_protocol int32
-	Xso_family   int32
-	So_qlen      int16
-	So_incqlen   int16
-	So_qlimit    int16
-	So_timeo     int16
-	So_error     uint16
-	So_pgid      int32
-	So_oobmark   uint32
-	So_rcv       XSockbuf
-	So_snd       XSockbuf
-	So_uid       uint32
-}
-
-type XSockbuf struct {
-	Cc    uint32
-	Hiwat uint32
-	Mbcnt uint32
-	Mbmax uint32
-	Lowat int32
-	Flags int16
-	Timeo int16
-}
-
-type XVSockPgen struct {
-	Len   uint32
-	Count uint64
-	Gen   uint64
-	Sogen uint64
-}
-
 type _Socklen uint32
 
-type SaeAssocID uint32
-
-type SaeConnID uint32
-
-type SaEndpoints struct {
-	Srcif      uint32
-	Srcaddr    *RawSockaddr
-	Srcaddrlen uint32
-	Dstaddr    *RawSockaddr
-	Dstaddrlen uint32
-	_          [4]byte
-}
-
 type Xucred struct {
 	Version uint32
 	Uid     uint32
@@ -388,57 +280,25 @@ type ICMPv6Filter struct {
 	Filt [8]uint32
 }
 
-type TCPConnectionInfo struct {
-	State               uint8
-	Snd_wscale          uint8
-	Rcv_wscale          uint8
-	_                   uint8
-	Options             uint32
-	Flags               uint32
-	Rto                 uint32
-	Maxseg              uint32
-	Snd_ssthresh        uint32
-	Snd_cwnd            uint32
-	Snd_wnd             uint32
-	Snd_sbbytes         uint32
-	Rcv_wnd             uint32
-	Rttcur              uint32
-	Srtt                uint32
-	Rttvar              uint32
-	Txpackets           uint64
-	Txbytes             uint64
-	Txretransmitbytes   uint64
-	Rxpackets           uint64
-	Rxbytes             uint64
-	Rxoutoforderbytes   uint64
-	Txretransmitpackets uint64
-}
-
 const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x6c
-	SizeofSockaddrUnix      = 0x6a
-	SizeofSockaddrDatalink  = 0x14
-	SizeofSockaddrCtl       = 0x20
-	SizeofSockaddrVM        = 0xc
-	SizeofXvsockpcb         = 0xa8
-	SizeofXSocket           = 0x64
-	SizeofXSockbuf          = 0x18
-	SizeofXVSockPgen        = 0x20
-	SizeofXucred            = 0x4c
-	SizeofLinger            = 0x8
-	SizeofIovec             = 0x10
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x30
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofTCPConnectionInfo = 0x70
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofSockaddrCtl      = 0x20
+	SizeofXucred           = 0x4c
+	SizeofLinger           = 0x8
+	SizeofIovec            = 0x10
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
 )
 
 const (
@@ -462,14 +322,11 @@ type FdSet struct {
 
 const (
 	SizeofIfMsghdr    = 0x70
-	SizeofIfMsghdr2   = 0xa0
 	SizeofIfData      = 0x60
-	SizeofIfData64    = 0x80
 	SizeofIfaMsghdr   = 0x14
 	SizeofIfmaMsghdr  = 0x10
 	SizeofIfmaMsghdr2 = 0x14
 	SizeofRtMsghdr    = 0x5c
-	SizeofRtMsghdr2   = 0x5c
 	SizeofRtMetrics   = 0x38
 )
 
@@ -483,20 +340,6 @@ type IfMsghdr struct {
 	Data    IfData
 }
 
-type IfMsghdr2 struct {
-	Msglen     uint16
-	Version    uint8
-	Type       uint8
-	Addrs      int32
-	Flags      int32
-	Index      uint16
-	Snd_len    int32
-	Snd_maxlen int32
-	Snd_drops  int32
-	Timer      int32
-	Data       IfData64
-}
-
 type IfData struct {
 	Type       uint8
 	Typelen    uint8
@@ -529,34 +372,6 @@ type IfData struct {
 	Reserved2  uint32
 }
 
-type IfData64 struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-}
-
 type IfaMsghdr struct {
 	Msglen  uint16
 	Version uint8
@@ -602,21 +417,6 @@ type RtMsghdr struct {
 	Rmx     RtMetrics
 }
 
-type RtMsghdr2 struct {
-	Msglen      uint16
-	Version     uint8
-	Type        uint8
-	Index       uint16
-	Flags       int32
-	Addrs       int32
-	Refcnt      int32
-	Parentflags int32
-	Reserved    int32
-	Use         int32
-	Inits       uint32
-	Rmx         RtMetrics
-}
-
 type RtMetrics struct {
 	Locks    uint32
 	Mtu      uint32
@@ -692,7 +492,6 @@ const (
 	AT_REMOVEDIR        = 0x80
 	AT_SYMLINK_FOLLOW   = 0x40
 	AT_SYMLINK_NOFOLLOW = 0x20
-	AT_EACCESS          = 0x10
 )
 
 type PollFd struct {
@@ -751,13 +550,13 @@ type Eproc struct {
 	Tdev    int32
 	Tpgid   int32
 	Tsess   uintptr
-	Wmesg   [8]byte
+	Wmesg   [8]int8
 	Xsize   int32
 	Xrssize int16
 	Xccount int16
 	Xswrss  int16
 	Flag    int32
-	Login   [12]byte
+	Login   [12]int8
 	Spare   [4]int32
 	_       [4]byte
 }
@@ -798,7 +597,7 @@ type ExternProc struct {
 	P_priority  uint8
 	P_usrpri    uint8
 	P_nice      int8
-	P_comm      [17]byte
+	P_comm      [17]int8
 	P_pgrp      uintptr
 	P_addr      uintptr
 	P_xstat     uint16
@@ -840,39 +639,3 @@ type Ucred struct {
 	Ngroups int16
 	Groups  [16]uint32
 }
-
-type SysvIpcPerm struct {
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint16
-	_    uint16
-	_    int32
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Lpid   int32
-	Cpid   int32
-	Nattch uint16
-	_      [34]byte
-}
-
-const (
-	IPC_CREAT   = 0x200
-	IPC_EXCL    = 0x400
-	IPC_NOWAIT  = 0x800
-	IPC_PRIVATE = 0x0
-)
-
-const (
-	IPC_RMID = 0x0
-	IPC_SET  = 0x1
-	IPC_STAT = 0x2
-)
-
-const (
-	SHM_RDONLY = 0x1000
-	SHM_RND    = 0x2000
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
index 2392226..96f0e6a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && darwin
+// +build arm64,darwin
 
 package unix
 
@@ -150,16 +151,6 @@ type Dirent struct {
 	_       [3]byte
 }
 
-type Attrlist struct {
-	Bitmapcount uint16
-	Reserved    uint16
-	Commonattr  uint32
-	Volattr     uint32
-	Dirattr     uint32
-	Fileattr    uint32
-	Forkattr    uint32
-}
-
 const (
 	PathMax = 0x400
 )
@@ -218,107 +209,8 @@ type RawSockaddrCtl struct {
 	Sc_reserved [5]uint32
 }
 
-type RawSockaddrVM struct {
-	Len       uint8
-	Family    uint8
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-}
-
-type XVSockPCB struct {
-	Xv_len           uint32
-	Xv_vsockpp       uint64
-	Xvp_local_cid    uint32
-	Xvp_local_port   uint32
-	Xvp_remote_cid   uint32
-	Xvp_remote_port  uint32
-	Xvp_rxcnt        uint32
-	Xvp_txcnt        uint32
-	Xvp_peer_rxhiwat uint32
-	Xvp_peer_rxcnt   uint32
-	Xvp_last_pid     int32
-	Xvp_gencnt       uint64
-	Xv_socket        XSocket
-	_                [4]byte
-}
-
-type XSocket struct {
-	Xso_len      uint32
-	Xso_so       uint32
-	So_type      int16
-	So_options   int16
-	So_linger    int16
-	So_state     int16
-	So_pcb       uint32
-	Xso_protocol int32
-	Xso_family   int32
-	So_qlen      int16
-	So_incqlen   int16
-	So_qlimit    int16
-	So_timeo     int16
-	So_error     uint16
-	So_pgid      int32
-	So_oobmark   uint32
-	So_rcv       XSockbuf
-	So_snd       XSockbuf
-	So_uid       uint32
-}
-
-type XSocket64 struct {
-	Xso_len      uint32
-	_            [8]byte
-	So_type      int16
-	So_options   int16
-	So_linger    int16
-	So_state     int16
-	_            [8]byte
-	Xso_protocol int32
-	Xso_family   int32
-	So_qlen      int16
-	So_incqlen   int16
-	So_qlimit    int16
-	So_timeo     int16
-	So_error     uint16
-	So_pgid      int32
-	So_oobmark   uint32
-	So_rcv       XSockbuf
-	So_snd       XSockbuf
-	So_uid       uint32
-}
-
-type XSockbuf struct {
-	Cc    uint32
-	Hiwat uint32
-	Mbcnt uint32
-	Mbmax uint32
-	Lowat int32
-	Flags int16
-	Timeo int16
-}
-
-type XVSockPgen struct {
-	Len   uint32
-	Count uint64
-	Gen   uint64
-	Sogen uint64
-}
-
 type _Socklen uint32
 
-type SaeAssocID uint32
-
-type SaeConnID uint32
-
-type SaEndpoints struct {
-	Srcif      uint32
-	Srcaddr    *RawSockaddr
-	Srcaddrlen uint32
-	Dstaddr    *RawSockaddr
-	Dstaddrlen uint32
-	_          [4]byte
-}
-
 type Xucred struct {
 	Version uint32
 	Uid     uint32
@@ -388,57 +280,25 @@ type ICMPv6Filter struct {
 	Filt [8]uint32
 }
 
-type TCPConnectionInfo struct {
-	State               uint8
-	Snd_wscale          uint8
-	Rcv_wscale          uint8
-	_                   uint8
-	Options             uint32
-	Flags               uint32
-	Rto                 uint32
-	Maxseg              uint32
-	Snd_ssthresh        uint32
-	Snd_cwnd            uint32
-	Snd_wnd             uint32
-	Snd_sbbytes         uint32
-	Rcv_wnd             uint32
-	Rttcur              uint32
-	Srtt                uint32
-	Rttvar              uint32
-	Txpackets           uint64
-	Txbytes             uint64
-	Txretransmitbytes   uint64
-	Rxpackets           uint64
-	Rxbytes             uint64
-	Rxoutoforderbytes   uint64
-	Txretransmitpackets uint64
-}
-
 const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x6c
-	SizeofSockaddrUnix      = 0x6a
-	SizeofSockaddrDatalink  = 0x14
-	SizeofSockaddrCtl       = 0x20
-	SizeofSockaddrVM        = 0xc
-	SizeofXvsockpcb         = 0xa8
-	SizeofXSocket           = 0x64
-	SizeofXSockbuf          = 0x18
-	SizeofXVSockPgen        = 0x20
-	SizeofXucred            = 0x4c
-	SizeofLinger            = 0x8
-	SizeofIovec             = 0x10
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x30
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofTCPConnectionInfo = 0x70
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofSockaddrCtl      = 0x20
+	SizeofXucred           = 0x4c
+	SizeofLinger           = 0x8
+	SizeofIovec            = 0x10
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
 )
 
 const (
@@ -462,14 +322,11 @@ type FdSet struct {
 
 const (
 	SizeofIfMsghdr    = 0x70
-	SizeofIfMsghdr2   = 0xa0
 	SizeofIfData      = 0x60
-	SizeofIfData64    = 0x80
 	SizeofIfaMsghdr   = 0x14
 	SizeofIfmaMsghdr  = 0x10
 	SizeofIfmaMsghdr2 = 0x14
 	SizeofRtMsghdr    = 0x5c
-	SizeofRtMsghdr2   = 0x5c
 	SizeofRtMetrics   = 0x38
 )
 
@@ -483,20 +340,6 @@ type IfMsghdr struct {
 	Data    IfData
 }
 
-type IfMsghdr2 struct {
-	Msglen     uint16
-	Version    uint8
-	Type       uint8
-	Addrs      int32
-	Flags      int32
-	Index      uint16
-	Snd_len    int32
-	Snd_maxlen int32
-	Snd_drops  int32
-	Timer      int32
-	Data       IfData64
-}
-
 type IfData struct {
 	Type       uint8
 	Typelen    uint8
@@ -529,34 +372,6 @@ type IfData struct {
 	Reserved2  uint32
 }
 
-type IfData64 struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-}
-
 type IfaMsghdr struct {
 	Msglen  uint16
 	Version uint8
@@ -602,21 +417,6 @@ type RtMsghdr struct {
 	Rmx     RtMetrics
 }
 
-type RtMsghdr2 struct {
-	Msglen      uint16
-	Version     uint8
-	Type        uint8
-	Index       uint16
-	Flags       int32
-	Addrs       int32
-	Refcnt      int32
-	Parentflags int32
-	Reserved    int32
-	Use         int32
-	Inits       uint32
-	Rmx         RtMetrics
-}
-
 type RtMetrics struct {
 	Locks    uint32
 	Mtu      uint32
@@ -692,7 +492,6 @@ const (
 	AT_REMOVEDIR        = 0x80
 	AT_SYMLINK_FOLLOW   = 0x40
 	AT_SYMLINK_NOFOLLOW = 0x20
-	AT_EACCESS          = 0x10
 )
 
 type PollFd struct {
@@ -751,13 +550,13 @@ type Eproc struct {
 	Tdev    int32
 	Tpgid   int32
 	Tsess   uintptr
-	Wmesg   [8]byte
+	Wmesg   [8]int8
 	Xsize   int32
 	Xrssize int16
 	Xccount int16
 	Xswrss  int16
 	Flag    int32
-	Login   [12]byte
+	Login   [12]int8
 	Spare   [4]int32
 	_       [4]byte
 }
@@ -798,7 +597,7 @@ type ExternProc struct {
 	P_priority  uint8
 	P_usrpri    uint8
 	P_nice      int8
-	P_comm      [17]byte
+	P_comm      [17]int8
 	P_pgrp      uintptr
 	P_addr      uintptr
 	P_xstat     uint16
@@ -840,39 +639,3 @@ type Ucred struct {
 	Ngroups int16
 	Groups  [16]uint32
 }
-
-type SysvIpcPerm struct {
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint16
-	_    uint16
-	_    int32
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Lpid   int32
-	Cpid   int32
-	Nattch uint16
-	_      [34]byte
-}
-
-const (
-	IPC_CREAT   = 0x200
-	IPC_EXCL    = 0x400
-	IPC_NOWAIT  = 0x800
-	IPC_PRIVATE = 0x0
-)
-
-const (
-	IPC_RMID = 0x0
-	IPC_SET  = 0x1
-	IPC_STAT = 0x2
-)
-
-const (
-	SHM_RDONLY = 0x1000
-	SHM_RND    = 0x2000
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
index 30e405b..d0ba8e9 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && dragonfly
+// +build amd64,dragonfly
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
index 51e13eb..1f99c02 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && freebsd
+// +build 386,freebsd
 
 package unix
 
@@ -30,8 +31,6 @@ type Timeval struct {
 	Usec int32
 }
 
-type Time_t int32
-
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -89,6 +88,27 @@ type Stat_t struct {
 	Spare   [10]uint64
 }
 
+type stat_freebsd11_t struct {
+	Dev     uint32
+	Ino     uint32
+	Mode    uint16
+	Nlink   uint16
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Size    int64
+	Blocks  int64
+	Blksize int32
+	Flags   uint32
+	Gen     uint32
+	Lspare  int32
+	Btim    Timespec
+	_       [8]byte
+}
+
 type Statfs_t struct {
 	Version     uint32
 	Type        uint32
@@ -114,6 +134,31 @@ type Statfs_t struct {
 	Mntonname   [1024]byte
 }
 
+type statfs_freebsd11_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]byte
+	Mntfromname [88]byte
+	Mntonname   [88]byte
+}
+
 type Flock_t struct {
 	Start  int64
 	Len    int64
@@ -134,6 +179,14 @@ type Dirent struct {
 	Name   [256]int8
 }
 
+type dirent_freebsd11 struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
 type Fsid struct {
 	Val [2]int32
 }
@@ -282,9 +335,41 @@ const (
 )
 
 const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
+	PTRACE_ATTACH     = 0xa
+	PTRACE_CONT       = 0x7
+	PTRACE_DETACH     = 0xb
+	PTRACE_GETFPREGS  = 0x23
+	PTRACE_GETFSBASE  = 0x47
+	PTRACE_GETLWPLIST = 0xf
+	PTRACE_GETNUMLWPS = 0xe
+	PTRACE_GETREGS    = 0x21
+	PTRACE_GETXSTATE  = 0x45
+	PTRACE_IO         = 0xc
+	PTRACE_KILL       = 0x8
+	PTRACE_LWPEVENTS  = 0x18
+	PTRACE_LWPINFO    = 0xd
+	PTRACE_SETFPREGS  = 0x24
+	PTRACE_SETREGS    = 0x22
+	PTRACE_SINGLESTEP = 0x9
+	PTRACE_TRACEME    = 0x0
+)
+
+const (
+	PIOD_READ_D  = 0x1
+	PIOD_WRITE_D = 0x2
+	PIOD_READ_I  = 0x3
+	PIOD_WRITE_I = 0x4
+)
+
+const (
+	PL_FLAG_BORN   = 0x100
+	PL_FLAG_EXITED = 0x200
+	PL_FLAG_SI     = 0x20
+)
+
+const (
+	TRAP_BRKPT = 0x1
+	TRAP_TRACE = 0x2
 )
 
 type PtraceLwpInfoStruct struct {
@@ -293,7 +378,7 @@ type PtraceLwpInfoStruct struct {
 	Flags        int32
 	Sigmask      Sigset_t
 	Siglist      Sigset_t
-	Siginfo      __PtraceSiginfo
+	Siginfo      __Siginfo
 	Tdname       [20]int8
 	Child_pid    int32
 	Syscall_code uint32
@@ -311,17 +396,6 @@ type __Siginfo struct {
 	Value  [4]byte
 	_      [32]byte
 }
-type __PtraceSiginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   uintptr
-	Value  [4]byte
-	_      [32]byte
-}
 
 type Sigset_t struct {
 	Val [4]uint32
@@ -356,11 +430,9 @@ type FpReg struct {
 	Pad   [64]uint8
 }
 
-type FpExtendedPrecision struct{}
-
 type PtraceIoDesc struct {
 	Op   int32
-	Offs uintptr
+	Offs *byte
 	Addr *byte
 	Len  uint32
 }
@@ -370,9 +442,8 @@ type Kevent_t struct {
 	Filter int16
 	Flags  uint16
 	Fflags uint32
-	Data   int64
+	Data   int32
 	Udata  *byte
-	Ext    [4]uint64
 }
 
 type FdSet struct {
@@ -625,7 +696,6 @@ const (
 	POLLRDNORM   = 0x40
 	POLLWRBAND   = 0x100
 	POLLWRNORM   = 0x4
-	POLLRDHUP    = 0x4000
 )
 
 type CapRights struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index d002d8e..ddf0305 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && freebsd
+// +build amd64,freebsd
 
 package unix
 
@@ -30,8 +31,6 @@ type Timeval struct {
 	Usec int64
 }
 
-type Time_t int64
-
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -85,6 +84,26 @@ type Stat_t struct {
 	Spare   [10]uint64
 }
 
+type stat_freebsd11_t struct {
+	Dev     uint32
+	Ino     uint32
+	Mode    uint16
+	Nlink   uint16
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Size    int64
+	Blocks  int64
+	Blksize int32
+	Flags   uint32
+	Gen     uint32
+	Lspare  int32
+	Btim    Timespec
+}
+
 type Statfs_t struct {
 	Version     uint32
 	Type        uint32
@@ -110,6 +129,31 @@ type Statfs_t struct {
 	Mntonname   [1024]byte
 }
 
+type statfs_freebsd11_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]byte
+	Mntfromname [88]byte
+	Mntonname   [88]byte
+}
+
 type Flock_t struct {
 	Start  int64
 	Len    int64
@@ -131,6 +175,14 @@ type Dirent struct {
 	Name   [256]int8
 }
 
+type dirent_freebsd11 struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
 type Fsid struct {
 	Val [2]int32
 }
@@ -279,9 +331,41 @@ const (
 )
 
 const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
+	PTRACE_ATTACH     = 0xa
+	PTRACE_CONT       = 0x7
+	PTRACE_DETACH     = 0xb
+	PTRACE_GETFPREGS  = 0x23
+	PTRACE_GETFSBASE  = 0x47
+	PTRACE_GETLWPLIST = 0xf
+	PTRACE_GETNUMLWPS = 0xe
+	PTRACE_GETREGS    = 0x21
+	PTRACE_GETXSTATE  = 0x45
+	PTRACE_IO         = 0xc
+	PTRACE_KILL       = 0x8
+	PTRACE_LWPEVENTS  = 0x18
+	PTRACE_LWPINFO    = 0xd
+	PTRACE_SETFPREGS  = 0x24
+	PTRACE_SETREGS    = 0x22
+	PTRACE_SINGLESTEP = 0x9
+	PTRACE_TRACEME    = 0x0
+)
+
+const (
+	PIOD_READ_D  = 0x1
+	PIOD_WRITE_D = 0x2
+	PIOD_READ_I  = 0x3
+	PIOD_WRITE_I = 0x4
+)
+
+const (
+	PL_FLAG_BORN   = 0x100
+	PL_FLAG_EXITED = 0x200
+	PL_FLAG_SI     = 0x20
+)
+
+const (
+	TRAP_BRKPT = 0x1
+	TRAP_TRACE = 0x2
 )
 
 type PtraceLwpInfoStruct struct {
@@ -290,7 +374,7 @@ type PtraceLwpInfoStruct struct {
 	Flags        int32
 	Sigmask      Sigset_t
 	Siglist      Sigset_t
-	Siginfo      __PtraceSiginfo
+	Siginfo      __Siginfo
 	Tdname       [20]int8
 	Child_pid    int32
 	Syscall_code uint32
@@ -309,18 +393,6 @@ type __Siginfo struct {
 	_      [40]byte
 }
 
-type __PtraceSiginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   uintptr
-	Value  [8]byte
-	_      [40]byte
-}
-
 type Sigset_t struct {
 	Val [4]uint32
 }
@@ -361,11 +433,9 @@ type FpReg struct {
 	Spare [12]uint64
 }
 
-type FpExtendedPrecision struct{}
-
 type PtraceIoDesc struct {
 	Op   int32
-	Offs uintptr
+	Offs *byte
 	Addr *byte
 	Len  uint64
 }
@@ -377,7 +447,6 @@ type Kevent_t struct {
 	Fflags uint32
 	Data   int64
 	Udata  *byte
-	Ext    [4]uint64
 }
 
 type FdSet struct {
@@ -630,7 +699,6 @@ const (
 	POLLRDNORM   = 0x40
 	POLLWRBAND   = 0x100
 	POLLWRNORM   = 0x4
-	POLLRDHUP    = 0x4000
 )
 
 type CapRights struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index 3f863d8..dce0a5c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && freebsd
+// +build arm,freebsd
 
 package unix
 
@@ -32,8 +33,6 @@ type Timeval struct {
 	_    [4]byte
 }
 
-type Time_t int64
-
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -87,6 +86,26 @@ type Stat_t struct {
 	Spare   [10]uint64
 }
 
+type stat_freebsd11_t struct {
+	Dev     uint32
+	Ino     uint32
+	Mode    uint16
+	Nlink   uint16
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Size    int64
+	Blocks  int64
+	Blksize int32
+	Flags   uint32
+	Gen     uint32
+	Lspare  int32
+	Btim    Timespec
+}
+
 type Statfs_t struct {
 	Version     uint32
 	Type        uint32
@@ -112,6 +131,31 @@ type Statfs_t struct {
 	Mntonname   [1024]byte
 }
 
+type statfs_freebsd11_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]byte
+	Mntfromname [88]byte
+	Mntonname   [88]byte
+}
+
 type Flock_t struct {
 	Start  int64
 	Len    int64
@@ -133,6 +177,14 @@ type Dirent struct {
 	Name   [256]int8
 }
 
+type dirent_freebsd11 struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
 type Fsid struct {
 	Val [2]int32
 }
@@ -281,9 +333,41 @@ const (
 )
 
 const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
+	PTRACE_ATTACH     = 0xa
+	PTRACE_CONT       = 0x7
+	PTRACE_DETACH     = 0xb
+	PTRACE_GETFPREGS  = 0x23
+	PTRACE_GETFSBASE  = 0x47
+	PTRACE_GETLWPLIST = 0xf
+	PTRACE_GETNUMLWPS = 0xe
+	PTRACE_GETREGS    = 0x21
+	PTRACE_GETXSTATE  = 0x45
+	PTRACE_IO         = 0xc
+	PTRACE_KILL       = 0x8
+	PTRACE_LWPEVENTS  = 0x18
+	PTRACE_LWPINFO    = 0xd
+	PTRACE_SETFPREGS  = 0x24
+	PTRACE_SETREGS    = 0x22
+	PTRACE_SINGLESTEP = 0x9
+	PTRACE_TRACEME    = 0x0
+)
+
+const (
+	PIOD_READ_D  = 0x1
+	PIOD_WRITE_D = 0x2
+	PIOD_READ_I  = 0x3
+	PIOD_WRITE_I = 0x4
+)
+
+const (
+	PL_FLAG_BORN   = 0x100
+	PL_FLAG_EXITED = 0x200
+	PL_FLAG_SI     = 0x20
+)
+
+const (
+	TRAP_BRKPT = 0x1
+	TRAP_TRACE = 0x2
 )
 
 type PtraceLwpInfoStruct struct {
@@ -292,7 +376,7 @@ type PtraceLwpInfoStruct struct {
 	Flags        int32
 	Sigmask      Sigset_t
 	Siglist      Sigset_t
-	Siginfo      __PtraceSiginfo
+	Siginfo      __Siginfo
 	Tdname       [20]int8
 	Child_pid    int32
 	Syscall_code uint32
@@ -300,27 +384,15 @@ type PtraceLwpInfoStruct struct {
 }
 
 type __Siginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   *byte
-	Value  [4]byte
-	_      [32]byte
-}
-
-type __PtraceSiginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   uintptr
-	Value  [4]byte
-	_      [32]byte
+	Signo    int32
+	Errno    int32
+	Code     int32
+	Pid      int32
+	Uid      uint32
+	Status   int32
+	Addr     *byte
+	Value    [4]byte
+	X_reason [32]byte
 }
 
 type Sigset_t struct {
@@ -328,27 +400,21 @@ type Sigset_t struct {
 }
 
 type Reg struct {
-	R    [13]uint32
-	Sp   uint32
-	Lr   uint32
-	Pc   uint32
-	Cpsr uint32
+	R      [13]uint32
+	R_sp   uint32
+	R_lr   uint32
+	R_pc   uint32
+	R_cpsr uint32
 }
 
 type FpReg struct {
-	Fpsr uint32
-	Fpr  [8]FpExtendedPrecision
-}
-
-type FpExtendedPrecision struct {
-	Exponent    uint32
-	Mantissa_hi uint32
-	Mantissa_lo uint32
+	Fpr_fpsr uint32
+	Fpr      [8][3]uint32
 }
 
 type PtraceIoDesc struct {
 	Op   int32
-	Offs uintptr
+	Offs *byte
 	Addr *byte
 	Len  uint32
 }
@@ -358,11 +424,8 @@ type Kevent_t struct {
 	Filter int16
 	Flags  uint16
 	Fflags uint32
-	_      [4]byte
-	Data   int64
+	Data   int32
 	Udata  *byte
-	_      [4]byte
-	Ext    [4]uint64
 }
 
 type FdSet struct {
@@ -388,7 +451,7 @@ type ifMsghdr struct {
 	Addrs   int32
 	Flags   int32
 	Index   uint16
-	_       uint16
+	_       [2]byte
 	Data    ifData
 }
 
@@ -399,6 +462,7 @@ type IfMsghdr struct {
 	Addrs   int32
 	Flags   int32
 	Index   uint16
+	_       [2]byte
 	Data    IfData
 }
 
@@ -466,7 +530,7 @@ type IfaMsghdr struct {
 	Addrs   int32
 	Flags   int32
 	Index   uint16
-	_       uint16
+	_       [2]byte
 	Metric  int32
 }
 
@@ -477,7 +541,7 @@ type IfmaMsghdr struct {
 	Addrs   int32
 	Flags   int32
 	Index   uint16
-	_       uint16
+	_       [2]byte
 }
 
 type IfAnnounceMsghdr struct {
@@ -494,7 +558,7 @@ type RtMsghdr struct {
 	Version uint8
 	Type    uint8
 	Index   uint16
-	_       uint16
+	_       [2]byte
 	Flags   int32
 	Addrs   int32
 	Pid     int32
@@ -616,7 +680,6 @@ const (
 	POLLRDNORM   = 0x40
 	POLLWRBAND   = 0x100
 	POLLWRNORM   = 0x4
-	POLLRDHUP    = 0x4000
 )
 
 type CapRights struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
index 61c7293..e232447 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && freebsd
+// +build arm64,freebsd
 
 package unix
 
@@ -30,8 +31,6 @@ type Timeval struct {
 	Usec int64
 }
 
-type Time_t int64
-
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -85,6 +84,26 @@ type Stat_t struct {
 	Spare   [10]uint64
 }
 
+type stat_freebsd11_t struct {
+	Dev     uint32
+	Ino     uint32
+	Mode    uint16
+	Nlink   uint16
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Size    int64
+	Blocks  int64
+	Blksize int32
+	Flags   uint32
+	Gen     uint32
+	Lspare  int32
+	Btim    Timespec
+}
+
 type Statfs_t struct {
 	Version     uint32
 	Type        uint32
@@ -110,6 +129,31 @@ type Statfs_t struct {
 	Mntonname   [1024]byte
 }
 
+type statfs_freebsd11_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]byte
+	Mntfromname [88]byte
+	Mntonname   [88]byte
+}
+
 type Flock_t struct {
 	Start  int64
 	Len    int64
@@ -131,6 +175,14 @@ type Dirent struct {
 	Name   [256]int8
 }
 
+type dirent_freebsd11 struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
 type Fsid struct {
 	Val [2]int32
 }
@@ -279,9 +331,39 @@ const (
 )
 
 const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
+	PTRACE_ATTACH     = 0xa
+	PTRACE_CONT       = 0x7
+	PTRACE_DETACH     = 0xb
+	PTRACE_GETFPREGS  = 0x23
+	PTRACE_GETLWPLIST = 0xf
+	PTRACE_GETNUMLWPS = 0xe
+	PTRACE_GETREGS    = 0x21
+	PTRACE_IO         = 0xc
+	PTRACE_KILL       = 0x8
+	PTRACE_LWPEVENTS  = 0x18
+	PTRACE_LWPINFO    = 0xd
+	PTRACE_SETFPREGS  = 0x24
+	PTRACE_SETREGS    = 0x22
+	PTRACE_SINGLESTEP = 0x9
+	PTRACE_TRACEME    = 0x0
+)
+
+const (
+	PIOD_READ_D  = 0x1
+	PIOD_WRITE_D = 0x2
+	PIOD_READ_I  = 0x3
+	PIOD_WRITE_I = 0x4
+)
+
+const (
+	PL_FLAG_BORN   = 0x100
+	PL_FLAG_EXITED = 0x200
+	PL_FLAG_SI     = 0x20
+)
+
+const (
+	TRAP_BRKPT = 0x1
+	TRAP_TRACE = 0x2
 )
 
 type PtraceLwpInfoStruct struct {
@@ -290,7 +372,7 @@ type PtraceLwpInfoStruct struct {
 	Flags        int32
 	Sigmask      Sigset_t
 	Siglist      Sigset_t
-	Siginfo      __PtraceSiginfo
+	Siginfo      __Siginfo
 	Tdname       [20]int8
 	Child_pid    int32
 	Syscall_code uint32
@@ -309,18 +391,6 @@ type __Siginfo struct {
 	_      [40]byte
 }
 
-type __PtraceSiginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   uintptr
-	Value  [8]byte
-	_      [40]byte
-}
-
 type Sigset_t struct {
 	Val [4]uint32
 }
@@ -341,11 +411,9 @@ type FpReg struct {
 	_  [8]byte
 }
 
-type FpExtendedPrecision struct{}
-
 type PtraceIoDesc struct {
 	Op   int32
-	Offs uintptr
+	Offs *byte
 	Addr *byte
 	Len  uint64
 }
@@ -357,7 +425,6 @@ type Kevent_t struct {
 	Fflags uint32
 	Data   int64
 	Udata  *byte
-	Ext    [4]uint64
 }
 
 type FdSet struct {
@@ -610,7 +677,6 @@ const (
 	POLLRDNORM   = 0x40
 	POLLWRBAND   = 0x100
 	POLLWRNORM   = 0x4
-	POLLRDHUP    = 0x4000
 )
 
 type CapRights struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
deleted file mode 100644
index b5d1741..0000000
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
+++ /dev/null
@@ -1,638 +0,0 @@
-// cgo -godefs -- -fsigned-char types_freebsd.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && freebsd
-
-package unix
-
-const (
-	SizeofPtr      = 0x8
-	SizeofShort    = 0x2
-	SizeofInt      = 0x4
-	SizeofLong     = 0x8
-	SizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Time_t int64
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	_statfsVersion = 0x20140518
-	_dirblksiz     = 0x400
-)
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint16
-	_0      int16
-	Uid     uint32
-	Gid     uint32
-	_1      int32
-	Rdev    uint64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Btim    Timespec
-	Size    int64
-	Blocks  int64
-	Blksize int32
-	Flags   uint32
-	Gen     uint64
-	Spare   [10]uint64
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]byte
-	Mntfromname [1024]byte
-	Mntonname   [1024]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-	Sysid  int32
-	_      [4]byte
-}
-
-type Dirent struct {
-	Fileno uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Pad0   uint8
-	Namlen uint16
-	Pad1   uint16
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	PathMax = 0x400
-)
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Xucred struct {
-	Version uint32
-	Uid     uint32
-	Ngroups int16
-	Groups  [16]uint32
-	_       *byte
-}
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofXucred           = 0x58
-	SizeofLinger           = 0x8
-	SizeofIovec            = 0x10
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type PtraceLwpInfoStruct struct {
-	Lwpid        int32
-	Event        int32
-	Flags        int32
-	Sigmask      Sigset_t
-	Siglist      Sigset_t
-	Siginfo      __PtraceSiginfo
-	Tdname       [20]int8
-	Child_pid    int32
-	Syscall_code uint32
-	Syscall_narg uint32
-}
-
-type __Siginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   *byte
-	Value  [8]byte
-	_      [40]byte
-}
-
-type __PtraceSiginfo struct {
-	Signo  int32
-	Errno  int32
-	Code   int32
-	Pid    int32
-	Uid    uint32
-	Status int32
-	Addr   uintptr
-	Value  [8]byte
-	_      [40]byte
-}
-
-type Sigset_t struct {
-	Val [4]uint32
-}
-
-type Reg struct {
-	Ra      uint64
-	Sp      uint64
-	Gp      uint64
-	Tp      uint64
-	T       [7]uint64
-	S       [12]uint64
-	A       [8]uint64
-	Sepc    uint64
-	Sstatus uint64
-}
-
-type FpReg struct {
-	X    [32][2]uint64
-	Fcsr uint64
-}
-
-type FpExtendedPrecision struct{}
-
-type PtraceIoDesc struct {
-	Op   int32
-	Offs uintptr
-	Addr *byte
-	Len  uint64
-}
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-	Ext    [4]uint64
-}
-
-type FdSet struct {
-	Bits [16]uint64
-}
-
-const (
-	sizeofIfMsghdr         = 0xa8
-	SizeofIfMsghdr         = 0xa8
-	sizeofIfData           = 0x98
-	SizeofIfData           = 0x98
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x98
-	SizeofRtMetrics        = 0x70
-)
-
-type ifMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Addrs   int32
-	Flags   int32
-	Index   uint16
-	_       uint16
-	Data    ifData
-}
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Addrs   int32
-	Flags   int32
-	Index   uint16
-	Data    IfData
-}
-
-type ifData struct {
-	Type       uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Link_state uint8
-	Vhid       uint8
-	Datalen    uint16
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Oqdrops    uint64
-	Noproto    uint64
-	Hwassist   uint64
-	_          [8]byte
-	_          [16]byte
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Addrs   int32
-	Flags   int32
-	Index   uint16
-	_       uint16
-	Metric  int32
-}
-
-type IfmaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Addrs   int32
-	Flags   int32
-	Index   uint16
-	_       uint16
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	_       uint16
-	Flags   int32
-	Addrs   int32
-	Pid     int32
-	Seq     int32
-	Errno   int32
-	Fmask   int32
-	Inits   uint64
-	Rmx     RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Expire   uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Pksent   uint64
-	Weight   uint64
-	Nhidx    uint64
-	Filler   [2]uint64
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0x18
-	SizeofBpfProgram    = 0x10
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x20
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint64
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp  Timeval
-	Caplen  uint32
-	Datalen uint32
-	Hdrlen  uint16
-	_       [6]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	_          [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_EACCESS          = 0x100
-	AT_SYMLINK_NOFOLLOW = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_REMOVEDIR        = 0x800
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLERR      = 0x8
-	POLLHUP      = 0x10
-	POLLIN       = 0x1
-	POLLINIGNEOF = 0x2000
-	POLLNVAL     = 0x20
-	POLLOUT      = 0x4
-	POLLPRI      = 0x2
-	POLLRDBAND   = 0x80
-	POLLRDNORM   = 0x40
-	POLLWRBAND   = 0x100
-	POLLWRNORM   = 0x4
-	POLLRDHUP    = 0x4000
-)
-
-type CapRights struct {
-	Rights [2]uint64
-}
-
-type Utsname struct {
-	Sysname  [256]byte
-	Nodename [256]byte
-	Release  [256]byte
-	Version  [256]byte
-	Machine  [256]byte
-}
-
-const SizeofClockinfo = 0x14
-
-type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Spare  int32
-	Stathz int32
-	Profhz int32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go
new file mode 100644
index 0000000..236f37e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go
@@ -0,0 +1,40 @@
+// cgo -godefs types_illumos.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+//go:build amd64 && illumos
+// +build amd64,illumos
+
+package unix
+
+const (
+	TUNNEWPPA = 0x540001
+	TUNSETPPA = 0x540002
+
+	I_STR     = 0x5308
+	I_POP     = 0x5303
+	I_PUSH    = 0x5302
+	I_PLINK   = 0x5316
+	I_PUNLINK = 0x5317
+
+	IF_UNITSEL = -0x7ffb8cca
+)
+
+type strbuf struct {
+	Maxlen int32
+	Len    int32
+	Buf    *int8
+}
+
+type Strioctl struct {
+	Cmd    int32
+	Timout int32
+	Len    int32
+	Dp     *int8
+}
+
+type Lifreq struct {
+	Name   [32]int8
+	Lifru1 [4]byte
+	Type   uint32
+	Lifru  [336]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index a46abe6..4b73bb3 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -1,6 +1,7 @@
-// Code generated by mkmerge; DO NOT EDIT.
+// Code generated by mkmerge.go; DO NOT EDIT.
 
 //go:build linux
+// +build linux
 
 package unix
 
@@ -23,46 +24,6 @@ type ItimerSpec struct {
 	Value    Timespec
 }
 
-type Itimerval struct {
-	Interval Timeval
-	Value    Timeval
-}
-
-const (
-	ADJ_OFFSET            = 0x1
-	ADJ_FREQUENCY         = 0x2
-	ADJ_MAXERROR          = 0x4
-	ADJ_ESTERROR          = 0x8
-	ADJ_STATUS            = 0x10
-	ADJ_TIMECONST         = 0x20
-	ADJ_TAI               = 0x80
-	ADJ_SETOFFSET         = 0x100
-	ADJ_MICRO             = 0x1000
-	ADJ_NANO              = 0x2000
-	ADJ_TICK              = 0x4000
-	ADJ_OFFSET_SINGLESHOT = 0x8001
-	ADJ_OFFSET_SS_READ    = 0xa001
-)
-
-const (
-	STA_PLL       = 0x1
-	STA_PPSFREQ   = 0x2
-	STA_PPSTIME   = 0x4
-	STA_FLL       = 0x8
-	STA_INS       = 0x10
-	STA_DEL       = 0x20
-	STA_UNSYNC    = 0x40
-	STA_FREQHOLD  = 0x80
-	STA_PPSSIGNAL = 0x100
-	STA_PPSJITTER = 0x200
-	STA_PPSWANDER = 0x400
-	STA_PPSERROR  = 0x800
-	STA_CLOCKERR  = 0x1000
-	STA_NANO      = 0x2000
-	STA_MODE      = 0x4000
-	STA_CLK       = 0x8000
-)
-
 const (
 	TIME_OK    = 0x0
 	TIME_INS   = 0x1
@@ -87,35 +48,29 @@ type StatxTimestamp struct {
 }
 
 type Statx_t struct {
-	Mask                      uint32
-	Blksize                   uint32
-	Attributes                uint64
-	Nlink                     uint32
-	Uid                       uint32
-	Gid                       uint32
-	Mode                      uint16
-	_                         [1]uint16
-	Ino                       uint64
-	Size                      uint64
-	Blocks                    uint64
-	Attributes_mask           uint64
-	Atime                     StatxTimestamp
-	Btime                     StatxTimestamp
-	Ctime                     StatxTimestamp
-	Mtime                     StatxTimestamp
-	Rdev_major                uint32
-	Rdev_minor                uint32
-	Dev_major                 uint32
-	Dev_minor                 uint32
-	Mnt_id                    uint64
-	Dio_mem_align             uint32
-	Dio_offset_align          uint32
-	Subvol                    uint64
-	Atomic_write_unit_min     uint32
-	Atomic_write_unit_max     uint32
-	Atomic_write_segments_max uint32
-	_                         [1]uint32
-	_                         [9]uint64
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	Mnt_id          uint64
+	_               uint64
+	_               [12]uint64
 }
 
 type Fsid struct {
@@ -179,8 +134,7 @@ type FscryptPolicyV2 struct {
 	Contents_encryption_mode  uint8
 	Filenames_encryption_mode uint8
 	Flags                     uint8
-	Log2_data_unit_size       uint8
-	_                         [3]uint8
+	_                         [4]uint8
 	Master_key_identifier     [16]uint8
 }
 
@@ -461,86 +415,36 @@ type Ucred struct {
 }
 
 type TCPInfo struct {
-	State                uint8
-	Ca_state             uint8
-	Retransmits          uint8
-	Probes               uint8
-	Backoff              uint8
-	Options              uint8
-	Rto                  uint32
-	Ato                  uint32
-	Snd_mss              uint32
-	Rcv_mss              uint32
-	Unacked              uint32
-	Sacked               uint32
-	Lost                 uint32
-	Retrans              uint32
-	Fackets              uint32
-	Last_data_sent       uint32
-	Last_ack_sent        uint32
-	Last_data_recv       uint32
-	Last_ack_recv        uint32
-	Pmtu                 uint32
-	Rcv_ssthresh         uint32
-	Rtt                  uint32
-	Rttvar               uint32
-	Snd_ssthresh         uint32
-	Snd_cwnd             uint32
-	Advmss               uint32
-	Reordering           uint32
-	Rcv_rtt              uint32
-	Rcv_space            uint32
-	Total_retrans        uint32
-	Pacing_rate          uint64
-	Max_pacing_rate      uint64
-	Bytes_acked          uint64
-	Bytes_received       uint64
-	Segs_out             uint32
-	Segs_in              uint32
-	Notsent_bytes        uint32
-	Min_rtt              uint32
-	Data_segs_in         uint32
-	Data_segs_out        uint32
-	Delivery_rate        uint64
-	Busy_time            uint64
-	Rwnd_limited         uint64
-	Sndbuf_limited       uint64
-	Delivered            uint32
-	Delivered_ce         uint32
-	Bytes_sent           uint64
-	Bytes_retrans        uint64
-	Dsack_dups           uint32
-	Reord_seen           uint32
-	Rcv_ooopack          uint32
-	Snd_wnd              uint32
-	Rcv_wnd              uint32
-	Rehash               uint32
-	Total_rto            uint16
-	Total_rto_recoveries uint16
-	Total_rto_time       uint32
-}
-
-type TCPVegasInfo struct {
-	Enabled uint32
-	Rttcnt  uint32
-	Rtt     uint32
-	Minrtt  uint32
-}
-
-type TCPDCTCPInfo struct {
-	Enabled  uint16
-	Ce_state uint16
-	Alpha    uint32
-	Ab_ecn   uint32
-	Ab_tot   uint32
-}
-
-type TCPBBRInfo struct {
-	Bw_lo       uint32
-	Bw_hi       uint32
-	Min_rtt     uint32
-	Pacing_gain uint32
-	Cwnd_gain   uint32
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
 }
 
 type CanFilter struct {
@@ -583,8 +487,7 @@ const (
 	SizeofIPv6MTUInfo       = 0x20
 	SizeofICMPv6Filter      = 0x20
 	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0xf8
-	SizeofTCPCCInfo         = 0x14
+	SizeofTCPInfo           = 0x68
 	SizeofCanFilter         = 0x8
 	SizeofTCPRepairOpt      = 0x8
 )
@@ -840,40 +743,10 @@ const (
 	AT_STATX_FORCE_SYNC   = 0x2000
 	AT_STATX_DONT_SYNC    = 0x4000
 
-	AT_RECURSIVE = 0x8000
-
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 
 	AT_EACCESS = 0x200
-
-	OPEN_TREE_CLONE = 0x1
-
-	MOVE_MOUNT_F_SYMLINKS   = 0x1
-	MOVE_MOUNT_F_AUTOMOUNTS = 0x2
-	MOVE_MOUNT_F_EMPTY_PATH = 0x4
-	MOVE_MOUNT_T_SYMLINKS   = 0x10
-	MOVE_MOUNT_T_AUTOMOUNTS = 0x20
-	MOVE_MOUNT_T_EMPTY_PATH = 0x40
-	MOVE_MOUNT_SET_GROUP    = 0x100
-
-	FSOPEN_CLOEXEC = 0x1
-
-	FSPICK_CLOEXEC          = 0x1
-	FSPICK_SYMLINK_NOFOLLOW = 0x2
-	FSPICK_NO_AUTOMOUNT     = 0x4
-	FSPICK_EMPTY_PATH       = 0x8
-
-	FSMOUNT_CLOEXEC = 0x1
-
-	FSCONFIG_SET_FLAG        = 0x0
-	FSCONFIG_SET_STRING      = 0x1
-	FSCONFIG_SET_BINARY      = 0x2
-	FSCONFIG_SET_PATH        = 0x3
-	FSCONFIG_SET_PATH_EMPTY  = 0x4
-	FSCONFIG_SET_FD          = 0x5
-	FSCONFIG_CMD_CREATE      = 0x6
-	FSCONFIG_CMD_RECONFIGURE = 0x7
 )
 
 type OpenHow struct {
@@ -907,11 +780,6 @@ const (
 	POLLNVAL = 0x20
 )
 
-type sigset_argpack struct {
-	ss    *Sigset_t
-	ssLen uintptr
-}
-
 type SignalfdSiginfo struct {
 	Signo     uint32
 	Errno     int32
@@ -997,7 +865,6 @@ const (
 	CTRL_CMD_NEWMCAST_GRP      = 0x7
 	CTRL_CMD_DELMCAST_GRP      = 0x8
 	CTRL_CMD_GETMCAST_GRP      = 0x9
-	CTRL_CMD_GETPOLICY         = 0xa
 	CTRL_ATTR_UNSPEC           = 0x0
 	CTRL_ATTR_FAMILY_ID        = 0x1
 	CTRL_ATTR_FAMILY_NAME      = 0x2
@@ -1006,19 +873,12 @@ const (
 	CTRL_ATTR_MAXATTR          = 0x5
 	CTRL_ATTR_OPS              = 0x6
 	CTRL_ATTR_MCAST_GROUPS     = 0x7
-	CTRL_ATTR_POLICY           = 0x8
-	CTRL_ATTR_OP_POLICY        = 0x9
-	CTRL_ATTR_OP               = 0xa
 	CTRL_ATTR_OP_UNSPEC        = 0x0
 	CTRL_ATTR_OP_ID            = 0x1
 	CTRL_ATTR_OP_FLAGS         = 0x2
 	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
 	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
 	CTRL_ATTR_MCAST_GRP_ID     = 0x2
-	CTRL_ATTR_POLICY_UNSPEC    = 0x0
-	CTRL_ATTR_POLICY_DO        = 0x1
-	CTRL_ATTR_POLICY_DUMP      = 0x2
-	CTRL_ATTR_POLICY_DUMP_MAX  = 0x2
 )
 
 const (
@@ -1051,9 +911,6 @@ type PerfEventAttr struct {
 	Aux_watermark      uint32
 	Sample_max_stack   uint16
 	_                  uint16
-	Aux_sample_size    uint32
-	_                  uint32
-	Sig_data           uint64
 }
 
 type PerfEventMmapPage struct {
@@ -1113,7 +970,6 @@ const (
 	PerfBitCommExec                      = CBitFieldMaskBit24
 	PerfBitUseClockID                    = CBitFieldMaskBit25
 	PerfBitContextSwitch                 = CBitFieldMaskBit26
-	PerfBitWriteBackward                 = CBitFieldMaskBit27
 )
 
 const (
@@ -1206,9 +1062,7 @@ const (
 	PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT    = 0xf
 	PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT    = 0x10
 	PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT     = 0x11
-	PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT    = 0x12
-	PERF_SAMPLE_BRANCH_COUNTERS           = 0x80000
-	PERF_SAMPLE_BRANCH_MAX_SHIFT          = 0x14
+	PERF_SAMPLE_BRANCH_MAX_SHIFT          = 0x12
 	PERF_SAMPLE_BRANCH_USER               = 0x1
 	PERF_SAMPLE_BRANCH_KERNEL             = 0x2
 	PERF_SAMPLE_BRANCH_HV                 = 0x4
@@ -1227,8 +1081,7 @@ const (
 	PERF_SAMPLE_BRANCH_NO_CYCLES          = 0x8000
 	PERF_SAMPLE_BRANCH_TYPE_SAVE          = 0x10000
 	PERF_SAMPLE_BRANCH_HW_INDEX           = 0x20000
-	PERF_SAMPLE_BRANCH_PRIV_SAVE          = 0x40000
-	PERF_SAMPLE_BRANCH_MAX                = 0x100000
+	PERF_SAMPLE_BRANCH_MAX                = 0x40000
 	PERF_BR_UNKNOWN                       = 0x0
 	PERF_BR_COND                          = 0x1
 	PERF_BR_UNCOND                        = 0x2
@@ -1240,12 +1093,7 @@ const (
 	PERF_BR_SYSRET                        = 0x8
 	PERF_BR_COND_CALL                     = 0x9
 	PERF_BR_COND_RET                      = 0xa
-	PERF_BR_ERET                          = 0xb
-	PERF_BR_IRQ                           = 0xc
-	PERF_BR_SERROR                        = 0xd
-	PERF_BR_NO_TX                         = 0xe
-	PERF_BR_EXTEND_ABI                    = 0xf
-	PERF_BR_MAX                           = 0x10
+	PERF_BR_MAX                           = 0xb
 	PERF_SAMPLE_REGS_ABI_NONE             = 0x0
 	PERF_SAMPLE_REGS_ABI_32               = 0x1
 	PERF_SAMPLE_REGS_ABI_64               = 0x2
@@ -1264,8 +1112,7 @@ const (
 	PERF_FORMAT_TOTAL_TIME_RUNNING        = 0x2
 	PERF_FORMAT_ID                        = 0x4
 	PERF_FORMAT_GROUP                     = 0x8
-	PERF_FORMAT_LOST                      = 0x10
-	PERF_FORMAT_MAX                       = 0x20
+	PERF_FORMAT_MAX                       = 0x10
 	PERF_IOC_FLAG_GROUP                   = 0x1
 	PERF_RECORD_MMAP                      = 0x1
 	PERF_RECORD_LOST                      = 0x2
@@ -1287,8 +1134,7 @@ const (
 	PERF_RECORD_BPF_EVENT                 = 0x12
 	PERF_RECORD_CGROUP                    = 0x13
 	PERF_RECORD_TEXT_POKE                 = 0x14
-	PERF_RECORD_AUX_OUTPUT_HW_ID          = 0x15
-	PERF_RECORD_MAX                       = 0x16
+	PERF_RECORD_MAX                       = 0x15
 	PERF_RECORD_KSYMBOL_TYPE_UNKNOWN      = 0x0
 	PERF_RECORD_KSYMBOL_TYPE_BPF          = 0x1
 	PERF_RECORD_KSYMBOL_TYPE_OOL          = 0x2
@@ -1311,7 +1157,7 @@ type TCPMD5Sig struct {
 	Flags     uint8
 	Prefixlen uint8
 	Keylen    uint16
-	Ifindex   int32
+	_         uint32
 	Key       [80]uint8
 }
 
@@ -1580,16 +1426,6 @@ const (
 	IFLA_ALT_IFNAME                            = 0x35
 	IFLA_PERM_ADDRESS                          = 0x36
 	IFLA_PROTO_DOWN_REASON                     = 0x37
-	IFLA_PARENT_DEV_NAME                       = 0x38
-	IFLA_PARENT_DEV_BUS_NAME                   = 0x39
-	IFLA_GRO_MAX_SIZE                          = 0x3a
-	IFLA_TSO_MAX_SIZE                          = 0x3b
-	IFLA_TSO_MAX_SEGS                          = 0x3c
-	IFLA_ALLMULTI                              = 0x3d
-	IFLA_DEVLINK_PORT                          = 0x3e
-	IFLA_GSO_IPV4_MAX_SIZE                     = 0x3f
-	IFLA_GRO_IPV4_MAX_SIZE                     = 0x40
-	IFLA_DPLL_PIN                              = 0x41
 	IFLA_PROTO_DOWN_REASON_UNSPEC              = 0x0
 	IFLA_PROTO_DOWN_REASON_MASK                = 0x1
 	IFLA_PROTO_DOWN_REASON_VALUE               = 0x2
@@ -1605,7 +1441,6 @@ const (
 	IFLA_INET6_ICMP6STATS                      = 0x6
 	IFLA_INET6_TOKEN                           = 0x7
 	IFLA_INET6_ADDR_GEN_MODE                   = 0x8
-	IFLA_INET6_RA_MTU                          = 0x9
 	IFLA_BR_UNSPEC                             = 0x0
 	IFLA_BR_FORWARD_DELAY                      = 0x1
 	IFLA_BR_HELLO_TIME                         = 0x2
@@ -1653,9 +1488,6 @@ const (
 	IFLA_BR_MCAST_MLD_VERSION                  = 0x2c
 	IFLA_BR_VLAN_STATS_PER_PORT                = 0x2d
 	IFLA_BR_MULTI_BOOLOPT                      = 0x2e
-	IFLA_BR_MCAST_QUERIER_STATE                = 0x2f
-	IFLA_BR_FDB_N_LEARNED                      = 0x30
-	IFLA_BR_FDB_MAX_LEARNED                    = 0x31
 	IFLA_BRPORT_UNSPEC                         = 0x0
 	IFLA_BRPORT_STATE                          = 0x1
 	IFLA_BRPORT_PRIORITY                       = 0x2
@@ -1693,14 +1525,6 @@ const (
 	IFLA_BRPORT_BACKUP_PORT                    = 0x22
 	IFLA_BRPORT_MRP_RING_OPEN                  = 0x23
 	IFLA_BRPORT_MRP_IN_OPEN                    = 0x24
-	IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT          = 0x25
-	IFLA_BRPORT_MCAST_EHT_HOSTS_CNT            = 0x26
-	IFLA_BRPORT_LOCKED                         = 0x27
-	IFLA_BRPORT_MAB                            = 0x28
-	IFLA_BRPORT_MCAST_N_GROUPS                 = 0x29
-	IFLA_BRPORT_MCAST_MAX_GROUPS               = 0x2a
-	IFLA_BRPORT_NEIGH_VLAN_SUPPRESS            = 0x2b
-	IFLA_BRPORT_BACKUP_NHID                    = 0x2c
 	IFLA_INFO_UNSPEC                           = 0x0
 	IFLA_INFO_KIND                             = 0x1
 	IFLA_INFO_DATA                             = 0x2
@@ -1722,9 +1546,6 @@ const (
 	IFLA_MACVLAN_MACADDR                       = 0x4
 	IFLA_MACVLAN_MACADDR_DATA                  = 0x5
 	IFLA_MACVLAN_MACADDR_COUNT                 = 0x6
-	IFLA_MACVLAN_BC_QUEUE_LEN                  = 0x7
-	IFLA_MACVLAN_BC_QUEUE_LEN_USED             = 0x8
-	IFLA_MACVLAN_BC_CUTOFF                     = 0x9
 	IFLA_VRF_UNSPEC                            = 0x0
 	IFLA_VRF_TABLE                             = 0x1
 	IFLA_VRF_PORT_UNSPEC                       = 0x0
@@ -1748,16 +1569,9 @@ const (
 	IFLA_XFRM_UNSPEC                           = 0x0
 	IFLA_XFRM_LINK                             = 0x1
 	IFLA_XFRM_IF_ID                            = 0x2
-	IFLA_XFRM_COLLECT_METADATA                 = 0x3
 	IFLA_IPVLAN_UNSPEC                         = 0x0
 	IFLA_IPVLAN_MODE                           = 0x1
 	IFLA_IPVLAN_FLAGS                          = 0x2
-	IFLA_NETKIT_UNSPEC                         = 0x0
-	IFLA_NETKIT_PEER_INFO                      = 0x1
-	IFLA_NETKIT_PRIMARY                        = 0x2
-	IFLA_NETKIT_POLICY                         = 0x3
-	IFLA_NETKIT_PEER_POLICY                    = 0x4
-	IFLA_NETKIT_MODE                           = 0x5
 	IFLA_VXLAN_UNSPEC                          = 0x0
 	IFLA_VXLAN_ID                              = 0x1
 	IFLA_VXLAN_GROUP                           = 0x2
@@ -1788,9 +1602,6 @@ const (
 	IFLA_VXLAN_GPE                             = 0x1b
 	IFLA_VXLAN_TTL_INHERIT                     = 0x1c
 	IFLA_VXLAN_DF                              = 0x1d
-	IFLA_VXLAN_VNIFILTER                       = 0x1e
-	IFLA_VXLAN_LOCALBYPASS                     = 0x1f
-	IFLA_VXLAN_LABEL_POLICY                    = 0x20
 	IFLA_GENEVE_UNSPEC                         = 0x0
 	IFLA_GENEVE_ID                             = 0x1
 	IFLA_GENEVE_REMOTE                         = 0x2
@@ -1805,7 +1616,6 @@ const (
 	IFLA_GENEVE_LABEL                          = 0xb
 	IFLA_GENEVE_TTL_INHERIT                    = 0xc
 	IFLA_GENEVE_DF                             = 0xd
-	IFLA_GENEVE_INNER_PROTO_INHERIT            = 0xe
 	IFLA_BAREUDP_UNSPEC                        = 0x0
 	IFLA_BAREUDP_PORT                          = 0x1
 	IFLA_BAREUDP_ETHERTYPE                     = 0x2
@@ -1818,10 +1628,6 @@ const (
 	IFLA_GTP_FD1                               = 0x2
 	IFLA_GTP_PDP_HASHSIZE                      = 0x3
 	IFLA_GTP_ROLE                              = 0x4
-	IFLA_GTP_CREATE_SOCKETS                    = 0x5
-	IFLA_GTP_RESTART_COUNT                     = 0x6
-	IFLA_GTP_LOCAL                             = 0x7
-	IFLA_GTP_LOCAL6                            = 0x8
 	IFLA_BOND_UNSPEC                           = 0x0
 	IFLA_BOND_MODE                             = 0x1
 	IFLA_BOND_ACTIVE_SLAVE                     = 0x2
@@ -1851,10 +1657,6 @@ const (
 	IFLA_BOND_AD_ACTOR_SYSTEM                  = 0x1a
 	IFLA_BOND_TLB_DYNAMIC_LB                   = 0x1b
 	IFLA_BOND_PEER_NOTIF_DELAY                 = 0x1c
-	IFLA_BOND_AD_LACP_ACTIVE                   = 0x1d
-	IFLA_BOND_MISSED_MAX                       = 0x1e
-	IFLA_BOND_NS_IP6_TARGET                    = 0x1f
-	IFLA_BOND_COUPLED_CONTROL                  = 0x20
 	IFLA_BOND_AD_INFO_UNSPEC                   = 0x0
 	IFLA_BOND_AD_INFO_AGGREGATOR               = 0x1
 	IFLA_BOND_AD_INFO_NUM_PORTS                = 0x2
@@ -1870,7 +1672,6 @@ const (
 	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID           = 0x6
 	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE   = 0x7
 	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE = 0x8
-	IFLA_BOND_SLAVE_PRIO                       = 0x9
 	IFLA_VF_INFO_UNSPEC                        = 0x0
 	IFLA_VF_INFO                               = 0x1
 	IFLA_VF_UNSPEC                             = 0x0
@@ -1923,23 +1724,14 @@ const (
 	IFLA_HSR_SEQ_NR                            = 0x5
 	IFLA_HSR_VERSION                           = 0x6
 	IFLA_HSR_PROTOCOL                          = 0x7
-	IFLA_HSR_INTERLINK                         = 0x8
 	IFLA_STATS_UNSPEC                          = 0x0
 	IFLA_STATS_LINK_64                         = 0x1
 	IFLA_STATS_LINK_XSTATS                     = 0x2
 	IFLA_STATS_LINK_XSTATS_SLAVE               = 0x3
 	IFLA_STATS_LINK_OFFLOAD_XSTATS             = 0x4
 	IFLA_STATS_AF_SPEC                         = 0x5
-	IFLA_STATS_GETSET_UNSPEC                   = 0x0
-	IFLA_STATS_GET_FILTERS                     = 0x1
-	IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS     = 0x2
 	IFLA_OFFLOAD_XSTATS_UNSPEC                 = 0x0
 	IFLA_OFFLOAD_XSTATS_CPU_HIT                = 0x1
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO              = 0x2
-	IFLA_OFFLOAD_XSTATS_L3_STATS               = 0x3
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_UNSPEC       = 0x0
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST      = 0x1
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED         = 0x2
 	IFLA_XDP_UNSPEC                            = 0x0
 	IFLA_XDP_FD                                = 0x1
 	IFLA_XDP_ATTACHED                          = 0x2
@@ -1969,20 +1761,6 @@ const (
 	IFLA_RMNET_UNSPEC                          = 0x0
 	IFLA_RMNET_MUX_ID                          = 0x1
 	IFLA_RMNET_FLAGS                           = 0x2
-	IFLA_MCTP_UNSPEC                           = 0x0
-	IFLA_MCTP_NET                              = 0x1
-	IFLA_DSA_UNSPEC                            = 0x0
-	IFLA_DSA_CONDUIT                           = 0x1
-	IFLA_DSA_MASTER                            = 0x1
-)
-
-const (
-	NETKIT_NEXT     = -0x1
-	NETKIT_PASS     = 0x0
-	NETKIT_DROP     = 0x2
-	NETKIT_REDIRECT = 0x7
-	NETKIT_L2       = 0x0
-	NETKIT_L3       = 0x1
 )
 
 const (
@@ -1996,8 +1774,7 @@ const (
 
 const (
 	NF_NETDEV_INGRESS  = 0x0
-	NF_NETDEV_EGRESS   = 0x1
-	NF_NETDEV_NUMHOOKS = 0x2
+	NF_NETDEV_NUMHOOKS = 0x1
 )
 
 const (
@@ -2074,11 +1851,7 @@ const (
 	NFT_MSG_GETOBJ                    = 0x13
 	NFT_MSG_DELOBJ                    = 0x14
 	NFT_MSG_GETOBJ_RESET              = 0x15
-	NFT_MSG_NEWFLOWTABLE              = 0x16
-	NFT_MSG_GETFLOWTABLE              = 0x17
-	NFT_MSG_DELFLOWTABLE              = 0x18
-	NFT_MSG_GETRULE_RESET             = 0x19
-	NFT_MSG_MAX                       = 0x22
+	NFT_MSG_MAX                       = 0x19
 	NFTA_LIST_UNSPEC                  = 0x0
 	NFTA_LIST_ELEM                    = 0x1
 	NFTA_HOOK_UNSPEC                  = 0x0
@@ -2519,15 +2292,6 @@ type XDPMmapOffsets struct {
 	Cr XDPRingOffset
 }
 
-type XDPUmemReg struct {
-	Addr            uint64
-	Len             uint64
-	Size            uint32
-	Headroom        uint32
-	Flags           uint32
-	Tx_metadata_len uint32
-}
-
 type XDPStatistics struct {
 	Rx_dropped               uint64
 	Rx_invalid_descs         uint64
@@ -2591,11 +2355,9 @@ const (
 	SOF_TIMESTAMPING_OPT_STATS    = 0x1000
 	SOF_TIMESTAMPING_OPT_PKTINFO  = 0x2000
 	SOF_TIMESTAMPING_OPT_TX_SWHW  = 0x4000
-	SOF_TIMESTAMPING_BIND_PHC     = 0x8000
-	SOF_TIMESTAMPING_OPT_ID_TCP   = 0x10000
 
-	SOF_TIMESTAMPING_LAST = 0x20000
-	SOF_TIMESTAMPING_MASK = 0x3ffff
+	SOF_TIMESTAMPING_LAST = 0x8000
+	SOF_TIMESTAMPING_MASK = 0xffff
 
 	SCM_TSTAMP_SND   = 0x0
 	SCM_TSTAMP_SCHED = 0x1
@@ -2674,11 +2436,6 @@ const (
 	BPF_REG_8                                  = 0x8
 	BPF_REG_9                                  = 0x9
 	BPF_REG_10                                 = 0xa
-	BPF_CGROUP_ITER_ORDER_UNSPEC               = 0x0
-	BPF_CGROUP_ITER_SELF_ONLY                  = 0x1
-	BPF_CGROUP_ITER_DESCENDANTS_PRE            = 0x2
-	BPF_CGROUP_ITER_DESCENDANTS_POST           = 0x3
-	BPF_CGROUP_ITER_ANCESTORS_UP               = 0x4
 	BPF_MAP_CREATE                             = 0x0
 	BPF_MAP_LOOKUP_ELEM                        = 0x1
 	BPF_MAP_UPDATE_ELEM                        = 0x2
@@ -2690,7 +2447,6 @@ const (
 	BPF_PROG_ATTACH                            = 0x8
 	BPF_PROG_DETACH                            = 0x9
 	BPF_PROG_TEST_RUN                          = 0xa
-	BPF_PROG_RUN                               = 0xa
 	BPF_PROG_GET_NEXT_ID                       = 0xb
 	BPF_MAP_GET_NEXT_ID                        = 0xc
 	BPF_PROG_GET_FD_BY_ID                      = 0xd
@@ -2735,7 +2491,6 @@ const (
 	BPF_MAP_TYPE_CPUMAP                        = 0x10
 	BPF_MAP_TYPE_XSKMAP                        = 0x11
 	BPF_MAP_TYPE_SOCKHASH                      = 0x12
-	BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED     = 0x13
 	BPF_MAP_TYPE_CGROUP_STORAGE                = 0x13
 	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY           = 0x14
 	BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE         = 0x15
@@ -2746,10 +2501,6 @@ const (
 	BPF_MAP_TYPE_STRUCT_OPS                    = 0x1a
 	BPF_MAP_TYPE_RINGBUF                       = 0x1b
 	BPF_MAP_TYPE_INODE_STORAGE                 = 0x1c
-	BPF_MAP_TYPE_TASK_STORAGE                  = 0x1d
-	BPF_MAP_TYPE_BLOOM_FILTER                  = 0x1e
-	BPF_MAP_TYPE_USER_RINGBUF                  = 0x1f
-	BPF_MAP_TYPE_CGRP_STORAGE                  = 0x20
 	BPF_PROG_TYPE_UNSPEC                       = 0x0
 	BPF_PROG_TYPE_SOCKET_FILTER                = 0x1
 	BPF_PROG_TYPE_KPROBE                       = 0x2
@@ -2781,8 +2532,6 @@ const (
 	BPF_PROG_TYPE_EXT                          = 0x1c
 	BPF_PROG_TYPE_LSM                          = 0x1d
 	BPF_PROG_TYPE_SK_LOOKUP                    = 0x1e
-	BPF_PROG_TYPE_SYSCALL                      = 0x1f
-	BPF_PROG_TYPE_NETFILTER                    = 0x20
 	BPF_CGROUP_INET_INGRESS                    = 0x0
 	BPF_CGROUP_INET_EGRESS                     = 0x1
 	BPF_CGROUP_INET_SOCK_CREATE                = 0x2
@@ -2821,17 +2570,6 @@ const (
 	BPF_XDP_CPUMAP                             = 0x23
 	BPF_SK_LOOKUP                              = 0x24
 	BPF_XDP                                    = 0x25
-	BPF_SK_SKB_VERDICT                         = 0x26
-	BPF_SK_REUSEPORT_SELECT                    = 0x27
-	BPF_SK_REUSEPORT_SELECT_OR_MIGRATE         = 0x28
-	BPF_PERF_EVENT                             = 0x29
-	BPF_TRACE_KPROBE_MULTI                     = 0x2a
-	BPF_LSM_CGROUP                             = 0x2b
-	BPF_STRUCT_OPS                             = 0x2c
-	BPF_NETFILTER                              = 0x2d
-	BPF_TCX_INGRESS                            = 0x2e
-	BPF_TCX_EGRESS                             = 0x2f
-	BPF_TRACE_UPROBE_MULTI                     = 0x30
 	BPF_LINK_TYPE_UNSPEC                       = 0x0
 	BPF_LINK_TYPE_RAW_TRACEPOINT               = 0x1
 	BPF_LINK_TYPE_TRACING                      = 0x2
@@ -2839,21 +2577,6 @@ const (
 	BPF_LINK_TYPE_ITER                         = 0x4
 	BPF_LINK_TYPE_NETNS                        = 0x5
 	BPF_LINK_TYPE_XDP                          = 0x6
-	BPF_LINK_TYPE_PERF_EVENT                   = 0x7
-	BPF_LINK_TYPE_KPROBE_MULTI                 = 0x8
-	BPF_LINK_TYPE_STRUCT_OPS                   = 0x9
-	BPF_LINK_TYPE_NETFILTER                    = 0xa
-	BPF_LINK_TYPE_TCX                          = 0xb
-	BPF_LINK_TYPE_UPROBE_MULTI                 = 0xc
-	BPF_PERF_EVENT_UNSPEC                      = 0x0
-	BPF_PERF_EVENT_UPROBE                      = 0x1
-	BPF_PERF_EVENT_URETPROBE                   = 0x2
-	BPF_PERF_EVENT_KPROBE                      = 0x3
-	BPF_PERF_EVENT_KRETPROBE                   = 0x4
-	BPF_PERF_EVENT_TRACEPOINT                  = 0x5
-	BPF_PERF_EVENT_EVENT                       = 0x6
-	BPF_F_KPROBE_MULTI_RETURN                  = 0x1
-	BPF_F_UPROBE_MULTI_RETURN                  = 0x1
 	BPF_ANY                                    = 0x0
 	BPF_NOEXIST                                = 0x1
 	BPF_EXIST                                  = 0x2
@@ -2871,8 +2594,6 @@ const (
 	BPF_F_MMAPABLE                             = 0x400
 	BPF_F_PRESERVE_ELEMS                       = 0x800
 	BPF_F_INNER_MAP                            = 0x1000
-	BPF_F_LINK                                 = 0x2000
-	BPF_F_PATH_FD                              = 0x4000
 	BPF_STATS_RUN_TIME                         = 0x0
 	BPF_STACK_BUILD_ID_EMPTY                   = 0x0
 	BPF_STACK_BUILD_ID_VALID                   = 0x1
@@ -2893,8 +2614,6 @@ const (
 	BPF_F_ZERO_CSUM_TX                         = 0x2
 	BPF_F_DONT_FRAGMENT                        = 0x4
 	BPF_F_SEQ_NUMBER                           = 0x8
-	BPF_F_NO_TUNNEL_KEY                        = 0x10
-	BPF_F_TUNINFO_FLAGS                        = 0x10
 	BPF_F_INDEX_MASK                           = 0xffffffff
 	BPF_F_CURRENT_CPU                          = 0xffffffff
 	BPF_F_CTXLEN_MASK                          = 0xfffff00000000
@@ -2909,9 +2628,6 @@ const (
 	BPF_F_ADJ_ROOM_ENCAP_L4_GRE                = 0x8
 	BPF_F_ADJ_ROOM_ENCAP_L4_UDP                = 0x10
 	BPF_F_ADJ_ROOM_NO_CSUM_RESET               = 0x20
-	BPF_F_ADJ_ROOM_ENCAP_L2_ETH                = 0x40
-	BPF_F_ADJ_ROOM_DECAP_L3_IPV4               = 0x80
-	BPF_F_ADJ_ROOM_DECAP_L3_IPV6               = 0x100
 	BPF_ADJ_ROOM_ENCAP_L2_MASK                 = 0xff
 	BPF_ADJ_ROOM_ENCAP_L2_SHIFT                = 0x38
 	BPF_F_SYSCTL_BASE_NAME                     = 0x1
@@ -2936,16 +2652,10 @@ const (
 	BPF_LWT_ENCAP_SEG6                         = 0x0
 	BPF_LWT_ENCAP_SEG6_INLINE                  = 0x1
 	BPF_LWT_ENCAP_IP                           = 0x2
-	BPF_F_BPRM_SECUREEXEC                      = 0x1
-	BPF_F_BROADCAST                            = 0x8
-	BPF_F_EXCLUDE_INGRESS                      = 0x10
-	BPF_SKB_TSTAMP_UNSPEC                      = 0x0
-	BPF_SKB_TSTAMP_DELIVERY_MONO               = 0x1
 	BPF_OK                                     = 0x0
 	BPF_DROP                                   = 0x2
 	BPF_REDIRECT                               = 0x7
 	BPF_LWT_REROUTE                            = 0x80
-	BPF_FLOW_DISSECTOR_CONTINUE                = 0x81
 	BPF_SOCK_OPS_RTO_CB_FLAG                   = 0x1
 	BPF_SOCK_OPS_RETRANS_CB_FLAG               = 0x2
 	BPF_SOCK_OPS_STATE_CB_FLAG                 = 0x4
@@ -2982,7 +2692,7 @@ const (
 	BPF_TCP_LISTEN                             = 0xa
 	BPF_TCP_CLOSING                            = 0xb
 	BPF_TCP_NEW_SYN_RECV                       = 0xc
-	BPF_TCP_MAX_STATES                         = 0xe
+	BPF_TCP_MAX_STATES                         = 0xd
 	TCP_BPF_IW                                 = 0x3e9
 	TCP_BPF_SNDCWND_CLAMP                      = 0x3ea
 	TCP_BPF_DELACK_MAX                         = 0x3eb
@@ -3000,8 +2710,6 @@ const (
 	BPF_DEVCG_DEV_CHAR                         = 0x2
 	BPF_FIB_LOOKUP_DIRECT                      = 0x1
 	BPF_FIB_LOOKUP_OUTPUT                      = 0x2
-	BPF_FIB_LOOKUP_SKIP_NEIGH                  = 0x4
-	BPF_FIB_LOOKUP_TBID                        = 0x8
 	BPF_FIB_LKUP_RET_SUCCESS                   = 0x0
 	BPF_FIB_LKUP_RET_BLACKHOLE                 = 0x1
 	BPF_FIB_LKUP_RET_UNREACHABLE               = 0x2
@@ -3011,10 +2719,6 @@ const (
 	BPF_FIB_LKUP_RET_UNSUPP_LWT                = 0x6
 	BPF_FIB_LKUP_RET_NO_NEIGH                  = 0x7
 	BPF_FIB_LKUP_RET_FRAG_NEEDED               = 0x8
-	BPF_MTU_CHK_SEGS                           = 0x1
-	BPF_MTU_CHK_RET_SUCCESS                    = 0x0
-	BPF_MTU_CHK_RET_FRAG_NEEDED                = 0x1
-	BPF_MTU_CHK_RET_SEGS_TOOBIG                = 0x2
 	BPF_FD_TYPE_RAW_TRACEPOINT                 = 0x0
 	BPF_FD_TYPE_TRACEPOINT                     = 0x1
 	BPF_FD_TYPE_KPROBE                         = 0x2
@@ -3024,20 +2728,6 @@ const (
 	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG        = 0x1
 	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL    = 0x2
 	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP         = 0x4
-	BPF_CORE_FIELD_BYTE_OFFSET                 = 0x0
-	BPF_CORE_FIELD_BYTE_SIZE                   = 0x1
-	BPF_CORE_FIELD_EXISTS                      = 0x2
-	BPF_CORE_FIELD_SIGNED                      = 0x3
-	BPF_CORE_FIELD_LSHIFT_U64                  = 0x4
-	BPF_CORE_FIELD_RSHIFT_U64                  = 0x5
-	BPF_CORE_TYPE_ID_LOCAL                     = 0x6
-	BPF_CORE_TYPE_ID_TARGET                    = 0x7
-	BPF_CORE_TYPE_EXISTS                       = 0x8
-	BPF_CORE_TYPE_SIZE                         = 0x9
-	BPF_CORE_ENUMVAL_EXISTS                    = 0xa
-	BPF_CORE_ENUMVAL_VALUE                     = 0xb
-	BPF_CORE_TYPE_MATCHES                      = 0xc
-	BPF_F_TIMER_ABS                            = 0x1
 )
 
 const (
@@ -3116,12 +2806,6 @@ type LoopInfo64 struct {
 	Encrypt_key      [32]uint8
 	Init             [2]uint64
 }
-type LoopConfig struct {
-	Fd   uint32
-	Size uint32
-	Info LoopInfo64
-	_    [8]uint64
-}
 
 type TIPCSocketAddr struct {
 	Ref  uint32
@@ -3249,16 +2933,7 @@ const (
 	DEVLINK_CMD_TRAP_POLICER_NEW                       = 0x47
 	DEVLINK_CMD_TRAP_POLICER_DEL                       = 0x48
 	DEVLINK_CMD_HEALTH_REPORTER_TEST                   = 0x49
-	DEVLINK_CMD_RATE_GET                               = 0x4a
-	DEVLINK_CMD_RATE_SET                               = 0x4b
-	DEVLINK_CMD_RATE_NEW                               = 0x4c
-	DEVLINK_CMD_RATE_DEL                               = 0x4d
-	DEVLINK_CMD_LINECARD_GET                           = 0x4e
-	DEVLINK_CMD_LINECARD_SET                           = 0x4f
-	DEVLINK_CMD_LINECARD_NEW                           = 0x50
-	DEVLINK_CMD_LINECARD_DEL                           = 0x51
-	DEVLINK_CMD_SELFTESTS_GET                          = 0x52
-	DEVLINK_CMD_MAX                                    = 0x54
+	DEVLINK_CMD_MAX                                    = 0x4d
 	DEVLINK_PORT_TYPE_NOTSET                           = 0x0
 	DEVLINK_PORT_TYPE_AUTO                             = 0x1
 	DEVLINK_PORT_TYPE_ETH                              = 0x2
@@ -3481,19 +3156,7 @@ const (
 	DEVLINK_ATTR_RELOAD_ACTION_INFO                    = 0xa2
 	DEVLINK_ATTR_RELOAD_ACTION_STATS                   = 0xa3
 	DEVLINK_ATTR_PORT_PCI_SF_NUMBER                    = 0xa4
-	DEVLINK_ATTR_RATE_TYPE                             = 0xa5
-	DEVLINK_ATTR_RATE_TX_SHARE                         = 0xa6
-	DEVLINK_ATTR_RATE_TX_MAX                           = 0xa7
-	DEVLINK_ATTR_RATE_NODE_NAME                        = 0xa8
-	DEVLINK_ATTR_RATE_PARENT_NODE_NAME                 = 0xa9
-	DEVLINK_ATTR_REGION_MAX_SNAPSHOTS                  = 0xaa
-	DEVLINK_ATTR_LINECARD_INDEX                        = 0xab
-	DEVLINK_ATTR_LINECARD_STATE                        = 0xac
-	DEVLINK_ATTR_LINECARD_TYPE                         = 0xad
-	DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES              = 0xae
-	DEVLINK_ATTR_NESTED_DEVLINK                        = 0xaf
-	DEVLINK_ATTR_SELFTESTS                             = 0xb0
-	DEVLINK_ATTR_MAX                                   = 0xb3
+	DEVLINK_ATTR_MAX                                   = 0xa9
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE              = 0x0
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX           = 0x1
 	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT               = 0x0
@@ -3509,8 +3172,7 @@ const (
 	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR                 = 0x1
 	DEVLINK_PORT_FN_ATTR_STATE                         = 0x2
 	DEVLINK_PORT_FN_ATTR_OPSTATE                       = 0x3
-	DEVLINK_PORT_FN_ATTR_CAPS                          = 0x4
-	DEVLINK_PORT_FUNCTION_ATTR_MAX                     = 0x6
+	DEVLINK_PORT_FUNCTION_ATTR_MAX                     = 0x3
 )
 
 type FsverityDigest struct {
@@ -3541,7 +3203,7 @@ type Nhmsg struct {
 type NexthopGrp struct {
 	Id     uint32
 	Weight uint8
-	High   uint8
+	Resvd1 uint8
 	Resvd2 uint16
 }
 
@@ -3602,9 +3264,7 @@ const (
 	LWTUNNEL_ENCAP_BPF        = 0x6
 	LWTUNNEL_ENCAP_SEG6_LOCAL = 0x7
 	LWTUNNEL_ENCAP_RPL        = 0x8
-	LWTUNNEL_ENCAP_IOAM6      = 0x9
-	LWTUNNEL_ENCAP_XFRM       = 0xa
-	LWTUNNEL_ENCAP_MAX        = 0xa
+	LWTUNNEL_ENCAP_MAX        = 0x8
 
 	MPLS_IPTUNNEL_UNSPEC = 0x0
 	MPLS_IPTUNNEL_DST    = 0x1
@@ -3792,17 +3452,7 @@ const (
 	ETHTOOL_MSG_CABLE_TEST_ACT                = 0x1a
 	ETHTOOL_MSG_CABLE_TEST_TDR_ACT            = 0x1b
 	ETHTOOL_MSG_TUNNEL_INFO_GET               = 0x1c
-	ETHTOOL_MSG_FEC_GET                       = 0x1d
-	ETHTOOL_MSG_FEC_SET                       = 0x1e
-	ETHTOOL_MSG_MODULE_EEPROM_GET             = 0x1f
-	ETHTOOL_MSG_STATS_GET                     = 0x20
-	ETHTOOL_MSG_PHC_VCLOCKS_GET               = 0x21
-	ETHTOOL_MSG_MODULE_GET                    = 0x22
-	ETHTOOL_MSG_MODULE_SET                    = 0x23
-	ETHTOOL_MSG_PSE_GET                       = 0x24
-	ETHTOOL_MSG_PSE_SET                       = 0x25
-	ETHTOOL_MSG_RSS_GET                       = 0x26
-	ETHTOOL_MSG_USER_MAX                      = 0x2d
+	ETHTOOL_MSG_USER_MAX                      = 0x21
 	ETHTOOL_MSG_KERNEL_NONE                   = 0x0
 	ETHTOOL_MSG_STRSET_GET_REPLY              = 0x1
 	ETHTOOL_MSG_LINKINFO_GET_REPLY            = 0x2
@@ -3833,24 +3483,12 @@ const (
 	ETHTOOL_MSG_CABLE_TEST_NTF                = 0x1b
 	ETHTOOL_MSG_CABLE_TEST_TDR_NTF            = 0x1c
 	ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY         = 0x1d
-	ETHTOOL_MSG_FEC_GET_REPLY                 = 0x1e
-	ETHTOOL_MSG_FEC_NTF                       = 0x1f
-	ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY       = 0x20
-	ETHTOOL_MSG_STATS_GET_REPLY               = 0x21
-	ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY         = 0x22
-	ETHTOOL_MSG_MODULE_GET_REPLY              = 0x23
-	ETHTOOL_MSG_MODULE_NTF                    = 0x24
-	ETHTOOL_MSG_PSE_GET_REPLY                 = 0x25
-	ETHTOOL_MSG_RSS_GET_REPLY                 = 0x26
-	ETHTOOL_MSG_KERNEL_MAX                    = 0x2e
-	ETHTOOL_FLAG_COMPACT_BITSETS              = 0x1
-	ETHTOOL_FLAG_OMIT_REPLY                   = 0x2
-	ETHTOOL_FLAG_STATS                        = 0x4
+	ETHTOOL_MSG_KERNEL_MAX                    = 0x22
 	ETHTOOL_A_HEADER_UNSPEC                   = 0x0
 	ETHTOOL_A_HEADER_DEV_INDEX                = 0x1
 	ETHTOOL_A_HEADER_DEV_NAME                 = 0x2
 	ETHTOOL_A_HEADER_FLAGS                    = 0x3
-	ETHTOOL_A_HEADER_MAX                      = 0x4
+	ETHTOOL_A_HEADER_MAX                      = 0x3
 	ETHTOOL_A_BITSET_BIT_UNSPEC               = 0x0
 	ETHTOOL_A_BITSET_BIT_INDEX                = 0x1
 	ETHTOOL_A_BITSET_BIT_NAME                 = 0x2
@@ -3904,8 +3542,7 @@ const (
 	ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG      = 0x7
 	ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE    = 0x8
 	ETHTOOL_A_LINKMODES_LANES                 = 0x9
-	ETHTOOL_A_LINKMODES_RATE_MATCHING         = 0xa
-	ETHTOOL_A_LINKMODES_MAX                   = 0xa
+	ETHTOOL_A_LINKMODES_MAX                   = 0x9
 	ETHTOOL_A_LINKSTATE_UNSPEC                = 0x0
 	ETHTOOL_A_LINKSTATE_HEADER                = 0x1
 	ETHTOOL_A_LINKSTATE_LINK                  = 0x2
@@ -3913,8 +3550,7 @@ const (
 	ETHTOOL_A_LINKSTATE_SQI_MAX               = 0x4
 	ETHTOOL_A_LINKSTATE_EXT_STATE             = 0x5
 	ETHTOOL_A_LINKSTATE_EXT_SUBSTATE          = 0x6
-	ETHTOOL_A_LINKSTATE_EXT_DOWN_CNT          = 0x7
-	ETHTOOL_A_LINKSTATE_MAX                   = 0x7
+	ETHTOOL_A_LINKSTATE_MAX                   = 0x6
 	ETHTOOL_A_DEBUG_UNSPEC                    = 0x0
 	ETHTOOL_A_DEBUG_HEADER                    = 0x1
 	ETHTOOL_A_DEBUG_MSGMASK                   = 0x2
@@ -3945,11 +3581,7 @@ const (
 	ETHTOOL_A_RINGS_RX_MINI                   = 0x7
 	ETHTOOL_A_RINGS_RX_JUMBO                  = 0x8
 	ETHTOOL_A_RINGS_TX                        = 0x9
-	ETHTOOL_A_RINGS_RX_BUF_LEN                = 0xa
-	ETHTOOL_A_RINGS_TCP_DATA_SPLIT            = 0xb
-	ETHTOOL_A_RINGS_CQE_SIZE                  = 0xc
-	ETHTOOL_A_RINGS_TX_PUSH                   = 0xd
-	ETHTOOL_A_RINGS_MAX                       = 0x10
+	ETHTOOL_A_RINGS_MAX                       = 0x9
 	ETHTOOL_A_CHANNELS_UNSPEC                 = 0x0
 	ETHTOOL_A_CHANNELS_HEADER                 = 0x1
 	ETHTOOL_A_CHANNELS_RX_MAX                 = 0x2
@@ -3985,16 +3617,14 @@ const (
 	ETHTOOL_A_COALESCE_TX_USECS_HIGH          = 0x15
 	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH     = 0x16
 	ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL   = 0x17
-	ETHTOOL_A_COALESCE_USE_CQE_MODE_TX        = 0x18
-	ETHTOOL_A_COALESCE_USE_CQE_MODE_RX        = 0x19
-	ETHTOOL_A_COALESCE_MAX                    = 0x1e
+	ETHTOOL_A_COALESCE_MAX                    = 0x17
 	ETHTOOL_A_PAUSE_UNSPEC                    = 0x0
 	ETHTOOL_A_PAUSE_HEADER                    = 0x1
 	ETHTOOL_A_PAUSE_AUTONEG                   = 0x2
 	ETHTOOL_A_PAUSE_RX                        = 0x3
 	ETHTOOL_A_PAUSE_TX                        = 0x4
 	ETHTOOL_A_PAUSE_STATS                     = 0x5
-	ETHTOOL_A_PAUSE_MAX                       = 0x6
+	ETHTOOL_A_PAUSE_MAX                       = 0x5
 	ETHTOOL_A_PAUSE_STAT_UNSPEC               = 0x0
 	ETHTOOL_A_PAUSE_STAT_PAD                  = 0x1
 	ETHTOOL_A_PAUSE_STAT_TX_FRAMES            = 0x2
@@ -4015,7 +3645,7 @@ const (
 	ETHTOOL_A_TSINFO_TX_TYPES                 = 0x3
 	ETHTOOL_A_TSINFO_RX_FILTERS               = 0x4
 	ETHTOOL_A_TSINFO_PHC_INDEX                = 0x5
-	ETHTOOL_A_TSINFO_MAX                      = 0x6
+	ETHTOOL_A_TSINFO_MAX                      = 0x5
 	ETHTOOL_A_CABLE_TEST_UNSPEC               = 0x0
 	ETHTOOL_A_CABLE_TEST_HEADER               = 0x1
 	ETHTOOL_A_CABLE_TEST_MAX                  = 0x1
@@ -4031,11 +3661,11 @@ const (
 	ETHTOOL_A_CABLE_RESULT_UNSPEC             = 0x0
 	ETHTOOL_A_CABLE_RESULT_PAIR               = 0x1
 	ETHTOOL_A_CABLE_RESULT_CODE               = 0x2
-	ETHTOOL_A_CABLE_RESULT_MAX                = 0x3
+	ETHTOOL_A_CABLE_RESULT_MAX                = 0x2
 	ETHTOOL_A_CABLE_FAULT_LENGTH_UNSPEC       = 0x0
 	ETHTOOL_A_CABLE_FAULT_LENGTH_PAIR         = 0x1
 	ETHTOOL_A_CABLE_FAULT_LENGTH_CM           = 0x2
-	ETHTOOL_A_CABLE_FAULT_LENGTH_MAX          = 0x3
+	ETHTOOL_A_CABLE_FAULT_LENGTH_MAX          = 0x2
 	ETHTOOL_A_CABLE_TEST_NTF_STATUS_UNSPEC    = 0x0
 	ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED   = 0x1
 	ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED = 0x2
@@ -4101,8 +3731,6 @@ const (
 	ETHTOOL_A_TUNNEL_INFO_MAX                 = 0x2
 )
 
-const SPEED_UNKNOWN = -0x1
-
 type EthtoolDrvinfo struct {
 	Cmd          uint32
 	Driver       [32]byte
@@ -4118,107 +3746,6 @@ type EthtoolDrvinfo struct {
 	Regdump_len  uint32
 }
 
-type EthtoolTsInfo struct {
-	Cmd             uint32
-	So_timestamping uint32
-	Phc_index       int32
-	Tx_types        uint32
-	Tx_reserved     [3]uint32
-	Rx_filters      uint32
-	Rx_reserved     [3]uint32
-}
-
-type HwTstampConfig struct {
-	Flags     int32
-	Tx_type   int32
-	Rx_filter int32
-}
-
-const (
-	HWTSTAMP_FILTER_NONE            = 0x0
-	HWTSTAMP_FILTER_ALL             = 0x1
-	HWTSTAMP_FILTER_SOME            = 0x2
-	HWTSTAMP_FILTER_PTP_V1_L4_EVENT = 0x3
-	HWTSTAMP_FILTER_PTP_V2_L4_EVENT = 0x6
-	HWTSTAMP_FILTER_PTP_V2_L2_EVENT = 0x9
-	HWTSTAMP_FILTER_PTP_V2_EVENT    = 0xc
-)
-
-const (
-	HWTSTAMP_TX_OFF          = 0x0
-	HWTSTAMP_TX_ON           = 0x1
-	HWTSTAMP_TX_ONESTEP_SYNC = 0x2
-)
-
-type (
-	PtpClockCaps struct {
-		Max_adj            int32
-		N_alarm            int32
-		N_ext_ts           int32
-		N_per_out          int32
-		Pps                int32
-		N_pins             int32
-		Cross_timestamping int32
-		Adjust_phase       int32
-		Max_phase_adj      int32
-		Rsv                [11]int32
-	}
-	PtpClockTime struct {
-		Sec      int64
-		Nsec     uint32
-		Reserved uint32
-	}
-	PtpExttsEvent struct {
-		T     PtpClockTime
-		Index uint32
-		Flags uint32
-		Rsv   [2]uint32
-	}
-	PtpExttsRequest struct {
-		Index uint32
-		Flags uint32
-		Rsv   [2]uint32
-	}
-	PtpPeroutRequest struct {
-		StartOrPhase PtpClockTime
-		Period       PtpClockTime
-		Index        uint32
-		Flags        uint32
-		On           PtpClockTime
-	}
-	PtpPinDesc struct {
-		Name  [64]byte
-		Index uint32
-		Func  uint32
-		Chan  uint32
-		Rsv   [5]uint32
-	}
-	PtpSysOffset struct {
-		Samples uint32
-		Rsv     [3]uint32
-		Ts      [51]PtpClockTime
-	}
-	PtpSysOffsetExtended struct {
-		Samples uint32
-		Clockid int32
-		Rsv     [2]uint32
-		Ts      [25][3]PtpClockTime
-	}
-	PtpSysOffsetPrecise struct {
-		Device   PtpClockTime
-		Realtime PtpClockTime
-		Monoraw  PtpClockTime
-		Rsv      [4]uint32
-	}
-)
-
-const (
-	PTP_PF_NONE    = 0x0
-	PTP_PF_EXTTS   = 0x1
-	PTP_PF_PEROUT  = 0x2
-	PTP_PF_PHYSYNC = 0x3
-)
-
 type (
 	HIDRawReportDescriptor struct {
 		Size  uint32
@@ -4396,1783 +3923,3 @@ const (
 	NFC_SDP_ATTR_URI                  = 0x1
 	NFC_SDP_ATTR_SAP                  = 0x2
 )
-
-type LandlockRulesetAttr struct {
-	Access_fs  uint64
-	Access_net uint64
-	Scoped     uint64
-}
-
-type LandlockPathBeneathAttr struct {
-	Allowed_access uint64
-	Parent_fd      int32
-}
-
-const (
-	LANDLOCK_RULE_PATH_BENEATH = 0x1
-)
-
-const (
-	IPC_CREAT   = 0x200
-	IPC_EXCL    = 0x400
-	IPC_NOWAIT  = 0x800
-	IPC_PRIVATE = 0x0
-
-	ipc_64 = 0x100
-)
-
-const (
-	IPC_RMID = 0x0
-	IPC_SET  = 0x1
-	IPC_STAT = 0x2
-)
-
-const (
-	SHM_RDONLY = 0x1000
-	SHM_RND    = 0x2000
-)
-
-type MountAttr struct {
-	Attr_set    uint64
-	Attr_clr    uint64
-	Propagation uint64
-	Userns_fd   uint64
-}
-
-const (
-	WG_CMD_GET_DEVICE                      = 0x0
-	WG_CMD_SET_DEVICE                      = 0x1
-	WGDEVICE_F_REPLACE_PEERS               = 0x1
-	WGDEVICE_A_UNSPEC                      = 0x0
-	WGDEVICE_A_IFINDEX                     = 0x1
-	WGDEVICE_A_IFNAME                      = 0x2
-	WGDEVICE_A_PRIVATE_KEY                 = 0x3
-	WGDEVICE_A_PUBLIC_KEY                  = 0x4
-	WGDEVICE_A_FLAGS                       = 0x5
-	WGDEVICE_A_LISTEN_PORT                 = 0x6
-	WGDEVICE_A_FWMARK                      = 0x7
-	WGDEVICE_A_PEERS                       = 0x8
-	WGPEER_F_REMOVE_ME                     = 0x1
-	WGPEER_F_REPLACE_ALLOWEDIPS            = 0x2
-	WGPEER_F_UPDATE_ONLY                   = 0x4
-	WGPEER_A_UNSPEC                        = 0x0
-	WGPEER_A_PUBLIC_KEY                    = 0x1
-	WGPEER_A_PRESHARED_KEY                 = 0x2
-	WGPEER_A_FLAGS                         = 0x3
-	WGPEER_A_ENDPOINT                      = 0x4
-	WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL = 0x5
-	WGPEER_A_LAST_HANDSHAKE_TIME           = 0x6
-	WGPEER_A_RX_BYTES                      = 0x7
-	WGPEER_A_TX_BYTES                      = 0x8
-	WGPEER_A_ALLOWEDIPS                    = 0x9
-	WGPEER_A_PROTOCOL_VERSION              = 0xa
-	WGALLOWEDIP_A_UNSPEC                   = 0x0
-	WGALLOWEDIP_A_FAMILY                   = 0x1
-	WGALLOWEDIP_A_IPADDR                   = 0x2
-	WGALLOWEDIP_A_CIDR_MASK                = 0x3
-)
-
-const (
-	NL_ATTR_TYPE_INVALID      = 0x0
-	NL_ATTR_TYPE_FLAG         = 0x1
-	NL_ATTR_TYPE_U8           = 0x2
-	NL_ATTR_TYPE_U16          = 0x3
-	NL_ATTR_TYPE_U32          = 0x4
-	NL_ATTR_TYPE_U64          = 0x5
-	NL_ATTR_TYPE_S8           = 0x6
-	NL_ATTR_TYPE_S16          = 0x7
-	NL_ATTR_TYPE_S32          = 0x8
-	NL_ATTR_TYPE_S64          = 0x9
-	NL_ATTR_TYPE_BINARY       = 0xa
-	NL_ATTR_TYPE_STRING       = 0xb
-	NL_ATTR_TYPE_NUL_STRING   = 0xc
-	NL_ATTR_TYPE_NESTED       = 0xd
-	NL_ATTR_TYPE_NESTED_ARRAY = 0xe
-	NL_ATTR_TYPE_BITFIELD32   = 0xf
-
-	NL_POLICY_TYPE_ATTR_UNSPEC          = 0x0
-	NL_POLICY_TYPE_ATTR_TYPE            = 0x1
-	NL_POLICY_TYPE_ATTR_MIN_VALUE_S     = 0x2
-	NL_POLICY_TYPE_ATTR_MAX_VALUE_S     = 0x3
-	NL_POLICY_TYPE_ATTR_MIN_VALUE_U     = 0x4
-	NL_POLICY_TYPE_ATTR_MAX_VALUE_U     = 0x5
-	NL_POLICY_TYPE_ATTR_MIN_LENGTH      = 0x6
-	NL_POLICY_TYPE_ATTR_MAX_LENGTH      = 0x7
-	NL_POLICY_TYPE_ATTR_POLICY_IDX      = 0x8
-	NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE  = 0x9
-	NL_POLICY_TYPE_ATTR_BITFIELD32_MASK = 0xa
-	NL_POLICY_TYPE_ATTR_PAD             = 0xb
-	NL_POLICY_TYPE_ATTR_MASK            = 0xc
-	NL_POLICY_TYPE_ATTR_MAX             = 0xc
-)
-
-type CANBitTiming struct {
-	Bitrate      uint32
-	Sample_point uint32
-	Tq           uint32
-	Prop_seg     uint32
-	Phase_seg1   uint32
-	Phase_seg2   uint32
-	Sjw          uint32
-	Brp          uint32
-}
-
-type CANBitTimingConst struct {
-	Name      [16]uint8
-	Tseg1_min uint32
-	Tseg1_max uint32
-	Tseg2_min uint32
-	Tseg2_max uint32
-	Sjw_max   uint32
-	Brp_min   uint32
-	Brp_max   uint32
-	Brp_inc   uint32
-}
-
-type CANClock struct {
-	Freq uint32
-}
-
-type CANBusErrorCounters struct {
-	Txerr uint16
-	Rxerr uint16
-}
-
-type CANCtrlMode struct {
-	Mask  uint32
-	Flags uint32
-}
-
-type CANDeviceStats struct {
-	Bus_error        uint32
-	Error_warning    uint32
-	Error_passive    uint32
-	Bus_off          uint32
-	Arbitration_lost uint32
-	Restarts         uint32
-}
-
-const (
-	CAN_STATE_ERROR_ACTIVE  = 0x0
-	CAN_STATE_ERROR_WARNING = 0x1
-	CAN_STATE_ERROR_PASSIVE = 0x2
-	CAN_STATE_BUS_OFF       = 0x3
-	CAN_STATE_STOPPED       = 0x4
-	CAN_STATE_SLEEPING      = 0x5
-	CAN_STATE_MAX           = 0x6
-)
-
-const (
-	IFLA_CAN_UNSPEC               = 0x0
-	IFLA_CAN_BITTIMING            = 0x1
-	IFLA_CAN_BITTIMING_CONST      = 0x2
-	IFLA_CAN_CLOCK                = 0x3
-	IFLA_CAN_STATE                = 0x4
-	IFLA_CAN_CTRLMODE             = 0x5
-	IFLA_CAN_RESTART_MS           = 0x6
-	IFLA_CAN_RESTART              = 0x7
-	IFLA_CAN_BERR_COUNTER         = 0x8
-	IFLA_CAN_DATA_BITTIMING       = 0x9
-	IFLA_CAN_DATA_BITTIMING_CONST = 0xa
-	IFLA_CAN_TERMINATION          = 0xb
-	IFLA_CAN_TERMINATION_CONST    = 0xc
-	IFLA_CAN_BITRATE_CONST        = 0xd
-	IFLA_CAN_DATA_BITRATE_CONST   = 0xe
-	IFLA_CAN_BITRATE_MAX          = 0xf
-)
-
-type KCMAttach struct {
-	Fd     int32
-	Bpf_fd int32
-}
-
-type KCMUnattach struct {
-	Fd int32
-}
-
-type KCMClone struct {
-	Fd int32
-}
-
-const (
-	NL80211_AC_BE                                           = 0x2
-	NL80211_AC_BK                                           = 0x3
-	NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED                 = 0x0
-	NL80211_ACL_POLICY_DENY_UNLESS_LISTED                   = 0x1
-	NL80211_AC_VI                                           = 0x1
-	NL80211_AC_VO                                           = 0x0
-	NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT               = 0x1
-	NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT            = 0x2
-	NL80211_AP_SME_SA_QUERY_OFFLOAD                         = 0x1
-	NL80211_ATTR_4ADDR                                      = 0x53
-	NL80211_ATTR_ACK                                        = 0x5c
-	NL80211_ATTR_ACK_SIGNAL                                 = 0x107
-	NL80211_ATTR_ACL_POLICY                                 = 0xa5
-	NL80211_ATTR_ADMITTED_TIME                              = 0xd4
-	NL80211_ATTR_AIRTIME_WEIGHT                             = 0x112
-	NL80211_ATTR_AKM_SUITES                                 = 0x4c
-	NL80211_ATTR_AP_ISOLATE                                 = 0x60
-	NL80211_ATTR_AP_SETTINGS_FLAGS                          = 0x135
-	NL80211_ATTR_AUTH_DATA                                  = 0x9c
-	NL80211_ATTR_AUTH_TYPE                                  = 0x35
-	NL80211_ATTR_BANDS                                      = 0xef
-	NL80211_ATTR_BEACON_HEAD                                = 0xe
-	NL80211_ATTR_BEACON_INTERVAL                            = 0xc
-	NL80211_ATTR_BEACON_TAIL                                = 0xf
-	NL80211_ATTR_BG_SCAN_PERIOD                             = 0x98
-	NL80211_ATTR_BSS_BASIC_RATES                            = 0x24
-	NL80211_ATTR_BSS                                        = 0x2f
-	NL80211_ATTR_BSS_CTS_PROT                               = 0x1c
-	NL80211_ATTR_BSS_HT_OPMODE                              = 0x6d
-	NL80211_ATTR_BSSID                                      = 0xf5
-	NL80211_ATTR_BSS_SELECT                                 = 0xe3
-	NL80211_ATTR_BSS_SHORT_PREAMBLE                         = 0x1d
-	NL80211_ATTR_BSS_SHORT_SLOT_TIME                        = 0x1e
-	NL80211_ATTR_CENTER_FREQ1                               = 0xa0
-	NL80211_ATTR_CENTER_FREQ1_OFFSET                        = 0x123
-	NL80211_ATTR_CENTER_FREQ2                               = 0xa1
-	NL80211_ATTR_CHANNEL_WIDTH                              = 0x9f
-	NL80211_ATTR_CH_SWITCH_BLOCK_TX                         = 0xb8
-	NL80211_ATTR_CH_SWITCH_COUNT                            = 0xb7
-	NL80211_ATTR_CIPHER_SUITE_GROUP                         = 0x4a
-	NL80211_ATTR_CIPHER_SUITES                              = 0x39
-	NL80211_ATTR_CIPHER_SUITES_PAIRWISE                     = 0x49
-	NL80211_ATTR_CNTDWN_OFFS_BEACON                         = 0xba
-	NL80211_ATTR_CNTDWN_OFFS_PRESP                          = 0xbb
-	NL80211_ATTR_COALESCE_RULE                              = 0xb6
-	NL80211_ATTR_COALESCE_RULE_CONDITION                    = 0x2
-	NL80211_ATTR_COALESCE_RULE_DELAY                        = 0x1
-	NL80211_ATTR_COALESCE_RULE_MAX                          = 0x3
-	NL80211_ATTR_COALESCE_RULE_PKT_PATTERN                  = 0x3
-	NL80211_ATTR_COLOR_CHANGE_COLOR                         = 0x130
-	NL80211_ATTR_COLOR_CHANGE_COUNT                         = 0x12f
-	NL80211_ATTR_COLOR_CHANGE_ELEMS                         = 0x131
-	NL80211_ATTR_CONN_FAILED_REASON                         = 0x9b
-	NL80211_ATTR_CONTROL_PORT                               = 0x44
-	NL80211_ATTR_CONTROL_PORT_ETHERTYPE                     = 0x66
-	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT                    = 0x67
-	NL80211_ATTR_CONTROL_PORT_NO_PREAUTH                    = 0x11e
-	NL80211_ATTR_CONTROL_PORT_OVER_NL80211                  = 0x108
-	NL80211_ATTR_COOKIE                                     = 0x58
-	NL80211_ATTR_CQM_BEACON_LOSS_EVENT                      = 0x8
-	NL80211_ATTR_CQM                                        = 0x5e
-	NL80211_ATTR_CQM_MAX                                    = 0x9
-	NL80211_ATTR_CQM_PKT_LOSS_EVENT                         = 0x4
-	NL80211_ATTR_CQM_RSSI_HYST                              = 0x2
-	NL80211_ATTR_CQM_RSSI_LEVEL                             = 0x9
-	NL80211_ATTR_CQM_RSSI_THOLD                             = 0x1
-	NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT                   = 0x3
-	NL80211_ATTR_CQM_TXE_INTVL                              = 0x7
-	NL80211_ATTR_CQM_TXE_PKTS                               = 0x6
-	NL80211_ATTR_CQM_TXE_RATE                               = 0x5
-	NL80211_ATTR_CRIT_PROT_ID                               = 0xb3
-	NL80211_ATTR_CSA_C_OFF_BEACON                           = 0xba
-	NL80211_ATTR_CSA_C_OFF_PRESP                            = 0xbb
-	NL80211_ATTR_CSA_C_OFFSETS_TX                           = 0xcd
-	NL80211_ATTR_CSA_IES                                    = 0xb9
-	NL80211_ATTR_DEVICE_AP_SME                              = 0x8d
-	NL80211_ATTR_DFS_CAC_TIME                               = 0x7
-	NL80211_ATTR_DFS_REGION                                 = 0x92
-	NL80211_ATTR_DISABLE_EHT                                = 0x137
-	NL80211_ATTR_DISABLE_HE                                 = 0x12d
-	NL80211_ATTR_DISABLE_HT                                 = 0x93
-	NL80211_ATTR_DISABLE_VHT                                = 0xaf
-	NL80211_ATTR_DISCONNECTED_BY_AP                         = 0x47
-	NL80211_ATTR_DONT_WAIT_FOR_ACK                          = 0x8e
-	NL80211_ATTR_DTIM_PERIOD                                = 0xd
-	NL80211_ATTR_DURATION                                   = 0x57
-	NL80211_ATTR_EHT_CAPABILITY                             = 0x136
-	NL80211_ATTR_EML_CAPABILITY                             = 0x13d
-	NL80211_ATTR_EXT_CAPA                                   = 0xa9
-	NL80211_ATTR_EXT_CAPA_MASK                              = 0xaa
-	NL80211_ATTR_EXTERNAL_AUTH_ACTION                       = 0x104
-	NL80211_ATTR_EXTERNAL_AUTH_SUPPORT                      = 0x105
-	NL80211_ATTR_EXT_FEATURES                               = 0xd9
-	NL80211_ATTR_FEATURE_FLAGS                              = 0x8f
-	NL80211_ATTR_FILS_CACHE_ID                              = 0xfd
-	NL80211_ATTR_FILS_DISCOVERY                             = 0x126
-	NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM                      = 0xfb
-	NL80211_ATTR_FILS_ERP_REALM                             = 0xfa
-	NL80211_ATTR_FILS_ERP_RRK                               = 0xfc
-	NL80211_ATTR_FILS_ERP_USERNAME                          = 0xf9
-	NL80211_ATTR_FILS_KEK                                   = 0xf2
-	NL80211_ATTR_FILS_NONCES                                = 0xf3
-	NL80211_ATTR_FRAME                                      = 0x33
-	NL80211_ATTR_FRAME_MATCH                                = 0x5b
-	NL80211_ATTR_FRAME_TYPE                                 = 0x65
-	NL80211_ATTR_FREQ_AFTER                                 = 0x3b
-	NL80211_ATTR_FREQ_BEFORE                                = 0x3a
-	NL80211_ATTR_FREQ_FIXED                                 = 0x3c
-	NL80211_ATTR_FREQ_RANGE_END                             = 0x3
-	NL80211_ATTR_FREQ_RANGE_MAX_BW                          = 0x4
-	NL80211_ATTR_FREQ_RANGE_START                           = 0x2
-	NL80211_ATTR_FTM_RESPONDER                              = 0x10e
-	NL80211_ATTR_FTM_RESPONDER_STATS                        = 0x10f
-	NL80211_ATTR_GENERATION                                 = 0x2e
-	NL80211_ATTR_HANDLE_DFS                                 = 0xbf
-	NL80211_ATTR_HE_6GHZ_CAPABILITY                         = 0x125
-	NL80211_ATTR_HE_BSS_COLOR                               = 0x11b
-	NL80211_ATTR_HE_CAPABILITY                              = 0x10d
-	NL80211_ATTR_HE_OBSS_PD                                 = 0x117
-	NL80211_ATTR_HIDDEN_SSID                                = 0x7e
-	NL80211_ATTR_HT_CAPABILITY                              = 0x1f
-	NL80211_ATTR_HT_CAPABILITY_MASK                         = 0x94
-	NL80211_ATTR_IE_ASSOC_RESP                              = 0x80
-	NL80211_ATTR_IE                                         = 0x2a
-	NL80211_ATTR_IE_PROBE_RESP                              = 0x7f
-	NL80211_ATTR_IE_RIC                                     = 0xb2
-	NL80211_ATTR_IFACE_SOCKET_OWNER                         = 0xcc
-	NL80211_ATTR_IFINDEX                                    = 0x3
-	NL80211_ATTR_IFNAME                                     = 0x4
-	NL80211_ATTR_IFTYPE_AKM_SUITES                          = 0x11c
-	NL80211_ATTR_IFTYPE                                     = 0x5
-	NL80211_ATTR_IFTYPE_EXT_CAPA                            = 0xe6
-	NL80211_ATTR_INACTIVITY_TIMEOUT                         = 0x96
-	NL80211_ATTR_INTERFACE_COMBINATIONS                     = 0x78
-	NL80211_ATTR_KEY_CIPHER                                 = 0x9
-	NL80211_ATTR_KEY                                        = 0x50
-	NL80211_ATTR_KEY_DATA                                   = 0x7
-	NL80211_ATTR_KEY_DEFAULT                                = 0xb
-	NL80211_ATTR_KEY_DEFAULT_MGMT                           = 0x28
-	NL80211_ATTR_KEY_DEFAULT_TYPES                          = 0x6e
-	NL80211_ATTR_KEY_IDX                                    = 0x8
-	NL80211_ATTR_KEYS                                       = 0x51
-	NL80211_ATTR_KEY_SEQ                                    = 0xa
-	NL80211_ATTR_KEY_TYPE                                   = 0x37
-	NL80211_ATTR_LOCAL_MESH_POWER_MODE                      = 0xa4
-	NL80211_ATTR_LOCAL_STATE_CHANGE                         = 0x5f
-	NL80211_ATTR_MAC_ACL_MAX                                = 0xa7
-	NL80211_ATTR_MAC_ADDRS                                  = 0xa6
-	NL80211_ATTR_MAC                                        = 0x6
-	NL80211_ATTR_MAC_HINT                                   = 0xc8
-	NL80211_ATTR_MAC_MASK                                   = 0xd7
-	NL80211_ATTR_MAX_AP_ASSOC_STA                           = 0xca
-	NL80211_ATTR_MAX                                        = 0x14d
-	NL80211_ATTR_MAX_CRIT_PROT_DURATION                     = 0xb4
-	NL80211_ATTR_MAX_CSA_COUNTERS                           = 0xce
-	NL80211_ATTR_MAX_MATCH_SETS                             = 0x85
-	NL80211_ATTR_MAX_NUM_AKM_SUITES                         = 0x13c
-	NL80211_ATTR_MAX_NUM_PMKIDS                             = 0x56
-	NL80211_ATTR_MAX_NUM_SCAN_SSIDS                         = 0x2b
-	NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS                   = 0xde
-	NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS                   = 0x7b
-	NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION             = 0x6f
-	NL80211_ATTR_MAX_SCAN_IE_LEN                            = 0x38
-	NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL                     = 0xdf
-	NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS                   = 0xe0
-	NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN                      = 0x7c
-	NL80211_ATTR_MBSSID_CONFIG                              = 0x132
-	NL80211_ATTR_MBSSID_ELEMS                               = 0x133
-	NL80211_ATTR_MCAST_RATE                                 = 0x6b
-	NL80211_ATTR_MDID                                       = 0xb1
-	NL80211_ATTR_MEASUREMENT_DURATION                       = 0xeb
-	NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY             = 0xec
-	NL80211_ATTR_MESH_CONFIG                                = 0x23
-	NL80211_ATTR_MESH_ID                                    = 0x18
-	NL80211_ATTR_MESH_PEER_AID                              = 0xed
-	NL80211_ATTR_MESH_SETUP                                 = 0x70
-	NL80211_ATTR_MGMT_SUBTYPE                               = 0x29
-	NL80211_ATTR_MLD_ADDR                                   = 0x13a
-	NL80211_ATTR_MLD_CAPA_AND_OPS                           = 0x13e
-	NL80211_ATTR_MLO_LINK_ID                                = 0x139
-	NL80211_ATTR_MLO_LINKS                                  = 0x138
-	NL80211_ATTR_MLO_SUPPORT                                = 0x13b
-	NL80211_ATTR_MNTR_FLAGS                                 = 0x17
-	NL80211_ATTR_MPATH_INFO                                 = 0x1b
-	NL80211_ATTR_MPATH_NEXT_HOP                             = 0x1a
-	NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED               = 0xf4
-	NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR                    = 0xe8
-	NL80211_ATTR_MU_MIMO_GROUP_DATA                         = 0xe7
-	NL80211_ATTR_NAN_FUNC                                   = 0xf0
-	NL80211_ATTR_NAN_MASTER_PREF                            = 0xee
-	NL80211_ATTR_NAN_MATCH                                  = 0xf1
-	NL80211_ATTR_NETNS_FD                                   = 0xdb
-	NL80211_ATTR_NOACK_MAP                                  = 0x95
-	NL80211_ATTR_NSS                                        = 0x106
-	NL80211_ATTR_OBSS_COLOR_BITMAP                          = 0x12e
-	NL80211_ATTR_OFFCHANNEL_TX_OK                           = 0x6c
-	NL80211_ATTR_OPER_CLASS                                 = 0xd6
-	NL80211_ATTR_OPMODE_NOTIF                               = 0xc2
-	NL80211_ATTR_P2P_CTWINDOW                               = 0xa2
-	NL80211_ATTR_P2P_OPPPS                                  = 0xa3
-	NL80211_ATTR_PAD                                        = 0xe5
-	NL80211_ATTR_PBSS                                       = 0xe2
-	NL80211_ATTR_PEER_AID                                   = 0xb5
-	NL80211_ATTR_PEER_MEASUREMENTS                          = 0x111
-	NL80211_ATTR_PID                                        = 0x52
-	NL80211_ATTR_PMK                                        = 0xfe
-	NL80211_ATTR_PMKID                                      = 0x55
-	NL80211_ATTR_PMK_LIFETIME                               = 0x11f
-	NL80211_ATTR_PMKR0_NAME                                 = 0x102
-	NL80211_ATTR_PMK_REAUTH_THRESHOLD                       = 0x120
-	NL80211_ATTR_PMKSA_CANDIDATE                            = 0x86
-	NL80211_ATTR_PORT_AUTHORIZED                            = 0x103
-	NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN                    = 0x5
-	NL80211_ATTR_POWER_RULE_MAX_EIRP                        = 0x6
-	NL80211_ATTR_PREV_BSSID                                 = 0x4f
-	NL80211_ATTR_PRIVACY                                    = 0x46
-	NL80211_ATTR_PROBE_RESP                                 = 0x91
-	NL80211_ATTR_PROBE_RESP_OFFLOAD                         = 0x90
-	NL80211_ATTR_PROTOCOL_FEATURES                          = 0xad
-	NL80211_ATTR_PS_STATE                                   = 0x5d
-	NL80211_ATTR_QOS_MAP                                    = 0xc7
-	NL80211_ATTR_RADAR_BACKGROUND                           = 0x134
-	NL80211_ATTR_RADAR_EVENT                                = 0xa8
-	NL80211_ATTR_REASON_CODE                                = 0x36
-	NL80211_ATTR_RECEIVE_MULTICAST                          = 0x121
-	NL80211_ATTR_RECONNECT_REQUESTED                        = 0x12b
-	NL80211_ATTR_REG_ALPHA2                                 = 0x21
-	NL80211_ATTR_REG_INDOOR                                 = 0xdd
-	NL80211_ATTR_REG_INITIATOR                              = 0x30
-	NL80211_ATTR_REG_RULE_FLAGS                             = 0x1
-	NL80211_ATTR_REG_RULES                                  = 0x22
-	NL80211_ATTR_REG_TYPE                                   = 0x31
-	NL80211_ATTR_REKEY_DATA                                 = 0x7a
-	NL80211_ATTR_REQ_IE                                     = 0x4d
-	NL80211_ATTR_RESP_IE                                    = 0x4e
-	NL80211_ATTR_ROAM_SUPPORT                               = 0x83
-	NL80211_ATTR_RX_FRAME_TYPES                             = 0x64
-	NL80211_ATTR_RX_HW_TIMESTAMP                            = 0x140
-	NL80211_ATTR_RXMGMT_FLAGS                               = 0xbc
-	NL80211_ATTR_RX_SIGNAL_DBM                              = 0x97
-	NL80211_ATTR_S1G_CAPABILITY                             = 0x128
-	NL80211_ATTR_S1G_CAPABILITY_MASK                        = 0x129
-	NL80211_ATTR_SAE_DATA                                   = 0x9c
-	NL80211_ATTR_SAE_PASSWORD                               = 0x115
-	NL80211_ATTR_SAE_PWE                                    = 0x12a
-	NL80211_ATTR_SAR_SPEC                                   = 0x12c
-	NL80211_ATTR_SCAN_FLAGS                                 = 0x9e
-	NL80211_ATTR_SCAN_FREQ_KHZ                              = 0x124
-	NL80211_ATTR_SCAN_FREQUENCIES                           = 0x2c
-	NL80211_ATTR_SCAN_GENERATION                            = 0x2e
-	NL80211_ATTR_SCAN_SSIDS                                 = 0x2d
-	NL80211_ATTR_SCAN_START_TIME_TSF_BSSID                  = 0xea
-	NL80211_ATTR_SCAN_START_TIME_TSF                        = 0xe9
-	NL80211_ATTR_SCAN_SUPP_RATES                            = 0x7d
-	NL80211_ATTR_SCHED_SCAN_DELAY                           = 0xdc
-	NL80211_ATTR_SCHED_SCAN_INTERVAL                        = 0x77
-	NL80211_ATTR_SCHED_SCAN_MATCH                           = 0x84
-	NL80211_ATTR_SCHED_SCAN_MATCH_SSID                      = 0x1
-	NL80211_ATTR_SCHED_SCAN_MAX_REQS                        = 0x100
-	NL80211_ATTR_SCHED_SCAN_MULTI                           = 0xff
-	NL80211_ATTR_SCHED_SCAN_PLANS                           = 0xe1
-	NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI                   = 0xf6
-	NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST                     = 0xf7
-	NL80211_ATTR_SMPS_MODE                                  = 0xd5
-	NL80211_ATTR_SOCKET_OWNER                               = 0xcc
-	NL80211_ATTR_SOFTWARE_IFTYPES                           = 0x79
-	NL80211_ATTR_SPLIT_WIPHY_DUMP                           = 0xae
-	NL80211_ATTR_SSID                                       = 0x34
-	NL80211_ATTR_STA_AID                                    = 0x10
-	NL80211_ATTR_STA_CAPABILITY                             = 0xab
-	NL80211_ATTR_STA_EXT_CAPABILITY                         = 0xac
-	NL80211_ATTR_STA_FLAGS2                                 = 0x43
-	NL80211_ATTR_STA_FLAGS                                  = 0x11
-	NL80211_ATTR_STA_INFO                                   = 0x15
-	NL80211_ATTR_STA_LISTEN_INTERVAL                        = 0x12
-	NL80211_ATTR_STA_PLINK_ACTION                           = 0x19
-	NL80211_ATTR_STA_PLINK_STATE                            = 0x74
-	NL80211_ATTR_STA_SUPPORTED_CHANNELS                     = 0xbd
-	NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES                 = 0xbe
-	NL80211_ATTR_STA_SUPPORTED_RATES                        = 0x13
-	NL80211_ATTR_STA_SUPPORT_P2P_PS                         = 0xe4
-	NL80211_ATTR_STATUS_CODE                                = 0x48
-	NL80211_ATTR_STA_TX_POWER                               = 0x114
-	NL80211_ATTR_STA_TX_POWER_SETTING                       = 0x113
-	NL80211_ATTR_STA_VLAN                                   = 0x14
-	NL80211_ATTR_STA_WME                                    = 0x81
-	NL80211_ATTR_SUPPORT_10_MHZ                             = 0xc1
-	NL80211_ATTR_SUPPORT_5_MHZ                              = 0xc0
-	NL80211_ATTR_SUPPORT_AP_UAPSD                           = 0x82
-	NL80211_ATTR_SUPPORTED_COMMANDS                         = 0x32
-	NL80211_ATTR_SUPPORTED_IFTYPES                          = 0x20
-	NL80211_ATTR_SUPPORT_IBSS_RSN                           = 0x68
-	NL80211_ATTR_SUPPORT_MESH_AUTH                          = 0x73
-	NL80211_ATTR_SURVEY_INFO                                = 0x54
-	NL80211_ATTR_SURVEY_RADIO_STATS                         = 0xda
-	NL80211_ATTR_TD_BITMAP                                  = 0x141
-	NL80211_ATTR_TDLS_ACTION                                = 0x88
-	NL80211_ATTR_TDLS_DIALOG_TOKEN                          = 0x89
-	NL80211_ATTR_TDLS_EXTERNAL_SETUP                        = 0x8c
-	NL80211_ATTR_TDLS_INITIATOR                             = 0xcf
-	NL80211_ATTR_TDLS_OPERATION                             = 0x8a
-	NL80211_ATTR_TDLS_PEER_CAPABILITY                       = 0xcb
-	NL80211_ATTR_TDLS_SUPPORT                               = 0x8b
-	NL80211_ATTR_TESTDATA                                   = 0x45
-	NL80211_ATTR_TID_CONFIG                                 = 0x11d
-	NL80211_ATTR_TIMED_OUT                                  = 0x41
-	NL80211_ATTR_TIMEOUT                                    = 0x110
-	NL80211_ATTR_TIMEOUT_REASON                             = 0xf8
-	NL80211_ATTR_TSID                                       = 0xd2
-	NL80211_ATTR_TWT_RESPONDER                              = 0x116
-	NL80211_ATTR_TX_FRAME_TYPES                             = 0x63
-	NL80211_ATTR_TX_HW_TIMESTAMP                            = 0x13f
-	NL80211_ATTR_TX_NO_CCK_RATE                             = 0x87
-	NL80211_ATTR_TXQ_LIMIT                                  = 0x10a
-	NL80211_ATTR_TXQ_MEMORY_LIMIT                           = 0x10b
-	NL80211_ATTR_TXQ_QUANTUM                                = 0x10c
-	NL80211_ATTR_TXQ_STATS                                  = 0x109
-	NL80211_ATTR_TX_RATES                                   = 0x5a
-	NL80211_ATTR_UNSOL_BCAST_PROBE_RESP                     = 0x127
-	NL80211_ATTR_UNSPEC                                     = 0x0
-	NL80211_ATTR_USE_MFP                                    = 0x42
-	NL80211_ATTR_USER_PRIO                                  = 0xd3
-	NL80211_ATTR_USER_REG_HINT_TYPE                         = 0x9a
-	NL80211_ATTR_USE_RRM                                    = 0xd0
-	NL80211_ATTR_VENDOR_DATA                                = 0xc5
-	NL80211_ATTR_VENDOR_EVENTS                              = 0xc6
-	NL80211_ATTR_VENDOR_ID                                  = 0xc3
-	NL80211_ATTR_VENDOR_SUBCMD                              = 0xc4
-	NL80211_ATTR_VHT_CAPABILITY                             = 0x9d
-	NL80211_ATTR_VHT_CAPABILITY_MASK                        = 0xb0
-	NL80211_ATTR_VLAN_ID                                    = 0x11a
-	NL80211_ATTR_WANT_1X_4WAY_HS                            = 0x101
-	NL80211_ATTR_WDEV                                       = 0x99
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX                     = 0x72
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX                     = 0x71
-	NL80211_ATTR_WIPHY_ANTENNA_RX                           = 0x6a
-	NL80211_ATTR_WIPHY_ANTENNA_TX                           = 0x69
-	NL80211_ATTR_WIPHY_BANDS                                = 0x16
-	NL80211_ATTR_WIPHY_CHANNEL_TYPE                         = 0x27
-	NL80211_ATTR_WIPHY                                      = 0x1
-	NL80211_ATTR_WIPHY_COVERAGE_CLASS                       = 0x59
-	NL80211_ATTR_WIPHY_DYN_ACK                              = 0xd1
-	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG                       = 0x119
-	NL80211_ATTR_WIPHY_EDMG_CHANNELS                        = 0x118
-	NL80211_ATTR_WIPHY_FRAG_THRESHOLD                       = 0x3f
-	NL80211_ATTR_WIPHY_FREQ                                 = 0x26
-	NL80211_ATTR_WIPHY_FREQ_HINT                            = 0xc9
-	NL80211_ATTR_WIPHY_FREQ_OFFSET                          = 0x122
-	NL80211_ATTR_WIPHY_NAME                                 = 0x2
-	NL80211_ATTR_WIPHY_RETRY_LONG                           = 0x3e
-	NL80211_ATTR_WIPHY_RETRY_SHORT                          = 0x3d
-	NL80211_ATTR_WIPHY_RTS_THRESHOLD                        = 0x40
-	NL80211_ATTR_WIPHY_SELF_MANAGED_REG                     = 0xd8
-	NL80211_ATTR_WIPHY_TX_POWER_LEVEL                       = 0x62
-	NL80211_ATTR_WIPHY_TX_POWER_SETTING                     = 0x61
-	NL80211_ATTR_WIPHY_TXQ_PARAMS                           = 0x25
-	NL80211_ATTR_WOWLAN_TRIGGERS                            = 0x75
-	NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED                  = 0x76
-	NL80211_ATTR_WPA_VERSIONS                               = 0x4b
-	NL80211_AUTHTYPE_AUTOMATIC                              = 0x8
-	NL80211_AUTHTYPE_FILS_PK                                = 0x7
-	NL80211_AUTHTYPE_FILS_SK                                = 0x5
-	NL80211_AUTHTYPE_FILS_SK_PFS                            = 0x6
-	NL80211_AUTHTYPE_FT                                     = 0x2
-	NL80211_AUTHTYPE_MAX                                    = 0x7
-	NL80211_AUTHTYPE_NETWORK_EAP                            = 0x3
-	NL80211_AUTHTYPE_OPEN_SYSTEM                            = 0x0
-	NL80211_AUTHTYPE_SAE                                    = 0x4
-	NL80211_AUTHTYPE_SHARED_KEY                             = 0x1
-	NL80211_BAND_2GHZ                                       = 0x0
-	NL80211_BAND_5GHZ                                       = 0x1
-	NL80211_BAND_60GHZ                                      = 0x2
-	NL80211_BAND_6GHZ                                       = 0x3
-	NL80211_BAND_ATTR_EDMG_BW_CONFIG                        = 0xb
-	NL80211_BAND_ATTR_EDMG_CHANNELS                         = 0xa
-	NL80211_BAND_ATTR_FREQS                                 = 0x1
-	NL80211_BAND_ATTR_HT_AMPDU_DENSITY                      = 0x6
-	NL80211_BAND_ATTR_HT_AMPDU_FACTOR                       = 0x5
-	NL80211_BAND_ATTR_HT_CAPA                               = 0x4
-	NL80211_BAND_ATTR_HT_MCS_SET                            = 0x3
-	NL80211_BAND_ATTR_IFTYPE_DATA                           = 0x9
-	NL80211_BAND_ATTR_MAX                                   = 0xd
-	NL80211_BAND_ATTR_RATES                                 = 0x2
-	NL80211_BAND_ATTR_VHT_CAPA                              = 0x8
-	NL80211_BAND_ATTR_VHT_MCS_SET                           = 0x7
-	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC                    = 0x8
-	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET                = 0xa
-	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY                    = 0x9
-	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE                    = 0xb
-	NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA                   = 0x6
-	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC                     = 0x2
-	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET                 = 0x4
-	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY                     = 0x3
-	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE                     = 0x5
-	NL80211_BAND_IFTYPE_ATTR_IFTYPES                        = 0x1
-	NL80211_BAND_IFTYPE_ATTR_MAX                            = 0xb
-	NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS                   = 0x7
-	NL80211_BAND_LC                                         = 0x5
-	NL80211_BAND_S1GHZ                                      = 0x4
-	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE                 = 0x2
-	NL80211_BITRATE_ATTR_MAX                                = 0x2
-	NL80211_BITRATE_ATTR_RATE                               = 0x1
-	NL80211_BSS_BEACON_IES                                  = 0xb
-	NL80211_BSS_BEACON_INTERVAL                             = 0x4
-	NL80211_BSS_BEACON_TSF                                  = 0xd
-	NL80211_BSS_BSSID                                       = 0x1
-	NL80211_BSS_CAPABILITY                                  = 0x5
-	NL80211_BSS_CHAIN_SIGNAL                                = 0x13
-	NL80211_BSS_CHAN_WIDTH_10                               = 0x1
-	NL80211_BSS_CHAN_WIDTH_1                                = 0x3
-	NL80211_BSS_CHAN_WIDTH_20                               = 0x0
-	NL80211_BSS_CHAN_WIDTH_2                                = 0x4
-	NL80211_BSS_CHAN_WIDTH_5                                = 0x2
-	NL80211_BSS_CHAN_WIDTH                                  = 0xc
-	NL80211_BSS_FREQUENCY                                   = 0x2
-	NL80211_BSS_FREQUENCY_OFFSET                            = 0x14
-	NL80211_BSS_INFORMATION_ELEMENTS                        = 0x6
-	NL80211_BSS_LAST_SEEN_BOOTTIME                          = 0xf
-	NL80211_BSS_MAX                                         = 0x18
-	NL80211_BSS_MLD_ADDR                                    = 0x16
-	NL80211_BSS_MLO_LINK_ID                                 = 0x15
-	NL80211_BSS_PAD                                         = 0x10
-	NL80211_BSS_PARENT_BSSID                                = 0x12
-	NL80211_BSS_PARENT_TSF                                  = 0x11
-	NL80211_BSS_PRESP_DATA                                  = 0xe
-	NL80211_BSS_SEEN_MS_AGO                                 = 0xa
-	NL80211_BSS_SELECT_ATTR_BAND_PREF                       = 0x2
-	NL80211_BSS_SELECT_ATTR_MAX                             = 0x3
-	NL80211_BSS_SELECT_ATTR_RSSI_ADJUST                     = 0x3
-	NL80211_BSS_SELECT_ATTR_RSSI                            = 0x1
-	NL80211_BSS_SIGNAL_MBM                                  = 0x7
-	NL80211_BSS_SIGNAL_UNSPEC                               = 0x8
-	NL80211_BSS_STATUS_ASSOCIATED                           = 0x1
-	NL80211_BSS_STATUS_AUTHENTICATED                        = 0x0
-	NL80211_BSS_STATUS                                      = 0x9
-	NL80211_BSS_STATUS_IBSS_JOINED                          = 0x2
-	NL80211_BSS_TSF                                         = 0x3
-	NL80211_CHAN_HT20                                       = 0x1
-	NL80211_CHAN_HT40MINUS                                  = 0x2
-	NL80211_CHAN_HT40PLUS                                   = 0x3
-	NL80211_CHAN_NO_HT                                      = 0x0
-	NL80211_CHAN_WIDTH_10                                   = 0x7
-	NL80211_CHAN_WIDTH_160                                  = 0x5
-	NL80211_CHAN_WIDTH_16                                   = 0xc
-	NL80211_CHAN_WIDTH_1                                    = 0x8
-	NL80211_CHAN_WIDTH_20                                   = 0x1
-	NL80211_CHAN_WIDTH_20_NOHT                              = 0x0
-	NL80211_CHAN_WIDTH_2                                    = 0x9
-	NL80211_CHAN_WIDTH_320                                  = 0xd
-	NL80211_CHAN_WIDTH_40                                   = 0x2
-	NL80211_CHAN_WIDTH_4                                    = 0xa
-	NL80211_CHAN_WIDTH_5                                    = 0x6
-	NL80211_CHAN_WIDTH_80                                   = 0x3
-	NL80211_CHAN_WIDTH_80P80                                = 0x4
-	NL80211_CHAN_WIDTH_8                                    = 0xb
-	NL80211_CMD_ABORT_SCAN                                  = 0x72
-	NL80211_CMD_ACTION                                      = 0x3b
-	NL80211_CMD_ACTION_TX_STATUS                            = 0x3c
-	NL80211_CMD_ADD_LINK                                    = 0x94
-	NL80211_CMD_ADD_LINK_STA                                = 0x96
-	NL80211_CMD_ADD_NAN_FUNCTION                            = 0x75
-	NL80211_CMD_ADD_TX_TS                                   = 0x69
-	NL80211_CMD_ASSOC_COMEBACK                              = 0x93
-	NL80211_CMD_ASSOCIATE                                   = 0x26
-	NL80211_CMD_AUTHENTICATE                                = 0x25
-	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL                    = 0x38
-	NL80211_CMD_CHANGE_NAN_CONFIG                           = 0x77
-	NL80211_CMD_CHANNEL_SWITCH                              = 0x66
-	NL80211_CMD_CH_SWITCH_NOTIFY                            = 0x58
-	NL80211_CMD_CH_SWITCH_STARTED_NOTIFY                    = 0x6e
-	NL80211_CMD_COLOR_CHANGE_ABORTED                        = 0x90
-	NL80211_CMD_COLOR_CHANGE_COMPLETED                      = 0x91
-	NL80211_CMD_COLOR_CHANGE_REQUEST                        = 0x8e
-	NL80211_CMD_COLOR_CHANGE_STARTED                        = 0x8f
-	NL80211_CMD_CONNECT                                     = 0x2e
-	NL80211_CMD_CONN_FAILED                                 = 0x5b
-	NL80211_CMD_CONTROL_PORT_FRAME                          = 0x81
-	NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS                = 0x8b
-	NL80211_CMD_CRIT_PROTOCOL_START                         = 0x62
-	NL80211_CMD_CRIT_PROTOCOL_STOP                          = 0x63
-	NL80211_CMD_DEAUTHENTICATE                              = 0x27
-	NL80211_CMD_DEL_BEACON                                  = 0x10
-	NL80211_CMD_DEL_INTERFACE                               = 0x8
-	NL80211_CMD_DEL_KEY                                     = 0xc
-	NL80211_CMD_DEL_MPATH                                   = 0x18
-	NL80211_CMD_DEL_NAN_FUNCTION                            = 0x76
-	NL80211_CMD_DEL_PMK                                     = 0x7c
-	NL80211_CMD_DEL_PMKSA                                   = 0x35
-	NL80211_CMD_DEL_STATION                                 = 0x14
-	NL80211_CMD_DEL_TX_TS                                   = 0x6a
-	NL80211_CMD_DEL_WIPHY                                   = 0x4
-	NL80211_CMD_DISASSOCIATE                                = 0x28
-	NL80211_CMD_DISCONNECT                                  = 0x30
-	NL80211_CMD_EXTERNAL_AUTH                               = 0x7f
-	NL80211_CMD_FLUSH_PMKSA                                 = 0x36
-	NL80211_CMD_FRAME                                       = 0x3b
-	NL80211_CMD_FRAME_TX_STATUS                             = 0x3c
-	NL80211_CMD_FRAME_WAIT_CANCEL                           = 0x43
-	NL80211_CMD_FT_EVENT                                    = 0x61
-	NL80211_CMD_GET_BEACON                                  = 0xd
-	NL80211_CMD_GET_COALESCE                                = 0x64
-	NL80211_CMD_GET_FTM_RESPONDER_STATS                     = 0x82
-	NL80211_CMD_GET_INTERFACE                               = 0x5
-	NL80211_CMD_GET_KEY                                     = 0x9
-	NL80211_CMD_GET_MESH_CONFIG                             = 0x1c
-	NL80211_CMD_GET_MESH_PARAMS                             = 0x1c
-	NL80211_CMD_GET_MPATH                                   = 0x15
-	NL80211_CMD_GET_MPP                                     = 0x6b
-	NL80211_CMD_GET_POWER_SAVE                              = 0x3e
-	NL80211_CMD_GET_PROTOCOL_FEATURES                       = 0x5f
-	NL80211_CMD_GET_REG                                     = 0x1f
-	NL80211_CMD_GET_SCAN                                    = 0x20
-	NL80211_CMD_GET_STATION                                 = 0x11
-	NL80211_CMD_GET_SURVEY                                  = 0x32
-	NL80211_CMD_GET_WIPHY                                   = 0x1
-	NL80211_CMD_GET_WOWLAN                                  = 0x49
-	NL80211_CMD_JOIN_IBSS                                   = 0x2b
-	NL80211_CMD_JOIN_MESH                                   = 0x44
-	NL80211_CMD_JOIN_OCB                                    = 0x6c
-	NL80211_CMD_LEAVE_IBSS                                  = 0x2c
-	NL80211_CMD_LEAVE_MESH                                  = 0x45
-	NL80211_CMD_LEAVE_OCB                                   = 0x6d
-	NL80211_CMD_MAX                                         = 0x9b
-	NL80211_CMD_MICHAEL_MIC_FAILURE                         = 0x29
-	NL80211_CMD_MODIFY_LINK_STA                             = 0x97
-	NL80211_CMD_NAN_MATCH                                   = 0x78
-	NL80211_CMD_NEW_BEACON                                  = 0xf
-	NL80211_CMD_NEW_INTERFACE                               = 0x7
-	NL80211_CMD_NEW_KEY                                     = 0xb
-	NL80211_CMD_NEW_MPATH                                   = 0x17
-	NL80211_CMD_NEW_PEER_CANDIDATE                          = 0x48
-	NL80211_CMD_NEW_SCAN_RESULTS                            = 0x22
-	NL80211_CMD_NEW_STATION                                 = 0x13
-	NL80211_CMD_NEW_SURVEY_RESULTS                          = 0x33
-	NL80211_CMD_NEW_WIPHY                                   = 0x3
-	NL80211_CMD_NOTIFY_CQM                                  = 0x40
-	NL80211_CMD_NOTIFY_RADAR                                = 0x86
-	NL80211_CMD_OBSS_COLOR_COLLISION                        = 0x8d
-	NL80211_CMD_PEER_MEASUREMENT_COMPLETE                   = 0x85
-	NL80211_CMD_PEER_MEASUREMENT_RESULT                     = 0x84
-	NL80211_CMD_PEER_MEASUREMENT_START                      = 0x83
-	NL80211_CMD_PMKSA_CANDIDATE                             = 0x50
-	NL80211_CMD_PORT_AUTHORIZED                             = 0x7d
-	NL80211_CMD_PROBE_CLIENT                                = 0x54
-	NL80211_CMD_PROBE_MESH_LINK                             = 0x88
-	NL80211_CMD_RADAR_DETECT                                = 0x5e
-	NL80211_CMD_REG_BEACON_HINT                             = 0x2a
-	NL80211_CMD_REG_CHANGE                                  = 0x24
-	NL80211_CMD_REGISTER_ACTION                             = 0x3a
-	NL80211_CMD_REGISTER_BEACONS                            = 0x55
-	NL80211_CMD_REGISTER_FRAME                              = 0x3a
-	NL80211_CMD_RELOAD_REGDB                                = 0x7e
-	NL80211_CMD_REMAIN_ON_CHANNEL                           = 0x37
-	NL80211_CMD_REMOVE_LINK                                 = 0x95
-	NL80211_CMD_REMOVE_LINK_STA                             = 0x98
-	NL80211_CMD_REQ_SET_REG                                 = 0x1b
-	NL80211_CMD_ROAM                                        = 0x2f
-	NL80211_CMD_SCAN_ABORTED                                = 0x23
-	NL80211_CMD_SCHED_SCAN_RESULTS                          = 0x4d
-	NL80211_CMD_SCHED_SCAN_STOPPED                          = 0x4e
-	NL80211_CMD_SET_BEACON                                  = 0xe
-	NL80211_CMD_SET_BSS                                     = 0x19
-	NL80211_CMD_SET_CHANNEL                                 = 0x41
-	NL80211_CMD_SET_COALESCE                                = 0x65
-	NL80211_CMD_SET_CQM                                     = 0x3f
-	NL80211_CMD_SET_FILS_AAD                                = 0x92
-	NL80211_CMD_SET_INTERFACE                               = 0x6
-	NL80211_CMD_SET_KEY                                     = 0xa
-	NL80211_CMD_SET_MAC_ACL                                 = 0x5d
-	NL80211_CMD_SET_MCAST_RATE                              = 0x5c
-	NL80211_CMD_SET_MESH_CONFIG                             = 0x1d
-	NL80211_CMD_SET_MESH_PARAMS                             = 0x1d
-	NL80211_CMD_SET_MGMT_EXTRA_IE                           = 0x1e
-	NL80211_CMD_SET_MPATH                                   = 0x16
-	NL80211_CMD_SET_MULTICAST_TO_UNICAST                    = 0x79
-	NL80211_CMD_SET_NOACK_MAP                               = 0x57
-	NL80211_CMD_SET_PMK                                     = 0x7b
-	NL80211_CMD_SET_PMKSA                                   = 0x34
-	NL80211_CMD_SET_POWER_SAVE                              = 0x3d
-	NL80211_CMD_SET_QOS_MAP                                 = 0x68
-	NL80211_CMD_SET_REG                                     = 0x1a
-	NL80211_CMD_SET_REKEY_OFFLOAD                           = 0x4f
-	NL80211_CMD_SET_SAR_SPECS                               = 0x8c
-	NL80211_CMD_SET_STATION                                 = 0x12
-	NL80211_CMD_SET_TID_CONFIG                              = 0x89
-	NL80211_CMD_SET_TX_BITRATE_MASK                         = 0x39
-	NL80211_CMD_SET_WDS_PEER                                = 0x42
-	NL80211_CMD_SET_WIPHY                                   = 0x2
-	NL80211_CMD_SET_WIPHY_NETNS                             = 0x31
-	NL80211_CMD_SET_WOWLAN                                  = 0x4a
-	NL80211_CMD_STA_OPMODE_CHANGED                          = 0x80
-	NL80211_CMD_START_AP                                    = 0xf
-	NL80211_CMD_START_NAN                                   = 0x73
-	NL80211_CMD_START_P2P_DEVICE                            = 0x59
-	NL80211_CMD_START_SCHED_SCAN                            = 0x4b
-	NL80211_CMD_STOP_AP                                     = 0x10
-	NL80211_CMD_STOP_NAN                                    = 0x74
-	NL80211_CMD_STOP_P2P_DEVICE                             = 0x5a
-	NL80211_CMD_STOP_SCHED_SCAN                             = 0x4c
-	NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH                  = 0x70
-	NL80211_CMD_TDLS_CHANNEL_SWITCH                         = 0x6f
-	NL80211_CMD_TDLS_MGMT                                   = 0x52
-	NL80211_CMD_TDLS_OPER                                   = 0x51
-	NL80211_CMD_TESTMODE                                    = 0x2d
-	NL80211_CMD_TRIGGER_SCAN                                = 0x21
-	NL80211_CMD_UNEXPECTED_4ADDR_FRAME                      = 0x56
-	NL80211_CMD_UNEXPECTED_FRAME                            = 0x53
-	NL80211_CMD_UNPROT_BEACON                               = 0x8a
-	NL80211_CMD_UNPROT_DEAUTHENTICATE                       = 0x46
-	NL80211_CMD_UNPROT_DISASSOCIATE                         = 0x47
-	NL80211_CMD_UNSPEC                                      = 0x0
-	NL80211_CMD_UPDATE_CONNECT_PARAMS                       = 0x7a
-	NL80211_CMD_UPDATE_FT_IES                               = 0x60
-	NL80211_CMD_UPDATE_OWE_INFO                             = 0x87
-	NL80211_CMD_VENDOR                                      = 0x67
-	NL80211_CMD_WIPHY_REG_CHANGE                            = 0x71
-	NL80211_COALESCE_CONDITION_MATCH                        = 0x0
-	NL80211_COALESCE_CONDITION_NO_MATCH                     = 0x1
-	NL80211_CONN_FAIL_BLOCKED_CLIENT                        = 0x1
-	NL80211_CONN_FAIL_MAX_CLIENTS                           = 0x0
-	NL80211_CQM_RSSI_BEACON_LOSS_EVENT                      = 0x2
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH                   = 0x1
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW                    = 0x0
-	NL80211_CQM_TXE_MAX_INTVL                               = 0x708
-	NL80211_CRIT_PROTO_APIPA                                = 0x3
-	NL80211_CRIT_PROTO_DHCP                                 = 0x1
-	NL80211_CRIT_PROTO_EAPOL                                = 0x2
-	NL80211_CRIT_PROTO_MAX_DURATION                         = 0x1388
-	NL80211_CRIT_PROTO_UNSPEC                               = 0x0
-	NL80211_DFS_AVAILABLE                                   = 0x2
-	NL80211_DFS_ETSI                                        = 0x2
-	NL80211_DFS_FCC                                         = 0x1
-	NL80211_DFS_JP                                          = 0x3
-	NL80211_DFS_UNAVAILABLE                                 = 0x1
-	NL80211_DFS_UNSET                                       = 0x0
-	NL80211_DFS_USABLE                                      = 0x0
-	NL80211_EDMG_BW_CONFIG_MAX                              = 0xf
-	NL80211_EDMG_BW_CONFIG_MIN                              = 0x4
-	NL80211_EDMG_CHANNELS_MAX                               = 0x3c
-	NL80211_EDMG_CHANNELS_MIN                               = 0x1
-	NL80211_EHT_MAX_CAPABILITY_LEN                          = 0x33
-	NL80211_EHT_MIN_CAPABILITY_LEN                          = 0xd
-	NL80211_EXTERNAL_AUTH_ABORT                             = 0x1
-	NL80211_EXTERNAL_AUTH_START                             = 0x0
-	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK               = 0x32
-	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X               = 0x10
-	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK              = 0xf
-	NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP             = 0x12
-	NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT                  = 0x1b
-	NL80211_EXT_FEATURE_AIRTIME_FAIRNESS                    = 0x21
-	NL80211_EXT_FEATURE_AP_PMKSA_CACHING                    = 0x22
-	NL80211_EXT_FEATURE_AQL                                 = 0x28
-	NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT            = 0x2e
-	NL80211_EXT_FEATURE_BEACON_PROTECTION                   = 0x29
-	NL80211_EXT_FEATURE_BEACON_RATE_HE                      = 0x36
-	NL80211_EXT_FEATURE_BEACON_RATE_HT                      = 0x7
-	NL80211_EXT_FEATURE_BEACON_RATE_LEGACY                  = 0x6
-	NL80211_EXT_FEATURE_BEACON_RATE_VHT                     = 0x8
-	NL80211_EXT_FEATURE_BSS_COLOR                           = 0x3a
-	NL80211_EXT_FEATURE_BSS_PARENT_TSF                      = 0x4
-	NL80211_EXT_FEATURE_CAN_REPLACE_PTK0                    = 0x1f
-	NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH             = 0x2a
-	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211           = 0x1a
-	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS = 0x30
-	NL80211_EXT_FEATURE_CQM_RSSI_LIST                       = 0xd
-	NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT             = 0x1b
-	NL80211_EXT_FEATURE_DEL_IBSS_STA                        = 0x2c
-	NL80211_EXT_FEATURE_DFS_OFFLOAD                         = 0x19
-	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER                = 0x20
-	NL80211_EXT_FEATURE_EXT_KEY_ID                          = 0x24
-	NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD                 = 0x3b
-	NL80211_EXT_FEATURE_FILS_DISCOVERY                      = 0x34
-	NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME               = 0x11
-	NL80211_EXT_FEATURE_FILS_SK_OFFLOAD                     = 0xe
-	NL80211_EXT_FEATURE_FILS_STA                            = 0x9
-	NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN                  = 0x18
-	NL80211_EXT_FEATURE_LOW_POWER_SCAN                      = 0x17
-	NL80211_EXT_FEATURE_LOW_SPAN_SCAN                       = 0x16
-	NL80211_EXT_FEATURE_MFP_OPTIONAL                        = 0x15
-	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA                   = 0xa
-	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED         = 0xb
-	NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS             = 0x2d
-	NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER                 = 0x2
-	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION  = 0x14
-	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE          = 0x13
-	NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION        = 0x31
-	NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE                 = 0x3d
-	NL80211_EXT_FEATURE_PROTECTED_TWT                       = 0x2b
-	NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE         = 0x39
-	NL80211_EXT_FEATURE_RADAR_BACKGROUND                    = 0x3c
-	NL80211_EXT_FEATURE_RRM                                 = 0x1
-	NL80211_EXT_FEATURE_SAE_OFFLOAD_AP                      = 0x33
-	NL80211_EXT_FEATURE_SAE_OFFLOAD                         = 0x26
-	NL80211_EXT_FEATURE_SCAN_FREQ_KHZ                       = 0x2f
-	NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT               = 0x1e
-	NL80211_EXT_FEATURE_SCAN_RANDOM_SN                      = 0x1d
-	NL80211_EXT_FEATURE_SCAN_START_TIME                     = 0x3
-	NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD = 0x23
-	NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI            = 0xc
-	NL80211_EXT_FEATURE_SECURE_LTF                          = 0x37
-	NL80211_EXT_FEATURE_SECURE_RTT                          = 0x38
-	NL80211_EXT_FEATURE_SET_SCAN_DWELL                      = 0x5
-	NL80211_EXT_FEATURE_STA_TX_PWR                          = 0x25
-	NL80211_EXT_FEATURE_TXQS                                = 0x1c
-	NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP              = 0x35
-	NL80211_EXT_FEATURE_VHT_IBSS                            = 0x0
-	NL80211_EXT_FEATURE_VLAN_OFFLOAD                        = 0x27
-	NL80211_FEATURE_ACKTO_ESTIMATION                        = 0x800000
-	NL80211_FEATURE_ACTIVE_MONITOR                          = 0x20000
-	NL80211_FEATURE_ADVERTISE_CHAN_LIMITS                   = 0x4000
-	NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE               = 0x40000
-	NL80211_FEATURE_AP_SCAN                                 = 0x100
-	NL80211_FEATURE_CELL_BASE_REG_HINTS                     = 0x8
-	NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES               = 0x80000
-	NL80211_FEATURE_DYNAMIC_SMPS                            = 0x2000000
-	NL80211_FEATURE_FULL_AP_CLIENT_STATE                    = 0x8000
-	NL80211_FEATURE_HT_IBSS                                 = 0x2
-	NL80211_FEATURE_INACTIVITY_TIMER                        = 0x4
-	NL80211_FEATURE_LOW_PRIORITY_SCAN                       = 0x40
-	NL80211_FEATURE_MAC_ON_CREATE                           = 0x8000000
-	NL80211_FEATURE_ND_RANDOM_MAC_ADDR                      = 0x80000000
-	NL80211_FEATURE_NEED_OBSS_SCAN                          = 0x400
-	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL                = 0x10
-	NL80211_FEATURE_P2P_GO_CTWIN                            = 0x800
-	NL80211_FEATURE_P2P_GO_OPPPS                            = 0x1000
-	NL80211_FEATURE_QUIET                                   = 0x200000
-	NL80211_FEATURE_SAE                                     = 0x20
-	NL80211_FEATURE_SCAN_FLUSH                              = 0x80
-	NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR                    = 0x20000000
-	NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR              = 0x40000000
-	NL80211_FEATURE_SK_TX_STATUS                            = 0x1
-	NL80211_FEATURE_STATIC_SMPS                             = 0x1000000
-	NL80211_FEATURE_SUPPORTS_WMM_ADMISSION                  = 0x4000000
-	NL80211_FEATURE_TDLS_CHANNEL_SWITCH                     = 0x10000000
-	NL80211_FEATURE_TX_POWER_INSERTION                      = 0x400000
-	NL80211_FEATURE_USERSPACE_MPM                           = 0x10000
-	NL80211_FEATURE_VIF_TXPOWER                             = 0x200
-	NL80211_FEATURE_WFA_TPC_IE_IN_PROBES                    = 0x100000
-	NL80211_FILS_DISCOVERY_ATTR_INT_MAX                     = 0x2
-	NL80211_FILS_DISCOVERY_ATTR_INT_MIN                     = 0x1
-	NL80211_FILS_DISCOVERY_ATTR_MAX                         = 0x3
-	NL80211_FILS_DISCOVERY_ATTR_TMPL                        = 0x3
-	NL80211_FILS_DISCOVERY_TMPL_MIN_LEN                     = 0x2a
-	NL80211_FREQUENCY_ATTR_16MHZ                            = 0x19
-	NL80211_FREQUENCY_ATTR_1MHZ                             = 0x15
-	NL80211_FREQUENCY_ATTR_2MHZ                             = 0x16
-	NL80211_FREQUENCY_ATTR_4MHZ                             = 0x17
-	NL80211_FREQUENCY_ATTR_8MHZ                             = 0x18
-	NL80211_FREQUENCY_ATTR_DFS_CAC_TIME                     = 0xd
-	NL80211_FREQUENCY_ATTR_DFS_STATE                        = 0x7
-	NL80211_FREQUENCY_ATTR_DFS_TIME                         = 0x8
-	NL80211_FREQUENCY_ATTR_DISABLED                         = 0x2
-	NL80211_FREQUENCY_ATTR_FREQ                             = 0x1
-	NL80211_FREQUENCY_ATTR_GO_CONCURRENT                    = 0xf
-	NL80211_FREQUENCY_ATTR_INDOOR_ONLY                      = 0xe
-	NL80211_FREQUENCY_ATTR_IR_CONCURRENT                    = 0xf
-	NL80211_FREQUENCY_ATTR_MAX                              = 0x21
-	NL80211_FREQUENCY_ATTR_MAX_TX_POWER                     = 0x6
-	NL80211_FREQUENCY_ATTR_NO_10MHZ                         = 0x11
-	NL80211_FREQUENCY_ATTR_NO_160MHZ                        = 0xc
-	NL80211_FREQUENCY_ATTR_NO_20MHZ                         = 0x10
-	NL80211_FREQUENCY_ATTR_NO_320MHZ                        = 0x1a
-	NL80211_FREQUENCY_ATTR_NO_80MHZ                         = 0xb
-	NL80211_FREQUENCY_ATTR_NO_EHT                           = 0x1b
-	NL80211_FREQUENCY_ATTR_NO_HE                            = 0x13
-	NL80211_FREQUENCY_ATTR_NO_HT40_MINUS                    = 0x9
-	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS                     = 0xa
-	NL80211_FREQUENCY_ATTR_NO_IBSS                          = 0x3
-	NL80211_FREQUENCY_ATTR_NO_IR                            = 0x3
-	NL80211_FREQUENCY_ATTR_OFFSET                           = 0x14
-	NL80211_FREQUENCY_ATTR_PASSIVE_SCAN                     = 0x3
-	NL80211_FREQUENCY_ATTR_RADAR                            = 0x5
-	NL80211_FREQUENCY_ATTR_WMM                              = 0x12
-	NL80211_FTM_RESP_ATTR_CIVICLOC                          = 0x3
-	NL80211_FTM_RESP_ATTR_ENABLED                           = 0x1
-	NL80211_FTM_RESP_ATTR_LCI                               = 0x2
-	NL80211_FTM_RESP_ATTR_MAX                               = 0x3
-	NL80211_FTM_STATS_ASAP_NUM                              = 0x4
-	NL80211_FTM_STATS_FAILED_NUM                            = 0x3
-	NL80211_FTM_STATS_MAX                                   = 0xa
-	NL80211_FTM_STATS_NON_ASAP_NUM                          = 0x5
-	NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM            = 0x9
-	NL80211_FTM_STATS_PAD                                   = 0xa
-	NL80211_FTM_STATS_PARTIAL_NUM                           = 0x2
-	NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM               = 0x8
-	NL80211_FTM_STATS_SUCCESS_NUM                           = 0x1
-	NL80211_FTM_STATS_TOTAL_DURATION_MSEC                   = 0x6
-	NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM                  = 0x7
-	NL80211_GENL_NAME                                       = "nl80211"
-	NL80211_HE_BSS_COLOR_ATTR_COLOR                         = 0x1
-	NL80211_HE_BSS_COLOR_ATTR_DISABLED                      = 0x2
-	NL80211_HE_BSS_COLOR_ATTR_MAX                           = 0x3
-	NL80211_HE_BSS_COLOR_ATTR_PARTIAL                       = 0x3
-	NL80211_HE_MAX_CAPABILITY_LEN                           = 0x36
-	NL80211_HE_MIN_CAPABILITY_LEN                           = 0x10
-	NL80211_HE_NSS_MAX                                      = 0x8
-	NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP                = 0x4
-	NL80211_HE_OBSS_PD_ATTR_MAX                             = 0x6
-	NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET                      = 0x2
-	NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET                      = 0x1
-	NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET              = 0x3
-	NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP            = 0x5
-	NL80211_HE_OBSS_PD_ATTR_SR_CTRL                         = 0x6
-	NL80211_HIDDEN_SSID_NOT_IN_USE                          = 0x0
-	NL80211_HIDDEN_SSID_ZERO_CONTENTS                       = 0x2
-	NL80211_HIDDEN_SSID_ZERO_LEN                            = 0x1
-	NL80211_HT_CAPABILITY_LEN                               = 0x1a
-	NL80211_IFACE_COMB_BI_MIN_GCD                           = 0x7
-	NL80211_IFACE_COMB_LIMITS                               = 0x1
-	NL80211_IFACE_COMB_MAXNUM                               = 0x2
-	NL80211_IFACE_COMB_NUM_CHANNELS                         = 0x4
-	NL80211_IFACE_COMB_RADAR_DETECT_REGIONS                 = 0x6
-	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS                  = 0x5
-	NL80211_IFACE_COMB_STA_AP_BI_MATCH                      = 0x3
-	NL80211_IFACE_COMB_UNSPEC                               = 0x0
-	NL80211_IFACE_LIMIT_MAX                                 = 0x1
-	NL80211_IFACE_LIMIT_TYPES                               = 0x2
-	NL80211_IFACE_LIMIT_UNSPEC                              = 0x0
-	NL80211_IFTYPE_ADHOC                                    = 0x1
-	NL80211_IFTYPE_AKM_ATTR_IFTYPES                         = 0x1
-	NL80211_IFTYPE_AKM_ATTR_MAX                             = 0x2
-	NL80211_IFTYPE_AKM_ATTR_SUITES                          = 0x2
-	NL80211_IFTYPE_AP                                       = 0x3
-	NL80211_IFTYPE_AP_VLAN                                  = 0x4
-	NL80211_IFTYPE_MAX                                      = 0xc
-	NL80211_IFTYPE_MESH_POINT                               = 0x7
-	NL80211_IFTYPE_MONITOR                                  = 0x6
-	NL80211_IFTYPE_NAN                                      = 0xc
-	NL80211_IFTYPE_OCB                                      = 0xb
-	NL80211_IFTYPE_P2P_CLIENT                               = 0x8
-	NL80211_IFTYPE_P2P_DEVICE                               = 0xa
-	NL80211_IFTYPE_P2P_GO                                   = 0x9
-	NL80211_IFTYPE_STATION                                  = 0x2
-	NL80211_IFTYPE_UNSPECIFIED                              = 0x0
-	NL80211_IFTYPE_WDS                                      = 0x5
-	NL80211_KCK_EXT_LEN                                     = 0x18
-	NL80211_KCK_LEN                                         = 0x10
-	NL80211_KEK_EXT_LEN                                     = 0x20
-	NL80211_KEK_LEN                                         = 0x10
-	NL80211_KEY_CIPHER                                      = 0x3
-	NL80211_KEY_DATA                                        = 0x1
-	NL80211_KEY_DEFAULT_BEACON                              = 0xa
-	NL80211_KEY_DEFAULT                                     = 0x5
-	NL80211_KEY_DEFAULT_MGMT                                = 0x6
-	NL80211_KEY_DEFAULT_TYPE_MULTICAST                      = 0x2
-	NL80211_KEY_DEFAULT_TYPES                               = 0x8
-	NL80211_KEY_DEFAULT_TYPE_UNICAST                        = 0x1
-	NL80211_KEY_IDX                                         = 0x2
-	NL80211_KEY_MAX                                         = 0xa
-	NL80211_KEY_MODE                                        = 0x9
-	NL80211_KEY_NO_TX                                       = 0x1
-	NL80211_KEY_RX_TX                                       = 0x0
-	NL80211_KEY_SEQ                                         = 0x4
-	NL80211_KEY_SET_TX                                      = 0x2
-	NL80211_KEY_TYPE                                        = 0x7
-	NL80211_KEYTYPE_GROUP                                   = 0x0
-	NL80211_KEYTYPE_PAIRWISE                                = 0x1
-	NL80211_KEYTYPE_PEERKEY                                 = 0x2
-	NL80211_MAX_NR_AKM_SUITES                               = 0x2
-	NL80211_MAX_NR_CIPHER_SUITES                            = 0x5
-	NL80211_MAX_SUPP_HT_RATES                               = 0x4d
-	NL80211_MAX_SUPP_RATES                                  = 0x20
-	NL80211_MAX_SUPP_REG_RULES                              = 0x80
-	NL80211_MBSSID_CONFIG_ATTR_EMA                          = 0x5
-	NL80211_MBSSID_CONFIG_ATTR_INDEX                        = 0x3
-	NL80211_MBSSID_CONFIG_ATTR_MAX                          = 0x5
-	NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY  = 0x2
-	NL80211_MBSSID_CONFIG_ATTR_MAX_INTERFACES               = 0x1
-	NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX                   = 0x4
-	NL80211_MESHCONF_ATTR_MAX                               = 0x1f
-	NL80211_MESHCONF_AUTO_OPEN_PLINKS                       = 0x7
-	NL80211_MESHCONF_AWAKE_WINDOW                           = 0x1b
-	NL80211_MESHCONF_CONFIRM_TIMEOUT                        = 0x2
-	NL80211_MESHCONF_CONNECTED_TO_AS                        = 0x1f
-	NL80211_MESHCONF_CONNECTED_TO_GATE                      = 0x1d
-	NL80211_MESHCONF_ELEMENT_TTL                            = 0xf
-	NL80211_MESHCONF_FORWARDING                             = 0x13
-	NL80211_MESHCONF_GATE_ANNOUNCEMENTS                     = 0x11
-	NL80211_MESHCONF_HOLDING_TIMEOUT                        = 0x3
-	NL80211_MESHCONF_HT_OPMODE                              = 0x16
-	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT               = 0xb
-	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL             = 0x19
-	NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES                  = 0x8
-	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME                = 0xd
-	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT              = 0x17
-	NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL                 = 0x12
-	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL                 = 0xc
-	NL80211_MESHCONF_HWMP_RANN_INTERVAL                     = 0x10
-	NL80211_MESHCONF_HWMP_ROOT_INTERVAL                     = 0x18
-	NL80211_MESHCONF_HWMP_ROOTMODE                          = 0xe
-	NL80211_MESHCONF_MAX_PEER_LINKS                         = 0x4
-	NL80211_MESHCONF_MAX_RETRIES                            = 0x5
-	NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT                  = 0xa
-	NL80211_MESHCONF_NOLEARN                                = 0x1e
-	NL80211_MESHCONF_PATH_REFRESH_TIME                      = 0x9
-	NL80211_MESHCONF_PLINK_TIMEOUT                          = 0x1c
-	NL80211_MESHCONF_POWER_MODE                             = 0x1a
-	NL80211_MESHCONF_RETRY_TIMEOUT                          = 0x1
-	NL80211_MESHCONF_RSSI_THRESHOLD                         = 0x14
-	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR               = 0x15
-	NL80211_MESHCONF_TTL                                    = 0x6
-	NL80211_MESH_POWER_ACTIVE                               = 0x1
-	NL80211_MESH_POWER_DEEP_SLEEP                           = 0x3
-	NL80211_MESH_POWER_LIGHT_SLEEP                          = 0x2
-	NL80211_MESH_POWER_MAX                                  = 0x3
-	NL80211_MESH_POWER_UNKNOWN                              = 0x0
-	NL80211_MESH_SETUP_ATTR_MAX                             = 0x8
-	NL80211_MESH_SETUP_AUTH_PROTOCOL                        = 0x8
-	NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC                 = 0x2
-	NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL               = 0x1
-	NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC                   = 0x6
-	NL80211_MESH_SETUP_IE                                   = 0x3
-	NL80211_MESH_SETUP_USERSPACE_AMPE                       = 0x5
-	NL80211_MESH_SETUP_USERSPACE_AUTH                       = 0x4
-	NL80211_MESH_SETUP_USERSPACE_MPM                        = 0x7
-	NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE                   = 0x3
-	NL80211_MFP_NO                                          = 0x0
-	NL80211_MFP_OPTIONAL                                    = 0x2
-	NL80211_MFP_REQUIRED                                    = 0x1
-	NL80211_MIN_REMAIN_ON_CHANNEL_TIME                      = 0xa
-	NL80211_MNTR_FLAG_ACTIVE                                = 0x6
-	NL80211_MNTR_FLAG_CONTROL                               = 0x3
-	NL80211_MNTR_FLAG_COOK_FRAMES                           = 0x5
-	NL80211_MNTR_FLAG_FCSFAIL                               = 0x1
-	NL80211_MNTR_FLAG_MAX                                   = 0x7
-	NL80211_MNTR_FLAG_OTHER_BSS                             = 0x4
-	NL80211_MNTR_FLAG_PLCPFAIL                              = 0x2
-	NL80211_MPATH_FLAG_ACTIVE                               = 0x1
-	NL80211_MPATH_FLAG_FIXED                                = 0x8
-	NL80211_MPATH_FLAG_RESOLVED                             = 0x10
-	NL80211_MPATH_FLAG_RESOLVING                            = 0x2
-	NL80211_MPATH_FLAG_SN_VALID                             = 0x4
-	NL80211_MPATH_INFO_DISCOVERY_RETRIES                    = 0x7
-	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT                    = 0x6
-	NL80211_MPATH_INFO_EXPTIME                              = 0x4
-	NL80211_MPATH_INFO_FLAGS                                = 0x5
-	NL80211_MPATH_INFO_FRAME_QLEN                           = 0x1
-	NL80211_MPATH_INFO_HOP_COUNT                            = 0x8
-	NL80211_MPATH_INFO_MAX                                  = 0x9
-	NL80211_MPATH_INFO_METRIC                               = 0x3
-	NL80211_MPATH_INFO_PATH_CHANGE                          = 0x9
-	NL80211_MPATH_INFO_SN                                   = 0x2
-	NL80211_MULTICAST_GROUP_CONFIG                          = "config"
-	NL80211_MULTICAST_GROUP_MLME                            = "mlme"
-	NL80211_MULTICAST_GROUP_NAN                             = "nan"
-	NL80211_MULTICAST_GROUP_REG                             = "regulatory"
-	NL80211_MULTICAST_GROUP_SCAN                            = "scan"
-	NL80211_MULTICAST_GROUP_TESTMODE                        = "testmode"
-	NL80211_MULTICAST_GROUP_VENDOR                          = "vendor"
-	NL80211_NAN_FUNC_ATTR_MAX                               = 0x10
-	NL80211_NAN_FUNC_CLOSE_RANGE                            = 0x9
-	NL80211_NAN_FUNC_FOLLOW_UP                              = 0x2
-	NL80211_NAN_FUNC_FOLLOW_UP_DEST                         = 0x8
-	NL80211_NAN_FUNC_FOLLOW_UP_ID                           = 0x6
-	NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID                       = 0x7
-	NL80211_NAN_FUNC_INSTANCE_ID                            = 0xf
-	NL80211_NAN_FUNC_MAX_TYPE                               = 0x2
-	NL80211_NAN_FUNC_PUBLISH_BCAST                          = 0x4
-	NL80211_NAN_FUNC_PUBLISH                                = 0x0
-	NL80211_NAN_FUNC_PUBLISH_TYPE                           = 0x3
-	NL80211_NAN_FUNC_RX_MATCH_FILTER                        = 0xd
-	NL80211_NAN_FUNC_SERVICE_ID                             = 0x2
-	NL80211_NAN_FUNC_SERVICE_ID_LEN                         = 0x6
-	NL80211_NAN_FUNC_SERVICE_INFO                           = 0xb
-	NL80211_NAN_FUNC_SERVICE_SPEC_INFO_MAX_LEN              = 0xff
-	NL80211_NAN_FUNC_SRF                                    = 0xc
-	NL80211_NAN_FUNC_SRF_MAX_LEN                            = 0xff
-	NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE                       = 0x5
-	NL80211_NAN_FUNC_SUBSCRIBE                              = 0x1
-	NL80211_NAN_FUNC_TERM_REASON                            = 0x10
-	NL80211_NAN_FUNC_TERM_REASON_ERROR                      = 0x2
-	NL80211_NAN_FUNC_TERM_REASON_TTL_EXPIRED                = 0x1
-	NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST               = 0x0
-	NL80211_NAN_FUNC_TTL                                    = 0xa
-	NL80211_NAN_FUNC_TX_MATCH_FILTER                        = 0xe
-	NL80211_NAN_FUNC_TYPE                                   = 0x1
-	NL80211_NAN_MATCH_ATTR_MAX                              = 0x2
-	NL80211_NAN_MATCH_FUNC_LOCAL                            = 0x1
-	NL80211_NAN_MATCH_FUNC_PEER                             = 0x2
-	NL80211_NAN_SOLICITED_PUBLISH                           = 0x1
-	NL80211_NAN_SRF_ATTR_MAX                                = 0x4
-	NL80211_NAN_SRF_BF                                      = 0x2
-	NL80211_NAN_SRF_BF_IDX                                  = 0x3
-	NL80211_NAN_SRF_INCLUDE                                 = 0x1
-	NL80211_NAN_SRF_MAC_ADDRS                               = 0x4
-	NL80211_NAN_UNSOLICITED_PUBLISH                         = 0x2
-	NL80211_NUM_ACS                                         = 0x4
-	NL80211_P2P_PS_SUPPORTED                                = 0x1
-	NL80211_P2P_PS_UNSUPPORTED                              = 0x0
-	NL80211_PKTPAT_MASK                                     = 0x1
-	NL80211_PKTPAT_OFFSET                                   = 0x3
-	NL80211_PKTPAT_PATTERN                                  = 0x2
-	NL80211_PLINK_ACTION_BLOCK                              = 0x2
-	NL80211_PLINK_ACTION_NO_ACTION                          = 0x0
-	NL80211_PLINK_ACTION_OPEN                               = 0x1
-	NL80211_PLINK_BLOCKED                                   = 0x6
-	NL80211_PLINK_CNF_RCVD                                  = 0x3
-	NL80211_PLINK_ESTAB                                     = 0x4
-	NL80211_PLINK_HOLDING                                   = 0x5
-	NL80211_PLINK_LISTEN                                    = 0x0
-	NL80211_PLINK_OPN_RCVD                                  = 0x2
-	NL80211_PLINK_OPN_SNT                                   = 0x1
-	NL80211_PMKSA_CANDIDATE_BSSID                           = 0x2
-	NL80211_PMKSA_CANDIDATE_INDEX                           = 0x1
-	NL80211_PMKSA_CANDIDATE_PREAUTH                         = 0x3
-	NL80211_PMSR_ATTR_MAX                                   = 0x5
-	NL80211_PMSR_ATTR_MAX_PEERS                             = 0x1
-	NL80211_PMSR_ATTR_PEERS                                 = 0x5
-	NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR                    = 0x3
-	NL80211_PMSR_ATTR_REPORT_AP_TSF                         = 0x2
-	NL80211_PMSR_ATTR_TYPE_CAPA                             = 0x4
-	NL80211_PMSR_FTM_CAPA_ATTR_ASAP                         = 0x1
-	NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS                   = 0x6
-	NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT          = 0x7
-	NL80211_PMSR_FTM_CAPA_ATTR_MAX                          = 0xa
-	NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST           = 0x8
-	NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP                     = 0x2
-	NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED            = 0xa
-	NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES                    = 0x5
-	NL80211_PMSR_FTM_CAPA_ATTR_REQ_CIVICLOC                 = 0x4
-	NL80211_PMSR_FTM_CAPA_ATTR_REQ_LCI                      = 0x3
-	NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED                = 0x9
-	NL80211_PMSR_FTM_FAILURE_BAD_CHANGED_PARAMS             = 0x7
-	NL80211_PMSR_FTM_FAILURE_INVALID_TIMESTAMP              = 0x5
-	NL80211_PMSR_FTM_FAILURE_NO_RESPONSE                    = 0x1
-	NL80211_PMSR_FTM_FAILURE_PEER_BUSY                      = 0x6
-	NL80211_PMSR_FTM_FAILURE_PEER_NOT_CAPABLE               = 0x4
-	NL80211_PMSR_FTM_FAILURE_REJECTED                       = 0x2
-	NL80211_PMSR_FTM_FAILURE_UNSPECIFIED                    = 0x0
-	NL80211_PMSR_FTM_FAILURE_WRONG_CHANNEL                  = 0x3
-	NL80211_PMSR_FTM_REQ_ATTR_ASAP                          = 0x1
-	NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR                     = 0xd
-	NL80211_PMSR_FTM_REQ_ATTR_BURST_DURATION                = 0x5
-	NL80211_PMSR_FTM_REQ_ATTR_BURST_PERIOD                  = 0x4
-	NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST                = 0x6
-	NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK                  = 0xc
-	NL80211_PMSR_FTM_REQ_ATTR_MAX                           = 0xd
-	NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED             = 0xb
-	NL80211_PMSR_FTM_REQ_ATTR_NUM_BURSTS_EXP                = 0x3
-	NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES              = 0x7
-	NL80211_PMSR_FTM_REQ_ATTR_PREAMBLE                      = 0x2
-	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC              = 0x9
-	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI                   = 0x8
-	NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED                 = 0xa
-	NL80211_PMSR_FTM_RESP_ATTR_BURST_DURATION               = 0x7
-	NL80211_PMSR_FTM_RESP_ATTR_BURST_INDEX                  = 0x2
-	NL80211_PMSR_FTM_RESP_ATTR_BUSY_RETRY_TIME              = 0x5
-	NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC                     = 0x14
-	NL80211_PMSR_FTM_RESP_ATTR_DIST_AVG                     = 0x10
-	NL80211_PMSR_FTM_RESP_ATTR_DIST_SPREAD                  = 0x12
-	NL80211_PMSR_FTM_RESP_ATTR_DIST_VARIANCE                = 0x11
-	NL80211_PMSR_FTM_RESP_ATTR_FAIL_REASON                  = 0x1
-	NL80211_PMSR_FTM_RESP_ATTR_FTMS_PER_BURST               = 0x8
-	NL80211_PMSR_FTM_RESP_ATTR_LCI                          = 0x13
-	NL80211_PMSR_FTM_RESP_ATTR_MAX                          = 0x15
-	NL80211_PMSR_FTM_RESP_ATTR_NUM_BURSTS_EXP               = 0x6
-	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_ATTEMPTS            = 0x3
-	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_SUCCESSES           = 0x4
-	NL80211_PMSR_FTM_RESP_ATTR_PAD                          = 0x15
-	NL80211_PMSR_FTM_RESP_ATTR_RSSI_AVG                     = 0x9
-	NL80211_PMSR_FTM_RESP_ATTR_RSSI_SPREAD                  = 0xa
-	NL80211_PMSR_FTM_RESP_ATTR_RTT_AVG                      = 0xd
-	NL80211_PMSR_FTM_RESP_ATTR_RTT_SPREAD                   = 0xf
-	NL80211_PMSR_FTM_RESP_ATTR_RTT_VARIANCE                 = 0xe
-	NL80211_PMSR_FTM_RESP_ATTR_RX_RATE                      = 0xc
-	NL80211_PMSR_FTM_RESP_ATTR_TX_RATE                      = 0xb
-	NL80211_PMSR_PEER_ATTR_ADDR                             = 0x1
-	NL80211_PMSR_PEER_ATTR_CHAN                             = 0x2
-	NL80211_PMSR_PEER_ATTR_MAX                              = 0x4
-	NL80211_PMSR_PEER_ATTR_REQ                              = 0x3
-	NL80211_PMSR_PEER_ATTR_RESP                             = 0x4
-	NL80211_PMSR_REQ_ATTR_DATA                              = 0x1
-	NL80211_PMSR_REQ_ATTR_GET_AP_TSF                        = 0x2
-	NL80211_PMSR_REQ_ATTR_MAX                               = 0x2
-	NL80211_PMSR_RESP_ATTR_AP_TSF                           = 0x4
-	NL80211_PMSR_RESP_ATTR_DATA                             = 0x1
-	NL80211_PMSR_RESP_ATTR_FINAL                            = 0x5
-	NL80211_PMSR_RESP_ATTR_HOST_TIME                        = 0x3
-	NL80211_PMSR_RESP_ATTR_MAX                              = 0x6
-	NL80211_PMSR_RESP_ATTR_PAD                              = 0x6
-	NL80211_PMSR_RESP_ATTR_STATUS                           = 0x2
-	NL80211_PMSR_STATUS_FAILURE                             = 0x3
-	NL80211_PMSR_STATUS_REFUSED                             = 0x1
-	NL80211_PMSR_STATUS_SUCCESS                             = 0x0
-	NL80211_PMSR_STATUS_TIMEOUT                             = 0x2
-	NL80211_PMSR_TYPE_FTM                                   = 0x1
-	NL80211_PMSR_TYPE_INVALID                               = 0x0
-	NL80211_PMSR_TYPE_MAX                                   = 0x1
-	NL80211_PREAMBLE_DMG                                    = 0x3
-	NL80211_PREAMBLE_HE                                     = 0x4
-	NL80211_PREAMBLE_HT                                     = 0x1
-	NL80211_PREAMBLE_LEGACY                                 = 0x0
-	NL80211_PREAMBLE_VHT                                    = 0x2
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U               = 0x8
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P                  = 0x4
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2                 = 0x2
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS                  = 0x1
-	NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP               = 0x1
-	NL80211_PS_DISABLED                                     = 0x0
-	NL80211_PS_ENABLED                                      = 0x1
-	NL80211_RADAR_CAC_ABORTED                               = 0x2
-	NL80211_RADAR_CAC_FINISHED                              = 0x1
-	NL80211_RADAR_CAC_STARTED                               = 0x5
-	NL80211_RADAR_DETECTED                                  = 0x0
-	NL80211_RADAR_NOP_FINISHED                              = 0x3
-	NL80211_RADAR_PRE_CAC_EXPIRED                           = 0x4
-	NL80211_RATE_INFO_10_MHZ_WIDTH                          = 0xb
-	NL80211_RATE_INFO_160_MHZ_WIDTH                         = 0xa
-	NL80211_RATE_INFO_320_MHZ_WIDTH                         = 0x12
-	NL80211_RATE_INFO_40_MHZ_WIDTH                          = 0x3
-	NL80211_RATE_INFO_5_MHZ_WIDTH                           = 0xc
-	NL80211_RATE_INFO_80_MHZ_WIDTH                          = 0x8
-	NL80211_RATE_INFO_80P80_MHZ_WIDTH                       = 0x9
-	NL80211_RATE_INFO_BITRATE32                             = 0x5
-	NL80211_RATE_INFO_BITRATE                               = 0x1
-	NL80211_RATE_INFO_EHT_GI_0_8                            = 0x0
-	NL80211_RATE_INFO_EHT_GI_1_6                            = 0x1
-	NL80211_RATE_INFO_EHT_GI_3_2                            = 0x2
-	NL80211_RATE_INFO_EHT_GI                                = 0x15
-	NL80211_RATE_INFO_EHT_MCS                               = 0x13
-	NL80211_RATE_INFO_EHT_NSS                               = 0x14
-	NL80211_RATE_INFO_EHT_RU_ALLOC_106                      = 0x3
-	NL80211_RATE_INFO_EHT_RU_ALLOC_106P26                   = 0x4
-	NL80211_RATE_INFO_EHT_RU_ALLOC_242                      = 0x5
-	NL80211_RATE_INFO_EHT_RU_ALLOC_26                       = 0x0
-	NL80211_RATE_INFO_EHT_RU_ALLOC_2x996                    = 0xb
-	NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484                = 0xc
-	NL80211_RATE_INFO_EHT_RU_ALLOC_3x996                    = 0xd
-	NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484                = 0xe
-	NL80211_RATE_INFO_EHT_RU_ALLOC_484                      = 0x6
-	NL80211_RATE_INFO_EHT_RU_ALLOC_484P242                  = 0x7
-	NL80211_RATE_INFO_EHT_RU_ALLOC_4x996                    = 0xf
-	NL80211_RATE_INFO_EHT_RU_ALLOC_52                       = 0x1
-	NL80211_RATE_INFO_EHT_RU_ALLOC_52P26                    = 0x2
-	NL80211_RATE_INFO_EHT_RU_ALLOC_996                      = 0x8
-	NL80211_RATE_INFO_EHT_RU_ALLOC_996P484                  = 0x9
-	NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242              = 0xa
-	NL80211_RATE_INFO_EHT_RU_ALLOC                          = 0x16
-	NL80211_RATE_INFO_HE_1XLTF                              = 0x0
-	NL80211_RATE_INFO_HE_2XLTF                              = 0x1
-	NL80211_RATE_INFO_HE_4XLTF                              = 0x2
-	NL80211_RATE_INFO_HE_DCM                                = 0x10
-	NL80211_RATE_INFO_HE_GI_0_8                             = 0x0
-	NL80211_RATE_INFO_HE_GI_1_6                             = 0x1
-	NL80211_RATE_INFO_HE_GI_3_2                             = 0x2
-	NL80211_RATE_INFO_HE_GI                                 = 0xf
-	NL80211_RATE_INFO_HE_MCS                                = 0xd
-	NL80211_RATE_INFO_HE_NSS                                = 0xe
-	NL80211_RATE_INFO_HE_RU_ALLOC_106                       = 0x2
-	NL80211_RATE_INFO_HE_RU_ALLOC_242                       = 0x3
-	NL80211_RATE_INFO_HE_RU_ALLOC_26                        = 0x0
-	NL80211_RATE_INFO_HE_RU_ALLOC_2x996                     = 0x6
-	NL80211_RATE_INFO_HE_RU_ALLOC_484                       = 0x4
-	NL80211_RATE_INFO_HE_RU_ALLOC_52                        = 0x1
-	NL80211_RATE_INFO_HE_RU_ALLOC_996                       = 0x5
-	NL80211_RATE_INFO_HE_RU_ALLOC                           = 0x11
-	NL80211_RATE_INFO_MAX                                   = 0x1d
-	NL80211_RATE_INFO_MCS                                   = 0x2
-	NL80211_RATE_INFO_SHORT_GI                              = 0x4
-	NL80211_RATE_INFO_VHT_MCS                               = 0x6
-	NL80211_RATE_INFO_VHT_NSS                               = 0x7
-	NL80211_REGDOM_SET_BY_CORE                              = 0x0
-	NL80211_REGDOM_SET_BY_COUNTRY_IE                        = 0x3
-	NL80211_REGDOM_SET_BY_DRIVER                            = 0x2
-	NL80211_REGDOM_SET_BY_USER                              = 0x1
-	NL80211_REGDOM_TYPE_COUNTRY                             = 0x0
-	NL80211_REGDOM_TYPE_CUSTOM_WORLD                        = 0x2
-	NL80211_REGDOM_TYPE_INTERSECTION                        = 0x3
-	NL80211_REGDOM_TYPE_WORLD                               = 0x1
-	NL80211_REG_RULE_ATTR_MAX                               = 0x8
-	NL80211_REKEY_DATA_AKM                                  = 0x4
-	NL80211_REKEY_DATA_KCK                                  = 0x2
-	NL80211_REKEY_DATA_KEK                                  = 0x1
-	NL80211_REKEY_DATA_REPLAY_CTR                           = 0x3
-	NL80211_REPLAY_CTR_LEN                                  = 0x8
-	NL80211_RRF_AUTO_BW                                     = 0x800
-	NL80211_RRF_DFS                                         = 0x10
-	NL80211_RRF_GO_CONCURRENT                               = 0x1000
-	NL80211_RRF_IR_CONCURRENT                               = 0x1000
-	NL80211_RRF_NO_160MHZ                                   = 0x10000
-	NL80211_RRF_NO_320MHZ                                   = 0x40000
-	NL80211_RRF_NO_80MHZ                                    = 0x8000
-	NL80211_RRF_NO_CCK                                      = 0x2
-	NL80211_RRF_NO_HE                                       = 0x20000
-	NL80211_RRF_NO_HT40                                     = 0x6000
-	NL80211_RRF_NO_HT40MINUS                                = 0x2000
-	NL80211_RRF_NO_HT40PLUS                                 = 0x4000
-	NL80211_RRF_NO_IBSS                                     = 0x80
-	NL80211_RRF_NO_INDOOR                                   = 0x4
-	NL80211_RRF_NO_IR_ALL                                   = 0x180
-	NL80211_RRF_NO_IR                                       = 0x80
-	NL80211_RRF_NO_OFDM                                     = 0x1
-	NL80211_RRF_NO_OUTDOOR                                  = 0x8
-	NL80211_RRF_PASSIVE_SCAN                                = 0x80
-	NL80211_RRF_PTMP_ONLY                                   = 0x40
-	NL80211_RRF_PTP_ONLY                                    = 0x20
-	NL80211_RXMGMT_FLAG_ANSWERED                            = 0x1
-	NL80211_RXMGMT_FLAG_EXTERNAL_AUTH                       = 0x2
-	NL80211_SAE_PWE_BOTH                                    = 0x3
-	NL80211_SAE_PWE_HASH_TO_ELEMENT                         = 0x2
-	NL80211_SAE_PWE_HUNT_AND_PECK                           = 0x1
-	NL80211_SAE_PWE_UNSPECIFIED                             = 0x0
-	NL80211_SAR_ATTR_MAX                                    = 0x2
-	NL80211_SAR_ATTR_SPECS                                  = 0x2
-	NL80211_SAR_ATTR_SPECS_END_FREQ                         = 0x4
-	NL80211_SAR_ATTR_SPECS_MAX                              = 0x4
-	NL80211_SAR_ATTR_SPECS_POWER                            = 0x1
-	NL80211_SAR_ATTR_SPECS_RANGE_INDEX                      = 0x2
-	NL80211_SAR_ATTR_SPECS_START_FREQ                       = 0x3
-	NL80211_SAR_ATTR_TYPE                                   = 0x1
-	NL80211_SAR_TYPE_POWER                                  = 0x0
-	NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP               = 0x20
-	NL80211_SCAN_FLAG_AP                                    = 0x4
-	NL80211_SCAN_FLAG_COLOCATED_6GHZ                        = 0x4000
-	NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME                 = 0x10
-	NL80211_SCAN_FLAG_FLUSH                                 = 0x2
-	NL80211_SCAN_FLAG_FREQ_KHZ                              = 0x2000
-	NL80211_SCAN_FLAG_HIGH_ACCURACY                         = 0x400
-	NL80211_SCAN_FLAG_LOW_POWER                             = 0x200
-	NL80211_SCAN_FLAG_LOW_PRIORITY                          = 0x1
-	NL80211_SCAN_FLAG_LOW_SPAN                              = 0x100
-	NL80211_SCAN_FLAG_MIN_PREQ_CONTENT                      = 0x1000
-	NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION    = 0x80
-	NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE            = 0x40
-	NL80211_SCAN_FLAG_RANDOM_ADDR                           = 0x8
-	NL80211_SCAN_FLAG_RANDOM_SN                             = 0x800
-	NL80211_SCAN_RSSI_THOLD_OFF                             = -0x12c
-	NL80211_SCHED_SCAN_MATCH_ATTR_BSSID                     = 0x5
-	NL80211_SCHED_SCAN_MATCH_ATTR_MAX                       = 0x6
-	NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI             = 0x3
-	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST               = 0x4
-	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI                      = 0x2
-	NL80211_SCHED_SCAN_MATCH_ATTR_SSID                      = 0x1
-	NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI                  = 0x6
-	NL80211_SCHED_SCAN_PLAN_INTERVAL                        = 0x1
-	NL80211_SCHED_SCAN_PLAN_ITERATIONS                      = 0x2
-	NL80211_SCHED_SCAN_PLAN_MAX                             = 0x2
-	NL80211_SMPS_DYNAMIC                                    = 0x2
-	NL80211_SMPS_MAX                                        = 0x2
-	NL80211_SMPS_OFF                                        = 0x0
-	NL80211_SMPS_STATIC                                     = 0x1
-	NL80211_STA_BSS_PARAM_BEACON_INTERVAL                   = 0x5
-	NL80211_STA_BSS_PARAM_CTS_PROT                          = 0x1
-	NL80211_STA_BSS_PARAM_DTIM_PERIOD                       = 0x4
-	NL80211_STA_BSS_PARAM_MAX                               = 0x5
-	NL80211_STA_BSS_PARAM_SHORT_PREAMBLE                    = 0x2
-	NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME                   = 0x3
-	NL80211_STA_FLAG_ASSOCIATED                             = 0x7
-	NL80211_STA_FLAG_AUTHENTICATED                          = 0x5
-	NL80211_STA_FLAG_AUTHORIZED                             = 0x1
-	NL80211_STA_FLAG_MAX                                    = 0x8
-	NL80211_STA_FLAG_MAX_OLD_API                            = 0x6
-	NL80211_STA_FLAG_MFP                                    = 0x4
-	NL80211_STA_FLAG_SHORT_PREAMBLE                         = 0x2
-	NL80211_STA_FLAG_TDLS_PEER                              = 0x6
-	NL80211_STA_FLAG_WME                                    = 0x3
-	NL80211_STA_INFO_ACK_SIGNAL_AVG                         = 0x23
-	NL80211_STA_INFO_ACK_SIGNAL                             = 0x22
-	NL80211_STA_INFO_AIRTIME_LINK_METRIC                    = 0x29
-	NL80211_STA_INFO_AIRTIME_WEIGHT                         = 0x28
-	NL80211_STA_INFO_ASSOC_AT_BOOTTIME                      = 0x2a
-	NL80211_STA_INFO_BEACON_LOSS                            = 0x12
-	NL80211_STA_INFO_BEACON_RX                              = 0x1d
-	NL80211_STA_INFO_BEACON_SIGNAL_AVG                      = 0x1e
-	NL80211_STA_INFO_BSS_PARAM                              = 0xf
-	NL80211_STA_INFO_CHAIN_SIGNAL_AVG                       = 0x1a
-	NL80211_STA_INFO_CHAIN_SIGNAL                           = 0x19
-	NL80211_STA_INFO_CONNECTED_TIME                         = 0x10
-	NL80211_STA_INFO_CONNECTED_TO_AS                        = 0x2b
-	NL80211_STA_INFO_CONNECTED_TO_GATE                      = 0x26
-	NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG                    = 0x23
-	NL80211_STA_INFO_EXPECTED_THROUGHPUT                    = 0x1b
-	NL80211_STA_INFO_FCS_ERROR_COUNT                        = 0x25
-	NL80211_STA_INFO_INACTIVE_TIME                          = 0x1
-	NL80211_STA_INFO_LLID                                   = 0x4
-	NL80211_STA_INFO_LOCAL_PM                               = 0x14
-	NL80211_STA_INFO_MAX                                    = 0x2b
-	NL80211_STA_INFO_NONPEER_PM                             = 0x16
-	NL80211_STA_INFO_PAD                                    = 0x21
-	NL80211_STA_INFO_PEER_PM                                = 0x15
-	NL80211_STA_INFO_PLID                                   = 0x5
-	NL80211_STA_INFO_PLINK_STATE                            = 0x6
-	NL80211_STA_INFO_RX_BITRATE                             = 0xe
-	NL80211_STA_INFO_RX_BYTES64                             = 0x17
-	NL80211_STA_INFO_RX_BYTES                               = 0x2
-	NL80211_STA_INFO_RX_DROP_MISC                           = 0x1c
-	NL80211_STA_INFO_RX_DURATION                            = 0x20
-	NL80211_STA_INFO_RX_MPDUS                               = 0x24
-	NL80211_STA_INFO_RX_PACKETS                             = 0x9
-	NL80211_STA_INFO_SIGNAL_AVG                             = 0xd
-	NL80211_STA_INFO_SIGNAL                                 = 0x7
-	NL80211_STA_INFO_STA_FLAGS                              = 0x11
-	NL80211_STA_INFO_TID_STATS                              = 0x1f
-	NL80211_STA_INFO_T_OFFSET                               = 0x13
-	NL80211_STA_INFO_TX_BITRATE                             = 0x8
-	NL80211_STA_INFO_TX_BYTES64                             = 0x18
-	NL80211_STA_INFO_TX_BYTES                               = 0x3
-	NL80211_STA_INFO_TX_DURATION                            = 0x27
-	NL80211_STA_INFO_TX_FAILED                              = 0xc
-	NL80211_STA_INFO_TX_PACKETS                             = 0xa
-	NL80211_STA_INFO_TX_RETRIES                             = 0xb
-	NL80211_STA_WME_MAX                                     = 0x2
-	NL80211_STA_WME_MAX_SP                                  = 0x2
-	NL80211_STA_WME_UAPSD_QUEUES                            = 0x1
-	NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY                   = 0x5
-	NL80211_SURVEY_INFO_CHANNEL_TIME                        = 0x4
-	NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY               = 0x6
-	NL80211_SURVEY_INFO_CHANNEL_TIME_RX                     = 0x7
-	NL80211_SURVEY_INFO_CHANNEL_TIME_TX                     = 0x8
-	NL80211_SURVEY_INFO_FREQUENCY                           = 0x1
-	NL80211_SURVEY_INFO_FREQUENCY_OFFSET                    = 0xc
-	NL80211_SURVEY_INFO_IN_USE                              = 0x3
-	NL80211_SURVEY_INFO_MAX                                 = 0xc
-	NL80211_SURVEY_INFO_NOISE                               = 0x2
-	NL80211_SURVEY_INFO_PAD                                 = 0xa
-	NL80211_SURVEY_INFO_TIME_BSS_RX                         = 0xb
-	NL80211_SURVEY_INFO_TIME_BUSY                           = 0x5
-	NL80211_SURVEY_INFO_TIME                                = 0x4
-	NL80211_SURVEY_INFO_TIME_EXT_BUSY                       = 0x6
-	NL80211_SURVEY_INFO_TIME_RX                             = 0x7
-	NL80211_SURVEY_INFO_TIME_SCAN                           = 0x9
-	NL80211_SURVEY_INFO_TIME_TX                             = 0x8
-	NL80211_TDLS_DISABLE_LINK                               = 0x4
-	NL80211_TDLS_DISCOVERY_REQ                              = 0x0
-	NL80211_TDLS_ENABLE_LINK                                = 0x3
-	NL80211_TDLS_PEER_HE                                    = 0x8
-	NL80211_TDLS_PEER_HT                                    = 0x1
-	NL80211_TDLS_PEER_VHT                                   = 0x2
-	NL80211_TDLS_PEER_WMM                                   = 0x4
-	NL80211_TDLS_SETUP                                      = 0x1
-	NL80211_TDLS_TEARDOWN                                   = 0x2
-	NL80211_TID_CONFIG_ATTR_AMPDU_CTRL                      = 0x9
-	NL80211_TID_CONFIG_ATTR_AMSDU_CTRL                      = 0xb
-	NL80211_TID_CONFIG_ATTR_MAX                             = 0xd
-	NL80211_TID_CONFIG_ATTR_NOACK                           = 0x6
-	NL80211_TID_CONFIG_ATTR_OVERRIDE                        = 0x4
-	NL80211_TID_CONFIG_ATTR_PAD                             = 0x1
-	NL80211_TID_CONFIG_ATTR_PEER_SUPP                       = 0x3
-	NL80211_TID_CONFIG_ATTR_RETRY_LONG                      = 0x8
-	NL80211_TID_CONFIG_ATTR_RETRY_SHORT                     = 0x7
-	NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL                     = 0xa
-	NL80211_TID_CONFIG_ATTR_TIDS                            = 0x5
-	NL80211_TID_CONFIG_ATTR_TX_RATE                         = 0xd
-	NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE                    = 0xc
-	NL80211_TID_CONFIG_ATTR_VIF_SUPP                        = 0x2
-	NL80211_TID_CONFIG_DISABLE                              = 0x1
-	NL80211_TID_CONFIG_ENABLE                               = 0x0
-	NL80211_TID_STATS_MAX                                   = 0x6
-	NL80211_TID_STATS_PAD                                   = 0x5
-	NL80211_TID_STATS_RX_MSDU                               = 0x1
-	NL80211_TID_STATS_TX_MSDU                               = 0x2
-	NL80211_TID_STATS_TX_MSDU_FAILED                        = 0x4
-	NL80211_TID_STATS_TX_MSDU_RETRIES                       = 0x3
-	NL80211_TID_STATS_TXQ_STATS                             = 0x6
-	NL80211_TIMEOUT_ASSOC                                   = 0x3
-	NL80211_TIMEOUT_AUTH                                    = 0x2
-	NL80211_TIMEOUT_SCAN                                    = 0x1
-	NL80211_TIMEOUT_UNSPECIFIED                             = 0x0
-	NL80211_TKIP_DATA_OFFSET_ENCR_KEY                       = 0x0
-	NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY                     = 0x18
-	NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY                     = 0x10
-	NL80211_TX_POWER_AUTOMATIC                              = 0x0
-	NL80211_TX_POWER_FIXED                                  = 0x2
-	NL80211_TX_POWER_LIMITED                                = 0x1
-	NL80211_TXQ_ATTR_AC                                     = 0x1
-	NL80211_TXQ_ATTR_AIFS                                   = 0x5
-	NL80211_TXQ_ATTR_CWMAX                                  = 0x4
-	NL80211_TXQ_ATTR_CWMIN                                  = 0x3
-	NL80211_TXQ_ATTR_MAX                                    = 0x5
-	NL80211_TXQ_ATTR_QUEUE                                  = 0x1
-	NL80211_TXQ_ATTR_TXOP                                   = 0x2
-	NL80211_TXQ_Q_BE                                        = 0x2
-	NL80211_TXQ_Q_BK                                        = 0x3
-	NL80211_TXQ_Q_VI                                        = 0x1
-	NL80211_TXQ_Q_VO                                        = 0x0
-	NL80211_TXQ_STATS_BACKLOG_BYTES                         = 0x1
-	NL80211_TXQ_STATS_BACKLOG_PACKETS                       = 0x2
-	NL80211_TXQ_STATS_COLLISIONS                            = 0x8
-	NL80211_TXQ_STATS_DROPS                                 = 0x4
-	NL80211_TXQ_STATS_ECN_MARKS                             = 0x5
-	NL80211_TXQ_STATS_FLOWS                                 = 0x3
-	NL80211_TXQ_STATS_MAX                                   = 0xb
-	NL80211_TXQ_STATS_MAX_FLOWS                             = 0xb
-	NL80211_TXQ_STATS_OVERLIMIT                             = 0x6
-	NL80211_TXQ_STATS_OVERMEMORY                            = 0x7
-	NL80211_TXQ_STATS_TX_BYTES                              = 0x9
-	NL80211_TXQ_STATS_TX_PACKETS                            = 0xa
-	NL80211_TX_RATE_AUTOMATIC                               = 0x0
-	NL80211_TXRATE_DEFAULT_GI                               = 0x0
-	NL80211_TX_RATE_FIXED                                   = 0x2
-	NL80211_TXRATE_FORCE_LGI                                = 0x2
-	NL80211_TXRATE_FORCE_SGI                                = 0x1
-	NL80211_TXRATE_GI                                       = 0x4
-	NL80211_TXRATE_HE                                       = 0x5
-	NL80211_TXRATE_HE_GI                                    = 0x6
-	NL80211_TXRATE_HE_LTF                                   = 0x7
-	NL80211_TXRATE_HT                                       = 0x2
-	NL80211_TXRATE_LEGACY                                   = 0x1
-	NL80211_TX_RATE_LIMITED                                 = 0x1
-	NL80211_TXRATE_MAX                                      = 0x7
-	NL80211_TXRATE_MCS                                      = 0x2
-	NL80211_TXRATE_VHT                                      = 0x3
-	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT                 = 0x1
-	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX                 = 0x2
-	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL                = 0x2
-	NL80211_USER_REG_HINT_CELL_BASE                         = 0x1
-	NL80211_USER_REG_HINT_INDOOR                            = 0x2
-	NL80211_USER_REG_HINT_USER                              = 0x0
-	NL80211_VENDOR_ID_IS_LINUX                              = 0x80000000
-	NL80211_VHT_CAPABILITY_LEN                              = 0xc
-	NL80211_VHT_NSS_MAX                                     = 0x8
-	NL80211_WIPHY_NAME_MAXLEN                               = 0x40
-	NL80211_WMMR_AIFSN                                      = 0x3
-	NL80211_WMMR_CW_MAX                                     = 0x2
-	NL80211_WMMR_CW_MIN                                     = 0x1
-	NL80211_WMMR_MAX                                        = 0x4
-	NL80211_WMMR_TXOP                                       = 0x4
-	NL80211_WOWLAN_PKTPAT_MASK                              = 0x1
-	NL80211_WOWLAN_PKTPAT_OFFSET                            = 0x3
-	NL80211_WOWLAN_PKTPAT_PATTERN                           = 0x2
-	NL80211_WOWLAN_TCP_DATA_INTERVAL                        = 0x9
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD                         = 0x6
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ                     = 0x7
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN                   = 0x8
-	NL80211_WOWLAN_TCP_DST_IPV4                             = 0x2
-	NL80211_WOWLAN_TCP_DST_MAC                              = 0x3
-	NL80211_WOWLAN_TCP_DST_PORT                             = 0x5
-	NL80211_WOWLAN_TCP_SRC_IPV4                             = 0x1
-	NL80211_WOWLAN_TCP_SRC_PORT                             = 0x4
-	NL80211_WOWLAN_TCP_WAKE_MASK                            = 0xb
-	NL80211_WOWLAN_TCP_WAKE_PAYLOAD                         = 0xa
-	NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE                      = 0x8
-	NL80211_WOWLAN_TRIG_ANY                                 = 0x1
-	NL80211_WOWLAN_TRIG_DISCONNECT                          = 0x2
-	NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST                   = 0x7
-	NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE                   = 0x6
-	NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED                 = 0x5
-	NL80211_WOWLAN_TRIG_MAGIC_PKT                           = 0x3
-	NL80211_WOWLAN_TRIG_NET_DETECT                          = 0x12
-	NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS                  = 0x13
-	NL80211_WOWLAN_TRIG_PKT_PATTERN                         = 0x4
-	NL80211_WOWLAN_TRIG_RFKILL_RELEASE                      = 0x9
-	NL80211_WOWLAN_TRIG_TCP_CONNECTION                      = 0xe
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211                    = 0xa
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN                = 0xb
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023                     = 0xc
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN                 = 0xd
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST                 = 0x10
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH                    = 0xf
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS             = 0x11
-	NL80211_WPA_VERSION_1                                   = 0x1
-	NL80211_WPA_VERSION_2                                   = 0x2
-	NL80211_WPA_VERSION_3                                   = 0x4
-)
-
-const (
-	FRA_UNSPEC             = 0x0
-	FRA_DST                = 0x1
-	FRA_SRC                = 0x2
-	FRA_IIFNAME            = 0x3
-	FRA_GOTO               = 0x4
-	FRA_UNUSED2            = 0x5
-	FRA_PRIORITY           = 0x6
-	FRA_UNUSED3            = 0x7
-	FRA_UNUSED4            = 0x8
-	FRA_UNUSED5            = 0x9
-	FRA_FWMARK             = 0xa
-	FRA_FLOW               = 0xb
-	FRA_TUN_ID             = 0xc
-	FRA_SUPPRESS_IFGROUP   = 0xd
-	FRA_SUPPRESS_PREFIXLEN = 0xe
-	FRA_TABLE              = 0xf
-	FRA_FWMASK             = 0x10
-	FRA_OIFNAME            = 0x11
-	FRA_PAD                = 0x12
-	FRA_L3MDEV             = 0x13
-	FRA_UID_RANGE          = 0x14
-	FRA_PROTOCOL           = 0x15
-	FRA_IP_PROTO           = 0x16
-	FRA_SPORT_RANGE        = 0x17
-	FRA_DPORT_RANGE        = 0x18
-	FR_ACT_UNSPEC          = 0x0
-	FR_ACT_TO_TBL          = 0x1
-	FR_ACT_GOTO            = 0x2
-	FR_ACT_NOP             = 0x3
-	FR_ACT_RES3            = 0x4
-	FR_ACT_RES4            = 0x5
-	FR_ACT_BLACKHOLE       = 0x6
-	FR_ACT_UNREACHABLE     = 0x7
-	FR_ACT_PROHIBIT        = 0x8
-)
-
-const (
-	AUDIT_NLGRP_NONE    = 0x0
-	AUDIT_NLGRP_READLOG = 0x1
-)
-
-const (
-	TUN_F_CSUM    = 0x1
-	TUN_F_TSO4    = 0x2
-	TUN_F_TSO6    = 0x4
-	TUN_F_TSO_ECN = 0x8
-	TUN_F_UFO     = 0x10
-	TUN_F_USO4    = 0x20
-	TUN_F_USO6    = 0x40
-)
-
-const (
-	VIRTIO_NET_HDR_F_NEEDS_CSUM = 0x1
-	VIRTIO_NET_HDR_F_DATA_VALID = 0x2
-	VIRTIO_NET_HDR_F_RSC_INFO   = 0x4
-)
-
-const (
-	VIRTIO_NET_HDR_GSO_NONE   = 0x0
-	VIRTIO_NET_HDR_GSO_TCPV4  = 0x1
-	VIRTIO_NET_HDR_GSO_UDP    = 0x3
-	VIRTIO_NET_HDR_GSO_TCPV6  = 0x4
-	VIRTIO_NET_HDR_GSO_UDP_L4 = 0x5
-	VIRTIO_NET_HDR_GSO_ECN    = 0x80
-)
-
-type SchedAttr struct {
-	Size     uint32
-	Policy   uint32
-	Flags    uint64
-	Nice     int32
-	Priority uint32
-	Runtime  uint64
-	Deadline uint64
-	Period   uint64
-	Util_min uint32
-	Util_max uint32
-}
-
-const SizeofSchedAttr = 0x38
-
-type Cachestat_t struct {
-	Cache            uint64
-	Dirty            uint64
-	Writeback        uint64
-	Evicted          uint64
-	Recently_evicted uint64
-}
-type CachestatRange struct {
-	Off uint64
-	Len uint64
-}
-
-const (
-	SK_MEMINFO_RMEM_ALLOC          = 0x0
-	SK_MEMINFO_RCVBUF              = 0x1
-	SK_MEMINFO_WMEM_ALLOC          = 0x2
-	SK_MEMINFO_SNDBUF              = 0x3
-	SK_MEMINFO_FWD_ALLOC           = 0x4
-	SK_MEMINFO_WMEM_QUEUED         = 0x5
-	SK_MEMINFO_OPTMEM              = 0x6
-	SK_MEMINFO_BACKLOG             = 0x7
-	SK_MEMINFO_DROPS               = 0x8
-	SK_MEMINFO_VARS                = 0x9
-	SKNLGRP_NONE                   = 0x0
-	SKNLGRP_INET_TCP_DESTROY       = 0x1
-	SKNLGRP_INET_UDP_DESTROY       = 0x2
-	SKNLGRP_INET6_TCP_DESTROY      = 0x3
-	SKNLGRP_INET6_UDP_DESTROY      = 0x4
-	SK_DIAG_BPF_STORAGE_REQ_NONE   = 0x0
-	SK_DIAG_BPF_STORAGE_REQ_MAP_FD = 0x1
-	SK_DIAG_BPF_STORAGE_REP_NONE   = 0x0
-	SK_DIAG_BPF_STORAGE            = 0x1
-	SK_DIAG_BPF_STORAGE_NONE       = 0x0
-	SK_DIAG_BPF_STORAGE_PAD        = 0x1
-	SK_DIAG_BPF_STORAGE_MAP_ID     = 0x2
-	SK_DIAG_BPF_STORAGE_MAP_VALUE  = 0x3
-)
-
-type SockDiagReq struct {
-	Family   uint8
-	Protocol uint8
-}
-
-const RTM_NEWNVLAN = 0x70
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index fd402da..72f2e96 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/386/cgo -- -Wall -Werror -static -I/tmp/386/include -m32 linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
+// +build 386,linux
 
 package unix
 
@@ -239,10 +240,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -253,19 +250,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     [116]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -327,17 +311,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	_                         [4]byte
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint32
@@ -415,7 +388,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [122]byte
+	_      [122]int8
 	_      uint32
 }
 
@@ -477,6 +450,14 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -654,36 +635,3 @@ const (
 	PPS_GETCAP    = 0x800470a3
 	PPS_FETCH     = 0xc00470a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint16
-	_    [2]uint8
-	Seq  uint16
-	_    uint16
-	_    uint32
-	_    uint32
-}
-type SysvShmDesc struct {
-	Perm       SysvIpcPerm
-	Segsz      uint32
-	Atime      uint32
-	Atime_high uint32
-	Dtime      uint32
-	Dtime_high uint32
-	Ctime      uint32
-	Ctime_high uint32
-	Cpid       int32
-	Lpid       int32
-	Nattch     uint32
-	_          uint32
-	_          uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index eb7a5e1..d5f018d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/amd64/cgo -- -Wall -Werror -static -I/tmp/amd64/include -m64 linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
+// +build amd64,linux
 
 package unix
 
@@ -254,10 +255,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -268,20 +265,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -341,16 +324,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -428,7 +401,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -492,6 +465,15 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -671,33 +653,3 @@ const (
 	PPS_GETCAP    = 0x800870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index d78ac10..675446d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/arm/cgo -- -Wall -Werror -static -I/tmp/arm/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
+// +build arm,linux
 
 package unix
 
@@ -230,10 +231,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -244,19 +241,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     [116]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -318,17 +302,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	_                         [4]byte
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint32
@@ -406,7 +379,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [122]byte
+	_      [122]uint8
 	_      uint32
 }
 
@@ -470,6 +443,15 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]uint8
 	Driver_name [64]uint8
@@ -648,36 +630,3 @@ const (
 	PPS_GETCAP    = 0x800470a3
 	PPS_FETCH     = 0xc00470a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint16
-	_    [2]uint8
-	Seq  uint16
-	_    uint16
-	_    uint32
-	_    uint32
-}
-type SysvShmDesc struct {
-	Perm       SysvIpcPerm
-	Segsz      uint32
-	Atime      uint32
-	Atime_high uint32
-	Dtime      uint32
-	Dtime_high uint32
-	Ctime      uint32
-	Ctime_high uint32
-	Cpid       int32
-	Lpid       int32
-	Nattch     uint32
-	_          uint32
-	_          uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index cd06d47..711d071 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/arm64/cgo -- -Wall -Werror -static -I/tmp/arm64/include -fsigned-char linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
+// +build arm64,linux
 
 package unix
 
@@ -233,10 +234,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -247,20 +244,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -320,16 +303,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -407,7 +380,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -471,6 +444,15 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -650,33 +632,3 @@ const (
 	PPS_GETCAP    = 0x800870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
deleted file mode 100644
index 2f28fe2..0000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
+++ /dev/null
@@ -1,683 +0,0 @@
-// cgo -godefs -objdir=/tmp/loong64/cgo -- -Wall -Werror -static -I/tmp/loong64/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build loong64 && linux
-
-package unix
-
-const (
-	SizeofPtr  = 0x8
-	SizeofLong = 0x8
-)
-
-type (
-	_C_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	_         [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint64
-	_       uint64
-	Size    int64
-	Blksize int32
-	_       int32
-	Blocks  int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	_       [2]int32
-}
-
-type Dirent struct {
-	Ino    uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Name   [256]int8
-	_      [5]byte
-}
-
-type Flock_t struct {
-	Type   int16
-	Whence int16
-	Start  int64
-	Len    int64
-	Pid    int32
-	_      [4]byte
-}
-
-type DmNameList struct {
-	Dev  uint64
-	Next uint32
-	Name [0]byte
-	_    [4]byte
-}
-
-const (
-	FADV_DONTNEED = 0x4
-	FADV_NOREUSE  = 0x5
-)
-
-type RawSockaddrNFCLLCP struct {
-	Sa_family        uint16
-	Dev_idx          uint32
-	Target_idx       uint32
-	Nfc_protocol     uint32
-	Dsap             uint8
-	Ssap             uint8
-	Service_name     [63]uint8
-	Service_name_len uint64
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	_          [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type ifreq struct {
-	Ifrn [16]byte
-	Ifru [24]byte
-}
-
-const (
-	SizeofSockaddrNFCLLCP = 0x60
-	SizeofIovec           = 0x10
-	SizeofMsghdr          = 0x38
-	SizeofCmsghdr         = 0x10
-)
-
-const (
-	SizeofSockFprog = 0x10
-)
-
-type PtraceRegs struct {
-	Regs     [32]uint64
-	Orig_a0  uint64
-	Era      uint64
-	Badv     uint64
-	Reserved [10]uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	_         [0]int8
-	_         [4]byte
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint64
-	Fname  [6]int8
-	Fpack  [6]int8
-	_      [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	_      int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
-const (
-	POLLRDHUP = 0x2000
-)
-
-type Sigset_t struct {
-	Val [16]uint64
-}
-
-const _C__NSIG = 0x41
-
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
-
-type Taskstats struct {
-	Version                   uint16
-	Ac_exitcode               uint32
-	Ac_flag                   uint8
-	Ac_nice                   uint8
-	Cpu_count                 uint64
-	Cpu_delay_total           uint64
-	Blkio_count               uint64
-	Blkio_delay_total         uint64
-	Swapin_count              uint64
-	Swapin_delay_total        uint64
-	Cpu_run_real_total        uint64
-	Cpu_run_virtual_total     uint64
-	Ac_comm                   [32]int8
-	Ac_sched                  uint8
-	Ac_pad                    [3]uint8
-	_                         [4]byte
-	Ac_uid                    uint32
-	Ac_gid                    uint32
-	Ac_pid                    uint32
-	Ac_ppid                   uint32
-	Ac_btime                  uint32
-	Ac_etime                  uint64
-	Ac_utime                  uint64
-	Ac_stime                  uint64
-	Ac_minflt                 uint64
-	Ac_majflt                 uint64
-	Coremem                   uint64
-	Virtmem                   uint64
-	Hiwater_rss               uint64
-	Hiwater_vm                uint64
-	Read_char                 uint64
-	Write_char                uint64
-	Read_syscalls             uint64
-	Write_syscalls            uint64
-	Read_bytes                uint64
-	Write_bytes               uint64
-	Cancelled_write_bytes     uint64
-	Nvcsw                     uint64
-	Nivcsw                    uint64
-	Ac_utimescaled            uint64
-	Ac_stimescaled            uint64
-	Cpu_scaled_run_real_total uint64
-	Freepages_count           uint64
-	Freepages_delay_total     uint64
-	Thrashing_count           uint64
-	Thrashing_delay_total     uint64
-	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
-}
-
-type cpuMask uint64
-
-const (
-	_NCPUBITS = 0x40
-)
-
-const (
-	CBitFieldMaskBit0  = 0x1
-	CBitFieldMaskBit1  = 0x2
-	CBitFieldMaskBit2  = 0x4
-	CBitFieldMaskBit3  = 0x8
-	CBitFieldMaskBit4  = 0x10
-	CBitFieldMaskBit5  = 0x20
-	CBitFieldMaskBit6  = 0x40
-	CBitFieldMaskBit7  = 0x80
-	CBitFieldMaskBit8  = 0x100
-	CBitFieldMaskBit9  = 0x200
-	CBitFieldMaskBit10 = 0x400
-	CBitFieldMaskBit11 = 0x800
-	CBitFieldMaskBit12 = 0x1000
-	CBitFieldMaskBit13 = 0x2000
-	CBitFieldMaskBit14 = 0x4000
-	CBitFieldMaskBit15 = 0x8000
-	CBitFieldMaskBit16 = 0x10000
-	CBitFieldMaskBit17 = 0x20000
-	CBitFieldMaskBit18 = 0x40000
-	CBitFieldMaskBit19 = 0x80000
-	CBitFieldMaskBit20 = 0x100000
-	CBitFieldMaskBit21 = 0x200000
-	CBitFieldMaskBit22 = 0x400000
-	CBitFieldMaskBit23 = 0x800000
-	CBitFieldMaskBit24 = 0x1000000
-	CBitFieldMaskBit25 = 0x2000000
-	CBitFieldMaskBit26 = 0x4000000
-	CBitFieldMaskBit27 = 0x8000000
-	CBitFieldMaskBit28 = 0x10000000
-	CBitFieldMaskBit29 = 0x20000000
-	CBitFieldMaskBit30 = 0x40000000
-	CBitFieldMaskBit31 = 0x80000000
-	CBitFieldMaskBit32 = 0x100000000
-	CBitFieldMaskBit33 = 0x200000000
-	CBitFieldMaskBit34 = 0x400000000
-	CBitFieldMaskBit35 = 0x800000000
-	CBitFieldMaskBit36 = 0x1000000000
-	CBitFieldMaskBit37 = 0x2000000000
-	CBitFieldMaskBit38 = 0x4000000000
-	CBitFieldMaskBit39 = 0x8000000000
-	CBitFieldMaskBit40 = 0x10000000000
-	CBitFieldMaskBit41 = 0x20000000000
-	CBitFieldMaskBit42 = 0x40000000000
-	CBitFieldMaskBit43 = 0x80000000000
-	CBitFieldMaskBit44 = 0x100000000000
-	CBitFieldMaskBit45 = 0x200000000000
-	CBitFieldMaskBit46 = 0x400000000000
-	CBitFieldMaskBit47 = 0x800000000000
-	CBitFieldMaskBit48 = 0x1000000000000
-	CBitFieldMaskBit49 = 0x2000000000000
-	CBitFieldMaskBit50 = 0x4000000000000
-	CBitFieldMaskBit51 = 0x8000000000000
-	CBitFieldMaskBit52 = 0x10000000000000
-	CBitFieldMaskBit53 = 0x20000000000000
-	CBitFieldMaskBit54 = 0x40000000000000
-	CBitFieldMaskBit55 = 0x80000000000000
-	CBitFieldMaskBit56 = 0x100000000000000
-	CBitFieldMaskBit57 = 0x200000000000000
-	CBitFieldMaskBit58 = 0x400000000000000
-	CBitFieldMaskBit59 = 0x800000000000000
-	CBitFieldMaskBit60 = 0x1000000000000000
-	CBitFieldMaskBit61 = 0x2000000000000000
-	CBitFieldMaskBit62 = 0x4000000000000000
-	CBitFieldMaskBit63 = 0x8000000000000000
-)
-
-type SockaddrStorage struct {
-	Family uint16
-	Data   [118]byte
-	_      uint64
-}
-
-type HDGeometry struct {
-	Heads     uint8
-	Sectors   uint8
-	Cylinders uint16
-	Start     uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type TpacketHdr struct {
-	Status  uint64
-	Len     uint32
-	Snaplen uint32
-	Mac     uint16
-	Net     uint16
-	Sec     uint32
-	Usec    uint32
-	_       [4]byte
-}
-
-const (
-	SizeofTpacketHdr = 0x20
-)
-
-type RTCPLLInfo struct {
-	Ctrl    int32
-	Value   int32
-	Max     int32
-	Min     int32
-	Posmult int32
-	Negmult int32
-	Clock   int64
-}
-
-type BlkpgPartition struct {
-	Start   int64
-	Length  int64
-	Pno     int32
-	Devname [64]uint8
-	Volname [64]uint8
-	_       [4]byte
-}
-
-const (
-	BLKPG = 0x1269
-)
-
-type CryptoUserAlg struct {
-	Name        [64]int8
-	Driver_name [64]int8
-	Module_name [64]int8
-	Type        uint32
-	Mask        uint32
-	Refcnt      uint32
-	Flags       uint32
-}
-
-type CryptoStatAEAD struct {
-	Type         [64]int8
-	Encrypt_cnt  uint64
-	Encrypt_tlen uint64
-	Decrypt_cnt  uint64
-	Decrypt_tlen uint64
-	Err_cnt      uint64
-}
-
-type CryptoStatAKCipher struct {
-	Type         [64]int8
-	Encrypt_cnt  uint64
-	Encrypt_tlen uint64
-	Decrypt_cnt  uint64
-	Decrypt_tlen uint64
-	Verify_cnt   uint64
-	Sign_cnt     uint64
-	Err_cnt      uint64
-}
-
-type CryptoStatCipher struct {
-	Type         [64]int8
-	Encrypt_cnt  uint64
-	Encrypt_tlen uint64
-	Decrypt_cnt  uint64
-	Decrypt_tlen uint64
-	Err_cnt      uint64
-}
-
-type CryptoStatCompress struct {
-	Type            [64]int8
-	Compress_cnt    uint64
-	Compress_tlen   uint64
-	Decompress_cnt  uint64
-	Decompress_tlen uint64
-	Err_cnt         uint64
-}
-
-type CryptoStatHash struct {
-	Type      [64]int8
-	Hash_cnt  uint64
-	Hash_tlen uint64
-	Err_cnt   uint64
-}
-
-type CryptoStatKPP struct {
-	Type                      [64]int8
-	Setsecret_cnt             uint64
-	Generate_public_key_cnt   uint64
-	Compute_shared_secret_cnt uint64
-	Err_cnt                   uint64
-}
-
-type CryptoStatRNG struct {
-	Type          [64]int8
-	Generate_cnt  uint64
-	Generate_tlen uint64
-	Seed_cnt      uint64
-	Err_cnt       uint64
-}
-
-type CryptoStatLarval struct {
-	Type [64]int8
-}
-
-type CryptoReportLarval struct {
-	Type [64]int8
-}
-
-type CryptoReportHash struct {
-	Type       [64]int8
-	Blocksize  uint32
-	Digestsize uint32
-}
-
-type CryptoReportCipher struct {
-	Type        [64]int8
-	Blocksize   uint32
-	Min_keysize uint32
-	Max_keysize uint32
-}
-
-type CryptoReportBlkCipher struct {
-	Type        [64]int8
-	Geniv       [64]int8
-	Blocksize   uint32
-	Min_keysize uint32
-	Max_keysize uint32
-	Ivsize      uint32
-}
-
-type CryptoReportAEAD struct {
-	Type        [64]int8
-	Geniv       [64]int8
-	Blocksize   uint32
-	Maxauthsize uint32
-	Ivsize      uint32
-}
-
-type CryptoReportComp struct {
-	Type [64]int8
-}
-
-type CryptoReportRNG struct {
-	Type     [64]int8
-	Seedsize uint32
-}
-
-type CryptoReportAKCipher struct {
-	Type [64]int8
-}
-
-type CryptoReportKPP struct {
-	Type [64]int8
-}
-
-type CryptoReportAcomp struct {
-	Type [64]int8
-}
-
-type LoopInfo struct {
-	Number           int32
-	Device           uint32
-	Inode            uint64
-	Rdevice          uint32
-	Offset           int32
-	Encrypt_type     int32
-	Encrypt_key_size int32
-	Flags            int32
-	Name             [64]int8
-	Encrypt_key      [32]uint8
-	Init             [2]uint64
-	Reserved         [4]int8
-	_                [4]byte
-}
-
-type TIPCSubscr struct {
-	Seq     TIPCServiceRange
-	Timeout uint32
-	Filter  uint32
-	Handle  [8]int8
-}
-
-type TIPCSIOCLNReq struct {
-	Peer     uint32
-	Id       uint32
-	Linkname [68]int8
-}
-
-type TIPCSIOCNodeIDReq struct {
-	Peer uint32
-	Id   [16]int8
-}
-
-type PPSKInfo struct {
-	Assert_sequence uint32
-	Clear_sequence  uint32
-	Assert_tu       PPSKTime
-	Clear_tu        PPSKTime
-	Current_mode    int32
-	_               [4]byte
-}
-
-const (
-	PPS_GETPARAMS = 0x800870a1
-	PPS_SETPARAMS = 0x400870a2
-	PPS_GETCAP    = 0x800870a3
-	PPS_FETCH     = 0xc00870a4
-)
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index 71d6cac..c1131c7 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/mips/cgo -- -Wall -Werror -static -I/tmp/mips/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
+// +build mips,linux
 
 package unix
 
@@ -235,10 +236,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -249,19 +246,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x80
 
-const (
-	SIG_BLOCK   = 0x1
-	SIG_UNBLOCK = 0x2
-	SIG_SETMASK = 0x3
-)
-
-type Siginfo struct {
-	Signo int32
-	Code  int32
-	Errno int32
-	_     [116]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -323,17 +307,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	_                         [4]byte
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint32
@@ -411,7 +384,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [122]byte
+	_      [122]int8
 	_      uint32
 }
 
@@ -476,6 +449,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -654,35 +636,3 @@ const (
 	PPS_GETCAP    = 0x400470a3
 	PPS_FETCH     = 0xc00470a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x80
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint32
-	_    uint32
-}
-type SysvShmDesc struct {
-	Perm       SysvIpcPerm
-	Segsz      uint32
-	Atime      uint32
-	Dtime      uint32
-	Ctime      uint32
-	Cpid       int32
-	Lpid       int32
-	Nattch     uint32
-	Atime_high uint16
-	Dtime_high uint16
-	Ctime_high uint16
-	_          uint16
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index 8596d45..91d5574 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/mips64/cgo -- -Wall -Werror -static -I/tmp/mips64/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
+// +build mips64,linux
 
 package unix
 
@@ -236,10 +237,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -250,20 +247,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x80
 
-const (
-	SIG_BLOCK   = 0x1
-	SIG_UNBLOCK = 0x2
-	SIG_SETMASK = 0x3
-)
-
-type Siginfo struct {
-	Signo int32
-	Code  int32
-	Errno int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -323,16 +306,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -410,7 +383,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -474,6 +447,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -653,33 +635,3 @@ const (
 	PPS_GETCAP    = 0x400870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x80
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index cd60ea1..5d72149 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/mips64le/cgo -- -Wall -Werror -static -I/tmp/mips64le/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
+// +build mips64le,linux
 
 package unix
 
@@ -236,10 +237,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -250,20 +247,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x80
 
-const (
-	SIG_BLOCK   = 0x1
-	SIG_UNBLOCK = 0x2
-	SIG_SETMASK = 0x3
-)
-
-type Siginfo struct {
-	Signo int32
-	Code  int32
-	Errno int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -323,16 +306,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -410,7 +383,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -474,6 +447,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -653,33 +635,3 @@ const (
 	PPS_GETCAP    = 0x400870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x80
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index b0ae420..a5addd0 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/mipsle/cgo -- -Wall -Werror -static -I/tmp/mipsle/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
+// +build mipsle,linux
 
 package unix
 
@@ -235,10 +236,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -249,19 +246,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x80
 
-const (
-	SIG_BLOCK   = 0x1
-	SIG_UNBLOCK = 0x2
-	SIG_SETMASK = 0x3
-)
-
-type Siginfo struct {
-	Signo int32
-	Code  int32
-	Errno int32
-	_     [116]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -323,17 +307,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	_                         [4]byte
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint32
@@ -411,7 +384,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [122]byte
+	_      [122]int8
 	_      uint32
 }
 
@@ -476,6 +449,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -654,35 +636,3 @@ const (
 	PPS_GETCAP    = 0x400470a3
 	PPS_FETCH     = 0xc00470a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x80
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint32
-	_    uint32
-}
-type SysvShmDesc struct {
-	Perm       SysvIpcPerm
-	Segsz      uint32
-	Atime      uint32
-	Dtime      uint32
-	Ctime      uint32
-	Cpid       int32
-	Lpid       int32
-	Nattch     uint32
-	Atime_high uint16
-	Dtime_high uint16
-	Ctime_high uint16
-	_          uint16
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
index 8359728..bb6b03d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/ppc/cgo -- -Wall -Werror -static -I/tmp/ppc/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
+// +build ppc,linux
 
 package unix
 
@@ -242,10 +243,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -256,19 +253,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     [116]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -330,17 +314,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	_                         [4]byte
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint32
@@ -418,7 +391,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [122]byte
+	_      [122]uint8
 	_      uint32
 }
 
@@ -482,6 +455,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]uint8
 	Driver_name [64]uint8
@@ -660,37 +642,3 @@ const (
 	PPS_GETCAP    = 0x400470a3
 	PPS_FETCH     = 0xc00470a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	Seq  uint32
-	_    uint32
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm       SysvIpcPerm
-	Atime_high uint32
-	Atime      uint32
-	Dtime_high uint32
-	Dtime      uint32
-	Ctime_high uint32
-	Ctime      uint32
-	_          uint32
-	Segsz      uint32
-	Cpid       int32
-	Lpid       int32
-	Nattch     uint32
-	_          uint32
-	_          uint32
-	_          [4]byte
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index 69eb6a5..7637243 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/ppc64/cgo -- -Wall -Werror -static -I/tmp/ppc64/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
+// +build ppc64,linux
 
 package unix
 
@@ -243,10 +244,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -257,20 +254,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -330,16 +313,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -417,7 +390,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]uint8
 	_      uint64
 }
 
@@ -481,6 +454,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]uint8
 	Driver_name [64]uint8
@@ -660,32 +642,3 @@ const (
 	PPS_GETCAP    = 0x400870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	Seq  uint32
-	_    uint32
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Segsz  uint64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index 5f583cb..a1a28e5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/ppc64le/cgo -- -Wall -Werror -static -I/tmp/ppc64le/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
+// +build ppc64le,linux
 
 package unix
 
@@ -243,10 +244,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -257,20 +254,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -330,16 +313,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -417,7 +390,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]uint8
 	_      uint64
 }
 
@@ -481,6 +454,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]uint8
 	Driver_name [64]uint8
@@ -660,32 +642,3 @@ const (
 	PPS_GETCAP    = 0x400870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	Seq  uint32
-	_    uint32
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Segsz  uint64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
index ad05b51..e0a8a13 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/riscv64/cgo -- -Wall -Werror -static -I/tmp/riscv64/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
+// +build riscv64,linux
 
 package unix
 
@@ -261,10 +262,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -275,20 +272,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -348,16 +331,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -435,7 +408,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]uint8
 	_      uint64
 }
 
@@ -499,6 +472,15 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]uint8
 	Driver_name [64]uint8
@@ -678,93 +660,3 @@ const (
 	PPS_GETCAP    = 0x800870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    [0]uint8
-	Seq  uint16
-	_    uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
-
-type RISCVHWProbePairs struct {
-	Key   int64
-	Value uint64
-}
-
-const (
-	RISCV_HWPROBE_KEY_MVENDORID          = 0x0
-	RISCV_HWPROBE_KEY_MARCHID            = 0x1
-	RISCV_HWPROBE_KEY_MIMPID             = 0x2
-	RISCV_HWPROBE_KEY_BASE_BEHAVIOR      = 0x3
-	RISCV_HWPROBE_BASE_BEHAVIOR_IMA      = 0x1
-	RISCV_HWPROBE_KEY_IMA_EXT_0          = 0x4
-	RISCV_HWPROBE_IMA_FD                 = 0x1
-	RISCV_HWPROBE_IMA_C                  = 0x2
-	RISCV_HWPROBE_IMA_V                  = 0x4
-	RISCV_HWPROBE_EXT_ZBA                = 0x8
-	RISCV_HWPROBE_EXT_ZBB                = 0x10
-	RISCV_HWPROBE_EXT_ZBS                = 0x20
-	RISCV_HWPROBE_EXT_ZICBOZ             = 0x40
-	RISCV_HWPROBE_EXT_ZBC                = 0x80
-	RISCV_HWPROBE_EXT_ZBKB               = 0x100
-	RISCV_HWPROBE_EXT_ZBKC               = 0x200
-	RISCV_HWPROBE_EXT_ZBKX               = 0x400
-	RISCV_HWPROBE_EXT_ZKND               = 0x800
-	RISCV_HWPROBE_EXT_ZKNE               = 0x1000
-	RISCV_HWPROBE_EXT_ZKNH               = 0x2000
-	RISCV_HWPROBE_EXT_ZKSED              = 0x4000
-	RISCV_HWPROBE_EXT_ZKSH               = 0x8000
-	RISCV_HWPROBE_EXT_ZKT                = 0x10000
-	RISCV_HWPROBE_EXT_ZVBB               = 0x20000
-	RISCV_HWPROBE_EXT_ZVBC               = 0x40000
-	RISCV_HWPROBE_EXT_ZVKB               = 0x80000
-	RISCV_HWPROBE_EXT_ZVKG               = 0x100000
-	RISCV_HWPROBE_EXT_ZVKNED             = 0x200000
-	RISCV_HWPROBE_EXT_ZVKNHA             = 0x400000
-	RISCV_HWPROBE_EXT_ZVKNHB             = 0x800000
-	RISCV_HWPROBE_EXT_ZVKSED             = 0x1000000
-	RISCV_HWPROBE_EXT_ZVKSH              = 0x2000000
-	RISCV_HWPROBE_EXT_ZVKT               = 0x4000000
-	RISCV_HWPROBE_EXT_ZFH                = 0x8000000
-	RISCV_HWPROBE_EXT_ZFHMIN             = 0x10000000
-	RISCV_HWPROBE_EXT_ZIHINTNTL          = 0x20000000
-	RISCV_HWPROBE_EXT_ZVFH               = 0x40000000
-	RISCV_HWPROBE_EXT_ZVFHMIN            = 0x80000000
-	RISCV_HWPROBE_EXT_ZFA                = 0x100000000
-	RISCV_HWPROBE_EXT_ZTSO               = 0x200000000
-	RISCV_HWPROBE_EXT_ZACAS              = 0x400000000
-	RISCV_HWPROBE_EXT_ZICOND             = 0x800000000
-	RISCV_HWPROBE_EXT_ZIHINTPAUSE        = 0x1000000000
-	RISCV_HWPROBE_KEY_CPUPERF_0          = 0x5
-	RISCV_HWPROBE_MISALIGNED_UNKNOWN     = 0x0
-	RISCV_HWPROBE_MISALIGNED_EMULATED    = 0x1
-	RISCV_HWPROBE_MISALIGNED_SLOW        = 0x2
-	RISCV_HWPROBE_MISALIGNED_FAST        = 0x3
-	RISCV_HWPROBE_MISALIGNED_UNSUPPORTED = 0x4
-	RISCV_HWPROBE_MISALIGNED_MASK        = 0x7
-	RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE  = 0x6
-	RISCV_HWPROBE_WHICH_CPUS             = 0x1
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index cf3ce90..21d6e56 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/s390x/cgo -- -Wall -Werror -static -I/tmp/s390x/include -fsigned-char linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
+// +build s390x,linux
 
 package unix
 
@@ -209,8 +210,8 @@ type PtraceFpregs struct {
 }
 
 type PtracePer struct {
-	Control_regs  [3]uint64
-	_             [8]byte
+	_             [0]uint64
+	_             [32]byte
 	Starting_addr uint64
 	Ending_addr   uint64
 	Perc_atmid    uint16
@@ -256,10 +257,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x80000
-)
-
 const (
 	POLLRDHUP = 0x2000
 )
@@ -270,20 +267,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x0
-	SIG_UNBLOCK = 0x1
-	SIG_SETMASK = 0x2
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -343,16 +326,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -430,7 +403,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -495,6 +468,15 @@ const (
 	BLKPG = 0x1269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -674,32 +656,3 @@ const (
 	PPS_GETCAP    = 0x800870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x800
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    uint16
-	Seq  uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
index 590b567..0531e98 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -1,7 +1,8 @@
-// cgo -godefs -objdir=/tmp/sparc64/cgo -- -Wall -Werror -static -I/tmp/sparc64/include linux/types.go | go run mkpost.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
+// +build sparc64,linux
 
 package unix
 
@@ -238,10 +239,6 @@ type EpollEvent struct {
 	Pad    int32
 }
 
-const (
-	OPEN_TREE_CLOEXEC = 0x400000
-)
-
 const (
 	POLLRDHUP = 0x800
 )
@@ -252,20 +249,6 @@ type Sigset_t struct {
 
 const _C__NSIG = 0x41
 
-const (
-	SIG_BLOCK   = 0x1
-	SIG_UNBLOCK = 0x2
-	SIG_SETMASK = 0x4
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	_     int32
-	_     [112]byte
-}
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -325,16 +308,6 @@ type Taskstats struct {
 	Thrashing_count           uint64
 	Thrashing_delay_total     uint64
 	Ac_btime64                uint64
-	Compact_count             uint64
-	Compact_delay_total       uint64
-	Ac_tgid                   uint32
-	Ac_tgetime                uint64
-	Ac_exe_dev                uint64
-	Ac_exe_inode              uint64
-	Wpcopy_count              uint64
-	Wpcopy_delay_total        uint64
-	Irq_count                 uint64
-	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -412,7 +385,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	Data   [118]byte
+	_      [118]int8
 	_      uint64
 }
 
@@ -476,6 +449,15 @@ const (
 	BLKPG = 0x20001269
 )
 
+type XDPUmemReg struct {
+	Addr     uint64
+	Len      uint64
+	Size     uint32
+	Headroom uint32
+	Flags    uint32
+	_        [4]byte
+}
+
 type CryptoUserAlg struct {
 	Name        [64]int8
 	Driver_name [64]int8
@@ -655,32 +637,3 @@ const (
 	PPS_GETCAP    = 0x400870a3
 	PPS_FETCH     = 0xc00870a4
 )
-
-const (
-	PIDFD_NONBLOCK = 0x4000
-)
-
-type SysvIpcPerm struct {
-	Key  int32
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode uint32
-	_    uint16
-	Seq  uint16
-	_    uint64
-	_    uint64
-}
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-	Segsz  uint64
-	Cpid   int32
-	Lpid   int32
-	Nattch uint64
-	_      uint64
-	_      uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
index f22e794..2fd2060 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && netbsd
+// +build 386,netbsd
 
 package unix
 
@@ -490,90 +491,6 @@ type Utsname struct {
 	Machine  [256]byte
 }
 
-const SizeofUvmexp = 0x278
-
-type Uvmexp struct {
-	Pagesize           int64
-	Pagemask           int64
-	Pageshift          int64
-	Npages             int64
-	Free               int64
-	Active             int64
-	Inactive           int64
-	Paging             int64
-	Wired              int64
-	Zeropages          int64
-	Reserve_pagedaemon int64
-	Reserve_kernel     int64
-	Freemin            int64
-	Freetarg           int64
-	Inactarg           int64
-	Wiredmax           int64
-	Nswapdev           int64
-	Swpages            int64
-	Swpginuse          int64
-	Swpgonly           int64
-	Nswget             int64
-	Unused1            int64
-	Cpuhit             int64
-	Cpumiss            int64
-	Faults             int64
-	Traps              int64
-	Intrs              int64
-	Swtch              int64
-	Softs              int64
-	Syscalls           int64
-	Pageins            int64
-	Swapins            int64
-	Swapouts           int64
-	Pgswapin           int64
-	Pgswapout          int64
-	Forks              int64
-	Forks_ppwait       int64
-	Forks_sharevm      int64
-	Pga_zerohit        int64
-	Pga_zeromiss       int64
-	Zeroaborts         int64
-	Fltnoram           int64
-	Fltnoanon          int64
-	Fltpgwait          int64
-	Fltpgrele          int64
-	Fltrelck           int64
-	Fltrelckok         int64
-	Fltanget           int64
-	Fltanretry         int64
-	Fltamcopy          int64
-	Fltnamap           int64
-	Fltnomap           int64
-	Fltlget            int64
-	Fltget             int64
-	Flt_anon           int64
-	Flt_acow           int64
-	Flt_obj            int64
-	Flt_prcopy         int64
-	Flt_przero         int64
-	Pdwoke             int64
-	Pdrevs             int64
-	Unused4            int64
-	Pdfreed            int64
-	Pdscans            int64
-	Pdanscan           int64
-	Pdobscan           int64
-	Pdreact            int64
-	Pdbusy             int64
-	Pdpageouts         int64
-	Pdpending          int64
-	Pddeact            int64
-	Anonpages          int64
-	Filepages          int64
-	Execpages          int64
-	Colorhit           int64
-	Colormiss          int64
-	Ncolors            int64
-	Bootpages          int64
-	Poolpages          int64
-}
-
 const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
index 066a7d8..6a5a1a8 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && netbsd
+// +build amd64,netbsd
 
 package unix
 
@@ -498,90 +499,6 @@ type Utsname struct {
 	Machine  [256]byte
 }
 
-const SizeofUvmexp = 0x278
-
-type Uvmexp struct {
-	Pagesize           int64
-	Pagemask           int64
-	Pageshift          int64
-	Npages             int64
-	Free               int64
-	Active             int64
-	Inactive           int64
-	Paging             int64
-	Wired              int64
-	Zeropages          int64
-	Reserve_pagedaemon int64
-	Reserve_kernel     int64
-	Freemin            int64
-	Freetarg           int64
-	Inactarg           int64
-	Wiredmax           int64
-	Nswapdev           int64
-	Swpages            int64
-	Swpginuse          int64
-	Swpgonly           int64
-	Nswget             int64
-	Unused1            int64
-	Cpuhit             int64
-	Cpumiss            int64
-	Faults             int64
-	Traps              int64
-	Intrs              int64
-	Swtch              int64
-	Softs              int64
-	Syscalls           int64
-	Pageins            int64
-	Swapins            int64
-	Swapouts           int64
-	Pgswapin           int64
-	Pgswapout          int64
-	Forks              int64
-	Forks_ppwait       int64
-	Forks_sharevm      int64
-	Pga_zerohit        int64
-	Pga_zeromiss       int64
-	Zeroaborts         int64
-	Fltnoram           int64
-	Fltnoanon          int64
-	Fltpgwait          int64
-	Fltpgrele          int64
-	Fltrelck           int64
-	Fltrelckok         int64
-	Fltanget           int64
-	Fltanretry         int64
-	Fltamcopy          int64
-	Fltnamap           int64
-	Fltnomap           int64
-	Fltlget            int64
-	Fltget             int64
-	Flt_anon           int64
-	Flt_acow           int64
-	Flt_obj            int64
-	Flt_prcopy         int64
-	Flt_przero         int64
-	Pdwoke             int64
-	Pdrevs             int64
-	Unused4            int64
-	Pdfreed            int64
-	Pdscans            int64
-	Pdanscan           int64
-	Pdobscan           int64
-	Pdreact            int64
-	Pdbusy             int64
-	Pdpageouts         int64
-	Pdpending          int64
-	Pddeact            int64
-	Anonpages          int64
-	Filepages          int64
-	Execpages          int64
-	Colorhit           int64
-	Colormiss          int64
-	Ncolors            int64
-	Bootpages          int64
-	Poolpages          int64
-}
-
 const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
index 439548e..84cc8d0 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && netbsd
+// +build arm,netbsd
 
 package unix
 
@@ -495,90 +496,6 @@ type Utsname struct {
 	Machine  [256]byte
 }
 
-const SizeofUvmexp = 0x278
-
-type Uvmexp struct {
-	Pagesize           int64
-	Pagemask           int64
-	Pageshift          int64
-	Npages             int64
-	Free               int64
-	Active             int64
-	Inactive           int64
-	Paging             int64
-	Wired              int64
-	Zeropages          int64
-	Reserve_pagedaemon int64
-	Reserve_kernel     int64
-	Freemin            int64
-	Freetarg           int64
-	Inactarg           int64
-	Wiredmax           int64
-	Nswapdev           int64
-	Swpages            int64
-	Swpginuse          int64
-	Swpgonly           int64
-	Nswget             int64
-	Unused1            int64
-	Cpuhit             int64
-	Cpumiss            int64
-	Faults             int64
-	Traps              int64
-	Intrs              int64
-	Swtch              int64
-	Softs              int64
-	Syscalls           int64
-	Pageins            int64
-	Swapins            int64
-	Swapouts           int64
-	Pgswapin           int64
-	Pgswapout          int64
-	Forks              int64
-	Forks_ppwait       int64
-	Forks_sharevm      int64
-	Pga_zerohit        int64
-	Pga_zeromiss       int64
-	Zeroaborts         int64
-	Fltnoram           int64
-	Fltnoanon          int64
-	Fltpgwait          int64
-	Fltpgrele          int64
-	Fltrelck           int64
-	Fltrelckok         int64
-	Fltanget           int64
-	Fltanretry         int64
-	Fltamcopy          int64
-	Fltnamap           int64
-	Fltnomap           int64
-	Fltlget            int64
-	Fltget             int64
-	Flt_anon           int64
-	Flt_acow           int64
-	Flt_obj            int64
-	Flt_prcopy         int64
-	Flt_przero         int64
-	Pdwoke             int64
-	Pdrevs             int64
-	Unused4            int64
-	Pdfreed            int64
-	Pdscans            int64
-	Pdanscan           int64
-	Pdobscan           int64
-	Pdreact            int64
-	Pdbusy             int64
-	Pdpageouts         int64
-	Pdpending          int64
-	Pddeact            int64
-	Anonpages          int64
-	Filepages          int64
-	Execpages          int64
-	Colorhit           int64
-	Colormiss          int64
-	Ncolors            int64
-	Bootpages          int64
-	Poolpages          int64
-}
-
 const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
index 16085d3..c844e70 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && netbsd
+// +build arm64,netbsd
 
 package unix
 
@@ -498,90 +499,6 @@ type Utsname struct {
 	Machine  [256]byte
 }
 
-const SizeofUvmexp = 0x278
-
-type Uvmexp struct {
-	Pagesize           int64
-	Pagemask           int64
-	Pageshift          int64
-	Npages             int64
-	Free               int64
-	Active             int64
-	Inactive           int64
-	Paging             int64
-	Wired              int64
-	Zeropages          int64
-	Reserve_pagedaemon int64
-	Reserve_kernel     int64
-	Freemin            int64
-	Freetarg           int64
-	Inactarg           int64
-	Wiredmax           int64
-	Nswapdev           int64
-	Swpages            int64
-	Swpginuse          int64
-	Swpgonly           int64
-	Nswget             int64
-	Unused1            int64
-	Cpuhit             int64
-	Cpumiss            int64
-	Faults             int64
-	Traps              int64
-	Intrs              int64
-	Swtch              int64
-	Softs              int64
-	Syscalls           int64
-	Pageins            int64
-	Swapins            int64
-	Swapouts           int64
-	Pgswapin           int64
-	Pgswapout          int64
-	Forks              int64
-	Forks_ppwait       int64
-	Forks_sharevm      int64
-	Pga_zerohit        int64
-	Pga_zeromiss       int64
-	Zeroaborts         int64
-	Fltnoram           int64
-	Fltnoanon          int64
-	Fltpgwait          int64
-	Fltpgrele          int64
-	Fltrelck           int64
-	Fltrelckok         int64
-	Fltanget           int64
-	Fltanretry         int64
-	Fltamcopy          int64
-	Fltnamap           int64
-	Fltnomap           int64
-	Fltlget            int64
-	Fltget             int64
-	Flt_anon           int64
-	Flt_acow           int64
-	Flt_obj            int64
-	Flt_prcopy         int64
-	Flt_przero         int64
-	Pdwoke             int64
-	Pdrevs             int64
-	Unused4            int64
-	Pdfreed            int64
-	Pdscans            int64
-	Pdanscan           int64
-	Pdobscan           int64
-	Pdreact            int64
-	Pdbusy             int64
-	Pdpageouts         int64
-	Pdpending          int64
-	Pddeact            int64
-	Anonpages          int64
-	Filepages          int64
-	Execpages          int64
-	Colorhit           int64
-	Colormiss          int64
-	Ncolors            int64
-	Bootpages          int64
-	Poolpages          int64
-}
-
 const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
index afd13a3..2a8b1e6 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && openbsd
+// +build 386,openbsd
 
 package unix
 
@@ -57,22 +58,22 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Mode    uint32
-	Dev     int32
-	Ino     uint64
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    int32
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Size    int64
-	Blocks  int64
-	Blksize int32
-	Flags   uint32
-	Gen     uint32
-	_       Timespec
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        uint32
+	Flags          uint32
+	Gen            uint32
+	X__st_birthtim Timespec
 }
 
 type Statfs_t struct {
@@ -93,11 +94,11 @@ type Statfs_t struct {
 	F_namemax     uint32
 	F_owner       uint32
 	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
-	_             [2]byte
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
+	Pad_cgo_0     [2]byte
 	Mount_info    [160]byte
 }
 
@@ -110,13 +111,13 @@ type Flock_t struct {
 }
 
 type Dirent struct {
-	Fileno uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	_      [4]uint8
-	Name   [256]int8
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]int8
 }
 
 type Fsid struct {
@@ -261,8 +262,8 @@ type FdSet struct {
 }
 
 const (
-	SizeofIfMsghdr         = 0xa0
-	SizeofIfData           = 0x88
+	SizeofIfMsghdr         = 0xec
+	SizeofIfData           = 0xd4
 	SizeofIfaMsghdr        = 0x18
 	SizeofIfAnnounceMsghdr = 0x1a
 	SizeofRtMsghdr         = 0x60
@@ -291,7 +292,7 @@ type IfData struct {
 	Link_state   uint8
 	Mtu          uint32
 	Metric       uint32
-	Rdomain      uint32
+	Pad          uint32
 	Baudrate     uint64
 	Ipackets     uint64
 	Ierrors      uint64
@@ -303,10 +304,10 @@ type IfData struct {
 	Imcasts      uint64
 	Omcasts      uint64
 	Iqdrops      uint64
-	Oqdrops      uint64
 	Noproto      uint64
 	Capabilities uint32
 	Lastchange   Timeval
+	Mclpool      [7]Mclpool
 }
 
 type IfaMsghdr struct {
@@ -367,12 +368,20 @@ type RtMetrics struct {
 	Pad      uint32
 }
 
+type Mclpool struct {
+	Grown int32
+	Alive uint16
+	Hwm   uint16
+	Cwm   uint16
+	Lwm   uint16
+}
+
 const (
 	SizeofBpfVersion = 0x4
 	SizeofBpfStat    = 0x8
 	SizeofBpfProgram = 0x8
 	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
+	SizeofBpfHdr     = 0x14
 )
 
 type BpfVersion struct {
@@ -398,14 +407,11 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp  BpfTimeval
-	Caplen  uint32
-	Datalen uint32
-	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
 }
 
 type BpfTimeval struct {
@@ -482,7 +488,7 @@ type Uvmexp struct {
 	Zeropages          int32
 	Reserve_pagedaemon int32
 	Reserve_kernel     int32
-	Unused01           int32
+	Anonpages          int32
 	Vnodepages         int32
 	Vtextpages         int32
 	Freemin            int32
@@ -501,8 +507,8 @@ type Uvmexp struct {
 	Swpgonly           int32
 	Nswget             int32
 	Nanon              int32
-	Unused05           int32
-	Unused06           int32
+	Nanonneeded        int32
+	Nfreeanon          int32
 	Faults             int32
 	Traps              int32
 	Intrs              int32
@@ -510,8 +516,8 @@ type Uvmexp struct {
 	Softs              int32
 	Syscalls           int32
 	Pageins            int32
-	Unused07           int32
-	Unused08           int32
+	Obsolete_swapins   int32
+	Obsolete_swapouts  int32
 	Pgswapin           int32
 	Pgswapout          int32
 	Forks              int32
@@ -519,7 +525,7 @@ type Uvmexp struct {
 	Forks_sharevm      int32
 	Pga_zerohit        int32
 	Pga_zeromiss       int32
-	Unused09           int32
+	Zeroaborts         int32
 	Fltnoram           int32
 	Fltnoanon          int32
 	Fltnoamap          int32
@@ -551,18 +557,19 @@ type Uvmexp struct {
 	Pdpageouts         int32
 	Pdpending          int32
 	Pddeact            int32
-	Unused11           int32
-	Unused12           int32
-	Unused13           int32
+	Pdreanon           int32
+	Pdrevnode          int32
+	Pdrevtext          int32
 	Fpswtch            int32
 	Kmapent            int32
 }
 
-const SizeofClockinfo = 0x10
+const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
+	Hz      int32
+	Tick    int32
+	Tickadj int32
+	Stathz  int32
+	Profhz  int32
 }
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
index 5d97f1f..b1759cf 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && openbsd
+// +build amd64,openbsd
 
 package unix
 
@@ -72,6 +73,7 @@ type Stat_t struct {
 	Blksize int32
 	Flags   uint32
 	Gen     uint32
+	_       [4]byte
 	_       Timespec
 }
 
@@ -79,6 +81,7 @@ type Statfs_t struct {
 	F_flags       uint32
 	F_bsize       uint32
 	F_iosize      uint32
+	_             [4]byte
 	F_blocks      uint64
 	F_bfree       uint64
 	F_bavail      int64
@@ -93,10 +96,10 @@ type Statfs_t struct {
 	F_namemax     uint32
 	F_owner       uint32
 	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
 	_             [2]byte
 	Mount_info    [160]byte
 }
@@ -197,8 +200,10 @@ type IPv6Mreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint32
+	_          [4]byte
 	Control    *byte
 	Controllen uint32
 	Flags      int32
@@ -306,6 +311,7 @@ type IfData struct {
 	Oqdrops      uint64
 	Noproto      uint64
 	Capabilities uint32
+	_            [4]byte
 	Lastchange   Timeval
 }
 
@@ -367,12 +373,14 @@ type RtMetrics struct {
 	Pad      uint32
 }
 
+type Mclpool struct{}
+
 const (
 	SizeofBpfVersion = 0x4
 	SizeofBpfStat    = 0x8
 	SizeofBpfProgram = 0x10
 	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
+	SizeofBpfHdr     = 0x14
 )
 
 type BpfVersion struct {
@@ -387,6 +395,7 @@ type BpfStat struct {
 
 type BpfProgram struct {
 	Len   uint32
+	_     [4]byte
 	Insns *BpfInsn
 }
 
@@ -402,10 +411,7 @@ type BpfHdr struct {
 	Caplen  uint32
 	Datalen uint32
 	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
+	_       [2]byte
 }
 
 type BpfTimeval struct {
@@ -482,7 +488,7 @@ type Uvmexp struct {
 	Zeropages          int32
 	Reserve_pagedaemon int32
 	Reserve_kernel     int32
-	Unused01           int32
+	Anonpages          int32
 	Vnodepages         int32
 	Vtextpages         int32
 	Freemin            int32
@@ -501,8 +507,8 @@ type Uvmexp struct {
 	Swpgonly           int32
 	Nswget             int32
 	Nanon              int32
-	Unused05           int32
-	Unused06           int32
+	Nanonneeded        int32
+	Nfreeanon          int32
 	Faults             int32
 	Traps              int32
 	Intrs              int32
@@ -510,8 +516,8 @@ type Uvmexp struct {
 	Softs              int32
 	Syscalls           int32
 	Pageins            int32
-	Unused07           int32
-	Unused08           int32
+	Obsolete_swapins   int32
+	Obsolete_swapouts  int32
 	Pgswapin           int32
 	Pgswapout          int32
 	Forks              int32
@@ -519,7 +525,7 @@ type Uvmexp struct {
 	Forks_sharevm      int32
 	Pga_zerohit        int32
 	Pga_zeromiss       int32
-	Unused09           int32
+	Zeroaborts         int32
 	Fltnoram           int32
 	Fltnoanon          int32
 	Fltnoamap          int32
@@ -551,18 +557,19 @@ type Uvmexp struct {
 	Pdpageouts         int32
 	Pdpending          int32
 	Pddeact            int32
-	Unused11           int32
-	Unused12           int32
-	Unused13           int32
+	Pdreanon           int32
+	Pdrevnode          int32
+	Pdrevtext          int32
 	Fpswtch            int32
 	Kmapent            int32
 }
 
-const SizeofClockinfo = 0x10
+const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
+	Hz      int32
+	Tick    int32
+	Tickadj int32
+	Stathz  int32
+	Profhz  int32
 }
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
index 34871cd..e807de2 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && openbsd
+// +build arm,openbsd
 
 package unix
 
@@ -97,10 +98,10 @@ type Statfs_t struct {
 	F_namemax     uint32
 	F_owner       uint32
 	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
 	_             [2]byte
 	Mount_info    [160]byte
 }
@@ -374,12 +375,14 @@ type RtMetrics struct {
 	Pad      uint32
 }
 
+type Mclpool struct{}
+
 const (
 	SizeofBpfVersion = 0x4
 	SizeofBpfStat    = 0x8
 	SizeofBpfProgram = 0x8
 	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
+	SizeofBpfHdr     = 0x14
 )
 
 type BpfVersion struct {
@@ -409,10 +412,7 @@ type BpfHdr struct {
 	Caplen  uint32
 	Datalen uint32
 	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
+	_       [2]byte
 }
 
 type BpfTimeval struct {
@@ -565,11 +565,12 @@ type Uvmexp struct {
 	Kmapent            int32
 }
 
-const SizeofClockinfo = 0x10
+const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
+	Hz      int32
+	Tick    int32
+	Tickadj int32
+	Stathz  int32
+	Profhz  int32
 }
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
index 5911bce..ff3aeca 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && openbsd
+// +build arm64,openbsd
 
 package unix
 
@@ -93,10 +94,10 @@ type Statfs_t struct {
 	F_namemax     uint32
 	F_owner       uint32
 	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
 	_             [2]byte
 	Mount_info    [160]byte
 }
@@ -367,12 +368,14 @@ type RtMetrics struct {
 	Pad      uint32
 }
 
+type Mclpool struct{}
+
 const (
 	SizeofBpfVersion = 0x4
 	SizeofBpfStat    = 0x8
 	SizeofBpfProgram = 0x10
 	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
+	SizeofBpfHdr     = 0x14
 )
 
 type BpfVersion struct {
@@ -402,10 +405,7 @@ type BpfHdr struct {
 	Caplen  uint32
 	Datalen uint32
 	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
+	_       [2]byte
 }
 
 type BpfTimeval struct {
@@ -558,11 +558,12 @@ type Uvmexp struct {
 	Kmapent            int32
 }
 
-const SizeofClockinfo = 0x10
+const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
+	Hz      int32
+	Tick    int32
+	Tickadj int32
+	Stathz  int32
+	Profhz  int32
 }
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
index e4f24f3..9ecda69 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && openbsd
+// +build mips64,openbsd
 
 package unix
 
@@ -93,10 +94,10 @@ type Statfs_t struct {
 	F_namemax     uint32
 	F_owner       uint32
 	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
 	_             [2]byte
 	Mount_info    [160]byte
 }
@@ -367,12 +368,14 @@ type RtMetrics struct {
 	Pad      uint32
 }
 
+type Mclpool struct{}
+
 const (
 	SizeofBpfVersion = 0x4
 	SizeofBpfStat    = 0x8
 	SizeofBpfProgram = 0x10
 	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
+	SizeofBpfHdr     = 0x14
 )
 
 type BpfVersion struct {
@@ -402,10 +405,7 @@ type BpfHdr struct {
 	Caplen  uint32
 	Datalen uint32
 	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
+	_       [2]byte
 }
 
 type BpfTimeval struct {
@@ -558,11 +558,12 @@ type Uvmexp struct {
 	Kmapent            int32
 }
 
-const SizeofClockinfo = 0x10
+const SizeofClockinfo = 0x14
 
 type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
+	Hz      int32
+	Tick    int32
+	Tickadj int32
+	Stathz  int32
+	Profhz  int32
 }
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go
deleted file mode 100644
index ca50a79..0000000
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go
+++ /dev/null
@@ -1,570 +0,0 @@
-// cgo -godefs -- -fsigned-char types_openbsd.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build ppc64 && openbsd
-
-package unix
-
-const (
-	SizeofPtr      = 0x8
-	SizeofShort    = 0x2
-	SizeofInt      = 0x4
-	SizeofLong     = 0x8
-	SizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Mode    uint32
-	Dev     int32
-	Ino     uint64
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    int32
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Size    int64
-	Blocks  int64
-	Blksize int32
-	Flags   uint32
-	Gen     uint32
-	_       Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
-	_             [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	_      [4]uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	PathMax = 0x400
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIovec            = 0x10
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xa8
-	SizeofIfData           = 0x90
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Rdomain      uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Oqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Lastchange   Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct{}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp  BpfTimeval
-	Caplen  uint32
-	Datalen uint32
-	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_EACCESS          = 0x1
-	AT_SYMLINK_NOFOLLOW = 0x2
-	AT_SYMLINK_FOLLOW   = 0x4
-	AT_REMOVEDIR        = 0x8
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLERR    = 0x8
-	POLLHUP    = 0x10
-	POLLIN     = 0x1
-	POLLNVAL   = 0x20
-	POLLOUT    = 0x4
-	POLLPRI    = 0x2
-	POLLRDBAND = 0x80
-	POLLRDNORM = 0x40
-	POLLWRBAND = 0x100
-	POLLWRNORM = 0x4
-)
-
-type Sigset_t uint32
-
-type Utsname struct {
-	Sysname  [256]byte
-	Nodename [256]byte
-	Release  [256]byte
-	Version  [256]byte
-	Machine  [256]byte
-}
-
-const SizeofUvmexp = 0x158
-
-type Uvmexp struct {
-	Pagesize           int32
-	Pagemask           int32
-	Pageshift          int32
-	Npages             int32
-	Free               int32
-	Active             int32
-	Inactive           int32
-	Paging             int32
-	Wired              int32
-	Zeropages          int32
-	Reserve_pagedaemon int32
-	Reserve_kernel     int32
-	Unused01           int32
-	Vnodepages         int32
-	Vtextpages         int32
-	Freemin            int32
-	Freetarg           int32
-	Inactarg           int32
-	Wiredmax           int32
-	Anonmin            int32
-	Vtextmin           int32
-	Vnodemin           int32
-	Anonminpct         int32
-	Vtextminpct        int32
-	Vnodeminpct        int32
-	Nswapdev           int32
-	Swpages            int32
-	Swpginuse          int32
-	Swpgonly           int32
-	Nswget             int32
-	Nanon              int32
-	Unused05           int32
-	Unused06           int32
-	Faults             int32
-	Traps              int32
-	Intrs              int32
-	Swtch              int32
-	Softs              int32
-	Syscalls           int32
-	Pageins            int32
-	Unused07           int32
-	Unused08           int32
-	Pgswapin           int32
-	Pgswapout          int32
-	Forks              int32
-	Forks_ppwait       int32
-	Forks_sharevm      int32
-	Pga_zerohit        int32
-	Pga_zeromiss       int32
-	Unused09           int32
-	Fltnoram           int32
-	Fltnoanon          int32
-	Fltnoamap          int32
-	Fltpgwait          int32
-	Fltpgrele          int32
-	Fltrelck           int32
-	Fltrelckok         int32
-	Fltanget           int32
-	Fltanretry         int32
-	Fltamcopy          int32
-	Fltnamap           int32
-	Fltnomap           int32
-	Fltlget            int32
-	Fltget             int32
-	Flt_anon           int32
-	Flt_acow           int32
-	Flt_obj            int32
-	Flt_prcopy         int32
-	Flt_przero         int32
-	Pdwoke             int32
-	Pdrevs             int32
-	Pdswout            int32
-	Pdfreed            int32
-	Pdscans            int32
-	Pdanscan           int32
-	Pdobscan           int32
-	Pdreact            int32
-	Pdbusy             int32
-	Pdpageouts         int32
-	Pdpending          int32
-	Pddeact            int32
-	Unused11           int32
-	Unused12           int32
-	Unused13           int32
-	Fpswtch            int32
-	Kmapent            int32
-}
-
-const SizeofClockinfo = 0x10
-
-type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go
deleted file mode 100644
index d7d7f79..0000000
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go
+++ /dev/null
@@ -1,570 +0,0 @@
-// cgo -godefs -- -fsigned-char types_openbsd.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-//go:build riscv64 && openbsd
-
-package unix
-
-const (
-	SizeofPtr      = 0x8
-	SizeofShort    = 0x2
-	SizeofInt      = 0x4
-	SizeofLong     = 0x8
-	SizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Mode    uint32
-	Dev     int32
-	Ino     uint64
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    int32
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Size    int64
-	Blocks  int64
-	Blksize int32
-	Flags   uint32
-	Gen     uint32
-	_       Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]byte
-	F_mntonname   [90]byte
-	F_mntfromname [90]byte
-	F_mntfromspec [90]byte
-	_             [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	_      [4]uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	PathMax = 0x400
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIovec            = 0x10
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xa8
-	SizeofIfData           = 0x90
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Rdomain      uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Oqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Lastchange   Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct{}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x18
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp  BpfTimeval
-	Caplen  uint32
-	Datalen uint32
-	Hdrlen  uint16
-	Ifidx   uint16
-	Flowid  uint16
-	Flags   uint8
-	Drops   uint8
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_EACCESS          = 0x1
-	AT_SYMLINK_NOFOLLOW = 0x2
-	AT_SYMLINK_FOLLOW   = 0x4
-	AT_REMOVEDIR        = 0x8
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLERR    = 0x8
-	POLLHUP    = 0x10
-	POLLIN     = 0x1
-	POLLNVAL   = 0x20
-	POLLOUT    = 0x4
-	POLLPRI    = 0x2
-	POLLRDBAND = 0x80
-	POLLRDNORM = 0x40
-	POLLWRBAND = 0x100
-	POLLWRNORM = 0x4
-)
-
-type Sigset_t uint32
-
-type Utsname struct {
-	Sysname  [256]byte
-	Nodename [256]byte
-	Release  [256]byte
-	Version  [256]byte
-	Machine  [256]byte
-}
-
-const SizeofUvmexp = 0x158
-
-type Uvmexp struct {
-	Pagesize           int32
-	Pagemask           int32
-	Pageshift          int32
-	Npages             int32
-	Free               int32
-	Active             int32
-	Inactive           int32
-	Paging             int32
-	Wired              int32
-	Zeropages          int32
-	Reserve_pagedaemon int32
-	Reserve_kernel     int32
-	Unused01           int32
-	Vnodepages         int32
-	Vtextpages         int32
-	Freemin            int32
-	Freetarg           int32
-	Inactarg           int32
-	Wiredmax           int32
-	Anonmin            int32
-	Vtextmin           int32
-	Vnodemin           int32
-	Anonminpct         int32
-	Vtextminpct        int32
-	Vnodeminpct        int32
-	Nswapdev           int32
-	Swpages            int32
-	Swpginuse          int32
-	Swpgonly           int32
-	Nswget             int32
-	Nanon              int32
-	Unused05           int32
-	Unused06           int32
-	Faults             int32
-	Traps              int32
-	Intrs              int32
-	Swtch              int32
-	Softs              int32
-	Syscalls           int32
-	Pageins            int32
-	Unused07           int32
-	Unused08           int32
-	Pgswapin           int32
-	Pgswapout          int32
-	Forks              int32
-	Forks_ppwait       int32
-	Forks_sharevm      int32
-	Pga_zerohit        int32
-	Pga_zeromiss       int32
-	Unused09           int32
-	Fltnoram           int32
-	Fltnoanon          int32
-	Fltnoamap          int32
-	Fltpgwait          int32
-	Fltpgrele          int32
-	Fltrelck           int32
-	Fltrelckok         int32
-	Fltanget           int32
-	Fltanretry         int32
-	Fltamcopy          int32
-	Fltnamap           int32
-	Fltnomap           int32
-	Fltlget            int32
-	Fltget             int32
-	Flt_anon           int32
-	Flt_acow           int32
-	Flt_obj            int32
-	Flt_prcopy         int32
-	Flt_przero         int32
-	Pdwoke             int32
-	Pdrevs             int32
-	Pdswout            int32
-	Pdfreed            int32
-	Pdscans            int32
-	Pdanscan           int32
-	Pdobscan           int32
-	Pdreact            int32
-	Pdbusy             int32
-	Pdpageouts         int32
-	Pdpending          int32
-	Pddeact            int32
-	Unused11           int32
-	Unused12           int32
-	Unused13           int32
-	Fpswtch            int32
-	Kmapent            int32
-}
-
-const SizeofClockinfo = 0x10
-
-type Clockinfo struct {
-	Hz     int32
-	Tick   int32
-	Stathz int32
-	Profhz int32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
index 1416057..ad4aad2 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
@@ -2,6 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && solaris
+// +build amd64,solaris
 
 package unix
 
@@ -177,7 +178,7 @@ type Linger struct {
 }
 
 type Iovec struct {
-	Base *byte
+	Base *int8
 	Len  uint64
 }
 
@@ -479,38 +480,3 @@ const (
 	MOUNTEDOVER        = 0x40000000
 	FILE_EXCEPTION     = 0x60000070
 )
-
-const (
-	TUNNEWPPA = 0x540001
-	TUNSETPPA = 0x540002
-
-	I_STR     = 0x5308
-	I_POP     = 0x5303
-	I_PUSH    = 0x5302
-	I_LINK    = 0x530c
-	I_UNLINK  = 0x530d
-	I_PLINK   = 0x5316
-	I_PUNLINK = 0x5317
-
-	IF_UNITSEL = -0x7ffb8cca
-)
-
-type strbuf struct {
-	Maxlen int32
-	Len    int32
-	Buf    *int8
-}
-
-type Strioctl struct {
-	Cmd    int32
-	Timout int32
-	Len    int32
-	Dp     *int8
-}
-
-type Lifreq struct {
-	Name   [32]int8
-	Lifru1 [4]byte
-	Type   uint32
-	Lifru  [336]byte
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
index 2e5d5a4..4ab638c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build zos && s390x
+// +build zos,s390x
 
 // Hand edited based on ztypes_linux_s390x.go
 // TODO: auto-generate.
@@ -25,13 +26,10 @@ const (
 	SizeofIPv6Mreq      = 20
 	SizeofICMPv6Filter  = 32
 	SizeofIPv6MTUInfo   = 32
-	SizeofInet4Pktinfo  = 8
-	SizeofInet6Pktinfo  = 20
 	SizeofLinger        = 8
 	SizeofSockaddrInet4 = 16
 	SizeofSockaddrInet6 = 28
 	SizeofTCPInfo       = 0x68
-	SizeofUcred         = 12
 )
 
 type (
@@ -72,17 +70,12 @@ type Utimbuf struct {
 }
 
 type Utsname struct {
-	Sysname  [16]byte
-	Nodename [32]byte
-	Release  [8]byte
-	Version  [8]byte
-	Machine  [16]byte
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type RawSockaddrInet4 struct {
@@ -333,7 +326,7 @@ type Statvfs_t struct {
 }
 
 type Statfs_t struct {
-	Type    uint64
+	Type    uint32
 	Bsize   uint64
 	Blocks  uint64
 	Bfree   uint64
@@ -344,10 +337,9 @@ type Statfs_t struct {
 	Namelen uint64
 	Frsize  uint64
 	Flags   uint64
-	_       [4]uint64
 }
 
-type direntLE struct {
+type Dirent struct {
 	Reclen uint16
 	Namlen uint16
 	Ino    uint32
@@ -355,15 +347,6 @@ type direntLE struct {
 	Name   [256]byte
 }
 
-type Dirent struct {
-	Ino    uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Name   [256]uint8
-	_      [5]byte
-}
-
 type FdSet struct {
 	Bits [64]int32
 }
@@ -377,12 +360,6 @@ type Flock_t struct {
 	Pid    int32
 }
 
-type F_cnvrt struct {
-	Cvtcmd int32
-	Pccsid int16
-	Fccsid int16
-}
-
 type Termios struct {
 	Cflag uint32
 	Iflag uint32
@@ -427,126 +404,3 @@ type W_Mntent struct {
 	Quiesceowner [8]byte
 	_            [38]byte
 }
-
-type EpollEvent struct {
-	Events uint32
-	_      int32
-	Fd     int32
-	Pad    int32
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   string
-}
-
-const (
-	SizeofInotifyEvent = 0x10
-)
-
-type ConsMsg2 struct {
-	Cm2Format       uint16
-	Cm2R1           uint16
-	Cm2Msglength    uint32
-	Cm2Msg          *byte
-	Cm2R2           [4]byte
-	Cm2R3           [4]byte
-	Cm2Routcde      *uint32
-	Cm2Descr        *uint32
-	Cm2Msgflag      uint32
-	Cm2Token        uint32
-	Cm2Msgid        *uint32
-	Cm2R4           [4]byte
-	Cm2DomToken     uint32
-	Cm2DomMsgid     *uint32
-	Cm2ModCartptr   *byte
-	Cm2ModConsidptr *byte
-	Cm2MsgCart      [8]byte
-	Cm2MsgConsid    [4]byte
-	Cm2R5           [12]byte
-}
-
-const (
-	CC_modify        = 1
-	CC_stop          = 2
-	CONSOLE_FORMAT_2 = 2
-	CONSOLE_FORMAT_3 = 3
-	CONSOLE_HRDCPY   = 0x80000000
-)
-
-type OpenHow struct {
-	Flags   uint64
-	Mode    uint64
-	Resolve uint64
-}
-
-const SizeofOpenHow = 0x18
-
-const (
-	RESOLVE_CACHED        = 0x20
-	RESOLVE_BENEATH       = 0x8
-	RESOLVE_IN_ROOT       = 0x10
-	RESOLVE_NO_MAGICLINKS = 0x2
-	RESOLVE_NO_SYMLINKS   = 0x4
-	RESOLVE_NO_XDEV       = 0x1
-)
-
-type Siginfo struct {
-	Signo int32
-	Errno int32
-	Code  int32
-	Pid   int32
-	Uid   uint32
-	_     [44]byte
-}
-
-type SysvIpcPerm struct {
-	Uid  uint32
-	Gid  uint32
-	Cuid uint32
-	Cgid uint32
-	Mode int32
-}
-
-type SysvShmDesc struct {
-	Perm   SysvIpcPerm
-	_      [4]byte
-	Lpid   int32
-	Cpid   int32
-	Nattch uint32
-	_      [4]byte
-	_      [4]byte
-	_      [4]byte
-	_      int32
-	_      uint8
-	_      uint8
-	_      uint16
-	_      *byte
-	Segsz  uint64
-	Atime  Time_t
-	Dtime  Time_t
-	Ctime  Time_t
-}
-
-type SysvShmDesc64 struct {
-	Perm   SysvIpcPerm
-	_      [4]byte
-	Lpid   int32
-	Cpid   int32
-	Nattch uint32
-	_      [4]byte
-	_      [4]byte
-	_      [4]byte
-	_      int32
-	_      byte
-	_      uint8
-	_      uint16
-	_      *byte
-	Segsz  uint64
-	Atime  int64
-	Dtime  int64
-	Ctime  int64
-}
diff --git a/vendor/golang.org/x/sys/windows/aliases.go b/vendor/golang.org/x/sys/windows/aliases.go
index 16f9056..af3af60 100644
--- a/vendor/golang.org/x/sys/windows/aliases.go
+++ b/vendor/golang.org/x/sys/windows/aliases.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows
+// +build windows
+// +build go1.9
 
 package windows
 
diff --git a/vendor/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go
index 3ca814f..115341f 100644
--- a/vendor/golang.org/x/sys/windows/dll_windows.go
+++ b/vendor/golang.org/x/sys/windows/dll_windows.go
@@ -43,8 +43,8 @@ type DLL struct {
 // LoadDLL loads DLL file into memory.
 //
 // Warning: using LoadDLL without an absolute path name is subject to
-// DLL preloading attacks. To safely load a system DLL, use [NewLazySystemDLL],
-// or use [LoadLibraryEx] directly.
+// DLL preloading attacks. To safely load a system DLL, use LazyDLL
+// with System set to true, or use LoadLibraryEx directly.
 func LoadDLL(name string) (dll *DLL, err error) {
 	namep, err := UTF16PtrFromString(name)
 	if err != nil {
@@ -65,7 +65,7 @@ func LoadDLL(name string) (dll *DLL, err error) {
 	return d, nil
 }
 
-// MustLoadDLL is like LoadDLL but panics if load operation fails.
+// MustLoadDLL is like LoadDLL but panics if load operation failes.
 func MustLoadDLL(name string) *DLL {
 	d, e := LoadDLL(name)
 	if e != nil {
@@ -271,9 +271,6 @@ func (d *LazyDLL) NewProc(name string) *LazyProc {
 }
 
 // NewLazyDLL creates new LazyDLL associated with DLL file.
-//
-// Warning: using NewLazyDLL without an absolute path name is subject to
-// DLL preloading attacks. To safely load a system DLL, use [NewLazySystemDLL].
 func NewLazyDLL(name string) *LazyDLL {
 	return &LazyDLL{Name: name}
 }
@@ -413,3 +410,7 @@ func loadLibraryEx(name string, system bool) (*DLL, error) {
 	}
 	return &DLL{Name: name, Handle: h}, nil
 }
+
+type errString string
+
+func (s errString) Error() string { return string(s) }
diff --git a/vendor/golang.org/x/sys/windows/empty.s b/vendor/golang.org/x/sys/windows/empty.s
new file mode 100644
index 0000000..fdbbbcd
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/empty.s
@@ -0,0 +1,9 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !go1.12
+// +build !go1.12
+
+// This file is here to allow bodyless functions with go:linkname for Go 1.11
+// and earlier (see https://golang.org/issue/23311).
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
index d4577a4..92ac05f 100644
--- a/vendor/golang.org/x/sys/windows/env_windows.go
+++ b/vendor/golang.org/x/sys/windows/env_windows.go
@@ -37,17 +37,14 @@ func (token Token) Environ(inheritExisting bool) (env []string, err error) {
 		return nil, err
 	}
 	defer DestroyEnvironmentBlock(block)
-	size := unsafe.Sizeof(*block)
-	for *block != 0 {
-		// find NUL terminator
-		end := unsafe.Pointer(block)
-		for *(*uint16)(end) != 0 {
-			end = unsafe.Add(end, size)
+	blockp := uintptr(unsafe.Pointer(block))
+	for {
+		entry := UTF16PtrToString((*uint16)(unsafe.Pointer(blockp)))
+		if len(entry) == 0 {
+			break
 		}
-
-		entry := unsafe.Slice(block, (uintptr(end)-uintptr(unsafe.Pointer(block)))/size)
-		env = append(env, UTF16ToString(entry))
-		block = (*uint16)(unsafe.Add(end, size))
+		env = append(env, entry)
+		blockp += 2 * (uintptr(len(entry)) + 1)
 	}
 	return env, nil
 }
diff --git a/vendor/golang.org/x/sys/windows/eventlog.go b/vendor/golang.org/x/sys/windows/eventlog.go
index 6c36695..40af946 100644
--- a/vendor/golang.org/x/sys/windows/eventlog.go
+++ b/vendor/golang.org/x/sys/windows/eventlog.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows
+// +build windows
 
 package windows
 
diff --git a/vendor/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go
index 9cabbb6..7a11e83 100644
--- a/vendor/golang.org/x/sys/windows/exec_windows.go
+++ b/vendor/golang.org/x/sys/windows/exec_windows.go
@@ -9,20 +9,22 @@ package windows
 import (
 	errorspkg "errors"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
 // EscapeArg rewrites command line argument s as prescribed
 // in http://msdn.microsoft.com/en-us/library/ms880421.
 // This function returns "" (2 double quotes) if s is empty.
 // Alternatively, these transformations are done:
-//   - every back slash (\) is doubled, but only if immediately
-//     followed by double quote (");
-//   - every double quote (") is escaped by back slash (\);
-//   - finally, s is wrapped with double quotes (arg -> "arg"),
-//     but only if there is space or tab inside s.
+// - every back slash (\) is doubled, but only if immediately
+//   followed by double quote (");
+// - every double quote (") is escaped by back slash (\);
+// - finally, s is wrapped with double quotes (arg -> "arg"),
+//   but only if there is space or tab inside s.
 func EscapeArg(s string) string {
 	if len(s) == 0 {
-		return `""`
+		return "\"\""
 	}
 	n := len(s)
 	hasSpace := false
@@ -35,7 +37,7 @@ func EscapeArg(s string) string {
 		}
 	}
 	if hasSpace {
-		n += 2 // Reserve space for quotes.
+		n += 2
 	}
 	if n == len(s) {
 		return s
@@ -82,106 +84,36 @@ func EscapeArg(s string) string {
 // in CreateProcess's CommandLine argument, CreateService/ChangeServiceConfig's BinaryPathName argument,
 // or any program that uses CommandLineToArgv.
 func ComposeCommandLine(args []string) string {
-	if len(args) == 0 {
-		return ""
-	}
-
-	// Per https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-commandlinetoargvw:
-	// “This function accepts command lines that contain a program name; the
-	// program name can be enclosed in quotation marks or not.�
-	//
-	// Unfortunately, it provides no means of escaping interior quotation marks
-	// within that program name, and we have no way to report them here.
-	prog := args[0]
-	mustQuote := len(prog) == 0
-	for i := 0; i < len(prog); i++ {
-		c := prog[i]
-		if c <= ' ' || (c == '"' && i == 0) {
-			// Force quotes for not only the ASCII space and tab as described in the
-			// MSDN article, but also ASCII control characters.
-			// The documentation for CommandLineToArgvW doesn't say what happens when
-			// the first argument is not a valid program name, but it empirically
-			// seems to drop unquoted control characters.
-			mustQuote = true
-			break
+	var commandLine string
+	for i := range args {
+		if i > 0 {
+			commandLine += " "
 		}
+		commandLine += EscapeArg(args[i])
 	}
-	var commandLine []byte
-	if mustQuote {
-		commandLine = make([]byte, 0, len(prog)+2)
-		commandLine = append(commandLine, '"')
-		for i := 0; i < len(prog); i++ {
-			c := prog[i]
-			if c == '"' {
-				// This quote would interfere with our surrounding quotes.
-				// We have no way to report an error, so just strip out
-				// the offending character instead.
-				continue
-			}
-			commandLine = append(commandLine, c)
-		}
-		commandLine = append(commandLine, '"')
-	} else {
-		if len(args) == 1 {
-			// args[0] is a valid command line representing itself.
-			// No need to allocate a new slice or string for it.
-			return prog
-		}
-		commandLine = []byte(prog)
-	}
-
-	for _, arg := range args[1:] {
-		commandLine = append(commandLine, ' ')
-		// TODO(bcmills): since we're already appending to a slice, it would be nice
-		// to avoid the intermediate allocations of EscapeArg.
-		// Perhaps we can factor out an appendEscapedArg function.
-		commandLine = append(commandLine, EscapeArg(arg)...)
-	}
-	return string(commandLine)
+	return commandLine
 }
 
 // DecomposeCommandLine breaks apart its argument command line into unescaped parts using CommandLineToArgv,
 // as gathered from GetCommandLine, QUERY_SERVICE_CONFIG's BinaryPathName argument, or elsewhere that
 // command lines are passed around.
-// DecomposeCommandLine returns an error if commandLine contains NUL.
 func DecomposeCommandLine(commandLine string) ([]string, error) {
 	if len(commandLine) == 0 {
 		return []string{}, nil
 	}
-	utf16CommandLine, err := UTF16FromString(commandLine)
-	if err != nil {
-		return nil, errorspkg.New("string with NUL passed to DecomposeCommandLine")
-	}
 	var argc int32
-	argv, err := commandLineToArgv(&utf16CommandLine[0], &argc)
+	argv, err := CommandLineToArgv(StringToUTF16Ptr(commandLine), &argc)
 	if err != nil {
 		return nil, err
 	}
 	defer LocalFree(Handle(unsafe.Pointer(argv)))
-
 	var args []string
-	for _, p := range unsafe.Slice(argv, argc) {
-		args = append(args, UTF16PtrToString(p))
+	for _, v := range (*argv)[:argc] {
+		args = append(args, UTF16ToString((*v)[:]))
 	}
 	return args, nil
 }
 
-// CommandLineToArgv parses a Unicode command line string and sets
-// argc to the number of parsed arguments.
-//
-// The returned memory should be freed using a single call to LocalFree.
-//
-// Note that although the return type of CommandLineToArgv indicates 8192
-// entries of up to 8192 characters each, the actual count of parsed arguments
-// may exceed 8192, and the documentation for CommandLineToArgvW does not mention
-// any bound on the lengths of the individual argument strings.
-// (See https://go.dev/issue/63236.)
-func CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) {
-	argp, err := commandLineToArgv(cmd, argc)
-	argv = (*[8192]*[8192]uint16)(unsafe.Pointer(argp))
-	return argv, err
-}
-
 func CloseOnExec(fd Handle) {
 	SetHandleInformation(Handle(fd), HANDLE_FLAG_INHERIT, 0)
 }
@@ -215,12 +147,8 @@ func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeListCo
 		}
 		return nil, err
 	}
-	alloc, err := LocalAlloc(LMEM_FIXED, uint32(size))
-	if err != nil {
-		return nil, err
-	}
 	// size is guaranteed to be ≥1 by InitializeProcThreadAttributeList.
-	al := &ProcThreadAttributeListContainer{data: (*ProcThreadAttributeList)(unsafe.Pointer(alloc))}
+	al := &ProcThreadAttributeListContainer{data: (*ProcThreadAttributeList)(unsafe.Pointer(&make([]byte, size)[0]))}
 	err = initializeProcThreadAttributeList(al.data, maxAttrCount, 0, &size)
 	if err != nil {
 		return nil, err
@@ -229,17 +157,36 @@ func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeListCo
 }
 
 // Update modifies the ProcThreadAttributeList using UpdateProcThreadAttribute.
+// Note that the value passed to this function will be copied into memory
+// allocated by LocalAlloc, the contents of which should not contain any
+// Go-managed pointers, even if the passed value itself is a Go-managed
+// pointer.
 func (al *ProcThreadAttributeListContainer) Update(attribute uintptr, value unsafe.Pointer, size uintptr) error {
-	al.pointers = append(al.pointers, value)
-	return updateProcThreadAttribute(al.data, 0, attribute, value, size, nil, nil)
+	alloc, err := LocalAlloc(LMEM_FIXED, uint32(size))
+	if err != nil {
+		return err
+	}
+	var src, dst []byte
+	hdr := (*unsafeheader.Slice)(unsafe.Pointer(&src))
+	hdr.Data = value
+	hdr.Cap = int(size)
+	hdr.Len = int(size)
+	hdr = (*unsafeheader.Slice)(unsafe.Pointer(&dst))
+	hdr.Data = unsafe.Pointer(alloc)
+	hdr.Cap = int(size)
+	hdr.Len = int(size)
+	copy(dst, src)
+	al.heapAllocations = append(al.heapAllocations, alloc)
+	return updateProcThreadAttribute(al.data, 0, attribute, unsafe.Pointer(alloc), size, nil, nil)
 }
 
 // Delete frees ProcThreadAttributeList's resources.
 func (al *ProcThreadAttributeListContainer) Delete() {
 	deleteProcThreadAttributeList(al.data)
-	LocalFree(Handle(unsafe.Pointer(al.data)))
-	al.data = nil
-	al.pointers = nil
+	for i := range al.heapAllocations {
+		LocalFree(Handle(al.heapAllocations[i]))
+	}
+	al.heapAllocations = nil
 }
 
 // List returns the actual ProcThreadAttributeList to be passed to StartupInfoEx.
diff --git a/vendor/golang.org/x/sys/windows/memory_windows.go b/vendor/golang.org/x/sys/windows/memory_windows.go
index 6dc0920..1adb607 100644
--- a/vendor/golang.org/x/sys/windows/memory_windows.go
+++ b/vendor/golang.org/x/sys/windows/memory_windows.go
@@ -35,14 +35,3 @@ const (
 	QUOTA_LIMITS_HARDWS_MAX_DISABLE = 0x00000008
 	QUOTA_LIMITS_HARDWS_MAX_ENABLE  = 0x00000004
 )
-
-type MemoryBasicInformation struct {
-	BaseAddress       uintptr
-	AllocationBase    uintptr
-	AllocationProtect uint32
-	PartitionId       uint16
-	RegionSize        uintptr
-	State             uint32
-	Protect           uint32
-	Type              uint32
-}
diff --git a/vendor/golang.org/x/sys/windows/mksyscall.go b/vendor/golang.org/x/sys/windows/mksyscall.go
index dbcdb09..328e3b2 100644
--- a/vendor/golang.org/x/sys/windows/mksyscall.go
+++ b/vendor/golang.org/x/sys/windows/mksyscall.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build generate
+// +build generate
 
 package windows
 
-//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go setupapi_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go
diff --git a/vendor/golang.org/x/sys/windows/race.go b/vendor/golang.org/x/sys/windows/race.go
index 0f1bdc3..a74e3e2 100644
--- a/vendor/golang.org/x/sys/windows/race.go
+++ b/vendor/golang.org/x/sys/windows/race.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows && race
+// +build windows,race
 
 package windows
 
diff --git a/vendor/golang.org/x/sys/windows/race0.go b/vendor/golang.org/x/sys/windows/race0.go
index 0c78da7..e44a3cb 100644
--- a/vendor/golang.org/x/sys/windows/race0.go
+++ b/vendor/golang.org/x/sys/windows/race0.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows && !race
+// +build windows,!race
 
 package windows
 
diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
index a8b0364..d414ef1 100644
--- a/vendor/golang.org/x/sys/windows/security_windows.go
+++ b/vendor/golang.org/x/sys/windows/security_windows.go
@@ -7,6 +7,8 @@ package windows
 import (
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
 const (
@@ -68,7 +70,6 @@ type UserInfo10 struct {
 //sys	NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) = netapi32.NetUserGetInfo
 //sys	NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (neterr error) = netapi32.NetGetJoinInformation
 //sys	NetApiBufferFree(buf *byte) (neterr error) = netapi32.NetApiBufferFree
-//sys   NetUserEnum(serverName *uint16, level uint32, filter uint32, buf **byte, prefMaxLen uint32, entriesRead *uint32, totalEntries *uint32, resumeHandle *uint32) (neterr error) = netapi32.NetUserEnum
 
 const (
 	// do not reorder
@@ -894,7 +895,7 @@ type ACL struct {
 	aclRevision byte
 	sbz1        byte
 	aclSize     uint16
-	AceCount    uint16
+	aceCount    uint16
 	sbz2        uint16
 }
 
@@ -1087,27 +1088,6 @@ type EXPLICIT_ACCESS struct {
 	Trustee           TRUSTEE
 }
 
-// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-ace_header
-type ACE_HEADER struct {
-	AceType  uint8
-	AceFlags uint8
-	AceSize  uint16
-}
-
-// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-access_allowed_ace
-type ACCESS_ALLOWED_ACE struct {
-	Header   ACE_HEADER
-	Mask     ACCESS_MASK
-	SidStart uint32
-}
-
-const (
-	// Constants for AceType
-	// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-ace_header
-	ACCESS_ALLOWED_ACE_TYPE = 0
-	ACCESS_DENIED_ACE_TYPE  = 1
-)
-
 // This type is the union inside of TRUSTEE and must be created using one of the TrusteeValueFrom* functions.
 type TrusteeValue uintptr
 
@@ -1179,7 +1159,6 @@ type OBJECTS_AND_NAME struct {
 //sys	makeSelfRelativeSD(absoluteSD *SECURITY_DESCRIPTOR, selfRelativeSD *SECURITY_DESCRIPTOR, selfRelativeSDSize *uint32) (err error) = advapi32.MakeSelfRelativeSD
 
 //sys	setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCESS, oldACL *ACL, newACL **ACL) (ret error) = advapi32.SetEntriesInAclW
-//sys	GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (err error) = advapi32.GetAce
 
 // Control returns the security descriptor control bits.
 func (sd *SECURITY_DESCRIPTOR) Control() (control SECURITY_DESCRIPTOR_CONTROL, revision uint32, err error) {
@@ -1303,10 +1282,7 @@ func (selfRelativeSD *SECURITY_DESCRIPTOR) ToAbsolute() (absoluteSD *SECURITY_DE
 		return nil, err
 	}
 	if absoluteSDSize > 0 {
-		absoluteSD = new(SECURITY_DESCRIPTOR)
-		if unsafe.Sizeof(*absoluteSD) < uintptr(absoluteSDSize) {
-			panic("sizeof(SECURITY_DESCRIPTOR) too small")
-		}
+		absoluteSD = (*SECURITY_DESCRIPTOR)(unsafe.Pointer(&make([]byte, absoluteSDSize)[0]))
 	}
 	var (
 		dacl  *ACL
@@ -1315,55 +1291,19 @@ func (selfRelativeSD *SECURITY_DESCRIPTOR) ToAbsolute() (absoluteSD *SECURITY_DE
 		group *SID
 	)
 	if daclSize > 0 {
-		dacl = (*ACL)(unsafe.Pointer(unsafe.SliceData(make([]byte, daclSize))))
+		dacl = (*ACL)(unsafe.Pointer(&make([]byte, daclSize)[0]))
 	}
 	if saclSize > 0 {
-		sacl = (*ACL)(unsafe.Pointer(unsafe.SliceData(make([]byte, saclSize))))
+		sacl = (*ACL)(unsafe.Pointer(&make([]byte, saclSize)[0]))
 	}
 	if ownerSize > 0 {
-		owner = (*SID)(unsafe.Pointer(unsafe.SliceData(make([]byte, ownerSize))))
+		owner = (*SID)(unsafe.Pointer(&make([]byte, ownerSize)[0]))
 	}
 	if groupSize > 0 {
-		group = (*SID)(unsafe.Pointer(unsafe.SliceData(make([]byte, groupSize))))
+		group = (*SID)(unsafe.Pointer(&make([]byte, groupSize)[0]))
 	}
-	// We call into Windows via makeAbsoluteSD, which sets up
-	// pointers within absoluteSD that point to other chunks of memory
-	// we pass into makeAbsoluteSD, and that happens outside the view of the GC.
-	// We therefore take some care here to then verify the pointers are as we expect
-	// and set them explicitly in view of the GC. See https://go.dev/issue/73199.
-	// TODO: consider weak pointers once Go 1.24 is appropriate. See suggestion in https://go.dev/cl/663575.
 	err = makeAbsoluteSD(selfRelativeSD, absoluteSD, &absoluteSDSize,
 		dacl, &daclSize, sacl, &saclSize, owner, &ownerSize, group, &groupSize)
-	if err != nil {
-		// Don't return absoluteSD, which might be partially initialized.
-		return nil, err
-	}
-	// Before using any fields, verify absoluteSD is in the format we expect according to Windows.
-	// See https://learn.microsoft.com/en-us/windows/win32/secauthz/absolute-and-self-relative-security-descriptors
-	absControl, _, err := absoluteSD.Control()
-	if err != nil {
-		panic("absoluteSD: " + err.Error())
-	}
-	if absControl&SE_SELF_RELATIVE != 0 {
-		panic("absoluteSD not in absolute format")
-	}
-	if absoluteSD.dacl != dacl {
-		panic("dacl pointer mismatch")
-	}
-	if absoluteSD.sacl != sacl {
-		panic("sacl pointer mismatch")
-	}
-	if absoluteSD.owner != owner {
-		panic("owner pointer mismatch")
-	}
-	if absoluteSD.group != group {
-		panic("group pointer mismatch")
-	}
-	absoluteSD.dacl = dacl
-	absoluteSD.sacl = sacl
-	absoluteSD.owner = owner
-	absoluteSD.group = group
-
 	return
 }
 
@@ -1401,14 +1341,21 @@ func (selfRelativeSD *SECURITY_DESCRIPTOR) copySelfRelativeSecurityDescriptor()
 		sdLen = min
 	}
 
-	src := unsafe.Slice((*byte)(unsafe.Pointer(selfRelativeSD)), sdLen)
-	// SECURITY_DESCRIPTOR has pointers in it, which means checkptr expects for it to
-	// be aligned properly. When we're copying a Windows-allocated struct to a
-	// Go-allocated one, make sure that the Go allocation is aligned to the
-	// pointer size.
+	var src []byte
+	h := (*unsafeheader.Slice)(unsafe.Pointer(&src))
+	h.Data = unsafe.Pointer(selfRelativeSD)
+	h.Len = sdLen
+	h.Cap = sdLen
+
 	const psize = int(unsafe.Sizeof(uintptr(0)))
+
+	var dst []byte
+	h = (*unsafeheader.Slice)(unsafe.Pointer(&dst))
 	alloc := make([]uintptr, (sdLen+psize-1)/psize)
-	dst := unsafe.Slice((*byte)(unsafe.Pointer(&alloc[0])), sdLen)
+	h.Data = (*unsafeheader.Slice)(unsafe.Pointer(&alloc)).Data
+	h.Len = sdLen
+	h.Cap = sdLen
+
 	copy(dst, src)
 	return (*SECURITY_DESCRIPTOR)(unsafe.Pointer(&dst[0]))
 }
diff --git a/vendor/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go
index a9dc630..b269850 100644
--- a/vendor/golang.org/x/sys/windows/service.go
+++ b/vendor/golang.org/x/sys/windows/service.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows
+// +build windows
 
 package windows
 
@@ -16,6 +16,8 @@ const (
 	SC_MANAGER_ALL_ACCESS         = 0xf003f
 )
 
+//sys	OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenSCManagerW
+
 const (
 	SERVICE_KERNEL_DRIVER       = 1
 	SERVICE_FILE_SYSTEM_DRIVER  = 2
@@ -130,22 +132,8 @@ const (
 	SC_EVENT_DATABASE_CHANGE = 0
 	SC_EVENT_PROPERTY_CHANGE = 1
 	SC_EVENT_STATUS_CHANGE   = 2
-
-	SERVICE_START_REASON_DEMAND             = 0x00000001
-	SERVICE_START_REASON_AUTO               = 0x00000002
-	SERVICE_START_REASON_TRIGGER            = 0x00000004
-	SERVICE_START_REASON_RESTART_ON_FAILURE = 0x00000008
-	SERVICE_START_REASON_DELAYEDAUTO        = 0x00000010
-
-	SERVICE_DYNAMIC_INFORMATION_LEVEL_START_REASON = 1
 )
 
-type ENUM_SERVICE_STATUS struct {
-	ServiceName   *uint16
-	DisplayName   *uint16
-	ServiceStatus SERVICE_STATUS
-}
-
 type SERVICE_STATUS struct {
 	ServiceType             uint32
 	CurrentState            uint32
@@ -217,10 +205,6 @@ type SERVICE_FAILURE_ACTIONS struct {
 	Actions      *SC_ACTION
 }
 
-type SERVICE_FAILURE_ACTIONS_FLAG struct {
-	FailureActionsOnNonCrashFailures int32
-}
-
 type SC_ACTION struct {
 	Type  uint32
 	Delay uint32
@@ -232,7 +216,6 @@ type QUERY_SERVICE_LOCK_STATUS struct {
 	LockDuration uint32
 }
 
-//sys	OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenSCManagerW
 //sys	CloseServiceHandle(handle Handle) (err error) = advapi32.CloseServiceHandle
 //sys	CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) [failretval==0] = advapi32.CreateServiceW
 //sys	OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenServiceW
@@ -252,6 +235,3 @@ type QUERY_SERVICE_LOCK_STATUS struct {
 //sys	NotifyServiceStatusChange(service Handle, notifyMask uint32, notifier *SERVICE_NOTIFY) (ret error) = advapi32.NotifyServiceStatusChangeW
 //sys	SubscribeServiceChangeNotifications(service Handle, eventType uint32, callback uintptr, callbackCtx uintptr, subscription *uintptr) (ret error) = sechost.SubscribeServiceChangeNotifications?
 //sys	UnsubscribeServiceChangeNotifications(subscription uintptr) = sechost.UnsubscribeServiceChangeNotifications?
-//sys	RegisterServiceCtrlHandlerEx(serviceName *uint16, handlerProc uintptr, context uintptr) (handle Handle, err error) = advapi32.RegisterServiceCtrlHandlerExW
-//sys	QueryServiceDynamicInformation(service Handle, infoLevel uint32, dynamicInfo unsafe.Pointer) (err error) = advapi32.QueryServiceDynamicInformation?
-//sys	EnumDependentServices(service Handle, activityState uint32, services *ENUM_SERVICE_STATUS, buffSize uint32, bytesNeeded *uint32, servicesReturned *uint32) (err error) = advapi32.EnumDependentServicesW
diff --git a/vendor/golang.org/x/sys/windows/setupapi_windows.go b/vendor/golang.org/x/sys/windows/setupapi_windows.go
deleted file mode 100644
index f812648..0000000
--- a/vendor/golang.org/x/sys/windows/setupapi_windows.go
+++ /dev/null
@@ -1,1425 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"runtime"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-// This file contains functions that wrap SetupAPI.dll and CfgMgr32.dll,
-// core system functions for managing hardware devices, drivers, and the PnP tree.
-// Information about these APIs can be found at:
-//     https://docs.microsoft.com/en-us/windows-hardware/drivers/install/setupapi
-//     https://docs.microsoft.com/en-us/windows/win32/devinst/cfgmgr32-
-
-const (
-	ERROR_EXPECTED_SECTION_NAME                  Errno = 0x20000000 | 0xC0000000 | 0
-	ERROR_BAD_SECTION_NAME_LINE                  Errno = 0x20000000 | 0xC0000000 | 1
-	ERROR_SECTION_NAME_TOO_LONG                  Errno = 0x20000000 | 0xC0000000 | 2
-	ERROR_GENERAL_SYNTAX                         Errno = 0x20000000 | 0xC0000000 | 3
-	ERROR_WRONG_INF_STYLE                        Errno = 0x20000000 | 0xC0000000 | 0x100
-	ERROR_SECTION_NOT_FOUND                      Errno = 0x20000000 | 0xC0000000 | 0x101
-	ERROR_LINE_NOT_FOUND                         Errno = 0x20000000 | 0xC0000000 | 0x102
-	ERROR_NO_BACKUP                              Errno = 0x20000000 | 0xC0000000 | 0x103
-	ERROR_NO_ASSOCIATED_CLASS                    Errno = 0x20000000 | 0xC0000000 | 0x200
-	ERROR_CLASS_MISMATCH                         Errno = 0x20000000 | 0xC0000000 | 0x201
-	ERROR_DUPLICATE_FOUND                        Errno = 0x20000000 | 0xC0000000 | 0x202
-	ERROR_NO_DRIVER_SELECTED                     Errno = 0x20000000 | 0xC0000000 | 0x203
-	ERROR_KEY_DOES_NOT_EXIST                     Errno = 0x20000000 | 0xC0000000 | 0x204
-	ERROR_INVALID_DEVINST_NAME                   Errno = 0x20000000 | 0xC0000000 | 0x205
-	ERROR_INVALID_CLASS                          Errno = 0x20000000 | 0xC0000000 | 0x206
-	ERROR_DEVINST_ALREADY_EXISTS                 Errno = 0x20000000 | 0xC0000000 | 0x207
-	ERROR_DEVINFO_NOT_REGISTERED                 Errno = 0x20000000 | 0xC0000000 | 0x208
-	ERROR_INVALID_REG_PROPERTY                   Errno = 0x20000000 | 0xC0000000 | 0x209
-	ERROR_NO_INF                                 Errno = 0x20000000 | 0xC0000000 | 0x20A
-	ERROR_NO_SUCH_DEVINST                        Errno = 0x20000000 | 0xC0000000 | 0x20B
-	ERROR_CANT_LOAD_CLASS_ICON                   Errno = 0x20000000 | 0xC0000000 | 0x20C
-	ERROR_INVALID_CLASS_INSTALLER                Errno = 0x20000000 | 0xC0000000 | 0x20D
-	ERROR_DI_DO_DEFAULT                          Errno = 0x20000000 | 0xC0000000 | 0x20E
-	ERROR_DI_NOFILECOPY                          Errno = 0x20000000 | 0xC0000000 | 0x20F
-	ERROR_INVALID_HWPROFILE                      Errno = 0x20000000 | 0xC0000000 | 0x210
-	ERROR_NO_DEVICE_SELECTED                     Errno = 0x20000000 | 0xC0000000 | 0x211
-	ERROR_DEVINFO_LIST_LOCKED                    Errno = 0x20000000 | 0xC0000000 | 0x212
-	ERROR_DEVINFO_DATA_LOCKED                    Errno = 0x20000000 | 0xC0000000 | 0x213
-	ERROR_DI_BAD_PATH                            Errno = 0x20000000 | 0xC0000000 | 0x214
-	ERROR_NO_CLASSINSTALL_PARAMS                 Errno = 0x20000000 | 0xC0000000 | 0x215
-	ERROR_FILEQUEUE_LOCKED                       Errno = 0x20000000 | 0xC0000000 | 0x216
-	ERROR_BAD_SERVICE_INSTALLSECT                Errno = 0x20000000 | 0xC0000000 | 0x217
-	ERROR_NO_CLASS_DRIVER_LIST                   Errno = 0x20000000 | 0xC0000000 | 0x218
-	ERROR_NO_ASSOCIATED_SERVICE                  Errno = 0x20000000 | 0xC0000000 | 0x219
-	ERROR_NO_DEFAULT_DEVICE_INTERFACE            Errno = 0x20000000 | 0xC0000000 | 0x21A
-	ERROR_DEVICE_INTERFACE_ACTIVE                Errno = 0x20000000 | 0xC0000000 | 0x21B
-	ERROR_DEVICE_INTERFACE_REMOVED               Errno = 0x20000000 | 0xC0000000 | 0x21C
-	ERROR_BAD_INTERFACE_INSTALLSECT              Errno = 0x20000000 | 0xC0000000 | 0x21D
-	ERROR_NO_SUCH_INTERFACE_CLASS                Errno = 0x20000000 | 0xC0000000 | 0x21E
-	ERROR_INVALID_REFERENCE_STRING               Errno = 0x20000000 | 0xC0000000 | 0x21F
-	ERROR_INVALID_MACHINENAME                    Errno = 0x20000000 | 0xC0000000 | 0x220
-	ERROR_REMOTE_COMM_FAILURE                    Errno = 0x20000000 | 0xC0000000 | 0x221
-	ERROR_MACHINE_UNAVAILABLE                    Errno = 0x20000000 | 0xC0000000 | 0x222
-	ERROR_NO_CONFIGMGR_SERVICES                  Errno = 0x20000000 | 0xC0000000 | 0x223
-	ERROR_INVALID_PROPPAGE_PROVIDER              Errno = 0x20000000 | 0xC0000000 | 0x224
-	ERROR_NO_SUCH_DEVICE_INTERFACE               Errno = 0x20000000 | 0xC0000000 | 0x225
-	ERROR_DI_POSTPROCESSING_REQUIRED             Errno = 0x20000000 | 0xC0000000 | 0x226
-	ERROR_INVALID_COINSTALLER                    Errno = 0x20000000 | 0xC0000000 | 0x227
-	ERROR_NO_COMPAT_DRIVERS                      Errno = 0x20000000 | 0xC0000000 | 0x228
-	ERROR_NO_DEVICE_ICON                         Errno = 0x20000000 | 0xC0000000 | 0x229
-	ERROR_INVALID_INF_LOGCONFIG                  Errno = 0x20000000 | 0xC0000000 | 0x22A
-	ERROR_DI_DONT_INSTALL                        Errno = 0x20000000 | 0xC0000000 | 0x22B
-	ERROR_INVALID_FILTER_DRIVER                  Errno = 0x20000000 | 0xC0000000 | 0x22C
-	ERROR_NON_WINDOWS_NT_DRIVER                  Errno = 0x20000000 | 0xC0000000 | 0x22D
-	ERROR_NON_WINDOWS_DRIVER                     Errno = 0x20000000 | 0xC0000000 | 0x22E
-	ERROR_NO_CATALOG_FOR_OEM_INF                 Errno = 0x20000000 | 0xC0000000 | 0x22F
-	ERROR_DEVINSTALL_QUEUE_NONNATIVE             Errno = 0x20000000 | 0xC0000000 | 0x230
-	ERROR_NOT_DISABLEABLE                        Errno = 0x20000000 | 0xC0000000 | 0x231
-	ERROR_CANT_REMOVE_DEVINST                    Errno = 0x20000000 | 0xC0000000 | 0x232
-	ERROR_INVALID_TARGET                         Errno = 0x20000000 | 0xC0000000 | 0x233
-	ERROR_DRIVER_NONNATIVE                       Errno = 0x20000000 | 0xC0000000 | 0x234
-	ERROR_IN_WOW64                               Errno = 0x20000000 | 0xC0000000 | 0x235
-	ERROR_SET_SYSTEM_RESTORE_POINT               Errno = 0x20000000 | 0xC0000000 | 0x236
-	ERROR_SCE_DISABLED                           Errno = 0x20000000 | 0xC0000000 | 0x238
-	ERROR_UNKNOWN_EXCEPTION                      Errno = 0x20000000 | 0xC0000000 | 0x239
-	ERROR_PNP_REGISTRY_ERROR                     Errno = 0x20000000 | 0xC0000000 | 0x23A
-	ERROR_REMOTE_REQUEST_UNSUPPORTED             Errno = 0x20000000 | 0xC0000000 | 0x23B
-	ERROR_NOT_AN_INSTALLED_OEM_INF               Errno = 0x20000000 | 0xC0000000 | 0x23C
-	ERROR_INF_IN_USE_BY_DEVICES                  Errno = 0x20000000 | 0xC0000000 | 0x23D
-	ERROR_DI_FUNCTION_OBSOLETE                   Errno = 0x20000000 | 0xC0000000 | 0x23E
-	ERROR_NO_AUTHENTICODE_CATALOG                Errno = 0x20000000 | 0xC0000000 | 0x23F
-	ERROR_AUTHENTICODE_DISALLOWED                Errno = 0x20000000 | 0xC0000000 | 0x240
-	ERROR_AUTHENTICODE_TRUSTED_PUBLISHER         Errno = 0x20000000 | 0xC0000000 | 0x241
-	ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED     Errno = 0x20000000 | 0xC0000000 | 0x242
-	ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED     Errno = 0x20000000 | 0xC0000000 | 0x243
-	ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH         Errno = 0x20000000 | 0xC0000000 | 0x244
-	ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE         Errno = 0x20000000 | 0xC0000000 | 0x245
-	ERROR_DEVICE_INSTALLER_NOT_READY             Errno = 0x20000000 | 0xC0000000 | 0x246
-	ERROR_DRIVER_STORE_ADD_FAILED                Errno = 0x20000000 | 0xC0000000 | 0x247
-	ERROR_DEVICE_INSTALL_BLOCKED                 Errno = 0x20000000 | 0xC0000000 | 0x248
-	ERROR_DRIVER_INSTALL_BLOCKED                 Errno = 0x20000000 | 0xC0000000 | 0x249
-	ERROR_WRONG_INF_TYPE                         Errno = 0x20000000 | 0xC0000000 | 0x24A
-	ERROR_FILE_HASH_NOT_IN_CATALOG               Errno = 0x20000000 | 0xC0000000 | 0x24B
-	ERROR_DRIVER_STORE_DELETE_FAILED             Errno = 0x20000000 | 0xC0000000 | 0x24C
-	ERROR_UNRECOVERABLE_STACK_OVERFLOW           Errno = 0x20000000 | 0xC0000000 | 0x300
-	EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW Errno = ERROR_UNRECOVERABLE_STACK_OVERFLOW
-	ERROR_NO_DEFAULT_INTERFACE_DEVICE            Errno = ERROR_NO_DEFAULT_DEVICE_INTERFACE
-	ERROR_INTERFACE_DEVICE_ACTIVE                Errno = ERROR_DEVICE_INTERFACE_ACTIVE
-	ERROR_INTERFACE_DEVICE_REMOVED               Errno = ERROR_DEVICE_INTERFACE_REMOVED
-	ERROR_NO_SUCH_INTERFACE_DEVICE               Errno = ERROR_NO_SUCH_DEVICE_INTERFACE
-)
-
-const (
-	MAX_DEVICE_ID_LEN   = 200
-	MAX_DEVNODE_ID_LEN  = MAX_DEVICE_ID_LEN
-	MAX_GUID_STRING_LEN = 39 // 38 chars + terminator null
-	MAX_CLASS_NAME_LEN  = 32
-	MAX_PROFILE_LEN     = 80
-	MAX_CONFIG_VALUE    = 9999
-	MAX_INSTANCE_VALUE  = 9999
-	CONFIGMG_VERSION    = 0x0400
-)
-
-// Maximum string length constants
-const (
-	LINE_LEN                    = 256  // Windows 9x-compatible maximum for displayable strings coming from a device INF.
-	MAX_INF_STRING_LENGTH       = 4096 // Actual maximum size of an INF string (including string substitutions).
-	MAX_INF_SECTION_NAME_LENGTH = 255  // For Windows 9x compatibility, INF section names should be constrained to 32 characters.
-	MAX_TITLE_LEN               = 60
-	MAX_INSTRUCTION_LEN         = 256
-	MAX_LABEL_LEN               = 30
-	MAX_SERVICE_NAME_LEN        = 256
-	MAX_SUBTITLE_LEN            = 256
-)
-
-const (
-	// SP_MAX_MACHINENAME_LENGTH defines maximum length of a machine name in the format expected by ConfigMgr32 CM_Connect_Machine (i.e., "\\\\MachineName\0").
-	SP_MAX_MACHINENAME_LENGTH = MAX_PATH + 3
-)
-
-// HSPFILEQ is type for setup file queue
-type HSPFILEQ uintptr
-
-// DevInfo holds reference to device information set
-type DevInfo Handle
-
-// DEVINST is a handle usually recognized by cfgmgr32 APIs
-type DEVINST uint32
-
-// DevInfoData is a device information structure (references a device instance that is a member of a device information set)
-type DevInfoData struct {
-	size      uint32
-	ClassGUID GUID
-	DevInst   DEVINST
-	_         uintptr
-}
-
-// DevInfoListDetailData is a structure for detailed information on a device information set (used for SetupDiGetDeviceInfoListDetail which supersedes the functionality of SetupDiGetDeviceInfoListClass).
-type DevInfoListDetailData struct {
-	size                uint32 // Use unsafeSizeOf method
-	ClassGUID           GUID
-	RemoteMachineHandle Handle
-	remoteMachineName   [SP_MAX_MACHINENAME_LENGTH]uint16
-}
-
-func (*DevInfoListDetailData) unsafeSizeOf() uint32 {
-	if unsafe.Sizeof(uintptr(0)) == 4 {
-		// Windows declares this with pshpack1.h
-		return uint32(unsafe.Offsetof(DevInfoListDetailData{}.remoteMachineName) + unsafe.Sizeof(DevInfoListDetailData{}.remoteMachineName))
-	}
-	return uint32(unsafe.Sizeof(DevInfoListDetailData{}))
-}
-
-func (data *DevInfoListDetailData) RemoteMachineName() string {
-	return UTF16ToString(data.remoteMachineName[:])
-}
-
-func (data *DevInfoListDetailData) SetRemoteMachineName(remoteMachineName string) error {
-	str, err := UTF16FromString(remoteMachineName)
-	if err != nil {
-		return err
-	}
-	copy(data.remoteMachineName[:], str)
-	return nil
-}
-
-// DI_FUNCTION is function type for device installer
-type DI_FUNCTION uint32
-
-const (
-	DIF_SELECTDEVICE                   DI_FUNCTION = 0x00000001
-	DIF_INSTALLDEVICE                  DI_FUNCTION = 0x00000002
-	DIF_ASSIGNRESOURCES                DI_FUNCTION = 0x00000003
-	DIF_PROPERTIES                     DI_FUNCTION = 0x00000004
-	DIF_REMOVE                         DI_FUNCTION = 0x00000005
-	DIF_FIRSTTIMESETUP                 DI_FUNCTION = 0x00000006
-	DIF_FOUNDDEVICE                    DI_FUNCTION = 0x00000007
-	DIF_SELECTCLASSDRIVERS             DI_FUNCTION = 0x00000008
-	DIF_VALIDATECLASSDRIVERS           DI_FUNCTION = 0x00000009
-	DIF_INSTALLCLASSDRIVERS            DI_FUNCTION = 0x0000000A
-	DIF_CALCDISKSPACE                  DI_FUNCTION = 0x0000000B
-	DIF_DESTROYPRIVATEDATA             DI_FUNCTION = 0x0000000C
-	DIF_VALIDATEDRIVER                 DI_FUNCTION = 0x0000000D
-	DIF_DETECT                         DI_FUNCTION = 0x0000000F
-	DIF_INSTALLWIZARD                  DI_FUNCTION = 0x00000010
-	DIF_DESTROYWIZARDDATA              DI_FUNCTION = 0x00000011
-	DIF_PROPERTYCHANGE                 DI_FUNCTION = 0x00000012
-	DIF_ENABLECLASS                    DI_FUNCTION = 0x00000013
-	DIF_DETECTVERIFY                   DI_FUNCTION = 0x00000014
-	DIF_INSTALLDEVICEFILES             DI_FUNCTION = 0x00000015
-	DIF_UNREMOVE                       DI_FUNCTION = 0x00000016
-	DIF_SELECTBESTCOMPATDRV            DI_FUNCTION = 0x00000017
-	DIF_ALLOW_INSTALL                  DI_FUNCTION = 0x00000018
-	DIF_REGISTERDEVICE                 DI_FUNCTION = 0x00000019
-	DIF_NEWDEVICEWIZARD_PRESELECT      DI_FUNCTION = 0x0000001A
-	DIF_NEWDEVICEWIZARD_SELECT         DI_FUNCTION = 0x0000001B
-	DIF_NEWDEVICEWIZARD_PREANALYZE     DI_FUNCTION = 0x0000001C
-	DIF_NEWDEVICEWIZARD_POSTANALYZE    DI_FUNCTION = 0x0000001D
-	DIF_NEWDEVICEWIZARD_FINISHINSTALL  DI_FUNCTION = 0x0000001E
-	DIF_INSTALLINTERFACES              DI_FUNCTION = 0x00000020
-	DIF_DETECTCANCEL                   DI_FUNCTION = 0x00000021
-	DIF_REGISTER_COINSTALLERS          DI_FUNCTION = 0x00000022
-	DIF_ADDPROPERTYPAGE_ADVANCED       DI_FUNCTION = 0x00000023
-	DIF_ADDPROPERTYPAGE_BASIC          DI_FUNCTION = 0x00000024
-	DIF_TROUBLESHOOTER                 DI_FUNCTION = 0x00000026
-	DIF_POWERMESSAGEWAKE               DI_FUNCTION = 0x00000027
-	DIF_ADDREMOTEPROPERTYPAGE_ADVANCED DI_FUNCTION = 0x00000028
-	DIF_UPDATEDRIVER_UI                DI_FUNCTION = 0x00000029
-	DIF_FINISHINSTALL_ACTION           DI_FUNCTION = 0x0000002A
-)
-
-// DevInstallParams is device installation parameters structure (associated with a particular device information element, or globally with a device information set)
-type DevInstallParams struct {
-	size                     uint32
-	Flags                    DI_FLAGS
-	FlagsEx                  DI_FLAGSEX
-	hwndParent               uintptr
-	InstallMsgHandler        uintptr
-	InstallMsgHandlerContext uintptr
-	FileQueue                HSPFILEQ
-	_                        uintptr
-	_                        uint32
-	driverPath               [MAX_PATH]uint16
-}
-
-func (params *DevInstallParams) DriverPath() string {
-	return UTF16ToString(params.driverPath[:])
-}
-
-func (params *DevInstallParams) SetDriverPath(driverPath string) error {
-	str, err := UTF16FromString(driverPath)
-	if err != nil {
-		return err
-	}
-	copy(params.driverPath[:], str)
-	return nil
-}
-
-// DI_FLAGS is SP_DEVINSTALL_PARAMS.Flags values
-type DI_FLAGS uint32
-
-const (
-	// Flags for choosing a device
-	DI_SHOWOEM       DI_FLAGS = 0x00000001 // support Other... button
-	DI_SHOWCOMPAT    DI_FLAGS = 0x00000002 // show compatibility list
-	DI_SHOWCLASS     DI_FLAGS = 0x00000004 // show class list
-	DI_SHOWALL       DI_FLAGS = 0x00000007 // both class & compat list shown
-	DI_NOVCP         DI_FLAGS = 0x00000008 // don't create a new copy queue--use caller-supplied FileQueue
-	DI_DIDCOMPAT     DI_FLAGS = 0x00000010 // Searched for compatible devices
-	DI_DIDCLASS      DI_FLAGS = 0x00000020 // Searched for class devices
-	DI_AUTOASSIGNRES DI_FLAGS = 0x00000040 // No UI for resources if possible
-
-	// Flags returned by DiInstallDevice to indicate need to reboot/restart
-	DI_NEEDRESTART DI_FLAGS = 0x00000080 // Reboot required to take effect
-	DI_NEEDREBOOT  DI_FLAGS = 0x00000100 // ""
-
-	// Flags for device installation
-	DI_NOBROWSE DI_FLAGS = 0x00000200 // no Browse... in InsertDisk
-
-	// Flags set by DiBuildDriverInfoList
-	DI_MULTMFGS DI_FLAGS = 0x00000400 // Set if multiple manufacturers in class driver list
-
-	// Flag indicates that device is disabled
-	DI_DISABLED DI_FLAGS = 0x00000800 // Set if device disabled
-
-	// Flags for Device/Class Properties
-	DI_GENERALPAGE_ADDED  DI_FLAGS = 0x00001000
-	DI_RESOURCEPAGE_ADDED DI_FLAGS = 0x00002000
-
-	// Flag to indicate the setting properties for this Device (or class) caused a change so the Dev Mgr UI probably needs to be updated.
-	DI_PROPERTIES_CHANGE DI_FLAGS = 0x00004000
-
-	// Flag to indicate that the sorting from the INF file should be used.
-	DI_INF_IS_SORTED DI_FLAGS = 0x00008000
-
-	// Flag to indicate that only the INF specified by SP_DEVINSTALL_PARAMS.DriverPath should be searched.
-	DI_ENUMSINGLEINF DI_FLAGS = 0x00010000
-
-	// Flag that prevents ConfigMgr from removing/re-enumerating devices during device
-	// registration, installation, and deletion.
-	DI_DONOTCALLCONFIGMG DI_FLAGS = 0x00020000
-
-	// The following flag can be used to install a device disabled
-	DI_INSTALLDISABLED DI_FLAGS = 0x00040000
-
-	// Flag that causes SetupDiBuildDriverInfoList to build a device's compatible driver
-	// list from its existing class driver list, instead of the normal INF search.
-	DI_COMPAT_FROM_CLASS DI_FLAGS = 0x00080000
-
-	// This flag is set if the Class Install params should be used.
-	DI_CLASSINSTALLPARAMS DI_FLAGS = 0x00100000
-
-	// This flag is set if the caller of DiCallClassInstaller does NOT want the internal default action performed if the Class installer returns ERROR_DI_DO_DEFAULT.
-	DI_NODI_DEFAULTACTION DI_FLAGS = 0x00200000
-
-	// Flags for device installation
-	DI_QUIETINSTALL        DI_FLAGS = 0x00800000 // don't confuse the user with questions or excess info
-	DI_NOFILECOPY          DI_FLAGS = 0x01000000 // No file Copy necessary
-	DI_FORCECOPY           DI_FLAGS = 0x02000000 // Force files to be copied from install path
-	DI_DRIVERPAGE_ADDED    DI_FLAGS = 0x04000000 // Prop provider added Driver page.
-	DI_USECI_SELECTSTRINGS DI_FLAGS = 0x08000000 // Use Class Installer Provided strings in the Select Device Dlg
-	DI_OVERRIDE_INFFLAGS   DI_FLAGS = 0x10000000 // Override INF flags
-	DI_PROPS_NOCHANGEUSAGE DI_FLAGS = 0x20000000 // No Enable/Disable in General Props
-
-	DI_NOSELECTICONS DI_FLAGS = 0x40000000 // No small icons in select device dialogs
-
-	DI_NOWRITE_IDS DI_FLAGS = 0x80000000 // Don't write HW & Compat IDs on install
-)
-
-// DI_FLAGSEX is SP_DEVINSTALL_PARAMS.FlagsEx values
-type DI_FLAGSEX uint32
-
-const (
-	DI_FLAGSEX_CI_FAILED                DI_FLAGSEX = 0x00000004 // Failed to Load/Call class installer
-	DI_FLAGSEX_FINISHINSTALL_ACTION     DI_FLAGSEX = 0x00000008 // Class/co-installer wants to get a DIF_FINISH_INSTALL action in client context.
-	DI_FLAGSEX_DIDINFOLIST              DI_FLAGSEX = 0x00000010 // Did the Class Info List
-	DI_FLAGSEX_DIDCOMPATINFO            DI_FLAGSEX = 0x00000020 // Did the Compat Info List
-	DI_FLAGSEX_FILTERCLASSES            DI_FLAGSEX = 0x00000040
-	DI_FLAGSEX_SETFAILEDINSTALL         DI_FLAGSEX = 0x00000080
-	DI_FLAGSEX_DEVICECHANGE             DI_FLAGSEX = 0x00000100
-	DI_FLAGSEX_ALWAYSWRITEIDS           DI_FLAGSEX = 0x00000200
-	DI_FLAGSEX_PROPCHANGE_PENDING       DI_FLAGSEX = 0x00000400 // One or more device property sheets have had changes made to them, and need to have a DIF_PROPERTYCHANGE occur.
-	DI_FLAGSEX_ALLOWEXCLUDEDDRVS        DI_FLAGSEX = 0x00000800
-	DI_FLAGSEX_NOUIONQUERYREMOVE        DI_FLAGSEX = 0x00001000
-	DI_FLAGSEX_USECLASSFORCOMPAT        DI_FLAGSEX = 0x00002000 // Use the device's class when building compat drv list. (Ignored if DI_COMPAT_FROM_CLASS flag is specified.)
-	DI_FLAGSEX_NO_DRVREG_MODIFY         DI_FLAGSEX = 0x00008000 // Don't run AddReg and DelReg for device's software (driver) key.
-	DI_FLAGSEX_IN_SYSTEM_SETUP          DI_FLAGSEX = 0x00010000 // Installation is occurring during initial system setup.
-	DI_FLAGSEX_INET_DRIVER              DI_FLAGSEX = 0x00020000 // Driver came from Windows Update
-	DI_FLAGSEX_APPENDDRIVERLIST         DI_FLAGSEX = 0x00040000 // Cause SetupDiBuildDriverInfoList to append a new driver list to an existing list.
-	DI_FLAGSEX_PREINSTALLBACKUP         DI_FLAGSEX = 0x00080000 // not used
-	DI_FLAGSEX_BACKUPONREPLACE          DI_FLAGSEX = 0x00100000 // not used
-	DI_FLAGSEX_DRIVERLIST_FROM_URL      DI_FLAGSEX = 0x00200000 // build driver list from INF(s) retrieved from URL specified in SP_DEVINSTALL_PARAMS.DriverPath (empty string means Windows Update website)
-	DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS DI_FLAGSEX = 0x00800000 // Don't include old Internet drivers when building a driver list. Ignored on Windows Vista and later.
-	DI_FLAGSEX_POWERPAGE_ADDED          DI_FLAGSEX = 0x01000000 // class installer added their own power page
-	DI_FLAGSEX_FILTERSIMILARDRIVERS     DI_FLAGSEX = 0x02000000 // only include similar drivers in class list
-	DI_FLAGSEX_INSTALLEDDRIVER          DI_FLAGSEX = 0x04000000 // only add the installed driver to the class or compat driver list.  Used in calls to SetupDiBuildDriverInfoList
-	DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE  DI_FLAGSEX = 0x08000000 // Don't remove identical driver nodes from the class list
-	DI_FLAGSEX_ALTPLATFORM_DRVSEARCH    DI_FLAGSEX = 0x10000000 // Build driver list based on alternate platform information specified in associated file queue
-	DI_FLAGSEX_RESTART_DEVICE_ONLY      DI_FLAGSEX = 0x20000000 // only restart the device drivers are being installed on as opposed to restarting all devices using those drivers.
-	DI_FLAGSEX_RECURSIVESEARCH          DI_FLAGSEX = 0x40000000 // Tell SetupDiBuildDriverInfoList to do a recursive search
-	DI_FLAGSEX_SEARCH_PUBLISHED_INFS    DI_FLAGSEX = 0x80000000 // Tell SetupDiBuildDriverInfoList to do a "published INF" search
-)
-
-// ClassInstallHeader is the first member of any class install parameters structure. It contains the device installation request code that defines the format of the rest of the install parameters structure.
-type ClassInstallHeader struct {
-	size            uint32
-	InstallFunction DI_FUNCTION
-}
-
-func MakeClassInstallHeader(installFunction DI_FUNCTION) *ClassInstallHeader {
-	hdr := &ClassInstallHeader{InstallFunction: installFunction}
-	hdr.size = uint32(unsafe.Sizeof(*hdr))
-	return hdr
-}
-
-// DICS_STATE specifies values indicating a change in a device's state
-type DICS_STATE uint32
-
-const (
-	DICS_ENABLE     DICS_STATE = 0x00000001 // The device is being enabled.
-	DICS_DISABLE    DICS_STATE = 0x00000002 // The device is being disabled.
-	DICS_PROPCHANGE DICS_STATE = 0x00000003 // The properties of the device have changed.
-	DICS_START      DICS_STATE = 0x00000004 // The device is being started (if the request is for the currently active hardware profile).
-	DICS_STOP       DICS_STATE = 0x00000005 // The device is being stopped. The driver stack will be unloaded and the CSCONFIGFLAG_DO_NOT_START flag will be set for the device.
-)
-
-// DICS_FLAG specifies the scope of a device property change
-type DICS_FLAG uint32
-
-const (
-	DICS_FLAG_GLOBAL         DICS_FLAG = 0x00000001 // make change in all hardware profiles
-	DICS_FLAG_CONFIGSPECIFIC DICS_FLAG = 0x00000002 // make change in specified profile only
-	DICS_FLAG_CONFIGGENERAL  DICS_FLAG = 0x00000004 // 1 or more hardware profile-specific changes to follow (obsolete)
-)
-
-// PropChangeParams is a structure corresponding to a DIF_PROPERTYCHANGE install function.
-type PropChangeParams struct {
-	ClassInstallHeader ClassInstallHeader
-	StateChange        DICS_STATE
-	Scope              DICS_FLAG
-	HwProfile          uint32
-}
-
-// DI_REMOVEDEVICE specifies the scope of the device removal
-type DI_REMOVEDEVICE uint32
-
-const (
-	DI_REMOVEDEVICE_GLOBAL         DI_REMOVEDEVICE = 0x00000001 // Make this change in all hardware profiles. Remove information about the device from the registry.
-	DI_REMOVEDEVICE_CONFIGSPECIFIC DI_REMOVEDEVICE = 0x00000002 // Make this change to only the hardware profile specified by HwProfile. this flag only applies to root-enumerated devices. When Windows removes the device from the last hardware profile in which it was configured, Windows performs a global removal.
-)
-
-// RemoveDeviceParams is a structure corresponding to a DIF_REMOVE install function.
-type RemoveDeviceParams struct {
-	ClassInstallHeader ClassInstallHeader
-	Scope              DI_REMOVEDEVICE
-	HwProfile          uint32
-}
-
-// DrvInfoData is driver information structure (member of a driver info list that may be associated with a particular device instance, or (globally) with a device information set)
-type DrvInfoData struct {
-	size          uint32
-	DriverType    uint32
-	_             uintptr
-	description   [LINE_LEN]uint16
-	mfgName       [LINE_LEN]uint16
-	providerName  [LINE_LEN]uint16
-	DriverDate    Filetime
-	DriverVersion uint64
-}
-
-func (data *DrvInfoData) Description() string {
-	return UTF16ToString(data.description[:])
-}
-
-func (data *DrvInfoData) SetDescription(description string) error {
-	str, err := UTF16FromString(description)
-	if err != nil {
-		return err
-	}
-	copy(data.description[:], str)
-	return nil
-}
-
-func (data *DrvInfoData) MfgName() string {
-	return UTF16ToString(data.mfgName[:])
-}
-
-func (data *DrvInfoData) SetMfgName(mfgName string) error {
-	str, err := UTF16FromString(mfgName)
-	if err != nil {
-		return err
-	}
-	copy(data.mfgName[:], str)
-	return nil
-}
-
-func (data *DrvInfoData) ProviderName() string {
-	return UTF16ToString(data.providerName[:])
-}
-
-func (data *DrvInfoData) SetProviderName(providerName string) error {
-	str, err := UTF16FromString(providerName)
-	if err != nil {
-		return err
-	}
-	copy(data.providerName[:], str)
-	return nil
-}
-
-// IsNewer method returns true if DrvInfoData date and version is newer than supplied parameters.
-func (data *DrvInfoData) IsNewer(driverDate Filetime, driverVersion uint64) bool {
-	if data.DriverDate.HighDateTime > driverDate.HighDateTime {
-		return true
-	}
-	if data.DriverDate.HighDateTime < driverDate.HighDateTime {
-		return false
-	}
-
-	if data.DriverDate.LowDateTime > driverDate.LowDateTime {
-		return true
-	}
-	if data.DriverDate.LowDateTime < driverDate.LowDateTime {
-		return false
-	}
-
-	if data.DriverVersion > driverVersion {
-		return true
-	}
-	if data.DriverVersion < driverVersion {
-		return false
-	}
-
-	return false
-}
-
-// DrvInfoDetailData is driver information details structure (provides detailed information about a particular driver information structure)
-type DrvInfoDetailData struct {
-	size            uint32 // Use unsafeSizeOf method
-	InfDate         Filetime
-	compatIDsOffset uint32
-	compatIDsLength uint32
-	_               uintptr
-	sectionName     [LINE_LEN]uint16
-	infFileName     [MAX_PATH]uint16
-	drvDescription  [LINE_LEN]uint16
-	hardwareID      [1]uint16
-}
-
-func (*DrvInfoDetailData) unsafeSizeOf() uint32 {
-	if unsafe.Sizeof(uintptr(0)) == 4 {
-		// Windows declares this with pshpack1.h
-		return uint32(unsafe.Offsetof(DrvInfoDetailData{}.hardwareID) + unsafe.Sizeof(DrvInfoDetailData{}.hardwareID))
-	}
-	return uint32(unsafe.Sizeof(DrvInfoDetailData{}))
-}
-
-func (data *DrvInfoDetailData) SectionName() string {
-	return UTF16ToString(data.sectionName[:])
-}
-
-func (data *DrvInfoDetailData) InfFileName() string {
-	return UTF16ToString(data.infFileName[:])
-}
-
-func (data *DrvInfoDetailData) DrvDescription() string {
-	return UTF16ToString(data.drvDescription[:])
-}
-
-func (data *DrvInfoDetailData) HardwareID() string {
-	if data.compatIDsOffset > 1 {
-		bufW := data.getBuf()
-		return UTF16ToString(bufW[:wcslen(bufW)])
-	}
-
-	return ""
-}
-
-func (data *DrvInfoDetailData) CompatIDs() []string {
-	a := make([]string, 0)
-
-	if data.compatIDsLength > 0 {
-		bufW := data.getBuf()
-		bufW = bufW[data.compatIDsOffset : data.compatIDsOffset+data.compatIDsLength]
-		for i := 0; i < len(bufW); {
-			j := i + wcslen(bufW[i:])
-			if i < j {
-				a = append(a, UTF16ToString(bufW[i:j]))
-			}
-			i = j + 1
-		}
-	}
-
-	return a
-}
-
-func (data *DrvInfoDetailData) getBuf() []uint16 {
-	len := (data.size - uint32(unsafe.Offsetof(data.hardwareID))) / 2
-	sl := struct {
-		addr *uint16
-		len  int
-		cap  int
-	}{&data.hardwareID[0], int(len), int(len)}
-	return *(*[]uint16)(unsafe.Pointer(&sl))
-}
-
-// IsCompatible method tests if given hardware ID matches the driver or is listed on the compatible ID list.
-func (data *DrvInfoDetailData) IsCompatible(hwid string) bool {
-	hwidLC := strings.ToLower(hwid)
-	if strings.ToLower(data.HardwareID()) == hwidLC {
-		return true
-	}
-	a := data.CompatIDs()
-	for i := range a {
-		if strings.ToLower(a[i]) == hwidLC {
-			return true
-		}
-	}
-
-	return false
-}
-
-// DICD flags control SetupDiCreateDeviceInfo
-type DICD uint32
-
-const (
-	DICD_GENERATE_ID       DICD = 0x00000001
-	DICD_INHERIT_CLASSDRVS DICD = 0x00000002
-)
-
-// SUOI flags control SetupUninstallOEMInf
-type SUOI uint32
-
-const (
-	SUOI_FORCEDELETE SUOI = 0x0001
-)
-
-// SPDIT flags to distinguish between class drivers and
-// device drivers. (Passed in 'DriverType' parameter of
-// driver information list APIs)
-type SPDIT uint32
-
-const (
-	SPDIT_NODRIVER     SPDIT = 0x00000000
-	SPDIT_CLASSDRIVER  SPDIT = 0x00000001
-	SPDIT_COMPATDRIVER SPDIT = 0x00000002
-)
-
-// DIGCF flags control what is included in the device information set built by SetupDiGetClassDevs
-type DIGCF uint32
-
-const (
-	DIGCF_DEFAULT         DIGCF = 0x00000001 // only valid with DIGCF_DEVICEINTERFACE
-	DIGCF_PRESENT         DIGCF = 0x00000002
-	DIGCF_ALLCLASSES      DIGCF = 0x00000004
-	DIGCF_PROFILE         DIGCF = 0x00000008
-	DIGCF_DEVICEINTERFACE DIGCF = 0x00000010
-)
-
-// DIREG specifies values for SetupDiCreateDevRegKey, SetupDiOpenDevRegKey, and SetupDiDeleteDevRegKey.
-type DIREG uint32
-
-const (
-	DIREG_DEV  DIREG = 0x00000001 // Open/Create/Delete device key
-	DIREG_DRV  DIREG = 0x00000002 // Open/Create/Delete driver key
-	DIREG_BOTH DIREG = 0x00000004 // Delete both driver and Device key
-)
-
-// SPDRP specifies device registry property codes
-// (Codes marked as read-only (R) may only be used for
-// SetupDiGetDeviceRegistryProperty)
-//
-// These values should cover the same set of registry properties
-// as defined by the CM_DRP codes in cfgmgr32.h.
-//
-// Note that SPDRP codes are zero based while CM_DRP codes are one based!
-type SPDRP uint32
-
-const (
-	SPDRP_DEVICEDESC                  SPDRP = 0x00000000 // DeviceDesc (R/W)
-	SPDRP_HARDWAREID                  SPDRP = 0x00000001 // HardwareID (R/W)
-	SPDRP_COMPATIBLEIDS               SPDRP = 0x00000002 // CompatibleIDs (R/W)
-	SPDRP_SERVICE                     SPDRP = 0x00000004 // Service (R/W)
-	SPDRP_CLASS                       SPDRP = 0x00000007 // Class (R--tied to ClassGUID)
-	SPDRP_CLASSGUID                   SPDRP = 0x00000008 // ClassGUID (R/W)
-	SPDRP_DRIVER                      SPDRP = 0x00000009 // Driver (R/W)
-	SPDRP_CONFIGFLAGS                 SPDRP = 0x0000000A // ConfigFlags (R/W)
-	SPDRP_MFG                         SPDRP = 0x0000000B // Mfg (R/W)
-	SPDRP_FRIENDLYNAME                SPDRP = 0x0000000C // FriendlyName (R/W)
-	SPDRP_LOCATION_INFORMATION        SPDRP = 0x0000000D // LocationInformation (R/W)
-	SPDRP_PHYSICAL_DEVICE_OBJECT_NAME SPDRP = 0x0000000E // PhysicalDeviceObjectName (R)
-	SPDRP_CAPABILITIES                SPDRP = 0x0000000F // Capabilities (R)
-	SPDRP_UI_NUMBER                   SPDRP = 0x00000010 // UiNumber (R)
-	SPDRP_UPPERFILTERS                SPDRP = 0x00000011 // UpperFilters (R/W)
-	SPDRP_LOWERFILTERS                SPDRP = 0x00000012 // LowerFilters (R/W)
-	SPDRP_BUSTYPEGUID                 SPDRP = 0x00000013 // BusTypeGUID (R)
-	SPDRP_LEGACYBUSTYPE               SPDRP = 0x00000014 // LegacyBusType (R)
-	SPDRP_BUSNUMBER                   SPDRP = 0x00000015 // BusNumber (R)
-	SPDRP_ENUMERATOR_NAME             SPDRP = 0x00000016 // Enumerator Name (R)
-	SPDRP_SECURITY                    SPDRP = 0x00000017 // Security (R/W, binary form)
-	SPDRP_SECURITY_SDS                SPDRP = 0x00000018 // Security (W, SDS form)
-	SPDRP_DEVTYPE                     SPDRP = 0x00000019 // Device Type (R/W)
-	SPDRP_EXCLUSIVE                   SPDRP = 0x0000001A // Device is exclusive-access (R/W)
-	SPDRP_CHARACTERISTICS             SPDRP = 0x0000001B // Device Characteristics (R/W)
-	SPDRP_ADDRESS                     SPDRP = 0x0000001C // Device Address (R)
-	SPDRP_UI_NUMBER_DESC_FORMAT       SPDRP = 0x0000001D // UiNumberDescFormat (R/W)
-	SPDRP_DEVICE_POWER_DATA           SPDRP = 0x0000001E // Device Power Data (R)
-	SPDRP_REMOVAL_POLICY              SPDRP = 0x0000001F // Removal Policy (R)
-	SPDRP_REMOVAL_POLICY_HW_DEFAULT   SPDRP = 0x00000020 // Hardware Removal Policy (R)
-	SPDRP_REMOVAL_POLICY_OVERRIDE     SPDRP = 0x00000021 // Removal Policy Override (RW)
-	SPDRP_INSTALL_STATE               SPDRP = 0x00000022 // Device Install State (R)
-	SPDRP_LOCATION_PATHS              SPDRP = 0x00000023 // Device Location Paths (R)
-	SPDRP_BASE_CONTAINERID            SPDRP = 0x00000024 // Base ContainerID (R)
-
-	SPDRP_MAXIMUM_PROPERTY SPDRP = 0x00000025 // Upper bound on ordinals
-)
-
-// DEVPROPTYPE represents the property-data-type identifier that specifies the
-// data type of a device property value in the unified device property model.
-type DEVPROPTYPE uint32
-
-const (
-	DEVPROP_TYPEMOD_ARRAY DEVPROPTYPE = 0x00001000
-	DEVPROP_TYPEMOD_LIST  DEVPROPTYPE = 0x00002000
-
-	DEVPROP_TYPE_EMPTY                      DEVPROPTYPE = 0x00000000
-	DEVPROP_TYPE_NULL                       DEVPROPTYPE = 0x00000001
-	DEVPROP_TYPE_SBYTE                      DEVPROPTYPE = 0x00000002
-	DEVPROP_TYPE_BYTE                       DEVPROPTYPE = 0x00000003
-	DEVPROP_TYPE_INT16                      DEVPROPTYPE = 0x00000004
-	DEVPROP_TYPE_UINT16                     DEVPROPTYPE = 0x00000005
-	DEVPROP_TYPE_INT32                      DEVPROPTYPE = 0x00000006
-	DEVPROP_TYPE_UINT32                     DEVPROPTYPE = 0x00000007
-	DEVPROP_TYPE_INT64                      DEVPROPTYPE = 0x00000008
-	DEVPROP_TYPE_UINT64                     DEVPROPTYPE = 0x00000009
-	DEVPROP_TYPE_FLOAT                      DEVPROPTYPE = 0x0000000A
-	DEVPROP_TYPE_DOUBLE                     DEVPROPTYPE = 0x0000000B
-	DEVPROP_TYPE_DECIMAL                    DEVPROPTYPE = 0x0000000C
-	DEVPROP_TYPE_GUID                       DEVPROPTYPE = 0x0000000D
-	DEVPROP_TYPE_CURRENCY                   DEVPROPTYPE = 0x0000000E
-	DEVPROP_TYPE_DATE                       DEVPROPTYPE = 0x0000000F
-	DEVPROP_TYPE_FILETIME                   DEVPROPTYPE = 0x00000010
-	DEVPROP_TYPE_BOOLEAN                    DEVPROPTYPE = 0x00000011
-	DEVPROP_TYPE_STRING                     DEVPROPTYPE = 0x00000012
-	DEVPROP_TYPE_STRING_LIST                DEVPROPTYPE = DEVPROP_TYPE_STRING | DEVPROP_TYPEMOD_LIST
-	DEVPROP_TYPE_SECURITY_DESCRIPTOR        DEVPROPTYPE = 0x00000013
-	DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING DEVPROPTYPE = 0x00000014
-	DEVPROP_TYPE_DEVPROPKEY                 DEVPROPTYPE = 0x00000015
-	DEVPROP_TYPE_DEVPROPTYPE                DEVPROPTYPE = 0x00000016
-	DEVPROP_TYPE_BINARY                     DEVPROPTYPE = DEVPROP_TYPE_BYTE | DEVPROP_TYPEMOD_ARRAY
-	DEVPROP_TYPE_ERROR                      DEVPROPTYPE = 0x00000017
-	DEVPROP_TYPE_NTSTATUS                   DEVPROPTYPE = 0x00000018
-	DEVPROP_TYPE_STRING_INDIRECT            DEVPROPTYPE = 0x00000019
-
-	MAX_DEVPROP_TYPE    DEVPROPTYPE = 0x00000019
-	MAX_DEVPROP_TYPEMOD DEVPROPTYPE = 0x00002000
-
-	DEVPROP_MASK_TYPE    DEVPROPTYPE = 0x00000FFF
-	DEVPROP_MASK_TYPEMOD DEVPROPTYPE = 0x0000F000
-)
-
-// DEVPROPGUID specifies a property category.
-type DEVPROPGUID GUID
-
-// DEVPROPID uniquely identifies the property within the property category.
-type DEVPROPID uint32
-
-const DEVPROPID_FIRST_USABLE DEVPROPID = 2
-
-// DEVPROPKEY represents a device property key for a device property in the
-// unified device property model.
-type DEVPROPKEY struct {
-	FmtID DEVPROPGUID
-	PID   DEVPROPID
-}
-
-// CONFIGRET is a return value or error code from cfgmgr32 APIs
-type CONFIGRET uint32
-
-func (ret CONFIGRET) Error() string {
-	if win32Error, ok := ret.Unwrap().(Errno); ok {
-		return fmt.Sprintf("%s (CfgMgr error: 0x%08x)", win32Error.Error(), uint32(ret))
-	}
-	return fmt.Sprintf("CfgMgr error: 0x%08x", uint32(ret))
-}
-
-func (ret CONFIGRET) Win32Error(defaultError Errno) Errno {
-	return cm_MapCrToWin32Err(ret, defaultError)
-}
-
-func (ret CONFIGRET) Unwrap() error {
-	const noMatch = Errno(^uintptr(0))
-	win32Error := ret.Win32Error(noMatch)
-	if win32Error == noMatch {
-		return nil
-	}
-	return win32Error
-}
-
-const (
-	CR_SUCCESS                  CONFIGRET = 0x00000000
-	CR_DEFAULT                  CONFIGRET = 0x00000001
-	CR_OUT_OF_MEMORY            CONFIGRET = 0x00000002
-	CR_INVALID_POINTER          CONFIGRET = 0x00000003
-	CR_INVALID_FLAG             CONFIGRET = 0x00000004
-	CR_INVALID_DEVNODE          CONFIGRET = 0x00000005
-	CR_INVALID_DEVINST                    = CR_INVALID_DEVNODE
-	CR_INVALID_RES_DES          CONFIGRET = 0x00000006
-	CR_INVALID_LOG_CONF         CONFIGRET = 0x00000007
-	CR_INVALID_ARBITRATOR       CONFIGRET = 0x00000008
-	CR_INVALID_NODELIST         CONFIGRET = 0x00000009
-	CR_DEVNODE_HAS_REQS         CONFIGRET = 0x0000000A
-	CR_DEVINST_HAS_REQS                   = CR_DEVNODE_HAS_REQS
-	CR_INVALID_RESOURCEID       CONFIGRET = 0x0000000B
-	CR_DLVXD_NOT_FOUND          CONFIGRET = 0x0000000C
-	CR_NO_SUCH_DEVNODE          CONFIGRET = 0x0000000D
-	CR_NO_SUCH_DEVINST                    = CR_NO_SUCH_DEVNODE
-	CR_NO_MORE_LOG_CONF         CONFIGRET = 0x0000000E
-	CR_NO_MORE_RES_DES          CONFIGRET = 0x0000000F
-	CR_ALREADY_SUCH_DEVNODE     CONFIGRET = 0x00000010
-	CR_ALREADY_SUCH_DEVINST               = CR_ALREADY_SUCH_DEVNODE
-	CR_INVALID_RANGE_LIST       CONFIGRET = 0x00000011
-	CR_INVALID_RANGE            CONFIGRET = 0x00000012
-	CR_FAILURE                  CONFIGRET = 0x00000013
-	CR_NO_SUCH_LOGICAL_DEV      CONFIGRET = 0x00000014
-	CR_CREATE_BLOCKED           CONFIGRET = 0x00000015
-	CR_NOT_SYSTEM_VM            CONFIGRET = 0x00000016
-	CR_REMOVE_VETOED            CONFIGRET = 0x00000017
-	CR_APM_VETOED               CONFIGRET = 0x00000018
-	CR_INVALID_LOAD_TYPE        CONFIGRET = 0x00000019
-	CR_BUFFER_SMALL             CONFIGRET = 0x0000001A
-	CR_NO_ARBITRATOR            CONFIGRET = 0x0000001B
-	CR_NO_REGISTRY_HANDLE       CONFIGRET = 0x0000001C
-	CR_REGISTRY_ERROR           CONFIGRET = 0x0000001D
-	CR_INVALID_DEVICE_ID        CONFIGRET = 0x0000001E
-	CR_INVALID_DATA             CONFIGRET = 0x0000001F
-	CR_INVALID_API              CONFIGRET = 0x00000020
-	CR_DEVLOADER_NOT_READY      CONFIGRET = 0x00000021
-	CR_NEED_RESTART             CONFIGRET = 0x00000022
-	CR_NO_MORE_HW_PROFILES      CONFIGRET = 0x00000023
-	CR_DEVICE_NOT_THERE         CONFIGRET = 0x00000024
-	CR_NO_SUCH_VALUE            CONFIGRET = 0x00000025
-	CR_WRONG_TYPE               CONFIGRET = 0x00000026
-	CR_INVALID_PRIORITY         CONFIGRET = 0x00000027
-	CR_NOT_DISABLEABLE          CONFIGRET = 0x00000028
-	CR_FREE_RESOURCES           CONFIGRET = 0x00000029
-	CR_QUERY_VETOED             CONFIGRET = 0x0000002A
-	CR_CANT_SHARE_IRQ           CONFIGRET = 0x0000002B
-	CR_NO_DEPENDENT             CONFIGRET = 0x0000002C
-	CR_SAME_RESOURCES           CONFIGRET = 0x0000002D
-	CR_NO_SUCH_REGISTRY_KEY     CONFIGRET = 0x0000002E
-	CR_INVALID_MACHINENAME      CONFIGRET = 0x0000002F
-	CR_REMOTE_COMM_FAILURE      CONFIGRET = 0x00000030
-	CR_MACHINE_UNAVAILABLE      CONFIGRET = 0x00000031
-	CR_NO_CM_SERVICES           CONFIGRET = 0x00000032
-	CR_ACCESS_DENIED            CONFIGRET = 0x00000033
-	CR_CALL_NOT_IMPLEMENTED     CONFIGRET = 0x00000034
-	CR_INVALID_PROPERTY         CONFIGRET = 0x00000035
-	CR_DEVICE_INTERFACE_ACTIVE  CONFIGRET = 0x00000036
-	CR_NO_SUCH_DEVICE_INTERFACE CONFIGRET = 0x00000037
-	CR_INVALID_REFERENCE_STRING CONFIGRET = 0x00000038
-	CR_INVALID_CONFLICT_LIST    CONFIGRET = 0x00000039
-	CR_INVALID_INDEX            CONFIGRET = 0x0000003A
-	CR_INVALID_STRUCTURE_SIZE   CONFIGRET = 0x0000003B
-	NUM_CR_RESULTS              CONFIGRET = 0x0000003C
-)
-
-const (
-	CM_GET_DEVICE_INTERFACE_LIST_PRESENT     = 0 // only currently 'live' device interfaces
-	CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES = 1 // all registered device interfaces, live or not
-)
-
-const (
-	DN_ROOT_ENUMERATED       = 0x00000001        // Was enumerated by ROOT
-	DN_DRIVER_LOADED         = 0x00000002        // Has Register_Device_Driver
-	DN_ENUM_LOADED           = 0x00000004        // Has Register_Enumerator
-	DN_STARTED               = 0x00000008        // Is currently configured
-	DN_MANUAL                = 0x00000010        // Manually installed
-	DN_NEED_TO_ENUM          = 0x00000020        // May need reenumeration
-	DN_NOT_FIRST_TIME        = 0x00000040        // Has received a config
-	DN_HARDWARE_ENUM         = 0x00000080        // Enum generates hardware ID
-	DN_LIAR                  = 0x00000100        // Lied about can reconfig once
-	DN_HAS_MARK              = 0x00000200        // Not CM_Create_DevInst lately
-	DN_HAS_PROBLEM           = 0x00000400        // Need device installer
-	DN_FILTERED              = 0x00000800        // Is filtered
-	DN_MOVED                 = 0x00001000        // Has been moved
-	DN_DISABLEABLE           = 0x00002000        // Can be disabled
-	DN_REMOVABLE             = 0x00004000        // Can be removed
-	DN_PRIVATE_PROBLEM       = 0x00008000        // Has a private problem
-	DN_MF_PARENT             = 0x00010000        // Multi function parent
-	DN_MF_CHILD              = 0x00020000        // Multi function child
-	DN_WILL_BE_REMOVED       = 0x00040000        // DevInst is being removed
-	DN_NOT_FIRST_TIMEE       = 0x00080000        // Has received a config enumerate
-	DN_STOP_FREE_RES         = 0x00100000        // When child is stopped, free resources
-	DN_REBAL_CANDIDATE       = 0x00200000        // Don't skip during rebalance
-	DN_BAD_PARTIAL           = 0x00400000        // This devnode's log_confs do not have same resources
-	DN_NT_ENUMERATOR         = 0x00800000        // This devnode's is an NT enumerator
-	DN_NT_DRIVER             = 0x01000000        // This devnode's is an NT driver
-	DN_NEEDS_LOCKING         = 0x02000000        // Devnode need lock resume processing
-	DN_ARM_WAKEUP            = 0x04000000        // Devnode can be the wakeup device
-	DN_APM_ENUMERATOR        = 0x08000000        // APM aware enumerator
-	DN_APM_DRIVER            = 0x10000000        // APM aware driver
-	DN_SILENT_INSTALL        = 0x20000000        // Silent install
-	DN_NO_SHOW_IN_DM         = 0x40000000        // No show in device manager
-	DN_BOOT_LOG_PROB         = 0x80000000        // Had a problem during preassignment of boot log conf
-	DN_NEED_RESTART          = DN_LIAR           // System needs to be restarted for this Devnode to work properly
-	DN_DRIVER_BLOCKED        = DN_NOT_FIRST_TIME // One or more drivers are blocked from loading for this Devnode
-	DN_LEGACY_DRIVER         = DN_MOVED          // This device is using a legacy driver
-	DN_CHILD_WITH_INVALID_ID = DN_HAS_MARK       // One or more children have invalid IDs
-	DN_DEVICE_DISCONNECTED   = DN_NEEDS_LOCKING  // The function driver for a device reported that the device is not connected.  Typically this means a wireless device is out of range.
-	DN_QUERY_REMOVE_PENDING  = DN_MF_PARENT      // Device is part of a set of related devices collectively pending query-removal
-	DN_QUERY_REMOVE_ACTIVE   = DN_MF_CHILD       // Device is actively engaged in a query-remove IRP
-	DN_CHANGEABLE_FLAGS      = DN_NOT_FIRST_TIME | DN_HARDWARE_ENUM | DN_HAS_MARK | DN_DISABLEABLE | DN_REMOVABLE | DN_MF_CHILD | DN_MF_PARENT | DN_NOT_FIRST_TIMEE | DN_STOP_FREE_RES | DN_REBAL_CANDIDATE | DN_NT_ENUMERATOR | DN_NT_DRIVER | DN_SILENT_INSTALL | DN_NO_SHOW_IN_DM
-)
-
-//sys	setupDiCreateDeviceInfoListEx(classGUID *GUID, hwndParent uintptr, machineName *uint16, reserved uintptr) (handle DevInfo, err error) [failretval==DevInfo(InvalidHandle)] = setupapi.SetupDiCreateDeviceInfoListExW
-
-// SetupDiCreateDeviceInfoListEx function creates an empty device information set on a remote or a local computer and optionally associates the set with a device setup class.
-func SetupDiCreateDeviceInfoListEx(classGUID *GUID, hwndParent uintptr, machineName string) (deviceInfoSet DevInfo, err error) {
-	var machineNameUTF16 *uint16
-	if machineName != "" {
-		machineNameUTF16, err = UTF16PtrFromString(machineName)
-		if err != nil {
-			return
-		}
-	}
-	return setupDiCreateDeviceInfoListEx(classGUID, hwndParent, machineNameUTF16, 0)
-}
-
-//sys	setupDiGetDeviceInfoListDetail(deviceInfoSet DevInfo, deviceInfoSetDetailData *DevInfoListDetailData) (err error) = setupapi.SetupDiGetDeviceInfoListDetailW
-
-// SetupDiGetDeviceInfoListDetail function retrieves information associated with a device information set including the class GUID, remote computer handle, and remote computer name.
-func SetupDiGetDeviceInfoListDetail(deviceInfoSet DevInfo) (deviceInfoSetDetailData *DevInfoListDetailData, err error) {
-	data := &DevInfoListDetailData{}
-	data.size = data.unsafeSizeOf()
-
-	return data, setupDiGetDeviceInfoListDetail(deviceInfoSet, data)
-}
-
-// DeviceInfoListDetail method retrieves information associated with a device information set including the class GUID, remote computer handle, and remote computer name.
-func (deviceInfoSet DevInfo) DeviceInfoListDetail() (*DevInfoListDetailData, error) {
-	return SetupDiGetDeviceInfoListDetail(deviceInfoSet)
-}
-
-//sys	setupDiCreateDeviceInfo(deviceInfoSet DevInfo, DeviceName *uint16, classGUID *GUID, DeviceDescription *uint16, hwndParent uintptr, CreationFlags DICD, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiCreateDeviceInfoW
-
-// SetupDiCreateDeviceInfo function creates a new device information element and adds it as a new member to the specified device information set.
-func SetupDiCreateDeviceInfo(deviceInfoSet DevInfo, deviceName string, classGUID *GUID, deviceDescription string, hwndParent uintptr, creationFlags DICD) (deviceInfoData *DevInfoData, err error) {
-	deviceNameUTF16, err := UTF16PtrFromString(deviceName)
-	if err != nil {
-		return
-	}
-
-	var deviceDescriptionUTF16 *uint16
-	if deviceDescription != "" {
-		deviceDescriptionUTF16, err = UTF16PtrFromString(deviceDescription)
-		if err != nil {
-			return
-		}
-	}
-
-	data := &DevInfoData{}
-	data.size = uint32(unsafe.Sizeof(*data))
-
-	return data, setupDiCreateDeviceInfo(deviceInfoSet, deviceNameUTF16, classGUID, deviceDescriptionUTF16, hwndParent, creationFlags, data)
-}
-
-// CreateDeviceInfo method creates a new device information element and adds it as a new member to the specified device information set.
-func (deviceInfoSet DevInfo) CreateDeviceInfo(deviceName string, classGUID *GUID, deviceDescription string, hwndParent uintptr, creationFlags DICD) (*DevInfoData, error) {
-	return SetupDiCreateDeviceInfo(deviceInfoSet, deviceName, classGUID, deviceDescription, hwndParent, creationFlags)
-}
-
-//sys	setupDiEnumDeviceInfo(deviceInfoSet DevInfo, memberIndex uint32, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiEnumDeviceInfo
-
-// SetupDiEnumDeviceInfo function returns a DevInfoData structure that specifies a device information element in a device information set.
-func SetupDiEnumDeviceInfo(deviceInfoSet DevInfo, memberIndex int) (*DevInfoData, error) {
-	data := &DevInfoData{}
-	data.size = uint32(unsafe.Sizeof(*data))
-
-	return data, setupDiEnumDeviceInfo(deviceInfoSet, uint32(memberIndex), data)
-}
-
-// EnumDeviceInfo method returns a DevInfoData structure that specifies a device information element in a device information set.
-func (deviceInfoSet DevInfo) EnumDeviceInfo(memberIndex int) (*DevInfoData, error) {
-	return SetupDiEnumDeviceInfo(deviceInfoSet, memberIndex)
-}
-
-// SetupDiDestroyDeviceInfoList function deletes a device information set and frees all associated memory.
-//sys	SetupDiDestroyDeviceInfoList(deviceInfoSet DevInfo) (err error) = setupapi.SetupDiDestroyDeviceInfoList
-
-// Close method deletes a device information set and frees all associated memory.
-func (deviceInfoSet DevInfo) Close() error {
-	return SetupDiDestroyDeviceInfoList(deviceInfoSet)
-}
-
-//sys	SetupDiBuildDriverInfoList(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT) (err error) = setupapi.SetupDiBuildDriverInfoList
-
-// BuildDriverInfoList method builds a list of drivers that is associated with a specific device or with the global class driver list for a device information set.
-func (deviceInfoSet DevInfo) BuildDriverInfoList(deviceInfoData *DevInfoData, driverType SPDIT) error {
-	return SetupDiBuildDriverInfoList(deviceInfoSet, deviceInfoData, driverType)
-}
-
-//sys	SetupDiCancelDriverInfoSearch(deviceInfoSet DevInfo) (err error) = setupapi.SetupDiCancelDriverInfoSearch
-
-// CancelDriverInfoSearch method cancels a driver list search that is currently in progress in a different thread.
-func (deviceInfoSet DevInfo) CancelDriverInfoSearch() error {
-	return SetupDiCancelDriverInfoSearch(deviceInfoSet)
-}
-
-//sys	setupDiEnumDriverInfo(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT, memberIndex uint32, driverInfoData *DrvInfoData) (err error) = setupapi.SetupDiEnumDriverInfoW
-
-// SetupDiEnumDriverInfo function enumerates the members of a driver list.
-func SetupDiEnumDriverInfo(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT, memberIndex int) (*DrvInfoData, error) {
-	data := &DrvInfoData{}
-	data.size = uint32(unsafe.Sizeof(*data))
-
-	return data, setupDiEnumDriverInfo(deviceInfoSet, deviceInfoData, driverType, uint32(memberIndex), data)
-}
-
-// EnumDriverInfo method enumerates the members of a driver list.
-func (deviceInfoSet DevInfo) EnumDriverInfo(deviceInfoData *DevInfoData, driverType SPDIT, memberIndex int) (*DrvInfoData, error) {
-	return SetupDiEnumDriverInfo(deviceInfoSet, deviceInfoData, driverType, memberIndex)
-}
-
-//sys	setupDiGetSelectedDriver(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (err error) = setupapi.SetupDiGetSelectedDriverW
-
-// SetupDiGetSelectedDriver function retrieves the selected driver for a device information set or a particular device information element.
-func SetupDiGetSelectedDriver(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (*DrvInfoData, error) {
-	data := &DrvInfoData{}
-	data.size = uint32(unsafe.Sizeof(*data))
-
-	return data, setupDiGetSelectedDriver(deviceInfoSet, deviceInfoData, data)
-}
-
-// SelectedDriver method retrieves the selected driver for a device information set or a particular device information element.
-func (deviceInfoSet DevInfo) SelectedDriver(deviceInfoData *DevInfoData) (*DrvInfoData, error) {
-	return SetupDiGetSelectedDriver(deviceInfoSet, deviceInfoData)
-}
-
-//sys	SetupDiSetSelectedDriver(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (err error) = setupapi.SetupDiSetSelectedDriverW
-
-// SetSelectedDriver method sets, or resets, the selected driver for a device information element or the selected class driver for a device information set.
-func (deviceInfoSet DevInfo) SetSelectedDriver(deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) error {
-	return SetupDiSetSelectedDriver(deviceInfoSet, deviceInfoData, driverInfoData)
-}
-
-//sys	setupDiGetDriverInfoDetail(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData, driverInfoDetailData *DrvInfoDetailData, driverInfoDetailDataSize uint32, requiredSize *uint32) (err error) = setupapi.SetupDiGetDriverInfoDetailW
-
-// SetupDiGetDriverInfoDetail function retrieves driver information detail for a device information set or a particular device information element in the device information set.
-func SetupDiGetDriverInfoDetail(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (*DrvInfoDetailData, error) {
-	reqSize := uint32(2048)
-	for {
-		buf := make([]byte, reqSize)
-		data := (*DrvInfoDetailData)(unsafe.Pointer(&buf[0]))
-		data.size = data.unsafeSizeOf()
-		err := setupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData, data, uint32(len(buf)), &reqSize)
-		if err == ERROR_INSUFFICIENT_BUFFER {
-			continue
-		}
-		if err != nil {
-			return nil, err
-		}
-		data.size = reqSize
-		return data, nil
-	}
-}
-
-// DriverInfoDetail method retrieves driver information detail for a device information set or a particular device information element in the device information set.
-func (deviceInfoSet DevInfo) DriverInfoDetail(deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (*DrvInfoDetailData, error) {
-	return SetupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData)
-}
-
-//sys	SetupDiDestroyDriverInfoList(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT) (err error) = setupapi.SetupDiDestroyDriverInfoList
-
-// DestroyDriverInfoList method deletes a driver list.
-func (deviceInfoSet DevInfo) DestroyDriverInfoList(deviceInfoData *DevInfoData, driverType SPDIT) error {
-	return SetupDiDestroyDriverInfoList(deviceInfoSet, deviceInfoData, driverType)
-}
-
-//sys	setupDiGetClassDevsEx(classGUID *GUID, Enumerator *uint16, hwndParent uintptr, Flags DIGCF, deviceInfoSet DevInfo, machineName *uint16, reserved uintptr) (handle DevInfo, err error) [failretval==DevInfo(InvalidHandle)] = setupapi.SetupDiGetClassDevsExW
-
-// SetupDiGetClassDevsEx function returns a handle to a device information set that contains requested device information elements for a local or a remote computer.
-func SetupDiGetClassDevsEx(classGUID *GUID, enumerator string, hwndParent uintptr, flags DIGCF, deviceInfoSet DevInfo, machineName string) (handle DevInfo, err error) {
-	var enumeratorUTF16 *uint16
-	if enumerator != "" {
-		enumeratorUTF16, err = UTF16PtrFromString(enumerator)
-		if err != nil {
-			return
-		}
-	}
-	var machineNameUTF16 *uint16
-	if machineName != "" {
-		machineNameUTF16, err = UTF16PtrFromString(machineName)
-		if err != nil {
-			return
-		}
-	}
-	return setupDiGetClassDevsEx(classGUID, enumeratorUTF16, hwndParent, flags, deviceInfoSet, machineNameUTF16, 0)
-}
-
-// SetupDiCallClassInstaller function calls the appropriate class installer, and any registered co-installers, with the specified installation request (DIF code).
-//sys	SetupDiCallClassInstaller(installFunction DI_FUNCTION, deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiCallClassInstaller
-
-// CallClassInstaller member calls the appropriate class installer, and any registered co-installers, with the specified installation request (DIF code).
-func (deviceInfoSet DevInfo) CallClassInstaller(installFunction DI_FUNCTION, deviceInfoData *DevInfoData) error {
-	return SetupDiCallClassInstaller(installFunction, deviceInfoSet, deviceInfoData)
-}
-
-// SetupDiOpenDevRegKey function opens a registry key for device-specific configuration information.
-//sys	SetupDiOpenDevRegKey(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, Scope DICS_FLAG, HwProfile uint32, KeyType DIREG, samDesired uint32) (key Handle, err error) [failretval==InvalidHandle] = setupapi.SetupDiOpenDevRegKey
-
-// OpenDevRegKey method opens a registry key for device-specific configuration information.
-func (deviceInfoSet DevInfo) OpenDevRegKey(DeviceInfoData *DevInfoData, Scope DICS_FLAG, HwProfile uint32, KeyType DIREG, samDesired uint32) (Handle, error) {
-	return SetupDiOpenDevRegKey(deviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, samDesired)
-}
-
-//sys	setupDiGetDeviceProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, propertyKey *DEVPROPKEY, propertyType *DEVPROPTYPE, propertyBuffer *byte, propertyBufferSize uint32, requiredSize *uint32, flags uint32) (err error) = setupapi.SetupDiGetDevicePropertyW
-
-// SetupDiGetDeviceProperty function retrieves a specified device instance property.
-func SetupDiGetDeviceProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, propertyKey *DEVPROPKEY) (value interface{}, err error) {
-	reqSize := uint32(256)
-	for {
-		var dataType DEVPROPTYPE
-		buf := make([]byte, reqSize)
-		err = setupDiGetDeviceProperty(deviceInfoSet, deviceInfoData, propertyKey, &dataType, &buf[0], uint32(len(buf)), &reqSize, 0)
-		if err == ERROR_INSUFFICIENT_BUFFER {
-			continue
-		}
-		if err != nil {
-			return
-		}
-		switch dataType {
-		case DEVPROP_TYPE_STRING:
-			ret := UTF16ToString(bufToUTF16(buf))
-			runtime.KeepAlive(buf)
-			return ret, nil
-		}
-		return nil, errors.New("unimplemented property type")
-	}
-}
-
-//sys	setupDiGetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP, propertyRegDataType *uint32, propertyBuffer *byte, propertyBufferSize uint32, requiredSize *uint32) (err error) = setupapi.SetupDiGetDeviceRegistryPropertyW
-
-// SetupDiGetDeviceRegistryProperty function retrieves a specified Plug and Play device property.
-func SetupDiGetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP) (value interface{}, err error) {
-	reqSize := uint32(256)
-	for {
-		var dataType uint32
-		buf := make([]byte, reqSize)
-		err = setupDiGetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, &dataType, &buf[0], uint32(len(buf)), &reqSize)
-		if err == ERROR_INSUFFICIENT_BUFFER {
-			continue
-		}
-		if err != nil {
-			return
-		}
-		return getRegistryValue(buf[:reqSize], dataType)
-	}
-}
-
-func getRegistryValue(buf []byte, dataType uint32) (interface{}, error) {
-	switch dataType {
-	case REG_SZ:
-		ret := UTF16ToString(bufToUTF16(buf))
-		runtime.KeepAlive(buf)
-		return ret, nil
-	case REG_EXPAND_SZ:
-		value := UTF16ToString(bufToUTF16(buf))
-		if value == "" {
-			return "", nil
-		}
-		p, err := syscall.UTF16PtrFromString(value)
-		if err != nil {
-			return "", err
-		}
-		ret := make([]uint16, 100)
-		for {
-			n, err := ExpandEnvironmentStrings(p, &ret[0], uint32(len(ret)))
-			if err != nil {
-				return "", err
-			}
-			if n <= uint32(len(ret)) {
-				return UTF16ToString(ret[:n]), nil
-			}
-			ret = make([]uint16, n)
-		}
-	case REG_BINARY:
-		return buf, nil
-	case REG_DWORD_LITTLE_ENDIAN:
-		return binary.LittleEndian.Uint32(buf), nil
-	case REG_DWORD_BIG_ENDIAN:
-		return binary.BigEndian.Uint32(buf), nil
-	case REG_MULTI_SZ:
-		bufW := bufToUTF16(buf)
-		a := []string{}
-		for i := 0; i < len(bufW); {
-			j := i + wcslen(bufW[i:])
-			if i < j {
-				a = append(a, UTF16ToString(bufW[i:j]))
-			}
-			i = j + 1
-		}
-		runtime.KeepAlive(buf)
-		return a, nil
-	case REG_QWORD_LITTLE_ENDIAN:
-		return binary.LittleEndian.Uint64(buf), nil
-	default:
-		return nil, fmt.Errorf("Unsupported registry value type: %v", dataType)
-	}
-}
-
-// bufToUTF16 function reinterprets []byte buffer as []uint16
-func bufToUTF16(buf []byte) []uint16 {
-	sl := struct {
-		addr *uint16
-		len  int
-		cap  int
-	}{(*uint16)(unsafe.Pointer(&buf[0])), len(buf) / 2, cap(buf) / 2}
-	return *(*[]uint16)(unsafe.Pointer(&sl))
-}
-
-// utf16ToBuf function reinterprets []uint16 as []byte
-func utf16ToBuf(buf []uint16) []byte {
-	sl := struct {
-		addr *byte
-		len  int
-		cap  int
-	}{(*byte)(unsafe.Pointer(&buf[0])), len(buf) * 2, cap(buf) * 2}
-	return *(*[]byte)(unsafe.Pointer(&sl))
-}
-
-func wcslen(str []uint16) int {
-	for i := 0; i < len(str); i++ {
-		if str[i] == 0 {
-			return i
-		}
-	}
-	return len(str)
-}
-
-// DeviceRegistryProperty method retrieves a specified Plug and Play device property.
-func (deviceInfoSet DevInfo) DeviceRegistryProperty(deviceInfoData *DevInfoData, property SPDRP) (interface{}, error) {
-	return SetupDiGetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property)
-}
-
-//sys	setupDiSetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP, propertyBuffer *byte, propertyBufferSize uint32) (err error) = setupapi.SetupDiSetDeviceRegistryPropertyW
-
-// SetupDiSetDeviceRegistryProperty function sets a Plug and Play device property for a device.
-func SetupDiSetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP, propertyBuffers []byte) error {
-	return setupDiSetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, &propertyBuffers[0], uint32(len(propertyBuffers)))
-}
-
-// SetDeviceRegistryProperty function sets a Plug and Play device property for a device.
-func (deviceInfoSet DevInfo) SetDeviceRegistryProperty(deviceInfoData *DevInfoData, property SPDRP, propertyBuffers []byte) error {
-	return SetupDiSetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, propertyBuffers)
-}
-
-// SetDeviceRegistryPropertyString method sets a Plug and Play device property string for a device.
-func (deviceInfoSet DevInfo) SetDeviceRegistryPropertyString(deviceInfoData *DevInfoData, property SPDRP, str string) error {
-	str16, err := UTF16FromString(str)
-	if err != nil {
-		return err
-	}
-	err = SetupDiSetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, utf16ToBuf(append(str16, 0)))
-	runtime.KeepAlive(str16)
-	return err
-}
-
-//sys	setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) = setupapi.SetupDiGetDeviceInstallParamsW
-
-// SetupDiGetDeviceInstallParams function retrieves device installation parameters for a device information set or a particular device information element.
-func SetupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (*DevInstallParams, error) {
-	params := &DevInstallParams{}
-	params.size = uint32(unsafe.Sizeof(*params))
-
-	return params, setupDiGetDeviceInstallParams(deviceInfoSet, deviceInfoData, params)
-}
-
-// DeviceInstallParams method retrieves device installation parameters for a device information set or a particular device information element.
-func (deviceInfoSet DevInfo) DeviceInstallParams(deviceInfoData *DevInfoData) (*DevInstallParams, error) {
-	return SetupDiGetDeviceInstallParams(deviceInfoSet, deviceInfoData)
-}
-
-//sys	setupDiGetDeviceInstanceId(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, instanceId *uint16, instanceIdSize uint32, instanceIdRequiredSize *uint32) (err error) = setupapi.SetupDiGetDeviceInstanceIdW
-
-// SetupDiGetDeviceInstanceId function retrieves the instance ID of the device.
-func SetupDiGetDeviceInstanceId(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (string, error) {
-	reqSize := uint32(1024)
-	for {
-		buf := make([]uint16, reqSize)
-		err := setupDiGetDeviceInstanceId(deviceInfoSet, deviceInfoData, &buf[0], uint32(len(buf)), &reqSize)
-		if err == ERROR_INSUFFICIENT_BUFFER {
-			continue
-		}
-		if err != nil {
-			return "", err
-		}
-		return UTF16ToString(buf), nil
-	}
-}
-
-// DeviceInstanceID method retrieves the instance ID of the device.
-func (deviceInfoSet DevInfo) DeviceInstanceID(deviceInfoData *DevInfoData) (string, error) {
-	return SetupDiGetDeviceInstanceId(deviceInfoSet, deviceInfoData)
-}
-
-// SetupDiGetClassInstallParams function retrieves class installation parameters for a device information set or a particular device information element.
-//sys	SetupDiGetClassInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32, requiredSize *uint32) (err error) = setupapi.SetupDiGetClassInstallParamsW
-
-// ClassInstallParams method retrieves class installation parameters for a device information set or a particular device information element.
-func (deviceInfoSet DevInfo) ClassInstallParams(deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32, requiredSize *uint32) error {
-	return SetupDiGetClassInstallParams(deviceInfoSet, deviceInfoData, classInstallParams, classInstallParamsSize, requiredSize)
-}
-
-//sys	SetupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) = setupapi.SetupDiSetDeviceInstallParamsW
-
-// SetDeviceInstallParams member sets device installation parameters for a device information set or a particular device information element.
-func (deviceInfoSet DevInfo) SetDeviceInstallParams(deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) error {
-	return SetupDiSetDeviceInstallParams(deviceInfoSet, deviceInfoData, deviceInstallParams)
-}
-
-// SetupDiSetClassInstallParams function sets or clears class install parameters for a device information set or a particular device information element.
-//sys	SetupDiSetClassInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32) (err error) = setupapi.SetupDiSetClassInstallParamsW
-
-// SetClassInstallParams method sets or clears class install parameters for a device information set or a particular device information element.
-func (deviceInfoSet DevInfo) SetClassInstallParams(deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32) error {
-	return SetupDiSetClassInstallParams(deviceInfoSet, deviceInfoData, classInstallParams, classInstallParamsSize)
-}
-
-//sys	setupDiClassNameFromGuidEx(classGUID *GUID, className *uint16, classNameSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) = setupapi.SetupDiClassNameFromGuidExW
-
-// SetupDiClassNameFromGuidEx function retrieves the class name associated with a class GUID. The class can be installed on a local or remote computer.
-func SetupDiClassNameFromGuidEx(classGUID *GUID, machineName string) (className string, err error) {
-	var classNameUTF16 [MAX_CLASS_NAME_LEN]uint16
-
-	var machineNameUTF16 *uint16
-	if machineName != "" {
-		machineNameUTF16, err = UTF16PtrFromString(machineName)
-		if err != nil {
-			return
-		}
-	}
-
-	err = setupDiClassNameFromGuidEx(classGUID, &classNameUTF16[0], MAX_CLASS_NAME_LEN, nil, machineNameUTF16, 0)
-	if err != nil {
-		return
-	}
-
-	className = UTF16ToString(classNameUTF16[:])
-	return
-}
-
-//sys	setupDiClassGuidsFromNameEx(className *uint16, classGuidList *GUID, classGuidListSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) = setupapi.SetupDiClassGuidsFromNameExW
-
-// SetupDiClassGuidsFromNameEx function retrieves the GUIDs associated with the specified class name. This resulting list contains the classes currently installed on a local or remote computer.
-func SetupDiClassGuidsFromNameEx(className string, machineName string) ([]GUID, error) {
-	classNameUTF16, err := UTF16PtrFromString(className)
-	if err != nil {
-		return nil, err
-	}
-
-	var machineNameUTF16 *uint16
-	if machineName != "" {
-		machineNameUTF16, err = UTF16PtrFromString(machineName)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	reqSize := uint32(4)
-	for {
-		buf := make([]GUID, reqSize)
-		err = setupDiClassGuidsFromNameEx(classNameUTF16, &buf[0], uint32(len(buf)), &reqSize, machineNameUTF16, 0)
-		if err == ERROR_INSUFFICIENT_BUFFER {
-			continue
-		}
-		if err != nil {
-			return nil, err
-		}
-		return buf[:reqSize], nil
-	}
-}
-
-//sys	setupDiGetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiGetSelectedDevice
-
-// SetupDiGetSelectedDevice function retrieves the selected device information element in a device information set.
-func SetupDiGetSelectedDevice(deviceInfoSet DevInfo) (*DevInfoData, error) {
-	data := &DevInfoData{}
-	data.size = uint32(unsafe.Sizeof(*data))
-
-	return data, setupDiGetSelectedDevice(deviceInfoSet, data)
-}
-
-// SelectedDevice method retrieves the selected device information element in a device information set.
-func (deviceInfoSet DevInfo) SelectedDevice() (*DevInfoData, error) {
-	return SetupDiGetSelectedDevice(deviceInfoSet)
-}
-
-// SetupDiSetSelectedDevice function sets a device information element as the selected member of a device information set. This function is typically used by an installation wizard.
-//sys	SetupDiSetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiSetSelectedDevice
-
-// SetSelectedDevice method sets a device information element as the selected member of a device information set. This function is typically used by an installation wizard.
-func (deviceInfoSet DevInfo) SetSelectedDevice(deviceInfoData *DevInfoData) error {
-	return SetupDiSetSelectedDevice(deviceInfoSet, deviceInfoData)
-}
-
-//sys	setupUninstallOEMInf(infFileName *uint16, flags SUOI, reserved uintptr) (err error) = setupapi.SetupUninstallOEMInfW
-
-// SetupUninstallOEMInf uninstalls the specified driver.
-func SetupUninstallOEMInf(infFileName string, flags SUOI) error {
-	infFileName16, err := UTF16PtrFromString(infFileName)
-	if err != nil {
-		return err
-	}
-	return setupUninstallOEMInf(infFileName16, flags, 0)
-}
-
-//sys cm_MapCrToWin32Err(configRet CONFIGRET, defaultWin32Error Errno) (ret Errno) = CfgMgr32.CM_MapCrToWin32Err
-
-//sys cm_Get_Device_Interface_List_Size(len *uint32, interfaceClass *GUID, deviceID *uint16, flags uint32) (ret CONFIGRET) = CfgMgr32.CM_Get_Device_Interface_List_SizeW
-//sys cm_Get_Device_Interface_List(interfaceClass *GUID, deviceID *uint16, buffer *uint16, bufferLen uint32, flags uint32) (ret CONFIGRET) = CfgMgr32.CM_Get_Device_Interface_ListW
-
-func CM_Get_Device_Interface_List(deviceID string, interfaceClass *GUID, flags uint32) ([]string, error) {
-	deviceID16, err := UTF16PtrFromString(deviceID)
-	if err != nil {
-		return nil, err
-	}
-	var buf []uint16
-	var buflen uint32
-	for {
-		if ret := cm_Get_Device_Interface_List_Size(&buflen, interfaceClass, deviceID16, flags); ret != CR_SUCCESS {
-			return nil, ret
-		}
-		buf = make([]uint16, buflen)
-		if ret := cm_Get_Device_Interface_List(interfaceClass, deviceID16, &buf[0], buflen, flags); ret == CR_SUCCESS {
-			break
-		} else if ret != CR_BUFFER_SMALL {
-			return nil, ret
-		}
-	}
-	var interfaces []string
-	for i := 0; i < len(buf); {
-		j := i + wcslen(buf[i:])
-		if i < j {
-			interfaces = append(interfaces, UTF16ToString(buf[i:j]))
-		}
-		i = j + 1
-	}
-	if interfaces == nil {
-		return nil, ERROR_NO_SUCH_DEVICE_INTERFACE
-	}
-	return interfaces, nil
-}
-
-//sys cm_Get_DevNode_Status(status *uint32, problemNumber *uint32, devInst DEVINST, flags uint32) (ret CONFIGRET) = CfgMgr32.CM_Get_DevNode_Status
-
-func CM_Get_DevNode_Status(status *uint32, problemNumber *uint32, devInst DEVINST, flags uint32) error {
-	ret := cm_Get_DevNode_Status(status, problemNumber, devInst, flags)
-	if ret == CR_SUCCESS {
-		return nil
-	}
-	return ret
-}
diff --git a/vendor/golang.org/x/sys/windows/setupapierrors_windows.go b/vendor/golang.org/x/sys/windows/setupapierrors_windows.go
new file mode 100644
index 0000000..1681810
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/setupapierrors_windows.go
@@ -0,0 +1,100 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+import "syscall"
+
+const (
+	ERROR_EXPECTED_SECTION_NAME                  syscall.Errno = 0x20000000 | 0xC0000000 | 0
+	ERROR_BAD_SECTION_NAME_LINE                  syscall.Errno = 0x20000000 | 0xC0000000 | 1
+	ERROR_SECTION_NAME_TOO_LONG                  syscall.Errno = 0x20000000 | 0xC0000000 | 2
+	ERROR_GENERAL_SYNTAX                         syscall.Errno = 0x20000000 | 0xC0000000 | 3
+	ERROR_WRONG_INF_STYLE                        syscall.Errno = 0x20000000 | 0xC0000000 | 0x100
+	ERROR_SECTION_NOT_FOUND                      syscall.Errno = 0x20000000 | 0xC0000000 | 0x101
+	ERROR_LINE_NOT_FOUND                         syscall.Errno = 0x20000000 | 0xC0000000 | 0x102
+	ERROR_NO_BACKUP                              syscall.Errno = 0x20000000 | 0xC0000000 | 0x103
+	ERROR_NO_ASSOCIATED_CLASS                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x200
+	ERROR_CLASS_MISMATCH                         syscall.Errno = 0x20000000 | 0xC0000000 | 0x201
+	ERROR_DUPLICATE_FOUND                        syscall.Errno = 0x20000000 | 0xC0000000 | 0x202
+	ERROR_NO_DRIVER_SELECTED                     syscall.Errno = 0x20000000 | 0xC0000000 | 0x203
+	ERROR_KEY_DOES_NOT_EXIST                     syscall.Errno = 0x20000000 | 0xC0000000 | 0x204
+	ERROR_INVALID_DEVINST_NAME                   syscall.Errno = 0x20000000 | 0xC0000000 | 0x205
+	ERROR_INVALID_CLASS                          syscall.Errno = 0x20000000 | 0xC0000000 | 0x206
+	ERROR_DEVINST_ALREADY_EXISTS                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x207
+	ERROR_DEVINFO_NOT_REGISTERED                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x208
+	ERROR_INVALID_REG_PROPERTY                   syscall.Errno = 0x20000000 | 0xC0000000 | 0x209
+	ERROR_NO_INF                                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x20A
+	ERROR_NO_SUCH_DEVINST                        syscall.Errno = 0x20000000 | 0xC0000000 | 0x20B
+	ERROR_CANT_LOAD_CLASS_ICON                   syscall.Errno = 0x20000000 | 0xC0000000 | 0x20C
+	ERROR_INVALID_CLASS_INSTALLER                syscall.Errno = 0x20000000 | 0xC0000000 | 0x20D
+	ERROR_DI_DO_DEFAULT                          syscall.Errno = 0x20000000 | 0xC0000000 | 0x20E
+	ERROR_DI_NOFILECOPY                          syscall.Errno = 0x20000000 | 0xC0000000 | 0x20F
+	ERROR_INVALID_HWPROFILE                      syscall.Errno = 0x20000000 | 0xC0000000 | 0x210
+	ERROR_NO_DEVICE_SELECTED                     syscall.Errno = 0x20000000 | 0xC0000000 | 0x211
+	ERROR_DEVINFO_LIST_LOCKED                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x212
+	ERROR_DEVINFO_DATA_LOCKED                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x213
+	ERROR_DI_BAD_PATH                            syscall.Errno = 0x20000000 | 0xC0000000 | 0x214
+	ERROR_NO_CLASSINSTALL_PARAMS                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x215
+	ERROR_FILEQUEUE_LOCKED                       syscall.Errno = 0x20000000 | 0xC0000000 | 0x216
+	ERROR_BAD_SERVICE_INSTALLSECT                syscall.Errno = 0x20000000 | 0xC0000000 | 0x217
+	ERROR_NO_CLASS_DRIVER_LIST                   syscall.Errno = 0x20000000 | 0xC0000000 | 0x218
+	ERROR_NO_ASSOCIATED_SERVICE                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x219
+	ERROR_NO_DEFAULT_DEVICE_INTERFACE            syscall.Errno = 0x20000000 | 0xC0000000 | 0x21A
+	ERROR_DEVICE_INTERFACE_ACTIVE                syscall.Errno = 0x20000000 | 0xC0000000 | 0x21B
+	ERROR_DEVICE_INTERFACE_REMOVED               syscall.Errno = 0x20000000 | 0xC0000000 | 0x21C
+	ERROR_BAD_INTERFACE_INSTALLSECT              syscall.Errno = 0x20000000 | 0xC0000000 | 0x21D
+	ERROR_NO_SUCH_INTERFACE_CLASS                syscall.Errno = 0x20000000 | 0xC0000000 | 0x21E
+	ERROR_INVALID_REFERENCE_STRING               syscall.Errno = 0x20000000 | 0xC0000000 | 0x21F
+	ERROR_INVALID_MACHINENAME                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x220
+	ERROR_REMOTE_COMM_FAILURE                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x221
+	ERROR_MACHINE_UNAVAILABLE                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x222
+	ERROR_NO_CONFIGMGR_SERVICES                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x223
+	ERROR_INVALID_PROPPAGE_PROVIDER              syscall.Errno = 0x20000000 | 0xC0000000 | 0x224
+	ERROR_NO_SUCH_DEVICE_INTERFACE               syscall.Errno = 0x20000000 | 0xC0000000 | 0x225
+	ERROR_DI_POSTPROCESSING_REQUIRED             syscall.Errno = 0x20000000 | 0xC0000000 | 0x226
+	ERROR_INVALID_COINSTALLER                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x227
+	ERROR_NO_COMPAT_DRIVERS                      syscall.Errno = 0x20000000 | 0xC0000000 | 0x228
+	ERROR_NO_DEVICE_ICON                         syscall.Errno = 0x20000000 | 0xC0000000 | 0x229
+	ERROR_INVALID_INF_LOGCONFIG                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x22A
+	ERROR_DI_DONT_INSTALL                        syscall.Errno = 0x20000000 | 0xC0000000 | 0x22B
+	ERROR_INVALID_FILTER_DRIVER                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x22C
+	ERROR_NON_WINDOWS_NT_DRIVER                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x22D
+	ERROR_NON_WINDOWS_DRIVER                     syscall.Errno = 0x20000000 | 0xC0000000 | 0x22E
+	ERROR_NO_CATALOG_FOR_OEM_INF                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x22F
+	ERROR_DEVINSTALL_QUEUE_NONNATIVE             syscall.Errno = 0x20000000 | 0xC0000000 | 0x230
+	ERROR_NOT_DISABLEABLE                        syscall.Errno = 0x20000000 | 0xC0000000 | 0x231
+	ERROR_CANT_REMOVE_DEVINST                    syscall.Errno = 0x20000000 | 0xC0000000 | 0x232
+	ERROR_INVALID_TARGET                         syscall.Errno = 0x20000000 | 0xC0000000 | 0x233
+	ERROR_DRIVER_NONNATIVE                       syscall.Errno = 0x20000000 | 0xC0000000 | 0x234
+	ERROR_IN_WOW64                               syscall.Errno = 0x20000000 | 0xC0000000 | 0x235
+	ERROR_SET_SYSTEM_RESTORE_POINT               syscall.Errno = 0x20000000 | 0xC0000000 | 0x236
+	ERROR_SCE_DISABLED                           syscall.Errno = 0x20000000 | 0xC0000000 | 0x238
+	ERROR_UNKNOWN_EXCEPTION                      syscall.Errno = 0x20000000 | 0xC0000000 | 0x239
+	ERROR_PNP_REGISTRY_ERROR                     syscall.Errno = 0x20000000 | 0xC0000000 | 0x23A
+	ERROR_REMOTE_REQUEST_UNSUPPORTED             syscall.Errno = 0x20000000 | 0xC0000000 | 0x23B
+	ERROR_NOT_AN_INSTALLED_OEM_INF               syscall.Errno = 0x20000000 | 0xC0000000 | 0x23C
+	ERROR_INF_IN_USE_BY_DEVICES                  syscall.Errno = 0x20000000 | 0xC0000000 | 0x23D
+	ERROR_DI_FUNCTION_OBSOLETE                   syscall.Errno = 0x20000000 | 0xC0000000 | 0x23E
+	ERROR_NO_AUTHENTICODE_CATALOG                syscall.Errno = 0x20000000 | 0xC0000000 | 0x23F
+	ERROR_AUTHENTICODE_DISALLOWED                syscall.Errno = 0x20000000 | 0xC0000000 | 0x240
+	ERROR_AUTHENTICODE_TRUSTED_PUBLISHER         syscall.Errno = 0x20000000 | 0xC0000000 | 0x241
+	ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED     syscall.Errno = 0x20000000 | 0xC0000000 | 0x242
+	ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED     syscall.Errno = 0x20000000 | 0xC0000000 | 0x243
+	ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH         syscall.Errno = 0x20000000 | 0xC0000000 | 0x244
+	ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE         syscall.Errno = 0x20000000 | 0xC0000000 | 0x245
+	ERROR_DEVICE_INSTALLER_NOT_READY             syscall.Errno = 0x20000000 | 0xC0000000 | 0x246
+	ERROR_DRIVER_STORE_ADD_FAILED                syscall.Errno = 0x20000000 | 0xC0000000 | 0x247
+	ERROR_DEVICE_INSTALL_BLOCKED                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x248
+	ERROR_DRIVER_INSTALL_BLOCKED                 syscall.Errno = 0x20000000 | 0xC0000000 | 0x249
+	ERROR_WRONG_INF_TYPE                         syscall.Errno = 0x20000000 | 0xC0000000 | 0x24A
+	ERROR_FILE_HASH_NOT_IN_CATALOG               syscall.Errno = 0x20000000 | 0xC0000000 | 0x24B
+	ERROR_DRIVER_STORE_DELETE_FAILED             syscall.Errno = 0x20000000 | 0xC0000000 | 0x24C
+	ERROR_UNRECOVERABLE_STACK_OVERFLOW           syscall.Errno = 0x20000000 | 0xC0000000 | 0x300
+	EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW syscall.Errno = ERROR_UNRECOVERABLE_STACK_OVERFLOW
+	ERROR_NO_DEFAULT_INTERFACE_DEVICE            syscall.Errno = ERROR_NO_DEFAULT_DEVICE_INTERFACE
+	ERROR_INTERFACE_DEVICE_ACTIVE                syscall.Errno = ERROR_DEVICE_INTERFACE_ACTIVE
+	ERROR_INTERFACE_DEVICE_REMOVED               syscall.Errno = ERROR_DEVICE_INTERFACE_REMOVED
+	ERROR_NO_SUCH_INTERFACE_DEVICE               syscall.Errno = ERROR_NO_SUCH_DEVICE_INTERFACE
+)
diff --git a/vendor/golang.org/x/sys/windows/str.go b/vendor/golang.org/x/sys/windows/str.go
index 6a4f9ce..917cc2a 100644
--- a/vendor/golang.org/x/sys/windows/str.go
+++ b/vendor/golang.org/x/sys/windows/str.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows
+// +build windows
 
 package windows
 
diff --git a/vendor/golang.org/x/sys/windows/syscall.go b/vendor/golang.org/x/sys/windows/syscall.go
index e85ed6b..6122f55 100644
--- a/vendor/golang.org/x/sys/windows/syscall.go
+++ b/vendor/golang.org/x/sys/windows/syscall.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build windows
+// +build windows
 
 // Package windows contains an interface to the low-level operating system
 // primitives. OS details vary depending on the underlying system, and
@@ -29,6 +29,8 @@ import (
 	"strings"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
 // ByteSliceFromString returns a NUL-terminated slice of bytes
@@ -80,7 +82,13 @@ func BytePtrToString(p *byte) string {
 		ptr = unsafe.Pointer(uintptr(ptr) + 1)
 	}
 
-	return string(unsafe.Slice(p, n))
+	var s []byte
+	h := (*unsafeheader.Slice)(unsafe.Pointer(&s))
+	h.Data = unsafe.Pointer(p)
+	h.Len = n
+	h.Cap = n
+
+	return string(s)
 }
 
 // Single-word zero for use when we need a valid pointer to 0 bytes.
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index 640f6b1..1215b2a 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -15,12 +15,12 @@ import (
 	"time"
 	"unicode/utf16"
 	"unsafe"
+
+	"golang.org/x/sys/internal/unsafeheader"
 )
 
-type (
-	Handle uintptr
-	HWND   uintptr
-)
+type Handle uintptr
+type HWND uintptr
 
 const (
 	InvalidHandle = ^Handle(0)
@@ -86,13 +86,24 @@ func StringToUTF16(s string) []uint16 {
 // s, with a terminating NUL added. If s contains a NUL byte at any
 // location, it returns (nil, syscall.EINVAL).
 func UTF16FromString(s string) ([]uint16, error) {
-	return syscall.UTF16FromString(s)
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, syscall.EINVAL
+		}
+	}
+	return utf16.Encode([]rune(s + "\x00")), nil
 }
 
 // UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s,
 // with a terminating NUL and any bytes after the NUL removed.
 func UTF16ToString(s []uint16) string {
-	return syscall.UTF16ToString(s)
+	for i, v := range s {
+		if v == 0 {
+			s = s[:i]
+			break
+		}
+	}
+	return string(utf16.Decode(s))
 }
 
 // StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead.
@@ -127,21 +138,28 @@ func UTF16PtrToString(p *uint16) string {
 	for ptr := unsafe.Pointer(p); *(*uint16)(ptr) != 0; n++ {
 		ptr = unsafe.Pointer(uintptr(ptr) + unsafe.Sizeof(*p))
 	}
-	return UTF16ToString(unsafe.Slice(p, n))
+
+	var s []uint16
+	h := (*unsafeheader.Slice)(unsafe.Pointer(&s))
+	h.Data = unsafe.Pointer(p)
+	h.Len = n
+	h.Cap = n
+
+	return string(utf16.Decode(s))
 }
 
 func Getpagesize() int { return 4096 }
 
 // NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
-// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallback(fn interface{}) uintptr {
 	return syscall.NewCallback(fn)
 }
 
 // NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
-// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallbackCDecl(fn interface{}) uintptr {
 	return syscall.NewCallbackCDecl(fn)
 }
@@ -156,8 +174,6 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	GetModuleFileName(module Handle, filename *uint16, size uint32) (n uint32, err error) = kernel32.GetModuleFileNameW
 //sys	GetModuleHandleEx(flags uint32, moduleName *uint16, module *Handle) (err error) = kernel32.GetModuleHandleExW
 //sys	SetDefaultDllDirectories(directoryFlags uint32) (err error)
-//sys	AddDllDirectory(path *uint16) (cookie uintptr, err error) = kernel32.AddDllDirectory
-//sys	RemoveDllDirectory(cookie uintptr) (err error) = kernel32.RemoveDllDirectory
 //sys	SetDllDirectory(path string) (err error) = kernel32.SetDllDirectoryW
 //sys	GetVersion() (ver uint32, err error)
 //sys	FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid uint32, buf []uint16, args *byte) (n uint32, err error) = FormatMessageW
@@ -167,14 +183,11 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	CreateFile(name *uint16, access uint32, mode uint32, sa *SecurityAttributes, createmode uint32, attrs uint32, templatefile Handle) (handle Handle, err error) [failretval==InvalidHandle] = CreateFileW
 //sys	CreateNamedPipe(name *uint16, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *SecurityAttributes) (handle Handle, err error)  [failretval==InvalidHandle] = CreateNamedPipeW
 //sys	ConnectNamedPipe(pipe Handle, overlapped *Overlapped) (err error)
-//sys	DisconnectNamedPipe(pipe Handle) (err error)
-//sys   GetNamedPipeClientProcessId(pipe Handle, clientProcessID *uint32) (err error)
-//sys   GetNamedPipeServerProcessId(pipe Handle, serverProcessID *uint32) (err error)
 //sys	GetNamedPipeInfo(pipe Handle, flags *uint32, outSize *uint32, inSize *uint32, maxInstances *uint32) (err error)
 //sys	GetNamedPipeHandleState(pipe Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) = GetNamedPipeHandleStateW
 //sys	SetNamedPipeHandleState(pipe Handle, state *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32) (err error) = SetNamedPipeHandleState
-//sys	readFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) = ReadFile
-//sys	writeFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) = WriteFile
+//sys	ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
+//sys	WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
 //sys	GetOverlappedResult(handle Handle, overlapped *Overlapped, done *uint32, wait bool) (err error)
 //sys	SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) [failretval==0xffffffff]
 //sys	CloseHandle(handle Handle) (err error)
@@ -198,7 +211,6 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	GetComputerName(buf *uint16, n *uint32) (err error) = GetComputerNameW
 //sys	GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) = GetComputerNameExW
 //sys	SetEndOfFile(handle Handle) (err error)
-//sys	SetFileValidData(handle Handle, validDataLength int64) (err error)
 //sys	GetSystemTimeAsFileTime(time *Filetime)
 //sys	GetSystemTimePreciseAsFileTime(time *Filetime)
 //sys	GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) [failretval==0xffffffff]
@@ -215,17 +227,13 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	OpenProcess(desiredAccess uint32, inheritHandle bool, processId uint32) (handle Handle, err error)
 //sys	ShellExecute(hwnd Handle, verb *uint16, file *uint16, args *uint16, cwd *uint16, showCmd int32) (err error) [failretval<=32] = shell32.ShellExecuteW
 //sys	GetWindowThreadProcessId(hwnd HWND, pid *uint32) (tid uint32, err error) = user32.GetWindowThreadProcessId
-//sys	LoadKeyboardLayout(name *uint16, flags uint32) (hkl Handle, err error) [failretval==0] = user32.LoadKeyboardLayoutW
-//sys	UnloadKeyboardLayout(hkl Handle) (err error) = user32.UnloadKeyboardLayout
-//sys	GetKeyboardLayout(tid uint32) (hkl Handle) = user32.GetKeyboardLayout
-//sys	ToUnicodeEx(vkey uint32, scancode uint32, keystate *byte, pwszBuff *uint16, cchBuff int32, flags uint32, hkl Handle) (ret int32) = user32.ToUnicodeEx
 //sys	GetShellWindow() (shellWindow HWND) = user32.GetShellWindow
 //sys	MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret int32, err error) [failretval==0] = user32.MessageBoxW
 //sys	ExitWindowsEx(flags uint32, reason uint32) (err error) = user32.ExitWindowsEx
 //sys	shGetKnownFolderPath(id *KNOWNFOLDERID, flags uint32, token Token, path **uint16) (ret error) = shell32.SHGetKnownFolderPath
 //sys	TerminateProcess(handle Handle, exitcode uint32) (err error)
 //sys	GetExitCodeProcess(handle Handle, exitcode *uint32) (err error)
-//sys	getStartupInfo(startupInfo *StartupInfo) = GetStartupInfoW
+//sys	GetStartupInfo(startupInfo *StartupInfo) (err error) = GetStartupInfoW
 //sys	GetProcessTimes(handle Handle, creationTime *Filetime, exitTime *Filetime, kernelTime *Filetime, userTime *Filetime) (err error)
 //sys	DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error)
 //sys	WaitForSingleObject(handle Handle, waitMilliseconds uint32) (event uint32, err error) [failretval==0xffffffff]
@@ -240,17 +248,15 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	FreeEnvironmentStrings(envs *uint16) (err error) = kernel32.FreeEnvironmentStringsW
 //sys	GetEnvironmentVariable(name *uint16, buffer *uint16, size uint32) (n uint32, err error) = kernel32.GetEnvironmentVariableW
 //sys	SetEnvironmentVariable(name *uint16, value *uint16) (err error) = kernel32.SetEnvironmentVariableW
-//sys	ExpandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) = kernel32.ExpandEnvironmentStringsW
 //sys	CreateEnvironmentBlock(block **uint16, token Token, inheritExisting bool) (err error) = userenv.CreateEnvironmentBlock
 //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
 //sys	getTickCount64() (ms uint64) = kernel32.GetTickCount64
-//sys   GetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error)
 //sys	SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error)
 //sys	GetFileAttributes(name *uint16) (attrs uint32, err error) [failretval==INVALID_FILE_ATTRIBUTES] = kernel32.GetFileAttributesW
 //sys	SetFileAttributes(name *uint16, attrs uint32) (err error) = kernel32.SetFileAttributesW
 //sys	GetFileAttributesEx(name *uint16, level uint32, info *byte) (err error) = kernel32.GetFileAttributesExW
 //sys	GetCommandLine() (cmd *uint16) = kernel32.GetCommandLineW
-//sys	commandLineToArgv(cmd *uint16, argc *int32) (argv **uint16, err error) [failretval==nil] = shell32.CommandLineToArgvW
+//sys	CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) [failretval==nil] = shell32.CommandLineToArgvW
 //sys	LocalFree(hmem Handle) (handle Handle, err error) [failretval!=0]
 //sys	LocalAlloc(flags uint32, length uint32) (ptr uintptr, err error)
 //sys	SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error)
@@ -268,11 +274,6 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	VirtualAlloc(address uintptr, size uintptr, alloctype uint32, protect uint32) (value uintptr, err error) = kernel32.VirtualAlloc
 //sys	VirtualFree(address uintptr, size uintptr, freetype uint32) (err error) = kernel32.VirtualFree
 //sys	VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect *uint32) (err error) = kernel32.VirtualProtect
-//sys	VirtualProtectEx(process Handle, address uintptr, size uintptr, newProtect uint32, oldProtect *uint32) (err error) = kernel32.VirtualProtectEx
-//sys	VirtualQuery(address uintptr, buffer *MemoryBasicInformation, length uintptr) (err error) = kernel32.VirtualQuery
-//sys	VirtualQueryEx(process Handle, address uintptr, buffer *MemoryBasicInformation, length uintptr) (err error) = kernel32.VirtualQueryEx
-//sys	ReadProcessMemory(process Handle, baseAddress uintptr, buffer *byte, size uintptr, numberOfBytesRead *uintptr) (err error) = kernel32.ReadProcessMemory
-//sys	WriteProcessMemory(process Handle, baseAddress uintptr, buffer *byte, size uintptr, numberOfBytesWritten *uintptr) (err error) = kernel32.WriteProcessMemory
 //sys	TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) = mswsock.TransmitFile
 //sys	ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) = kernel32.ReadDirectoryChangesW
 //sys	FindFirstChangeNotification(path string, watchSubtree bool, notifyFilter uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.FindFirstChangeNotificationW
@@ -309,22 +310,13 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	RegNotifyChangeKeyValue(key Handle, watchSubtree bool, notifyFilter uint32, event Handle, asynchronous bool) (regerrno error) = advapi32.RegNotifyChangeKeyValue
 //sys	GetCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId
 //sys	ProcessIdToSessionId(pid uint32, sessionid *uint32) (err error) = kernel32.ProcessIdToSessionId
-//sys	ClosePseudoConsole(console Handle) = kernel32.ClosePseudoConsole
-//sys	createPseudoConsole(size uint32, in Handle, out Handle, flags uint32, pconsole *Handle) (hr error) = kernel32.CreatePseudoConsole
 //sys	GetConsoleMode(console Handle, mode *uint32) (err error) = kernel32.GetConsoleMode
 //sys	SetConsoleMode(console Handle, mode uint32) (err error) = kernel32.SetConsoleMode
 //sys	GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) = kernel32.GetConsoleScreenBufferInfo
 //sys	setConsoleCursorPosition(console Handle, position uint32) (err error) = kernel32.SetConsoleCursorPosition
-//sys	GetConsoleCP() (cp uint32, err error) = kernel32.GetConsoleCP
-//sys	GetConsoleOutputCP() (cp uint32, err error) = kernel32.GetConsoleOutputCP
-//sys	SetConsoleCP(cp uint32) (err error) = kernel32.SetConsoleCP
-//sys	SetConsoleOutputCP(cp uint32) (err error) = kernel32.SetConsoleOutputCP
 //sys	WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW
 //sys	ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW
-//sys	resizePseudoConsole(pconsole Handle, size uint32) (hr error) = kernel32.ResizePseudoConsole
 //sys	CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.CreateToolhelp32Snapshot
-//sys	Module32First(snapshot Handle, moduleEntry *ModuleEntry32) (err error) = kernel32.Module32FirstW
-//sys	Module32Next(snapshot Handle, moduleEntry *ModuleEntry32) (err error) = kernel32.Module32NextW
 //sys	Process32First(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32FirstW
 //sys	Process32Next(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32NextW
 //sys	Thread32First(snapshot Handle, threadEntry *ThreadEntry32) (err error)
@@ -361,31 +353,8 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	SetProcessPriorityBoost(process Handle, disable bool) (err error) = kernel32.SetProcessPriorityBoost
 //sys	GetProcessWorkingSetSizeEx(hProcess Handle, lpMinimumWorkingSetSize *uintptr, lpMaximumWorkingSetSize *uintptr, flags *uint32)
 //sys	SetProcessWorkingSetSizeEx(hProcess Handle, dwMinimumWorkingSetSize uintptr, dwMaximumWorkingSetSize uintptr, flags uint32) (err error)
-//sys	ClearCommBreak(handle Handle) (err error)
-//sys	ClearCommError(handle Handle, lpErrors *uint32, lpStat *ComStat) (err error)
-//sys	EscapeCommFunction(handle Handle, dwFunc uint32) (err error)
-//sys	GetCommState(handle Handle, lpDCB *DCB) (err error)
-//sys	GetCommModemStatus(handle Handle, lpModemStat *uint32) (err error)
 //sys	GetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error)
-//sys	PurgeComm(handle Handle, dwFlags uint32) (err error)
-//sys	SetCommBreak(handle Handle) (err error)
-//sys	SetCommMask(handle Handle, dwEvtMask uint32) (err error)
-//sys	SetCommState(handle Handle, lpDCB *DCB) (err error)
 //sys	SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error)
-//sys	SetupComm(handle Handle, dwInQueue uint32, dwOutQueue uint32) (err error)
-//sys	WaitCommEvent(handle Handle, lpEvtMask *uint32, lpOverlapped *Overlapped) (err error)
-//sys	GetActiveProcessorCount(groupNumber uint16) (ret uint32)
-//sys	GetMaximumProcessorCount(groupNumber uint16) (ret uint32)
-//sys	EnumWindows(enumFunc uintptr, param unsafe.Pointer) (err error) = user32.EnumWindows
-//sys	EnumChildWindows(hwnd HWND, enumFunc uintptr, param unsafe.Pointer) = user32.EnumChildWindows
-//sys	GetClassName(hwnd HWND, className *uint16, maxCount int32) (copied int32, err error) = user32.GetClassNameW
-//sys	GetDesktopWindow() (hwnd HWND) = user32.GetDesktopWindow
-//sys	GetForegroundWindow() (hwnd HWND) = user32.GetForegroundWindow
-//sys	IsWindow(hwnd HWND) (isWindow bool) = user32.IsWindow
-//sys	IsWindowUnicode(hwnd HWND) (isUnicode bool) = user32.IsWindowUnicode
-//sys	IsWindowVisible(hwnd HWND) (isVisible bool) = user32.IsWindowVisible
-//sys	GetGUIThreadInfo(thread uint32, info *GUIThreadInfo) (err error) = user32.GetGUIThreadInfo
-//sys	GetLargePageMinimum() (size uintptr)
 
 // Volume Management Functions
 //sys	DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) = DefineDosDeviceW
@@ -427,19 +396,8 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	LoadResource(module Handle, resInfo Handle) (resData Handle, err error) = kernel32.LoadResource
 //sys	LockResource(resData Handle) (addr uintptr, err error) = kernel32.LockResource
 
-// Version APIs
-//sys	GetFileVersionInfoSize(filename string, zeroHandle *Handle) (bufSize uint32, err error) = version.GetFileVersionInfoSizeW
-//sys	GetFileVersionInfo(filename string, handle uint32, bufSize uint32, buffer unsafe.Pointer) (err error) = version.GetFileVersionInfoW
-//sys	VerQueryValue(block unsafe.Pointer, subBlock string, pointerToBufferPointer unsafe.Pointer, bufSize *uint32) (err error) = version.VerQueryValueW
-
 // Process Status API (PSAPI)
-//sys	enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses
-//sys	EnumProcessModules(process Handle, module *Handle, cb uint32, cbNeeded *uint32) (err error) = psapi.EnumProcessModules
-//sys	EnumProcessModulesEx(process Handle, module *Handle, cb uint32, cbNeeded *uint32, filterFlag uint32) (err error) = psapi.EnumProcessModulesEx
-//sys	GetModuleInformation(process Handle, module Handle, modinfo *ModuleInfo, cb uint32) (err error) = psapi.GetModuleInformation
-//sys	GetModuleFileNameEx(process Handle, module Handle, filename *uint16, size uint32) (err error) = psapi.GetModuleFileNameExW
-//sys	GetModuleBaseName(process Handle, module Handle, baseName *uint16, size uint32) (err error) = psapi.GetModuleBaseNameW
-//sys   QueryWorkingSetEx(process Handle, pv uintptr, cb uint32) (err error) = psapi.QueryWorkingSetEx
+//sys	EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses
 
 // NT Native APIs
 //sys	rtlNtStatusToDosErrorNoTeb(ntstatus NTStatus) (ret syscall.Errno) = ntdll.RtlNtStatusToDosErrorNoTeb
@@ -450,24 +408,11 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	RtlInitString(destinationString *NTString, sourceString *byte) = ntdll.RtlInitString
 //sys	NtCreateFile(handle *Handle, access uint32, oa *OBJECT_ATTRIBUTES, iosb *IO_STATUS_BLOCK, allocationSize *int64, attributes uint32, share uint32, disposition uint32, options uint32, eabuffer uintptr, ealength uint32) (ntstatus error) = ntdll.NtCreateFile
 //sys	NtCreateNamedPipeFile(pipe *Handle, access uint32, oa *OBJECT_ATTRIBUTES, iosb *IO_STATUS_BLOCK, share uint32, disposition uint32, options uint32, typ uint32, readMode uint32, completionMode uint32, maxInstances uint32, inboundQuota uint32, outputQuota uint32, timeout *int64) (ntstatus error) = ntdll.NtCreateNamedPipeFile
-//sys	NtSetInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32, class uint32) (ntstatus error) = ntdll.NtSetInformationFile
 //sys	RtlDosPathNameToNtPathName(dosName *uint16, ntName *NTUnicodeString, ntFileNamePart *uint16, relativeName *RTL_RELATIVE_NAME) (ntstatus error) = ntdll.RtlDosPathNameToNtPathName_U_WithStatus
 //sys	RtlDosPathNameToRelativeNtPathName(dosName *uint16, ntName *NTUnicodeString, ntFileNamePart *uint16, relativeName *RTL_RELATIVE_NAME) (ntstatus error) = ntdll.RtlDosPathNameToRelativeNtPathName_U_WithStatus
 //sys	RtlDefaultNpAcl(acl **ACL) (ntstatus error) = ntdll.RtlDefaultNpAcl
 //sys	NtQueryInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.Pointer, procInfoLen uint32, retLen *uint32) (ntstatus error) = ntdll.NtQueryInformationProcess
 //sys	NtSetInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.Pointer, procInfoLen uint32) (ntstatus error) = ntdll.NtSetInformationProcess
-//sys	NtQuerySystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32, retLen *uint32) (ntstatus error) = ntdll.NtQuerySystemInformation
-//sys	NtSetSystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32) (ntstatus error) = ntdll.NtSetSystemInformation
-//sys	RtlAddFunctionTable(functionTable *RUNTIME_FUNCTION, entryCount uint32, baseAddress uintptr) (ret bool) = ntdll.RtlAddFunctionTable
-//sys	RtlDeleteFunctionTable(functionTable *RUNTIME_FUNCTION) (ret bool) = ntdll.RtlDeleteFunctionTable
-
-// Desktop Window Manager API (Dwmapi)
-//sys	DwmGetWindowAttribute(hwnd HWND, attribute uint32, value unsafe.Pointer, size uint32) (ret error) = dwmapi.DwmGetWindowAttribute
-//sys	DwmSetWindowAttribute(hwnd HWND, attribute uint32, value unsafe.Pointer, size uint32) (ret error) = dwmapi.DwmSetWindowAttribute
-
-// Windows Multimedia API
-//sys TimeBeginPeriod (period uint32) (err error) [failretval != 0] = winmm.timeBeginPeriod
-//sys TimeEndPeriod (period uint32) (err error) [failretval != 0] = winmm.timeEndPeriod
 
 // syscall interface implementation for other packages
 
@@ -579,6 +524,12 @@ func Read(fd Handle, p []byte) (n int, err error) {
 		}
 		return 0, e
 	}
+	if raceenabled {
+		if done > 0 {
+			raceWriteRange(unsafe.Pointer(&p[0]), int(done))
+		}
+		raceAcquire(unsafe.Pointer(&ioSync))
+	}
 	return int(done), nil
 }
 
@@ -591,31 +542,12 @@ func Write(fd Handle, p []byte) (n int, err error) {
 	if e != nil {
 		return 0, e
 	}
+	if raceenabled && done > 0 {
+		raceReadRange(unsafe.Pointer(&p[0]), int(done))
+	}
 	return int(done), nil
 }
 
-func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
-	err := readFile(fd, p, done, overlapped)
-	if raceenabled {
-		if *done > 0 {
-			raceWriteRange(unsafe.Pointer(&p[0]), int(*done))
-		}
-		raceAcquire(unsafe.Pointer(&ioSync))
-	}
-	return err
-}
-
-func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	err := writeFile(fd, p, done, overlapped)
-	if raceenabled && *done > 0 {
-		raceReadRange(unsafe.Pointer(&p[0]), int(*done))
-	}
-	return err
-}
-
 var ioSync int64
 
 func Seek(fd Handle, offset int64, whence int) (newoffset int64, err error) {
@@ -654,6 +586,7 @@ var (
 
 func getStdHandle(stdhandle uint32) (fd Handle) {
 	r, _ := GetStdHandle(stdhandle)
+	CloseOnExec(r)
 	return r
 }
 
@@ -727,12 +660,20 @@ func DurationSinceBoot() time.Duration {
 }
 
 func Ftruncate(fd Handle, length int64) (err error) {
-	type _FILE_END_OF_FILE_INFO struct {
-		EndOfFile int64
+	curoffset, e := Seek(fd, 0, 1)
+	if e != nil {
+		return e
 	}
-	var info _FILE_END_OF_FILE_INFO
-	info.EndOfFile = length
-	return SetFileInformationByHandle(fd, FileEndOfFileInfo, (*byte)(unsafe.Pointer(&info)), uint32(unsafe.Sizeof(info)))
+	defer Seek(fd, curoffset, 0)
+	_, e = Seek(fd, length, 0)
+	if e != nil {
+		return e
+	}
+	e = SetEndOfFile(fd)
+	if e != nil {
+		return e
+	}
+	return nil
 }
 
 func Gettimeofday(tv *Timeval) (err error) {
@@ -770,7 +711,7 @@ func Utimes(path string, tv []Timeval) (err error) {
 	if e != nil {
 		return e
 	}
-	defer CloseHandle(h)
+	defer Close(h)
 	a := NsecToFiletime(tv[0].Nanoseconds())
 	w := NsecToFiletime(tv[1].Nanoseconds())
 	return SetFileTime(h, nil, &a, &w)
@@ -790,7 +731,7 @@ func UtimesNano(path string, ts []Timespec) (err error) {
 	if e != nil {
 		return e
 	}
-	defer CloseHandle(h)
+	defer Close(h)
 	a := NsecToFiletime(TimespecToNsec(ts[0]))
 	w := NsecToFiletime(TimespecToNsec(ts[1]))
 	return SetFileTime(h, nil, &a, &w)
@@ -848,9 +789,6 @@ const socket_error = uintptr(^uint32(0))
 //sys	WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup
 //sys	WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup
 //sys	WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl
-//sys	WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceBeginW
-//sys	WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceNextW
-//sys	WSALookupServiceEnd(handle Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceEnd
 //sys	socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket
 //sys	sendto(s Handle, buf []byte, flags int32, to unsafe.Pointer, tolen int32) (err error) [failretval==socket_error] = ws2_32.sendto
 //sys	recvfrom(s Handle, buf []byte, flags int32, from *RawSockaddrAny, fromlen *int32) (n int32, err error) [failretval==-1] = ws2_32.recvfrom
@@ -870,7 +808,6 @@ const socket_error = uintptr(^uint32(0))
 //sys	WSARecvFrom(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32,  from *RawSockaddrAny, fromlen *int32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSARecvFrom
 //sys	WSASendTo(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to *RawSockaddrAny, tolen int32,  overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSASendTo
 //sys	WSASocket(af int32, typ int32, protocol int32, protoInfo *WSAProtocolInfo, group uint32, flags uint32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.WSASocketW
-//sys	WSADuplicateSocket(s Handle, processID uint32, info *WSAProtocolInfo) (err error) [failretval!=0] = ws2_32.WSADuplicateSocketW
 //sys	GetHostByName(name string) (h *Hostent, err error) [failretval==nil] = ws2_32.gethostbyname
 //sys	GetServByName(name string, proto string) (s *Servent, err error) [failretval==nil] = ws2_32.getservbyname
 //sys	Ntohs(netshort uint16) (u uint16) = ws2_32.ntohs
@@ -888,12 +825,6 @@ const socket_error = uintptr(^uint32(0))
 //sys	GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) = iphlpapi.GetAdaptersAddresses
 //sys	GetACP() (acp uint32) = kernel32.GetACP
 //sys	MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) = kernel32.MultiByteToWideChar
-//sys	getBestInterfaceEx(sockaddr unsafe.Pointer, pdwBestIfIndex *uint32) (errcode error) = iphlpapi.GetBestInterfaceEx
-//sys   GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) = iphlpapi.GetIfEntry2Ex
-//sys   GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) = iphlpapi.GetUnicastIpAddressEntry
-//sys   NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyIpInterfaceChange
-//sys   NotifyUnicastIpAddressChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyUnicastIpAddressChange
-//sys   CancelMibChangeNotify2(notificationHandle Handle) (errcode error) = iphlpapi.CancelMibChangeNotify2
 
 // For testing: clients can set this flag to force
 // creation of IPv6 sockets to return EAFNOSUPPORT.
@@ -942,7 +873,9 @@ func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, int32, error) {
 	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
 }
 
@@ -962,7 +895,9 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, int32, error) {
 	p[0] = byte(sa.Port >> 8)
 	p[1] = byte(sa.Port)
 	sa.raw.Scope_id = sa.ZoneId
-	sa.raw.Addr = sa.Addr
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
 	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
 }
 
@@ -994,8 +929,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
 	if n > 0 {
 		sl += int32(n) + 1
 	}
-	if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
-		// Check sl > 3 so we don't change unnamed socket behavior.
+	if sa.raw.Path[0] == '@' {
 		sa.raw.Path[0] = 0
 		// Don't count trailing NUL for abstract address.
 		sl--
@@ -1004,32 +938,6 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
 	return unsafe.Pointer(&sa.raw), sl, nil
 }
 
-type RawSockaddrBth struct {
-	AddressFamily  [2]byte
-	BtAddr         [8]byte
-	ServiceClassId [16]byte
-	Port           [4]byte
-}
-
-type SockaddrBth struct {
-	BtAddr         uint64
-	ServiceClassId GUID
-	Port           uint32
-
-	raw RawSockaddrBth
-}
-
-func (sa *SockaddrBth) sockaddr() (unsafe.Pointer, int32, error) {
-	family := AF_BTH
-	sa.raw = RawSockaddrBth{
-		AddressFamily:  *(*[2]byte)(unsafe.Pointer(&family)),
-		BtAddr:         *(*[8]byte)(unsafe.Pointer(&sa.BtAddr)),
-		Port:           *(*[4]byte)(unsafe.Pointer(&sa.Port)),
-		ServiceClassId: *(*[16]byte)(unsafe.Pointer(&sa.ServiceClassId)),
-	}
-	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
-}
-
 func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
@@ -1053,7 +961,8 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
 		return sa, nil
 
 	case AF_INET:
@@ -1061,7 +970,9 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
 		sa := new(SockaddrInet4)
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 
 	case AF_INET6:
@@ -1070,7 +981,9 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
 		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
 		sa.Port = int(p[0])<<8 + int(p[1])
 		sa.ZoneId = pp.Scope_id
-		sa.Addr = pp.Addr
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
 		return sa, nil
 	}
 	return nil, syscall.EAFNOSUPPORT
@@ -1104,14 +1017,6 @@ func Connect(fd Handle, sa Sockaddr) (err error) {
 	return connect(fd, ptr, n)
 }
 
-func GetBestInterfaceEx(sa Sockaddr, pdwBestIfIndex *uint32) (err error) {
-	ptr, _, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return getBestInterfaceEx(ptr, pdwBestIfIndex)
-}
-
 func Getsockname(fd Handle) (sa Sockaddr, err error) {
 	var rsa RawSockaddrAny
 	l := int32(unsafe.Sizeof(rsa))
@@ -1139,13 +1044,9 @@ func Shutdown(fd Handle, how int) (err error) {
 }
 
 func WSASendto(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to Sockaddr, overlapped *Overlapped, croutine *byte) (err error) {
-	var rsa unsafe.Pointer
-	var l int32
-	if to != nil {
-		rsa, l, err = to.sockaddr()
-		if err != nil {
-			return err
-		}
+	rsa, l, err := to.sockaddr()
+	if err != nil {
+		return err
 	}
 	return WSASendTo(s, bufs, bufcnt, sent, flags, (*RawSockaddrAny)(unsafe.Pointer(rsa)), l, overlapped, croutine)
 }
@@ -1378,26 +1279,13 @@ func SetsockoptLinger(fd Handle, level, opt int, l *Linger) (err error) {
 func SetsockoptInet4Addr(fd Handle, level, opt int, value [4]byte) (err error) {
 	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&value[0])), 4)
 }
-
 func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) {
 	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(mreq)), int32(unsafe.Sizeof(*mreq)))
 }
-
 func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) {
 	return syscall.EWINDOWS
 }
 
-func EnumProcesses(processIds []uint32, bytesReturned *uint32) error {
-	// EnumProcesses syscall expects the size parameter to be in bytes, but the code generated with mksyscall uses
-	// the length of the processIds slice instead. Hence, this wrapper function is added to fix the discrepancy.
-	var p *uint32
-	if len(processIds) > 0 {
-		p = &processIds[0]
-	}
-	size := uint32(len(processIds) * 4)
-	return enumProcesses(p, size, bytesReturned)
-}
-
 func Getpid() (pid int) { return int(GetCurrentProcessId()) }
 
 func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) {
@@ -1657,11 +1545,6 @@ func SetConsoleCursorPosition(console Handle, position Coord) error {
 	return setConsoleCursorPosition(console, *((*uint32)(unsafe.Pointer(&position))))
 }
 
-func GetStartupInfo(startupInfo *StartupInfo) error {
-	getStartupInfo(startupInfo)
-	return nil
-}
-
 func (s NTStatus) Errno() syscall.Errno {
 	return rtlNtStatusToDosErrorNoTeb(s)
 }
@@ -1685,23 +1568,23 @@ func (s NTStatus) Error() string {
 // do not use NTUnicodeString, and instead UTF16PtrFromString should be used for
 // the more common *uint16 string type.
 func NewNTUnicodeString(s string) (*NTUnicodeString, error) {
-	s16, err := UTF16FromString(s)
+	var u NTUnicodeString
+	s16, err := UTF16PtrFromString(s)
 	if err != nil {
 		return nil, err
 	}
-	n := uint16(len(s16) * 2)
-	return &NTUnicodeString{
-		Length:        n - 2, // subtract 2 bytes for the NULL terminator
-		MaximumLength: n,
-		Buffer:        &s16[0],
-	}, nil
+	RtlInitUnicodeString(&u, s16)
+	return &u, nil
 }
 
 // Slice returns a uint16 slice that aliases the data in the NTUnicodeString.
 func (s *NTUnicodeString) Slice() []uint16 {
-	// Note: this rounds the length down, if it happens
-	// to (incorrectly) be odd. Probably safer than rounding up.
-	return unsafe.Slice(s.Buffer, s.MaximumLength/2)[:s.Length/2]
+	var slice []uint16
+	hdr := (*unsafeheader.Slice)(unsafe.Pointer(&slice))
+	hdr.Data = unsafe.Pointer(s.Buffer)
+	hdr.Len = int(s.Length)
+	hdr.Cap = int(s.MaximumLength)
+	return slice
 }
 
 func (s *NTUnicodeString) String() string {
@@ -1724,8 +1607,12 @@ func NewNTString(s string) (*NTString, error) {
 
 // Slice returns a byte slice that aliases the data in the NTString.
 func (s *NTString) Slice() []byte {
-	slice := unsafe.Slice(s.Buffer, s.MaximumLength)
-	return slice[:s.Length]
+	var slice []byte
+	hdr := (*unsafeheader.Slice)(unsafe.Pointer(&slice))
+	hdr.Data = unsafe.Pointer(s.Buffer)
+	hdr.Len = int(s.Length)
+	hdr.Cap = int(s.MaximumLength)
+	return slice
 }
 
 func (s *NTString) String() string {
@@ -1777,158 +1664,9 @@ func LoadResourceData(module, resInfo Handle) (data []byte, err error) {
 	if err != nil {
 		return
 	}
-	data = unsafe.Slice((*byte)(unsafe.Pointer(ptr)), size)
+	h := (*unsafeheader.Slice)(unsafe.Pointer(&data))
+	h.Data = unsafe.Pointer(ptr)
+	h.Len = int(size)
+	h.Cap = int(size)
 	return
 }
-
-// PSAPI_WORKING_SET_EX_BLOCK contains extended working set information for a page.
-type PSAPI_WORKING_SET_EX_BLOCK uint64
-
-// Valid returns the validity of this page.
-// If this bit is 1, the subsequent members are valid; otherwise they should be ignored.
-func (b PSAPI_WORKING_SET_EX_BLOCK) Valid() bool {
-	return (b & 1) == 1
-}
-
-// ShareCount is the number of processes that share this page. The maximum value of this member is 7.
-func (b PSAPI_WORKING_SET_EX_BLOCK) ShareCount() uint64 {
-	return b.intField(1, 3)
-}
-
-// Win32Protection is the memory protection attributes of the page. For a list of values, see
-// https://docs.microsoft.com/en-us/windows/win32/memory/memory-protection-constants
-func (b PSAPI_WORKING_SET_EX_BLOCK) Win32Protection() uint64 {
-	return b.intField(4, 11)
-}
-
-// Shared returns the shared status of this page.
-// If this bit is 1, the page can be shared.
-func (b PSAPI_WORKING_SET_EX_BLOCK) Shared() bool {
-	return (b & (1 << 15)) == 1
-}
-
-// Node is the NUMA node. The maximum value of this member is 63.
-func (b PSAPI_WORKING_SET_EX_BLOCK) Node() uint64 {
-	return b.intField(16, 6)
-}
-
-// Locked returns the locked status of this page.
-// If this bit is 1, the virtual page is locked in physical memory.
-func (b PSAPI_WORKING_SET_EX_BLOCK) Locked() bool {
-	return (b & (1 << 22)) == 1
-}
-
-// LargePage returns the large page status of this page.
-// If this bit is 1, the page is a large page.
-func (b PSAPI_WORKING_SET_EX_BLOCK) LargePage() bool {
-	return (b & (1 << 23)) == 1
-}
-
-// Bad returns the bad status of this page.
-// If this bit is 1, the page is has been reported as bad.
-func (b PSAPI_WORKING_SET_EX_BLOCK) Bad() bool {
-	return (b & (1 << 31)) == 1
-}
-
-// intField extracts an integer field in the PSAPI_WORKING_SET_EX_BLOCK union.
-func (b PSAPI_WORKING_SET_EX_BLOCK) intField(start, length int) uint64 {
-	var mask PSAPI_WORKING_SET_EX_BLOCK
-	for pos := start; pos < start+length; pos++ {
-		mask |= (1 << pos)
-	}
-
-	masked := b & mask
-	return uint64(masked >> start)
-}
-
-// PSAPI_WORKING_SET_EX_INFORMATION contains extended working set information for a process.
-type PSAPI_WORKING_SET_EX_INFORMATION struct {
-	// The virtual address.
-	VirtualAddress Pointer
-	// A PSAPI_WORKING_SET_EX_BLOCK union that indicates the attributes of the page at VirtualAddress.
-	VirtualAttributes PSAPI_WORKING_SET_EX_BLOCK
-}
-
-// CreatePseudoConsole creates a windows pseudo console.
-func CreatePseudoConsole(size Coord, in Handle, out Handle, flags uint32, pconsole *Handle) error {
-	// We need this wrapper to manually cast Coord to uint32. The autogenerated wrappers only
-	// accept arguments that can be casted to uintptr, and Coord can't.
-	return createPseudoConsole(*((*uint32)(unsafe.Pointer(&size))), in, out, flags, pconsole)
-}
-
-// ResizePseudoConsole resizes the internal buffers of the pseudo console to the width and height specified in `size`.
-func ResizePseudoConsole(pconsole Handle, size Coord) error {
-	// We need this wrapper to manually cast Coord to uint32. The autogenerated wrappers only
-	// accept arguments that can be casted to uintptr, and Coord can't.
-	return resizePseudoConsole(pconsole, *((*uint32)(unsafe.Pointer(&size))))
-}
-
-// DCB constants. See https://learn.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-dcb.
-const (
-	CBR_110    = 110
-	CBR_300    = 300
-	CBR_600    = 600
-	CBR_1200   = 1200
-	CBR_2400   = 2400
-	CBR_4800   = 4800
-	CBR_9600   = 9600
-	CBR_14400  = 14400
-	CBR_19200  = 19200
-	CBR_38400  = 38400
-	CBR_57600  = 57600
-	CBR_115200 = 115200
-	CBR_128000 = 128000
-	CBR_256000 = 256000
-
-	DTR_CONTROL_DISABLE   = 0x00000000
-	DTR_CONTROL_ENABLE    = 0x00000010
-	DTR_CONTROL_HANDSHAKE = 0x00000020
-
-	RTS_CONTROL_DISABLE   = 0x00000000
-	RTS_CONTROL_ENABLE    = 0x00001000
-	RTS_CONTROL_HANDSHAKE = 0x00002000
-	RTS_CONTROL_TOGGLE    = 0x00003000
-
-	NOPARITY    = 0
-	ODDPARITY   = 1
-	EVENPARITY  = 2
-	MARKPARITY  = 3
-	SPACEPARITY = 4
-
-	ONESTOPBIT   = 0
-	ONE5STOPBITS = 1
-	TWOSTOPBITS  = 2
-)
-
-// EscapeCommFunction constants. See https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-escapecommfunction.
-const (
-	SETXOFF  = 1
-	SETXON   = 2
-	SETRTS   = 3
-	CLRRTS   = 4
-	SETDTR   = 5
-	CLRDTR   = 6
-	SETBREAK = 8
-	CLRBREAK = 9
-)
-
-// PurgeComm constants. See https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-purgecomm.
-const (
-	PURGE_TXABORT = 0x0001
-	PURGE_RXABORT = 0x0002
-	PURGE_TXCLEAR = 0x0004
-	PURGE_RXCLEAR = 0x0008
-)
-
-// SetCommMask constants. See https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setcommmask.
-const (
-	EV_RXCHAR  = 0x0001
-	EV_RXFLAG  = 0x0002
-	EV_TXEMPTY = 0x0004
-	EV_CTS     = 0x0008
-	EV_DSR     = 0x0010
-	EV_RLSD    = 0x0020
-	EV_BREAK   = 0x0040
-	EV_ERR     = 0x0080
-	EV_RING    = 0x0100
-)
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index 958bcf4..17f0331 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -66,21 +66,9 @@ var signals = [...]string{
 }
 
 const (
-	FILE_READ_DATA        = 0x00000001
-	FILE_READ_ATTRIBUTES  = 0x00000080
-	FILE_READ_EA          = 0x00000008
-	FILE_WRITE_DATA       = 0x00000002
-	FILE_WRITE_ATTRIBUTES = 0x00000100
-	FILE_WRITE_EA         = 0x00000010
+	FILE_LIST_DIRECTORY   = 0x00000001
 	FILE_APPEND_DATA      = 0x00000004
-	FILE_EXECUTE          = 0x00000020
-
-	FILE_GENERIC_READ    = STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE
-	FILE_GENERIC_WRITE   = STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE
-	FILE_GENERIC_EXECUTE = STANDARD_RIGHTS_EXECUTE | FILE_READ_ATTRIBUTES | FILE_EXECUTE | SYNCHRONIZE
-
-	FILE_LIST_DIRECTORY = 0x00000001
-	FILE_TRAVERSE       = 0x00000020
+	FILE_WRITE_ATTRIBUTES = 0x00000100
 
 	FILE_SHARE_READ   = 0x00000001
 	FILE_SHARE_WRITE  = 0x00000002
@@ -156,14 +144,8 @@ const (
 	MAX_PATH      = 260
 	MAX_LONG_PATH = 32768
 
-	MAX_MODULE_NAME32 = 255
-
 	MAX_COMPUTERNAME_LENGTH = 15
 
-	MAX_DHCPV6_DUID_LENGTH = 130
-
-	MAX_DNS_SUFFIX_STRING_LENGTH = 256
-
 	TIME_ZONE_ID_UNKNOWN  = 0
 	TIME_ZONE_ID_STANDARD = 1
 
@@ -176,7 +158,6 @@ const (
 	WAIT_FAILED    = 0xFFFFFFFF
 
 	// Access rights for process.
-	PROCESS_ALL_ACCESS                = 0xFFFF
 	PROCESS_CREATE_PROCESS            = 0x0080
 	PROCESS_CREATE_THREAD             = 0x0002
 	PROCESS_DUP_HANDLE                = 0x0040
@@ -248,7 +229,6 @@ const (
 	PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY = 0x00020007
 	PROC_THREAD_ATTRIBUTE_UMS_THREAD        = 0x00030006
 	PROC_THREAD_ATTRIBUTE_PROTECTION_LEVEL  = 0x0002000b
-	PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE     = 0x00020016
 )
 
 const (
@@ -262,14 +242,6 @@ const (
 	TH32CS_INHERIT      = 0x80000000
 )
 
-const (
-	// flags for EnumProcessModulesEx
-	LIST_MODULES_32BIT   = 0x01
-	LIST_MODULES_64BIT   = 0x02
-	LIST_MODULES_ALL     = 0x03
-	LIST_MODULES_DEFAULT = 0x00
-)
-
 const (
 	// filters for ReadDirectoryChangesW and FindFirstChangeNotificationW
 	FILE_NOTIFY_CHANGE_FILE_NAME   = 0x001
@@ -944,8 +916,8 @@ type StartupInfoEx struct {
 type ProcThreadAttributeList struct{}
 
 type ProcThreadAttributeListContainer struct {
-	data     *ProcThreadAttributeList
-	pointers []unsafe.Pointer
+	data            *ProcThreadAttributeList
+	heapAllocations []uintptr
 }
 
 type ProcessInformation struct {
@@ -978,21 +950,6 @@ type ThreadEntry32 struct {
 	Flags          uint32
 }
 
-type ModuleEntry32 struct {
-	Size         uint32
-	ModuleID     uint32
-	ProcessID    uint32
-	GlblcntUsage uint32
-	ProccntUsage uint32
-	ModBaseAddr  uintptr
-	ModBaseSize  uint32
-	ModuleHandle Handle
-	Module       [MAX_MODULE_NAME32 + 1]uint16
-	ExePath      [MAX_PATH]uint16
-}
-
-const SizeofModuleEntry32 = unsafe.Sizeof(ModuleEntry32{})
-
 type Systemtime struct {
 	Year         uint16
 	Month        uint16
@@ -1061,7 +1018,6 @@ const (
 	SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
 	SIO_KEEPALIVE_VALS                 = IOC_IN | IOC_VENDOR | 4
 	SIO_UDP_CONNRESET                  = IOC_IN | IOC_VENDOR | 12
-	SIO_UDP_NETRESET                   = IOC_IN | IOC_VENDOR | 15
 
 	// cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460
 
@@ -1074,7 +1030,6 @@ const (
 	IP_ADD_MEMBERSHIP  = 0xc
 	IP_DROP_MEMBERSHIP = 0xd
 	IP_PKTINFO         = 0x13
-	IP_MTU_DISCOVER    = 0x47
 
 	IPV6_V6ONLY         = 0x1b
 	IPV6_UNICAST_HOPS   = 0x4
@@ -1084,7 +1039,6 @@ const (
 	IPV6_JOIN_GROUP     = 0xc
 	IPV6_LEAVE_GROUP    = 0xd
 	IPV6_PKTINFO        = 0x13
-	IPV6_MTU_DISCOVER   = 0x47
 
 	MSG_OOB       = 0x1
 	MSG_PEEK      = 0x2
@@ -1098,33 +1052,7 @@ const (
 
 	SOMAXCONN = 0x7fffffff
 
-	TCP_NODELAY                    = 1
-	TCP_EXPEDITED_1122             = 2
-	TCP_KEEPALIVE                  = 3
-	TCP_MAXSEG                     = 4
-	TCP_MAXRT                      = 5
-	TCP_STDURG                     = 6
-	TCP_NOURG                      = 7
-	TCP_ATMARK                     = 8
-	TCP_NOSYNRETRIES               = 9
-	TCP_TIMESTAMPS                 = 10
-	TCP_OFFLOAD_PREFERENCE         = 11
-	TCP_CONGESTION_ALGORITHM       = 12
-	TCP_DELAY_FIN_ACK              = 13
-	TCP_MAXRTMS                    = 14
-	TCP_FASTOPEN                   = 15
-	TCP_KEEPCNT                    = 16
-	TCP_KEEPIDLE                   = TCP_KEEPALIVE
-	TCP_KEEPINTVL                  = 17
-	TCP_FAIL_CONNECT_ON_ICMP_ERROR = 18
-	TCP_ICMP_ERROR_INFO            = 19
-
-	UDP_NOCHECKSUM              = 1
-	UDP_SEND_MSG_SIZE           = 2
-	UDP_RECV_MAX_COALESCED_SIZE = 3
-	UDP_CHECKSUM_COVERAGE       = 20
-
-	UDP_COALESCED_INFO = 3
+	TCP_NODELAY = 1
 
 	SHUT_RD   = 0
 	SHUT_WR   = 1
@@ -1134,15 +1062,6 @@ const (
 	WSASYS_STATUS_LEN  = 128
 )
 
-// enum PMTUD_STATE from ws2ipdef.h
-const (
-	IP_PMTUDISC_NOT_SET = 0
-	IP_PMTUDISC_DO      = 1
-	IP_PMTUDISC_DONT    = 2
-	IP_PMTUDISC_PROBE   = 3
-	IP_PMTUDISC_MAX     = 4
-)
-
 type WSABuf struct {
 	Len uint32
 	Buf *byte
@@ -1157,22 +1076,6 @@ type WSAMsg struct {
 	Flags       uint32
 }
 
-type WSACMSGHDR struct {
-	Len   uintptr
-	Level int32
-	Type  int32
-}
-
-type IN_PKTINFO struct {
-	Addr    [4]byte
-	Ifindex uint32
-}
-
-type IN6_PKTINFO struct {
-	Addr    [16]byte
-	Ifindex uint32
-}
-
 // Flags for WSASocket
 const (
 	WSA_FLAG_OVERLAPPED             = 0x01
@@ -1299,51 +1202,6 @@ const (
 	DnsSectionAdditional = 0x0003
 )
 
-const (
-	// flags of WSALookupService
-	LUP_DEEP                = 0x0001
-	LUP_CONTAINERS          = 0x0002
-	LUP_NOCONTAINERS        = 0x0004
-	LUP_NEAREST             = 0x0008
-	LUP_RETURN_NAME         = 0x0010
-	LUP_RETURN_TYPE         = 0x0020
-	LUP_RETURN_VERSION      = 0x0040
-	LUP_RETURN_COMMENT      = 0x0080
-	LUP_RETURN_ADDR         = 0x0100
-	LUP_RETURN_BLOB         = 0x0200
-	LUP_RETURN_ALIASES      = 0x0400
-	LUP_RETURN_QUERY_STRING = 0x0800
-	LUP_RETURN_ALL          = 0x0FF0
-	LUP_RES_SERVICE         = 0x8000
-
-	LUP_FLUSHCACHE    = 0x1000
-	LUP_FLUSHPREVIOUS = 0x2000
-
-	LUP_NON_AUTHORITATIVE      = 0x4000
-	LUP_SECURE                 = 0x8000
-	LUP_RETURN_PREFERRED_NAMES = 0x10000
-	LUP_DNS_ONLY               = 0x20000
-
-	LUP_ADDRCONFIG           = 0x100000
-	LUP_DUAL_ADDR            = 0x200000
-	LUP_FILESERVER           = 0x400000
-	LUP_DISABLE_IDN_ENCODING = 0x00800000
-	LUP_API_ANSI             = 0x01000000
-
-	LUP_RESOLUTION_HANDLE = 0x80000000
-)
-
-const (
-	// values of WSAQUERYSET's namespace
-	NS_ALL       = 0
-	NS_DNS       = 12
-	NS_NLA       = 15
-	NS_BTH       = 16
-	NS_EMAIL     = 37
-	NS_PNRPNAME  = 38
-	NS_PNRPCLOUD = 39
-)
-
 type DNSSRVData struct {
 	Target   *uint16
 	Priority uint16
@@ -1923,53 +1781,7 @@ type reparseDataBuffer struct {
 }
 
 const (
-	FSCTL_CREATE_OR_GET_OBJECT_ID             = 0x0900C0
-	FSCTL_DELETE_OBJECT_ID                    = 0x0900A0
-	FSCTL_DELETE_REPARSE_POINT                = 0x0900AC
-	FSCTL_DUPLICATE_EXTENTS_TO_FILE           = 0x098344
-	FSCTL_DUPLICATE_EXTENTS_TO_FILE_EX        = 0x0983E8
-	FSCTL_FILESYSTEM_GET_STATISTICS           = 0x090060
-	FSCTL_FILE_LEVEL_TRIM                     = 0x098208
-	FSCTL_FIND_FILES_BY_SID                   = 0x09008F
-	FSCTL_GET_COMPRESSION                     = 0x09003C
-	FSCTL_GET_INTEGRITY_INFORMATION           = 0x09027C
-	FSCTL_GET_NTFS_VOLUME_DATA                = 0x090064
-	FSCTL_GET_REFS_VOLUME_DATA                = 0x0902D8
-	FSCTL_GET_OBJECT_ID                       = 0x09009C
-	FSCTL_GET_REPARSE_POINT                   = 0x0900A8
-	FSCTL_GET_RETRIEVAL_POINTER_COUNT         = 0x09042B
-	FSCTL_GET_RETRIEVAL_POINTERS              = 0x090073
-	FSCTL_GET_RETRIEVAL_POINTERS_AND_REFCOUNT = 0x0903D3
-	FSCTL_IS_PATHNAME_VALID                   = 0x09002C
-	FSCTL_LMR_SET_LINK_TRACKING_INFORMATION   = 0x1400EC
-	FSCTL_MARK_HANDLE                         = 0x0900FC
-	FSCTL_OFFLOAD_READ                        = 0x094264
-	FSCTL_OFFLOAD_WRITE                       = 0x098268
-	FSCTL_PIPE_PEEK                           = 0x11400C
-	FSCTL_PIPE_TRANSCEIVE                     = 0x11C017
-	FSCTL_PIPE_WAIT                           = 0x110018
-	FSCTL_QUERY_ALLOCATED_RANGES              = 0x0940CF
-	FSCTL_QUERY_FAT_BPB                       = 0x090058
-	FSCTL_QUERY_FILE_REGIONS                  = 0x090284
-	FSCTL_QUERY_ON_DISK_VOLUME_INFO           = 0x09013C
-	FSCTL_QUERY_SPARING_INFO                  = 0x090138
-	FSCTL_READ_FILE_USN_DATA                  = 0x0900EB
-	FSCTL_RECALL_FILE                         = 0x090117
-	FSCTL_REFS_STREAM_SNAPSHOT_MANAGEMENT     = 0x090440
-	FSCTL_SET_COMPRESSION                     = 0x09C040
-	FSCTL_SET_DEFECT_MANAGEMENT               = 0x098134
-	FSCTL_SET_ENCRYPTION                      = 0x0900D7
-	FSCTL_SET_INTEGRITY_INFORMATION           = 0x09C280
-	FSCTL_SET_INTEGRITY_INFORMATION_EX        = 0x090380
-	FSCTL_SET_OBJECT_ID                       = 0x090098
-	FSCTL_SET_OBJECT_ID_EXTENDED              = 0x0900BC
-	FSCTL_SET_REPARSE_POINT                   = 0x0900A4
-	FSCTL_SET_SPARSE                          = 0x0900C4
-	FSCTL_SET_ZERO_DATA                       = 0x0980C8
-	FSCTL_SET_ZERO_ON_DEALLOCATION            = 0x090194
-	FSCTL_SIS_COPYFILE                        = 0x090100
-	FSCTL_WRITE_USN_CLOSE_RECORD              = 0x0900EF
-
+	FSCTL_GET_REPARSE_POINT          = 0x900A8
 	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024
 	IO_REPARSE_TAG_MOUNT_POINT       = 0xA0000003
 	IO_REPARSE_TAG_SYMLINK           = 0xA000000C
@@ -2032,21 +1844,7 @@ const (
 	MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20
 )
 
-// Flags for GetAdaptersAddresses, see
-// https://learn.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getadaptersaddresses.
-const (
-	GAA_FLAG_SKIP_UNICAST                = 0x1
-	GAA_FLAG_SKIP_ANYCAST                = 0x2
-	GAA_FLAG_SKIP_MULTICAST              = 0x4
-	GAA_FLAG_SKIP_DNS_SERVER             = 0x8
-	GAA_FLAG_INCLUDE_PREFIX              = 0x10
-	GAA_FLAG_SKIP_FRIENDLY_NAME          = 0x20
-	GAA_FLAG_INCLUDE_WINS_INFO           = 0x40
-	GAA_FLAG_INCLUDE_GATEWAYS            = 0x80
-	GAA_FLAG_INCLUDE_ALL_INTERFACES      = 0x100
-	GAA_FLAG_INCLUDE_ALL_COMPARTMENTS    = 0x200
-	GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER = 0x400
-)
+const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
 
 const (
 	IF_TYPE_OTHER              = 1
@@ -2060,50 +1858,6 @@ const (
 	IF_TYPE_IEEE1394           = 144
 )
 
-// Enum NL_PREFIX_ORIGIN for [IpAdapterUnicastAddress], see
-// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_prefix_origin
-const (
-	IpPrefixOriginOther               = 0
-	IpPrefixOriginManual              = 1
-	IpPrefixOriginWellKnown           = 2
-	IpPrefixOriginDhcp                = 3
-	IpPrefixOriginRouterAdvertisement = 4
-	IpPrefixOriginUnchanged           = 1 << 4
-)
-
-// Enum NL_SUFFIX_ORIGIN for [IpAdapterUnicastAddress], see
-// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_suffix_origin
-const (
-	NlsoOther                      = 0
-	NlsoManual                     = 1
-	NlsoWellKnown                  = 2
-	NlsoDhcp                       = 3
-	NlsoLinkLayerAddress           = 4
-	NlsoRandom                     = 5
-	IpSuffixOriginOther            = 0
-	IpSuffixOriginManual           = 1
-	IpSuffixOriginWellKnown        = 2
-	IpSuffixOriginDhcp             = 3
-	IpSuffixOriginLinkLayerAddress = 4
-	IpSuffixOriginRandom           = 5
-	IpSuffixOriginUnchanged        = 1 << 4
-)
-
-// Enum NL_DAD_STATE for [IpAdapterUnicastAddress], see
-// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_dad_state
-const (
-	NldsInvalid          = 0
-	NldsTentative        = 1
-	NldsDuplicate        = 2
-	NldsDeprecated       = 3
-	NldsPreferred        = 4
-	IpDadStateInvalid    = 0
-	IpDadStateTentative  = 1
-	IpDadStateDuplicate  = 2
-	IpDadStateDeprecated = 3
-	IpDadStatePreferred  = 4
-)
-
 type SocketAddress struct {
 	Sockaddr       *syscall.RawSockaddrAny
 	SockaddrLength int32
@@ -2163,62 +1917,27 @@ type IpAdapterPrefix struct {
 }
 
 type IpAdapterAddresses struct {
-	Length                 uint32
-	IfIndex                uint32
-	Next                   *IpAdapterAddresses
-	AdapterName            *byte
-	FirstUnicastAddress    *IpAdapterUnicastAddress
-	FirstAnycastAddress    *IpAdapterAnycastAddress
-	FirstMulticastAddress  *IpAdapterMulticastAddress
-	FirstDnsServerAddress  *IpAdapterDnsServerAdapter
-	DnsSuffix              *uint16
-	Description            *uint16
-	FriendlyName           *uint16
-	PhysicalAddress        [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
-	PhysicalAddressLength  uint32
-	Flags                  uint32
-	Mtu                    uint32
-	IfType                 uint32
-	OperStatus             uint32
-	Ipv6IfIndex            uint32
-	ZoneIndices            [16]uint32
-	FirstPrefix            *IpAdapterPrefix
-	TransmitLinkSpeed      uint64
-	ReceiveLinkSpeed       uint64
-	FirstWinsServerAddress *IpAdapterWinsServerAddress
-	FirstGatewayAddress    *IpAdapterGatewayAddress
-	Ipv4Metric             uint32
-	Ipv6Metric             uint32
-	Luid                   uint64
-	Dhcpv4Server           SocketAddress
-	CompartmentId          uint32
-	NetworkGuid            GUID
-	ConnectionType         uint32
-	TunnelType             uint32
-	Dhcpv6Server           SocketAddress
-	Dhcpv6ClientDuid       [MAX_DHCPV6_DUID_LENGTH]byte
-	Dhcpv6ClientDuidLength uint32
-	Dhcpv6Iaid             uint32
-	FirstDnsSuffix         *IpAdapterDNSSuffix
-}
-
-type IpAdapterWinsServerAddress struct {
-	Length   uint32
-	Reserved uint32
-	Next     *IpAdapterWinsServerAddress
-	Address  SocketAddress
-}
-
-type IpAdapterGatewayAddress struct {
-	Length   uint32
-	Reserved uint32
-	Next     *IpAdapterGatewayAddress
-	Address  SocketAddress
-}
-
-type IpAdapterDNSSuffix struct {
-	Next   *IpAdapterDNSSuffix
-	String [MAX_DNS_SUFFIX_STRING_LENGTH]uint16
+	Length                uint32
+	IfIndex               uint32
+	Next                  *IpAdapterAddresses
+	AdapterName           *byte
+	FirstUnicastAddress   *IpAdapterUnicastAddress
+	FirstAnycastAddress   *IpAdapterAnycastAddress
+	FirstMulticastAddress *IpAdapterMulticastAddress
+	FirstDnsServerAddress *IpAdapterDnsServerAdapter
+	DnsSuffix             *uint16
+	Description           *uint16
+	FriendlyName          *uint16
+	PhysicalAddress       [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
+	PhysicalAddressLength uint32
+	Flags                 uint32
+	Mtu                   uint32
+	IfType                uint32
+	OperStatus            uint32
+	Ipv6IfIndex           uint32
+	ZoneIndices           [16]uint32
+	FirstPrefix           *IpAdapterPrefix
+	/* more fields might be present here. */
 }
 
 const (
@@ -2231,132 +1950,6 @@ const (
 	IfOperStatusLowerLayerDown = 7
 )
 
-const (
-	IF_MAX_PHYS_ADDRESS_LENGTH = 32
-	IF_MAX_STRING_SIZE         = 256
-)
-
-// MIB_IF_ENTRY_LEVEL enumeration from netioapi.h or
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/nf-netioapi-getifentry2ex.
-const (
-	MibIfEntryNormal                  = 0
-	MibIfEntryNormalWithoutStatistics = 2
-)
-
-// MIB_NOTIFICATION_TYPE enumeration from netioapi.h or
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ne-netioapi-mib_notification_type.
-const (
-	MibParameterNotification = 0
-	MibAddInstance           = 1
-	MibDeleteInstance        = 2
-	MibInitialNotification   = 3
-)
-
-// MibIfRow2 stores information about a particular interface. See
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_if_row2.
-type MibIfRow2 struct {
-	InterfaceLuid               uint64
-	InterfaceIndex              uint32
-	InterfaceGuid               GUID
-	Alias                       [IF_MAX_STRING_SIZE + 1]uint16
-	Description                 [IF_MAX_STRING_SIZE + 1]uint16
-	PhysicalAddressLength       uint32
-	PhysicalAddress             [IF_MAX_PHYS_ADDRESS_LENGTH]uint8
-	PermanentPhysicalAddress    [IF_MAX_PHYS_ADDRESS_LENGTH]uint8
-	Mtu                         uint32
-	Type                        uint32
-	TunnelType                  uint32
-	MediaType                   uint32
-	PhysicalMediumType          uint32
-	AccessType                  uint32
-	DirectionType               uint32
-	InterfaceAndOperStatusFlags uint8
-	OperStatus                  uint32
-	AdminStatus                 uint32
-	MediaConnectState           uint32
-	NetworkGuid                 GUID
-	ConnectionType              uint32
-	TransmitLinkSpeed           uint64
-	ReceiveLinkSpeed            uint64
-	InOctets                    uint64
-	InUcastPkts                 uint64
-	InNUcastPkts                uint64
-	InDiscards                  uint64
-	InErrors                    uint64
-	InUnknownProtos             uint64
-	InUcastOctets               uint64
-	InMulticastOctets           uint64
-	InBroadcastOctets           uint64
-	OutOctets                   uint64
-	OutUcastPkts                uint64
-	OutNUcastPkts               uint64
-	OutDiscards                 uint64
-	OutErrors                   uint64
-	OutUcastOctets              uint64
-	OutMulticastOctets          uint64
-	OutBroadcastOctets          uint64
-	OutQLen                     uint64
-}
-
-// MIB_UNICASTIPADDRESS_ROW stores information about a unicast IP address. See
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_unicastipaddress_row.
-type MibUnicastIpAddressRow struct {
-	Address            RawSockaddrInet6 // SOCKADDR_INET union
-	InterfaceLuid      uint64
-	InterfaceIndex     uint32
-	PrefixOrigin       uint32
-	SuffixOrigin       uint32
-	ValidLifetime      uint32
-	PreferredLifetime  uint32
-	OnLinkPrefixLength uint8
-	SkipAsSource       uint8
-	DadState           uint32
-	ScopeId            uint32
-	CreationTimeStamp  Filetime
-}
-
-const ScopeLevelCount = 16
-
-// MIB_IPINTERFACE_ROW stores interface management information for a particular IP address family on a network interface.
-// See https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_ipinterface_row.
-type MibIpInterfaceRow struct {
-	Family                               uint16
-	InterfaceLuid                        uint64
-	InterfaceIndex                       uint32
-	MaxReassemblySize                    uint32
-	InterfaceIdentifier                  uint64
-	MinRouterAdvertisementInterval       uint32
-	MaxRouterAdvertisementInterval       uint32
-	AdvertisingEnabled                   uint8
-	ForwardingEnabled                    uint8
-	WeakHostSend                         uint8
-	WeakHostReceive                      uint8
-	UseAutomaticMetric                   uint8
-	UseNeighborUnreachabilityDetection   uint8
-	ManagedAddressConfigurationSupported uint8
-	OtherStatefulConfigurationSupported  uint8
-	AdvertiseDefaultRoute                uint8
-	RouterDiscoveryBehavior              uint32
-	DadTransmits                         uint32
-	BaseReachableTime                    uint32
-	RetransmitTime                       uint32
-	PathMtuDiscoveryTimeout              uint32
-	LinkLocalAddressBehavior             uint32
-	LinkLocalAddressTimeout              uint32
-	ZoneIndices                          [ScopeLevelCount]uint32
-	SitePrefixLength                     uint32
-	Metric                               uint32
-	NlMtu                                uint32
-	Connected                            uint8
-	SupportsWakeUpPatterns               uint8
-	SupportsNeighborDiscovery            uint8
-	SupportsRouterDiscovery              uint8
-	ReachableTime                        uint32
-	TransmitOffload                      uint32
-	ReceiveOffload                       uint32
-	DisableDefaultRoutes                 uint8
-}
-
 // Console related constants used for the mode parameter to SetConsoleMode. See
 // https://docs.microsoft.com/en-us/windows/console/setconsolemode for details.
 
@@ -2379,12 +1972,6 @@ const (
 	ENABLE_LVB_GRID_WORLDWIDE          = 0x10
 )
 
-// Pseudo console related constants used for the flags parameter to
-// CreatePseudoConsole. See: https://learn.microsoft.com/en-us/windows/console/createpseudoconsole
-const (
-	PSEUDOCONSOLE_INHERIT_CURSOR = 0x1
-)
-
 type Coord struct {
 	X int16
 	Y int16
@@ -2466,23 +2053,19 @@ type JOBOBJECT_BASIC_UI_RESTRICTIONS struct {
 }
 
 const (
-	// JobObjectInformationClass for QueryInformationJobObject and SetInformationJobObject
+	// JobObjectInformationClass
 	JobObjectAssociateCompletionPortInformation = 7
-	JobObjectBasicAccountingInformation         = 1
-	JobObjectBasicAndIoAccountingInformation    = 8
 	JobObjectBasicLimitInformation              = 2
-	JobObjectBasicProcessIdList                 = 3
 	JobObjectBasicUIRestrictions                = 4
 	JobObjectCpuRateControlInformation          = 15
 	JobObjectEndOfJobTimeInformation            = 6
 	JobObjectExtendedLimitInformation           = 9
 	JobObjectGroupInformation                   = 11
 	JobObjectGroupInformationEx                 = 14
-	JobObjectLimitViolationInformation          = 13
-	JobObjectLimitViolationInformation2         = 34
+	JobObjectLimitViolationInformation2         = 35
 	JobObjectNetRateControlInformation          = 32
 	JobObjectNotificationLimitInformation       = 12
-	JobObjectNotificationLimitInformation2      = 33
+	JobObjectNotificationLimitInformation2      = 34
 	JobObjectSecurityLimitInformation           = 5
 )
 
@@ -2700,8 +2283,6 @@ type CommTimeouts struct {
 
 // NTUnicodeString is a UTF-16 string for NT native APIs, corresponding to UNICODE_STRING.
 type NTUnicodeString struct {
-	// Note: Length and MaximumLength are in *bytes*, not uint16s.
-	// They should always be even.
 	Length        uint16
 	MaximumLength uint16
 	Buffer        *uint16
@@ -2719,12 +2300,6 @@ type LIST_ENTRY struct {
 	Blink *LIST_ENTRY
 }
 
-type RUNTIME_FUNCTION struct {
-	BeginAddress uint32
-	EndAddress   uint32
-	UnwindData   uint32
-}
-
 type LDR_DATA_TABLE_ENTRY struct {
 	reserved1          [2]uintptr
 	InMemoryOrderLinks LIST_ENTRY
@@ -2915,60 +2490,6 @@ const (
 	FILE_PIPE_SERVER_END = 0x00000001
 )
 
-const (
-	// FileInformationClass for NtSetInformationFile
-	FileBasicInformation                         = 4
-	FileRenameInformation                        = 10
-	FileDispositionInformation                   = 13
-	FilePositionInformation                      = 14
-	FileEndOfFileInformation                     = 20
-	FileValidDataLengthInformation               = 39
-	FileShortNameInformation                     = 40
-	FileIoPriorityHintInformation                = 43
-	FileReplaceCompletionInformation             = 61
-	FileDispositionInformationEx                 = 64
-	FileCaseSensitiveInformation                 = 71
-	FileLinkInformation                          = 72
-	FileCaseSensitiveInformationForceAccessCheck = 75
-	FileKnownFolderInformation                   = 76
-
-	// Flags for FILE_RENAME_INFORMATION
-	FILE_RENAME_REPLACE_IF_EXISTS                    = 0x00000001
-	FILE_RENAME_POSIX_SEMANTICS                      = 0x00000002
-	FILE_RENAME_SUPPRESS_PIN_STATE_INHERITANCE       = 0x00000004
-	FILE_RENAME_SUPPRESS_STORAGE_RESERVE_INHERITANCE = 0x00000008
-	FILE_RENAME_NO_INCREASE_AVAILABLE_SPACE          = 0x00000010
-	FILE_RENAME_NO_DECREASE_AVAILABLE_SPACE          = 0x00000020
-	FILE_RENAME_PRESERVE_AVAILABLE_SPACE             = 0x00000030
-	FILE_RENAME_IGNORE_READONLY_ATTRIBUTE            = 0x00000040
-	FILE_RENAME_FORCE_RESIZE_TARGET_SR               = 0x00000080
-	FILE_RENAME_FORCE_RESIZE_SOURCE_SR               = 0x00000100
-	FILE_RENAME_FORCE_RESIZE_SR                      = 0x00000180
-
-	// Flags for FILE_DISPOSITION_INFORMATION_EX
-	FILE_DISPOSITION_DO_NOT_DELETE             = 0x00000000
-	FILE_DISPOSITION_DELETE                    = 0x00000001
-	FILE_DISPOSITION_POSIX_SEMANTICS           = 0x00000002
-	FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK = 0x00000004
-	FILE_DISPOSITION_ON_CLOSE                  = 0x00000008
-	FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE = 0x00000010
-
-	// Flags for FILE_CASE_SENSITIVE_INFORMATION
-	FILE_CS_FLAG_CASE_SENSITIVE_DIR = 0x00000001
-
-	// Flags for FILE_LINK_INFORMATION
-	FILE_LINK_REPLACE_IF_EXISTS                    = 0x00000001
-	FILE_LINK_POSIX_SEMANTICS                      = 0x00000002
-	FILE_LINK_SUPPRESS_STORAGE_RESERVE_INHERITANCE = 0x00000008
-	FILE_LINK_NO_INCREASE_AVAILABLE_SPACE          = 0x00000010
-	FILE_LINK_NO_DECREASE_AVAILABLE_SPACE          = 0x00000020
-	FILE_LINK_PRESERVE_AVAILABLE_SPACE             = 0x00000030
-	FILE_LINK_IGNORE_READONLY_ATTRIBUTE            = 0x00000040
-	FILE_LINK_FORCE_RESIZE_TARGET_SR               = 0x00000080
-	FILE_LINK_FORCE_RESIZE_SOURCE_SR               = 0x00000100
-	FILE_LINK_FORCE_RESIZE_SR                      = 0x00000180
-)
-
 // ProcessInformationClasses for NtQueryInformationProcess and NtSetInformationProcess.
 const (
 	ProcessBasicInformation = iota
@@ -3085,240 +2606,6 @@ type PROCESS_BASIC_INFORMATION struct {
 	InheritedFromUniqueProcessId uintptr
 }
 
-type SYSTEM_PROCESS_INFORMATION struct {
-	NextEntryOffset              uint32
-	NumberOfThreads              uint32
-	WorkingSetPrivateSize        int64
-	HardFaultCount               uint32
-	NumberOfThreadsHighWatermark uint32
-	CycleTime                    uint64
-	CreateTime                   int64
-	UserTime                     int64
-	KernelTime                   int64
-	ImageName                    NTUnicodeString
-	BasePriority                 int32
-	UniqueProcessID              uintptr
-	InheritedFromUniqueProcessID uintptr
-	HandleCount                  uint32
-	SessionID                    uint32
-	UniqueProcessKey             *uint32
-	PeakVirtualSize              uintptr
-	VirtualSize                  uintptr
-	PageFaultCount               uint32
-	PeakWorkingSetSize           uintptr
-	WorkingSetSize               uintptr
-	QuotaPeakPagedPoolUsage      uintptr
-	QuotaPagedPoolUsage          uintptr
-	QuotaPeakNonPagedPoolUsage   uintptr
-	QuotaNonPagedPoolUsage       uintptr
-	PagefileUsage                uintptr
-	PeakPagefileUsage            uintptr
-	PrivatePageCount             uintptr
-	ReadOperationCount           int64
-	WriteOperationCount          int64
-	OtherOperationCount          int64
-	ReadTransferCount            int64
-	WriteTransferCount           int64
-	OtherTransferCount           int64
-}
-
-// SystemInformationClasses for NtQuerySystemInformation and NtSetSystemInformation
-const (
-	SystemBasicInformation = iota
-	SystemProcessorInformation
-	SystemPerformanceInformation
-	SystemTimeOfDayInformation
-	SystemPathInformation
-	SystemProcessInformation
-	SystemCallCountInformation
-	SystemDeviceInformation
-	SystemProcessorPerformanceInformation
-	SystemFlagsInformation
-	SystemCallTimeInformation
-	SystemModuleInformation
-	SystemLocksInformation
-	SystemStackTraceInformation
-	SystemPagedPoolInformation
-	SystemNonPagedPoolInformation
-	SystemHandleInformation
-	SystemObjectInformation
-	SystemPageFileInformation
-	SystemVdmInstemulInformation
-	SystemVdmBopInformation
-	SystemFileCacheInformation
-	SystemPoolTagInformation
-	SystemInterruptInformation
-	SystemDpcBehaviorInformation
-	SystemFullMemoryInformation
-	SystemLoadGdiDriverInformation
-	SystemUnloadGdiDriverInformation
-	SystemTimeAdjustmentInformation
-	SystemSummaryMemoryInformation
-	SystemMirrorMemoryInformation
-	SystemPerformanceTraceInformation
-	systemObsolete0
-	SystemExceptionInformation
-	SystemCrashDumpStateInformation
-	SystemKernelDebuggerInformation
-	SystemContextSwitchInformation
-	SystemRegistryQuotaInformation
-	SystemExtendServiceTableInformation
-	SystemPrioritySeperation
-	SystemVerifierAddDriverInformation
-	SystemVerifierRemoveDriverInformation
-	SystemProcessorIdleInformation
-	SystemLegacyDriverInformation
-	SystemCurrentTimeZoneInformation
-	SystemLookasideInformation
-	SystemTimeSlipNotification
-	SystemSessionCreate
-	SystemSessionDetach
-	SystemSessionInformation
-	SystemRangeStartInformation
-	SystemVerifierInformation
-	SystemVerifierThunkExtend
-	SystemSessionProcessInformation
-	SystemLoadGdiDriverInSystemSpace
-	SystemNumaProcessorMap
-	SystemPrefetcherInformation
-	SystemExtendedProcessInformation
-	SystemRecommendedSharedDataAlignment
-	SystemComPlusPackage
-	SystemNumaAvailableMemory
-	SystemProcessorPowerInformation
-	SystemEmulationBasicInformation
-	SystemEmulationProcessorInformation
-	SystemExtendedHandleInformation
-	SystemLostDelayedWriteInformation
-	SystemBigPoolInformation
-	SystemSessionPoolTagInformation
-	SystemSessionMappedViewInformation
-	SystemHotpatchInformation
-	SystemObjectSecurityMode
-	SystemWatchdogTimerHandler
-	SystemWatchdogTimerInformation
-	SystemLogicalProcessorInformation
-	SystemWow64SharedInformationObsolete
-	SystemRegisterFirmwareTableInformationHandler
-	SystemFirmwareTableInformation
-	SystemModuleInformationEx
-	SystemVerifierTriageInformation
-	SystemSuperfetchInformation
-	SystemMemoryListInformation
-	SystemFileCacheInformationEx
-	SystemThreadPriorityClientIdInformation
-	SystemProcessorIdleCycleTimeInformation
-	SystemVerifierCancellationInformation
-	SystemProcessorPowerInformationEx
-	SystemRefTraceInformation
-	SystemSpecialPoolInformation
-	SystemProcessIdInformation
-	SystemErrorPortInformation
-	SystemBootEnvironmentInformation
-	SystemHypervisorInformation
-	SystemVerifierInformationEx
-	SystemTimeZoneInformation
-	SystemImageFileExecutionOptionsInformation
-	SystemCoverageInformation
-	SystemPrefetchPatchInformation
-	SystemVerifierFaultsInformation
-	SystemSystemPartitionInformation
-	SystemSystemDiskInformation
-	SystemProcessorPerformanceDistribution
-	SystemNumaProximityNodeInformation
-	SystemDynamicTimeZoneInformation
-	SystemCodeIntegrityInformation
-	SystemProcessorMicrocodeUpdateInformation
-	SystemProcessorBrandString
-	SystemVirtualAddressInformation
-	SystemLogicalProcessorAndGroupInformation
-	SystemProcessorCycleTimeInformation
-	SystemStoreInformation
-	SystemRegistryAppendString
-	SystemAitSamplingValue
-	SystemVhdBootInformation
-	SystemCpuQuotaInformation
-	SystemNativeBasicInformation
-	systemSpare1
-	SystemLowPriorityIoInformation
-	SystemTpmBootEntropyInformation
-	SystemVerifierCountersInformation
-	SystemPagedPoolInformationEx
-	SystemSystemPtesInformationEx
-	SystemNodeDistanceInformation
-	SystemAcpiAuditInformation
-	SystemBasicPerformanceInformation
-	SystemQueryPerformanceCounterInformation
-	SystemSessionBigPoolInformation
-	SystemBootGraphicsInformation
-	SystemScrubPhysicalMemoryInformation
-	SystemBadPageInformation
-	SystemProcessorProfileControlArea
-	SystemCombinePhysicalMemoryInformation
-	SystemEntropyInterruptTimingCallback
-	SystemConsoleInformation
-	SystemPlatformBinaryInformation
-	SystemThrottleNotificationInformation
-	SystemHypervisorProcessorCountInformation
-	SystemDeviceDataInformation
-	SystemDeviceDataEnumerationInformation
-	SystemMemoryTopologyInformation
-	SystemMemoryChannelInformation
-	SystemBootLogoInformation
-	SystemProcessorPerformanceInformationEx
-	systemSpare0
-	SystemSecureBootPolicyInformation
-	SystemPageFileInformationEx
-	SystemSecureBootInformation
-	SystemEntropyInterruptTimingRawInformation
-	SystemPortableWorkspaceEfiLauncherInformation
-	SystemFullProcessInformation
-	SystemKernelDebuggerInformationEx
-	SystemBootMetadataInformation
-	SystemSoftRebootInformation
-	SystemElamCertificateInformation
-	SystemOfflineDumpConfigInformation
-	SystemProcessorFeaturesInformation
-	SystemRegistryReconciliationInformation
-	SystemEdidInformation
-	SystemManufacturingInformation
-	SystemEnergyEstimationConfigInformation
-	SystemHypervisorDetailInformation
-	SystemProcessorCycleStatsInformation
-	SystemVmGenerationCountInformation
-	SystemTrustedPlatformModuleInformation
-	SystemKernelDebuggerFlags
-	SystemCodeIntegrityPolicyInformation
-	SystemIsolatedUserModeInformation
-	SystemHardwareSecurityTestInterfaceResultsInformation
-	SystemSingleModuleInformation
-	SystemAllowedCpuSetsInformation
-	SystemDmaProtectionInformation
-	SystemInterruptCpuSetsInformation
-	SystemSecureBootPolicyFullInformation
-	SystemCodeIntegrityPolicyFullInformation
-	SystemAffinitizedInterruptProcessorInformation
-	SystemRootSiloInformation
-)
-
-type RTL_PROCESS_MODULE_INFORMATION struct {
-	Section          Handle
-	MappedBase       uintptr
-	ImageBase        uintptr
-	ImageSize        uint32
-	Flags            uint32
-	LoadOrderIndex   uint16
-	InitOrderIndex   uint16
-	LoadCount        uint16
-	OffsetToFileName uint16
-	FullPathName     [256]byte
-}
-
-type RTL_PROCESS_MODULES struct {
-	NumberOfModules uint32
-	Modules         [1]RTL_PROCESS_MODULE_INFORMATION
-}
-
 // Constants for LocalAlloc flags.
 const (
 	LMEM_FIXED          = 0x0
@@ -3413,22 +2700,6 @@ var (
 	RT_MANIFEST     ResourceID = 24
 )
 
-type VS_FIXEDFILEINFO struct {
-	Signature        uint32
-	StrucVersion     uint32
-	FileVersionMS    uint32
-	FileVersionLS    uint32
-	ProductVersionMS uint32
-	ProductVersionLS uint32
-	FileFlagsMask    uint32
-	FileFlags        uint32
-	FileOS           uint32
-	FileType         uint32
-	FileSubtype      uint32
-	FileDateMS       uint32
-	FileDateLS       uint32
-}
-
 type COAUTHIDENTITY struct {
 	User           *uint16
 	UserLength     uint32
@@ -3502,341 +2773,3 @@ const (
 
 // Flag for QueryFullProcessImageName.
 const PROCESS_NAME_NATIVE = 1
-
-type ModuleInfo struct {
-	BaseOfDll   uintptr
-	SizeOfImage uint32
-	EntryPoint  uintptr
-}
-
-const ALL_PROCESSOR_GROUPS = 0xFFFF
-
-type Rect struct {
-	Left   int32
-	Top    int32
-	Right  int32
-	Bottom int32
-}
-
-type GUIThreadInfo struct {
-	Size        uint32
-	Flags       uint32
-	Active      HWND
-	Focus       HWND
-	Capture     HWND
-	MenuOwner   HWND
-	MoveSize    HWND
-	CaretHandle HWND
-	CaretRect   Rect
-}
-
-const (
-	DWMWA_NCRENDERING_ENABLED            = 1
-	DWMWA_NCRENDERING_POLICY             = 2
-	DWMWA_TRANSITIONS_FORCEDISABLED      = 3
-	DWMWA_ALLOW_NCPAINT                  = 4
-	DWMWA_CAPTION_BUTTON_BOUNDS          = 5
-	DWMWA_NONCLIENT_RTL_LAYOUT           = 6
-	DWMWA_FORCE_ICONIC_REPRESENTATION    = 7
-	DWMWA_FLIP3D_POLICY                  = 8
-	DWMWA_EXTENDED_FRAME_BOUNDS          = 9
-	DWMWA_HAS_ICONIC_BITMAP              = 10
-	DWMWA_DISALLOW_PEEK                  = 11
-	DWMWA_EXCLUDED_FROM_PEEK             = 12
-	DWMWA_CLOAK                          = 13
-	DWMWA_CLOAKED                        = 14
-	DWMWA_FREEZE_REPRESENTATION          = 15
-	DWMWA_PASSIVE_UPDATE_MODE            = 16
-	DWMWA_USE_HOSTBACKDROPBRUSH          = 17
-	DWMWA_USE_IMMERSIVE_DARK_MODE        = 20
-	DWMWA_WINDOW_CORNER_PREFERENCE       = 33
-	DWMWA_BORDER_COLOR                   = 34
-	DWMWA_CAPTION_COLOR                  = 35
-	DWMWA_TEXT_COLOR                     = 36
-	DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
-)
-
-type WSAQUERYSET struct {
-	Size                uint32
-	ServiceInstanceName *uint16
-	ServiceClassId      *GUID
-	Version             *WSAVersion
-	Comment             *uint16
-	NameSpace           uint32
-	NSProviderId        *GUID
-	Context             *uint16
-	NumberOfProtocols   uint32
-	AfpProtocols        *AFProtocols
-	QueryString         *uint16
-	NumberOfCsAddrs     uint32
-	SaBuffer            *CSAddrInfo
-	OutputFlags         uint32
-	Blob                *BLOB
-}
-
-type WSAVersion struct {
-	Version                 uint32
-	EnumerationOfComparison int32
-}
-
-type AFProtocols struct {
-	AddressFamily int32
-	Protocol      int32
-}
-
-type CSAddrInfo struct {
-	LocalAddr  SocketAddress
-	RemoteAddr SocketAddress
-	SocketType int32
-	Protocol   int32
-}
-
-type BLOB struct {
-	Size     uint32
-	BlobData *byte
-}
-
-type ComStat struct {
-	Flags    uint32
-	CBInQue  uint32
-	CBOutQue uint32
-}
-
-type DCB struct {
-	DCBlength  uint32
-	BaudRate   uint32
-	Flags      uint32
-	wReserved  uint16
-	XonLim     uint16
-	XoffLim    uint16
-	ByteSize   uint8
-	Parity     uint8
-	StopBits   uint8
-	XonChar    byte
-	XoffChar   byte
-	ErrorChar  byte
-	EofChar    byte
-	EvtChar    byte
-	wReserved1 uint16
-}
-
-// Keyboard Layout Flags.
-// See https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-loadkeyboardlayoutw
-const (
-	KLF_ACTIVATE      = 0x00000001
-	KLF_SUBSTITUTE_OK = 0x00000002
-	KLF_REORDER       = 0x00000008
-	KLF_REPLACELANG   = 0x00000010
-	KLF_NOTELLSHELL   = 0x00000080
-	KLF_SETFORPROCESS = 0x00000100
-)
-
-// Virtual Key codes
-// https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-const (
-	VK_LBUTTON             = 0x01
-	VK_RBUTTON             = 0x02
-	VK_CANCEL              = 0x03
-	VK_MBUTTON             = 0x04
-	VK_XBUTTON1            = 0x05
-	VK_XBUTTON2            = 0x06
-	VK_BACK                = 0x08
-	VK_TAB                 = 0x09
-	VK_CLEAR               = 0x0C
-	VK_RETURN              = 0x0D
-	VK_SHIFT               = 0x10
-	VK_CONTROL             = 0x11
-	VK_MENU                = 0x12
-	VK_PAUSE               = 0x13
-	VK_CAPITAL             = 0x14
-	VK_KANA                = 0x15
-	VK_HANGEUL             = 0x15
-	VK_HANGUL              = 0x15
-	VK_IME_ON              = 0x16
-	VK_JUNJA               = 0x17
-	VK_FINAL               = 0x18
-	VK_HANJA               = 0x19
-	VK_KANJI               = 0x19
-	VK_IME_OFF             = 0x1A
-	VK_ESCAPE              = 0x1B
-	VK_CONVERT             = 0x1C
-	VK_NONCONVERT          = 0x1D
-	VK_ACCEPT              = 0x1E
-	VK_MODECHANGE          = 0x1F
-	VK_SPACE               = 0x20
-	VK_PRIOR               = 0x21
-	VK_NEXT                = 0x22
-	VK_END                 = 0x23
-	VK_HOME                = 0x24
-	VK_LEFT                = 0x25
-	VK_UP                  = 0x26
-	VK_RIGHT               = 0x27
-	VK_DOWN                = 0x28
-	VK_SELECT              = 0x29
-	VK_PRINT               = 0x2A
-	VK_EXECUTE             = 0x2B
-	VK_SNAPSHOT            = 0x2C
-	VK_INSERT              = 0x2D
-	VK_DELETE              = 0x2E
-	VK_HELP                = 0x2F
-	VK_LWIN                = 0x5B
-	VK_RWIN                = 0x5C
-	VK_APPS                = 0x5D
-	VK_SLEEP               = 0x5F
-	VK_NUMPAD0             = 0x60
-	VK_NUMPAD1             = 0x61
-	VK_NUMPAD2             = 0x62
-	VK_NUMPAD3             = 0x63
-	VK_NUMPAD4             = 0x64
-	VK_NUMPAD5             = 0x65
-	VK_NUMPAD6             = 0x66
-	VK_NUMPAD7             = 0x67
-	VK_NUMPAD8             = 0x68
-	VK_NUMPAD9             = 0x69
-	VK_MULTIPLY            = 0x6A
-	VK_ADD                 = 0x6B
-	VK_SEPARATOR           = 0x6C
-	VK_SUBTRACT            = 0x6D
-	VK_DECIMAL             = 0x6E
-	VK_DIVIDE              = 0x6F
-	VK_F1                  = 0x70
-	VK_F2                  = 0x71
-	VK_F3                  = 0x72
-	VK_F4                  = 0x73
-	VK_F5                  = 0x74
-	VK_F6                  = 0x75
-	VK_F7                  = 0x76
-	VK_F8                  = 0x77
-	VK_F9                  = 0x78
-	VK_F10                 = 0x79
-	VK_F11                 = 0x7A
-	VK_F12                 = 0x7B
-	VK_F13                 = 0x7C
-	VK_F14                 = 0x7D
-	VK_F15                 = 0x7E
-	VK_F16                 = 0x7F
-	VK_F17                 = 0x80
-	VK_F18                 = 0x81
-	VK_F19                 = 0x82
-	VK_F20                 = 0x83
-	VK_F21                 = 0x84
-	VK_F22                 = 0x85
-	VK_F23                 = 0x86
-	VK_F24                 = 0x87
-	VK_NUMLOCK             = 0x90
-	VK_SCROLL              = 0x91
-	VK_OEM_NEC_EQUAL       = 0x92
-	VK_OEM_FJ_JISHO        = 0x92
-	VK_OEM_FJ_MASSHOU      = 0x93
-	VK_OEM_FJ_TOUROKU      = 0x94
-	VK_OEM_FJ_LOYA         = 0x95
-	VK_OEM_FJ_ROYA         = 0x96
-	VK_LSHIFT              = 0xA0
-	VK_RSHIFT              = 0xA1
-	VK_LCONTROL            = 0xA2
-	VK_RCONTROL            = 0xA3
-	VK_LMENU               = 0xA4
-	VK_RMENU               = 0xA5
-	VK_BROWSER_BACK        = 0xA6
-	VK_BROWSER_FORWARD     = 0xA7
-	VK_BROWSER_REFRESH     = 0xA8
-	VK_BROWSER_STOP        = 0xA9
-	VK_BROWSER_SEARCH      = 0xAA
-	VK_BROWSER_FAVORITES   = 0xAB
-	VK_BROWSER_HOME        = 0xAC
-	VK_VOLUME_MUTE         = 0xAD
-	VK_VOLUME_DOWN         = 0xAE
-	VK_VOLUME_UP           = 0xAF
-	VK_MEDIA_NEXT_TRACK    = 0xB0
-	VK_MEDIA_PREV_TRACK    = 0xB1
-	VK_MEDIA_STOP          = 0xB2
-	VK_MEDIA_PLAY_PAUSE    = 0xB3
-	VK_LAUNCH_MAIL         = 0xB4
-	VK_LAUNCH_MEDIA_SELECT = 0xB5
-	VK_LAUNCH_APP1         = 0xB6
-	VK_LAUNCH_APP2         = 0xB7
-	VK_OEM_1               = 0xBA
-	VK_OEM_PLUS            = 0xBB
-	VK_OEM_COMMA           = 0xBC
-	VK_OEM_MINUS           = 0xBD
-	VK_OEM_PERIOD          = 0xBE
-	VK_OEM_2               = 0xBF
-	VK_OEM_3               = 0xC0
-	VK_OEM_4               = 0xDB
-	VK_OEM_5               = 0xDC
-	VK_OEM_6               = 0xDD
-	VK_OEM_7               = 0xDE
-	VK_OEM_8               = 0xDF
-	VK_OEM_AX              = 0xE1
-	VK_OEM_102             = 0xE2
-	VK_ICO_HELP            = 0xE3
-	VK_ICO_00              = 0xE4
-	VK_PROCESSKEY          = 0xE5
-	VK_ICO_CLEAR           = 0xE6
-	VK_OEM_RESET           = 0xE9
-	VK_OEM_JUMP            = 0xEA
-	VK_OEM_PA1             = 0xEB
-	VK_OEM_PA2             = 0xEC
-	VK_OEM_PA3             = 0xED
-	VK_OEM_WSCTRL          = 0xEE
-	VK_OEM_CUSEL           = 0xEF
-	VK_OEM_ATTN            = 0xF0
-	VK_OEM_FINISH          = 0xF1
-	VK_OEM_COPY            = 0xF2
-	VK_OEM_AUTO            = 0xF3
-	VK_OEM_ENLW            = 0xF4
-	VK_OEM_BACKTAB         = 0xF5
-	VK_ATTN                = 0xF6
-	VK_CRSEL               = 0xF7
-	VK_EXSEL               = 0xF8
-	VK_EREOF               = 0xF9
-	VK_PLAY                = 0xFA
-	VK_ZOOM                = 0xFB
-	VK_NONAME              = 0xFC
-	VK_PA1                 = 0xFD
-	VK_OEM_CLEAR           = 0xFE
-)
-
-// Mouse button constants.
-// https://docs.microsoft.com/en-us/windows/console/mouse-event-record-str
-const (
-	FROM_LEFT_1ST_BUTTON_PRESSED = 0x0001
-	RIGHTMOST_BUTTON_PRESSED     = 0x0002
-	FROM_LEFT_2ND_BUTTON_PRESSED = 0x0004
-	FROM_LEFT_3RD_BUTTON_PRESSED = 0x0008
-	FROM_LEFT_4TH_BUTTON_PRESSED = 0x0010
-)
-
-// Control key state constaints.
-// https://docs.microsoft.com/en-us/windows/console/key-event-record-str
-// https://docs.microsoft.com/en-us/windows/console/mouse-event-record-str
-const (
-	CAPSLOCK_ON        = 0x0080
-	ENHANCED_KEY       = 0x0100
-	LEFT_ALT_PRESSED   = 0x0002
-	LEFT_CTRL_PRESSED  = 0x0008
-	NUMLOCK_ON         = 0x0020
-	RIGHT_ALT_PRESSED  = 0x0001
-	RIGHT_CTRL_PRESSED = 0x0004
-	SCROLLLOCK_ON      = 0x0040
-	SHIFT_PRESSED      = 0x0010
-)
-
-// Mouse event record event flags.
-// https://docs.microsoft.com/en-us/windows/console/mouse-event-record-str
-const (
-	MOUSE_MOVED    = 0x0001
-	DOUBLE_CLICK   = 0x0002
-	MOUSE_WHEELED  = 0x0004
-	MOUSE_HWHEELED = 0x0008
-)
-
-// Input Record Event Types
-// https://learn.microsoft.com/en-us/windows/console/input-record-str
-const (
-	FOCUS_EVENT              = 0x0010
-	KEY_EVENT                = 0x0001
-	MENU_EVENT               = 0x0008
-	MOUSE_EVENT              = 0x0002
-	WINDOW_BUFFER_SIZE_EVENT = 0x0004
-)
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index a58bc48..2083ec3 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -36,11 +36,9 @@ func errnoErr(e syscall.Errno) error {
 }
 
 var (
-	modCfgMgr32 = NewLazySystemDLL("CfgMgr32.dll")
 	modadvapi32 = NewLazySystemDLL("advapi32.dll")
 	modcrypt32  = NewLazySystemDLL("crypt32.dll")
 	moddnsapi   = NewLazySystemDLL("dnsapi.dll")
-	moddwmapi   = NewLazySystemDLL("dwmapi.dll")
 	modiphlpapi = NewLazySystemDLL("iphlpapi.dll")
 	modkernel32 = NewLazySystemDLL("kernel32.dll")
 	modmswsock  = NewLazySystemDLL("mswsock.dll")
@@ -50,20 +48,13 @@ var (
 	modpsapi    = NewLazySystemDLL("psapi.dll")
 	modsechost  = NewLazySystemDLL("sechost.dll")
 	modsecur32  = NewLazySystemDLL("secur32.dll")
-	modsetupapi = NewLazySystemDLL("setupapi.dll")
 	modshell32  = NewLazySystemDLL("shell32.dll")
 	moduser32   = NewLazySystemDLL("user32.dll")
 	moduserenv  = NewLazySystemDLL("userenv.dll")
-	modversion  = NewLazySystemDLL("version.dll")
-	modwinmm    = NewLazySystemDLL("winmm.dll")
 	modwintrust = NewLazySystemDLL("wintrust.dll")
 	modws2_32   = NewLazySystemDLL("ws2_32.dll")
 	modwtsapi32 = NewLazySystemDLL("wtsapi32.dll")
 
-	procCM_Get_DevNode_Status                                = modCfgMgr32.NewProc("CM_Get_DevNode_Status")
-	procCM_Get_Device_Interface_ListW                        = modCfgMgr32.NewProc("CM_Get_Device_Interface_ListW")
-	procCM_Get_Device_Interface_List_SizeW                   = modCfgMgr32.NewProc("CM_Get_Device_Interface_List_SizeW")
-	procCM_MapCrToWin32Err                                   = modCfgMgr32.NewProc("CM_MapCrToWin32Err")
 	procAdjustTokenGroups                                    = modadvapi32.NewProc("AdjustTokenGroups")
 	procAdjustTokenPrivileges                                = modadvapi32.NewProc("AdjustTokenPrivileges")
 	procAllocateAndInitializeSid                             = modadvapi32.NewProc("AllocateAndInitializeSid")
@@ -87,11 +78,9 @@ var (
 	procDeleteService                                        = modadvapi32.NewProc("DeleteService")
 	procDeregisterEventSource                                = modadvapi32.NewProc("DeregisterEventSource")
 	procDuplicateTokenEx                                     = modadvapi32.NewProc("DuplicateTokenEx")
-	procEnumDependentServicesW                               = modadvapi32.NewProc("EnumDependentServicesW")
 	procEnumServicesStatusExW                                = modadvapi32.NewProc("EnumServicesStatusExW")
 	procEqualSid                                             = modadvapi32.NewProc("EqualSid")
 	procFreeSid                                              = modadvapi32.NewProc("FreeSid")
-	procGetAce                                               = modadvapi32.NewProc("GetAce")
 	procGetLengthSid                                         = modadvapi32.NewProc("GetLengthSid")
 	procGetNamedSecurityInfoW                                = modadvapi32.NewProc("GetNamedSecurityInfoW")
 	procGetSecurityDescriptorControl                         = modadvapi32.NewProc("GetSecurityDescriptorControl")
@@ -125,7 +114,6 @@ var (
 	procOpenThreadToken                                      = modadvapi32.NewProc("OpenThreadToken")
 	procQueryServiceConfig2W                                 = modadvapi32.NewProc("QueryServiceConfig2W")
 	procQueryServiceConfigW                                  = modadvapi32.NewProc("QueryServiceConfigW")
-	procQueryServiceDynamicInformation                       = modadvapi32.NewProc("QueryServiceDynamicInformation")
 	procQueryServiceLockStatusW                              = modadvapi32.NewProc("QueryServiceLockStatusW")
 	procQueryServiceStatus                                   = modadvapi32.NewProc("QueryServiceStatus")
 	procQueryServiceStatusEx                                 = modadvapi32.NewProc("QueryServiceStatusEx")
@@ -136,7 +124,6 @@ var (
 	procRegQueryInfoKeyW                                     = modadvapi32.NewProc("RegQueryInfoKeyW")
 	procRegQueryValueExW                                     = modadvapi32.NewProc("RegQueryValueExW")
 	procRegisterEventSourceW                                 = modadvapi32.NewProc("RegisterEventSourceW")
-	procRegisterServiceCtrlHandlerExW                        = modadvapi32.NewProc("RegisterServiceCtrlHandlerExW")
 	procReportEventW                                         = modadvapi32.NewProc("ReportEventW")
 	procRevertToSelf                                         = modadvapi32.NewProc("RevertToSelf")
 	procSetEntriesInAclW                                     = modadvapi32.NewProc("SetEntriesInAclW")
@@ -179,25 +166,13 @@ var (
 	procDnsNameCompare_W                                     = moddnsapi.NewProc("DnsNameCompare_W")
 	procDnsQuery_W                                           = moddnsapi.NewProc("DnsQuery_W")
 	procDnsRecordListFree                                    = moddnsapi.NewProc("DnsRecordListFree")
-	procDwmGetWindowAttribute                                = moddwmapi.NewProc("DwmGetWindowAttribute")
-	procDwmSetWindowAttribute                                = moddwmapi.NewProc("DwmSetWindowAttribute")
-	procCancelMibChangeNotify2                               = modiphlpapi.NewProc("CancelMibChangeNotify2")
 	procGetAdaptersAddresses                                 = modiphlpapi.NewProc("GetAdaptersAddresses")
 	procGetAdaptersInfo                                      = modiphlpapi.NewProc("GetAdaptersInfo")
-	procGetBestInterfaceEx                                   = modiphlpapi.NewProc("GetBestInterfaceEx")
 	procGetIfEntry                                           = modiphlpapi.NewProc("GetIfEntry")
-	procGetIfEntry2Ex                                        = modiphlpapi.NewProc("GetIfEntry2Ex")
-	procGetUnicastIpAddressEntry                             = modiphlpapi.NewProc("GetUnicastIpAddressEntry")
-	procNotifyIpInterfaceChange                              = modiphlpapi.NewProc("NotifyIpInterfaceChange")
-	procNotifyUnicastIpAddressChange                         = modiphlpapi.NewProc("NotifyUnicastIpAddressChange")
-	procAddDllDirectory                                      = modkernel32.NewProc("AddDllDirectory")
 	procAssignProcessToJobObject                             = modkernel32.NewProc("AssignProcessToJobObject")
 	procCancelIo                                             = modkernel32.NewProc("CancelIo")
 	procCancelIoEx                                           = modkernel32.NewProc("CancelIoEx")
-	procClearCommBreak                                       = modkernel32.NewProc("ClearCommBreak")
-	procClearCommError                                       = modkernel32.NewProc("ClearCommError")
 	procCloseHandle                                          = modkernel32.NewProc("CloseHandle")
-	procClosePseudoConsole                                   = modkernel32.NewProc("ClosePseudoConsole")
 	procConnectNamedPipe                                     = modkernel32.NewProc("ConnectNamedPipe")
 	procCreateDirectoryW                                     = modkernel32.NewProc("CreateDirectoryW")
 	procCreateEventExW                                       = modkernel32.NewProc("CreateEventExW")
@@ -212,7 +187,6 @@ var (
 	procCreateNamedPipeW                                     = modkernel32.NewProc("CreateNamedPipeW")
 	procCreatePipe                                           = modkernel32.NewProc("CreatePipe")
 	procCreateProcessW                                       = modkernel32.NewProc("CreateProcessW")
-	procCreatePseudoConsole                                  = modkernel32.NewProc("CreatePseudoConsole")
 	procCreateSymbolicLinkW                                  = modkernel32.NewProc("CreateSymbolicLinkW")
 	procCreateToolhelp32Snapshot                             = modkernel32.NewProc("CreateToolhelp32Snapshot")
 	procDefineDosDeviceW                                     = modkernel32.NewProc("DefineDosDeviceW")
@@ -220,11 +194,8 @@ var (
 	procDeleteProcThreadAttributeList                        = modkernel32.NewProc("DeleteProcThreadAttributeList")
 	procDeleteVolumeMountPointW                              = modkernel32.NewProc("DeleteVolumeMountPointW")
 	procDeviceIoControl                                      = modkernel32.NewProc("DeviceIoControl")
-	procDisconnectNamedPipe                                  = modkernel32.NewProc("DisconnectNamedPipe")
 	procDuplicateHandle                                      = modkernel32.NewProc("DuplicateHandle")
-	procEscapeCommFunction                                   = modkernel32.NewProc("EscapeCommFunction")
 	procExitProcess                                          = modkernel32.NewProc("ExitProcess")
-	procExpandEnvironmentStringsW                            = modkernel32.NewProc("ExpandEnvironmentStringsW")
 	procFindClose                                            = modkernel32.NewProc("FindClose")
 	procFindCloseChangeNotification                          = modkernel32.NewProc("FindCloseChangeNotification")
 	procFindFirstChangeNotificationW                         = modkernel32.NewProc("FindFirstChangeNotificationW")
@@ -245,16 +216,11 @@ var (
 	procFreeLibrary                                          = modkernel32.NewProc("FreeLibrary")
 	procGenerateConsoleCtrlEvent                             = modkernel32.NewProc("GenerateConsoleCtrlEvent")
 	procGetACP                                               = modkernel32.NewProc("GetACP")
-	procGetActiveProcessorCount                              = modkernel32.NewProc("GetActiveProcessorCount")
-	procGetCommModemStatus                                   = modkernel32.NewProc("GetCommModemStatus")
-	procGetCommState                                         = modkernel32.NewProc("GetCommState")
 	procGetCommTimeouts                                      = modkernel32.NewProc("GetCommTimeouts")
 	procGetCommandLineW                                      = modkernel32.NewProc("GetCommandLineW")
 	procGetComputerNameExW                                   = modkernel32.NewProc("GetComputerNameExW")
 	procGetComputerNameW                                     = modkernel32.NewProc("GetComputerNameW")
-	procGetConsoleCP                                         = modkernel32.NewProc("GetConsoleCP")
 	procGetConsoleMode                                       = modkernel32.NewProc("GetConsoleMode")
-	procGetConsoleOutputCP                                   = modkernel32.NewProc("GetConsoleOutputCP")
 	procGetConsoleScreenBufferInfo                           = modkernel32.NewProc("GetConsoleScreenBufferInfo")
 	procGetCurrentDirectoryW                                 = modkernel32.NewProc("GetCurrentDirectoryW")
 	procGetCurrentProcessId                                  = modkernel32.NewProc("GetCurrentProcessId")
@@ -268,22 +234,17 @@ var (
 	procGetFileAttributesW                                   = modkernel32.NewProc("GetFileAttributesW")
 	procGetFileInformationByHandle                           = modkernel32.NewProc("GetFileInformationByHandle")
 	procGetFileInformationByHandleEx                         = modkernel32.NewProc("GetFileInformationByHandleEx")
-	procGetFileTime                                          = modkernel32.NewProc("GetFileTime")
 	procGetFileType                                          = modkernel32.NewProc("GetFileType")
 	procGetFinalPathNameByHandleW                            = modkernel32.NewProc("GetFinalPathNameByHandleW")
 	procGetFullPathNameW                                     = modkernel32.NewProc("GetFullPathNameW")
-	procGetLargePageMinimum                                  = modkernel32.NewProc("GetLargePageMinimum")
 	procGetLastError                                         = modkernel32.NewProc("GetLastError")
 	procGetLogicalDriveStringsW                              = modkernel32.NewProc("GetLogicalDriveStringsW")
 	procGetLogicalDrives                                     = modkernel32.NewProc("GetLogicalDrives")
 	procGetLongPathNameW                                     = modkernel32.NewProc("GetLongPathNameW")
-	procGetMaximumProcessorCount                             = modkernel32.NewProc("GetMaximumProcessorCount")
 	procGetModuleFileNameW                                   = modkernel32.NewProc("GetModuleFileNameW")
 	procGetModuleHandleExW                                   = modkernel32.NewProc("GetModuleHandleExW")
-	procGetNamedPipeClientProcessId                          = modkernel32.NewProc("GetNamedPipeClientProcessId")
 	procGetNamedPipeHandleStateW                             = modkernel32.NewProc("GetNamedPipeHandleStateW")
 	procGetNamedPipeInfo                                     = modkernel32.NewProc("GetNamedPipeInfo")
-	procGetNamedPipeServerProcessId                          = modkernel32.NewProc("GetNamedPipeServerProcessId")
 	procGetOverlappedResult                                  = modkernel32.NewProc("GetOverlappedResult")
 	procGetPriorityClass                                     = modkernel32.NewProc("GetPriorityClass")
 	procGetProcAddress                                       = modkernel32.NewProc("GetProcAddress")
@@ -324,8 +285,6 @@ var (
 	procLockFileEx                                           = modkernel32.NewProc("LockFileEx")
 	procLockResource                                         = modkernel32.NewProc("LockResource")
 	procMapViewOfFile                                        = modkernel32.NewProc("MapViewOfFile")
-	procModule32FirstW                                       = modkernel32.NewProc("Module32FirstW")
-	procModule32NextW                                        = modkernel32.NewProc("Module32NextW")
 	procMoveFileExW                                          = modkernel32.NewProc("MoveFileExW")
 	procMoveFileW                                            = modkernel32.NewProc("MoveFileW")
 	procMultiByteToWideChar                                  = modkernel32.NewProc("MultiByteToWideChar")
@@ -338,28 +297,19 @@ var (
 	procProcess32NextW                                       = modkernel32.NewProc("Process32NextW")
 	procProcessIdToSessionId                                 = modkernel32.NewProc("ProcessIdToSessionId")
 	procPulseEvent                                           = modkernel32.NewProc("PulseEvent")
-	procPurgeComm                                            = modkernel32.NewProc("PurgeComm")
 	procQueryDosDeviceW                                      = modkernel32.NewProc("QueryDosDeviceW")
 	procQueryFullProcessImageNameW                           = modkernel32.NewProc("QueryFullProcessImageNameW")
 	procQueryInformationJobObject                            = modkernel32.NewProc("QueryInformationJobObject")
 	procReadConsoleW                                         = modkernel32.NewProc("ReadConsoleW")
 	procReadDirectoryChangesW                                = modkernel32.NewProc("ReadDirectoryChangesW")
 	procReadFile                                             = modkernel32.NewProc("ReadFile")
-	procReadProcessMemory                                    = modkernel32.NewProc("ReadProcessMemory")
 	procReleaseMutex                                         = modkernel32.NewProc("ReleaseMutex")
 	procRemoveDirectoryW                                     = modkernel32.NewProc("RemoveDirectoryW")
-	procRemoveDllDirectory                                   = modkernel32.NewProc("RemoveDllDirectory")
 	procResetEvent                                           = modkernel32.NewProc("ResetEvent")
-	procResizePseudoConsole                                  = modkernel32.NewProc("ResizePseudoConsole")
 	procResumeThread                                         = modkernel32.NewProc("ResumeThread")
-	procSetCommBreak                                         = modkernel32.NewProc("SetCommBreak")
-	procSetCommMask                                          = modkernel32.NewProc("SetCommMask")
-	procSetCommState                                         = modkernel32.NewProc("SetCommState")
 	procSetCommTimeouts                                      = modkernel32.NewProc("SetCommTimeouts")
-	procSetConsoleCP                                         = modkernel32.NewProc("SetConsoleCP")
 	procSetConsoleCursorPosition                             = modkernel32.NewProc("SetConsoleCursorPosition")
 	procSetConsoleMode                                       = modkernel32.NewProc("SetConsoleMode")
-	procSetConsoleOutputCP                                   = modkernel32.NewProc("SetConsoleOutputCP")
 	procSetCurrentDirectoryW                                 = modkernel32.NewProc("SetCurrentDirectoryW")
 	procSetDefaultDllDirectories                             = modkernel32.NewProc("SetDefaultDllDirectories")
 	procSetDllDirectoryW                                     = modkernel32.NewProc("SetDllDirectoryW")
@@ -372,7 +322,6 @@ var (
 	procSetFileInformationByHandle                           = modkernel32.NewProc("SetFileInformationByHandle")
 	procSetFilePointer                                       = modkernel32.NewProc("SetFilePointer")
 	procSetFileTime                                          = modkernel32.NewProc("SetFileTime")
-	procSetFileValidData                                     = modkernel32.NewProc("SetFileValidData")
 	procSetHandleInformation                                 = modkernel32.NewProc("SetHandleInformation")
 	procSetInformationJobObject                              = modkernel32.NewProc("SetInformationJobObject")
 	procSetNamedPipeHandleState                              = modkernel32.NewProc("SetNamedPipeHandleState")
@@ -383,7 +332,6 @@ var (
 	procSetStdHandle                                         = modkernel32.NewProc("SetStdHandle")
 	procSetVolumeLabelW                                      = modkernel32.NewProc("SetVolumeLabelW")
 	procSetVolumeMountPointW                                 = modkernel32.NewProc("SetVolumeMountPointW")
-	procSetupComm                                            = modkernel32.NewProc("SetupComm")
 	procSizeofResource                                       = modkernel32.NewProc("SizeofResource")
 	procSleepEx                                              = modkernel32.NewProc("SleepEx")
 	procTerminateJobObject                                   = modkernel32.NewProc("TerminateJobObject")
@@ -397,34 +345,23 @@ var (
 	procVirtualFree                                          = modkernel32.NewProc("VirtualFree")
 	procVirtualLock                                          = modkernel32.NewProc("VirtualLock")
 	procVirtualProtect                                       = modkernel32.NewProc("VirtualProtect")
-	procVirtualProtectEx                                     = modkernel32.NewProc("VirtualProtectEx")
-	procVirtualQuery                                         = modkernel32.NewProc("VirtualQuery")
-	procVirtualQueryEx                                       = modkernel32.NewProc("VirtualQueryEx")
 	procVirtualUnlock                                        = modkernel32.NewProc("VirtualUnlock")
 	procWTSGetActiveConsoleSessionId                         = modkernel32.NewProc("WTSGetActiveConsoleSessionId")
-	procWaitCommEvent                                        = modkernel32.NewProc("WaitCommEvent")
 	procWaitForMultipleObjects                               = modkernel32.NewProc("WaitForMultipleObjects")
 	procWaitForSingleObject                                  = modkernel32.NewProc("WaitForSingleObject")
 	procWriteConsoleW                                        = modkernel32.NewProc("WriteConsoleW")
 	procWriteFile                                            = modkernel32.NewProc("WriteFile")
-	procWriteProcessMemory                                   = modkernel32.NewProc("WriteProcessMemory")
 	procAcceptEx                                             = modmswsock.NewProc("AcceptEx")
 	procGetAcceptExSockaddrs                                 = modmswsock.NewProc("GetAcceptExSockaddrs")
 	procTransmitFile                                         = modmswsock.NewProc("TransmitFile")
 	procNetApiBufferFree                                     = modnetapi32.NewProc("NetApiBufferFree")
 	procNetGetJoinInformation                                = modnetapi32.NewProc("NetGetJoinInformation")
-	procNetUserEnum                                          = modnetapi32.NewProc("NetUserEnum")
 	procNetUserGetInfo                                       = modnetapi32.NewProc("NetUserGetInfo")
 	procNtCreateFile                                         = modntdll.NewProc("NtCreateFile")
 	procNtCreateNamedPipeFile                                = modntdll.NewProc("NtCreateNamedPipeFile")
 	procNtQueryInformationProcess                            = modntdll.NewProc("NtQueryInformationProcess")
-	procNtQuerySystemInformation                             = modntdll.NewProc("NtQuerySystemInformation")
-	procNtSetInformationFile                                 = modntdll.NewProc("NtSetInformationFile")
 	procNtSetInformationProcess                              = modntdll.NewProc("NtSetInformationProcess")
-	procNtSetSystemInformation                               = modntdll.NewProc("NtSetSystemInformation")
-	procRtlAddFunctionTable                                  = modntdll.NewProc("RtlAddFunctionTable")
 	procRtlDefaultNpAcl                                      = modntdll.NewProc("RtlDefaultNpAcl")
-	procRtlDeleteFunctionTable                               = modntdll.NewProc("RtlDeleteFunctionTable")
 	procRtlDosPathNameToNtPathName_U_WithStatus              = modntdll.NewProc("RtlDosPathNameToNtPathName_U_WithStatus")
 	procRtlDosPathNameToRelativeNtPathName_U_WithStatus      = modntdll.NewProc("RtlDosPathNameToRelativeNtPathName_U_WithStatus")
 	procRtlGetCurrentPeb                                     = modntdll.NewProc("RtlGetCurrentPeb")
@@ -440,84 +377,28 @@ var (
 	procCoTaskMemFree                                        = modole32.NewProc("CoTaskMemFree")
 	procCoUninitialize                                       = modole32.NewProc("CoUninitialize")
 	procStringFromGUID2                                      = modole32.NewProc("StringFromGUID2")
-	procEnumProcessModules                                   = modpsapi.NewProc("EnumProcessModules")
-	procEnumProcessModulesEx                                 = modpsapi.NewProc("EnumProcessModulesEx")
 	procEnumProcesses                                        = modpsapi.NewProc("EnumProcesses")
-	procGetModuleBaseNameW                                   = modpsapi.NewProc("GetModuleBaseNameW")
-	procGetModuleFileNameExW                                 = modpsapi.NewProc("GetModuleFileNameExW")
-	procGetModuleInformation                                 = modpsapi.NewProc("GetModuleInformation")
-	procQueryWorkingSetEx                                    = modpsapi.NewProc("QueryWorkingSetEx")
 	procSubscribeServiceChangeNotifications                  = modsechost.NewProc("SubscribeServiceChangeNotifications")
 	procUnsubscribeServiceChangeNotifications                = modsechost.NewProc("UnsubscribeServiceChangeNotifications")
 	procGetUserNameExW                                       = modsecur32.NewProc("GetUserNameExW")
 	procTranslateNameW                                       = modsecur32.NewProc("TranslateNameW")
-	procSetupDiBuildDriverInfoList                           = modsetupapi.NewProc("SetupDiBuildDriverInfoList")
-	procSetupDiCallClassInstaller                            = modsetupapi.NewProc("SetupDiCallClassInstaller")
-	procSetupDiCancelDriverInfoSearch                        = modsetupapi.NewProc("SetupDiCancelDriverInfoSearch")
-	procSetupDiClassGuidsFromNameExW                         = modsetupapi.NewProc("SetupDiClassGuidsFromNameExW")
-	procSetupDiClassNameFromGuidExW                          = modsetupapi.NewProc("SetupDiClassNameFromGuidExW")
-	procSetupDiCreateDeviceInfoListExW                       = modsetupapi.NewProc("SetupDiCreateDeviceInfoListExW")
-	procSetupDiCreateDeviceInfoW                             = modsetupapi.NewProc("SetupDiCreateDeviceInfoW")
-	procSetupDiDestroyDeviceInfoList                         = modsetupapi.NewProc("SetupDiDestroyDeviceInfoList")
-	procSetupDiDestroyDriverInfoList                         = modsetupapi.NewProc("SetupDiDestroyDriverInfoList")
-	procSetupDiEnumDeviceInfo                                = modsetupapi.NewProc("SetupDiEnumDeviceInfo")
-	procSetupDiEnumDriverInfoW                               = modsetupapi.NewProc("SetupDiEnumDriverInfoW")
-	procSetupDiGetClassDevsExW                               = modsetupapi.NewProc("SetupDiGetClassDevsExW")
-	procSetupDiGetClassInstallParamsW                        = modsetupapi.NewProc("SetupDiGetClassInstallParamsW")
-	procSetupDiGetDeviceInfoListDetailW                      = modsetupapi.NewProc("SetupDiGetDeviceInfoListDetailW")
-	procSetupDiGetDeviceInstallParamsW                       = modsetupapi.NewProc("SetupDiGetDeviceInstallParamsW")
-	procSetupDiGetDeviceInstanceIdW                          = modsetupapi.NewProc("SetupDiGetDeviceInstanceIdW")
-	procSetupDiGetDevicePropertyW                            = modsetupapi.NewProc("SetupDiGetDevicePropertyW")
-	procSetupDiGetDeviceRegistryPropertyW                    = modsetupapi.NewProc("SetupDiGetDeviceRegistryPropertyW")
-	procSetupDiGetDriverInfoDetailW                          = modsetupapi.NewProc("SetupDiGetDriverInfoDetailW")
-	procSetupDiGetSelectedDevice                             = modsetupapi.NewProc("SetupDiGetSelectedDevice")
-	procSetupDiGetSelectedDriverW                            = modsetupapi.NewProc("SetupDiGetSelectedDriverW")
-	procSetupDiOpenDevRegKey                                 = modsetupapi.NewProc("SetupDiOpenDevRegKey")
-	procSetupDiSetClassInstallParamsW                        = modsetupapi.NewProc("SetupDiSetClassInstallParamsW")
-	procSetupDiSetDeviceInstallParamsW                       = modsetupapi.NewProc("SetupDiSetDeviceInstallParamsW")
-	procSetupDiSetDeviceRegistryPropertyW                    = modsetupapi.NewProc("SetupDiSetDeviceRegistryPropertyW")
-	procSetupDiSetSelectedDevice                             = modsetupapi.NewProc("SetupDiSetSelectedDevice")
-	procSetupDiSetSelectedDriverW                            = modsetupapi.NewProc("SetupDiSetSelectedDriverW")
-	procSetupUninstallOEMInfW                                = modsetupapi.NewProc("SetupUninstallOEMInfW")
 	procCommandLineToArgvW                                   = modshell32.NewProc("CommandLineToArgvW")
 	procSHGetKnownFolderPath                                 = modshell32.NewProc("SHGetKnownFolderPath")
 	procShellExecuteW                                        = modshell32.NewProc("ShellExecuteW")
-	procEnumChildWindows                                     = moduser32.NewProc("EnumChildWindows")
-	procEnumWindows                                          = moduser32.NewProc("EnumWindows")
 	procExitWindowsEx                                        = moduser32.NewProc("ExitWindowsEx")
-	procGetClassNameW                                        = moduser32.NewProc("GetClassNameW")
-	procGetDesktopWindow                                     = moduser32.NewProc("GetDesktopWindow")
-	procGetForegroundWindow                                  = moduser32.NewProc("GetForegroundWindow")
-	procGetGUIThreadInfo                                     = moduser32.NewProc("GetGUIThreadInfo")
-	procGetKeyboardLayout                                    = moduser32.NewProc("GetKeyboardLayout")
 	procGetShellWindow                                       = moduser32.NewProc("GetShellWindow")
 	procGetWindowThreadProcessId                             = moduser32.NewProc("GetWindowThreadProcessId")
-	procIsWindow                                             = moduser32.NewProc("IsWindow")
-	procIsWindowUnicode                                      = moduser32.NewProc("IsWindowUnicode")
-	procIsWindowVisible                                      = moduser32.NewProc("IsWindowVisible")
-	procLoadKeyboardLayoutW                                  = moduser32.NewProc("LoadKeyboardLayoutW")
 	procMessageBoxW                                          = moduser32.NewProc("MessageBoxW")
-	procToUnicodeEx                                          = moduser32.NewProc("ToUnicodeEx")
-	procUnloadKeyboardLayout                                 = moduser32.NewProc("UnloadKeyboardLayout")
 	procCreateEnvironmentBlock                               = moduserenv.NewProc("CreateEnvironmentBlock")
 	procDestroyEnvironmentBlock                              = moduserenv.NewProc("DestroyEnvironmentBlock")
 	procGetUserProfileDirectoryW                             = moduserenv.NewProc("GetUserProfileDirectoryW")
-	procGetFileVersionInfoSizeW                              = modversion.NewProc("GetFileVersionInfoSizeW")
-	procGetFileVersionInfoW                                  = modversion.NewProc("GetFileVersionInfoW")
-	procVerQueryValueW                                       = modversion.NewProc("VerQueryValueW")
-	proctimeBeginPeriod                                      = modwinmm.NewProc("timeBeginPeriod")
-	proctimeEndPeriod                                        = modwinmm.NewProc("timeEndPeriod")
 	procWinVerifyTrustEx                                     = modwintrust.NewProc("WinVerifyTrustEx")
 	procFreeAddrInfoW                                        = modws2_32.NewProc("FreeAddrInfoW")
 	procGetAddrInfoW                                         = modws2_32.NewProc("GetAddrInfoW")
 	procWSACleanup                                           = modws2_32.NewProc("WSACleanup")
-	procWSADuplicateSocketW                                  = modws2_32.NewProc("WSADuplicateSocketW")
 	procWSAEnumProtocolsW                                    = modws2_32.NewProc("WSAEnumProtocolsW")
 	procWSAGetOverlappedResult                               = modws2_32.NewProc("WSAGetOverlappedResult")
 	procWSAIoctl                                             = modws2_32.NewProc("WSAIoctl")
-	procWSALookupServiceBeginW                               = modws2_32.NewProc("WSALookupServiceBeginW")
-	procWSALookupServiceEnd                                  = modws2_32.NewProc("WSALookupServiceEnd")
-	procWSALookupServiceNextW                                = modws2_32.NewProc("WSALookupServiceNextW")
 	procWSARecv                                              = modws2_32.NewProc("WSARecv")
 	procWSARecvFrom                                          = modws2_32.NewProc("WSARecvFrom")
 	procWSASend                                              = modws2_32.NewProc("WSASend")
@@ -545,30 +426,6 @@ var (
 	procWTSQueryUserToken                                    = modwtsapi32.NewProc("WTSQueryUserToken")
 )
 
-func cm_Get_DevNode_Status(status *uint32, problemNumber *uint32, devInst DEVINST, flags uint32) (ret CONFIGRET) {
-	r0, _, _ := syscall.Syscall6(procCM_Get_DevNode_Status.Addr(), 4, uintptr(unsafe.Pointer(status)), uintptr(unsafe.Pointer(problemNumber)), uintptr(devInst), uintptr(flags), 0, 0)
-	ret = CONFIGRET(r0)
-	return
-}
-
-func cm_Get_Device_Interface_List(interfaceClass *GUID, deviceID *uint16, buffer *uint16, bufferLen uint32, flags uint32) (ret CONFIGRET) {
-	r0, _, _ := syscall.Syscall6(procCM_Get_Device_Interface_ListW.Addr(), 5, uintptr(unsafe.Pointer(interfaceClass)), uintptr(unsafe.Pointer(deviceID)), uintptr(unsafe.Pointer(buffer)), uintptr(bufferLen), uintptr(flags), 0)
-	ret = CONFIGRET(r0)
-	return
-}
-
-func cm_Get_Device_Interface_List_Size(len *uint32, interfaceClass *GUID, deviceID *uint16, flags uint32) (ret CONFIGRET) {
-	r0, _, _ := syscall.Syscall6(procCM_Get_Device_Interface_List_SizeW.Addr(), 4, uintptr(unsafe.Pointer(len)), uintptr(unsafe.Pointer(interfaceClass)), uintptr(unsafe.Pointer(deviceID)), uintptr(flags), 0, 0)
-	ret = CONFIGRET(r0)
-	return
-}
-
-func cm_MapCrToWin32Err(configRet CONFIGRET, defaultWin32Error Errno) (ret Errno) {
-	r0, _, _ := syscall.Syscall(procCM_MapCrToWin32Err.Addr(), 2, uintptr(configRet), uintptr(defaultWin32Error), 0)
-	ret = Errno(r0)
-	return
-}
-
 func AdjustTokenGroups(token Token, resetToDefault bool, newstate *Tokengroups, buflen uint32, prevstate *Tokengroups, returnlen *uint32) (err error) {
 	var _p0 uint32
 	if resetToDefault {
@@ -775,14 +632,6 @@ func DuplicateTokenEx(existingToken Token, desiredAccess uint32, tokenAttributes
 	return
 }
 
-func EnumDependentServices(service Handle, activityState uint32, services *ENUM_SERVICE_STATUS, buffSize uint32, bytesNeeded *uint32, servicesReturned *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procEnumDependentServicesW.Addr(), 6, uintptr(service), uintptr(activityState), uintptr(unsafe.Pointer(services)), uintptr(buffSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) {
 	r1, _, e1 := syscall.Syscall12(procEnumServicesStatusExW.Addr(), 10, uintptr(mgr), uintptr(infoLevel), uintptr(serviceType), uintptr(serviceState), uintptr(unsafe.Pointer(services)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)), uintptr(unsafe.Pointer(resumeHandle)), uintptr(unsafe.Pointer(groupName)), 0, 0)
 	if r1 == 0 {
@@ -805,14 +654,6 @@ func FreeSid(sid *SID) (err error) {
 	return
 }
 
-func GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetAce.Addr(), 3, uintptr(unsafe.Pointer(acl)), uintptr(aceIndex), uintptr(unsafe.Pointer(pAce)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetLengthSid(sid *SID) (len uint32) {
 	r0, _, _ := syscall.Syscall(procGetLengthSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0)
 	len = uint32(r0)
@@ -1115,18 +956,6 @@ func QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, buf
 	return
 }
 
-func QueryServiceDynamicInformation(service Handle, infoLevel uint32, dynamicInfo unsafe.Pointer) (err error) {
-	err = procQueryServiceDynamicInformation.Find()
-	if err != nil {
-		return
-	}
-	r1, _, e1 := syscall.Syscall(procQueryServiceDynamicInformation.Addr(), 3, uintptr(service), uintptr(infoLevel), uintptr(dynamicInfo))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func QueryServiceLockStatus(mgr Handle, lockStatus *QUERY_SERVICE_LOCK_STATUS, bufSize uint32, bytesNeeded *uint32) (err error) {
 	r1, _, e1 := syscall.Syscall6(procQueryServiceLockStatusW.Addr(), 4, uintptr(mgr), uintptr(unsafe.Pointer(lockStatus)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), 0, 0)
 	if r1 == 0 {
@@ -1216,15 +1045,6 @@ func RegisterEventSource(uncServerName *uint16, sourceName *uint16) (handle Hand
 	return
 }
 
-func RegisterServiceCtrlHandlerEx(serviceName *uint16, handlerProc uintptr, context uintptr) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procRegisterServiceCtrlHandlerExW.Addr(), 3, uintptr(unsafe.Pointer(serviceName)), uintptr(handlerProc), uintptr(context))
-	handle = Handle(r0)
-	if handle == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func ReportEvent(log Handle, etype uint16, category uint16, eventId uint32, usrSId uintptr, numStrings uint16, dataSize uint32, strings **uint16, rawData *byte) (err error) {
 	r1, _, e1 := syscall.Syscall9(procReportEventW.Addr(), 9, uintptr(log), uintptr(etype), uintptr(category), uintptr(eventId), uintptr(usrSId), uintptr(numStrings), uintptr(dataSize), uintptr(unsafe.Pointer(strings)), uintptr(unsafe.Pointer(rawData)))
 	if r1 == 0 {
@@ -1598,30 +1418,6 @@ func DnsRecordListFree(rl *DNSRecord, freetype uint32) {
 	return
 }
 
-func DwmGetWindowAttribute(hwnd HWND, attribute uint32, value unsafe.Pointer, size uint32) (ret error) {
-	r0, _, _ := syscall.Syscall6(procDwmGetWindowAttribute.Addr(), 4, uintptr(hwnd), uintptr(attribute), uintptr(value), uintptr(size), 0, 0)
-	if r0 != 0 {
-		ret = syscall.Errno(r0)
-	}
-	return
-}
-
-func DwmSetWindowAttribute(hwnd HWND, attribute uint32, value unsafe.Pointer, size uint32) (ret error) {
-	r0, _, _ := syscall.Syscall6(procDwmSetWindowAttribute.Addr(), 4, uintptr(hwnd), uintptr(attribute), uintptr(value), uintptr(size), 0, 0)
-	if r0 != 0 {
-		ret = syscall.Errno(r0)
-	}
-	return
-}
-
-func CancelMibChangeNotify2(notificationHandle Handle) (errcode error) {
-	r0, _, _ := syscall.Syscall(procCancelMibChangeNotify2.Addr(), 1, uintptr(notificationHandle), 0, 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
 func GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) {
 	r0, _, _ := syscall.Syscall6(procGetAdaptersAddresses.Addr(), 5, uintptr(family), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(adapterAddresses)), uintptr(unsafe.Pointer(sizePointer)), 0)
 	if r0 != 0 {
@@ -1638,14 +1434,6 @@ func GetAdaptersInfo(ai *IpAdapterInfo, ol *uint32) (errcode error) {
 	return
 }
 
-func getBestInterfaceEx(sockaddr unsafe.Pointer, pdwBestIfIndex *uint32) (errcode error) {
-	r0, _, _ := syscall.Syscall(procGetBestInterfaceEx.Addr(), 2, uintptr(sockaddr), uintptr(unsafe.Pointer(pdwBestIfIndex)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
 func GetIfEntry(pIfRow *MibIfRow) (errcode error) {
 	r0, _, _ := syscall.Syscall(procGetIfEntry.Addr(), 1, uintptr(unsafe.Pointer(pIfRow)), 0, 0)
 	if r0 != 0 {
@@ -1654,55 +1442,6 @@ func GetIfEntry(pIfRow *MibIfRow) (errcode error) {
 	return
 }
 
-func GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) {
-	r0, _, _ := syscall.Syscall(procGetIfEntry2Ex.Addr(), 2, uintptr(level), uintptr(unsafe.Pointer(row)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) {
-	r0, _, _ := syscall.Syscall(procGetUnicastIpAddressEntry.Addr(), 1, uintptr(unsafe.Pointer(row)), 0, 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) {
-	var _p0 uint32
-	if initialNotification {
-		_p0 = 1
-	}
-	r0, _, _ := syscall.Syscall6(procNotifyIpInterfaceChange.Addr(), 5, uintptr(family), uintptr(callback), uintptr(callerContext), uintptr(_p0), uintptr(unsafe.Pointer(notificationHandle)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func NotifyUnicastIpAddressChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) {
-	var _p0 uint32
-	if initialNotification {
-		_p0 = 1
-	}
-	r0, _, _ := syscall.Syscall6(procNotifyUnicastIpAddressChange.Addr(), 5, uintptr(family), uintptr(callback), uintptr(callerContext), uintptr(_p0), uintptr(unsafe.Pointer(notificationHandle)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func AddDllDirectory(path *uint16) (cookie uintptr, err error) {
-	r0, _, e1 := syscall.Syscall(procAddDllDirectory.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
-	cookie = uintptr(r0)
-	if cookie == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func AssignProcessToJobObject(job Handle, process Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procAssignProcessToJobObject.Addr(), 2, uintptr(job), uintptr(process), 0)
 	if r1 == 0 {
@@ -1727,22 +1466,6 @@ func CancelIoEx(s Handle, o *Overlapped) (err error) {
 	return
 }
 
-func ClearCommBreak(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procClearCommBreak.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func ClearCommError(handle Handle, lpErrors *uint32, lpStat *ComStat) (err error) {
-	r1, _, e1 := syscall.Syscall(procClearCommError.Addr(), 3, uintptr(handle), uintptr(unsafe.Pointer(lpErrors)), uintptr(unsafe.Pointer(lpStat)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func CloseHandle(handle Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procCloseHandle.Addr(), 1, uintptr(handle), 0, 0)
 	if r1 == 0 {
@@ -1751,11 +1474,6 @@ func CloseHandle(handle Handle) (err error) {
 	return
 }
 
-func ClosePseudoConsole(console Handle) {
-	syscall.Syscall(procClosePseudoConsole.Addr(), 1, uintptr(console), 0, 0)
-	return
-}
-
 func ConnectNamedPipe(pipe Handle, overlapped *Overlapped) (err error) {
 	r1, _, e1 := syscall.Syscall(procConnectNamedPipe.Addr(), 2, uintptr(pipe), uintptr(unsafe.Pointer(overlapped)), 0)
 	if r1 == 0 {
@@ -1885,14 +1603,6 @@ func CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityA
 	return
 }
 
-func createPseudoConsole(size uint32, in Handle, out Handle, flags uint32, pconsole *Handle) (hr error) {
-	r0, _, _ := syscall.Syscall6(procCreatePseudoConsole.Addr(), 5, uintptr(size), uintptr(in), uintptr(out), uintptr(flags), uintptr(unsafe.Pointer(pconsole)), 0)
-	if r0 != 0 {
-		hr = syscall.Errno(r0)
-	}
-	return
-}
-
 func CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procCreateSymbolicLinkW.Addr(), 3, uintptr(unsafe.Pointer(symlinkfilename)), uintptr(unsafe.Pointer(targetfilename)), uintptr(flags))
 	if r1&0xff == 0 {
@@ -1947,14 +1657,6 @@ func DeviceIoControl(handle Handle, ioControlCode uint32, inBuffer *byte, inBuff
 	return
 }
 
-func DisconnectNamedPipe(pipe Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procDisconnectNamedPipe.Addr(), 1, uintptr(pipe), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error) {
 	var _p0 uint32
 	if bInheritHandle {
@@ -1967,28 +1669,11 @@ func DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetP
 	return
 }
 
-func EscapeCommFunction(handle Handle, dwFunc uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procEscapeCommFunction.Addr(), 2, uintptr(handle), uintptr(dwFunc), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func ExitProcess(exitcode uint32) {
 	syscall.Syscall(procExitProcess.Addr(), 1, uintptr(exitcode), 0, 0)
 	return
 }
 
-func ExpandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procExpandEnvironmentStringsW.Addr(), 3, uintptr(unsafe.Pointer(src)), uintptr(unsafe.Pointer(dst)), uintptr(size))
-	n = uint32(r0)
-	if n == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func FindClose(handle Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procFindClose.Addr(), 1, uintptr(handle), 0, 0)
 	if r1 == 0 {
@@ -2170,28 +1855,6 @@ func GetACP() (acp uint32) {
 	return
 }
 
-func GetActiveProcessorCount(groupNumber uint16) (ret uint32) {
-	r0, _, _ := syscall.Syscall(procGetActiveProcessorCount.Addr(), 1, uintptr(groupNumber), 0, 0)
-	ret = uint32(r0)
-	return
-}
-
-func GetCommModemStatus(handle Handle, lpModemStat *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetCommModemStatus.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(lpModemStat)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetCommState(handle Handle, lpDCB *DCB) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetCommState.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(lpDCB)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) {
 	r1, _, e1 := syscall.Syscall(procGetCommTimeouts.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(timeouts)), 0)
 	if r1 == 0 {
@@ -2222,15 +1885,6 @@ func GetComputerName(buf *uint16, n *uint32) (err error) {
 	return
 }
 
-func GetConsoleCP() (cp uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetConsoleCP.Addr(), 0, 0, 0, 0)
-	cp = uint32(r0)
-	if cp == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetConsoleMode(console Handle, mode *uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(mode)), 0)
 	if r1 == 0 {
@@ -2239,15 +1893,6 @@ func GetConsoleMode(console Handle, mode *uint32) (err error) {
 	return
 }
 
-func GetConsoleOutputCP() (cp uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetConsoleOutputCP.Addr(), 0, 0, 0, 0)
-	cp = uint32(r0)
-	if cp == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) {
 	r1, _, e1 := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(info)), 0)
 	if r1 == 0 {
@@ -2350,14 +1995,6 @@ func GetFileInformationByHandleEx(handle Handle, class uint32, outBuffer *byte,
 	return
 }
 
-func GetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetFileTime.Addr(), 4, uintptr(handle), uintptr(unsafe.Pointer(ctime)), uintptr(unsafe.Pointer(atime)), uintptr(unsafe.Pointer(wtime)), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetFileType(filehandle Handle) (n uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procGetFileType.Addr(), 1, uintptr(filehandle), 0, 0)
 	n = uint32(r0)
@@ -2385,12 +2022,6 @@ func GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) (
 	return
 }
 
-func GetLargePageMinimum() (size uintptr) {
-	r0, _, _ := syscall.Syscall(procGetLargePageMinimum.Addr(), 0, 0, 0, 0)
-	size = uintptr(r0)
-	return
-}
-
 func GetLastError() (lasterr error) {
 	r0, _, _ := syscall.Syscall(procGetLastError.Addr(), 0, 0, 0, 0)
 	if r0 != 0 {
@@ -2426,12 +2057,6 @@ func GetLongPathName(path *uint16, buf *uint16, buflen uint32) (n uint32, err er
 	return
 }
 
-func GetMaximumProcessorCount(groupNumber uint16) (ret uint32) {
-	r0, _, _ := syscall.Syscall(procGetMaximumProcessorCount.Addr(), 1, uintptr(groupNumber), 0, 0)
-	ret = uint32(r0)
-	return
-}
-
 func GetModuleFileName(module Handle, filename *uint16, size uint32) (n uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procGetModuleFileNameW.Addr(), 3, uintptr(module), uintptr(unsafe.Pointer(filename)), uintptr(size))
 	n = uint32(r0)
@@ -2449,14 +2074,6 @@ func GetModuleHandleEx(flags uint32, moduleName *uint16, module *Handle) (err er
 	return
 }
 
-func GetNamedPipeClientProcessId(pipe Handle, clientProcessID *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetNamedPipeClientProcessId.Addr(), 2, uintptr(pipe), uintptr(unsafe.Pointer(clientProcessID)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetNamedPipeHandleState(pipe Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) {
 	r1, _, e1 := syscall.Syscall9(procGetNamedPipeHandleStateW.Addr(), 7, uintptr(pipe), uintptr(unsafe.Pointer(state)), uintptr(unsafe.Pointer(curInstances)), uintptr(unsafe.Pointer(maxCollectionCount)), uintptr(unsafe.Pointer(collectDataTimeout)), uintptr(unsafe.Pointer(userName)), uintptr(maxUserNameSize), 0, 0)
 	if r1 == 0 {
@@ -2473,14 +2090,6 @@ func GetNamedPipeInfo(pipe Handle, flags *uint32, outSize *uint32, inSize *uint3
 	return
 }
 
-func GetNamedPipeServerProcessId(pipe Handle, serverProcessID *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetNamedPipeServerProcessId.Addr(), 2, uintptr(pipe), uintptr(unsafe.Pointer(serverProcessID)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func GetOverlappedResult(handle Handle, overlapped *Overlapped, done *uint32, wait bool) (err error) {
 	var _p0 uint32
 	if wait {
@@ -2575,8 +2184,11 @@ func GetShortPathName(longpath *uint16, shortpath *uint16, buflen uint32) (n uin
 	return
 }
 
-func getStartupInfo(startupInfo *StartupInfo) {
-	syscall.Syscall(procGetStartupInfoW.Addr(), 1, uintptr(unsafe.Pointer(startupInfo)), 0, 0)
+func GetStartupInfo(startupInfo *StartupInfo) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetStartupInfoW.Addr(), 1, uintptr(unsafe.Pointer(startupInfo)), 0, 0)
+	if r1 == 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -2845,22 +2457,6 @@ func MapViewOfFile(handle Handle, access uint32, offsetHigh uint32, offsetLow ui
 	return
 }
 
-func Module32First(snapshot Handle, moduleEntry *ModuleEntry32) (err error) {
-	r1, _, e1 := syscall.Syscall(procModule32FirstW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(moduleEntry)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func Module32Next(snapshot Handle, moduleEntry *ModuleEntry32) (err error) {
-	r1, _, e1 := syscall.Syscall(procModule32NextW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(moduleEntry)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func MoveFileEx(from *uint16, to *uint16, flags uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procMoveFileExW.Addr(), 3, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), uintptr(flags))
 	if r1 == 0 {
@@ -2978,14 +2574,6 @@ func PulseEvent(event Handle) (err error) {
 	return
 }
 
-func PurgeComm(handle Handle, dwFlags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procPurgeComm.Addr(), 2, uintptr(handle), uintptr(dwFlags), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procQueryDosDeviceW.Addr(), 3, uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)), uintptr(max))
 	n = uint32(r0)
@@ -3031,7 +2619,7 @@ func ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree
 	return
 }
 
-func readFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
+func ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
 	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
@@ -3043,14 +2631,6 @@ func readFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (
 	return
 }
 
-func ReadProcessMemory(process Handle, baseAddress uintptr, buffer *byte, size uintptr, numberOfBytesRead *uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall6(procReadProcessMemory.Addr(), 5, uintptr(process), uintptr(baseAddress), uintptr(unsafe.Pointer(buffer)), uintptr(size), uintptr(unsafe.Pointer(numberOfBytesRead)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func ReleaseMutex(mutex Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procReleaseMutex.Addr(), 1, uintptr(mutex), 0, 0)
 	if r1 == 0 {
@@ -3067,14 +2647,6 @@ func RemoveDirectory(path *uint16) (err error) {
 	return
 }
 
-func RemoveDllDirectory(cookie uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procRemoveDllDirectory.Addr(), 1, uintptr(cookie), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func ResetEvent(event Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procResetEvent.Addr(), 1, uintptr(event), 0, 0)
 	if r1 == 0 {
@@ -3083,14 +2655,6 @@ func ResetEvent(event Handle) (err error) {
 	return
 }
 
-func resizePseudoConsole(pconsole Handle, size uint32) (hr error) {
-	r0, _, _ := syscall.Syscall(procResizePseudoConsole.Addr(), 2, uintptr(pconsole), uintptr(size), 0)
-	if r0 != 0 {
-		hr = syscall.Errno(r0)
-	}
-	return
-}
-
 func ResumeThread(thread Handle) (ret uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procResumeThread.Addr(), 1, uintptr(thread), 0, 0)
 	ret = uint32(r0)
@@ -3100,30 +2664,6 @@ func ResumeThread(thread Handle) (ret uint32, err error) {
 	return
 }
 
-func SetCommBreak(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetCommBreak.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetCommMask(handle Handle, dwEvtMask uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetCommMask.Addr(), 2, uintptr(handle), uintptr(dwEvtMask), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetCommState(handle Handle, lpDCB *DCB) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetCommState.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(lpDCB)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) {
 	r1, _, e1 := syscall.Syscall(procSetCommTimeouts.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(timeouts)), 0)
 	if r1 == 0 {
@@ -3132,14 +2672,6 @@ func SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) {
 	return
 }
 
-func SetConsoleCP(cp uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetConsoleCP.Addr(), 1, uintptr(cp), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func setConsoleCursorPosition(console Handle, position uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procSetConsoleCursorPosition.Addr(), 2, uintptr(console), uintptr(position), 0)
 	if r1 == 0 {
@@ -3156,14 +2688,6 @@ func SetConsoleMode(console Handle, mode uint32) (err error) {
 	return
 }
 
-func SetConsoleOutputCP(cp uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetConsoleOutputCP.Addr(), 1, uintptr(cp), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func SetCurrentDirectory(path *uint16) (err error) {
 	r1, _, e1 := syscall.Syscall(procSetCurrentDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
 	if r1 == 0 {
@@ -3268,14 +2792,6 @@ func SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetim
 	return
 }
 
-func SetFileValidData(handle Handle, validDataLength int64) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetFileValidData.Addr(), 2, uintptr(handle), uintptr(validDataLength), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procSetHandleInformation.Addr(), 3, uintptr(handle), uintptr(mask), uintptr(flags))
 	if r1 == 0 {
@@ -3361,14 +2877,6 @@ func SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err erro
 	return
 }
 
-func SetupComm(handle Handle, dwInQueue uint32, dwOutQueue uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupComm.Addr(), 3, uintptr(handle), uintptr(dwInQueue), uintptr(dwOutQueue))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func SizeofResource(module Handle, resInfo Handle) (size uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procSizeofResource.Addr(), 2, uintptr(module), uintptr(resInfo), 0)
 	size = uint32(r0)
@@ -3477,30 +2985,6 @@ func VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect
 	return
 }
 
-func VirtualProtectEx(process Handle, address uintptr, size uintptr, newProtect uint32, oldProtect *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procVirtualProtectEx.Addr(), 5, uintptr(process), uintptr(address), uintptr(size), uintptr(newProtect), uintptr(unsafe.Pointer(oldProtect)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func VirtualQuery(address uintptr, buffer *MemoryBasicInformation, length uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procVirtualQuery.Addr(), 3, uintptr(address), uintptr(unsafe.Pointer(buffer)), uintptr(length))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func VirtualQueryEx(process Handle, address uintptr, buffer *MemoryBasicInformation, length uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall6(procVirtualQueryEx.Addr(), 4, uintptr(process), uintptr(address), uintptr(unsafe.Pointer(buffer)), uintptr(length), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func VirtualUnlock(addr uintptr, length uintptr) (err error) {
 	r1, _, e1 := syscall.Syscall(procVirtualUnlock.Addr(), 2, uintptr(addr), uintptr(length), 0)
 	if r1 == 0 {
@@ -3515,14 +2999,6 @@ func WTSGetActiveConsoleSessionId() (sessionID uint32) {
 	return
 }
 
-func WaitCommEvent(handle Handle, lpEvtMask *uint32, lpOverlapped *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall(procWaitCommEvent.Addr(), 3, uintptr(handle), uintptr(unsafe.Pointer(lpEvtMask)), uintptr(unsafe.Pointer(lpOverlapped)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func waitForMultipleObjects(count uint32, handles uintptr, waitAll bool, waitMilliseconds uint32) (event uint32, err error) {
 	var _p0 uint32
 	if waitAll {
@@ -3553,7 +3029,7 @@ func WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32,
 	return
 }
 
-func writeFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
+func WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
 	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
@@ -3565,14 +3041,6 @@ func writeFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped)
 	return
 }
 
-func WriteProcessMemory(process Handle, baseAddress uintptr, buffer *byte, size uintptr, numberOfBytesWritten *uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall6(procWriteProcessMemory.Addr(), 5, uintptr(process), uintptr(baseAddress), uintptr(unsafe.Pointer(buffer)), uintptr(size), uintptr(unsafe.Pointer(numberOfBytesWritten)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func AcceptEx(ls Handle, as Handle, buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, recvd *uint32, overlapped *Overlapped) (err error) {
 	r1, _, e1 := syscall.Syscall9(procAcceptEx.Addr(), 8, uintptr(ls), uintptr(as), uintptr(unsafe.Pointer(buf)), uintptr(rxdatalen), uintptr(laddrlen), uintptr(raddrlen), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(overlapped)), 0)
 	if r1 == 0 {
@@ -3610,14 +3078,6 @@ func NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (nete
 	return
 }
 
-func NetUserEnum(serverName *uint16, level uint32, filter uint32, buf **byte, prefMaxLen uint32, entriesRead *uint32, totalEntries *uint32, resumeHandle *uint32) (neterr error) {
-	r0, _, _ := syscall.Syscall9(procNetUserEnum.Addr(), 8, uintptr(unsafe.Pointer(serverName)), uintptr(level), uintptr(filter), uintptr(unsafe.Pointer(buf)), uintptr(prefMaxLen), uintptr(unsafe.Pointer(entriesRead)), uintptr(unsafe.Pointer(totalEntries)), uintptr(unsafe.Pointer(resumeHandle)), 0)
-	if r0 != 0 {
-		neterr = syscall.Errno(r0)
-	}
-	return
-}
-
 func NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) {
 	r0, _, _ := syscall.Syscall6(procNetUserGetInfo.Addr(), 4, uintptr(unsafe.Pointer(serverName)), uintptr(unsafe.Pointer(userName)), uintptr(level), uintptr(unsafe.Pointer(buf)), 0, 0)
 	if r0 != 0 {
@@ -3650,22 +3110,6 @@ func NtQueryInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe
 	return
 }
 
-func NtQuerySystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32, retLen *uint32) (ntstatus error) {
-	r0, _, _ := syscall.Syscall6(procNtQuerySystemInformation.Addr(), 4, uintptr(sysInfoClass), uintptr(sysInfo), uintptr(sysInfoLen), uintptr(unsafe.Pointer(retLen)), 0, 0)
-	if r0 != 0 {
-		ntstatus = NTStatus(r0)
-	}
-	return
-}
-
-func NtSetInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32, class uint32) (ntstatus error) {
-	r0, _, _ := syscall.Syscall6(procNtSetInformationFile.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(iosb)), uintptr(unsafe.Pointer(inBuffer)), uintptr(inBufferLen), uintptr(class), 0)
-	if r0 != 0 {
-		ntstatus = NTStatus(r0)
-	}
-	return
-}
-
 func NtSetInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.Pointer, procInfoLen uint32) (ntstatus error) {
 	r0, _, _ := syscall.Syscall6(procNtSetInformationProcess.Addr(), 4, uintptr(proc), uintptr(procInfoClass), uintptr(procInfo), uintptr(procInfoLen), 0, 0)
 	if r0 != 0 {
@@ -3674,20 +3118,6 @@ func NtSetInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.P
 	return
 }
 
-func NtSetSystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32) (ntstatus error) {
-	r0, _, _ := syscall.Syscall(procNtSetSystemInformation.Addr(), 3, uintptr(sysInfoClass), uintptr(sysInfo), uintptr(sysInfoLen))
-	if r0 != 0 {
-		ntstatus = NTStatus(r0)
-	}
-	return
-}
-
-func RtlAddFunctionTable(functionTable *RUNTIME_FUNCTION, entryCount uint32, baseAddress uintptr) (ret bool) {
-	r0, _, _ := syscall.Syscall(procRtlAddFunctionTable.Addr(), 3, uintptr(unsafe.Pointer(functionTable)), uintptr(entryCount), uintptr(baseAddress))
-	ret = r0 != 0
-	return
-}
-
 func RtlDefaultNpAcl(acl **ACL) (ntstatus error) {
 	r0, _, _ := syscall.Syscall(procRtlDefaultNpAcl.Addr(), 1, uintptr(unsafe.Pointer(acl)), 0, 0)
 	if r0 != 0 {
@@ -3696,12 +3126,6 @@ func RtlDefaultNpAcl(acl **ACL) (ntstatus error) {
 	return
 }
 
-func RtlDeleteFunctionTable(functionTable *RUNTIME_FUNCTION) (ret bool) {
-	r0, _, _ := syscall.Syscall(procRtlDeleteFunctionTable.Addr(), 1, uintptr(unsafe.Pointer(functionTable)), 0, 0)
-	ret = r0 != 0
-	return
-}
-
 func RtlDosPathNameToNtPathName(dosName *uint16, ntName *NTUnicodeString, ntFileNamePart *uint16, relativeName *RTL_RELATIVE_NAME) (ntstatus error) {
 	r0, _, _ := syscall.Syscall6(procRtlDosPathNameToNtPathName_U_WithStatus.Addr(), 4, uintptr(unsafe.Pointer(dosName)), uintptr(unsafe.Pointer(ntName)), uintptr(unsafe.Pointer(ntFileNamePart)), uintptr(unsafe.Pointer(relativeName)), 0, 0)
 	if r0 != 0 {
@@ -3801,56 +3225,12 @@ func stringFromGUID2(rguid *GUID, lpsz *uint16, cchMax int32) (chars int32) {
 	return
 }
 
-func EnumProcessModules(process Handle, module *Handle, cb uint32, cbNeeded *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procEnumProcessModules.Addr(), 4, uintptr(process), uintptr(unsafe.Pointer(module)), uintptr(cb), uintptr(unsafe.Pointer(cbNeeded)), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
+func EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) {
+	var _p0 *uint32
+	if len(processIds) > 0 {
+		_p0 = &processIds[0]
 	}
-	return
-}
-
-func EnumProcessModulesEx(process Handle, module *Handle, cb uint32, cbNeeded *uint32, filterFlag uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procEnumProcessModulesEx.Addr(), 5, uintptr(process), uintptr(unsafe.Pointer(module)), uintptr(cb), uintptr(unsafe.Pointer(cbNeeded)), uintptr(filterFlag), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(processIds)), uintptr(nSize), uintptr(unsafe.Pointer(bytesReturned)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetModuleBaseName(process Handle, module Handle, baseName *uint16, size uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetModuleBaseNameW.Addr(), 4, uintptr(process), uintptr(module), uintptr(unsafe.Pointer(baseName)), uintptr(size), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetModuleFileNameEx(process Handle, module Handle, filename *uint16, size uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetModuleFileNameExW.Addr(), 4, uintptr(process), uintptr(module), uintptr(unsafe.Pointer(filename)), uintptr(size), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetModuleInformation(process Handle, module Handle, modinfo *ModuleInfo, cb uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetModuleInformation.Addr(), 4, uintptr(process), uintptr(module), uintptr(unsafe.Pointer(modinfo)), uintptr(cb), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func QueryWorkingSetEx(process Handle, pv uintptr, cb uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procQueryWorkingSetEx.Addr(), 3, uintptr(process), uintptr(pv), uintptr(cb))
+	r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(processIds)), uintptr(unsafe.Pointer(bytesReturned)))
 	if r1 == 0 {
 		err = errnoErr(e1)
 	}
@@ -3894,236 +3274,9 @@ func TranslateName(accName *uint16, accNameFormat uint32, desiredNameFormat uint
 	return
 }
 
-func SetupDiBuildDriverInfoList(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiBuildDriverInfoList.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(driverType))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiCallClassInstaller(installFunction DI_FUNCTION, deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiCallClassInstaller.Addr(), 3, uintptr(installFunction), uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiCancelDriverInfoSearch(deviceInfoSet DevInfo) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiCancelDriverInfoSearch.Addr(), 1, uintptr(deviceInfoSet), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiClassGuidsFromNameEx(className *uint16, classGuidList *GUID, classGuidListSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiClassGuidsFromNameExW.Addr(), 6, uintptr(unsafe.Pointer(className)), uintptr(unsafe.Pointer(classGuidList)), uintptr(classGuidListSize), uintptr(unsafe.Pointer(requiredSize)), uintptr(unsafe.Pointer(machineName)), uintptr(reserved))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiClassNameFromGuidEx(classGUID *GUID, className *uint16, classNameSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiClassNameFromGuidExW.Addr(), 6, uintptr(unsafe.Pointer(classGUID)), uintptr(unsafe.Pointer(className)), uintptr(classNameSize), uintptr(unsafe.Pointer(requiredSize)), uintptr(unsafe.Pointer(machineName)), uintptr(reserved))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiCreateDeviceInfoListEx(classGUID *GUID, hwndParent uintptr, machineName *uint16, reserved uintptr) (handle DevInfo, err error) {
-	r0, _, e1 := syscall.Syscall6(procSetupDiCreateDeviceInfoListExW.Addr(), 4, uintptr(unsafe.Pointer(classGUID)), uintptr(hwndParent), uintptr(unsafe.Pointer(machineName)), uintptr(reserved), 0, 0)
-	handle = DevInfo(r0)
-	if handle == DevInfo(InvalidHandle) {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiCreateDeviceInfo(deviceInfoSet DevInfo, DeviceName *uint16, classGUID *GUID, DeviceDescription *uint16, hwndParent uintptr, CreationFlags DICD, deviceInfoData *DevInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall9(procSetupDiCreateDeviceInfoW.Addr(), 7, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(DeviceName)), uintptr(unsafe.Pointer(classGUID)), uintptr(unsafe.Pointer(DeviceDescription)), uintptr(hwndParent), uintptr(CreationFlags), uintptr(unsafe.Pointer(deviceInfoData)), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiDestroyDeviceInfoList(deviceInfoSet DevInfo) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiDestroyDeviceInfoList.Addr(), 1, uintptr(deviceInfoSet), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiDestroyDriverInfoList(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiDestroyDriverInfoList.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(driverType))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiEnumDeviceInfo(deviceInfoSet DevInfo, memberIndex uint32, deviceInfoData *DevInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiEnumDeviceInfo.Addr(), 3, uintptr(deviceInfoSet), uintptr(memberIndex), uintptr(unsafe.Pointer(deviceInfoData)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiEnumDriverInfo(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverType SPDIT, memberIndex uint32, driverInfoData *DrvInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiEnumDriverInfoW.Addr(), 5, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(driverType), uintptr(memberIndex), uintptr(unsafe.Pointer(driverInfoData)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetClassDevsEx(classGUID *GUID, Enumerator *uint16, hwndParent uintptr, Flags DIGCF, deviceInfoSet DevInfo, machineName *uint16, reserved uintptr) (handle DevInfo, err error) {
-	r0, _, e1 := syscall.Syscall9(procSetupDiGetClassDevsExW.Addr(), 7, uintptr(unsafe.Pointer(classGUID)), uintptr(unsafe.Pointer(Enumerator)), uintptr(hwndParent), uintptr(Flags), uintptr(deviceInfoSet), uintptr(unsafe.Pointer(machineName)), uintptr(reserved), 0, 0)
-	handle = DevInfo(r0)
-	if handle == DevInfo(InvalidHandle) {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiGetClassInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32, requiredSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiGetClassInstallParamsW.Addr(), 5, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(classInstallParams)), uintptr(classInstallParamsSize), uintptr(unsafe.Pointer(requiredSize)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDeviceInfoListDetail(deviceInfoSet DevInfo, deviceInfoSetDetailData *DevInfoListDetailData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiGetDeviceInfoListDetailW.Addr(), 2, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoSetDetailData)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiGetDeviceInstallParamsW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(deviceInstallParams)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDeviceInstanceId(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, instanceId *uint16, instanceIdSize uint32, instanceIdRequiredSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiGetDeviceInstanceIdW.Addr(), 5, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(instanceId)), uintptr(instanceIdSize), uintptr(unsafe.Pointer(instanceIdRequiredSize)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDeviceProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, propertyKey *DEVPROPKEY, propertyType *DEVPROPTYPE, propertyBuffer *byte, propertyBufferSize uint32, requiredSize *uint32, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procSetupDiGetDevicePropertyW.Addr(), 8, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(propertyKey)), uintptr(unsafe.Pointer(propertyType)), uintptr(unsafe.Pointer(propertyBuffer)), uintptr(propertyBufferSize), uintptr(unsafe.Pointer(requiredSize)), uintptr(flags), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP, propertyRegDataType *uint32, propertyBuffer *byte, propertyBufferSize uint32, requiredSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procSetupDiGetDeviceRegistryPropertyW.Addr(), 7, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(property), uintptr(unsafe.Pointer(propertyRegDataType)), uintptr(unsafe.Pointer(propertyBuffer)), uintptr(propertyBufferSize), uintptr(unsafe.Pointer(requiredSize)), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetDriverInfoDetail(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData, driverInfoDetailData *DrvInfoDetailData, driverInfoDetailDataSize uint32, requiredSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiGetDriverInfoDetailW.Addr(), 6, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(driverInfoData)), uintptr(unsafe.Pointer(driverInfoDetailData)), uintptr(driverInfoDetailDataSize), uintptr(unsafe.Pointer(requiredSize)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiGetSelectedDevice.Addr(), 2, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiGetSelectedDriver(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiGetSelectedDriverW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(driverInfoData)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiOpenDevRegKey(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, Scope DICS_FLAG, HwProfile uint32, KeyType DIREG, samDesired uint32) (key Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procSetupDiOpenDevRegKey.Addr(), 6, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(Scope), uintptr(HwProfile), uintptr(KeyType), uintptr(samDesired))
-	key = Handle(r0)
-	if key == InvalidHandle {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiSetClassInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, classInstallParams *ClassInstallHeader, classInstallParamsSize uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiSetClassInstallParamsW.Addr(), 4, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(classInstallParams)), uintptr(classInstallParamsSize), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiSetDeviceInstallParamsW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(deviceInstallParams)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupDiSetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, property SPDRP, propertyBuffer *byte, propertyBufferSize uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetupDiSetDeviceRegistryPropertyW.Addr(), 5, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(property), uintptr(unsafe.Pointer(propertyBuffer)), uintptr(propertyBufferSize), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiSetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiSetSelectedDevice.Addr(), 2, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func SetupDiSetSelectedDriver(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, driverInfoData *DrvInfoData) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupDiSetSelectedDriverW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(driverInfoData)))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func setupUninstallOEMInf(infFileName *uint16, flags SUOI, reserved uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetupUninstallOEMInfW.Addr(), 3, uintptr(unsafe.Pointer(infFileName)), uintptr(flags), uintptr(reserved))
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func commandLineToArgv(cmd *uint16, argc *int32) (argv **uint16, err error) {
+func CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) {
 	r0, _, e1 := syscall.Syscall(procCommandLineToArgvW.Addr(), 2, uintptr(unsafe.Pointer(cmd)), uintptr(unsafe.Pointer(argc)), 0)
-	argv = (**uint16)(unsafe.Pointer(r0))
+	argv = (*[8192]*[8192]uint16)(unsafe.Pointer(r0))
 	if argv == nil {
 		err = errnoErr(e1)
 	}
@@ -4146,19 +3299,6 @@ func ShellExecute(hwnd Handle, verb *uint16, file *uint16, args *uint16, cwd *ui
 	return
 }
 
-func EnumChildWindows(hwnd HWND, enumFunc uintptr, param unsafe.Pointer) {
-	syscall.Syscall(procEnumChildWindows.Addr(), 3, uintptr(hwnd), uintptr(enumFunc), uintptr(param))
-	return
-}
-
-func EnumWindows(enumFunc uintptr, param unsafe.Pointer) (err error) {
-	r1, _, e1 := syscall.Syscall(procEnumWindows.Addr(), 2, uintptr(enumFunc), uintptr(param), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func ExitWindowsEx(flags uint32, reason uint32) (err error) {
 	r1, _, e1 := syscall.Syscall(procExitWindowsEx.Addr(), 2, uintptr(flags), uintptr(reason), 0)
 	if r1 == 0 {
@@ -4167,41 +3307,6 @@ func ExitWindowsEx(flags uint32, reason uint32) (err error) {
 	return
 }
 
-func GetClassName(hwnd HWND, className *uint16, maxCount int32) (copied int32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetClassNameW.Addr(), 3, uintptr(hwnd), uintptr(unsafe.Pointer(className)), uintptr(maxCount))
-	copied = int32(r0)
-	if copied == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetDesktopWindow() (hwnd HWND) {
-	r0, _, _ := syscall.Syscall(procGetDesktopWindow.Addr(), 0, 0, 0, 0)
-	hwnd = HWND(r0)
-	return
-}
-
-func GetForegroundWindow() (hwnd HWND) {
-	r0, _, _ := syscall.Syscall(procGetForegroundWindow.Addr(), 0, 0, 0, 0)
-	hwnd = HWND(r0)
-	return
-}
-
-func GetGUIThreadInfo(thread uint32, info *GUIThreadInfo) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetGUIThreadInfo.Addr(), 2, uintptr(thread), uintptr(unsafe.Pointer(info)), 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetKeyboardLayout(tid uint32) (hkl Handle) {
-	r0, _, _ := syscall.Syscall(procGetKeyboardLayout.Addr(), 1, uintptr(tid), 0, 0)
-	hkl = Handle(r0)
-	return
-}
-
 func GetShellWindow() (shellWindow HWND) {
 	r0, _, _ := syscall.Syscall(procGetShellWindow.Addr(), 0, 0, 0, 0)
 	shellWindow = HWND(r0)
@@ -4217,33 +3322,6 @@ func GetWindowThreadProcessId(hwnd HWND, pid *uint32) (tid uint32, err error) {
 	return
 }
 
-func IsWindow(hwnd HWND) (isWindow bool) {
-	r0, _, _ := syscall.Syscall(procIsWindow.Addr(), 1, uintptr(hwnd), 0, 0)
-	isWindow = r0 != 0
-	return
-}
-
-func IsWindowUnicode(hwnd HWND) (isUnicode bool) {
-	r0, _, _ := syscall.Syscall(procIsWindowUnicode.Addr(), 1, uintptr(hwnd), 0, 0)
-	isUnicode = r0 != 0
-	return
-}
-
-func IsWindowVisible(hwnd HWND) (isVisible bool) {
-	r0, _, _ := syscall.Syscall(procIsWindowVisible.Addr(), 1, uintptr(hwnd), 0, 0)
-	isVisible = r0 != 0
-	return
-}
-
-func LoadKeyboardLayout(name *uint16, flags uint32) (hkl Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procLoadKeyboardLayoutW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(flags), 0)
-	hkl = Handle(r0)
-	if hkl == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret int32, err error) {
 	r0, _, e1 := syscall.Syscall6(procMessageBoxW.Addr(), 4, uintptr(hwnd), uintptr(unsafe.Pointer(text)), uintptr(unsafe.Pointer(caption)), uintptr(boxtype), 0, 0)
 	ret = int32(r0)
@@ -4253,20 +3331,6 @@ func MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret i
 	return
 }
 
-func ToUnicodeEx(vkey uint32, scancode uint32, keystate *byte, pwszBuff *uint16, cchBuff int32, flags uint32, hkl Handle) (ret int32) {
-	r0, _, _ := syscall.Syscall9(procToUnicodeEx.Addr(), 7, uintptr(vkey), uintptr(scancode), uintptr(unsafe.Pointer(keystate)), uintptr(unsafe.Pointer(pwszBuff)), uintptr(cchBuff), uintptr(flags), uintptr(hkl), 0, 0)
-	ret = int32(r0)
-	return
-}
-
-func UnloadKeyboardLayout(hkl Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procUnloadKeyboardLayout.Addr(), 1, uintptr(hkl), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func CreateEnvironmentBlock(block **uint16, token Token, inheritExisting bool) (err error) {
 	var _p0 uint32
 	if inheritExisting {
@@ -4295,74 +3359,6 @@ func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) {
 	return
 }
 
-func GetFileVersionInfoSize(filename string, zeroHandle *Handle) (bufSize uint32, err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(filename)
-	if err != nil {
-		return
-	}
-	return _GetFileVersionInfoSize(_p0, zeroHandle)
-}
-
-func _GetFileVersionInfoSize(filename *uint16, zeroHandle *Handle) (bufSize uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetFileVersionInfoSizeW.Addr(), 2, uintptr(unsafe.Pointer(filename)), uintptr(unsafe.Pointer(zeroHandle)), 0)
-	bufSize = uint32(r0)
-	if bufSize == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func GetFileVersionInfo(filename string, handle uint32, bufSize uint32, buffer unsafe.Pointer) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(filename)
-	if err != nil {
-		return
-	}
-	return _GetFileVersionInfo(_p0, handle, bufSize, buffer)
-}
-
-func _GetFileVersionInfo(filename *uint16, handle uint32, bufSize uint32, buffer unsafe.Pointer) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetFileVersionInfoW.Addr(), 4, uintptr(unsafe.Pointer(filename)), uintptr(handle), uintptr(bufSize), uintptr(buffer), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func VerQueryValue(block unsafe.Pointer, subBlock string, pointerToBufferPointer unsafe.Pointer, bufSize *uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(subBlock)
-	if err != nil {
-		return
-	}
-	return _VerQueryValue(block, _p0, pointerToBufferPointer, bufSize)
-}
-
-func _VerQueryValue(block unsafe.Pointer, subBlock *uint16, pointerToBufferPointer unsafe.Pointer, bufSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procVerQueryValueW.Addr(), 4, uintptr(block), uintptr(unsafe.Pointer(subBlock)), uintptr(pointerToBufferPointer), uintptr(unsafe.Pointer(bufSize)), 0, 0)
-	if r1 == 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func TimeBeginPeriod(period uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(proctimeBeginPeriod.Addr(), 1, uintptr(period), 0, 0)
-	if r1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func TimeEndPeriod(period uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(proctimeEndPeriod.Addr(), 1, uintptr(period), 0, 0)
-	if r1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func WinVerifyTrustEx(hwnd HWND, actionId *GUID, data *WinTrustData) (ret error) {
 	r0, _, _ := syscall.Syscall(procWinVerifyTrustEx.Addr(), 3, uintptr(hwnd), uintptr(unsafe.Pointer(actionId)), uintptr(unsafe.Pointer(data)))
 	if r0 != 0 {
@@ -4392,14 +3388,6 @@ func WSACleanup() (err error) {
 	return
 }
 
-func WSADuplicateSocket(s Handle, processID uint32, info *WSAProtocolInfo) (err error) {
-	r1, _, e1 := syscall.Syscall(procWSADuplicateSocketW.Addr(), 3, uintptr(s), uintptr(processID), uintptr(unsafe.Pointer(info)))
-	if r1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func WSAEnumProtocols(protocols *int32, protocolBuffer *WSAProtocolInfo, bufferLength *uint32) (n int32, err error) {
 	r0, _, e1 := syscall.Syscall(procWSAEnumProtocolsW.Addr(), 3, uintptr(unsafe.Pointer(protocols)), uintptr(unsafe.Pointer(protocolBuffer)), uintptr(unsafe.Pointer(bufferLength)))
 	n = int32(r0)
@@ -4429,30 +3417,6 @@ func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbo
 	return
 }
 
-func WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procWSALookupServiceBeginW.Addr(), 3, uintptr(unsafe.Pointer(querySet)), uintptr(flags), uintptr(unsafe.Pointer(handle)))
-	if r1 == socket_error {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func WSALookupServiceEnd(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procWSALookupServiceEnd.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == socket_error {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) {
-	r1, _, e1 := syscall.Syscall6(procWSALookupServiceNextW.Addr(), 4, uintptr(handle), uintptr(flags), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(querySet)), 0, 0)
-	if r1 == socket_error {
-		err = errnoErr(e1)
-	}
-	return
-}
-
 func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) {
 	r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
 	if r1 == socket_error {
diff --git a/vendor/golang.org/x/text/AUTHORS b/vendor/golang.org/x/text/AUTHORS
new file mode 100644
index 0000000..15167cd
--- /dev/null
+++ b/vendor/golang.org/x/text/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/text/CONTRIBUTORS b/vendor/golang.org/x/text/CONTRIBUTORS
new file mode 100644
index 0000000..1c4577e
--- /dev/null
+++ b/vendor/golang.org/x/text/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/text/LICENSE b/vendor/golang.org/x/text/LICENSE
index 2a7cf70..6a66aea 100644
--- a/vendor/golang.org/x/text/LICENSE
+++ b/vendor/golang.org/x/text/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 The Go Authors.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google LLC nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0.go b/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0.go
index 784bb88..8a7392c 100644
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0.go
+++ b/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
+// +build go1.10
 
 package bidirule
 
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0.go b/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0.go
index 8e1e943..bb0a920 100644
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0.go
+++ b/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.10
+// +build !go1.10
 
 package bidirule
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/core.go b/vendor/golang.org/x/text/unicode/bidi/core.go
index 9d2ae54..e4c0811 100644
--- a/vendor/golang.org/x/text/unicode/bidi/core.go
+++ b/vendor/golang.org/x/text/unicode/bidi/core.go
@@ -193,14 +193,14 @@ func (p *paragraph) run() {
 //
 // At the end of this function:
 //
-//   - The member variable matchingPDI is set to point to the index of the
-//     matching PDI character for each isolate initiator character. If there is
-//     no matching PDI, it is set to the length of the input text. For other
-//     characters, it is set to -1.
-//   - The member variable matchingIsolateInitiator is set to point to the
-//     index of the matching isolate initiator character for each PDI character.
-//     If there is no matching isolate initiator, or the character is not a PDI,
-//     it is set to -1.
+//  - The member variable matchingPDI is set to point to the index of the
+//    matching PDI character for each isolate initiator character. If there is
+//    no matching PDI, it is set to the length of the input text. For other
+//    characters, it is set to -1.
+//  - The member variable matchingIsolateInitiator is set to point to the
+//    index of the matching isolate initiator character for each PDI character.
+//    If there is no matching isolate initiator, or the character is not a PDI,
+//    it is set to -1.
 func (p *paragraph) determineMatchingIsolates() {
 	p.matchingPDI = make([]int, p.Len())
 	p.matchingIsolateInitiator = make([]int, p.Len())
@@ -435,7 +435,7 @@ func maxLevel(a, b level) level {
 }
 
 // Rule X10, second bullet: Determine the start-of-sequence (sos) and end-of-sequence (eos) types,
-// either L or R, for each isolating run sequence.
+// 			 either L or R, for each isolating run sequence.
 func (p *paragraph) isolatingRunSequence(indexes []int) *isolatingRunSequence {
 	length := len(indexes)
 	types := make([]Class, length)
@@ -495,9 +495,9 @@ func (s *isolatingRunSequence) resolveWeakTypes() {
 		if t == NSM {
 			s.types[i] = precedingCharacterType
 		} else {
-			// if t.in(LRI, RLI, FSI, PDI) {
-			// 	precedingCharacterType = ON
-			// }
+			if t.in(LRI, RLI, FSI, PDI) {
+				precedingCharacterType = ON
+			}
 			precedingCharacterType = t
 		}
 	}
@@ -905,7 +905,7 @@ func (p *paragraph) getLevels(linebreaks []int) []level {
 // Lines are concatenated from left to right. So for example, the fifth
 // character from the left on the third line is
 //
-//	getReordering(linebreaks)[linebreaks[1] + 4]
+// 		getReordering(linebreaks)[linebreaks[1] + 4]
 //
 // (linebreaks[1] is the position after the last character of the second
 // line, which is also the index of the first character on the third line,
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables10.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables10.0.0.go
index d2bd711..42fa8d7 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables10.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables10.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.10 && !go1.13
+// +build go1.10,!go1.13
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go
index f76bdca..56a0e1e 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.13 && !go1.14
+// +build go1.13,!go1.14
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go
index 3aa2c3b..baacf32 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.14 && !go1.16
+// +build go1.14,!go1.16
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
index a713757..f248eff 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16 && !go1.21
+//go:build go1.16
+// +build go1.16
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go
deleted file mode 100644
index f15746f..0000000
--- a/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go
+++ /dev/null
@@ -1,2042 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-//go:build go1.21
-
-package bidi
-
-// UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "15.0.0"
-
-// xorMasks contains masks to be xor-ed with brackets to get the reverse
-// version.
-var xorMasks = []int32{ // 8 elements
-	0, 1, 6, 7, 3, 15, 29, 63,
-} // Size: 56 bytes
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *bidiTrie) lookup(s []byte) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return bidiValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *bidiTrie) lookupUnsafe(s []byte) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return bidiValues[c0]
-	}
-	i := bidiIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *bidiTrie) lookupString(s string) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return bidiValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *bidiTrie) lookupStringUnsafe(s string) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return bidiValues[c0]
-	}
-	i := bidiIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// bidiTrie. Total size: 19904 bytes (19.44 KiB). Checksum: b1f201ed2debb6c8.
-type bidiTrie struct{}
-
-func newBidiTrie(i int) *bidiTrie {
-	return &bidiTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *bidiTrie) lookupValue(n uint32, b byte) uint8 {
-	switch {
-	default:
-		return uint8(bidiValues[n<<6+uint32(b)])
-	}
-}
-
-// bidiValues: 259 blocks, 16576 entries, 16576 bytes
-// The third block is the zero block.
-var bidiValues = [16576]uint8{
-	// Block 0x0, offset 0x0
-	0x00: 0x000b, 0x01: 0x000b, 0x02: 0x000b, 0x03: 0x000b, 0x04: 0x000b, 0x05: 0x000b,
-	0x06: 0x000b, 0x07: 0x000b, 0x08: 0x000b, 0x09: 0x0008, 0x0a: 0x0007, 0x0b: 0x0008,
-	0x0c: 0x0009, 0x0d: 0x0007, 0x0e: 0x000b, 0x0f: 0x000b, 0x10: 0x000b, 0x11: 0x000b,
-	0x12: 0x000b, 0x13: 0x000b, 0x14: 0x000b, 0x15: 0x000b, 0x16: 0x000b, 0x17: 0x000b,
-	0x18: 0x000b, 0x19: 0x000b, 0x1a: 0x000b, 0x1b: 0x000b, 0x1c: 0x0007, 0x1d: 0x0007,
-	0x1e: 0x0007, 0x1f: 0x0008, 0x20: 0x0009, 0x21: 0x000a, 0x22: 0x000a, 0x23: 0x0004,
-	0x24: 0x0004, 0x25: 0x0004, 0x26: 0x000a, 0x27: 0x000a, 0x28: 0x003a, 0x29: 0x002a,
-	0x2a: 0x000a, 0x2b: 0x0003, 0x2c: 0x0006, 0x2d: 0x0003, 0x2e: 0x0006, 0x2f: 0x0006,
-	0x30: 0x0002, 0x31: 0x0002, 0x32: 0x0002, 0x33: 0x0002, 0x34: 0x0002, 0x35: 0x0002,
-	0x36: 0x0002, 0x37: 0x0002, 0x38: 0x0002, 0x39: 0x0002, 0x3a: 0x0006, 0x3b: 0x000a,
-	0x3c: 0x000a, 0x3d: 0x000a, 0x3e: 0x000a, 0x3f: 0x000a,
-	// Block 0x1, offset 0x40
-	0x40: 0x000a,
-	0x5b: 0x005a, 0x5c: 0x000a, 0x5d: 0x004a,
-	0x5e: 0x000a, 0x5f: 0x000a, 0x60: 0x000a,
-	0x7b: 0x005a,
-	0x7c: 0x000a, 0x7d: 0x004a, 0x7e: 0x000a, 0x7f: 0x000b,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x000b, 0xc1: 0x000b, 0xc2: 0x000b, 0xc3: 0x000b, 0xc4: 0x000b, 0xc5: 0x0007,
-	0xc6: 0x000b, 0xc7: 0x000b, 0xc8: 0x000b, 0xc9: 0x000b, 0xca: 0x000b, 0xcb: 0x000b,
-	0xcc: 0x000b, 0xcd: 0x000b, 0xce: 0x000b, 0xcf: 0x000b, 0xd0: 0x000b, 0xd1: 0x000b,
-	0xd2: 0x000b, 0xd3: 0x000b, 0xd4: 0x000b, 0xd5: 0x000b, 0xd6: 0x000b, 0xd7: 0x000b,
-	0xd8: 0x000b, 0xd9: 0x000b, 0xda: 0x000b, 0xdb: 0x000b, 0xdc: 0x000b, 0xdd: 0x000b,
-	0xde: 0x000b, 0xdf: 0x000b, 0xe0: 0x0006, 0xe1: 0x000a, 0xe2: 0x0004, 0xe3: 0x0004,
-	0xe4: 0x0004, 0xe5: 0x0004, 0xe6: 0x000a, 0xe7: 0x000a, 0xe8: 0x000a, 0xe9: 0x000a,
-	0xeb: 0x000a, 0xec: 0x000a, 0xed: 0x000b, 0xee: 0x000a, 0xef: 0x000a,
-	0xf0: 0x0004, 0xf1: 0x0004, 0xf2: 0x0002, 0xf3: 0x0002, 0xf4: 0x000a,
-	0xf6: 0x000a, 0xf7: 0x000a, 0xf8: 0x000a, 0xf9: 0x0002, 0xfb: 0x000a,
-	0xfc: 0x000a, 0xfd: 0x000a, 0xfe: 0x000a, 0xff: 0x000a,
-	// Block 0x4, offset 0x100
-	0x117: 0x000a,
-	0x137: 0x000a,
-	// Block 0x5, offset 0x140
-	0x179: 0x000a, 0x17a: 0x000a,
-	// Block 0x6, offset 0x180
-	0x182: 0x000a, 0x183: 0x000a, 0x184: 0x000a, 0x185: 0x000a,
-	0x186: 0x000a, 0x187: 0x000a, 0x188: 0x000a, 0x189: 0x000a, 0x18a: 0x000a, 0x18b: 0x000a,
-	0x18c: 0x000a, 0x18d: 0x000a, 0x18e: 0x000a, 0x18f: 0x000a,
-	0x192: 0x000a, 0x193: 0x000a, 0x194: 0x000a, 0x195: 0x000a, 0x196: 0x000a, 0x197: 0x000a,
-	0x198: 0x000a, 0x199: 0x000a, 0x19a: 0x000a, 0x19b: 0x000a, 0x19c: 0x000a, 0x19d: 0x000a,
-	0x19e: 0x000a, 0x19f: 0x000a,
-	0x1a5: 0x000a, 0x1a6: 0x000a, 0x1a7: 0x000a, 0x1a8: 0x000a, 0x1a9: 0x000a,
-	0x1aa: 0x000a, 0x1ab: 0x000a, 0x1ac: 0x000a, 0x1ad: 0x000a, 0x1af: 0x000a,
-	0x1b0: 0x000a, 0x1b1: 0x000a, 0x1b2: 0x000a, 0x1b3: 0x000a, 0x1b4: 0x000a, 0x1b5: 0x000a,
-	0x1b6: 0x000a, 0x1b7: 0x000a, 0x1b8: 0x000a, 0x1b9: 0x000a, 0x1ba: 0x000a, 0x1bb: 0x000a,
-	0x1bc: 0x000a, 0x1bd: 0x000a, 0x1be: 0x000a, 0x1bf: 0x000a,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x000c, 0x1c1: 0x000c, 0x1c2: 0x000c, 0x1c3: 0x000c, 0x1c4: 0x000c, 0x1c5: 0x000c,
-	0x1c6: 0x000c, 0x1c7: 0x000c, 0x1c8: 0x000c, 0x1c9: 0x000c, 0x1ca: 0x000c, 0x1cb: 0x000c,
-	0x1cc: 0x000c, 0x1cd: 0x000c, 0x1ce: 0x000c, 0x1cf: 0x000c, 0x1d0: 0x000c, 0x1d1: 0x000c,
-	0x1d2: 0x000c, 0x1d3: 0x000c, 0x1d4: 0x000c, 0x1d5: 0x000c, 0x1d6: 0x000c, 0x1d7: 0x000c,
-	0x1d8: 0x000c, 0x1d9: 0x000c, 0x1da: 0x000c, 0x1db: 0x000c, 0x1dc: 0x000c, 0x1dd: 0x000c,
-	0x1de: 0x000c, 0x1df: 0x000c, 0x1e0: 0x000c, 0x1e1: 0x000c, 0x1e2: 0x000c, 0x1e3: 0x000c,
-	0x1e4: 0x000c, 0x1e5: 0x000c, 0x1e6: 0x000c, 0x1e7: 0x000c, 0x1e8: 0x000c, 0x1e9: 0x000c,
-	0x1ea: 0x000c, 0x1eb: 0x000c, 0x1ec: 0x000c, 0x1ed: 0x000c, 0x1ee: 0x000c, 0x1ef: 0x000c,
-	0x1f0: 0x000c, 0x1f1: 0x000c, 0x1f2: 0x000c, 0x1f3: 0x000c, 0x1f4: 0x000c, 0x1f5: 0x000c,
-	0x1f6: 0x000c, 0x1f7: 0x000c, 0x1f8: 0x000c, 0x1f9: 0x000c, 0x1fa: 0x000c, 0x1fb: 0x000c,
-	0x1fc: 0x000c, 0x1fd: 0x000c, 0x1fe: 0x000c, 0x1ff: 0x000c,
-	// Block 0x8, offset 0x200
-	0x200: 0x000c, 0x201: 0x000c, 0x202: 0x000c, 0x203: 0x000c, 0x204: 0x000c, 0x205: 0x000c,
-	0x206: 0x000c, 0x207: 0x000c, 0x208: 0x000c, 0x209: 0x000c, 0x20a: 0x000c, 0x20b: 0x000c,
-	0x20c: 0x000c, 0x20d: 0x000c, 0x20e: 0x000c, 0x20f: 0x000c, 0x210: 0x000c, 0x211: 0x000c,
-	0x212: 0x000c, 0x213: 0x000c, 0x214: 0x000c, 0x215: 0x000c, 0x216: 0x000c, 0x217: 0x000c,
-	0x218: 0x000c, 0x219: 0x000c, 0x21a: 0x000c, 0x21b: 0x000c, 0x21c: 0x000c, 0x21d: 0x000c,
-	0x21e: 0x000c, 0x21f: 0x000c, 0x220: 0x000c, 0x221: 0x000c, 0x222: 0x000c, 0x223: 0x000c,
-	0x224: 0x000c, 0x225: 0x000c, 0x226: 0x000c, 0x227: 0x000c, 0x228: 0x000c, 0x229: 0x000c,
-	0x22a: 0x000c, 0x22b: 0x000c, 0x22c: 0x000c, 0x22d: 0x000c, 0x22e: 0x000c, 0x22f: 0x000c,
-	0x234: 0x000a, 0x235: 0x000a,
-	0x23e: 0x000a,
-	// Block 0x9, offset 0x240
-	0x244: 0x000a, 0x245: 0x000a,
-	0x247: 0x000a,
-	// Block 0xa, offset 0x280
-	0x2b6: 0x000a,
-	// Block 0xb, offset 0x2c0
-	0x2c3: 0x000c, 0x2c4: 0x000c, 0x2c5: 0x000c,
-	0x2c6: 0x000c, 0x2c7: 0x000c, 0x2c8: 0x000c, 0x2c9: 0x000c,
-	// Block 0xc, offset 0x300
-	0x30a: 0x000a,
-	0x30d: 0x000a, 0x30e: 0x000a, 0x30f: 0x0004, 0x310: 0x0001, 0x311: 0x000c,
-	0x312: 0x000c, 0x313: 0x000c, 0x314: 0x000c, 0x315: 0x000c, 0x316: 0x000c, 0x317: 0x000c,
-	0x318: 0x000c, 0x319: 0x000c, 0x31a: 0x000c, 0x31b: 0x000c, 0x31c: 0x000c, 0x31d: 0x000c,
-	0x31e: 0x000c, 0x31f: 0x000c, 0x320: 0x000c, 0x321: 0x000c, 0x322: 0x000c, 0x323: 0x000c,
-	0x324: 0x000c, 0x325: 0x000c, 0x326: 0x000c, 0x327: 0x000c, 0x328: 0x000c, 0x329: 0x000c,
-	0x32a: 0x000c, 0x32b: 0x000c, 0x32c: 0x000c, 0x32d: 0x000c, 0x32e: 0x000c, 0x32f: 0x000c,
-	0x330: 0x000c, 0x331: 0x000c, 0x332: 0x000c, 0x333: 0x000c, 0x334: 0x000c, 0x335: 0x000c,
-	0x336: 0x000c, 0x337: 0x000c, 0x338: 0x000c, 0x339: 0x000c, 0x33a: 0x000c, 0x33b: 0x000c,
-	0x33c: 0x000c, 0x33d: 0x000c, 0x33e: 0x0001, 0x33f: 0x000c,
-	// Block 0xd, offset 0x340
-	0x340: 0x0001, 0x341: 0x000c, 0x342: 0x000c, 0x343: 0x0001, 0x344: 0x000c, 0x345: 0x000c,
-	0x346: 0x0001, 0x347: 0x000c, 0x348: 0x0001, 0x349: 0x0001, 0x34a: 0x0001, 0x34b: 0x0001,
-	0x34c: 0x0001, 0x34d: 0x0001, 0x34e: 0x0001, 0x34f: 0x0001, 0x350: 0x0001, 0x351: 0x0001,
-	0x352: 0x0001, 0x353: 0x0001, 0x354: 0x0001, 0x355: 0x0001, 0x356: 0x0001, 0x357: 0x0001,
-	0x358: 0x0001, 0x359: 0x0001, 0x35a: 0x0001, 0x35b: 0x0001, 0x35c: 0x0001, 0x35d: 0x0001,
-	0x35e: 0x0001, 0x35f: 0x0001, 0x360: 0x0001, 0x361: 0x0001, 0x362: 0x0001, 0x363: 0x0001,
-	0x364: 0x0001, 0x365: 0x0001, 0x366: 0x0001, 0x367: 0x0001, 0x368: 0x0001, 0x369: 0x0001,
-	0x36a: 0x0001, 0x36b: 0x0001, 0x36c: 0x0001, 0x36d: 0x0001, 0x36e: 0x0001, 0x36f: 0x0001,
-	0x370: 0x0001, 0x371: 0x0001, 0x372: 0x0001, 0x373: 0x0001, 0x374: 0x0001, 0x375: 0x0001,
-	0x376: 0x0001, 0x377: 0x0001, 0x378: 0x0001, 0x379: 0x0001, 0x37a: 0x0001, 0x37b: 0x0001,
-	0x37c: 0x0001, 0x37d: 0x0001, 0x37e: 0x0001, 0x37f: 0x0001,
-	// Block 0xe, offset 0x380
-	0x380: 0x0005, 0x381: 0x0005, 0x382: 0x0005, 0x383: 0x0005, 0x384: 0x0005, 0x385: 0x0005,
-	0x386: 0x000a, 0x387: 0x000a, 0x388: 0x000d, 0x389: 0x0004, 0x38a: 0x0004, 0x38b: 0x000d,
-	0x38c: 0x0006, 0x38d: 0x000d, 0x38e: 0x000a, 0x38f: 0x000a, 0x390: 0x000c, 0x391: 0x000c,
-	0x392: 0x000c, 0x393: 0x000c, 0x394: 0x000c, 0x395: 0x000c, 0x396: 0x000c, 0x397: 0x000c,
-	0x398: 0x000c, 0x399: 0x000c, 0x39a: 0x000c, 0x39b: 0x000d, 0x39c: 0x000d, 0x39d: 0x000d,
-	0x39e: 0x000d, 0x39f: 0x000d, 0x3a0: 0x000d, 0x3a1: 0x000d, 0x3a2: 0x000d, 0x3a3: 0x000d,
-	0x3a4: 0x000d, 0x3a5: 0x000d, 0x3a6: 0x000d, 0x3a7: 0x000d, 0x3a8: 0x000d, 0x3a9: 0x000d,
-	0x3aa: 0x000d, 0x3ab: 0x000d, 0x3ac: 0x000d, 0x3ad: 0x000d, 0x3ae: 0x000d, 0x3af: 0x000d,
-	0x3b0: 0x000d, 0x3b1: 0x000d, 0x3b2: 0x000d, 0x3b3: 0x000d, 0x3b4: 0x000d, 0x3b5: 0x000d,
-	0x3b6: 0x000d, 0x3b7: 0x000d, 0x3b8: 0x000d, 0x3b9: 0x000d, 0x3ba: 0x000d, 0x3bb: 0x000d,
-	0x3bc: 0x000d, 0x3bd: 0x000d, 0x3be: 0x000d, 0x3bf: 0x000d,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x000d, 0x3c1: 0x000d, 0x3c2: 0x000d, 0x3c3: 0x000d, 0x3c4: 0x000d, 0x3c5: 0x000d,
-	0x3c6: 0x000d, 0x3c7: 0x000d, 0x3c8: 0x000d, 0x3c9: 0x000d, 0x3ca: 0x000d, 0x3cb: 0x000c,
-	0x3cc: 0x000c, 0x3cd: 0x000c, 0x3ce: 0x000c, 0x3cf: 0x000c, 0x3d0: 0x000c, 0x3d1: 0x000c,
-	0x3d2: 0x000c, 0x3d3: 0x000c, 0x3d4: 0x000c, 0x3d5: 0x000c, 0x3d6: 0x000c, 0x3d7: 0x000c,
-	0x3d8: 0x000c, 0x3d9: 0x000c, 0x3da: 0x000c, 0x3db: 0x000c, 0x3dc: 0x000c, 0x3dd: 0x000c,
-	0x3de: 0x000c, 0x3df: 0x000c, 0x3e0: 0x0005, 0x3e1: 0x0005, 0x3e2: 0x0005, 0x3e3: 0x0005,
-	0x3e4: 0x0005, 0x3e5: 0x0005, 0x3e6: 0x0005, 0x3e7: 0x0005, 0x3e8: 0x0005, 0x3e9: 0x0005,
-	0x3ea: 0x0004, 0x3eb: 0x0005, 0x3ec: 0x0005, 0x3ed: 0x000d, 0x3ee: 0x000d, 0x3ef: 0x000d,
-	0x3f0: 0x000c, 0x3f1: 0x000d, 0x3f2: 0x000d, 0x3f3: 0x000d, 0x3f4: 0x000d, 0x3f5: 0x000d,
-	0x3f6: 0x000d, 0x3f7: 0x000d, 0x3f8: 0x000d, 0x3f9: 0x000d, 0x3fa: 0x000d, 0x3fb: 0x000d,
-	0x3fc: 0x000d, 0x3fd: 0x000d, 0x3fe: 0x000d, 0x3ff: 0x000d,
-	// Block 0x10, offset 0x400
-	0x400: 0x000d, 0x401: 0x000d, 0x402: 0x000d, 0x403: 0x000d, 0x404: 0x000d, 0x405: 0x000d,
-	0x406: 0x000d, 0x407: 0x000d, 0x408: 0x000d, 0x409: 0x000d, 0x40a: 0x000d, 0x40b: 0x000d,
-	0x40c: 0x000d, 0x40d: 0x000d, 0x40e: 0x000d, 0x40f: 0x000d, 0x410: 0x000d, 0x411: 0x000d,
-	0x412: 0x000d, 0x413: 0x000d, 0x414: 0x000d, 0x415: 0x000d, 0x416: 0x000d, 0x417: 0x000d,
-	0x418: 0x000d, 0x419: 0x000d, 0x41a: 0x000d, 0x41b: 0x000d, 0x41c: 0x000d, 0x41d: 0x000d,
-	0x41e: 0x000d, 0x41f: 0x000d, 0x420: 0x000d, 0x421: 0x000d, 0x422: 0x000d, 0x423: 0x000d,
-	0x424: 0x000d, 0x425: 0x000d, 0x426: 0x000d, 0x427: 0x000d, 0x428: 0x000d, 0x429: 0x000d,
-	0x42a: 0x000d, 0x42b: 0x000d, 0x42c: 0x000d, 0x42d: 0x000d, 0x42e: 0x000d, 0x42f: 0x000d,
-	0x430: 0x000d, 0x431: 0x000d, 0x432: 0x000d, 0x433: 0x000d, 0x434: 0x000d, 0x435: 0x000d,
-	0x436: 0x000d, 0x437: 0x000d, 0x438: 0x000d, 0x439: 0x000d, 0x43a: 0x000d, 0x43b: 0x000d,
-	0x43c: 0x000d, 0x43d: 0x000d, 0x43e: 0x000d, 0x43f: 0x000d,
-	// Block 0x11, offset 0x440
-	0x440: 0x000d, 0x441: 0x000d, 0x442: 0x000d, 0x443: 0x000d, 0x444: 0x000d, 0x445: 0x000d,
-	0x446: 0x000d, 0x447: 0x000d, 0x448: 0x000d, 0x449: 0x000d, 0x44a: 0x000d, 0x44b: 0x000d,
-	0x44c: 0x000d, 0x44d: 0x000d, 0x44e: 0x000d, 0x44f: 0x000d, 0x450: 0x000d, 0x451: 0x000d,
-	0x452: 0x000d, 0x453: 0x000d, 0x454: 0x000d, 0x455: 0x000d, 0x456: 0x000c, 0x457: 0x000c,
-	0x458: 0x000c, 0x459: 0x000c, 0x45a: 0x000c, 0x45b: 0x000c, 0x45c: 0x000c, 0x45d: 0x0005,
-	0x45e: 0x000a, 0x45f: 0x000c, 0x460: 0x000c, 0x461: 0x000c, 0x462: 0x000c, 0x463: 0x000c,
-	0x464: 0x000c, 0x465: 0x000d, 0x466: 0x000d, 0x467: 0x000c, 0x468: 0x000c, 0x469: 0x000a,
-	0x46a: 0x000c, 0x46b: 0x000c, 0x46c: 0x000c, 0x46d: 0x000c, 0x46e: 0x000d, 0x46f: 0x000d,
-	0x470: 0x0002, 0x471: 0x0002, 0x472: 0x0002, 0x473: 0x0002, 0x474: 0x0002, 0x475: 0x0002,
-	0x476: 0x0002, 0x477: 0x0002, 0x478: 0x0002, 0x479: 0x0002, 0x47a: 0x000d, 0x47b: 0x000d,
-	0x47c: 0x000d, 0x47d: 0x000d, 0x47e: 0x000d, 0x47f: 0x000d,
-	// Block 0x12, offset 0x480
-	0x480: 0x000d, 0x481: 0x000d, 0x482: 0x000d, 0x483: 0x000d, 0x484: 0x000d, 0x485: 0x000d,
-	0x486: 0x000d, 0x487: 0x000d, 0x488: 0x000d, 0x489: 0x000d, 0x48a: 0x000d, 0x48b: 0x000d,
-	0x48c: 0x000d, 0x48d: 0x000d, 0x48e: 0x000d, 0x48f: 0x000d, 0x490: 0x000d, 0x491: 0x000c,
-	0x492: 0x000d, 0x493: 0x000d, 0x494: 0x000d, 0x495: 0x000d, 0x496: 0x000d, 0x497: 0x000d,
-	0x498: 0x000d, 0x499: 0x000d, 0x49a: 0x000d, 0x49b: 0x000d, 0x49c: 0x000d, 0x49d: 0x000d,
-	0x49e: 0x000d, 0x49f: 0x000d, 0x4a0: 0x000d, 0x4a1: 0x000d, 0x4a2: 0x000d, 0x4a3: 0x000d,
-	0x4a4: 0x000d, 0x4a5: 0x000d, 0x4a6: 0x000d, 0x4a7: 0x000d, 0x4a8: 0x000d, 0x4a9: 0x000d,
-	0x4aa: 0x000d, 0x4ab: 0x000d, 0x4ac: 0x000d, 0x4ad: 0x000d, 0x4ae: 0x000d, 0x4af: 0x000d,
-	0x4b0: 0x000c, 0x4b1: 0x000c, 0x4b2: 0x000c, 0x4b3: 0x000c, 0x4b4: 0x000c, 0x4b5: 0x000c,
-	0x4b6: 0x000c, 0x4b7: 0x000c, 0x4b8: 0x000c, 0x4b9: 0x000c, 0x4ba: 0x000c, 0x4bb: 0x000c,
-	0x4bc: 0x000c, 0x4bd: 0x000c, 0x4be: 0x000c, 0x4bf: 0x000c,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x000c, 0x4c1: 0x000c, 0x4c2: 0x000c, 0x4c3: 0x000c, 0x4c4: 0x000c, 0x4c5: 0x000c,
-	0x4c6: 0x000c, 0x4c7: 0x000c, 0x4c8: 0x000c, 0x4c9: 0x000c, 0x4ca: 0x000c, 0x4cb: 0x000d,
-	0x4cc: 0x000d, 0x4cd: 0x000d, 0x4ce: 0x000d, 0x4cf: 0x000d, 0x4d0: 0x000d, 0x4d1: 0x000d,
-	0x4d2: 0x000d, 0x4d3: 0x000d, 0x4d4: 0x000d, 0x4d5: 0x000d, 0x4d6: 0x000d, 0x4d7: 0x000d,
-	0x4d8: 0x000d, 0x4d9: 0x000d, 0x4da: 0x000d, 0x4db: 0x000d, 0x4dc: 0x000d, 0x4dd: 0x000d,
-	0x4de: 0x000d, 0x4df: 0x000d, 0x4e0: 0x000d, 0x4e1: 0x000d, 0x4e2: 0x000d, 0x4e3: 0x000d,
-	0x4e4: 0x000d, 0x4e5: 0x000d, 0x4e6: 0x000d, 0x4e7: 0x000d, 0x4e8: 0x000d, 0x4e9: 0x000d,
-	0x4ea: 0x000d, 0x4eb: 0x000d, 0x4ec: 0x000d, 0x4ed: 0x000d, 0x4ee: 0x000d, 0x4ef: 0x000d,
-	0x4f0: 0x000d, 0x4f1: 0x000d, 0x4f2: 0x000d, 0x4f3: 0x000d, 0x4f4: 0x000d, 0x4f5: 0x000d,
-	0x4f6: 0x000d, 0x4f7: 0x000d, 0x4f8: 0x000d, 0x4f9: 0x000d, 0x4fa: 0x000d, 0x4fb: 0x000d,
-	0x4fc: 0x000d, 0x4fd: 0x000d, 0x4fe: 0x000d, 0x4ff: 0x000d,
-	// Block 0x14, offset 0x500
-	0x500: 0x000d, 0x501: 0x000d, 0x502: 0x000d, 0x503: 0x000d, 0x504: 0x000d, 0x505: 0x000d,
-	0x506: 0x000d, 0x507: 0x000d, 0x508: 0x000d, 0x509: 0x000d, 0x50a: 0x000d, 0x50b: 0x000d,
-	0x50c: 0x000d, 0x50d: 0x000d, 0x50e: 0x000d, 0x50f: 0x000d, 0x510: 0x000d, 0x511: 0x000d,
-	0x512: 0x000d, 0x513: 0x000d, 0x514: 0x000d, 0x515: 0x000d, 0x516: 0x000d, 0x517: 0x000d,
-	0x518: 0x000d, 0x519: 0x000d, 0x51a: 0x000d, 0x51b: 0x000d, 0x51c: 0x000d, 0x51d: 0x000d,
-	0x51e: 0x000d, 0x51f: 0x000d, 0x520: 0x000d, 0x521: 0x000d, 0x522: 0x000d, 0x523: 0x000d,
-	0x524: 0x000d, 0x525: 0x000d, 0x526: 0x000c, 0x527: 0x000c, 0x528: 0x000c, 0x529: 0x000c,
-	0x52a: 0x000c, 0x52b: 0x000c, 0x52c: 0x000c, 0x52d: 0x000c, 0x52e: 0x000c, 0x52f: 0x000c,
-	0x530: 0x000c, 0x531: 0x000d, 0x532: 0x000d, 0x533: 0x000d, 0x534: 0x000d, 0x535: 0x000d,
-	0x536: 0x000d, 0x537: 0x000d, 0x538: 0x000d, 0x539: 0x000d, 0x53a: 0x000d, 0x53b: 0x000d,
-	0x53c: 0x000d, 0x53d: 0x000d, 0x53e: 0x000d, 0x53f: 0x000d,
-	// Block 0x15, offset 0x540
-	0x540: 0x0001, 0x541: 0x0001, 0x542: 0x0001, 0x543: 0x0001, 0x544: 0x0001, 0x545: 0x0001,
-	0x546: 0x0001, 0x547: 0x0001, 0x548: 0x0001, 0x549: 0x0001, 0x54a: 0x0001, 0x54b: 0x0001,
-	0x54c: 0x0001, 0x54d: 0x0001, 0x54e: 0x0001, 0x54f: 0x0001, 0x550: 0x0001, 0x551: 0x0001,
-	0x552: 0x0001, 0x553: 0x0001, 0x554: 0x0001, 0x555: 0x0001, 0x556: 0x0001, 0x557: 0x0001,
-	0x558: 0x0001, 0x559: 0x0001, 0x55a: 0x0001, 0x55b: 0x0001, 0x55c: 0x0001, 0x55d: 0x0001,
-	0x55e: 0x0001, 0x55f: 0x0001, 0x560: 0x0001, 0x561: 0x0001, 0x562: 0x0001, 0x563: 0x0001,
-	0x564: 0x0001, 0x565: 0x0001, 0x566: 0x0001, 0x567: 0x0001, 0x568: 0x0001, 0x569: 0x0001,
-	0x56a: 0x0001, 0x56b: 0x000c, 0x56c: 0x000c, 0x56d: 0x000c, 0x56e: 0x000c, 0x56f: 0x000c,
-	0x570: 0x000c, 0x571: 0x000c, 0x572: 0x000c, 0x573: 0x000c, 0x574: 0x0001, 0x575: 0x0001,
-	0x576: 0x000a, 0x577: 0x000a, 0x578: 0x000a, 0x579: 0x000a, 0x57a: 0x0001, 0x57b: 0x0001,
-	0x57c: 0x0001, 0x57d: 0x000c, 0x57e: 0x0001, 0x57f: 0x0001,
-	// Block 0x16, offset 0x580
-	0x580: 0x0001, 0x581: 0x0001, 0x582: 0x0001, 0x583: 0x0001, 0x584: 0x0001, 0x585: 0x0001,
-	0x586: 0x0001, 0x587: 0x0001, 0x588: 0x0001, 0x589: 0x0001, 0x58a: 0x0001, 0x58b: 0x0001,
-	0x58c: 0x0001, 0x58d: 0x0001, 0x58e: 0x0001, 0x58f: 0x0001, 0x590: 0x0001, 0x591: 0x0001,
-	0x592: 0x0001, 0x593: 0x0001, 0x594: 0x0001, 0x595: 0x0001, 0x596: 0x000c, 0x597: 0x000c,
-	0x598: 0x000c, 0x599: 0x000c, 0x59a: 0x0001, 0x59b: 0x000c, 0x59c: 0x000c, 0x59d: 0x000c,
-	0x59e: 0x000c, 0x59f: 0x000c, 0x5a0: 0x000c, 0x5a1: 0x000c, 0x5a2: 0x000c, 0x5a3: 0x000c,
-	0x5a4: 0x0001, 0x5a5: 0x000c, 0x5a6: 0x000c, 0x5a7: 0x000c, 0x5a8: 0x0001, 0x5a9: 0x000c,
-	0x5aa: 0x000c, 0x5ab: 0x000c, 0x5ac: 0x000c, 0x5ad: 0x000c, 0x5ae: 0x0001, 0x5af: 0x0001,
-	0x5b0: 0x0001, 0x5b1: 0x0001, 0x5b2: 0x0001, 0x5b3: 0x0001, 0x5b4: 0x0001, 0x5b5: 0x0001,
-	0x5b6: 0x0001, 0x5b7: 0x0001, 0x5b8: 0x0001, 0x5b9: 0x0001, 0x5ba: 0x0001, 0x5bb: 0x0001,
-	0x5bc: 0x0001, 0x5bd: 0x0001, 0x5be: 0x0001, 0x5bf: 0x0001,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x0001, 0x5c1: 0x0001, 0x5c2: 0x0001, 0x5c3: 0x0001, 0x5c4: 0x0001, 0x5c5: 0x0001,
-	0x5c6: 0x0001, 0x5c7: 0x0001, 0x5c8: 0x0001, 0x5c9: 0x0001, 0x5ca: 0x0001, 0x5cb: 0x0001,
-	0x5cc: 0x0001, 0x5cd: 0x0001, 0x5ce: 0x0001, 0x5cf: 0x0001, 0x5d0: 0x0001, 0x5d1: 0x0001,
-	0x5d2: 0x0001, 0x5d3: 0x0001, 0x5d4: 0x0001, 0x5d5: 0x0001, 0x5d6: 0x0001, 0x5d7: 0x0001,
-	0x5d8: 0x0001, 0x5d9: 0x000c, 0x5da: 0x000c, 0x5db: 0x000c, 0x5dc: 0x0001, 0x5dd: 0x0001,
-	0x5de: 0x0001, 0x5df: 0x0001, 0x5e0: 0x000d, 0x5e1: 0x000d, 0x5e2: 0x000d, 0x5e3: 0x000d,
-	0x5e4: 0x000d, 0x5e5: 0x000d, 0x5e6: 0x000d, 0x5e7: 0x000d, 0x5e8: 0x000d, 0x5e9: 0x000d,
-	0x5ea: 0x000d, 0x5eb: 0x0001, 0x5ec: 0x0001, 0x5ed: 0x0001, 0x5ee: 0x0001, 0x5ef: 0x0001,
-	0x5f0: 0x000d, 0x5f1: 0x000d, 0x5f2: 0x000d, 0x5f3: 0x000d, 0x5f4: 0x000d, 0x5f5: 0x000d,
-	0x5f6: 0x000d, 0x5f7: 0x000d, 0x5f8: 0x000d, 0x5f9: 0x000d, 0x5fa: 0x000d, 0x5fb: 0x000d,
-	0x5fc: 0x000d, 0x5fd: 0x000d, 0x5fe: 0x000d, 0x5ff: 0x000d,
-	// Block 0x18, offset 0x600
-	0x600: 0x000d, 0x601: 0x000d, 0x602: 0x000d, 0x603: 0x000d, 0x604: 0x000d, 0x605: 0x000d,
-	0x606: 0x000d, 0x607: 0x000d, 0x608: 0x000d, 0x609: 0x000d, 0x60a: 0x000d, 0x60b: 0x000d,
-	0x60c: 0x000d, 0x60d: 0x000d, 0x60e: 0x000d, 0x60f: 0x0001, 0x610: 0x0005, 0x611: 0x0005,
-	0x612: 0x0001, 0x613: 0x0001, 0x614: 0x0001, 0x615: 0x0001, 0x616: 0x0001, 0x617: 0x0001,
-	0x618: 0x000c, 0x619: 0x000c, 0x61a: 0x000c, 0x61b: 0x000c, 0x61c: 0x000c, 0x61d: 0x000c,
-	0x61e: 0x000c, 0x61f: 0x000c, 0x620: 0x000d, 0x621: 0x000d, 0x622: 0x000d, 0x623: 0x000d,
-	0x624: 0x000d, 0x625: 0x000d, 0x626: 0x000d, 0x627: 0x000d, 0x628: 0x000d, 0x629: 0x000d,
-	0x62a: 0x000d, 0x62b: 0x000d, 0x62c: 0x000d, 0x62d: 0x000d, 0x62e: 0x000d, 0x62f: 0x000d,
-	0x630: 0x000d, 0x631: 0x000d, 0x632: 0x000d, 0x633: 0x000d, 0x634: 0x000d, 0x635: 0x000d,
-	0x636: 0x000d, 0x637: 0x000d, 0x638: 0x000d, 0x639: 0x000d, 0x63a: 0x000d, 0x63b: 0x000d,
-	0x63c: 0x000d, 0x63d: 0x000d, 0x63e: 0x000d, 0x63f: 0x000d,
-	// Block 0x19, offset 0x640
-	0x640: 0x000d, 0x641: 0x000d, 0x642: 0x000d, 0x643: 0x000d, 0x644: 0x000d, 0x645: 0x000d,
-	0x646: 0x000d, 0x647: 0x000d, 0x648: 0x000d, 0x649: 0x000d, 0x64a: 0x000c, 0x64b: 0x000c,
-	0x64c: 0x000c, 0x64d: 0x000c, 0x64e: 0x000c, 0x64f: 0x000c, 0x650: 0x000c, 0x651: 0x000c,
-	0x652: 0x000c, 0x653: 0x000c, 0x654: 0x000c, 0x655: 0x000c, 0x656: 0x000c, 0x657: 0x000c,
-	0x658: 0x000c, 0x659: 0x000c, 0x65a: 0x000c, 0x65b: 0x000c, 0x65c: 0x000c, 0x65d: 0x000c,
-	0x65e: 0x000c, 0x65f: 0x000c, 0x660: 0x000c, 0x661: 0x000c, 0x662: 0x0005, 0x663: 0x000c,
-	0x664: 0x000c, 0x665: 0x000c, 0x666: 0x000c, 0x667: 0x000c, 0x668: 0x000c, 0x669: 0x000c,
-	0x66a: 0x000c, 0x66b: 0x000c, 0x66c: 0x000c, 0x66d: 0x000c, 0x66e: 0x000c, 0x66f: 0x000c,
-	0x670: 0x000c, 0x671: 0x000c, 0x672: 0x000c, 0x673: 0x000c, 0x674: 0x000c, 0x675: 0x000c,
-	0x676: 0x000c, 0x677: 0x000c, 0x678: 0x000c, 0x679: 0x000c, 0x67a: 0x000c, 0x67b: 0x000c,
-	0x67c: 0x000c, 0x67d: 0x000c, 0x67e: 0x000c, 0x67f: 0x000c,
-	// Block 0x1a, offset 0x680
-	0x680: 0x000c, 0x681: 0x000c, 0x682: 0x000c,
-	0x6ba: 0x000c,
-	0x6bc: 0x000c,
-	// Block 0x1b, offset 0x6c0
-	0x6c1: 0x000c, 0x6c2: 0x000c, 0x6c3: 0x000c, 0x6c4: 0x000c, 0x6c5: 0x000c,
-	0x6c6: 0x000c, 0x6c7: 0x000c, 0x6c8: 0x000c,
-	0x6cd: 0x000c, 0x6d1: 0x000c,
-	0x6d2: 0x000c, 0x6d3: 0x000c, 0x6d4: 0x000c, 0x6d5: 0x000c, 0x6d6: 0x000c, 0x6d7: 0x000c,
-	0x6e2: 0x000c, 0x6e3: 0x000c,
-	// Block 0x1c, offset 0x700
-	0x701: 0x000c,
-	0x73c: 0x000c,
-	// Block 0x1d, offset 0x740
-	0x741: 0x000c, 0x742: 0x000c, 0x743: 0x000c, 0x744: 0x000c,
-	0x74d: 0x000c,
-	0x762: 0x000c, 0x763: 0x000c,
-	0x772: 0x0004, 0x773: 0x0004,
-	0x77b: 0x0004,
-	0x77e: 0x000c,
-	// Block 0x1e, offset 0x780
-	0x781: 0x000c, 0x782: 0x000c,
-	0x7bc: 0x000c,
-	// Block 0x1f, offset 0x7c0
-	0x7c1: 0x000c, 0x7c2: 0x000c,
-	0x7c7: 0x000c, 0x7c8: 0x000c, 0x7cb: 0x000c,
-	0x7cc: 0x000c, 0x7cd: 0x000c, 0x7d1: 0x000c,
-	0x7f0: 0x000c, 0x7f1: 0x000c, 0x7f5: 0x000c,
-	// Block 0x20, offset 0x800
-	0x801: 0x000c, 0x802: 0x000c, 0x803: 0x000c, 0x804: 0x000c, 0x805: 0x000c,
-	0x807: 0x000c, 0x808: 0x000c,
-	0x80d: 0x000c,
-	0x822: 0x000c, 0x823: 0x000c,
-	0x831: 0x0004,
-	0x83a: 0x000c, 0x83b: 0x000c,
-	0x83c: 0x000c, 0x83d: 0x000c, 0x83e: 0x000c, 0x83f: 0x000c,
-	// Block 0x21, offset 0x840
-	0x841: 0x000c,
-	0x87c: 0x000c, 0x87f: 0x000c,
-	// Block 0x22, offset 0x880
-	0x881: 0x000c, 0x882: 0x000c, 0x883: 0x000c, 0x884: 0x000c,
-	0x88d: 0x000c,
-	0x895: 0x000c, 0x896: 0x000c,
-	0x8a2: 0x000c, 0x8a3: 0x000c,
-	// Block 0x23, offset 0x8c0
-	0x8c2: 0x000c,
-	// Block 0x24, offset 0x900
-	0x900: 0x000c,
-	0x90d: 0x000c,
-	0x933: 0x000a, 0x934: 0x000a, 0x935: 0x000a,
-	0x936: 0x000a, 0x937: 0x000a, 0x938: 0x000a, 0x939: 0x0004, 0x93a: 0x000a,
-	// Block 0x25, offset 0x940
-	0x940: 0x000c, 0x944: 0x000c,
-	0x97c: 0x000c, 0x97e: 0x000c, 0x97f: 0x000c,
-	// Block 0x26, offset 0x980
-	0x980: 0x000c,
-	0x986: 0x000c, 0x987: 0x000c, 0x988: 0x000c, 0x98a: 0x000c, 0x98b: 0x000c,
-	0x98c: 0x000c, 0x98d: 0x000c,
-	0x995: 0x000c, 0x996: 0x000c,
-	0x9a2: 0x000c, 0x9a3: 0x000c,
-	0x9b8: 0x000a, 0x9b9: 0x000a, 0x9ba: 0x000a, 0x9bb: 0x000a,
-	0x9bc: 0x000a, 0x9bd: 0x000a, 0x9be: 0x000a,
-	// Block 0x27, offset 0x9c0
-	0x9cc: 0x000c, 0x9cd: 0x000c,
-	0x9e2: 0x000c, 0x9e3: 0x000c,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x000c, 0xa01: 0x000c,
-	0xa3b: 0x000c,
-	0xa3c: 0x000c,
-	// Block 0x29, offset 0xa40
-	0xa41: 0x000c, 0xa42: 0x000c, 0xa43: 0x000c, 0xa44: 0x000c,
-	0xa4d: 0x000c,
-	0xa62: 0x000c, 0xa63: 0x000c,
-	// Block 0x2a, offset 0xa80
-	0xa81: 0x000c,
-	// Block 0x2b, offset 0xac0
-	0xaca: 0x000c,
-	0xad2: 0x000c, 0xad3: 0x000c, 0xad4: 0x000c, 0xad6: 0x000c,
-	// Block 0x2c, offset 0xb00
-	0xb31: 0x000c, 0xb34: 0x000c, 0xb35: 0x000c,
-	0xb36: 0x000c, 0xb37: 0x000c, 0xb38: 0x000c, 0xb39: 0x000c, 0xb3a: 0x000c,
-	0xb3f: 0x0004,
-	// Block 0x2d, offset 0xb40
-	0xb47: 0x000c, 0xb48: 0x000c, 0xb49: 0x000c, 0xb4a: 0x000c, 0xb4b: 0x000c,
-	0xb4c: 0x000c, 0xb4d: 0x000c, 0xb4e: 0x000c,
-	// Block 0x2e, offset 0xb80
-	0xbb1: 0x000c, 0xbb4: 0x000c, 0xbb5: 0x000c,
-	0xbb6: 0x000c, 0xbb7: 0x000c, 0xbb8: 0x000c, 0xbb9: 0x000c, 0xbba: 0x000c, 0xbbb: 0x000c,
-	0xbbc: 0x000c,
-	// Block 0x2f, offset 0xbc0
-	0xbc8: 0x000c, 0xbc9: 0x000c, 0xbca: 0x000c, 0xbcb: 0x000c,
-	0xbcc: 0x000c, 0xbcd: 0x000c, 0xbce: 0x000c,
-	// Block 0x30, offset 0xc00
-	0xc18: 0x000c, 0xc19: 0x000c,
-	0xc35: 0x000c,
-	0xc37: 0x000c, 0xc39: 0x000c, 0xc3a: 0x003a, 0xc3b: 0x002a,
-	0xc3c: 0x003a, 0xc3d: 0x002a,
-	// Block 0x31, offset 0xc40
-	0xc71: 0x000c, 0xc72: 0x000c, 0xc73: 0x000c, 0xc74: 0x000c, 0xc75: 0x000c,
-	0xc76: 0x000c, 0xc77: 0x000c, 0xc78: 0x000c, 0xc79: 0x000c, 0xc7a: 0x000c, 0xc7b: 0x000c,
-	0xc7c: 0x000c, 0xc7d: 0x000c, 0xc7e: 0x000c,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x000c, 0xc81: 0x000c, 0xc82: 0x000c, 0xc83: 0x000c, 0xc84: 0x000c,
-	0xc86: 0x000c, 0xc87: 0x000c,
-	0xc8d: 0x000c, 0xc8e: 0x000c, 0xc8f: 0x000c, 0xc90: 0x000c, 0xc91: 0x000c,
-	0xc92: 0x000c, 0xc93: 0x000c, 0xc94: 0x000c, 0xc95: 0x000c, 0xc96: 0x000c, 0xc97: 0x000c,
-	0xc99: 0x000c, 0xc9a: 0x000c, 0xc9b: 0x000c, 0xc9c: 0x000c, 0xc9d: 0x000c,
-	0xc9e: 0x000c, 0xc9f: 0x000c, 0xca0: 0x000c, 0xca1: 0x000c, 0xca2: 0x000c, 0xca3: 0x000c,
-	0xca4: 0x000c, 0xca5: 0x000c, 0xca6: 0x000c, 0xca7: 0x000c, 0xca8: 0x000c, 0xca9: 0x000c,
-	0xcaa: 0x000c, 0xcab: 0x000c, 0xcac: 0x000c, 0xcad: 0x000c, 0xcae: 0x000c, 0xcaf: 0x000c,
-	0xcb0: 0x000c, 0xcb1: 0x000c, 0xcb2: 0x000c, 0xcb3: 0x000c, 0xcb4: 0x000c, 0xcb5: 0x000c,
-	0xcb6: 0x000c, 0xcb7: 0x000c, 0xcb8: 0x000c, 0xcb9: 0x000c, 0xcba: 0x000c, 0xcbb: 0x000c,
-	0xcbc: 0x000c,
-	// Block 0x33, offset 0xcc0
-	0xcc6: 0x000c,
-	// Block 0x34, offset 0xd00
-	0xd2d: 0x000c, 0xd2e: 0x000c, 0xd2f: 0x000c,
-	0xd30: 0x000c, 0xd32: 0x000c, 0xd33: 0x000c, 0xd34: 0x000c, 0xd35: 0x000c,
-	0xd36: 0x000c, 0xd37: 0x000c, 0xd39: 0x000c, 0xd3a: 0x000c,
-	0xd3d: 0x000c, 0xd3e: 0x000c,
-	// Block 0x35, offset 0xd40
-	0xd58: 0x000c, 0xd59: 0x000c,
-	0xd5e: 0x000c, 0xd5f: 0x000c, 0xd60: 0x000c,
-	0xd71: 0x000c, 0xd72: 0x000c, 0xd73: 0x000c, 0xd74: 0x000c,
-	// Block 0x36, offset 0xd80
-	0xd82: 0x000c, 0xd85: 0x000c,
-	0xd86: 0x000c,
-	0xd8d: 0x000c,
-	0xd9d: 0x000c,
-	// Block 0x37, offset 0xdc0
-	0xddd: 0x000c,
-	0xdde: 0x000c, 0xddf: 0x000c,
-	// Block 0x38, offset 0xe00
-	0xe10: 0x000a, 0xe11: 0x000a,
-	0xe12: 0x000a, 0xe13: 0x000a, 0xe14: 0x000a, 0xe15: 0x000a, 0xe16: 0x000a, 0xe17: 0x000a,
-	0xe18: 0x000a, 0xe19: 0x000a,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x000a,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x0009,
-	0xe9b: 0x007a, 0xe9c: 0x006a,
-	// Block 0x3b, offset 0xec0
-	0xed2: 0x000c, 0xed3: 0x000c, 0xed4: 0x000c,
-	0xef2: 0x000c, 0xef3: 0x000c,
-	// Block 0x3c, offset 0xf00
-	0xf12: 0x000c, 0xf13: 0x000c,
-	0xf32: 0x000c, 0xf33: 0x000c,
-	// Block 0x3d, offset 0xf40
-	0xf74: 0x000c, 0xf75: 0x000c,
-	0xf77: 0x000c, 0xf78: 0x000c, 0xf79: 0x000c, 0xf7a: 0x000c, 0xf7b: 0x000c,
-	0xf7c: 0x000c, 0xf7d: 0x000c,
-	// Block 0x3e, offset 0xf80
-	0xf86: 0x000c, 0xf89: 0x000c, 0xf8a: 0x000c, 0xf8b: 0x000c,
-	0xf8c: 0x000c, 0xf8d: 0x000c, 0xf8e: 0x000c, 0xf8f: 0x000c, 0xf90: 0x000c, 0xf91: 0x000c,
-	0xf92: 0x000c, 0xf93: 0x000c,
-	0xf9b: 0x0004, 0xf9d: 0x000c,
-	0xfb0: 0x000a, 0xfb1: 0x000a, 0xfb2: 0x000a, 0xfb3: 0x000a, 0xfb4: 0x000a, 0xfb5: 0x000a,
-	0xfb6: 0x000a, 0xfb7: 0x000a, 0xfb8: 0x000a, 0xfb9: 0x000a,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x000a, 0xfc1: 0x000a, 0xfc2: 0x000a, 0xfc3: 0x000a, 0xfc4: 0x000a, 0xfc5: 0x000a,
-	0xfc6: 0x000a, 0xfc7: 0x000a, 0xfc8: 0x000a, 0xfc9: 0x000a, 0xfca: 0x000a, 0xfcb: 0x000c,
-	0xfcc: 0x000c, 0xfcd: 0x000c, 0xfce: 0x000b, 0xfcf: 0x000c,
-	// Block 0x40, offset 0x1000
-	0x1005: 0x000c,
-	0x1006: 0x000c,
-	0x1029: 0x000c,
-	// Block 0x41, offset 0x1040
-	0x1060: 0x000c, 0x1061: 0x000c, 0x1062: 0x000c,
-	0x1067: 0x000c, 0x1068: 0x000c,
-	0x1072: 0x000c,
-	0x1079: 0x000c, 0x107a: 0x000c, 0x107b: 0x000c,
-	// Block 0x42, offset 0x1080
-	0x1080: 0x000a, 0x1084: 0x000a, 0x1085: 0x000a,
-	// Block 0x43, offset 0x10c0
-	0x10de: 0x000a, 0x10df: 0x000a, 0x10e0: 0x000a, 0x10e1: 0x000a, 0x10e2: 0x000a, 0x10e3: 0x000a,
-	0x10e4: 0x000a, 0x10e5: 0x000a, 0x10e6: 0x000a, 0x10e7: 0x000a, 0x10e8: 0x000a, 0x10e9: 0x000a,
-	0x10ea: 0x000a, 0x10eb: 0x000a, 0x10ec: 0x000a, 0x10ed: 0x000a, 0x10ee: 0x000a, 0x10ef: 0x000a,
-	0x10f0: 0x000a, 0x10f1: 0x000a, 0x10f2: 0x000a, 0x10f3: 0x000a, 0x10f4: 0x000a, 0x10f5: 0x000a,
-	0x10f6: 0x000a, 0x10f7: 0x000a, 0x10f8: 0x000a, 0x10f9: 0x000a, 0x10fa: 0x000a, 0x10fb: 0x000a,
-	0x10fc: 0x000a, 0x10fd: 0x000a, 0x10fe: 0x000a, 0x10ff: 0x000a,
-	// Block 0x44, offset 0x1100
-	0x1117: 0x000c,
-	0x1118: 0x000c, 0x111b: 0x000c,
-	// Block 0x45, offset 0x1140
-	0x1156: 0x000c,
-	0x1158: 0x000c, 0x1159: 0x000c, 0x115a: 0x000c, 0x115b: 0x000c, 0x115c: 0x000c, 0x115d: 0x000c,
-	0x115e: 0x000c, 0x1160: 0x000c, 0x1162: 0x000c,
-	0x1165: 0x000c, 0x1166: 0x000c, 0x1167: 0x000c, 0x1168: 0x000c, 0x1169: 0x000c,
-	0x116a: 0x000c, 0x116b: 0x000c, 0x116c: 0x000c,
-	0x1173: 0x000c, 0x1174: 0x000c, 0x1175: 0x000c,
-	0x1176: 0x000c, 0x1177: 0x000c, 0x1178: 0x000c, 0x1179: 0x000c, 0x117a: 0x000c, 0x117b: 0x000c,
-	0x117c: 0x000c, 0x117f: 0x000c,
-	// Block 0x46, offset 0x1180
-	0x11b0: 0x000c, 0x11b1: 0x000c, 0x11b2: 0x000c, 0x11b3: 0x000c, 0x11b4: 0x000c, 0x11b5: 0x000c,
-	0x11b6: 0x000c, 0x11b7: 0x000c, 0x11b8: 0x000c, 0x11b9: 0x000c, 0x11ba: 0x000c, 0x11bb: 0x000c,
-	0x11bc: 0x000c, 0x11bd: 0x000c, 0x11be: 0x000c, 0x11bf: 0x000c,
-	// Block 0x47, offset 0x11c0
-	0x11c0: 0x000c, 0x11c1: 0x000c, 0x11c2: 0x000c, 0x11c3: 0x000c, 0x11c4: 0x000c, 0x11c5: 0x000c,
-	0x11c6: 0x000c, 0x11c7: 0x000c, 0x11c8: 0x000c, 0x11c9: 0x000c, 0x11ca: 0x000c, 0x11cb: 0x000c,
-	0x11cc: 0x000c, 0x11cd: 0x000c, 0x11ce: 0x000c,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x000c, 0x1201: 0x000c, 0x1202: 0x000c, 0x1203: 0x000c,
-	0x1234: 0x000c,
-	0x1236: 0x000c, 0x1237: 0x000c, 0x1238: 0x000c, 0x1239: 0x000c, 0x123a: 0x000c,
-	0x123c: 0x000c,
-	// Block 0x49, offset 0x1240
-	0x1242: 0x000c,
-	0x126b: 0x000c, 0x126c: 0x000c, 0x126d: 0x000c, 0x126e: 0x000c, 0x126f: 0x000c,
-	0x1270: 0x000c, 0x1271: 0x000c, 0x1272: 0x000c, 0x1273: 0x000c,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x000c, 0x1281: 0x000c,
-	0x12a2: 0x000c, 0x12a3: 0x000c,
-	0x12a4: 0x000c, 0x12a5: 0x000c, 0x12a8: 0x000c, 0x12a9: 0x000c,
-	0x12ab: 0x000c, 0x12ac: 0x000c, 0x12ad: 0x000c,
-	// Block 0x4b, offset 0x12c0
-	0x12e6: 0x000c, 0x12e8: 0x000c, 0x12e9: 0x000c,
-	0x12ed: 0x000c, 0x12ef: 0x000c,
-	0x12f0: 0x000c, 0x12f1: 0x000c,
-	// Block 0x4c, offset 0x1300
-	0x132c: 0x000c, 0x132d: 0x000c, 0x132e: 0x000c, 0x132f: 0x000c,
-	0x1330: 0x000c, 0x1331: 0x000c, 0x1332: 0x000c, 0x1333: 0x000c,
-	0x1336: 0x000c, 0x1337: 0x000c,
-	// Block 0x4d, offset 0x1340
-	0x1350: 0x000c, 0x1351: 0x000c,
-	0x1352: 0x000c, 0x1354: 0x000c, 0x1355: 0x000c, 0x1356: 0x000c, 0x1357: 0x000c,
-	0x1358: 0x000c, 0x1359: 0x000c, 0x135a: 0x000c, 0x135b: 0x000c, 0x135c: 0x000c, 0x135d: 0x000c,
-	0x135e: 0x000c, 0x135f: 0x000c, 0x1360: 0x000c, 0x1362: 0x000c, 0x1363: 0x000c,
-	0x1364: 0x000c, 0x1365: 0x000c, 0x1366: 0x000c, 0x1367: 0x000c, 0x1368: 0x000c,
-	0x136d: 0x000c,
-	0x1374: 0x000c,
-	0x1378: 0x000c, 0x1379: 0x000c,
-	// Block 0x4e, offset 0x1380
-	0x13bd: 0x000a, 0x13bf: 0x000a,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x000a, 0x13c1: 0x000a,
-	0x13cd: 0x000a, 0x13ce: 0x000a, 0x13cf: 0x000a,
-	0x13dd: 0x000a,
-	0x13de: 0x000a, 0x13df: 0x000a,
-	0x13ed: 0x000a, 0x13ee: 0x000a, 0x13ef: 0x000a,
-	0x13fd: 0x000a, 0x13fe: 0x000a,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x0009, 0x1401: 0x0009, 0x1402: 0x0009, 0x1403: 0x0009, 0x1404: 0x0009, 0x1405: 0x0009,
-	0x1406: 0x0009, 0x1407: 0x0009, 0x1408: 0x0009, 0x1409: 0x0009, 0x140a: 0x0009, 0x140b: 0x000b,
-	0x140c: 0x000b, 0x140d: 0x000b, 0x140f: 0x0001, 0x1410: 0x000a, 0x1411: 0x000a,
-	0x1412: 0x000a, 0x1413: 0x000a, 0x1414: 0x000a, 0x1415: 0x000a, 0x1416: 0x000a, 0x1417: 0x000a,
-	0x1418: 0x000a, 0x1419: 0x000a, 0x141a: 0x000a, 0x141b: 0x000a, 0x141c: 0x000a, 0x141d: 0x000a,
-	0x141e: 0x000a, 0x141f: 0x000a, 0x1420: 0x000a, 0x1421: 0x000a, 0x1422: 0x000a, 0x1423: 0x000a,
-	0x1424: 0x000a, 0x1425: 0x000a, 0x1426: 0x000a, 0x1427: 0x000a, 0x1428: 0x0009, 0x1429: 0x0007,
-	0x142a: 0x000e, 0x142b: 0x000e, 0x142c: 0x000e, 0x142d: 0x000e, 0x142e: 0x000e, 0x142f: 0x0006,
-	0x1430: 0x0004, 0x1431: 0x0004, 0x1432: 0x0004, 0x1433: 0x0004, 0x1434: 0x0004, 0x1435: 0x000a,
-	0x1436: 0x000a, 0x1437: 0x000a, 0x1438: 0x000a, 0x1439: 0x000a, 0x143a: 0x000a, 0x143b: 0x000a,
-	0x143c: 0x000a, 0x143d: 0x000a, 0x143e: 0x000a, 0x143f: 0x000a,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x000a, 0x1441: 0x000a, 0x1442: 0x000a, 0x1443: 0x000a, 0x1444: 0x0006, 0x1445: 0x009a,
-	0x1446: 0x008a, 0x1447: 0x000a, 0x1448: 0x000a, 0x1449: 0x000a, 0x144a: 0x000a, 0x144b: 0x000a,
-	0x144c: 0x000a, 0x144d: 0x000a, 0x144e: 0x000a, 0x144f: 0x000a, 0x1450: 0x000a, 0x1451: 0x000a,
-	0x1452: 0x000a, 0x1453: 0x000a, 0x1454: 0x000a, 0x1455: 0x000a, 0x1456: 0x000a, 0x1457: 0x000a,
-	0x1458: 0x000a, 0x1459: 0x000a, 0x145a: 0x000a, 0x145b: 0x000a, 0x145c: 0x000a, 0x145d: 0x000a,
-	0x145e: 0x000a, 0x145f: 0x0009, 0x1460: 0x000b, 0x1461: 0x000b, 0x1462: 0x000b, 0x1463: 0x000b,
-	0x1464: 0x000b, 0x1465: 0x000b, 0x1466: 0x000e, 0x1467: 0x000e, 0x1468: 0x000e, 0x1469: 0x000e,
-	0x146a: 0x000b, 0x146b: 0x000b, 0x146c: 0x000b, 0x146d: 0x000b, 0x146e: 0x000b, 0x146f: 0x000b,
-	0x1470: 0x0002, 0x1474: 0x0002, 0x1475: 0x0002,
-	0x1476: 0x0002, 0x1477: 0x0002, 0x1478: 0x0002, 0x1479: 0x0002, 0x147a: 0x0003, 0x147b: 0x0003,
-	0x147c: 0x000a, 0x147d: 0x009a, 0x147e: 0x008a,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x0002, 0x1481: 0x0002, 0x1482: 0x0002, 0x1483: 0x0002, 0x1484: 0x0002, 0x1485: 0x0002,
-	0x1486: 0x0002, 0x1487: 0x0002, 0x1488: 0x0002, 0x1489: 0x0002, 0x148a: 0x0003, 0x148b: 0x0003,
-	0x148c: 0x000a, 0x148d: 0x009a, 0x148e: 0x008a,
-	0x14a0: 0x0004, 0x14a1: 0x0004, 0x14a2: 0x0004, 0x14a3: 0x0004,
-	0x14a4: 0x0004, 0x14a5: 0x0004, 0x14a6: 0x0004, 0x14a7: 0x0004, 0x14a8: 0x0004, 0x14a9: 0x0004,
-	0x14aa: 0x0004, 0x14ab: 0x0004, 0x14ac: 0x0004, 0x14ad: 0x0004, 0x14ae: 0x0004, 0x14af: 0x0004,
-	0x14b0: 0x0004, 0x14b1: 0x0004, 0x14b2: 0x0004, 0x14b3: 0x0004, 0x14b4: 0x0004, 0x14b5: 0x0004,
-	0x14b6: 0x0004, 0x14b7: 0x0004, 0x14b8: 0x0004, 0x14b9: 0x0004, 0x14ba: 0x0004, 0x14bb: 0x0004,
-	0x14bc: 0x0004, 0x14bd: 0x0004, 0x14be: 0x0004, 0x14bf: 0x0004,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x0004, 0x14c1: 0x0004, 0x14c2: 0x0004, 0x14c3: 0x0004, 0x14c4: 0x0004, 0x14c5: 0x0004,
-	0x14c6: 0x0004, 0x14c7: 0x0004, 0x14c8: 0x0004, 0x14c9: 0x0004, 0x14ca: 0x0004, 0x14cb: 0x0004,
-	0x14cc: 0x0004, 0x14cd: 0x0004, 0x14ce: 0x0004, 0x14cf: 0x0004, 0x14d0: 0x000c, 0x14d1: 0x000c,
-	0x14d2: 0x000c, 0x14d3: 0x000c, 0x14d4: 0x000c, 0x14d5: 0x000c, 0x14d6: 0x000c, 0x14d7: 0x000c,
-	0x14d8: 0x000c, 0x14d9: 0x000c, 0x14da: 0x000c, 0x14db: 0x000c, 0x14dc: 0x000c, 0x14dd: 0x000c,
-	0x14de: 0x000c, 0x14df: 0x000c, 0x14e0: 0x000c, 0x14e1: 0x000c, 0x14e2: 0x000c, 0x14e3: 0x000c,
-	0x14e4: 0x000c, 0x14e5: 0x000c, 0x14e6: 0x000c, 0x14e7: 0x000c, 0x14e8: 0x000c, 0x14e9: 0x000c,
-	0x14ea: 0x000c, 0x14eb: 0x000c, 0x14ec: 0x000c, 0x14ed: 0x000c, 0x14ee: 0x000c, 0x14ef: 0x000c,
-	0x14f0: 0x000c,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x000a, 0x1501: 0x000a, 0x1503: 0x000a, 0x1504: 0x000a, 0x1505: 0x000a,
-	0x1506: 0x000a, 0x1508: 0x000a, 0x1509: 0x000a,
-	0x1514: 0x000a, 0x1516: 0x000a, 0x1517: 0x000a,
-	0x1518: 0x000a,
-	0x151e: 0x000a, 0x151f: 0x000a, 0x1520: 0x000a, 0x1521: 0x000a, 0x1522: 0x000a, 0x1523: 0x000a,
-	0x1525: 0x000a, 0x1527: 0x000a, 0x1529: 0x000a,
-	0x152e: 0x0004,
-	0x153a: 0x000a, 0x153b: 0x000a,
-	// Block 0x55, offset 0x1540
-	0x1540: 0x000a, 0x1541: 0x000a, 0x1542: 0x000a, 0x1543: 0x000a, 0x1544: 0x000a,
-	0x154a: 0x000a, 0x154b: 0x000a,
-	0x154c: 0x000a, 0x154d: 0x000a, 0x1550: 0x000a, 0x1551: 0x000a,
-	0x1552: 0x000a, 0x1553: 0x000a, 0x1554: 0x000a, 0x1555: 0x000a, 0x1556: 0x000a, 0x1557: 0x000a,
-	0x1558: 0x000a, 0x1559: 0x000a, 0x155a: 0x000a, 0x155b: 0x000a, 0x155c: 0x000a, 0x155d: 0x000a,
-	0x155e: 0x000a, 0x155f: 0x000a,
-	// Block 0x56, offset 0x1580
-	0x1589: 0x000a, 0x158a: 0x000a, 0x158b: 0x000a,
-	0x1590: 0x000a, 0x1591: 0x000a,
-	0x1592: 0x000a, 0x1593: 0x000a, 0x1594: 0x000a, 0x1595: 0x000a, 0x1596: 0x000a, 0x1597: 0x000a,
-	0x1598: 0x000a, 0x1599: 0x000a, 0x159a: 0x000a, 0x159b: 0x000a, 0x159c: 0x000a, 0x159d: 0x000a,
-	0x159e: 0x000a, 0x159f: 0x000a, 0x15a0: 0x000a, 0x15a1: 0x000a, 0x15a2: 0x000a, 0x15a3: 0x000a,
-	0x15a4: 0x000a, 0x15a5: 0x000a, 0x15a6: 0x000a, 0x15a7: 0x000a, 0x15a8: 0x000a, 0x15a9: 0x000a,
-	0x15aa: 0x000a, 0x15ab: 0x000a, 0x15ac: 0x000a, 0x15ad: 0x000a, 0x15ae: 0x000a, 0x15af: 0x000a,
-	0x15b0: 0x000a, 0x15b1: 0x000a, 0x15b2: 0x000a, 0x15b3: 0x000a, 0x15b4: 0x000a, 0x15b5: 0x000a,
-	0x15b6: 0x000a, 0x15b7: 0x000a, 0x15b8: 0x000a, 0x15b9: 0x000a, 0x15ba: 0x000a, 0x15bb: 0x000a,
-	0x15bc: 0x000a, 0x15bd: 0x000a, 0x15be: 0x000a, 0x15bf: 0x000a,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x000a, 0x15c1: 0x000a, 0x15c2: 0x000a, 0x15c3: 0x000a, 0x15c4: 0x000a, 0x15c5: 0x000a,
-	0x15c6: 0x000a, 0x15c7: 0x000a, 0x15c8: 0x000a, 0x15c9: 0x000a, 0x15ca: 0x000a, 0x15cb: 0x000a,
-	0x15cc: 0x000a, 0x15cd: 0x000a, 0x15ce: 0x000a, 0x15cf: 0x000a, 0x15d0: 0x000a, 0x15d1: 0x000a,
-	0x15d2: 0x000a, 0x15d3: 0x000a, 0x15d4: 0x000a, 0x15d5: 0x000a, 0x15d6: 0x000a, 0x15d7: 0x000a,
-	0x15d8: 0x000a, 0x15d9: 0x000a, 0x15da: 0x000a, 0x15db: 0x000a, 0x15dc: 0x000a, 0x15dd: 0x000a,
-	0x15de: 0x000a, 0x15df: 0x000a, 0x15e0: 0x000a, 0x15e1: 0x000a, 0x15e2: 0x000a, 0x15e3: 0x000a,
-	0x15e4: 0x000a, 0x15e5: 0x000a, 0x15e6: 0x000a, 0x15e7: 0x000a, 0x15e8: 0x000a, 0x15e9: 0x000a,
-	0x15ea: 0x000a, 0x15eb: 0x000a, 0x15ec: 0x000a, 0x15ed: 0x000a, 0x15ee: 0x000a, 0x15ef: 0x000a,
-	0x15f0: 0x000a, 0x15f1: 0x000a, 0x15f2: 0x000a, 0x15f3: 0x000a, 0x15f4: 0x000a, 0x15f5: 0x000a,
-	0x15f6: 0x000a, 0x15f7: 0x000a, 0x15f8: 0x000a, 0x15f9: 0x000a, 0x15fa: 0x000a, 0x15fb: 0x000a,
-	0x15fc: 0x000a, 0x15fd: 0x000a, 0x15fe: 0x000a, 0x15ff: 0x000a,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x000a, 0x1601: 0x000a, 0x1602: 0x000a, 0x1603: 0x000a, 0x1604: 0x000a, 0x1605: 0x000a,
-	0x1606: 0x000a, 0x1607: 0x000a, 0x1608: 0x000a, 0x1609: 0x000a, 0x160a: 0x000a, 0x160b: 0x000a,
-	0x160c: 0x000a, 0x160d: 0x000a, 0x160e: 0x000a, 0x160f: 0x000a, 0x1610: 0x000a, 0x1611: 0x000a,
-	0x1612: 0x0003, 0x1613: 0x0004, 0x1614: 0x000a, 0x1615: 0x000a, 0x1616: 0x000a, 0x1617: 0x000a,
-	0x1618: 0x000a, 0x1619: 0x000a, 0x161a: 0x000a, 0x161b: 0x000a, 0x161c: 0x000a, 0x161d: 0x000a,
-	0x161e: 0x000a, 0x161f: 0x000a, 0x1620: 0x000a, 0x1621: 0x000a, 0x1622: 0x000a, 0x1623: 0x000a,
-	0x1624: 0x000a, 0x1625: 0x000a, 0x1626: 0x000a, 0x1627: 0x000a, 0x1628: 0x000a, 0x1629: 0x000a,
-	0x162a: 0x000a, 0x162b: 0x000a, 0x162c: 0x000a, 0x162d: 0x000a, 0x162e: 0x000a, 0x162f: 0x000a,
-	0x1630: 0x000a, 0x1631: 0x000a, 0x1632: 0x000a, 0x1633: 0x000a, 0x1634: 0x000a, 0x1635: 0x000a,
-	0x1636: 0x000a, 0x1637: 0x000a, 0x1638: 0x000a, 0x1639: 0x000a, 0x163a: 0x000a, 0x163b: 0x000a,
-	0x163c: 0x000a, 0x163d: 0x000a, 0x163e: 0x000a, 0x163f: 0x000a,
-	// Block 0x59, offset 0x1640
-	0x1640: 0x000a, 0x1641: 0x000a, 0x1642: 0x000a, 0x1643: 0x000a, 0x1644: 0x000a, 0x1645: 0x000a,
-	0x1646: 0x000a, 0x1647: 0x000a, 0x1648: 0x003a, 0x1649: 0x002a, 0x164a: 0x003a, 0x164b: 0x002a,
-	0x164c: 0x000a, 0x164d: 0x000a, 0x164e: 0x000a, 0x164f: 0x000a, 0x1650: 0x000a, 0x1651: 0x000a,
-	0x1652: 0x000a, 0x1653: 0x000a, 0x1654: 0x000a, 0x1655: 0x000a, 0x1656: 0x000a, 0x1657: 0x000a,
-	0x1658: 0x000a, 0x1659: 0x000a, 0x165a: 0x000a, 0x165b: 0x000a, 0x165c: 0x000a, 0x165d: 0x000a,
-	0x165e: 0x000a, 0x165f: 0x000a, 0x1660: 0x000a, 0x1661: 0x000a, 0x1662: 0x000a, 0x1663: 0x000a,
-	0x1664: 0x000a, 0x1665: 0x000a, 0x1666: 0x000a, 0x1667: 0x000a, 0x1668: 0x000a, 0x1669: 0x009a,
-	0x166a: 0x008a, 0x166b: 0x000a, 0x166c: 0x000a, 0x166d: 0x000a, 0x166e: 0x000a, 0x166f: 0x000a,
-	0x1670: 0x000a, 0x1671: 0x000a, 0x1672: 0x000a, 0x1673: 0x000a, 0x1674: 0x000a, 0x1675: 0x000a,
-	// Block 0x5a, offset 0x1680
-	0x16bb: 0x000a,
-	0x16bc: 0x000a, 0x16bd: 0x000a, 0x16be: 0x000a, 0x16bf: 0x000a,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x000a, 0x16c1: 0x000a, 0x16c2: 0x000a, 0x16c3: 0x000a, 0x16c4: 0x000a, 0x16c5: 0x000a,
-	0x16c6: 0x000a, 0x16c7: 0x000a, 0x16c8: 0x000a, 0x16c9: 0x000a, 0x16ca: 0x000a, 0x16cb: 0x000a,
-	0x16cc: 0x000a, 0x16cd: 0x000a, 0x16ce: 0x000a, 0x16cf: 0x000a, 0x16d0: 0x000a, 0x16d1: 0x000a,
-	0x16d2: 0x000a, 0x16d3: 0x000a, 0x16d4: 0x000a, 0x16d6: 0x000a, 0x16d7: 0x000a,
-	0x16d8: 0x000a, 0x16d9: 0x000a, 0x16da: 0x000a, 0x16db: 0x000a, 0x16dc: 0x000a, 0x16dd: 0x000a,
-	0x16de: 0x000a, 0x16df: 0x000a, 0x16e0: 0x000a, 0x16e1: 0x000a, 0x16e2: 0x000a, 0x16e3: 0x000a,
-	0x16e4: 0x000a, 0x16e5: 0x000a, 0x16e6: 0x000a, 0x16e7: 0x000a, 0x16e8: 0x000a, 0x16e9: 0x000a,
-	0x16ea: 0x000a, 0x16eb: 0x000a, 0x16ec: 0x000a, 0x16ed: 0x000a, 0x16ee: 0x000a, 0x16ef: 0x000a,
-	0x16f0: 0x000a, 0x16f1: 0x000a, 0x16f2: 0x000a, 0x16f3: 0x000a, 0x16f4: 0x000a, 0x16f5: 0x000a,
-	0x16f6: 0x000a, 0x16f7: 0x000a, 0x16f8: 0x000a, 0x16f9: 0x000a, 0x16fa: 0x000a, 0x16fb: 0x000a,
-	0x16fc: 0x000a, 0x16fd: 0x000a, 0x16fe: 0x000a, 0x16ff: 0x000a,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x000a, 0x1701: 0x000a, 0x1702: 0x000a, 0x1703: 0x000a, 0x1704: 0x000a, 0x1705: 0x000a,
-	0x1706: 0x000a, 0x1707: 0x000a, 0x1708: 0x000a, 0x1709: 0x000a, 0x170a: 0x000a, 0x170b: 0x000a,
-	0x170c: 0x000a, 0x170d: 0x000a, 0x170e: 0x000a, 0x170f: 0x000a, 0x1710: 0x000a, 0x1711: 0x000a,
-	0x1712: 0x000a, 0x1713: 0x000a, 0x1714: 0x000a, 0x1715: 0x000a, 0x1716: 0x000a, 0x1717: 0x000a,
-	0x1718: 0x000a, 0x1719: 0x000a, 0x171a: 0x000a, 0x171b: 0x000a, 0x171c: 0x000a, 0x171d: 0x000a,
-	0x171e: 0x000a, 0x171f: 0x000a, 0x1720: 0x000a, 0x1721: 0x000a, 0x1722: 0x000a, 0x1723: 0x000a,
-	0x1724: 0x000a, 0x1725: 0x000a, 0x1726: 0x000a,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x000a, 0x1741: 0x000a, 0x1742: 0x000a, 0x1743: 0x000a, 0x1744: 0x000a, 0x1745: 0x000a,
-	0x1746: 0x000a, 0x1747: 0x000a, 0x1748: 0x000a, 0x1749: 0x000a, 0x174a: 0x000a,
-	0x1760: 0x000a, 0x1761: 0x000a, 0x1762: 0x000a, 0x1763: 0x000a,
-	0x1764: 0x000a, 0x1765: 0x000a, 0x1766: 0x000a, 0x1767: 0x000a, 0x1768: 0x000a, 0x1769: 0x000a,
-	0x176a: 0x000a, 0x176b: 0x000a, 0x176c: 0x000a, 0x176d: 0x000a, 0x176e: 0x000a, 0x176f: 0x000a,
-	0x1770: 0x000a, 0x1771: 0x000a, 0x1772: 0x000a, 0x1773: 0x000a, 0x1774: 0x000a, 0x1775: 0x000a,
-	0x1776: 0x000a, 0x1777: 0x000a, 0x1778: 0x000a, 0x1779: 0x000a, 0x177a: 0x000a, 0x177b: 0x000a,
-	0x177c: 0x000a, 0x177d: 0x000a, 0x177e: 0x000a, 0x177f: 0x000a,
-	// Block 0x5e, offset 0x1780
-	0x1780: 0x000a, 0x1781: 0x000a, 0x1782: 0x000a, 0x1783: 0x000a, 0x1784: 0x000a, 0x1785: 0x000a,
-	0x1786: 0x000a, 0x1787: 0x000a, 0x1788: 0x0002, 0x1789: 0x0002, 0x178a: 0x0002, 0x178b: 0x0002,
-	0x178c: 0x0002, 0x178d: 0x0002, 0x178e: 0x0002, 0x178f: 0x0002, 0x1790: 0x0002, 0x1791: 0x0002,
-	0x1792: 0x0002, 0x1793: 0x0002, 0x1794: 0x0002, 0x1795: 0x0002, 0x1796: 0x0002, 0x1797: 0x0002,
-	0x1798: 0x0002, 0x1799: 0x0002, 0x179a: 0x0002, 0x179b: 0x0002,
-	// Block 0x5f, offset 0x17c0
-	0x17ea: 0x000a, 0x17eb: 0x000a, 0x17ec: 0x000a, 0x17ed: 0x000a, 0x17ee: 0x000a, 0x17ef: 0x000a,
-	0x17f0: 0x000a, 0x17f1: 0x000a, 0x17f2: 0x000a, 0x17f3: 0x000a, 0x17f4: 0x000a, 0x17f5: 0x000a,
-	0x17f6: 0x000a, 0x17f7: 0x000a, 0x17f8: 0x000a, 0x17f9: 0x000a, 0x17fa: 0x000a, 0x17fb: 0x000a,
-	0x17fc: 0x000a, 0x17fd: 0x000a, 0x17fe: 0x000a, 0x17ff: 0x000a,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x000a, 0x1801: 0x000a, 0x1802: 0x000a, 0x1803: 0x000a, 0x1804: 0x000a, 0x1805: 0x000a,
-	0x1806: 0x000a, 0x1807: 0x000a, 0x1808: 0x000a, 0x1809: 0x000a, 0x180a: 0x000a, 0x180b: 0x000a,
-	0x180c: 0x000a, 0x180d: 0x000a, 0x180e: 0x000a, 0x180f: 0x000a, 0x1810: 0x000a, 0x1811: 0x000a,
-	0x1812: 0x000a, 0x1813: 0x000a, 0x1814: 0x000a, 0x1815: 0x000a, 0x1816: 0x000a, 0x1817: 0x000a,
-	0x1818: 0x000a, 0x1819: 0x000a, 0x181a: 0x000a, 0x181b: 0x000a, 0x181c: 0x000a, 0x181d: 0x000a,
-	0x181e: 0x000a, 0x181f: 0x000a, 0x1820: 0x000a, 0x1821: 0x000a, 0x1822: 0x000a, 0x1823: 0x000a,
-	0x1824: 0x000a, 0x1825: 0x000a, 0x1826: 0x000a, 0x1827: 0x000a, 0x1828: 0x000a, 0x1829: 0x000a,
-	0x182a: 0x000a, 0x182b: 0x000a, 0x182d: 0x000a, 0x182e: 0x000a, 0x182f: 0x000a,
-	0x1830: 0x000a, 0x1831: 0x000a, 0x1832: 0x000a, 0x1833: 0x000a, 0x1834: 0x000a, 0x1835: 0x000a,
-	0x1836: 0x000a, 0x1837: 0x000a, 0x1838: 0x000a, 0x1839: 0x000a, 0x183a: 0x000a, 0x183b: 0x000a,
-	0x183c: 0x000a, 0x183d: 0x000a, 0x183e: 0x000a, 0x183f: 0x000a,
-	// Block 0x61, offset 0x1840
-	0x1840: 0x000a, 0x1841: 0x000a, 0x1842: 0x000a, 0x1843: 0x000a, 0x1844: 0x000a, 0x1845: 0x000a,
-	0x1846: 0x000a, 0x1847: 0x000a, 0x1848: 0x000a, 0x1849: 0x000a, 0x184a: 0x000a, 0x184b: 0x000a,
-	0x184c: 0x000a, 0x184d: 0x000a, 0x184e: 0x000a, 0x184f: 0x000a, 0x1850: 0x000a, 0x1851: 0x000a,
-	0x1852: 0x000a, 0x1853: 0x000a, 0x1854: 0x000a, 0x1855: 0x000a, 0x1856: 0x000a, 0x1857: 0x000a,
-	0x1858: 0x000a, 0x1859: 0x000a, 0x185a: 0x000a, 0x185b: 0x000a, 0x185c: 0x000a, 0x185d: 0x000a,
-	0x185e: 0x000a, 0x185f: 0x000a, 0x1860: 0x000a, 0x1861: 0x000a, 0x1862: 0x000a, 0x1863: 0x000a,
-	0x1864: 0x000a, 0x1865: 0x000a, 0x1866: 0x000a, 0x1867: 0x000a, 0x1868: 0x003a, 0x1869: 0x002a,
-	0x186a: 0x003a, 0x186b: 0x002a, 0x186c: 0x003a, 0x186d: 0x002a, 0x186e: 0x003a, 0x186f: 0x002a,
-	0x1870: 0x003a, 0x1871: 0x002a, 0x1872: 0x003a, 0x1873: 0x002a, 0x1874: 0x003a, 0x1875: 0x002a,
-	0x1876: 0x000a, 0x1877: 0x000a, 0x1878: 0x000a, 0x1879: 0x000a, 0x187a: 0x000a, 0x187b: 0x000a,
-	0x187c: 0x000a, 0x187d: 0x000a, 0x187e: 0x000a, 0x187f: 0x000a,
-	// Block 0x62, offset 0x1880
-	0x1880: 0x000a, 0x1881: 0x000a, 0x1882: 0x000a, 0x1883: 0x000a, 0x1884: 0x000a, 0x1885: 0x009a,
-	0x1886: 0x008a, 0x1887: 0x000a, 0x1888: 0x000a, 0x1889: 0x000a, 0x188a: 0x000a, 0x188b: 0x000a,
-	0x188c: 0x000a, 0x188d: 0x000a, 0x188e: 0x000a, 0x188f: 0x000a, 0x1890: 0x000a, 0x1891: 0x000a,
-	0x1892: 0x000a, 0x1893: 0x000a, 0x1894: 0x000a, 0x1895: 0x000a, 0x1896: 0x000a, 0x1897: 0x000a,
-	0x1898: 0x000a, 0x1899: 0x000a, 0x189a: 0x000a, 0x189b: 0x000a, 0x189c: 0x000a, 0x189d: 0x000a,
-	0x189e: 0x000a, 0x189f: 0x000a, 0x18a0: 0x000a, 0x18a1: 0x000a, 0x18a2: 0x000a, 0x18a3: 0x000a,
-	0x18a4: 0x000a, 0x18a5: 0x000a, 0x18a6: 0x003a, 0x18a7: 0x002a, 0x18a8: 0x003a, 0x18a9: 0x002a,
-	0x18aa: 0x003a, 0x18ab: 0x002a, 0x18ac: 0x003a, 0x18ad: 0x002a, 0x18ae: 0x003a, 0x18af: 0x002a,
-	0x18b0: 0x000a, 0x18b1: 0x000a, 0x18b2: 0x000a, 0x18b3: 0x000a, 0x18b4: 0x000a, 0x18b5: 0x000a,
-	0x18b6: 0x000a, 0x18b7: 0x000a, 0x18b8: 0x000a, 0x18b9: 0x000a, 0x18ba: 0x000a, 0x18bb: 0x000a,
-	0x18bc: 0x000a, 0x18bd: 0x000a, 0x18be: 0x000a, 0x18bf: 0x000a,
-	// Block 0x63, offset 0x18c0
-	0x18c0: 0x000a, 0x18c1: 0x000a, 0x18c2: 0x000a, 0x18c3: 0x007a, 0x18c4: 0x006a, 0x18c5: 0x009a,
-	0x18c6: 0x008a, 0x18c7: 0x00ba, 0x18c8: 0x00aa, 0x18c9: 0x009a, 0x18ca: 0x008a, 0x18cb: 0x007a,
-	0x18cc: 0x006a, 0x18cd: 0x00da, 0x18ce: 0x002a, 0x18cf: 0x003a, 0x18d0: 0x00ca, 0x18d1: 0x009a,
-	0x18d2: 0x008a, 0x18d3: 0x007a, 0x18d4: 0x006a, 0x18d5: 0x009a, 0x18d6: 0x008a, 0x18d7: 0x00ba,
-	0x18d8: 0x00aa, 0x18d9: 0x000a, 0x18da: 0x000a, 0x18db: 0x000a, 0x18dc: 0x000a, 0x18dd: 0x000a,
-	0x18de: 0x000a, 0x18df: 0x000a, 0x18e0: 0x000a, 0x18e1: 0x000a, 0x18e2: 0x000a, 0x18e3: 0x000a,
-	0x18e4: 0x000a, 0x18e5: 0x000a, 0x18e6: 0x000a, 0x18e7: 0x000a, 0x18e8: 0x000a, 0x18e9: 0x000a,
-	0x18ea: 0x000a, 0x18eb: 0x000a, 0x18ec: 0x000a, 0x18ed: 0x000a, 0x18ee: 0x000a, 0x18ef: 0x000a,
-	0x18f0: 0x000a, 0x18f1: 0x000a, 0x18f2: 0x000a, 0x18f3: 0x000a, 0x18f4: 0x000a, 0x18f5: 0x000a,
-	0x18f6: 0x000a, 0x18f7: 0x000a, 0x18f8: 0x000a, 0x18f9: 0x000a, 0x18fa: 0x000a, 0x18fb: 0x000a,
-	0x18fc: 0x000a, 0x18fd: 0x000a, 0x18fe: 0x000a, 0x18ff: 0x000a,
-	// Block 0x64, offset 0x1900
-	0x1900: 0x000a, 0x1901: 0x000a, 0x1902: 0x000a, 0x1903: 0x000a, 0x1904: 0x000a, 0x1905: 0x000a,
-	0x1906: 0x000a, 0x1907: 0x000a, 0x1908: 0x000a, 0x1909: 0x000a, 0x190a: 0x000a, 0x190b: 0x000a,
-	0x190c: 0x000a, 0x190d: 0x000a, 0x190e: 0x000a, 0x190f: 0x000a, 0x1910: 0x000a, 0x1911: 0x000a,
-	0x1912: 0x000a, 0x1913: 0x000a, 0x1914: 0x000a, 0x1915: 0x000a, 0x1916: 0x000a, 0x1917: 0x000a,
-	0x1918: 0x003a, 0x1919: 0x002a, 0x191a: 0x003a, 0x191b: 0x002a, 0x191c: 0x000a, 0x191d: 0x000a,
-	0x191e: 0x000a, 0x191f: 0x000a, 0x1920: 0x000a, 0x1921: 0x000a, 0x1922: 0x000a, 0x1923: 0x000a,
-	0x1924: 0x000a, 0x1925: 0x000a, 0x1926: 0x000a, 0x1927: 0x000a, 0x1928: 0x000a, 0x1929: 0x000a,
-	0x192a: 0x000a, 0x192b: 0x000a, 0x192c: 0x000a, 0x192d: 0x000a, 0x192e: 0x000a, 0x192f: 0x000a,
-	0x1930: 0x000a, 0x1931: 0x000a, 0x1932: 0x000a, 0x1933: 0x000a, 0x1934: 0x000a, 0x1935: 0x000a,
-	0x1936: 0x000a, 0x1937: 0x000a, 0x1938: 0x000a, 0x1939: 0x000a, 0x193a: 0x000a, 0x193b: 0x000a,
-	0x193c: 0x003a, 0x193d: 0x002a, 0x193e: 0x000a, 0x193f: 0x000a,
-	// Block 0x65, offset 0x1940
-	0x1940: 0x000a, 0x1941: 0x000a, 0x1942: 0x000a, 0x1943: 0x000a, 0x1944: 0x000a, 0x1945: 0x000a,
-	0x1946: 0x000a, 0x1947: 0x000a, 0x1948: 0x000a, 0x1949: 0x000a, 0x194a: 0x000a, 0x194b: 0x000a,
-	0x194c: 0x000a, 0x194d: 0x000a, 0x194e: 0x000a, 0x194f: 0x000a, 0x1950: 0x000a, 0x1951: 0x000a,
-	0x1952: 0x000a, 0x1953: 0x000a, 0x1954: 0x000a, 0x1955: 0x000a, 0x1956: 0x000a, 0x1957: 0x000a,
-	0x1958: 0x000a, 0x1959: 0x000a, 0x195a: 0x000a, 0x195b: 0x000a, 0x195c: 0x000a, 0x195d: 0x000a,
-	0x195e: 0x000a, 0x195f: 0x000a, 0x1960: 0x000a, 0x1961: 0x000a, 0x1962: 0x000a, 0x1963: 0x000a,
-	0x1964: 0x000a, 0x1965: 0x000a, 0x1966: 0x000a, 0x1967: 0x000a, 0x1968: 0x000a, 0x1969: 0x000a,
-	0x196a: 0x000a, 0x196b: 0x000a, 0x196c: 0x000a, 0x196d: 0x000a, 0x196e: 0x000a, 0x196f: 0x000a,
-	0x1970: 0x000a, 0x1971: 0x000a, 0x1972: 0x000a, 0x1973: 0x000a,
-	0x1976: 0x000a, 0x1977: 0x000a, 0x1978: 0x000a, 0x1979: 0x000a, 0x197a: 0x000a, 0x197b: 0x000a,
-	0x197c: 0x000a, 0x197d: 0x000a, 0x197e: 0x000a, 0x197f: 0x000a,
-	// Block 0x66, offset 0x1980
-	0x1980: 0x000a, 0x1981: 0x000a, 0x1982: 0x000a, 0x1983: 0x000a, 0x1984: 0x000a, 0x1985: 0x000a,
-	0x1986: 0x000a, 0x1987: 0x000a, 0x1988: 0x000a, 0x1989: 0x000a, 0x198a: 0x000a, 0x198b: 0x000a,
-	0x198c: 0x000a, 0x198d: 0x000a, 0x198e: 0x000a, 0x198f: 0x000a, 0x1990: 0x000a, 0x1991: 0x000a,
-	0x1992: 0x000a, 0x1993: 0x000a, 0x1994: 0x000a, 0x1995: 0x000a, 0x1997: 0x000a,
-	0x1998: 0x000a, 0x1999: 0x000a, 0x199a: 0x000a, 0x199b: 0x000a, 0x199c: 0x000a, 0x199d: 0x000a,
-	0x199e: 0x000a, 0x199f: 0x000a, 0x19a0: 0x000a, 0x19a1: 0x000a, 0x19a2: 0x000a, 0x19a3: 0x000a,
-	0x19a4: 0x000a, 0x19a5: 0x000a, 0x19a6: 0x000a, 0x19a7: 0x000a, 0x19a8: 0x000a, 0x19a9: 0x000a,
-	0x19aa: 0x000a, 0x19ab: 0x000a, 0x19ac: 0x000a, 0x19ad: 0x000a, 0x19ae: 0x000a, 0x19af: 0x000a,
-	0x19b0: 0x000a, 0x19b1: 0x000a, 0x19b2: 0x000a, 0x19b3: 0x000a, 0x19b4: 0x000a, 0x19b5: 0x000a,
-	0x19b6: 0x000a, 0x19b7: 0x000a, 0x19b8: 0x000a, 0x19b9: 0x000a, 0x19ba: 0x000a, 0x19bb: 0x000a,
-	0x19bc: 0x000a, 0x19bd: 0x000a, 0x19be: 0x000a, 0x19bf: 0x000a,
-	// Block 0x67, offset 0x19c0
-	0x19e5: 0x000a, 0x19e6: 0x000a, 0x19e7: 0x000a, 0x19e8: 0x000a, 0x19e9: 0x000a,
-	0x19ea: 0x000a, 0x19ef: 0x000c,
-	0x19f0: 0x000c, 0x19f1: 0x000c,
-	0x19f9: 0x000a, 0x19fa: 0x000a, 0x19fb: 0x000a,
-	0x19fc: 0x000a, 0x19fd: 0x000a, 0x19fe: 0x000a, 0x19ff: 0x000a,
-	// Block 0x68, offset 0x1a00
-	0x1a3f: 0x000c,
-	// Block 0x69, offset 0x1a40
-	0x1a60: 0x000c, 0x1a61: 0x000c, 0x1a62: 0x000c, 0x1a63: 0x000c,
-	0x1a64: 0x000c, 0x1a65: 0x000c, 0x1a66: 0x000c, 0x1a67: 0x000c, 0x1a68: 0x000c, 0x1a69: 0x000c,
-	0x1a6a: 0x000c, 0x1a6b: 0x000c, 0x1a6c: 0x000c, 0x1a6d: 0x000c, 0x1a6e: 0x000c, 0x1a6f: 0x000c,
-	0x1a70: 0x000c, 0x1a71: 0x000c, 0x1a72: 0x000c, 0x1a73: 0x000c, 0x1a74: 0x000c, 0x1a75: 0x000c,
-	0x1a76: 0x000c, 0x1a77: 0x000c, 0x1a78: 0x000c, 0x1a79: 0x000c, 0x1a7a: 0x000c, 0x1a7b: 0x000c,
-	0x1a7c: 0x000c, 0x1a7d: 0x000c, 0x1a7e: 0x000c, 0x1a7f: 0x000c,
-	// Block 0x6a, offset 0x1a80
-	0x1a80: 0x000a, 0x1a81: 0x000a, 0x1a82: 0x000a, 0x1a83: 0x000a, 0x1a84: 0x000a, 0x1a85: 0x000a,
-	0x1a86: 0x000a, 0x1a87: 0x000a, 0x1a88: 0x000a, 0x1a89: 0x000a, 0x1a8a: 0x000a, 0x1a8b: 0x000a,
-	0x1a8c: 0x000a, 0x1a8d: 0x000a, 0x1a8e: 0x000a, 0x1a8f: 0x000a, 0x1a90: 0x000a, 0x1a91: 0x000a,
-	0x1a92: 0x000a, 0x1a93: 0x000a, 0x1a94: 0x000a, 0x1a95: 0x000a, 0x1a96: 0x000a, 0x1a97: 0x000a,
-	0x1a98: 0x000a, 0x1a99: 0x000a, 0x1a9a: 0x000a, 0x1a9b: 0x000a, 0x1a9c: 0x000a, 0x1a9d: 0x000a,
-	0x1a9e: 0x000a, 0x1a9f: 0x000a, 0x1aa0: 0x000a, 0x1aa1: 0x000a, 0x1aa2: 0x003a, 0x1aa3: 0x002a,
-	0x1aa4: 0x003a, 0x1aa5: 0x002a, 0x1aa6: 0x003a, 0x1aa7: 0x002a, 0x1aa8: 0x003a, 0x1aa9: 0x002a,
-	0x1aaa: 0x000a, 0x1aab: 0x000a, 0x1aac: 0x000a, 0x1aad: 0x000a, 0x1aae: 0x000a, 0x1aaf: 0x000a,
-	0x1ab0: 0x000a, 0x1ab1: 0x000a, 0x1ab2: 0x000a, 0x1ab3: 0x000a, 0x1ab4: 0x000a, 0x1ab5: 0x000a,
-	0x1ab6: 0x000a, 0x1ab7: 0x000a, 0x1ab8: 0x000a, 0x1ab9: 0x000a, 0x1aba: 0x000a, 0x1abb: 0x000a,
-	0x1abc: 0x000a, 0x1abd: 0x000a, 0x1abe: 0x000a, 0x1abf: 0x000a,
-	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0x000a, 0x1ac1: 0x000a, 0x1ac2: 0x000a, 0x1ac3: 0x000a, 0x1ac4: 0x000a, 0x1ac5: 0x000a,
-	0x1ac6: 0x000a, 0x1ac7: 0x000a, 0x1ac8: 0x000a, 0x1ac9: 0x000a, 0x1aca: 0x000a, 0x1acb: 0x000a,
-	0x1acc: 0x000a, 0x1acd: 0x000a, 0x1ace: 0x000a, 0x1acf: 0x000a, 0x1ad0: 0x000a, 0x1ad1: 0x000a,
-	0x1ad2: 0x000a, 0x1ad3: 0x000a, 0x1ad4: 0x000a, 0x1ad5: 0x009a, 0x1ad6: 0x008a, 0x1ad7: 0x00ba,
-	0x1ad8: 0x00aa, 0x1ad9: 0x009a, 0x1ada: 0x008a, 0x1adb: 0x007a, 0x1adc: 0x006a, 0x1add: 0x000a,
-	// Block 0x6c, offset 0x1b00
-	0x1b00: 0x000a, 0x1b01: 0x000a, 0x1b02: 0x000a, 0x1b03: 0x000a, 0x1b04: 0x000a, 0x1b05: 0x000a,
-	0x1b06: 0x000a, 0x1b07: 0x000a, 0x1b08: 0x000a, 0x1b09: 0x000a, 0x1b0a: 0x000a, 0x1b0b: 0x000a,
-	0x1b0c: 0x000a, 0x1b0d: 0x000a, 0x1b0e: 0x000a, 0x1b0f: 0x000a, 0x1b10: 0x000a, 0x1b11: 0x000a,
-	0x1b12: 0x000a, 0x1b13: 0x000a, 0x1b14: 0x000a, 0x1b15: 0x000a, 0x1b16: 0x000a, 0x1b17: 0x000a,
-	0x1b18: 0x000a, 0x1b19: 0x000a, 0x1b1b: 0x000a, 0x1b1c: 0x000a, 0x1b1d: 0x000a,
-	0x1b1e: 0x000a, 0x1b1f: 0x000a, 0x1b20: 0x000a, 0x1b21: 0x000a, 0x1b22: 0x000a, 0x1b23: 0x000a,
-	0x1b24: 0x000a, 0x1b25: 0x000a, 0x1b26: 0x000a, 0x1b27: 0x000a, 0x1b28: 0x000a, 0x1b29: 0x000a,
-	0x1b2a: 0x000a, 0x1b2b: 0x000a, 0x1b2c: 0x000a, 0x1b2d: 0x000a, 0x1b2e: 0x000a, 0x1b2f: 0x000a,
-	0x1b30: 0x000a, 0x1b31: 0x000a, 0x1b32: 0x000a, 0x1b33: 0x000a, 0x1b34: 0x000a, 0x1b35: 0x000a,
-	0x1b36: 0x000a, 0x1b37: 0x000a, 0x1b38: 0x000a, 0x1b39: 0x000a, 0x1b3a: 0x000a, 0x1b3b: 0x000a,
-	0x1b3c: 0x000a, 0x1b3d: 0x000a, 0x1b3e: 0x000a, 0x1b3f: 0x000a,
-	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x000a, 0x1b41: 0x000a, 0x1b42: 0x000a, 0x1b43: 0x000a, 0x1b44: 0x000a, 0x1b45: 0x000a,
-	0x1b46: 0x000a, 0x1b47: 0x000a, 0x1b48: 0x000a, 0x1b49: 0x000a, 0x1b4a: 0x000a, 0x1b4b: 0x000a,
-	0x1b4c: 0x000a, 0x1b4d: 0x000a, 0x1b4e: 0x000a, 0x1b4f: 0x000a, 0x1b50: 0x000a, 0x1b51: 0x000a,
-	0x1b52: 0x000a, 0x1b53: 0x000a, 0x1b54: 0x000a, 0x1b55: 0x000a, 0x1b56: 0x000a, 0x1b57: 0x000a,
-	0x1b58: 0x000a, 0x1b59: 0x000a, 0x1b5a: 0x000a, 0x1b5b: 0x000a, 0x1b5c: 0x000a, 0x1b5d: 0x000a,
-	0x1b5e: 0x000a, 0x1b5f: 0x000a, 0x1b60: 0x000a, 0x1b61: 0x000a, 0x1b62: 0x000a, 0x1b63: 0x000a,
-	0x1b64: 0x000a, 0x1b65: 0x000a, 0x1b66: 0x000a, 0x1b67: 0x000a, 0x1b68: 0x000a, 0x1b69: 0x000a,
-	0x1b6a: 0x000a, 0x1b6b: 0x000a, 0x1b6c: 0x000a, 0x1b6d: 0x000a, 0x1b6e: 0x000a, 0x1b6f: 0x000a,
-	0x1b70: 0x000a, 0x1b71: 0x000a, 0x1b72: 0x000a, 0x1b73: 0x000a,
-	// Block 0x6e, offset 0x1b80
-	0x1b80: 0x000a, 0x1b81: 0x000a, 0x1b82: 0x000a, 0x1b83: 0x000a, 0x1b84: 0x000a, 0x1b85: 0x000a,
-	0x1b86: 0x000a, 0x1b87: 0x000a, 0x1b88: 0x000a, 0x1b89: 0x000a, 0x1b8a: 0x000a, 0x1b8b: 0x000a,
-	0x1b8c: 0x000a, 0x1b8d: 0x000a, 0x1b8e: 0x000a, 0x1b8f: 0x000a, 0x1b90: 0x000a, 0x1b91: 0x000a,
-	0x1b92: 0x000a, 0x1b93: 0x000a, 0x1b94: 0x000a, 0x1b95: 0x000a,
-	0x1bb0: 0x000a, 0x1bb1: 0x000a, 0x1bb2: 0x000a, 0x1bb3: 0x000a, 0x1bb4: 0x000a, 0x1bb5: 0x000a,
-	0x1bb6: 0x000a, 0x1bb7: 0x000a, 0x1bb8: 0x000a, 0x1bb9: 0x000a, 0x1bba: 0x000a, 0x1bbb: 0x000a,
-	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0x0009, 0x1bc1: 0x000a, 0x1bc2: 0x000a, 0x1bc3: 0x000a, 0x1bc4: 0x000a,
-	0x1bc8: 0x003a, 0x1bc9: 0x002a, 0x1bca: 0x003a, 0x1bcb: 0x002a,
-	0x1bcc: 0x003a, 0x1bcd: 0x002a, 0x1bce: 0x003a, 0x1bcf: 0x002a, 0x1bd0: 0x003a, 0x1bd1: 0x002a,
-	0x1bd2: 0x000a, 0x1bd3: 0x000a, 0x1bd4: 0x003a, 0x1bd5: 0x002a, 0x1bd6: 0x003a, 0x1bd7: 0x002a,
-	0x1bd8: 0x003a, 0x1bd9: 0x002a, 0x1bda: 0x003a, 0x1bdb: 0x002a, 0x1bdc: 0x000a, 0x1bdd: 0x000a,
-	0x1bde: 0x000a, 0x1bdf: 0x000a, 0x1be0: 0x000a,
-	0x1bea: 0x000c, 0x1beb: 0x000c, 0x1bec: 0x000c, 0x1bed: 0x000c,
-	0x1bf0: 0x000a,
-	0x1bf6: 0x000a, 0x1bf7: 0x000a,
-	0x1bfd: 0x000a, 0x1bfe: 0x000a, 0x1bff: 0x000a,
-	// Block 0x70, offset 0x1c00
-	0x1c19: 0x000c, 0x1c1a: 0x000c, 0x1c1b: 0x000a, 0x1c1c: 0x000a,
-	0x1c20: 0x000a,
-	// Block 0x71, offset 0x1c40
-	0x1c7b: 0x000a,
-	// Block 0x72, offset 0x1c80
-	0x1c80: 0x000a, 0x1c81: 0x000a, 0x1c82: 0x000a, 0x1c83: 0x000a, 0x1c84: 0x000a, 0x1c85: 0x000a,
-	0x1c86: 0x000a, 0x1c87: 0x000a, 0x1c88: 0x000a, 0x1c89: 0x000a, 0x1c8a: 0x000a, 0x1c8b: 0x000a,
-	0x1c8c: 0x000a, 0x1c8d: 0x000a, 0x1c8e: 0x000a, 0x1c8f: 0x000a, 0x1c90: 0x000a, 0x1c91: 0x000a,
-	0x1c92: 0x000a, 0x1c93: 0x000a, 0x1c94: 0x000a, 0x1c95: 0x000a, 0x1c96: 0x000a, 0x1c97: 0x000a,
-	0x1c98: 0x000a, 0x1c99: 0x000a, 0x1c9a: 0x000a, 0x1c9b: 0x000a, 0x1c9c: 0x000a, 0x1c9d: 0x000a,
-	0x1c9e: 0x000a, 0x1c9f: 0x000a, 0x1ca0: 0x000a, 0x1ca1: 0x000a, 0x1ca2: 0x000a, 0x1ca3: 0x000a,
-	// Block 0x73, offset 0x1cc0
-	0x1cdd: 0x000a,
-	0x1cde: 0x000a,
-	// Block 0x74, offset 0x1d00
-	0x1d10: 0x000a, 0x1d11: 0x000a,
-	0x1d12: 0x000a, 0x1d13: 0x000a, 0x1d14: 0x000a, 0x1d15: 0x000a, 0x1d16: 0x000a, 0x1d17: 0x000a,
-	0x1d18: 0x000a, 0x1d19: 0x000a, 0x1d1a: 0x000a, 0x1d1b: 0x000a, 0x1d1c: 0x000a, 0x1d1d: 0x000a,
-	0x1d1e: 0x000a, 0x1d1f: 0x000a,
-	0x1d3c: 0x000a, 0x1d3d: 0x000a, 0x1d3e: 0x000a,
-	// Block 0x75, offset 0x1d40
-	0x1d71: 0x000a, 0x1d72: 0x000a, 0x1d73: 0x000a, 0x1d74: 0x000a, 0x1d75: 0x000a,
-	0x1d76: 0x000a, 0x1d77: 0x000a, 0x1d78: 0x000a, 0x1d79: 0x000a, 0x1d7a: 0x000a, 0x1d7b: 0x000a,
-	0x1d7c: 0x000a, 0x1d7d: 0x000a, 0x1d7e: 0x000a, 0x1d7f: 0x000a,
-	// Block 0x76, offset 0x1d80
-	0x1d8c: 0x000a, 0x1d8d: 0x000a, 0x1d8e: 0x000a, 0x1d8f: 0x000a,
-	// Block 0x77, offset 0x1dc0
-	0x1df7: 0x000a, 0x1df8: 0x000a, 0x1df9: 0x000a, 0x1dfa: 0x000a,
-	// Block 0x78, offset 0x1e00
-	0x1e1e: 0x000a, 0x1e1f: 0x000a,
-	0x1e3f: 0x000a,
-	// Block 0x79, offset 0x1e40
-	0x1e50: 0x000a, 0x1e51: 0x000a,
-	0x1e52: 0x000a, 0x1e53: 0x000a, 0x1e54: 0x000a, 0x1e55: 0x000a, 0x1e56: 0x000a, 0x1e57: 0x000a,
-	0x1e58: 0x000a, 0x1e59: 0x000a, 0x1e5a: 0x000a, 0x1e5b: 0x000a, 0x1e5c: 0x000a, 0x1e5d: 0x000a,
-	0x1e5e: 0x000a, 0x1e5f: 0x000a, 0x1e60: 0x000a, 0x1e61: 0x000a, 0x1e62: 0x000a, 0x1e63: 0x000a,
-	0x1e64: 0x000a, 0x1e65: 0x000a, 0x1e66: 0x000a, 0x1e67: 0x000a, 0x1e68: 0x000a, 0x1e69: 0x000a,
-	0x1e6a: 0x000a, 0x1e6b: 0x000a, 0x1e6c: 0x000a, 0x1e6d: 0x000a, 0x1e6e: 0x000a, 0x1e6f: 0x000a,
-	0x1e70: 0x000a, 0x1e71: 0x000a, 0x1e72: 0x000a, 0x1e73: 0x000a, 0x1e74: 0x000a, 0x1e75: 0x000a,
-	0x1e76: 0x000a, 0x1e77: 0x000a, 0x1e78: 0x000a, 0x1e79: 0x000a, 0x1e7a: 0x000a, 0x1e7b: 0x000a,
-	0x1e7c: 0x000a, 0x1e7d: 0x000a, 0x1e7e: 0x000a, 0x1e7f: 0x000a,
-	// Block 0x7a, offset 0x1e80
-	0x1e80: 0x000a, 0x1e81: 0x000a, 0x1e82: 0x000a, 0x1e83: 0x000a, 0x1e84: 0x000a, 0x1e85: 0x000a,
-	0x1e86: 0x000a,
-	// Block 0x7b, offset 0x1ec0
-	0x1ecd: 0x000a, 0x1ece: 0x000a, 0x1ecf: 0x000a,
-	// Block 0x7c, offset 0x1f00
-	0x1f2f: 0x000c,
-	0x1f30: 0x000c, 0x1f31: 0x000c, 0x1f32: 0x000c, 0x1f33: 0x000a, 0x1f34: 0x000c, 0x1f35: 0x000c,
-	0x1f36: 0x000c, 0x1f37: 0x000c, 0x1f38: 0x000c, 0x1f39: 0x000c, 0x1f3a: 0x000c, 0x1f3b: 0x000c,
-	0x1f3c: 0x000c, 0x1f3d: 0x000c, 0x1f3e: 0x000a, 0x1f3f: 0x000a,
-	// Block 0x7d, offset 0x1f40
-	0x1f5e: 0x000c, 0x1f5f: 0x000c,
-	// Block 0x7e, offset 0x1f80
-	0x1fb0: 0x000c, 0x1fb1: 0x000c,
-	// Block 0x7f, offset 0x1fc0
-	0x1fc0: 0x000a, 0x1fc1: 0x000a, 0x1fc2: 0x000a, 0x1fc3: 0x000a, 0x1fc4: 0x000a, 0x1fc5: 0x000a,
-	0x1fc6: 0x000a, 0x1fc7: 0x000a, 0x1fc8: 0x000a, 0x1fc9: 0x000a, 0x1fca: 0x000a, 0x1fcb: 0x000a,
-	0x1fcc: 0x000a, 0x1fcd: 0x000a, 0x1fce: 0x000a, 0x1fcf: 0x000a, 0x1fd0: 0x000a, 0x1fd1: 0x000a,
-	0x1fd2: 0x000a, 0x1fd3: 0x000a, 0x1fd4: 0x000a, 0x1fd5: 0x000a, 0x1fd6: 0x000a, 0x1fd7: 0x000a,
-	0x1fd8: 0x000a, 0x1fd9: 0x000a, 0x1fda: 0x000a, 0x1fdb: 0x000a, 0x1fdc: 0x000a, 0x1fdd: 0x000a,
-	0x1fde: 0x000a, 0x1fdf: 0x000a, 0x1fe0: 0x000a, 0x1fe1: 0x000a,
-	// Block 0x80, offset 0x2000
-	0x2008: 0x000a,
-	// Block 0x81, offset 0x2040
-	0x2042: 0x000c,
-	0x2046: 0x000c, 0x204b: 0x000c,
-	0x2065: 0x000c, 0x2066: 0x000c, 0x2068: 0x000a, 0x2069: 0x000a,
-	0x206a: 0x000a, 0x206b: 0x000a, 0x206c: 0x000c,
-	0x2078: 0x0004, 0x2079: 0x0004,
-	// Block 0x82, offset 0x2080
-	0x20b4: 0x000a, 0x20b5: 0x000a,
-	0x20b6: 0x000a, 0x20b7: 0x000a,
-	// Block 0x83, offset 0x20c0
-	0x20c4: 0x000c, 0x20c5: 0x000c,
-	0x20e0: 0x000c, 0x20e1: 0x000c, 0x20e2: 0x000c, 0x20e3: 0x000c,
-	0x20e4: 0x000c, 0x20e5: 0x000c, 0x20e6: 0x000c, 0x20e7: 0x000c, 0x20e8: 0x000c, 0x20e9: 0x000c,
-	0x20ea: 0x000c, 0x20eb: 0x000c, 0x20ec: 0x000c, 0x20ed: 0x000c, 0x20ee: 0x000c, 0x20ef: 0x000c,
-	0x20f0: 0x000c, 0x20f1: 0x000c,
-	0x20ff: 0x000c,
-	// Block 0x84, offset 0x2100
-	0x2126: 0x000c, 0x2127: 0x000c, 0x2128: 0x000c, 0x2129: 0x000c,
-	0x212a: 0x000c, 0x212b: 0x000c, 0x212c: 0x000c, 0x212d: 0x000c,
-	// Block 0x85, offset 0x2140
-	0x2147: 0x000c, 0x2148: 0x000c, 0x2149: 0x000c, 0x214a: 0x000c, 0x214b: 0x000c,
-	0x214c: 0x000c, 0x214d: 0x000c, 0x214e: 0x000c, 0x214f: 0x000c, 0x2150: 0x000c, 0x2151: 0x000c,
-	// Block 0x86, offset 0x2180
-	0x2180: 0x000c, 0x2181: 0x000c, 0x2182: 0x000c,
-	0x21b3: 0x000c,
-	0x21b6: 0x000c, 0x21b7: 0x000c, 0x21b8: 0x000c, 0x21b9: 0x000c,
-	0x21bc: 0x000c, 0x21bd: 0x000c,
-	// Block 0x87, offset 0x21c0
-	0x21e5: 0x000c,
-	// Block 0x88, offset 0x2200
-	0x2229: 0x000c,
-	0x222a: 0x000c, 0x222b: 0x000c, 0x222c: 0x000c, 0x222d: 0x000c, 0x222e: 0x000c,
-	0x2231: 0x000c, 0x2232: 0x000c, 0x2235: 0x000c,
-	0x2236: 0x000c,
-	// Block 0x89, offset 0x2240
-	0x2243: 0x000c,
-	0x224c: 0x000c,
-	0x227c: 0x000c,
-	// Block 0x8a, offset 0x2280
-	0x22b0: 0x000c, 0x22b2: 0x000c, 0x22b3: 0x000c, 0x22b4: 0x000c,
-	0x22b7: 0x000c, 0x22b8: 0x000c,
-	0x22be: 0x000c, 0x22bf: 0x000c,
-	// Block 0x8b, offset 0x22c0
-	0x22c1: 0x000c,
-	0x22ec: 0x000c, 0x22ed: 0x000c,
-	0x22f6: 0x000c,
-	// Block 0x8c, offset 0x2300
-	0x232a: 0x000a, 0x232b: 0x000a,
-	// Block 0x8d, offset 0x2340
-	0x2365: 0x000c, 0x2368: 0x000c,
-	0x236d: 0x000c,
-	// Block 0x8e, offset 0x2380
-	0x239d: 0x0001,
-	0x239e: 0x000c, 0x239f: 0x0001, 0x23a0: 0x0001, 0x23a1: 0x0001, 0x23a2: 0x0001, 0x23a3: 0x0001,
-	0x23a4: 0x0001, 0x23a5: 0x0001, 0x23a6: 0x0001, 0x23a7: 0x0001, 0x23a8: 0x0001, 0x23a9: 0x0003,
-	0x23aa: 0x0001, 0x23ab: 0x0001, 0x23ac: 0x0001, 0x23ad: 0x0001, 0x23ae: 0x0001, 0x23af: 0x0001,
-	0x23b0: 0x0001, 0x23b1: 0x0001, 0x23b2: 0x0001, 0x23b3: 0x0001, 0x23b4: 0x0001, 0x23b5: 0x0001,
-	0x23b6: 0x0001, 0x23b7: 0x0001, 0x23b8: 0x0001, 0x23b9: 0x0001, 0x23ba: 0x0001, 0x23bb: 0x0001,
-	0x23bc: 0x0001, 0x23bd: 0x0001, 0x23be: 0x0001, 0x23bf: 0x0001,
-	// Block 0x8f, offset 0x23c0
-	0x23c0: 0x0001, 0x23c1: 0x0001, 0x23c2: 0x0001, 0x23c3: 0x0001, 0x23c4: 0x0001, 0x23c5: 0x0001,
-	0x23c6: 0x0001, 0x23c7: 0x0001, 0x23c8: 0x0001, 0x23c9: 0x0001, 0x23ca: 0x0001, 0x23cb: 0x0001,
-	0x23cc: 0x0001, 0x23cd: 0x0001, 0x23ce: 0x0001, 0x23cf: 0x0001, 0x23d0: 0x000d, 0x23d1: 0x000d,
-	0x23d2: 0x000d, 0x23d3: 0x000d, 0x23d4: 0x000d, 0x23d5: 0x000d, 0x23d6: 0x000d, 0x23d7: 0x000d,
-	0x23d8: 0x000d, 0x23d9: 0x000d, 0x23da: 0x000d, 0x23db: 0x000d, 0x23dc: 0x000d, 0x23dd: 0x000d,
-	0x23de: 0x000d, 0x23df: 0x000d, 0x23e0: 0x000d, 0x23e1: 0x000d, 0x23e2: 0x000d, 0x23e3: 0x000d,
-	0x23e4: 0x000d, 0x23e5: 0x000d, 0x23e6: 0x000d, 0x23e7: 0x000d, 0x23e8: 0x000d, 0x23e9: 0x000d,
-	0x23ea: 0x000d, 0x23eb: 0x000d, 0x23ec: 0x000d, 0x23ed: 0x000d, 0x23ee: 0x000d, 0x23ef: 0x000d,
-	0x23f0: 0x000d, 0x23f1: 0x000d, 0x23f2: 0x000d, 0x23f3: 0x000d, 0x23f4: 0x000d, 0x23f5: 0x000d,
-	0x23f6: 0x000d, 0x23f7: 0x000d, 0x23f8: 0x000d, 0x23f9: 0x000d, 0x23fa: 0x000d, 0x23fb: 0x000d,
-	0x23fc: 0x000d, 0x23fd: 0x000d, 0x23fe: 0x000d, 0x23ff: 0x000d,
-	// Block 0x90, offset 0x2400
-	0x2400: 0x000d, 0x2401: 0x000d, 0x2402: 0x000d, 0x2403: 0x000d, 0x2404: 0x000d, 0x2405: 0x000d,
-	0x2406: 0x000d, 0x2407: 0x000d, 0x2408: 0x000d, 0x2409: 0x000d, 0x240a: 0x000d, 0x240b: 0x000d,
-	0x240c: 0x000d, 0x240d: 0x000d, 0x240e: 0x000d, 0x240f: 0x000d, 0x2410: 0x000d, 0x2411: 0x000d,
-	0x2412: 0x000d, 0x2413: 0x000d, 0x2414: 0x000d, 0x2415: 0x000d, 0x2416: 0x000d, 0x2417: 0x000d,
-	0x2418: 0x000d, 0x2419: 0x000d, 0x241a: 0x000d, 0x241b: 0x000d, 0x241c: 0x000d, 0x241d: 0x000d,
-	0x241e: 0x000d, 0x241f: 0x000d, 0x2420: 0x000d, 0x2421: 0x000d, 0x2422: 0x000d, 0x2423: 0x000d,
-	0x2424: 0x000d, 0x2425: 0x000d, 0x2426: 0x000d, 0x2427: 0x000d, 0x2428: 0x000d, 0x2429: 0x000d,
-	0x242a: 0x000d, 0x242b: 0x000d, 0x242c: 0x000d, 0x242d: 0x000d, 0x242e: 0x000d, 0x242f: 0x000d,
-	0x2430: 0x000d, 0x2431: 0x000d, 0x2432: 0x000d, 0x2433: 0x000d, 0x2434: 0x000d, 0x2435: 0x000d,
-	0x2436: 0x000d, 0x2437: 0x000d, 0x2438: 0x000d, 0x2439: 0x000d, 0x243a: 0x000d, 0x243b: 0x000d,
-	0x243c: 0x000d, 0x243d: 0x000d, 0x243e: 0x000a, 0x243f: 0x000a,
-	// Block 0x91, offset 0x2440
-	0x2440: 0x000a, 0x2441: 0x000a, 0x2442: 0x000a, 0x2443: 0x000a, 0x2444: 0x000a, 0x2445: 0x000a,
-	0x2446: 0x000a, 0x2447: 0x000a, 0x2448: 0x000a, 0x2449: 0x000a, 0x244a: 0x000a, 0x244b: 0x000a,
-	0x244c: 0x000a, 0x244d: 0x000a, 0x244e: 0x000a, 0x244f: 0x000a, 0x2450: 0x000d, 0x2451: 0x000d,
-	0x2452: 0x000d, 0x2453: 0x000d, 0x2454: 0x000d, 0x2455: 0x000d, 0x2456: 0x000d, 0x2457: 0x000d,
-	0x2458: 0x000d, 0x2459: 0x000d, 0x245a: 0x000d, 0x245b: 0x000d, 0x245c: 0x000d, 0x245d: 0x000d,
-	0x245e: 0x000d, 0x245f: 0x000d, 0x2460: 0x000d, 0x2461: 0x000d, 0x2462: 0x000d, 0x2463: 0x000d,
-	0x2464: 0x000d, 0x2465: 0x000d, 0x2466: 0x000d, 0x2467: 0x000d, 0x2468: 0x000d, 0x2469: 0x000d,
-	0x246a: 0x000d, 0x246b: 0x000d, 0x246c: 0x000d, 0x246d: 0x000d, 0x246e: 0x000d, 0x246f: 0x000d,
-	0x2470: 0x000d, 0x2471: 0x000d, 0x2472: 0x000d, 0x2473: 0x000d, 0x2474: 0x000d, 0x2475: 0x000d,
-	0x2476: 0x000d, 0x2477: 0x000d, 0x2478: 0x000d, 0x2479: 0x000d, 0x247a: 0x000d, 0x247b: 0x000d,
-	0x247c: 0x000d, 0x247d: 0x000d, 0x247e: 0x000d, 0x247f: 0x000d,
-	// Block 0x92, offset 0x2480
-	0x2480: 0x000d, 0x2481: 0x000d, 0x2482: 0x000d, 0x2483: 0x000d, 0x2484: 0x000d, 0x2485: 0x000d,
-	0x2486: 0x000d, 0x2487: 0x000d, 0x2488: 0x000d, 0x2489: 0x000d, 0x248a: 0x000d, 0x248b: 0x000d,
-	0x248c: 0x000d, 0x248d: 0x000d, 0x248e: 0x000d, 0x248f: 0x000a, 0x2490: 0x000b, 0x2491: 0x000b,
-	0x2492: 0x000b, 0x2493: 0x000b, 0x2494: 0x000b, 0x2495: 0x000b, 0x2496: 0x000b, 0x2497: 0x000b,
-	0x2498: 0x000b, 0x2499: 0x000b, 0x249a: 0x000b, 0x249b: 0x000b, 0x249c: 0x000b, 0x249d: 0x000b,
-	0x249e: 0x000b, 0x249f: 0x000b, 0x24a0: 0x000b, 0x24a1: 0x000b, 0x24a2: 0x000b, 0x24a3: 0x000b,
-	0x24a4: 0x000b, 0x24a5: 0x000b, 0x24a6: 0x000b, 0x24a7: 0x000b, 0x24a8: 0x000b, 0x24a9: 0x000b,
-	0x24aa: 0x000b, 0x24ab: 0x000b, 0x24ac: 0x000b, 0x24ad: 0x000b, 0x24ae: 0x000b, 0x24af: 0x000b,
-	0x24b0: 0x000d, 0x24b1: 0x000d, 0x24b2: 0x000d, 0x24b3: 0x000d, 0x24b4: 0x000d, 0x24b5: 0x000d,
-	0x24b6: 0x000d, 0x24b7: 0x000d, 0x24b8: 0x000d, 0x24b9: 0x000d, 0x24ba: 0x000d, 0x24bb: 0x000d,
-	0x24bc: 0x000d, 0x24bd: 0x000a, 0x24be: 0x000a, 0x24bf: 0x000a,
-	// Block 0x93, offset 0x24c0
-	0x24c0: 0x000c, 0x24c1: 0x000c, 0x24c2: 0x000c, 0x24c3: 0x000c, 0x24c4: 0x000c, 0x24c5: 0x000c,
-	0x24c6: 0x000c, 0x24c7: 0x000c, 0x24c8: 0x000c, 0x24c9: 0x000c, 0x24ca: 0x000c, 0x24cb: 0x000c,
-	0x24cc: 0x000c, 0x24cd: 0x000c, 0x24ce: 0x000c, 0x24cf: 0x000c, 0x24d0: 0x000a, 0x24d1: 0x000a,
-	0x24d2: 0x000a, 0x24d3: 0x000a, 0x24d4: 0x000a, 0x24d5: 0x000a, 0x24d6: 0x000a, 0x24d7: 0x000a,
-	0x24d8: 0x000a, 0x24d9: 0x000a,
-	0x24e0: 0x000c, 0x24e1: 0x000c, 0x24e2: 0x000c, 0x24e3: 0x000c,
-	0x24e4: 0x000c, 0x24e5: 0x000c, 0x24e6: 0x000c, 0x24e7: 0x000c, 0x24e8: 0x000c, 0x24e9: 0x000c,
-	0x24ea: 0x000c, 0x24eb: 0x000c, 0x24ec: 0x000c, 0x24ed: 0x000c, 0x24ee: 0x000c, 0x24ef: 0x000c,
-	0x24f0: 0x000a, 0x24f1: 0x000a, 0x24f2: 0x000a, 0x24f3: 0x000a, 0x24f4: 0x000a, 0x24f5: 0x000a,
-	0x24f6: 0x000a, 0x24f7: 0x000a, 0x24f8: 0x000a, 0x24f9: 0x000a, 0x24fa: 0x000a, 0x24fb: 0x000a,
-	0x24fc: 0x000a, 0x24fd: 0x000a, 0x24fe: 0x000a, 0x24ff: 0x000a,
-	// Block 0x94, offset 0x2500
-	0x2500: 0x000a, 0x2501: 0x000a, 0x2502: 0x000a, 0x2503: 0x000a, 0x2504: 0x000a, 0x2505: 0x000a,
-	0x2506: 0x000a, 0x2507: 0x000a, 0x2508: 0x000a, 0x2509: 0x000a, 0x250a: 0x000a, 0x250b: 0x000a,
-	0x250c: 0x000a, 0x250d: 0x000a, 0x250e: 0x000a, 0x250f: 0x000a, 0x2510: 0x0006, 0x2511: 0x000a,
-	0x2512: 0x0006, 0x2514: 0x000a, 0x2515: 0x0006, 0x2516: 0x000a, 0x2517: 0x000a,
-	0x2518: 0x000a, 0x2519: 0x009a, 0x251a: 0x008a, 0x251b: 0x007a, 0x251c: 0x006a, 0x251d: 0x009a,
-	0x251e: 0x008a, 0x251f: 0x0004, 0x2520: 0x000a, 0x2521: 0x000a, 0x2522: 0x0003, 0x2523: 0x0003,
-	0x2524: 0x000a, 0x2525: 0x000a, 0x2526: 0x000a, 0x2528: 0x000a, 0x2529: 0x0004,
-	0x252a: 0x0004, 0x252b: 0x000a,
-	0x2530: 0x000d, 0x2531: 0x000d, 0x2532: 0x000d, 0x2533: 0x000d, 0x2534: 0x000d, 0x2535: 0x000d,
-	0x2536: 0x000d, 0x2537: 0x000d, 0x2538: 0x000d, 0x2539: 0x000d, 0x253a: 0x000d, 0x253b: 0x000d,
-	0x253c: 0x000d, 0x253d: 0x000d, 0x253e: 0x000d, 0x253f: 0x000d,
-	// Block 0x95, offset 0x2540
-	0x2540: 0x000d, 0x2541: 0x000d, 0x2542: 0x000d, 0x2543: 0x000d, 0x2544: 0x000d, 0x2545: 0x000d,
-	0x2546: 0x000d, 0x2547: 0x000d, 0x2548: 0x000d, 0x2549: 0x000d, 0x254a: 0x000d, 0x254b: 0x000d,
-	0x254c: 0x000d, 0x254d: 0x000d, 0x254e: 0x000d, 0x254f: 0x000d, 0x2550: 0x000d, 0x2551: 0x000d,
-	0x2552: 0x000d, 0x2553: 0x000d, 0x2554: 0x000d, 0x2555: 0x000d, 0x2556: 0x000d, 0x2557: 0x000d,
-	0x2558: 0x000d, 0x2559: 0x000d, 0x255a: 0x000d, 0x255b: 0x000d, 0x255c: 0x000d, 0x255d: 0x000d,
-	0x255e: 0x000d, 0x255f: 0x000d, 0x2560: 0x000d, 0x2561: 0x000d, 0x2562: 0x000d, 0x2563: 0x000d,
-	0x2564: 0x000d, 0x2565: 0x000d, 0x2566: 0x000d, 0x2567: 0x000d, 0x2568: 0x000d, 0x2569: 0x000d,
-	0x256a: 0x000d, 0x256b: 0x000d, 0x256c: 0x000d, 0x256d: 0x000d, 0x256e: 0x000d, 0x256f: 0x000d,
-	0x2570: 0x000d, 0x2571: 0x000d, 0x2572: 0x000d, 0x2573: 0x000d, 0x2574: 0x000d, 0x2575: 0x000d,
-	0x2576: 0x000d, 0x2577: 0x000d, 0x2578: 0x000d, 0x2579: 0x000d, 0x257a: 0x000d, 0x257b: 0x000d,
-	0x257c: 0x000d, 0x257d: 0x000d, 0x257e: 0x000d, 0x257f: 0x000b,
-	// Block 0x96, offset 0x2580
-	0x2581: 0x000a, 0x2582: 0x000a, 0x2583: 0x0004, 0x2584: 0x0004, 0x2585: 0x0004,
-	0x2586: 0x000a, 0x2587: 0x000a, 0x2588: 0x003a, 0x2589: 0x002a, 0x258a: 0x000a, 0x258b: 0x0003,
-	0x258c: 0x0006, 0x258d: 0x0003, 0x258e: 0x0006, 0x258f: 0x0006, 0x2590: 0x0002, 0x2591: 0x0002,
-	0x2592: 0x0002, 0x2593: 0x0002, 0x2594: 0x0002, 0x2595: 0x0002, 0x2596: 0x0002, 0x2597: 0x0002,
-	0x2598: 0x0002, 0x2599: 0x0002, 0x259a: 0x0006, 0x259b: 0x000a, 0x259c: 0x000a, 0x259d: 0x000a,
-	0x259e: 0x000a, 0x259f: 0x000a, 0x25a0: 0x000a,
-	0x25bb: 0x005a,
-	0x25bc: 0x000a, 0x25bd: 0x004a, 0x25be: 0x000a, 0x25bf: 0x000a,
-	// Block 0x97, offset 0x25c0
-	0x25c0: 0x000a,
-	0x25db: 0x005a, 0x25dc: 0x000a, 0x25dd: 0x004a,
-	0x25de: 0x000a, 0x25df: 0x00fa, 0x25e0: 0x00ea, 0x25e1: 0x000a, 0x25e2: 0x003a, 0x25e3: 0x002a,
-	0x25e4: 0x000a, 0x25e5: 0x000a,
-	// Block 0x98, offset 0x2600
-	0x2620: 0x0004, 0x2621: 0x0004, 0x2622: 0x000a, 0x2623: 0x000a,
-	0x2624: 0x000a, 0x2625: 0x0004, 0x2626: 0x0004, 0x2628: 0x000a, 0x2629: 0x000a,
-	0x262a: 0x000a, 0x262b: 0x000a, 0x262c: 0x000a, 0x262d: 0x000a, 0x262e: 0x000a,
-	0x2630: 0x000b, 0x2631: 0x000b, 0x2632: 0x000b, 0x2633: 0x000b, 0x2634: 0x000b, 0x2635: 0x000b,
-	0x2636: 0x000b, 0x2637: 0x000b, 0x2638: 0x000b, 0x2639: 0x000a, 0x263a: 0x000a, 0x263b: 0x000a,
-	0x263c: 0x000a, 0x263d: 0x000a, 0x263e: 0x000b, 0x263f: 0x000b,
-	// Block 0x99, offset 0x2640
-	0x2641: 0x000a,
-	// Block 0x9a, offset 0x2680
-	0x2680: 0x000a, 0x2681: 0x000a, 0x2682: 0x000a, 0x2683: 0x000a, 0x2684: 0x000a, 0x2685: 0x000a,
-	0x2686: 0x000a, 0x2687: 0x000a, 0x2688: 0x000a, 0x2689: 0x000a, 0x268a: 0x000a, 0x268b: 0x000a,
-	0x268c: 0x000a, 0x2690: 0x000a, 0x2691: 0x000a,
-	0x2692: 0x000a, 0x2693: 0x000a, 0x2694: 0x000a, 0x2695: 0x000a, 0x2696: 0x000a, 0x2697: 0x000a,
-	0x2698: 0x000a, 0x2699: 0x000a, 0x269a: 0x000a, 0x269b: 0x000a, 0x269c: 0x000a,
-	0x26a0: 0x000a,
-	// Block 0x9b, offset 0x26c0
-	0x26fd: 0x000c,
-	// Block 0x9c, offset 0x2700
-	0x2720: 0x000c, 0x2721: 0x0002, 0x2722: 0x0002, 0x2723: 0x0002,
-	0x2724: 0x0002, 0x2725: 0x0002, 0x2726: 0x0002, 0x2727: 0x0002, 0x2728: 0x0002, 0x2729: 0x0002,
-	0x272a: 0x0002, 0x272b: 0x0002, 0x272c: 0x0002, 0x272d: 0x0002, 0x272e: 0x0002, 0x272f: 0x0002,
-	0x2730: 0x0002, 0x2731: 0x0002, 0x2732: 0x0002, 0x2733: 0x0002, 0x2734: 0x0002, 0x2735: 0x0002,
-	0x2736: 0x0002, 0x2737: 0x0002, 0x2738: 0x0002, 0x2739: 0x0002, 0x273a: 0x0002, 0x273b: 0x0002,
-	// Block 0x9d, offset 0x2740
-	0x2776: 0x000c, 0x2777: 0x000c, 0x2778: 0x000c, 0x2779: 0x000c, 0x277a: 0x000c,
-	// Block 0x9e, offset 0x2780
-	0x2780: 0x0001, 0x2781: 0x0001, 0x2782: 0x0001, 0x2783: 0x0001, 0x2784: 0x0001, 0x2785: 0x0001,
-	0x2786: 0x0001, 0x2787: 0x0001, 0x2788: 0x0001, 0x2789: 0x0001, 0x278a: 0x0001, 0x278b: 0x0001,
-	0x278c: 0x0001, 0x278d: 0x0001, 0x278e: 0x0001, 0x278f: 0x0001, 0x2790: 0x0001, 0x2791: 0x0001,
-	0x2792: 0x0001, 0x2793: 0x0001, 0x2794: 0x0001, 0x2795: 0x0001, 0x2796: 0x0001, 0x2797: 0x0001,
-	0x2798: 0x0001, 0x2799: 0x0001, 0x279a: 0x0001, 0x279b: 0x0001, 0x279c: 0x0001, 0x279d: 0x0001,
-	0x279e: 0x0001, 0x279f: 0x0001, 0x27a0: 0x0001, 0x27a1: 0x0001, 0x27a2: 0x0001, 0x27a3: 0x0001,
-	0x27a4: 0x0001, 0x27a5: 0x0001, 0x27a6: 0x0001, 0x27a7: 0x0001, 0x27a8: 0x0001, 0x27a9: 0x0001,
-	0x27aa: 0x0001, 0x27ab: 0x0001, 0x27ac: 0x0001, 0x27ad: 0x0001, 0x27ae: 0x0001, 0x27af: 0x0001,
-	0x27b0: 0x0001, 0x27b1: 0x0001, 0x27b2: 0x0001, 0x27b3: 0x0001, 0x27b4: 0x0001, 0x27b5: 0x0001,
-	0x27b6: 0x0001, 0x27b7: 0x0001, 0x27b8: 0x0001, 0x27b9: 0x0001, 0x27ba: 0x0001, 0x27bb: 0x0001,
-	0x27bc: 0x0001, 0x27bd: 0x0001, 0x27be: 0x0001, 0x27bf: 0x0001,
-	// Block 0x9f, offset 0x27c0
-	0x27c0: 0x0001, 0x27c1: 0x0001, 0x27c2: 0x0001, 0x27c3: 0x0001, 0x27c4: 0x0001, 0x27c5: 0x0001,
-	0x27c6: 0x0001, 0x27c7: 0x0001, 0x27c8: 0x0001, 0x27c9: 0x0001, 0x27ca: 0x0001, 0x27cb: 0x0001,
-	0x27cc: 0x0001, 0x27cd: 0x0001, 0x27ce: 0x0001, 0x27cf: 0x0001, 0x27d0: 0x0001, 0x27d1: 0x0001,
-	0x27d2: 0x0001, 0x27d3: 0x0001, 0x27d4: 0x0001, 0x27d5: 0x0001, 0x27d6: 0x0001, 0x27d7: 0x0001,
-	0x27d8: 0x0001, 0x27d9: 0x0001, 0x27da: 0x0001, 0x27db: 0x0001, 0x27dc: 0x0001, 0x27dd: 0x0001,
-	0x27de: 0x0001, 0x27df: 0x000a, 0x27e0: 0x0001, 0x27e1: 0x0001, 0x27e2: 0x0001, 0x27e3: 0x0001,
-	0x27e4: 0x0001, 0x27e5: 0x0001, 0x27e6: 0x0001, 0x27e7: 0x0001, 0x27e8: 0x0001, 0x27e9: 0x0001,
-	0x27ea: 0x0001, 0x27eb: 0x0001, 0x27ec: 0x0001, 0x27ed: 0x0001, 0x27ee: 0x0001, 0x27ef: 0x0001,
-	0x27f0: 0x0001, 0x27f1: 0x0001, 0x27f2: 0x0001, 0x27f3: 0x0001, 0x27f4: 0x0001, 0x27f5: 0x0001,
-	0x27f6: 0x0001, 0x27f7: 0x0001, 0x27f8: 0x0001, 0x27f9: 0x0001, 0x27fa: 0x0001, 0x27fb: 0x0001,
-	0x27fc: 0x0001, 0x27fd: 0x0001, 0x27fe: 0x0001, 0x27ff: 0x0001,
-	// Block 0xa0, offset 0x2800
-	0x2800: 0x0001, 0x2801: 0x000c, 0x2802: 0x000c, 0x2803: 0x000c, 0x2804: 0x0001, 0x2805: 0x000c,
-	0x2806: 0x000c, 0x2807: 0x0001, 0x2808: 0x0001, 0x2809: 0x0001, 0x280a: 0x0001, 0x280b: 0x0001,
-	0x280c: 0x000c, 0x280d: 0x000c, 0x280e: 0x000c, 0x280f: 0x000c, 0x2810: 0x0001, 0x2811: 0x0001,
-	0x2812: 0x0001, 0x2813: 0x0001, 0x2814: 0x0001, 0x2815: 0x0001, 0x2816: 0x0001, 0x2817: 0x0001,
-	0x2818: 0x0001, 0x2819: 0x0001, 0x281a: 0x0001, 0x281b: 0x0001, 0x281c: 0x0001, 0x281d: 0x0001,
-	0x281e: 0x0001, 0x281f: 0x0001, 0x2820: 0x0001, 0x2821: 0x0001, 0x2822: 0x0001, 0x2823: 0x0001,
-	0x2824: 0x0001, 0x2825: 0x0001, 0x2826: 0x0001, 0x2827: 0x0001, 0x2828: 0x0001, 0x2829: 0x0001,
-	0x282a: 0x0001, 0x282b: 0x0001, 0x282c: 0x0001, 0x282d: 0x0001, 0x282e: 0x0001, 0x282f: 0x0001,
-	0x2830: 0x0001, 0x2831: 0x0001, 0x2832: 0x0001, 0x2833: 0x0001, 0x2834: 0x0001, 0x2835: 0x0001,
-	0x2836: 0x0001, 0x2837: 0x0001, 0x2838: 0x000c, 0x2839: 0x000c, 0x283a: 0x000c, 0x283b: 0x0001,
-	0x283c: 0x0001, 0x283d: 0x0001, 0x283e: 0x0001, 0x283f: 0x000c,
-	// Block 0xa1, offset 0x2840
-	0x2840: 0x0001, 0x2841: 0x0001, 0x2842: 0x0001, 0x2843: 0x0001, 0x2844: 0x0001, 0x2845: 0x0001,
-	0x2846: 0x0001, 0x2847: 0x0001, 0x2848: 0x0001, 0x2849: 0x0001, 0x284a: 0x0001, 0x284b: 0x0001,
-	0x284c: 0x0001, 0x284d: 0x0001, 0x284e: 0x0001, 0x284f: 0x0001, 0x2850: 0x0001, 0x2851: 0x0001,
-	0x2852: 0x0001, 0x2853: 0x0001, 0x2854: 0x0001, 0x2855: 0x0001, 0x2856: 0x0001, 0x2857: 0x0001,
-	0x2858: 0x0001, 0x2859: 0x0001, 0x285a: 0x0001, 0x285b: 0x0001, 0x285c: 0x0001, 0x285d: 0x0001,
-	0x285e: 0x0001, 0x285f: 0x0001, 0x2860: 0x0001, 0x2861: 0x0001, 0x2862: 0x0001, 0x2863: 0x0001,
-	0x2864: 0x0001, 0x2865: 0x000c, 0x2866: 0x000c, 0x2867: 0x0001, 0x2868: 0x0001, 0x2869: 0x0001,
-	0x286a: 0x0001, 0x286b: 0x0001, 0x286c: 0x0001, 0x286d: 0x0001, 0x286e: 0x0001, 0x286f: 0x0001,
-	0x2870: 0x0001, 0x2871: 0x0001, 0x2872: 0x0001, 0x2873: 0x0001, 0x2874: 0x0001, 0x2875: 0x0001,
-	0x2876: 0x0001, 0x2877: 0x0001, 0x2878: 0x0001, 0x2879: 0x0001, 0x287a: 0x0001, 0x287b: 0x0001,
-	0x287c: 0x0001, 0x287d: 0x0001, 0x287e: 0x0001, 0x287f: 0x0001,
-	// Block 0xa2, offset 0x2880
-	0x2880: 0x0001, 0x2881: 0x0001, 0x2882: 0x0001, 0x2883: 0x0001, 0x2884: 0x0001, 0x2885: 0x0001,
-	0x2886: 0x0001, 0x2887: 0x0001, 0x2888: 0x0001, 0x2889: 0x0001, 0x288a: 0x0001, 0x288b: 0x0001,
-	0x288c: 0x0001, 0x288d: 0x0001, 0x288e: 0x0001, 0x288f: 0x0001, 0x2890: 0x0001, 0x2891: 0x0001,
-	0x2892: 0x0001, 0x2893: 0x0001, 0x2894: 0x0001, 0x2895: 0x0001, 0x2896: 0x0001, 0x2897: 0x0001,
-	0x2898: 0x0001, 0x2899: 0x0001, 0x289a: 0x0001, 0x289b: 0x0001, 0x289c: 0x0001, 0x289d: 0x0001,
-	0x289e: 0x0001, 0x289f: 0x0001, 0x28a0: 0x0001, 0x28a1: 0x0001, 0x28a2: 0x0001, 0x28a3: 0x0001,
-	0x28a4: 0x0001, 0x28a5: 0x0001, 0x28a6: 0x0001, 0x28a7: 0x0001, 0x28a8: 0x0001, 0x28a9: 0x0001,
-	0x28aa: 0x0001, 0x28ab: 0x0001, 0x28ac: 0x0001, 0x28ad: 0x0001, 0x28ae: 0x0001, 0x28af: 0x0001,
-	0x28b0: 0x0001, 0x28b1: 0x0001, 0x28b2: 0x0001, 0x28b3: 0x0001, 0x28b4: 0x0001, 0x28b5: 0x0001,
-	0x28b6: 0x0001, 0x28b7: 0x0001, 0x28b8: 0x0001, 0x28b9: 0x000a, 0x28ba: 0x000a, 0x28bb: 0x000a,
-	0x28bc: 0x000a, 0x28bd: 0x000a, 0x28be: 0x000a, 0x28bf: 0x000a,
-	// Block 0xa3, offset 0x28c0
-	0x28c0: 0x000d, 0x28c1: 0x000d, 0x28c2: 0x000d, 0x28c3: 0x000d, 0x28c4: 0x000d, 0x28c5: 0x000d,
-	0x28c6: 0x000d, 0x28c7: 0x000d, 0x28c8: 0x000d, 0x28c9: 0x000d, 0x28ca: 0x000d, 0x28cb: 0x000d,
-	0x28cc: 0x000d, 0x28cd: 0x000d, 0x28ce: 0x000d, 0x28cf: 0x000d, 0x28d0: 0x000d, 0x28d1: 0x000d,
-	0x28d2: 0x000d, 0x28d3: 0x000d, 0x28d4: 0x000d, 0x28d5: 0x000d, 0x28d6: 0x000d, 0x28d7: 0x000d,
-	0x28d8: 0x000d, 0x28d9: 0x000d, 0x28da: 0x000d, 0x28db: 0x000d, 0x28dc: 0x000d, 0x28dd: 0x000d,
-	0x28de: 0x000d, 0x28df: 0x000d, 0x28e0: 0x000d, 0x28e1: 0x000d, 0x28e2: 0x000d, 0x28e3: 0x000d,
-	0x28e4: 0x000c, 0x28e5: 0x000c, 0x28e6: 0x000c, 0x28e7: 0x000c, 0x28e8: 0x0001, 0x28e9: 0x0001,
-	0x28ea: 0x0001, 0x28eb: 0x0001, 0x28ec: 0x0001, 0x28ed: 0x0001, 0x28ee: 0x0001, 0x28ef: 0x0001,
-	0x28f0: 0x0005, 0x28f1: 0x0005, 0x28f2: 0x0005, 0x28f3: 0x0005, 0x28f4: 0x0005, 0x28f5: 0x0005,
-	0x28f6: 0x0005, 0x28f7: 0x0005, 0x28f8: 0x0005, 0x28f9: 0x0005, 0x28fa: 0x0001, 0x28fb: 0x0001,
-	0x28fc: 0x0001, 0x28fd: 0x0001, 0x28fe: 0x0001, 0x28ff: 0x0001,
-	// Block 0xa4, offset 0x2900
-	0x2900: 0x0001, 0x2901: 0x0001, 0x2902: 0x0001, 0x2903: 0x0001, 0x2904: 0x0001, 0x2905: 0x0001,
-	0x2906: 0x0001, 0x2907: 0x0001, 0x2908: 0x0001, 0x2909: 0x0001, 0x290a: 0x0001, 0x290b: 0x0001,
-	0x290c: 0x0001, 0x290d: 0x0001, 0x290e: 0x0001, 0x290f: 0x0001, 0x2910: 0x0001, 0x2911: 0x0001,
-	0x2912: 0x0001, 0x2913: 0x0001, 0x2914: 0x0001, 0x2915: 0x0001, 0x2916: 0x0001, 0x2917: 0x0001,
-	0x2918: 0x0001, 0x2919: 0x0001, 0x291a: 0x0001, 0x291b: 0x0001, 0x291c: 0x0001, 0x291d: 0x0001,
-	0x291e: 0x0001, 0x291f: 0x0001, 0x2920: 0x0005, 0x2921: 0x0005, 0x2922: 0x0005, 0x2923: 0x0005,
-	0x2924: 0x0005, 0x2925: 0x0005, 0x2926: 0x0005, 0x2927: 0x0005, 0x2928: 0x0005, 0x2929: 0x0005,
-	0x292a: 0x0005, 0x292b: 0x0005, 0x292c: 0x0005, 0x292d: 0x0005, 0x292e: 0x0005, 0x292f: 0x0005,
-	0x2930: 0x0005, 0x2931: 0x0005, 0x2932: 0x0005, 0x2933: 0x0005, 0x2934: 0x0005, 0x2935: 0x0005,
-	0x2936: 0x0005, 0x2937: 0x0005, 0x2938: 0x0005, 0x2939: 0x0005, 0x293a: 0x0005, 0x293b: 0x0005,
-	0x293c: 0x0005, 0x293d: 0x0005, 0x293e: 0x0005, 0x293f: 0x0001,
-	// Block 0xa5, offset 0x2940
-	0x2940: 0x0001, 0x2941: 0x0001, 0x2942: 0x0001, 0x2943: 0x0001, 0x2944: 0x0001, 0x2945: 0x0001,
-	0x2946: 0x0001, 0x2947: 0x0001, 0x2948: 0x0001, 0x2949: 0x0001, 0x294a: 0x0001, 0x294b: 0x0001,
-	0x294c: 0x0001, 0x294d: 0x0001, 0x294e: 0x0001, 0x294f: 0x0001, 0x2950: 0x0001, 0x2951: 0x0001,
-	0x2952: 0x0001, 0x2953: 0x0001, 0x2954: 0x0001, 0x2955: 0x0001, 0x2956: 0x0001, 0x2957: 0x0001,
-	0x2958: 0x0001, 0x2959: 0x0001, 0x295a: 0x0001, 0x295b: 0x0001, 0x295c: 0x0001, 0x295d: 0x0001,
-	0x295e: 0x0001, 0x295f: 0x0001, 0x2960: 0x0001, 0x2961: 0x0001, 0x2962: 0x0001, 0x2963: 0x0001,
-	0x2964: 0x0001, 0x2965: 0x0001, 0x2966: 0x0001, 0x2967: 0x0001, 0x2968: 0x0001, 0x2969: 0x0001,
-	0x296a: 0x0001, 0x296b: 0x000c, 0x296c: 0x000c, 0x296d: 0x0001, 0x296e: 0x0001, 0x296f: 0x0001,
-	0x2970: 0x0001, 0x2971: 0x0001, 0x2972: 0x0001, 0x2973: 0x0001, 0x2974: 0x0001, 0x2975: 0x0001,
-	0x2976: 0x0001, 0x2977: 0x0001, 0x2978: 0x0001, 0x2979: 0x0001, 0x297a: 0x0001, 0x297b: 0x0001,
-	0x297c: 0x0001, 0x297d: 0x0001, 0x297e: 0x0001, 0x297f: 0x0001,
-	// Block 0xa6, offset 0x2980
-	0x2980: 0x0001, 0x2981: 0x0001, 0x2982: 0x0001, 0x2983: 0x0001, 0x2984: 0x0001, 0x2985: 0x0001,
-	0x2986: 0x0001, 0x2987: 0x0001, 0x2988: 0x0001, 0x2989: 0x0001, 0x298a: 0x0001, 0x298b: 0x0001,
-	0x298c: 0x0001, 0x298d: 0x0001, 0x298e: 0x0001, 0x298f: 0x0001, 0x2990: 0x0001, 0x2991: 0x0001,
-	0x2992: 0x0001, 0x2993: 0x0001, 0x2994: 0x0001, 0x2995: 0x0001, 0x2996: 0x0001, 0x2997: 0x0001,
-	0x2998: 0x0001, 0x2999: 0x0001, 0x299a: 0x0001, 0x299b: 0x0001, 0x299c: 0x0001, 0x299d: 0x0001,
-	0x299e: 0x0001, 0x299f: 0x0001, 0x29a0: 0x0001, 0x29a1: 0x0001, 0x29a2: 0x0001, 0x29a3: 0x0001,
-	0x29a4: 0x0001, 0x29a5: 0x0001, 0x29a6: 0x0001, 0x29a7: 0x0001, 0x29a8: 0x0001, 0x29a9: 0x0001,
-	0x29aa: 0x0001, 0x29ab: 0x0001, 0x29ac: 0x0001, 0x29ad: 0x0001, 0x29ae: 0x0001, 0x29af: 0x0001,
-	0x29b0: 0x0001, 0x29b1: 0x0001, 0x29b2: 0x0001, 0x29b3: 0x0001, 0x29b4: 0x0001, 0x29b5: 0x0001,
-	0x29b6: 0x0001, 0x29b7: 0x0001, 0x29b8: 0x0001, 0x29b9: 0x0001, 0x29ba: 0x0001, 0x29bb: 0x0001,
-	0x29bc: 0x0001, 0x29bd: 0x000c, 0x29be: 0x000c, 0x29bf: 0x000c,
-	// Block 0xa7, offset 0x29c0
-	0x29c0: 0x0001, 0x29c1: 0x0001, 0x29c2: 0x0001, 0x29c3: 0x0001, 0x29c4: 0x0001, 0x29c5: 0x0001,
-	0x29c6: 0x0001, 0x29c7: 0x0001, 0x29c8: 0x0001, 0x29c9: 0x0001, 0x29ca: 0x0001, 0x29cb: 0x0001,
-	0x29cc: 0x0001, 0x29cd: 0x0001, 0x29ce: 0x0001, 0x29cf: 0x0001, 0x29d0: 0x0001, 0x29d1: 0x0001,
-	0x29d2: 0x0001, 0x29d3: 0x0001, 0x29d4: 0x0001, 0x29d5: 0x0001, 0x29d6: 0x0001, 0x29d7: 0x0001,
-	0x29d8: 0x0001, 0x29d9: 0x0001, 0x29da: 0x0001, 0x29db: 0x0001, 0x29dc: 0x0001, 0x29dd: 0x0001,
-	0x29de: 0x0001, 0x29df: 0x0001, 0x29e0: 0x0001, 0x29e1: 0x0001, 0x29e2: 0x0001, 0x29e3: 0x0001,
-	0x29e4: 0x0001, 0x29e5: 0x0001, 0x29e6: 0x0001, 0x29e7: 0x0001, 0x29e8: 0x0001, 0x29e9: 0x0001,
-	0x29ea: 0x0001, 0x29eb: 0x0001, 0x29ec: 0x0001, 0x29ed: 0x0001, 0x29ee: 0x0001, 0x29ef: 0x0001,
-	0x29f0: 0x000d, 0x29f1: 0x000d, 0x29f2: 0x000d, 0x29f3: 0x000d, 0x29f4: 0x000d, 0x29f5: 0x000d,
-	0x29f6: 0x000d, 0x29f7: 0x000d, 0x29f8: 0x000d, 0x29f9: 0x000d, 0x29fa: 0x000d, 0x29fb: 0x000d,
-	0x29fc: 0x000d, 0x29fd: 0x000d, 0x29fe: 0x000d, 0x29ff: 0x000d,
-	// Block 0xa8, offset 0x2a00
-	0x2a00: 0x000d, 0x2a01: 0x000d, 0x2a02: 0x000d, 0x2a03: 0x000d, 0x2a04: 0x000d, 0x2a05: 0x000d,
-	0x2a06: 0x000c, 0x2a07: 0x000c, 0x2a08: 0x000c, 0x2a09: 0x000c, 0x2a0a: 0x000c, 0x2a0b: 0x000c,
-	0x2a0c: 0x000c, 0x2a0d: 0x000c, 0x2a0e: 0x000c, 0x2a0f: 0x000c, 0x2a10: 0x000c, 0x2a11: 0x000d,
-	0x2a12: 0x000d, 0x2a13: 0x000d, 0x2a14: 0x000d, 0x2a15: 0x000d, 0x2a16: 0x000d, 0x2a17: 0x000d,
-	0x2a18: 0x000d, 0x2a19: 0x000d, 0x2a1a: 0x0001, 0x2a1b: 0x0001, 0x2a1c: 0x0001, 0x2a1d: 0x0001,
-	0x2a1e: 0x0001, 0x2a1f: 0x0001, 0x2a20: 0x0001, 0x2a21: 0x0001, 0x2a22: 0x0001, 0x2a23: 0x0001,
-	0x2a24: 0x0001, 0x2a25: 0x0001, 0x2a26: 0x0001, 0x2a27: 0x0001, 0x2a28: 0x0001, 0x2a29: 0x0001,
-	0x2a2a: 0x0001, 0x2a2b: 0x0001, 0x2a2c: 0x0001, 0x2a2d: 0x0001, 0x2a2e: 0x0001, 0x2a2f: 0x0001,
-	0x2a30: 0x0001, 0x2a31: 0x0001, 0x2a32: 0x0001, 0x2a33: 0x0001, 0x2a34: 0x0001, 0x2a35: 0x0001,
-	0x2a36: 0x0001, 0x2a37: 0x0001, 0x2a38: 0x0001, 0x2a39: 0x0001, 0x2a3a: 0x0001, 0x2a3b: 0x0001,
-	0x2a3c: 0x0001, 0x2a3d: 0x0001, 0x2a3e: 0x0001, 0x2a3f: 0x0001,
-	// Block 0xa9, offset 0x2a40
-	0x2a40: 0x0001, 0x2a41: 0x0001, 0x2a42: 0x000c, 0x2a43: 0x000c, 0x2a44: 0x000c, 0x2a45: 0x000c,
-	0x2a46: 0x0001, 0x2a47: 0x0001, 0x2a48: 0x0001, 0x2a49: 0x0001, 0x2a4a: 0x0001, 0x2a4b: 0x0001,
-	0x2a4c: 0x0001, 0x2a4d: 0x0001, 0x2a4e: 0x0001, 0x2a4f: 0x0001, 0x2a50: 0x0001, 0x2a51: 0x0001,
-	0x2a52: 0x0001, 0x2a53: 0x0001, 0x2a54: 0x0001, 0x2a55: 0x0001, 0x2a56: 0x0001, 0x2a57: 0x0001,
-	0x2a58: 0x0001, 0x2a59: 0x0001, 0x2a5a: 0x0001, 0x2a5b: 0x0001, 0x2a5c: 0x0001, 0x2a5d: 0x0001,
-	0x2a5e: 0x0001, 0x2a5f: 0x0001, 0x2a60: 0x0001, 0x2a61: 0x0001, 0x2a62: 0x0001, 0x2a63: 0x0001,
-	0x2a64: 0x0001, 0x2a65: 0x0001, 0x2a66: 0x0001, 0x2a67: 0x0001, 0x2a68: 0x0001, 0x2a69: 0x0001,
-	0x2a6a: 0x0001, 0x2a6b: 0x0001, 0x2a6c: 0x0001, 0x2a6d: 0x0001, 0x2a6e: 0x0001, 0x2a6f: 0x0001,
-	0x2a70: 0x0001, 0x2a71: 0x0001, 0x2a72: 0x0001, 0x2a73: 0x0001, 0x2a74: 0x0001, 0x2a75: 0x0001,
-	0x2a76: 0x0001, 0x2a77: 0x0001, 0x2a78: 0x0001, 0x2a79: 0x0001, 0x2a7a: 0x0001, 0x2a7b: 0x0001,
-	0x2a7c: 0x0001, 0x2a7d: 0x0001, 0x2a7e: 0x0001, 0x2a7f: 0x0001,
-	// Block 0xaa, offset 0x2a80
-	0x2a81: 0x000c,
-	0x2ab8: 0x000c, 0x2ab9: 0x000c, 0x2aba: 0x000c, 0x2abb: 0x000c,
-	0x2abc: 0x000c, 0x2abd: 0x000c, 0x2abe: 0x000c, 0x2abf: 0x000c,
-	// Block 0xab, offset 0x2ac0
-	0x2ac0: 0x000c, 0x2ac1: 0x000c, 0x2ac2: 0x000c, 0x2ac3: 0x000c, 0x2ac4: 0x000c, 0x2ac5: 0x000c,
-	0x2ac6: 0x000c,
-	0x2ad2: 0x000a, 0x2ad3: 0x000a, 0x2ad4: 0x000a, 0x2ad5: 0x000a, 0x2ad6: 0x000a, 0x2ad7: 0x000a,
-	0x2ad8: 0x000a, 0x2ad9: 0x000a, 0x2ada: 0x000a, 0x2adb: 0x000a, 0x2adc: 0x000a, 0x2add: 0x000a,
-	0x2ade: 0x000a, 0x2adf: 0x000a, 0x2ae0: 0x000a, 0x2ae1: 0x000a, 0x2ae2: 0x000a, 0x2ae3: 0x000a,
-	0x2ae4: 0x000a, 0x2ae5: 0x000a,
-	0x2af0: 0x000c, 0x2af3: 0x000c, 0x2af4: 0x000c,
-	0x2aff: 0x000c,
-	// Block 0xac, offset 0x2b00
-	0x2b00: 0x000c, 0x2b01: 0x000c,
-	0x2b33: 0x000c, 0x2b34: 0x000c, 0x2b35: 0x000c,
-	0x2b36: 0x000c, 0x2b39: 0x000c, 0x2b3a: 0x000c,
-	// Block 0xad, offset 0x2b40
-	0x2b40: 0x000c, 0x2b41: 0x000c, 0x2b42: 0x000c,
-	0x2b67: 0x000c, 0x2b68: 0x000c, 0x2b69: 0x000c,
-	0x2b6a: 0x000c, 0x2b6b: 0x000c, 0x2b6d: 0x000c, 0x2b6e: 0x000c, 0x2b6f: 0x000c,
-	0x2b70: 0x000c, 0x2b71: 0x000c, 0x2b72: 0x000c, 0x2b73: 0x000c, 0x2b74: 0x000c,
-	// Block 0xae, offset 0x2b80
-	0x2bb3: 0x000c,
-	// Block 0xaf, offset 0x2bc0
-	0x2bc0: 0x000c, 0x2bc1: 0x000c,
-	0x2bf6: 0x000c, 0x2bf7: 0x000c, 0x2bf8: 0x000c, 0x2bf9: 0x000c, 0x2bfa: 0x000c, 0x2bfb: 0x000c,
-	0x2bfc: 0x000c, 0x2bfd: 0x000c, 0x2bfe: 0x000c,
-	// Block 0xb0, offset 0x2c00
-	0x2c09: 0x000c, 0x2c0a: 0x000c, 0x2c0b: 0x000c,
-	0x2c0c: 0x000c, 0x2c0f: 0x000c,
-	// Block 0xb1, offset 0x2c40
-	0x2c6f: 0x000c,
-	0x2c70: 0x000c, 0x2c71: 0x000c, 0x2c74: 0x000c,
-	0x2c76: 0x000c, 0x2c77: 0x000c,
-	0x2c7e: 0x000c,
-	// Block 0xb2, offset 0x2c80
-	0x2c9f: 0x000c, 0x2ca3: 0x000c,
-	0x2ca4: 0x000c, 0x2ca5: 0x000c, 0x2ca6: 0x000c, 0x2ca7: 0x000c, 0x2ca8: 0x000c, 0x2ca9: 0x000c,
-	0x2caa: 0x000c,
-	// Block 0xb3, offset 0x2cc0
-	0x2cc0: 0x000c,
-	0x2ce6: 0x000c, 0x2ce7: 0x000c, 0x2ce8: 0x000c, 0x2ce9: 0x000c,
-	0x2cea: 0x000c, 0x2ceb: 0x000c, 0x2cec: 0x000c,
-	0x2cf0: 0x000c, 0x2cf1: 0x000c, 0x2cf2: 0x000c, 0x2cf3: 0x000c, 0x2cf4: 0x000c,
-	// Block 0xb4, offset 0x2d00
-	0x2d38: 0x000c, 0x2d39: 0x000c, 0x2d3a: 0x000c, 0x2d3b: 0x000c,
-	0x2d3c: 0x000c, 0x2d3d: 0x000c, 0x2d3e: 0x000c, 0x2d3f: 0x000c,
-	// Block 0xb5, offset 0x2d40
-	0x2d42: 0x000c, 0x2d43: 0x000c, 0x2d44: 0x000c,
-	0x2d46: 0x000c,
-	0x2d5e: 0x000c,
-	// Block 0xb6, offset 0x2d80
-	0x2db3: 0x000c, 0x2db4: 0x000c, 0x2db5: 0x000c,
-	0x2db6: 0x000c, 0x2db7: 0x000c, 0x2db8: 0x000c, 0x2dba: 0x000c,
-	0x2dbf: 0x000c,
-	// Block 0xb7, offset 0x2dc0
-	0x2dc0: 0x000c, 0x2dc2: 0x000c, 0x2dc3: 0x000c,
-	// Block 0xb8, offset 0x2e00
-	0x2e32: 0x000c, 0x2e33: 0x000c, 0x2e34: 0x000c, 0x2e35: 0x000c,
-	0x2e3c: 0x000c, 0x2e3d: 0x000c, 0x2e3f: 0x000c,
-	// Block 0xb9, offset 0x2e40
-	0x2e40: 0x000c,
-	0x2e5c: 0x000c, 0x2e5d: 0x000c,
-	// Block 0xba, offset 0x2e80
-	0x2eb3: 0x000c, 0x2eb4: 0x000c, 0x2eb5: 0x000c,
-	0x2eb6: 0x000c, 0x2eb7: 0x000c, 0x2eb8: 0x000c, 0x2eb9: 0x000c, 0x2eba: 0x000c,
-	0x2ebd: 0x000c, 0x2ebf: 0x000c,
-	// Block 0xbb, offset 0x2ec0
-	0x2ec0: 0x000c,
-	0x2ee0: 0x000a, 0x2ee1: 0x000a, 0x2ee2: 0x000a, 0x2ee3: 0x000a,
-	0x2ee4: 0x000a, 0x2ee5: 0x000a, 0x2ee6: 0x000a, 0x2ee7: 0x000a, 0x2ee8: 0x000a, 0x2ee9: 0x000a,
-	0x2eea: 0x000a, 0x2eeb: 0x000a, 0x2eec: 0x000a,
-	// Block 0xbc, offset 0x2f00
-	0x2f2b: 0x000c, 0x2f2d: 0x000c,
-	0x2f30: 0x000c, 0x2f31: 0x000c, 0x2f32: 0x000c, 0x2f33: 0x000c, 0x2f34: 0x000c, 0x2f35: 0x000c,
-	0x2f37: 0x000c,
-	// Block 0xbd, offset 0x2f40
-	0x2f5d: 0x000c,
-	0x2f5e: 0x000c, 0x2f5f: 0x000c, 0x2f62: 0x000c, 0x2f63: 0x000c,
-	0x2f64: 0x000c, 0x2f65: 0x000c, 0x2f67: 0x000c, 0x2f68: 0x000c, 0x2f69: 0x000c,
-	0x2f6a: 0x000c, 0x2f6b: 0x000c,
-	// Block 0xbe, offset 0x2f80
-	0x2faf: 0x000c,
-	0x2fb0: 0x000c, 0x2fb1: 0x000c, 0x2fb2: 0x000c, 0x2fb3: 0x000c, 0x2fb4: 0x000c, 0x2fb5: 0x000c,
-	0x2fb6: 0x000c, 0x2fb7: 0x000c, 0x2fb9: 0x000c, 0x2fba: 0x000c,
-	// Block 0xbf, offset 0x2fc0
-	0x2ffb: 0x000c,
-	0x2ffc: 0x000c, 0x2ffe: 0x000c,
-	// Block 0xc0, offset 0x3000
-	0x3003: 0x000c,
-	// Block 0xc1, offset 0x3040
-	0x3054: 0x000c, 0x3055: 0x000c, 0x3056: 0x000c, 0x3057: 0x000c,
-	0x305a: 0x000c, 0x305b: 0x000c,
-	0x3060: 0x000c,
-	// Block 0xc2, offset 0x3080
-	0x3081: 0x000c, 0x3082: 0x000c, 0x3083: 0x000c, 0x3084: 0x000c, 0x3085: 0x000c,
-	0x3086: 0x000c, 0x3089: 0x000c, 0x308a: 0x000c,
-	0x30b3: 0x000c, 0x30b4: 0x000c, 0x30b5: 0x000c,
-	0x30b6: 0x000c, 0x30b7: 0x000c, 0x30b8: 0x000c, 0x30bb: 0x000c,
-	0x30bc: 0x000c, 0x30bd: 0x000c, 0x30be: 0x000c,
-	// Block 0xc3, offset 0x30c0
-	0x30c7: 0x000c,
-	0x30d1: 0x000c,
-	0x30d2: 0x000c, 0x30d3: 0x000c, 0x30d4: 0x000c, 0x30d5: 0x000c, 0x30d6: 0x000c,
-	0x30d9: 0x000c, 0x30da: 0x000c, 0x30db: 0x000c,
-	// Block 0xc4, offset 0x3100
-	0x310a: 0x000c, 0x310b: 0x000c,
-	0x310c: 0x000c, 0x310d: 0x000c, 0x310e: 0x000c, 0x310f: 0x000c, 0x3110: 0x000c, 0x3111: 0x000c,
-	0x3112: 0x000c, 0x3113: 0x000c, 0x3114: 0x000c, 0x3115: 0x000c, 0x3116: 0x000c,
-	0x3118: 0x000c, 0x3119: 0x000c,
-	// Block 0xc5, offset 0x3140
-	0x3170: 0x000c, 0x3171: 0x000c, 0x3172: 0x000c, 0x3173: 0x000c, 0x3174: 0x000c, 0x3175: 0x000c,
-	0x3176: 0x000c, 0x3178: 0x000c, 0x3179: 0x000c, 0x317a: 0x000c, 0x317b: 0x000c,
-	0x317c: 0x000c, 0x317d: 0x000c,
-	// Block 0xc6, offset 0x3180
-	0x3192: 0x000c, 0x3193: 0x000c, 0x3194: 0x000c, 0x3195: 0x000c, 0x3196: 0x000c, 0x3197: 0x000c,
-	0x3198: 0x000c, 0x3199: 0x000c, 0x319a: 0x000c, 0x319b: 0x000c, 0x319c: 0x000c, 0x319d: 0x000c,
-	0x319e: 0x000c, 0x319f: 0x000c, 0x31a0: 0x000c, 0x31a1: 0x000c, 0x31a2: 0x000c, 0x31a3: 0x000c,
-	0x31a4: 0x000c, 0x31a5: 0x000c, 0x31a6: 0x000c, 0x31a7: 0x000c,
-	0x31aa: 0x000c, 0x31ab: 0x000c, 0x31ac: 0x000c, 0x31ad: 0x000c, 0x31ae: 0x000c, 0x31af: 0x000c,
-	0x31b0: 0x000c, 0x31b2: 0x000c, 0x31b3: 0x000c, 0x31b5: 0x000c,
-	0x31b6: 0x000c,
-	// Block 0xc7, offset 0x31c0
-	0x31f1: 0x000c, 0x31f2: 0x000c, 0x31f3: 0x000c, 0x31f4: 0x000c, 0x31f5: 0x000c,
-	0x31f6: 0x000c, 0x31fa: 0x000c,
-	0x31fc: 0x000c, 0x31fd: 0x000c, 0x31ff: 0x000c,
-	// Block 0xc8, offset 0x3200
-	0x3200: 0x000c, 0x3201: 0x000c, 0x3202: 0x000c, 0x3203: 0x000c, 0x3204: 0x000c, 0x3205: 0x000c,
-	0x3207: 0x000c,
-	// Block 0xc9, offset 0x3240
-	0x3250: 0x000c, 0x3251: 0x000c,
-	0x3255: 0x000c, 0x3257: 0x000c,
-	// Block 0xca, offset 0x3280
-	0x32b3: 0x000c, 0x32b4: 0x000c,
-	// Block 0xcb, offset 0x32c0
-	0x32c0: 0x000c, 0x32c1: 0x000c,
-	0x32f6: 0x000c, 0x32f7: 0x000c, 0x32f8: 0x000c, 0x32f9: 0x000c, 0x32fa: 0x000c,
-	// Block 0xcc, offset 0x3300
-	0x3300: 0x000c, 0x3302: 0x000c,
-	// Block 0xcd, offset 0x3340
-	0x3355: 0x000a, 0x3356: 0x000a, 0x3357: 0x000a,
-	0x3358: 0x000a, 0x3359: 0x000a, 0x335a: 0x000a, 0x335b: 0x000a, 0x335c: 0x000a, 0x335d: 0x0004,
-	0x335e: 0x0004, 0x335f: 0x0004, 0x3360: 0x0004, 0x3361: 0x000a, 0x3362: 0x000a, 0x3363: 0x000a,
-	0x3364: 0x000a, 0x3365: 0x000a, 0x3366: 0x000a, 0x3367: 0x000a, 0x3368: 0x000a, 0x3369: 0x000a,
-	0x336a: 0x000a, 0x336b: 0x000a, 0x336c: 0x000a, 0x336d: 0x000a, 0x336e: 0x000a, 0x336f: 0x000a,
-	0x3370: 0x000a, 0x3371: 0x000a,
-	// Block 0xce, offset 0x3380
-	0x3380: 0x000c,
-	0x3387: 0x000c, 0x3388: 0x000c, 0x3389: 0x000c, 0x338a: 0x000c, 0x338b: 0x000c,
-	0x338c: 0x000c, 0x338d: 0x000c, 0x338e: 0x000c, 0x338f: 0x000c, 0x3390: 0x000c, 0x3391: 0x000c,
-	0x3392: 0x000c, 0x3393: 0x000c, 0x3394: 0x000c, 0x3395: 0x000c,
-	// Block 0xcf, offset 0x33c0
-	0x33f0: 0x000c, 0x33f1: 0x000c, 0x33f2: 0x000c, 0x33f3: 0x000c, 0x33f4: 0x000c,
-	// Block 0xd0, offset 0x3400
-	0x3430: 0x000c, 0x3431: 0x000c, 0x3432: 0x000c, 0x3433: 0x000c, 0x3434: 0x000c, 0x3435: 0x000c,
-	0x3436: 0x000c,
-	// Block 0xd1, offset 0x3440
-	0x344f: 0x000c,
-	// Block 0xd2, offset 0x3480
-	0x348f: 0x000c, 0x3490: 0x000c, 0x3491: 0x000c,
-	0x3492: 0x000c,
-	// Block 0xd3, offset 0x34c0
-	0x34e2: 0x000a,
-	0x34e4: 0x000c,
-	// Block 0xd4, offset 0x3500
-	0x351d: 0x000c,
-	0x351e: 0x000c, 0x3520: 0x000b, 0x3521: 0x000b, 0x3522: 0x000b, 0x3523: 0x000b,
-	// Block 0xd5, offset 0x3540
-	0x3540: 0x000c, 0x3541: 0x000c, 0x3542: 0x000c, 0x3543: 0x000c, 0x3544: 0x000c, 0x3545: 0x000c,
-	0x3546: 0x000c, 0x3547: 0x000c, 0x3548: 0x000c, 0x3549: 0x000c, 0x354a: 0x000c, 0x354b: 0x000c,
-	0x354c: 0x000c, 0x354d: 0x000c, 0x354e: 0x000c, 0x354f: 0x000c, 0x3550: 0x000c, 0x3551: 0x000c,
-	0x3552: 0x000c, 0x3553: 0x000c, 0x3554: 0x000c, 0x3555: 0x000c, 0x3556: 0x000c, 0x3557: 0x000c,
-	0x3558: 0x000c, 0x3559: 0x000c, 0x355a: 0x000c, 0x355b: 0x000c, 0x355c: 0x000c, 0x355d: 0x000c,
-	0x355e: 0x000c, 0x355f: 0x000c, 0x3560: 0x000c, 0x3561: 0x000c, 0x3562: 0x000c, 0x3563: 0x000c,
-	0x3564: 0x000c, 0x3565: 0x000c, 0x3566: 0x000c, 0x3567: 0x000c, 0x3568: 0x000c, 0x3569: 0x000c,
-	0x356a: 0x000c, 0x356b: 0x000c, 0x356c: 0x000c, 0x356d: 0x000c,
-	0x3570: 0x000c, 0x3571: 0x000c, 0x3572: 0x000c, 0x3573: 0x000c, 0x3574: 0x000c, 0x3575: 0x000c,
-	0x3576: 0x000c, 0x3577: 0x000c, 0x3578: 0x000c, 0x3579: 0x000c, 0x357a: 0x000c, 0x357b: 0x000c,
-	0x357c: 0x000c, 0x357d: 0x000c, 0x357e: 0x000c, 0x357f: 0x000c,
-	// Block 0xd6, offset 0x3580
-	0x3580: 0x000c, 0x3581: 0x000c, 0x3582: 0x000c, 0x3583: 0x000c, 0x3584: 0x000c, 0x3585: 0x000c,
-	0x3586: 0x000c,
-	// Block 0xd7, offset 0x35c0
-	0x35e7: 0x000c, 0x35e8: 0x000c, 0x35e9: 0x000c,
-	0x35f3: 0x000b, 0x35f4: 0x000b, 0x35f5: 0x000b,
-	0x35f6: 0x000b, 0x35f7: 0x000b, 0x35f8: 0x000b, 0x35f9: 0x000b, 0x35fa: 0x000b, 0x35fb: 0x000c,
-	0x35fc: 0x000c, 0x35fd: 0x000c, 0x35fe: 0x000c, 0x35ff: 0x000c,
-	// Block 0xd8, offset 0x3600
-	0x3600: 0x000c, 0x3601: 0x000c, 0x3602: 0x000c, 0x3605: 0x000c,
-	0x3606: 0x000c, 0x3607: 0x000c, 0x3608: 0x000c, 0x3609: 0x000c, 0x360a: 0x000c, 0x360b: 0x000c,
-	0x362a: 0x000c, 0x362b: 0x000c, 0x362c: 0x000c, 0x362d: 0x000c,
-	// Block 0xd9, offset 0x3640
-	0x3669: 0x000a,
-	0x366a: 0x000a,
-	// Block 0xda, offset 0x3680
-	0x3680: 0x000a, 0x3681: 0x000a, 0x3682: 0x000c, 0x3683: 0x000c, 0x3684: 0x000c, 0x3685: 0x000a,
-	// Block 0xdb, offset 0x36c0
-	0x36c0: 0x000a, 0x36c1: 0x000a, 0x36c2: 0x000a, 0x36c3: 0x000a, 0x36c4: 0x000a, 0x36c5: 0x000a,
-	0x36c6: 0x000a, 0x36c7: 0x000a, 0x36c8: 0x000a, 0x36c9: 0x000a, 0x36ca: 0x000a, 0x36cb: 0x000a,
-	0x36cc: 0x000a, 0x36cd: 0x000a, 0x36ce: 0x000a, 0x36cf: 0x000a, 0x36d0: 0x000a, 0x36d1: 0x000a,
-	0x36d2: 0x000a, 0x36d3: 0x000a, 0x36d4: 0x000a, 0x36d5: 0x000a, 0x36d6: 0x000a,
-	// Block 0xdc, offset 0x3700
-	0x371b: 0x000a,
-	// Block 0xdd, offset 0x3740
-	0x3755: 0x000a,
-	// Block 0xde, offset 0x3780
-	0x378f: 0x000a,
-	// Block 0xdf, offset 0x37c0
-	0x37c9: 0x000a,
-	// Block 0xe0, offset 0x3800
-	0x3803: 0x000a,
-	0x380e: 0x0002, 0x380f: 0x0002, 0x3810: 0x0002, 0x3811: 0x0002,
-	0x3812: 0x0002, 0x3813: 0x0002, 0x3814: 0x0002, 0x3815: 0x0002, 0x3816: 0x0002, 0x3817: 0x0002,
-	0x3818: 0x0002, 0x3819: 0x0002, 0x381a: 0x0002, 0x381b: 0x0002, 0x381c: 0x0002, 0x381d: 0x0002,
-	0x381e: 0x0002, 0x381f: 0x0002, 0x3820: 0x0002, 0x3821: 0x0002, 0x3822: 0x0002, 0x3823: 0x0002,
-	0x3824: 0x0002, 0x3825: 0x0002, 0x3826: 0x0002, 0x3827: 0x0002, 0x3828: 0x0002, 0x3829: 0x0002,
-	0x382a: 0x0002, 0x382b: 0x0002, 0x382c: 0x0002, 0x382d: 0x0002, 0x382e: 0x0002, 0x382f: 0x0002,
-	0x3830: 0x0002, 0x3831: 0x0002, 0x3832: 0x0002, 0x3833: 0x0002, 0x3834: 0x0002, 0x3835: 0x0002,
-	0x3836: 0x0002, 0x3837: 0x0002, 0x3838: 0x0002, 0x3839: 0x0002, 0x383a: 0x0002, 0x383b: 0x0002,
-	0x383c: 0x0002, 0x383d: 0x0002, 0x383e: 0x0002, 0x383f: 0x0002,
-	// Block 0xe1, offset 0x3840
-	0x3840: 0x000c, 0x3841: 0x000c, 0x3842: 0x000c, 0x3843: 0x000c, 0x3844: 0x000c, 0x3845: 0x000c,
-	0x3846: 0x000c, 0x3847: 0x000c, 0x3848: 0x000c, 0x3849: 0x000c, 0x384a: 0x000c, 0x384b: 0x000c,
-	0x384c: 0x000c, 0x384d: 0x000c, 0x384e: 0x000c, 0x384f: 0x000c, 0x3850: 0x000c, 0x3851: 0x000c,
-	0x3852: 0x000c, 0x3853: 0x000c, 0x3854: 0x000c, 0x3855: 0x000c, 0x3856: 0x000c, 0x3857: 0x000c,
-	0x3858: 0x000c, 0x3859: 0x000c, 0x385a: 0x000c, 0x385b: 0x000c, 0x385c: 0x000c, 0x385d: 0x000c,
-	0x385e: 0x000c, 0x385f: 0x000c, 0x3860: 0x000c, 0x3861: 0x000c, 0x3862: 0x000c, 0x3863: 0x000c,
-	0x3864: 0x000c, 0x3865: 0x000c, 0x3866: 0x000c, 0x3867: 0x000c, 0x3868: 0x000c, 0x3869: 0x000c,
-	0x386a: 0x000c, 0x386b: 0x000c, 0x386c: 0x000c, 0x386d: 0x000c, 0x386e: 0x000c, 0x386f: 0x000c,
-	0x3870: 0x000c, 0x3871: 0x000c, 0x3872: 0x000c, 0x3873: 0x000c, 0x3874: 0x000c, 0x3875: 0x000c,
-	0x3876: 0x000c, 0x387b: 0x000c,
-	0x387c: 0x000c, 0x387d: 0x000c, 0x387e: 0x000c, 0x387f: 0x000c,
-	// Block 0xe2, offset 0x3880
-	0x3880: 0x000c, 0x3881: 0x000c, 0x3882: 0x000c, 0x3883: 0x000c, 0x3884: 0x000c, 0x3885: 0x000c,
-	0x3886: 0x000c, 0x3887: 0x000c, 0x3888: 0x000c, 0x3889: 0x000c, 0x388a: 0x000c, 0x388b: 0x000c,
-	0x388c: 0x000c, 0x388d: 0x000c, 0x388e: 0x000c, 0x388f: 0x000c, 0x3890: 0x000c, 0x3891: 0x000c,
-	0x3892: 0x000c, 0x3893: 0x000c, 0x3894: 0x000c, 0x3895: 0x000c, 0x3896: 0x000c, 0x3897: 0x000c,
-	0x3898: 0x000c, 0x3899: 0x000c, 0x389a: 0x000c, 0x389b: 0x000c, 0x389c: 0x000c, 0x389d: 0x000c,
-	0x389e: 0x000c, 0x389f: 0x000c, 0x38a0: 0x000c, 0x38a1: 0x000c, 0x38a2: 0x000c, 0x38a3: 0x000c,
-	0x38a4: 0x000c, 0x38a5: 0x000c, 0x38a6: 0x000c, 0x38a7: 0x000c, 0x38a8: 0x000c, 0x38a9: 0x000c,
-	0x38aa: 0x000c, 0x38ab: 0x000c, 0x38ac: 0x000c,
-	0x38b5: 0x000c,
-	// Block 0xe3, offset 0x38c0
-	0x38c4: 0x000c,
-	0x38db: 0x000c, 0x38dc: 0x000c, 0x38dd: 0x000c,
-	0x38de: 0x000c, 0x38df: 0x000c, 0x38e1: 0x000c, 0x38e2: 0x000c, 0x38e3: 0x000c,
-	0x38e4: 0x000c, 0x38e5: 0x000c, 0x38e6: 0x000c, 0x38e7: 0x000c, 0x38e8: 0x000c, 0x38e9: 0x000c,
-	0x38ea: 0x000c, 0x38eb: 0x000c, 0x38ec: 0x000c, 0x38ed: 0x000c, 0x38ee: 0x000c, 0x38ef: 0x000c,
-	// Block 0xe4, offset 0x3900
-	0x3900: 0x000c, 0x3901: 0x000c, 0x3902: 0x000c, 0x3903: 0x000c, 0x3904: 0x000c, 0x3905: 0x000c,
-	0x3906: 0x000c, 0x3908: 0x000c, 0x3909: 0x000c, 0x390a: 0x000c, 0x390b: 0x000c,
-	0x390c: 0x000c, 0x390d: 0x000c, 0x390e: 0x000c, 0x390f: 0x000c, 0x3910: 0x000c, 0x3911: 0x000c,
-	0x3912: 0x000c, 0x3913: 0x000c, 0x3914: 0x000c, 0x3915: 0x000c, 0x3916: 0x000c, 0x3917: 0x000c,
-	0x3918: 0x000c, 0x391b: 0x000c, 0x391c: 0x000c, 0x391d: 0x000c,
-	0x391e: 0x000c, 0x391f: 0x000c, 0x3920: 0x000c, 0x3921: 0x000c, 0x3923: 0x000c,
-	0x3924: 0x000c, 0x3926: 0x000c, 0x3927: 0x000c, 0x3928: 0x000c, 0x3929: 0x000c,
-	0x392a: 0x000c,
-	// Block 0xe5, offset 0x3940
-	0x396e: 0x000c,
-	// Block 0xe6, offset 0x3980
-	0x39ac: 0x000c, 0x39ad: 0x000c, 0x39ae: 0x000c, 0x39af: 0x000c,
-	0x39bf: 0x0004,
-	// Block 0xe7, offset 0x39c0
-	0x39ec: 0x000c, 0x39ed: 0x000c, 0x39ee: 0x000c, 0x39ef: 0x000c,
-	// Block 0xe8, offset 0x3a00
-	0x3a00: 0x0001, 0x3a01: 0x0001, 0x3a02: 0x0001, 0x3a03: 0x0001, 0x3a04: 0x0001, 0x3a05: 0x0001,
-	0x3a06: 0x0001, 0x3a07: 0x0001, 0x3a08: 0x0001, 0x3a09: 0x0001, 0x3a0a: 0x0001, 0x3a0b: 0x0001,
-	0x3a0c: 0x0001, 0x3a0d: 0x0001, 0x3a0e: 0x0001, 0x3a0f: 0x0001, 0x3a10: 0x000c, 0x3a11: 0x000c,
-	0x3a12: 0x000c, 0x3a13: 0x000c, 0x3a14: 0x000c, 0x3a15: 0x000c, 0x3a16: 0x000c, 0x3a17: 0x0001,
-	0x3a18: 0x0001, 0x3a19: 0x0001, 0x3a1a: 0x0001, 0x3a1b: 0x0001, 0x3a1c: 0x0001, 0x3a1d: 0x0001,
-	0x3a1e: 0x0001, 0x3a1f: 0x0001, 0x3a20: 0x0001, 0x3a21: 0x0001, 0x3a22: 0x0001, 0x3a23: 0x0001,
-	0x3a24: 0x0001, 0x3a25: 0x0001, 0x3a26: 0x0001, 0x3a27: 0x0001, 0x3a28: 0x0001, 0x3a29: 0x0001,
-	0x3a2a: 0x0001, 0x3a2b: 0x0001, 0x3a2c: 0x0001, 0x3a2d: 0x0001, 0x3a2e: 0x0001, 0x3a2f: 0x0001,
-	0x3a30: 0x0001, 0x3a31: 0x0001, 0x3a32: 0x0001, 0x3a33: 0x0001, 0x3a34: 0x0001, 0x3a35: 0x0001,
-	0x3a36: 0x0001, 0x3a37: 0x0001, 0x3a38: 0x0001, 0x3a39: 0x0001, 0x3a3a: 0x0001, 0x3a3b: 0x0001,
-	0x3a3c: 0x0001, 0x3a3d: 0x0001, 0x3a3e: 0x0001, 0x3a3f: 0x0001,
-	// Block 0xe9, offset 0x3a40
-	0x3a40: 0x0001, 0x3a41: 0x0001, 0x3a42: 0x0001, 0x3a43: 0x0001, 0x3a44: 0x000c, 0x3a45: 0x000c,
-	0x3a46: 0x000c, 0x3a47: 0x000c, 0x3a48: 0x000c, 0x3a49: 0x000c, 0x3a4a: 0x000c, 0x3a4b: 0x0001,
-	0x3a4c: 0x0001, 0x3a4d: 0x0001, 0x3a4e: 0x0001, 0x3a4f: 0x0001, 0x3a50: 0x0001, 0x3a51: 0x0001,
-	0x3a52: 0x0001, 0x3a53: 0x0001, 0x3a54: 0x0001, 0x3a55: 0x0001, 0x3a56: 0x0001, 0x3a57: 0x0001,
-	0x3a58: 0x0001, 0x3a59: 0x0001, 0x3a5a: 0x0001, 0x3a5b: 0x0001, 0x3a5c: 0x0001, 0x3a5d: 0x0001,
-	0x3a5e: 0x0001, 0x3a5f: 0x0001, 0x3a60: 0x0001, 0x3a61: 0x0001, 0x3a62: 0x0001, 0x3a63: 0x0001,
-	0x3a64: 0x0001, 0x3a65: 0x0001, 0x3a66: 0x0001, 0x3a67: 0x0001, 0x3a68: 0x0001, 0x3a69: 0x0001,
-	0x3a6a: 0x0001, 0x3a6b: 0x0001, 0x3a6c: 0x0001, 0x3a6d: 0x0001, 0x3a6e: 0x0001, 0x3a6f: 0x0001,
-	0x3a70: 0x0001, 0x3a71: 0x0001, 0x3a72: 0x0001, 0x3a73: 0x0001, 0x3a74: 0x0001, 0x3a75: 0x0001,
-	0x3a76: 0x0001, 0x3a77: 0x0001, 0x3a78: 0x0001, 0x3a79: 0x0001, 0x3a7a: 0x0001, 0x3a7b: 0x0001,
-	0x3a7c: 0x0001, 0x3a7d: 0x0001, 0x3a7e: 0x0001, 0x3a7f: 0x0001,
-	// Block 0xea, offset 0x3a80
-	0x3a80: 0x0001, 0x3a81: 0x0001, 0x3a82: 0x0001, 0x3a83: 0x0001, 0x3a84: 0x0001, 0x3a85: 0x0001,
-	0x3a86: 0x0001, 0x3a87: 0x0001, 0x3a88: 0x0001, 0x3a89: 0x0001, 0x3a8a: 0x0001, 0x3a8b: 0x0001,
-	0x3a8c: 0x0001, 0x3a8d: 0x0001, 0x3a8e: 0x0001, 0x3a8f: 0x0001, 0x3a90: 0x0001, 0x3a91: 0x0001,
-	0x3a92: 0x0001, 0x3a93: 0x0001, 0x3a94: 0x0001, 0x3a95: 0x0001, 0x3a96: 0x0001, 0x3a97: 0x0001,
-	0x3a98: 0x0001, 0x3a99: 0x0001, 0x3a9a: 0x0001, 0x3a9b: 0x0001, 0x3a9c: 0x0001, 0x3a9d: 0x0001,
-	0x3a9e: 0x0001, 0x3a9f: 0x0001, 0x3aa0: 0x0001, 0x3aa1: 0x0001, 0x3aa2: 0x0001, 0x3aa3: 0x0001,
-	0x3aa4: 0x0001, 0x3aa5: 0x0001, 0x3aa6: 0x0001, 0x3aa7: 0x0001, 0x3aa8: 0x0001, 0x3aa9: 0x0001,
-	0x3aaa: 0x0001, 0x3aab: 0x0001, 0x3aac: 0x0001, 0x3aad: 0x0001, 0x3aae: 0x0001, 0x3aaf: 0x0001,
-	0x3ab0: 0x0001, 0x3ab1: 0x000d, 0x3ab2: 0x000d, 0x3ab3: 0x000d, 0x3ab4: 0x000d, 0x3ab5: 0x000d,
-	0x3ab6: 0x000d, 0x3ab7: 0x000d, 0x3ab8: 0x000d, 0x3ab9: 0x000d, 0x3aba: 0x000d, 0x3abb: 0x000d,
-	0x3abc: 0x000d, 0x3abd: 0x000d, 0x3abe: 0x000d, 0x3abf: 0x000d,
-	// Block 0xeb, offset 0x3ac0
-	0x3ac0: 0x000d, 0x3ac1: 0x000d, 0x3ac2: 0x000d, 0x3ac3: 0x000d, 0x3ac4: 0x000d, 0x3ac5: 0x000d,
-	0x3ac6: 0x000d, 0x3ac7: 0x000d, 0x3ac8: 0x000d, 0x3ac9: 0x000d, 0x3aca: 0x000d, 0x3acb: 0x000d,
-	0x3acc: 0x000d, 0x3acd: 0x000d, 0x3ace: 0x000d, 0x3acf: 0x000d, 0x3ad0: 0x000d, 0x3ad1: 0x000d,
-	0x3ad2: 0x000d, 0x3ad3: 0x000d, 0x3ad4: 0x000d, 0x3ad5: 0x000d, 0x3ad6: 0x000d, 0x3ad7: 0x000d,
-	0x3ad8: 0x000d, 0x3ad9: 0x000d, 0x3ada: 0x000d, 0x3adb: 0x000d, 0x3adc: 0x000d, 0x3add: 0x000d,
-	0x3ade: 0x000d, 0x3adf: 0x000d, 0x3ae0: 0x000d, 0x3ae1: 0x000d, 0x3ae2: 0x000d, 0x3ae3: 0x000d,
-	0x3ae4: 0x000d, 0x3ae5: 0x000d, 0x3ae6: 0x000d, 0x3ae7: 0x000d, 0x3ae8: 0x000d, 0x3ae9: 0x000d,
-	0x3aea: 0x000d, 0x3aeb: 0x000d, 0x3aec: 0x000d, 0x3aed: 0x000d, 0x3aee: 0x000d, 0x3aef: 0x000d,
-	0x3af0: 0x000d, 0x3af1: 0x000d, 0x3af2: 0x000d, 0x3af3: 0x000d, 0x3af4: 0x000d, 0x3af5: 0x0001,
-	0x3af6: 0x0001, 0x3af7: 0x0001, 0x3af8: 0x0001, 0x3af9: 0x0001, 0x3afa: 0x0001, 0x3afb: 0x0001,
-	0x3afc: 0x0001, 0x3afd: 0x0001, 0x3afe: 0x0001, 0x3aff: 0x0001,
-	// Block 0xec, offset 0x3b00
-	0x3b00: 0x0001, 0x3b01: 0x000d, 0x3b02: 0x000d, 0x3b03: 0x000d, 0x3b04: 0x000d, 0x3b05: 0x000d,
-	0x3b06: 0x000d, 0x3b07: 0x000d, 0x3b08: 0x000d, 0x3b09: 0x000d, 0x3b0a: 0x000d, 0x3b0b: 0x000d,
-	0x3b0c: 0x000d, 0x3b0d: 0x000d, 0x3b0e: 0x000d, 0x3b0f: 0x000d, 0x3b10: 0x000d, 0x3b11: 0x000d,
-	0x3b12: 0x000d, 0x3b13: 0x000d, 0x3b14: 0x000d, 0x3b15: 0x000d, 0x3b16: 0x000d, 0x3b17: 0x000d,
-	0x3b18: 0x000d, 0x3b19: 0x000d, 0x3b1a: 0x000d, 0x3b1b: 0x000d, 0x3b1c: 0x000d, 0x3b1d: 0x000d,
-	0x3b1e: 0x000d, 0x3b1f: 0x000d, 0x3b20: 0x000d, 0x3b21: 0x000d, 0x3b22: 0x000d, 0x3b23: 0x000d,
-	0x3b24: 0x000d, 0x3b25: 0x000d, 0x3b26: 0x000d, 0x3b27: 0x000d, 0x3b28: 0x000d, 0x3b29: 0x000d,
-	0x3b2a: 0x000d, 0x3b2b: 0x000d, 0x3b2c: 0x000d, 0x3b2d: 0x000d, 0x3b2e: 0x000d, 0x3b2f: 0x000d,
-	0x3b30: 0x000d, 0x3b31: 0x000d, 0x3b32: 0x000d, 0x3b33: 0x000d, 0x3b34: 0x000d, 0x3b35: 0x000d,
-	0x3b36: 0x000d, 0x3b37: 0x000d, 0x3b38: 0x000d, 0x3b39: 0x000d, 0x3b3a: 0x000d, 0x3b3b: 0x000d,
-	0x3b3c: 0x000d, 0x3b3d: 0x000d, 0x3b3e: 0x0001, 0x3b3f: 0x0001,
-	// Block 0xed, offset 0x3b40
-	0x3b40: 0x000d, 0x3b41: 0x000d, 0x3b42: 0x000d, 0x3b43: 0x000d, 0x3b44: 0x000d, 0x3b45: 0x000d,
-	0x3b46: 0x000d, 0x3b47: 0x000d, 0x3b48: 0x000d, 0x3b49: 0x000d, 0x3b4a: 0x000d, 0x3b4b: 0x000d,
-	0x3b4c: 0x000d, 0x3b4d: 0x000d, 0x3b4e: 0x000d, 0x3b4f: 0x000d, 0x3b50: 0x000d, 0x3b51: 0x000d,
-	0x3b52: 0x000d, 0x3b53: 0x000d, 0x3b54: 0x000d, 0x3b55: 0x000d, 0x3b56: 0x000d, 0x3b57: 0x000d,
-	0x3b58: 0x000d, 0x3b59: 0x000d, 0x3b5a: 0x000d, 0x3b5b: 0x000d, 0x3b5c: 0x000d, 0x3b5d: 0x000d,
-	0x3b5e: 0x000d, 0x3b5f: 0x000d, 0x3b60: 0x000d, 0x3b61: 0x000d, 0x3b62: 0x000d, 0x3b63: 0x000d,
-	0x3b64: 0x000d, 0x3b65: 0x000d, 0x3b66: 0x000d, 0x3b67: 0x000d, 0x3b68: 0x000d, 0x3b69: 0x000d,
-	0x3b6a: 0x000d, 0x3b6b: 0x000d, 0x3b6c: 0x000d, 0x3b6d: 0x000d, 0x3b6e: 0x000d, 0x3b6f: 0x000d,
-	0x3b70: 0x000a, 0x3b71: 0x000a, 0x3b72: 0x000d, 0x3b73: 0x000d, 0x3b74: 0x000d, 0x3b75: 0x000d,
-	0x3b76: 0x000d, 0x3b77: 0x000d, 0x3b78: 0x000d, 0x3b79: 0x000d, 0x3b7a: 0x000d, 0x3b7b: 0x000d,
-	0x3b7c: 0x000d, 0x3b7d: 0x000d, 0x3b7e: 0x000d, 0x3b7f: 0x000d,
-	// Block 0xee, offset 0x3b80
-	0x3b80: 0x000a, 0x3b81: 0x000a, 0x3b82: 0x000a, 0x3b83: 0x000a, 0x3b84: 0x000a, 0x3b85: 0x000a,
-	0x3b86: 0x000a, 0x3b87: 0x000a, 0x3b88: 0x000a, 0x3b89: 0x000a, 0x3b8a: 0x000a, 0x3b8b: 0x000a,
-	0x3b8c: 0x000a, 0x3b8d: 0x000a, 0x3b8e: 0x000a, 0x3b8f: 0x000a, 0x3b90: 0x000a, 0x3b91: 0x000a,
-	0x3b92: 0x000a, 0x3b93: 0x000a, 0x3b94: 0x000a, 0x3b95: 0x000a, 0x3b96: 0x000a, 0x3b97: 0x000a,
-	0x3b98: 0x000a, 0x3b99: 0x000a, 0x3b9a: 0x000a, 0x3b9b: 0x000a, 0x3b9c: 0x000a, 0x3b9d: 0x000a,
-	0x3b9e: 0x000a, 0x3b9f: 0x000a, 0x3ba0: 0x000a, 0x3ba1: 0x000a, 0x3ba2: 0x000a, 0x3ba3: 0x000a,
-	0x3ba4: 0x000a, 0x3ba5: 0x000a, 0x3ba6: 0x000a, 0x3ba7: 0x000a, 0x3ba8: 0x000a, 0x3ba9: 0x000a,
-	0x3baa: 0x000a, 0x3bab: 0x000a,
-	0x3bb0: 0x000a, 0x3bb1: 0x000a, 0x3bb2: 0x000a, 0x3bb3: 0x000a, 0x3bb4: 0x000a, 0x3bb5: 0x000a,
-	0x3bb6: 0x000a, 0x3bb7: 0x000a, 0x3bb8: 0x000a, 0x3bb9: 0x000a, 0x3bba: 0x000a, 0x3bbb: 0x000a,
-	0x3bbc: 0x000a, 0x3bbd: 0x000a, 0x3bbe: 0x000a, 0x3bbf: 0x000a,
-	// Block 0xef, offset 0x3bc0
-	0x3bc0: 0x000a, 0x3bc1: 0x000a, 0x3bc2: 0x000a, 0x3bc3: 0x000a, 0x3bc4: 0x000a, 0x3bc5: 0x000a,
-	0x3bc6: 0x000a, 0x3bc7: 0x000a, 0x3bc8: 0x000a, 0x3bc9: 0x000a, 0x3bca: 0x000a, 0x3bcb: 0x000a,
-	0x3bcc: 0x000a, 0x3bcd: 0x000a, 0x3bce: 0x000a, 0x3bcf: 0x000a, 0x3bd0: 0x000a, 0x3bd1: 0x000a,
-	0x3bd2: 0x000a, 0x3bd3: 0x000a,
-	0x3be0: 0x000a, 0x3be1: 0x000a, 0x3be2: 0x000a, 0x3be3: 0x000a,
-	0x3be4: 0x000a, 0x3be5: 0x000a, 0x3be6: 0x000a, 0x3be7: 0x000a, 0x3be8: 0x000a, 0x3be9: 0x000a,
-	0x3bea: 0x000a, 0x3beb: 0x000a, 0x3bec: 0x000a, 0x3bed: 0x000a, 0x3bee: 0x000a,
-	0x3bf1: 0x000a, 0x3bf2: 0x000a, 0x3bf3: 0x000a, 0x3bf4: 0x000a, 0x3bf5: 0x000a,
-	0x3bf6: 0x000a, 0x3bf7: 0x000a, 0x3bf8: 0x000a, 0x3bf9: 0x000a, 0x3bfa: 0x000a, 0x3bfb: 0x000a,
-	0x3bfc: 0x000a, 0x3bfd: 0x000a, 0x3bfe: 0x000a, 0x3bff: 0x000a,
-	// Block 0xf0, offset 0x3c00
-	0x3c01: 0x000a, 0x3c02: 0x000a, 0x3c03: 0x000a, 0x3c04: 0x000a, 0x3c05: 0x000a,
-	0x3c06: 0x000a, 0x3c07: 0x000a, 0x3c08: 0x000a, 0x3c09: 0x000a, 0x3c0a: 0x000a, 0x3c0b: 0x000a,
-	0x3c0c: 0x000a, 0x3c0d: 0x000a, 0x3c0e: 0x000a, 0x3c0f: 0x000a, 0x3c11: 0x000a,
-	0x3c12: 0x000a, 0x3c13: 0x000a, 0x3c14: 0x000a, 0x3c15: 0x000a, 0x3c16: 0x000a, 0x3c17: 0x000a,
-	0x3c18: 0x000a, 0x3c19: 0x000a, 0x3c1a: 0x000a, 0x3c1b: 0x000a, 0x3c1c: 0x000a, 0x3c1d: 0x000a,
-	0x3c1e: 0x000a, 0x3c1f: 0x000a, 0x3c20: 0x000a, 0x3c21: 0x000a, 0x3c22: 0x000a, 0x3c23: 0x000a,
-	0x3c24: 0x000a, 0x3c25: 0x000a, 0x3c26: 0x000a, 0x3c27: 0x000a, 0x3c28: 0x000a, 0x3c29: 0x000a,
-	0x3c2a: 0x000a, 0x3c2b: 0x000a, 0x3c2c: 0x000a, 0x3c2d: 0x000a, 0x3c2e: 0x000a, 0x3c2f: 0x000a,
-	0x3c30: 0x000a, 0x3c31: 0x000a, 0x3c32: 0x000a, 0x3c33: 0x000a, 0x3c34: 0x000a, 0x3c35: 0x000a,
-	// Block 0xf1, offset 0x3c40
-	0x3c40: 0x0002, 0x3c41: 0x0002, 0x3c42: 0x0002, 0x3c43: 0x0002, 0x3c44: 0x0002, 0x3c45: 0x0002,
-	0x3c46: 0x0002, 0x3c47: 0x0002, 0x3c48: 0x0002, 0x3c49: 0x0002, 0x3c4a: 0x0002, 0x3c4b: 0x000a,
-	0x3c4c: 0x000a, 0x3c4d: 0x000a, 0x3c4e: 0x000a, 0x3c4f: 0x000a,
-	0x3c6f: 0x000a,
-	// Block 0xf2, offset 0x3c80
-	0x3caa: 0x000a, 0x3cab: 0x000a, 0x3cac: 0x000a, 0x3cad: 0x000a, 0x3cae: 0x000a, 0x3caf: 0x000a,
-	// Block 0xf3, offset 0x3cc0
-	0x3ced: 0x000a,
-	// Block 0xf4, offset 0x3d00
-	0x3d20: 0x000a, 0x3d21: 0x000a, 0x3d22: 0x000a, 0x3d23: 0x000a,
-	0x3d24: 0x000a, 0x3d25: 0x000a,
-	// Block 0xf5, offset 0x3d40
-	0x3d40: 0x000a, 0x3d41: 0x000a, 0x3d42: 0x000a, 0x3d43: 0x000a, 0x3d44: 0x000a, 0x3d45: 0x000a,
-	0x3d46: 0x000a, 0x3d47: 0x000a, 0x3d48: 0x000a, 0x3d49: 0x000a, 0x3d4a: 0x000a, 0x3d4b: 0x000a,
-	0x3d4c: 0x000a, 0x3d4d: 0x000a, 0x3d4e: 0x000a, 0x3d4f: 0x000a, 0x3d50: 0x000a, 0x3d51: 0x000a,
-	0x3d52: 0x000a, 0x3d53: 0x000a, 0x3d54: 0x000a, 0x3d55: 0x000a, 0x3d56: 0x000a, 0x3d57: 0x000a,
-	0x3d5c: 0x000a, 0x3d5d: 0x000a,
-	0x3d5e: 0x000a, 0x3d5f: 0x000a, 0x3d60: 0x000a, 0x3d61: 0x000a, 0x3d62: 0x000a, 0x3d63: 0x000a,
-	0x3d64: 0x000a, 0x3d65: 0x000a, 0x3d66: 0x000a, 0x3d67: 0x000a, 0x3d68: 0x000a, 0x3d69: 0x000a,
-	0x3d6a: 0x000a, 0x3d6b: 0x000a, 0x3d6c: 0x000a,
-	0x3d70: 0x000a, 0x3d71: 0x000a, 0x3d72: 0x000a, 0x3d73: 0x000a, 0x3d74: 0x000a, 0x3d75: 0x000a,
-	0x3d76: 0x000a, 0x3d77: 0x000a, 0x3d78: 0x000a, 0x3d79: 0x000a, 0x3d7a: 0x000a, 0x3d7b: 0x000a,
-	0x3d7c: 0x000a,
-	// Block 0xf6, offset 0x3d80
-	0x3d80: 0x000a, 0x3d81: 0x000a, 0x3d82: 0x000a, 0x3d83: 0x000a, 0x3d84: 0x000a, 0x3d85: 0x000a,
-	0x3d86: 0x000a, 0x3d87: 0x000a, 0x3d88: 0x000a, 0x3d89: 0x000a, 0x3d8a: 0x000a, 0x3d8b: 0x000a,
-	0x3d8c: 0x000a, 0x3d8d: 0x000a, 0x3d8e: 0x000a, 0x3d8f: 0x000a, 0x3d90: 0x000a, 0x3d91: 0x000a,
-	0x3d92: 0x000a, 0x3d93: 0x000a, 0x3d94: 0x000a, 0x3d95: 0x000a, 0x3d96: 0x000a, 0x3d97: 0x000a,
-	0x3d98: 0x000a, 0x3d99: 0x000a, 0x3d9a: 0x000a, 0x3d9b: 0x000a, 0x3d9c: 0x000a, 0x3d9d: 0x000a,
-	0x3d9e: 0x000a, 0x3d9f: 0x000a, 0x3da0: 0x000a, 0x3da1: 0x000a, 0x3da2: 0x000a, 0x3da3: 0x000a,
-	0x3da4: 0x000a, 0x3da5: 0x000a, 0x3da6: 0x000a, 0x3da7: 0x000a, 0x3da8: 0x000a, 0x3da9: 0x000a,
-	0x3daa: 0x000a, 0x3dab: 0x000a, 0x3dac: 0x000a, 0x3dad: 0x000a, 0x3dae: 0x000a, 0x3daf: 0x000a,
-	0x3db0: 0x000a, 0x3db1: 0x000a, 0x3db2: 0x000a, 0x3db3: 0x000a, 0x3db4: 0x000a, 0x3db5: 0x000a,
-	0x3db6: 0x000a, 0x3dbb: 0x000a,
-	0x3dbc: 0x000a, 0x3dbd: 0x000a, 0x3dbe: 0x000a, 0x3dbf: 0x000a,
-	// Block 0xf7, offset 0x3dc0
-	0x3dc0: 0x000a, 0x3dc1: 0x000a, 0x3dc2: 0x000a, 0x3dc3: 0x000a, 0x3dc4: 0x000a, 0x3dc5: 0x000a,
-	0x3dc6: 0x000a, 0x3dc7: 0x000a, 0x3dc8: 0x000a, 0x3dc9: 0x000a, 0x3dca: 0x000a, 0x3dcb: 0x000a,
-	0x3dcc: 0x000a, 0x3dcd: 0x000a, 0x3dce: 0x000a, 0x3dcf: 0x000a, 0x3dd0: 0x000a, 0x3dd1: 0x000a,
-	0x3dd2: 0x000a, 0x3dd3: 0x000a, 0x3dd4: 0x000a, 0x3dd5: 0x000a, 0x3dd6: 0x000a, 0x3dd7: 0x000a,
-	0x3dd8: 0x000a, 0x3dd9: 0x000a,
-	0x3de0: 0x000a, 0x3de1: 0x000a, 0x3de2: 0x000a, 0x3de3: 0x000a,
-	0x3de4: 0x000a, 0x3de5: 0x000a, 0x3de6: 0x000a, 0x3de7: 0x000a, 0x3de8: 0x000a, 0x3de9: 0x000a,
-	0x3dea: 0x000a, 0x3deb: 0x000a,
-	0x3df0: 0x000a,
-	// Block 0xf8, offset 0x3e00
-	0x3e00: 0x000a, 0x3e01: 0x000a, 0x3e02: 0x000a, 0x3e03: 0x000a, 0x3e04: 0x000a, 0x3e05: 0x000a,
-	0x3e06: 0x000a, 0x3e07: 0x000a, 0x3e08: 0x000a, 0x3e09: 0x000a, 0x3e0a: 0x000a, 0x3e0b: 0x000a,
-	0x3e10: 0x000a, 0x3e11: 0x000a,
-	0x3e12: 0x000a, 0x3e13: 0x000a, 0x3e14: 0x000a, 0x3e15: 0x000a, 0x3e16: 0x000a, 0x3e17: 0x000a,
-	0x3e18: 0x000a, 0x3e19: 0x000a, 0x3e1a: 0x000a, 0x3e1b: 0x000a, 0x3e1c: 0x000a, 0x3e1d: 0x000a,
-	0x3e1e: 0x000a, 0x3e1f: 0x000a, 0x3e20: 0x000a, 0x3e21: 0x000a, 0x3e22: 0x000a, 0x3e23: 0x000a,
-	0x3e24: 0x000a, 0x3e25: 0x000a, 0x3e26: 0x000a, 0x3e27: 0x000a, 0x3e28: 0x000a, 0x3e29: 0x000a,
-	0x3e2a: 0x000a, 0x3e2b: 0x000a, 0x3e2c: 0x000a, 0x3e2d: 0x000a, 0x3e2e: 0x000a, 0x3e2f: 0x000a,
-	0x3e30: 0x000a, 0x3e31: 0x000a, 0x3e32: 0x000a, 0x3e33: 0x000a, 0x3e34: 0x000a, 0x3e35: 0x000a,
-	0x3e36: 0x000a, 0x3e37: 0x000a, 0x3e38: 0x000a, 0x3e39: 0x000a, 0x3e3a: 0x000a, 0x3e3b: 0x000a,
-	0x3e3c: 0x000a, 0x3e3d: 0x000a, 0x3e3e: 0x000a, 0x3e3f: 0x000a,
-	// Block 0xf9, offset 0x3e40
-	0x3e40: 0x000a, 0x3e41: 0x000a, 0x3e42: 0x000a, 0x3e43: 0x000a, 0x3e44: 0x000a, 0x3e45: 0x000a,
-	0x3e46: 0x000a, 0x3e47: 0x000a,
-	0x3e50: 0x000a, 0x3e51: 0x000a,
-	0x3e52: 0x000a, 0x3e53: 0x000a, 0x3e54: 0x000a, 0x3e55: 0x000a, 0x3e56: 0x000a, 0x3e57: 0x000a,
-	0x3e58: 0x000a, 0x3e59: 0x000a,
-	0x3e60: 0x000a, 0x3e61: 0x000a, 0x3e62: 0x000a, 0x3e63: 0x000a,
-	0x3e64: 0x000a, 0x3e65: 0x000a, 0x3e66: 0x000a, 0x3e67: 0x000a, 0x3e68: 0x000a, 0x3e69: 0x000a,
-	0x3e6a: 0x000a, 0x3e6b: 0x000a, 0x3e6c: 0x000a, 0x3e6d: 0x000a, 0x3e6e: 0x000a, 0x3e6f: 0x000a,
-	0x3e70: 0x000a, 0x3e71: 0x000a, 0x3e72: 0x000a, 0x3e73: 0x000a, 0x3e74: 0x000a, 0x3e75: 0x000a,
-	0x3e76: 0x000a, 0x3e77: 0x000a, 0x3e78: 0x000a, 0x3e79: 0x000a, 0x3e7a: 0x000a, 0x3e7b: 0x000a,
-	0x3e7c: 0x000a, 0x3e7d: 0x000a, 0x3e7e: 0x000a, 0x3e7f: 0x000a,
-	// Block 0xfa, offset 0x3e80
-	0x3e80: 0x000a, 0x3e81: 0x000a, 0x3e82: 0x000a, 0x3e83: 0x000a, 0x3e84: 0x000a, 0x3e85: 0x000a,
-	0x3e86: 0x000a, 0x3e87: 0x000a,
-	0x3e90: 0x000a, 0x3e91: 0x000a,
-	0x3e92: 0x000a, 0x3e93: 0x000a, 0x3e94: 0x000a, 0x3e95: 0x000a, 0x3e96: 0x000a, 0x3e97: 0x000a,
-	0x3e98: 0x000a, 0x3e99: 0x000a, 0x3e9a: 0x000a, 0x3e9b: 0x000a, 0x3e9c: 0x000a, 0x3e9d: 0x000a,
-	0x3e9e: 0x000a, 0x3e9f: 0x000a, 0x3ea0: 0x000a, 0x3ea1: 0x000a, 0x3ea2: 0x000a, 0x3ea3: 0x000a,
-	0x3ea4: 0x000a, 0x3ea5: 0x000a, 0x3ea6: 0x000a, 0x3ea7: 0x000a, 0x3ea8: 0x000a, 0x3ea9: 0x000a,
-	0x3eaa: 0x000a, 0x3eab: 0x000a, 0x3eac: 0x000a, 0x3ead: 0x000a,
-	0x3eb0: 0x000a, 0x3eb1: 0x000a,
-	// Block 0xfb, offset 0x3ec0
-	0x3ec0: 0x000a, 0x3ec1: 0x000a, 0x3ec2: 0x000a, 0x3ec3: 0x000a, 0x3ec4: 0x000a, 0x3ec5: 0x000a,
-	0x3ec6: 0x000a, 0x3ec7: 0x000a, 0x3ec8: 0x000a, 0x3ec9: 0x000a, 0x3eca: 0x000a, 0x3ecb: 0x000a,
-	0x3ecc: 0x000a, 0x3ecd: 0x000a, 0x3ece: 0x000a, 0x3ecf: 0x000a, 0x3ed0: 0x000a, 0x3ed1: 0x000a,
-	0x3ed2: 0x000a, 0x3ed3: 0x000a,
-	0x3ee0: 0x000a, 0x3ee1: 0x000a, 0x3ee2: 0x000a, 0x3ee3: 0x000a,
-	0x3ee4: 0x000a, 0x3ee5: 0x000a, 0x3ee6: 0x000a, 0x3ee7: 0x000a, 0x3ee8: 0x000a, 0x3ee9: 0x000a,
-	0x3eea: 0x000a, 0x3eeb: 0x000a, 0x3eec: 0x000a, 0x3eed: 0x000a,
-	0x3ef0: 0x000a, 0x3ef1: 0x000a, 0x3ef2: 0x000a, 0x3ef3: 0x000a, 0x3ef4: 0x000a, 0x3ef5: 0x000a,
-	0x3ef6: 0x000a, 0x3ef7: 0x000a, 0x3ef8: 0x000a, 0x3ef9: 0x000a, 0x3efa: 0x000a, 0x3efb: 0x000a,
-	0x3efc: 0x000a,
-	// Block 0xfc, offset 0x3f00
-	0x3f00: 0x000a, 0x3f01: 0x000a, 0x3f02: 0x000a, 0x3f03: 0x000a, 0x3f04: 0x000a, 0x3f05: 0x000a,
-	0x3f06: 0x000a, 0x3f07: 0x000a, 0x3f08: 0x000a,
-	0x3f10: 0x000a, 0x3f11: 0x000a,
-	0x3f12: 0x000a, 0x3f13: 0x000a, 0x3f14: 0x000a, 0x3f15: 0x000a, 0x3f16: 0x000a, 0x3f17: 0x000a,
-	0x3f18: 0x000a, 0x3f19: 0x000a, 0x3f1a: 0x000a, 0x3f1b: 0x000a, 0x3f1c: 0x000a, 0x3f1d: 0x000a,
-	0x3f1e: 0x000a, 0x3f1f: 0x000a, 0x3f20: 0x000a, 0x3f21: 0x000a, 0x3f22: 0x000a, 0x3f23: 0x000a,
-	0x3f24: 0x000a, 0x3f25: 0x000a, 0x3f26: 0x000a, 0x3f27: 0x000a, 0x3f28: 0x000a, 0x3f29: 0x000a,
-	0x3f2a: 0x000a, 0x3f2b: 0x000a, 0x3f2c: 0x000a, 0x3f2d: 0x000a, 0x3f2e: 0x000a, 0x3f2f: 0x000a,
-	0x3f30: 0x000a, 0x3f31: 0x000a, 0x3f32: 0x000a, 0x3f33: 0x000a, 0x3f34: 0x000a, 0x3f35: 0x000a,
-	0x3f36: 0x000a, 0x3f37: 0x000a, 0x3f38: 0x000a, 0x3f39: 0x000a, 0x3f3a: 0x000a, 0x3f3b: 0x000a,
-	0x3f3c: 0x000a, 0x3f3d: 0x000a, 0x3f3f: 0x000a,
-	// Block 0xfd, offset 0x3f40
-	0x3f40: 0x000a, 0x3f41: 0x000a, 0x3f42: 0x000a, 0x3f43: 0x000a, 0x3f44: 0x000a, 0x3f45: 0x000a,
-	0x3f4e: 0x000a, 0x3f4f: 0x000a, 0x3f50: 0x000a, 0x3f51: 0x000a,
-	0x3f52: 0x000a, 0x3f53: 0x000a, 0x3f54: 0x000a, 0x3f55: 0x000a, 0x3f56: 0x000a, 0x3f57: 0x000a,
-	0x3f58: 0x000a, 0x3f59: 0x000a, 0x3f5a: 0x000a, 0x3f5b: 0x000a,
-	0x3f60: 0x000a, 0x3f61: 0x000a, 0x3f62: 0x000a, 0x3f63: 0x000a,
-	0x3f64: 0x000a, 0x3f65: 0x000a, 0x3f66: 0x000a, 0x3f67: 0x000a, 0x3f68: 0x000a,
-	0x3f70: 0x000a, 0x3f71: 0x000a, 0x3f72: 0x000a, 0x3f73: 0x000a, 0x3f74: 0x000a, 0x3f75: 0x000a,
-	0x3f76: 0x000a, 0x3f77: 0x000a, 0x3f78: 0x000a,
-	// Block 0xfe, offset 0x3f80
-	0x3f80: 0x000a, 0x3f81: 0x000a, 0x3f82: 0x000a, 0x3f83: 0x000a, 0x3f84: 0x000a, 0x3f85: 0x000a,
-	0x3f86: 0x000a, 0x3f87: 0x000a, 0x3f88: 0x000a, 0x3f89: 0x000a, 0x3f8a: 0x000a, 0x3f8b: 0x000a,
-	0x3f8c: 0x000a, 0x3f8d: 0x000a, 0x3f8e: 0x000a, 0x3f8f: 0x000a, 0x3f90: 0x000a, 0x3f91: 0x000a,
-	0x3f92: 0x000a, 0x3f94: 0x000a, 0x3f95: 0x000a, 0x3f96: 0x000a, 0x3f97: 0x000a,
-	0x3f98: 0x000a, 0x3f99: 0x000a, 0x3f9a: 0x000a, 0x3f9b: 0x000a, 0x3f9c: 0x000a, 0x3f9d: 0x000a,
-	0x3f9e: 0x000a, 0x3f9f: 0x000a, 0x3fa0: 0x000a, 0x3fa1: 0x000a, 0x3fa2: 0x000a, 0x3fa3: 0x000a,
-	0x3fa4: 0x000a, 0x3fa5: 0x000a, 0x3fa6: 0x000a, 0x3fa7: 0x000a, 0x3fa8: 0x000a, 0x3fa9: 0x000a,
-	0x3faa: 0x000a, 0x3fab: 0x000a, 0x3fac: 0x000a, 0x3fad: 0x000a, 0x3fae: 0x000a, 0x3faf: 0x000a,
-	0x3fb0: 0x000a, 0x3fb1: 0x000a, 0x3fb2: 0x000a, 0x3fb3: 0x000a, 0x3fb4: 0x000a, 0x3fb5: 0x000a,
-	0x3fb6: 0x000a, 0x3fb7: 0x000a, 0x3fb8: 0x000a, 0x3fb9: 0x000a, 0x3fba: 0x000a, 0x3fbb: 0x000a,
-	0x3fbc: 0x000a, 0x3fbd: 0x000a, 0x3fbe: 0x000a, 0x3fbf: 0x000a,
-	// Block 0xff, offset 0x3fc0
-	0x3fc0: 0x000a, 0x3fc1: 0x000a, 0x3fc2: 0x000a, 0x3fc3: 0x000a, 0x3fc4: 0x000a, 0x3fc5: 0x000a,
-	0x3fc6: 0x000a, 0x3fc7: 0x000a, 0x3fc8: 0x000a, 0x3fc9: 0x000a, 0x3fca: 0x000a,
-	0x3ff0: 0x0002, 0x3ff1: 0x0002, 0x3ff2: 0x0002, 0x3ff3: 0x0002, 0x3ff4: 0x0002, 0x3ff5: 0x0002,
-	0x3ff6: 0x0002, 0x3ff7: 0x0002, 0x3ff8: 0x0002, 0x3ff9: 0x0002,
-	// Block 0x100, offset 0x4000
-	0x403e: 0x000b, 0x403f: 0x000b,
-	// Block 0x101, offset 0x4040
-	0x4040: 0x000b, 0x4041: 0x000b, 0x4042: 0x000b, 0x4043: 0x000b, 0x4044: 0x000b, 0x4045: 0x000b,
-	0x4046: 0x000b, 0x4047: 0x000b, 0x4048: 0x000b, 0x4049: 0x000b, 0x404a: 0x000b, 0x404b: 0x000b,
-	0x404c: 0x000b, 0x404d: 0x000b, 0x404e: 0x000b, 0x404f: 0x000b, 0x4050: 0x000b, 0x4051: 0x000b,
-	0x4052: 0x000b, 0x4053: 0x000b, 0x4054: 0x000b, 0x4055: 0x000b, 0x4056: 0x000b, 0x4057: 0x000b,
-	0x4058: 0x000b, 0x4059: 0x000b, 0x405a: 0x000b, 0x405b: 0x000b, 0x405c: 0x000b, 0x405d: 0x000b,
-	0x405e: 0x000b, 0x405f: 0x000b, 0x4060: 0x000b, 0x4061: 0x000b, 0x4062: 0x000b, 0x4063: 0x000b,
-	0x4064: 0x000b, 0x4065: 0x000b, 0x4066: 0x000b, 0x4067: 0x000b, 0x4068: 0x000b, 0x4069: 0x000b,
-	0x406a: 0x000b, 0x406b: 0x000b, 0x406c: 0x000b, 0x406d: 0x000b, 0x406e: 0x000b, 0x406f: 0x000b,
-	0x4070: 0x000b, 0x4071: 0x000b, 0x4072: 0x000b, 0x4073: 0x000b, 0x4074: 0x000b, 0x4075: 0x000b,
-	0x4076: 0x000b, 0x4077: 0x000b, 0x4078: 0x000b, 0x4079: 0x000b, 0x407a: 0x000b, 0x407b: 0x000b,
-	0x407c: 0x000b, 0x407d: 0x000b, 0x407e: 0x000b, 0x407f: 0x000b,
-	// Block 0x102, offset 0x4080
-	0x4080: 0x000c, 0x4081: 0x000c, 0x4082: 0x000c, 0x4083: 0x000c, 0x4084: 0x000c, 0x4085: 0x000c,
-	0x4086: 0x000c, 0x4087: 0x000c, 0x4088: 0x000c, 0x4089: 0x000c, 0x408a: 0x000c, 0x408b: 0x000c,
-	0x408c: 0x000c, 0x408d: 0x000c, 0x408e: 0x000c, 0x408f: 0x000c, 0x4090: 0x000c, 0x4091: 0x000c,
-	0x4092: 0x000c, 0x4093: 0x000c, 0x4094: 0x000c, 0x4095: 0x000c, 0x4096: 0x000c, 0x4097: 0x000c,
-	0x4098: 0x000c, 0x4099: 0x000c, 0x409a: 0x000c, 0x409b: 0x000c, 0x409c: 0x000c, 0x409d: 0x000c,
-	0x409e: 0x000c, 0x409f: 0x000c, 0x40a0: 0x000c, 0x40a1: 0x000c, 0x40a2: 0x000c, 0x40a3: 0x000c,
-	0x40a4: 0x000c, 0x40a5: 0x000c, 0x40a6: 0x000c, 0x40a7: 0x000c, 0x40a8: 0x000c, 0x40a9: 0x000c,
-	0x40aa: 0x000c, 0x40ab: 0x000c, 0x40ac: 0x000c, 0x40ad: 0x000c, 0x40ae: 0x000c, 0x40af: 0x000c,
-	0x40b0: 0x000b, 0x40b1: 0x000b, 0x40b2: 0x000b, 0x40b3: 0x000b, 0x40b4: 0x000b, 0x40b5: 0x000b,
-	0x40b6: 0x000b, 0x40b7: 0x000b, 0x40b8: 0x000b, 0x40b9: 0x000b, 0x40ba: 0x000b, 0x40bb: 0x000b,
-	0x40bc: 0x000b, 0x40bd: 0x000b, 0x40be: 0x000b, 0x40bf: 0x000b,
-}
-
-// bidiIndex: 26 blocks, 1664 entries, 3328 bytes
-// Block 0 is the zero block.
-var bidiIndex = [1664]uint16{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x02,
-	0xca: 0x03, 0xcb: 0x04, 0xcc: 0x05, 0xcd: 0x06, 0xce: 0x07, 0xcf: 0x08,
-	0xd2: 0x09, 0xd6: 0x0a, 0xd7: 0x0b,
-	0xd8: 0x0c, 0xd9: 0x0d, 0xda: 0x0e, 0xdb: 0x0f, 0xdc: 0x10, 0xdd: 0x11, 0xde: 0x12, 0xdf: 0x13,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06,
-	0xea: 0x07, 0xef: 0x08,
-	0xf0: 0x13, 0xf1: 0x14, 0xf2: 0x14, 0xf3: 0x16, 0xf4: 0x17,
-	// Block 0x4, offset 0x100
-	0x120: 0x14, 0x121: 0x15, 0x122: 0x16, 0x123: 0x17, 0x124: 0x18, 0x125: 0x19, 0x126: 0x1a, 0x127: 0x1b,
-	0x128: 0x1c, 0x129: 0x1d, 0x12a: 0x1c, 0x12b: 0x1e, 0x12c: 0x1f, 0x12d: 0x20, 0x12e: 0x21, 0x12f: 0x22,
-	0x130: 0x23, 0x131: 0x24, 0x132: 0x1a, 0x133: 0x25, 0x134: 0x26, 0x135: 0x27, 0x136: 0x28, 0x137: 0x29,
-	0x138: 0x2a, 0x139: 0x2b, 0x13a: 0x2c, 0x13b: 0x2d, 0x13c: 0x2e, 0x13d: 0x2f, 0x13e: 0x30, 0x13f: 0x31,
-	// Block 0x5, offset 0x140
-	0x140: 0x32, 0x141: 0x33, 0x142: 0x34,
-	0x14d: 0x35, 0x14e: 0x36,
-	0x150: 0x37,
-	0x15a: 0x38, 0x15c: 0x39, 0x15d: 0x3a, 0x15e: 0x3b, 0x15f: 0x3c,
-	0x160: 0x3d, 0x162: 0x3e, 0x164: 0x3f, 0x165: 0x40, 0x167: 0x41,
-	0x168: 0x42, 0x169: 0x43, 0x16a: 0x44, 0x16b: 0x45, 0x16c: 0x46, 0x16d: 0x47, 0x16e: 0x48, 0x16f: 0x49,
-	0x170: 0x4a, 0x173: 0x4b, 0x177: 0x05,
-	0x17e: 0x4c, 0x17f: 0x4d,
-	// Block 0x6, offset 0x180
-	0x180: 0x4e, 0x181: 0x4f, 0x182: 0x50, 0x183: 0x51, 0x184: 0x52, 0x185: 0x53, 0x186: 0x54, 0x187: 0x55,
-	0x188: 0x56, 0x189: 0x55, 0x18a: 0x55, 0x18b: 0x55, 0x18c: 0x57, 0x18d: 0x58, 0x18e: 0x59, 0x18f: 0x55,
-	0x190: 0x5a, 0x191: 0x5b, 0x192: 0x5c, 0x193: 0x5d, 0x194: 0x55, 0x195: 0x55, 0x196: 0x55, 0x197: 0x55,
-	0x198: 0x55, 0x199: 0x55, 0x19a: 0x5e, 0x19b: 0x55, 0x19c: 0x55, 0x19d: 0x5f, 0x19e: 0x55, 0x19f: 0x60,
-	0x1a4: 0x55, 0x1a5: 0x55, 0x1a6: 0x61, 0x1a7: 0x62,
-	0x1a8: 0x55, 0x1a9: 0x55, 0x1aa: 0x55, 0x1ab: 0x55, 0x1ac: 0x55, 0x1ad: 0x63, 0x1ae: 0x64, 0x1af: 0x55,
-	0x1b3: 0x65, 0x1b5: 0x66, 0x1b7: 0x67,
-	0x1b8: 0x68, 0x1b9: 0x69, 0x1ba: 0x6a, 0x1bb: 0x6b, 0x1bc: 0x55, 0x1bd: 0x55, 0x1be: 0x55, 0x1bf: 0x6c,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x6d, 0x1c2: 0x6e, 0x1c3: 0x6f, 0x1c7: 0x70,
-	0x1c8: 0x71, 0x1c9: 0x72, 0x1ca: 0x73, 0x1cb: 0x74, 0x1cd: 0x75, 0x1cf: 0x76,
-	// Block 0x8, offset 0x200
-	0x237: 0x55,
-	// Block 0x9, offset 0x240
-	0x252: 0x77, 0x253: 0x78,
-	0x258: 0x79, 0x259: 0x7a, 0x25a: 0x7b, 0x25b: 0x7c, 0x25c: 0x7d, 0x25e: 0x7e,
-	0x260: 0x7f, 0x261: 0x80, 0x263: 0x81, 0x264: 0x82, 0x265: 0x83, 0x266: 0x84, 0x267: 0x85,
-	0x268: 0x86, 0x269: 0x87, 0x26a: 0x88, 0x26b: 0x89, 0x26d: 0x8a, 0x26f: 0x8b,
-	// Block 0xa, offset 0x280
-	0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x0e, 0x2af: 0x0e,
-	0x2b0: 0x0e, 0x2b1: 0x0e, 0x2b2: 0x0e, 0x2b3: 0x0e, 0x2b4: 0x8e, 0x2b5: 0x8f, 0x2b6: 0x0e, 0x2b7: 0x90,
-	0x2b8: 0x91, 0x2b9: 0x92, 0x2ba: 0x0e, 0x2bb: 0x93, 0x2bc: 0x94, 0x2bd: 0x95, 0x2bf: 0x96,
-	// Block 0xb, offset 0x2c0
-	0x2c4: 0x97, 0x2c5: 0x55, 0x2c6: 0x98, 0x2c7: 0x99,
-	0x2cb: 0x9a, 0x2cd: 0x9b,
-	0x2e0: 0x9c, 0x2e1: 0x9c, 0x2e2: 0x9c, 0x2e3: 0x9c, 0x2e4: 0x9d, 0x2e5: 0x9c, 0x2e6: 0x9c, 0x2e7: 0x9c,
-	0x2e8: 0x9e, 0x2e9: 0x9c, 0x2ea: 0x9c, 0x2eb: 0x9f, 0x2ec: 0xa0, 0x2ed: 0x9c, 0x2ee: 0x9c, 0x2ef: 0x9c,
-	0x2f0: 0x9c, 0x2f1: 0x9c, 0x2f2: 0x9c, 0x2f3: 0x9c, 0x2f4: 0xa1, 0x2f5: 0x9c, 0x2f6: 0x9c, 0x2f7: 0x9c,
-	0x2f8: 0x9c, 0x2f9: 0xa2, 0x2fa: 0xa3, 0x2fb: 0xa4, 0x2fc: 0xa5, 0x2fd: 0xa6, 0x2fe: 0xa7, 0x2ff: 0x9c,
-	// Block 0xc, offset 0x300
-	0x300: 0xa8, 0x301: 0xa9, 0x302: 0xaa, 0x303: 0x21, 0x304: 0xab, 0x305: 0xac, 0x306: 0xad, 0x307: 0xae,
-	0x308: 0xaf, 0x309: 0x28, 0x30b: 0xb0, 0x30c: 0x26, 0x30d: 0xb1,
-	0x310: 0xb2, 0x311: 0xb3, 0x312: 0xb4, 0x313: 0xb5, 0x316: 0xb6, 0x317: 0xb7,
-	0x318: 0xb8, 0x319: 0xb9, 0x31a: 0xba, 0x31c: 0xbb,
-	0x320: 0xbc, 0x324: 0xbd, 0x325: 0xbe, 0x327: 0xbf,
-	0x328: 0xc0, 0x329: 0xc1, 0x32a: 0xc2,
-	0x330: 0xc3, 0x332: 0xc4, 0x334: 0xc5, 0x335: 0xc6, 0x336: 0xc7,
-	0x33b: 0xc8, 0x33c: 0xc9, 0x33d: 0xca, 0x33f: 0xcb,
-	// Block 0xd, offset 0x340
-	0x351: 0xcc,
-	// Block 0xe, offset 0x380
-	0x3ab: 0xcd, 0x3ac: 0xce,
-	0x3bd: 0xcf, 0x3be: 0xd0, 0x3bf: 0xd1,
-	// Block 0xf, offset 0x3c0
-	0x3f2: 0xd2,
-	// Block 0x10, offset 0x400
-	0x43c: 0xd3, 0x43d: 0xd4,
-	// Block 0x11, offset 0x440
-	0x445: 0xd5, 0x446: 0xd6, 0x447: 0xd7,
-	0x448: 0x55, 0x449: 0xd8, 0x44c: 0x55, 0x44d: 0xd9,
-	0x45b: 0xda, 0x45c: 0xdb, 0x45d: 0xdc, 0x45e: 0xdd, 0x45f: 0xde,
-	0x468: 0xdf, 0x469: 0xe0, 0x46a: 0xe1,
-	// Block 0x12, offset 0x480
-	0x480: 0xe2, 0x482: 0xcf, 0x484: 0xce,
-	0x48a: 0xe3, 0x48b: 0xe4,
-	0x493: 0xe5,
-	0x4a0: 0x9c, 0x4a1: 0x9c, 0x4a2: 0x9c, 0x4a3: 0xe6, 0x4a4: 0x9c, 0x4a5: 0xe7, 0x4a6: 0x9c, 0x4a7: 0x9c,
-	0x4a8: 0x9c, 0x4a9: 0x9c, 0x4aa: 0x9c, 0x4ab: 0x9c, 0x4ac: 0x9c, 0x4ad: 0x9c, 0x4ae: 0x9c, 0x4af: 0x9c,
-	0x4b0: 0x9c, 0x4b1: 0xe8, 0x4b2: 0xe9, 0x4b3: 0x9c, 0x4b4: 0xea, 0x4b5: 0x9c, 0x4b6: 0x9c, 0x4b7: 0x9c,
-	0x4b8: 0x0e, 0x4b9: 0x0e, 0x4ba: 0x0e, 0x4bb: 0xeb, 0x4bc: 0x9c, 0x4bd: 0x9c, 0x4be: 0x9c, 0x4bf: 0x9c,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0xec, 0x4c1: 0x55, 0x4c2: 0xed, 0x4c3: 0xee, 0x4c4: 0xef, 0x4c5: 0xf0, 0x4c6: 0xf1,
-	0x4c9: 0xf2, 0x4cc: 0x55, 0x4cd: 0x55, 0x4ce: 0x55, 0x4cf: 0x55,
-	0x4d0: 0x55, 0x4d1: 0x55, 0x4d2: 0x55, 0x4d3: 0x55, 0x4d4: 0x55, 0x4d5: 0x55, 0x4d6: 0x55, 0x4d7: 0x55,
-	0x4d8: 0x55, 0x4d9: 0x55, 0x4da: 0x55, 0x4db: 0xf3, 0x4dc: 0x55, 0x4dd: 0xf4, 0x4de: 0x55, 0x4df: 0xf5,
-	0x4e0: 0xf6, 0x4e1: 0xf7, 0x4e2: 0xf8, 0x4e4: 0x55, 0x4e5: 0x55, 0x4e6: 0x55, 0x4e7: 0x55,
-	0x4e8: 0x55, 0x4e9: 0xf9, 0x4ea: 0xfa, 0x4eb: 0xfb, 0x4ec: 0x55, 0x4ed: 0x55, 0x4ee: 0xfc, 0x4ef: 0xfd,
-	0x4ff: 0xfe,
-	// Block 0x14, offset 0x500
-	0x53f: 0xfe,
-	// Block 0x15, offset 0x540
-	0x550: 0x09, 0x551: 0x0a, 0x553: 0x0b, 0x556: 0x0c,
-	0x55b: 0x0d, 0x55c: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
-	0x56f: 0x12,
-	0x57f: 0x12,
-	// Block 0x16, offset 0x580
-	0x58f: 0x12,
-	0x59f: 0x12,
-	0x5af: 0x12,
-	0x5bf: 0x12,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0xff, 0x5c1: 0xff, 0x5c2: 0xff, 0x5c3: 0xff, 0x5c4: 0x05, 0x5c5: 0x05, 0x5c6: 0x05, 0x5c7: 0x100,
-	0x5c8: 0xff, 0x5c9: 0xff, 0x5ca: 0xff, 0x5cb: 0xff, 0x5cc: 0xff, 0x5cd: 0xff, 0x5ce: 0xff, 0x5cf: 0xff,
-	0x5d0: 0xff, 0x5d1: 0xff, 0x5d2: 0xff, 0x5d3: 0xff, 0x5d4: 0xff, 0x5d5: 0xff, 0x5d6: 0xff, 0x5d7: 0xff,
-	0x5d8: 0xff, 0x5d9: 0xff, 0x5da: 0xff, 0x5db: 0xff, 0x5dc: 0xff, 0x5dd: 0xff, 0x5de: 0xff, 0x5df: 0xff,
-	0x5e0: 0xff, 0x5e1: 0xff, 0x5e2: 0xff, 0x5e3: 0xff, 0x5e4: 0xff, 0x5e5: 0xff, 0x5e6: 0xff, 0x5e7: 0xff,
-	0x5e8: 0xff, 0x5e9: 0xff, 0x5ea: 0xff, 0x5eb: 0xff, 0x5ec: 0xff, 0x5ed: 0xff, 0x5ee: 0xff, 0x5ef: 0xff,
-	0x5f0: 0xff, 0x5f1: 0xff, 0x5f2: 0xff, 0x5f3: 0xff, 0x5f4: 0xff, 0x5f5: 0xff, 0x5f6: 0xff, 0x5f7: 0xff,
-	0x5f8: 0xff, 0x5f9: 0xff, 0x5fa: 0xff, 0x5fb: 0xff, 0x5fc: 0xff, 0x5fd: 0xff, 0x5fe: 0xff, 0x5ff: 0xff,
-	// Block 0x18, offset 0x600
-	0x60f: 0x12,
-	0x61f: 0x12,
-	0x620: 0x15,
-	0x62f: 0x12,
-	0x63f: 0x12,
-	// Block 0x19, offset 0x640
-	0x64f: 0x12,
-}
-
-// Total table size 19960 bytes (19KiB); checksum: F50EF68C
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables9.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables9.0.0.go
index c164d37..f517fdb 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables9.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables9.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build !go1.10
+// +build !go1.10
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/trieval.go b/vendor/golang.org/x/text/unicode/bidi/trieval.go
index 6a796e2..4c459c4 100644
--- a/vendor/golang.org/x/text/unicode/bidi/trieval.go
+++ b/vendor/golang.org/x/text/unicode/bidi/trieval.go
@@ -37,6 +37,18 @@ const (
 	unknownClass = ^Class(0)
 )
 
+var controlToClass = map[rune]Class{
+	0x202D: LRO, // LeftToRightOverride,
+	0x202E: RLO, // RightToLeftOverride,
+	0x202A: LRE, // LeftToRightEmbedding,
+	0x202B: RLE, // RightToLeftEmbedding,
+	0x202C: PDF, // PopDirectionalFormat,
+	0x2066: LRI, // LeftToRightIsolate,
+	0x2067: RLI, // RightToLeftIsolate,
+	0x2068: FSI, // FirstStrongIsolate,
+	0x2069: PDI, // PopDirectionalIsolate,
+}
+
 // A trie entry has the following bits:
 // 7..5  XOR mask for brackets
 // 4     1: Bracket open, 0: Bracket close
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index 487335d..526c703 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -13,7 +13,7 @@ import "encoding/binary"
 // a rune to a uint16. The values take two forms.  For v >= 0x8000:
 //   bits
 //   15:    1 (inverse of NFD_QC bit of qcInfo)
-//   13..7: qcInfo (see below). isYesD is always true (no decomposition).
+//   13..7: qcInfo (see below). isYesD is always true (no decompostion).
 //    6..0: ccc (compressed CCC value).
 // For v < 0x8000, the respective rune has a decomposition and v is an index
 // into a byte array of UTF-8 decomposition sequences and additional info and
@@ -110,11 +110,10 @@ func (p Properties) BoundaryAfter() bool {
 }
 
 // We pack quick check data in 4 bits:
-//
-//	5:    Combines forward  (0 == false, 1 == true)
-//	4..3: NFC_QC Yes(00), No (10), or Maybe (11)
-//	2:    NFD_QC Yes (0) or No (1). No also means there is a decomposition.
-//	1..0: Number of trailing non-starters.
+//   5:    Combines forward  (0 == false, 1 == true)
+//   4..3: NFC_QC Yes(00), No (10), or Maybe (11)
+//   2:    NFD_QC Yes (0) or No (1). No also means there is a decomposition.
+//   1..0: Number of trailing non-starters.
 //
 // When all 4 bits are zero, the character is inert, meaning it is never
 // influenced by normalization.
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
index 4747ad0..95efcf2 100644
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -18,17 +18,16 @@ import (
 // A Form denotes a canonical representation of Unicode code points.
 // The Unicode-defined normalization and equivalence forms are:
 //
-//	NFC   Unicode Normalization Form C
-//	NFD   Unicode Normalization Form D
-//	NFKC  Unicode Normalization Form KC
-//	NFKD  Unicode Normalization Form KD
+//   NFC   Unicode Normalization Form C
+//   NFD   Unicode Normalization Form D
+//   NFKC  Unicode Normalization Form KC
+//   NFKD  Unicode Normalization Form KD
 //
 // For a Form f, this documentation uses the notation f(x) to mean
 // the bytes or string x converted to the given form.
 // A position n in x is called a boundary if conversion to the form can
 // proceed independently on both sides:
-//
-//	f(x) == append(f(x[0:n]), f(x[n:])...)
+//   f(x) == append(f(x[0:n]), f(x[n:])...)
 //
 // References: https://unicode.org/reports/tr15/ and
 // https://unicode.org/notes/tn5/.
diff --git a/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
index 1af161c..f5a0788 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.10 && !go1.13
+// +build go1.10,!go1.13
 
 package norm
 
diff --git a/vendor/golang.org/x/text/unicode/norm/tables11.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables11.0.0.go
index eb73ecc..cb7239c 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables11.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables11.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.13 && !go1.14
+// +build go1.13,!go1.14
 
 package norm
 
diff --git a/vendor/golang.org/x/text/unicode/norm/tables12.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables12.0.0.go
index 276cb8d..11b2733 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables12.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables12.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.14 && !go1.16
+// +build go1.14,!go1.16
 
 package norm
 
diff --git a/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
index 0cceffd..96a130d 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16 && !go1.21
+//go:build go1.16
+// +build go1.16
 
 package norm
 
@@ -7314,7 +7315,7 @@ const recompMapPacked = "" +
 	"\x00V\x03\x03\x00\x00\x1e|" + // 0x00560303: 0x00001E7C
 	"\x00v\x03\x03\x00\x00\x1e}" + // 0x00760303: 0x00001E7D
 	"\x00V\x03#\x00\x00\x1e~" + // 0x00560323: 0x00001E7E
-	"\x00v\x03#\x00\x00\x1e\x7f" + // 0x00760323: 0x00001E7F
+	"\x00v\x03#\x00\x00\x1e\u007f" + // 0x00760323: 0x00001E7F
 	"\x00W\x03\x00\x00\x00\x1e\x80" + // 0x00570300: 0x00001E80
 	"\x00w\x03\x00\x00\x00\x1e\x81" + // 0x00770300: 0x00001E81
 	"\x00W\x03\x01\x00\x00\x1e\x82" + // 0x00570301: 0x00001E82
@@ -7341,7 +7342,7 @@ const recompMapPacked = "" +
 	"\x00t\x03\b\x00\x00\x1e\x97" + // 0x00740308: 0x00001E97
 	"\x00w\x03\n\x00\x00\x1e\x98" + // 0x0077030A: 0x00001E98
 	"\x00y\x03\n\x00\x00\x1e\x99" + // 0x0079030A: 0x00001E99
-	"\x01\x7f\x03\a\x00\x00\x1e\x9b" + // 0x017F0307: 0x00001E9B
+	"\x01\u007f\x03\a\x00\x00\x1e\x9b" + // 0x017F0307: 0x00001E9B
 	"\x00A\x03#\x00\x00\x1e\xa0" + // 0x00410323: 0x00001EA0
 	"\x00a\x03#\x00\x00\x1e\xa1" + // 0x00610323: 0x00001EA1
 	"\x00A\x03\t\x00\x00\x1e\xa2" + // 0x00410309: 0x00001EA2
diff --git a/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go
deleted file mode 100644
index b0819e4..0000000
--- a/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go
+++ /dev/null
@@ -1,7907 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-//go:build go1.21
-
-package norm
-
-import "sync"
-
-const (
-	// Version is the Unicode edition from which the tables are derived.
-	Version = "15.0.0"
-
-	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
-	// may need to write atomically for any Form. Making a destination buffer at
-	// least this size ensures that Transform can always make progress and that
-	// the user does not need to grow the buffer on an ErrShortDst.
-	MaxTransformChunkSize = 35 + maxNonStarters*4
-)
-
-var ccc = [56]uint8{
-	0, 1, 6, 7, 8, 9, 10, 11,
-	12, 13, 14, 15, 16, 17, 18, 19,
-	20, 21, 22, 23, 24, 25, 26, 27,
-	28, 29, 30, 31, 32, 33, 34, 35,
-	36, 84, 91, 103, 107, 118, 122, 129,
-	130, 132, 202, 214, 216, 218, 220, 222,
-	224, 226, 228, 230, 232, 233, 234, 240,
-}
-
-const (
-	firstMulti            = 0x199A
-	firstCCC              = 0x2DD5
-	endMulti              = 0x30A1
-	firstLeadingCCC       = 0x4AEF
-	firstCCCZeroExcept    = 0x4BB9
-	firstStarterWithNLead = 0x4BE0
-	lastDecomp            = 0x4BE2
-	maxDecomp             = 0x8000
-)
-
-// decomps: 19426 bytes
-var decomps = [...]byte{
-	// Bytes 0 - 3f
-	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
-	0x23, 0x41, 0x24, 0x41, 0x25, 0x41, 0x26, 0x41,
-	0x27, 0x41, 0x28, 0x41, 0x29, 0x41, 0x2A, 0x41,
-	0x2B, 0x41, 0x2C, 0x41, 0x2D, 0x41, 0x2E, 0x41,
-	0x2F, 0x41, 0x30, 0x41, 0x31, 0x41, 0x32, 0x41,
-	0x33, 0x41, 0x34, 0x41, 0x35, 0x41, 0x36, 0x41,
-	0x37, 0x41, 0x38, 0x41, 0x39, 0x41, 0x3A, 0x41,
-	0x3B, 0x41, 0x3C, 0x41, 0x3D, 0x41, 0x3E, 0x41,
-	// Bytes 40 - 7f
-	0x3F, 0x41, 0x40, 0x41, 0x41, 0x41, 0x42, 0x41,
-	0x43, 0x41, 0x44, 0x41, 0x45, 0x41, 0x46, 0x41,
-	0x47, 0x41, 0x48, 0x41, 0x49, 0x41, 0x4A, 0x41,
-	0x4B, 0x41, 0x4C, 0x41, 0x4D, 0x41, 0x4E, 0x41,
-	0x4F, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41,
-	0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41,
-	0x57, 0x41, 0x58, 0x41, 0x59, 0x41, 0x5A, 0x41,
-	0x5B, 0x41, 0x5C, 0x41, 0x5D, 0x41, 0x5E, 0x41,
-	// Bytes 80 - bf
-	0x5F, 0x41, 0x60, 0x41, 0x61, 0x41, 0x62, 0x41,
-	0x63, 0x41, 0x64, 0x41, 0x65, 0x41, 0x66, 0x41,
-	0x67, 0x41, 0x68, 0x41, 0x69, 0x41, 0x6A, 0x41,
-	0x6B, 0x41, 0x6C, 0x41, 0x6D, 0x41, 0x6E, 0x41,
-	0x6F, 0x41, 0x70, 0x41, 0x71, 0x41, 0x72, 0x41,
-	0x73, 0x41, 0x74, 0x41, 0x75, 0x41, 0x76, 0x41,
-	0x77, 0x41, 0x78, 0x41, 0x79, 0x41, 0x7A, 0x41,
-	0x7B, 0x41, 0x7C, 0x41, 0x7D, 0x41, 0x7E, 0x42,
-	// Bytes c0 - ff
-	0xC2, 0xA2, 0x42, 0xC2, 0xA3, 0x42, 0xC2, 0xA5,
-	0x42, 0xC2, 0xA6, 0x42, 0xC2, 0xAC, 0x42, 0xC2,
-	0xB7, 0x42, 0xC3, 0x86, 0x42, 0xC3, 0xA6, 0x42,
-	0xC3, 0xB0, 0x42, 0xC3, 0xB8, 0x42, 0xC4, 0xA6,
-	0x42, 0xC4, 0xA7, 0x42, 0xC4, 0xB1, 0x42, 0xC5,
-	0x8B, 0x42, 0xC5, 0x93, 0x42, 0xC6, 0x8E, 0x42,
-	0xC6, 0x90, 0x42, 0xC6, 0xAB, 0x42, 0xC7, 0x80,
-	0x42, 0xC7, 0x81, 0x42, 0xC7, 0x82, 0x42, 0xC8,
-	// Bytes 100 - 13f
-	0xA2, 0x42, 0xC8, 0xB7, 0x42, 0xC9, 0x90, 0x42,
-	0xC9, 0x91, 0x42, 0xC9, 0x92, 0x42, 0xC9, 0x93,
-	0x42, 0xC9, 0x94, 0x42, 0xC9, 0x95, 0x42, 0xC9,
-	0x96, 0x42, 0xC9, 0x97, 0x42, 0xC9, 0x98, 0x42,
-	0xC9, 0x99, 0x42, 0xC9, 0x9B, 0x42, 0xC9, 0x9C,
-	0x42, 0xC9, 0x9E, 0x42, 0xC9, 0x9F, 0x42, 0xC9,
-	0xA0, 0x42, 0xC9, 0xA1, 0x42, 0xC9, 0xA2, 0x42,
-	0xC9, 0xA3, 0x42, 0xC9, 0xA4, 0x42, 0xC9, 0xA5,
-	// Bytes 140 - 17f
-	0x42, 0xC9, 0xA6, 0x42, 0xC9, 0xA7, 0x42, 0xC9,
-	0xA8, 0x42, 0xC9, 0xA9, 0x42, 0xC9, 0xAA, 0x42,
-	0xC9, 0xAB, 0x42, 0xC9, 0xAC, 0x42, 0xC9, 0xAD,
-	0x42, 0xC9, 0xAE, 0x42, 0xC9, 0xAF, 0x42, 0xC9,
-	0xB0, 0x42, 0xC9, 0xB1, 0x42, 0xC9, 0xB2, 0x42,
-	0xC9, 0xB3, 0x42, 0xC9, 0xB4, 0x42, 0xC9, 0xB5,
-	0x42, 0xC9, 0xB6, 0x42, 0xC9, 0xB7, 0x42, 0xC9,
-	0xB8, 0x42, 0xC9, 0xB9, 0x42, 0xC9, 0xBA, 0x42,
-	// Bytes 180 - 1bf
-	0xC9, 0xBB, 0x42, 0xC9, 0xBD, 0x42, 0xC9, 0xBE,
-	0x42, 0xCA, 0x80, 0x42, 0xCA, 0x81, 0x42, 0xCA,
-	0x82, 0x42, 0xCA, 0x83, 0x42, 0xCA, 0x84, 0x42,
-	0xCA, 0x88, 0x42, 0xCA, 0x89, 0x42, 0xCA, 0x8A,
-	0x42, 0xCA, 0x8B, 0x42, 0xCA, 0x8C, 0x42, 0xCA,
-	0x8D, 0x42, 0xCA, 0x8E, 0x42, 0xCA, 0x8F, 0x42,
-	0xCA, 0x90, 0x42, 0xCA, 0x91, 0x42, 0xCA, 0x92,
-	0x42, 0xCA, 0x95, 0x42, 0xCA, 0x98, 0x42, 0xCA,
-	// Bytes 1c0 - 1ff
-	0x99, 0x42, 0xCA, 0x9B, 0x42, 0xCA, 0x9C, 0x42,
-	0xCA, 0x9D, 0x42, 0xCA, 0x9F, 0x42, 0xCA, 0xA1,
-	0x42, 0xCA, 0xA2, 0x42, 0xCA, 0xA3, 0x42, 0xCA,
-	0xA4, 0x42, 0xCA, 0xA5, 0x42, 0xCA, 0xA6, 0x42,
-	0xCA, 0xA7, 0x42, 0xCA, 0xA8, 0x42, 0xCA, 0xA9,
-	0x42, 0xCA, 0xAA, 0x42, 0xCA, 0xAB, 0x42, 0xCA,
-	0xB9, 0x42, 0xCB, 0x90, 0x42, 0xCB, 0x91, 0x42,
-	0xCE, 0x91, 0x42, 0xCE, 0x92, 0x42, 0xCE, 0x93,
-	// Bytes 200 - 23f
-	0x42, 0xCE, 0x94, 0x42, 0xCE, 0x95, 0x42, 0xCE,
-	0x96, 0x42, 0xCE, 0x97, 0x42, 0xCE, 0x98, 0x42,
-	0xCE, 0x99, 0x42, 0xCE, 0x9A, 0x42, 0xCE, 0x9B,
-	0x42, 0xCE, 0x9C, 0x42, 0xCE, 0x9D, 0x42, 0xCE,
-	0x9E, 0x42, 0xCE, 0x9F, 0x42, 0xCE, 0xA0, 0x42,
-	0xCE, 0xA1, 0x42, 0xCE, 0xA3, 0x42, 0xCE, 0xA4,
-	0x42, 0xCE, 0xA5, 0x42, 0xCE, 0xA6, 0x42, 0xCE,
-	0xA7, 0x42, 0xCE, 0xA8, 0x42, 0xCE, 0xA9, 0x42,
-	// Bytes 240 - 27f
-	0xCE, 0xB1, 0x42, 0xCE, 0xB2, 0x42, 0xCE, 0xB3,
-	0x42, 0xCE, 0xB4, 0x42, 0xCE, 0xB5, 0x42, 0xCE,
-	0xB6, 0x42, 0xCE, 0xB7, 0x42, 0xCE, 0xB8, 0x42,
-	0xCE, 0xB9, 0x42, 0xCE, 0xBA, 0x42, 0xCE, 0xBB,
-	0x42, 0xCE, 0xBC, 0x42, 0xCE, 0xBD, 0x42, 0xCE,
-	0xBE, 0x42, 0xCE, 0xBF, 0x42, 0xCF, 0x80, 0x42,
-	0xCF, 0x81, 0x42, 0xCF, 0x82, 0x42, 0xCF, 0x83,
-	0x42, 0xCF, 0x84, 0x42, 0xCF, 0x85, 0x42, 0xCF,
-	// Bytes 280 - 2bf
-	0x86, 0x42, 0xCF, 0x87, 0x42, 0xCF, 0x88, 0x42,
-	0xCF, 0x89, 0x42, 0xCF, 0x9C, 0x42, 0xCF, 0x9D,
-	0x42, 0xD0, 0xB0, 0x42, 0xD0, 0xB1, 0x42, 0xD0,
-	0xB2, 0x42, 0xD0, 0xB3, 0x42, 0xD0, 0xB4, 0x42,
-	0xD0, 0xB5, 0x42, 0xD0, 0xB6, 0x42, 0xD0, 0xB7,
-	0x42, 0xD0, 0xB8, 0x42, 0xD0, 0xBA, 0x42, 0xD0,
-	0xBB, 0x42, 0xD0, 0xBC, 0x42, 0xD0, 0xBD, 0x42,
-	0xD0, 0xBE, 0x42, 0xD0, 0xBF, 0x42, 0xD1, 0x80,
-	// Bytes 2c0 - 2ff
-	0x42, 0xD1, 0x81, 0x42, 0xD1, 0x82, 0x42, 0xD1,
-	0x83, 0x42, 0xD1, 0x84, 0x42, 0xD1, 0x85, 0x42,
-	0xD1, 0x86, 0x42, 0xD1, 0x87, 0x42, 0xD1, 0x88,
-	0x42, 0xD1, 0x8A, 0x42, 0xD1, 0x8B, 0x42, 0xD1,
-	0x8C, 0x42, 0xD1, 0x8D, 0x42, 0xD1, 0x8E, 0x42,
-	0xD1, 0x95, 0x42, 0xD1, 0x96, 0x42, 0xD1, 0x98,
-	0x42, 0xD1, 0x9F, 0x42, 0xD2, 0x91, 0x42, 0xD2,
-	0xAB, 0x42, 0xD2, 0xAF, 0x42, 0xD2, 0xB1, 0x42,
-	// Bytes 300 - 33f
-	0xD3, 0x8F, 0x42, 0xD3, 0x99, 0x42, 0xD3, 0xA9,
-	0x42, 0xD7, 0x90, 0x42, 0xD7, 0x91, 0x42, 0xD7,
-	0x92, 0x42, 0xD7, 0x93, 0x42, 0xD7, 0x94, 0x42,
-	0xD7, 0x9B, 0x42, 0xD7, 0x9C, 0x42, 0xD7, 0x9D,
-	0x42, 0xD7, 0xA2, 0x42, 0xD7, 0xA8, 0x42, 0xD7,
-	0xAA, 0x42, 0xD8, 0xA1, 0x42, 0xD8, 0xA7, 0x42,
-	0xD8, 0xA8, 0x42, 0xD8, 0xA9, 0x42, 0xD8, 0xAA,
-	0x42, 0xD8, 0xAB, 0x42, 0xD8, 0xAC, 0x42, 0xD8,
-	// Bytes 340 - 37f
-	0xAD, 0x42, 0xD8, 0xAE, 0x42, 0xD8, 0xAF, 0x42,
-	0xD8, 0xB0, 0x42, 0xD8, 0xB1, 0x42, 0xD8, 0xB2,
-	0x42, 0xD8, 0xB3, 0x42, 0xD8, 0xB4, 0x42, 0xD8,
-	0xB5, 0x42, 0xD8, 0xB6, 0x42, 0xD8, 0xB7, 0x42,
-	0xD8, 0xB8, 0x42, 0xD8, 0xB9, 0x42, 0xD8, 0xBA,
-	0x42, 0xD9, 0x81, 0x42, 0xD9, 0x82, 0x42, 0xD9,
-	0x83, 0x42, 0xD9, 0x84, 0x42, 0xD9, 0x85, 0x42,
-	0xD9, 0x86, 0x42, 0xD9, 0x87, 0x42, 0xD9, 0x88,
-	// Bytes 380 - 3bf
-	0x42, 0xD9, 0x89, 0x42, 0xD9, 0x8A, 0x42, 0xD9,
-	0xAE, 0x42, 0xD9, 0xAF, 0x42, 0xD9, 0xB1, 0x42,
-	0xD9, 0xB9, 0x42, 0xD9, 0xBA, 0x42, 0xD9, 0xBB,
-	0x42, 0xD9, 0xBE, 0x42, 0xD9, 0xBF, 0x42, 0xDA,
-	0x80, 0x42, 0xDA, 0x83, 0x42, 0xDA, 0x84, 0x42,
-	0xDA, 0x86, 0x42, 0xDA, 0x87, 0x42, 0xDA, 0x88,
-	0x42, 0xDA, 0x8C, 0x42, 0xDA, 0x8D, 0x42, 0xDA,
-	0x8E, 0x42, 0xDA, 0x91, 0x42, 0xDA, 0x98, 0x42,
-	// Bytes 3c0 - 3ff
-	0xDA, 0xA1, 0x42, 0xDA, 0xA4, 0x42, 0xDA, 0xA6,
-	0x42, 0xDA, 0xA9, 0x42, 0xDA, 0xAD, 0x42, 0xDA,
-	0xAF, 0x42, 0xDA, 0xB1, 0x42, 0xDA, 0xB3, 0x42,
-	0xDA, 0xBA, 0x42, 0xDA, 0xBB, 0x42, 0xDA, 0xBE,
-	0x42, 0xDB, 0x81, 0x42, 0xDB, 0x85, 0x42, 0xDB,
-	0x86, 0x42, 0xDB, 0x87, 0x42, 0xDB, 0x88, 0x42,
-	0xDB, 0x89, 0x42, 0xDB, 0x8B, 0x42, 0xDB, 0x8C,
-	0x42, 0xDB, 0x90, 0x42, 0xDB, 0x92, 0x43, 0xE0,
-	// Bytes 400 - 43f
-	0xBC, 0x8B, 0x43, 0xE1, 0x83, 0x9C, 0x43, 0xE1,
-	0x84, 0x80, 0x43, 0xE1, 0x84, 0x81, 0x43, 0xE1,
-	0x84, 0x82, 0x43, 0xE1, 0x84, 0x83, 0x43, 0xE1,
-	0x84, 0x84, 0x43, 0xE1, 0x84, 0x85, 0x43, 0xE1,
-	0x84, 0x86, 0x43, 0xE1, 0x84, 0x87, 0x43, 0xE1,
-	0x84, 0x88, 0x43, 0xE1, 0x84, 0x89, 0x43, 0xE1,
-	0x84, 0x8A, 0x43, 0xE1, 0x84, 0x8B, 0x43, 0xE1,
-	0x84, 0x8C, 0x43, 0xE1, 0x84, 0x8D, 0x43, 0xE1,
-	// Bytes 440 - 47f
-	0x84, 0x8E, 0x43, 0xE1, 0x84, 0x8F, 0x43, 0xE1,
-	0x84, 0x90, 0x43, 0xE1, 0x84, 0x91, 0x43, 0xE1,
-	0x84, 0x92, 0x43, 0xE1, 0x84, 0x94, 0x43, 0xE1,
-	0x84, 0x95, 0x43, 0xE1, 0x84, 0x9A, 0x43, 0xE1,
-	0x84, 0x9C, 0x43, 0xE1, 0x84, 0x9D, 0x43, 0xE1,
-	0x84, 0x9E, 0x43, 0xE1, 0x84, 0xA0, 0x43, 0xE1,
-	0x84, 0xA1, 0x43, 0xE1, 0x84, 0xA2, 0x43, 0xE1,
-	0x84, 0xA3, 0x43, 0xE1, 0x84, 0xA7, 0x43, 0xE1,
-	// Bytes 480 - 4bf
-	0x84, 0xA9, 0x43, 0xE1, 0x84, 0xAB, 0x43, 0xE1,
-	0x84, 0xAC, 0x43, 0xE1, 0x84, 0xAD, 0x43, 0xE1,
-	0x84, 0xAE, 0x43, 0xE1, 0x84, 0xAF, 0x43, 0xE1,
-	0x84, 0xB2, 0x43, 0xE1, 0x84, 0xB6, 0x43, 0xE1,
-	0x85, 0x80, 0x43, 0xE1, 0x85, 0x87, 0x43, 0xE1,
-	0x85, 0x8C, 0x43, 0xE1, 0x85, 0x97, 0x43, 0xE1,
-	0x85, 0x98, 0x43, 0xE1, 0x85, 0x99, 0x43, 0xE1,
-	0x85, 0xA0, 0x43, 0xE1, 0x86, 0x84, 0x43, 0xE1,
-	// Bytes 4c0 - 4ff
-	0x86, 0x85, 0x43, 0xE1, 0x86, 0x88, 0x43, 0xE1,
-	0x86, 0x91, 0x43, 0xE1, 0x86, 0x92, 0x43, 0xE1,
-	0x86, 0x94, 0x43, 0xE1, 0x86, 0x9E, 0x43, 0xE1,
-	0x86, 0xA1, 0x43, 0xE1, 0x87, 0x87, 0x43, 0xE1,
-	0x87, 0x88, 0x43, 0xE1, 0x87, 0x8C, 0x43, 0xE1,
-	0x87, 0x8E, 0x43, 0xE1, 0x87, 0x93, 0x43, 0xE1,
-	0x87, 0x97, 0x43, 0xE1, 0x87, 0x99, 0x43, 0xE1,
-	0x87, 0x9D, 0x43, 0xE1, 0x87, 0x9F, 0x43, 0xE1,
-	// Bytes 500 - 53f
-	0x87, 0xB1, 0x43, 0xE1, 0x87, 0xB2, 0x43, 0xE1,
-	0xB4, 0x82, 0x43, 0xE1, 0xB4, 0x96, 0x43, 0xE1,
-	0xB4, 0x97, 0x43, 0xE1, 0xB4, 0x9C, 0x43, 0xE1,
-	0xB4, 0x9D, 0x43, 0xE1, 0xB4, 0xA5, 0x43, 0xE1,
-	0xB5, 0xBB, 0x43, 0xE1, 0xB6, 0x85, 0x43, 0xE1,
-	0xB6, 0x91, 0x43, 0xE2, 0x80, 0x82, 0x43, 0xE2,
-	0x80, 0x83, 0x43, 0xE2, 0x80, 0x90, 0x43, 0xE2,
-	0x80, 0x93, 0x43, 0xE2, 0x80, 0x94, 0x43, 0xE2,
-	// Bytes 540 - 57f
-	0x82, 0xA9, 0x43, 0xE2, 0x86, 0x90, 0x43, 0xE2,
-	0x86, 0x91, 0x43, 0xE2, 0x86, 0x92, 0x43, 0xE2,
-	0x86, 0x93, 0x43, 0xE2, 0x88, 0x82, 0x43, 0xE2,
-	0x88, 0x87, 0x43, 0xE2, 0x88, 0x91, 0x43, 0xE2,
-	0x88, 0x92, 0x43, 0xE2, 0x94, 0x82, 0x43, 0xE2,
-	0x96, 0xA0, 0x43, 0xE2, 0x97, 0x8B, 0x43, 0xE2,
-	0xA6, 0x85, 0x43, 0xE2, 0xA6, 0x86, 0x43, 0xE2,
-	0xB1, 0xB1, 0x43, 0xE2, 0xB5, 0xA1, 0x43, 0xE3,
-	// Bytes 580 - 5bf
-	0x80, 0x81, 0x43, 0xE3, 0x80, 0x82, 0x43, 0xE3,
-	0x80, 0x88, 0x43, 0xE3, 0x80, 0x89, 0x43, 0xE3,
-	0x80, 0x8A, 0x43, 0xE3, 0x80, 0x8B, 0x43, 0xE3,
-	0x80, 0x8C, 0x43, 0xE3, 0x80, 0x8D, 0x43, 0xE3,
-	0x80, 0x8E, 0x43, 0xE3, 0x80, 0x8F, 0x43, 0xE3,
-	0x80, 0x90, 0x43, 0xE3, 0x80, 0x91, 0x43, 0xE3,
-	0x80, 0x92, 0x43, 0xE3, 0x80, 0x94, 0x43, 0xE3,
-	0x80, 0x95, 0x43, 0xE3, 0x80, 0x96, 0x43, 0xE3,
-	// Bytes 5c0 - 5ff
-	0x80, 0x97, 0x43, 0xE3, 0x82, 0xA1, 0x43, 0xE3,
-	0x82, 0xA2, 0x43, 0xE3, 0x82, 0xA3, 0x43, 0xE3,
-	0x82, 0xA4, 0x43, 0xE3, 0x82, 0xA5, 0x43, 0xE3,
-	0x82, 0xA6, 0x43, 0xE3, 0x82, 0xA7, 0x43, 0xE3,
-	0x82, 0xA8, 0x43, 0xE3, 0x82, 0xA9, 0x43, 0xE3,
-	0x82, 0xAA, 0x43, 0xE3, 0x82, 0xAB, 0x43, 0xE3,
-	0x82, 0xAD, 0x43, 0xE3, 0x82, 0xAF, 0x43, 0xE3,
-	0x82, 0xB1, 0x43, 0xE3, 0x82, 0xB3, 0x43, 0xE3,
-	// Bytes 600 - 63f
-	0x82, 0xB5, 0x43, 0xE3, 0x82, 0xB7, 0x43, 0xE3,
-	0x82, 0xB9, 0x43, 0xE3, 0x82, 0xBB, 0x43, 0xE3,
-	0x82, 0xBD, 0x43, 0xE3, 0x82, 0xBF, 0x43, 0xE3,
-	0x83, 0x81, 0x43, 0xE3, 0x83, 0x83, 0x43, 0xE3,
-	0x83, 0x84, 0x43, 0xE3, 0x83, 0x86, 0x43, 0xE3,
-	0x83, 0x88, 0x43, 0xE3, 0x83, 0x8A, 0x43, 0xE3,
-	0x83, 0x8B, 0x43, 0xE3, 0x83, 0x8C, 0x43, 0xE3,
-	0x83, 0x8D, 0x43, 0xE3, 0x83, 0x8E, 0x43, 0xE3,
-	// Bytes 640 - 67f
-	0x83, 0x8F, 0x43, 0xE3, 0x83, 0x92, 0x43, 0xE3,
-	0x83, 0x95, 0x43, 0xE3, 0x83, 0x98, 0x43, 0xE3,
-	0x83, 0x9B, 0x43, 0xE3, 0x83, 0x9E, 0x43, 0xE3,
-	0x83, 0x9F, 0x43, 0xE3, 0x83, 0xA0, 0x43, 0xE3,
-	0x83, 0xA1, 0x43, 0xE3, 0x83, 0xA2, 0x43, 0xE3,
-	0x83, 0xA3, 0x43, 0xE3, 0x83, 0xA4, 0x43, 0xE3,
-	0x83, 0xA5, 0x43, 0xE3, 0x83, 0xA6, 0x43, 0xE3,
-	0x83, 0xA7, 0x43, 0xE3, 0x83, 0xA8, 0x43, 0xE3,
-	// Bytes 680 - 6bf
-	0x83, 0xA9, 0x43, 0xE3, 0x83, 0xAA, 0x43, 0xE3,
-	0x83, 0xAB, 0x43, 0xE3, 0x83, 0xAC, 0x43, 0xE3,
-	0x83, 0xAD, 0x43, 0xE3, 0x83, 0xAF, 0x43, 0xE3,
-	0x83, 0xB0, 0x43, 0xE3, 0x83, 0xB1, 0x43, 0xE3,
-	0x83, 0xB2, 0x43, 0xE3, 0x83, 0xB3, 0x43, 0xE3,
-	0x83, 0xBB, 0x43, 0xE3, 0x83, 0xBC, 0x43, 0xE3,
-	0x92, 0x9E, 0x43, 0xE3, 0x92, 0xB9, 0x43, 0xE3,
-	0x92, 0xBB, 0x43, 0xE3, 0x93, 0x9F, 0x43, 0xE3,
-	// Bytes 6c0 - 6ff
-	0x94, 0x95, 0x43, 0xE3, 0x9B, 0xAE, 0x43, 0xE3,
-	0x9B, 0xBC, 0x43, 0xE3, 0x9E, 0x81, 0x43, 0xE3,
-	0xA0, 0xAF, 0x43, 0xE3, 0xA1, 0xA2, 0x43, 0xE3,
-	0xA1, 0xBC, 0x43, 0xE3, 0xA3, 0x87, 0x43, 0xE3,
-	0xA3, 0xA3, 0x43, 0xE3, 0xA4, 0x9C, 0x43, 0xE3,
-	0xA4, 0xBA, 0x43, 0xE3, 0xA8, 0xAE, 0x43, 0xE3,
-	0xA9, 0xAC, 0x43, 0xE3, 0xAB, 0xA4, 0x43, 0xE3,
-	0xAC, 0x88, 0x43, 0xE3, 0xAC, 0x99, 0x43, 0xE3,
-	// Bytes 700 - 73f
-	0xAD, 0x89, 0x43, 0xE3, 0xAE, 0x9D, 0x43, 0xE3,
-	0xB0, 0x98, 0x43, 0xE3, 0xB1, 0x8E, 0x43, 0xE3,
-	0xB4, 0xB3, 0x43, 0xE3, 0xB6, 0x96, 0x43, 0xE3,
-	0xBA, 0xAC, 0x43, 0xE3, 0xBA, 0xB8, 0x43, 0xE3,
-	0xBC, 0x9B, 0x43, 0xE3, 0xBF, 0xBC, 0x43, 0xE4,
-	0x80, 0x88, 0x43, 0xE4, 0x80, 0x98, 0x43, 0xE4,
-	0x80, 0xB9, 0x43, 0xE4, 0x81, 0x86, 0x43, 0xE4,
-	0x82, 0x96, 0x43, 0xE4, 0x83, 0xA3, 0x43, 0xE4,
-	// Bytes 740 - 77f
-	0x84, 0xAF, 0x43, 0xE4, 0x88, 0x82, 0x43, 0xE4,
-	0x88, 0xA7, 0x43, 0xE4, 0x8A, 0xA0, 0x43, 0xE4,
-	0x8C, 0x81, 0x43, 0xE4, 0x8C, 0xB4, 0x43, 0xE4,
-	0x8D, 0x99, 0x43, 0xE4, 0x8F, 0x95, 0x43, 0xE4,
-	0x8F, 0x99, 0x43, 0xE4, 0x90, 0x8B, 0x43, 0xE4,
-	0x91, 0xAB, 0x43, 0xE4, 0x94, 0xAB, 0x43, 0xE4,
-	0x95, 0x9D, 0x43, 0xE4, 0x95, 0xA1, 0x43, 0xE4,
-	0x95, 0xAB, 0x43, 0xE4, 0x97, 0x97, 0x43, 0xE4,
-	// Bytes 780 - 7bf
-	0x97, 0xB9, 0x43, 0xE4, 0x98, 0xB5, 0x43, 0xE4,
-	0x9A, 0xBE, 0x43, 0xE4, 0x9B, 0x87, 0x43, 0xE4,
-	0xA6, 0x95, 0x43, 0xE4, 0xA7, 0xA6, 0x43, 0xE4,
-	0xA9, 0xAE, 0x43, 0xE4, 0xA9, 0xB6, 0x43, 0xE4,
-	0xAA, 0xB2, 0x43, 0xE4, 0xAC, 0xB3, 0x43, 0xE4,
-	0xAF, 0x8E, 0x43, 0xE4, 0xB3, 0x8E, 0x43, 0xE4,
-	0xB3, 0xAD, 0x43, 0xE4, 0xB3, 0xB8, 0x43, 0xE4,
-	0xB5, 0x96, 0x43, 0xE4, 0xB8, 0x80, 0x43, 0xE4,
-	// Bytes 7c0 - 7ff
-	0xB8, 0x81, 0x43, 0xE4, 0xB8, 0x83, 0x43, 0xE4,
-	0xB8, 0x89, 0x43, 0xE4, 0xB8, 0x8A, 0x43, 0xE4,
-	0xB8, 0x8B, 0x43, 0xE4, 0xB8, 0x8D, 0x43, 0xE4,
-	0xB8, 0x99, 0x43, 0xE4, 0xB8, 0xA6, 0x43, 0xE4,
-	0xB8, 0xA8, 0x43, 0xE4, 0xB8, 0xAD, 0x43, 0xE4,
-	0xB8, 0xB2, 0x43, 0xE4, 0xB8, 0xB6, 0x43, 0xE4,
-	0xB8, 0xB8, 0x43, 0xE4, 0xB8, 0xB9, 0x43, 0xE4,
-	0xB8, 0xBD, 0x43, 0xE4, 0xB8, 0xBF, 0x43, 0xE4,
-	// Bytes 800 - 83f
-	0xB9, 0x81, 0x43, 0xE4, 0xB9, 0x99, 0x43, 0xE4,
-	0xB9, 0x9D, 0x43, 0xE4, 0xBA, 0x82, 0x43, 0xE4,
-	0xBA, 0x85, 0x43, 0xE4, 0xBA, 0x86, 0x43, 0xE4,
-	0xBA, 0x8C, 0x43, 0xE4, 0xBA, 0x94, 0x43, 0xE4,
-	0xBA, 0xA0, 0x43, 0xE4, 0xBA, 0xA4, 0x43, 0xE4,
-	0xBA, 0xAE, 0x43, 0xE4, 0xBA, 0xBA, 0x43, 0xE4,
-	0xBB, 0x80, 0x43, 0xE4, 0xBB, 0x8C, 0x43, 0xE4,
-	0xBB, 0xA4, 0x43, 0xE4, 0xBC, 0x81, 0x43, 0xE4,
-	// Bytes 840 - 87f
-	0xBC, 0x91, 0x43, 0xE4, 0xBD, 0xA0, 0x43, 0xE4,
-	0xBE, 0x80, 0x43, 0xE4, 0xBE, 0x86, 0x43, 0xE4,
-	0xBE, 0x8B, 0x43, 0xE4, 0xBE, 0xAE, 0x43, 0xE4,
-	0xBE, 0xBB, 0x43, 0xE4, 0xBE, 0xBF, 0x43, 0xE5,
-	0x80, 0x82, 0x43, 0xE5, 0x80, 0xAB, 0x43, 0xE5,
-	0x81, 0xBA, 0x43, 0xE5, 0x82, 0x99, 0x43, 0xE5,
-	0x83, 0x8F, 0x43, 0xE5, 0x83, 0x9A, 0x43, 0xE5,
-	0x83, 0xA7, 0x43, 0xE5, 0x84, 0xAA, 0x43, 0xE5,
-	// Bytes 880 - 8bf
-	0x84, 0xBF, 0x43, 0xE5, 0x85, 0x80, 0x43, 0xE5,
-	0x85, 0x85, 0x43, 0xE5, 0x85, 0x8D, 0x43, 0xE5,
-	0x85, 0x94, 0x43, 0xE5, 0x85, 0xA4, 0x43, 0xE5,
-	0x85, 0xA5, 0x43, 0xE5, 0x85, 0xA7, 0x43, 0xE5,
-	0x85, 0xA8, 0x43, 0xE5, 0x85, 0xA9, 0x43, 0xE5,
-	0x85, 0xAB, 0x43, 0xE5, 0x85, 0xAD, 0x43, 0xE5,
-	0x85, 0xB7, 0x43, 0xE5, 0x86, 0x80, 0x43, 0xE5,
-	0x86, 0x82, 0x43, 0xE5, 0x86, 0x8D, 0x43, 0xE5,
-	// Bytes 8c0 - 8ff
-	0x86, 0x92, 0x43, 0xE5, 0x86, 0x95, 0x43, 0xE5,
-	0x86, 0x96, 0x43, 0xE5, 0x86, 0x97, 0x43, 0xE5,
-	0x86, 0x99, 0x43, 0xE5, 0x86, 0xA4, 0x43, 0xE5,
-	0x86, 0xAB, 0x43, 0xE5, 0x86, 0xAC, 0x43, 0xE5,
-	0x86, 0xB5, 0x43, 0xE5, 0x86, 0xB7, 0x43, 0xE5,
-	0x87, 0x89, 0x43, 0xE5, 0x87, 0x8C, 0x43, 0xE5,
-	0x87, 0x9C, 0x43, 0xE5, 0x87, 0x9E, 0x43, 0xE5,
-	0x87, 0xA0, 0x43, 0xE5, 0x87, 0xB5, 0x43, 0xE5,
-	// Bytes 900 - 93f
-	0x88, 0x80, 0x43, 0xE5, 0x88, 0x83, 0x43, 0xE5,
-	0x88, 0x87, 0x43, 0xE5, 0x88, 0x97, 0x43, 0xE5,
-	0x88, 0x9D, 0x43, 0xE5, 0x88, 0xA9, 0x43, 0xE5,
-	0x88, 0xBA, 0x43, 0xE5, 0x88, 0xBB, 0x43, 0xE5,
-	0x89, 0x86, 0x43, 0xE5, 0x89, 0x8D, 0x43, 0xE5,
-	0x89, 0xB2, 0x43, 0xE5, 0x89, 0xB7, 0x43, 0xE5,
-	0x8A, 0x89, 0x43, 0xE5, 0x8A, 0x9B, 0x43, 0xE5,
-	0x8A, 0xA3, 0x43, 0xE5, 0x8A, 0xB3, 0x43, 0xE5,
-	// Bytes 940 - 97f
-	0x8A, 0xB4, 0x43, 0xE5, 0x8B, 0x87, 0x43, 0xE5,
-	0x8B, 0x89, 0x43, 0xE5, 0x8B, 0x92, 0x43, 0xE5,
-	0x8B, 0x9E, 0x43, 0xE5, 0x8B, 0xA4, 0x43, 0xE5,
-	0x8B, 0xB5, 0x43, 0xE5, 0x8B, 0xB9, 0x43, 0xE5,
-	0x8B, 0xBA, 0x43, 0xE5, 0x8C, 0x85, 0x43, 0xE5,
-	0x8C, 0x86, 0x43, 0xE5, 0x8C, 0x95, 0x43, 0xE5,
-	0x8C, 0x97, 0x43, 0xE5, 0x8C, 0x9A, 0x43, 0xE5,
-	0x8C, 0xB8, 0x43, 0xE5, 0x8C, 0xBB, 0x43, 0xE5,
-	// Bytes 980 - 9bf
-	0x8C, 0xBF, 0x43, 0xE5, 0x8D, 0x81, 0x43, 0xE5,
-	0x8D, 0x84, 0x43, 0xE5, 0x8D, 0x85, 0x43, 0xE5,
-	0x8D, 0x89, 0x43, 0xE5, 0x8D, 0x91, 0x43, 0xE5,
-	0x8D, 0x94, 0x43, 0xE5, 0x8D, 0x9A, 0x43, 0xE5,
-	0x8D, 0x9C, 0x43, 0xE5, 0x8D, 0xA9, 0x43, 0xE5,
-	0x8D, 0xB0, 0x43, 0xE5, 0x8D, 0xB3, 0x43, 0xE5,
-	0x8D, 0xB5, 0x43, 0xE5, 0x8D, 0xBD, 0x43, 0xE5,
-	0x8D, 0xBF, 0x43, 0xE5, 0x8E, 0x82, 0x43, 0xE5,
-	// Bytes 9c0 - 9ff
-	0x8E, 0xB6, 0x43, 0xE5, 0x8F, 0x83, 0x43, 0xE5,
-	0x8F, 0x88, 0x43, 0xE5, 0x8F, 0x8A, 0x43, 0xE5,
-	0x8F, 0x8C, 0x43, 0xE5, 0x8F, 0x9F, 0x43, 0xE5,
-	0x8F, 0xA3, 0x43, 0xE5, 0x8F, 0xA5, 0x43, 0xE5,
-	0x8F, 0xAB, 0x43, 0xE5, 0x8F, 0xAF, 0x43, 0xE5,
-	0x8F, 0xB1, 0x43, 0xE5, 0x8F, 0xB3, 0x43, 0xE5,
-	0x90, 0x86, 0x43, 0xE5, 0x90, 0x88, 0x43, 0xE5,
-	0x90, 0x8D, 0x43, 0xE5, 0x90, 0x8F, 0x43, 0xE5,
-	// Bytes a00 - a3f
-	0x90, 0x9D, 0x43, 0xE5, 0x90, 0xB8, 0x43, 0xE5,
-	0x90, 0xB9, 0x43, 0xE5, 0x91, 0x82, 0x43, 0xE5,
-	0x91, 0x88, 0x43, 0xE5, 0x91, 0xA8, 0x43, 0xE5,
-	0x92, 0x9E, 0x43, 0xE5, 0x92, 0xA2, 0x43, 0xE5,
-	0x92, 0xBD, 0x43, 0xE5, 0x93, 0xB6, 0x43, 0xE5,
-	0x94, 0x90, 0x43, 0xE5, 0x95, 0x8F, 0x43, 0xE5,
-	0x95, 0x93, 0x43, 0xE5, 0x95, 0x95, 0x43, 0xE5,
-	0x95, 0xA3, 0x43, 0xE5, 0x96, 0x84, 0x43, 0xE5,
-	// Bytes a40 - a7f
-	0x96, 0x87, 0x43, 0xE5, 0x96, 0x99, 0x43, 0xE5,
-	0x96, 0x9D, 0x43, 0xE5, 0x96, 0xAB, 0x43, 0xE5,
-	0x96, 0xB3, 0x43, 0xE5, 0x96, 0xB6, 0x43, 0xE5,
-	0x97, 0x80, 0x43, 0xE5, 0x97, 0x82, 0x43, 0xE5,
-	0x97, 0xA2, 0x43, 0xE5, 0x98, 0x86, 0x43, 0xE5,
-	0x99, 0x91, 0x43, 0xE5, 0x99, 0xA8, 0x43, 0xE5,
-	0x99, 0xB4, 0x43, 0xE5, 0x9B, 0x97, 0x43, 0xE5,
-	0x9B, 0x9B, 0x43, 0xE5, 0x9B, 0xB9, 0x43, 0xE5,
-	// Bytes a80 - abf
-	0x9C, 0x96, 0x43, 0xE5, 0x9C, 0x97, 0x43, 0xE5,
-	0x9C, 0x9F, 0x43, 0xE5, 0x9C, 0xB0, 0x43, 0xE5,
-	0x9E, 0x8B, 0x43, 0xE5, 0x9F, 0x8E, 0x43, 0xE5,
-	0x9F, 0xB4, 0x43, 0xE5, 0xA0, 0x8D, 0x43, 0xE5,
-	0xA0, 0xB1, 0x43, 0xE5, 0xA0, 0xB2, 0x43, 0xE5,
-	0xA1, 0x80, 0x43, 0xE5, 0xA1, 0x9A, 0x43, 0xE5,
-	0xA1, 0x9E, 0x43, 0xE5, 0xA2, 0xA8, 0x43, 0xE5,
-	0xA2, 0xAC, 0x43, 0xE5, 0xA2, 0xB3, 0x43, 0xE5,
-	// Bytes ac0 - aff
-	0xA3, 0x98, 0x43, 0xE5, 0xA3, 0x9F, 0x43, 0xE5,
-	0xA3, 0xAB, 0x43, 0xE5, 0xA3, 0xAE, 0x43, 0xE5,
-	0xA3, 0xB0, 0x43, 0xE5, 0xA3, 0xB2, 0x43, 0xE5,
-	0xA3, 0xB7, 0x43, 0xE5, 0xA4, 0x82, 0x43, 0xE5,
-	0xA4, 0x86, 0x43, 0xE5, 0xA4, 0x8A, 0x43, 0xE5,
-	0xA4, 0x95, 0x43, 0xE5, 0xA4, 0x9A, 0x43, 0xE5,
-	0xA4, 0x9C, 0x43, 0xE5, 0xA4, 0xA2, 0x43, 0xE5,
-	0xA4, 0xA7, 0x43, 0xE5, 0xA4, 0xA9, 0x43, 0xE5,
-	// Bytes b00 - b3f
-	0xA5, 0x84, 0x43, 0xE5, 0xA5, 0x88, 0x43, 0xE5,
-	0xA5, 0x91, 0x43, 0xE5, 0xA5, 0x94, 0x43, 0xE5,
-	0xA5, 0xA2, 0x43, 0xE5, 0xA5, 0xB3, 0x43, 0xE5,
-	0xA7, 0x98, 0x43, 0xE5, 0xA7, 0xAC, 0x43, 0xE5,
-	0xA8, 0x9B, 0x43, 0xE5, 0xA8, 0xA7, 0x43, 0xE5,
-	0xA9, 0xA2, 0x43, 0xE5, 0xA9, 0xA6, 0x43, 0xE5,
-	0xAA, 0xB5, 0x43, 0xE5, 0xAC, 0x88, 0x43, 0xE5,
-	0xAC, 0xA8, 0x43, 0xE5, 0xAC, 0xBE, 0x43, 0xE5,
-	// Bytes b40 - b7f
-	0xAD, 0x90, 0x43, 0xE5, 0xAD, 0x97, 0x43, 0xE5,
-	0xAD, 0xA6, 0x43, 0xE5, 0xAE, 0x80, 0x43, 0xE5,
-	0xAE, 0x85, 0x43, 0xE5, 0xAE, 0x97, 0x43, 0xE5,
-	0xAF, 0x83, 0x43, 0xE5, 0xAF, 0x98, 0x43, 0xE5,
-	0xAF, 0xA7, 0x43, 0xE5, 0xAF, 0xAE, 0x43, 0xE5,
-	0xAF, 0xB3, 0x43, 0xE5, 0xAF, 0xB8, 0x43, 0xE5,
-	0xAF, 0xBF, 0x43, 0xE5, 0xB0, 0x86, 0x43, 0xE5,
-	0xB0, 0x8F, 0x43, 0xE5, 0xB0, 0xA2, 0x43, 0xE5,
-	// Bytes b80 - bbf
-	0xB0, 0xB8, 0x43, 0xE5, 0xB0, 0xBF, 0x43, 0xE5,
-	0xB1, 0xA0, 0x43, 0xE5, 0xB1, 0xA2, 0x43, 0xE5,
-	0xB1, 0xA4, 0x43, 0xE5, 0xB1, 0xA5, 0x43, 0xE5,
-	0xB1, 0xAE, 0x43, 0xE5, 0xB1, 0xB1, 0x43, 0xE5,
-	0xB2, 0x8D, 0x43, 0xE5, 0xB3, 0x80, 0x43, 0xE5,
-	0xB4, 0x99, 0x43, 0xE5, 0xB5, 0x83, 0x43, 0xE5,
-	0xB5, 0x90, 0x43, 0xE5, 0xB5, 0xAB, 0x43, 0xE5,
-	0xB5, 0xAE, 0x43, 0xE5, 0xB5, 0xBC, 0x43, 0xE5,
-	// Bytes bc0 - bff
-	0xB6, 0xB2, 0x43, 0xE5, 0xB6, 0xBA, 0x43, 0xE5,
-	0xB7, 0x9B, 0x43, 0xE5, 0xB7, 0xA1, 0x43, 0xE5,
-	0xB7, 0xA2, 0x43, 0xE5, 0xB7, 0xA5, 0x43, 0xE5,
-	0xB7, 0xA6, 0x43, 0xE5, 0xB7, 0xB1, 0x43, 0xE5,
-	0xB7, 0xBD, 0x43, 0xE5, 0xB7, 0xBE, 0x43, 0xE5,
-	0xB8, 0xA8, 0x43, 0xE5, 0xB8, 0xBD, 0x43, 0xE5,
-	0xB9, 0xA9, 0x43, 0xE5, 0xB9, 0xB2, 0x43, 0xE5,
-	0xB9, 0xB4, 0x43, 0xE5, 0xB9, 0xBA, 0x43, 0xE5,
-	// Bytes c00 - c3f
-	0xB9, 0xBC, 0x43, 0xE5, 0xB9, 0xBF, 0x43, 0xE5,
-	0xBA, 0xA6, 0x43, 0xE5, 0xBA, 0xB0, 0x43, 0xE5,
-	0xBA, 0xB3, 0x43, 0xE5, 0xBA, 0xB6, 0x43, 0xE5,
-	0xBB, 0x89, 0x43, 0xE5, 0xBB, 0x8A, 0x43, 0xE5,
-	0xBB, 0x92, 0x43, 0xE5, 0xBB, 0x93, 0x43, 0xE5,
-	0xBB, 0x99, 0x43, 0xE5, 0xBB, 0xAC, 0x43, 0xE5,
-	0xBB, 0xB4, 0x43, 0xE5, 0xBB, 0xBE, 0x43, 0xE5,
-	0xBC, 0x84, 0x43, 0xE5, 0xBC, 0x8B, 0x43, 0xE5,
-	// Bytes c40 - c7f
-	0xBC, 0x93, 0x43, 0xE5, 0xBC, 0xA2, 0x43, 0xE5,
-	0xBD, 0x90, 0x43, 0xE5, 0xBD, 0x93, 0x43, 0xE5,
-	0xBD, 0xA1, 0x43, 0xE5, 0xBD, 0xA2, 0x43, 0xE5,
-	0xBD, 0xA9, 0x43, 0xE5, 0xBD, 0xAB, 0x43, 0xE5,
-	0xBD, 0xB3, 0x43, 0xE5, 0xBE, 0x8B, 0x43, 0xE5,
-	0xBE, 0x8C, 0x43, 0xE5, 0xBE, 0x97, 0x43, 0xE5,
-	0xBE, 0x9A, 0x43, 0xE5, 0xBE, 0xA9, 0x43, 0xE5,
-	0xBE, 0xAD, 0x43, 0xE5, 0xBF, 0x83, 0x43, 0xE5,
-	// Bytes c80 - cbf
-	0xBF, 0x8D, 0x43, 0xE5, 0xBF, 0x97, 0x43, 0xE5,
-	0xBF, 0xB5, 0x43, 0xE5, 0xBF, 0xB9, 0x43, 0xE6,
-	0x80, 0x92, 0x43, 0xE6, 0x80, 0x9C, 0x43, 0xE6,
-	0x81, 0xB5, 0x43, 0xE6, 0x82, 0x81, 0x43, 0xE6,
-	0x82, 0x94, 0x43, 0xE6, 0x83, 0x87, 0x43, 0xE6,
-	0x83, 0x98, 0x43, 0xE6, 0x83, 0xA1, 0x43, 0xE6,
-	0x84, 0x88, 0x43, 0xE6, 0x85, 0x84, 0x43, 0xE6,
-	0x85, 0x88, 0x43, 0xE6, 0x85, 0x8C, 0x43, 0xE6,
-	// Bytes cc0 - cff
-	0x85, 0x8E, 0x43, 0xE6, 0x85, 0xA0, 0x43, 0xE6,
-	0x85, 0xA8, 0x43, 0xE6, 0x85, 0xBA, 0x43, 0xE6,
-	0x86, 0x8E, 0x43, 0xE6, 0x86, 0x90, 0x43, 0xE6,
-	0x86, 0xA4, 0x43, 0xE6, 0x86, 0xAF, 0x43, 0xE6,
-	0x86, 0xB2, 0x43, 0xE6, 0x87, 0x9E, 0x43, 0xE6,
-	0x87, 0xB2, 0x43, 0xE6, 0x87, 0xB6, 0x43, 0xE6,
-	0x88, 0x80, 0x43, 0xE6, 0x88, 0x88, 0x43, 0xE6,
-	0x88, 0x90, 0x43, 0xE6, 0x88, 0x9B, 0x43, 0xE6,
-	// Bytes d00 - d3f
-	0x88, 0xAE, 0x43, 0xE6, 0x88, 0xB4, 0x43, 0xE6,
-	0x88, 0xB6, 0x43, 0xE6, 0x89, 0x8B, 0x43, 0xE6,
-	0x89, 0x93, 0x43, 0xE6, 0x89, 0x9D, 0x43, 0xE6,
-	0x8A, 0x95, 0x43, 0xE6, 0x8A, 0xB1, 0x43, 0xE6,
-	0x8B, 0x89, 0x43, 0xE6, 0x8B, 0x8F, 0x43, 0xE6,
-	0x8B, 0x93, 0x43, 0xE6, 0x8B, 0x94, 0x43, 0xE6,
-	0x8B, 0xBC, 0x43, 0xE6, 0x8B, 0xBE, 0x43, 0xE6,
-	0x8C, 0x87, 0x43, 0xE6, 0x8C, 0xBD, 0x43, 0xE6,
-	// Bytes d40 - d7f
-	0x8D, 0x90, 0x43, 0xE6, 0x8D, 0x95, 0x43, 0xE6,
-	0x8D, 0xA8, 0x43, 0xE6, 0x8D, 0xBB, 0x43, 0xE6,
-	0x8E, 0x83, 0x43, 0xE6, 0x8E, 0xA0, 0x43, 0xE6,
-	0x8E, 0xA9, 0x43, 0xE6, 0x8F, 0x84, 0x43, 0xE6,
-	0x8F, 0x85, 0x43, 0xE6, 0x8F, 0xA4, 0x43, 0xE6,
-	0x90, 0x9C, 0x43, 0xE6, 0x90, 0xA2, 0x43, 0xE6,
-	0x91, 0x92, 0x43, 0xE6, 0x91, 0xA9, 0x43, 0xE6,
-	0x91, 0xB7, 0x43, 0xE6, 0x91, 0xBE, 0x43, 0xE6,
-	// Bytes d80 - dbf
-	0x92, 0x9A, 0x43, 0xE6, 0x92, 0x9D, 0x43, 0xE6,
-	0x93, 0x84, 0x43, 0xE6, 0x94, 0xAF, 0x43, 0xE6,
-	0x94, 0xB4, 0x43, 0xE6, 0x95, 0x8F, 0x43, 0xE6,
-	0x95, 0x96, 0x43, 0xE6, 0x95, 0xAC, 0x43, 0xE6,
-	0x95, 0xB8, 0x43, 0xE6, 0x96, 0x87, 0x43, 0xE6,
-	0x96, 0x97, 0x43, 0xE6, 0x96, 0x99, 0x43, 0xE6,
-	0x96, 0xA4, 0x43, 0xE6, 0x96, 0xB0, 0x43, 0xE6,
-	0x96, 0xB9, 0x43, 0xE6, 0x97, 0x85, 0x43, 0xE6,
-	// Bytes dc0 - dff
-	0x97, 0xA0, 0x43, 0xE6, 0x97, 0xA2, 0x43, 0xE6,
-	0x97, 0xA3, 0x43, 0xE6, 0x97, 0xA5, 0x43, 0xE6,
-	0x98, 0x93, 0x43, 0xE6, 0x98, 0xA0, 0x43, 0xE6,
-	0x99, 0x89, 0x43, 0xE6, 0x99, 0xB4, 0x43, 0xE6,
-	0x9A, 0x88, 0x43, 0xE6, 0x9A, 0x91, 0x43, 0xE6,
-	0x9A, 0x9C, 0x43, 0xE6, 0x9A, 0xB4, 0x43, 0xE6,
-	0x9B, 0x86, 0x43, 0xE6, 0x9B, 0xB0, 0x43, 0xE6,
-	0x9B, 0xB4, 0x43, 0xE6, 0x9B, 0xB8, 0x43, 0xE6,
-	// Bytes e00 - e3f
-	0x9C, 0x80, 0x43, 0xE6, 0x9C, 0x88, 0x43, 0xE6,
-	0x9C, 0x89, 0x43, 0xE6, 0x9C, 0x97, 0x43, 0xE6,
-	0x9C, 0x9B, 0x43, 0xE6, 0x9C, 0xA1, 0x43, 0xE6,
-	0x9C, 0xA8, 0x43, 0xE6, 0x9D, 0x8E, 0x43, 0xE6,
-	0x9D, 0x93, 0x43, 0xE6, 0x9D, 0x96, 0x43, 0xE6,
-	0x9D, 0x9E, 0x43, 0xE6, 0x9D, 0xBB, 0x43, 0xE6,
-	0x9E, 0x85, 0x43, 0xE6, 0x9E, 0x97, 0x43, 0xE6,
-	0x9F, 0xB3, 0x43, 0xE6, 0x9F, 0xBA, 0x43, 0xE6,
-	// Bytes e40 - e7f
-	0xA0, 0x97, 0x43, 0xE6, 0xA0, 0x9F, 0x43, 0xE6,
-	0xA0, 0xAA, 0x43, 0xE6, 0xA1, 0x92, 0x43, 0xE6,
-	0xA2, 0x81, 0x43, 0xE6, 0xA2, 0x85, 0x43, 0xE6,
-	0xA2, 0x8E, 0x43, 0xE6, 0xA2, 0xA8, 0x43, 0xE6,
-	0xA4, 0x94, 0x43, 0xE6, 0xA5, 0x82, 0x43, 0xE6,
-	0xA6, 0xA3, 0x43, 0xE6, 0xA7, 0xAA, 0x43, 0xE6,
-	0xA8, 0x82, 0x43, 0xE6, 0xA8, 0x93, 0x43, 0xE6,
-	0xAA, 0xA8, 0x43, 0xE6, 0xAB, 0x93, 0x43, 0xE6,
-	// Bytes e80 - ebf
-	0xAB, 0x9B, 0x43, 0xE6, 0xAC, 0x84, 0x43, 0xE6,
-	0xAC, 0xA0, 0x43, 0xE6, 0xAC, 0xA1, 0x43, 0xE6,
-	0xAD, 0x94, 0x43, 0xE6, 0xAD, 0xA2, 0x43, 0xE6,
-	0xAD, 0xA3, 0x43, 0xE6, 0xAD, 0xB2, 0x43, 0xE6,
-	0xAD, 0xB7, 0x43, 0xE6, 0xAD, 0xB9, 0x43, 0xE6,
-	0xAE, 0x9F, 0x43, 0xE6, 0xAE, 0xAE, 0x43, 0xE6,
-	0xAE, 0xB3, 0x43, 0xE6, 0xAE, 0xBA, 0x43, 0xE6,
-	0xAE, 0xBB, 0x43, 0xE6, 0xAF, 0x8B, 0x43, 0xE6,
-	// Bytes ec0 - eff
-	0xAF, 0x8D, 0x43, 0xE6, 0xAF, 0x94, 0x43, 0xE6,
-	0xAF, 0x9B, 0x43, 0xE6, 0xB0, 0x8F, 0x43, 0xE6,
-	0xB0, 0x94, 0x43, 0xE6, 0xB0, 0xB4, 0x43, 0xE6,
-	0xB1, 0x8E, 0x43, 0xE6, 0xB1, 0xA7, 0x43, 0xE6,
-	0xB2, 0x88, 0x43, 0xE6, 0xB2, 0xBF, 0x43, 0xE6,
-	0xB3, 0x8C, 0x43, 0xE6, 0xB3, 0x8D, 0x43, 0xE6,
-	0xB3, 0xA5, 0x43, 0xE6, 0xB3, 0xA8, 0x43, 0xE6,
-	0xB4, 0x96, 0x43, 0xE6, 0xB4, 0x9B, 0x43, 0xE6,
-	// Bytes f00 - f3f
-	0xB4, 0x9E, 0x43, 0xE6, 0xB4, 0xB4, 0x43, 0xE6,
-	0xB4, 0xBE, 0x43, 0xE6, 0xB5, 0x81, 0x43, 0xE6,
-	0xB5, 0xA9, 0x43, 0xE6, 0xB5, 0xAA, 0x43, 0xE6,
-	0xB5, 0xB7, 0x43, 0xE6, 0xB5, 0xB8, 0x43, 0xE6,
-	0xB6, 0x85, 0x43, 0xE6, 0xB7, 0x8B, 0x43, 0xE6,
-	0xB7, 0x9A, 0x43, 0xE6, 0xB7, 0xAA, 0x43, 0xE6,
-	0xB7, 0xB9, 0x43, 0xE6, 0xB8, 0x9A, 0x43, 0xE6,
-	0xB8, 0xAF, 0x43, 0xE6, 0xB9, 0xAE, 0x43, 0xE6,
-	// Bytes f40 - f7f
-	0xBA, 0x80, 0x43, 0xE6, 0xBA, 0x9C, 0x43, 0xE6,
-	0xBA, 0xBA, 0x43, 0xE6, 0xBB, 0x87, 0x43, 0xE6,
-	0xBB, 0x8B, 0x43, 0xE6, 0xBB, 0x91, 0x43, 0xE6,
-	0xBB, 0x9B, 0x43, 0xE6, 0xBC, 0x8F, 0x43, 0xE6,
-	0xBC, 0x94, 0x43, 0xE6, 0xBC, 0xA2, 0x43, 0xE6,
-	0xBC, 0xA3, 0x43, 0xE6, 0xBD, 0xAE, 0x43, 0xE6,
-	0xBF, 0x86, 0x43, 0xE6, 0xBF, 0xAB, 0x43, 0xE6,
-	0xBF, 0xBE, 0x43, 0xE7, 0x80, 0x9B, 0x43, 0xE7,
-	// Bytes f80 - fbf
-	0x80, 0x9E, 0x43, 0xE7, 0x80, 0xB9, 0x43, 0xE7,
-	0x81, 0x8A, 0x43, 0xE7, 0x81, 0xAB, 0x43, 0xE7,
-	0x81, 0xB0, 0x43, 0xE7, 0x81, 0xB7, 0x43, 0xE7,
-	0x81, 0xBD, 0x43, 0xE7, 0x82, 0x99, 0x43, 0xE7,
-	0x82, 0xAD, 0x43, 0xE7, 0x83, 0x88, 0x43, 0xE7,
-	0x83, 0x99, 0x43, 0xE7, 0x84, 0xA1, 0x43, 0xE7,
-	0x85, 0x85, 0x43, 0xE7, 0x85, 0x89, 0x43, 0xE7,
-	0x85, 0xAE, 0x43, 0xE7, 0x86, 0x9C, 0x43, 0xE7,
-	// Bytes fc0 - fff
-	0x87, 0x8E, 0x43, 0xE7, 0x87, 0x90, 0x43, 0xE7,
-	0x88, 0x90, 0x43, 0xE7, 0x88, 0x9B, 0x43, 0xE7,
-	0x88, 0xA8, 0x43, 0xE7, 0x88, 0xAA, 0x43, 0xE7,
-	0x88, 0xAB, 0x43, 0xE7, 0x88, 0xB5, 0x43, 0xE7,
-	0x88, 0xB6, 0x43, 0xE7, 0x88, 0xBB, 0x43, 0xE7,
-	0x88, 0xBF, 0x43, 0xE7, 0x89, 0x87, 0x43, 0xE7,
-	0x89, 0x90, 0x43, 0xE7, 0x89, 0x99, 0x43, 0xE7,
-	0x89, 0x9B, 0x43, 0xE7, 0x89, 0xA2, 0x43, 0xE7,
-	// Bytes 1000 - 103f
-	0x89, 0xB9, 0x43, 0xE7, 0x8A, 0x80, 0x43, 0xE7,
-	0x8A, 0x95, 0x43, 0xE7, 0x8A, 0xAC, 0x43, 0xE7,
-	0x8A, 0xAF, 0x43, 0xE7, 0x8B, 0x80, 0x43, 0xE7,
-	0x8B, 0xBC, 0x43, 0xE7, 0x8C, 0xAA, 0x43, 0xE7,
-	0x8D, 0xB5, 0x43, 0xE7, 0x8D, 0xBA, 0x43, 0xE7,
-	0x8E, 0x84, 0x43, 0xE7, 0x8E, 0x87, 0x43, 0xE7,
-	0x8E, 0x89, 0x43, 0xE7, 0x8E, 0x8B, 0x43, 0xE7,
-	0x8E, 0xA5, 0x43, 0xE7, 0x8E, 0xB2, 0x43, 0xE7,
-	// Bytes 1040 - 107f
-	0x8F, 0x9E, 0x43, 0xE7, 0x90, 0x86, 0x43, 0xE7,
-	0x90, 0x89, 0x43, 0xE7, 0x90, 0xA2, 0x43, 0xE7,
-	0x91, 0x87, 0x43, 0xE7, 0x91, 0x9C, 0x43, 0xE7,
-	0x91, 0xA9, 0x43, 0xE7, 0x91, 0xB1, 0x43, 0xE7,
-	0x92, 0x85, 0x43, 0xE7, 0x92, 0x89, 0x43, 0xE7,
-	0x92, 0x98, 0x43, 0xE7, 0x93, 0x8A, 0x43, 0xE7,
-	0x93, 0x9C, 0x43, 0xE7, 0x93, 0xA6, 0x43, 0xE7,
-	0x94, 0x86, 0x43, 0xE7, 0x94, 0x98, 0x43, 0xE7,
-	// Bytes 1080 - 10bf
-	0x94, 0x9F, 0x43, 0xE7, 0x94, 0xA4, 0x43, 0xE7,
-	0x94, 0xA8, 0x43, 0xE7, 0x94, 0xB0, 0x43, 0xE7,
-	0x94, 0xB2, 0x43, 0xE7, 0x94, 0xB3, 0x43, 0xE7,
-	0x94, 0xB7, 0x43, 0xE7, 0x94, 0xBB, 0x43, 0xE7,
-	0x94, 0xBE, 0x43, 0xE7, 0x95, 0x99, 0x43, 0xE7,
-	0x95, 0xA5, 0x43, 0xE7, 0x95, 0xB0, 0x43, 0xE7,
-	0x96, 0x8B, 0x43, 0xE7, 0x96, 0x92, 0x43, 0xE7,
-	0x97, 0xA2, 0x43, 0xE7, 0x98, 0x90, 0x43, 0xE7,
-	// Bytes 10c0 - 10ff
-	0x98, 0x9D, 0x43, 0xE7, 0x98, 0x9F, 0x43, 0xE7,
-	0x99, 0x82, 0x43, 0xE7, 0x99, 0xA9, 0x43, 0xE7,
-	0x99, 0xB6, 0x43, 0xE7, 0x99, 0xBD, 0x43, 0xE7,
-	0x9A, 0xAE, 0x43, 0xE7, 0x9A, 0xBF, 0x43, 0xE7,
-	0x9B, 0x8A, 0x43, 0xE7, 0x9B, 0x9B, 0x43, 0xE7,
-	0x9B, 0xA3, 0x43, 0xE7, 0x9B, 0xA7, 0x43, 0xE7,
-	0x9B, 0xAE, 0x43, 0xE7, 0x9B, 0xB4, 0x43, 0xE7,
-	0x9C, 0x81, 0x43, 0xE7, 0x9C, 0x9E, 0x43, 0xE7,
-	// Bytes 1100 - 113f
-	0x9C, 0x9F, 0x43, 0xE7, 0x9D, 0x80, 0x43, 0xE7,
-	0x9D, 0x8A, 0x43, 0xE7, 0x9E, 0x8B, 0x43, 0xE7,
-	0x9E, 0xA7, 0x43, 0xE7, 0x9F, 0x9B, 0x43, 0xE7,
-	0x9F, 0xA2, 0x43, 0xE7, 0x9F, 0xB3, 0x43, 0xE7,
-	0xA1, 0x8E, 0x43, 0xE7, 0xA1, 0xAB, 0x43, 0xE7,
-	0xA2, 0x8C, 0x43, 0xE7, 0xA2, 0x91, 0x43, 0xE7,
-	0xA3, 0x8A, 0x43, 0xE7, 0xA3, 0x8C, 0x43, 0xE7,
-	0xA3, 0xBB, 0x43, 0xE7, 0xA4, 0xAA, 0x43, 0xE7,
-	// Bytes 1140 - 117f
-	0xA4, 0xBA, 0x43, 0xE7, 0xA4, 0xBC, 0x43, 0xE7,
-	0xA4, 0xBE, 0x43, 0xE7, 0xA5, 0x88, 0x43, 0xE7,
-	0xA5, 0x89, 0x43, 0xE7, 0xA5, 0x90, 0x43, 0xE7,
-	0xA5, 0x96, 0x43, 0xE7, 0xA5, 0x9D, 0x43, 0xE7,
-	0xA5, 0x9E, 0x43, 0xE7, 0xA5, 0xA5, 0x43, 0xE7,
-	0xA5, 0xBF, 0x43, 0xE7, 0xA6, 0x81, 0x43, 0xE7,
-	0xA6, 0x8D, 0x43, 0xE7, 0xA6, 0x8E, 0x43, 0xE7,
-	0xA6, 0x8F, 0x43, 0xE7, 0xA6, 0xAE, 0x43, 0xE7,
-	// Bytes 1180 - 11bf
-	0xA6, 0xB8, 0x43, 0xE7, 0xA6, 0xBE, 0x43, 0xE7,
-	0xA7, 0x8A, 0x43, 0xE7, 0xA7, 0x98, 0x43, 0xE7,
-	0xA7, 0xAB, 0x43, 0xE7, 0xA8, 0x9C, 0x43, 0xE7,
-	0xA9, 0x80, 0x43, 0xE7, 0xA9, 0x8A, 0x43, 0xE7,
-	0xA9, 0x8F, 0x43, 0xE7, 0xA9, 0xB4, 0x43, 0xE7,
-	0xA9, 0xBA, 0x43, 0xE7, 0xAA, 0x81, 0x43, 0xE7,
-	0xAA, 0xB1, 0x43, 0xE7, 0xAB, 0x8B, 0x43, 0xE7,
-	0xAB, 0xAE, 0x43, 0xE7, 0xAB, 0xB9, 0x43, 0xE7,
-	// Bytes 11c0 - 11ff
-	0xAC, 0xA0, 0x43, 0xE7, 0xAE, 0x8F, 0x43, 0xE7,
-	0xAF, 0x80, 0x43, 0xE7, 0xAF, 0x86, 0x43, 0xE7,
-	0xAF, 0x89, 0x43, 0xE7, 0xB0, 0xBE, 0x43, 0xE7,
-	0xB1, 0xA0, 0x43, 0xE7, 0xB1, 0xB3, 0x43, 0xE7,
-	0xB1, 0xBB, 0x43, 0xE7, 0xB2, 0x92, 0x43, 0xE7,
-	0xB2, 0xBE, 0x43, 0xE7, 0xB3, 0x92, 0x43, 0xE7,
-	0xB3, 0x96, 0x43, 0xE7, 0xB3, 0xA3, 0x43, 0xE7,
-	0xB3, 0xA7, 0x43, 0xE7, 0xB3, 0xA8, 0x43, 0xE7,
-	// Bytes 1200 - 123f
-	0xB3, 0xB8, 0x43, 0xE7, 0xB4, 0x80, 0x43, 0xE7,
-	0xB4, 0x90, 0x43, 0xE7, 0xB4, 0xA2, 0x43, 0xE7,
-	0xB4, 0xAF, 0x43, 0xE7, 0xB5, 0x82, 0x43, 0xE7,
-	0xB5, 0x9B, 0x43, 0xE7, 0xB5, 0xA3, 0x43, 0xE7,
-	0xB6, 0xA0, 0x43, 0xE7, 0xB6, 0xBE, 0x43, 0xE7,
-	0xB7, 0x87, 0x43, 0xE7, 0xB7, 0xB4, 0x43, 0xE7,
-	0xB8, 0x82, 0x43, 0xE7, 0xB8, 0x89, 0x43, 0xE7,
-	0xB8, 0xB7, 0x43, 0xE7, 0xB9, 0x81, 0x43, 0xE7,
-	// Bytes 1240 - 127f
-	0xB9, 0x85, 0x43, 0xE7, 0xBC, 0xB6, 0x43, 0xE7,
-	0xBC, 0xBE, 0x43, 0xE7, 0xBD, 0x91, 0x43, 0xE7,
-	0xBD, 0xB2, 0x43, 0xE7, 0xBD, 0xB9, 0x43, 0xE7,
-	0xBD, 0xBA, 0x43, 0xE7, 0xBE, 0x85, 0x43, 0xE7,
-	0xBE, 0x8A, 0x43, 0xE7, 0xBE, 0x95, 0x43, 0xE7,
-	0xBE, 0x9A, 0x43, 0xE7, 0xBE, 0xBD, 0x43, 0xE7,
-	0xBF, 0xBA, 0x43, 0xE8, 0x80, 0x81, 0x43, 0xE8,
-	0x80, 0x85, 0x43, 0xE8, 0x80, 0x8C, 0x43, 0xE8,
-	// Bytes 1280 - 12bf
-	0x80, 0x92, 0x43, 0xE8, 0x80, 0xB3, 0x43, 0xE8,
-	0x81, 0x86, 0x43, 0xE8, 0x81, 0xA0, 0x43, 0xE8,
-	0x81, 0xAF, 0x43, 0xE8, 0x81, 0xB0, 0x43, 0xE8,
-	0x81, 0xBE, 0x43, 0xE8, 0x81, 0xBF, 0x43, 0xE8,
-	0x82, 0x89, 0x43, 0xE8, 0x82, 0x8B, 0x43, 0xE8,
-	0x82, 0xAD, 0x43, 0xE8, 0x82, 0xB2, 0x43, 0xE8,
-	0x84, 0x83, 0x43, 0xE8, 0x84, 0xBE, 0x43, 0xE8,
-	0x87, 0x98, 0x43, 0xE8, 0x87, 0xA3, 0x43, 0xE8,
-	// Bytes 12c0 - 12ff
-	0x87, 0xA8, 0x43, 0xE8, 0x87, 0xAA, 0x43, 0xE8,
-	0x87, 0xAD, 0x43, 0xE8, 0x87, 0xB3, 0x43, 0xE8,
-	0x87, 0xBC, 0x43, 0xE8, 0x88, 0x81, 0x43, 0xE8,
-	0x88, 0x84, 0x43, 0xE8, 0x88, 0x8C, 0x43, 0xE8,
-	0x88, 0x98, 0x43, 0xE8, 0x88, 0x9B, 0x43, 0xE8,
-	0x88, 0x9F, 0x43, 0xE8, 0x89, 0xAE, 0x43, 0xE8,
-	0x89, 0xAF, 0x43, 0xE8, 0x89, 0xB2, 0x43, 0xE8,
-	0x89, 0xB8, 0x43, 0xE8, 0x89, 0xB9, 0x43, 0xE8,
-	// Bytes 1300 - 133f
-	0x8A, 0x8B, 0x43, 0xE8, 0x8A, 0x91, 0x43, 0xE8,
-	0x8A, 0x9D, 0x43, 0xE8, 0x8A, 0xB1, 0x43, 0xE8,
-	0x8A, 0xB3, 0x43, 0xE8, 0x8A, 0xBD, 0x43, 0xE8,
-	0x8B, 0xA5, 0x43, 0xE8, 0x8B, 0xA6, 0x43, 0xE8,
-	0x8C, 0x9D, 0x43, 0xE8, 0x8C, 0xA3, 0x43, 0xE8,
-	0x8C, 0xB6, 0x43, 0xE8, 0x8D, 0x92, 0x43, 0xE8,
-	0x8D, 0x93, 0x43, 0xE8, 0x8D, 0xA3, 0x43, 0xE8,
-	0x8E, 0xAD, 0x43, 0xE8, 0x8E, 0xBD, 0x43, 0xE8,
-	// Bytes 1340 - 137f
-	0x8F, 0x89, 0x43, 0xE8, 0x8F, 0x8A, 0x43, 0xE8,
-	0x8F, 0x8C, 0x43, 0xE8, 0x8F, 0x9C, 0x43, 0xE8,
-	0x8F, 0xA7, 0x43, 0xE8, 0x8F, 0xAF, 0x43, 0xE8,
-	0x8F, 0xB1, 0x43, 0xE8, 0x90, 0xBD, 0x43, 0xE8,
-	0x91, 0x89, 0x43, 0xE8, 0x91, 0x97, 0x43, 0xE8,
-	0x93, 0xAE, 0x43, 0xE8, 0x93, 0xB1, 0x43, 0xE8,
-	0x93, 0xB3, 0x43, 0xE8, 0x93, 0xBC, 0x43, 0xE8,
-	0x94, 0x96, 0x43, 0xE8, 0x95, 0xA4, 0x43, 0xE8,
-	// Bytes 1380 - 13bf
-	0x97, 0x8D, 0x43, 0xE8, 0x97, 0xBA, 0x43, 0xE8,
-	0x98, 0x86, 0x43, 0xE8, 0x98, 0x92, 0x43, 0xE8,
-	0x98, 0xAD, 0x43, 0xE8, 0x98, 0xBF, 0x43, 0xE8,
-	0x99, 0x8D, 0x43, 0xE8, 0x99, 0x90, 0x43, 0xE8,
-	0x99, 0x9C, 0x43, 0xE8, 0x99, 0xA7, 0x43, 0xE8,
-	0x99, 0xA9, 0x43, 0xE8, 0x99, 0xAB, 0x43, 0xE8,
-	0x9A, 0x88, 0x43, 0xE8, 0x9A, 0xA9, 0x43, 0xE8,
-	0x9B, 0xA2, 0x43, 0xE8, 0x9C, 0x8E, 0x43, 0xE8,
-	// Bytes 13c0 - 13ff
-	0x9C, 0xA8, 0x43, 0xE8, 0x9D, 0xAB, 0x43, 0xE8,
-	0x9D, 0xB9, 0x43, 0xE8, 0x9E, 0x86, 0x43, 0xE8,
-	0x9E, 0xBA, 0x43, 0xE8, 0x9F, 0xA1, 0x43, 0xE8,
-	0xA0, 0x81, 0x43, 0xE8, 0xA0, 0x9F, 0x43, 0xE8,
-	0xA1, 0x80, 0x43, 0xE8, 0xA1, 0x8C, 0x43, 0xE8,
-	0xA1, 0xA0, 0x43, 0xE8, 0xA1, 0xA3, 0x43, 0xE8,
-	0xA3, 0x82, 0x43, 0xE8, 0xA3, 0x8F, 0x43, 0xE8,
-	0xA3, 0x97, 0x43, 0xE8, 0xA3, 0x9E, 0x43, 0xE8,
-	// Bytes 1400 - 143f
-	0xA3, 0xA1, 0x43, 0xE8, 0xA3, 0xB8, 0x43, 0xE8,
-	0xA3, 0xBA, 0x43, 0xE8, 0xA4, 0x90, 0x43, 0xE8,
-	0xA5, 0x81, 0x43, 0xE8, 0xA5, 0xA4, 0x43, 0xE8,
-	0xA5, 0xBE, 0x43, 0xE8, 0xA6, 0x86, 0x43, 0xE8,
-	0xA6, 0x8B, 0x43, 0xE8, 0xA6, 0x96, 0x43, 0xE8,
-	0xA7, 0x92, 0x43, 0xE8, 0xA7, 0xA3, 0x43, 0xE8,
-	0xA8, 0x80, 0x43, 0xE8, 0xAA, 0xA0, 0x43, 0xE8,
-	0xAA, 0xAA, 0x43, 0xE8, 0xAA, 0xBF, 0x43, 0xE8,
-	// Bytes 1440 - 147f
-	0xAB, 0x8B, 0x43, 0xE8, 0xAB, 0x92, 0x43, 0xE8,
-	0xAB, 0x96, 0x43, 0xE8, 0xAB, 0xAD, 0x43, 0xE8,
-	0xAB, 0xB8, 0x43, 0xE8, 0xAB, 0xBE, 0x43, 0xE8,
-	0xAC, 0x81, 0x43, 0xE8, 0xAC, 0xB9, 0x43, 0xE8,
-	0xAD, 0x98, 0x43, 0xE8, 0xAE, 0x80, 0x43, 0xE8,
-	0xAE, 0x8A, 0x43, 0xE8, 0xB0, 0xB7, 0x43, 0xE8,
-	0xB1, 0x86, 0x43, 0xE8, 0xB1, 0x88, 0x43, 0xE8,
-	0xB1, 0x95, 0x43, 0xE8, 0xB1, 0xB8, 0x43, 0xE8,
-	// Bytes 1480 - 14bf
-	0xB2, 0x9D, 0x43, 0xE8, 0xB2, 0xA1, 0x43, 0xE8,
-	0xB2, 0xA9, 0x43, 0xE8, 0xB2, 0xAB, 0x43, 0xE8,
-	0xB3, 0x81, 0x43, 0xE8, 0xB3, 0x82, 0x43, 0xE8,
-	0xB3, 0x87, 0x43, 0xE8, 0xB3, 0x88, 0x43, 0xE8,
-	0xB3, 0x93, 0x43, 0xE8, 0xB4, 0x88, 0x43, 0xE8,
-	0xB4, 0x9B, 0x43, 0xE8, 0xB5, 0xA4, 0x43, 0xE8,
-	0xB5, 0xB0, 0x43, 0xE8, 0xB5, 0xB7, 0x43, 0xE8,
-	0xB6, 0xB3, 0x43, 0xE8, 0xB6, 0xBC, 0x43, 0xE8,
-	// Bytes 14c0 - 14ff
-	0xB7, 0x8B, 0x43, 0xE8, 0xB7, 0xAF, 0x43, 0xE8,
-	0xB7, 0xB0, 0x43, 0xE8, 0xBA, 0xAB, 0x43, 0xE8,
-	0xBB, 0x8A, 0x43, 0xE8, 0xBB, 0x94, 0x43, 0xE8,
-	0xBC, 0xA6, 0x43, 0xE8, 0xBC, 0xAA, 0x43, 0xE8,
-	0xBC, 0xB8, 0x43, 0xE8, 0xBC, 0xBB, 0x43, 0xE8,
-	0xBD, 0xA2, 0x43, 0xE8, 0xBE, 0x9B, 0x43, 0xE8,
-	0xBE, 0x9E, 0x43, 0xE8, 0xBE, 0xB0, 0x43, 0xE8,
-	0xBE, 0xB5, 0x43, 0xE8, 0xBE, 0xB6, 0x43, 0xE9,
-	// Bytes 1500 - 153f
-	0x80, 0xA3, 0x43, 0xE9, 0x80, 0xB8, 0x43, 0xE9,
-	0x81, 0x8A, 0x43, 0xE9, 0x81, 0xA9, 0x43, 0xE9,
-	0x81, 0xB2, 0x43, 0xE9, 0x81, 0xBC, 0x43, 0xE9,
-	0x82, 0x8F, 0x43, 0xE9, 0x82, 0x91, 0x43, 0xE9,
-	0x82, 0x94, 0x43, 0xE9, 0x83, 0x8E, 0x43, 0xE9,
-	0x83, 0x9E, 0x43, 0xE9, 0x83, 0xB1, 0x43, 0xE9,
-	0x83, 0xBD, 0x43, 0xE9, 0x84, 0x91, 0x43, 0xE9,
-	0x84, 0x9B, 0x43, 0xE9, 0x85, 0x89, 0x43, 0xE9,
-	// Bytes 1540 - 157f
-	0x85, 0x8D, 0x43, 0xE9, 0x85, 0xAA, 0x43, 0xE9,
-	0x86, 0x99, 0x43, 0xE9, 0x86, 0xB4, 0x43, 0xE9,
-	0x87, 0x86, 0x43, 0xE9, 0x87, 0x8C, 0x43, 0xE9,
-	0x87, 0x8F, 0x43, 0xE9, 0x87, 0x91, 0x43, 0xE9,
-	0x88, 0xB4, 0x43, 0xE9, 0x88, 0xB8, 0x43, 0xE9,
-	0x89, 0xB6, 0x43, 0xE9, 0x89, 0xBC, 0x43, 0xE9,
-	0x8B, 0x97, 0x43, 0xE9, 0x8B, 0x98, 0x43, 0xE9,
-	0x8C, 0x84, 0x43, 0xE9, 0x8D, 0x8A, 0x43, 0xE9,
-	// Bytes 1580 - 15bf
-	0x8F, 0xB9, 0x43, 0xE9, 0x90, 0x95, 0x43, 0xE9,
-	0x95, 0xB7, 0x43, 0xE9, 0x96, 0x80, 0x43, 0xE9,
-	0x96, 0x8B, 0x43, 0xE9, 0x96, 0xAD, 0x43, 0xE9,
-	0x96, 0xB7, 0x43, 0xE9, 0x98, 0x9C, 0x43, 0xE9,
-	0x98, 0xAE, 0x43, 0xE9, 0x99, 0x8B, 0x43, 0xE9,
-	0x99, 0x8D, 0x43, 0xE9, 0x99, 0xB5, 0x43, 0xE9,
-	0x99, 0xB8, 0x43, 0xE9, 0x99, 0xBC, 0x43, 0xE9,
-	0x9A, 0x86, 0x43, 0xE9, 0x9A, 0xA3, 0x43, 0xE9,
-	// Bytes 15c0 - 15ff
-	0x9A, 0xB6, 0x43, 0xE9, 0x9A, 0xB7, 0x43, 0xE9,
-	0x9A, 0xB8, 0x43, 0xE9, 0x9A, 0xB9, 0x43, 0xE9,
-	0x9B, 0x83, 0x43, 0xE9, 0x9B, 0xA2, 0x43, 0xE9,
-	0x9B, 0xA3, 0x43, 0xE9, 0x9B, 0xA8, 0x43, 0xE9,
-	0x9B, 0xB6, 0x43, 0xE9, 0x9B, 0xB7, 0x43, 0xE9,
-	0x9C, 0xA3, 0x43, 0xE9, 0x9C, 0xB2, 0x43, 0xE9,
-	0x9D, 0x88, 0x43, 0xE9, 0x9D, 0x91, 0x43, 0xE9,
-	0x9D, 0x96, 0x43, 0xE9, 0x9D, 0x9E, 0x43, 0xE9,
-	// Bytes 1600 - 163f
-	0x9D, 0xA2, 0x43, 0xE9, 0x9D, 0xA9, 0x43, 0xE9,
-	0x9F, 0x8B, 0x43, 0xE9, 0x9F, 0x9B, 0x43, 0xE9,
-	0x9F, 0xA0, 0x43, 0xE9, 0x9F, 0xAD, 0x43, 0xE9,
-	0x9F, 0xB3, 0x43, 0xE9, 0x9F, 0xBF, 0x43, 0xE9,
-	0xA0, 0x81, 0x43, 0xE9, 0xA0, 0x85, 0x43, 0xE9,
-	0xA0, 0x8B, 0x43, 0xE9, 0xA0, 0x98, 0x43, 0xE9,
-	0xA0, 0xA9, 0x43, 0xE9, 0xA0, 0xBB, 0x43, 0xE9,
-	0xA1, 0x9E, 0x43, 0xE9, 0xA2, 0xA8, 0x43, 0xE9,
-	// Bytes 1640 - 167f
-	0xA3, 0x9B, 0x43, 0xE9, 0xA3, 0x9F, 0x43, 0xE9,
-	0xA3, 0xA2, 0x43, 0xE9, 0xA3, 0xAF, 0x43, 0xE9,
-	0xA3, 0xBC, 0x43, 0xE9, 0xA4, 0xA8, 0x43, 0xE9,
-	0xA4, 0xA9, 0x43, 0xE9, 0xA6, 0x96, 0x43, 0xE9,
-	0xA6, 0x99, 0x43, 0xE9, 0xA6, 0xA7, 0x43, 0xE9,
-	0xA6, 0xAC, 0x43, 0xE9, 0xA7, 0x82, 0x43, 0xE9,
-	0xA7, 0xB1, 0x43, 0xE9, 0xA7, 0xBE, 0x43, 0xE9,
-	0xA9, 0xAA, 0x43, 0xE9, 0xAA, 0xA8, 0x43, 0xE9,
-	// Bytes 1680 - 16bf
-	0xAB, 0x98, 0x43, 0xE9, 0xAB, 0x9F, 0x43, 0xE9,
-	0xAC, 0x92, 0x43, 0xE9, 0xAC, 0xA5, 0x43, 0xE9,
-	0xAC, 0xAF, 0x43, 0xE9, 0xAC, 0xB2, 0x43, 0xE9,
-	0xAC, 0xBC, 0x43, 0xE9, 0xAD, 0x9A, 0x43, 0xE9,
-	0xAD, 0xAF, 0x43, 0xE9, 0xB1, 0x80, 0x43, 0xE9,
-	0xB1, 0x97, 0x43, 0xE9, 0xB3, 0xA5, 0x43, 0xE9,
-	0xB3, 0xBD, 0x43, 0xE9, 0xB5, 0xA7, 0x43, 0xE9,
-	0xB6, 0xB4, 0x43, 0xE9, 0xB7, 0xBA, 0x43, 0xE9,
-	// Bytes 16c0 - 16ff
-	0xB8, 0x9E, 0x43, 0xE9, 0xB9, 0xB5, 0x43, 0xE9,
-	0xB9, 0xBF, 0x43, 0xE9, 0xBA, 0x97, 0x43, 0xE9,
-	0xBA, 0x9F, 0x43, 0xE9, 0xBA, 0xA5, 0x43, 0xE9,
-	0xBA, 0xBB, 0x43, 0xE9, 0xBB, 0x83, 0x43, 0xE9,
-	0xBB, 0x8D, 0x43, 0xE9, 0xBB, 0x8E, 0x43, 0xE9,
-	0xBB, 0x91, 0x43, 0xE9, 0xBB, 0xB9, 0x43, 0xE9,
-	0xBB, 0xBD, 0x43, 0xE9, 0xBB, 0xBE, 0x43, 0xE9,
-	0xBC, 0x85, 0x43, 0xE9, 0xBC, 0x8E, 0x43, 0xE9,
-	// Bytes 1700 - 173f
-	0xBC, 0x8F, 0x43, 0xE9, 0xBC, 0x93, 0x43, 0xE9,
-	0xBC, 0x96, 0x43, 0xE9, 0xBC, 0xA0, 0x43, 0xE9,
-	0xBC, 0xBB, 0x43, 0xE9, 0xBD, 0x83, 0x43, 0xE9,
-	0xBD, 0x8A, 0x43, 0xE9, 0xBD, 0x92, 0x43, 0xE9,
-	0xBE, 0x8D, 0x43, 0xE9, 0xBE, 0x8E, 0x43, 0xE9,
-	0xBE, 0x9C, 0x43, 0xE9, 0xBE, 0x9F, 0x43, 0xE9,
-	0xBE, 0xA0, 0x43, 0xEA, 0x99, 0x91, 0x43, 0xEA,
-	0x9A, 0x89, 0x43, 0xEA, 0x9C, 0xA7, 0x43, 0xEA,
-	// Bytes 1740 - 177f
-	0x9D, 0xAF, 0x43, 0xEA, 0x9E, 0x8E, 0x43, 0xEA,
-	0xAC, 0xB7, 0x43, 0xEA, 0xAD, 0x92, 0x43, 0xEA,
-	0xAD, 0xA6, 0x43, 0xEA, 0xAD, 0xA7, 0x44, 0xF0,
-	0x9D, 0xBC, 0x84, 0x44, 0xF0, 0x9D, 0xBC, 0x85,
-	0x44, 0xF0, 0x9D, 0xBC, 0x86, 0x44, 0xF0, 0x9D,
-	0xBC, 0x88, 0x44, 0xF0, 0x9D, 0xBC, 0x8A, 0x44,
-	0xF0, 0x9D, 0xBC, 0x9E, 0x44, 0xF0, 0xA0, 0x84,
-	0xA2, 0x44, 0xF0, 0xA0, 0x94, 0x9C, 0x44, 0xF0,
-	// Bytes 1780 - 17bf
-	0xA0, 0x94, 0xA5, 0x44, 0xF0, 0xA0, 0x95, 0x8B,
-	0x44, 0xF0, 0xA0, 0x98, 0xBA, 0x44, 0xF0, 0xA0,
-	0xA0, 0x84, 0x44, 0xF0, 0xA0, 0xA3, 0x9E, 0x44,
-	0xF0, 0xA0, 0xA8, 0xAC, 0x44, 0xF0, 0xA0, 0xAD,
-	0xA3, 0x44, 0xF0, 0xA1, 0x93, 0xA4, 0x44, 0xF0,
-	0xA1, 0x9A, 0xA8, 0x44, 0xF0, 0xA1, 0x9B, 0xAA,
-	0x44, 0xF0, 0xA1, 0xA7, 0x88, 0x44, 0xF0, 0xA1,
-	0xAC, 0x98, 0x44, 0xF0, 0xA1, 0xB4, 0x8B, 0x44,
-	// Bytes 17c0 - 17ff
-	0xF0, 0xA1, 0xB7, 0xA4, 0x44, 0xF0, 0xA1, 0xB7,
-	0xA6, 0x44, 0xF0, 0xA2, 0x86, 0x83, 0x44, 0xF0,
-	0xA2, 0x86, 0x9F, 0x44, 0xF0, 0xA2, 0x8C, 0xB1,
-	0x44, 0xF0, 0xA2, 0x9B, 0x94, 0x44, 0xF0, 0xA2,
-	0xA1, 0x84, 0x44, 0xF0, 0xA2, 0xA1, 0x8A, 0x44,
-	0xF0, 0xA2, 0xAC, 0x8C, 0x44, 0xF0, 0xA2, 0xAF,
-	0xB1, 0x44, 0xF0, 0xA3, 0x80, 0x8A, 0x44, 0xF0,
-	0xA3, 0x8A, 0xB8, 0x44, 0xF0, 0xA3, 0x8D, 0x9F,
-	// Bytes 1800 - 183f
-	0x44, 0xF0, 0xA3, 0x8E, 0x93, 0x44, 0xF0, 0xA3,
-	0x8E, 0x9C, 0x44, 0xF0, 0xA3, 0x8F, 0x83, 0x44,
-	0xF0, 0xA3, 0x8F, 0x95, 0x44, 0xF0, 0xA3, 0x91,
-	0xAD, 0x44, 0xF0, 0xA3, 0x9A, 0xA3, 0x44, 0xF0,
-	0xA3, 0xA2, 0xA7, 0x44, 0xF0, 0xA3, 0xAA, 0x8D,
-	0x44, 0xF0, 0xA3, 0xAB, 0xBA, 0x44, 0xF0, 0xA3,
-	0xB2, 0xBC, 0x44, 0xF0, 0xA3, 0xB4, 0x9E, 0x44,
-	0xF0, 0xA3, 0xBB, 0x91, 0x44, 0xF0, 0xA3, 0xBD,
-	// Bytes 1840 - 187f
-	0x9E, 0x44, 0xF0, 0xA3, 0xBE, 0x8E, 0x44, 0xF0,
-	0xA4, 0x89, 0xA3, 0x44, 0xF0, 0xA4, 0x8B, 0xAE,
-	0x44, 0xF0, 0xA4, 0x8E, 0xAB, 0x44, 0xF0, 0xA4,
-	0x98, 0x88, 0x44, 0xF0, 0xA4, 0x9C, 0xB5, 0x44,
-	0xF0, 0xA4, 0xA0, 0x94, 0x44, 0xF0, 0xA4, 0xB0,
-	0xB6, 0x44, 0xF0, 0xA4, 0xB2, 0x92, 0x44, 0xF0,
-	0xA4, 0xBE, 0xA1, 0x44, 0xF0, 0xA4, 0xBE, 0xB8,
-	0x44, 0xF0, 0xA5, 0x81, 0x84, 0x44, 0xF0, 0xA5,
-	// Bytes 1880 - 18bf
-	0x83, 0xB2, 0x44, 0xF0, 0xA5, 0x83, 0xB3, 0x44,
-	0xF0, 0xA5, 0x84, 0x99, 0x44, 0xF0, 0xA5, 0x84,
-	0xB3, 0x44, 0xF0, 0xA5, 0x89, 0x89, 0x44, 0xF0,
-	0xA5, 0x90, 0x9D, 0x44, 0xF0, 0xA5, 0x98, 0xA6,
-	0x44, 0xF0, 0xA5, 0x9A, 0x9A, 0x44, 0xF0, 0xA5,
-	0x9B, 0x85, 0x44, 0xF0, 0xA5, 0xA5, 0xBC, 0x44,
-	0xF0, 0xA5, 0xAA, 0xA7, 0x44, 0xF0, 0xA5, 0xAE,
-	0xAB, 0x44, 0xF0, 0xA5, 0xB2, 0x80, 0x44, 0xF0,
-	// Bytes 18c0 - 18ff
-	0xA5, 0xB3, 0x90, 0x44, 0xF0, 0xA5, 0xBE, 0x86,
-	0x44, 0xF0, 0xA6, 0x87, 0x9A, 0x44, 0xF0, 0xA6,
-	0x88, 0xA8, 0x44, 0xF0, 0xA6, 0x89, 0x87, 0x44,
-	0xF0, 0xA6, 0x8B, 0x99, 0x44, 0xF0, 0xA6, 0x8C,
-	0xBE, 0x44, 0xF0, 0xA6, 0x93, 0x9A, 0x44, 0xF0,
-	0xA6, 0x94, 0xA3, 0x44, 0xF0, 0xA6, 0x96, 0xA8,
-	0x44, 0xF0, 0xA6, 0x9E, 0xA7, 0x44, 0xF0, 0xA6,
-	0x9E, 0xB5, 0x44, 0xF0, 0xA6, 0xAC, 0xBC, 0x44,
-	// Bytes 1900 - 193f
-	0xF0, 0xA6, 0xB0, 0xB6, 0x44, 0xF0, 0xA6, 0xB3,
-	0x95, 0x44, 0xF0, 0xA6, 0xB5, 0xAB, 0x44, 0xF0,
-	0xA6, 0xBC, 0xAC, 0x44, 0xF0, 0xA6, 0xBE, 0xB1,
-	0x44, 0xF0, 0xA7, 0x83, 0x92, 0x44, 0xF0, 0xA7,
-	0x8F, 0x8A, 0x44, 0xF0, 0xA7, 0x99, 0xA7, 0x44,
-	0xF0, 0xA7, 0xA2, 0xAE, 0x44, 0xF0, 0xA7, 0xA5,
-	0xA6, 0x44, 0xF0, 0xA7, 0xB2, 0xA8, 0x44, 0xF0,
-	0xA7, 0xBB, 0x93, 0x44, 0xF0, 0xA7, 0xBC, 0xAF,
-	// Bytes 1940 - 197f
-	0x44, 0xF0, 0xA8, 0x97, 0x92, 0x44, 0xF0, 0xA8,
-	0x97, 0xAD, 0x44, 0xF0, 0xA8, 0x9C, 0xAE, 0x44,
-	0xF0, 0xA8, 0xAF, 0xBA, 0x44, 0xF0, 0xA8, 0xB5,
-	0xB7, 0x44, 0xF0, 0xA9, 0x85, 0x85, 0x44, 0xF0,
-	0xA9, 0x87, 0x9F, 0x44, 0xF0, 0xA9, 0x88, 0x9A,
-	0x44, 0xF0, 0xA9, 0x90, 0x8A, 0x44, 0xF0, 0xA9,
-	0x92, 0x96, 0x44, 0xF0, 0xA9, 0x96, 0xB6, 0x44,
-	0xF0, 0xA9, 0xAC, 0xB0, 0x44, 0xF0, 0xAA, 0x83,
-	// Bytes 1980 - 19bf
-	0x8E, 0x44, 0xF0, 0xAA, 0x84, 0x85, 0x44, 0xF0,
-	0xAA, 0x88, 0x8E, 0x44, 0xF0, 0xAA, 0x8A, 0x91,
-	0x44, 0xF0, 0xAA, 0x8E, 0x92, 0x44, 0xF0, 0xAA,
-	0x98, 0x80, 0x42, 0x21, 0x21, 0x42, 0x21, 0x3F,
-	0x42, 0x2E, 0x2E, 0x42, 0x30, 0x2C, 0x42, 0x30,
-	0x2E, 0x42, 0x31, 0x2C, 0x42, 0x31, 0x2E, 0x42,
-	0x31, 0x30, 0x42, 0x31, 0x31, 0x42, 0x31, 0x32,
-	0x42, 0x31, 0x33, 0x42, 0x31, 0x34, 0x42, 0x31,
-	// Bytes 19c0 - 19ff
-	0x35, 0x42, 0x31, 0x36, 0x42, 0x31, 0x37, 0x42,
-	0x31, 0x38, 0x42, 0x31, 0x39, 0x42, 0x32, 0x2C,
-	0x42, 0x32, 0x2E, 0x42, 0x32, 0x30, 0x42, 0x32,
-	0x31, 0x42, 0x32, 0x32, 0x42, 0x32, 0x33, 0x42,
-	0x32, 0x34, 0x42, 0x32, 0x35, 0x42, 0x32, 0x36,
-	0x42, 0x32, 0x37, 0x42, 0x32, 0x38, 0x42, 0x32,
-	0x39, 0x42, 0x33, 0x2C, 0x42, 0x33, 0x2E, 0x42,
-	0x33, 0x30, 0x42, 0x33, 0x31, 0x42, 0x33, 0x32,
-	// Bytes 1a00 - 1a3f
-	0x42, 0x33, 0x33, 0x42, 0x33, 0x34, 0x42, 0x33,
-	0x35, 0x42, 0x33, 0x36, 0x42, 0x33, 0x37, 0x42,
-	0x33, 0x38, 0x42, 0x33, 0x39, 0x42, 0x34, 0x2C,
-	0x42, 0x34, 0x2E, 0x42, 0x34, 0x30, 0x42, 0x34,
-	0x31, 0x42, 0x34, 0x32, 0x42, 0x34, 0x33, 0x42,
-	0x34, 0x34, 0x42, 0x34, 0x35, 0x42, 0x34, 0x36,
-	0x42, 0x34, 0x37, 0x42, 0x34, 0x38, 0x42, 0x34,
-	0x39, 0x42, 0x35, 0x2C, 0x42, 0x35, 0x2E, 0x42,
-	// Bytes 1a40 - 1a7f
-	0x35, 0x30, 0x42, 0x36, 0x2C, 0x42, 0x36, 0x2E,
-	0x42, 0x37, 0x2C, 0x42, 0x37, 0x2E, 0x42, 0x38,
-	0x2C, 0x42, 0x38, 0x2E, 0x42, 0x39, 0x2C, 0x42,
-	0x39, 0x2E, 0x42, 0x3D, 0x3D, 0x42, 0x3F, 0x21,
-	0x42, 0x3F, 0x3F, 0x42, 0x41, 0x55, 0x42, 0x42,
-	0x71, 0x42, 0x43, 0x44, 0x42, 0x44, 0x4A, 0x42,
-	0x44, 0x5A, 0x42, 0x44, 0x7A, 0x42, 0x47, 0x42,
-	0x42, 0x47, 0x79, 0x42, 0x48, 0x50, 0x42, 0x48,
-	// Bytes 1a80 - 1abf
-	0x56, 0x42, 0x48, 0x67, 0x42, 0x48, 0x7A, 0x42,
-	0x49, 0x49, 0x42, 0x49, 0x4A, 0x42, 0x49, 0x55,
-	0x42, 0x49, 0x56, 0x42, 0x49, 0x58, 0x42, 0x4B,
-	0x42, 0x42, 0x4B, 0x4B, 0x42, 0x4B, 0x4D, 0x42,
-	0x4C, 0x4A, 0x42, 0x4C, 0x6A, 0x42, 0x4D, 0x42,
-	0x42, 0x4D, 0x43, 0x42, 0x4D, 0x44, 0x42, 0x4D,
-	0x52, 0x42, 0x4D, 0x56, 0x42, 0x4D, 0x57, 0x42,
-	0x4E, 0x4A, 0x42, 0x4E, 0x6A, 0x42, 0x4E, 0x6F,
-	// Bytes 1ac0 - 1aff
-	0x42, 0x50, 0x48, 0x42, 0x50, 0x52, 0x42, 0x50,
-	0x61, 0x42, 0x52, 0x73, 0x42, 0x53, 0x44, 0x42,
-	0x53, 0x4D, 0x42, 0x53, 0x53, 0x42, 0x53, 0x76,
-	0x42, 0x54, 0x4D, 0x42, 0x56, 0x49, 0x42, 0x57,
-	0x43, 0x42, 0x57, 0x5A, 0x42, 0x57, 0x62, 0x42,
-	0x58, 0x49, 0x42, 0x63, 0x63, 0x42, 0x63, 0x64,
-	0x42, 0x63, 0x6D, 0x42, 0x64, 0x42, 0x42, 0x64,
-	0x61, 0x42, 0x64, 0x6C, 0x42, 0x64, 0x6D, 0x42,
-	// Bytes 1b00 - 1b3f
-	0x64, 0x7A, 0x42, 0x65, 0x56, 0x42, 0x66, 0x66,
-	0x42, 0x66, 0x69, 0x42, 0x66, 0x6C, 0x42, 0x66,
-	0x6D, 0x42, 0x68, 0x61, 0x42, 0x69, 0x69, 0x42,
-	0x69, 0x6A, 0x42, 0x69, 0x6E, 0x42, 0x69, 0x76,
-	0x42, 0x69, 0x78, 0x42, 0x6B, 0x41, 0x42, 0x6B,
-	0x56, 0x42, 0x6B, 0x57, 0x42, 0x6B, 0x67, 0x42,
-	0x6B, 0x6C, 0x42, 0x6B, 0x6D, 0x42, 0x6B, 0x74,
-	0x42, 0x6C, 0x6A, 0x42, 0x6C, 0x6D, 0x42, 0x6C,
-	// Bytes 1b40 - 1b7f
-	0x6E, 0x42, 0x6C, 0x78, 0x42, 0x6D, 0x32, 0x42,
-	0x6D, 0x33, 0x42, 0x6D, 0x41, 0x42, 0x6D, 0x56,
-	0x42, 0x6D, 0x57, 0x42, 0x6D, 0x62, 0x42, 0x6D,
-	0x67, 0x42, 0x6D, 0x6C, 0x42, 0x6D, 0x6D, 0x42,
-	0x6D, 0x73, 0x42, 0x6E, 0x41, 0x42, 0x6E, 0x46,
-	0x42, 0x6E, 0x56, 0x42, 0x6E, 0x57, 0x42, 0x6E,
-	0x6A, 0x42, 0x6E, 0x6D, 0x42, 0x6E, 0x73, 0x42,
-	0x6F, 0x56, 0x42, 0x70, 0x41, 0x42, 0x70, 0x46,
-	// Bytes 1b80 - 1bbf
-	0x42, 0x70, 0x56, 0x42, 0x70, 0x57, 0x42, 0x70,
-	0x63, 0x42, 0x70, 0x73, 0x42, 0x73, 0x72, 0x42,
-	0x73, 0x74, 0x42, 0x76, 0x69, 0x42, 0x78, 0x69,
-	0x43, 0x28, 0x31, 0x29, 0x43, 0x28, 0x32, 0x29,
-	0x43, 0x28, 0x33, 0x29, 0x43, 0x28, 0x34, 0x29,
-	0x43, 0x28, 0x35, 0x29, 0x43, 0x28, 0x36, 0x29,
-	0x43, 0x28, 0x37, 0x29, 0x43, 0x28, 0x38, 0x29,
-	0x43, 0x28, 0x39, 0x29, 0x43, 0x28, 0x41, 0x29,
-	// Bytes 1bc0 - 1bff
-	0x43, 0x28, 0x42, 0x29, 0x43, 0x28, 0x43, 0x29,
-	0x43, 0x28, 0x44, 0x29, 0x43, 0x28, 0x45, 0x29,
-	0x43, 0x28, 0x46, 0x29, 0x43, 0x28, 0x47, 0x29,
-	0x43, 0x28, 0x48, 0x29, 0x43, 0x28, 0x49, 0x29,
-	0x43, 0x28, 0x4A, 0x29, 0x43, 0x28, 0x4B, 0x29,
-	0x43, 0x28, 0x4C, 0x29, 0x43, 0x28, 0x4D, 0x29,
-	0x43, 0x28, 0x4E, 0x29, 0x43, 0x28, 0x4F, 0x29,
-	0x43, 0x28, 0x50, 0x29, 0x43, 0x28, 0x51, 0x29,
-	// Bytes 1c00 - 1c3f
-	0x43, 0x28, 0x52, 0x29, 0x43, 0x28, 0x53, 0x29,
-	0x43, 0x28, 0x54, 0x29, 0x43, 0x28, 0x55, 0x29,
-	0x43, 0x28, 0x56, 0x29, 0x43, 0x28, 0x57, 0x29,
-	0x43, 0x28, 0x58, 0x29, 0x43, 0x28, 0x59, 0x29,
-	0x43, 0x28, 0x5A, 0x29, 0x43, 0x28, 0x61, 0x29,
-	0x43, 0x28, 0x62, 0x29, 0x43, 0x28, 0x63, 0x29,
-	0x43, 0x28, 0x64, 0x29, 0x43, 0x28, 0x65, 0x29,
-	0x43, 0x28, 0x66, 0x29, 0x43, 0x28, 0x67, 0x29,
-	// Bytes 1c40 - 1c7f
-	0x43, 0x28, 0x68, 0x29, 0x43, 0x28, 0x69, 0x29,
-	0x43, 0x28, 0x6A, 0x29, 0x43, 0x28, 0x6B, 0x29,
-	0x43, 0x28, 0x6C, 0x29, 0x43, 0x28, 0x6D, 0x29,
-	0x43, 0x28, 0x6E, 0x29, 0x43, 0x28, 0x6F, 0x29,
-	0x43, 0x28, 0x70, 0x29, 0x43, 0x28, 0x71, 0x29,
-	0x43, 0x28, 0x72, 0x29, 0x43, 0x28, 0x73, 0x29,
-	0x43, 0x28, 0x74, 0x29, 0x43, 0x28, 0x75, 0x29,
-	0x43, 0x28, 0x76, 0x29, 0x43, 0x28, 0x77, 0x29,
-	// Bytes 1c80 - 1cbf
-	0x43, 0x28, 0x78, 0x29, 0x43, 0x28, 0x79, 0x29,
-	0x43, 0x28, 0x7A, 0x29, 0x43, 0x2E, 0x2E, 0x2E,
-	0x43, 0x31, 0x30, 0x2E, 0x43, 0x31, 0x31, 0x2E,
-	0x43, 0x31, 0x32, 0x2E, 0x43, 0x31, 0x33, 0x2E,
-	0x43, 0x31, 0x34, 0x2E, 0x43, 0x31, 0x35, 0x2E,
-	0x43, 0x31, 0x36, 0x2E, 0x43, 0x31, 0x37, 0x2E,
-	0x43, 0x31, 0x38, 0x2E, 0x43, 0x31, 0x39, 0x2E,
-	0x43, 0x32, 0x30, 0x2E, 0x43, 0x3A, 0x3A, 0x3D,
-	// Bytes 1cc0 - 1cff
-	0x43, 0x3D, 0x3D, 0x3D, 0x43, 0x43, 0x6F, 0x2E,
-	0x43, 0x46, 0x41, 0x58, 0x43, 0x47, 0x48, 0x7A,
-	0x43, 0x47, 0x50, 0x61, 0x43, 0x49, 0x49, 0x49,
-	0x43, 0x4C, 0x54, 0x44, 0x43, 0x4C, 0xC2, 0xB7,
-	0x43, 0x4D, 0x48, 0x7A, 0x43, 0x4D, 0x50, 0x61,
-	0x43, 0x4D, 0xCE, 0xA9, 0x43, 0x50, 0x50, 0x4D,
-	0x43, 0x50, 0x50, 0x56, 0x43, 0x50, 0x54, 0x45,
-	0x43, 0x54, 0x45, 0x4C, 0x43, 0x54, 0x48, 0x7A,
-	// Bytes 1d00 - 1d3f
-	0x43, 0x56, 0x49, 0x49, 0x43, 0x58, 0x49, 0x49,
-	0x43, 0x61, 0x2F, 0x63, 0x43, 0x61, 0x2F, 0x73,
-	0x43, 0x61, 0xCA, 0xBE, 0x43, 0x62, 0x61, 0x72,
-	0x43, 0x63, 0x2F, 0x6F, 0x43, 0x63, 0x2F, 0x75,
-	0x43, 0x63, 0x61, 0x6C, 0x43, 0x63, 0x6D, 0x32,
-	0x43, 0x63, 0x6D, 0x33, 0x43, 0x64, 0x6D, 0x32,
-	0x43, 0x64, 0x6D, 0x33, 0x43, 0x65, 0x72, 0x67,
-	0x43, 0x66, 0x66, 0x69, 0x43, 0x66, 0x66, 0x6C,
-	// Bytes 1d40 - 1d7f
-	0x43, 0x67, 0x61, 0x6C, 0x43, 0x68, 0x50, 0x61,
-	0x43, 0x69, 0x69, 0x69, 0x43, 0x6B, 0x48, 0x7A,
-	0x43, 0x6B, 0x50, 0x61, 0x43, 0x6B, 0x6D, 0x32,
-	0x43, 0x6B, 0x6D, 0x33, 0x43, 0x6B, 0xCE, 0xA9,
-	0x43, 0x6C, 0x6F, 0x67, 0x43, 0x6C, 0xC2, 0xB7,
-	0x43, 0x6D, 0x69, 0x6C, 0x43, 0x6D, 0x6D, 0x32,
-	0x43, 0x6D, 0x6D, 0x33, 0x43, 0x6D, 0x6F, 0x6C,
-	0x43, 0x72, 0x61, 0x64, 0x43, 0x76, 0x69, 0x69,
-	// Bytes 1d80 - 1dbf
-	0x43, 0x78, 0x69, 0x69, 0x43, 0xC2, 0xB0, 0x43,
-	0x43, 0xC2, 0xB0, 0x46, 0x43, 0xCA, 0xBC, 0x6E,
-	0x43, 0xCE, 0xBC, 0x41, 0x43, 0xCE, 0xBC, 0x46,
-	0x43, 0xCE, 0xBC, 0x56, 0x43, 0xCE, 0xBC, 0x57,
-	0x43, 0xCE, 0xBC, 0x67, 0x43, 0xCE, 0xBC, 0x6C,
-	0x43, 0xCE, 0xBC, 0x6D, 0x43, 0xCE, 0xBC, 0x73,
-	0x44, 0x28, 0x31, 0x30, 0x29, 0x44, 0x28, 0x31,
-	0x31, 0x29, 0x44, 0x28, 0x31, 0x32, 0x29, 0x44,
-	// Bytes 1dc0 - 1dff
-	0x28, 0x31, 0x33, 0x29, 0x44, 0x28, 0x31, 0x34,
-	0x29, 0x44, 0x28, 0x31, 0x35, 0x29, 0x44, 0x28,
-	0x31, 0x36, 0x29, 0x44, 0x28, 0x31, 0x37, 0x29,
-	0x44, 0x28, 0x31, 0x38, 0x29, 0x44, 0x28, 0x31,
-	0x39, 0x29, 0x44, 0x28, 0x32, 0x30, 0x29, 0x44,
-	0x30, 0xE7, 0x82, 0xB9, 0x44, 0x31, 0xE2, 0x81,
-	0x84, 0x44, 0x31, 0xE6, 0x97, 0xA5, 0x44, 0x31,
-	0xE6, 0x9C, 0x88, 0x44, 0x31, 0xE7, 0x82, 0xB9,
-	// Bytes 1e00 - 1e3f
-	0x44, 0x32, 0xE6, 0x97, 0xA5, 0x44, 0x32, 0xE6,
-	0x9C, 0x88, 0x44, 0x32, 0xE7, 0x82, 0xB9, 0x44,
-	0x33, 0xE6, 0x97, 0xA5, 0x44, 0x33, 0xE6, 0x9C,
-	0x88, 0x44, 0x33, 0xE7, 0x82, 0xB9, 0x44, 0x34,
-	0xE6, 0x97, 0xA5, 0x44, 0x34, 0xE6, 0x9C, 0x88,
-	0x44, 0x34, 0xE7, 0x82, 0xB9, 0x44, 0x35, 0xE6,
-	0x97, 0xA5, 0x44, 0x35, 0xE6, 0x9C, 0x88, 0x44,
-	0x35, 0xE7, 0x82, 0xB9, 0x44, 0x36, 0xE6, 0x97,
-	// Bytes 1e40 - 1e7f
-	0xA5, 0x44, 0x36, 0xE6, 0x9C, 0x88, 0x44, 0x36,
-	0xE7, 0x82, 0xB9, 0x44, 0x37, 0xE6, 0x97, 0xA5,
-	0x44, 0x37, 0xE6, 0x9C, 0x88, 0x44, 0x37, 0xE7,
-	0x82, 0xB9, 0x44, 0x38, 0xE6, 0x97, 0xA5, 0x44,
-	0x38, 0xE6, 0x9C, 0x88, 0x44, 0x38, 0xE7, 0x82,
-	0xB9, 0x44, 0x39, 0xE6, 0x97, 0xA5, 0x44, 0x39,
-	0xE6, 0x9C, 0x88, 0x44, 0x39, 0xE7, 0x82, 0xB9,
-	0x44, 0x56, 0x49, 0x49, 0x49, 0x44, 0x61, 0x2E,
-	// Bytes 1e80 - 1ebf
-	0x6D, 0x2E, 0x44, 0x6B, 0x63, 0x61, 0x6C, 0x44,
-	0x70, 0x2E, 0x6D, 0x2E, 0x44, 0x76, 0x69, 0x69,
-	0x69, 0x44, 0xD5, 0xA5, 0xD6, 0x82, 0x44, 0xD5,
-	0xB4, 0xD5, 0xA5, 0x44, 0xD5, 0xB4, 0xD5, 0xAB,
-	0x44, 0xD5, 0xB4, 0xD5, 0xAD, 0x44, 0xD5, 0xB4,
-	0xD5, 0xB6, 0x44, 0xD5, 0xBE, 0xD5, 0xB6, 0x44,
-	0xD7, 0x90, 0xD7, 0x9C, 0x44, 0xD8, 0xA7, 0xD9,
-	0xB4, 0x44, 0xD8, 0xA8, 0xD8, 0xAC, 0x44, 0xD8,
-	// Bytes 1ec0 - 1eff
-	0xA8, 0xD8, 0xAD, 0x44, 0xD8, 0xA8, 0xD8, 0xAE,
-	0x44, 0xD8, 0xA8, 0xD8, 0xB1, 0x44, 0xD8, 0xA8,
-	0xD8, 0xB2, 0x44, 0xD8, 0xA8, 0xD9, 0x85, 0x44,
-	0xD8, 0xA8, 0xD9, 0x86, 0x44, 0xD8, 0xA8, 0xD9,
-	0x87, 0x44, 0xD8, 0xA8, 0xD9, 0x89, 0x44, 0xD8,
-	0xA8, 0xD9, 0x8A, 0x44, 0xD8, 0xAA, 0xD8, 0xAC,
-	0x44, 0xD8, 0xAA, 0xD8, 0xAD, 0x44, 0xD8, 0xAA,
-	0xD8, 0xAE, 0x44, 0xD8, 0xAA, 0xD8, 0xB1, 0x44,
-	// Bytes 1f00 - 1f3f
-	0xD8, 0xAA, 0xD8, 0xB2, 0x44, 0xD8, 0xAA, 0xD9,
-	0x85, 0x44, 0xD8, 0xAA, 0xD9, 0x86, 0x44, 0xD8,
-	0xAA, 0xD9, 0x87, 0x44, 0xD8, 0xAA, 0xD9, 0x89,
-	0x44, 0xD8, 0xAA, 0xD9, 0x8A, 0x44, 0xD8, 0xAB,
-	0xD8, 0xAC, 0x44, 0xD8, 0xAB, 0xD8, 0xB1, 0x44,
-	0xD8, 0xAB, 0xD8, 0xB2, 0x44, 0xD8, 0xAB, 0xD9,
-	0x85, 0x44, 0xD8, 0xAB, 0xD9, 0x86, 0x44, 0xD8,
-	0xAB, 0xD9, 0x87, 0x44, 0xD8, 0xAB, 0xD9, 0x89,
-	// Bytes 1f40 - 1f7f
-	0x44, 0xD8, 0xAB, 0xD9, 0x8A, 0x44, 0xD8, 0xAC,
-	0xD8, 0xAD, 0x44, 0xD8, 0xAC, 0xD9, 0x85, 0x44,
-	0xD8, 0xAC, 0xD9, 0x89, 0x44, 0xD8, 0xAC, 0xD9,
-	0x8A, 0x44, 0xD8, 0xAD, 0xD8, 0xAC, 0x44, 0xD8,
-	0xAD, 0xD9, 0x85, 0x44, 0xD8, 0xAD, 0xD9, 0x89,
-	0x44, 0xD8, 0xAD, 0xD9, 0x8A, 0x44, 0xD8, 0xAE,
-	0xD8, 0xAC, 0x44, 0xD8, 0xAE, 0xD8, 0xAD, 0x44,
-	0xD8, 0xAE, 0xD9, 0x85, 0x44, 0xD8, 0xAE, 0xD9,
-	// Bytes 1f80 - 1fbf
-	0x89, 0x44, 0xD8, 0xAE, 0xD9, 0x8A, 0x44, 0xD8,
-	0xB3, 0xD8, 0xAC, 0x44, 0xD8, 0xB3, 0xD8, 0xAD,
-	0x44, 0xD8, 0xB3, 0xD8, 0xAE, 0x44, 0xD8, 0xB3,
-	0xD8, 0xB1, 0x44, 0xD8, 0xB3, 0xD9, 0x85, 0x44,
-	0xD8, 0xB3, 0xD9, 0x87, 0x44, 0xD8, 0xB3, 0xD9,
-	0x89, 0x44, 0xD8, 0xB3, 0xD9, 0x8A, 0x44, 0xD8,
-	0xB4, 0xD8, 0xAC, 0x44, 0xD8, 0xB4, 0xD8, 0xAD,
-	0x44, 0xD8, 0xB4, 0xD8, 0xAE, 0x44, 0xD8, 0xB4,
-	// Bytes 1fc0 - 1fff
-	0xD8, 0xB1, 0x44, 0xD8, 0xB4, 0xD9, 0x85, 0x44,
-	0xD8, 0xB4, 0xD9, 0x87, 0x44, 0xD8, 0xB4, 0xD9,
-	0x89, 0x44, 0xD8, 0xB4, 0xD9, 0x8A, 0x44, 0xD8,
-	0xB5, 0xD8, 0xAD, 0x44, 0xD8, 0xB5, 0xD8, 0xAE,
-	0x44, 0xD8, 0xB5, 0xD8, 0xB1, 0x44, 0xD8, 0xB5,
-	0xD9, 0x85, 0x44, 0xD8, 0xB5, 0xD9, 0x89, 0x44,
-	0xD8, 0xB5, 0xD9, 0x8A, 0x44, 0xD8, 0xB6, 0xD8,
-	0xAC, 0x44, 0xD8, 0xB6, 0xD8, 0xAD, 0x44, 0xD8,
-	// Bytes 2000 - 203f
-	0xB6, 0xD8, 0xAE, 0x44, 0xD8, 0xB6, 0xD8, 0xB1,
-	0x44, 0xD8, 0xB6, 0xD9, 0x85, 0x44, 0xD8, 0xB6,
-	0xD9, 0x89, 0x44, 0xD8, 0xB6, 0xD9, 0x8A, 0x44,
-	0xD8, 0xB7, 0xD8, 0xAD, 0x44, 0xD8, 0xB7, 0xD9,
-	0x85, 0x44, 0xD8, 0xB7, 0xD9, 0x89, 0x44, 0xD8,
-	0xB7, 0xD9, 0x8A, 0x44, 0xD8, 0xB8, 0xD9, 0x85,
-	0x44, 0xD8, 0xB9, 0xD8, 0xAC, 0x44, 0xD8, 0xB9,
-	0xD9, 0x85, 0x44, 0xD8, 0xB9, 0xD9, 0x89, 0x44,
-	// Bytes 2040 - 207f
-	0xD8, 0xB9, 0xD9, 0x8A, 0x44, 0xD8, 0xBA, 0xD8,
-	0xAC, 0x44, 0xD8, 0xBA, 0xD9, 0x85, 0x44, 0xD8,
-	0xBA, 0xD9, 0x89, 0x44, 0xD8, 0xBA, 0xD9, 0x8A,
-	0x44, 0xD9, 0x81, 0xD8, 0xAC, 0x44, 0xD9, 0x81,
-	0xD8, 0xAD, 0x44, 0xD9, 0x81, 0xD8, 0xAE, 0x44,
-	0xD9, 0x81, 0xD9, 0x85, 0x44, 0xD9, 0x81, 0xD9,
-	0x89, 0x44, 0xD9, 0x81, 0xD9, 0x8A, 0x44, 0xD9,
-	0x82, 0xD8, 0xAD, 0x44, 0xD9, 0x82, 0xD9, 0x85,
-	// Bytes 2080 - 20bf
-	0x44, 0xD9, 0x82, 0xD9, 0x89, 0x44, 0xD9, 0x82,
-	0xD9, 0x8A, 0x44, 0xD9, 0x83, 0xD8, 0xA7, 0x44,
-	0xD9, 0x83, 0xD8, 0xAC, 0x44, 0xD9, 0x83, 0xD8,
-	0xAD, 0x44, 0xD9, 0x83, 0xD8, 0xAE, 0x44, 0xD9,
-	0x83, 0xD9, 0x84, 0x44, 0xD9, 0x83, 0xD9, 0x85,
-	0x44, 0xD9, 0x83, 0xD9, 0x89, 0x44, 0xD9, 0x83,
-	0xD9, 0x8A, 0x44, 0xD9, 0x84, 0xD8, 0xA7, 0x44,
-	0xD9, 0x84, 0xD8, 0xAC, 0x44, 0xD9, 0x84, 0xD8,
-	// Bytes 20c0 - 20ff
-	0xAD, 0x44, 0xD9, 0x84, 0xD8, 0xAE, 0x44, 0xD9,
-	0x84, 0xD9, 0x85, 0x44, 0xD9, 0x84, 0xD9, 0x87,
-	0x44, 0xD9, 0x84, 0xD9, 0x89, 0x44, 0xD9, 0x84,
-	0xD9, 0x8A, 0x44, 0xD9, 0x85, 0xD8, 0xA7, 0x44,
-	0xD9, 0x85, 0xD8, 0xAC, 0x44, 0xD9, 0x85, 0xD8,
-	0xAD, 0x44, 0xD9, 0x85, 0xD8, 0xAE, 0x44, 0xD9,
-	0x85, 0xD9, 0x85, 0x44, 0xD9, 0x85, 0xD9, 0x89,
-	0x44, 0xD9, 0x85, 0xD9, 0x8A, 0x44, 0xD9, 0x86,
-	// Bytes 2100 - 213f
-	0xD8, 0xAC, 0x44, 0xD9, 0x86, 0xD8, 0xAD, 0x44,
-	0xD9, 0x86, 0xD8, 0xAE, 0x44, 0xD9, 0x86, 0xD8,
-	0xB1, 0x44, 0xD9, 0x86, 0xD8, 0xB2, 0x44, 0xD9,
-	0x86, 0xD9, 0x85, 0x44, 0xD9, 0x86, 0xD9, 0x86,
-	0x44, 0xD9, 0x86, 0xD9, 0x87, 0x44, 0xD9, 0x86,
-	0xD9, 0x89, 0x44, 0xD9, 0x86, 0xD9, 0x8A, 0x44,
-	0xD9, 0x87, 0xD8, 0xAC, 0x44, 0xD9, 0x87, 0xD9,
-	0x85, 0x44, 0xD9, 0x87, 0xD9, 0x89, 0x44, 0xD9,
-	// Bytes 2140 - 217f
-	0x87, 0xD9, 0x8A, 0x44, 0xD9, 0x88, 0xD9, 0xB4,
-	0x44, 0xD9, 0x8A, 0xD8, 0xAC, 0x44, 0xD9, 0x8A,
-	0xD8, 0xAD, 0x44, 0xD9, 0x8A, 0xD8, 0xAE, 0x44,
-	0xD9, 0x8A, 0xD8, 0xB1, 0x44, 0xD9, 0x8A, 0xD8,
-	0xB2, 0x44, 0xD9, 0x8A, 0xD9, 0x85, 0x44, 0xD9,
-	0x8A, 0xD9, 0x86, 0x44, 0xD9, 0x8A, 0xD9, 0x87,
-	0x44, 0xD9, 0x8A, 0xD9, 0x89, 0x44, 0xD9, 0x8A,
-	0xD9, 0x8A, 0x44, 0xD9, 0x8A, 0xD9, 0xB4, 0x44,
-	// Bytes 2180 - 21bf
-	0xDB, 0x87, 0xD9, 0xB4, 0x45, 0x28, 0xE1, 0x84,
-	0x80, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x82, 0x29,
-	0x45, 0x28, 0xE1, 0x84, 0x83, 0x29, 0x45, 0x28,
-	0xE1, 0x84, 0x85, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x86, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x87, 0x29,
-	0x45, 0x28, 0xE1, 0x84, 0x89, 0x29, 0x45, 0x28,
-	0xE1, 0x84, 0x8B, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x8C, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x8E, 0x29,
-	// Bytes 21c0 - 21ff
-	0x45, 0x28, 0xE1, 0x84, 0x8F, 0x29, 0x45, 0x28,
-	0xE1, 0x84, 0x90, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x91, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x92, 0x29,
-	0x45, 0x28, 0xE4, 0xB8, 0x80, 0x29, 0x45, 0x28,
-	0xE4, 0xB8, 0x83, 0x29, 0x45, 0x28, 0xE4, 0xB8,
-	0x89, 0x29, 0x45, 0x28, 0xE4, 0xB9, 0x9D, 0x29,
-	0x45, 0x28, 0xE4, 0xBA, 0x8C, 0x29, 0x45, 0x28,
-	0xE4, 0xBA, 0x94, 0x29, 0x45, 0x28, 0xE4, 0xBB,
-	// Bytes 2200 - 223f
-	0xA3, 0x29, 0x45, 0x28, 0xE4, 0xBC, 0x81, 0x29,
-	0x45, 0x28, 0xE4, 0xBC, 0x91, 0x29, 0x45, 0x28,
-	0xE5, 0x85, 0xAB, 0x29, 0x45, 0x28, 0xE5, 0x85,
-	0xAD, 0x29, 0x45, 0x28, 0xE5, 0x8A, 0xB4, 0x29,
-	0x45, 0x28, 0xE5, 0x8D, 0x81, 0x29, 0x45, 0x28,
-	0xE5, 0x8D, 0x94, 0x29, 0x45, 0x28, 0xE5, 0x90,
-	0x8D, 0x29, 0x45, 0x28, 0xE5, 0x91, 0xBC, 0x29,
-	0x45, 0x28, 0xE5, 0x9B, 0x9B, 0x29, 0x45, 0x28,
-	// Bytes 2240 - 227f
-	0xE5, 0x9C, 0x9F, 0x29, 0x45, 0x28, 0xE5, 0xAD,
-	0xA6, 0x29, 0x45, 0x28, 0xE6, 0x97, 0xA5, 0x29,
-	0x45, 0x28, 0xE6, 0x9C, 0x88, 0x29, 0x45, 0x28,
-	0xE6, 0x9C, 0x89, 0x29, 0x45, 0x28, 0xE6, 0x9C,
-	0xA8, 0x29, 0x45, 0x28, 0xE6, 0xA0, 0xAA, 0x29,
-	0x45, 0x28, 0xE6, 0xB0, 0xB4, 0x29, 0x45, 0x28,
-	0xE7, 0x81, 0xAB, 0x29, 0x45, 0x28, 0xE7, 0x89,
-	0xB9, 0x29, 0x45, 0x28, 0xE7, 0x9B, 0xA3, 0x29,
-	// Bytes 2280 - 22bf
-	0x45, 0x28, 0xE7, 0xA4, 0xBE, 0x29, 0x45, 0x28,
-	0xE7, 0xA5, 0x9D, 0x29, 0x45, 0x28, 0xE7, 0xA5,
-	0xAD, 0x29, 0x45, 0x28, 0xE8, 0x87, 0xAA, 0x29,
-	0x45, 0x28, 0xE8, 0x87, 0xB3, 0x29, 0x45, 0x28,
-	0xE8, 0xB2, 0xA1, 0x29, 0x45, 0x28, 0xE8, 0xB3,
-	0x87, 0x29, 0x45, 0x28, 0xE9, 0x87, 0x91, 0x29,
-	0x45, 0x30, 0xE2, 0x81, 0x84, 0x33, 0x45, 0x31,
-	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x31, 0x30, 0xE6,
-	// Bytes 22c0 - 22ff
-	0x9C, 0x88, 0x45, 0x31, 0x30, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x31, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x31, 0xE6, 0x9C, 0x88, 0x45, 0x31, 0x31, 0xE7,
-	0x82, 0xB9, 0x45, 0x31, 0x32, 0xE6, 0x97, 0xA5,
-	0x45, 0x31, 0x32, 0xE6, 0x9C, 0x88, 0x45, 0x31,
-	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x33, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x33, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	// Bytes 2300 - 233f
-	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x35, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x35, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x36, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x36, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x37, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x37, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x38, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x38, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x39, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x39, 0xE7, 0x82, 0xB9,
-	// Bytes 2340 - 237f
-	0x45, 0x31, 0xE2, 0x81, 0x84, 0x32, 0x45, 0x31,
-	0xE2, 0x81, 0x84, 0x33, 0x45, 0x31, 0xE2, 0x81,
-	0x84, 0x34, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x35,
-	0x45, 0x31, 0xE2, 0x81, 0x84, 0x36, 0x45, 0x31,
-	0xE2, 0x81, 0x84, 0x37, 0x45, 0x31, 0xE2, 0x81,
-	0x84, 0x38, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x39,
-	0x45, 0x32, 0x30, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x30, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x31, 0xE6,
-	// Bytes 2380 - 23bf
-	0x97, 0xA5, 0x45, 0x32, 0x31, 0xE7, 0x82, 0xB9,
-	0x45, 0x32, 0x32, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x33, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0x33, 0xE7, 0x82, 0xB9,
-	0x45, 0x32, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x35, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0x36, 0xE6, 0x97, 0xA5,
-	0x45, 0x32, 0x37, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	// Bytes 23c0 - 23ff
-	0x38, 0xE6, 0x97, 0xA5, 0x45, 0x32, 0x39, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0xE2, 0x81, 0x84, 0x33,
-	0x45, 0x32, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
-	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x33, 0x31, 0xE6,
-	0x97, 0xA5, 0x45, 0x33, 0xE2, 0x81, 0x84, 0x34,
-	0x45, 0x33, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
-	0xE2, 0x81, 0x84, 0x38, 0x45, 0x34, 0xE2, 0x81,
-	0x84, 0x35, 0x45, 0x35, 0xE2, 0x81, 0x84, 0x36,
-	// Bytes 2400 - 243f
-	0x45, 0x35, 0xE2, 0x81, 0x84, 0x38, 0x45, 0x37,
-	0xE2, 0x81, 0x84, 0x38, 0x45, 0x41, 0xE2, 0x88,
-	0x95, 0x6D, 0x45, 0x56, 0xE2, 0x88, 0x95, 0x6D,
-	0x45, 0x6D, 0xE2, 0x88, 0x95, 0x73, 0x46, 0x31,
-	0xE2, 0x81, 0x84, 0x31, 0x30, 0x46, 0x43, 0xE2,
-	0x88, 0x95, 0x6B, 0x67, 0x46, 0x6D, 0xE2, 0x88,
-	0x95, 0x73, 0x32, 0x46, 0xD8, 0xA8, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD8, 0xA8, 0xD8, 0xAE, 0xD9,
-	// Bytes 2440 - 247f
-	0x8A, 0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x85,
-	0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x89, 0x46,
-	0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
-	0xAA, 0xD8, 0xAD, 0xD8, 0xAC, 0x46, 0xD8, 0xAA,
-	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8,
-	0xAE, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8, 0xAE,
-	0xD9, 0x89, 0x46, 0xD8, 0xAA, 0xD8, 0xAE, 0xD9,
-	0x8A, 0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAC,
-	// Bytes 2480 - 24bf
-	0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAD, 0x46,
-	0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAE, 0x46, 0xD8,
-	0xAA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAA,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD8,
-	0xAD, 0xD9, 0x89, 0x46, 0xD8, 0xAC, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD8,
-	0xAD, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x89,
-	0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
-	// Bytes 24c0 - 24ff
-	0xD8, 0xAD, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
-	0xAD, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAD,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB3, 0xD8,
-	0xAC, 0xD8, 0xAD, 0x46, 0xD8, 0xB3, 0xD8, 0xAC,
-	0xD9, 0x89, 0x46, 0xD8, 0xB3, 0xD8, 0xAD, 0xD8,
-	0xAC, 0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x89,
-	0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x8A, 0x46,
-	0xD8, 0xB3, 0xD9, 0x85, 0xD8, 0xAC, 0x46, 0xD8,
-	// Bytes 2500 - 253f
-	0xB3, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8, 0xB3,
-	0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8,
-	0xAC, 0xD9, 0x8A, 0x46, 0xD8, 0xB4, 0xD8, 0xAD,
-	0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8, 0xAD, 0xD9,
-	0x8A, 0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD8, 0xAE,
-	0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD9, 0x85, 0x46,
-	0xD8, 0xB5, 0xD8, 0xAD, 0xD8, 0xAD, 0x46, 0xD8,
-	0xB5, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD8, 0xB5,
-	// Bytes 2540 - 257f
-	0xD9, 0x84, 0xD9, 0x89, 0x46, 0xD8, 0xB5, 0xD9,
-	0x84, 0xDB, 0x92, 0x46, 0xD8, 0xB5, 0xD9, 0x85,
-	0xD9, 0x85, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9,
-	0x89, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9, 0x8A,
-	0x46, 0xD8, 0xB6, 0xD8, 0xAE, 0xD9, 0x85, 0x46,
-	0xD8, 0xB7, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8,
-	0xB7, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB7,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB9, 0xD8,
-	// Bytes 2580 - 25bf
-	0xAC, 0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85,
-	0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9,
-	0x89, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9, 0x8A,
-	0x46, 0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x85, 0x46,
-	0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8,
-	0xBA, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x81,
-	0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x81, 0xD9,
-	0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x82, 0xD9, 0x84,
-	// Bytes 25c0 - 25ff
-	0xDB, 0x92, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD8,
-	0xAD, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x85,
-	0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
-	0xD9, 0x83, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
-	0x83, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x84,
-	0xD8, 0xAC, 0xD8, 0xAC, 0x46, 0xD9, 0x84, 0xD8,
-	0xAC, 0xD9, 0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAC,
-	0xD9, 0x8A, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9,
-	// Bytes 2600 - 263f
-	0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x89,
-	0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x8A, 0x46,
-	0xD9, 0x84, 0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9,
-	0x84, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD9, 0x84,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD8,
-	0xAC, 0xD8, 0xAD, 0x46, 0xD9, 0x85, 0xD8, 0xAC,
-	0xD8, 0xAE, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9,
-	0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9, 0x8A,
-	// Bytes 2640 - 267f
-	0x46, 0xD9, 0x85, 0xD8, 0xAD, 0xD8, 0xAC, 0x46,
-	0xD9, 0x85, 0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9,
-	0x85, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x85,
-	0xD8, 0xAE, 0xD8, 0xAC, 0x46, 0xD9, 0x85, 0xD8,
-	0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAE,
-	0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD9, 0x85, 0xD9,
-	0x8A, 0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD8, 0xAD,
-	0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x85, 0x46,
-	// Bytes 2680 - 26bf
-	0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x89, 0x46, 0xD9,
-	0x86, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x86,
-	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9, 0x86, 0xD8,
-	0xAD, 0xD9, 0x89, 0x46, 0xD9, 0x86, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9,
-	0x89, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9, 0x8A,
-	0x46, 0xD9, 0x87, 0xD9, 0x85, 0xD8, 0xAC, 0x46,
-	0xD9, 0x87, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
-	// Bytes 26c0 - 26ff
-	0x8A, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x8A,
-	0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9,
-	0x85, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x85,
-	0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8,
-	0xA7, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAC,
-	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAD, 0x46,
-	0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAE, 0x46, 0xD9,
-	0x8A, 0xD9, 0x94, 0xD8, 0xB1, 0x46, 0xD9, 0x8A,
-	// Bytes 2700 - 273f
-	0xD9, 0x94, 0xD8, 0xB2, 0x46, 0xD9, 0x8A, 0xD9,
-	0x94, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
-	0xD9, 0x86, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9,
-	0x87, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x88,
-	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x89, 0x46,
-	0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x8A, 0x46, 0xD9,
-	0x8A, 0xD9, 0x94, 0xDB, 0x86, 0x46, 0xD9, 0x8A,
-	0xD9, 0x94, 0xDB, 0x87, 0x46, 0xD9, 0x8A, 0xD9,
-	// Bytes 2740 - 277f
-	0x94, 0xDB, 0x88, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
-	0xDB, 0x90, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xDB,
-	0x95, 0x46, 0xE0, 0xB9, 0x8D, 0xE0, 0xB8, 0xB2,
-	0x46, 0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0x99, 0x46,
-	0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0xA1, 0x46, 0xE0,
-	0xBB, 0x8D, 0xE0, 0xBA, 0xB2, 0x46, 0xE0, 0xBD,
-	0x80, 0xE0, 0xBE, 0xB5, 0x46, 0xE0, 0xBD, 0x82,
-	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x8C, 0xE0,
-	// Bytes 2780 - 27bf
-	0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x91, 0xE0, 0xBE,
-	0xB7, 0x46, 0xE0, 0xBD, 0x96, 0xE0, 0xBE, 0xB7,
-	0x46, 0xE0, 0xBD, 0x9B, 0xE0, 0xBE, 0xB7, 0x46,
-	0xE0, 0xBE, 0x90, 0xE0, 0xBE, 0xB5, 0x46, 0xE0,
-	0xBE, 0x92, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE,
-	0x9C, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA1,
-	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA6, 0xE0,
-	0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xAB, 0xE0, 0xBE,
-	// Bytes 27c0 - 27ff
-	0xB7, 0x46, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
-	0x46, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0x46,
-	0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x46, 0xE2,
-	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x46, 0xE3, 0x81,
-	0xBB, 0xE3, 0x81, 0x8B, 0x46, 0xE3, 0x82, 0x88,
-	0xE3, 0x82, 0x8A, 0x46, 0xE3, 0x82, 0xAD, 0xE3,
-	0x83, 0xAD, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x82,
-	0xB3, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0x88,
-	// Bytes 2800 - 283f
-	0x46, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xB3, 0x46,
-	0xE3, 0x83, 0x8A, 0xE3, 0x83, 0x8E, 0x46, 0xE3,
-	0x83, 0x9B, 0xE3, 0x83, 0xB3, 0x46, 0xE3, 0x83,
-	0x9F, 0xE3, 0x83, 0xAA, 0x46, 0xE3, 0x83, 0xAA,
-	0xE3, 0x83, 0xA9, 0x46, 0xE3, 0x83, 0xAC, 0xE3,
-	0x83, 0xA0, 0x46, 0xE4, 0xBB, 0xA4, 0xE5, 0x92,
-	0x8C, 0x46, 0xE5, 0xA4, 0xA7, 0xE6, 0xAD, 0xA3,
-	0x46, 0xE5, 0xB9, 0xB3, 0xE6, 0x88, 0x90, 0x46,
-	// Bytes 2840 - 287f
-	0xE6, 0x98, 0x8E, 0xE6, 0xB2, 0xBB, 0x46, 0xE6,
-	0x98, 0xAD, 0xE5, 0x92, 0x8C, 0x47, 0x72, 0x61,
-	0x64, 0xE2, 0x88, 0x95, 0x73, 0x47, 0xE3, 0x80,
-	0x94, 0x53, 0xE3, 0x80, 0x95, 0x48, 0x28, 0xE1,
-	0x84, 0x80, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
-	0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x29, 0x48,
-	0x28, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1, 0x29,
-	0x48, 0x28, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1,
-	// Bytes 2880 - 28bf
-	0x29, 0x48, 0x28, 0xE1, 0x84, 0x86, 0xE1, 0x85,
-	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x87, 0xE1,
-	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x89,
-	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
-	0x8B, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1,
-	0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
-	0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xAE, 0x29, 0x48,
-	0x28, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1, 0x29,
-	// Bytes 28c0 - 28ff
-	0x48, 0x28, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1,
-	0x29, 0x48, 0x28, 0xE1, 0x84, 0x90, 0xE1, 0x85,
-	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x91, 0xE1,
-	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x92,
-	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x72, 0x61, 0x64,
-	0xE2, 0x88, 0x95, 0x73, 0x32, 0x48, 0xD8, 0xA7,
-	0xD9, 0x83, 0xD8, 0xA8, 0xD8, 0xB1, 0x48, 0xD8,
-	0xA7, 0xD9, 0x84, 0xD9, 0x84, 0xD9, 0x87, 0x48,
-	// Bytes 2900 - 293f
-	0xD8, 0xB1, 0xD8, 0xB3, 0xD9, 0x88, 0xD9, 0x84,
-	0x48, 0xD8, 0xB1, 0xDB, 0x8C, 0xD8, 0xA7, 0xD9,
-	0x84, 0x48, 0xD8, 0xB5, 0xD9, 0x84, 0xD8, 0xB9,
-	0xD9, 0x85, 0x48, 0xD8, 0xB9, 0xD9, 0x84, 0xD9,
-	0x8A, 0xD9, 0x87, 0x48, 0xD9, 0x85, 0xD8, 0xAD,
-	0xD9, 0x85, 0xD8, 0xAF, 0x48, 0xD9, 0x88, 0xD8,
-	0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x49, 0xE2, 0x80,
-	0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2, 0x49,
-	// Bytes 2940 - 297f
-	0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0xE2, 0x80,
-	0xB5, 0x49, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB,
-	0xE2, 0x88, 0xAB, 0x49, 0xE2, 0x88, 0xAE, 0xE2,
-	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x49, 0xE3, 0x80,
-	0x94, 0xE4, 0xB8, 0x89, 0xE3, 0x80, 0x95, 0x49,
-	0xE3, 0x80, 0x94, 0xE4, 0xBA, 0x8C, 0xE3, 0x80,
-	0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5, 0x8B, 0x9D,
-	0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5,
-	// Bytes 2980 - 29bf
-	0xAE, 0x89, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80,
-	0x94, 0xE6, 0x89, 0x93, 0xE3, 0x80, 0x95, 0x49,
-	0xE3, 0x80, 0x94, 0xE6, 0x95, 0x97, 0xE3, 0x80,
-	0x95, 0x49, 0xE3, 0x80, 0x94, 0xE6, 0x9C, 0xAC,
-	0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE7,
-	0x82, 0xB9, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80,
-	0x94, 0xE7, 0x9B, 0x97, 0xE3, 0x80, 0x95, 0x49,
-	0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	// Bytes 29c0 - 29ff
-	0xAB, 0x49, 0xE3, 0x82, 0xA4, 0xE3, 0x83, 0xB3,
-	0xE3, 0x83, 0x81, 0x49, 0xE3, 0x82, 0xA6, 0xE3,
-	0x82, 0xA9, 0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x82,
-	0xAA, 0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB9, 0x49,
-	0xE3, 0x82, 0xAA, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0xA0, 0x49, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0xA4,
-	0xE3, 0x83, 0xAA, 0x49, 0xE3, 0x82, 0xB1, 0xE3,
-	0x83, 0xBC, 0xE3, 0x82, 0xB9, 0x49, 0xE3, 0x82,
-	// Bytes 2a00 - 2a3f
-	0xB3, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x8A, 0x49,
-	0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83,
-	0x81, 0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3,
-	0xE3, 0x83, 0x88, 0x49, 0xE3, 0x83, 0x86, 0xE3,
-	0x82, 0x99, 0xE3, 0x82, 0xB7, 0x49, 0xE3, 0x83,
-	0x88, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49,
-	0xE3, 0x83, 0x8E, 0xE3, 0x83, 0x83, 0xE3, 0x83,
-	0x88, 0x49, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0xA4,
-	// Bytes 2a40 - 2a7f
-	0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83, 0x92, 0xE3,
-	0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83,
-	0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xB3, 0x49,
-	0xE3, 0x83, 0x95, 0xE3, 0x83, 0xA9, 0xE3, 0x83,
-	0xB3, 0x49, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
-	0xE3, 0x82, 0xBD, 0x49, 0xE3, 0x83, 0x98, 0xE3,
-	0x83, 0xAB, 0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83,
-	0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB, 0x49,
-	// Bytes 2a80 - 2abf
-	0xE3, 0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0xB3, 0x49, 0xE3, 0x83, 0x9E, 0xE3, 0x82, 0xA4,
-	0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83, 0x9E, 0xE3,
-	0x83, 0x83, 0xE3, 0x83, 0x8F, 0x49, 0xE3, 0x83,
-	0x9E, 0xE3, 0x83, 0xAB, 0xE3, 0x82, 0xAF, 0x49,
-	0xE3, 0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0xAB, 0x49, 0xE3, 0x83, 0xA6, 0xE3, 0x82, 0xA2,
-	0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x83, 0xAF, 0xE3,
-	// Bytes 2ac0 - 2aff
-	0x83, 0x83, 0xE3, 0x83, 0x88, 0x4C, 0xE2, 0x80,
-	0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2,
-	0x80, 0xB2, 0x4C, 0xE2, 0x88, 0xAB, 0xE2, 0x88,
-	0xAB, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x4C,
-	0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xAB, 0xE3, 0x83,
-	0x95, 0xE3, 0x82, 0xA1, 0x4C, 0xE3, 0x82, 0xA8,
-	0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xAB, 0xE3, 0x83,
-	0xBC, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99,
-	// Bytes 2b00 - 2b3f
-	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3, 0x4C, 0xE3,
-	0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xB3,
-	0xE3, 0x83, 0x9E, 0x4C, 0xE3, 0x82, 0xAB, 0xE3,
-	0x83, 0xA9, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88,
-	0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x83, 0xAD, 0xE3,
-	0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C, 0xE3, 0x82,
-	0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x8B, 0xE3,
-	0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x83,
-	// Bytes 2b40 - 2b7f
-	0xA5, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C,
-	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	0xA9, 0xE3, 0x83, 0xA0, 0x4C, 0xE3, 0x82, 0xAF,
-	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0x8D, 0x4C, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0xA4,
-	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
-	0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC,
-	0xE3, 0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x8F, 0xE3,
-	// Bytes 2b80 - 2bbf
-	0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x84,
-	0x4C, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3,
-	0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83,
-	0x95, 0xE3, 0x82, 0xA3, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0x88, 0x4C, 0xE3, 0x83, 0x98, 0xE3, 0x82,
-	0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xBF, 0x4C,
-	0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
-	0x8B, 0xE3, 0x83, 0x92, 0x4C, 0xE3, 0x83, 0x98,
-	// Bytes 2bc0 - 2bff
-	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xB3, 0xE3, 0x82,
-	0xB9, 0x4C, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99,
-	0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x88, 0x4C, 0xE3,
-	0x83, 0x9E, 0xE3, 0x82, 0xA4, 0xE3, 0x82, 0xAF,
-	0xE3, 0x83, 0xAD, 0x4C, 0xE3, 0x83, 0x9F, 0xE3,
-	0x82, 0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3,
-	0x4C, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0x88, 0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83,
-	// Bytes 2c00 - 2c3f
-	0xAA, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88, 0xE3,
-	0x83, 0xAB, 0x4C, 0xE3, 0x83, 0xAB, 0xE3, 0x83,
-	0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0x4C,
-	0xE6, 0xA0, 0xAA, 0xE5, 0xBC, 0x8F, 0xE4, 0xBC,
-	0x9A, 0xE7, 0xA4, 0xBE, 0x4E, 0x28, 0xE1, 0x84,
-	0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x92, 0xE1,
-	0x85, 0xAE, 0x29, 0x4F, 0xD8, 0xAC, 0xD9, 0x84,
-	0x20, 0xD8, 0xAC, 0xD9, 0x84, 0xD8, 0xA7, 0xD9,
-	// Bytes 2c40 - 2c7f
-	0x84, 0xD9, 0x87, 0x4F, 0xE3, 0x82, 0xA2, 0xE3,
-	0x83, 0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
-	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xA2, 0xE3,
-	0x83, 0xB3, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
-	0xE3, 0x82, 0xA2, 0x4F, 0xE3, 0x82, 0xAD, 0xE3,
-	0x83, 0xAD, 0xE3, 0x83, 0xAF, 0xE3, 0x83, 0x83,
-	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xB5, 0xE3,
-	0x83, 0xB3, 0xE3, 0x83, 0x81, 0xE3, 0x83, 0xBC,
-	// Bytes 2c80 - 2cbf
-	0xE3, 0x83, 0xA0, 0x4F, 0xE3, 0x83, 0x8F, 0xE3,
-	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAC,
-	0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x98, 0xE3,
-	0x82, 0xAF, 0xE3, 0x82, 0xBF, 0xE3, 0x83, 0xBC,
-	0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x9B, 0xE3,
-	0x82, 0x9A, 0xE3, 0x82, 0xA4, 0xE3, 0x83, 0xB3,
-	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x83, 0x9E, 0xE3,
-	0x83, 0xB3, 0xE3, 0x82, 0xB7, 0xE3, 0x83, 0xA7,
-	// Bytes 2cc0 - 2cff
-	0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xA1, 0xE3,
-	0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x88,
-	0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xAB, 0xE3,
-	0x83, 0xBC, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99,
-	0xE3, 0x83, 0xAB, 0x51, 0x28, 0xE1, 0x84, 0x8B,
-	0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x8C, 0xE1, 0x85,
-	0xA5, 0xE1, 0x86, 0xAB, 0x29, 0x52, 0xE3, 0x82,
-	0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0xE3,
-	// Bytes 2d00 - 2d3f
-	0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC,
-	0x52, 0xE3, 0x82, 0xAD, 0xE3, 0x83, 0xAD, 0xE3,
-	0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xA9,
-	0xE3, 0x83, 0xA0, 0x52, 0xE3, 0x82, 0xAD, 0xE3,
-	0x83, 0xAD, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC,
-	0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x52, 0xE3,
-	0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xA9,
-	0xE3, 0x83, 0xA0, 0xE3, 0x83, 0x88, 0xE3, 0x83,
-	// Bytes 2d40 - 2d7f
-	0xB3, 0x52, 0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB,
-	0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0xE3, 0x82,
-	0xA4, 0xE3, 0x83, 0xAD, 0x52, 0xE3, 0x83, 0x8F,
-	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x82,
-	0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x88, 0x52,
-	0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82,
-	0xA2, 0xE3, 0x82, 0xB9, 0xE3, 0x83, 0x88, 0xE3,
-	0x83, 0xAB, 0x52, 0xE3, 0x83, 0x95, 0xE3, 0x82,
-	// Bytes 2d80 - 2dbf
-	0x99, 0xE3, 0x83, 0x83, 0xE3, 0x82, 0xB7, 0xE3,
-	0x82, 0xA7, 0xE3, 0x83, 0xAB, 0x52, 0xE3, 0x83,
-	0x9F, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0x8F, 0xE3,
-	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB,
-	0x52, 0xE3, 0x83, 0xAC, 0xE3, 0x83, 0xB3, 0xE3,
-	0x83, 0x88, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99,
-	0xE3, 0x83, 0xB3, 0x61, 0xD8, 0xB5, 0xD9, 0x84,
-	0xD9, 0x89, 0x20, 0xD8, 0xA7, 0xD9, 0x84, 0xD9,
-	// Bytes 2dc0 - 2dff
-	0x84, 0xD9, 0x87, 0x20, 0xD8, 0xB9, 0xD9, 0x84,
-	0xD9, 0x8A, 0xD9, 0x87, 0x20, 0xD9, 0x88, 0xD8,
-	0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x06, 0xE0, 0xA7,
-	0x87, 0xE0, 0xA6, 0xBE, 0x01, 0x06, 0xE0, 0xA7,
-	0x87, 0xE0, 0xA7, 0x97, 0x01, 0x06, 0xE0, 0xAD,
-	0x87, 0xE0, 0xAC, 0xBE, 0x01, 0x06, 0xE0, 0xAD,
-	0x87, 0xE0, 0xAD, 0x96, 0x01, 0x06, 0xE0, 0xAD,
-	0x87, 0xE0, 0xAD, 0x97, 0x01, 0x06, 0xE0, 0xAE,
-	// Bytes 2e00 - 2e3f
-	0x92, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0, 0xAF,
-	0x86, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0, 0xAF,
-	0x86, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0, 0xAF,
-	0x87, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0, 0xB2,
-	0xBF, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0, 0xB3,
-	0x86, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0, 0xB3,
-	0x86, 0xE0, 0xB3, 0x96, 0x01, 0x06, 0xE0, 0xB5,
-	0x86, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0, 0xB5,
-	// Bytes 2e40 - 2e7f
-	0x86, 0xE0, 0xB5, 0x97, 0x01, 0x06, 0xE0, 0xB5,
-	0x87, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0, 0xB7,
-	0x99, 0xE0, 0xB7, 0x9F, 0x01, 0x06, 0xE1, 0x80,
-	0xA5, 0xE1, 0x80, 0xAE, 0x01, 0x06, 0xE1, 0xAC,
-	0x85, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0x87, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0x89, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0x8B, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	// Bytes 2e80 - 2ebf
-	0x8D, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0x91, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0xBA, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0xBC, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0xBE, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
-	0xBF, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAD,
-	0x82, 0xE1, 0xAC, 0xB5, 0x01, 0x08, 0xF0, 0x91,
-	0x84, 0xB1, 0xF0, 0x91, 0x84, 0xA7, 0x01, 0x08,
-	// Bytes 2ec0 - 2eff
-	0xF0, 0x91, 0x84, 0xB2, 0xF0, 0x91, 0x84, 0xA7,
-	0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87, 0xF0, 0x91,
-	0x8C, 0xBE, 0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87,
-	0xF0, 0x91, 0x8D, 0x97, 0x01, 0x08, 0xF0, 0x91,
-	0x92, 0xB9, 0xF0, 0x91, 0x92, 0xB0, 0x01, 0x08,
-	0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92, 0xBA,
-	0x01, 0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91,
-	0x92, 0xBD, 0x01, 0x08, 0xF0, 0x91, 0x96, 0xB8,
-	// Bytes 2f00 - 2f3f
-	0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08, 0xF0, 0x91,
-	0x96, 0xB9, 0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08,
-	0xF0, 0x91, 0xA4, 0xB5, 0xF0, 0x91, 0xA4, 0xB0,
-	0x01, 0x09, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82,
-	0xE0, 0xB3, 0x95, 0x02, 0x09, 0xE0, 0xB7, 0x99,
-	0xE0, 0xB7, 0x8F, 0xE0, 0xB7, 0x8A, 0x16, 0x44,
-	0x44, 0x5A, 0xCC, 0x8C, 0xCD, 0x44, 0x44, 0x7A,
-	0xCC, 0x8C, 0xCD, 0x44, 0x64, 0x7A, 0xCC, 0x8C,
-	// Bytes 2f40 - 2f7f
-	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x93,
-	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x94,
-	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x95,
-	0xB9, 0x46, 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x86, 0xE1, 0x85, 0xA1,
-	// Bytes 2f80 - 2fbf
-	0x01, 0x46, 0xE1, 0x84, 0x87, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x89, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xAE,
-	0x01, 0x46, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x90, 0xE1, 0x85, 0xA1,
-	// Bytes 2fc0 - 2fff
-	0x01, 0x46, 0xE1, 0x84, 0x91, 0xE1, 0x85, 0xA1,
-	0x01, 0x46, 0xE1, 0x84, 0x92, 0xE1, 0x85, 0xA1,
-	0x01, 0x49, 0xE3, 0x83, 0xA1, 0xE3, 0x82, 0xAB,
-	0xE3, 0x82, 0x99, 0x11, 0x4C, 0xE1, 0x84, 0x8C,
-	0xE1, 0x85, 0xAE, 0xE1, 0x84, 0x8B, 0xE1, 0x85,
-	0xB4, 0x01, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x82,
-	0x99, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x11,
-	0x4C, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0xBC, 0xE3,
-	// Bytes 3000 - 303f
-	0x83, 0x9B, 0xE3, 0x82, 0x9A, 0x11, 0x4C, 0xE3,
-	0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88,
-	0xE3, 0x82, 0x99, 0x11, 0x4F, 0xE1, 0x84, 0x8E,
-	0xE1, 0x85, 0xA1, 0xE1, 0x86, 0xB7, 0xE1, 0x84,
-	0x80, 0xE1, 0x85, 0xA9, 0x01, 0x4F, 0xE3, 0x82,
-	0xA4, 0xE3, 0x83, 0x8B, 0xE3, 0x83, 0xB3, 0xE3,
-	0x82, 0xAF, 0xE3, 0x82, 0x99, 0x11, 0x4F, 0xE3,
-	0x82, 0xB7, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xB3,
-	// Bytes 3040 - 307f
-	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0x11, 0x4F,
-	0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
-	0xBC, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x11,
-	0x4F, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0xE3,
-	0x83, 0xB3, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
-	0x11, 0x52, 0xE3, 0x82, 0xA8, 0xE3, 0x82, 0xB9,
-	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0x88, 0xE3, 0x82, 0x99, 0x11, 0x52, 0xE3, 0x83,
-	// Bytes 3080 - 30bf
-	0x95, 0xE3, 0x82, 0xA1, 0xE3, 0x83, 0xA9, 0xE3,
-	0x83, 0x83, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
-	0x11, 0x86, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82,
-	0x01, 0x86, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8F,
-	0x01, 0x03, 0x3C, 0xCC, 0xB8, 0x05, 0x03, 0x3D,
-	0xCC, 0xB8, 0x05, 0x03, 0x3E, 0xCC, 0xB8, 0x05,
-	0x03, 0x41, 0xCC, 0x80, 0xCD, 0x03, 0x41, 0xCC,
-	0x81, 0xCD, 0x03, 0x41, 0xCC, 0x83, 0xCD, 0x03,
-	// Bytes 30c0 - 30ff
-	0x41, 0xCC, 0x84, 0xCD, 0x03, 0x41, 0xCC, 0x89,
-	0xCD, 0x03, 0x41, 0xCC, 0x8C, 0xCD, 0x03, 0x41,
-	0xCC, 0x8F, 0xCD, 0x03, 0x41, 0xCC, 0x91, 0xCD,
-	0x03, 0x41, 0xCC, 0xA5, 0xB9, 0x03, 0x41, 0xCC,
-	0xA8, 0xA9, 0x03, 0x42, 0xCC, 0x87, 0xCD, 0x03,
-	0x42, 0xCC, 0xA3, 0xB9, 0x03, 0x42, 0xCC, 0xB1,
-	0xB9, 0x03, 0x43, 0xCC, 0x81, 0xCD, 0x03, 0x43,
-	0xCC, 0x82, 0xCD, 0x03, 0x43, 0xCC, 0x87, 0xCD,
-	// Bytes 3100 - 313f
-	0x03, 0x43, 0xCC, 0x8C, 0xCD, 0x03, 0x44, 0xCC,
-	0x87, 0xCD, 0x03, 0x44, 0xCC, 0x8C, 0xCD, 0x03,
-	0x44, 0xCC, 0xA3, 0xB9, 0x03, 0x44, 0xCC, 0xA7,
-	0xA9, 0x03, 0x44, 0xCC, 0xAD, 0xB9, 0x03, 0x44,
-	0xCC, 0xB1, 0xB9, 0x03, 0x45, 0xCC, 0x80, 0xCD,
-	0x03, 0x45, 0xCC, 0x81, 0xCD, 0x03, 0x45, 0xCC,
-	0x83, 0xCD, 0x03, 0x45, 0xCC, 0x86, 0xCD, 0x03,
-	0x45, 0xCC, 0x87, 0xCD, 0x03, 0x45, 0xCC, 0x88,
-	// Bytes 3140 - 317f
-	0xCD, 0x03, 0x45, 0xCC, 0x89, 0xCD, 0x03, 0x45,
-	0xCC, 0x8C, 0xCD, 0x03, 0x45, 0xCC, 0x8F, 0xCD,
-	0x03, 0x45, 0xCC, 0x91, 0xCD, 0x03, 0x45, 0xCC,
-	0xA8, 0xA9, 0x03, 0x45, 0xCC, 0xAD, 0xB9, 0x03,
-	0x45, 0xCC, 0xB0, 0xB9, 0x03, 0x46, 0xCC, 0x87,
-	0xCD, 0x03, 0x47, 0xCC, 0x81, 0xCD, 0x03, 0x47,
-	0xCC, 0x82, 0xCD, 0x03, 0x47, 0xCC, 0x84, 0xCD,
-	0x03, 0x47, 0xCC, 0x86, 0xCD, 0x03, 0x47, 0xCC,
-	// Bytes 3180 - 31bf
-	0x87, 0xCD, 0x03, 0x47, 0xCC, 0x8C, 0xCD, 0x03,
-	0x47, 0xCC, 0xA7, 0xA9, 0x03, 0x48, 0xCC, 0x82,
-	0xCD, 0x03, 0x48, 0xCC, 0x87, 0xCD, 0x03, 0x48,
-	0xCC, 0x88, 0xCD, 0x03, 0x48, 0xCC, 0x8C, 0xCD,
-	0x03, 0x48, 0xCC, 0xA3, 0xB9, 0x03, 0x48, 0xCC,
-	0xA7, 0xA9, 0x03, 0x48, 0xCC, 0xAE, 0xB9, 0x03,
-	0x49, 0xCC, 0x80, 0xCD, 0x03, 0x49, 0xCC, 0x81,
-	0xCD, 0x03, 0x49, 0xCC, 0x82, 0xCD, 0x03, 0x49,
-	// Bytes 31c0 - 31ff
-	0xCC, 0x83, 0xCD, 0x03, 0x49, 0xCC, 0x84, 0xCD,
-	0x03, 0x49, 0xCC, 0x86, 0xCD, 0x03, 0x49, 0xCC,
-	0x87, 0xCD, 0x03, 0x49, 0xCC, 0x89, 0xCD, 0x03,
-	0x49, 0xCC, 0x8C, 0xCD, 0x03, 0x49, 0xCC, 0x8F,
-	0xCD, 0x03, 0x49, 0xCC, 0x91, 0xCD, 0x03, 0x49,
-	0xCC, 0xA3, 0xB9, 0x03, 0x49, 0xCC, 0xA8, 0xA9,
-	0x03, 0x49, 0xCC, 0xB0, 0xB9, 0x03, 0x4A, 0xCC,
-	0x82, 0xCD, 0x03, 0x4B, 0xCC, 0x81, 0xCD, 0x03,
-	// Bytes 3200 - 323f
-	0x4B, 0xCC, 0x8C, 0xCD, 0x03, 0x4B, 0xCC, 0xA3,
-	0xB9, 0x03, 0x4B, 0xCC, 0xA7, 0xA9, 0x03, 0x4B,
-	0xCC, 0xB1, 0xB9, 0x03, 0x4C, 0xCC, 0x81, 0xCD,
-	0x03, 0x4C, 0xCC, 0x8C, 0xCD, 0x03, 0x4C, 0xCC,
-	0xA7, 0xA9, 0x03, 0x4C, 0xCC, 0xAD, 0xB9, 0x03,
-	0x4C, 0xCC, 0xB1, 0xB9, 0x03, 0x4D, 0xCC, 0x81,
-	0xCD, 0x03, 0x4D, 0xCC, 0x87, 0xCD, 0x03, 0x4D,
-	0xCC, 0xA3, 0xB9, 0x03, 0x4E, 0xCC, 0x80, 0xCD,
-	// Bytes 3240 - 327f
-	0x03, 0x4E, 0xCC, 0x81, 0xCD, 0x03, 0x4E, 0xCC,
-	0x83, 0xCD, 0x03, 0x4E, 0xCC, 0x87, 0xCD, 0x03,
-	0x4E, 0xCC, 0x8C, 0xCD, 0x03, 0x4E, 0xCC, 0xA3,
-	0xB9, 0x03, 0x4E, 0xCC, 0xA7, 0xA9, 0x03, 0x4E,
-	0xCC, 0xAD, 0xB9, 0x03, 0x4E, 0xCC, 0xB1, 0xB9,
-	0x03, 0x4F, 0xCC, 0x80, 0xCD, 0x03, 0x4F, 0xCC,
-	0x81, 0xCD, 0x03, 0x4F, 0xCC, 0x86, 0xCD, 0x03,
-	0x4F, 0xCC, 0x89, 0xCD, 0x03, 0x4F, 0xCC, 0x8B,
-	// Bytes 3280 - 32bf
-	0xCD, 0x03, 0x4F, 0xCC, 0x8C, 0xCD, 0x03, 0x4F,
-	0xCC, 0x8F, 0xCD, 0x03, 0x4F, 0xCC, 0x91, 0xCD,
-	0x03, 0x50, 0xCC, 0x81, 0xCD, 0x03, 0x50, 0xCC,
-	0x87, 0xCD, 0x03, 0x52, 0xCC, 0x81, 0xCD, 0x03,
-	0x52, 0xCC, 0x87, 0xCD, 0x03, 0x52, 0xCC, 0x8C,
-	0xCD, 0x03, 0x52, 0xCC, 0x8F, 0xCD, 0x03, 0x52,
-	0xCC, 0x91, 0xCD, 0x03, 0x52, 0xCC, 0xA7, 0xA9,
-	0x03, 0x52, 0xCC, 0xB1, 0xB9, 0x03, 0x53, 0xCC,
-	// Bytes 32c0 - 32ff
-	0x82, 0xCD, 0x03, 0x53, 0xCC, 0x87, 0xCD, 0x03,
-	0x53, 0xCC, 0xA6, 0xB9, 0x03, 0x53, 0xCC, 0xA7,
-	0xA9, 0x03, 0x54, 0xCC, 0x87, 0xCD, 0x03, 0x54,
-	0xCC, 0x8C, 0xCD, 0x03, 0x54, 0xCC, 0xA3, 0xB9,
-	0x03, 0x54, 0xCC, 0xA6, 0xB9, 0x03, 0x54, 0xCC,
-	0xA7, 0xA9, 0x03, 0x54, 0xCC, 0xAD, 0xB9, 0x03,
-	0x54, 0xCC, 0xB1, 0xB9, 0x03, 0x55, 0xCC, 0x80,
-	0xCD, 0x03, 0x55, 0xCC, 0x81, 0xCD, 0x03, 0x55,
-	// Bytes 3300 - 333f
-	0xCC, 0x82, 0xCD, 0x03, 0x55, 0xCC, 0x86, 0xCD,
-	0x03, 0x55, 0xCC, 0x89, 0xCD, 0x03, 0x55, 0xCC,
-	0x8A, 0xCD, 0x03, 0x55, 0xCC, 0x8B, 0xCD, 0x03,
-	0x55, 0xCC, 0x8C, 0xCD, 0x03, 0x55, 0xCC, 0x8F,
-	0xCD, 0x03, 0x55, 0xCC, 0x91, 0xCD, 0x03, 0x55,
-	0xCC, 0xA3, 0xB9, 0x03, 0x55, 0xCC, 0xA4, 0xB9,
-	0x03, 0x55, 0xCC, 0xA8, 0xA9, 0x03, 0x55, 0xCC,
-	0xAD, 0xB9, 0x03, 0x55, 0xCC, 0xB0, 0xB9, 0x03,
-	// Bytes 3340 - 337f
-	0x56, 0xCC, 0x83, 0xCD, 0x03, 0x56, 0xCC, 0xA3,
-	0xB9, 0x03, 0x57, 0xCC, 0x80, 0xCD, 0x03, 0x57,
-	0xCC, 0x81, 0xCD, 0x03, 0x57, 0xCC, 0x82, 0xCD,
-	0x03, 0x57, 0xCC, 0x87, 0xCD, 0x03, 0x57, 0xCC,
-	0x88, 0xCD, 0x03, 0x57, 0xCC, 0xA3, 0xB9, 0x03,
-	0x58, 0xCC, 0x87, 0xCD, 0x03, 0x58, 0xCC, 0x88,
-	0xCD, 0x03, 0x59, 0xCC, 0x80, 0xCD, 0x03, 0x59,
-	0xCC, 0x81, 0xCD, 0x03, 0x59, 0xCC, 0x82, 0xCD,
-	// Bytes 3380 - 33bf
-	0x03, 0x59, 0xCC, 0x83, 0xCD, 0x03, 0x59, 0xCC,
-	0x84, 0xCD, 0x03, 0x59, 0xCC, 0x87, 0xCD, 0x03,
-	0x59, 0xCC, 0x88, 0xCD, 0x03, 0x59, 0xCC, 0x89,
-	0xCD, 0x03, 0x59, 0xCC, 0xA3, 0xB9, 0x03, 0x5A,
-	0xCC, 0x81, 0xCD, 0x03, 0x5A, 0xCC, 0x82, 0xCD,
-	0x03, 0x5A, 0xCC, 0x87, 0xCD, 0x03, 0x5A, 0xCC,
-	0x8C, 0xCD, 0x03, 0x5A, 0xCC, 0xA3, 0xB9, 0x03,
-	0x5A, 0xCC, 0xB1, 0xB9, 0x03, 0x61, 0xCC, 0x80,
-	// Bytes 33c0 - 33ff
-	0xCD, 0x03, 0x61, 0xCC, 0x81, 0xCD, 0x03, 0x61,
-	0xCC, 0x83, 0xCD, 0x03, 0x61, 0xCC, 0x84, 0xCD,
-	0x03, 0x61, 0xCC, 0x89, 0xCD, 0x03, 0x61, 0xCC,
-	0x8C, 0xCD, 0x03, 0x61, 0xCC, 0x8F, 0xCD, 0x03,
-	0x61, 0xCC, 0x91, 0xCD, 0x03, 0x61, 0xCC, 0xA5,
-	0xB9, 0x03, 0x61, 0xCC, 0xA8, 0xA9, 0x03, 0x62,
-	0xCC, 0x87, 0xCD, 0x03, 0x62, 0xCC, 0xA3, 0xB9,
-	0x03, 0x62, 0xCC, 0xB1, 0xB9, 0x03, 0x63, 0xCC,
-	// Bytes 3400 - 343f
-	0x81, 0xCD, 0x03, 0x63, 0xCC, 0x82, 0xCD, 0x03,
-	0x63, 0xCC, 0x87, 0xCD, 0x03, 0x63, 0xCC, 0x8C,
-	0xCD, 0x03, 0x64, 0xCC, 0x87, 0xCD, 0x03, 0x64,
-	0xCC, 0x8C, 0xCD, 0x03, 0x64, 0xCC, 0xA3, 0xB9,
-	0x03, 0x64, 0xCC, 0xA7, 0xA9, 0x03, 0x64, 0xCC,
-	0xAD, 0xB9, 0x03, 0x64, 0xCC, 0xB1, 0xB9, 0x03,
-	0x65, 0xCC, 0x80, 0xCD, 0x03, 0x65, 0xCC, 0x81,
-	0xCD, 0x03, 0x65, 0xCC, 0x83, 0xCD, 0x03, 0x65,
-	// Bytes 3440 - 347f
-	0xCC, 0x86, 0xCD, 0x03, 0x65, 0xCC, 0x87, 0xCD,
-	0x03, 0x65, 0xCC, 0x88, 0xCD, 0x03, 0x65, 0xCC,
-	0x89, 0xCD, 0x03, 0x65, 0xCC, 0x8C, 0xCD, 0x03,
-	0x65, 0xCC, 0x8F, 0xCD, 0x03, 0x65, 0xCC, 0x91,
-	0xCD, 0x03, 0x65, 0xCC, 0xA8, 0xA9, 0x03, 0x65,
-	0xCC, 0xAD, 0xB9, 0x03, 0x65, 0xCC, 0xB0, 0xB9,
-	0x03, 0x66, 0xCC, 0x87, 0xCD, 0x03, 0x67, 0xCC,
-	0x81, 0xCD, 0x03, 0x67, 0xCC, 0x82, 0xCD, 0x03,
-	// Bytes 3480 - 34bf
-	0x67, 0xCC, 0x84, 0xCD, 0x03, 0x67, 0xCC, 0x86,
-	0xCD, 0x03, 0x67, 0xCC, 0x87, 0xCD, 0x03, 0x67,
-	0xCC, 0x8C, 0xCD, 0x03, 0x67, 0xCC, 0xA7, 0xA9,
-	0x03, 0x68, 0xCC, 0x82, 0xCD, 0x03, 0x68, 0xCC,
-	0x87, 0xCD, 0x03, 0x68, 0xCC, 0x88, 0xCD, 0x03,
-	0x68, 0xCC, 0x8C, 0xCD, 0x03, 0x68, 0xCC, 0xA3,
-	0xB9, 0x03, 0x68, 0xCC, 0xA7, 0xA9, 0x03, 0x68,
-	0xCC, 0xAE, 0xB9, 0x03, 0x68, 0xCC, 0xB1, 0xB9,
-	// Bytes 34c0 - 34ff
-	0x03, 0x69, 0xCC, 0x80, 0xCD, 0x03, 0x69, 0xCC,
-	0x81, 0xCD, 0x03, 0x69, 0xCC, 0x82, 0xCD, 0x03,
-	0x69, 0xCC, 0x83, 0xCD, 0x03, 0x69, 0xCC, 0x84,
-	0xCD, 0x03, 0x69, 0xCC, 0x86, 0xCD, 0x03, 0x69,
-	0xCC, 0x89, 0xCD, 0x03, 0x69, 0xCC, 0x8C, 0xCD,
-	0x03, 0x69, 0xCC, 0x8F, 0xCD, 0x03, 0x69, 0xCC,
-	0x91, 0xCD, 0x03, 0x69, 0xCC, 0xA3, 0xB9, 0x03,
-	0x69, 0xCC, 0xA8, 0xA9, 0x03, 0x69, 0xCC, 0xB0,
-	// Bytes 3500 - 353f
-	0xB9, 0x03, 0x6A, 0xCC, 0x82, 0xCD, 0x03, 0x6A,
-	0xCC, 0x8C, 0xCD, 0x03, 0x6B, 0xCC, 0x81, 0xCD,
-	0x03, 0x6B, 0xCC, 0x8C, 0xCD, 0x03, 0x6B, 0xCC,
-	0xA3, 0xB9, 0x03, 0x6B, 0xCC, 0xA7, 0xA9, 0x03,
-	0x6B, 0xCC, 0xB1, 0xB9, 0x03, 0x6C, 0xCC, 0x81,
-	0xCD, 0x03, 0x6C, 0xCC, 0x8C, 0xCD, 0x03, 0x6C,
-	0xCC, 0xA7, 0xA9, 0x03, 0x6C, 0xCC, 0xAD, 0xB9,
-	0x03, 0x6C, 0xCC, 0xB1, 0xB9, 0x03, 0x6D, 0xCC,
-	// Bytes 3540 - 357f
-	0x81, 0xCD, 0x03, 0x6D, 0xCC, 0x87, 0xCD, 0x03,
-	0x6D, 0xCC, 0xA3, 0xB9, 0x03, 0x6E, 0xCC, 0x80,
-	0xCD, 0x03, 0x6E, 0xCC, 0x81, 0xCD, 0x03, 0x6E,
-	0xCC, 0x83, 0xCD, 0x03, 0x6E, 0xCC, 0x87, 0xCD,
-	0x03, 0x6E, 0xCC, 0x8C, 0xCD, 0x03, 0x6E, 0xCC,
-	0xA3, 0xB9, 0x03, 0x6E, 0xCC, 0xA7, 0xA9, 0x03,
-	0x6E, 0xCC, 0xAD, 0xB9, 0x03, 0x6E, 0xCC, 0xB1,
-	0xB9, 0x03, 0x6F, 0xCC, 0x80, 0xCD, 0x03, 0x6F,
-	// Bytes 3580 - 35bf
-	0xCC, 0x81, 0xCD, 0x03, 0x6F, 0xCC, 0x86, 0xCD,
-	0x03, 0x6F, 0xCC, 0x89, 0xCD, 0x03, 0x6F, 0xCC,
-	0x8B, 0xCD, 0x03, 0x6F, 0xCC, 0x8C, 0xCD, 0x03,
-	0x6F, 0xCC, 0x8F, 0xCD, 0x03, 0x6F, 0xCC, 0x91,
-	0xCD, 0x03, 0x70, 0xCC, 0x81, 0xCD, 0x03, 0x70,
-	0xCC, 0x87, 0xCD, 0x03, 0x72, 0xCC, 0x81, 0xCD,
-	0x03, 0x72, 0xCC, 0x87, 0xCD, 0x03, 0x72, 0xCC,
-	0x8C, 0xCD, 0x03, 0x72, 0xCC, 0x8F, 0xCD, 0x03,
-	// Bytes 35c0 - 35ff
-	0x72, 0xCC, 0x91, 0xCD, 0x03, 0x72, 0xCC, 0xA7,
-	0xA9, 0x03, 0x72, 0xCC, 0xB1, 0xB9, 0x03, 0x73,
-	0xCC, 0x82, 0xCD, 0x03, 0x73, 0xCC, 0x87, 0xCD,
-	0x03, 0x73, 0xCC, 0xA6, 0xB9, 0x03, 0x73, 0xCC,
-	0xA7, 0xA9, 0x03, 0x74, 0xCC, 0x87, 0xCD, 0x03,
-	0x74, 0xCC, 0x88, 0xCD, 0x03, 0x74, 0xCC, 0x8C,
-	0xCD, 0x03, 0x74, 0xCC, 0xA3, 0xB9, 0x03, 0x74,
-	0xCC, 0xA6, 0xB9, 0x03, 0x74, 0xCC, 0xA7, 0xA9,
-	// Bytes 3600 - 363f
-	0x03, 0x74, 0xCC, 0xAD, 0xB9, 0x03, 0x74, 0xCC,
-	0xB1, 0xB9, 0x03, 0x75, 0xCC, 0x80, 0xCD, 0x03,
-	0x75, 0xCC, 0x81, 0xCD, 0x03, 0x75, 0xCC, 0x82,
-	0xCD, 0x03, 0x75, 0xCC, 0x86, 0xCD, 0x03, 0x75,
-	0xCC, 0x89, 0xCD, 0x03, 0x75, 0xCC, 0x8A, 0xCD,
-	0x03, 0x75, 0xCC, 0x8B, 0xCD, 0x03, 0x75, 0xCC,
-	0x8C, 0xCD, 0x03, 0x75, 0xCC, 0x8F, 0xCD, 0x03,
-	0x75, 0xCC, 0x91, 0xCD, 0x03, 0x75, 0xCC, 0xA3,
-	// Bytes 3640 - 367f
-	0xB9, 0x03, 0x75, 0xCC, 0xA4, 0xB9, 0x03, 0x75,
-	0xCC, 0xA8, 0xA9, 0x03, 0x75, 0xCC, 0xAD, 0xB9,
-	0x03, 0x75, 0xCC, 0xB0, 0xB9, 0x03, 0x76, 0xCC,
-	0x83, 0xCD, 0x03, 0x76, 0xCC, 0xA3, 0xB9, 0x03,
-	0x77, 0xCC, 0x80, 0xCD, 0x03, 0x77, 0xCC, 0x81,
-	0xCD, 0x03, 0x77, 0xCC, 0x82, 0xCD, 0x03, 0x77,
-	0xCC, 0x87, 0xCD, 0x03, 0x77, 0xCC, 0x88, 0xCD,
-	0x03, 0x77, 0xCC, 0x8A, 0xCD, 0x03, 0x77, 0xCC,
-	// Bytes 3680 - 36bf
-	0xA3, 0xB9, 0x03, 0x78, 0xCC, 0x87, 0xCD, 0x03,
-	0x78, 0xCC, 0x88, 0xCD, 0x03, 0x79, 0xCC, 0x80,
-	0xCD, 0x03, 0x79, 0xCC, 0x81, 0xCD, 0x03, 0x79,
-	0xCC, 0x82, 0xCD, 0x03, 0x79, 0xCC, 0x83, 0xCD,
-	0x03, 0x79, 0xCC, 0x84, 0xCD, 0x03, 0x79, 0xCC,
-	0x87, 0xCD, 0x03, 0x79, 0xCC, 0x88, 0xCD, 0x03,
-	0x79, 0xCC, 0x89, 0xCD, 0x03, 0x79, 0xCC, 0x8A,
-	0xCD, 0x03, 0x79, 0xCC, 0xA3, 0xB9, 0x03, 0x7A,
-	// Bytes 36c0 - 36ff
-	0xCC, 0x81, 0xCD, 0x03, 0x7A, 0xCC, 0x82, 0xCD,
-	0x03, 0x7A, 0xCC, 0x87, 0xCD, 0x03, 0x7A, 0xCC,
-	0x8C, 0xCD, 0x03, 0x7A, 0xCC, 0xA3, 0xB9, 0x03,
-	0x7A, 0xCC, 0xB1, 0xB9, 0x04, 0xC2, 0xA8, 0xCC,
-	0x80, 0xCE, 0x04, 0xC2, 0xA8, 0xCC, 0x81, 0xCE,
-	0x04, 0xC2, 0xA8, 0xCD, 0x82, 0xCE, 0x04, 0xC3,
-	0x86, 0xCC, 0x81, 0xCD, 0x04, 0xC3, 0x86, 0xCC,
-	0x84, 0xCD, 0x04, 0xC3, 0x98, 0xCC, 0x81, 0xCD,
-	// Bytes 3700 - 373f
-	0x04, 0xC3, 0xA6, 0xCC, 0x81, 0xCD, 0x04, 0xC3,
-	0xA6, 0xCC, 0x84, 0xCD, 0x04, 0xC3, 0xB8, 0xCC,
-	0x81, 0xCD, 0x04, 0xC5, 0xBF, 0xCC, 0x87, 0xCD,
-	0x04, 0xC6, 0xB7, 0xCC, 0x8C, 0xCD, 0x04, 0xCA,
-	0x92, 0xCC, 0x8C, 0xCD, 0x04, 0xCE, 0x91, 0xCC,
-	0x80, 0xCD, 0x04, 0xCE, 0x91, 0xCC, 0x81, 0xCD,
-	0x04, 0xCE, 0x91, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
-	0x91, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0x91, 0xCD,
-	// Bytes 3740 - 377f
-	0x85, 0xDD, 0x04, 0xCE, 0x95, 0xCC, 0x80, 0xCD,
-	0x04, 0xCE, 0x95, 0xCC, 0x81, 0xCD, 0x04, 0xCE,
-	0x97, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0x97, 0xCC,
-	0x81, 0xCD, 0x04, 0xCE, 0x97, 0xCD, 0x85, 0xDD,
-	0x04, 0xCE, 0x99, 0xCC, 0x80, 0xCD, 0x04, 0xCE,
-	0x99, 0xCC, 0x81, 0xCD, 0x04, 0xCE, 0x99, 0xCC,
-	0x84, 0xCD, 0x04, 0xCE, 0x99, 0xCC, 0x86, 0xCD,
-	0x04, 0xCE, 0x99, 0xCC, 0x88, 0xCD, 0x04, 0xCE,
-	// Bytes 3780 - 37bf
-	0x9F, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0x9F, 0xCC,
-	0x81, 0xCD, 0x04, 0xCE, 0xA1, 0xCC, 0x94, 0xCD,
-	0x04, 0xCE, 0xA5, 0xCC, 0x80, 0xCD, 0x04, 0xCE,
-	0xA5, 0xCC, 0x81, 0xCD, 0x04, 0xCE, 0xA5, 0xCC,
-	0x84, 0xCD, 0x04, 0xCE, 0xA5, 0xCC, 0x86, 0xCD,
-	0x04, 0xCE, 0xA5, 0xCC, 0x88, 0xCD, 0x04, 0xCE,
-	0xA9, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0xA9, 0xCC,
-	0x81, 0xCD, 0x04, 0xCE, 0xA9, 0xCD, 0x85, 0xDD,
-	// Bytes 37c0 - 37ff
-	0x04, 0xCE, 0xB1, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
-	0xB1, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0xB1, 0xCD,
-	0x85, 0xDD, 0x04, 0xCE, 0xB5, 0xCC, 0x80, 0xCD,
-	0x04, 0xCE, 0xB5, 0xCC, 0x81, 0xCD, 0x04, 0xCE,
-	0xB7, 0xCD, 0x85, 0xDD, 0x04, 0xCE, 0xB9, 0xCC,
-	0x80, 0xCD, 0x04, 0xCE, 0xB9, 0xCC, 0x81, 0xCD,
-	0x04, 0xCE, 0xB9, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
-	0xB9, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0xB9, 0xCD,
-	// Bytes 3800 - 383f
-	0x82, 0xCD, 0x04, 0xCE, 0xBF, 0xCC, 0x80, 0xCD,
-	0x04, 0xCE, 0xBF, 0xCC, 0x81, 0xCD, 0x04, 0xCF,
-	0x81, 0xCC, 0x93, 0xCD, 0x04, 0xCF, 0x81, 0xCC,
-	0x94, 0xCD, 0x04, 0xCF, 0x85, 0xCC, 0x80, 0xCD,
-	0x04, 0xCF, 0x85, 0xCC, 0x81, 0xCD, 0x04, 0xCF,
-	0x85, 0xCC, 0x84, 0xCD, 0x04, 0xCF, 0x85, 0xCC,
-	0x86, 0xCD, 0x04, 0xCF, 0x85, 0xCD, 0x82, 0xCD,
-	0x04, 0xCF, 0x89, 0xCD, 0x85, 0xDD, 0x04, 0xCF,
-	// Bytes 3840 - 387f
-	0x92, 0xCC, 0x81, 0xCD, 0x04, 0xCF, 0x92, 0xCC,
-	0x88, 0xCD, 0x04, 0xD0, 0x86, 0xCC, 0x88, 0xCD,
-	0x04, 0xD0, 0x90, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
-	0x90, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0x93, 0xCC,
-	0x81, 0xCD, 0x04, 0xD0, 0x95, 0xCC, 0x80, 0xCD,
-	0x04, 0xD0, 0x95, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
-	0x95, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0x96, 0xCC,
-	0x86, 0xCD, 0x04, 0xD0, 0x96, 0xCC, 0x88, 0xCD,
-	// Bytes 3880 - 38bf
-	0x04, 0xD0, 0x97, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
-	0x98, 0xCC, 0x80, 0xCD, 0x04, 0xD0, 0x98, 0xCC,
-	0x84, 0xCD, 0x04, 0xD0, 0x98, 0xCC, 0x86, 0xCD,
-	0x04, 0xD0, 0x98, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
-	0x9A, 0xCC, 0x81, 0xCD, 0x04, 0xD0, 0x9E, 0xCC,
-	0x88, 0xCD, 0x04, 0xD0, 0xA3, 0xCC, 0x84, 0xCD,
-	0x04, 0xD0, 0xA3, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
-	0xA3, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xA3, 0xCC,
-	// Bytes 38c0 - 38ff
-	0x8B, 0xCD, 0x04, 0xD0, 0xA7, 0xCC, 0x88, 0xCD,
-	0x04, 0xD0, 0xAB, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
-	0xAD, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xB0, 0xCC,
-	0x86, 0xCD, 0x04, 0xD0, 0xB0, 0xCC, 0x88, 0xCD,
-	0x04, 0xD0, 0xB3, 0xCC, 0x81, 0xCD, 0x04, 0xD0,
-	0xB5, 0xCC, 0x80, 0xCD, 0x04, 0xD0, 0xB5, 0xCC,
-	0x86, 0xCD, 0x04, 0xD0, 0xB5, 0xCC, 0x88, 0xCD,
-	0x04, 0xD0, 0xB6, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
-	// Bytes 3900 - 393f
-	0xB6, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xB7, 0xCC,
-	0x88, 0xCD, 0x04, 0xD0, 0xB8, 0xCC, 0x80, 0xCD,
-	0x04, 0xD0, 0xB8, 0xCC, 0x84, 0xCD, 0x04, 0xD0,
-	0xB8, 0xCC, 0x86, 0xCD, 0x04, 0xD0, 0xB8, 0xCC,
-	0x88, 0xCD, 0x04, 0xD0, 0xBA, 0xCC, 0x81, 0xCD,
-	0x04, 0xD0, 0xBE, 0xCC, 0x88, 0xCD, 0x04, 0xD1,
-	0x83, 0xCC, 0x84, 0xCD, 0x04, 0xD1, 0x83, 0xCC,
-	0x86, 0xCD, 0x04, 0xD1, 0x83, 0xCC, 0x88, 0xCD,
-	// Bytes 3940 - 397f
-	0x04, 0xD1, 0x83, 0xCC, 0x8B, 0xCD, 0x04, 0xD1,
-	0x87, 0xCC, 0x88, 0xCD, 0x04, 0xD1, 0x8B, 0xCC,
-	0x88, 0xCD, 0x04, 0xD1, 0x8D, 0xCC, 0x88, 0xCD,
-	0x04, 0xD1, 0x96, 0xCC, 0x88, 0xCD, 0x04, 0xD1,
-	0xB4, 0xCC, 0x8F, 0xCD, 0x04, 0xD1, 0xB5, 0xCC,
-	0x8F, 0xCD, 0x04, 0xD3, 0x98, 0xCC, 0x88, 0xCD,
-	0x04, 0xD3, 0x99, 0xCC, 0x88, 0xCD, 0x04, 0xD3,
-	0xA8, 0xCC, 0x88, 0xCD, 0x04, 0xD3, 0xA9, 0xCC,
-	// Bytes 3980 - 39bf
-	0x88, 0xCD, 0x04, 0xD8, 0xA7, 0xD9, 0x93, 0xCD,
-	0x04, 0xD8, 0xA7, 0xD9, 0x94, 0xCD, 0x04, 0xD8,
-	0xA7, 0xD9, 0x95, 0xB9, 0x04, 0xD9, 0x88, 0xD9,
-	0x94, 0xCD, 0x04, 0xD9, 0x8A, 0xD9, 0x94, 0xCD,
-	0x04, 0xDB, 0x81, 0xD9, 0x94, 0xCD, 0x04, 0xDB,
-	0x92, 0xD9, 0x94, 0xCD, 0x04, 0xDB, 0x95, 0xD9,
-	0x94, 0xCD, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x80,
-	0xCE, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x81, 0xCE,
-	// Bytes 39c0 - 39ff
-	0x05, 0x41, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05,
-	0x41, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x41,
-	0xCC, 0x86, 0xCC, 0x80, 0xCE, 0x05, 0x41, 0xCC,
-	0x86, 0xCC, 0x81, 0xCE, 0x05, 0x41, 0xCC, 0x86,
-	0xCC, 0x83, 0xCE, 0x05, 0x41, 0xCC, 0x86, 0xCC,
-	0x89, 0xCE, 0x05, 0x41, 0xCC, 0x87, 0xCC, 0x84,
-	0xCE, 0x05, 0x41, 0xCC, 0x88, 0xCC, 0x84, 0xCE,
-	0x05, 0x41, 0xCC, 0x8A, 0xCC, 0x81, 0xCE, 0x05,
-	// Bytes 3a00 - 3a3f
-	0x41, 0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x41,
-	0xCC, 0xA3, 0xCC, 0x86, 0xCE, 0x05, 0x43, 0xCC,
-	0xA7, 0xCC, 0x81, 0xCE, 0x05, 0x45, 0xCC, 0x82,
-	0xCC, 0x80, 0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC,
-	0x81, 0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x83,
-	0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x89, 0xCE,
-	0x05, 0x45, 0xCC, 0x84, 0xCC, 0x80, 0xCE, 0x05,
-	0x45, 0xCC, 0x84, 0xCC, 0x81, 0xCE, 0x05, 0x45,
-	// Bytes 3a40 - 3a7f
-	0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x45, 0xCC,
-	0xA7, 0xCC, 0x86, 0xCE, 0x05, 0x49, 0xCC, 0x88,
-	0xCC, 0x81, 0xCE, 0x05, 0x4C, 0xCC, 0xA3, 0xCC,
-	0x84, 0xCE, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x80,
-	0xCE, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x81, 0xCE,
-	0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05,
-	0x4F, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x4F,
-	0xCC, 0x83, 0xCC, 0x81, 0xCE, 0x05, 0x4F, 0xCC,
-	// Bytes 3a80 - 3abf
-	0x83, 0xCC, 0x84, 0xCE, 0x05, 0x4F, 0xCC, 0x83,
-	0xCC, 0x88, 0xCE, 0x05, 0x4F, 0xCC, 0x84, 0xCC,
-	0x80, 0xCE, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x81,
-	0xCE, 0x05, 0x4F, 0xCC, 0x87, 0xCC, 0x84, 0xCE,
-	0x05, 0x4F, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
-	0x4F, 0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x4F,
-	0xCC, 0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x4F, 0xCC,
-	0x9B, 0xCC, 0x83, 0xCE, 0x05, 0x4F, 0xCC, 0x9B,
-	// Bytes 3ac0 - 3aff
-	0xCC, 0x89, 0xCE, 0x05, 0x4F, 0xCC, 0x9B, 0xCC,
-	0xA3, 0xBA, 0x05, 0x4F, 0xCC, 0xA3, 0xCC, 0x82,
-	0xCE, 0x05, 0x4F, 0xCC, 0xA8, 0xCC, 0x84, 0xCE,
-	0x05, 0x52, 0xCC, 0xA3, 0xCC, 0x84, 0xCE, 0x05,
-	0x53, 0xCC, 0x81, 0xCC, 0x87, 0xCE, 0x05, 0x53,
-	0xCC, 0x8C, 0xCC, 0x87, 0xCE, 0x05, 0x53, 0xCC,
-	0xA3, 0xCC, 0x87, 0xCE, 0x05, 0x55, 0xCC, 0x83,
-	0xCC, 0x81, 0xCE, 0x05, 0x55, 0xCC, 0x84, 0xCC,
-	// Bytes 3b00 - 3b3f
-	0x88, 0xCE, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x80,
-	0xCE, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x81, 0xCE,
-	0x05, 0x55, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
-	0x55, 0xCC, 0x88, 0xCC, 0x8C, 0xCE, 0x05, 0x55,
-	0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x55, 0xCC,
-	0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x55, 0xCC, 0x9B,
-	0xCC, 0x83, 0xCE, 0x05, 0x55, 0xCC, 0x9B, 0xCC,
-	0x89, 0xCE, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0xA3,
-	// Bytes 3b40 - 3b7f
-	0xBA, 0x05, 0x61, 0xCC, 0x82, 0xCC, 0x80, 0xCE,
-	0x05, 0x61, 0xCC, 0x82, 0xCC, 0x81, 0xCE, 0x05,
-	0x61, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05, 0x61,
-	0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x61, 0xCC,
-	0x86, 0xCC, 0x80, 0xCE, 0x05, 0x61, 0xCC, 0x86,
-	0xCC, 0x81, 0xCE, 0x05, 0x61, 0xCC, 0x86, 0xCC,
-	0x83, 0xCE, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x89,
-	0xCE, 0x05, 0x61, 0xCC, 0x87, 0xCC, 0x84, 0xCE,
-	// Bytes 3b80 - 3bbf
-	0x05, 0x61, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
-	0x61, 0xCC, 0x8A, 0xCC, 0x81, 0xCE, 0x05, 0x61,
-	0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x61, 0xCC,
-	0xA3, 0xCC, 0x86, 0xCE, 0x05, 0x63, 0xCC, 0xA7,
-	0xCC, 0x81, 0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC,
-	0x80, 0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x81,
-	0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x83, 0xCE,
-	0x05, 0x65, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05,
-	// Bytes 3bc0 - 3bff
-	0x65, 0xCC, 0x84, 0xCC, 0x80, 0xCE, 0x05, 0x65,
-	0xCC, 0x84, 0xCC, 0x81, 0xCE, 0x05, 0x65, 0xCC,
-	0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x65, 0xCC, 0xA7,
-	0xCC, 0x86, 0xCE, 0x05, 0x69, 0xCC, 0x88, 0xCC,
-	0x81, 0xCE, 0x05, 0x6C, 0xCC, 0xA3, 0xCC, 0x84,
-	0xCE, 0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x80, 0xCE,
-	0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x81, 0xCE, 0x05,
-	0x6F, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05, 0x6F,
-	// Bytes 3c00 - 3c3f
-	0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x6F, 0xCC,
-	0x83, 0xCC, 0x81, 0xCE, 0x05, 0x6F, 0xCC, 0x83,
-	0xCC, 0x84, 0xCE, 0x05, 0x6F, 0xCC, 0x83, 0xCC,
-	0x88, 0xCE, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x80,
-	0xCE, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x81, 0xCE,
-	0x05, 0x6F, 0xCC, 0x87, 0xCC, 0x84, 0xCE, 0x05,
-	0x6F, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05, 0x6F,
-	0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x6F, 0xCC,
-	// Bytes 3c40 - 3c7f
-	0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x6F, 0xCC, 0x9B,
-	0xCC, 0x83, 0xCE, 0x05, 0x6F, 0xCC, 0x9B, 0xCC,
-	0x89, 0xCE, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0xA3,
-	0xBA, 0x05, 0x6F, 0xCC, 0xA3, 0xCC, 0x82, 0xCE,
-	0x05, 0x6F, 0xCC, 0xA8, 0xCC, 0x84, 0xCE, 0x05,
-	0x72, 0xCC, 0xA3, 0xCC, 0x84, 0xCE, 0x05, 0x73,
-	0xCC, 0x81, 0xCC, 0x87, 0xCE, 0x05, 0x73, 0xCC,
-	0x8C, 0xCC, 0x87, 0xCE, 0x05, 0x73, 0xCC, 0xA3,
-	// Bytes 3c80 - 3cbf
-	0xCC, 0x87, 0xCE, 0x05, 0x75, 0xCC, 0x83, 0xCC,
-	0x81, 0xCE, 0x05, 0x75, 0xCC, 0x84, 0xCC, 0x88,
-	0xCE, 0x05, 0x75, 0xCC, 0x88, 0xCC, 0x80, 0xCE,
-	0x05, 0x75, 0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x05,
-	0x75, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05, 0x75,
-	0xCC, 0x88, 0xCC, 0x8C, 0xCE, 0x05, 0x75, 0xCC,
-	0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x75, 0xCC, 0x9B,
-	0xCC, 0x81, 0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC,
-	// Bytes 3cc0 - 3cff
-	0x83, 0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x89,
-	0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0xA3, 0xBA,
-	0x05, 0xE1, 0xBE, 0xBF, 0xCC, 0x80, 0xCE, 0x05,
-	0xE1, 0xBE, 0xBF, 0xCC, 0x81, 0xCE, 0x05, 0xE1,
-	0xBE, 0xBF, 0xCD, 0x82, 0xCE, 0x05, 0xE1, 0xBF,
-	0xBE, 0xCC, 0x80, 0xCE, 0x05, 0xE1, 0xBF, 0xBE,
-	0xCC, 0x81, 0xCE, 0x05, 0xE1, 0xBF, 0xBE, 0xCD,
-	0x82, 0xCE, 0x05, 0xE2, 0x86, 0x90, 0xCC, 0xB8,
-	// Bytes 3d00 - 3d3f
-	0x05, 0x05, 0xE2, 0x86, 0x92, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x86, 0x94, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x87, 0x90, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x87, 0x92, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87,
-	0x94, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x83,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x88, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x88, 0x8B, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x88, 0xA3, 0xCC, 0xB8, 0x05,
-	// Bytes 3d40 - 3d7f
-	0x05, 0xE2, 0x88, 0xA5, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x88, 0xBC, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x89, 0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
-	0x85, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x88,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x8D, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xA1, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x89, 0xA4, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x89, 0xA5, 0xCC, 0xB8, 0x05, 0x05,
-	// Bytes 3d80 - 3dbf
-	0xE2, 0x89, 0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x89, 0xB3, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
-	0xB6, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB7,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBA, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBB, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x89, 0xBC, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x89, 0xBD, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x8A, 0x82, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	// Bytes 3dc0 - 3dff
-	0x8A, 0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
-	0x86, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x87,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x91, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x92, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x8A, 0xA2, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x8A, 0xA8, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x8A, 0xA9, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x8A, 0xAB, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
-	// Bytes 3e00 - 3e3f
-	0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB3,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB4, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB5, 0xCC, 0xB8,
-	0x05, 0x06, 0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x80,
-	// Bytes 3e40 - 3e7f
-	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x82,
-	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x81,
-	// Bytes 3e80 - 3ebf
-	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCD, 0x82,
-	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x82,
-	// Bytes 3ec0 - 3eff
-	0xCE, 0x06, 0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x80,
-	// Bytes 3f00 - 3f3f
-	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xB7, 0xCC, 0x80, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCE, 0xB7, 0xCD, 0x82, 0xCD, 0x85,
-	// Bytes 3f40 - 3f7f
-	0xDE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x82,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x82,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x81,
-	// Bytes 3f80 - 3fbf
-	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCD, 0x82,
-	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x80,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x81,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x82,
-	// Bytes 3fc0 - 3fff
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x81,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCD, 0x82,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x80,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x81,
-	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCD, 0x82,
-	0xCE, 0x06, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x85,
-	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x85,
-	// Bytes 4000 - 403f
-	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x85,
-	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x85,
-	0xDE, 0x06, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x85,
-	0xDE, 0x06, 0xE0, 0xA4, 0xA8, 0xE0, 0xA4, 0xBC,
-	0x0D, 0x06, 0xE0, 0xA4, 0xB0, 0xE0, 0xA4, 0xBC,
-	0x0D, 0x06, 0xE0, 0xA4, 0xB3, 0xE0, 0xA4, 0xBC,
-	0x0D, 0x06, 0xE0, 0xB1, 0x86, 0xE0, 0xB1, 0x96,
-	0x89, 0x06, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8A,
-	// Bytes 4040 - 407f
-	0x15, 0x06, 0xE3, 0x81, 0x86, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x8B, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x8D, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x8F, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x91, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x93, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x95, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x97, 0xE3, 0x82, 0x99,
-	// Bytes 4080 - 40bf
-	0x11, 0x06, 0xE3, 0x81, 0x99, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x9B, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x9D, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0x9F, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xA1, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xA4, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xA6, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xA8, 0xE3, 0x82, 0x99,
-	// Bytes 40c0 - 40ff
-	0x11, 0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x9A,
-	// Bytes 4100 - 413f
-	0x11, 0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x82, 0x9D, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xA6, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99,
-	// Bytes 4140 - 417f
-	0x11, 0x06, 0xE3, 0x82, 0xB3, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xB9, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xBD, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x81, 0xE3, 0x82, 0x99,
-	// Bytes 4180 - 41bf
-	0x11, 0x06, 0xE3, 0x83, 0x84, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x86, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99,
-	// Bytes 41c0 - 41ff
-	0x11, 0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A,
-	0x11, 0x06, 0xE3, 0x83, 0xAF, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0xB0, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0xB1, 0xE3, 0x82, 0x99,
-	// Bytes 4200 - 423f
-	0x11, 0x06, 0xE3, 0x83, 0xB2, 0xE3, 0x82, 0x99,
-	0x11, 0x06, 0xE3, 0x83, 0xBD, 0xE3, 0x82, 0x99,
-	0x11, 0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x93,
-	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91,
-	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81,
-	// Bytes 4240 - 427f
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x94,
-	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97,
-	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97, 0xCC, 0x94,
-	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97,
-	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
-	// Bytes 4280 - 42bf
-	0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x93,
-	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9,
-	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x94,
-	// Bytes 42c0 - 42ff
-	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1,
-	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1, 0xCC, 0x94,
-	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1,
-	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
-	// Bytes 4300 - 433f
-	0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x93,
-	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7,
-	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
-	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
-	0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81,
-	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x94,
-	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89,
-	// Bytes 4340 - 437f
-	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
-	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
-	0xDF, 0x08, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82,
-	0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89, 0xCC, 0x94,
-	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89,
-	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
-	0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
-	0xDF, 0x08, 0xF0, 0x91, 0x82, 0x99, 0xF0, 0x91,
-	// Bytes 4380 - 43bf
-	0x82, 0xBA, 0x0D, 0x08, 0xF0, 0x91, 0x82, 0x9B,
-	0xF0, 0x91, 0x82, 0xBA, 0x0D, 0x08, 0xF0, 0x91,
-	0x82, 0xA5, 0xF0, 0x91, 0x82, 0xBA, 0x0D, 0x42,
-	0xC2, 0xB4, 0x01, 0x43, 0x20, 0xCC, 0x81, 0xCD,
-	0x43, 0x20, 0xCC, 0x83, 0xCD, 0x43, 0x20, 0xCC,
-	0x84, 0xCD, 0x43, 0x20, 0xCC, 0x85, 0xCD, 0x43,
-	0x20, 0xCC, 0x86, 0xCD, 0x43, 0x20, 0xCC, 0x87,
-	0xCD, 0x43, 0x20, 0xCC, 0x88, 0xCD, 0x43, 0x20,
-	// Bytes 43c0 - 43ff
-	0xCC, 0x8A, 0xCD, 0x43, 0x20, 0xCC, 0x8B, 0xCD,
-	0x43, 0x20, 0xCC, 0x93, 0xCD, 0x43, 0x20, 0xCC,
-	0x94, 0xCD, 0x43, 0x20, 0xCC, 0xA7, 0xA9, 0x43,
-	0x20, 0xCC, 0xA8, 0xA9, 0x43, 0x20, 0xCC, 0xB3,
-	0xB9, 0x43, 0x20, 0xCD, 0x82, 0xCD, 0x43, 0x20,
-	0xCD, 0x85, 0xDD, 0x43, 0x20, 0xD9, 0x8B, 0x5D,
-	0x43, 0x20, 0xD9, 0x8C, 0x61, 0x43, 0x20, 0xD9,
-	0x8D, 0x65, 0x43, 0x20, 0xD9, 0x8E, 0x69, 0x43,
-	// Bytes 4400 - 443f
-	0x20, 0xD9, 0x8F, 0x6D, 0x43, 0x20, 0xD9, 0x90,
-	0x71, 0x43, 0x20, 0xD9, 0x91, 0x75, 0x43, 0x20,
-	0xD9, 0x92, 0x79, 0x43, 0x41, 0xCC, 0x8A, 0xCD,
-	0x43, 0x73, 0xCC, 0x87, 0xCD, 0x44, 0x20, 0xE3,
-	0x82, 0x99, 0x11, 0x44, 0x20, 0xE3, 0x82, 0x9A,
-	0x11, 0x44, 0xC2, 0xA8, 0xCC, 0x81, 0xCE, 0x44,
-	0xCE, 0x91, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0x95,
-	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0x97, 0xCC, 0x81,
-	// Bytes 4440 - 447f
-	0xCD, 0x44, 0xCE, 0x99, 0xCC, 0x81, 0xCD, 0x44,
-	0xCE, 0x9F, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xA5,
-	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xA5, 0xCC, 0x88,
-	0xCD, 0x44, 0xCE, 0xA9, 0xCC, 0x81, 0xCD, 0x44,
-	0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xB5,
-	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xB7, 0xCC, 0x81,
-	0xCD, 0x44, 0xCE, 0xB9, 0xCC, 0x81, 0xCD, 0x44,
-	0xCE, 0xBF, 0xCC, 0x81, 0xCD, 0x44, 0xCF, 0x85,
-	// Bytes 4480 - 44bf
-	0xCC, 0x81, 0xCD, 0x44, 0xCF, 0x89, 0xCC, 0x81,
-	0xCD, 0x44, 0xD7, 0x90, 0xD6, 0xB7, 0x35, 0x44,
-	0xD7, 0x90, 0xD6, 0xB8, 0x39, 0x44, 0xD7, 0x90,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x91, 0xD6, 0xBC,
-	0x45, 0x44, 0xD7, 0x91, 0xD6, 0xBF, 0x4D, 0x44,
-	0xD7, 0x92, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x93,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x94, 0xD6, 0xBC,
-	0x45, 0x44, 0xD7, 0x95, 0xD6, 0xB9, 0x3D, 0x44,
-	// Bytes 44c0 - 44ff
-	0xD7, 0x95, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x96,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x98, 0xD6, 0xBC,
-	0x45, 0x44, 0xD7, 0x99, 0xD6, 0xB4, 0x29, 0x44,
-	0xD7, 0x99, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9A,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9B, 0xD6, 0xBC,
-	0x45, 0x44, 0xD7, 0x9B, 0xD6, 0xBF, 0x4D, 0x44,
-	0xD7, 0x9C, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9E,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA0, 0xD6, 0xBC,
-	// Bytes 4500 - 453f
-	0x45, 0x44, 0xD7, 0xA1, 0xD6, 0xBC, 0x45, 0x44,
-	0xD7, 0xA3, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA4,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA4, 0xD6, 0xBF,
-	0x4D, 0x44, 0xD7, 0xA6, 0xD6, 0xBC, 0x45, 0x44,
-	0xD7, 0xA7, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA8,
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA9, 0xD6, 0xBC,
-	0x45, 0x44, 0xD7, 0xA9, 0xD7, 0x81, 0x51, 0x44,
-	0xD7, 0xA9, 0xD7, 0x82, 0x55, 0x44, 0xD7, 0xAA,
-	// Bytes 4540 - 457f
-	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xB2, 0xD6, 0xB7,
-	0x35, 0x44, 0xD8, 0xA7, 0xD9, 0x8B, 0x5D, 0x44,
-	0xD8, 0xA7, 0xD9, 0x93, 0xCD, 0x44, 0xD8, 0xA7,
-	0xD9, 0x94, 0xCD, 0x44, 0xD8, 0xA7, 0xD9, 0x95,
-	0xB9, 0x44, 0xD8, 0xB0, 0xD9, 0xB0, 0x7D, 0x44,
-	0xD8, 0xB1, 0xD9, 0xB0, 0x7D, 0x44, 0xD9, 0x80,
-	0xD9, 0x8B, 0x5D, 0x44, 0xD9, 0x80, 0xD9, 0x8E,
-	0x69, 0x44, 0xD9, 0x80, 0xD9, 0x8F, 0x6D, 0x44,
-	// Bytes 4580 - 45bf
-	0xD9, 0x80, 0xD9, 0x90, 0x71, 0x44, 0xD9, 0x80,
-	0xD9, 0x91, 0x75, 0x44, 0xD9, 0x80, 0xD9, 0x92,
-	0x79, 0x44, 0xD9, 0x87, 0xD9, 0xB0, 0x7D, 0x44,
-	0xD9, 0x88, 0xD9, 0x94, 0xCD, 0x44, 0xD9, 0x89,
-	0xD9, 0xB0, 0x7D, 0x44, 0xD9, 0x8A, 0xD9, 0x94,
-	0xCD, 0x44, 0xDB, 0x92, 0xD9, 0x94, 0xCD, 0x44,
-	0xDB, 0x95, 0xD9, 0x94, 0xCD, 0x45, 0x20, 0xCC,
-	0x88, 0xCC, 0x80, 0xCE, 0x45, 0x20, 0xCC, 0x88,
-	// Bytes 45c0 - 45ff
-	0xCC, 0x81, 0xCE, 0x45, 0x20, 0xCC, 0x88, 0xCD,
-	0x82, 0xCE, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x80,
-	0xCE, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x81, 0xCE,
-	0x45, 0x20, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x45,
-	0x20, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x45, 0x20,
-	0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x45, 0x20, 0xCC,
-	0x94, 0xCD, 0x82, 0xCE, 0x45, 0x20, 0xD9, 0x8C,
-	0xD9, 0x91, 0x76, 0x45, 0x20, 0xD9, 0x8D, 0xD9,
-	// Bytes 4600 - 463f
-	0x91, 0x76, 0x45, 0x20, 0xD9, 0x8E, 0xD9, 0x91,
-	0x76, 0x45, 0x20, 0xD9, 0x8F, 0xD9, 0x91, 0x76,
-	0x45, 0x20, 0xD9, 0x90, 0xD9, 0x91, 0x76, 0x45,
-	0x20, 0xD9, 0x91, 0xD9, 0xB0, 0x7E, 0x45, 0xE2,
-	0xAB, 0x9D, 0xCC, 0xB8, 0x05, 0x46, 0xCE, 0xB9,
-	0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x46, 0xCF, 0x85,
-	0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x46, 0xD7, 0xA9,
-	0xD6, 0xBC, 0xD7, 0x81, 0x52, 0x46, 0xD7, 0xA9,
-	// Bytes 4640 - 467f
-	0xD6, 0xBC, 0xD7, 0x82, 0x56, 0x46, 0xD9, 0x80,
-	0xD9, 0x8E, 0xD9, 0x91, 0x76, 0x46, 0xD9, 0x80,
-	0xD9, 0x8F, 0xD9, 0x91, 0x76, 0x46, 0xD9, 0x80,
-	0xD9, 0x90, 0xD9, 0x91, 0x76, 0x46, 0xE0, 0xA4,
-	0x95, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0x96, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0x97, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0x9C, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	// Bytes 4680 - 46bf
-	0xA1, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0xA2, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0xAB, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
-	0xAF, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
-	0xA1, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
-	0xA2, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
-	0xAF, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	0x96, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	// Bytes 46c0 - 46ff
-	0x97, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	0x9C, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	0xAB, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	0xB2, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
-	0xB8, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xAC,
-	0xA1, 0xE0, 0xAC, 0xBC, 0x0D, 0x46, 0xE0, 0xAC,
-	0xA2, 0xE0, 0xAC, 0xBC, 0x0D, 0x46, 0xE0, 0xBE,
-	0xB2, 0xE0, 0xBE, 0x80, 0xA1, 0x46, 0xE0, 0xBE,
-	// Bytes 4700 - 473f
-	0xB3, 0xE0, 0xBE, 0x80, 0xA1, 0x46, 0xE3, 0x83,
-	0x86, 0xE3, 0x82, 0x99, 0x11, 0x48, 0xF0, 0x9D,
-	0x85, 0x97, 0xF0, 0x9D, 0x85, 0xA5, 0xB1, 0x48,
-	0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5,
-	0xB1, 0x48, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D,
-	0x85, 0xA5, 0xB1, 0x48, 0xF0, 0x9D, 0x86, 0xBA,
-	0xF0, 0x9D, 0x85, 0xA5, 0xB1, 0x49, 0xE0, 0xBE,
-	0xB2, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0xA2,
-	// Bytes 4740 - 477f
-	0x49, 0xE0, 0xBE, 0xB3, 0xE0, 0xBD, 0xB1, 0xE0,
-	0xBE, 0x80, 0xA2, 0x4C, 0xF0, 0x9D, 0x85, 0x98,
-	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE,
-	0xB2, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D,
-	0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xB2, 0x4C,
-	0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5,
-	0xF0, 0x9D, 0x85, 0xB0, 0xB2, 0x4C, 0xF0, 0x9D,
-	0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D,
-	// Bytes 4780 - 47bf
-	0x85, 0xB1, 0xB2, 0x4C, 0xF0, 0x9D, 0x85, 0x98,
-	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB2,
-	0xB2, 0x4C, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D,
-	0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xB2, 0x4C,
-	0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5,
-	0xF0, 0x9D, 0x85, 0xAF, 0xB2, 0x4C, 0xF0, 0x9D,
-	0x86, 0xBA, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D,
-	0x85, 0xAE, 0xB2, 0x4C, 0xF0, 0x9D, 0x86, 0xBA,
-	// Bytes 47c0 - 47ff
-	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF,
-	0xB2, 0x83, 0x41, 0xCC, 0x82, 0xCD, 0x83, 0x41,
-	0xCC, 0x86, 0xCD, 0x83, 0x41, 0xCC, 0x87, 0xCD,
-	0x83, 0x41, 0xCC, 0x88, 0xCD, 0x83, 0x41, 0xCC,
-	0x8A, 0xCD, 0x83, 0x41, 0xCC, 0xA3, 0xB9, 0x83,
-	0x43, 0xCC, 0xA7, 0xA9, 0x83, 0x45, 0xCC, 0x82,
-	0xCD, 0x83, 0x45, 0xCC, 0x84, 0xCD, 0x83, 0x45,
-	0xCC, 0xA3, 0xB9, 0x83, 0x45, 0xCC, 0xA7, 0xA9,
-	// Bytes 4800 - 483f
-	0x83, 0x49, 0xCC, 0x88, 0xCD, 0x83, 0x4C, 0xCC,
-	0xA3, 0xB9, 0x83, 0x4F, 0xCC, 0x82, 0xCD, 0x83,
-	0x4F, 0xCC, 0x83, 0xCD, 0x83, 0x4F, 0xCC, 0x84,
-	0xCD, 0x83, 0x4F, 0xCC, 0x87, 0xCD, 0x83, 0x4F,
-	0xCC, 0x88, 0xCD, 0x83, 0x4F, 0xCC, 0x9B, 0xB1,
-	0x83, 0x4F, 0xCC, 0xA3, 0xB9, 0x83, 0x4F, 0xCC,
-	0xA8, 0xA9, 0x83, 0x52, 0xCC, 0xA3, 0xB9, 0x83,
-	0x53, 0xCC, 0x81, 0xCD, 0x83, 0x53, 0xCC, 0x8C,
-	// Bytes 4840 - 487f
-	0xCD, 0x83, 0x53, 0xCC, 0xA3, 0xB9, 0x83, 0x55,
-	0xCC, 0x83, 0xCD, 0x83, 0x55, 0xCC, 0x84, 0xCD,
-	0x83, 0x55, 0xCC, 0x88, 0xCD, 0x83, 0x55, 0xCC,
-	0x9B, 0xB1, 0x83, 0x61, 0xCC, 0x82, 0xCD, 0x83,
-	0x61, 0xCC, 0x86, 0xCD, 0x83, 0x61, 0xCC, 0x87,
-	0xCD, 0x83, 0x61, 0xCC, 0x88, 0xCD, 0x83, 0x61,
-	0xCC, 0x8A, 0xCD, 0x83, 0x61, 0xCC, 0xA3, 0xB9,
-	0x83, 0x63, 0xCC, 0xA7, 0xA9, 0x83, 0x65, 0xCC,
-	// Bytes 4880 - 48bf
-	0x82, 0xCD, 0x83, 0x65, 0xCC, 0x84, 0xCD, 0x83,
-	0x65, 0xCC, 0xA3, 0xB9, 0x83, 0x65, 0xCC, 0xA7,
-	0xA9, 0x83, 0x69, 0xCC, 0x88, 0xCD, 0x83, 0x6C,
-	0xCC, 0xA3, 0xB9, 0x83, 0x6F, 0xCC, 0x82, 0xCD,
-	0x83, 0x6F, 0xCC, 0x83, 0xCD, 0x83, 0x6F, 0xCC,
-	0x84, 0xCD, 0x83, 0x6F, 0xCC, 0x87, 0xCD, 0x83,
-	0x6F, 0xCC, 0x88, 0xCD, 0x83, 0x6F, 0xCC, 0x9B,
-	0xB1, 0x83, 0x6F, 0xCC, 0xA3, 0xB9, 0x83, 0x6F,
-	// Bytes 48c0 - 48ff
-	0xCC, 0xA8, 0xA9, 0x83, 0x72, 0xCC, 0xA3, 0xB9,
-	0x83, 0x73, 0xCC, 0x81, 0xCD, 0x83, 0x73, 0xCC,
-	0x8C, 0xCD, 0x83, 0x73, 0xCC, 0xA3, 0xB9, 0x83,
-	0x75, 0xCC, 0x83, 0xCD, 0x83, 0x75, 0xCC, 0x84,
-	0xCD, 0x83, 0x75, 0xCC, 0x88, 0xCD, 0x83, 0x75,
-	0xCC, 0x9B, 0xB1, 0x84, 0xCE, 0x91, 0xCC, 0x93,
-	0xCD, 0x84, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x84,
-	0xCE, 0x95, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0x95,
-	// Bytes 4900 - 493f
-	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0x97, 0xCC, 0x93,
-	0xCD, 0x84, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x84,
-	0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0x99,
-	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0x9F, 0xCC, 0x93,
-	0xCD, 0x84, 0xCE, 0x9F, 0xCC, 0x94, 0xCD, 0x84,
-	0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xA9,
-	0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xA9, 0xCC, 0x94,
-	0xCD, 0x84, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x84,
-	// Bytes 4940 - 497f
-	0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x84, 0xCE, 0xB1,
-	0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB1, 0xCC, 0x94,
-	0xCD, 0x84, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x84,
-	0xCE, 0xB5, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB5,
-	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xB7, 0xCC, 0x80,
-	0xCD, 0x84, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x84,
-	0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB7,
-	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xB7, 0xCD, 0x82,
-	// Bytes 4980 - 49bf
-	0xCD, 0x84, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x84,
-	0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB9,
-	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xBF, 0xCC, 0x93,
-	0xCD, 0x84, 0xCE, 0xBF, 0xCC, 0x94, 0xCD, 0x84,
-	0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x84, 0xCF, 0x85,
-	0xCC, 0x93, 0xCD, 0x84, 0xCF, 0x85, 0xCC, 0x94,
-	0xCD, 0x84, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x84,
-	0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x84, 0xCF, 0x89,
-	// Bytes 49c0 - 49ff
-	0xCC, 0x93, 0xCD, 0x84, 0xCF, 0x89, 0xCC, 0x94,
-	0xCD, 0x84, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x86,
-	0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
-	// Bytes 4a00 - 4a3f
-	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0x97, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0x97, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	// Bytes 4a40 - 4a7f
-	0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xB1, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	// Bytes 4a80 - 4abf
-	0xCE, 0xB1, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
-	// Bytes 4ac0 - 4aff
-	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
-	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
-	0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
-	0xCF, 0x89, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
-	0xCF, 0x89, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
-	0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x42,
-	0xCC, 0x80, 0xCD, 0x33, 0x42, 0xCC, 0x81, 0xCD,
-	0x33, 0x42, 0xCC, 0x93, 0xCD, 0x33, 0x43, 0xE1,
-	// Bytes 4b00 - 4b3f
-	0x85, 0xA1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA2,
-	0x01, 0x00, 0x43, 0xE1, 0x85, 0xA3, 0x01, 0x00,
-	0x43, 0xE1, 0x85, 0xA4, 0x01, 0x00, 0x43, 0xE1,
-	0x85, 0xA5, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA6,
-	0x01, 0x00, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x00,
-	0x43, 0xE1, 0x85, 0xA8, 0x01, 0x00, 0x43, 0xE1,
-	0x85, 0xA9, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAA,
-	0x01, 0x00, 0x43, 0xE1, 0x85, 0xAB, 0x01, 0x00,
-	// Bytes 4b40 - 4b7f
-	0x43, 0xE1, 0x85, 0xAC, 0x01, 0x00, 0x43, 0xE1,
-	0x85, 0xAD, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAE,
-	0x01, 0x00, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x00,
-	0x43, 0xE1, 0x85, 0xB0, 0x01, 0x00, 0x43, 0xE1,
-	0x85, 0xB1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xB2,
-	0x01, 0x00, 0x43, 0xE1, 0x85, 0xB3, 0x01, 0x00,
-	0x43, 0xE1, 0x85, 0xB4, 0x01, 0x00, 0x43, 0xE1,
-	0x85, 0xB5, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xAA,
-	// Bytes 4b80 - 4bbf
-	0x01, 0x00, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x00,
-	0x43, 0xE1, 0x86, 0xAD, 0x01, 0x00, 0x43, 0xE1,
-	0x86, 0xB0, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB1,
-	0x01, 0x00, 0x43, 0xE1, 0x86, 0xB2, 0x01, 0x00,
-	0x43, 0xE1, 0x86, 0xB3, 0x01, 0x00, 0x43, 0xE1,
-	0x86, 0xB4, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB5,
-	0x01, 0x00, 0x44, 0xCC, 0x88, 0xCC, 0x81, 0xCE,
-	0x33, 0x43, 0xE3, 0x82, 0x99, 0x11, 0x04, 0x43,
-	// Bytes 4bc0 - 4bff
-	0xE3, 0x82, 0x9A, 0x11, 0x04, 0x46, 0xE0, 0xBD,
-	0xB1, 0xE0, 0xBD, 0xB2, 0xA2, 0x27, 0x46, 0xE0,
-	0xBD, 0xB1, 0xE0, 0xBD, 0xB4, 0xA6, 0x27, 0x46,
-	0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0xA2, 0x27,
-	0x00, 0x01,
-}
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfcTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfcTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfcValues[c0]
-	}
-	i := nfcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfcTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfcValues[c0]
-	}
-	i := nfcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// nfcTrie. Total size: 10798 bytes (10.54 KiB). Checksum: b5981cc85e3bd14.
-type nfcTrie struct{}
-
-func newNfcTrie(i int) *nfcTrie {
-	return &nfcTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 46:
-		return uint16(nfcValues[n<<6+uint32(b)])
-	default:
-		n -= 46
-		return uint16(nfcSparse.lookup(n, b))
-	}
-}
-
-// nfcValues: 48 blocks, 3072 entries, 6144 bytes
-// The third block is the zero block.
-var nfcValues = [3072]uint16{
-	// Block 0x0, offset 0x0
-	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
-	// Block 0x1, offset 0x40
-	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
-	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
-	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
-	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
-	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
-	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
-	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
-	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
-	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
-	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x30b0, 0xc1: 0x30b5, 0xc2: 0x47c9, 0xc3: 0x30ba, 0xc4: 0x47d8, 0xc5: 0x47dd,
-	0xc6: 0xa000, 0xc7: 0x47e7, 0xc8: 0x3123, 0xc9: 0x3128, 0xca: 0x47ec, 0xcb: 0x313c,
-	0xcc: 0x31af, 0xcd: 0x31b4, 0xce: 0x31b9, 0xcf: 0x4800, 0xd1: 0x3245,
-	0xd2: 0x3268, 0xd3: 0x326d, 0xd4: 0x480a, 0xd5: 0x480f, 0xd6: 0x481e,
-	0xd8: 0xa000, 0xd9: 0x32f4, 0xda: 0x32f9, 0xdb: 0x32fe, 0xdc: 0x4850, 0xdd: 0x3376,
-	0xe0: 0x33bc, 0xe1: 0x33c1, 0xe2: 0x485a, 0xe3: 0x33c6,
-	0xe4: 0x4869, 0xe5: 0x486e, 0xe6: 0xa000, 0xe7: 0x4878, 0xe8: 0x342f, 0xe9: 0x3434,
-	0xea: 0x487d, 0xeb: 0x3448, 0xec: 0x34c0, 0xed: 0x34c5, 0xee: 0x34ca, 0xef: 0x4891,
-	0xf1: 0x3556, 0xf2: 0x3579, 0xf3: 0x357e, 0xf4: 0x489b, 0xf5: 0x48a0,
-	0xf6: 0x48af, 0xf8: 0xa000, 0xf9: 0x360a, 0xfa: 0x360f, 0xfb: 0x3614,
-	0xfc: 0x48e1, 0xfd: 0x3691, 0xff: 0x36aa,
-	// Block 0x4, offset 0x100
-	0x100: 0x30bf, 0x101: 0x33cb, 0x102: 0x47ce, 0x103: 0x485f, 0x104: 0x30dd, 0x105: 0x33e9,
-	0x106: 0x30f1, 0x107: 0x33fd, 0x108: 0x30f6, 0x109: 0x3402, 0x10a: 0x30fb, 0x10b: 0x3407,
-	0x10c: 0x3100, 0x10d: 0x340c, 0x10e: 0x310a, 0x10f: 0x3416,
-	0x112: 0x47f1, 0x113: 0x4882, 0x114: 0x3132, 0x115: 0x343e, 0x116: 0x3137, 0x117: 0x3443,
-	0x118: 0x3155, 0x119: 0x3461, 0x11a: 0x3146, 0x11b: 0x3452, 0x11c: 0x316e, 0x11d: 0x347a,
-	0x11e: 0x3178, 0x11f: 0x3484, 0x120: 0x317d, 0x121: 0x3489, 0x122: 0x3187, 0x123: 0x3493,
-	0x124: 0x318c, 0x125: 0x3498, 0x128: 0x31be, 0x129: 0x34cf,
-	0x12a: 0x31c3, 0x12b: 0x34d4, 0x12c: 0x31c8, 0x12d: 0x34d9, 0x12e: 0x31eb, 0x12f: 0x34f7,
-	0x130: 0x31cd, 0x134: 0x31f5, 0x135: 0x3501,
-	0x136: 0x3209, 0x137: 0x351a, 0x139: 0x3213, 0x13a: 0x3524, 0x13b: 0x321d,
-	0x13c: 0x352e, 0x13d: 0x3218, 0x13e: 0x3529,
-	// Block 0x5, offset 0x140
-	0x143: 0x3240, 0x144: 0x3551, 0x145: 0x3259,
-	0x146: 0x356a, 0x147: 0x324f, 0x148: 0x3560,
-	0x14c: 0x4814, 0x14d: 0x48a5, 0x14e: 0x3272, 0x14f: 0x3583, 0x150: 0x327c, 0x151: 0x358d,
-	0x154: 0x329a, 0x155: 0x35ab, 0x156: 0x32b3, 0x157: 0x35c4,
-	0x158: 0x32a4, 0x159: 0x35b5, 0x15a: 0x4837, 0x15b: 0x48c8, 0x15c: 0x32bd, 0x15d: 0x35ce,
-	0x15e: 0x32cc, 0x15f: 0x35dd, 0x160: 0x483c, 0x161: 0x48cd, 0x162: 0x32e5, 0x163: 0x35fb,
-	0x164: 0x32d6, 0x165: 0x35ec, 0x168: 0x4846, 0x169: 0x48d7,
-	0x16a: 0x484b, 0x16b: 0x48dc, 0x16c: 0x3303, 0x16d: 0x3619, 0x16e: 0x330d, 0x16f: 0x3623,
-	0x170: 0x3312, 0x171: 0x3628, 0x172: 0x3330, 0x173: 0x3646, 0x174: 0x3353, 0x175: 0x3669,
-	0x176: 0x337b, 0x177: 0x3696, 0x178: 0x338f, 0x179: 0x339e, 0x17a: 0x36be, 0x17b: 0x33a8,
-	0x17c: 0x36c8, 0x17d: 0x33ad, 0x17e: 0x36cd, 0x17f: 0xa000,
-	// Block 0x6, offset 0x180
-	0x184: 0x8100, 0x185: 0x8100,
-	0x186: 0x8100,
-	0x18d: 0x30c9, 0x18e: 0x33d5, 0x18f: 0x31d7, 0x190: 0x34e3, 0x191: 0x3281,
-	0x192: 0x3592, 0x193: 0x3317, 0x194: 0x362d, 0x195: 0x3b10, 0x196: 0x3c9f, 0x197: 0x3b09,
-	0x198: 0x3c98, 0x199: 0x3b17, 0x19a: 0x3ca6, 0x19b: 0x3b02, 0x19c: 0x3c91,
-	0x19e: 0x39f1, 0x19f: 0x3b80, 0x1a0: 0x39ea, 0x1a1: 0x3b79, 0x1a2: 0x36f4, 0x1a3: 0x3706,
-	0x1a6: 0x3182, 0x1a7: 0x348e, 0x1a8: 0x31ff, 0x1a9: 0x3510,
-	0x1aa: 0x482d, 0x1ab: 0x48be, 0x1ac: 0x3ad1, 0x1ad: 0x3c60, 0x1ae: 0x3718, 0x1af: 0x371e,
-	0x1b0: 0x3506, 0x1b4: 0x3169, 0x1b5: 0x3475,
-	0x1b8: 0x323b, 0x1b9: 0x354c, 0x1ba: 0x39f8, 0x1bb: 0x3b87,
-	0x1bc: 0x36ee, 0x1bd: 0x3700, 0x1be: 0x36fa, 0x1bf: 0x370c,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x30ce, 0x1c1: 0x33da, 0x1c2: 0x30d3, 0x1c3: 0x33df, 0x1c4: 0x314b, 0x1c5: 0x3457,
-	0x1c6: 0x3150, 0x1c7: 0x345c, 0x1c8: 0x31dc, 0x1c9: 0x34e8, 0x1ca: 0x31e1, 0x1cb: 0x34ed,
-	0x1cc: 0x3286, 0x1cd: 0x3597, 0x1ce: 0x328b, 0x1cf: 0x359c, 0x1d0: 0x32a9, 0x1d1: 0x35ba,
-	0x1d2: 0x32ae, 0x1d3: 0x35bf, 0x1d4: 0x331c, 0x1d5: 0x3632, 0x1d6: 0x3321, 0x1d7: 0x3637,
-	0x1d8: 0x32c7, 0x1d9: 0x35d8, 0x1da: 0x32e0, 0x1db: 0x35f6,
-	0x1de: 0x319b, 0x1df: 0x34a7,
-	0x1e6: 0x47d3, 0x1e7: 0x4864, 0x1e8: 0x47fb, 0x1e9: 0x488c,
-	0x1ea: 0x3aa0, 0x1eb: 0x3c2f, 0x1ec: 0x3a7d, 0x1ed: 0x3c0c, 0x1ee: 0x4819, 0x1ef: 0x48aa,
-	0x1f0: 0x3a99, 0x1f1: 0x3c28, 0x1f2: 0x3385, 0x1f3: 0x36a0,
-	// Block 0x8, offset 0x200
-	0x200: 0x9933, 0x201: 0x9933, 0x202: 0x9933, 0x203: 0x9933, 0x204: 0x9933, 0x205: 0x8133,
-	0x206: 0x9933, 0x207: 0x9933, 0x208: 0x9933, 0x209: 0x9933, 0x20a: 0x9933, 0x20b: 0x9933,
-	0x20c: 0x9933, 0x20d: 0x8133, 0x20e: 0x8133, 0x20f: 0x9933, 0x210: 0x8133, 0x211: 0x9933,
-	0x212: 0x8133, 0x213: 0x9933, 0x214: 0x9933, 0x215: 0x8134, 0x216: 0x812e, 0x217: 0x812e,
-	0x218: 0x812e, 0x219: 0x812e, 0x21a: 0x8134, 0x21b: 0x992c, 0x21c: 0x812e, 0x21d: 0x812e,
-	0x21e: 0x812e, 0x21f: 0x812e, 0x220: 0x812e, 0x221: 0x812a, 0x222: 0x812a, 0x223: 0x992e,
-	0x224: 0x992e, 0x225: 0x992e, 0x226: 0x992e, 0x227: 0x992a, 0x228: 0x992a, 0x229: 0x812e,
-	0x22a: 0x812e, 0x22b: 0x812e, 0x22c: 0x812e, 0x22d: 0x992e, 0x22e: 0x992e, 0x22f: 0x812e,
-	0x230: 0x992e, 0x231: 0x992e, 0x232: 0x812e, 0x233: 0x812e, 0x234: 0x8101, 0x235: 0x8101,
-	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812e, 0x23a: 0x812e, 0x23b: 0x812e,
-	0x23c: 0x812e, 0x23d: 0x8133, 0x23e: 0x8133, 0x23f: 0x8133,
-	// Block 0x9, offset 0x240
-	0x240: 0x4aef, 0x241: 0x4af4, 0x242: 0x9933, 0x243: 0x4af9, 0x244: 0x4bb2, 0x245: 0x9937,
-	0x246: 0x8133, 0x247: 0x812e, 0x248: 0x812e, 0x249: 0x812e, 0x24a: 0x8133, 0x24b: 0x8133,
-	0x24c: 0x8133, 0x24d: 0x812e, 0x24e: 0x812e, 0x250: 0x8133, 0x251: 0x8133,
-	0x252: 0x8133, 0x253: 0x812e, 0x254: 0x812e, 0x255: 0x812e, 0x256: 0x812e, 0x257: 0x8133,
-	0x258: 0x8134, 0x259: 0x812e, 0x25a: 0x812e, 0x25b: 0x8133, 0x25c: 0x8135, 0x25d: 0x8136,
-	0x25e: 0x8136, 0x25f: 0x8135, 0x260: 0x8136, 0x261: 0x8136, 0x262: 0x8135, 0x263: 0x8133,
-	0x264: 0x8133, 0x265: 0x8133, 0x266: 0x8133, 0x267: 0x8133, 0x268: 0x8133, 0x269: 0x8133,
-	0x26a: 0x8133, 0x26b: 0x8133, 0x26c: 0x8133, 0x26d: 0x8133, 0x26e: 0x8133, 0x26f: 0x8133,
-	0x274: 0x01ee,
-	0x27a: 0x8100,
-	0x27e: 0x0037,
-	// Block 0xa, offset 0x280
-	0x284: 0x8100, 0x285: 0x36e2,
-	0x286: 0x372a, 0x287: 0x00ce, 0x288: 0x3748, 0x289: 0x3754, 0x28a: 0x3766,
-	0x28c: 0x3784, 0x28e: 0x3796, 0x28f: 0x37b4, 0x290: 0x3f49, 0x291: 0xa000,
-	0x295: 0xa000, 0x297: 0xa000,
-	0x299: 0xa000,
-	0x29f: 0xa000, 0x2a1: 0xa000,
-	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3778, 0x2ab: 0x37a8, 0x2ac: 0x493f, 0x2ad: 0x37d8, 0x2ae: 0x4969, 0x2af: 0x37ea,
-	0x2b0: 0x3fb1, 0x2b1: 0xa000, 0x2b5: 0xa000,
-	0x2b7: 0xa000, 0x2b9: 0xa000,
-	0x2bf: 0xa000,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x3862, 0x2c1: 0x386e, 0x2c3: 0x385c,
-	0x2c6: 0xa000, 0x2c7: 0x384a,
-	0x2cc: 0x389e, 0x2cd: 0x3886, 0x2ce: 0x38b0, 0x2d0: 0xa000,
-	0x2d3: 0xa000, 0x2d5: 0xa000, 0x2d6: 0xa000, 0x2d7: 0xa000,
-	0x2d8: 0xa000, 0x2d9: 0x3892, 0x2da: 0xa000,
-	0x2de: 0xa000, 0x2e3: 0xa000,
-	0x2e7: 0xa000,
-	0x2eb: 0xa000, 0x2ed: 0xa000,
-	0x2f0: 0xa000, 0x2f3: 0xa000, 0x2f5: 0xa000,
-	0x2f6: 0xa000, 0x2f7: 0xa000, 0x2f8: 0xa000, 0x2f9: 0x3916, 0x2fa: 0xa000,
-	0x2fe: 0xa000,
-	// Block 0xc, offset 0x300
-	0x301: 0x3874, 0x302: 0x38f8,
-	0x310: 0x3850, 0x311: 0x38d4,
-	0x312: 0x3856, 0x313: 0x38da, 0x316: 0x3868, 0x317: 0x38ec,
-	0x318: 0xa000, 0x319: 0xa000, 0x31a: 0x396a, 0x31b: 0x3970, 0x31c: 0x387a, 0x31d: 0x38fe,
-	0x31e: 0x3880, 0x31f: 0x3904, 0x322: 0x388c, 0x323: 0x3910,
-	0x324: 0x3898, 0x325: 0x391c, 0x326: 0x38a4, 0x327: 0x3928, 0x328: 0xa000, 0x329: 0xa000,
-	0x32a: 0x3976, 0x32b: 0x397c, 0x32c: 0x38ce, 0x32d: 0x3952, 0x32e: 0x38aa, 0x32f: 0x392e,
-	0x330: 0x38b6, 0x331: 0x393a, 0x332: 0x38bc, 0x333: 0x3940, 0x334: 0x38c2, 0x335: 0x3946,
-	0x338: 0x38c8, 0x339: 0x394c,
-	// Block 0xd, offset 0x340
-	0x351: 0x812e,
-	0x352: 0x8133, 0x353: 0x8133, 0x354: 0x8133, 0x355: 0x8133, 0x356: 0x812e, 0x357: 0x8133,
-	0x358: 0x8133, 0x359: 0x8133, 0x35a: 0x812f, 0x35b: 0x812e, 0x35c: 0x8133, 0x35d: 0x8133,
-	0x35e: 0x8133, 0x35f: 0x8133, 0x360: 0x8133, 0x361: 0x8133, 0x362: 0x812e, 0x363: 0x812e,
-	0x364: 0x812e, 0x365: 0x812e, 0x366: 0x812e, 0x367: 0x812e, 0x368: 0x8133, 0x369: 0x8133,
-	0x36a: 0x812e, 0x36b: 0x8133, 0x36c: 0x8133, 0x36d: 0x812f, 0x36e: 0x8132, 0x36f: 0x8133,
-	0x370: 0x8106, 0x371: 0x8107, 0x372: 0x8108, 0x373: 0x8109, 0x374: 0x810a, 0x375: 0x810b,
-	0x376: 0x810c, 0x377: 0x810d, 0x378: 0x810e, 0x379: 0x810f, 0x37a: 0x810f, 0x37b: 0x8110,
-	0x37c: 0x8111, 0x37d: 0x8112, 0x37f: 0x8113,
-	// Block 0xe, offset 0x380
-	0x388: 0xa000, 0x38a: 0xa000, 0x38b: 0x8117,
-	0x38c: 0x8118, 0x38d: 0x8119, 0x38e: 0x811a, 0x38f: 0x811b, 0x390: 0x811c, 0x391: 0x811d,
-	0x392: 0x811e, 0x393: 0x9933, 0x394: 0x9933, 0x395: 0x992e, 0x396: 0x812e, 0x397: 0x8133,
-	0x398: 0x8133, 0x399: 0x8133, 0x39a: 0x8133, 0x39b: 0x8133, 0x39c: 0x812e, 0x39d: 0x8133,
-	0x39e: 0x8133, 0x39f: 0x812e,
-	0x3b0: 0x811f,
-	// Block 0xf, offset 0x3c0
-	0x3ca: 0x8133, 0x3cb: 0x8133,
-	0x3cc: 0x8133, 0x3cd: 0x8133, 0x3ce: 0x8133, 0x3cf: 0x812e, 0x3d0: 0x812e, 0x3d1: 0x812e,
-	0x3d2: 0x812e, 0x3d3: 0x812e, 0x3d4: 0x8133, 0x3d5: 0x8133, 0x3d6: 0x8133, 0x3d7: 0x8133,
-	0x3d8: 0x8133, 0x3d9: 0x8133, 0x3da: 0x8133, 0x3db: 0x8133, 0x3dc: 0x8133, 0x3dd: 0x8133,
-	0x3de: 0x8133, 0x3df: 0x8133, 0x3e0: 0x8133, 0x3e1: 0x8133, 0x3e3: 0x812e,
-	0x3e4: 0x8133, 0x3e5: 0x8133, 0x3e6: 0x812e, 0x3e7: 0x8133, 0x3e8: 0x8133, 0x3e9: 0x812e,
-	0x3ea: 0x8133, 0x3eb: 0x8133, 0x3ec: 0x8133, 0x3ed: 0x812e, 0x3ee: 0x812e, 0x3ef: 0x812e,
-	0x3f0: 0x8117, 0x3f1: 0x8118, 0x3f2: 0x8119, 0x3f3: 0x8133, 0x3f4: 0x8133, 0x3f5: 0x8133,
-	0x3f6: 0x812e, 0x3f7: 0x8133, 0x3f8: 0x8133, 0x3f9: 0x812e, 0x3fa: 0x812e, 0x3fb: 0x8133,
-	0x3fc: 0x8133, 0x3fd: 0x8133, 0x3fe: 0x8133, 0x3ff: 0x8133,
-	// Block 0x10, offset 0x400
-	0x405: 0xa000,
-	0x406: 0x2e5d, 0x407: 0xa000, 0x408: 0x2e65, 0x409: 0xa000, 0x40a: 0x2e6d, 0x40b: 0xa000,
-	0x40c: 0x2e75, 0x40d: 0xa000, 0x40e: 0x2e7d, 0x411: 0xa000,
-	0x412: 0x2e85,
-	0x434: 0x8103, 0x435: 0x9900,
-	0x43a: 0xa000, 0x43b: 0x2e8d,
-	0x43c: 0xa000, 0x43d: 0x2e95, 0x43e: 0xa000, 0x43f: 0xa000,
-	// Block 0x11, offset 0x440
-	0x440: 0x8133, 0x441: 0x8133, 0x442: 0x812e, 0x443: 0x8133, 0x444: 0x8133, 0x445: 0x8133,
-	0x446: 0x8133, 0x447: 0x8133, 0x448: 0x8133, 0x449: 0x8133, 0x44a: 0x812e, 0x44b: 0x8133,
-	0x44c: 0x8133, 0x44d: 0x8136, 0x44e: 0x812b, 0x44f: 0x812e, 0x450: 0x812a, 0x451: 0x8133,
-	0x452: 0x8133, 0x453: 0x8133, 0x454: 0x8133, 0x455: 0x8133, 0x456: 0x8133, 0x457: 0x8133,
-	0x458: 0x8133, 0x459: 0x8133, 0x45a: 0x8133, 0x45b: 0x8133, 0x45c: 0x8133, 0x45d: 0x8133,
-	0x45e: 0x8133, 0x45f: 0x8133, 0x460: 0x8133, 0x461: 0x8133, 0x462: 0x8133, 0x463: 0x8133,
-	0x464: 0x8133, 0x465: 0x8133, 0x466: 0x8133, 0x467: 0x8133, 0x468: 0x8133, 0x469: 0x8133,
-	0x46a: 0x8133, 0x46b: 0x8133, 0x46c: 0x8133, 0x46d: 0x8133, 0x46e: 0x8133, 0x46f: 0x8133,
-	0x470: 0x8133, 0x471: 0x8133, 0x472: 0x8133, 0x473: 0x8133, 0x474: 0x8133, 0x475: 0x8133,
-	0x476: 0x8134, 0x477: 0x8132, 0x478: 0x8132, 0x479: 0x812e, 0x47a: 0x812d, 0x47b: 0x8133,
-	0x47c: 0x8135, 0x47d: 0x812e, 0x47e: 0x8133, 0x47f: 0x812e,
-	// Block 0x12, offset 0x480
-	0x480: 0x30d8, 0x481: 0x33e4, 0x482: 0x30e2, 0x483: 0x33ee, 0x484: 0x30e7, 0x485: 0x33f3,
-	0x486: 0x30ec, 0x487: 0x33f8, 0x488: 0x3a0d, 0x489: 0x3b9c, 0x48a: 0x3105, 0x48b: 0x3411,
-	0x48c: 0x310f, 0x48d: 0x341b, 0x48e: 0x311e, 0x48f: 0x342a, 0x490: 0x3114, 0x491: 0x3420,
-	0x492: 0x3119, 0x493: 0x3425, 0x494: 0x3a30, 0x495: 0x3bbf, 0x496: 0x3a37, 0x497: 0x3bc6,
-	0x498: 0x315a, 0x499: 0x3466, 0x49a: 0x315f, 0x49b: 0x346b, 0x49c: 0x3a45, 0x49d: 0x3bd4,
-	0x49e: 0x3164, 0x49f: 0x3470, 0x4a0: 0x3173, 0x4a1: 0x347f, 0x4a2: 0x3191, 0x4a3: 0x349d,
-	0x4a4: 0x31a0, 0x4a5: 0x34ac, 0x4a6: 0x3196, 0x4a7: 0x34a2, 0x4a8: 0x31a5, 0x4a9: 0x34b1,
-	0x4aa: 0x31aa, 0x4ab: 0x34b6, 0x4ac: 0x31f0, 0x4ad: 0x34fc, 0x4ae: 0x3a4c, 0x4af: 0x3bdb,
-	0x4b0: 0x31fa, 0x4b1: 0x350b, 0x4b2: 0x3204, 0x4b3: 0x3515, 0x4b4: 0x320e, 0x4b5: 0x351f,
-	0x4b6: 0x4805, 0x4b7: 0x4896, 0x4b8: 0x3a53, 0x4b9: 0x3be2, 0x4ba: 0x3227, 0x4bb: 0x3538,
-	0x4bc: 0x3222, 0x4bd: 0x3533, 0x4be: 0x322c, 0x4bf: 0x353d,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x3231, 0x4c1: 0x3542, 0x4c2: 0x3236, 0x4c3: 0x3547, 0x4c4: 0x324a, 0x4c5: 0x355b,
-	0x4c6: 0x3254, 0x4c7: 0x3565, 0x4c8: 0x3263, 0x4c9: 0x3574, 0x4ca: 0x325e, 0x4cb: 0x356f,
-	0x4cc: 0x3a76, 0x4cd: 0x3c05, 0x4ce: 0x3a84, 0x4cf: 0x3c13, 0x4d0: 0x3a8b, 0x4d1: 0x3c1a,
-	0x4d2: 0x3a92, 0x4d3: 0x3c21, 0x4d4: 0x3290, 0x4d5: 0x35a1, 0x4d6: 0x3295, 0x4d7: 0x35a6,
-	0x4d8: 0x329f, 0x4d9: 0x35b0, 0x4da: 0x4832, 0x4db: 0x48c3, 0x4dc: 0x3ad8, 0x4dd: 0x3c67,
-	0x4de: 0x32b8, 0x4df: 0x35c9, 0x4e0: 0x32c2, 0x4e1: 0x35d3, 0x4e2: 0x4841, 0x4e3: 0x48d2,
-	0x4e4: 0x3adf, 0x4e5: 0x3c6e, 0x4e6: 0x3ae6, 0x4e7: 0x3c75, 0x4e8: 0x3aed, 0x4e9: 0x3c7c,
-	0x4ea: 0x32d1, 0x4eb: 0x35e2, 0x4ec: 0x32db, 0x4ed: 0x35f1, 0x4ee: 0x32ef, 0x4ef: 0x3605,
-	0x4f0: 0x32ea, 0x4f1: 0x3600, 0x4f2: 0x332b, 0x4f3: 0x3641, 0x4f4: 0x333a, 0x4f5: 0x3650,
-	0x4f6: 0x3335, 0x4f7: 0x364b, 0x4f8: 0x3af4, 0x4f9: 0x3c83, 0x4fa: 0x3afb, 0x4fb: 0x3c8a,
-	0x4fc: 0x333f, 0x4fd: 0x3655, 0x4fe: 0x3344, 0x4ff: 0x365a,
-	// Block 0x14, offset 0x500
-	0x500: 0x3349, 0x501: 0x365f, 0x502: 0x334e, 0x503: 0x3664, 0x504: 0x335d, 0x505: 0x3673,
-	0x506: 0x3358, 0x507: 0x366e, 0x508: 0x3362, 0x509: 0x367d, 0x50a: 0x3367, 0x50b: 0x3682,
-	0x50c: 0x336c, 0x50d: 0x3687, 0x50e: 0x338a, 0x50f: 0x36a5, 0x510: 0x33a3, 0x511: 0x36c3,
-	0x512: 0x33b2, 0x513: 0x36d2, 0x514: 0x33b7, 0x515: 0x36d7, 0x516: 0x34bb, 0x517: 0x35e7,
-	0x518: 0x3678, 0x519: 0x36b4, 0x51b: 0x3712,
-	0x520: 0x47e2, 0x521: 0x4873, 0x522: 0x30c4, 0x523: 0x33d0,
-	0x524: 0x39b9, 0x525: 0x3b48, 0x526: 0x39b2, 0x527: 0x3b41, 0x528: 0x39c7, 0x529: 0x3b56,
-	0x52a: 0x39c0, 0x52b: 0x3b4f, 0x52c: 0x39ff, 0x52d: 0x3b8e, 0x52e: 0x39d5, 0x52f: 0x3b64,
-	0x530: 0x39ce, 0x531: 0x3b5d, 0x532: 0x39e3, 0x533: 0x3b72, 0x534: 0x39dc, 0x535: 0x3b6b,
-	0x536: 0x3a06, 0x537: 0x3b95, 0x538: 0x47f6, 0x539: 0x4887, 0x53a: 0x3141, 0x53b: 0x344d,
-	0x53c: 0x312d, 0x53d: 0x3439, 0x53e: 0x3a1b, 0x53f: 0x3baa,
-	// Block 0x15, offset 0x540
-	0x540: 0x3a14, 0x541: 0x3ba3, 0x542: 0x3a29, 0x543: 0x3bb8, 0x544: 0x3a22, 0x545: 0x3bb1,
-	0x546: 0x3a3e, 0x547: 0x3bcd, 0x548: 0x31d2, 0x549: 0x34de, 0x54a: 0x31e6, 0x54b: 0x34f2,
-	0x54c: 0x4828, 0x54d: 0x48b9, 0x54e: 0x3277, 0x54f: 0x3588, 0x550: 0x3a61, 0x551: 0x3bf0,
-	0x552: 0x3a5a, 0x553: 0x3be9, 0x554: 0x3a6f, 0x555: 0x3bfe, 0x556: 0x3a68, 0x557: 0x3bf7,
-	0x558: 0x3aca, 0x559: 0x3c59, 0x55a: 0x3aae, 0x55b: 0x3c3d, 0x55c: 0x3aa7, 0x55d: 0x3c36,
-	0x55e: 0x3abc, 0x55f: 0x3c4b, 0x560: 0x3ab5, 0x561: 0x3c44, 0x562: 0x3ac3, 0x563: 0x3c52,
-	0x564: 0x3326, 0x565: 0x363c, 0x566: 0x3308, 0x567: 0x361e, 0x568: 0x3b25, 0x569: 0x3cb4,
-	0x56a: 0x3b1e, 0x56b: 0x3cad, 0x56c: 0x3b33, 0x56d: 0x3cc2, 0x56e: 0x3b2c, 0x56f: 0x3cbb,
-	0x570: 0x3b3a, 0x571: 0x3cc9, 0x572: 0x3371, 0x573: 0x368c, 0x574: 0x3399, 0x575: 0x36b9,
-	0x576: 0x3394, 0x577: 0x36af, 0x578: 0x3380, 0x579: 0x369b,
-	// Block 0x16, offset 0x580
-	0x580: 0x4945, 0x581: 0x494b, 0x582: 0x4a5f, 0x583: 0x4a77, 0x584: 0x4a67, 0x585: 0x4a7f,
-	0x586: 0x4a6f, 0x587: 0x4a87, 0x588: 0x48eb, 0x589: 0x48f1, 0x58a: 0x49cf, 0x58b: 0x49e7,
-	0x58c: 0x49d7, 0x58d: 0x49ef, 0x58e: 0x49df, 0x58f: 0x49f7, 0x590: 0x4957, 0x591: 0x495d,
-	0x592: 0x3ef9, 0x593: 0x3f09, 0x594: 0x3f01, 0x595: 0x3f11,
-	0x598: 0x48f7, 0x599: 0x48fd, 0x59a: 0x3e29, 0x59b: 0x3e39, 0x59c: 0x3e31, 0x59d: 0x3e41,
-	0x5a0: 0x496f, 0x5a1: 0x4975, 0x5a2: 0x4a8f, 0x5a3: 0x4aa7,
-	0x5a4: 0x4a97, 0x5a5: 0x4aaf, 0x5a6: 0x4a9f, 0x5a7: 0x4ab7, 0x5a8: 0x4903, 0x5a9: 0x4909,
-	0x5aa: 0x49ff, 0x5ab: 0x4a17, 0x5ac: 0x4a07, 0x5ad: 0x4a1f, 0x5ae: 0x4a0f, 0x5af: 0x4a27,
-	0x5b0: 0x4987, 0x5b1: 0x498d, 0x5b2: 0x3f59, 0x5b3: 0x3f71, 0x5b4: 0x3f61, 0x5b5: 0x3f79,
-	0x5b6: 0x3f69, 0x5b7: 0x3f81, 0x5b8: 0x490f, 0x5b9: 0x4915, 0x5ba: 0x3e59, 0x5bb: 0x3e71,
-	0x5bc: 0x3e61, 0x5bd: 0x3e79, 0x5be: 0x3e69, 0x5bf: 0x3e81,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x4993, 0x5c1: 0x4999, 0x5c2: 0x3f89, 0x5c3: 0x3f99, 0x5c4: 0x3f91, 0x5c5: 0x3fa1,
-	0x5c8: 0x491b, 0x5c9: 0x4921, 0x5ca: 0x3e89, 0x5cb: 0x3e99,
-	0x5cc: 0x3e91, 0x5cd: 0x3ea1, 0x5d0: 0x49a5, 0x5d1: 0x49ab,
-	0x5d2: 0x3fc1, 0x5d3: 0x3fd9, 0x5d4: 0x3fc9, 0x5d5: 0x3fe1, 0x5d6: 0x3fd1, 0x5d7: 0x3fe9,
-	0x5d9: 0x4927, 0x5db: 0x3ea9, 0x5dd: 0x3eb1,
-	0x5df: 0x3eb9, 0x5e0: 0x49bd, 0x5e1: 0x49c3, 0x5e2: 0x4abf, 0x5e3: 0x4ad7,
-	0x5e4: 0x4ac7, 0x5e5: 0x4adf, 0x5e6: 0x4acf, 0x5e7: 0x4ae7, 0x5e8: 0x492d, 0x5e9: 0x4933,
-	0x5ea: 0x4a2f, 0x5eb: 0x4a47, 0x5ec: 0x4a37, 0x5ed: 0x4a4f, 0x5ee: 0x4a3f, 0x5ef: 0x4a57,
-	0x5f0: 0x4939, 0x5f1: 0x445f, 0x5f2: 0x37d2, 0x5f3: 0x4465, 0x5f4: 0x4963, 0x5f5: 0x446b,
-	0x5f6: 0x37e4, 0x5f7: 0x4471, 0x5f8: 0x3802, 0x5f9: 0x4477, 0x5fa: 0x381a, 0x5fb: 0x447d,
-	0x5fc: 0x49b1, 0x5fd: 0x4483,
-	// Block 0x18, offset 0x600
-	0x600: 0x3ee1, 0x601: 0x3ee9, 0x602: 0x42c5, 0x603: 0x42e3, 0x604: 0x42cf, 0x605: 0x42ed,
-	0x606: 0x42d9, 0x607: 0x42f7, 0x608: 0x3e19, 0x609: 0x3e21, 0x60a: 0x4211, 0x60b: 0x422f,
-	0x60c: 0x421b, 0x60d: 0x4239, 0x60e: 0x4225, 0x60f: 0x4243, 0x610: 0x3f29, 0x611: 0x3f31,
-	0x612: 0x4301, 0x613: 0x431f, 0x614: 0x430b, 0x615: 0x4329, 0x616: 0x4315, 0x617: 0x4333,
-	0x618: 0x3e49, 0x619: 0x3e51, 0x61a: 0x424d, 0x61b: 0x426b, 0x61c: 0x4257, 0x61d: 0x4275,
-	0x61e: 0x4261, 0x61f: 0x427f, 0x620: 0x4001, 0x621: 0x4009, 0x622: 0x433d, 0x623: 0x435b,
-	0x624: 0x4347, 0x625: 0x4365, 0x626: 0x4351, 0x627: 0x436f, 0x628: 0x3ec1, 0x629: 0x3ec9,
-	0x62a: 0x4289, 0x62b: 0x42a7, 0x62c: 0x4293, 0x62d: 0x42b1, 0x62e: 0x429d, 0x62f: 0x42bb,
-	0x630: 0x37c6, 0x631: 0x37c0, 0x632: 0x3ed1, 0x633: 0x37cc, 0x634: 0x3ed9,
-	0x636: 0x4951, 0x637: 0x3ef1, 0x638: 0x3736, 0x639: 0x3730, 0x63a: 0x3724, 0x63b: 0x442f,
-	0x63c: 0x373c, 0x63d: 0x8100, 0x63e: 0x0257, 0x63f: 0xa100,
-	// Block 0x19, offset 0x640
-	0x640: 0x8100, 0x641: 0x36e8, 0x642: 0x3f19, 0x643: 0x37de, 0x644: 0x3f21,
-	0x646: 0x497b, 0x647: 0x3f39, 0x648: 0x3742, 0x649: 0x4435, 0x64a: 0x374e, 0x64b: 0x443b,
-	0x64c: 0x375a, 0x64d: 0x3cd0, 0x64e: 0x3cd7, 0x64f: 0x3cde, 0x650: 0x37f6, 0x651: 0x37f0,
-	0x652: 0x3f41, 0x653: 0x4625, 0x656: 0x37fc, 0x657: 0x3f51,
-	0x658: 0x3772, 0x659: 0x376c, 0x65a: 0x3760, 0x65b: 0x4441, 0x65d: 0x3ce5,
-	0x65e: 0x3cec, 0x65f: 0x3cf3, 0x660: 0x382c, 0x661: 0x3826, 0x662: 0x3fa9, 0x663: 0x462d,
-	0x664: 0x380e, 0x665: 0x3814, 0x666: 0x3832, 0x667: 0x3fb9, 0x668: 0x37a2, 0x669: 0x379c,
-	0x66a: 0x3790, 0x66b: 0x444d, 0x66c: 0x378a, 0x66d: 0x36dc, 0x66e: 0x4429, 0x66f: 0x0081,
-	0x672: 0x3ff1, 0x673: 0x3838, 0x674: 0x3ff9,
-	0x676: 0x49c9, 0x677: 0x4011, 0x678: 0x377e, 0x679: 0x4447, 0x67a: 0x37ae, 0x67b: 0x4459,
-	0x67c: 0x37ba, 0x67d: 0x4397, 0x67e: 0xa100,
-	// Block 0x1a, offset 0x680
-	0x681: 0x3d47, 0x683: 0xa000, 0x684: 0x3d4e, 0x685: 0xa000,
-	0x687: 0x3d55, 0x688: 0xa000, 0x689: 0x3d5c,
-	0x68d: 0xa000,
-	0x6a0: 0x30a6, 0x6a1: 0xa000, 0x6a2: 0x3d6a,
-	0x6a4: 0xa000, 0x6a5: 0xa000,
-	0x6ad: 0x3d63, 0x6ae: 0x30a1, 0x6af: 0x30ab,
-	0x6b0: 0x3d71, 0x6b1: 0x3d78, 0x6b2: 0xa000, 0x6b3: 0xa000, 0x6b4: 0x3d7f, 0x6b5: 0x3d86,
-	0x6b6: 0xa000, 0x6b7: 0xa000, 0x6b8: 0x3d8d, 0x6b9: 0x3d94, 0x6ba: 0xa000, 0x6bb: 0xa000,
-	0x6bc: 0xa000, 0x6bd: 0xa000,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x3d9b, 0x6c1: 0x3da2, 0x6c2: 0xa000, 0x6c3: 0xa000, 0x6c4: 0x3db7, 0x6c5: 0x3dbe,
-	0x6c6: 0xa000, 0x6c7: 0xa000, 0x6c8: 0x3dc5, 0x6c9: 0x3dcc,
-	0x6d1: 0xa000,
-	0x6d2: 0xa000,
-	0x6e2: 0xa000,
-	0x6e8: 0xa000, 0x6e9: 0xa000,
-	0x6eb: 0xa000, 0x6ec: 0x3de1, 0x6ed: 0x3de8, 0x6ee: 0x3def, 0x6ef: 0x3df6,
-	0x6f2: 0xa000, 0x6f3: 0xa000, 0x6f4: 0xa000, 0x6f5: 0xa000,
-	// Block 0x1c, offset 0x700
-	0x706: 0xa000, 0x70b: 0xa000,
-	0x70c: 0x4049, 0x70d: 0xa000, 0x70e: 0x4051, 0x70f: 0xa000, 0x710: 0x4059, 0x711: 0xa000,
-	0x712: 0x4061, 0x713: 0xa000, 0x714: 0x4069, 0x715: 0xa000, 0x716: 0x4071, 0x717: 0xa000,
-	0x718: 0x4079, 0x719: 0xa000, 0x71a: 0x4081, 0x71b: 0xa000, 0x71c: 0x4089, 0x71d: 0xa000,
-	0x71e: 0x4091, 0x71f: 0xa000, 0x720: 0x4099, 0x721: 0xa000, 0x722: 0x40a1,
-	0x724: 0xa000, 0x725: 0x40a9, 0x726: 0xa000, 0x727: 0x40b1, 0x728: 0xa000, 0x729: 0x40b9,
-	0x72f: 0xa000,
-	0x730: 0x40c1, 0x731: 0x40c9, 0x732: 0xa000, 0x733: 0x40d1, 0x734: 0x40d9, 0x735: 0xa000,
-	0x736: 0x40e1, 0x737: 0x40e9, 0x738: 0xa000, 0x739: 0x40f1, 0x73a: 0x40f9, 0x73b: 0xa000,
-	0x73c: 0x4101, 0x73d: 0x4109,
-	// Block 0x1d, offset 0x740
-	0x754: 0x4041,
-	0x759: 0x9904, 0x75a: 0x9904, 0x75b: 0x8100, 0x75c: 0x8100, 0x75d: 0xa000,
-	0x75e: 0x4111,
-	0x766: 0xa000,
-	0x76b: 0xa000, 0x76c: 0x4121, 0x76d: 0xa000, 0x76e: 0x4129, 0x76f: 0xa000,
-	0x770: 0x4131, 0x771: 0xa000, 0x772: 0x4139, 0x773: 0xa000, 0x774: 0x4141, 0x775: 0xa000,
-	0x776: 0x4149, 0x777: 0xa000, 0x778: 0x4151, 0x779: 0xa000, 0x77a: 0x4159, 0x77b: 0xa000,
-	0x77c: 0x4161, 0x77d: 0xa000, 0x77e: 0x4169, 0x77f: 0xa000,
-	// Block 0x1e, offset 0x780
-	0x780: 0x4171, 0x781: 0xa000, 0x782: 0x4179, 0x784: 0xa000, 0x785: 0x4181,
-	0x786: 0xa000, 0x787: 0x4189, 0x788: 0xa000, 0x789: 0x4191,
-	0x78f: 0xa000, 0x790: 0x4199, 0x791: 0x41a1,
-	0x792: 0xa000, 0x793: 0x41a9, 0x794: 0x41b1, 0x795: 0xa000, 0x796: 0x41b9, 0x797: 0x41c1,
-	0x798: 0xa000, 0x799: 0x41c9, 0x79a: 0x41d1, 0x79b: 0xa000, 0x79c: 0x41d9, 0x79d: 0x41e1,
-	0x7af: 0xa000,
-	0x7b0: 0xa000, 0x7b1: 0xa000, 0x7b2: 0xa000, 0x7b4: 0x4119,
-	0x7b7: 0x41e9, 0x7b8: 0x41f1, 0x7b9: 0x41f9, 0x7ba: 0x4201,
-	0x7bd: 0xa000, 0x7be: 0x4209,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x1472, 0x7c1: 0x0df6, 0x7c2: 0x14ce, 0x7c3: 0x149a, 0x7c4: 0x0f52, 0x7c5: 0x07e6,
-	0x7c6: 0x09da, 0x7c7: 0x1726, 0x7c8: 0x1726, 0x7c9: 0x0b06, 0x7ca: 0x155a, 0x7cb: 0x0a3e,
-	0x7cc: 0x0b02, 0x7cd: 0x0cea, 0x7ce: 0x10ca, 0x7cf: 0x125a, 0x7d0: 0x1392, 0x7d1: 0x13ce,
-	0x7d2: 0x1402, 0x7d3: 0x1516, 0x7d4: 0x0e6e, 0x7d5: 0x0efa, 0x7d6: 0x0fa6, 0x7d7: 0x103e,
-	0x7d8: 0x135a, 0x7d9: 0x1542, 0x7da: 0x166e, 0x7db: 0x080a, 0x7dc: 0x09ae, 0x7dd: 0x0e82,
-	0x7de: 0x0fca, 0x7df: 0x138e, 0x7e0: 0x16be, 0x7e1: 0x0bae, 0x7e2: 0x0f72, 0x7e3: 0x137e,
-	0x7e4: 0x1412, 0x7e5: 0x0d1e, 0x7e6: 0x12b6, 0x7e7: 0x13da, 0x7e8: 0x0c1a, 0x7e9: 0x0e0a,
-	0x7ea: 0x0f12, 0x7eb: 0x1016, 0x7ec: 0x1522, 0x7ed: 0x084a, 0x7ee: 0x08e2, 0x7ef: 0x094e,
-	0x7f0: 0x0d86, 0x7f1: 0x0e7a, 0x7f2: 0x0fc6, 0x7f3: 0x10ea, 0x7f4: 0x1272, 0x7f5: 0x1386,
-	0x7f6: 0x139e, 0x7f7: 0x14c2, 0x7f8: 0x15ea, 0x7f9: 0x169e, 0x7fa: 0x16ba, 0x7fb: 0x1126,
-	0x7fc: 0x1166, 0x7fd: 0x121e, 0x7fe: 0x133e, 0x7ff: 0x1576,
-	// Block 0x20, offset 0x800
-	0x800: 0x16c6, 0x801: 0x1446, 0x802: 0x0ac2, 0x803: 0x0c36, 0x804: 0x11d6, 0x805: 0x1296,
-	0x806: 0x0ffa, 0x807: 0x112e, 0x808: 0x1492, 0x809: 0x15e2, 0x80a: 0x0abe, 0x80b: 0x0b8a,
-	0x80c: 0x0e72, 0x80d: 0x0f26, 0x80e: 0x0f5a, 0x80f: 0x120e, 0x810: 0x1236, 0x811: 0x15a2,
-	0x812: 0x094a, 0x813: 0x12a2, 0x814: 0x08ee, 0x815: 0x08ea, 0x816: 0x1192, 0x817: 0x1222,
-	0x818: 0x1356, 0x819: 0x15aa, 0x81a: 0x1462, 0x81b: 0x0d22, 0x81c: 0x0e6e, 0x81d: 0x1452,
-	0x81e: 0x07f2, 0x81f: 0x0b5e, 0x820: 0x0c8e, 0x821: 0x102a, 0x822: 0x10aa, 0x823: 0x096e,
-	0x824: 0x1136, 0x825: 0x085a, 0x826: 0x0c72, 0x827: 0x07d2, 0x828: 0x0ee6, 0x829: 0x0d9e,
-	0x82a: 0x120a, 0x82b: 0x09c2, 0x82c: 0x0aae, 0x82d: 0x10f6, 0x82e: 0x135e, 0x82f: 0x1436,
-	0x830: 0x0eb2, 0x831: 0x14f2, 0x832: 0x0ede, 0x833: 0x0d32, 0x834: 0x1316, 0x835: 0x0d52,
-	0x836: 0x10a6, 0x837: 0x0826, 0x838: 0x08a2, 0x839: 0x08e6, 0x83a: 0x0e4e, 0x83b: 0x11f6,
-	0x83c: 0x12ee, 0x83d: 0x1442, 0x83e: 0x1556, 0x83f: 0x0956,
-	// Block 0x21, offset 0x840
-	0x840: 0x0a0a, 0x841: 0x0b12, 0x842: 0x0c2a, 0x843: 0x0dba, 0x844: 0x0f76, 0x845: 0x113a,
-	0x846: 0x1592, 0x847: 0x1676, 0x848: 0x16ca, 0x849: 0x16e2, 0x84a: 0x0932, 0x84b: 0x0dee,
-	0x84c: 0x0e9e, 0x84d: 0x14e6, 0x84e: 0x0bf6, 0x84f: 0x0cd2, 0x850: 0x0cee, 0x851: 0x0d7e,
-	0x852: 0x0f66, 0x853: 0x0fb2, 0x854: 0x1062, 0x855: 0x1186, 0x856: 0x122a, 0x857: 0x128e,
-	0x858: 0x14d6, 0x859: 0x1366, 0x85a: 0x14fe, 0x85b: 0x157a, 0x85c: 0x090a, 0x85d: 0x0936,
-	0x85e: 0x0a1e, 0x85f: 0x0fa2, 0x860: 0x13ee, 0x861: 0x1436, 0x862: 0x0c16, 0x863: 0x0c86,
-	0x864: 0x0d4a, 0x865: 0x0eaa, 0x866: 0x11d2, 0x867: 0x101e, 0x868: 0x0836, 0x869: 0x0a7a,
-	0x86a: 0x0b5e, 0x86b: 0x0bc2, 0x86c: 0x0c92, 0x86d: 0x103a, 0x86e: 0x1056, 0x86f: 0x1266,
-	0x870: 0x1286, 0x871: 0x155e, 0x872: 0x15de, 0x873: 0x15ee, 0x874: 0x162a, 0x875: 0x084e,
-	0x876: 0x117a, 0x877: 0x154a, 0x878: 0x15c6, 0x879: 0x0caa, 0x87a: 0x0812, 0x87b: 0x0872,
-	0x87c: 0x0b62, 0x87d: 0x0b82, 0x87e: 0x0daa, 0x87f: 0x0e6e,
-	// Block 0x22, offset 0x880
-	0x880: 0x0fbe, 0x881: 0x10c6, 0x882: 0x1372, 0x883: 0x1512, 0x884: 0x171e, 0x885: 0x0dde,
-	0x886: 0x159e, 0x887: 0x092e, 0x888: 0x0e2a, 0x889: 0x0e36, 0x88a: 0x0f0a, 0x88b: 0x0f42,
-	0x88c: 0x1046, 0x88d: 0x10a2, 0x88e: 0x1122, 0x88f: 0x1206, 0x890: 0x1636, 0x891: 0x08aa,
-	0x892: 0x0cfe, 0x893: 0x15ae, 0x894: 0x0862, 0x895: 0x0ba6, 0x896: 0x0f2a, 0x897: 0x14da,
-	0x898: 0x0c62, 0x899: 0x0cb2, 0x89a: 0x0e3e, 0x89b: 0x102a, 0x89c: 0x15b6, 0x89d: 0x0912,
-	0x89e: 0x09fa, 0x89f: 0x0b92, 0x8a0: 0x0dce, 0x8a1: 0x0e1a, 0x8a2: 0x0e5a, 0x8a3: 0x0eee,
-	0x8a4: 0x1042, 0x8a5: 0x10b6, 0x8a6: 0x1252, 0x8a7: 0x13f2, 0x8a8: 0x13fe, 0x8a9: 0x1552,
-	0x8aa: 0x15d2, 0x8ab: 0x097e, 0x8ac: 0x0f46, 0x8ad: 0x09fe, 0x8ae: 0x0fc2, 0x8af: 0x1066,
-	0x8b0: 0x1382, 0x8b1: 0x15ba, 0x8b2: 0x16a6, 0x8b3: 0x16ce, 0x8b4: 0x0e32, 0x8b5: 0x0f22,
-	0x8b6: 0x12be, 0x8b7: 0x11b2, 0x8b8: 0x11be, 0x8b9: 0x11e2, 0x8ba: 0x1012, 0x8bb: 0x0f9a,
-	0x8bc: 0x145e, 0x8bd: 0x082e, 0x8be: 0x1326, 0x8bf: 0x0916,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x0906, 0x8c1: 0x0c06, 0x8c2: 0x0d26, 0x8c3: 0x11ee, 0x8c4: 0x0b4e, 0x8c5: 0x0efe,
-	0x8c6: 0x0dea, 0x8c7: 0x14e2, 0x8c8: 0x13e2, 0x8c9: 0x15a6, 0x8ca: 0x141e, 0x8cb: 0x0c22,
-	0x8cc: 0x0882, 0x8cd: 0x0a56, 0x8d0: 0x0aaa,
-	0x8d2: 0x0dda, 0x8d5: 0x08f2, 0x8d6: 0x101a, 0x8d7: 0x10de,
-	0x8d8: 0x1142, 0x8d9: 0x115e, 0x8da: 0x1162, 0x8db: 0x1176, 0x8dc: 0x15f6, 0x8dd: 0x11e6,
-	0x8de: 0x126a, 0x8e0: 0x138a, 0x8e2: 0x144e,
-	0x8e5: 0x1502, 0x8e6: 0x152e,
-	0x8ea: 0x164a, 0x8eb: 0x164e, 0x8ec: 0x1652, 0x8ed: 0x16b6, 0x8ee: 0x1526, 0x8ef: 0x15c2,
-	0x8f0: 0x0852, 0x8f1: 0x0876, 0x8f2: 0x088a, 0x8f3: 0x0946, 0x8f4: 0x0952, 0x8f5: 0x0992,
-	0x8f6: 0x0a46, 0x8f7: 0x0a62, 0x8f8: 0x0a6a, 0x8f9: 0x0aa6, 0x8fa: 0x0ab2, 0x8fb: 0x0b8e,
-	0x8fc: 0x0b96, 0x8fd: 0x0c9e, 0x8fe: 0x0cc6, 0x8ff: 0x0cce,
-	// Block 0x24, offset 0x900
-	0x900: 0x0ce6, 0x901: 0x0d92, 0x902: 0x0dc2, 0x903: 0x0de2, 0x904: 0x0e52, 0x905: 0x0f16,
-	0x906: 0x0f32, 0x907: 0x0f62, 0x908: 0x0fb6, 0x909: 0x0fd6, 0x90a: 0x104a, 0x90b: 0x112a,
-	0x90c: 0x1146, 0x90d: 0x114e, 0x90e: 0x114a, 0x90f: 0x1152, 0x910: 0x1156, 0x911: 0x115a,
-	0x912: 0x116e, 0x913: 0x1172, 0x914: 0x1196, 0x915: 0x11aa, 0x916: 0x11c6, 0x917: 0x122a,
-	0x918: 0x1232, 0x919: 0x123a, 0x91a: 0x124e, 0x91b: 0x1276, 0x91c: 0x12c6, 0x91d: 0x12fa,
-	0x91e: 0x12fa, 0x91f: 0x1362, 0x920: 0x140a, 0x921: 0x1422, 0x922: 0x1456, 0x923: 0x145a,
-	0x924: 0x149e, 0x925: 0x14a2, 0x926: 0x14fa, 0x927: 0x1502, 0x928: 0x15d6, 0x929: 0x161a,
-	0x92a: 0x1632, 0x92b: 0x0c96, 0x92c: 0x184b, 0x92d: 0x12de,
-	0x930: 0x07da, 0x931: 0x08de, 0x932: 0x089e, 0x933: 0x0846, 0x934: 0x0886, 0x935: 0x08b2,
-	0x936: 0x0942, 0x937: 0x095e, 0x938: 0x0a46, 0x939: 0x0a32, 0x93a: 0x0a42, 0x93b: 0x0a5e,
-	0x93c: 0x0aaa, 0x93d: 0x0aba, 0x93e: 0x0afe, 0x93f: 0x0b0a,
-	// Block 0x25, offset 0x940
-	0x940: 0x0b26, 0x941: 0x0b36, 0x942: 0x0c1e, 0x943: 0x0c26, 0x944: 0x0c56, 0x945: 0x0c76,
-	0x946: 0x0ca6, 0x947: 0x0cbe, 0x948: 0x0cae, 0x949: 0x0cce, 0x94a: 0x0cc2, 0x94b: 0x0ce6,
-	0x94c: 0x0d02, 0x94d: 0x0d5a, 0x94e: 0x0d66, 0x94f: 0x0d6e, 0x950: 0x0d96, 0x951: 0x0dda,
-	0x952: 0x0e0a, 0x953: 0x0e0e, 0x954: 0x0e22, 0x955: 0x0ea2, 0x956: 0x0eb2, 0x957: 0x0f0a,
-	0x958: 0x0f56, 0x959: 0x0f4e, 0x95a: 0x0f62, 0x95b: 0x0f7e, 0x95c: 0x0fb6, 0x95d: 0x110e,
-	0x95e: 0x0fda, 0x95f: 0x100e, 0x960: 0x101a, 0x961: 0x105a, 0x962: 0x1076, 0x963: 0x109a,
-	0x964: 0x10be, 0x965: 0x10c2, 0x966: 0x10de, 0x967: 0x10e2, 0x968: 0x10f2, 0x969: 0x1106,
-	0x96a: 0x1102, 0x96b: 0x1132, 0x96c: 0x11ae, 0x96d: 0x11c6, 0x96e: 0x11de, 0x96f: 0x1216,
-	0x970: 0x122a, 0x971: 0x1246, 0x972: 0x1276, 0x973: 0x132a, 0x974: 0x1352, 0x975: 0x13c6,
-	0x976: 0x140e, 0x977: 0x141a, 0x978: 0x1422, 0x979: 0x143a, 0x97a: 0x144e, 0x97b: 0x143e,
-	0x97c: 0x1456, 0x97d: 0x1452, 0x97e: 0x144a, 0x97f: 0x145a,
-	// Block 0x26, offset 0x980
-	0x980: 0x1466, 0x981: 0x14a2, 0x982: 0x14de, 0x983: 0x150e, 0x984: 0x1546, 0x985: 0x1566,
-	0x986: 0x15b2, 0x987: 0x15d6, 0x988: 0x15f6, 0x989: 0x160a, 0x98a: 0x161a, 0x98b: 0x1626,
-	0x98c: 0x1632, 0x98d: 0x1686, 0x98e: 0x1726, 0x98f: 0x17e2, 0x990: 0x17dd, 0x991: 0x180f,
-	0x992: 0x0702, 0x993: 0x072a, 0x994: 0x072e, 0x995: 0x1891, 0x996: 0x18be, 0x997: 0x1936,
-	0x998: 0x1712, 0x999: 0x1722,
-	// Block 0x27, offset 0x9c0
-	0x9c0: 0x07f6, 0x9c1: 0x07ee, 0x9c2: 0x07fe, 0x9c3: 0x1774, 0x9c4: 0x0842, 0x9c5: 0x0852,
-	0x9c6: 0x0856, 0x9c7: 0x085e, 0x9c8: 0x0866, 0x9c9: 0x086a, 0x9ca: 0x0876, 0x9cb: 0x086e,
-	0x9cc: 0x06ae, 0x9cd: 0x1788, 0x9ce: 0x088a, 0x9cf: 0x088e, 0x9d0: 0x0892, 0x9d1: 0x08ae,
-	0x9d2: 0x1779, 0x9d3: 0x06b2, 0x9d4: 0x089a, 0x9d5: 0x08ba, 0x9d6: 0x1783, 0x9d7: 0x08ca,
-	0x9d8: 0x08d2, 0x9d9: 0x0832, 0x9da: 0x08da, 0x9db: 0x08de, 0x9dc: 0x195e, 0x9dd: 0x08fa,
-	0x9de: 0x0902, 0x9df: 0x06ba, 0x9e0: 0x091a, 0x9e1: 0x091e, 0x9e2: 0x0926, 0x9e3: 0x092a,
-	0x9e4: 0x06be, 0x9e5: 0x0942, 0x9e6: 0x0946, 0x9e7: 0x0952, 0x9e8: 0x095e, 0x9e9: 0x0962,
-	0x9ea: 0x0966, 0x9eb: 0x096e, 0x9ec: 0x098e, 0x9ed: 0x0992, 0x9ee: 0x099a, 0x9ef: 0x09aa,
-	0x9f0: 0x09b2, 0x9f1: 0x09b6, 0x9f2: 0x09b6, 0x9f3: 0x09b6, 0x9f4: 0x1797, 0x9f5: 0x0f8e,
-	0x9f6: 0x09ca, 0x9f7: 0x09d2, 0x9f8: 0x179c, 0x9f9: 0x09de, 0x9fa: 0x09e6, 0x9fb: 0x09ee,
-	0x9fc: 0x0a16, 0x9fd: 0x0a02, 0x9fe: 0x0a0e, 0x9ff: 0x0a12,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x0a1a, 0xa01: 0x0a22, 0xa02: 0x0a26, 0xa03: 0x0a2e, 0xa04: 0x0a36, 0xa05: 0x0a3a,
-	0xa06: 0x0a3a, 0xa07: 0x0a42, 0xa08: 0x0a4a, 0xa09: 0x0a4e, 0xa0a: 0x0a5a, 0xa0b: 0x0a7e,
-	0xa0c: 0x0a62, 0xa0d: 0x0a82, 0xa0e: 0x0a66, 0xa0f: 0x0a6e, 0xa10: 0x0906, 0xa11: 0x0aca,
-	0xa12: 0x0a92, 0xa13: 0x0a96, 0xa14: 0x0a9a, 0xa15: 0x0a8e, 0xa16: 0x0aa2, 0xa17: 0x0a9e,
-	0xa18: 0x0ab6, 0xa19: 0x17a1, 0xa1a: 0x0ad2, 0xa1b: 0x0ad6, 0xa1c: 0x0ade, 0xa1d: 0x0aea,
-	0xa1e: 0x0af2, 0xa1f: 0x0b0e, 0xa20: 0x17a6, 0xa21: 0x17ab, 0xa22: 0x0b1a, 0xa23: 0x0b1e,
-	0xa24: 0x0b22, 0xa25: 0x0b16, 0xa26: 0x0b2a, 0xa27: 0x06c2, 0xa28: 0x06c6, 0xa29: 0x0b32,
-	0xa2a: 0x0b3a, 0xa2b: 0x0b3a, 0xa2c: 0x17b0, 0xa2d: 0x0b56, 0xa2e: 0x0b5a, 0xa2f: 0x0b5e,
-	0xa30: 0x0b66, 0xa31: 0x17b5, 0xa32: 0x0b6e, 0xa33: 0x0b72, 0xa34: 0x0c4a, 0xa35: 0x0b7a,
-	0xa36: 0x06ca, 0xa37: 0x0b86, 0xa38: 0x0b96, 0xa39: 0x0ba2, 0xa3a: 0x0b9e, 0xa3b: 0x17bf,
-	0xa3c: 0x0baa, 0xa3d: 0x17c4, 0xa3e: 0x0bb6, 0xa3f: 0x0bb2,
-	// Block 0x29, offset 0xa40
-	0xa40: 0x0bba, 0xa41: 0x0bca, 0xa42: 0x0bce, 0xa43: 0x06ce, 0xa44: 0x0bde, 0xa45: 0x0be6,
-	0xa46: 0x0bea, 0xa47: 0x0bee, 0xa48: 0x06d2, 0xa49: 0x17c9, 0xa4a: 0x06d6, 0xa4b: 0x0c0a,
-	0xa4c: 0x0c0e, 0xa4d: 0x0c12, 0xa4e: 0x0c1a, 0xa4f: 0x1990, 0xa50: 0x0c32, 0xa51: 0x17d3,
-	0xa52: 0x17d3, 0xa53: 0x12d2, 0xa54: 0x0c42, 0xa55: 0x0c42, 0xa56: 0x06da, 0xa57: 0x17f6,
-	0xa58: 0x18c8, 0xa59: 0x0c52, 0xa5a: 0x0c5a, 0xa5b: 0x06de, 0xa5c: 0x0c6e, 0xa5d: 0x0c7e,
-	0xa5e: 0x0c82, 0xa5f: 0x0c8a, 0xa60: 0x0c9a, 0xa61: 0x06e6, 0xa62: 0x06e2, 0xa63: 0x0c9e,
-	0xa64: 0x17d8, 0xa65: 0x0ca2, 0xa66: 0x0cb6, 0xa67: 0x0cba, 0xa68: 0x0cbe, 0xa69: 0x0cba,
-	0xa6a: 0x0cca, 0xa6b: 0x0cce, 0xa6c: 0x0cde, 0xa6d: 0x0cd6, 0xa6e: 0x0cda, 0xa6f: 0x0ce2,
-	0xa70: 0x0ce6, 0xa71: 0x0cea, 0xa72: 0x0cf6, 0xa73: 0x0cfa, 0xa74: 0x0d12, 0xa75: 0x0d1a,
-	0xa76: 0x0d2a, 0xa77: 0x0d3e, 0xa78: 0x17e7, 0xa79: 0x0d3a, 0xa7a: 0x0d2e, 0xa7b: 0x0d46,
-	0xa7c: 0x0d4e, 0xa7d: 0x0d62, 0xa7e: 0x17ec, 0xa7f: 0x0d6a,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x0d5e, 0xa81: 0x0d56, 0xa82: 0x06ea, 0xa83: 0x0d72, 0xa84: 0x0d7a, 0xa85: 0x0d82,
-	0xa86: 0x0d76, 0xa87: 0x06ee, 0xa88: 0x0d92, 0xa89: 0x0d9a, 0xa8a: 0x17f1, 0xa8b: 0x0dc6,
-	0xa8c: 0x0dfa, 0xa8d: 0x0dd6, 0xa8e: 0x06fa, 0xa8f: 0x0de2, 0xa90: 0x06f6, 0xa91: 0x06f2,
-	0xa92: 0x08be, 0xa93: 0x08c2, 0xa94: 0x0dfe, 0xa95: 0x0de6, 0xa96: 0x12a6, 0xa97: 0x075e,
-	0xa98: 0x0e0a, 0xa99: 0x0e0e, 0xa9a: 0x0e12, 0xa9b: 0x0e26, 0xa9c: 0x0e1e, 0xa9d: 0x180a,
-	0xa9e: 0x06fe, 0xa9f: 0x0e3a, 0xaa0: 0x0e2e, 0xaa1: 0x0e4a, 0xaa2: 0x0e52, 0xaa3: 0x1814,
-	0xaa4: 0x0e56, 0xaa5: 0x0e42, 0xaa6: 0x0e5e, 0xaa7: 0x0702, 0xaa8: 0x0e62, 0xaa9: 0x0e66,
-	0xaaa: 0x0e6a, 0xaab: 0x0e76, 0xaac: 0x1819, 0xaad: 0x0e7e, 0xaae: 0x0706, 0xaaf: 0x0e8a,
-	0xab0: 0x181e, 0xab1: 0x0e8e, 0xab2: 0x070a, 0xab3: 0x0e9a, 0xab4: 0x0ea6, 0xab5: 0x0eb2,
-	0xab6: 0x0eb6, 0xab7: 0x1823, 0xab8: 0x17ba, 0xab9: 0x1828, 0xaba: 0x0ed6, 0xabb: 0x182d,
-	0xabc: 0x0ee2, 0xabd: 0x0eea, 0xabe: 0x0eda, 0xabf: 0x0ef6,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0x0f06, 0xac1: 0x0f16, 0xac2: 0x0f0a, 0xac3: 0x0f0e, 0xac4: 0x0f1a, 0xac5: 0x0f1e,
-	0xac6: 0x1832, 0xac7: 0x0f02, 0xac8: 0x0f36, 0xac9: 0x0f3a, 0xaca: 0x070e, 0xacb: 0x0f4e,
-	0xacc: 0x0f4a, 0xacd: 0x1837, 0xace: 0x0f2e, 0xacf: 0x0f6a, 0xad0: 0x183c, 0xad1: 0x1841,
-	0xad2: 0x0f6e, 0xad3: 0x0f82, 0xad4: 0x0f7e, 0xad5: 0x0f7a, 0xad6: 0x0712, 0xad7: 0x0f86,
-	0xad8: 0x0f96, 0xad9: 0x0f92, 0xada: 0x0f9e, 0xadb: 0x177e, 0xadc: 0x0fae, 0xadd: 0x1846,
-	0xade: 0x0fba, 0xadf: 0x1850, 0xae0: 0x0fce, 0xae1: 0x0fda, 0xae2: 0x0fee, 0xae3: 0x1855,
-	0xae4: 0x1002, 0xae5: 0x1006, 0xae6: 0x185a, 0xae7: 0x185f, 0xae8: 0x1022, 0xae9: 0x1032,
-	0xaea: 0x0716, 0xaeb: 0x1036, 0xaec: 0x071a, 0xaed: 0x071a, 0xaee: 0x104e, 0xaef: 0x1052,
-	0xaf0: 0x105a, 0xaf1: 0x105e, 0xaf2: 0x106a, 0xaf3: 0x071e, 0xaf4: 0x1082, 0xaf5: 0x1864,
-	0xaf6: 0x109e, 0xaf7: 0x1869, 0xaf8: 0x10aa, 0xaf9: 0x17ce, 0xafa: 0x10ba, 0xafb: 0x186e,
-	0xafc: 0x1873, 0xafd: 0x1878, 0xafe: 0x0722, 0xaff: 0x0726,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0x10f2, 0xb01: 0x1882, 0xb02: 0x187d, 0xb03: 0x1887, 0xb04: 0x188c, 0xb05: 0x10fa,
-	0xb06: 0x10fe, 0xb07: 0x10fe, 0xb08: 0x1106, 0xb09: 0x072e, 0xb0a: 0x110a, 0xb0b: 0x0732,
-	0xb0c: 0x0736, 0xb0d: 0x1896, 0xb0e: 0x111e, 0xb0f: 0x1126, 0xb10: 0x1132, 0xb11: 0x073a,
-	0xb12: 0x189b, 0xb13: 0x1156, 0xb14: 0x18a0, 0xb15: 0x18a5, 0xb16: 0x1176, 0xb17: 0x118e,
-	0xb18: 0x073e, 0xb19: 0x1196, 0xb1a: 0x119a, 0xb1b: 0x119e, 0xb1c: 0x18aa, 0xb1d: 0x18af,
-	0xb1e: 0x18af, 0xb1f: 0x11b6, 0xb20: 0x0742, 0xb21: 0x18b4, 0xb22: 0x11ca, 0xb23: 0x11ce,
-	0xb24: 0x0746, 0xb25: 0x18b9, 0xb26: 0x11ea, 0xb27: 0x074a, 0xb28: 0x11fa, 0xb29: 0x11f2,
-	0xb2a: 0x1202, 0xb2b: 0x18c3, 0xb2c: 0x121a, 0xb2d: 0x074e, 0xb2e: 0x1226, 0xb2f: 0x122e,
-	0xb30: 0x123e, 0xb31: 0x0752, 0xb32: 0x18cd, 0xb33: 0x18d2, 0xb34: 0x0756, 0xb35: 0x18d7,
-	0xb36: 0x1256, 0xb37: 0x18dc, 0xb38: 0x1262, 0xb39: 0x126e, 0xb3a: 0x1276, 0xb3b: 0x18e1,
-	0xb3c: 0x18e6, 0xb3d: 0x128a, 0xb3e: 0x18eb, 0xb3f: 0x1292,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x17fb, 0xb41: 0x075a, 0xb42: 0x12aa, 0xb43: 0x12ae, 0xb44: 0x0762, 0xb45: 0x12b2,
-	0xb46: 0x0b2e, 0xb47: 0x18f0, 0xb48: 0x18f5, 0xb49: 0x1800, 0xb4a: 0x1805, 0xb4b: 0x12d2,
-	0xb4c: 0x12d6, 0xb4d: 0x14ee, 0xb4e: 0x0766, 0xb4f: 0x1302, 0xb50: 0x12fe, 0xb51: 0x1306,
-	0xb52: 0x093a, 0xb53: 0x130a, 0xb54: 0x130e, 0xb55: 0x1312, 0xb56: 0x131a, 0xb57: 0x18fa,
-	0xb58: 0x1316, 0xb59: 0x131e, 0xb5a: 0x1332, 0xb5b: 0x1336, 0xb5c: 0x1322, 0xb5d: 0x133a,
-	0xb5e: 0x134e, 0xb5f: 0x1362, 0xb60: 0x132e, 0xb61: 0x1342, 0xb62: 0x1346, 0xb63: 0x134a,
-	0xb64: 0x18ff, 0xb65: 0x1909, 0xb66: 0x1904, 0xb67: 0x076a, 0xb68: 0x136a, 0xb69: 0x136e,
-	0xb6a: 0x1376, 0xb6b: 0x191d, 0xb6c: 0x137a, 0xb6d: 0x190e, 0xb6e: 0x076e, 0xb6f: 0x0772,
-	0xb70: 0x1913, 0xb71: 0x1918, 0xb72: 0x0776, 0xb73: 0x139a, 0xb74: 0x139e, 0xb75: 0x13a2,
-	0xb76: 0x13a6, 0xb77: 0x13b2, 0xb78: 0x13ae, 0xb79: 0x13ba, 0xb7a: 0x13b6, 0xb7b: 0x13c6,
-	0xb7c: 0x13be, 0xb7d: 0x13c2, 0xb7e: 0x13ca, 0xb7f: 0x077a,
-	// Block 0x2e, offset 0xb80
-	0xb80: 0x13d2, 0xb81: 0x13d6, 0xb82: 0x077e, 0xb83: 0x13e6, 0xb84: 0x13ea, 0xb85: 0x1922,
-	0xb86: 0x13f6, 0xb87: 0x13fa, 0xb88: 0x0782, 0xb89: 0x1406, 0xb8a: 0x06b6, 0xb8b: 0x1927,
-	0xb8c: 0x192c, 0xb8d: 0x0786, 0xb8e: 0x078a, 0xb8f: 0x1432, 0xb90: 0x144a, 0xb91: 0x1466,
-	0xb92: 0x1476, 0xb93: 0x1931, 0xb94: 0x148a, 0xb95: 0x148e, 0xb96: 0x14a6, 0xb97: 0x14b2,
-	0xb98: 0x193b, 0xb99: 0x178d, 0xb9a: 0x14be, 0xb9b: 0x14ba, 0xb9c: 0x14c6, 0xb9d: 0x1792,
-	0xb9e: 0x14d2, 0xb9f: 0x14de, 0xba0: 0x1940, 0xba1: 0x1945, 0xba2: 0x151e, 0xba3: 0x152a,
-	0xba4: 0x1532, 0xba5: 0x194a, 0xba6: 0x1536, 0xba7: 0x1562, 0xba8: 0x156e, 0xba9: 0x1572,
-	0xbaa: 0x156a, 0xbab: 0x157e, 0xbac: 0x1582, 0xbad: 0x194f, 0xbae: 0x158e, 0xbaf: 0x078e,
-	0xbb0: 0x1596, 0xbb1: 0x1954, 0xbb2: 0x0792, 0xbb3: 0x15ce, 0xbb4: 0x0bbe, 0xbb5: 0x15e6,
-	0xbb6: 0x1959, 0xbb7: 0x1963, 0xbb8: 0x0796, 0xbb9: 0x079a, 0xbba: 0x160e, 0xbbb: 0x1968,
-	0xbbc: 0x079e, 0xbbd: 0x196d, 0xbbe: 0x1626, 0xbbf: 0x1626,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x162e, 0xbc1: 0x1972, 0xbc2: 0x1646, 0xbc3: 0x07a2, 0xbc4: 0x1656, 0xbc5: 0x1662,
-	0xbc6: 0x166a, 0xbc7: 0x1672, 0xbc8: 0x07a6, 0xbc9: 0x1977, 0xbca: 0x1686, 0xbcb: 0x16a2,
-	0xbcc: 0x16ae, 0xbcd: 0x07aa, 0xbce: 0x07ae, 0xbcf: 0x16b2, 0xbd0: 0x197c, 0xbd1: 0x07b2,
-	0xbd2: 0x1981, 0xbd3: 0x1986, 0xbd4: 0x198b, 0xbd5: 0x16d6, 0xbd6: 0x07b6, 0xbd7: 0x16ea,
-	0xbd8: 0x16f2, 0xbd9: 0x16f6, 0xbda: 0x16fe, 0xbdb: 0x1706, 0xbdc: 0x170e, 0xbdd: 0x1995,
-}
-
-// nfcIndex: 22 blocks, 1408 entries, 1408 bytes
-// Block 0 is the zero block.
-var nfcIndex = [1408]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x2e, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2f, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x30, 0xcb: 0x31, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x32,
-	0xd0: 0x09, 0xd1: 0x33, 0xd2: 0x34, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x35,
-	0xd8: 0x36, 0xd9: 0x0c, 0xdb: 0x37, 0xdc: 0x38, 0xdd: 0x39, 0xdf: 0x3a,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
-	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
-	0xf0: 0x13,
-	// Block 0x4, offset 0x100
-	0x120: 0x3b, 0x121: 0x3c, 0x122: 0x3d, 0x123: 0x0d, 0x124: 0x3e, 0x125: 0x3f, 0x126: 0x40, 0x127: 0x41,
-	0x128: 0x42, 0x129: 0x43, 0x12a: 0x44, 0x12b: 0x45, 0x12c: 0x40, 0x12d: 0x46, 0x12e: 0x47, 0x12f: 0x48,
-	0x130: 0x44, 0x131: 0x49, 0x132: 0x4a, 0x133: 0x4b, 0x134: 0x4c, 0x135: 0x4d, 0x137: 0x4e,
-	0x138: 0x4f, 0x139: 0x50, 0x13a: 0x51, 0x13b: 0x52, 0x13c: 0x53, 0x13d: 0x54, 0x13e: 0x55, 0x13f: 0x56,
-	// Block 0x5, offset 0x140
-	0x140: 0x57, 0x142: 0x58, 0x144: 0x59, 0x145: 0x5a, 0x146: 0x5b, 0x147: 0x5c,
-	0x14d: 0x5d,
-	0x15c: 0x5e, 0x15f: 0x5f,
-	0x162: 0x60, 0x164: 0x61,
-	0x168: 0x62, 0x169: 0x63, 0x16a: 0x64, 0x16b: 0x65, 0x16c: 0x0e, 0x16d: 0x66, 0x16e: 0x67, 0x16f: 0x68,
-	0x170: 0x69, 0x173: 0x6a, 0x177: 0x0f,
-	0x178: 0x10, 0x179: 0x11, 0x17a: 0x12, 0x17b: 0x13, 0x17c: 0x14, 0x17d: 0x15, 0x17e: 0x16, 0x17f: 0x17,
-	// Block 0x6, offset 0x180
-	0x180: 0x6b, 0x183: 0x6c, 0x184: 0x6d, 0x186: 0x6e, 0x187: 0x6f,
-	0x188: 0x70, 0x189: 0x18, 0x18a: 0x19, 0x18b: 0x71, 0x18c: 0x72,
-	0x1ab: 0x73,
-	0x1b3: 0x74, 0x1b5: 0x75, 0x1b7: 0x76,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x77, 0x1c1: 0x1a, 0x1c2: 0x1b, 0x1c3: 0x1c, 0x1c4: 0x78, 0x1c5: 0x79,
-	0x1c9: 0x7a, 0x1cc: 0x7b, 0x1cd: 0x7c,
-	// Block 0x8, offset 0x200
-	0x219: 0x7d, 0x21a: 0x7e, 0x21b: 0x7f,
-	0x220: 0x80, 0x223: 0x81, 0x224: 0x82, 0x225: 0x83, 0x226: 0x84, 0x227: 0x85,
-	0x22a: 0x86, 0x22b: 0x87, 0x22f: 0x88,
-	0x230: 0x89, 0x231: 0x8a, 0x232: 0x8b, 0x233: 0x8c, 0x234: 0x8d, 0x235: 0x8e, 0x236: 0x8f, 0x237: 0x89,
-	0x238: 0x8a, 0x239: 0x8b, 0x23a: 0x8c, 0x23b: 0x8d, 0x23c: 0x8e, 0x23d: 0x8f, 0x23e: 0x89, 0x23f: 0x8a,
-	// Block 0x9, offset 0x240
-	0x240: 0x8b, 0x241: 0x8c, 0x242: 0x8d, 0x243: 0x8e, 0x244: 0x8f, 0x245: 0x89, 0x246: 0x8a, 0x247: 0x8b,
-	0x248: 0x8c, 0x249: 0x8d, 0x24a: 0x8e, 0x24b: 0x8f, 0x24c: 0x89, 0x24d: 0x8a, 0x24e: 0x8b, 0x24f: 0x8c,
-	0x250: 0x8d, 0x251: 0x8e, 0x252: 0x8f, 0x253: 0x89, 0x254: 0x8a, 0x255: 0x8b, 0x256: 0x8c, 0x257: 0x8d,
-	0x258: 0x8e, 0x259: 0x8f, 0x25a: 0x89, 0x25b: 0x8a, 0x25c: 0x8b, 0x25d: 0x8c, 0x25e: 0x8d, 0x25f: 0x8e,
-	0x260: 0x8f, 0x261: 0x89, 0x262: 0x8a, 0x263: 0x8b, 0x264: 0x8c, 0x265: 0x8d, 0x266: 0x8e, 0x267: 0x8f,
-	0x268: 0x89, 0x269: 0x8a, 0x26a: 0x8b, 0x26b: 0x8c, 0x26c: 0x8d, 0x26d: 0x8e, 0x26e: 0x8f, 0x26f: 0x89,
-	0x270: 0x8a, 0x271: 0x8b, 0x272: 0x8c, 0x273: 0x8d, 0x274: 0x8e, 0x275: 0x8f, 0x276: 0x89, 0x277: 0x8a,
-	0x278: 0x8b, 0x279: 0x8c, 0x27a: 0x8d, 0x27b: 0x8e, 0x27c: 0x8f, 0x27d: 0x89, 0x27e: 0x8a, 0x27f: 0x8b,
-	// Block 0xa, offset 0x280
-	0x280: 0x8c, 0x281: 0x8d, 0x282: 0x8e, 0x283: 0x8f, 0x284: 0x89, 0x285: 0x8a, 0x286: 0x8b, 0x287: 0x8c,
-	0x288: 0x8d, 0x289: 0x8e, 0x28a: 0x8f, 0x28b: 0x89, 0x28c: 0x8a, 0x28d: 0x8b, 0x28e: 0x8c, 0x28f: 0x8d,
-	0x290: 0x8e, 0x291: 0x8f, 0x292: 0x89, 0x293: 0x8a, 0x294: 0x8b, 0x295: 0x8c, 0x296: 0x8d, 0x297: 0x8e,
-	0x298: 0x8f, 0x299: 0x89, 0x29a: 0x8a, 0x29b: 0x8b, 0x29c: 0x8c, 0x29d: 0x8d, 0x29e: 0x8e, 0x29f: 0x8f,
-	0x2a0: 0x89, 0x2a1: 0x8a, 0x2a2: 0x8b, 0x2a3: 0x8c, 0x2a4: 0x8d, 0x2a5: 0x8e, 0x2a6: 0x8f, 0x2a7: 0x89,
-	0x2a8: 0x8a, 0x2a9: 0x8b, 0x2aa: 0x8c, 0x2ab: 0x8d, 0x2ac: 0x8e, 0x2ad: 0x8f, 0x2ae: 0x89, 0x2af: 0x8a,
-	0x2b0: 0x8b, 0x2b1: 0x8c, 0x2b2: 0x8d, 0x2b3: 0x8e, 0x2b4: 0x8f, 0x2b5: 0x89, 0x2b6: 0x8a, 0x2b7: 0x8b,
-	0x2b8: 0x8c, 0x2b9: 0x8d, 0x2ba: 0x8e, 0x2bb: 0x8f, 0x2bc: 0x89, 0x2bd: 0x8a, 0x2be: 0x8b, 0x2bf: 0x8c,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x8d, 0x2c1: 0x8e, 0x2c2: 0x8f, 0x2c3: 0x89, 0x2c4: 0x8a, 0x2c5: 0x8b, 0x2c6: 0x8c, 0x2c7: 0x8d,
-	0x2c8: 0x8e, 0x2c9: 0x8f, 0x2ca: 0x89, 0x2cb: 0x8a, 0x2cc: 0x8b, 0x2cd: 0x8c, 0x2ce: 0x8d, 0x2cf: 0x8e,
-	0x2d0: 0x8f, 0x2d1: 0x89, 0x2d2: 0x8a, 0x2d3: 0x8b, 0x2d4: 0x8c, 0x2d5: 0x8d, 0x2d6: 0x8e, 0x2d7: 0x8f,
-	0x2d8: 0x89, 0x2d9: 0x8a, 0x2da: 0x8b, 0x2db: 0x8c, 0x2dc: 0x8d, 0x2dd: 0x8e, 0x2de: 0x90,
-	// Block 0xc, offset 0x300
-	0x324: 0x1d, 0x325: 0x1e, 0x326: 0x1f, 0x327: 0x20,
-	0x328: 0x21, 0x329: 0x22, 0x32a: 0x23, 0x32b: 0x24, 0x32c: 0x91, 0x32d: 0x92, 0x32e: 0x93,
-	0x331: 0x94, 0x332: 0x95, 0x333: 0x96, 0x334: 0x97,
-	0x338: 0x98, 0x339: 0x99, 0x33a: 0x9a, 0x33b: 0x9b, 0x33e: 0x9c, 0x33f: 0x9d,
-	// Block 0xd, offset 0x340
-	0x347: 0x9e,
-	0x34b: 0x9f, 0x34d: 0xa0,
-	0x368: 0xa1, 0x36b: 0xa2,
-	0x374: 0xa3,
-	0x37a: 0xa4, 0x37b: 0xa5, 0x37d: 0xa6, 0x37e: 0xa7,
-	// Block 0xe, offset 0x380
-	0x381: 0xa8, 0x382: 0xa9, 0x384: 0xaa, 0x385: 0x84, 0x387: 0xab,
-	0x388: 0xac, 0x38b: 0xad, 0x38c: 0xae, 0x38d: 0xaf,
-	0x391: 0xb0, 0x392: 0xb1, 0x393: 0xb2, 0x396: 0xb3, 0x397: 0xb4,
-	0x398: 0x75, 0x39a: 0xb5, 0x39c: 0xb6,
-	0x3a0: 0xb7, 0x3a4: 0xb8, 0x3a5: 0xb9, 0x3a7: 0xba,
-	0x3a8: 0xbb, 0x3a9: 0xbc, 0x3aa: 0xbd,
-	0x3b0: 0x75, 0x3b5: 0xbe, 0x3b6: 0xbf,
-	0x3bd: 0xc0,
-	// Block 0xf, offset 0x3c0
-	0x3eb: 0xc1, 0x3ec: 0xc2,
-	0x3ff: 0xc3,
-	// Block 0x10, offset 0x400
-	0x432: 0xc4,
-	// Block 0x11, offset 0x440
-	0x445: 0xc5, 0x446: 0xc6, 0x447: 0xc7,
-	0x449: 0xc8,
-	// Block 0x12, offset 0x480
-	0x480: 0xc9, 0x482: 0xca, 0x484: 0xc2,
-	0x48a: 0xcb, 0x48b: 0xcc,
-	0x493: 0xcd,
-	0x4a3: 0xce, 0x4a5: 0xcf,
-	// Block 0x13, offset 0x4c0
-	0x4c8: 0xd0,
-	// Block 0x14, offset 0x500
-	0x520: 0x25, 0x521: 0x26, 0x522: 0x27, 0x523: 0x28, 0x524: 0x29, 0x525: 0x2a, 0x526: 0x2b, 0x527: 0x2c,
-	0x528: 0x2d,
-	// Block 0x15, offset 0x540
-	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
-	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
-	0x56f: 0x12,
-}
-
-// nfcSparseOffset: 163 entries, 326 bytes
-var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x63, 0x68, 0x6a, 0x6e, 0x76, 0x7d, 0x80, 0x88, 0x8c, 0x90, 0x92, 0x94, 0x9d, 0xa1, 0xa8, 0xad, 0xb0, 0xba, 0xbd, 0xc4, 0xcc, 0xcf, 0xd1, 0xd4, 0xd6, 0xdb, 0xec, 0xf8, 0xfa, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10a, 0x10c, 0x10f, 0x112, 0x114, 0x117, 0x11a, 0x11e, 0x124, 0x12b, 0x134, 0x136, 0x139, 0x13b, 0x146, 0x14a, 0x158, 0x15b, 0x161, 0x167, 0x172, 0x176, 0x178, 0x17a, 0x17c, 0x17e, 0x180, 0x186, 0x18a, 0x18c, 0x18e, 0x196, 0x19a, 0x19d, 0x19f, 0x1a1, 0x1a4, 0x1a7, 0x1a9, 0x1ab, 0x1ad, 0x1af, 0x1b5, 0x1b8, 0x1ba, 0x1c1, 0x1c7, 0x1cd, 0x1d5, 0x1db, 0x1e1, 0x1e7, 0x1eb, 0x1f9, 0x202, 0x205, 0x208, 0x20a, 0x20d, 0x20f, 0x213, 0x218, 0x21a, 0x21c, 0x221, 0x227, 0x229, 0x22b, 0x22d, 0x233, 0x236, 0x238, 0x23a, 0x23c, 0x242, 0x246, 0x24a, 0x252, 0x259, 0x25c, 0x25f, 0x261, 0x264, 0x26c, 0x270, 0x277, 0x27a, 0x280, 0x282, 0x285, 0x287, 0x28a, 0x28f, 0x291, 0x293, 0x295, 0x297, 0x299, 0x29c, 0x29e, 0x2a0, 0x2a2, 0x2a4, 0x2a6, 0x2a8, 0x2b5, 0x2bf, 0x2c1, 0x2c3, 0x2c9, 0x2cb, 0x2cd, 0x2cf, 0x2d3, 0x2d5, 0x2d8}
-
-// nfcSparseValues: 730 entries, 2920 bytes
-var nfcSparseValues = [730]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0000, lo: 0x04},
-	{value: 0xa100, lo: 0xa8, hi: 0xa8},
-	{value: 0x8100, lo: 0xaf, hi: 0xaf},
-	{value: 0x8100, lo: 0xb4, hi: 0xb4},
-	{value: 0x8100, lo: 0xb8, hi: 0xb8},
-	// Block 0x1, offset 0x5
-	{value: 0x0091, lo: 0x03},
-	{value: 0x4823, lo: 0xa0, hi: 0xa1},
-	{value: 0x4855, lo: 0xaf, hi: 0xb0},
-	{value: 0xa000, lo: 0xb7, hi: 0xb7},
-	// Block 0x2, offset 0x9
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	// Block 0x3, offset 0xb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x98, hi: 0x9d},
-	// Block 0x4, offset 0xd
-	{value: 0x0006, lo: 0x0a},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x85, hi: 0x85},
-	{value: 0xa000, lo: 0x89, hi: 0x89},
-	{value: 0x4981, lo: 0x8a, hi: 0x8a},
-	{value: 0x499f, lo: 0x8b, hi: 0x8b},
-	{value: 0x3808, lo: 0x8c, hi: 0x8c},
-	{value: 0x3820, lo: 0x8d, hi: 0x8d},
-	{value: 0x49b7, lo: 0x8e, hi: 0x8e},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x383e, lo: 0x93, hi: 0x94},
-	// Block 0x5, offset 0x18
-	{value: 0x0000, lo: 0x0f},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0xa000, lo: 0x8d, hi: 0x8d},
-	{value: 0x38e6, lo: 0x90, hi: 0x90},
-	{value: 0x38f2, lo: 0x91, hi: 0x91},
-	{value: 0x38e0, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x96, hi: 0x96},
-	{value: 0x3958, lo: 0x97, hi: 0x97},
-	{value: 0x3922, lo: 0x9c, hi: 0x9c},
-	{value: 0x390a, lo: 0x9d, hi: 0x9d},
-	{value: 0x3934, lo: 0x9e, hi: 0x9e},
-	{value: 0xa000, lo: 0xb4, hi: 0xb5},
-	{value: 0x395e, lo: 0xb6, hi: 0xb6},
-	{value: 0x3964, lo: 0xb7, hi: 0xb7},
-	// Block 0x6, offset 0x28
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x83, hi: 0x87},
-	// Block 0x7, offset 0x2a
-	{value: 0x0001, lo: 0x04},
-	{value: 0x8114, lo: 0x81, hi: 0x82},
-	{value: 0x8133, lo: 0x84, hi: 0x84},
-	{value: 0x812e, lo: 0x85, hi: 0x85},
-	{value: 0x810e, lo: 0x87, hi: 0x87},
-	// Block 0x8, offset 0x2f
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8133, lo: 0x90, hi: 0x97},
-	{value: 0x811a, lo: 0x98, hi: 0x98},
-	{value: 0x811b, lo: 0x99, hi: 0x99},
-	{value: 0x811c, lo: 0x9a, hi: 0x9a},
-	{value: 0x3982, lo: 0xa2, hi: 0xa2},
-	{value: 0x3988, lo: 0xa3, hi: 0xa3},
-	{value: 0x3994, lo: 0xa4, hi: 0xa4},
-	{value: 0x398e, lo: 0xa5, hi: 0xa5},
-	{value: 0x399a, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xa7, hi: 0xa7},
-	// Block 0x9, offset 0x3a
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x39ac, lo: 0x80, hi: 0x80},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0x39a0, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x39a6, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x95, hi: 0x95},
-	{value: 0x8133, lo: 0x96, hi: 0x9c},
-	{value: 0x8133, lo: 0x9f, hi: 0xa2},
-	{value: 0x812e, lo: 0xa3, hi: 0xa3},
-	{value: 0x8133, lo: 0xa4, hi: 0xa4},
-	{value: 0x8133, lo: 0xa7, hi: 0xa8},
-	{value: 0x812e, lo: 0xaa, hi: 0xaa},
-	{value: 0x8133, lo: 0xab, hi: 0xac},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	// Block 0xa, offset 0x49
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x8120, lo: 0x91, hi: 0x91},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	{value: 0x812e, lo: 0xb1, hi: 0xb1},
-	{value: 0x8133, lo: 0xb2, hi: 0xb3},
-	{value: 0x812e, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb5, hi: 0xb6},
-	{value: 0x812e, lo: 0xb7, hi: 0xb9},
-	{value: 0x8133, lo: 0xba, hi: 0xba},
-	{value: 0x812e, lo: 0xbb, hi: 0xbc},
-	{value: 0x8133, lo: 0xbd, hi: 0xbd},
-	{value: 0x812e, lo: 0xbe, hi: 0xbe},
-	{value: 0x8133, lo: 0xbf, hi: 0xbf},
-	// Block 0xb, offset 0x56
-	{value: 0x0005, lo: 0x07},
-	{value: 0x8133, lo: 0x80, hi: 0x80},
-	{value: 0x8133, lo: 0x81, hi: 0x81},
-	{value: 0x812e, lo: 0x82, hi: 0x83},
-	{value: 0x812e, lo: 0x84, hi: 0x85},
-	{value: 0x812e, lo: 0x86, hi: 0x87},
-	{value: 0x812e, lo: 0x88, hi: 0x89},
-	{value: 0x8133, lo: 0x8a, hi: 0x8a},
-	// Block 0xc, offset 0x5e
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8133, lo: 0xab, hi: 0xb1},
-	{value: 0x812e, lo: 0xb2, hi: 0xb2},
-	{value: 0x8133, lo: 0xb3, hi: 0xb3},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	// Block 0xd, offset 0x63
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8133, lo: 0x96, hi: 0x99},
-	{value: 0x8133, lo: 0x9b, hi: 0xa3},
-	{value: 0x8133, lo: 0xa5, hi: 0xa7},
-	{value: 0x8133, lo: 0xa9, hi: 0xad},
-	// Block 0xe, offset 0x68
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x99, hi: 0x9b},
-	// Block 0xf, offset 0x6a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8133, lo: 0x98, hi: 0x98},
-	{value: 0x812e, lo: 0x99, hi: 0x9b},
-	{value: 0x8133, lo: 0x9c, hi: 0x9f},
-	// Block 0x10, offset 0x6e
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0xa8, hi: 0xa8},
-	{value: 0x4019, lo: 0xa9, hi: 0xa9},
-	{value: 0xa000, lo: 0xb0, hi: 0xb0},
-	{value: 0x4021, lo: 0xb1, hi: 0xb1},
-	{value: 0xa000, lo: 0xb3, hi: 0xb3},
-	{value: 0x4029, lo: 0xb4, hi: 0xb4},
-	{value: 0x9903, lo: 0xbc, hi: 0xbc},
-	// Block 0x11, offset 0x76
-	{value: 0x0008, lo: 0x06},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x8133, lo: 0x91, hi: 0x91},
-	{value: 0x812e, lo: 0x92, hi: 0x92},
-	{value: 0x8133, lo: 0x93, hi: 0x93},
-	{value: 0x8133, lo: 0x94, hi: 0x94},
-	{value: 0x465d, lo: 0x98, hi: 0x9f},
-	// Block 0x12, offset 0x7d
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x13, offset 0x80
-	{value: 0x0008, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2dd5, lo: 0x8b, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x469d, lo: 0x9c, hi: 0x9d},
-	{value: 0x46ad, lo: 0x9f, hi: 0x9f},
-	{value: 0x8133, lo: 0xbe, hi: 0xbe},
-	// Block 0x14, offset 0x88
-	{value: 0x0000, lo: 0x03},
-	{value: 0x46d5, lo: 0xb3, hi: 0xb3},
-	{value: 0x46dd, lo: 0xb6, hi: 0xb6},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	// Block 0x15, offset 0x8c
-	{value: 0x0008, lo: 0x03},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x46b5, lo: 0x99, hi: 0x9b},
-	{value: 0x46cd, lo: 0x9e, hi: 0x9e},
-	// Block 0x16, offset 0x90
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	// Block 0x17, offset 0x92
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	// Block 0x18, offset 0x94
-	{value: 0x0000, lo: 0x08},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2ded, lo: 0x88, hi: 0x88},
-	{value: 0x2de5, lo: 0x8b, hi: 0x8b},
-	{value: 0x2df5, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x46e5, lo: 0x9c, hi: 0x9c},
-	{value: 0x46ed, lo: 0x9d, hi: 0x9d},
-	// Block 0x19, offset 0x9d
-	{value: 0x0000, lo: 0x03},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x2dfd, lo: 0x94, hi: 0x94},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1a, offset 0xa1
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2e05, lo: 0x8a, hi: 0x8a},
-	{value: 0x2e15, lo: 0x8b, hi: 0x8b},
-	{value: 0x2e0d, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1b, offset 0xa8
-	{value: 0x1801, lo: 0x04},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x4031, lo: 0x88, hi: 0x88},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x8121, lo: 0x95, hi: 0x96},
-	// Block 0x1c, offset 0xad
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	{value: 0xa000, lo: 0xbf, hi: 0xbf},
-	// Block 0x1d, offset 0xb0
-	{value: 0x0000, lo: 0x09},
-	{value: 0x2e1d, lo: 0x80, hi: 0x80},
-	{value: 0x9900, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x2e25, lo: 0x87, hi: 0x87},
-	{value: 0x2e2d, lo: 0x88, hi: 0x88},
-	{value: 0x3091, lo: 0x8a, hi: 0x8a},
-	{value: 0x2f19, lo: 0x8b, hi: 0x8b},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x95, hi: 0x96},
-	// Block 0x1e, offset 0xba
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xbb, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1f, offset 0xbd
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2e35, lo: 0x8a, hi: 0x8a},
-	{value: 0x2e45, lo: 0x8b, hi: 0x8b},
-	{value: 0x2e3d, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x20, offset 0xc4
-	{value: 0x6ab3, lo: 0x07},
-	{value: 0x9905, lo: 0x8a, hi: 0x8a},
-	{value: 0x9900, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4039, lo: 0x9a, hi: 0x9a},
-	{value: 0x3099, lo: 0x9c, hi: 0x9c},
-	{value: 0x2f24, lo: 0x9d, hi: 0x9d},
-	{value: 0x2e4d, lo: 0x9e, hi: 0x9f},
-	// Block 0x21, offset 0xcc
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8123, lo: 0xb8, hi: 0xb9},
-	{value: 0x8105, lo: 0xba, hi: 0xba},
-	// Block 0x22, offset 0xcf
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8124, lo: 0x88, hi: 0x8b},
-	// Block 0x23, offset 0xd1
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8125, lo: 0xb8, hi: 0xb9},
-	{value: 0x8105, lo: 0xba, hi: 0xba},
-	// Block 0x24, offset 0xd4
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8126, lo: 0x88, hi: 0x8b},
-	// Block 0x25, offset 0xd6
-	{value: 0x0000, lo: 0x04},
-	{value: 0x812e, lo: 0x98, hi: 0x99},
-	{value: 0x812e, lo: 0xb5, hi: 0xb5},
-	{value: 0x812e, lo: 0xb7, hi: 0xb7},
-	{value: 0x812c, lo: 0xb9, hi: 0xb9},
-	// Block 0x26, offset 0xdb
-	{value: 0x0000, lo: 0x10},
-	{value: 0x2774, lo: 0x83, hi: 0x83},
-	{value: 0x277b, lo: 0x8d, hi: 0x8d},
-	{value: 0x2782, lo: 0x92, hi: 0x92},
-	{value: 0x2789, lo: 0x97, hi: 0x97},
-	{value: 0x2790, lo: 0x9c, hi: 0x9c},
-	{value: 0x276d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8127, lo: 0xb1, hi: 0xb1},
-	{value: 0x8128, lo: 0xb2, hi: 0xb2},
-	{value: 0x4bc5, lo: 0xb3, hi: 0xb3},
-	{value: 0x8129, lo: 0xb4, hi: 0xb4},
-	{value: 0x4bce, lo: 0xb5, hi: 0xb5},
-	{value: 0x46f5, lo: 0xb6, hi: 0xb6},
-	{value: 0x8200, lo: 0xb7, hi: 0xb7},
-	{value: 0x46fd, lo: 0xb8, hi: 0xb8},
-	{value: 0x8200, lo: 0xb9, hi: 0xb9},
-	{value: 0x8128, lo: 0xba, hi: 0xbd},
-	// Block 0x27, offset 0xec
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x8128, lo: 0x80, hi: 0x80},
-	{value: 0x4bd7, lo: 0x81, hi: 0x81},
-	{value: 0x8133, lo: 0x82, hi: 0x83},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0x86, hi: 0x87},
-	{value: 0x279e, lo: 0x93, hi: 0x93},
-	{value: 0x27a5, lo: 0x9d, hi: 0x9d},
-	{value: 0x27ac, lo: 0xa2, hi: 0xa2},
-	{value: 0x27b3, lo: 0xa7, hi: 0xa7},
-	{value: 0x27ba, lo: 0xac, hi: 0xac},
-	{value: 0x2797, lo: 0xb9, hi: 0xb9},
-	// Block 0x28, offset 0xf8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x86, hi: 0x86},
-	// Block 0x29, offset 0xfa
-	{value: 0x0000, lo: 0x05},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x2e55, lo: 0xa6, hi: 0xa6},
-	{value: 0x9900, lo: 0xae, hi: 0xae},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	{value: 0x8105, lo: 0xb9, hi: 0xba},
-	// Block 0x2a, offset 0x100
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x8d, hi: 0x8d},
-	// Block 0x2b, offset 0x102
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x104
-	{value: 0x0000, lo: 0x01},
-	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x106
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x108
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x10a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x10c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x94, hi: 0x95},
-	{value: 0x8105, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x10f
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x92, hi: 0x92},
-	{value: 0x8133, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x112
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x114
-	{value: 0x0004, lo: 0x02},
-	{value: 0x812f, lo: 0xb9, hi: 0xba},
-	{value: 0x812e, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x117
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x97, hi: 0x97},
-	{value: 0x812e, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x11a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0xa0, hi: 0xa0},
-	{value: 0x8133, lo: 0xb5, hi: 0xbc},
-	{value: 0x812e, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x11e
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8133, lo: 0xb0, hi: 0xb4},
-	{value: 0x812e, lo: 0xb5, hi: 0xba},
-	{value: 0x8133, lo: 0xbb, hi: 0xbc},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	{value: 0x812e, lo: 0xbf, hi: 0xbf},
-	// Block 0x37, offset 0x124
-	{value: 0x0000, lo: 0x06},
-	{value: 0x812e, lo: 0x80, hi: 0x80},
-	{value: 0x8133, lo: 0x81, hi: 0x82},
-	{value: 0x812e, lo: 0x83, hi: 0x84},
-	{value: 0x8133, lo: 0x85, hi: 0x89},
-	{value: 0x812e, lo: 0x8a, hi: 0x8a},
-	{value: 0x8133, lo: 0x8b, hi: 0x8e},
-	// Block 0x38, offset 0x12b
-	{value: 0x0000, lo: 0x08},
-	{value: 0x2e9d, lo: 0x80, hi: 0x80},
-	{value: 0x2ea5, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x82, hi: 0x82},
-	{value: 0x2ead, lo: 0x83, hi: 0x83},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0xab, hi: 0xab},
-	{value: 0x812e, lo: 0xac, hi: 0xac},
-	{value: 0x8133, lo: 0xad, hi: 0xb3},
-	// Block 0x39, offset 0x134
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xaa, hi: 0xab},
-	// Block 0x3a, offset 0x136
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xa6, hi: 0xa6},
-	{value: 0x8105, lo: 0xb2, hi: 0xb3},
-	// Block 0x3b, offset 0x139
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	// Block 0x3c, offset 0x13b
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8133, lo: 0x90, hi: 0x92},
-	{value: 0x8101, lo: 0x94, hi: 0x94},
-	{value: 0x812e, lo: 0x95, hi: 0x99},
-	{value: 0x8133, lo: 0x9a, hi: 0x9b},
-	{value: 0x812e, lo: 0x9c, hi: 0x9f},
-	{value: 0x8133, lo: 0xa0, hi: 0xa0},
-	{value: 0x8101, lo: 0xa2, hi: 0xa8},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	{value: 0x8133, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb8, hi: 0xb9},
-	// Block 0x3d, offset 0x146
-	{value: 0x0004, lo: 0x03},
-	{value: 0x052a, lo: 0x80, hi: 0x81},
-	{value: 0x8100, lo: 0x97, hi: 0x97},
-	{value: 0x8100, lo: 0xbe, hi: 0xbe},
-	// Block 0x3e, offset 0x14a
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x8133, lo: 0x90, hi: 0x91},
-	{value: 0x8101, lo: 0x92, hi: 0x93},
-	{value: 0x8133, lo: 0x94, hi: 0x97},
-	{value: 0x8101, lo: 0x98, hi: 0x9a},
-	{value: 0x8133, lo: 0x9b, hi: 0x9c},
-	{value: 0x8133, lo: 0xa1, hi: 0xa1},
-	{value: 0x8101, lo: 0xa5, hi: 0xa6},
-	{value: 0x8133, lo: 0xa7, hi: 0xa7},
-	{value: 0x812e, lo: 0xa8, hi: 0xa8},
-	{value: 0x8133, lo: 0xa9, hi: 0xa9},
-	{value: 0x8101, lo: 0xaa, hi: 0xab},
-	{value: 0x812e, lo: 0xac, hi: 0xaf},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	// Block 0x3f, offset 0x158
-	{value: 0x43bc, lo: 0x02},
-	{value: 0x023c, lo: 0xa6, hi: 0xa6},
-	{value: 0x0057, lo: 0xaa, hi: 0xab},
-	// Block 0x40, offset 0x15b
-	{value: 0x0007, lo: 0x05},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	{value: 0x3cfa, lo: 0x9a, hi: 0x9b},
-	{value: 0x3d08, lo: 0xae, hi: 0xae},
-	// Block 0x41, offset 0x161
-	{value: 0x000e, lo: 0x05},
-	{value: 0x3d0f, lo: 0x8d, hi: 0x8e},
-	{value: 0x3d16, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x42, offset 0x167
-	{value: 0x62c7, lo: 0x0a},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0x3d24, lo: 0x84, hi: 0x84},
-	{value: 0xa000, lo: 0x88, hi: 0x88},
-	{value: 0x3d2b, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0x3d32, lo: 0x8c, hi: 0x8c},
-	{value: 0xa000, lo: 0xa3, hi: 0xa3},
-	{value: 0x3d39, lo: 0xa4, hi: 0xa5},
-	{value: 0x3d40, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x43, offset 0x172
-	{value: 0x0007, lo: 0x03},
-	{value: 0x3da9, lo: 0xa0, hi: 0xa1},
-	{value: 0x3dd3, lo: 0xa2, hi: 0xa3},
-	{value: 0x3dfd, lo: 0xaa, hi: 0xad},
-	// Block 0x44, offset 0x176
-	{value: 0x0004, lo: 0x01},
-	{value: 0x0586, lo: 0xa9, hi: 0xaa},
-	// Block 0x45, offset 0x178
-	{value: 0x0000, lo: 0x01},
-	{value: 0x461e, lo: 0x9c, hi: 0x9c},
-	// Block 0x46, offset 0x17a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xaf, hi: 0xb1},
-	// Block 0x47, offset 0x17c
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x48, offset 0x17e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xa0, hi: 0xbf},
-	// Block 0x49, offset 0x180
-	{value: 0x0000, lo: 0x05},
-	{value: 0x812d, lo: 0xaa, hi: 0xaa},
-	{value: 0x8132, lo: 0xab, hi: 0xab},
-	{value: 0x8134, lo: 0xac, hi: 0xac},
-	{value: 0x812f, lo: 0xad, hi: 0xad},
-	{value: 0x8130, lo: 0xae, hi: 0xaf},
-	// Block 0x4a, offset 0x186
-	{value: 0x0000, lo: 0x03},
-	{value: 0x4be0, lo: 0xb3, hi: 0xb3},
-	{value: 0x4be0, lo: 0xb5, hi: 0xb6},
-	{value: 0x4be0, lo: 0xba, hi: 0xbf},
-	// Block 0x4b, offset 0x18a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x4be0, lo: 0x8f, hi: 0xa3},
-	// Block 0x4c, offset 0x18c
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xae, hi: 0xbe},
-	// Block 0x4d, offset 0x18e
-	{value: 0x0000, lo: 0x07},
-	{value: 0x8100, lo: 0x84, hi: 0x84},
-	{value: 0x8100, lo: 0x87, hi: 0x87},
-	{value: 0x8100, lo: 0x90, hi: 0x90},
-	{value: 0x8100, lo: 0x9e, hi: 0x9e},
-	{value: 0x8100, lo: 0xa1, hi: 0xa1},
-	{value: 0x8100, lo: 0xb2, hi: 0xb2},
-	{value: 0x8100, lo: 0xbb, hi: 0xbb},
-	// Block 0x4e, offset 0x196
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8100, lo: 0x80, hi: 0x80},
-	{value: 0x8100, lo: 0x8b, hi: 0x8b},
-	{value: 0x8100, lo: 0x8e, hi: 0x8e},
-	// Block 0x4f, offset 0x19a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0xaf, hi: 0xaf},
-	{value: 0x8133, lo: 0xb4, hi: 0xbd},
-	// Block 0x50, offset 0x19d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x9e, hi: 0x9f},
-	// Block 0x51, offset 0x19f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb0, hi: 0xb1},
-	// Block 0x52, offset 0x1a1
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x86, hi: 0x86},
-	{value: 0x8105, lo: 0xac, hi: 0xac},
-	// Block 0x53, offset 0x1a4
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0xa0, hi: 0xb1},
-	// Block 0x54, offset 0x1a7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xab, hi: 0xad},
-	// Block 0x55, offset 0x1a9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x93, hi: 0x93},
-	// Block 0x56, offset 0x1ab
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xb3, hi: 0xb3},
-	// Block 0x57, offset 0x1ad
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x80, hi: 0x80},
-	// Block 0x58, offset 0x1af
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	{value: 0x8133, lo: 0xb2, hi: 0xb3},
-	{value: 0x812e, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb7, hi: 0xb8},
-	{value: 0x8133, lo: 0xbe, hi: 0xbf},
-	// Block 0x59, offset 0x1b5
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x81, hi: 0x81},
-	{value: 0x8105, lo: 0xb6, hi: 0xb6},
-	// Block 0x5a, offset 0x1b8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xad, hi: 0xad},
-	// Block 0x5b, offset 0x1ba
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe500, lo: 0x80, hi: 0x80},
-	{value: 0xc600, lo: 0x81, hi: 0x9b},
-	{value: 0xe500, lo: 0x9c, hi: 0x9c},
-	{value: 0xc600, lo: 0x9d, hi: 0xb7},
-	{value: 0xe500, lo: 0xb8, hi: 0xb8},
-	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x5c, offset 0x1c1
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x93},
-	{value: 0xe500, lo: 0x94, hi: 0x94},
-	{value: 0xc600, lo: 0x95, hi: 0xaf},
-	{value: 0xe500, lo: 0xb0, hi: 0xb0},
-	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x5d, offset 0x1c7
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8b},
-	{value: 0xe500, lo: 0x8c, hi: 0x8c},
-	{value: 0xc600, lo: 0x8d, hi: 0xa7},
-	{value: 0xe500, lo: 0xa8, hi: 0xa8},
-	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x5e, offset 0x1cd
-	{value: 0x0000, lo: 0x07},
-	{value: 0xc600, lo: 0x80, hi: 0x83},
-	{value: 0xe500, lo: 0x84, hi: 0x84},
-	{value: 0xc600, lo: 0x85, hi: 0x9f},
-	{value: 0xe500, lo: 0xa0, hi: 0xa0},
-	{value: 0xc600, lo: 0xa1, hi: 0xbb},
-	{value: 0xe500, lo: 0xbc, hi: 0xbc},
-	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x5f, offset 0x1d5
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x97},
-	{value: 0xe500, lo: 0x98, hi: 0x98},
-	{value: 0xc600, lo: 0x99, hi: 0xb3},
-	{value: 0xe500, lo: 0xb4, hi: 0xb4},
-	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x60, offset 0x1db
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8f},
-	{value: 0xe500, lo: 0x90, hi: 0x90},
-	{value: 0xc600, lo: 0x91, hi: 0xab},
-	{value: 0xe500, lo: 0xac, hi: 0xac},
-	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x61, offset 0x1e1
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	{value: 0xe500, lo: 0xa4, hi: 0xa4},
-	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x62, offset 0x1e7
-	{value: 0x0000, lo: 0x03},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x63, offset 0x1eb
-	{value: 0x0006, lo: 0x0d},
-	{value: 0x44d1, lo: 0x9d, hi: 0x9d},
-	{value: 0x8116, lo: 0x9e, hi: 0x9e},
-	{value: 0x4543, lo: 0x9f, hi: 0x9f},
-	{value: 0x4531, lo: 0xaa, hi: 0xab},
-	{value: 0x4635, lo: 0xac, hi: 0xac},
-	{value: 0x463d, lo: 0xad, hi: 0xad},
-	{value: 0x4489, lo: 0xae, hi: 0xb1},
-	{value: 0x44a7, lo: 0xb2, hi: 0xb4},
-	{value: 0x44bf, lo: 0xb5, hi: 0xb6},
-	{value: 0x44cb, lo: 0xb8, hi: 0xb8},
-	{value: 0x44d7, lo: 0xb9, hi: 0xbb},
-	{value: 0x44ef, lo: 0xbc, hi: 0xbc},
-	{value: 0x44f5, lo: 0xbe, hi: 0xbe},
-	// Block 0x64, offset 0x1f9
-	{value: 0x0006, lo: 0x08},
-	{value: 0x44fb, lo: 0x80, hi: 0x81},
-	{value: 0x4507, lo: 0x83, hi: 0x84},
-	{value: 0x4519, lo: 0x86, hi: 0x89},
-	{value: 0x453d, lo: 0x8a, hi: 0x8a},
-	{value: 0x44b9, lo: 0x8b, hi: 0x8b},
-	{value: 0x44a1, lo: 0x8c, hi: 0x8c},
-	{value: 0x44e9, lo: 0x8d, hi: 0x8d},
-	{value: 0x4513, lo: 0x8e, hi: 0x8e},
-	// Block 0x65, offset 0x202
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0xa4, hi: 0xa5},
-	{value: 0x8100, lo: 0xb0, hi: 0xb1},
-	// Block 0x66, offset 0x205
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0x9b, hi: 0x9d},
-	{value: 0x8200, lo: 0x9e, hi: 0xa3},
-	// Block 0x67, offset 0x208
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x90, hi: 0x90},
-	// Block 0x68, offset 0x20a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0x99, hi: 0x99},
-	{value: 0x8200, lo: 0xb2, hi: 0xb4},
-	// Block 0x69, offset 0x20d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xbc, hi: 0xbd},
-	// Block 0x6a, offset 0x20f
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8133, lo: 0xa0, hi: 0xa6},
-	{value: 0x812e, lo: 0xa7, hi: 0xad},
-	{value: 0x8133, lo: 0xae, hi: 0xaf},
-	// Block 0x6b, offset 0x213
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8100, lo: 0x89, hi: 0x8c},
-	{value: 0x8100, lo: 0xb0, hi: 0xb2},
-	{value: 0x8100, lo: 0xb4, hi: 0xb4},
-	{value: 0x8100, lo: 0xb6, hi: 0xbf},
-	// Block 0x6c, offset 0x218
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x81, hi: 0x8c},
-	// Block 0x6d, offset 0x21a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xb5, hi: 0xba},
-	// Block 0x6e, offset 0x21c
-	{value: 0x0000, lo: 0x04},
-	{value: 0x4be0, lo: 0x9e, hi: 0x9f},
-	{value: 0x4be0, lo: 0xa3, hi: 0xa3},
-	{value: 0x4be0, lo: 0xa5, hi: 0xa6},
-	{value: 0x4be0, lo: 0xaa, hi: 0xaf},
-	// Block 0x6f, offset 0x221
-	{value: 0x0000, lo: 0x05},
-	{value: 0x4be0, lo: 0x82, hi: 0x87},
-	{value: 0x4be0, lo: 0x8a, hi: 0x8f},
-	{value: 0x4be0, lo: 0x92, hi: 0x97},
-	{value: 0x4be0, lo: 0x9a, hi: 0x9c},
-	{value: 0x8100, lo: 0xa3, hi: 0xa3},
-	// Block 0x70, offset 0x227
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	// Block 0x71, offset 0x229
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xa0, hi: 0xa0},
-	// Block 0x72, offset 0x22b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb6, hi: 0xba},
-	// Block 0x73, offset 0x22d
-	{value: 0x002d, lo: 0x05},
-	{value: 0x812e, lo: 0x8d, hi: 0x8d},
-	{value: 0x8133, lo: 0x8f, hi: 0x8f},
-	{value: 0x8133, lo: 0xb8, hi: 0xb8},
-	{value: 0x8101, lo: 0xb9, hi: 0xba},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x74, offset 0x233
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0xa5, hi: 0xa5},
-	{value: 0x812e, lo: 0xa6, hi: 0xa6},
-	// Block 0x75, offset 0x236
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xa4, hi: 0xa7},
-	// Block 0x76, offset 0x238
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xab, hi: 0xac},
-	// Block 0x77, offset 0x23a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xbd, hi: 0xbf},
-	// Block 0x78, offset 0x23c
-	{value: 0x0000, lo: 0x05},
-	{value: 0x812e, lo: 0x86, hi: 0x87},
-	{value: 0x8133, lo: 0x88, hi: 0x8a},
-	{value: 0x812e, lo: 0x8b, hi: 0x8b},
-	{value: 0x8133, lo: 0x8c, hi: 0x8c},
-	{value: 0x812e, lo: 0x8d, hi: 0x90},
-	// Block 0x79, offset 0x242
-	{value: 0x0005, lo: 0x03},
-	{value: 0x8133, lo: 0x82, hi: 0x82},
-	{value: 0x812e, lo: 0x83, hi: 0x84},
-	{value: 0x812e, lo: 0x85, hi: 0x85},
-	// Block 0x7a, offset 0x246
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0x86, hi: 0x86},
-	{value: 0x8105, lo: 0xb0, hi: 0xb0},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x7b, offset 0x24a
-	{value: 0x17fe, lo: 0x07},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4379, lo: 0x9a, hi: 0x9a},
-	{value: 0xa000, lo: 0x9b, hi: 0x9b},
-	{value: 0x4383, lo: 0x9c, hi: 0x9c},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x438d, lo: 0xab, hi: 0xab},
-	{value: 0x8105, lo: 0xb9, hi: 0xba},
-	// Block 0x7c, offset 0x252
-	{value: 0x0000, lo: 0x06},
-	{value: 0x8133, lo: 0x80, hi: 0x82},
-	{value: 0x9900, lo: 0xa7, hi: 0xa7},
-	{value: 0x2eb5, lo: 0xae, hi: 0xae},
-	{value: 0x2ebf, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb1, hi: 0xb2},
-	{value: 0x8105, lo: 0xb3, hi: 0xb4},
-	// Block 0x7d, offset 0x259
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x80, hi: 0x80},
-	{value: 0x8103, lo: 0x8a, hi: 0x8a},
-	// Block 0x7e, offset 0x25c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb5, hi: 0xb5},
-	{value: 0x8103, lo: 0xb6, hi: 0xb6},
-	// Block 0x7f, offset 0x25f
-	{value: 0x0002, lo: 0x01},
-	{value: 0x8103, lo: 0xa9, hi: 0xaa},
-	// Block 0x80, offset 0x261
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbb, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x81, offset 0x264
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2ec9, lo: 0x8b, hi: 0x8b},
-	{value: 0x2ed3, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x8133, lo: 0xa6, hi: 0xac},
-	{value: 0x8133, lo: 0xb0, hi: 0xb4},
-	// Block 0x82, offset 0x26c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0x82, hi: 0x82},
-	{value: 0x8103, lo: 0x86, hi: 0x86},
-	{value: 0x8133, lo: 0x9e, hi: 0x9e},
-	// Block 0x83, offset 0x270
-	{value: 0x6a23, lo: 0x06},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb9, hi: 0xb9},
-	{value: 0x9900, lo: 0xba, hi: 0xba},
-	{value: 0x2ee7, lo: 0xbb, hi: 0xbb},
-	{value: 0x2edd, lo: 0xbc, hi: 0xbd},
-	{value: 0x2ef1, lo: 0xbe, hi: 0xbe},
-	// Block 0x84, offset 0x277
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x82, hi: 0x82},
-	{value: 0x8103, lo: 0x83, hi: 0x83},
-	// Block 0x85, offset 0x27a
-	{value: 0x0000, lo: 0x05},
-	{value: 0x9900, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb8, hi: 0xb9},
-	{value: 0x2efb, lo: 0xba, hi: 0xba},
-	{value: 0x2f05, lo: 0xbb, hi: 0xbb},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x86, offset 0x280
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0x80, hi: 0x80},
-	// Block 0x87, offset 0x282
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb6, hi: 0xb6},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	// Block 0x88, offset 0x285
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xab, hi: 0xab},
-	// Block 0x89, offset 0x287
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb9, hi: 0xb9},
-	{value: 0x8103, lo: 0xba, hi: 0xba},
-	// Block 0x8a, offset 0x28a
-	{value: 0x0000, lo: 0x04},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb5, hi: 0xb5},
-	{value: 0x2f0f, lo: 0xb8, hi: 0xb8},
-	{value: 0x8105, lo: 0xbd, hi: 0xbe},
-	// Block 0x8b, offset 0x28f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0x83, hi: 0x83},
-	// Block 0x8c, offset 0x291
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xa0, hi: 0xa0},
-	// Block 0x8d, offset 0x293
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xb4, hi: 0xb4},
-	// Block 0x8e, offset 0x295
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x87, hi: 0x87},
-	// Block 0x8f, offset 0x297
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x99, hi: 0x99},
-	// Block 0x90, offset 0x299
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0x82, hi: 0x82},
-	{value: 0x8105, lo: 0x84, hi: 0x85},
-	// Block 0x91, offset 0x29c
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x97, hi: 0x97},
-	// Block 0x92, offset 0x29e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x81, hi: 0x82},
-	// Block 0x93, offset 0x2a0
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x94, offset 0x2a2
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb0, hi: 0xb6},
-	// Block 0x95, offset 0x2a4
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb0, hi: 0xb1},
-	// Block 0x96, offset 0x2a6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x97, offset 0x2a8
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x470d, lo: 0x9e, hi: 0x9e},
-	{value: 0x4717, lo: 0x9f, hi: 0x9f},
-	{value: 0x474b, lo: 0xa0, hi: 0xa0},
-	{value: 0x4759, lo: 0xa1, hi: 0xa1},
-	{value: 0x4767, lo: 0xa2, hi: 0xa2},
-	{value: 0x4775, lo: 0xa3, hi: 0xa3},
-	{value: 0x4783, lo: 0xa4, hi: 0xa4},
-	{value: 0x812c, lo: 0xa5, hi: 0xa6},
-	{value: 0x8101, lo: 0xa7, hi: 0xa9},
-	{value: 0x8131, lo: 0xad, hi: 0xad},
-	{value: 0x812c, lo: 0xae, hi: 0xb2},
-	{value: 0x812e, lo: 0xbb, hi: 0xbf},
-	// Block 0x98, offset 0x2b5
-	{value: 0x0000, lo: 0x09},
-	{value: 0x812e, lo: 0x80, hi: 0x82},
-	{value: 0x8133, lo: 0x85, hi: 0x89},
-	{value: 0x812e, lo: 0x8a, hi: 0x8b},
-	{value: 0x8133, lo: 0xaa, hi: 0xad},
-	{value: 0x4721, lo: 0xbb, hi: 0xbb},
-	{value: 0x472b, lo: 0xbc, hi: 0xbc},
-	{value: 0x4791, lo: 0xbd, hi: 0xbd},
-	{value: 0x47ad, lo: 0xbe, hi: 0xbe},
-	{value: 0x479f, lo: 0xbf, hi: 0xbf},
-	// Block 0x99, offset 0x2bf
-	{value: 0x0000, lo: 0x01},
-	{value: 0x47bb, lo: 0x80, hi: 0x80},
-	// Block 0x9a, offset 0x2c1
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x82, hi: 0x84},
-	// Block 0x9b, offset 0x2c3
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8133, lo: 0x80, hi: 0x86},
-	{value: 0x8133, lo: 0x88, hi: 0x98},
-	{value: 0x8133, lo: 0x9b, hi: 0xa1},
-	{value: 0x8133, lo: 0xa3, hi: 0xa4},
-	{value: 0x8133, lo: 0xa6, hi: 0xaa},
-	// Block 0x9c, offset 0x2c9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x8f, hi: 0x8f},
-	// Block 0x9d, offset 0x2cb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xae, hi: 0xae},
-	// Block 0x9e, offset 0x2cd
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xac, hi: 0xaf},
-	// Block 0x9f, offset 0x2cf
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8134, lo: 0xac, hi: 0xad},
-	{value: 0x812e, lo: 0xae, hi: 0xae},
-	{value: 0x8133, lo: 0xaf, hi: 0xaf},
-	// Block 0xa0, offset 0x2d3
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x90, hi: 0x96},
-	// Block 0xa1, offset 0x2d5
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x84, hi: 0x89},
-	{value: 0x8103, lo: 0x8a, hi: 0x8a},
-	// Block 0xa2, offset 0x2d8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x93, hi: 0x93},
-}
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfkcTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfkcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfkcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfkcTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfkcValues[c0]
-	}
-	i := nfkcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfkcTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfkcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfkcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfkcValues[c0]
-	}
-	i := nfkcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// nfkcTrie. Total size: 19260 bytes (18.81 KiB). Checksum: 1a0bbc4c8c24da49.
-type nfkcTrie struct{}
-
-func newNfkcTrie(i int) *nfkcTrie {
-	return &nfkcTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 95:
-		return uint16(nfkcValues[n<<6+uint32(b)])
-	default:
-		n -= 95
-		return uint16(nfkcSparse.lookup(n, b))
-	}
-}
-
-// nfkcValues: 97 blocks, 6208 entries, 12416 bytes
-// The third block is the zero block.
-var nfkcValues = [6208]uint16{
-	// Block 0x0, offset 0x0
-	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
-	// Block 0x1, offset 0x40
-	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
-	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
-	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
-	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
-	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
-	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
-	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
-	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
-	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
-	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x30b0, 0xc1: 0x30b5, 0xc2: 0x47c9, 0xc3: 0x30ba, 0xc4: 0x47d8, 0xc5: 0x47dd,
-	0xc6: 0xa000, 0xc7: 0x47e7, 0xc8: 0x3123, 0xc9: 0x3128, 0xca: 0x47ec, 0xcb: 0x313c,
-	0xcc: 0x31af, 0xcd: 0x31b4, 0xce: 0x31b9, 0xcf: 0x4800, 0xd1: 0x3245,
-	0xd2: 0x3268, 0xd3: 0x326d, 0xd4: 0x480a, 0xd5: 0x480f, 0xd6: 0x481e,
-	0xd8: 0xa000, 0xd9: 0x32f4, 0xda: 0x32f9, 0xdb: 0x32fe, 0xdc: 0x4850, 0xdd: 0x3376,
-	0xe0: 0x33bc, 0xe1: 0x33c1, 0xe2: 0x485a, 0xe3: 0x33c6,
-	0xe4: 0x4869, 0xe5: 0x486e, 0xe6: 0xa000, 0xe7: 0x4878, 0xe8: 0x342f, 0xe9: 0x3434,
-	0xea: 0x487d, 0xeb: 0x3448, 0xec: 0x34c0, 0xed: 0x34c5, 0xee: 0x34ca, 0xef: 0x4891,
-	0xf1: 0x3556, 0xf2: 0x3579, 0xf3: 0x357e, 0xf4: 0x489b, 0xf5: 0x48a0,
-	0xf6: 0x48af, 0xf8: 0xa000, 0xf9: 0x360a, 0xfa: 0x360f, 0xfb: 0x3614,
-	0xfc: 0x48e1, 0xfd: 0x3691, 0xff: 0x36aa,
-	// Block 0x4, offset 0x100
-	0x100: 0x30bf, 0x101: 0x33cb, 0x102: 0x47ce, 0x103: 0x485f, 0x104: 0x30dd, 0x105: 0x33e9,
-	0x106: 0x30f1, 0x107: 0x33fd, 0x108: 0x30f6, 0x109: 0x3402, 0x10a: 0x30fb, 0x10b: 0x3407,
-	0x10c: 0x3100, 0x10d: 0x340c, 0x10e: 0x310a, 0x10f: 0x3416,
-	0x112: 0x47f1, 0x113: 0x4882, 0x114: 0x3132, 0x115: 0x343e, 0x116: 0x3137, 0x117: 0x3443,
-	0x118: 0x3155, 0x119: 0x3461, 0x11a: 0x3146, 0x11b: 0x3452, 0x11c: 0x316e, 0x11d: 0x347a,
-	0x11e: 0x3178, 0x11f: 0x3484, 0x120: 0x317d, 0x121: 0x3489, 0x122: 0x3187, 0x123: 0x3493,
-	0x124: 0x318c, 0x125: 0x3498, 0x128: 0x31be, 0x129: 0x34cf,
-	0x12a: 0x31c3, 0x12b: 0x34d4, 0x12c: 0x31c8, 0x12d: 0x34d9, 0x12e: 0x31eb, 0x12f: 0x34f7,
-	0x130: 0x31cd, 0x132: 0x1a8a, 0x133: 0x1b17, 0x134: 0x31f5, 0x135: 0x3501,
-	0x136: 0x3209, 0x137: 0x351a, 0x139: 0x3213, 0x13a: 0x3524, 0x13b: 0x321d,
-	0x13c: 0x352e, 0x13d: 0x3218, 0x13e: 0x3529, 0x13f: 0x1cdc,
-	// Block 0x5, offset 0x140
-	0x140: 0x1d64, 0x143: 0x3240, 0x144: 0x3551, 0x145: 0x3259,
-	0x146: 0x356a, 0x147: 0x324f, 0x148: 0x3560, 0x149: 0x1d8c,
-	0x14c: 0x4814, 0x14d: 0x48a5, 0x14e: 0x3272, 0x14f: 0x3583, 0x150: 0x327c, 0x151: 0x358d,
-	0x154: 0x329a, 0x155: 0x35ab, 0x156: 0x32b3, 0x157: 0x35c4,
-	0x158: 0x32a4, 0x159: 0x35b5, 0x15a: 0x4837, 0x15b: 0x48c8, 0x15c: 0x32bd, 0x15d: 0x35ce,
-	0x15e: 0x32cc, 0x15f: 0x35dd, 0x160: 0x483c, 0x161: 0x48cd, 0x162: 0x32e5, 0x163: 0x35fb,
-	0x164: 0x32d6, 0x165: 0x35ec, 0x168: 0x4846, 0x169: 0x48d7,
-	0x16a: 0x484b, 0x16b: 0x48dc, 0x16c: 0x3303, 0x16d: 0x3619, 0x16e: 0x330d, 0x16f: 0x3623,
-	0x170: 0x3312, 0x171: 0x3628, 0x172: 0x3330, 0x173: 0x3646, 0x174: 0x3353, 0x175: 0x3669,
-	0x176: 0x337b, 0x177: 0x3696, 0x178: 0x338f, 0x179: 0x339e, 0x17a: 0x36be, 0x17b: 0x33a8,
-	0x17c: 0x36c8, 0x17d: 0x33ad, 0x17e: 0x36cd, 0x17f: 0x00a7,
-	// Block 0x6, offset 0x180
-	0x184: 0x2f2f, 0x185: 0x2f35,
-	0x186: 0x2f3b, 0x187: 0x1a9f, 0x188: 0x1aa2, 0x189: 0x1b38, 0x18a: 0x1ab7, 0x18b: 0x1aba,
-	0x18c: 0x1b6e, 0x18d: 0x30c9, 0x18e: 0x33d5, 0x18f: 0x31d7, 0x190: 0x34e3, 0x191: 0x3281,
-	0x192: 0x3592, 0x193: 0x3317, 0x194: 0x362d, 0x195: 0x3b10, 0x196: 0x3c9f, 0x197: 0x3b09,
-	0x198: 0x3c98, 0x199: 0x3b17, 0x19a: 0x3ca6, 0x19b: 0x3b02, 0x19c: 0x3c91,
-	0x19e: 0x39f1, 0x19f: 0x3b80, 0x1a0: 0x39ea, 0x1a1: 0x3b79, 0x1a2: 0x36f4, 0x1a3: 0x3706,
-	0x1a6: 0x3182, 0x1a7: 0x348e, 0x1a8: 0x31ff, 0x1a9: 0x3510,
-	0x1aa: 0x482d, 0x1ab: 0x48be, 0x1ac: 0x3ad1, 0x1ad: 0x3c60, 0x1ae: 0x3718, 0x1af: 0x371e,
-	0x1b0: 0x3506, 0x1b1: 0x1a6f, 0x1b2: 0x1a72, 0x1b3: 0x1aff, 0x1b4: 0x3169, 0x1b5: 0x3475,
-	0x1b8: 0x323b, 0x1b9: 0x354c, 0x1ba: 0x39f8, 0x1bb: 0x3b87,
-	0x1bc: 0x36ee, 0x1bd: 0x3700, 0x1be: 0x36fa, 0x1bf: 0x370c,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x30ce, 0x1c1: 0x33da, 0x1c2: 0x30d3, 0x1c3: 0x33df, 0x1c4: 0x314b, 0x1c5: 0x3457,
-	0x1c6: 0x3150, 0x1c7: 0x345c, 0x1c8: 0x31dc, 0x1c9: 0x34e8, 0x1ca: 0x31e1, 0x1cb: 0x34ed,
-	0x1cc: 0x3286, 0x1cd: 0x3597, 0x1ce: 0x328b, 0x1cf: 0x359c, 0x1d0: 0x32a9, 0x1d1: 0x35ba,
-	0x1d2: 0x32ae, 0x1d3: 0x35bf, 0x1d4: 0x331c, 0x1d5: 0x3632, 0x1d6: 0x3321, 0x1d7: 0x3637,
-	0x1d8: 0x32c7, 0x1d9: 0x35d8, 0x1da: 0x32e0, 0x1db: 0x35f6,
-	0x1de: 0x319b, 0x1df: 0x34a7,
-	0x1e6: 0x47d3, 0x1e7: 0x4864, 0x1e8: 0x47fb, 0x1e9: 0x488c,
-	0x1ea: 0x3aa0, 0x1eb: 0x3c2f, 0x1ec: 0x3a7d, 0x1ed: 0x3c0c, 0x1ee: 0x4819, 0x1ef: 0x48aa,
-	0x1f0: 0x3a99, 0x1f1: 0x3c28, 0x1f2: 0x3385, 0x1f3: 0x36a0,
-	// Block 0x8, offset 0x200
-	0x200: 0x9933, 0x201: 0x9933, 0x202: 0x9933, 0x203: 0x9933, 0x204: 0x9933, 0x205: 0x8133,
-	0x206: 0x9933, 0x207: 0x9933, 0x208: 0x9933, 0x209: 0x9933, 0x20a: 0x9933, 0x20b: 0x9933,
-	0x20c: 0x9933, 0x20d: 0x8133, 0x20e: 0x8133, 0x20f: 0x9933, 0x210: 0x8133, 0x211: 0x9933,
-	0x212: 0x8133, 0x213: 0x9933, 0x214: 0x9933, 0x215: 0x8134, 0x216: 0x812e, 0x217: 0x812e,
-	0x218: 0x812e, 0x219: 0x812e, 0x21a: 0x8134, 0x21b: 0x992c, 0x21c: 0x812e, 0x21d: 0x812e,
-	0x21e: 0x812e, 0x21f: 0x812e, 0x220: 0x812e, 0x221: 0x812a, 0x222: 0x812a, 0x223: 0x992e,
-	0x224: 0x992e, 0x225: 0x992e, 0x226: 0x992e, 0x227: 0x992a, 0x228: 0x992a, 0x229: 0x812e,
-	0x22a: 0x812e, 0x22b: 0x812e, 0x22c: 0x812e, 0x22d: 0x992e, 0x22e: 0x992e, 0x22f: 0x812e,
-	0x230: 0x992e, 0x231: 0x992e, 0x232: 0x812e, 0x233: 0x812e, 0x234: 0x8101, 0x235: 0x8101,
-	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812e, 0x23a: 0x812e, 0x23b: 0x812e,
-	0x23c: 0x812e, 0x23d: 0x8133, 0x23e: 0x8133, 0x23f: 0x8133,
-	// Block 0x9, offset 0x240
-	0x240: 0x4aef, 0x241: 0x4af4, 0x242: 0x9933, 0x243: 0x4af9, 0x244: 0x4bb2, 0x245: 0x9937,
-	0x246: 0x8133, 0x247: 0x812e, 0x248: 0x812e, 0x249: 0x812e, 0x24a: 0x8133, 0x24b: 0x8133,
-	0x24c: 0x8133, 0x24d: 0x812e, 0x24e: 0x812e, 0x250: 0x8133, 0x251: 0x8133,
-	0x252: 0x8133, 0x253: 0x812e, 0x254: 0x812e, 0x255: 0x812e, 0x256: 0x812e, 0x257: 0x8133,
-	0x258: 0x8134, 0x259: 0x812e, 0x25a: 0x812e, 0x25b: 0x8133, 0x25c: 0x8135, 0x25d: 0x8136,
-	0x25e: 0x8136, 0x25f: 0x8135, 0x260: 0x8136, 0x261: 0x8136, 0x262: 0x8135, 0x263: 0x8133,
-	0x264: 0x8133, 0x265: 0x8133, 0x266: 0x8133, 0x267: 0x8133, 0x268: 0x8133, 0x269: 0x8133,
-	0x26a: 0x8133, 0x26b: 0x8133, 0x26c: 0x8133, 0x26d: 0x8133, 0x26e: 0x8133, 0x26f: 0x8133,
-	0x274: 0x01ee,
-	0x27a: 0x43e6,
-	0x27e: 0x0037,
-	// Block 0xa, offset 0x280
-	0x284: 0x439b, 0x285: 0x45bc,
-	0x286: 0x372a, 0x287: 0x00ce, 0x288: 0x3748, 0x289: 0x3754, 0x28a: 0x3766,
-	0x28c: 0x3784, 0x28e: 0x3796, 0x28f: 0x37b4, 0x290: 0x3f49, 0x291: 0xa000,
-	0x295: 0xa000, 0x297: 0xa000,
-	0x299: 0xa000,
-	0x29f: 0xa000, 0x2a1: 0xa000,
-	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3778, 0x2ab: 0x37a8, 0x2ac: 0x493f, 0x2ad: 0x37d8, 0x2ae: 0x4969, 0x2af: 0x37ea,
-	0x2b0: 0x3fb1, 0x2b1: 0xa000, 0x2b5: 0xa000,
-	0x2b7: 0xa000, 0x2b9: 0xa000,
-	0x2bf: 0xa000,
-	// Block 0xb, offset 0x2c0
-	0x2c1: 0xa000, 0x2c5: 0xa000,
-	0x2c9: 0xa000, 0x2ca: 0x4981, 0x2cb: 0x499f,
-	0x2cc: 0x3808, 0x2cd: 0x3820, 0x2ce: 0x49b7, 0x2d0: 0x0242, 0x2d1: 0x0254,
-	0x2d2: 0x0230, 0x2d3: 0x444d, 0x2d4: 0x4453, 0x2d5: 0x027e, 0x2d6: 0x026c,
-	0x2f0: 0x025a, 0x2f1: 0x026f, 0x2f2: 0x0272, 0x2f4: 0x020c, 0x2f5: 0x024b,
-	0x2f9: 0x022a,
-	// Block 0xc, offset 0x300
-	0x300: 0x3862, 0x301: 0x386e, 0x303: 0x385c,
-	0x306: 0xa000, 0x307: 0x384a,
-	0x30c: 0x389e, 0x30d: 0x3886, 0x30e: 0x38b0, 0x310: 0xa000,
-	0x313: 0xa000, 0x315: 0xa000, 0x316: 0xa000, 0x317: 0xa000,
-	0x318: 0xa000, 0x319: 0x3892, 0x31a: 0xa000,
-	0x31e: 0xa000, 0x323: 0xa000,
-	0x327: 0xa000,
-	0x32b: 0xa000, 0x32d: 0xa000,
-	0x330: 0xa000, 0x333: 0xa000, 0x335: 0xa000,
-	0x336: 0xa000, 0x337: 0xa000, 0x338: 0xa000, 0x339: 0x3916, 0x33a: 0xa000,
-	0x33e: 0xa000,
-	// Block 0xd, offset 0x340
-	0x341: 0x3874, 0x342: 0x38f8,
-	0x350: 0x3850, 0x351: 0x38d4,
-	0x352: 0x3856, 0x353: 0x38da, 0x356: 0x3868, 0x357: 0x38ec,
-	0x358: 0xa000, 0x359: 0xa000, 0x35a: 0x396a, 0x35b: 0x3970, 0x35c: 0x387a, 0x35d: 0x38fe,
-	0x35e: 0x3880, 0x35f: 0x3904, 0x362: 0x388c, 0x363: 0x3910,
-	0x364: 0x3898, 0x365: 0x391c, 0x366: 0x38a4, 0x367: 0x3928, 0x368: 0xa000, 0x369: 0xa000,
-	0x36a: 0x3976, 0x36b: 0x397c, 0x36c: 0x38ce, 0x36d: 0x3952, 0x36e: 0x38aa, 0x36f: 0x392e,
-	0x370: 0x38b6, 0x371: 0x393a, 0x372: 0x38bc, 0x373: 0x3940, 0x374: 0x38c2, 0x375: 0x3946,
-	0x378: 0x38c8, 0x379: 0x394c,
-	// Block 0xe, offset 0x380
-	0x387: 0x1e91,
-	0x391: 0x812e,
-	0x392: 0x8133, 0x393: 0x8133, 0x394: 0x8133, 0x395: 0x8133, 0x396: 0x812e, 0x397: 0x8133,
-	0x398: 0x8133, 0x399: 0x8133, 0x39a: 0x812f, 0x39b: 0x812e, 0x39c: 0x8133, 0x39d: 0x8133,
-	0x39e: 0x8133, 0x39f: 0x8133, 0x3a0: 0x8133, 0x3a1: 0x8133, 0x3a2: 0x812e, 0x3a3: 0x812e,
-	0x3a4: 0x812e, 0x3a5: 0x812e, 0x3a6: 0x812e, 0x3a7: 0x812e, 0x3a8: 0x8133, 0x3a9: 0x8133,
-	0x3aa: 0x812e, 0x3ab: 0x8133, 0x3ac: 0x8133, 0x3ad: 0x812f, 0x3ae: 0x8132, 0x3af: 0x8133,
-	0x3b0: 0x8106, 0x3b1: 0x8107, 0x3b2: 0x8108, 0x3b3: 0x8109, 0x3b4: 0x810a, 0x3b5: 0x810b,
-	0x3b6: 0x810c, 0x3b7: 0x810d, 0x3b8: 0x810e, 0x3b9: 0x810f, 0x3ba: 0x810f, 0x3bb: 0x8110,
-	0x3bc: 0x8111, 0x3bd: 0x8112, 0x3bf: 0x8113,
-	// Block 0xf, offset 0x3c0
-	0x3c8: 0xa000, 0x3ca: 0xa000, 0x3cb: 0x8117,
-	0x3cc: 0x8118, 0x3cd: 0x8119, 0x3ce: 0x811a, 0x3cf: 0x811b, 0x3d0: 0x811c, 0x3d1: 0x811d,
-	0x3d2: 0x811e, 0x3d3: 0x9933, 0x3d4: 0x9933, 0x3d5: 0x992e, 0x3d6: 0x812e, 0x3d7: 0x8133,
-	0x3d8: 0x8133, 0x3d9: 0x8133, 0x3da: 0x8133, 0x3db: 0x8133, 0x3dc: 0x812e, 0x3dd: 0x8133,
-	0x3de: 0x8133, 0x3df: 0x812e,
-	0x3f0: 0x811f, 0x3f5: 0x1eb4,
-	0x3f6: 0x2143, 0x3f7: 0x217f, 0x3f8: 0x217a,
-	// Block 0x10, offset 0x400
-	0x40a: 0x8133, 0x40b: 0x8133,
-	0x40c: 0x8133, 0x40d: 0x8133, 0x40e: 0x8133, 0x40f: 0x812e, 0x410: 0x812e, 0x411: 0x812e,
-	0x412: 0x812e, 0x413: 0x812e, 0x414: 0x8133, 0x415: 0x8133, 0x416: 0x8133, 0x417: 0x8133,
-	0x418: 0x8133, 0x419: 0x8133, 0x41a: 0x8133, 0x41b: 0x8133, 0x41c: 0x8133, 0x41d: 0x8133,
-	0x41e: 0x8133, 0x41f: 0x8133, 0x420: 0x8133, 0x421: 0x8133, 0x423: 0x812e,
-	0x424: 0x8133, 0x425: 0x8133, 0x426: 0x812e, 0x427: 0x8133, 0x428: 0x8133, 0x429: 0x812e,
-	0x42a: 0x8133, 0x42b: 0x8133, 0x42c: 0x8133, 0x42d: 0x812e, 0x42e: 0x812e, 0x42f: 0x812e,
-	0x430: 0x8117, 0x431: 0x8118, 0x432: 0x8119, 0x433: 0x8133, 0x434: 0x8133, 0x435: 0x8133,
-	0x436: 0x812e, 0x437: 0x8133, 0x438: 0x8133, 0x439: 0x812e, 0x43a: 0x812e, 0x43b: 0x8133,
-	0x43c: 0x8133, 0x43d: 0x8133, 0x43e: 0x8133, 0x43f: 0x8133,
-	// Block 0x11, offset 0x440
-	0x445: 0xa000,
-	0x446: 0x2e5d, 0x447: 0xa000, 0x448: 0x2e65, 0x449: 0xa000, 0x44a: 0x2e6d, 0x44b: 0xa000,
-	0x44c: 0x2e75, 0x44d: 0xa000, 0x44e: 0x2e7d, 0x451: 0xa000,
-	0x452: 0x2e85,
-	0x474: 0x8103, 0x475: 0x9900,
-	0x47a: 0xa000, 0x47b: 0x2e8d,
-	0x47c: 0xa000, 0x47d: 0x2e95, 0x47e: 0xa000, 0x47f: 0xa000,
-	// Block 0x12, offset 0x480
-	0x480: 0x0069, 0x481: 0x006b, 0x482: 0x006f, 0x483: 0x0083, 0x484: 0x0104, 0x485: 0x0107,
-	0x486: 0x0506, 0x487: 0x0085, 0x488: 0x0089, 0x489: 0x008b, 0x48a: 0x011f, 0x48b: 0x0122,
-	0x48c: 0x0125, 0x48d: 0x008f, 0x48f: 0x0097, 0x490: 0x009b, 0x491: 0x00e6,
-	0x492: 0x009f, 0x493: 0x0110, 0x494: 0x050a, 0x495: 0x050e, 0x496: 0x00a1, 0x497: 0x00a9,
-	0x498: 0x00ab, 0x499: 0x0516, 0x49a: 0x015b, 0x49b: 0x00ad, 0x49c: 0x051a, 0x49d: 0x0242,
-	0x49e: 0x0245, 0x49f: 0x0248, 0x4a0: 0x027e, 0x4a1: 0x0281, 0x4a2: 0x0093, 0x4a3: 0x00a5,
-	0x4a4: 0x00ab, 0x4a5: 0x00ad, 0x4a6: 0x0242, 0x4a7: 0x0245, 0x4a8: 0x026f, 0x4a9: 0x027e,
-	0x4aa: 0x0281,
-	0x4b8: 0x02b4,
-	// Block 0x13, offset 0x4c0
-	0x4db: 0x010a, 0x4dc: 0x0087, 0x4dd: 0x0113,
-	0x4de: 0x00d7, 0x4df: 0x0125, 0x4e0: 0x008d, 0x4e1: 0x012b, 0x4e2: 0x0131, 0x4e3: 0x013d,
-	0x4e4: 0x0146, 0x4e5: 0x0149, 0x4e6: 0x014c, 0x4e7: 0x051e, 0x4e8: 0x01c7, 0x4e9: 0x0155,
-	0x4ea: 0x0522, 0x4eb: 0x01ca, 0x4ec: 0x0161, 0x4ed: 0x015e, 0x4ee: 0x0164, 0x4ef: 0x0167,
-	0x4f0: 0x016a, 0x4f1: 0x016d, 0x4f2: 0x0176, 0x4f3: 0x018e, 0x4f4: 0x0191, 0x4f5: 0x00f2,
-	0x4f6: 0x019a, 0x4f7: 0x019d, 0x4f8: 0x0512, 0x4f9: 0x01a0, 0x4fa: 0x01a3, 0x4fb: 0x00b5,
-	0x4fc: 0x01af, 0x4fd: 0x01b2, 0x4fe: 0x01b5, 0x4ff: 0x0254,
-	// Block 0x14, offset 0x500
-	0x500: 0x8133, 0x501: 0x8133, 0x502: 0x812e, 0x503: 0x8133, 0x504: 0x8133, 0x505: 0x8133,
-	0x506: 0x8133, 0x507: 0x8133, 0x508: 0x8133, 0x509: 0x8133, 0x50a: 0x812e, 0x50b: 0x8133,
-	0x50c: 0x8133, 0x50d: 0x8136, 0x50e: 0x812b, 0x50f: 0x812e, 0x510: 0x812a, 0x511: 0x8133,
-	0x512: 0x8133, 0x513: 0x8133, 0x514: 0x8133, 0x515: 0x8133, 0x516: 0x8133, 0x517: 0x8133,
-	0x518: 0x8133, 0x519: 0x8133, 0x51a: 0x8133, 0x51b: 0x8133, 0x51c: 0x8133, 0x51d: 0x8133,
-	0x51e: 0x8133, 0x51f: 0x8133, 0x520: 0x8133, 0x521: 0x8133, 0x522: 0x8133, 0x523: 0x8133,
-	0x524: 0x8133, 0x525: 0x8133, 0x526: 0x8133, 0x527: 0x8133, 0x528: 0x8133, 0x529: 0x8133,
-	0x52a: 0x8133, 0x52b: 0x8133, 0x52c: 0x8133, 0x52d: 0x8133, 0x52e: 0x8133, 0x52f: 0x8133,
-	0x530: 0x8133, 0x531: 0x8133, 0x532: 0x8133, 0x533: 0x8133, 0x534: 0x8133, 0x535: 0x8133,
-	0x536: 0x8134, 0x537: 0x8132, 0x538: 0x8132, 0x539: 0x812e, 0x53a: 0x812d, 0x53b: 0x8133,
-	0x53c: 0x8135, 0x53d: 0x812e, 0x53e: 0x8133, 0x53f: 0x812e,
-	// Block 0x15, offset 0x540
-	0x540: 0x30d8, 0x541: 0x33e4, 0x542: 0x30e2, 0x543: 0x33ee, 0x544: 0x30e7, 0x545: 0x33f3,
-	0x546: 0x30ec, 0x547: 0x33f8, 0x548: 0x3a0d, 0x549: 0x3b9c, 0x54a: 0x3105, 0x54b: 0x3411,
-	0x54c: 0x310f, 0x54d: 0x341b, 0x54e: 0x311e, 0x54f: 0x342a, 0x550: 0x3114, 0x551: 0x3420,
-	0x552: 0x3119, 0x553: 0x3425, 0x554: 0x3a30, 0x555: 0x3bbf, 0x556: 0x3a37, 0x557: 0x3bc6,
-	0x558: 0x315a, 0x559: 0x3466, 0x55a: 0x315f, 0x55b: 0x346b, 0x55c: 0x3a45, 0x55d: 0x3bd4,
-	0x55e: 0x3164, 0x55f: 0x3470, 0x560: 0x3173, 0x561: 0x347f, 0x562: 0x3191, 0x563: 0x349d,
-	0x564: 0x31a0, 0x565: 0x34ac, 0x566: 0x3196, 0x567: 0x34a2, 0x568: 0x31a5, 0x569: 0x34b1,
-	0x56a: 0x31aa, 0x56b: 0x34b6, 0x56c: 0x31f0, 0x56d: 0x34fc, 0x56e: 0x3a4c, 0x56f: 0x3bdb,
-	0x570: 0x31fa, 0x571: 0x350b, 0x572: 0x3204, 0x573: 0x3515, 0x574: 0x320e, 0x575: 0x351f,
-	0x576: 0x4805, 0x577: 0x4896, 0x578: 0x3a53, 0x579: 0x3be2, 0x57a: 0x3227, 0x57b: 0x3538,
-	0x57c: 0x3222, 0x57d: 0x3533, 0x57e: 0x322c, 0x57f: 0x353d,
-	// Block 0x16, offset 0x580
-	0x580: 0x3231, 0x581: 0x3542, 0x582: 0x3236, 0x583: 0x3547, 0x584: 0x324a, 0x585: 0x355b,
-	0x586: 0x3254, 0x587: 0x3565, 0x588: 0x3263, 0x589: 0x3574, 0x58a: 0x325e, 0x58b: 0x356f,
-	0x58c: 0x3a76, 0x58d: 0x3c05, 0x58e: 0x3a84, 0x58f: 0x3c13, 0x590: 0x3a8b, 0x591: 0x3c1a,
-	0x592: 0x3a92, 0x593: 0x3c21, 0x594: 0x3290, 0x595: 0x35a1, 0x596: 0x3295, 0x597: 0x35a6,
-	0x598: 0x329f, 0x599: 0x35b0, 0x59a: 0x4832, 0x59b: 0x48c3, 0x59c: 0x3ad8, 0x59d: 0x3c67,
-	0x59e: 0x32b8, 0x59f: 0x35c9, 0x5a0: 0x32c2, 0x5a1: 0x35d3, 0x5a2: 0x4841, 0x5a3: 0x48d2,
-	0x5a4: 0x3adf, 0x5a5: 0x3c6e, 0x5a6: 0x3ae6, 0x5a7: 0x3c75, 0x5a8: 0x3aed, 0x5a9: 0x3c7c,
-	0x5aa: 0x32d1, 0x5ab: 0x35e2, 0x5ac: 0x32db, 0x5ad: 0x35f1, 0x5ae: 0x32ef, 0x5af: 0x3605,
-	0x5b0: 0x32ea, 0x5b1: 0x3600, 0x5b2: 0x332b, 0x5b3: 0x3641, 0x5b4: 0x333a, 0x5b5: 0x3650,
-	0x5b6: 0x3335, 0x5b7: 0x364b, 0x5b8: 0x3af4, 0x5b9: 0x3c83, 0x5ba: 0x3afb, 0x5bb: 0x3c8a,
-	0x5bc: 0x333f, 0x5bd: 0x3655, 0x5be: 0x3344, 0x5bf: 0x365a,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x3349, 0x5c1: 0x365f, 0x5c2: 0x334e, 0x5c3: 0x3664, 0x5c4: 0x335d, 0x5c5: 0x3673,
-	0x5c6: 0x3358, 0x5c7: 0x366e, 0x5c8: 0x3362, 0x5c9: 0x367d, 0x5ca: 0x3367, 0x5cb: 0x3682,
-	0x5cc: 0x336c, 0x5cd: 0x3687, 0x5ce: 0x338a, 0x5cf: 0x36a5, 0x5d0: 0x33a3, 0x5d1: 0x36c3,
-	0x5d2: 0x33b2, 0x5d3: 0x36d2, 0x5d4: 0x33b7, 0x5d5: 0x36d7, 0x5d6: 0x34bb, 0x5d7: 0x35e7,
-	0x5d8: 0x3678, 0x5d9: 0x36b4, 0x5da: 0x1d10, 0x5db: 0x4418,
-	0x5e0: 0x47e2, 0x5e1: 0x4873, 0x5e2: 0x30c4, 0x5e3: 0x33d0,
-	0x5e4: 0x39b9, 0x5e5: 0x3b48, 0x5e6: 0x39b2, 0x5e7: 0x3b41, 0x5e8: 0x39c7, 0x5e9: 0x3b56,
-	0x5ea: 0x39c0, 0x5eb: 0x3b4f, 0x5ec: 0x39ff, 0x5ed: 0x3b8e, 0x5ee: 0x39d5, 0x5ef: 0x3b64,
-	0x5f0: 0x39ce, 0x5f1: 0x3b5d, 0x5f2: 0x39e3, 0x5f3: 0x3b72, 0x5f4: 0x39dc, 0x5f5: 0x3b6b,
-	0x5f6: 0x3a06, 0x5f7: 0x3b95, 0x5f8: 0x47f6, 0x5f9: 0x4887, 0x5fa: 0x3141, 0x5fb: 0x344d,
-	0x5fc: 0x312d, 0x5fd: 0x3439, 0x5fe: 0x3a1b, 0x5ff: 0x3baa,
-	// Block 0x18, offset 0x600
-	0x600: 0x3a14, 0x601: 0x3ba3, 0x602: 0x3a29, 0x603: 0x3bb8, 0x604: 0x3a22, 0x605: 0x3bb1,
-	0x606: 0x3a3e, 0x607: 0x3bcd, 0x608: 0x31d2, 0x609: 0x34de, 0x60a: 0x31e6, 0x60b: 0x34f2,
-	0x60c: 0x4828, 0x60d: 0x48b9, 0x60e: 0x3277, 0x60f: 0x3588, 0x610: 0x3a61, 0x611: 0x3bf0,
-	0x612: 0x3a5a, 0x613: 0x3be9, 0x614: 0x3a6f, 0x615: 0x3bfe, 0x616: 0x3a68, 0x617: 0x3bf7,
-	0x618: 0x3aca, 0x619: 0x3c59, 0x61a: 0x3aae, 0x61b: 0x3c3d, 0x61c: 0x3aa7, 0x61d: 0x3c36,
-	0x61e: 0x3abc, 0x61f: 0x3c4b, 0x620: 0x3ab5, 0x621: 0x3c44, 0x622: 0x3ac3, 0x623: 0x3c52,
-	0x624: 0x3326, 0x625: 0x363c, 0x626: 0x3308, 0x627: 0x361e, 0x628: 0x3b25, 0x629: 0x3cb4,
-	0x62a: 0x3b1e, 0x62b: 0x3cad, 0x62c: 0x3b33, 0x62d: 0x3cc2, 0x62e: 0x3b2c, 0x62f: 0x3cbb,
-	0x630: 0x3b3a, 0x631: 0x3cc9, 0x632: 0x3371, 0x633: 0x368c, 0x634: 0x3399, 0x635: 0x36b9,
-	0x636: 0x3394, 0x637: 0x36af, 0x638: 0x3380, 0x639: 0x369b,
-	// Block 0x19, offset 0x640
-	0x640: 0x4945, 0x641: 0x494b, 0x642: 0x4a5f, 0x643: 0x4a77, 0x644: 0x4a67, 0x645: 0x4a7f,
-	0x646: 0x4a6f, 0x647: 0x4a87, 0x648: 0x48eb, 0x649: 0x48f1, 0x64a: 0x49cf, 0x64b: 0x49e7,
-	0x64c: 0x49d7, 0x64d: 0x49ef, 0x64e: 0x49df, 0x64f: 0x49f7, 0x650: 0x4957, 0x651: 0x495d,
-	0x652: 0x3ef9, 0x653: 0x3f09, 0x654: 0x3f01, 0x655: 0x3f11,
-	0x658: 0x48f7, 0x659: 0x48fd, 0x65a: 0x3e29, 0x65b: 0x3e39, 0x65c: 0x3e31, 0x65d: 0x3e41,
-	0x660: 0x496f, 0x661: 0x4975, 0x662: 0x4a8f, 0x663: 0x4aa7,
-	0x664: 0x4a97, 0x665: 0x4aaf, 0x666: 0x4a9f, 0x667: 0x4ab7, 0x668: 0x4903, 0x669: 0x4909,
-	0x66a: 0x49ff, 0x66b: 0x4a17, 0x66c: 0x4a07, 0x66d: 0x4a1f, 0x66e: 0x4a0f, 0x66f: 0x4a27,
-	0x670: 0x4987, 0x671: 0x498d, 0x672: 0x3f59, 0x673: 0x3f71, 0x674: 0x3f61, 0x675: 0x3f79,
-	0x676: 0x3f69, 0x677: 0x3f81, 0x678: 0x490f, 0x679: 0x4915, 0x67a: 0x3e59, 0x67b: 0x3e71,
-	0x67c: 0x3e61, 0x67d: 0x3e79, 0x67e: 0x3e69, 0x67f: 0x3e81,
-	// Block 0x1a, offset 0x680
-	0x680: 0x4993, 0x681: 0x4999, 0x682: 0x3f89, 0x683: 0x3f99, 0x684: 0x3f91, 0x685: 0x3fa1,
-	0x688: 0x491b, 0x689: 0x4921, 0x68a: 0x3e89, 0x68b: 0x3e99,
-	0x68c: 0x3e91, 0x68d: 0x3ea1, 0x690: 0x49a5, 0x691: 0x49ab,
-	0x692: 0x3fc1, 0x693: 0x3fd9, 0x694: 0x3fc9, 0x695: 0x3fe1, 0x696: 0x3fd1, 0x697: 0x3fe9,
-	0x699: 0x4927, 0x69b: 0x3ea9, 0x69d: 0x3eb1,
-	0x69f: 0x3eb9, 0x6a0: 0x49bd, 0x6a1: 0x49c3, 0x6a2: 0x4abf, 0x6a3: 0x4ad7,
-	0x6a4: 0x4ac7, 0x6a5: 0x4adf, 0x6a6: 0x4acf, 0x6a7: 0x4ae7, 0x6a8: 0x492d, 0x6a9: 0x4933,
-	0x6aa: 0x4a2f, 0x6ab: 0x4a47, 0x6ac: 0x4a37, 0x6ad: 0x4a4f, 0x6ae: 0x4a3f, 0x6af: 0x4a57,
-	0x6b0: 0x4939, 0x6b1: 0x445f, 0x6b2: 0x37d2, 0x6b3: 0x4465, 0x6b4: 0x4963, 0x6b5: 0x446b,
-	0x6b6: 0x37e4, 0x6b7: 0x4471, 0x6b8: 0x3802, 0x6b9: 0x4477, 0x6ba: 0x381a, 0x6bb: 0x447d,
-	0x6bc: 0x49b1, 0x6bd: 0x4483,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x3ee1, 0x6c1: 0x3ee9, 0x6c2: 0x42c5, 0x6c3: 0x42e3, 0x6c4: 0x42cf, 0x6c5: 0x42ed,
-	0x6c6: 0x42d9, 0x6c7: 0x42f7, 0x6c8: 0x3e19, 0x6c9: 0x3e21, 0x6ca: 0x4211, 0x6cb: 0x422f,
-	0x6cc: 0x421b, 0x6cd: 0x4239, 0x6ce: 0x4225, 0x6cf: 0x4243, 0x6d0: 0x3f29, 0x6d1: 0x3f31,
-	0x6d2: 0x4301, 0x6d3: 0x431f, 0x6d4: 0x430b, 0x6d5: 0x4329, 0x6d6: 0x4315, 0x6d7: 0x4333,
-	0x6d8: 0x3e49, 0x6d9: 0x3e51, 0x6da: 0x424d, 0x6db: 0x426b, 0x6dc: 0x4257, 0x6dd: 0x4275,
-	0x6de: 0x4261, 0x6df: 0x427f, 0x6e0: 0x4001, 0x6e1: 0x4009, 0x6e2: 0x433d, 0x6e3: 0x435b,
-	0x6e4: 0x4347, 0x6e5: 0x4365, 0x6e6: 0x4351, 0x6e7: 0x436f, 0x6e8: 0x3ec1, 0x6e9: 0x3ec9,
-	0x6ea: 0x4289, 0x6eb: 0x42a7, 0x6ec: 0x4293, 0x6ed: 0x42b1, 0x6ee: 0x429d, 0x6ef: 0x42bb,
-	0x6f0: 0x37c6, 0x6f1: 0x37c0, 0x6f2: 0x3ed1, 0x6f3: 0x37cc, 0x6f4: 0x3ed9,
-	0x6f6: 0x4951, 0x6f7: 0x3ef1, 0x6f8: 0x3736, 0x6f9: 0x3730, 0x6fa: 0x3724, 0x6fb: 0x442f,
-	0x6fc: 0x373c, 0x6fd: 0x43c8, 0x6fe: 0x0257, 0x6ff: 0x43c8,
-	// Block 0x1c, offset 0x700
-	0x700: 0x43e1, 0x701: 0x45c3, 0x702: 0x3f19, 0x703: 0x37de, 0x704: 0x3f21,
-	0x706: 0x497b, 0x707: 0x3f39, 0x708: 0x3742, 0x709: 0x4435, 0x70a: 0x374e, 0x70b: 0x443b,
-	0x70c: 0x375a, 0x70d: 0x45ca, 0x70e: 0x45d1, 0x70f: 0x45d8, 0x710: 0x37f6, 0x711: 0x37f0,
-	0x712: 0x3f41, 0x713: 0x4625, 0x716: 0x37fc, 0x717: 0x3f51,
-	0x718: 0x3772, 0x719: 0x376c, 0x71a: 0x3760, 0x71b: 0x4441, 0x71d: 0x45df,
-	0x71e: 0x45e6, 0x71f: 0x45ed, 0x720: 0x382c, 0x721: 0x3826, 0x722: 0x3fa9, 0x723: 0x462d,
-	0x724: 0x380e, 0x725: 0x3814, 0x726: 0x3832, 0x727: 0x3fb9, 0x728: 0x37a2, 0x729: 0x379c,
-	0x72a: 0x3790, 0x72b: 0x444d, 0x72c: 0x378a, 0x72d: 0x45b5, 0x72e: 0x45bc, 0x72f: 0x0081,
-	0x732: 0x3ff1, 0x733: 0x3838, 0x734: 0x3ff9,
-	0x736: 0x49c9, 0x737: 0x4011, 0x738: 0x377e, 0x739: 0x4447, 0x73a: 0x37ae, 0x73b: 0x4459,
-	0x73c: 0x37ba, 0x73d: 0x439b, 0x73e: 0x43cd,
-	// Block 0x1d, offset 0x740
-	0x740: 0x1d08, 0x741: 0x1d0c, 0x742: 0x0047, 0x743: 0x1d84, 0x745: 0x1d18,
-	0x746: 0x1d1c, 0x747: 0x00ef, 0x749: 0x1d88, 0x74a: 0x008f, 0x74b: 0x0051,
-	0x74c: 0x0051, 0x74d: 0x0051, 0x74e: 0x0091, 0x74f: 0x00e0, 0x750: 0x0053, 0x751: 0x0053,
-	0x752: 0x0059, 0x753: 0x0099, 0x755: 0x005d, 0x756: 0x1abd,
-	0x759: 0x0061, 0x75a: 0x0063, 0x75b: 0x0065, 0x75c: 0x0065, 0x75d: 0x0065,
-	0x760: 0x1acf, 0x761: 0x1cf8, 0x762: 0x1ad8,
-	0x764: 0x0075, 0x766: 0x023c, 0x768: 0x0075,
-	0x76a: 0x0057, 0x76b: 0x4413, 0x76c: 0x0045, 0x76d: 0x0047, 0x76f: 0x008b,
-	0x770: 0x004b, 0x771: 0x004d, 0x773: 0x005b, 0x774: 0x009f, 0x775: 0x0308,
-	0x776: 0x030b, 0x777: 0x030e, 0x778: 0x0311, 0x779: 0x0093, 0x77b: 0x1cc8,
-	0x77c: 0x026c, 0x77d: 0x0245, 0x77e: 0x01fd, 0x77f: 0x0224,
-	// Block 0x1e, offset 0x780
-	0x780: 0x055a, 0x785: 0x0049,
-	0x786: 0x0089, 0x787: 0x008b, 0x788: 0x0093, 0x789: 0x0095,
-	0x790: 0x235e, 0x791: 0x236a,
-	0x792: 0x241e, 0x793: 0x2346, 0x794: 0x23ca, 0x795: 0x2352, 0x796: 0x23d0, 0x797: 0x23e8,
-	0x798: 0x23f4, 0x799: 0x2358, 0x79a: 0x23fa, 0x79b: 0x2364, 0x79c: 0x23ee, 0x79d: 0x2400,
-	0x79e: 0x2406, 0x79f: 0x1dec, 0x7a0: 0x0053, 0x7a1: 0x1a87, 0x7a2: 0x1cd4, 0x7a3: 0x1a90,
-	0x7a4: 0x006d, 0x7a5: 0x1adb, 0x7a6: 0x1d00, 0x7a7: 0x1e78, 0x7a8: 0x1a93, 0x7a9: 0x0071,
-	0x7aa: 0x1ae7, 0x7ab: 0x1d04, 0x7ac: 0x0059, 0x7ad: 0x0047, 0x7ae: 0x0049, 0x7af: 0x005b,
-	0x7b0: 0x0093, 0x7b1: 0x1b14, 0x7b2: 0x1d48, 0x7b3: 0x1b1d, 0x7b4: 0x00ad, 0x7b5: 0x1b92,
-	0x7b6: 0x1d7c, 0x7b7: 0x1e8c, 0x7b8: 0x1b20, 0x7b9: 0x00b1, 0x7ba: 0x1b95, 0x7bb: 0x1d80,
-	0x7bc: 0x0099, 0x7bd: 0x0087, 0x7be: 0x0089, 0x7bf: 0x009b,
-	// Block 0x1f, offset 0x7c0
-	0x7c1: 0x3d47, 0x7c3: 0xa000, 0x7c4: 0x3d4e, 0x7c5: 0xa000,
-	0x7c7: 0x3d55, 0x7c8: 0xa000, 0x7c9: 0x3d5c,
-	0x7cd: 0xa000,
-	0x7e0: 0x30a6, 0x7e1: 0xa000, 0x7e2: 0x3d6a,
-	0x7e4: 0xa000, 0x7e5: 0xa000,
-	0x7ed: 0x3d63, 0x7ee: 0x30a1, 0x7ef: 0x30ab,
-	0x7f0: 0x3d71, 0x7f1: 0x3d78, 0x7f2: 0xa000, 0x7f3: 0xa000, 0x7f4: 0x3d7f, 0x7f5: 0x3d86,
-	0x7f6: 0xa000, 0x7f7: 0xa000, 0x7f8: 0x3d8d, 0x7f9: 0x3d94, 0x7fa: 0xa000, 0x7fb: 0xa000,
-	0x7fc: 0xa000, 0x7fd: 0xa000,
-	// Block 0x20, offset 0x800
-	0x800: 0x3d9b, 0x801: 0x3da2, 0x802: 0xa000, 0x803: 0xa000, 0x804: 0x3db7, 0x805: 0x3dbe,
-	0x806: 0xa000, 0x807: 0xa000, 0x808: 0x3dc5, 0x809: 0x3dcc,
-	0x811: 0xa000,
-	0x812: 0xa000,
-	0x822: 0xa000,
-	0x828: 0xa000, 0x829: 0xa000,
-	0x82b: 0xa000, 0x82c: 0x3de1, 0x82d: 0x3de8, 0x82e: 0x3def, 0x82f: 0x3df6,
-	0x832: 0xa000, 0x833: 0xa000, 0x834: 0xa000, 0x835: 0xa000,
-	// Block 0x21, offset 0x840
-	0x860: 0x0023, 0x861: 0x0025, 0x862: 0x0027, 0x863: 0x0029,
-	0x864: 0x002b, 0x865: 0x002d, 0x866: 0x002f, 0x867: 0x0031, 0x868: 0x0033, 0x869: 0x19af,
-	0x86a: 0x19b2, 0x86b: 0x19b5, 0x86c: 0x19b8, 0x86d: 0x19bb, 0x86e: 0x19be, 0x86f: 0x19c1,
-	0x870: 0x19c4, 0x871: 0x19c7, 0x872: 0x19ca, 0x873: 0x19d3, 0x874: 0x1b98, 0x875: 0x1b9c,
-	0x876: 0x1ba0, 0x877: 0x1ba4, 0x878: 0x1ba8, 0x879: 0x1bac, 0x87a: 0x1bb0, 0x87b: 0x1bb4,
-	0x87c: 0x1bb8, 0x87d: 0x1db0, 0x87e: 0x1db5, 0x87f: 0x1dba,
-	// Block 0x22, offset 0x880
-	0x880: 0x1dbf, 0x881: 0x1dc4, 0x882: 0x1dc9, 0x883: 0x1dce, 0x884: 0x1dd3, 0x885: 0x1dd8,
-	0x886: 0x1ddd, 0x887: 0x1de2, 0x888: 0x19ac, 0x889: 0x19d0, 0x88a: 0x19f4, 0x88b: 0x1a18,
-	0x88c: 0x1a3c, 0x88d: 0x1a45, 0x88e: 0x1a4b, 0x88f: 0x1a51, 0x890: 0x1a57, 0x891: 0x1c90,
-	0x892: 0x1c94, 0x893: 0x1c98, 0x894: 0x1c9c, 0x895: 0x1ca0, 0x896: 0x1ca4, 0x897: 0x1ca8,
-	0x898: 0x1cac, 0x899: 0x1cb0, 0x89a: 0x1cb4, 0x89b: 0x1cb8, 0x89c: 0x1c24, 0x89d: 0x1c28,
-	0x89e: 0x1c2c, 0x89f: 0x1c30, 0x8a0: 0x1c34, 0x8a1: 0x1c38, 0x8a2: 0x1c3c, 0x8a3: 0x1c40,
-	0x8a4: 0x1c44, 0x8a5: 0x1c48, 0x8a6: 0x1c4c, 0x8a7: 0x1c50, 0x8a8: 0x1c54, 0x8a9: 0x1c58,
-	0x8aa: 0x1c5c, 0x8ab: 0x1c60, 0x8ac: 0x1c64, 0x8ad: 0x1c68, 0x8ae: 0x1c6c, 0x8af: 0x1c70,
-	0x8b0: 0x1c74, 0x8b1: 0x1c78, 0x8b2: 0x1c7c, 0x8b3: 0x1c80, 0x8b4: 0x1c84, 0x8b5: 0x1c88,
-	0x8b6: 0x0043, 0x8b7: 0x0045, 0x8b8: 0x0047, 0x8b9: 0x0049, 0x8ba: 0x004b, 0x8bb: 0x004d,
-	0x8bc: 0x004f, 0x8bd: 0x0051, 0x8be: 0x0053, 0x8bf: 0x0055,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x07ba, 0x8c1: 0x07de, 0x8c2: 0x07ea, 0x8c3: 0x07fa, 0x8c4: 0x0802, 0x8c5: 0x080e,
-	0x8c6: 0x0816, 0x8c7: 0x081e, 0x8c8: 0x082a, 0x8c9: 0x087e, 0x8ca: 0x0896, 0x8cb: 0x08a6,
-	0x8cc: 0x08b6, 0x8cd: 0x08c6, 0x8ce: 0x08d6, 0x8cf: 0x08f6, 0x8d0: 0x08fa, 0x8d1: 0x08fe,
-	0x8d2: 0x0932, 0x8d3: 0x095a, 0x8d4: 0x096a, 0x8d5: 0x0972, 0x8d6: 0x0976, 0x8d7: 0x0982,
-	0x8d8: 0x099e, 0x8d9: 0x09a2, 0x8da: 0x09ba, 0x8db: 0x09be, 0x8dc: 0x09c6, 0x8dd: 0x09d6,
-	0x8de: 0x0a72, 0x8df: 0x0a86, 0x8e0: 0x0ac6, 0x8e1: 0x0ada, 0x8e2: 0x0ae2, 0x8e3: 0x0ae6,
-	0x8e4: 0x0af6, 0x8e5: 0x0b12, 0x8e6: 0x0b3e, 0x8e7: 0x0b4a, 0x8e8: 0x0b6a, 0x8e9: 0x0b76,
-	0x8ea: 0x0b7a, 0x8eb: 0x0b7e, 0x8ec: 0x0b96, 0x8ed: 0x0b9a, 0x8ee: 0x0bc6, 0x8ef: 0x0bd2,
-	0x8f0: 0x0bda, 0x8f1: 0x0be2, 0x8f2: 0x0bf2, 0x8f3: 0x0bfa, 0x8f4: 0x0c02, 0x8f5: 0x0c2e,
-	0x8f6: 0x0c32, 0x8f7: 0x0c3a, 0x8f8: 0x0c3e, 0x8f9: 0x0c46, 0x8fa: 0x0c4e, 0x8fb: 0x0c5e,
-	0x8fc: 0x0c7a, 0x8fd: 0x0cf2, 0x8fe: 0x0d06, 0x8ff: 0x0d0a,
-	// Block 0x24, offset 0x900
-	0x900: 0x0d8a, 0x901: 0x0d8e, 0x902: 0x0da2, 0x903: 0x0da6, 0x904: 0x0dae, 0x905: 0x0db6,
-	0x906: 0x0dbe, 0x907: 0x0dca, 0x908: 0x0df2, 0x909: 0x0e02, 0x90a: 0x0e16, 0x90b: 0x0e86,
-	0x90c: 0x0e92, 0x90d: 0x0ea2, 0x90e: 0x0eae, 0x90f: 0x0eba, 0x910: 0x0ec2, 0x911: 0x0ec6,
-	0x912: 0x0eca, 0x913: 0x0ece, 0x914: 0x0ed2, 0x915: 0x0f8a, 0x916: 0x0fd2, 0x917: 0x0fde,
-	0x918: 0x0fe2, 0x919: 0x0fe6, 0x91a: 0x0fea, 0x91b: 0x0ff2, 0x91c: 0x0ff6, 0x91d: 0x100a,
-	0x91e: 0x1026, 0x91f: 0x102e, 0x920: 0x106e, 0x921: 0x1072, 0x922: 0x107a, 0x923: 0x107e,
-	0x924: 0x1086, 0x925: 0x108a, 0x926: 0x10ae, 0x927: 0x10b2, 0x928: 0x10ce, 0x929: 0x10d2,
-	0x92a: 0x10d6, 0x92b: 0x10da, 0x92c: 0x10ee, 0x92d: 0x1112, 0x92e: 0x1116, 0x92f: 0x111a,
-	0x930: 0x113e, 0x931: 0x117e, 0x932: 0x1182, 0x933: 0x11a2, 0x934: 0x11b2, 0x935: 0x11ba,
-	0x936: 0x11da, 0x937: 0x11fe, 0x938: 0x1242, 0x939: 0x124a, 0x93a: 0x125e, 0x93b: 0x126a,
-	0x93c: 0x1272, 0x93d: 0x127a, 0x93e: 0x127e, 0x93f: 0x1282,
-	// Block 0x25, offset 0x940
-	0x940: 0x129a, 0x941: 0x129e, 0x942: 0x12ba, 0x943: 0x12c2, 0x944: 0x12ca, 0x945: 0x12ce,
-	0x946: 0x12da, 0x947: 0x12e2, 0x948: 0x12e6, 0x949: 0x12ea, 0x94a: 0x12f2, 0x94b: 0x12f6,
-	0x94c: 0x1396, 0x94d: 0x13aa, 0x94e: 0x13de, 0x94f: 0x13e2, 0x950: 0x13ea, 0x951: 0x1416,
-	0x952: 0x141e, 0x953: 0x1426, 0x954: 0x142e, 0x955: 0x146a, 0x956: 0x146e, 0x957: 0x1476,
-	0x958: 0x147a, 0x959: 0x147e, 0x95a: 0x14aa, 0x95b: 0x14ae, 0x95c: 0x14b6, 0x95d: 0x14ca,
-	0x95e: 0x14ce, 0x95f: 0x14ea, 0x960: 0x14f2, 0x961: 0x14f6, 0x962: 0x151a, 0x963: 0x153a,
-	0x964: 0x154e, 0x965: 0x1552, 0x966: 0x155a, 0x967: 0x1586, 0x968: 0x158a, 0x969: 0x159a,
-	0x96a: 0x15be, 0x96b: 0x15ca, 0x96c: 0x15da, 0x96d: 0x15f2, 0x96e: 0x15fa, 0x96f: 0x15fe,
-	0x970: 0x1602, 0x971: 0x1606, 0x972: 0x1612, 0x973: 0x1616, 0x974: 0x161e, 0x975: 0x163a,
-	0x976: 0x163e, 0x977: 0x1642, 0x978: 0x165a, 0x979: 0x165e, 0x97a: 0x1666, 0x97b: 0x167a,
-	0x97c: 0x167e, 0x97d: 0x1682, 0x97e: 0x168a, 0x97f: 0x168e,
-	// Block 0x26, offset 0x980
-	0x986: 0xa000, 0x98b: 0xa000,
-	0x98c: 0x4049, 0x98d: 0xa000, 0x98e: 0x4051, 0x98f: 0xa000, 0x990: 0x4059, 0x991: 0xa000,
-	0x992: 0x4061, 0x993: 0xa000, 0x994: 0x4069, 0x995: 0xa000, 0x996: 0x4071, 0x997: 0xa000,
-	0x998: 0x4079, 0x999: 0xa000, 0x99a: 0x4081, 0x99b: 0xa000, 0x99c: 0x4089, 0x99d: 0xa000,
-	0x99e: 0x4091, 0x99f: 0xa000, 0x9a0: 0x4099, 0x9a1: 0xa000, 0x9a2: 0x40a1,
-	0x9a4: 0xa000, 0x9a5: 0x40a9, 0x9a6: 0xa000, 0x9a7: 0x40b1, 0x9a8: 0xa000, 0x9a9: 0x40b9,
-	0x9af: 0xa000,
-	0x9b0: 0x40c1, 0x9b1: 0x40c9, 0x9b2: 0xa000, 0x9b3: 0x40d1, 0x9b4: 0x40d9, 0x9b5: 0xa000,
-	0x9b6: 0x40e1, 0x9b7: 0x40e9, 0x9b8: 0xa000, 0x9b9: 0x40f1, 0x9ba: 0x40f9, 0x9bb: 0xa000,
-	0x9bc: 0x4101, 0x9bd: 0x4109,
-	// Block 0x27, offset 0x9c0
-	0x9d4: 0x4041,
-	0x9d9: 0x9904, 0x9da: 0x9904, 0x9db: 0x441d, 0x9dc: 0x4423, 0x9dd: 0xa000,
-	0x9de: 0x4111, 0x9df: 0x27e4,
-	0x9e6: 0xa000,
-	0x9eb: 0xa000, 0x9ec: 0x4121, 0x9ed: 0xa000, 0x9ee: 0x4129, 0x9ef: 0xa000,
-	0x9f0: 0x4131, 0x9f1: 0xa000, 0x9f2: 0x4139, 0x9f3: 0xa000, 0x9f4: 0x4141, 0x9f5: 0xa000,
-	0x9f6: 0x4149, 0x9f7: 0xa000, 0x9f8: 0x4151, 0x9f9: 0xa000, 0x9fa: 0x4159, 0x9fb: 0xa000,
-	0x9fc: 0x4161, 0x9fd: 0xa000, 0x9fe: 0x4169, 0x9ff: 0xa000,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x4171, 0xa01: 0xa000, 0xa02: 0x4179, 0xa04: 0xa000, 0xa05: 0x4181,
-	0xa06: 0xa000, 0xa07: 0x4189, 0xa08: 0xa000, 0xa09: 0x4191,
-	0xa0f: 0xa000, 0xa10: 0x4199, 0xa11: 0x41a1,
-	0xa12: 0xa000, 0xa13: 0x41a9, 0xa14: 0x41b1, 0xa15: 0xa000, 0xa16: 0x41b9, 0xa17: 0x41c1,
-	0xa18: 0xa000, 0xa19: 0x41c9, 0xa1a: 0x41d1, 0xa1b: 0xa000, 0xa1c: 0x41d9, 0xa1d: 0x41e1,
-	0xa2f: 0xa000,
-	0xa30: 0xa000, 0xa31: 0xa000, 0xa32: 0xa000, 0xa34: 0x4119,
-	0xa37: 0x41e9, 0xa38: 0x41f1, 0xa39: 0x41f9, 0xa3a: 0x4201,
-	0xa3d: 0xa000, 0xa3e: 0x4209, 0xa3f: 0x27f9,
-	// Block 0x29, offset 0xa40
-	0xa40: 0x045a, 0xa41: 0x041e, 0xa42: 0x0422, 0xa43: 0x0426, 0xa44: 0x046e, 0xa45: 0x042a,
-	0xa46: 0x042e, 0xa47: 0x0432, 0xa48: 0x0436, 0xa49: 0x043a, 0xa4a: 0x043e, 0xa4b: 0x0442,
-	0xa4c: 0x0446, 0xa4d: 0x044a, 0xa4e: 0x044e, 0xa4f: 0x4afe, 0xa50: 0x4b04, 0xa51: 0x4b0a,
-	0xa52: 0x4b10, 0xa53: 0x4b16, 0xa54: 0x4b1c, 0xa55: 0x4b22, 0xa56: 0x4b28, 0xa57: 0x4b2e,
-	0xa58: 0x4b34, 0xa59: 0x4b3a, 0xa5a: 0x4b40, 0xa5b: 0x4b46, 0xa5c: 0x4b4c, 0xa5d: 0x4b52,
-	0xa5e: 0x4b58, 0xa5f: 0x4b5e, 0xa60: 0x4b64, 0xa61: 0x4b6a, 0xa62: 0x4b70, 0xa63: 0x4b76,
-	0xa64: 0x04b6, 0xa65: 0x0452, 0xa66: 0x0456, 0xa67: 0x04da, 0xa68: 0x04de, 0xa69: 0x04e2,
-	0xa6a: 0x04e6, 0xa6b: 0x04ea, 0xa6c: 0x04ee, 0xa6d: 0x04f2, 0xa6e: 0x045e, 0xa6f: 0x04f6,
-	0xa70: 0x04fa, 0xa71: 0x0462, 0xa72: 0x0466, 0xa73: 0x046a, 0xa74: 0x0472, 0xa75: 0x0476,
-	0xa76: 0x047a, 0xa77: 0x047e, 0xa78: 0x0482, 0xa79: 0x0486, 0xa7a: 0x048a, 0xa7b: 0x048e,
-	0xa7c: 0x0492, 0xa7d: 0x0496, 0xa7e: 0x049a, 0xa7f: 0x049e,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x04a2, 0xa81: 0x04a6, 0xa82: 0x04fe, 0xa83: 0x0502, 0xa84: 0x04aa, 0xa85: 0x04ae,
-	0xa86: 0x04b2, 0xa87: 0x04ba, 0xa88: 0x04be, 0xa89: 0x04c2, 0xa8a: 0x04c6, 0xa8b: 0x04ca,
-	0xa8c: 0x04ce, 0xa8d: 0x04d2, 0xa8e: 0x04d6,
-	0xa92: 0x07ba, 0xa93: 0x0816, 0xa94: 0x07c6, 0xa95: 0x0a76, 0xa96: 0x07ca, 0xa97: 0x07e2,
-	0xa98: 0x07ce, 0xa99: 0x108e, 0xa9a: 0x0802, 0xa9b: 0x07d6, 0xa9c: 0x07be, 0xa9d: 0x0afa,
-	0xa9e: 0x0a8a, 0xa9f: 0x082a,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0x2184, 0xac1: 0x218a, 0xac2: 0x2190, 0xac3: 0x2196, 0xac4: 0x219c, 0xac5: 0x21a2,
-	0xac6: 0x21a8, 0xac7: 0x21ae, 0xac8: 0x21b4, 0xac9: 0x21ba, 0xaca: 0x21c0, 0xacb: 0x21c6,
-	0xacc: 0x21cc, 0xacd: 0x21d2, 0xace: 0x285d, 0xacf: 0x2866, 0xad0: 0x286f, 0xad1: 0x2878,
-	0xad2: 0x2881, 0xad3: 0x288a, 0xad4: 0x2893, 0xad5: 0x289c, 0xad6: 0x28a5, 0xad7: 0x28b7,
-	0xad8: 0x28c0, 0xad9: 0x28c9, 0xada: 0x28d2, 0xadb: 0x28db, 0xadc: 0x28ae, 0xadd: 0x2ce3,
-	0xade: 0x2c24, 0xae0: 0x21d8, 0xae1: 0x21f0, 0xae2: 0x21e4, 0xae3: 0x2238,
-	0xae4: 0x21f6, 0xae5: 0x2214, 0xae6: 0x21de, 0xae7: 0x220e, 0xae8: 0x21ea, 0xae9: 0x2220,
-	0xaea: 0x2250, 0xaeb: 0x226e, 0xaec: 0x2268, 0xaed: 0x225c, 0xaee: 0x22aa, 0xaef: 0x223e,
-	0xaf0: 0x224a, 0xaf1: 0x2262, 0xaf2: 0x2256, 0xaf3: 0x2280, 0xaf4: 0x222c, 0xaf5: 0x2274,
-	0xaf6: 0x229e, 0xaf7: 0x2286, 0xaf8: 0x221a, 0xaf9: 0x21fc, 0xafa: 0x2232, 0xafb: 0x2244,
-	0xafc: 0x227a, 0xafd: 0x2202, 0xafe: 0x22a4, 0xaff: 0x2226,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0x228c, 0xb01: 0x2208, 0xb02: 0x2292, 0xb03: 0x2298, 0xb04: 0x0a2a, 0xb05: 0x0bfe,
-	0xb06: 0x0da2, 0xb07: 0x11c2,
-	0xb10: 0x1cf4, 0xb11: 0x19d6,
-	0xb12: 0x19d9, 0xb13: 0x19dc, 0xb14: 0x19df, 0xb15: 0x19e2, 0xb16: 0x19e5, 0xb17: 0x19e8,
-	0xb18: 0x19eb, 0xb19: 0x19ee, 0xb1a: 0x19f7, 0xb1b: 0x19fa, 0xb1c: 0x19fd, 0xb1d: 0x1a00,
-	0xb1e: 0x1a03, 0xb1f: 0x1a06, 0xb20: 0x0406, 0xb21: 0x040e, 0xb22: 0x0412, 0xb23: 0x041a,
-	0xb24: 0x041e, 0xb25: 0x0422, 0xb26: 0x042a, 0xb27: 0x0432, 0xb28: 0x0436, 0xb29: 0x043e,
-	0xb2a: 0x0442, 0xb2b: 0x0446, 0xb2c: 0x044a, 0xb2d: 0x044e, 0xb2e: 0x2f59, 0xb2f: 0x2f61,
-	0xb30: 0x2f69, 0xb31: 0x2f71, 0xb32: 0x2f79, 0xb33: 0x2f81, 0xb34: 0x2f89, 0xb35: 0x2f91,
-	0xb36: 0x2fa1, 0xb37: 0x2fa9, 0xb38: 0x2fb1, 0xb39: 0x2fb9, 0xb3a: 0x2fc1, 0xb3b: 0x2fc9,
-	0xb3c: 0x3014, 0xb3d: 0x2fdc, 0xb3e: 0x2f99,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x07ba, 0xb41: 0x0816, 0xb42: 0x07c6, 0xb43: 0x0a76, 0xb44: 0x081a, 0xb45: 0x08aa,
-	0xb46: 0x07c2, 0xb47: 0x08a6, 0xb48: 0x0806, 0xb49: 0x0982, 0xb4a: 0x0e02, 0xb4b: 0x0f8a,
-	0xb4c: 0x0ed2, 0xb4d: 0x0e16, 0xb4e: 0x155a, 0xb4f: 0x0a86, 0xb50: 0x0dca, 0xb51: 0x0e46,
-	0xb52: 0x0e06, 0xb53: 0x1146, 0xb54: 0x09f6, 0xb55: 0x0ffe, 0xb56: 0x1482, 0xb57: 0x115a,
-	0xb58: 0x093e, 0xb59: 0x118a, 0xb5a: 0x1096, 0xb5b: 0x0b12, 0xb5c: 0x150a, 0xb5d: 0x087a,
-	0xb5e: 0x09a6, 0xb5f: 0x0ef2, 0xb60: 0x1622, 0xb61: 0x083e, 0xb62: 0x08ce, 0xb63: 0x0e96,
-	0xb64: 0x07ca, 0xb65: 0x07e2, 0xb66: 0x07ce, 0xb67: 0x0bd6, 0xb68: 0x09ea, 0xb69: 0x097a,
-	0xb6a: 0x0b52, 0xb6b: 0x0b46, 0xb6c: 0x10e6, 0xb6d: 0x083a, 0xb6e: 0x1496, 0xb6f: 0x0996,
-	0xb70: 0x0aee, 0xb71: 0x1a09, 0xb72: 0x1a0c, 0xb73: 0x1a0f, 0xb74: 0x1a12, 0xb75: 0x1a1b,
-	0xb76: 0x1a1e, 0xb77: 0x1a21, 0xb78: 0x1a24, 0xb79: 0x1a27, 0xb7a: 0x1a2a, 0xb7b: 0x1a2d,
-	0xb7c: 0x1a30, 0xb7d: 0x1a33, 0xb7e: 0x1a36, 0xb7f: 0x1a3f,
-	// Block 0x2e, offset 0xb80
-	0xb80: 0x1df6, 0xb81: 0x1e05, 0xb82: 0x1e14, 0xb83: 0x1e23, 0xb84: 0x1e32, 0xb85: 0x1e41,
-	0xb86: 0x1e50, 0xb87: 0x1e5f, 0xb88: 0x1e6e, 0xb89: 0x22bc, 0xb8a: 0x22ce, 0xb8b: 0x22e0,
-	0xb8c: 0x1a81, 0xb8d: 0x1d34, 0xb8e: 0x1b02, 0xb8f: 0x1cd8, 0xb90: 0x05c6, 0xb91: 0x05ce,
-	0xb92: 0x05d6, 0xb93: 0x05de, 0xb94: 0x05e6, 0xb95: 0x05ea, 0xb96: 0x05ee, 0xb97: 0x05f2,
-	0xb98: 0x05f6, 0xb99: 0x05fa, 0xb9a: 0x05fe, 0xb9b: 0x0602, 0xb9c: 0x0606, 0xb9d: 0x060a,
-	0xb9e: 0x060e, 0xb9f: 0x0612, 0xba0: 0x0616, 0xba1: 0x061e, 0xba2: 0x0622, 0xba3: 0x0626,
-	0xba4: 0x062a, 0xba5: 0x062e, 0xba6: 0x0632, 0xba7: 0x0636, 0xba8: 0x063a, 0xba9: 0x063e,
-	0xbaa: 0x0642, 0xbab: 0x0646, 0xbac: 0x064a, 0xbad: 0x064e, 0xbae: 0x0652, 0xbaf: 0x0656,
-	0xbb0: 0x065a, 0xbb1: 0x065e, 0xbb2: 0x0662, 0xbb3: 0x066a, 0xbb4: 0x0672, 0xbb5: 0x067a,
-	0xbb6: 0x067e, 0xbb7: 0x0682, 0xbb8: 0x0686, 0xbb9: 0x068a, 0xbba: 0x068e, 0xbbb: 0x0692,
-	0xbbc: 0x0696, 0xbbd: 0x069a, 0xbbe: 0x069e, 0xbbf: 0x282a,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x2c43, 0xbc1: 0x2adf, 0xbc2: 0x2c53, 0xbc3: 0x29b7, 0xbc4: 0x3025, 0xbc5: 0x29c1,
-	0xbc6: 0x29cb, 0xbc7: 0x3069, 0xbc8: 0x2aec, 0xbc9: 0x29d5, 0xbca: 0x29df, 0xbcb: 0x29e9,
-	0xbcc: 0x2b13, 0xbcd: 0x2b20, 0xbce: 0x2af9, 0xbcf: 0x2b06, 0xbd0: 0x2fea, 0xbd1: 0x2b2d,
-	0xbd2: 0x2b3a, 0xbd3: 0x2cf5, 0xbd4: 0x27eb, 0xbd5: 0x2d08, 0xbd6: 0x2d1b, 0xbd7: 0x2c63,
-	0xbd8: 0x2b47, 0xbd9: 0x2d2e, 0xbda: 0x2d41, 0xbdb: 0x2b54, 0xbdc: 0x29f3, 0xbdd: 0x29fd,
-	0xbde: 0x2ff8, 0xbdf: 0x2b61, 0xbe0: 0x2c73, 0xbe1: 0x3036, 0xbe2: 0x2a07, 0xbe3: 0x2a11,
-	0xbe4: 0x2b6e, 0xbe5: 0x2a1b, 0xbe6: 0x2a25, 0xbe7: 0x2800, 0xbe8: 0x2807, 0xbe9: 0x2a2f,
-	0xbea: 0x2a39, 0xbeb: 0x2d54, 0xbec: 0x2b7b, 0xbed: 0x2c83, 0xbee: 0x2d67, 0xbef: 0x2b88,
-	0xbf0: 0x2a4d, 0xbf1: 0x2a43, 0xbf2: 0x307d, 0xbf3: 0x2b95, 0xbf4: 0x2d7a, 0xbf5: 0x2a57,
-	0xbf6: 0x2c93, 0xbf7: 0x2a61, 0xbf8: 0x2baf, 0xbf9: 0x2a6b, 0xbfa: 0x2bbc, 0xbfb: 0x3047,
-	0xbfc: 0x2ba2, 0xbfd: 0x2ca3, 0xbfe: 0x2bc9, 0xbff: 0x280e,
-	// Block 0x30, offset 0xc00
-	0xc00: 0x3058, 0xc01: 0x2a75, 0xc02: 0x2a7f, 0xc03: 0x2bd6, 0xc04: 0x2a89, 0xc05: 0x2a93,
-	0xc06: 0x2a9d, 0xc07: 0x2cb3, 0xc08: 0x2be3, 0xc09: 0x2815, 0xc0a: 0x2d8d, 0xc0b: 0x2fd1,
-	0xc0c: 0x2cc3, 0xc0d: 0x2bf0, 0xc0e: 0x3006, 0xc0f: 0x2aa7, 0xc10: 0x2ab1, 0xc11: 0x2bfd,
-	0xc12: 0x281c, 0xc13: 0x2c0a, 0xc14: 0x2cd3, 0xc15: 0x2823, 0xc16: 0x2da0, 0xc17: 0x2abb,
-	0xc18: 0x1de7, 0xc19: 0x1dfb, 0xc1a: 0x1e0a, 0xc1b: 0x1e19, 0xc1c: 0x1e28, 0xc1d: 0x1e37,
-	0xc1e: 0x1e46, 0xc1f: 0x1e55, 0xc20: 0x1e64, 0xc21: 0x1e73, 0xc22: 0x22c2, 0xc23: 0x22d4,
-	0xc24: 0x22e6, 0xc25: 0x22f2, 0xc26: 0x22fe, 0xc27: 0x230a, 0xc28: 0x2316, 0xc29: 0x2322,
-	0xc2a: 0x232e, 0xc2b: 0x233a, 0xc2c: 0x2376, 0xc2d: 0x2382, 0xc2e: 0x238e, 0xc2f: 0x239a,
-	0xc30: 0x23a6, 0xc31: 0x1d44, 0xc32: 0x1af6, 0xc33: 0x1a63, 0xc34: 0x1d14, 0xc35: 0x1b77,
-	0xc36: 0x1b86, 0xc37: 0x1afc, 0xc38: 0x1d2c, 0xc39: 0x1d30, 0xc3a: 0x1a8d, 0xc3b: 0x2838,
-	0xc3c: 0x2846, 0xc3d: 0x2831, 0xc3e: 0x283f, 0xc3f: 0x2c17,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x1b7a, 0xc41: 0x1b62, 0xc42: 0x1d90, 0xc43: 0x1b4a, 0xc44: 0x1b23, 0xc45: 0x1a96,
-	0xc46: 0x1aa5, 0xc47: 0x1a75, 0xc48: 0x1d20, 0xc49: 0x1e82, 0xc4a: 0x1b7d, 0xc4b: 0x1b65,
-	0xc4c: 0x1d94, 0xc4d: 0x1da0, 0xc4e: 0x1b56, 0xc4f: 0x1b2c, 0xc50: 0x1a84, 0xc51: 0x1d4c,
-	0xc52: 0x1ce0, 0xc53: 0x1ccc, 0xc54: 0x1cfc, 0xc55: 0x1da4, 0xc56: 0x1b59, 0xc57: 0x1af9,
-	0xc58: 0x1b2f, 0xc59: 0x1b0e, 0xc5a: 0x1b71, 0xc5b: 0x1da8, 0xc5c: 0x1b5c, 0xc5d: 0x1af0,
-	0xc5e: 0x1b32, 0xc5f: 0x1d6c, 0xc60: 0x1d24, 0xc61: 0x1b44, 0xc62: 0x1d54, 0xc63: 0x1d70,
-	0xc64: 0x1d28, 0xc65: 0x1b47, 0xc66: 0x1d58, 0xc67: 0x2418, 0xc68: 0x242c, 0xc69: 0x1ac6,
-	0xc6a: 0x1d50, 0xc6b: 0x1ce4, 0xc6c: 0x1cd0, 0xc6d: 0x1d78, 0xc6e: 0x284d, 0xc6f: 0x28e4,
-	0xc70: 0x1b89, 0xc71: 0x1b74, 0xc72: 0x1dac, 0xc73: 0x1b5f, 0xc74: 0x1b80, 0xc75: 0x1b68,
-	0xc76: 0x1d98, 0xc77: 0x1b4d, 0xc78: 0x1b26, 0xc79: 0x1ab1, 0xc7a: 0x1b83, 0xc7b: 0x1b6b,
-	0xc7c: 0x1d9c, 0xc7d: 0x1b50, 0xc7e: 0x1b29, 0xc7f: 0x1ab4,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x1d5c, 0xc81: 0x1ce8, 0xc82: 0x1e7d, 0xc83: 0x1a66, 0xc84: 0x1aea, 0xc85: 0x1aed,
-	0xc86: 0x2425, 0xc87: 0x1cc4, 0xc88: 0x1af3, 0xc89: 0x1a78, 0xc8a: 0x1b11, 0xc8b: 0x1a7b,
-	0xc8c: 0x1b1a, 0xc8d: 0x1a99, 0xc8e: 0x1a9c, 0xc8f: 0x1b35, 0xc90: 0x1b3b, 0xc91: 0x1b3e,
-	0xc92: 0x1d60, 0xc93: 0x1b41, 0xc94: 0x1b53, 0xc95: 0x1d68, 0xc96: 0x1d74, 0xc97: 0x1ac0,
-	0xc98: 0x1e87, 0xc99: 0x1cec, 0xc9a: 0x1ac3, 0xc9b: 0x1b8c, 0xc9c: 0x1ad5, 0xc9d: 0x1ae4,
-	0xc9e: 0x2412, 0xc9f: 0x240c, 0xca0: 0x1df1, 0xca1: 0x1e00, 0xca2: 0x1e0f, 0xca3: 0x1e1e,
-	0xca4: 0x1e2d, 0xca5: 0x1e3c, 0xca6: 0x1e4b, 0xca7: 0x1e5a, 0xca8: 0x1e69, 0xca9: 0x22b6,
-	0xcaa: 0x22c8, 0xcab: 0x22da, 0xcac: 0x22ec, 0xcad: 0x22f8, 0xcae: 0x2304, 0xcaf: 0x2310,
-	0xcb0: 0x231c, 0xcb1: 0x2328, 0xcb2: 0x2334, 0xcb3: 0x2370, 0xcb4: 0x237c, 0xcb5: 0x2388,
-	0xcb6: 0x2394, 0xcb7: 0x23a0, 0xcb8: 0x23ac, 0xcb9: 0x23b2, 0xcba: 0x23b8, 0xcbb: 0x23be,
-	0xcbc: 0x23c4, 0xcbd: 0x23d6, 0xcbe: 0x23dc, 0xcbf: 0x1d40,
-	// Block 0x33, offset 0xcc0
-	0xcc0: 0x1472, 0xcc1: 0x0df6, 0xcc2: 0x14ce, 0xcc3: 0x149a, 0xcc4: 0x0f52, 0xcc5: 0x07e6,
-	0xcc6: 0x09da, 0xcc7: 0x1726, 0xcc8: 0x1726, 0xcc9: 0x0b06, 0xcca: 0x155a, 0xccb: 0x0a3e,
-	0xccc: 0x0b02, 0xccd: 0x0cea, 0xcce: 0x10ca, 0xccf: 0x125a, 0xcd0: 0x1392, 0xcd1: 0x13ce,
-	0xcd2: 0x1402, 0xcd3: 0x1516, 0xcd4: 0x0e6e, 0xcd5: 0x0efa, 0xcd6: 0x0fa6, 0xcd7: 0x103e,
-	0xcd8: 0x135a, 0xcd9: 0x1542, 0xcda: 0x166e, 0xcdb: 0x080a, 0xcdc: 0x09ae, 0xcdd: 0x0e82,
-	0xcde: 0x0fca, 0xcdf: 0x138e, 0xce0: 0x16be, 0xce1: 0x0bae, 0xce2: 0x0f72, 0xce3: 0x137e,
-	0xce4: 0x1412, 0xce5: 0x0d1e, 0xce6: 0x12b6, 0xce7: 0x13da, 0xce8: 0x0c1a, 0xce9: 0x0e0a,
-	0xcea: 0x0f12, 0xceb: 0x1016, 0xcec: 0x1522, 0xced: 0x084a, 0xcee: 0x08e2, 0xcef: 0x094e,
-	0xcf0: 0x0d86, 0xcf1: 0x0e7a, 0xcf2: 0x0fc6, 0xcf3: 0x10ea, 0xcf4: 0x1272, 0xcf5: 0x1386,
-	0xcf6: 0x139e, 0xcf7: 0x14c2, 0xcf8: 0x15ea, 0xcf9: 0x169e, 0xcfa: 0x16ba, 0xcfb: 0x1126,
-	0xcfc: 0x1166, 0xcfd: 0x121e, 0xcfe: 0x133e, 0xcff: 0x1576,
-	// Block 0x34, offset 0xd00
-	0xd00: 0x16c6, 0xd01: 0x1446, 0xd02: 0x0ac2, 0xd03: 0x0c36, 0xd04: 0x11d6, 0xd05: 0x1296,
-	0xd06: 0x0ffa, 0xd07: 0x112e, 0xd08: 0x1492, 0xd09: 0x15e2, 0xd0a: 0x0abe, 0xd0b: 0x0b8a,
-	0xd0c: 0x0e72, 0xd0d: 0x0f26, 0xd0e: 0x0f5a, 0xd0f: 0x120e, 0xd10: 0x1236, 0xd11: 0x15a2,
-	0xd12: 0x094a, 0xd13: 0x12a2, 0xd14: 0x08ee, 0xd15: 0x08ea, 0xd16: 0x1192, 0xd17: 0x1222,
-	0xd18: 0x1356, 0xd19: 0x15aa, 0xd1a: 0x1462, 0xd1b: 0x0d22, 0xd1c: 0x0e6e, 0xd1d: 0x1452,
-	0xd1e: 0x07f2, 0xd1f: 0x0b5e, 0xd20: 0x0c8e, 0xd21: 0x102a, 0xd22: 0x10aa, 0xd23: 0x096e,
-	0xd24: 0x1136, 0xd25: 0x085a, 0xd26: 0x0c72, 0xd27: 0x07d2, 0xd28: 0x0ee6, 0xd29: 0x0d9e,
-	0xd2a: 0x120a, 0xd2b: 0x09c2, 0xd2c: 0x0aae, 0xd2d: 0x10f6, 0xd2e: 0x135e, 0xd2f: 0x1436,
-	0xd30: 0x0eb2, 0xd31: 0x14f2, 0xd32: 0x0ede, 0xd33: 0x0d32, 0xd34: 0x1316, 0xd35: 0x0d52,
-	0xd36: 0x10a6, 0xd37: 0x0826, 0xd38: 0x08a2, 0xd39: 0x08e6, 0xd3a: 0x0e4e, 0xd3b: 0x11f6,
-	0xd3c: 0x12ee, 0xd3d: 0x1442, 0xd3e: 0x1556, 0xd3f: 0x0956,
-	// Block 0x35, offset 0xd40
-	0xd40: 0x0a0a, 0xd41: 0x0b12, 0xd42: 0x0c2a, 0xd43: 0x0dba, 0xd44: 0x0f76, 0xd45: 0x113a,
-	0xd46: 0x1592, 0xd47: 0x1676, 0xd48: 0x16ca, 0xd49: 0x16e2, 0xd4a: 0x0932, 0xd4b: 0x0dee,
-	0xd4c: 0x0e9e, 0xd4d: 0x14e6, 0xd4e: 0x0bf6, 0xd4f: 0x0cd2, 0xd50: 0x0cee, 0xd51: 0x0d7e,
-	0xd52: 0x0f66, 0xd53: 0x0fb2, 0xd54: 0x1062, 0xd55: 0x1186, 0xd56: 0x122a, 0xd57: 0x128e,
-	0xd58: 0x14d6, 0xd59: 0x1366, 0xd5a: 0x14fe, 0xd5b: 0x157a, 0xd5c: 0x090a, 0xd5d: 0x0936,
-	0xd5e: 0x0a1e, 0xd5f: 0x0fa2, 0xd60: 0x13ee, 0xd61: 0x1436, 0xd62: 0x0c16, 0xd63: 0x0c86,
-	0xd64: 0x0d4a, 0xd65: 0x0eaa, 0xd66: 0x11d2, 0xd67: 0x101e, 0xd68: 0x0836, 0xd69: 0x0a7a,
-	0xd6a: 0x0b5e, 0xd6b: 0x0bc2, 0xd6c: 0x0c92, 0xd6d: 0x103a, 0xd6e: 0x1056, 0xd6f: 0x1266,
-	0xd70: 0x1286, 0xd71: 0x155e, 0xd72: 0x15de, 0xd73: 0x15ee, 0xd74: 0x162a, 0xd75: 0x084e,
-	0xd76: 0x117a, 0xd77: 0x154a, 0xd78: 0x15c6, 0xd79: 0x0caa, 0xd7a: 0x0812, 0xd7b: 0x0872,
-	0xd7c: 0x0b62, 0xd7d: 0x0b82, 0xd7e: 0x0daa, 0xd7f: 0x0e6e,
-	// Block 0x36, offset 0xd80
-	0xd80: 0x0fbe, 0xd81: 0x10c6, 0xd82: 0x1372, 0xd83: 0x1512, 0xd84: 0x171e, 0xd85: 0x0dde,
-	0xd86: 0x159e, 0xd87: 0x092e, 0xd88: 0x0e2a, 0xd89: 0x0e36, 0xd8a: 0x0f0a, 0xd8b: 0x0f42,
-	0xd8c: 0x1046, 0xd8d: 0x10a2, 0xd8e: 0x1122, 0xd8f: 0x1206, 0xd90: 0x1636, 0xd91: 0x08aa,
-	0xd92: 0x0cfe, 0xd93: 0x15ae, 0xd94: 0x0862, 0xd95: 0x0ba6, 0xd96: 0x0f2a, 0xd97: 0x14da,
-	0xd98: 0x0c62, 0xd99: 0x0cb2, 0xd9a: 0x0e3e, 0xd9b: 0x102a, 0xd9c: 0x15b6, 0xd9d: 0x0912,
-	0xd9e: 0x09fa, 0xd9f: 0x0b92, 0xda0: 0x0dce, 0xda1: 0x0e1a, 0xda2: 0x0e5a, 0xda3: 0x0eee,
-	0xda4: 0x1042, 0xda5: 0x10b6, 0xda6: 0x1252, 0xda7: 0x13f2, 0xda8: 0x13fe, 0xda9: 0x1552,
-	0xdaa: 0x15d2, 0xdab: 0x097e, 0xdac: 0x0f46, 0xdad: 0x09fe, 0xdae: 0x0fc2, 0xdaf: 0x1066,
-	0xdb0: 0x1382, 0xdb1: 0x15ba, 0xdb2: 0x16a6, 0xdb3: 0x16ce, 0xdb4: 0x0e32, 0xdb5: 0x0f22,
-	0xdb6: 0x12be, 0xdb7: 0x11b2, 0xdb8: 0x11be, 0xdb9: 0x11e2, 0xdba: 0x1012, 0xdbb: 0x0f9a,
-	0xdbc: 0x145e, 0xdbd: 0x082e, 0xdbe: 0x1326, 0xdbf: 0x0916,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x0906, 0xdc1: 0x0c06, 0xdc2: 0x0d26, 0xdc3: 0x11ee, 0xdc4: 0x0b4e, 0xdc5: 0x0efe,
-	0xdc6: 0x0dea, 0xdc7: 0x14e2, 0xdc8: 0x13e2, 0xdc9: 0x15a6, 0xdca: 0x141e, 0xdcb: 0x0c22,
-	0xdcc: 0x0882, 0xdcd: 0x0a56, 0xdd0: 0x0aaa,
-	0xdd2: 0x0dda, 0xdd5: 0x08f2, 0xdd6: 0x101a, 0xdd7: 0x10de,
-	0xdd8: 0x1142, 0xdd9: 0x115e, 0xdda: 0x1162, 0xddb: 0x1176, 0xddc: 0x15f6, 0xddd: 0x11e6,
-	0xdde: 0x126a, 0xde0: 0x138a, 0xde2: 0x144e,
-	0xde5: 0x1502, 0xde6: 0x152e,
-	0xdea: 0x164a, 0xdeb: 0x164e, 0xdec: 0x1652, 0xded: 0x16b6, 0xdee: 0x1526, 0xdef: 0x15c2,
-	0xdf0: 0x0852, 0xdf1: 0x0876, 0xdf2: 0x088a, 0xdf3: 0x0946, 0xdf4: 0x0952, 0xdf5: 0x0992,
-	0xdf6: 0x0a46, 0xdf7: 0x0a62, 0xdf8: 0x0a6a, 0xdf9: 0x0aa6, 0xdfa: 0x0ab2, 0xdfb: 0x0b8e,
-	0xdfc: 0x0b96, 0xdfd: 0x0c9e, 0xdfe: 0x0cc6, 0xdff: 0x0cce,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x0ce6, 0xe01: 0x0d92, 0xe02: 0x0dc2, 0xe03: 0x0de2, 0xe04: 0x0e52, 0xe05: 0x0f16,
-	0xe06: 0x0f32, 0xe07: 0x0f62, 0xe08: 0x0fb6, 0xe09: 0x0fd6, 0xe0a: 0x104a, 0xe0b: 0x112a,
-	0xe0c: 0x1146, 0xe0d: 0x114e, 0xe0e: 0x114a, 0xe0f: 0x1152, 0xe10: 0x1156, 0xe11: 0x115a,
-	0xe12: 0x116e, 0xe13: 0x1172, 0xe14: 0x1196, 0xe15: 0x11aa, 0xe16: 0x11c6, 0xe17: 0x122a,
-	0xe18: 0x1232, 0xe19: 0x123a, 0xe1a: 0x124e, 0xe1b: 0x1276, 0xe1c: 0x12c6, 0xe1d: 0x12fa,
-	0xe1e: 0x12fa, 0xe1f: 0x1362, 0xe20: 0x140a, 0xe21: 0x1422, 0xe22: 0x1456, 0xe23: 0x145a,
-	0xe24: 0x149e, 0xe25: 0x14a2, 0xe26: 0x14fa, 0xe27: 0x1502, 0xe28: 0x15d6, 0xe29: 0x161a,
-	0xe2a: 0x1632, 0xe2b: 0x0c96, 0xe2c: 0x184b, 0xe2d: 0x12de,
-	0xe30: 0x07da, 0xe31: 0x08de, 0xe32: 0x089e, 0xe33: 0x0846, 0xe34: 0x0886, 0xe35: 0x08b2,
-	0xe36: 0x0942, 0xe37: 0x095e, 0xe38: 0x0a46, 0xe39: 0x0a32, 0xe3a: 0x0a42, 0xe3b: 0x0a5e,
-	0xe3c: 0x0aaa, 0xe3d: 0x0aba, 0xe3e: 0x0afe, 0xe3f: 0x0b0a,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x0b26, 0xe41: 0x0b36, 0xe42: 0x0c1e, 0xe43: 0x0c26, 0xe44: 0x0c56, 0xe45: 0x0c76,
-	0xe46: 0x0ca6, 0xe47: 0x0cbe, 0xe48: 0x0cae, 0xe49: 0x0cce, 0xe4a: 0x0cc2, 0xe4b: 0x0ce6,
-	0xe4c: 0x0d02, 0xe4d: 0x0d5a, 0xe4e: 0x0d66, 0xe4f: 0x0d6e, 0xe50: 0x0d96, 0xe51: 0x0dda,
-	0xe52: 0x0e0a, 0xe53: 0x0e0e, 0xe54: 0x0e22, 0xe55: 0x0ea2, 0xe56: 0x0eb2, 0xe57: 0x0f0a,
-	0xe58: 0x0f56, 0xe59: 0x0f4e, 0xe5a: 0x0f62, 0xe5b: 0x0f7e, 0xe5c: 0x0fb6, 0xe5d: 0x110e,
-	0xe5e: 0x0fda, 0xe5f: 0x100e, 0xe60: 0x101a, 0xe61: 0x105a, 0xe62: 0x1076, 0xe63: 0x109a,
-	0xe64: 0x10be, 0xe65: 0x10c2, 0xe66: 0x10de, 0xe67: 0x10e2, 0xe68: 0x10f2, 0xe69: 0x1106,
-	0xe6a: 0x1102, 0xe6b: 0x1132, 0xe6c: 0x11ae, 0xe6d: 0x11c6, 0xe6e: 0x11de, 0xe6f: 0x1216,
-	0xe70: 0x122a, 0xe71: 0x1246, 0xe72: 0x1276, 0xe73: 0x132a, 0xe74: 0x1352, 0xe75: 0x13c6,
-	0xe76: 0x140e, 0xe77: 0x141a, 0xe78: 0x1422, 0xe79: 0x143a, 0xe7a: 0x144e, 0xe7b: 0x143e,
-	0xe7c: 0x1456, 0xe7d: 0x1452, 0xe7e: 0x144a, 0xe7f: 0x145a,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x1466, 0xe81: 0x14a2, 0xe82: 0x14de, 0xe83: 0x150e, 0xe84: 0x1546, 0xe85: 0x1566,
-	0xe86: 0x15b2, 0xe87: 0x15d6, 0xe88: 0x15f6, 0xe89: 0x160a, 0xe8a: 0x161a, 0xe8b: 0x1626,
-	0xe8c: 0x1632, 0xe8d: 0x1686, 0xe8e: 0x1726, 0xe8f: 0x17e2, 0xe90: 0x17dd, 0xe91: 0x180f,
-	0xe92: 0x0702, 0xe93: 0x072a, 0xe94: 0x072e, 0xe95: 0x1891, 0xe96: 0x18be, 0xe97: 0x1936,
-	0xe98: 0x1712, 0xe99: 0x1722,
-	// Block 0x3b, offset 0xec0
-	0xec0: 0x1b05, 0xec1: 0x1b08, 0xec2: 0x1b0b, 0xec3: 0x1d38, 0xec4: 0x1d3c, 0xec5: 0x1b8f,
-	0xec6: 0x1b8f,
-	0xed3: 0x1ea5, 0xed4: 0x1e96, 0xed5: 0x1e9b, 0xed6: 0x1eaa, 0xed7: 0x1ea0,
-	0xedd: 0x44d1,
-	0xede: 0x8116, 0xedf: 0x4543, 0xee0: 0x0320, 0xee1: 0x0308, 0xee2: 0x0311, 0xee3: 0x0314,
-	0xee4: 0x0317, 0xee5: 0x031a, 0xee6: 0x031d, 0xee7: 0x0323, 0xee8: 0x0326, 0xee9: 0x0017,
-	0xeea: 0x4531, 0xeeb: 0x4537, 0xeec: 0x4635, 0xeed: 0x463d, 0xeee: 0x4489, 0xeef: 0x448f,
-	0xef0: 0x4495, 0xef1: 0x449b, 0xef2: 0x44a7, 0xef3: 0x44ad, 0xef4: 0x44b3, 0xef5: 0x44bf,
-	0xef6: 0x44c5, 0xef8: 0x44cb, 0xef9: 0x44d7, 0xefa: 0x44dd, 0xefb: 0x44e3,
-	0xefc: 0x44ef, 0xefe: 0x44f5,
-	// Block 0x3c, offset 0xf00
-	0xf00: 0x44fb, 0xf01: 0x4501, 0xf03: 0x4507, 0xf04: 0x450d,
-	0xf06: 0x4519, 0xf07: 0x451f, 0xf08: 0x4525, 0xf09: 0x452b, 0xf0a: 0x453d, 0xf0b: 0x44b9,
-	0xf0c: 0x44a1, 0xf0d: 0x44e9, 0xf0e: 0x4513, 0xf0f: 0x1eaf, 0xf10: 0x038c, 0xf11: 0x038c,
-	0xf12: 0x0395, 0xf13: 0x0395, 0xf14: 0x0395, 0xf15: 0x0395, 0xf16: 0x0398, 0xf17: 0x0398,
-	0xf18: 0x0398, 0xf19: 0x0398, 0xf1a: 0x039e, 0xf1b: 0x039e, 0xf1c: 0x039e, 0xf1d: 0x039e,
-	0xf1e: 0x0392, 0xf1f: 0x0392, 0xf20: 0x0392, 0xf21: 0x0392, 0xf22: 0x039b, 0xf23: 0x039b,
-	0xf24: 0x039b, 0xf25: 0x039b, 0xf26: 0x038f, 0xf27: 0x038f, 0xf28: 0x038f, 0xf29: 0x038f,
-	0xf2a: 0x03c2, 0xf2b: 0x03c2, 0xf2c: 0x03c2, 0xf2d: 0x03c2, 0xf2e: 0x03c5, 0xf2f: 0x03c5,
-	0xf30: 0x03c5, 0xf31: 0x03c5, 0xf32: 0x03a4, 0xf33: 0x03a4, 0xf34: 0x03a4, 0xf35: 0x03a4,
-	0xf36: 0x03a1, 0xf37: 0x03a1, 0xf38: 0x03a1, 0xf39: 0x03a1, 0xf3a: 0x03a7, 0xf3b: 0x03a7,
-	0xf3c: 0x03a7, 0xf3d: 0x03a7, 0xf3e: 0x03aa, 0xf3f: 0x03aa,
-	// Block 0x3d, offset 0xf40
-	0xf40: 0x03aa, 0xf41: 0x03aa, 0xf42: 0x03b3, 0xf43: 0x03b3, 0xf44: 0x03b0, 0xf45: 0x03b0,
-	0xf46: 0x03b6, 0xf47: 0x03b6, 0xf48: 0x03ad, 0xf49: 0x03ad, 0xf4a: 0x03bc, 0xf4b: 0x03bc,
-	0xf4c: 0x03b9, 0xf4d: 0x03b9, 0xf4e: 0x03c8, 0xf4f: 0x03c8, 0xf50: 0x03c8, 0xf51: 0x03c8,
-	0xf52: 0x03ce, 0xf53: 0x03ce, 0xf54: 0x03ce, 0xf55: 0x03ce, 0xf56: 0x03d4, 0xf57: 0x03d4,
-	0xf58: 0x03d4, 0xf59: 0x03d4, 0xf5a: 0x03d1, 0xf5b: 0x03d1, 0xf5c: 0x03d1, 0xf5d: 0x03d1,
-	0xf5e: 0x03d7, 0xf5f: 0x03d7, 0xf60: 0x03da, 0xf61: 0x03da, 0xf62: 0x03da, 0xf63: 0x03da,
-	0xf64: 0x45af, 0xf65: 0x45af, 0xf66: 0x03e0, 0xf67: 0x03e0, 0xf68: 0x03e0, 0xf69: 0x03e0,
-	0xf6a: 0x03dd, 0xf6b: 0x03dd, 0xf6c: 0x03dd, 0xf6d: 0x03dd, 0xf6e: 0x03fb, 0xf6f: 0x03fb,
-	0xf70: 0x45a9, 0xf71: 0x45a9,
-	// Block 0x3e, offset 0xf80
-	0xf93: 0x03cb, 0xf94: 0x03cb, 0xf95: 0x03cb, 0xf96: 0x03cb, 0xf97: 0x03e9,
-	0xf98: 0x03e9, 0xf99: 0x03e6, 0xf9a: 0x03e6, 0xf9b: 0x03ec, 0xf9c: 0x03ec, 0xf9d: 0x217f,
-	0xf9e: 0x03f2, 0xf9f: 0x03f2, 0xfa0: 0x03e3, 0xfa1: 0x03e3, 0xfa2: 0x03ef, 0xfa3: 0x03ef,
-	0xfa4: 0x03f8, 0xfa5: 0x03f8, 0xfa6: 0x03f8, 0xfa7: 0x03f8, 0xfa8: 0x0380, 0xfa9: 0x0380,
-	0xfaa: 0x26da, 0xfab: 0x26da, 0xfac: 0x274a, 0xfad: 0x274a, 0xfae: 0x2719, 0xfaf: 0x2719,
-	0xfb0: 0x2735, 0xfb1: 0x2735, 0xfb2: 0x272e, 0xfb3: 0x272e, 0xfb4: 0x273c, 0xfb5: 0x273c,
-	0xfb6: 0x2743, 0xfb7: 0x2743, 0xfb8: 0x2743, 0xfb9: 0x2720, 0xfba: 0x2720, 0xfbb: 0x2720,
-	0xfbc: 0x03f5, 0xfbd: 0x03f5, 0xfbe: 0x03f5, 0xfbf: 0x03f5,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x26e1, 0xfc1: 0x26e8, 0xfc2: 0x2704, 0xfc3: 0x2720, 0xfc4: 0x2727, 0xfc5: 0x1eb9,
-	0xfc6: 0x1ebe, 0xfc7: 0x1ec3, 0xfc8: 0x1ed2, 0xfc9: 0x1ee1, 0xfca: 0x1ee6, 0xfcb: 0x1eeb,
-	0xfcc: 0x1ef0, 0xfcd: 0x1ef5, 0xfce: 0x1f04, 0xfcf: 0x1f13, 0xfd0: 0x1f18, 0xfd1: 0x1f1d,
-	0xfd2: 0x1f2c, 0xfd3: 0x1f3b, 0xfd4: 0x1f40, 0xfd5: 0x1f45, 0xfd6: 0x1f4a, 0xfd7: 0x1f59,
-	0xfd8: 0x1f5e, 0xfd9: 0x1f6d, 0xfda: 0x1f72, 0xfdb: 0x1f77, 0xfdc: 0x1f86, 0xfdd: 0x1f8b,
-	0xfde: 0x1f90, 0xfdf: 0x1f9a, 0xfe0: 0x1fd6, 0xfe1: 0x1fe5, 0xfe2: 0x1ff4, 0xfe3: 0x1ff9,
-	0xfe4: 0x1ffe, 0xfe5: 0x2008, 0xfe6: 0x2017, 0xfe7: 0x201c, 0xfe8: 0x202b, 0xfe9: 0x2030,
-	0xfea: 0x2035, 0xfeb: 0x2044, 0xfec: 0x2049, 0xfed: 0x2058, 0xfee: 0x205d, 0xfef: 0x2062,
-	0xff0: 0x2067, 0xff1: 0x206c, 0xff2: 0x2071, 0xff3: 0x2076, 0xff4: 0x207b, 0xff5: 0x2080,
-	0xff6: 0x2085, 0xff7: 0x208a, 0xff8: 0x208f, 0xff9: 0x2094, 0xffa: 0x2099, 0xffb: 0x209e,
-	0xffc: 0x20a3, 0xffd: 0x20a8, 0xffe: 0x20ad, 0xfff: 0x20b7,
-	// Block 0x40, offset 0x1000
-	0x1000: 0x20bc, 0x1001: 0x20c1, 0x1002: 0x20c6, 0x1003: 0x20d0, 0x1004: 0x20d5, 0x1005: 0x20df,
-	0x1006: 0x20e4, 0x1007: 0x20e9, 0x1008: 0x20ee, 0x1009: 0x20f3, 0x100a: 0x20f8, 0x100b: 0x20fd,
-	0x100c: 0x2102, 0x100d: 0x2107, 0x100e: 0x2116, 0x100f: 0x2125, 0x1010: 0x212a, 0x1011: 0x212f,
-	0x1012: 0x2134, 0x1013: 0x2139, 0x1014: 0x213e, 0x1015: 0x2148, 0x1016: 0x214d, 0x1017: 0x2152,
-	0x1018: 0x2161, 0x1019: 0x2170, 0x101a: 0x2175, 0x101b: 0x4561, 0x101c: 0x4567, 0x101d: 0x459d,
-	0x101e: 0x45f4, 0x101f: 0x45fb, 0x1020: 0x4602, 0x1021: 0x4609, 0x1022: 0x4610, 0x1023: 0x4617,
-	0x1024: 0x26f6, 0x1025: 0x26fd, 0x1026: 0x2704, 0x1027: 0x270b, 0x1028: 0x2720, 0x1029: 0x2727,
-	0x102a: 0x1ec8, 0x102b: 0x1ecd, 0x102c: 0x1ed2, 0x102d: 0x1ed7, 0x102e: 0x1ee1, 0x102f: 0x1ee6,
-	0x1030: 0x1efa, 0x1031: 0x1eff, 0x1032: 0x1f04, 0x1033: 0x1f09, 0x1034: 0x1f13, 0x1035: 0x1f18,
-	0x1036: 0x1f22, 0x1037: 0x1f27, 0x1038: 0x1f2c, 0x1039: 0x1f31, 0x103a: 0x1f3b, 0x103b: 0x1f40,
-	0x103c: 0x206c, 0x103d: 0x2071, 0x103e: 0x2080, 0x103f: 0x2085,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x208a, 0x1041: 0x209e, 0x1042: 0x20a3, 0x1043: 0x20a8, 0x1044: 0x20ad, 0x1045: 0x20c6,
-	0x1046: 0x20d0, 0x1047: 0x20d5, 0x1048: 0x20da, 0x1049: 0x20ee, 0x104a: 0x210c, 0x104b: 0x2111,
-	0x104c: 0x2116, 0x104d: 0x211b, 0x104e: 0x2125, 0x104f: 0x212a, 0x1050: 0x459d, 0x1051: 0x2157,
-	0x1052: 0x215c, 0x1053: 0x2161, 0x1054: 0x2166, 0x1055: 0x2170, 0x1056: 0x2175, 0x1057: 0x26e1,
-	0x1058: 0x26e8, 0x1059: 0x26ef, 0x105a: 0x2704, 0x105b: 0x2712, 0x105c: 0x1eb9, 0x105d: 0x1ebe,
-	0x105e: 0x1ec3, 0x105f: 0x1ed2, 0x1060: 0x1edc, 0x1061: 0x1eeb, 0x1062: 0x1ef0, 0x1063: 0x1ef5,
-	0x1064: 0x1f04, 0x1065: 0x1f0e, 0x1066: 0x1f2c, 0x1067: 0x1f45, 0x1068: 0x1f4a, 0x1069: 0x1f59,
-	0x106a: 0x1f5e, 0x106b: 0x1f6d, 0x106c: 0x1f77, 0x106d: 0x1f86, 0x106e: 0x1f8b, 0x106f: 0x1f90,
-	0x1070: 0x1f9a, 0x1071: 0x1fd6, 0x1072: 0x1fdb, 0x1073: 0x1fe5, 0x1074: 0x1ff4, 0x1075: 0x1ff9,
-	0x1076: 0x1ffe, 0x1077: 0x2008, 0x1078: 0x2017, 0x1079: 0x202b, 0x107a: 0x2030, 0x107b: 0x2035,
-	0x107c: 0x2044, 0x107d: 0x2049, 0x107e: 0x2058, 0x107f: 0x205d,
-	// Block 0x42, offset 0x1080
-	0x1080: 0x2062, 0x1081: 0x2067, 0x1082: 0x2076, 0x1083: 0x207b, 0x1084: 0x208f, 0x1085: 0x2094,
-	0x1086: 0x2099, 0x1087: 0x209e, 0x1088: 0x20a3, 0x1089: 0x20b7, 0x108a: 0x20bc, 0x108b: 0x20c1,
-	0x108c: 0x20c6, 0x108d: 0x20cb, 0x108e: 0x20df, 0x108f: 0x20e4, 0x1090: 0x20e9, 0x1091: 0x20ee,
-	0x1092: 0x20fd, 0x1093: 0x2102, 0x1094: 0x2107, 0x1095: 0x2116, 0x1096: 0x2120, 0x1097: 0x212f,
-	0x1098: 0x2134, 0x1099: 0x4591, 0x109a: 0x2148, 0x109b: 0x214d, 0x109c: 0x2152, 0x109d: 0x2161,
-	0x109e: 0x216b, 0x109f: 0x2704, 0x10a0: 0x2712, 0x10a1: 0x1ed2, 0x10a2: 0x1edc, 0x10a3: 0x1f04,
-	0x10a4: 0x1f0e, 0x10a5: 0x1f2c, 0x10a6: 0x1f36, 0x10a7: 0x1f9a, 0x10a8: 0x1f9f, 0x10a9: 0x1fc2,
-	0x10aa: 0x1fc7, 0x10ab: 0x209e, 0x10ac: 0x20a3, 0x10ad: 0x20c6, 0x10ae: 0x2116, 0x10af: 0x2120,
-	0x10b0: 0x2161, 0x10b1: 0x216b, 0x10b2: 0x4645, 0x10b3: 0x464d, 0x10b4: 0x4655, 0x10b5: 0x2021,
-	0x10b6: 0x2026, 0x10b7: 0x203a, 0x10b8: 0x203f, 0x10b9: 0x204e, 0x10ba: 0x2053, 0x10bb: 0x1fa4,
-	0x10bc: 0x1fa9, 0x10bd: 0x1fcc, 0x10be: 0x1fd1, 0x10bf: 0x1f63,
-	// Block 0x43, offset 0x10c0
-	0x10c0: 0x1f68, 0x10c1: 0x1f4f, 0x10c2: 0x1f54, 0x10c3: 0x1f7c, 0x10c4: 0x1f81, 0x10c5: 0x1fea,
-	0x10c6: 0x1fef, 0x10c7: 0x200d, 0x10c8: 0x2012, 0x10c9: 0x1fae, 0x10ca: 0x1fb3, 0x10cb: 0x1fb8,
-	0x10cc: 0x1fc2, 0x10cd: 0x1fbd, 0x10ce: 0x1f95, 0x10cf: 0x1fe0, 0x10d0: 0x2003, 0x10d1: 0x2021,
-	0x10d2: 0x2026, 0x10d3: 0x203a, 0x10d4: 0x203f, 0x10d5: 0x204e, 0x10d6: 0x2053, 0x10d7: 0x1fa4,
-	0x10d8: 0x1fa9, 0x10d9: 0x1fcc, 0x10da: 0x1fd1, 0x10db: 0x1f63, 0x10dc: 0x1f68, 0x10dd: 0x1f4f,
-	0x10de: 0x1f54, 0x10df: 0x1f7c, 0x10e0: 0x1f81, 0x10e1: 0x1fea, 0x10e2: 0x1fef, 0x10e3: 0x200d,
-	0x10e4: 0x2012, 0x10e5: 0x1fae, 0x10e6: 0x1fb3, 0x10e7: 0x1fb8, 0x10e8: 0x1fc2, 0x10e9: 0x1fbd,
-	0x10ea: 0x1f95, 0x10eb: 0x1fe0, 0x10ec: 0x2003, 0x10ed: 0x1fae, 0x10ee: 0x1fb3, 0x10ef: 0x1fb8,
-	0x10f0: 0x1fc2, 0x10f1: 0x1f9f, 0x10f2: 0x1fc7, 0x10f3: 0x201c, 0x10f4: 0x1f86, 0x10f5: 0x1f8b,
-	0x10f6: 0x1f90, 0x10f7: 0x1fae, 0x10f8: 0x1fb3, 0x10f9: 0x1fb8, 0x10fa: 0x201c, 0x10fb: 0x202b,
-	0x10fc: 0x4549, 0x10fd: 0x4549,
-	// Block 0x44, offset 0x1100
-	0x1110: 0x2441, 0x1111: 0x2456,
-	0x1112: 0x2456, 0x1113: 0x245d, 0x1114: 0x2464, 0x1115: 0x2479, 0x1116: 0x2480, 0x1117: 0x2487,
-	0x1118: 0x24aa, 0x1119: 0x24aa, 0x111a: 0x24cd, 0x111b: 0x24c6, 0x111c: 0x24e2, 0x111d: 0x24d4,
-	0x111e: 0x24db, 0x111f: 0x24fe, 0x1120: 0x24fe, 0x1121: 0x24f7, 0x1122: 0x2505, 0x1123: 0x2505,
-	0x1124: 0x252f, 0x1125: 0x252f, 0x1126: 0x254b, 0x1127: 0x2513, 0x1128: 0x2513, 0x1129: 0x250c,
-	0x112a: 0x2521, 0x112b: 0x2521, 0x112c: 0x2528, 0x112d: 0x2528, 0x112e: 0x2552, 0x112f: 0x2560,
-	0x1130: 0x2560, 0x1131: 0x2567, 0x1132: 0x2567, 0x1133: 0x256e, 0x1134: 0x2575, 0x1135: 0x257c,
-	0x1136: 0x2583, 0x1137: 0x2583, 0x1138: 0x258a, 0x1139: 0x2598, 0x113a: 0x25a6, 0x113b: 0x259f,
-	0x113c: 0x25ad, 0x113d: 0x25ad, 0x113e: 0x25c2, 0x113f: 0x25c9,
-	// Block 0x45, offset 0x1140
-	0x1140: 0x25fa, 0x1141: 0x2608, 0x1142: 0x2601, 0x1143: 0x25e5, 0x1144: 0x25e5, 0x1145: 0x260f,
-	0x1146: 0x260f, 0x1147: 0x2616, 0x1148: 0x2616, 0x1149: 0x2640, 0x114a: 0x2647, 0x114b: 0x264e,
-	0x114c: 0x2624, 0x114d: 0x2632, 0x114e: 0x2655, 0x114f: 0x265c,
-	0x1152: 0x262b, 0x1153: 0x26b0, 0x1154: 0x26b7, 0x1155: 0x268d, 0x1156: 0x2694, 0x1157: 0x2678,
-	0x1158: 0x2678, 0x1159: 0x267f, 0x115a: 0x26a9, 0x115b: 0x26a2, 0x115c: 0x26cc, 0x115d: 0x26cc,
-	0x115e: 0x243a, 0x115f: 0x244f, 0x1160: 0x2448, 0x1161: 0x2472, 0x1162: 0x246b, 0x1163: 0x2495,
-	0x1164: 0x248e, 0x1165: 0x24b8, 0x1166: 0x249c, 0x1167: 0x24b1, 0x1168: 0x24e9, 0x1169: 0x2536,
-	0x116a: 0x251a, 0x116b: 0x2559, 0x116c: 0x25f3, 0x116d: 0x261d, 0x116e: 0x26c5, 0x116f: 0x26be,
-	0x1170: 0x26d3, 0x1171: 0x266a, 0x1172: 0x25d0, 0x1173: 0x269b, 0x1174: 0x25c2, 0x1175: 0x25fa,
-	0x1176: 0x2591, 0x1177: 0x25de, 0x1178: 0x2671, 0x1179: 0x2663, 0x117a: 0x25ec, 0x117b: 0x25d7,
-	0x117c: 0x25ec, 0x117d: 0x2671, 0x117e: 0x24a3, 0x117f: 0x24bf,
-	// Block 0x46, offset 0x1180
-	0x1180: 0x2639, 0x1181: 0x25b4, 0x1182: 0x2433, 0x1183: 0x25d7, 0x1184: 0x257c, 0x1185: 0x254b,
-	0x1186: 0x24f0, 0x1187: 0x2686,
-	0x11b0: 0x2544, 0x11b1: 0x25bb, 0x11b2: 0x28f6, 0x11b3: 0x28ed, 0x11b4: 0x2923, 0x11b5: 0x2911,
-	0x11b6: 0x28ff, 0x11b7: 0x291a, 0x11b8: 0x292c, 0x11b9: 0x253d, 0x11ba: 0x2db3, 0x11bb: 0x2c33,
-	0x11bc: 0x2908,
-	// Block 0x47, offset 0x11c0
-	0x11d0: 0x0019, 0x11d1: 0x057e,
-	0x11d2: 0x0582, 0x11d3: 0x0035, 0x11d4: 0x0037, 0x11d5: 0x0003, 0x11d6: 0x003f, 0x11d7: 0x05ba,
-	0x11d8: 0x05be, 0x11d9: 0x1c8c,
-	0x11e0: 0x8133, 0x11e1: 0x8133, 0x11e2: 0x8133, 0x11e3: 0x8133,
-	0x11e4: 0x8133, 0x11e5: 0x8133, 0x11e6: 0x8133, 0x11e7: 0x812e, 0x11e8: 0x812e, 0x11e9: 0x812e,
-	0x11ea: 0x812e, 0x11eb: 0x812e, 0x11ec: 0x812e, 0x11ed: 0x812e, 0x11ee: 0x8133, 0x11ef: 0x8133,
-	0x11f0: 0x19a0, 0x11f1: 0x053a, 0x11f2: 0x0536, 0x11f3: 0x007f, 0x11f4: 0x007f, 0x11f5: 0x0011,
-	0x11f6: 0x0013, 0x11f7: 0x00b7, 0x11f8: 0x00bb, 0x11f9: 0x05b2, 0x11fa: 0x05b6, 0x11fb: 0x05a6,
-	0x11fc: 0x05aa, 0x11fd: 0x058e, 0x11fe: 0x0592, 0x11ff: 0x0586,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x058a, 0x1201: 0x0596, 0x1202: 0x059a, 0x1203: 0x059e, 0x1204: 0x05a2,
-	0x1207: 0x0077, 0x1208: 0x007b, 0x1209: 0x43aa, 0x120a: 0x43aa, 0x120b: 0x43aa,
-	0x120c: 0x43aa, 0x120d: 0x007f, 0x120e: 0x007f, 0x120f: 0x007f, 0x1210: 0x0019, 0x1211: 0x057e,
-	0x1212: 0x001d, 0x1214: 0x0037, 0x1215: 0x0035, 0x1216: 0x003f, 0x1217: 0x0003,
-	0x1218: 0x053a, 0x1219: 0x0011, 0x121a: 0x0013, 0x121b: 0x00b7, 0x121c: 0x00bb, 0x121d: 0x05b2,
-	0x121e: 0x05b6, 0x121f: 0x0007, 0x1220: 0x000d, 0x1221: 0x0015, 0x1222: 0x0017, 0x1223: 0x001b,
-	0x1224: 0x0039, 0x1225: 0x003d, 0x1226: 0x003b, 0x1228: 0x0079, 0x1229: 0x0009,
-	0x122a: 0x000b, 0x122b: 0x0041,
-	0x1230: 0x43eb, 0x1231: 0x456d, 0x1232: 0x43f0, 0x1234: 0x43f5,
-	0x1236: 0x43fa, 0x1237: 0x4573, 0x1238: 0x43ff, 0x1239: 0x4579, 0x123a: 0x4404, 0x123b: 0x457f,
-	0x123c: 0x4409, 0x123d: 0x4585, 0x123e: 0x440e, 0x123f: 0x458b,
-	// Block 0x49, offset 0x1240
-	0x1240: 0x0329, 0x1241: 0x454f, 0x1242: 0x454f, 0x1243: 0x4555, 0x1244: 0x4555, 0x1245: 0x4597,
-	0x1246: 0x4597, 0x1247: 0x455b, 0x1248: 0x455b, 0x1249: 0x45a3, 0x124a: 0x45a3, 0x124b: 0x45a3,
-	0x124c: 0x45a3, 0x124d: 0x032c, 0x124e: 0x032c, 0x124f: 0x032f, 0x1250: 0x032f, 0x1251: 0x032f,
-	0x1252: 0x032f, 0x1253: 0x0332, 0x1254: 0x0332, 0x1255: 0x0335, 0x1256: 0x0335, 0x1257: 0x0335,
-	0x1258: 0x0335, 0x1259: 0x0338, 0x125a: 0x0338, 0x125b: 0x0338, 0x125c: 0x0338, 0x125d: 0x033b,
-	0x125e: 0x033b, 0x125f: 0x033b, 0x1260: 0x033b, 0x1261: 0x033e, 0x1262: 0x033e, 0x1263: 0x033e,
-	0x1264: 0x033e, 0x1265: 0x0341, 0x1266: 0x0341, 0x1267: 0x0341, 0x1268: 0x0341, 0x1269: 0x0344,
-	0x126a: 0x0344, 0x126b: 0x0347, 0x126c: 0x0347, 0x126d: 0x034a, 0x126e: 0x034a, 0x126f: 0x034d,
-	0x1270: 0x034d, 0x1271: 0x0350, 0x1272: 0x0350, 0x1273: 0x0350, 0x1274: 0x0350, 0x1275: 0x0353,
-	0x1276: 0x0353, 0x1277: 0x0353, 0x1278: 0x0353, 0x1279: 0x0356, 0x127a: 0x0356, 0x127b: 0x0356,
-	0x127c: 0x0356, 0x127d: 0x0359, 0x127e: 0x0359, 0x127f: 0x0359,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x0359, 0x1281: 0x035c, 0x1282: 0x035c, 0x1283: 0x035c, 0x1284: 0x035c, 0x1285: 0x035f,
-	0x1286: 0x035f, 0x1287: 0x035f, 0x1288: 0x035f, 0x1289: 0x0362, 0x128a: 0x0362, 0x128b: 0x0362,
-	0x128c: 0x0362, 0x128d: 0x0365, 0x128e: 0x0365, 0x128f: 0x0365, 0x1290: 0x0365, 0x1291: 0x0368,
-	0x1292: 0x0368, 0x1293: 0x0368, 0x1294: 0x0368, 0x1295: 0x036b, 0x1296: 0x036b, 0x1297: 0x036b,
-	0x1298: 0x036b, 0x1299: 0x036e, 0x129a: 0x036e, 0x129b: 0x036e, 0x129c: 0x036e, 0x129d: 0x0371,
-	0x129e: 0x0371, 0x129f: 0x0371, 0x12a0: 0x0371, 0x12a1: 0x0374, 0x12a2: 0x0374, 0x12a3: 0x0374,
-	0x12a4: 0x0374, 0x12a5: 0x0377, 0x12a6: 0x0377, 0x12a7: 0x0377, 0x12a8: 0x0377, 0x12a9: 0x037a,
-	0x12aa: 0x037a, 0x12ab: 0x037a, 0x12ac: 0x037a, 0x12ad: 0x037d, 0x12ae: 0x037d, 0x12af: 0x0380,
-	0x12b0: 0x0380, 0x12b1: 0x0383, 0x12b2: 0x0383, 0x12b3: 0x0383, 0x12b4: 0x0383, 0x12b5: 0x2f41,
-	0x12b6: 0x2f41, 0x12b7: 0x2f49, 0x12b8: 0x2f49, 0x12b9: 0x2f51, 0x12ba: 0x2f51, 0x12bb: 0x20b2,
-	0x12bc: 0x20b2,
-	// Block 0x4b, offset 0x12c0
-	0x12c0: 0x0081, 0x12c1: 0x0083, 0x12c2: 0x0085, 0x12c3: 0x0087, 0x12c4: 0x0089, 0x12c5: 0x008b,
-	0x12c6: 0x008d, 0x12c7: 0x008f, 0x12c8: 0x0091, 0x12c9: 0x0093, 0x12ca: 0x0095, 0x12cb: 0x0097,
-	0x12cc: 0x0099, 0x12cd: 0x009b, 0x12ce: 0x009d, 0x12cf: 0x009f, 0x12d0: 0x00a1, 0x12d1: 0x00a3,
-	0x12d2: 0x00a5, 0x12d3: 0x00a7, 0x12d4: 0x00a9, 0x12d5: 0x00ab, 0x12d6: 0x00ad, 0x12d7: 0x00af,
-	0x12d8: 0x00b1, 0x12d9: 0x00b3, 0x12da: 0x00b5, 0x12db: 0x00b7, 0x12dc: 0x00b9, 0x12dd: 0x00bb,
-	0x12de: 0x00bd, 0x12df: 0x056e, 0x12e0: 0x0572, 0x12e1: 0x0582, 0x12e2: 0x0596, 0x12e3: 0x059a,
-	0x12e4: 0x057e, 0x12e5: 0x06a6, 0x12e6: 0x069e, 0x12e7: 0x05c2, 0x12e8: 0x05ca, 0x12e9: 0x05d2,
-	0x12ea: 0x05da, 0x12eb: 0x05e2, 0x12ec: 0x0666, 0x12ed: 0x066e, 0x12ee: 0x0676, 0x12ef: 0x061a,
-	0x12f0: 0x06aa, 0x12f1: 0x05c6, 0x12f2: 0x05ce, 0x12f3: 0x05d6, 0x12f4: 0x05de, 0x12f5: 0x05e6,
-	0x12f6: 0x05ea, 0x12f7: 0x05ee, 0x12f8: 0x05f2, 0x12f9: 0x05f6, 0x12fa: 0x05fa, 0x12fb: 0x05fe,
-	0x12fc: 0x0602, 0x12fd: 0x0606, 0x12fe: 0x060a, 0x12ff: 0x060e,
-	// Block 0x4c, offset 0x1300
-	0x1300: 0x0612, 0x1301: 0x0616, 0x1302: 0x061e, 0x1303: 0x0622, 0x1304: 0x0626, 0x1305: 0x062a,
-	0x1306: 0x062e, 0x1307: 0x0632, 0x1308: 0x0636, 0x1309: 0x063a, 0x130a: 0x063e, 0x130b: 0x0642,
-	0x130c: 0x0646, 0x130d: 0x064a, 0x130e: 0x064e, 0x130f: 0x0652, 0x1310: 0x0656, 0x1311: 0x065a,
-	0x1312: 0x065e, 0x1313: 0x0662, 0x1314: 0x066a, 0x1315: 0x0672, 0x1316: 0x067a, 0x1317: 0x067e,
-	0x1318: 0x0682, 0x1319: 0x0686, 0x131a: 0x068a, 0x131b: 0x068e, 0x131c: 0x0692, 0x131d: 0x06a2,
-	0x131e: 0x4bb9, 0x131f: 0x4bbf, 0x1320: 0x04b6, 0x1321: 0x0406, 0x1322: 0x040a, 0x1323: 0x4b7c,
-	0x1324: 0x040e, 0x1325: 0x4b82, 0x1326: 0x4b88, 0x1327: 0x0412, 0x1328: 0x0416, 0x1329: 0x041a,
-	0x132a: 0x4b8e, 0x132b: 0x4b94, 0x132c: 0x4b9a, 0x132d: 0x4ba0, 0x132e: 0x4ba6, 0x132f: 0x4bac,
-	0x1330: 0x045a, 0x1331: 0x041e, 0x1332: 0x0422, 0x1333: 0x0426, 0x1334: 0x046e, 0x1335: 0x042a,
-	0x1336: 0x042e, 0x1337: 0x0432, 0x1338: 0x0436, 0x1339: 0x043a, 0x133a: 0x043e, 0x133b: 0x0442,
-	0x133c: 0x0446, 0x133d: 0x044a, 0x133e: 0x044e,
-	// Block 0x4d, offset 0x1340
-	0x1342: 0x4afe, 0x1343: 0x4b04, 0x1344: 0x4b0a, 0x1345: 0x4b10,
-	0x1346: 0x4b16, 0x1347: 0x4b1c, 0x134a: 0x4b22, 0x134b: 0x4b28,
-	0x134c: 0x4b2e, 0x134d: 0x4b34, 0x134e: 0x4b3a, 0x134f: 0x4b40,
-	0x1352: 0x4b46, 0x1353: 0x4b4c, 0x1354: 0x4b52, 0x1355: 0x4b58, 0x1356: 0x4b5e, 0x1357: 0x4b64,
-	0x135a: 0x4b6a, 0x135b: 0x4b70, 0x135c: 0x4b76,
-	0x1360: 0x00bf, 0x1361: 0x00c2, 0x1362: 0x00cb, 0x1363: 0x43a5,
-	0x1364: 0x00c8, 0x1365: 0x00c5, 0x1366: 0x053e, 0x1368: 0x0562, 0x1369: 0x0542,
-	0x136a: 0x0546, 0x136b: 0x054a, 0x136c: 0x054e, 0x136d: 0x0566, 0x136e: 0x056a,
-	// Block 0x4e, offset 0x1380
-	0x1381: 0x01f1, 0x1382: 0x01f4, 0x1383: 0x00d4, 0x1384: 0x01be, 0x1385: 0x010d,
-	0x1387: 0x01d3, 0x1388: 0x174e, 0x1389: 0x01d9, 0x138a: 0x01d6, 0x138b: 0x0116,
-	0x138c: 0x0119, 0x138d: 0x0526, 0x138e: 0x011c, 0x138f: 0x0128, 0x1390: 0x01e5, 0x1391: 0x013a,
-	0x1392: 0x0134, 0x1393: 0x012e, 0x1394: 0x01c1, 0x1395: 0x00e0, 0x1396: 0x01c4, 0x1397: 0x0143,
-	0x1398: 0x0194, 0x1399: 0x01e8, 0x139a: 0x01eb, 0x139b: 0x0152, 0x139c: 0x1756, 0x139d: 0x1742,
-	0x139e: 0x0158, 0x139f: 0x175b, 0x13a0: 0x01a9, 0x13a1: 0x1760, 0x13a2: 0x00da, 0x13a3: 0x0170,
-	0x13a4: 0x0173, 0x13a5: 0x00a3, 0x13a6: 0x017c, 0x13a7: 0x1765, 0x13a8: 0x0182, 0x13a9: 0x0185,
-	0x13aa: 0x0188, 0x13ab: 0x01e2, 0x13ac: 0x01dc, 0x13ad: 0x1752, 0x13ae: 0x01df, 0x13af: 0x0197,
-	0x13b0: 0x0576, 0x13b2: 0x01ac, 0x13b3: 0x01cd, 0x13b4: 0x01d0, 0x13b5: 0x01bb,
-	0x13b6: 0x00f5, 0x13b7: 0x00f8, 0x13b8: 0x00fb, 0x13b9: 0x176a, 0x13ba: 0x176f,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x0063, 0x13c1: 0x0065, 0x13c2: 0x0067, 0x13c3: 0x0069, 0x13c4: 0x006b, 0x13c5: 0x006d,
-	0x13c6: 0x006f, 0x13c7: 0x0071, 0x13c8: 0x0073, 0x13c9: 0x0075, 0x13ca: 0x0083, 0x13cb: 0x0085,
-	0x13cc: 0x0087, 0x13cd: 0x0089, 0x13ce: 0x008b, 0x13cf: 0x008d, 0x13d0: 0x008f, 0x13d1: 0x0091,
-	0x13d2: 0x0093, 0x13d3: 0x0095, 0x13d4: 0x0097, 0x13d5: 0x0099, 0x13d6: 0x009b, 0x13d7: 0x009d,
-	0x13d8: 0x009f, 0x13d9: 0x00a1, 0x13da: 0x00a3, 0x13db: 0x00a5, 0x13dc: 0x00a7, 0x13dd: 0x00a9,
-	0x13de: 0x00ab, 0x13df: 0x00ad, 0x13e0: 0x00af, 0x13e1: 0x00b1, 0x13e2: 0x00b3, 0x13e3: 0x00b5,
-	0x13e4: 0x00e3, 0x13e5: 0x0101, 0x13e8: 0x01f7, 0x13e9: 0x01fa,
-	0x13ea: 0x01fd, 0x13eb: 0x0200, 0x13ec: 0x0203, 0x13ed: 0x0206, 0x13ee: 0x0209, 0x13ef: 0x020c,
-	0x13f0: 0x020f, 0x13f1: 0x0212, 0x13f2: 0x0215, 0x13f3: 0x0218, 0x13f4: 0x021b, 0x13f5: 0x021e,
-	0x13f6: 0x0221, 0x13f7: 0x0224, 0x13f8: 0x0227, 0x13f9: 0x020c, 0x13fa: 0x022a, 0x13fb: 0x022d,
-	0x13fc: 0x0230, 0x13fd: 0x0233, 0x13fe: 0x0236, 0x13ff: 0x0239,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x0281, 0x1401: 0x0284, 0x1402: 0x0287, 0x1403: 0x0552, 0x1404: 0x024b, 0x1405: 0x0254,
-	0x1406: 0x025a, 0x1407: 0x027e, 0x1408: 0x026f, 0x1409: 0x026c, 0x140a: 0x028a, 0x140b: 0x028d,
-	0x140e: 0x0021, 0x140f: 0x0023, 0x1410: 0x0025, 0x1411: 0x0027,
-	0x1412: 0x0029, 0x1413: 0x002b, 0x1414: 0x002d, 0x1415: 0x002f, 0x1416: 0x0031, 0x1417: 0x0033,
-	0x1418: 0x0021, 0x1419: 0x0023, 0x141a: 0x0025, 0x141b: 0x0027, 0x141c: 0x0029, 0x141d: 0x002b,
-	0x141e: 0x002d, 0x141f: 0x002f, 0x1420: 0x0031, 0x1421: 0x0033, 0x1422: 0x0021, 0x1423: 0x0023,
-	0x1424: 0x0025, 0x1425: 0x0027, 0x1426: 0x0029, 0x1427: 0x002b, 0x1428: 0x002d, 0x1429: 0x002f,
-	0x142a: 0x0031, 0x142b: 0x0033, 0x142c: 0x0021, 0x142d: 0x0023, 0x142e: 0x0025, 0x142f: 0x0027,
-	0x1430: 0x0029, 0x1431: 0x002b, 0x1432: 0x002d, 0x1433: 0x002f, 0x1434: 0x0031, 0x1435: 0x0033,
-	0x1436: 0x0021, 0x1437: 0x0023, 0x1438: 0x0025, 0x1439: 0x0027, 0x143a: 0x0029, 0x143b: 0x002b,
-	0x143c: 0x002d, 0x143d: 0x002f, 0x143e: 0x0031, 0x143f: 0x0033,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x8133, 0x1441: 0x8133, 0x1442: 0x8133, 0x1443: 0x8133, 0x1444: 0x8133, 0x1445: 0x8133,
-	0x1446: 0x8133, 0x1448: 0x8133, 0x1449: 0x8133, 0x144a: 0x8133, 0x144b: 0x8133,
-	0x144c: 0x8133, 0x144d: 0x8133, 0x144e: 0x8133, 0x144f: 0x8133, 0x1450: 0x8133, 0x1451: 0x8133,
-	0x1452: 0x8133, 0x1453: 0x8133, 0x1454: 0x8133, 0x1455: 0x8133, 0x1456: 0x8133, 0x1457: 0x8133,
-	0x1458: 0x8133, 0x145b: 0x8133, 0x145c: 0x8133, 0x145d: 0x8133,
-	0x145e: 0x8133, 0x145f: 0x8133, 0x1460: 0x8133, 0x1461: 0x8133, 0x1463: 0x8133,
-	0x1464: 0x8133, 0x1466: 0x8133, 0x1467: 0x8133, 0x1468: 0x8133, 0x1469: 0x8133,
-	0x146a: 0x8133,
-	0x1470: 0x0290, 0x1471: 0x0293, 0x1472: 0x0296, 0x1473: 0x0299, 0x1474: 0x029c, 0x1475: 0x029f,
-	0x1476: 0x02a2, 0x1477: 0x02a5, 0x1478: 0x02a8, 0x1479: 0x02ab, 0x147a: 0x02ae, 0x147b: 0x02b1,
-	0x147c: 0x02b7, 0x147d: 0x02ba, 0x147e: 0x02bd, 0x147f: 0x02c0,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x02c3, 0x1481: 0x02c6, 0x1482: 0x02c9, 0x1483: 0x02cc, 0x1484: 0x02cf, 0x1485: 0x02d2,
-	0x1486: 0x02d5, 0x1487: 0x02db, 0x1488: 0x02e1, 0x1489: 0x02e4, 0x148a: 0x1736, 0x148b: 0x0302,
-	0x148c: 0x02ea, 0x148d: 0x02ed, 0x148e: 0x0305, 0x148f: 0x02f9, 0x1490: 0x02ff, 0x1491: 0x0290,
-	0x1492: 0x0293, 0x1493: 0x0296, 0x1494: 0x0299, 0x1495: 0x029c, 0x1496: 0x029f, 0x1497: 0x02a2,
-	0x1498: 0x02a5, 0x1499: 0x02a8, 0x149a: 0x02ab, 0x149b: 0x02ae, 0x149c: 0x02b7, 0x149d: 0x02ba,
-	0x149e: 0x02c0, 0x149f: 0x02c6, 0x14a0: 0x02c9, 0x14a1: 0x02cc, 0x14a2: 0x02cf, 0x14a3: 0x02d2,
-	0x14a4: 0x02d5, 0x14a5: 0x02d8, 0x14a6: 0x02db, 0x14a7: 0x02f3, 0x14a8: 0x02ea, 0x14a9: 0x02e7,
-	0x14aa: 0x02f0, 0x14ab: 0x02f6, 0x14ac: 0x1732, 0x14ad: 0x02fc,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x032c, 0x14c1: 0x032f, 0x14c2: 0x033b, 0x14c3: 0x0344, 0x14c5: 0x037d,
-	0x14c6: 0x034d, 0x14c7: 0x033e, 0x14c8: 0x035c, 0x14c9: 0x0383, 0x14ca: 0x036e, 0x14cb: 0x0371,
-	0x14cc: 0x0374, 0x14cd: 0x0377, 0x14ce: 0x0350, 0x14cf: 0x0362, 0x14d0: 0x0368, 0x14d1: 0x0356,
-	0x14d2: 0x036b, 0x14d3: 0x034a, 0x14d4: 0x0353, 0x14d5: 0x0335, 0x14d6: 0x0338, 0x14d7: 0x0341,
-	0x14d8: 0x0347, 0x14d9: 0x0359, 0x14da: 0x035f, 0x14db: 0x0365, 0x14dc: 0x0386, 0x14dd: 0x03d7,
-	0x14de: 0x03bf, 0x14df: 0x0389, 0x14e1: 0x032f, 0x14e2: 0x033b,
-	0x14e4: 0x037a, 0x14e7: 0x033e, 0x14e9: 0x0383,
-	0x14ea: 0x036e, 0x14eb: 0x0371, 0x14ec: 0x0374, 0x14ed: 0x0377, 0x14ee: 0x0350, 0x14ef: 0x0362,
-	0x14f0: 0x0368, 0x14f1: 0x0356, 0x14f2: 0x036b, 0x14f4: 0x0353, 0x14f5: 0x0335,
-	0x14f6: 0x0338, 0x14f7: 0x0341, 0x14f9: 0x0359, 0x14fb: 0x0365,
-	// Block 0x54, offset 0x1500
-	0x1502: 0x033b,
-	0x1507: 0x033e, 0x1509: 0x0383, 0x150b: 0x0371,
-	0x150d: 0x0377, 0x150e: 0x0350, 0x150f: 0x0362, 0x1511: 0x0356,
-	0x1512: 0x036b, 0x1514: 0x0353, 0x1517: 0x0341,
-	0x1519: 0x0359, 0x151b: 0x0365, 0x151d: 0x03d7,
-	0x151f: 0x0389, 0x1521: 0x032f, 0x1522: 0x033b,
-	0x1524: 0x037a, 0x1527: 0x033e, 0x1528: 0x035c, 0x1529: 0x0383,
-	0x152a: 0x036e, 0x152c: 0x0374, 0x152d: 0x0377, 0x152e: 0x0350, 0x152f: 0x0362,
-	0x1530: 0x0368, 0x1531: 0x0356, 0x1532: 0x036b, 0x1534: 0x0353, 0x1535: 0x0335,
-	0x1536: 0x0338, 0x1537: 0x0341, 0x1539: 0x0359, 0x153a: 0x035f, 0x153b: 0x0365,
-	0x153c: 0x0386, 0x153e: 0x03bf,
-	// Block 0x55, offset 0x1540
-	0x1540: 0x032c, 0x1541: 0x032f, 0x1542: 0x033b, 0x1543: 0x0344, 0x1544: 0x037a, 0x1545: 0x037d,
-	0x1546: 0x034d, 0x1547: 0x033e, 0x1548: 0x035c, 0x1549: 0x0383, 0x154b: 0x0371,
-	0x154c: 0x0374, 0x154d: 0x0377, 0x154e: 0x0350, 0x154f: 0x0362, 0x1550: 0x0368, 0x1551: 0x0356,
-	0x1552: 0x036b, 0x1553: 0x034a, 0x1554: 0x0353, 0x1555: 0x0335, 0x1556: 0x0338, 0x1557: 0x0341,
-	0x1558: 0x0347, 0x1559: 0x0359, 0x155a: 0x035f, 0x155b: 0x0365,
-	0x1561: 0x032f, 0x1562: 0x033b, 0x1563: 0x0344,
-	0x1565: 0x037d, 0x1566: 0x034d, 0x1567: 0x033e, 0x1568: 0x035c, 0x1569: 0x0383,
-	0x156b: 0x0371, 0x156c: 0x0374, 0x156d: 0x0377, 0x156e: 0x0350, 0x156f: 0x0362,
-	0x1570: 0x0368, 0x1571: 0x0356, 0x1572: 0x036b, 0x1573: 0x034a, 0x1574: 0x0353, 0x1575: 0x0335,
-	0x1576: 0x0338, 0x1577: 0x0341, 0x1578: 0x0347, 0x1579: 0x0359, 0x157a: 0x035f, 0x157b: 0x0365,
-	// Block 0x56, offset 0x1580
-	0x1580: 0x19a6, 0x1581: 0x19a3, 0x1582: 0x19a9, 0x1583: 0x19cd, 0x1584: 0x19f1, 0x1585: 0x1a15,
-	0x1586: 0x1a39, 0x1587: 0x1a42, 0x1588: 0x1a48, 0x1589: 0x1a4e, 0x158a: 0x1a54,
-	0x1590: 0x1bbc, 0x1591: 0x1bc0,
-	0x1592: 0x1bc4, 0x1593: 0x1bc8, 0x1594: 0x1bcc, 0x1595: 0x1bd0, 0x1596: 0x1bd4, 0x1597: 0x1bd8,
-	0x1598: 0x1bdc, 0x1599: 0x1be0, 0x159a: 0x1be4, 0x159b: 0x1be8, 0x159c: 0x1bec, 0x159d: 0x1bf0,
-	0x159e: 0x1bf4, 0x159f: 0x1bf8, 0x15a0: 0x1bfc, 0x15a1: 0x1c00, 0x15a2: 0x1c04, 0x15a3: 0x1c08,
-	0x15a4: 0x1c0c, 0x15a5: 0x1c10, 0x15a6: 0x1c14, 0x15a7: 0x1c18, 0x15a8: 0x1c1c, 0x15a9: 0x1c20,
-	0x15aa: 0x2855, 0x15ab: 0x0047, 0x15ac: 0x0065, 0x15ad: 0x1a69, 0x15ae: 0x1ae1,
-	0x15b0: 0x0043, 0x15b1: 0x0045, 0x15b2: 0x0047, 0x15b3: 0x0049, 0x15b4: 0x004b, 0x15b5: 0x004d,
-	0x15b6: 0x004f, 0x15b7: 0x0051, 0x15b8: 0x0053, 0x15b9: 0x0055, 0x15ba: 0x0057, 0x15bb: 0x0059,
-	0x15bc: 0x005b, 0x15bd: 0x005d, 0x15be: 0x005f, 0x15bf: 0x0061,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x27dd, 0x15c1: 0x27f2, 0x15c2: 0x05fe,
-	0x15d0: 0x0d0a, 0x15d1: 0x0b42,
-	0x15d2: 0x09ce, 0x15d3: 0x4705, 0x15d4: 0x0816, 0x15d5: 0x0aea, 0x15d6: 0x142a, 0x15d7: 0x0afa,
-	0x15d8: 0x0822, 0x15d9: 0x0dd2, 0x15da: 0x0faa, 0x15db: 0x0daa, 0x15dc: 0x0922, 0x15dd: 0x0c66,
-	0x15de: 0x08ba, 0x15df: 0x0db2, 0x15e0: 0x090e, 0x15e1: 0x1212, 0x15e2: 0x107e, 0x15e3: 0x1486,
-	0x15e4: 0x0ace, 0x15e5: 0x0a06, 0x15e6: 0x0f5e, 0x15e7: 0x0d16, 0x15e8: 0x0d42, 0x15e9: 0x07ba,
-	0x15ea: 0x07c6, 0x15eb: 0x1506, 0x15ec: 0x0bd6, 0x15ed: 0x07e2, 0x15ee: 0x09ea, 0x15ef: 0x0d36,
-	0x15f0: 0x14ae, 0x15f1: 0x0d0e, 0x15f2: 0x116a, 0x15f3: 0x11a6, 0x15f4: 0x09f2, 0x15f5: 0x0f3e,
-	0x15f6: 0x0e06, 0x15f7: 0x0e02, 0x15f8: 0x1092, 0x15f9: 0x0926, 0x15fa: 0x0a52, 0x15fb: 0x153e,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x07f6, 0x1601: 0x07ee, 0x1602: 0x07fe, 0x1603: 0x1774, 0x1604: 0x0842, 0x1605: 0x0852,
-	0x1606: 0x0856, 0x1607: 0x085e, 0x1608: 0x0866, 0x1609: 0x086a, 0x160a: 0x0876, 0x160b: 0x086e,
-	0x160c: 0x06ae, 0x160d: 0x1788, 0x160e: 0x088a, 0x160f: 0x088e, 0x1610: 0x0892, 0x1611: 0x08ae,
-	0x1612: 0x1779, 0x1613: 0x06b2, 0x1614: 0x089a, 0x1615: 0x08ba, 0x1616: 0x1783, 0x1617: 0x08ca,
-	0x1618: 0x08d2, 0x1619: 0x0832, 0x161a: 0x08da, 0x161b: 0x08de, 0x161c: 0x195e, 0x161d: 0x08fa,
-	0x161e: 0x0902, 0x161f: 0x06ba, 0x1620: 0x091a, 0x1621: 0x091e, 0x1622: 0x0926, 0x1623: 0x092a,
-	0x1624: 0x06be, 0x1625: 0x0942, 0x1626: 0x0946, 0x1627: 0x0952, 0x1628: 0x095e, 0x1629: 0x0962,
-	0x162a: 0x0966, 0x162b: 0x096e, 0x162c: 0x098e, 0x162d: 0x0992, 0x162e: 0x099a, 0x162f: 0x09aa,
-	0x1630: 0x09b2, 0x1631: 0x09b6, 0x1632: 0x09b6, 0x1633: 0x09b6, 0x1634: 0x1797, 0x1635: 0x0f8e,
-	0x1636: 0x09ca, 0x1637: 0x09d2, 0x1638: 0x179c, 0x1639: 0x09de, 0x163a: 0x09e6, 0x163b: 0x09ee,
-	0x163c: 0x0a16, 0x163d: 0x0a02, 0x163e: 0x0a0e, 0x163f: 0x0a12,
-	// Block 0x59, offset 0x1640
-	0x1640: 0x0a1a, 0x1641: 0x0a22, 0x1642: 0x0a26, 0x1643: 0x0a2e, 0x1644: 0x0a36, 0x1645: 0x0a3a,
-	0x1646: 0x0a3a, 0x1647: 0x0a42, 0x1648: 0x0a4a, 0x1649: 0x0a4e, 0x164a: 0x0a5a, 0x164b: 0x0a7e,
-	0x164c: 0x0a62, 0x164d: 0x0a82, 0x164e: 0x0a66, 0x164f: 0x0a6e, 0x1650: 0x0906, 0x1651: 0x0aca,
-	0x1652: 0x0a92, 0x1653: 0x0a96, 0x1654: 0x0a9a, 0x1655: 0x0a8e, 0x1656: 0x0aa2, 0x1657: 0x0a9e,
-	0x1658: 0x0ab6, 0x1659: 0x17a1, 0x165a: 0x0ad2, 0x165b: 0x0ad6, 0x165c: 0x0ade, 0x165d: 0x0aea,
-	0x165e: 0x0af2, 0x165f: 0x0b0e, 0x1660: 0x17a6, 0x1661: 0x17ab, 0x1662: 0x0b1a, 0x1663: 0x0b1e,
-	0x1664: 0x0b22, 0x1665: 0x0b16, 0x1666: 0x0b2a, 0x1667: 0x06c2, 0x1668: 0x06c6, 0x1669: 0x0b32,
-	0x166a: 0x0b3a, 0x166b: 0x0b3a, 0x166c: 0x17b0, 0x166d: 0x0b56, 0x166e: 0x0b5a, 0x166f: 0x0b5e,
-	0x1670: 0x0b66, 0x1671: 0x17b5, 0x1672: 0x0b6e, 0x1673: 0x0b72, 0x1674: 0x0c4a, 0x1675: 0x0b7a,
-	0x1676: 0x06ca, 0x1677: 0x0b86, 0x1678: 0x0b96, 0x1679: 0x0ba2, 0x167a: 0x0b9e, 0x167b: 0x17bf,
-	0x167c: 0x0baa, 0x167d: 0x17c4, 0x167e: 0x0bb6, 0x167f: 0x0bb2,
-	// Block 0x5a, offset 0x1680
-	0x1680: 0x0bba, 0x1681: 0x0bca, 0x1682: 0x0bce, 0x1683: 0x06ce, 0x1684: 0x0bde, 0x1685: 0x0be6,
-	0x1686: 0x0bea, 0x1687: 0x0bee, 0x1688: 0x06d2, 0x1689: 0x17c9, 0x168a: 0x06d6, 0x168b: 0x0c0a,
-	0x168c: 0x0c0e, 0x168d: 0x0c12, 0x168e: 0x0c1a, 0x168f: 0x1990, 0x1690: 0x0c32, 0x1691: 0x17d3,
-	0x1692: 0x17d3, 0x1693: 0x12d2, 0x1694: 0x0c42, 0x1695: 0x0c42, 0x1696: 0x06da, 0x1697: 0x17f6,
-	0x1698: 0x18c8, 0x1699: 0x0c52, 0x169a: 0x0c5a, 0x169b: 0x06de, 0x169c: 0x0c6e, 0x169d: 0x0c7e,
-	0x169e: 0x0c82, 0x169f: 0x0c8a, 0x16a0: 0x0c9a, 0x16a1: 0x06e6, 0x16a2: 0x06e2, 0x16a3: 0x0c9e,
-	0x16a4: 0x17d8, 0x16a5: 0x0ca2, 0x16a6: 0x0cb6, 0x16a7: 0x0cba, 0x16a8: 0x0cbe, 0x16a9: 0x0cba,
-	0x16aa: 0x0cca, 0x16ab: 0x0cce, 0x16ac: 0x0cde, 0x16ad: 0x0cd6, 0x16ae: 0x0cda, 0x16af: 0x0ce2,
-	0x16b0: 0x0ce6, 0x16b1: 0x0cea, 0x16b2: 0x0cf6, 0x16b3: 0x0cfa, 0x16b4: 0x0d12, 0x16b5: 0x0d1a,
-	0x16b6: 0x0d2a, 0x16b7: 0x0d3e, 0x16b8: 0x17e7, 0x16b9: 0x0d3a, 0x16ba: 0x0d2e, 0x16bb: 0x0d46,
-	0x16bc: 0x0d4e, 0x16bd: 0x0d62, 0x16be: 0x17ec, 0x16bf: 0x0d6a,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x0d5e, 0x16c1: 0x0d56, 0x16c2: 0x06ea, 0x16c3: 0x0d72, 0x16c4: 0x0d7a, 0x16c5: 0x0d82,
-	0x16c6: 0x0d76, 0x16c7: 0x06ee, 0x16c8: 0x0d92, 0x16c9: 0x0d9a, 0x16ca: 0x17f1, 0x16cb: 0x0dc6,
-	0x16cc: 0x0dfa, 0x16cd: 0x0dd6, 0x16ce: 0x06fa, 0x16cf: 0x0de2, 0x16d0: 0x06f6, 0x16d1: 0x06f2,
-	0x16d2: 0x08be, 0x16d3: 0x08c2, 0x16d4: 0x0dfe, 0x16d5: 0x0de6, 0x16d6: 0x12a6, 0x16d7: 0x075e,
-	0x16d8: 0x0e0a, 0x16d9: 0x0e0e, 0x16da: 0x0e12, 0x16db: 0x0e26, 0x16dc: 0x0e1e, 0x16dd: 0x180a,
-	0x16de: 0x06fe, 0x16df: 0x0e3a, 0x16e0: 0x0e2e, 0x16e1: 0x0e4a, 0x16e2: 0x0e52, 0x16e3: 0x1814,
-	0x16e4: 0x0e56, 0x16e5: 0x0e42, 0x16e6: 0x0e5e, 0x16e7: 0x0702, 0x16e8: 0x0e62, 0x16e9: 0x0e66,
-	0x16ea: 0x0e6a, 0x16eb: 0x0e76, 0x16ec: 0x1819, 0x16ed: 0x0e7e, 0x16ee: 0x0706, 0x16ef: 0x0e8a,
-	0x16f0: 0x181e, 0x16f1: 0x0e8e, 0x16f2: 0x070a, 0x16f3: 0x0e9a, 0x16f4: 0x0ea6, 0x16f5: 0x0eb2,
-	0x16f6: 0x0eb6, 0x16f7: 0x1823, 0x16f8: 0x17ba, 0x16f9: 0x1828, 0x16fa: 0x0ed6, 0x16fb: 0x182d,
-	0x16fc: 0x0ee2, 0x16fd: 0x0eea, 0x16fe: 0x0eda, 0x16ff: 0x0ef6,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x0f06, 0x1701: 0x0f16, 0x1702: 0x0f0a, 0x1703: 0x0f0e, 0x1704: 0x0f1a, 0x1705: 0x0f1e,
-	0x1706: 0x1832, 0x1707: 0x0f02, 0x1708: 0x0f36, 0x1709: 0x0f3a, 0x170a: 0x070e, 0x170b: 0x0f4e,
-	0x170c: 0x0f4a, 0x170d: 0x1837, 0x170e: 0x0f2e, 0x170f: 0x0f6a, 0x1710: 0x183c, 0x1711: 0x1841,
-	0x1712: 0x0f6e, 0x1713: 0x0f82, 0x1714: 0x0f7e, 0x1715: 0x0f7a, 0x1716: 0x0712, 0x1717: 0x0f86,
-	0x1718: 0x0f96, 0x1719: 0x0f92, 0x171a: 0x0f9e, 0x171b: 0x177e, 0x171c: 0x0fae, 0x171d: 0x1846,
-	0x171e: 0x0fba, 0x171f: 0x1850, 0x1720: 0x0fce, 0x1721: 0x0fda, 0x1722: 0x0fee, 0x1723: 0x1855,
-	0x1724: 0x1002, 0x1725: 0x1006, 0x1726: 0x185a, 0x1727: 0x185f, 0x1728: 0x1022, 0x1729: 0x1032,
-	0x172a: 0x0716, 0x172b: 0x1036, 0x172c: 0x071a, 0x172d: 0x071a, 0x172e: 0x104e, 0x172f: 0x1052,
-	0x1730: 0x105a, 0x1731: 0x105e, 0x1732: 0x106a, 0x1733: 0x071e, 0x1734: 0x1082, 0x1735: 0x1864,
-	0x1736: 0x109e, 0x1737: 0x1869, 0x1738: 0x10aa, 0x1739: 0x17ce, 0x173a: 0x10ba, 0x173b: 0x186e,
-	0x173c: 0x1873, 0x173d: 0x1878, 0x173e: 0x0722, 0x173f: 0x0726,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x10f2, 0x1741: 0x1882, 0x1742: 0x187d, 0x1743: 0x1887, 0x1744: 0x188c, 0x1745: 0x10fa,
-	0x1746: 0x10fe, 0x1747: 0x10fe, 0x1748: 0x1106, 0x1749: 0x072e, 0x174a: 0x110a, 0x174b: 0x0732,
-	0x174c: 0x0736, 0x174d: 0x1896, 0x174e: 0x111e, 0x174f: 0x1126, 0x1750: 0x1132, 0x1751: 0x073a,
-	0x1752: 0x189b, 0x1753: 0x1156, 0x1754: 0x18a0, 0x1755: 0x18a5, 0x1756: 0x1176, 0x1757: 0x118e,
-	0x1758: 0x073e, 0x1759: 0x1196, 0x175a: 0x119a, 0x175b: 0x119e, 0x175c: 0x18aa, 0x175d: 0x18af,
-	0x175e: 0x18af, 0x175f: 0x11b6, 0x1760: 0x0742, 0x1761: 0x18b4, 0x1762: 0x11ca, 0x1763: 0x11ce,
-	0x1764: 0x0746, 0x1765: 0x18b9, 0x1766: 0x11ea, 0x1767: 0x074a, 0x1768: 0x11fa, 0x1769: 0x11f2,
-	0x176a: 0x1202, 0x176b: 0x18c3, 0x176c: 0x121a, 0x176d: 0x074e, 0x176e: 0x1226, 0x176f: 0x122e,
-	0x1770: 0x123e, 0x1771: 0x0752, 0x1772: 0x18cd, 0x1773: 0x18d2, 0x1774: 0x0756, 0x1775: 0x18d7,
-	0x1776: 0x1256, 0x1777: 0x18dc, 0x1778: 0x1262, 0x1779: 0x126e, 0x177a: 0x1276, 0x177b: 0x18e1,
-	0x177c: 0x18e6, 0x177d: 0x128a, 0x177e: 0x18eb, 0x177f: 0x1292,
-	// Block 0x5e, offset 0x1780
-	0x1780: 0x17fb, 0x1781: 0x075a, 0x1782: 0x12aa, 0x1783: 0x12ae, 0x1784: 0x0762, 0x1785: 0x12b2,
-	0x1786: 0x0b2e, 0x1787: 0x18f0, 0x1788: 0x18f5, 0x1789: 0x1800, 0x178a: 0x1805, 0x178b: 0x12d2,
-	0x178c: 0x12d6, 0x178d: 0x14ee, 0x178e: 0x0766, 0x178f: 0x1302, 0x1790: 0x12fe, 0x1791: 0x1306,
-	0x1792: 0x093a, 0x1793: 0x130a, 0x1794: 0x130e, 0x1795: 0x1312, 0x1796: 0x131a, 0x1797: 0x18fa,
-	0x1798: 0x1316, 0x1799: 0x131e, 0x179a: 0x1332, 0x179b: 0x1336, 0x179c: 0x1322, 0x179d: 0x133a,
-	0x179e: 0x134e, 0x179f: 0x1362, 0x17a0: 0x132e, 0x17a1: 0x1342, 0x17a2: 0x1346, 0x17a3: 0x134a,
-	0x17a4: 0x18ff, 0x17a5: 0x1909, 0x17a6: 0x1904, 0x17a7: 0x076a, 0x17a8: 0x136a, 0x17a9: 0x136e,
-	0x17aa: 0x1376, 0x17ab: 0x191d, 0x17ac: 0x137a, 0x17ad: 0x190e, 0x17ae: 0x076e, 0x17af: 0x0772,
-	0x17b0: 0x1913, 0x17b1: 0x1918, 0x17b2: 0x0776, 0x17b3: 0x139a, 0x17b4: 0x139e, 0x17b5: 0x13a2,
-	0x17b6: 0x13a6, 0x17b7: 0x13b2, 0x17b8: 0x13ae, 0x17b9: 0x13ba, 0x17ba: 0x13b6, 0x17bb: 0x13c6,
-	0x17bc: 0x13be, 0x17bd: 0x13c2, 0x17be: 0x13ca, 0x17bf: 0x077a,
-	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x13d2, 0x17c1: 0x13d6, 0x17c2: 0x077e, 0x17c3: 0x13e6, 0x17c4: 0x13ea, 0x17c5: 0x1922,
-	0x17c6: 0x13f6, 0x17c7: 0x13fa, 0x17c8: 0x0782, 0x17c9: 0x1406, 0x17ca: 0x06b6, 0x17cb: 0x1927,
-	0x17cc: 0x192c, 0x17cd: 0x0786, 0x17ce: 0x078a, 0x17cf: 0x1432, 0x17d0: 0x144a, 0x17d1: 0x1466,
-	0x17d2: 0x1476, 0x17d3: 0x1931, 0x17d4: 0x148a, 0x17d5: 0x148e, 0x17d6: 0x14a6, 0x17d7: 0x14b2,
-	0x17d8: 0x193b, 0x17d9: 0x178d, 0x17da: 0x14be, 0x17db: 0x14ba, 0x17dc: 0x14c6, 0x17dd: 0x1792,
-	0x17de: 0x14d2, 0x17df: 0x14de, 0x17e0: 0x1940, 0x17e1: 0x1945, 0x17e2: 0x151e, 0x17e3: 0x152a,
-	0x17e4: 0x1532, 0x17e5: 0x194a, 0x17e6: 0x1536, 0x17e7: 0x1562, 0x17e8: 0x156e, 0x17e9: 0x1572,
-	0x17ea: 0x156a, 0x17eb: 0x157e, 0x17ec: 0x1582, 0x17ed: 0x194f, 0x17ee: 0x158e, 0x17ef: 0x078e,
-	0x17f0: 0x1596, 0x17f1: 0x1954, 0x17f2: 0x0792, 0x17f3: 0x15ce, 0x17f4: 0x0bbe, 0x17f5: 0x15e6,
-	0x17f6: 0x1959, 0x17f7: 0x1963, 0x17f8: 0x0796, 0x17f9: 0x079a, 0x17fa: 0x160e, 0x17fb: 0x1968,
-	0x17fc: 0x079e, 0x17fd: 0x196d, 0x17fe: 0x1626, 0x17ff: 0x1626,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x162e, 0x1801: 0x1972, 0x1802: 0x1646, 0x1803: 0x07a2, 0x1804: 0x1656, 0x1805: 0x1662,
-	0x1806: 0x166a, 0x1807: 0x1672, 0x1808: 0x07a6, 0x1809: 0x1977, 0x180a: 0x1686, 0x180b: 0x16a2,
-	0x180c: 0x16ae, 0x180d: 0x07aa, 0x180e: 0x07ae, 0x180f: 0x16b2, 0x1810: 0x197c, 0x1811: 0x07b2,
-	0x1812: 0x1981, 0x1813: 0x1986, 0x1814: 0x198b, 0x1815: 0x16d6, 0x1816: 0x07b6, 0x1817: 0x16ea,
-	0x1818: 0x16f2, 0x1819: 0x16f6, 0x181a: 0x16fe, 0x181b: 0x1706, 0x181c: 0x170e, 0x181d: 0x1995,
-}
-
-// nfkcIndex: 22 blocks, 1408 entries, 2816 bytes
-// Block 0 is the zero block.
-var nfkcIndex = [1408]uint16{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x5f, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x60, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x61, 0xcb: 0x62, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
-	0xd0: 0x0a, 0xd1: 0x63, 0xd2: 0x64, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x65,
-	0xd8: 0x66, 0xd9: 0x0d, 0xdb: 0x67, 0xdc: 0x68, 0xdd: 0x69, 0xdf: 0x6a,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
-	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
-	0xf0: 0x13,
-	// Block 0x4, offset 0x100
-	0x120: 0x6b, 0x121: 0x6c, 0x122: 0x6d, 0x123: 0x0e, 0x124: 0x6e, 0x125: 0x6f, 0x126: 0x70, 0x127: 0x71,
-	0x128: 0x72, 0x129: 0x73, 0x12a: 0x74, 0x12b: 0x75, 0x12c: 0x70, 0x12d: 0x76, 0x12e: 0x77, 0x12f: 0x78,
-	0x130: 0x74, 0x131: 0x79, 0x132: 0x7a, 0x133: 0x7b, 0x134: 0x7c, 0x135: 0x7d, 0x137: 0x7e,
-	0x138: 0x7f, 0x139: 0x80, 0x13a: 0x81, 0x13b: 0x82, 0x13c: 0x83, 0x13d: 0x84, 0x13e: 0x85, 0x13f: 0x86,
-	// Block 0x5, offset 0x140
-	0x140: 0x87, 0x142: 0x88, 0x143: 0x89, 0x144: 0x8a, 0x145: 0x8b, 0x146: 0x8c, 0x147: 0x8d,
-	0x14d: 0x8e,
-	0x15c: 0x8f, 0x15f: 0x90,
-	0x162: 0x91, 0x164: 0x92,
-	0x168: 0x93, 0x169: 0x94, 0x16a: 0x95, 0x16b: 0x96, 0x16c: 0x0f, 0x16d: 0x97, 0x16e: 0x98, 0x16f: 0x99,
-	0x170: 0x9a, 0x173: 0x9b, 0x174: 0x9c, 0x175: 0x10, 0x176: 0x11, 0x177: 0x12,
-	0x178: 0x13, 0x179: 0x14, 0x17a: 0x15, 0x17b: 0x16, 0x17c: 0x17, 0x17d: 0x18, 0x17e: 0x19, 0x17f: 0x1a,
-	// Block 0x6, offset 0x180
-	0x180: 0x9d, 0x181: 0x9e, 0x182: 0x9f, 0x183: 0xa0, 0x184: 0x1b, 0x185: 0x1c, 0x186: 0xa1, 0x187: 0xa2,
-	0x188: 0xa3, 0x189: 0x1d, 0x18a: 0x1e, 0x18b: 0xa4, 0x18c: 0xa5,
-	0x191: 0x1f, 0x192: 0x20, 0x193: 0xa6,
-	0x1a8: 0xa7, 0x1a9: 0xa8, 0x1ab: 0xa9,
-	0x1b1: 0xaa, 0x1b3: 0xab, 0x1b5: 0xac, 0x1b7: 0xad,
-	0x1ba: 0xae, 0x1bb: 0xaf, 0x1bc: 0x21, 0x1bd: 0x22, 0x1be: 0x23, 0x1bf: 0xb0,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0xb1, 0x1c1: 0x24, 0x1c2: 0x25, 0x1c3: 0x26, 0x1c4: 0xb2, 0x1c5: 0x27, 0x1c6: 0x28,
-	0x1c8: 0x29, 0x1c9: 0x2a, 0x1ca: 0x2b, 0x1cb: 0x2c, 0x1cc: 0x2d, 0x1cd: 0x2e, 0x1ce: 0x2f, 0x1cf: 0x30,
-	// Block 0x8, offset 0x200
-	0x219: 0xb3, 0x21a: 0xb4, 0x21b: 0xb5, 0x21d: 0xb6, 0x21f: 0xb7,
-	0x220: 0xb8, 0x223: 0xb9, 0x224: 0xba, 0x225: 0xbb, 0x226: 0xbc, 0x227: 0xbd,
-	0x22a: 0xbe, 0x22b: 0xbf, 0x22d: 0xc0, 0x22f: 0xc1,
-	0x230: 0xc2, 0x231: 0xc3, 0x232: 0xc4, 0x233: 0xc5, 0x234: 0xc6, 0x235: 0xc7, 0x236: 0xc8, 0x237: 0xc2,
-	0x238: 0xc3, 0x239: 0xc4, 0x23a: 0xc5, 0x23b: 0xc6, 0x23c: 0xc7, 0x23d: 0xc8, 0x23e: 0xc2, 0x23f: 0xc3,
-	// Block 0x9, offset 0x240
-	0x240: 0xc4, 0x241: 0xc5, 0x242: 0xc6, 0x243: 0xc7, 0x244: 0xc8, 0x245: 0xc2, 0x246: 0xc3, 0x247: 0xc4,
-	0x248: 0xc5, 0x249: 0xc6, 0x24a: 0xc7, 0x24b: 0xc8, 0x24c: 0xc2, 0x24d: 0xc3, 0x24e: 0xc4, 0x24f: 0xc5,
-	0x250: 0xc6, 0x251: 0xc7, 0x252: 0xc8, 0x253: 0xc2, 0x254: 0xc3, 0x255: 0xc4, 0x256: 0xc5, 0x257: 0xc6,
-	0x258: 0xc7, 0x259: 0xc8, 0x25a: 0xc2, 0x25b: 0xc3, 0x25c: 0xc4, 0x25d: 0xc5, 0x25e: 0xc6, 0x25f: 0xc7,
-	0x260: 0xc8, 0x261: 0xc2, 0x262: 0xc3, 0x263: 0xc4, 0x264: 0xc5, 0x265: 0xc6, 0x266: 0xc7, 0x267: 0xc8,
-	0x268: 0xc2, 0x269: 0xc3, 0x26a: 0xc4, 0x26b: 0xc5, 0x26c: 0xc6, 0x26d: 0xc7, 0x26e: 0xc8, 0x26f: 0xc2,
-	0x270: 0xc3, 0x271: 0xc4, 0x272: 0xc5, 0x273: 0xc6, 0x274: 0xc7, 0x275: 0xc8, 0x276: 0xc2, 0x277: 0xc3,
-	0x278: 0xc4, 0x279: 0xc5, 0x27a: 0xc6, 0x27b: 0xc7, 0x27c: 0xc8, 0x27d: 0xc2, 0x27e: 0xc3, 0x27f: 0xc4,
-	// Block 0xa, offset 0x280
-	0x280: 0xc5, 0x281: 0xc6, 0x282: 0xc7, 0x283: 0xc8, 0x284: 0xc2, 0x285: 0xc3, 0x286: 0xc4, 0x287: 0xc5,
-	0x288: 0xc6, 0x289: 0xc7, 0x28a: 0xc8, 0x28b: 0xc2, 0x28c: 0xc3, 0x28d: 0xc4, 0x28e: 0xc5, 0x28f: 0xc6,
-	0x290: 0xc7, 0x291: 0xc8, 0x292: 0xc2, 0x293: 0xc3, 0x294: 0xc4, 0x295: 0xc5, 0x296: 0xc6, 0x297: 0xc7,
-	0x298: 0xc8, 0x299: 0xc2, 0x29a: 0xc3, 0x29b: 0xc4, 0x29c: 0xc5, 0x29d: 0xc6, 0x29e: 0xc7, 0x29f: 0xc8,
-	0x2a0: 0xc2, 0x2a1: 0xc3, 0x2a2: 0xc4, 0x2a3: 0xc5, 0x2a4: 0xc6, 0x2a5: 0xc7, 0x2a6: 0xc8, 0x2a7: 0xc2,
-	0x2a8: 0xc3, 0x2a9: 0xc4, 0x2aa: 0xc5, 0x2ab: 0xc6, 0x2ac: 0xc7, 0x2ad: 0xc8, 0x2ae: 0xc2, 0x2af: 0xc3,
-	0x2b0: 0xc4, 0x2b1: 0xc5, 0x2b2: 0xc6, 0x2b3: 0xc7, 0x2b4: 0xc8, 0x2b5: 0xc2, 0x2b6: 0xc3, 0x2b7: 0xc4,
-	0x2b8: 0xc5, 0x2b9: 0xc6, 0x2ba: 0xc7, 0x2bb: 0xc8, 0x2bc: 0xc2, 0x2bd: 0xc3, 0x2be: 0xc4, 0x2bf: 0xc5,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0xc6, 0x2c1: 0xc7, 0x2c2: 0xc8, 0x2c3: 0xc2, 0x2c4: 0xc3, 0x2c5: 0xc4, 0x2c6: 0xc5, 0x2c7: 0xc6,
-	0x2c8: 0xc7, 0x2c9: 0xc8, 0x2ca: 0xc2, 0x2cb: 0xc3, 0x2cc: 0xc4, 0x2cd: 0xc5, 0x2ce: 0xc6, 0x2cf: 0xc7,
-	0x2d0: 0xc8, 0x2d1: 0xc2, 0x2d2: 0xc3, 0x2d3: 0xc4, 0x2d4: 0xc5, 0x2d5: 0xc6, 0x2d6: 0xc7, 0x2d7: 0xc8,
-	0x2d8: 0xc2, 0x2d9: 0xc3, 0x2da: 0xc4, 0x2db: 0xc5, 0x2dc: 0xc6, 0x2dd: 0xc7, 0x2de: 0xc9,
-	// Block 0xc, offset 0x300
-	0x324: 0x31, 0x325: 0x32, 0x326: 0x33, 0x327: 0x34,
-	0x328: 0x35, 0x329: 0x36, 0x32a: 0x37, 0x32b: 0x38, 0x32c: 0x39, 0x32d: 0x3a, 0x32e: 0x3b, 0x32f: 0x3c,
-	0x330: 0x3d, 0x331: 0x3e, 0x332: 0x3f, 0x333: 0x40, 0x334: 0x41, 0x335: 0x42, 0x336: 0x43, 0x337: 0x44,
-	0x338: 0x45, 0x339: 0x46, 0x33a: 0x47, 0x33b: 0x48, 0x33c: 0xca, 0x33d: 0x49, 0x33e: 0x4a, 0x33f: 0x4b,
-	// Block 0xd, offset 0x340
-	0x347: 0xcb,
-	0x34b: 0xcc, 0x34d: 0xcd,
-	0x35e: 0x4c,
-	0x368: 0xce, 0x36b: 0xcf,
-	0x374: 0xd0,
-	0x37a: 0xd1, 0x37b: 0xd2, 0x37d: 0xd3, 0x37e: 0xd4,
-	// Block 0xe, offset 0x380
-	0x381: 0xd5, 0x382: 0xd6, 0x384: 0xd7, 0x385: 0xbc, 0x387: 0xd8,
-	0x388: 0xd9, 0x38b: 0xda, 0x38c: 0xdb, 0x38d: 0xdc,
-	0x391: 0xdd, 0x392: 0xde, 0x393: 0xdf, 0x396: 0xe0, 0x397: 0xe1,
-	0x398: 0xe2, 0x39a: 0xe3, 0x39c: 0xe4,
-	0x3a0: 0xe5, 0x3a4: 0xe6, 0x3a5: 0xe7, 0x3a7: 0xe8,
-	0x3a8: 0xe9, 0x3a9: 0xea, 0x3aa: 0xeb,
-	0x3b0: 0xe2, 0x3b5: 0xec, 0x3b6: 0xed,
-	0x3bd: 0xee,
-	// Block 0xf, offset 0x3c0
-	0x3eb: 0xef, 0x3ec: 0xf0,
-	0x3ff: 0xf1,
-	// Block 0x10, offset 0x400
-	0x432: 0xf2,
-	// Block 0x11, offset 0x440
-	0x445: 0xf3, 0x446: 0xf4, 0x447: 0xf5,
-	0x449: 0xf6,
-	0x450: 0xf7, 0x451: 0xf8, 0x452: 0xf9, 0x453: 0xfa, 0x454: 0xfb, 0x455: 0xfc, 0x456: 0xfd, 0x457: 0xfe,
-	0x458: 0xff, 0x459: 0x100, 0x45a: 0x4d, 0x45b: 0x101, 0x45c: 0x102, 0x45d: 0x103, 0x45e: 0x104, 0x45f: 0x4e,
-	// Block 0x12, offset 0x480
-	0x480: 0x4f, 0x481: 0x50, 0x482: 0x105, 0x484: 0xf0,
-	0x48a: 0x106, 0x48b: 0x107,
-	0x493: 0x108,
-	0x4a3: 0x109, 0x4a5: 0x10a,
-	0x4b8: 0x51, 0x4b9: 0x52, 0x4ba: 0x53,
-	// Block 0x13, offset 0x4c0
-	0x4c4: 0x54, 0x4c5: 0x10b, 0x4c6: 0x10c,
-	0x4c8: 0x55, 0x4c9: 0x10d,
-	0x4ef: 0x10e,
-	// Block 0x14, offset 0x500
-	0x520: 0x56, 0x521: 0x57, 0x522: 0x58, 0x523: 0x59, 0x524: 0x5a, 0x525: 0x5b, 0x526: 0x5c, 0x527: 0x5d,
-	0x528: 0x5e,
-	// Block 0x15, offset 0x540
-	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
-	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
-	0x56f: 0x12,
-}
-
-// nfkcSparseOffset: 176 entries, 352 bytes
-var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1c, 0x26, 0x36, 0x38, 0x3d, 0x48, 0x57, 0x64, 0x6c, 0x71, 0x76, 0x78, 0x7c, 0x84, 0x8b, 0x8e, 0x96, 0x9a, 0x9e, 0xa0, 0xa2, 0xab, 0xaf, 0xb6, 0xbb, 0xbe, 0xc8, 0xcb, 0xd2, 0xda, 0xde, 0xe0, 0xe4, 0xe8, 0xee, 0xff, 0x10b, 0x10d, 0x113, 0x115, 0x117, 0x119, 0x11b, 0x11d, 0x11f, 0x121, 0x124, 0x127, 0x129, 0x12c, 0x12f, 0x133, 0x139, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x174, 0x182, 0x192, 0x1a0, 0x1a7, 0x1ad, 0x1bc, 0x1c0, 0x1c2, 0x1c6, 0x1c8, 0x1cb, 0x1cd, 0x1d0, 0x1d2, 0x1d5, 0x1d7, 0x1d9, 0x1db, 0x1e7, 0x1f1, 0x1fb, 0x1fe, 0x202, 0x204, 0x206, 0x20b, 0x20e, 0x211, 0x213, 0x215, 0x217, 0x219, 0x21f, 0x222, 0x227, 0x229, 0x230, 0x236, 0x23c, 0x244, 0x24a, 0x250, 0x256, 0x25a, 0x25c, 0x25e, 0x260, 0x262, 0x268, 0x26b, 0x26d, 0x26f, 0x271, 0x277, 0x27b, 0x27f, 0x287, 0x28e, 0x291, 0x294, 0x296, 0x299, 0x2a1, 0x2a5, 0x2ac, 0x2af, 0x2b5, 0x2b7, 0x2b9, 0x2bc, 0x2be, 0x2c1, 0x2c6, 0x2c8, 0x2ca, 0x2cc, 0x2ce, 0x2d0, 0x2d3, 0x2d5, 0x2d7, 0x2d9, 0x2db, 0x2dd, 0x2df, 0x2ec, 0x2f6, 0x2f8, 0x2fa, 0x2fe, 0x303, 0x30f, 0x314, 0x31d, 0x323, 0x328, 0x32c, 0x331, 0x335, 0x345, 0x353, 0x361, 0x36f, 0x371, 0x373, 0x375, 0x379, 0x37b, 0x37e, 0x389, 0x38b, 0x395}
-
-// nfkcSparseValues: 919 entries, 3676 bytes
-var nfkcSparseValues = [919]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0002, lo: 0x0d},
-	{value: 0x0001, lo: 0xa0, hi: 0xa0},
-	{value: 0x43b9, lo: 0xa8, hi: 0xa8},
-	{value: 0x0083, lo: 0xaa, hi: 0xaa},
-	{value: 0x43a5, lo: 0xaf, hi: 0xaf},
-	{value: 0x0025, lo: 0xb2, hi: 0xb3},
-	{value: 0x439b, lo: 0xb4, hi: 0xb4},
-	{value: 0x0260, lo: 0xb5, hi: 0xb5},
-	{value: 0x43d2, lo: 0xb8, hi: 0xb8},
-	{value: 0x0023, lo: 0xb9, hi: 0xb9},
-	{value: 0x009f, lo: 0xba, hi: 0xba},
-	{value: 0x234c, lo: 0xbc, hi: 0xbc},
-	{value: 0x2340, lo: 0xbd, hi: 0xbd},
-	{value: 0x23e2, lo: 0xbe, hi: 0xbe},
-	// Block 0x1, offset 0xe
-	{value: 0x0091, lo: 0x03},
-	{value: 0x4823, lo: 0xa0, hi: 0xa1},
-	{value: 0x4855, lo: 0xaf, hi: 0xb0},
-	{value: 0xa000, lo: 0xb7, hi: 0xb7},
-	// Block 0x2, offset 0x12
-	{value: 0x0004, lo: 0x09},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x0091, lo: 0xb0, hi: 0xb0},
-	{value: 0x0140, lo: 0xb1, hi: 0xb1},
-	{value: 0x0095, lo: 0xb2, hi: 0xb2},
-	{value: 0x00a5, lo: 0xb3, hi: 0xb3},
-	{value: 0x0179, lo: 0xb4, hi: 0xb4},
-	{value: 0x017f, lo: 0xb5, hi: 0xb5},
-	{value: 0x018b, lo: 0xb6, hi: 0xb6},
-	{value: 0x00af, lo: 0xb7, hi: 0xb8},
-	// Block 0x3, offset 0x1c
-	{value: 0x000a, lo: 0x09},
-	{value: 0x43af, lo: 0x98, hi: 0x98},
-	{value: 0x43b4, lo: 0x99, hi: 0x9a},
-	{value: 0x43d7, lo: 0x9b, hi: 0x9b},
-	{value: 0x43a0, lo: 0x9c, hi: 0x9c},
-	{value: 0x43c3, lo: 0x9d, hi: 0x9d},
-	{value: 0x0137, lo: 0xa0, hi: 0xa0},
-	{value: 0x0099, lo: 0xa1, hi: 0xa1},
-	{value: 0x00a7, lo: 0xa2, hi: 0xa3},
-	{value: 0x01b8, lo: 0xa4, hi: 0xa4},
-	// Block 0x4, offset 0x26
-	{value: 0x0000, lo: 0x0f},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0xa000, lo: 0x8d, hi: 0x8d},
-	{value: 0x38e6, lo: 0x90, hi: 0x90},
-	{value: 0x38f2, lo: 0x91, hi: 0x91},
-	{value: 0x38e0, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x96, hi: 0x96},
-	{value: 0x3958, lo: 0x97, hi: 0x97},
-	{value: 0x3922, lo: 0x9c, hi: 0x9c},
-	{value: 0x390a, lo: 0x9d, hi: 0x9d},
-	{value: 0x3934, lo: 0x9e, hi: 0x9e},
-	{value: 0xa000, lo: 0xb4, hi: 0xb5},
-	{value: 0x395e, lo: 0xb6, hi: 0xb6},
-	{value: 0x3964, lo: 0xb7, hi: 0xb7},
-	// Block 0x5, offset 0x36
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x83, hi: 0x87},
-	// Block 0x6, offset 0x38
-	{value: 0x0001, lo: 0x04},
-	{value: 0x8114, lo: 0x81, hi: 0x82},
-	{value: 0x8133, lo: 0x84, hi: 0x84},
-	{value: 0x812e, lo: 0x85, hi: 0x85},
-	{value: 0x810e, lo: 0x87, hi: 0x87},
-	// Block 0x7, offset 0x3d
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8133, lo: 0x90, hi: 0x97},
-	{value: 0x811a, lo: 0x98, hi: 0x98},
-	{value: 0x811b, lo: 0x99, hi: 0x99},
-	{value: 0x811c, lo: 0x9a, hi: 0x9a},
-	{value: 0x3982, lo: 0xa2, hi: 0xa2},
-	{value: 0x3988, lo: 0xa3, hi: 0xa3},
-	{value: 0x3994, lo: 0xa4, hi: 0xa4},
-	{value: 0x398e, lo: 0xa5, hi: 0xa5},
-	{value: 0x399a, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xa7, hi: 0xa7},
-	// Block 0x8, offset 0x48
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x39ac, lo: 0x80, hi: 0x80},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0x39a0, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x39a6, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x95, hi: 0x95},
-	{value: 0x8133, lo: 0x96, hi: 0x9c},
-	{value: 0x8133, lo: 0x9f, hi: 0xa2},
-	{value: 0x812e, lo: 0xa3, hi: 0xa3},
-	{value: 0x8133, lo: 0xa4, hi: 0xa4},
-	{value: 0x8133, lo: 0xa7, hi: 0xa8},
-	{value: 0x812e, lo: 0xaa, hi: 0xaa},
-	{value: 0x8133, lo: 0xab, hi: 0xac},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	// Block 0x9, offset 0x57
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x8120, lo: 0x91, hi: 0x91},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	{value: 0x812e, lo: 0xb1, hi: 0xb1},
-	{value: 0x8133, lo: 0xb2, hi: 0xb3},
-	{value: 0x812e, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb5, hi: 0xb6},
-	{value: 0x812e, lo: 0xb7, hi: 0xb9},
-	{value: 0x8133, lo: 0xba, hi: 0xba},
-	{value: 0x812e, lo: 0xbb, hi: 0xbc},
-	{value: 0x8133, lo: 0xbd, hi: 0xbd},
-	{value: 0x812e, lo: 0xbe, hi: 0xbe},
-	{value: 0x8133, lo: 0xbf, hi: 0xbf},
-	// Block 0xa, offset 0x64
-	{value: 0x0005, lo: 0x07},
-	{value: 0x8133, lo: 0x80, hi: 0x80},
-	{value: 0x8133, lo: 0x81, hi: 0x81},
-	{value: 0x812e, lo: 0x82, hi: 0x83},
-	{value: 0x812e, lo: 0x84, hi: 0x85},
-	{value: 0x812e, lo: 0x86, hi: 0x87},
-	{value: 0x812e, lo: 0x88, hi: 0x89},
-	{value: 0x8133, lo: 0x8a, hi: 0x8a},
-	// Block 0xb, offset 0x6c
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8133, lo: 0xab, hi: 0xb1},
-	{value: 0x812e, lo: 0xb2, hi: 0xb2},
-	{value: 0x8133, lo: 0xb3, hi: 0xb3},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	// Block 0xc, offset 0x71
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8133, lo: 0x96, hi: 0x99},
-	{value: 0x8133, lo: 0x9b, hi: 0xa3},
-	{value: 0x8133, lo: 0xa5, hi: 0xa7},
-	{value: 0x8133, lo: 0xa9, hi: 0xad},
-	// Block 0xd, offset 0x76
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x99, hi: 0x9b},
-	// Block 0xe, offset 0x78
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8133, lo: 0x98, hi: 0x98},
-	{value: 0x812e, lo: 0x99, hi: 0x9b},
-	{value: 0x8133, lo: 0x9c, hi: 0x9f},
-	// Block 0xf, offset 0x7c
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0xa8, hi: 0xa8},
-	{value: 0x4019, lo: 0xa9, hi: 0xa9},
-	{value: 0xa000, lo: 0xb0, hi: 0xb0},
-	{value: 0x4021, lo: 0xb1, hi: 0xb1},
-	{value: 0xa000, lo: 0xb3, hi: 0xb3},
-	{value: 0x4029, lo: 0xb4, hi: 0xb4},
-	{value: 0x9903, lo: 0xbc, hi: 0xbc},
-	// Block 0x10, offset 0x84
-	{value: 0x0008, lo: 0x06},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x8133, lo: 0x91, hi: 0x91},
-	{value: 0x812e, lo: 0x92, hi: 0x92},
-	{value: 0x8133, lo: 0x93, hi: 0x93},
-	{value: 0x8133, lo: 0x94, hi: 0x94},
-	{value: 0x465d, lo: 0x98, hi: 0x9f},
-	// Block 0x11, offset 0x8b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x12, offset 0x8e
-	{value: 0x0008, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2dd5, lo: 0x8b, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x469d, lo: 0x9c, hi: 0x9d},
-	{value: 0x46ad, lo: 0x9f, hi: 0x9f},
-	{value: 0x8133, lo: 0xbe, hi: 0xbe},
-	// Block 0x13, offset 0x96
-	{value: 0x0000, lo: 0x03},
-	{value: 0x46d5, lo: 0xb3, hi: 0xb3},
-	{value: 0x46dd, lo: 0xb6, hi: 0xb6},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	// Block 0x14, offset 0x9a
-	{value: 0x0008, lo: 0x03},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x46b5, lo: 0x99, hi: 0x9b},
-	{value: 0x46cd, lo: 0x9e, hi: 0x9e},
-	// Block 0x15, offset 0x9e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	// Block 0x16, offset 0xa0
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	// Block 0x17, offset 0xa2
-	{value: 0x0000, lo: 0x08},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2ded, lo: 0x88, hi: 0x88},
-	{value: 0x2de5, lo: 0x8b, hi: 0x8b},
-	{value: 0x2df5, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x46e5, lo: 0x9c, hi: 0x9c},
-	{value: 0x46ed, lo: 0x9d, hi: 0x9d},
-	// Block 0x18, offset 0xab
-	{value: 0x0000, lo: 0x03},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x2dfd, lo: 0x94, hi: 0x94},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x19, offset 0xaf
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2e05, lo: 0x8a, hi: 0x8a},
-	{value: 0x2e15, lo: 0x8b, hi: 0x8b},
-	{value: 0x2e0d, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1a, offset 0xb6
-	{value: 0x1801, lo: 0x04},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x4031, lo: 0x88, hi: 0x88},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x8121, lo: 0x95, hi: 0x96},
-	// Block 0x1b, offset 0xbb
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbc, hi: 0xbc},
-	{value: 0xa000, lo: 0xbf, hi: 0xbf},
-	// Block 0x1c, offset 0xbe
-	{value: 0x0000, lo: 0x09},
-	{value: 0x2e1d, lo: 0x80, hi: 0x80},
-	{value: 0x9900, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x2e25, lo: 0x87, hi: 0x87},
-	{value: 0x2e2d, lo: 0x88, hi: 0x88},
-	{value: 0x3091, lo: 0x8a, hi: 0x8a},
-	{value: 0x2f19, lo: 0x8b, hi: 0x8b},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x95, hi: 0x96},
-	// Block 0x1d, offset 0xc8
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xbb, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1e, offset 0xcb
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2e35, lo: 0x8a, hi: 0x8a},
-	{value: 0x2e45, lo: 0x8b, hi: 0x8b},
-	{value: 0x2e3d, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1f, offset 0xd2
-	{value: 0x6ab3, lo: 0x07},
-	{value: 0x9905, lo: 0x8a, hi: 0x8a},
-	{value: 0x9900, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4039, lo: 0x9a, hi: 0x9a},
-	{value: 0x3099, lo: 0x9c, hi: 0x9c},
-	{value: 0x2f24, lo: 0x9d, hi: 0x9d},
-	{value: 0x2e4d, lo: 0x9e, hi: 0x9f},
-	// Block 0x20, offset 0xda
-	{value: 0x0000, lo: 0x03},
-	{value: 0x2751, lo: 0xb3, hi: 0xb3},
-	{value: 0x8123, lo: 0xb8, hi: 0xb9},
-	{value: 0x8105, lo: 0xba, hi: 0xba},
-	// Block 0x21, offset 0xde
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8124, lo: 0x88, hi: 0x8b},
-	// Block 0x22, offset 0xe0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x2766, lo: 0xb3, hi: 0xb3},
-	{value: 0x8125, lo: 0xb8, hi: 0xb9},
-	{value: 0x8105, lo: 0xba, hi: 0xba},
-	// Block 0x23, offset 0xe4
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8126, lo: 0x88, hi: 0x8b},
-	{value: 0x2758, lo: 0x9c, hi: 0x9c},
-	{value: 0x275f, lo: 0x9d, hi: 0x9d},
-	// Block 0x24, offset 0xe8
-	{value: 0x0000, lo: 0x05},
-	{value: 0x03fe, lo: 0x8c, hi: 0x8c},
-	{value: 0x812e, lo: 0x98, hi: 0x99},
-	{value: 0x812e, lo: 0xb5, hi: 0xb5},
-	{value: 0x812e, lo: 0xb7, hi: 0xb7},
-	{value: 0x812c, lo: 0xb9, hi: 0xb9},
-	// Block 0x25, offset 0xee
-	{value: 0x0000, lo: 0x10},
-	{value: 0x2774, lo: 0x83, hi: 0x83},
-	{value: 0x277b, lo: 0x8d, hi: 0x8d},
-	{value: 0x2782, lo: 0x92, hi: 0x92},
-	{value: 0x2789, lo: 0x97, hi: 0x97},
-	{value: 0x2790, lo: 0x9c, hi: 0x9c},
-	{value: 0x276d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8127, lo: 0xb1, hi: 0xb1},
-	{value: 0x8128, lo: 0xb2, hi: 0xb2},
-	{value: 0x4bc5, lo: 0xb3, hi: 0xb3},
-	{value: 0x8129, lo: 0xb4, hi: 0xb4},
-	{value: 0x4bce, lo: 0xb5, hi: 0xb5},
-	{value: 0x46f5, lo: 0xb6, hi: 0xb6},
-	{value: 0x4735, lo: 0xb7, hi: 0xb7},
-	{value: 0x46fd, lo: 0xb8, hi: 0xb8},
-	{value: 0x4740, lo: 0xb9, hi: 0xb9},
-	{value: 0x8128, lo: 0xba, hi: 0xbd},
-	// Block 0x26, offset 0xff
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x8128, lo: 0x80, hi: 0x80},
-	{value: 0x4bd7, lo: 0x81, hi: 0x81},
-	{value: 0x8133, lo: 0x82, hi: 0x83},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0x86, hi: 0x87},
-	{value: 0x279e, lo: 0x93, hi: 0x93},
-	{value: 0x27a5, lo: 0x9d, hi: 0x9d},
-	{value: 0x27ac, lo: 0xa2, hi: 0xa2},
-	{value: 0x27b3, lo: 0xa7, hi: 0xa7},
-	{value: 0x27ba, lo: 0xac, hi: 0xac},
-	{value: 0x2797, lo: 0xb9, hi: 0xb9},
-	// Block 0x27, offset 0x10b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x86, hi: 0x86},
-	// Block 0x28, offset 0x10d
-	{value: 0x0000, lo: 0x05},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x2e55, lo: 0xa6, hi: 0xa6},
-	{value: 0x9900, lo: 0xae, hi: 0xae},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	{value: 0x8105, lo: 0xb9, hi: 0xba},
-	// Block 0x29, offset 0x113
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x8d, hi: 0x8d},
-	// Block 0x2a, offset 0x115
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0402, lo: 0xbc, hi: 0xbc},
-	// Block 0x2b, offset 0x117
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x119
-	{value: 0x0000, lo: 0x01},
-	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x11b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x11d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x11f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x121
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x94, hi: 0x95},
-	{value: 0x8105, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x124
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x92, hi: 0x92},
-	{value: 0x8133, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x127
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x129
-	{value: 0x0004, lo: 0x02},
-	{value: 0x812f, lo: 0xb9, hi: 0xba},
-	{value: 0x812e, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x12c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x97, hi: 0x97},
-	{value: 0x812e, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x12f
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0xa0, hi: 0xa0},
-	{value: 0x8133, lo: 0xb5, hi: 0xbc},
-	{value: 0x812e, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x133
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8133, lo: 0xb0, hi: 0xb4},
-	{value: 0x812e, lo: 0xb5, hi: 0xba},
-	{value: 0x8133, lo: 0xbb, hi: 0xbc},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	{value: 0x812e, lo: 0xbf, hi: 0xbf},
-	// Block 0x37, offset 0x139
-	{value: 0x0000, lo: 0x06},
-	{value: 0x812e, lo: 0x80, hi: 0x80},
-	{value: 0x8133, lo: 0x81, hi: 0x82},
-	{value: 0x812e, lo: 0x83, hi: 0x84},
-	{value: 0x8133, lo: 0x85, hi: 0x89},
-	{value: 0x812e, lo: 0x8a, hi: 0x8a},
-	{value: 0x8133, lo: 0x8b, hi: 0x8e},
-	// Block 0x38, offset 0x140
-	{value: 0x0000, lo: 0x08},
-	{value: 0x2e9d, lo: 0x80, hi: 0x80},
-	{value: 0x2ea5, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x82, hi: 0x82},
-	{value: 0x2ead, lo: 0x83, hi: 0x83},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0xab, hi: 0xab},
-	{value: 0x812e, lo: 0xac, hi: 0xac},
-	{value: 0x8133, lo: 0xad, hi: 0xb3},
-	// Block 0x39, offset 0x149
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xaa, hi: 0xab},
-	// Block 0x3a, offset 0x14b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xa6, hi: 0xa6},
-	{value: 0x8105, lo: 0xb2, hi: 0xb3},
-	// Block 0x3b, offset 0x14e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	// Block 0x3c, offset 0x150
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8133, lo: 0x90, hi: 0x92},
-	{value: 0x8101, lo: 0x94, hi: 0x94},
-	{value: 0x812e, lo: 0x95, hi: 0x99},
-	{value: 0x8133, lo: 0x9a, hi: 0x9b},
-	{value: 0x812e, lo: 0x9c, hi: 0x9f},
-	{value: 0x8133, lo: 0xa0, hi: 0xa0},
-	{value: 0x8101, lo: 0xa2, hi: 0xa8},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	{value: 0x8133, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb8, hi: 0xb9},
-	// Block 0x3d, offset 0x15b
-	{value: 0x0002, lo: 0x0a},
-	{value: 0x0043, lo: 0xac, hi: 0xac},
-	{value: 0x00d1, lo: 0xad, hi: 0xad},
-	{value: 0x0045, lo: 0xae, hi: 0xae},
-	{value: 0x0049, lo: 0xb0, hi: 0xb1},
-	{value: 0x00ec, lo: 0xb2, hi: 0xb2},
-	{value: 0x004f, lo: 0xb3, hi: 0xba},
-	{value: 0x005f, lo: 0xbc, hi: 0xbc},
-	{value: 0x00fe, lo: 0xbd, hi: 0xbd},
-	{value: 0x0061, lo: 0xbe, hi: 0xbe},
-	{value: 0x0065, lo: 0xbf, hi: 0xbf},
-	// Block 0x3e, offset 0x166
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0001, lo: 0x80, hi: 0x8a},
-	{value: 0x0532, lo: 0x91, hi: 0x91},
-	{value: 0x43dc, lo: 0x97, hi: 0x97},
-	{value: 0x001d, lo: 0xa4, hi: 0xa4},
-	{value: 0x19a0, lo: 0xa5, hi: 0xa5},
-	{value: 0x1c8c, lo: 0xa6, hi: 0xa6},
-	{value: 0x0001, lo: 0xaf, hi: 0xaf},
-	{value: 0x27c1, lo: 0xb3, hi: 0xb3},
-	{value: 0x2935, lo: 0xb4, hi: 0xb4},
-	{value: 0x27c8, lo: 0xb6, hi: 0xb6},
-	{value: 0x293f, lo: 0xb7, hi: 0xb7},
-	{value: 0x199a, lo: 0xbc, hi: 0xbc},
-	{value: 0x43aa, lo: 0xbe, hi: 0xbe},
-	// Block 0x3f, offset 0x174
-	{value: 0x0002, lo: 0x0d},
-	{value: 0x1a60, lo: 0x87, hi: 0x87},
-	{value: 0x1a5d, lo: 0x88, hi: 0x88},
-	{value: 0x199d, lo: 0x89, hi: 0x89},
-	{value: 0x2ac5, lo: 0x97, hi: 0x97},
-	{value: 0x0001, lo: 0x9f, hi: 0x9f},
-	{value: 0x0021, lo: 0xb0, hi: 0xb0},
-	{value: 0x0093, lo: 0xb1, hi: 0xb1},
-	{value: 0x0029, lo: 0xb4, hi: 0xb9},
-	{value: 0x0017, lo: 0xba, hi: 0xba},
-	{value: 0x055e, lo: 0xbb, hi: 0xbb},
-	{value: 0x003b, lo: 0xbc, hi: 0xbc},
-	{value: 0x0011, lo: 0xbd, hi: 0xbe},
-	{value: 0x009d, lo: 0xbf, hi: 0xbf},
-	// Block 0x40, offset 0x182
-	{value: 0x0002, lo: 0x0f},
-	{value: 0x0021, lo: 0x80, hi: 0x89},
-	{value: 0x0017, lo: 0x8a, hi: 0x8a},
-	{value: 0x055e, lo: 0x8b, hi: 0x8b},
-	{value: 0x003b, lo: 0x8c, hi: 0x8c},
-	{value: 0x0011, lo: 0x8d, hi: 0x8e},
-	{value: 0x0083, lo: 0x90, hi: 0x90},
-	{value: 0x008b, lo: 0x91, hi: 0x91},
-	{value: 0x009f, lo: 0x92, hi: 0x92},
-	{value: 0x00b1, lo: 0x93, hi: 0x93},
-	{value: 0x011f, lo: 0x94, hi: 0x94},
-	{value: 0x0091, lo: 0x95, hi: 0x95},
-	{value: 0x0097, lo: 0x96, hi: 0x99},
-	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
-	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
-	{value: 0x1ac9, lo: 0xa8, hi: 0xa8},
-	// Block 0x41, offset 0x192
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x8133, lo: 0x90, hi: 0x91},
-	{value: 0x8101, lo: 0x92, hi: 0x93},
-	{value: 0x8133, lo: 0x94, hi: 0x97},
-	{value: 0x8101, lo: 0x98, hi: 0x9a},
-	{value: 0x8133, lo: 0x9b, hi: 0x9c},
-	{value: 0x8133, lo: 0xa1, hi: 0xa1},
-	{value: 0x8101, lo: 0xa5, hi: 0xa6},
-	{value: 0x8133, lo: 0xa7, hi: 0xa7},
-	{value: 0x812e, lo: 0xa8, hi: 0xa8},
-	{value: 0x8133, lo: 0xa9, hi: 0xa9},
-	{value: 0x8101, lo: 0xaa, hi: 0xab},
-	{value: 0x812e, lo: 0xac, hi: 0xaf},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	// Block 0x42, offset 0x1a0
-	{value: 0x0007, lo: 0x06},
-	{value: 0x22b0, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	{value: 0x3cfa, lo: 0x9a, hi: 0x9b},
-	{value: 0x3d08, lo: 0xae, hi: 0xae},
-	// Block 0x43, offset 0x1a7
-	{value: 0x000e, lo: 0x05},
-	{value: 0x3d0f, lo: 0x8d, hi: 0x8e},
-	{value: 0x3d16, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x44, offset 0x1ad
-	{value: 0x017a, lo: 0x0e},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0x3d24, lo: 0x84, hi: 0x84},
-	{value: 0xa000, lo: 0x88, hi: 0x88},
-	{value: 0x3d2b, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0x3d32, lo: 0x8c, hi: 0x8c},
-	{value: 0xa000, lo: 0xa3, hi: 0xa3},
-	{value: 0x3d39, lo: 0xa4, hi: 0xa4},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x3d40, lo: 0xa6, hi: 0xa6},
-	{value: 0x27cf, lo: 0xac, hi: 0xad},
-	{value: 0x27d6, lo: 0xaf, hi: 0xaf},
-	{value: 0x2953, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x45, offset 0x1bc
-	{value: 0x0007, lo: 0x03},
-	{value: 0x3da9, lo: 0xa0, hi: 0xa1},
-	{value: 0x3dd3, lo: 0xa2, hi: 0xa3},
-	{value: 0x3dfd, lo: 0xaa, hi: 0xad},
-	// Block 0x46, offset 0x1c0
-	{value: 0x0004, lo: 0x01},
-	{value: 0x0586, lo: 0xa9, hi: 0xaa},
-	// Block 0x47, offset 0x1c2
-	{value: 0x0002, lo: 0x03},
-	{value: 0x0057, lo: 0x80, hi: 0x8f},
-	{value: 0x0083, lo: 0x90, hi: 0xa9},
-	{value: 0x0021, lo: 0xaa, hi: 0xaa},
-	// Block 0x48, offset 0x1c6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x2ad2, lo: 0x8c, hi: 0x8c},
-	// Block 0x49, offset 0x1c8
-	{value: 0x0266, lo: 0x02},
-	{value: 0x1cbc, lo: 0xb4, hi: 0xb4},
-	{value: 0x1a5a, lo: 0xb5, hi: 0xb6},
-	// Block 0x4a, offset 0x1cb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x461e, lo: 0x9c, hi: 0x9c},
-	// Block 0x4b, offset 0x1cd
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0095, lo: 0xbc, hi: 0xbc},
-	{value: 0x006d, lo: 0xbd, hi: 0xbd},
-	// Block 0x4c, offset 0x1d0
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xaf, hi: 0xb1},
-	// Block 0x4d, offset 0x1d2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x057a, lo: 0xaf, hi: 0xaf},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x4e, offset 0x1d5
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xa0, hi: 0xbf},
-	// Block 0x4f, offset 0x1d7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0ebe, lo: 0x9f, hi: 0x9f},
-	// Block 0x50, offset 0x1d9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x172a, lo: 0xb3, hi: 0xb3},
-	// Block 0x51, offset 0x1db
-	{value: 0x0004, lo: 0x0b},
-	{value: 0x1692, lo: 0x80, hi: 0x82},
-	{value: 0x16aa, lo: 0x83, hi: 0x83},
-	{value: 0x16c2, lo: 0x84, hi: 0x85},
-	{value: 0x16d2, lo: 0x86, hi: 0x89},
-	{value: 0x16e6, lo: 0x8a, hi: 0x8c},
-	{value: 0x16fa, lo: 0x8d, hi: 0x8d},
-	{value: 0x1702, lo: 0x8e, hi: 0x8e},
-	{value: 0x170a, lo: 0x8f, hi: 0x90},
-	{value: 0x1716, lo: 0x91, hi: 0x93},
-	{value: 0x1726, lo: 0x94, hi: 0x94},
-	{value: 0x172e, lo: 0x95, hi: 0x95},
-	// Block 0x52, offset 0x1e7
-	{value: 0x0004, lo: 0x09},
-	{value: 0x0001, lo: 0x80, hi: 0x80},
-	{value: 0x812d, lo: 0xaa, hi: 0xaa},
-	{value: 0x8132, lo: 0xab, hi: 0xab},
-	{value: 0x8134, lo: 0xac, hi: 0xac},
-	{value: 0x812f, lo: 0xad, hi: 0xad},
-	{value: 0x8130, lo: 0xae, hi: 0xae},
-	{value: 0x8130, lo: 0xaf, hi: 0xaf},
-	{value: 0x05ae, lo: 0xb6, hi: 0xb6},
-	{value: 0x0982, lo: 0xb8, hi: 0xba},
-	// Block 0x53, offset 0x1f1
-	{value: 0x0006, lo: 0x09},
-	{value: 0x0406, lo: 0xb1, hi: 0xb1},
-	{value: 0x040a, lo: 0xb2, hi: 0xb2},
-	{value: 0x4b7c, lo: 0xb3, hi: 0xb3},
-	{value: 0x040e, lo: 0xb4, hi: 0xb4},
-	{value: 0x4b82, lo: 0xb5, hi: 0xb6},
-	{value: 0x0412, lo: 0xb7, hi: 0xb7},
-	{value: 0x0416, lo: 0xb8, hi: 0xb8},
-	{value: 0x041a, lo: 0xb9, hi: 0xb9},
-	{value: 0x4b8e, lo: 0xba, hi: 0xbf},
-	// Block 0x54, offset 0x1fb
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0xaf, hi: 0xaf},
-	{value: 0x8133, lo: 0xb4, hi: 0xbd},
-	// Block 0x55, offset 0x1fe
-	{value: 0x0000, lo: 0x03},
-	{value: 0x02d8, lo: 0x9c, hi: 0x9c},
-	{value: 0x02de, lo: 0x9d, hi: 0x9d},
-	{value: 0x8133, lo: 0x9e, hi: 0x9f},
-	// Block 0x56, offset 0x202
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb0, hi: 0xb1},
-	// Block 0x57, offset 0x204
-	{value: 0x0000, lo: 0x01},
-	{value: 0x173e, lo: 0xb0, hi: 0xb0},
-	// Block 0x58, offset 0x206
-	{value: 0x0006, lo: 0x04},
-	{value: 0x0047, lo: 0xb2, hi: 0xb3},
-	{value: 0x0063, lo: 0xb4, hi: 0xb4},
-	{value: 0x00dd, lo: 0xb8, hi: 0xb8},
-	{value: 0x00e9, lo: 0xb9, hi: 0xb9},
-	// Block 0x59, offset 0x20b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x86, hi: 0x86},
-	{value: 0x8105, lo: 0xac, hi: 0xac},
-	// Block 0x5a, offset 0x20e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x84, hi: 0x84},
-	{value: 0x8133, lo: 0xa0, hi: 0xb1},
-	// Block 0x5b, offset 0x211
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xab, hi: 0xad},
-	// Block 0x5c, offset 0x213
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x93, hi: 0x93},
-	// Block 0x5d, offset 0x215
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0xb3, hi: 0xb3},
-	// Block 0x5e, offset 0x217
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x80, hi: 0x80},
-	// Block 0x5f, offset 0x219
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8133, lo: 0xb0, hi: 0xb0},
-	{value: 0x8133, lo: 0xb2, hi: 0xb3},
-	{value: 0x812e, lo: 0xb4, hi: 0xb4},
-	{value: 0x8133, lo: 0xb7, hi: 0xb8},
-	{value: 0x8133, lo: 0xbe, hi: 0xbf},
-	// Block 0x60, offset 0x21f
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x81, hi: 0x81},
-	{value: 0x8105, lo: 0xb6, hi: 0xb6},
-	// Block 0x61, offset 0x222
-	{value: 0x000c, lo: 0x04},
-	{value: 0x173a, lo: 0x9c, hi: 0x9d},
-	{value: 0x014f, lo: 0x9e, hi: 0x9e},
-	{value: 0x174a, lo: 0x9f, hi: 0x9f},
-	{value: 0x01a6, lo: 0xa9, hi: 0xa9},
-	// Block 0x62, offset 0x227
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xad, hi: 0xad},
-	// Block 0x63, offset 0x229
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe500, lo: 0x80, hi: 0x80},
-	{value: 0xc600, lo: 0x81, hi: 0x9b},
-	{value: 0xe500, lo: 0x9c, hi: 0x9c},
-	{value: 0xc600, lo: 0x9d, hi: 0xb7},
-	{value: 0xe500, lo: 0xb8, hi: 0xb8},
-	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x64, offset 0x230
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x93},
-	{value: 0xe500, lo: 0x94, hi: 0x94},
-	{value: 0xc600, lo: 0x95, hi: 0xaf},
-	{value: 0xe500, lo: 0xb0, hi: 0xb0},
-	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x65, offset 0x236
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8b},
-	{value: 0xe500, lo: 0x8c, hi: 0x8c},
-	{value: 0xc600, lo: 0x8d, hi: 0xa7},
-	{value: 0xe500, lo: 0xa8, hi: 0xa8},
-	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x66, offset 0x23c
-	{value: 0x0000, lo: 0x07},
-	{value: 0xc600, lo: 0x80, hi: 0x83},
-	{value: 0xe500, lo: 0x84, hi: 0x84},
-	{value: 0xc600, lo: 0x85, hi: 0x9f},
-	{value: 0xe500, lo: 0xa0, hi: 0xa0},
-	{value: 0xc600, lo: 0xa1, hi: 0xbb},
-	{value: 0xe500, lo: 0xbc, hi: 0xbc},
-	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x67, offset 0x244
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x97},
-	{value: 0xe500, lo: 0x98, hi: 0x98},
-	{value: 0xc600, lo: 0x99, hi: 0xb3},
-	{value: 0xe500, lo: 0xb4, hi: 0xb4},
-	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x68, offset 0x24a
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8f},
-	{value: 0xe500, lo: 0x90, hi: 0x90},
-	{value: 0xc600, lo: 0x91, hi: 0xab},
-	{value: 0xe500, lo: 0xac, hi: 0xac},
-	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x69, offset 0x250
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	{value: 0xe500, lo: 0xa4, hi: 0xa4},
-	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x6a, offset 0x256
-	{value: 0x0000, lo: 0x03},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x6b, offset 0x25a
-	{value: 0x0002, lo: 0x01},
-	{value: 0x0003, lo: 0x81, hi: 0xbf},
-	// Block 0x6c, offset 0x25c
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xbd, hi: 0xbd},
-	// Block 0x6d, offset 0x25e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xa0, hi: 0xa0},
-	// Block 0x6e, offset 0x260
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb6, hi: 0xba},
-	// Block 0x6f, offset 0x262
-	{value: 0x002d, lo: 0x05},
-	{value: 0x812e, lo: 0x8d, hi: 0x8d},
-	{value: 0x8133, lo: 0x8f, hi: 0x8f},
-	{value: 0x8133, lo: 0xb8, hi: 0xb8},
-	{value: 0x8101, lo: 0xb9, hi: 0xba},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x70, offset 0x268
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0xa5, hi: 0xa5},
-	{value: 0x812e, lo: 0xa6, hi: 0xa6},
-	// Block 0x71, offset 0x26b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xa4, hi: 0xa7},
-	// Block 0x72, offset 0x26d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xab, hi: 0xac},
-	// Block 0x73, offset 0x26f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0xbd, hi: 0xbf},
-	// Block 0x74, offset 0x271
-	{value: 0x0000, lo: 0x05},
-	{value: 0x812e, lo: 0x86, hi: 0x87},
-	{value: 0x8133, lo: 0x88, hi: 0x8a},
-	{value: 0x812e, lo: 0x8b, hi: 0x8b},
-	{value: 0x8133, lo: 0x8c, hi: 0x8c},
-	{value: 0x812e, lo: 0x8d, hi: 0x90},
-	// Block 0x75, offset 0x277
-	{value: 0x0005, lo: 0x03},
-	{value: 0x8133, lo: 0x82, hi: 0x82},
-	{value: 0x812e, lo: 0x83, hi: 0x84},
-	{value: 0x812e, lo: 0x85, hi: 0x85},
-	// Block 0x76, offset 0x27b
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0x86, hi: 0x86},
-	{value: 0x8105, lo: 0xb0, hi: 0xb0},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x77, offset 0x27f
-	{value: 0x17fe, lo: 0x07},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4379, lo: 0x9a, hi: 0x9a},
-	{value: 0xa000, lo: 0x9b, hi: 0x9b},
-	{value: 0x4383, lo: 0x9c, hi: 0x9c},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x438d, lo: 0xab, hi: 0xab},
-	{value: 0x8105, lo: 0xb9, hi: 0xba},
-	// Block 0x78, offset 0x287
-	{value: 0x0000, lo: 0x06},
-	{value: 0x8133, lo: 0x80, hi: 0x82},
-	{value: 0x9900, lo: 0xa7, hi: 0xa7},
-	{value: 0x2eb5, lo: 0xae, hi: 0xae},
-	{value: 0x2ebf, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb1, hi: 0xb2},
-	{value: 0x8105, lo: 0xb3, hi: 0xb4},
-	// Block 0x79, offset 0x28e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x80, hi: 0x80},
-	{value: 0x8103, lo: 0x8a, hi: 0x8a},
-	// Block 0x7a, offset 0x291
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb5, hi: 0xb5},
-	{value: 0x8103, lo: 0xb6, hi: 0xb6},
-	// Block 0x7b, offset 0x294
-	{value: 0x0002, lo: 0x01},
-	{value: 0x8103, lo: 0xa9, hi: 0xaa},
-	// Block 0x7c, offset 0x296
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0xbb, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x7d, offset 0x299
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2ec9, lo: 0x8b, hi: 0x8b},
-	{value: 0x2ed3, lo: 0x8c, hi: 0x8c},
-	{value: 0x8105, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x8133, lo: 0xa6, hi: 0xac},
-	{value: 0x8133, lo: 0xb0, hi: 0xb4},
-	// Block 0x7e, offset 0x2a1
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8105, lo: 0x82, hi: 0x82},
-	{value: 0x8103, lo: 0x86, hi: 0x86},
-	{value: 0x8133, lo: 0x9e, hi: 0x9e},
-	// Block 0x7f, offset 0x2a5
-	{value: 0x6a23, lo: 0x06},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb9, hi: 0xb9},
-	{value: 0x9900, lo: 0xba, hi: 0xba},
-	{value: 0x2ee7, lo: 0xbb, hi: 0xbb},
-	{value: 0x2edd, lo: 0xbc, hi: 0xbd},
-	{value: 0x2ef1, lo: 0xbe, hi: 0xbe},
-	// Block 0x80, offset 0x2ac
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0x82, hi: 0x82},
-	{value: 0x8103, lo: 0x83, hi: 0x83},
-	// Block 0x81, offset 0x2af
-	{value: 0x0000, lo: 0x05},
-	{value: 0x9900, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb8, hi: 0xb9},
-	{value: 0x2efb, lo: 0xba, hi: 0xba},
-	{value: 0x2f05, lo: 0xbb, hi: 0xbb},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x82, offset 0x2b5
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0x80, hi: 0x80},
-	// Block 0x83, offset 0x2b7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xbf, hi: 0xbf},
-	// Block 0x84, offset 0x2b9
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb6, hi: 0xb6},
-	{value: 0x8103, lo: 0xb7, hi: 0xb7},
-	// Block 0x85, offset 0x2bc
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xab, hi: 0xab},
-	// Block 0x86, offset 0x2be
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8105, lo: 0xb9, hi: 0xb9},
-	{value: 0x8103, lo: 0xba, hi: 0xba},
-	// Block 0x87, offset 0x2c1
-	{value: 0x0000, lo: 0x04},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb5, hi: 0xb5},
-	{value: 0x2f0f, lo: 0xb8, hi: 0xb8},
-	{value: 0x8105, lo: 0xbd, hi: 0xbe},
-	// Block 0x88, offset 0x2c6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8103, lo: 0x83, hi: 0x83},
-	// Block 0x89, offset 0x2c8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xa0, hi: 0xa0},
-	// Block 0x8a, offset 0x2ca
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0xb4, hi: 0xb4},
-	// Block 0x8b, offset 0x2cc
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x87, hi: 0x87},
-	// Block 0x8c, offset 0x2ce
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x99, hi: 0x99},
-	// Block 0x8d, offset 0x2d0
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8103, lo: 0x82, hi: 0x82},
-	{value: 0x8105, lo: 0x84, hi: 0x85},
-	// Block 0x8e, offset 0x2d3
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x97, hi: 0x97},
-	// Block 0x8f, offset 0x2d5
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8105, lo: 0x81, hi: 0x82},
-	// Block 0x90, offset 0x2d7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x91, offset 0x2d9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xb0, hi: 0xb6},
-	// Block 0x92, offset 0x2db
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb0, hi: 0xb1},
-	// Block 0x93, offset 0x2dd
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x94, offset 0x2df
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x470d, lo: 0x9e, hi: 0x9e},
-	{value: 0x4717, lo: 0x9f, hi: 0x9f},
-	{value: 0x474b, lo: 0xa0, hi: 0xa0},
-	{value: 0x4759, lo: 0xa1, hi: 0xa1},
-	{value: 0x4767, lo: 0xa2, hi: 0xa2},
-	{value: 0x4775, lo: 0xa3, hi: 0xa3},
-	{value: 0x4783, lo: 0xa4, hi: 0xa4},
-	{value: 0x812c, lo: 0xa5, hi: 0xa6},
-	{value: 0x8101, lo: 0xa7, hi: 0xa9},
-	{value: 0x8131, lo: 0xad, hi: 0xad},
-	{value: 0x812c, lo: 0xae, hi: 0xb2},
-	{value: 0x812e, lo: 0xbb, hi: 0xbf},
-	// Block 0x95, offset 0x2ec
-	{value: 0x0000, lo: 0x09},
-	{value: 0x812e, lo: 0x80, hi: 0x82},
-	{value: 0x8133, lo: 0x85, hi: 0x89},
-	{value: 0x812e, lo: 0x8a, hi: 0x8b},
-	{value: 0x8133, lo: 0xaa, hi: 0xad},
-	{value: 0x4721, lo: 0xbb, hi: 0xbb},
-	{value: 0x472b, lo: 0xbc, hi: 0xbc},
-	{value: 0x4791, lo: 0xbd, hi: 0xbd},
-	{value: 0x47ad, lo: 0xbe, hi: 0xbe},
-	{value: 0x479f, lo: 0xbf, hi: 0xbf},
-	// Block 0x96, offset 0x2f6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x47bb, lo: 0x80, hi: 0x80},
-	// Block 0x97, offset 0x2f8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x82, hi: 0x84},
-	// Block 0x98, offset 0x2fa
-	{value: 0x0002, lo: 0x03},
-	{value: 0x0043, lo: 0x80, hi: 0x99},
-	{value: 0x0083, lo: 0x9a, hi: 0xb3},
-	{value: 0x0043, lo: 0xb4, hi: 0xbf},
-	// Block 0x99, offset 0x2fe
-	{value: 0x0002, lo: 0x04},
-	{value: 0x005b, lo: 0x80, hi: 0x8d},
-	{value: 0x0083, lo: 0x8e, hi: 0x94},
-	{value: 0x0093, lo: 0x96, hi: 0xa7},
-	{value: 0x0043, lo: 0xa8, hi: 0xbf},
-	// Block 0x9a, offset 0x303
-	{value: 0x0002, lo: 0x0b},
-	{value: 0x0073, lo: 0x80, hi: 0x81},
-	{value: 0x0083, lo: 0x82, hi: 0x9b},
-	{value: 0x0043, lo: 0x9c, hi: 0x9c},
-	{value: 0x0047, lo: 0x9e, hi: 0x9f},
-	{value: 0x004f, lo: 0xa2, hi: 0xa2},
-	{value: 0x0055, lo: 0xa5, hi: 0xa6},
-	{value: 0x005d, lo: 0xa9, hi: 0xac},
-	{value: 0x0067, lo: 0xae, hi: 0xb5},
-	{value: 0x0083, lo: 0xb6, hi: 0xb9},
-	{value: 0x008d, lo: 0xbb, hi: 0xbb},
-	{value: 0x0091, lo: 0xbd, hi: 0xbf},
-	// Block 0x9b, offset 0x30f
-	{value: 0x0002, lo: 0x04},
-	{value: 0x0097, lo: 0x80, hi: 0x83},
-	{value: 0x00a1, lo: 0x85, hi: 0x8f},
-	{value: 0x0043, lo: 0x90, hi: 0xa9},
-	{value: 0x0083, lo: 0xaa, hi: 0xbf},
-	// Block 0x9c, offset 0x314
-	{value: 0x0002, lo: 0x08},
-	{value: 0x00af, lo: 0x80, hi: 0x83},
-	{value: 0x0043, lo: 0x84, hi: 0x85},
-	{value: 0x0049, lo: 0x87, hi: 0x8a},
-	{value: 0x0055, lo: 0x8d, hi: 0x94},
-	{value: 0x0067, lo: 0x96, hi: 0x9c},
-	{value: 0x0083, lo: 0x9e, hi: 0xb7},
-	{value: 0x0043, lo: 0xb8, hi: 0xb9},
-	{value: 0x0049, lo: 0xbb, hi: 0xbe},
-	// Block 0x9d, offset 0x31d
-	{value: 0x0002, lo: 0x05},
-	{value: 0x0053, lo: 0x80, hi: 0x84},
-	{value: 0x005f, lo: 0x86, hi: 0x86},
-	{value: 0x0067, lo: 0x8a, hi: 0x90},
-	{value: 0x0083, lo: 0x92, hi: 0xab},
-	{value: 0x0043, lo: 0xac, hi: 0xbf},
-	// Block 0x9e, offset 0x323
-	{value: 0x0002, lo: 0x04},
-	{value: 0x006b, lo: 0x80, hi: 0x85},
-	{value: 0x0083, lo: 0x86, hi: 0x9f},
-	{value: 0x0043, lo: 0xa0, hi: 0xb9},
-	{value: 0x0083, lo: 0xba, hi: 0xbf},
-	// Block 0x9f, offset 0x328
-	{value: 0x0002, lo: 0x03},
-	{value: 0x008f, lo: 0x80, hi: 0x93},
-	{value: 0x0043, lo: 0x94, hi: 0xad},
-	{value: 0x0083, lo: 0xae, hi: 0xbf},
-	// Block 0xa0, offset 0x32c
-	{value: 0x0002, lo: 0x04},
-	{value: 0x00a7, lo: 0x80, hi: 0x87},
-	{value: 0x0043, lo: 0x88, hi: 0xa1},
-	{value: 0x0083, lo: 0xa2, hi: 0xbb},
-	{value: 0x0043, lo: 0xbc, hi: 0xbf},
-	// Block 0xa1, offset 0x331
-	{value: 0x0002, lo: 0x03},
-	{value: 0x004b, lo: 0x80, hi: 0x95},
-	{value: 0x0083, lo: 0x96, hi: 0xaf},
-	{value: 0x0043, lo: 0xb0, hi: 0xbf},
-	// Block 0xa2, offset 0x335
-	{value: 0x0003, lo: 0x0f},
-	{value: 0x023c, lo: 0x80, hi: 0x80},
-	{value: 0x0556, lo: 0x81, hi: 0x81},
-	{value: 0x023f, lo: 0x82, hi: 0x9a},
-	{value: 0x0552, lo: 0x9b, hi: 0x9b},
-	{value: 0x024b, lo: 0x9c, hi: 0x9c},
-	{value: 0x0254, lo: 0x9d, hi: 0x9d},
-	{value: 0x025a, lo: 0x9e, hi: 0x9e},
-	{value: 0x027e, lo: 0x9f, hi: 0x9f},
-	{value: 0x026f, lo: 0xa0, hi: 0xa0},
-	{value: 0x026c, lo: 0xa1, hi: 0xa1},
-	{value: 0x01f7, lo: 0xa2, hi: 0xb2},
-	{value: 0x020c, lo: 0xb3, hi: 0xb3},
-	{value: 0x022a, lo: 0xb4, hi: 0xba},
-	{value: 0x0556, lo: 0xbb, hi: 0xbb},
-	{value: 0x023f, lo: 0xbc, hi: 0xbf},
-	// Block 0xa3, offset 0x345
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x024b, lo: 0x80, hi: 0x94},
-	{value: 0x0552, lo: 0x95, hi: 0x95},
-	{value: 0x024b, lo: 0x96, hi: 0x96},
-	{value: 0x0254, lo: 0x97, hi: 0x97},
-	{value: 0x025a, lo: 0x98, hi: 0x98},
-	{value: 0x027e, lo: 0x99, hi: 0x99},
-	{value: 0x026f, lo: 0x9a, hi: 0x9a},
-	{value: 0x026c, lo: 0x9b, hi: 0x9b},
-	{value: 0x01f7, lo: 0x9c, hi: 0xac},
-	{value: 0x020c, lo: 0xad, hi: 0xad},
-	{value: 0x022a, lo: 0xae, hi: 0xb4},
-	{value: 0x0556, lo: 0xb5, hi: 0xb5},
-	{value: 0x023f, lo: 0xb6, hi: 0xbf},
-	// Block 0xa4, offset 0x353
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x025d, lo: 0x80, hi: 0x8e},
-	{value: 0x0552, lo: 0x8f, hi: 0x8f},
-	{value: 0x024b, lo: 0x90, hi: 0x90},
-	{value: 0x0254, lo: 0x91, hi: 0x91},
-	{value: 0x025a, lo: 0x92, hi: 0x92},
-	{value: 0x027e, lo: 0x93, hi: 0x93},
-	{value: 0x026f, lo: 0x94, hi: 0x94},
-	{value: 0x026c, lo: 0x95, hi: 0x95},
-	{value: 0x01f7, lo: 0x96, hi: 0xa6},
-	{value: 0x020c, lo: 0xa7, hi: 0xa7},
-	{value: 0x022a, lo: 0xa8, hi: 0xae},
-	{value: 0x0556, lo: 0xaf, hi: 0xaf},
-	{value: 0x023f, lo: 0xb0, hi: 0xbf},
-	// Block 0xa5, offset 0x361
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x026f, lo: 0x80, hi: 0x88},
-	{value: 0x0552, lo: 0x89, hi: 0x89},
-	{value: 0x024b, lo: 0x8a, hi: 0x8a},
-	{value: 0x0254, lo: 0x8b, hi: 0x8b},
-	{value: 0x025a, lo: 0x8c, hi: 0x8c},
-	{value: 0x027e, lo: 0x8d, hi: 0x8d},
-	{value: 0x026f, lo: 0x8e, hi: 0x8e},
-	{value: 0x026c, lo: 0x8f, hi: 0x8f},
-	{value: 0x01f7, lo: 0x90, hi: 0xa0},
-	{value: 0x020c, lo: 0xa1, hi: 0xa1},
-	{value: 0x022a, lo: 0xa2, hi: 0xa8},
-	{value: 0x0556, lo: 0xa9, hi: 0xa9},
-	{value: 0x023f, lo: 0xaa, hi: 0xbf},
-	// Block 0xa6, offset 0x36f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0x8f, hi: 0x8f},
-	// Block 0xa7, offset 0x371
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xae, hi: 0xae},
-	// Block 0xa8, offset 0x373
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8133, lo: 0xac, hi: 0xaf},
-	// Block 0xa9, offset 0x375
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8134, lo: 0xac, hi: 0xad},
-	{value: 0x812e, lo: 0xae, hi: 0xae},
-	{value: 0x8133, lo: 0xaf, hi: 0xaf},
-	// Block 0xaa, offset 0x379
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812e, lo: 0x90, hi: 0x96},
-	// Block 0xab, offset 0x37b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8133, lo: 0x84, hi: 0x89},
-	{value: 0x8103, lo: 0x8a, hi: 0x8a},
-	// Block 0xac, offset 0x37e
-	{value: 0x0002, lo: 0x0a},
-	{value: 0x0063, lo: 0x80, hi: 0x89},
-	{value: 0x1a7e, lo: 0x8a, hi: 0x8a},
-	{value: 0x1ab1, lo: 0x8b, hi: 0x8b},
-	{value: 0x1acc, lo: 0x8c, hi: 0x8c},
-	{value: 0x1ad2, lo: 0x8d, hi: 0x8d},
-	{value: 0x1cf0, lo: 0x8e, hi: 0x8e},
-	{value: 0x1ade, lo: 0x8f, hi: 0x8f},
-	{value: 0x1aa8, lo: 0xaa, hi: 0xaa},
-	{value: 0x1aab, lo: 0xab, hi: 0xab},
-	{value: 0x1aae, lo: 0xac, hi: 0xac},
-	// Block 0xad, offset 0x389
-	{value: 0x0000, lo: 0x01},
-	{value: 0x1a6c, lo: 0x90, hi: 0x90},
-	// Block 0xae, offset 0x38b
-	{value: 0x0028, lo: 0x09},
-	{value: 0x2999, lo: 0x80, hi: 0x80},
-	{value: 0x295d, lo: 0x81, hi: 0x81},
-	{value: 0x2967, lo: 0x82, hi: 0x82},
-	{value: 0x297b, lo: 0x83, hi: 0x84},
-	{value: 0x2985, lo: 0x85, hi: 0x86},
-	{value: 0x2971, lo: 0x87, hi: 0x87},
-	{value: 0x298f, lo: 0x88, hi: 0x88},
-	{value: 0x0c6a, lo: 0x90, hi: 0x90},
-	{value: 0x09e2, lo: 0x91, hi: 0x91},
-	// Block 0xaf, offset 0x395
-	{value: 0x0002, lo: 0x01},
-	{value: 0x0021, lo: 0xb0, hi: 0xb9},
-}
-
-// recompMap: 7528 bytes (entries only)
-var recompMap map[uint32]rune
-var recompMapOnce sync.Once
-
-const recompMapPacked = "" +
-	"\x00A\x03\x00\x00\x00\x00\xc0" + // 0x00410300: 0x000000C0
-	"\x00A\x03\x01\x00\x00\x00\xc1" + // 0x00410301: 0x000000C1
-	"\x00A\x03\x02\x00\x00\x00\xc2" + // 0x00410302: 0x000000C2
-	"\x00A\x03\x03\x00\x00\x00\xc3" + // 0x00410303: 0x000000C3
-	"\x00A\x03\b\x00\x00\x00\xc4" + // 0x00410308: 0x000000C4
-	"\x00A\x03\n\x00\x00\x00\xc5" + // 0x0041030A: 0x000000C5
-	"\x00C\x03'\x00\x00\x00\xc7" + // 0x00430327: 0x000000C7
-	"\x00E\x03\x00\x00\x00\x00\xc8" + // 0x00450300: 0x000000C8
-	"\x00E\x03\x01\x00\x00\x00\xc9" + // 0x00450301: 0x000000C9
-	"\x00E\x03\x02\x00\x00\x00\xca" + // 0x00450302: 0x000000CA
-	"\x00E\x03\b\x00\x00\x00\xcb" + // 0x00450308: 0x000000CB
-	"\x00I\x03\x00\x00\x00\x00\xcc" + // 0x00490300: 0x000000CC
-	"\x00I\x03\x01\x00\x00\x00\xcd" + // 0x00490301: 0x000000CD
-	"\x00I\x03\x02\x00\x00\x00\xce" + // 0x00490302: 0x000000CE
-	"\x00I\x03\b\x00\x00\x00\xcf" + // 0x00490308: 0x000000CF
-	"\x00N\x03\x03\x00\x00\x00\xd1" + // 0x004E0303: 0x000000D1
-	"\x00O\x03\x00\x00\x00\x00\xd2" + // 0x004F0300: 0x000000D2
-	"\x00O\x03\x01\x00\x00\x00\xd3" + // 0x004F0301: 0x000000D3
-	"\x00O\x03\x02\x00\x00\x00\xd4" + // 0x004F0302: 0x000000D4
-	"\x00O\x03\x03\x00\x00\x00\xd5" + // 0x004F0303: 0x000000D5
-	"\x00O\x03\b\x00\x00\x00\xd6" + // 0x004F0308: 0x000000D6
-	"\x00U\x03\x00\x00\x00\x00\xd9" + // 0x00550300: 0x000000D9
-	"\x00U\x03\x01\x00\x00\x00\xda" + // 0x00550301: 0x000000DA
-	"\x00U\x03\x02\x00\x00\x00\xdb" + // 0x00550302: 0x000000DB
-	"\x00U\x03\b\x00\x00\x00\xdc" + // 0x00550308: 0x000000DC
-	"\x00Y\x03\x01\x00\x00\x00\xdd" + // 0x00590301: 0x000000DD
-	"\x00a\x03\x00\x00\x00\x00\xe0" + // 0x00610300: 0x000000E0
-	"\x00a\x03\x01\x00\x00\x00\xe1" + // 0x00610301: 0x000000E1
-	"\x00a\x03\x02\x00\x00\x00\xe2" + // 0x00610302: 0x000000E2
-	"\x00a\x03\x03\x00\x00\x00\xe3" + // 0x00610303: 0x000000E3
-	"\x00a\x03\b\x00\x00\x00\xe4" + // 0x00610308: 0x000000E4
-	"\x00a\x03\n\x00\x00\x00\xe5" + // 0x0061030A: 0x000000E5
-	"\x00c\x03'\x00\x00\x00\xe7" + // 0x00630327: 0x000000E7
-	"\x00e\x03\x00\x00\x00\x00\xe8" + // 0x00650300: 0x000000E8
-	"\x00e\x03\x01\x00\x00\x00\xe9" + // 0x00650301: 0x000000E9
-	"\x00e\x03\x02\x00\x00\x00\xea" + // 0x00650302: 0x000000EA
-	"\x00e\x03\b\x00\x00\x00\xeb" + // 0x00650308: 0x000000EB
-	"\x00i\x03\x00\x00\x00\x00\xec" + // 0x00690300: 0x000000EC
-	"\x00i\x03\x01\x00\x00\x00\xed" + // 0x00690301: 0x000000ED
-	"\x00i\x03\x02\x00\x00\x00\xee" + // 0x00690302: 0x000000EE
-	"\x00i\x03\b\x00\x00\x00\xef" + // 0x00690308: 0x000000EF
-	"\x00n\x03\x03\x00\x00\x00\xf1" + // 0x006E0303: 0x000000F1
-	"\x00o\x03\x00\x00\x00\x00\xf2" + // 0x006F0300: 0x000000F2
-	"\x00o\x03\x01\x00\x00\x00\xf3" + // 0x006F0301: 0x000000F3
-	"\x00o\x03\x02\x00\x00\x00\xf4" + // 0x006F0302: 0x000000F4
-	"\x00o\x03\x03\x00\x00\x00\xf5" + // 0x006F0303: 0x000000F5
-	"\x00o\x03\b\x00\x00\x00\xf6" + // 0x006F0308: 0x000000F6
-	"\x00u\x03\x00\x00\x00\x00\xf9" + // 0x00750300: 0x000000F9
-	"\x00u\x03\x01\x00\x00\x00\xfa" + // 0x00750301: 0x000000FA
-	"\x00u\x03\x02\x00\x00\x00\xfb" + // 0x00750302: 0x000000FB
-	"\x00u\x03\b\x00\x00\x00\xfc" + // 0x00750308: 0x000000FC
-	"\x00y\x03\x01\x00\x00\x00\xfd" + // 0x00790301: 0x000000FD
-	"\x00y\x03\b\x00\x00\x00\xff" + // 0x00790308: 0x000000FF
-	"\x00A\x03\x04\x00\x00\x01\x00" + // 0x00410304: 0x00000100
-	"\x00a\x03\x04\x00\x00\x01\x01" + // 0x00610304: 0x00000101
-	"\x00A\x03\x06\x00\x00\x01\x02" + // 0x00410306: 0x00000102
-	"\x00a\x03\x06\x00\x00\x01\x03" + // 0x00610306: 0x00000103
-	"\x00A\x03(\x00\x00\x01\x04" + // 0x00410328: 0x00000104
-	"\x00a\x03(\x00\x00\x01\x05" + // 0x00610328: 0x00000105
-	"\x00C\x03\x01\x00\x00\x01\x06" + // 0x00430301: 0x00000106
-	"\x00c\x03\x01\x00\x00\x01\a" + // 0x00630301: 0x00000107
-	"\x00C\x03\x02\x00\x00\x01\b" + // 0x00430302: 0x00000108
-	"\x00c\x03\x02\x00\x00\x01\t" + // 0x00630302: 0x00000109
-	"\x00C\x03\a\x00\x00\x01\n" + // 0x00430307: 0x0000010A
-	"\x00c\x03\a\x00\x00\x01\v" + // 0x00630307: 0x0000010B
-	"\x00C\x03\f\x00\x00\x01\f" + // 0x0043030C: 0x0000010C
-	"\x00c\x03\f\x00\x00\x01\r" + // 0x0063030C: 0x0000010D
-	"\x00D\x03\f\x00\x00\x01\x0e" + // 0x0044030C: 0x0000010E
-	"\x00d\x03\f\x00\x00\x01\x0f" + // 0x0064030C: 0x0000010F
-	"\x00E\x03\x04\x00\x00\x01\x12" + // 0x00450304: 0x00000112
-	"\x00e\x03\x04\x00\x00\x01\x13" + // 0x00650304: 0x00000113
-	"\x00E\x03\x06\x00\x00\x01\x14" + // 0x00450306: 0x00000114
-	"\x00e\x03\x06\x00\x00\x01\x15" + // 0x00650306: 0x00000115
-	"\x00E\x03\a\x00\x00\x01\x16" + // 0x00450307: 0x00000116
-	"\x00e\x03\a\x00\x00\x01\x17" + // 0x00650307: 0x00000117
-	"\x00E\x03(\x00\x00\x01\x18" + // 0x00450328: 0x00000118
-	"\x00e\x03(\x00\x00\x01\x19" + // 0x00650328: 0x00000119
-	"\x00E\x03\f\x00\x00\x01\x1a" + // 0x0045030C: 0x0000011A
-	"\x00e\x03\f\x00\x00\x01\x1b" + // 0x0065030C: 0x0000011B
-	"\x00G\x03\x02\x00\x00\x01\x1c" + // 0x00470302: 0x0000011C
-	"\x00g\x03\x02\x00\x00\x01\x1d" + // 0x00670302: 0x0000011D
-	"\x00G\x03\x06\x00\x00\x01\x1e" + // 0x00470306: 0x0000011E
-	"\x00g\x03\x06\x00\x00\x01\x1f" + // 0x00670306: 0x0000011F
-	"\x00G\x03\a\x00\x00\x01 " + // 0x00470307: 0x00000120
-	"\x00g\x03\a\x00\x00\x01!" + // 0x00670307: 0x00000121
-	"\x00G\x03'\x00\x00\x01\"" + // 0x00470327: 0x00000122
-	"\x00g\x03'\x00\x00\x01#" + // 0x00670327: 0x00000123
-	"\x00H\x03\x02\x00\x00\x01$" + // 0x00480302: 0x00000124
-	"\x00h\x03\x02\x00\x00\x01%" + // 0x00680302: 0x00000125
-	"\x00I\x03\x03\x00\x00\x01(" + // 0x00490303: 0x00000128
-	"\x00i\x03\x03\x00\x00\x01)" + // 0x00690303: 0x00000129
-	"\x00I\x03\x04\x00\x00\x01*" + // 0x00490304: 0x0000012A
-	"\x00i\x03\x04\x00\x00\x01+" + // 0x00690304: 0x0000012B
-	"\x00I\x03\x06\x00\x00\x01," + // 0x00490306: 0x0000012C
-	"\x00i\x03\x06\x00\x00\x01-" + // 0x00690306: 0x0000012D
-	"\x00I\x03(\x00\x00\x01." + // 0x00490328: 0x0000012E
-	"\x00i\x03(\x00\x00\x01/" + // 0x00690328: 0x0000012F
-	"\x00I\x03\a\x00\x00\x010" + // 0x00490307: 0x00000130
-	"\x00J\x03\x02\x00\x00\x014" + // 0x004A0302: 0x00000134
-	"\x00j\x03\x02\x00\x00\x015" + // 0x006A0302: 0x00000135
-	"\x00K\x03'\x00\x00\x016" + // 0x004B0327: 0x00000136
-	"\x00k\x03'\x00\x00\x017" + // 0x006B0327: 0x00000137
-	"\x00L\x03\x01\x00\x00\x019" + // 0x004C0301: 0x00000139
-	"\x00l\x03\x01\x00\x00\x01:" + // 0x006C0301: 0x0000013A
-	"\x00L\x03'\x00\x00\x01;" + // 0x004C0327: 0x0000013B
-	"\x00l\x03'\x00\x00\x01<" + // 0x006C0327: 0x0000013C
-	"\x00L\x03\f\x00\x00\x01=" + // 0x004C030C: 0x0000013D
-	"\x00l\x03\f\x00\x00\x01>" + // 0x006C030C: 0x0000013E
-	"\x00N\x03\x01\x00\x00\x01C" + // 0x004E0301: 0x00000143
-	"\x00n\x03\x01\x00\x00\x01D" + // 0x006E0301: 0x00000144
-	"\x00N\x03'\x00\x00\x01E" + // 0x004E0327: 0x00000145
-	"\x00n\x03'\x00\x00\x01F" + // 0x006E0327: 0x00000146
-	"\x00N\x03\f\x00\x00\x01G" + // 0x004E030C: 0x00000147
-	"\x00n\x03\f\x00\x00\x01H" + // 0x006E030C: 0x00000148
-	"\x00O\x03\x04\x00\x00\x01L" + // 0x004F0304: 0x0000014C
-	"\x00o\x03\x04\x00\x00\x01M" + // 0x006F0304: 0x0000014D
-	"\x00O\x03\x06\x00\x00\x01N" + // 0x004F0306: 0x0000014E
-	"\x00o\x03\x06\x00\x00\x01O" + // 0x006F0306: 0x0000014F
-	"\x00O\x03\v\x00\x00\x01P" + // 0x004F030B: 0x00000150
-	"\x00o\x03\v\x00\x00\x01Q" + // 0x006F030B: 0x00000151
-	"\x00R\x03\x01\x00\x00\x01T" + // 0x00520301: 0x00000154
-	"\x00r\x03\x01\x00\x00\x01U" + // 0x00720301: 0x00000155
-	"\x00R\x03'\x00\x00\x01V" + // 0x00520327: 0x00000156
-	"\x00r\x03'\x00\x00\x01W" + // 0x00720327: 0x00000157
-	"\x00R\x03\f\x00\x00\x01X" + // 0x0052030C: 0x00000158
-	"\x00r\x03\f\x00\x00\x01Y" + // 0x0072030C: 0x00000159
-	"\x00S\x03\x01\x00\x00\x01Z" + // 0x00530301: 0x0000015A
-	"\x00s\x03\x01\x00\x00\x01[" + // 0x00730301: 0x0000015B
-	"\x00S\x03\x02\x00\x00\x01\\" + // 0x00530302: 0x0000015C
-	"\x00s\x03\x02\x00\x00\x01]" + // 0x00730302: 0x0000015D
-	"\x00S\x03'\x00\x00\x01^" + // 0x00530327: 0x0000015E
-	"\x00s\x03'\x00\x00\x01_" + // 0x00730327: 0x0000015F
-	"\x00S\x03\f\x00\x00\x01`" + // 0x0053030C: 0x00000160
-	"\x00s\x03\f\x00\x00\x01a" + // 0x0073030C: 0x00000161
-	"\x00T\x03'\x00\x00\x01b" + // 0x00540327: 0x00000162
-	"\x00t\x03'\x00\x00\x01c" + // 0x00740327: 0x00000163
-	"\x00T\x03\f\x00\x00\x01d" + // 0x0054030C: 0x00000164
-	"\x00t\x03\f\x00\x00\x01e" + // 0x0074030C: 0x00000165
-	"\x00U\x03\x03\x00\x00\x01h" + // 0x00550303: 0x00000168
-	"\x00u\x03\x03\x00\x00\x01i" + // 0x00750303: 0x00000169
-	"\x00U\x03\x04\x00\x00\x01j" + // 0x00550304: 0x0000016A
-	"\x00u\x03\x04\x00\x00\x01k" + // 0x00750304: 0x0000016B
-	"\x00U\x03\x06\x00\x00\x01l" + // 0x00550306: 0x0000016C
-	"\x00u\x03\x06\x00\x00\x01m" + // 0x00750306: 0x0000016D
-	"\x00U\x03\n\x00\x00\x01n" + // 0x0055030A: 0x0000016E
-	"\x00u\x03\n\x00\x00\x01o" + // 0x0075030A: 0x0000016F
-	"\x00U\x03\v\x00\x00\x01p" + // 0x0055030B: 0x00000170
-	"\x00u\x03\v\x00\x00\x01q" + // 0x0075030B: 0x00000171
-	"\x00U\x03(\x00\x00\x01r" + // 0x00550328: 0x00000172
-	"\x00u\x03(\x00\x00\x01s" + // 0x00750328: 0x00000173
-	"\x00W\x03\x02\x00\x00\x01t" + // 0x00570302: 0x00000174
-	"\x00w\x03\x02\x00\x00\x01u" + // 0x00770302: 0x00000175
-	"\x00Y\x03\x02\x00\x00\x01v" + // 0x00590302: 0x00000176
-	"\x00y\x03\x02\x00\x00\x01w" + // 0x00790302: 0x00000177
-	"\x00Y\x03\b\x00\x00\x01x" + // 0x00590308: 0x00000178
-	"\x00Z\x03\x01\x00\x00\x01y" + // 0x005A0301: 0x00000179
-	"\x00z\x03\x01\x00\x00\x01z" + // 0x007A0301: 0x0000017A
-	"\x00Z\x03\a\x00\x00\x01{" + // 0x005A0307: 0x0000017B
-	"\x00z\x03\a\x00\x00\x01|" + // 0x007A0307: 0x0000017C
-	"\x00Z\x03\f\x00\x00\x01}" + // 0x005A030C: 0x0000017D
-	"\x00z\x03\f\x00\x00\x01~" + // 0x007A030C: 0x0000017E
-	"\x00O\x03\x1b\x00\x00\x01\xa0" + // 0x004F031B: 0x000001A0
-	"\x00o\x03\x1b\x00\x00\x01\xa1" + // 0x006F031B: 0x000001A1
-	"\x00U\x03\x1b\x00\x00\x01\xaf" + // 0x0055031B: 0x000001AF
-	"\x00u\x03\x1b\x00\x00\x01\xb0" + // 0x0075031B: 0x000001B0
-	"\x00A\x03\f\x00\x00\x01\xcd" + // 0x0041030C: 0x000001CD
-	"\x00a\x03\f\x00\x00\x01\xce" + // 0x0061030C: 0x000001CE
-	"\x00I\x03\f\x00\x00\x01\xcf" + // 0x0049030C: 0x000001CF
-	"\x00i\x03\f\x00\x00\x01\xd0" + // 0x0069030C: 0x000001D0
-	"\x00O\x03\f\x00\x00\x01\xd1" + // 0x004F030C: 0x000001D1
-	"\x00o\x03\f\x00\x00\x01\xd2" + // 0x006F030C: 0x000001D2
-	"\x00U\x03\f\x00\x00\x01\xd3" + // 0x0055030C: 0x000001D3
-	"\x00u\x03\f\x00\x00\x01\xd4" + // 0x0075030C: 0x000001D4
-	"\x00\xdc\x03\x04\x00\x00\x01\xd5" + // 0x00DC0304: 0x000001D5
-	"\x00\xfc\x03\x04\x00\x00\x01\xd6" + // 0x00FC0304: 0x000001D6
-	"\x00\xdc\x03\x01\x00\x00\x01\xd7" + // 0x00DC0301: 0x000001D7
-	"\x00\xfc\x03\x01\x00\x00\x01\xd8" + // 0x00FC0301: 0x000001D8
-	"\x00\xdc\x03\f\x00\x00\x01\xd9" + // 0x00DC030C: 0x000001D9
-	"\x00\xfc\x03\f\x00\x00\x01\xda" + // 0x00FC030C: 0x000001DA
-	"\x00\xdc\x03\x00\x00\x00\x01\xdb" + // 0x00DC0300: 0x000001DB
-	"\x00\xfc\x03\x00\x00\x00\x01\xdc" + // 0x00FC0300: 0x000001DC
-	"\x00\xc4\x03\x04\x00\x00\x01\xde" + // 0x00C40304: 0x000001DE
-	"\x00\xe4\x03\x04\x00\x00\x01\xdf" + // 0x00E40304: 0x000001DF
-	"\x02&\x03\x04\x00\x00\x01\xe0" + // 0x02260304: 0x000001E0
-	"\x02'\x03\x04\x00\x00\x01\xe1" + // 0x02270304: 0x000001E1
-	"\x00\xc6\x03\x04\x00\x00\x01\xe2" + // 0x00C60304: 0x000001E2
-	"\x00\xe6\x03\x04\x00\x00\x01\xe3" + // 0x00E60304: 0x000001E3
-	"\x00G\x03\f\x00\x00\x01\xe6" + // 0x0047030C: 0x000001E6
-	"\x00g\x03\f\x00\x00\x01\xe7" + // 0x0067030C: 0x000001E7
-	"\x00K\x03\f\x00\x00\x01\xe8" + // 0x004B030C: 0x000001E8
-	"\x00k\x03\f\x00\x00\x01\xe9" + // 0x006B030C: 0x000001E9
-	"\x00O\x03(\x00\x00\x01\xea" + // 0x004F0328: 0x000001EA
-	"\x00o\x03(\x00\x00\x01\xeb" + // 0x006F0328: 0x000001EB
-	"\x01\xea\x03\x04\x00\x00\x01\xec" + // 0x01EA0304: 0x000001EC
-	"\x01\xeb\x03\x04\x00\x00\x01\xed" + // 0x01EB0304: 0x000001ED
-	"\x01\xb7\x03\f\x00\x00\x01\xee" + // 0x01B7030C: 0x000001EE
-	"\x02\x92\x03\f\x00\x00\x01\xef" + // 0x0292030C: 0x000001EF
-	"\x00j\x03\f\x00\x00\x01\xf0" + // 0x006A030C: 0x000001F0
-	"\x00G\x03\x01\x00\x00\x01\xf4" + // 0x00470301: 0x000001F4
-	"\x00g\x03\x01\x00\x00\x01\xf5" + // 0x00670301: 0x000001F5
-	"\x00N\x03\x00\x00\x00\x01\xf8" + // 0x004E0300: 0x000001F8
-	"\x00n\x03\x00\x00\x00\x01\xf9" + // 0x006E0300: 0x000001F9
-	"\x00\xc5\x03\x01\x00\x00\x01\xfa" + // 0x00C50301: 0x000001FA
-	"\x00\xe5\x03\x01\x00\x00\x01\xfb" + // 0x00E50301: 0x000001FB
-	"\x00\xc6\x03\x01\x00\x00\x01\xfc" + // 0x00C60301: 0x000001FC
-	"\x00\xe6\x03\x01\x00\x00\x01\xfd" + // 0x00E60301: 0x000001FD
-	"\x00\xd8\x03\x01\x00\x00\x01\xfe" + // 0x00D80301: 0x000001FE
-	"\x00\xf8\x03\x01\x00\x00\x01\xff" + // 0x00F80301: 0x000001FF
-	"\x00A\x03\x0f\x00\x00\x02\x00" + // 0x0041030F: 0x00000200
-	"\x00a\x03\x0f\x00\x00\x02\x01" + // 0x0061030F: 0x00000201
-	"\x00A\x03\x11\x00\x00\x02\x02" + // 0x00410311: 0x00000202
-	"\x00a\x03\x11\x00\x00\x02\x03" + // 0x00610311: 0x00000203
-	"\x00E\x03\x0f\x00\x00\x02\x04" + // 0x0045030F: 0x00000204
-	"\x00e\x03\x0f\x00\x00\x02\x05" + // 0x0065030F: 0x00000205
-	"\x00E\x03\x11\x00\x00\x02\x06" + // 0x00450311: 0x00000206
-	"\x00e\x03\x11\x00\x00\x02\a" + // 0x00650311: 0x00000207
-	"\x00I\x03\x0f\x00\x00\x02\b" + // 0x0049030F: 0x00000208
-	"\x00i\x03\x0f\x00\x00\x02\t" + // 0x0069030F: 0x00000209
-	"\x00I\x03\x11\x00\x00\x02\n" + // 0x00490311: 0x0000020A
-	"\x00i\x03\x11\x00\x00\x02\v" + // 0x00690311: 0x0000020B
-	"\x00O\x03\x0f\x00\x00\x02\f" + // 0x004F030F: 0x0000020C
-	"\x00o\x03\x0f\x00\x00\x02\r" + // 0x006F030F: 0x0000020D
-	"\x00O\x03\x11\x00\x00\x02\x0e" + // 0x004F0311: 0x0000020E
-	"\x00o\x03\x11\x00\x00\x02\x0f" + // 0x006F0311: 0x0000020F
-	"\x00R\x03\x0f\x00\x00\x02\x10" + // 0x0052030F: 0x00000210
-	"\x00r\x03\x0f\x00\x00\x02\x11" + // 0x0072030F: 0x00000211
-	"\x00R\x03\x11\x00\x00\x02\x12" + // 0x00520311: 0x00000212
-	"\x00r\x03\x11\x00\x00\x02\x13" + // 0x00720311: 0x00000213
-	"\x00U\x03\x0f\x00\x00\x02\x14" + // 0x0055030F: 0x00000214
-	"\x00u\x03\x0f\x00\x00\x02\x15" + // 0x0075030F: 0x00000215
-	"\x00U\x03\x11\x00\x00\x02\x16" + // 0x00550311: 0x00000216
-	"\x00u\x03\x11\x00\x00\x02\x17" + // 0x00750311: 0x00000217
-	"\x00S\x03&\x00\x00\x02\x18" + // 0x00530326: 0x00000218
-	"\x00s\x03&\x00\x00\x02\x19" + // 0x00730326: 0x00000219
-	"\x00T\x03&\x00\x00\x02\x1a" + // 0x00540326: 0x0000021A
-	"\x00t\x03&\x00\x00\x02\x1b" + // 0x00740326: 0x0000021B
-	"\x00H\x03\f\x00\x00\x02\x1e" + // 0x0048030C: 0x0000021E
-	"\x00h\x03\f\x00\x00\x02\x1f" + // 0x0068030C: 0x0000021F
-	"\x00A\x03\a\x00\x00\x02&" + // 0x00410307: 0x00000226
-	"\x00a\x03\a\x00\x00\x02'" + // 0x00610307: 0x00000227
-	"\x00E\x03'\x00\x00\x02(" + // 0x00450327: 0x00000228
-	"\x00e\x03'\x00\x00\x02)" + // 0x00650327: 0x00000229
-	"\x00\xd6\x03\x04\x00\x00\x02*" + // 0x00D60304: 0x0000022A
-	"\x00\xf6\x03\x04\x00\x00\x02+" + // 0x00F60304: 0x0000022B
-	"\x00\xd5\x03\x04\x00\x00\x02," + // 0x00D50304: 0x0000022C
-	"\x00\xf5\x03\x04\x00\x00\x02-" + // 0x00F50304: 0x0000022D
-	"\x00O\x03\a\x00\x00\x02." + // 0x004F0307: 0x0000022E
-	"\x00o\x03\a\x00\x00\x02/" + // 0x006F0307: 0x0000022F
-	"\x02.\x03\x04\x00\x00\x020" + // 0x022E0304: 0x00000230
-	"\x02/\x03\x04\x00\x00\x021" + // 0x022F0304: 0x00000231
-	"\x00Y\x03\x04\x00\x00\x022" + // 0x00590304: 0x00000232
-	"\x00y\x03\x04\x00\x00\x023" + // 0x00790304: 0x00000233
-	"\x00\xa8\x03\x01\x00\x00\x03\x85" + // 0x00A80301: 0x00000385
-	"\x03\x91\x03\x01\x00\x00\x03\x86" + // 0x03910301: 0x00000386
-	"\x03\x95\x03\x01\x00\x00\x03\x88" + // 0x03950301: 0x00000388
-	"\x03\x97\x03\x01\x00\x00\x03\x89" + // 0x03970301: 0x00000389
-	"\x03\x99\x03\x01\x00\x00\x03\x8a" + // 0x03990301: 0x0000038A
-	"\x03\x9f\x03\x01\x00\x00\x03\x8c" + // 0x039F0301: 0x0000038C
-	"\x03\xa5\x03\x01\x00\x00\x03\x8e" + // 0x03A50301: 0x0000038E
-	"\x03\xa9\x03\x01\x00\x00\x03\x8f" + // 0x03A90301: 0x0000038F
-	"\x03\xca\x03\x01\x00\x00\x03\x90" + // 0x03CA0301: 0x00000390
-	"\x03\x99\x03\b\x00\x00\x03\xaa" + // 0x03990308: 0x000003AA
-	"\x03\xa5\x03\b\x00\x00\x03\xab" + // 0x03A50308: 0x000003AB
-	"\x03\xb1\x03\x01\x00\x00\x03\xac" + // 0x03B10301: 0x000003AC
-	"\x03\xb5\x03\x01\x00\x00\x03\xad" + // 0x03B50301: 0x000003AD
-	"\x03\xb7\x03\x01\x00\x00\x03\xae" + // 0x03B70301: 0x000003AE
-	"\x03\xb9\x03\x01\x00\x00\x03\xaf" + // 0x03B90301: 0x000003AF
-	"\x03\xcb\x03\x01\x00\x00\x03\xb0" + // 0x03CB0301: 0x000003B0
-	"\x03\xb9\x03\b\x00\x00\x03\xca" + // 0x03B90308: 0x000003CA
-	"\x03\xc5\x03\b\x00\x00\x03\xcb" + // 0x03C50308: 0x000003CB
-	"\x03\xbf\x03\x01\x00\x00\x03\xcc" + // 0x03BF0301: 0x000003CC
-	"\x03\xc5\x03\x01\x00\x00\x03\xcd" + // 0x03C50301: 0x000003CD
-	"\x03\xc9\x03\x01\x00\x00\x03\xce" + // 0x03C90301: 0x000003CE
-	"\x03\xd2\x03\x01\x00\x00\x03\xd3" + // 0x03D20301: 0x000003D3
-	"\x03\xd2\x03\b\x00\x00\x03\xd4" + // 0x03D20308: 0x000003D4
-	"\x04\x15\x03\x00\x00\x00\x04\x00" + // 0x04150300: 0x00000400
-	"\x04\x15\x03\b\x00\x00\x04\x01" + // 0x04150308: 0x00000401
-	"\x04\x13\x03\x01\x00\x00\x04\x03" + // 0x04130301: 0x00000403
-	"\x04\x06\x03\b\x00\x00\x04\a" + // 0x04060308: 0x00000407
-	"\x04\x1a\x03\x01\x00\x00\x04\f" + // 0x041A0301: 0x0000040C
-	"\x04\x18\x03\x00\x00\x00\x04\r" + // 0x04180300: 0x0000040D
-	"\x04#\x03\x06\x00\x00\x04\x0e" + // 0x04230306: 0x0000040E
-	"\x04\x18\x03\x06\x00\x00\x04\x19" + // 0x04180306: 0x00000419
-	"\x048\x03\x06\x00\x00\x049" + // 0x04380306: 0x00000439
-	"\x045\x03\x00\x00\x00\x04P" + // 0x04350300: 0x00000450
-	"\x045\x03\b\x00\x00\x04Q" + // 0x04350308: 0x00000451
-	"\x043\x03\x01\x00\x00\x04S" + // 0x04330301: 0x00000453
-	"\x04V\x03\b\x00\x00\x04W" + // 0x04560308: 0x00000457
-	"\x04:\x03\x01\x00\x00\x04\\" + // 0x043A0301: 0x0000045C
-	"\x048\x03\x00\x00\x00\x04]" + // 0x04380300: 0x0000045D
-	"\x04C\x03\x06\x00\x00\x04^" + // 0x04430306: 0x0000045E
-	"\x04t\x03\x0f\x00\x00\x04v" + // 0x0474030F: 0x00000476
-	"\x04u\x03\x0f\x00\x00\x04w" + // 0x0475030F: 0x00000477
-	"\x04\x16\x03\x06\x00\x00\x04\xc1" + // 0x04160306: 0x000004C1
-	"\x046\x03\x06\x00\x00\x04\xc2" + // 0x04360306: 0x000004C2
-	"\x04\x10\x03\x06\x00\x00\x04\xd0" + // 0x04100306: 0x000004D0
-	"\x040\x03\x06\x00\x00\x04\xd1" + // 0x04300306: 0x000004D1
-	"\x04\x10\x03\b\x00\x00\x04\xd2" + // 0x04100308: 0x000004D2
-	"\x040\x03\b\x00\x00\x04\xd3" + // 0x04300308: 0x000004D3
-	"\x04\x15\x03\x06\x00\x00\x04\xd6" + // 0x04150306: 0x000004D6
-	"\x045\x03\x06\x00\x00\x04\xd7" + // 0x04350306: 0x000004D7
-	"\x04\xd8\x03\b\x00\x00\x04\xda" + // 0x04D80308: 0x000004DA
-	"\x04\xd9\x03\b\x00\x00\x04\xdb" + // 0x04D90308: 0x000004DB
-	"\x04\x16\x03\b\x00\x00\x04\xdc" + // 0x04160308: 0x000004DC
-	"\x046\x03\b\x00\x00\x04\xdd" + // 0x04360308: 0x000004DD
-	"\x04\x17\x03\b\x00\x00\x04\xde" + // 0x04170308: 0x000004DE
-	"\x047\x03\b\x00\x00\x04\xdf" + // 0x04370308: 0x000004DF
-	"\x04\x18\x03\x04\x00\x00\x04\xe2" + // 0x04180304: 0x000004E2
-	"\x048\x03\x04\x00\x00\x04\xe3" + // 0x04380304: 0x000004E3
-	"\x04\x18\x03\b\x00\x00\x04\xe4" + // 0x04180308: 0x000004E4
-	"\x048\x03\b\x00\x00\x04\xe5" + // 0x04380308: 0x000004E5
-	"\x04\x1e\x03\b\x00\x00\x04\xe6" + // 0x041E0308: 0x000004E6
-	"\x04>\x03\b\x00\x00\x04\xe7" + // 0x043E0308: 0x000004E7
-	"\x04\xe8\x03\b\x00\x00\x04\xea" + // 0x04E80308: 0x000004EA
-	"\x04\xe9\x03\b\x00\x00\x04\xeb" + // 0x04E90308: 0x000004EB
-	"\x04-\x03\b\x00\x00\x04\xec" + // 0x042D0308: 0x000004EC
-	"\x04M\x03\b\x00\x00\x04\xed" + // 0x044D0308: 0x000004ED
-	"\x04#\x03\x04\x00\x00\x04\xee" + // 0x04230304: 0x000004EE
-	"\x04C\x03\x04\x00\x00\x04\xef" + // 0x04430304: 0x000004EF
-	"\x04#\x03\b\x00\x00\x04\xf0" + // 0x04230308: 0x000004F0
-	"\x04C\x03\b\x00\x00\x04\xf1" + // 0x04430308: 0x000004F1
-	"\x04#\x03\v\x00\x00\x04\xf2" + // 0x0423030B: 0x000004F2
-	"\x04C\x03\v\x00\x00\x04\xf3" + // 0x0443030B: 0x000004F3
-	"\x04'\x03\b\x00\x00\x04\xf4" + // 0x04270308: 0x000004F4
-	"\x04G\x03\b\x00\x00\x04\xf5" + // 0x04470308: 0x000004F5
-	"\x04+\x03\b\x00\x00\x04\xf8" + // 0x042B0308: 0x000004F8
-	"\x04K\x03\b\x00\x00\x04\xf9" + // 0x044B0308: 0x000004F9
-	"\x06'\x06S\x00\x00\x06\"" + // 0x06270653: 0x00000622
-	"\x06'\x06T\x00\x00\x06#" + // 0x06270654: 0x00000623
-	"\x06H\x06T\x00\x00\x06$" + // 0x06480654: 0x00000624
-	"\x06'\x06U\x00\x00\x06%" + // 0x06270655: 0x00000625
-	"\x06J\x06T\x00\x00\x06&" + // 0x064A0654: 0x00000626
-	"\x06\xd5\x06T\x00\x00\x06\xc0" + // 0x06D50654: 0x000006C0
-	"\x06\xc1\x06T\x00\x00\x06\xc2" + // 0x06C10654: 0x000006C2
-	"\x06\xd2\x06T\x00\x00\x06\xd3" + // 0x06D20654: 0x000006D3
-	"\t(\t<\x00\x00\t)" + // 0x0928093C: 0x00000929
-	"\t0\t<\x00\x00\t1" + // 0x0930093C: 0x00000931
-	"\t3\t<\x00\x00\t4" + // 0x0933093C: 0x00000934
-	"\t\xc7\t\xbe\x00\x00\t\xcb" + // 0x09C709BE: 0x000009CB
-	"\t\xc7\t\xd7\x00\x00\t\xcc" + // 0x09C709D7: 0x000009CC
-	"\vG\vV\x00\x00\vH" + // 0x0B470B56: 0x00000B48
-	"\vG\v>\x00\x00\vK" + // 0x0B470B3E: 0x00000B4B
-	"\vG\vW\x00\x00\vL" + // 0x0B470B57: 0x00000B4C
-	"\v\x92\v\xd7\x00\x00\v\x94" + // 0x0B920BD7: 0x00000B94
-	"\v\xc6\v\xbe\x00\x00\v\xca" + // 0x0BC60BBE: 0x00000BCA
-	"\v\xc7\v\xbe\x00\x00\v\xcb" + // 0x0BC70BBE: 0x00000BCB
-	"\v\xc6\v\xd7\x00\x00\v\xcc" + // 0x0BC60BD7: 0x00000BCC
-	"\fF\fV\x00\x00\fH" + // 0x0C460C56: 0x00000C48
-	"\f\xbf\f\xd5\x00\x00\f\xc0" + // 0x0CBF0CD5: 0x00000CC0
-	"\f\xc6\f\xd5\x00\x00\f\xc7" + // 0x0CC60CD5: 0x00000CC7
-	"\f\xc6\f\xd6\x00\x00\f\xc8" + // 0x0CC60CD6: 0x00000CC8
-	"\f\xc6\f\xc2\x00\x00\f\xca" + // 0x0CC60CC2: 0x00000CCA
-	"\f\xca\f\xd5\x00\x00\f\xcb" + // 0x0CCA0CD5: 0x00000CCB
-	"\rF\r>\x00\x00\rJ" + // 0x0D460D3E: 0x00000D4A
-	"\rG\r>\x00\x00\rK" + // 0x0D470D3E: 0x00000D4B
-	"\rF\rW\x00\x00\rL" + // 0x0D460D57: 0x00000D4C
-	"\r\xd9\r\xca\x00\x00\r\xda" + // 0x0DD90DCA: 0x00000DDA
-	"\r\xd9\r\xcf\x00\x00\r\xdc" + // 0x0DD90DCF: 0x00000DDC
-	"\r\xdc\r\xca\x00\x00\r\xdd" + // 0x0DDC0DCA: 0x00000DDD
-	"\r\xd9\r\xdf\x00\x00\r\xde" + // 0x0DD90DDF: 0x00000DDE
-	"\x10%\x10.\x00\x00\x10&" + // 0x1025102E: 0x00001026
-	"\x1b\x05\x1b5\x00\x00\x1b\x06" + // 0x1B051B35: 0x00001B06
-	"\x1b\a\x1b5\x00\x00\x1b\b" + // 0x1B071B35: 0x00001B08
-	"\x1b\t\x1b5\x00\x00\x1b\n" + // 0x1B091B35: 0x00001B0A
-	"\x1b\v\x1b5\x00\x00\x1b\f" + // 0x1B0B1B35: 0x00001B0C
-	"\x1b\r\x1b5\x00\x00\x1b\x0e" + // 0x1B0D1B35: 0x00001B0E
-	"\x1b\x11\x1b5\x00\x00\x1b\x12" + // 0x1B111B35: 0x00001B12
-	"\x1b:\x1b5\x00\x00\x1b;" + // 0x1B3A1B35: 0x00001B3B
-	"\x1b<\x1b5\x00\x00\x1b=" + // 0x1B3C1B35: 0x00001B3D
-	"\x1b>\x1b5\x00\x00\x1b@" + // 0x1B3E1B35: 0x00001B40
-	"\x1b?\x1b5\x00\x00\x1bA" + // 0x1B3F1B35: 0x00001B41
-	"\x1bB\x1b5\x00\x00\x1bC" + // 0x1B421B35: 0x00001B43
-	"\x00A\x03%\x00\x00\x1e\x00" + // 0x00410325: 0x00001E00
-	"\x00a\x03%\x00\x00\x1e\x01" + // 0x00610325: 0x00001E01
-	"\x00B\x03\a\x00\x00\x1e\x02" + // 0x00420307: 0x00001E02
-	"\x00b\x03\a\x00\x00\x1e\x03" + // 0x00620307: 0x00001E03
-	"\x00B\x03#\x00\x00\x1e\x04" + // 0x00420323: 0x00001E04
-	"\x00b\x03#\x00\x00\x1e\x05" + // 0x00620323: 0x00001E05
-	"\x00B\x031\x00\x00\x1e\x06" + // 0x00420331: 0x00001E06
-	"\x00b\x031\x00\x00\x1e\a" + // 0x00620331: 0x00001E07
-	"\x00\xc7\x03\x01\x00\x00\x1e\b" + // 0x00C70301: 0x00001E08
-	"\x00\xe7\x03\x01\x00\x00\x1e\t" + // 0x00E70301: 0x00001E09
-	"\x00D\x03\a\x00\x00\x1e\n" + // 0x00440307: 0x00001E0A
-	"\x00d\x03\a\x00\x00\x1e\v" + // 0x00640307: 0x00001E0B
-	"\x00D\x03#\x00\x00\x1e\f" + // 0x00440323: 0x00001E0C
-	"\x00d\x03#\x00\x00\x1e\r" + // 0x00640323: 0x00001E0D
-	"\x00D\x031\x00\x00\x1e\x0e" + // 0x00440331: 0x00001E0E
-	"\x00d\x031\x00\x00\x1e\x0f" + // 0x00640331: 0x00001E0F
-	"\x00D\x03'\x00\x00\x1e\x10" + // 0x00440327: 0x00001E10
-	"\x00d\x03'\x00\x00\x1e\x11" + // 0x00640327: 0x00001E11
-	"\x00D\x03-\x00\x00\x1e\x12" + // 0x0044032D: 0x00001E12
-	"\x00d\x03-\x00\x00\x1e\x13" + // 0x0064032D: 0x00001E13
-	"\x01\x12\x03\x00\x00\x00\x1e\x14" + // 0x01120300: 0x00001E14
-	"\x01\x13\x03\x00\x00\x00\x1e\x15" + // 0x01130300: 0x00001E15
-	"\x01\x12\x03\x01\x00\x00\x1e\x16" + // 0x01120301: 0x00001E16
-	"\x01\x13\x03\x01\x00\x00\x1e\x17" + // 0x01130301: 0x00001E17
-	"\x00E\x03-\x00\x00\x1e\x18" + // 0x0045032D: 0x00001E18
-	"\x00e\x03-\x00\x00\x1e\x19" + // 0x0065032D: 0x00001E19
-	"\x00E\x030\x00\x00\x1e\x1a" + // 0x00450330: 0x00001E1A
-	"\x00e\x030\x00\x00\x1e\x1b" + // 0x00650330: 0x00001E1B
-	"\x02(\x03\x06\x00\x00\x1e\x1c" + // 0x02280306: 0x00001E1C
-	"\x02)\x03\x06\x00\x00\x1e\x1d" + // 0x02290306: 0x00001E1D
-	"\x00F\x03\a\x00\x00\x1e\x1e" + // 0x00460307: 0x00001E1E
-	"\x00f\x03\a\x00\x00\x1e\x1f" + // 0x00660307: 0x00001E1F
-	"\x00G\x03\x04\x00\x00\x1e " + // 0x00470304: 0x00001E20
-	"\x00g\x03\x04\x00\x00\x1e!" + // 0x00670304: 0x00001E21
-	"\x00H\x03\a\x00\x00\x1e\"" + // 0x00480307: 0x00001E22
-	"\x00h\x03\a\x00\x00\x1e#" + // 0x00680307: 0x00001E23
-	"\x00H\x03#\x00\x00\x1e$" + // 0x00480323: 0x00001E24
-	"\x00h\x03#\x00\x00\x1e%" + // 0x00680323: 0x00001E25
-	"\x00H\x03\b\x00\x00\x1e&" + // 0x00480308: 0x00001E26
-	"\x00h\x03\b\x00\x00\x1e'" + // 0x00680308: 0x00001E27
-	"\x00H\x03'\x00\x00\x1e(" + // 0x00480327: 0x00001E28
-	"\x00h\x03'\x00\x00\x1e)" + // 0x00680327: 0x00001E29
-	"\x00H\x03.\x00\x00\x1e*" + // 0x0048032E: 0x00001E2A
-	"\x00h\x03.\x00\x00\x1e+" + // 0x0068032E: 0x00001E2B
-	"\x00I\x030\x00\x00\x1e," + // 0x00490330: 0x00001E2C
-	"\x00i\x030\x00\x00\x1e-" + // 0x00690330: 0x00001E2D
-	"\x00\xcf\x03\x01\x00\x00\x1e." + // 0x00CF0301: 0x00001E2E
-	"\x00\xef\x03\x01\x00\x00\x1e/" + // 0x00EF0301: 0x00001E2F
-	"\x00K\x03\x01\x00\x00\x1e0" + // 0x004B0301: 0x00001E30
-	"\x00k\x03\x01\x00\x00\x1e1" + // 0x006B0301: 0x00001E31
-	"\x00K\x03#\x00\x00\x1e2" + // 0x004B0323: 0x00001E32
-	"\x00k\x03#\x00\x00\x1e3" + // 0x006B0323: 0x00001E33
-	"\x00K\x031\x00\x00\x1e4" + // 0x004B0331: 0x00001E34
-	"\x00k\x031\x00\x00\x1e5" + // 0x006B0331: 0x00001E35
-	"\x00L\x03#\x00\x00\x1e6" + // 0x004C0323: 0x00001E36
-	"\x00l\x03#\x00\x00\x1e7" + // 0x006C0323: 0x00001E37
-	"\x1e6\x03\x04\x00\x00\x1e8" + // 0x1E360304: 0x00001E38
-	"\x1e7\x03\x04\x00\x00\x1e9" + // 0x1E370304: 0x00001E39
-	"\x00L\x031\x00\x00\x1e:" + // 0x004C0331: 0x00001E3A
-	"\x00l\x031\x00\x00\x1e;" + // 0x006C0331: 0x00001E3B
-	"\x00L\x03-\x00\x00\x1e<" + // 0x004C032D: 0x00001E3C
-	"\x00l\x03-\x00\x00\x1e=" + // 0x006C032D: 0x00001E3D
-	"\x00M\x03\x01\x00\x00\x1e>" + // 0x004D0301: 0x00001E3E
-	"\x00m\x03\x01\x00\x00\x1e?" + // 0x006D0301: 0x00001E3F
-	"\x00M\x03\a\x00\x00\x1e@" + // 0x004D0307: 0x00001E40
-	"\x00m\x03\a\x00\x00\x1eA" + // 0x006D0307: 0x00001E41
-	"\x00M\x03#\x00\x00\x1eB" + // 0x004D0323: 0x00001E42
-	"\x00m\x03#\x00\x00\x1eC" + // 0x006D0323: 0x00001E43
-	"\x00N\x03\a\x00\x00\x1eD" + // 0x004E0307: 0x00001E44
-	"\x00n\x03\a\x00\x00\x1eE" + // 0x006E0307: 0x00001E45
-	"\x00N\x03#\x00\x00\x1eF" + // 0x004E0323: 0x00001E46
-	"\x00n\x03#\x00\x00\x1eG" + // 0x006E0323: 0x00001E47
-	"\x00N\x031\x00\x00\x1eH" + // 0x004E0331: 0x00001E48
-	"\x00n\x031\x00\x00\x1eI" + // 0x006E0331: 0x00001E49
-	"\x00N\x03-\x00\x00\x1eJ" + // 0x004E032D: 0x00001E4A
-	"\x00n\x03-\x00\x00\x1eK" + // 0x006E032D: 0x00001E4B
-	"\x00\xd5\x03\x01\x00\x00\x1eL" + // 0x00D50301: 0x00001E4C
-	"\x00\xf5\x03\x01\x00\x00\x1eM" + // 0x00F50301: 0x00001E4D
-	"\x00\xd5\x03\b\x00\x00\x1eN" + // 0x00D50308: 0x00001E4E
-	"\x00\xf5\x03\b\x00\x00\x1eO" + // 0x00F50308: 0x00001E4F
-	"\x01L\x03\x00\x00\x00\x1eP" + // 0x014C0300: 0x00001E50
-	"\x01M\x03\x00\x00\x00\x1eQ" + // 0x014D0300: 0x00001E51
-	"\x01L\x03\x01\x00\x00\x1eR" + // 0x014C0301: 0x00001E52
-	"\x01M\x03\x01\x00\x00\x1eS" + // 0x014D0301: 0x00001E53
-	"\x00P\x03\x01\x00\x00\x1eT" + // 0x00500301: 0x00001E54
-	"\x00p\x03\x01\x00\x00\x1eU" + // 0x00700301: 0x00001E55
-	"\x00P\x03\a\x00\x00\x1eV" + // 0x00500307: 0x00001E56
-	"\x00p\x03\a\x00\x00\x1eW" + // 0x00700307: 0x00001E57
-	"\x00R\x03\a\x00\x00\x1eX" + // 0x00520307: 0x00001E58
-	"\x00r\x03\a\x00\x00\x1eY" + // 0x00720307: 0x00001E59
-	"\x00R\x03#\x00\x00\x1eZ" + // 0x00520323: 0x00001E5A
-	"\x00r\x03#\x00\x00\x1e[" + // 0x00720323: 0x00001E5B
-	"\x1eZ\x03\x04\x00\x00\x1e\\" + // 0x1E5A0304: 0x00001E5C
-	"\x1e[\x03\x04\x00\x00\x1e]" + // 0x1E5B0304: 0x00001E5D
-	"\x00R\x031\x00\x00\x1e^" + // 0x00520331: 0x00001E5E
-	"\x00r\x031\x00\x00\x1e_" + // 0x00720331: 0x00001E5F
-	"\x00S\x03\a\x00\x00\x1e`" + // 0x00530307: 0x00001E60
-	"\x00s\x03\a\x00\x00\x1ea" + // 0x00730307: 0x00001E61
-	"\x00S\x03#\x00\x00\x1eb" + // 0x00530323: 0x00001E62
-	"\x00s\x03#\x00\x00\x1ec" + // 0x00730323: 0x00001E63
-	"\x01Z\x03\a\x00\x00\x1ed" + // 0x015A0307: 0x00001E64
-	"\x01[\x03\a\x00\x00\x1ee" + // 0x015B0307: 0x00001E65
-	"\x01`\x03\a\x00\x00\x1ef" + // 0x01600307: 0x00001E66
-	"\x01a\x03\a\x00\x00\x1eg" + // 0x01610307: 0x00001E67
-	"\x1eb\x03\a\x00\x00\x1eh" + // 0x1E620307: 0x00001E68
-	"\x1ec\x03\a\x00\x00\x1ei" + // 0x1E630307: 0x00001E69
-	"\x00T\x03\a\x00\x00\x1ej" + // 0x00540307: 0x00001E6A
-	"\x00t\x03\a\x00\x00\x1ek" + // 0x00740307: 0x00001E6B
-	"\x00T\x03#\x00\x00\x1el" + // 0x00540323: 0x00001E6C
-	"\x00t\x03#\x00\x00\x1em" + // 0x00740323: 0x00001E6D
-	"\x00T\x031\x00\x00\x1en" + // 0x00540331: 0x00001E6E
-	"\x00t\x031\x00\x00\x1eo" + // 0x00740331: 0x00001E6F
-	"\x00T\x03-\x00\x00\x1ep" + // 0x0054032D: 0x00001E70
-	"\x00t\x03-\x00\x00\x1eq" + // 0x0074032D: 0x00001E71
-	"\x00U\x03$\x00\x00\x1er" + // 0x00550324: 0x00001E72
-	"\x00u\x03$\x00\x00\x1es" + // 0x00750324: 0x00001E73
-	"\x00U\x030\x00\x00\x1et" + // 0x00550330: 0x00001E74
-	"\x00u\x030\x00\x00\x1eu" + // 0x00750330: 0x00001E75
-	"\x00U\x03-\x00\x00\x1ev" + // 0x0055032D: 0x00001E76
-	"\x00u\x03-\x00\x00\x1ew" + // 0x0075032D: 0x00001E77
-	"\x01h\x03\x01\x00\x00\x1ex" + // 0x01680301: 0x00001E78
-	"\x01i\x03\x01\x00\x00\x1ey" + // 0x01690301: 0x00001E79
-	"\x01j\x03\b\x00\x00\x1ez" + // 0x016A0308: 0x00001E7A
-	"\x01k\x03\b\x00\x00\x1e{" + // 0x016B0308: 0x00001E7B
-	"\x00V\x03\x03\x00\x00\x1e|" + // 0x00560303: 0x00001E7C
-	"\x00v\x03\x03\x00\x00\x1e}" + // 0x00760303: 0x00001E7D
-	"\x00V\x03#\x00\x00\x1e~" + // 0x00560323: 0x00001E7E
-	"\x00v\x03#\x00\x00\x1e\x7f" + // 0x00760323: 0x00001E7F
-	"\x00W\x03\x00\x00\x00\x1e\x80" + // 0x00570300: 0x00001E80
-	"\x00w\x03\x00\x00\x00\x1e\x81" + // 0x00770300: 0x00001E81
-	"\x00W\x03\x01\x00\x00\x1e\x82" + // 0x00570301: 0x00001E82
-	"\x00w\x03\x01\x00\x00\x1e\x83" + // 0x00770301: 0x00001E83
-	"\x00W\x03\b\x00\x00\x1e\x84" + // 0x00570308: 0x00001E84
-	"\x00w\x03\b\x00\x00\x1e\x85" + // 0x00770308: 0x00001E85
-	"\x00W\x03\a\x00\x00\x1e\x86" + // 0x00570307: 0x00001E86
-	"\x00w\x03\a\x00\x00\x1e\x87" + // 0x00770307: 0x00001E87
-	"\x00W\x03#\x00\x00\x1e\x88" + // 0x00570323: 0x00001E88
-	"\x00w\x03#\x00\x00\x1e\x89" + // 0x00770323: 0x00001E89
-	"\x00X\x03\a\x00\x00\x1e\x8a" + // 0x00580307: 0x00001E8A
-	"\x00x\x03\a\x00\x00\x1e\x8b" + // 0x00780307: 0x00001E8B
-	"\x00X\x03\b\x00\x00\x1e\x8c" + // 0x00580308: 0x00001E8C
-	"\x00x\x03\b\x00\x00\x1e\x8d" + // 0x00780308: 0x00001E8D
-	"\x00Y\x03\a\x00\x00\x1e\x8e" + // 0x00590307: 0x00001E8E
-	"\x00y\x03\a\x00\x00\x1e\x8f" + // 0x00790307: 0x00001E8F
-	"\x00Z\x03\x02\x00\x00\x1e\x90" + // 0x005A0302: 0x00001E90
-	"\x00z\x03\x02\x00\x00\x1e\x91" + // 0x007A0302: 0x00001E91
-	"\x00Z\x03#\x00\x00\x1e\x92" + // 0x005A0323: 0x00001E92
-	"\x00z\x03#\x00\x00\x1e\x93" + // 0x007A0323: 0x00001E93
-	"\x00Z\x031\x00\x00\x1e\x94" + // 0x005A0331: 0x00001E94
-	"\x00z\x031\x00\x00\x1e\x95" + // 0x007A0331: 0x00001E95
-	"\x00h\x031\x00\x00\x1e\x96" + // 0x00680331: 0x00001E96
-	"\x00t\x03\b\x00\x00\x1e\x97" + // 0x00740308: 0x00001E97
-	"\x00w\x03\n\x00\x00\x1e\x98" + // 0x0077030A: 0x00001E98
-	"\x00y\x03\n\x00\x00\x1e\x99" + // 0x0079030A: 0x00001E99
-	"\x01\x7f\x03\a\x00\x00\x1e\x9b" + // 0x017F0307: 0x00001E9B
-	"\x00A\x03#\x00\x00\x1e\xa0" + // 0x00410323: 0x00001EA0
-	"\x00a\x03#\x00\x00\x1e\xa1" + // 0x00610323: 0x00001EA1
-	"\x00A\x03\t\x00\x00\x1e\xa2" + // 0x00410309: 0x00001EA2
-	"\x00a\x03\t\x00\x00\x1e\xa3" + // 0x00610309: 0x00001EA3
-	"\x00\xc2\x03\x01\x00\x00\x1e\xa4" + // 0x00C20301: 0x00001EA4
-	"\x00\xe2\x03\x01\x00\x00\x1e\xa5" + // 0x00E20301: 0x00001EA5
-	"\x00\xc2\x03\x00\x00\x00\x1e\xa6" + // 0x00C20300: 0x00001EA6
-	"\x00\xe2\x03\x00\x00\x00\x1e\xa7" + // 0x00E20300: 0x00001EA7
-	"\x00\xc2\x03\t\x00\x00\x1e\xa8" + // 0x00C20309: 0x00001EA8
-	"\x00\xe2\x03\t\x00\x00\x1e\xa9" + // 0x00E20309: 0x00001EA9
-	"\x00\xc2\x03\x03\x00\x00\x1e\xaa" + // 0x00C20303: 0x00001EAA
-	"\x00\xe2\x03\x03\x00\x00\x1e\xab" + // 0x00E20303: 0x00001EAB
-	"\x1e\xa0\x03\x02\x00\x00\x1e\xac" + // 0x1EA00302: 0x00001EAC
-	"\x1e\xa1\x03\x02\x00\x00\x1e\xad" + // 0x1EA10302: 0x00001EAD
-	"\x01\x02\x03\x01\x00\x00\x1e\xae" + // 0x01020301: 0x00001EAE
-	"\x01\x03\x03\x01\x00\x00\x1e\xaf" + // 0x01030301: 0x00001EAF
-	"\x01\x02\x03\x00\x00\x00\x1e\xb0" + // 0x01020300: 0x00001EB0
-	"\x01\x03\x03\x00\x00\x00\x1e\xb1" + // 0x01030300: 0x00001EB1
-	"\x01\x02\x03\t\x00\x00\x1e\xb2" + // 0x01020309: 0x00001EB2
-	"\x01\x03\x03\t\x00\x00\x1e\xb3" + // 0x01030309: 0x00001EB3
-	"\x01\x02\x03\x03\x00\x00\x1e\xb4" + // 0x01020303: 0x00001EB4
-	"\x01\x03\x03\x03\x00\x00\x1e\xb5" + // 0x01030303: 0x00001EB5
-	"\x1e\xa0\x03\x06\x00\x00\x1e\xb6" + // 0x1EA00306: 0x00001EB6
-	"\x1e\xa1\x03\x06\x00\x00\x1e\xb7" + // 0x1EA10306: 0x00001EB7
-	"\x00E\x03#\x00\x00\x1e\xb8" + // 0x00450323: 0x00001EB8
-	"\x00e\x03#\x00\x00\x1e\xb9" + // 0x00650323: 0x00001EB9
-	"\x00E\x03\t\x00\x00\x1e\xba" + // 0x00450309: 0x00001EBA
-	"\x00e\x03\t\x00\x00\x1e\xbb" + // 0x00650309: 0x00001EBB
-	"\x00E\x03\x03\x00\x00\x1e\xbc" + // 0x00450303: 0x00001EBC
-	"\x00e\x03\x03\x00\x00\x1e\xbd" + // 0x00650303: 0x00001EBD
-	"\x00\xca\x03\x01\x00\x00\x1e\xbe" + // 0x00CA0301: 0x00001EBE
-	"\x00\xea\x03\x01\x00\x00\x1e\xbf" + // 0x00EA0301: 0x00001EBF
-	"\x00\xca\x03\x00\x00\x00\x1e\xc0" + // 0x00CA0300: 0x00001EC0
-	"\x00\xea\x03\x00\x00\x00\x1e\xc1" + // 0x00EA0300: 0x00001EC1
-	"\x00\xca\x03\t\x00\x00\x1e\xc2" + // 0x00CA0309: 0x00001EC2
-	"\x00\xea\x03\t\x00\x00\x1e\xc3" + // 0x00EA0309: 0x00001EC3
-	"\x00\xca\x03\x03\x00\x00\x1e\xc4" + // 0x00CA0303: 0x00001EC4
-	"\x00\xea\x03\x03\x00\x00\x1e\xc5" + // 0x00EA0303: 0x00001EC5
-	"\x1e\xb8\x03\x02\x00\x00\x1e\xc6" + // 0x1EB80302: 0x00001EC6
-	"\x1e\xb9\x03\x02\x00\x00\x1e\xc7" + // 0x1EB90302: 0x00001EC7
-	"\x00I\x03\t\x00\x00\x1e\xc8" + // 0x00490309: 0x00001EC8
-	"\x00i\x03\t\x00\x00\x1e\xc9" + // 0x00690309: 0x00001EC9
-	"\x00I\x03#\x00\x00\x1e\xca" + // 0x00490323: 0x00001ECA
-	"\x00i\x03#\x00\x00\x1e\xcb" + // 0x00690323: 0x00001ECB
-	"\x00O\x03#\x00\x00\x1e\xcc" + // 0x004F0323: 0x00001ECC
-	"\x00o\x03#\x00\x00\x1e\xcd" + // 0x006F0323: 0x00001ECD
-	"\x00O\x03\t\x00\x00\x1e\xce" + // 0x004F0309: 0x00001ECE
-	"\x00o\x03\t\x00\x00\x1e\xcf" + // 0x006F0309: 0x00001ECF
-	"\x00\xd4\x03\x01\x00\x00\x1e\xd0" + // 0x00D40301: 0x00001ED0
-	"\x00\xf4\x03\x01\x00\x00\x1e\xd1" + // 0x00F40301: 0x00001ED1
-	"\x00\xd4\x03\x00\x00\x00\x1e\xd2" + // 0x00D40300: 0x00001ED2
-	"\x00\xf4\x03\x00\x00\x00\x1e\xd3" + // 0x00F40300: 0x00001ED3
-	"\x00\xd4\x03\t\x00\x00\x1e\xd4" + // 0x00D40309: 0x00001ED4
-	"\x00\xf4\x03\t\x00\x00\x1e\xd5" + // 0x00F40309: 0x00001ED5
-	"\x00\xd4\x03\x03\x00\x00\x1e\xd6" + // 0x00D40303: 0x00001ED6
-	"\x00\xf4\x03\x03\x00\x00\x1e\xd7" + // 0x00F40303: 0x00001ED7
-	"\x1e\xcc\x03\x02\x00\x00\x1e\xd8" + // 0x1ECC0302: 0x00001ED8
-	"\x1e\xcd\x03\x02\x00\x00\x1e\xd9" + // 0x1ECD0302: 0x00001ED9
-	"\x01\xa0\x03\x01\x00\x00\x1e\xda" + // 0x01A00301: 0x00001EDA
-	"\x01\xa1\x03\x01\x00\x00\x1e\xdb" + // 0x01A10301: 0x00001EDB
-	"\x01\xa0\x03\x00\x00\x00\x1e\xdc" + // 0x01A00300: 0x00001EDC
-	"\x01\xa1\x03\x00\x00\x00\x1e\xdd" + // 0x01A10300: 0x00001EDD
-	"\x01\xa0\x03\t\x00\x00\x1e\xde" + // 0x01A00309: 0x00001EDE
-	"\x01\xa1\x03\t\x00\x00\x1e\xdf" + // 0x01A10309: 0x00001EDF
-	"\x01\xa0\x03\x03\x00\x00\x1e\xe0" + // 0x01A00303: 0x00001EE0
-	"\x01\xa1\x03\x03\x00\x00\x1e\xe1" + // 0x01A10303: 0x00001EE1
-	"\x01\xa0\x03#\x00\x00\x1e\xe2" + // 0x01A00323: 0x00001EE2
-	"\x01\xa1\x03#\x00\x00\x1e\xe3" + // 0x01A10323: 0x00001EE3
-	"\x00U\x03#\x00\x00\x1e\xe4" + // 0x00550323: 0x00001EE4
-	"\x00u\x03#\x00\x00\x1e\xe5" + // 0x00750323: 0x00001EE5
-	"\x00U\x03\t\x00\x00\x1e\xe6" + // 0x00550309: 0x00001EE6
-	"\x00u\x03\t\x00\x00\x1e\xe7" + // 0x00750309: 0x00001EE7
-	"\x01\xaf\x03\x01\x00\x00\x1e\xe8" + // 0x01AF0301: 0x00001EE8
-	"\x01\xb0\x03\x01\x00\x00\x1e\xe9" + // 0x01B00301: 0x00001EE9
-	"\x01\xaf\x03\x00\x00\x00\x1e\xea" + // 0x01AF0300: 0x00001EEA
-	"\x01\xb0\x03\x00\x00\x00\x1e\xeb" + // 0x01B00300: 0x00001EEB
-	"\x01\xaf\x03\t\x00\x00\x1e\xec" + // 0x01AF0309: 0x00001EEC
-	"\x01\xb0\x03\t\x00\x00\x1e\xed" + // 0x01B00309: 0x00001EED
-	"\x01\xaf\x03\x03\x00\x00\x1e\xee" + // 0x01AF0303: 0x00001EEE
-	"\x01\xb0\x03\x03\x00\x00\x1e\xef" + // 0x01B00303: 0x00001EEF
-	"\x01\xaf\x03#\x00\x00\x1e\xf0" + // 0x01AF0323: 0x00001EF0
-	"\x01\xb0\x03#\x00\x00\x1e\xf1" + // 0x01B00323: 0x00001EF1
-	"\x00Y\x03\x00\x00\x00\x1e\xf2" + // 0x00590300: 0x00001EF2
-	"\x00y\x03\x00\x00\x00\x1e\xf3" + // 0x00790300: 0x00001EF3
-	"\x00Y\x03#\x00\x00\x1e\xf4" + // 0x00590323: 0x00001EF4
-	"\x00y\x03#\x00\x00\x1e\xf5" + // 0x00790323: 0x00001EF5
-	"\x00Y\x03\t\x00\x00\x1e\xf6" + // 0x00590309: 0x00001EF6
-	"\x00y\x03\t\x00\x00\x1e\xf7" + // 0x00790309: 0x00001EF7
-	"\x00Y\x03\x03\x00\x00\x1e\xf8" + // 0x00590303: 0x00001EF8
-	"\x00y\x03\x03\x00\x00\x1e\xf9" + // 0x00790303: 0x00001EF9
-	"\x03\xb1\x03\x13\x00\x00\x1f\x00" + // 0x03B10313: 0x00001F00
-	"\x03\xb1\x03\x14\x00\x00\x1f\x01" + // 0x03B10314: 0x00001F01
-	"\x1f\x00\x03\x00\x00\x00\x1f\x02" + // 0x1F000300: 0x00001F02
-	"\x1f\x01\x03\x00\x00\x00\x1f\x03" + // 0x1F010300: 0x00001F03
-	"\x1f\x00\x03\x01\x00\x00\x1f\x04" + // 0x1F000301: 0x00001F04
-	"\x1f\x01\x03\x01\x00\x00\x1f\x05" + // 0x1F010301: 0x00001F05
-	"\x1f\x00\x03B\x00\x00\x1f\x06" + // 0x1F000342: 0x00001F06
-	"\x1f\x01\x03B\x00\x00\x1f\a" + // 0x1F010342: 0x00001F07
-	"\x03\x91\x03\x13\x00\x00\x1f\b" + // 0x03910313: 0x00001F08
-	"\x03\x91\x03\x14\x00\x00\x1f\t" + // 0x03910314: 0x00001F09
-	"\x1f\b\x03\x00\x00\x00\x1f\n" + // 0x1F080300: 0x00001F0A
-	"\x1f\t\x03\x00\x00\x00\x1f\v" + // 0x1F090300: 0x00001F0B
-	"\x1f\b\x03\x01\x00\x00\x1f\f" + // 0x1F080301: 0x00001F0C
-	"\x1f\t\x03\x01\x00\x00\x1f\r" + // 0x1F090301: 0x00001F0D
-	"\x1f\b\x03B\x00\x00\x1f\x0e" + // 0x1F080342: 0x00001F0E
-	"\x1f\t\x03B\x00\x00\x1f\x0f" + // 0x1F090342: 0x00001F0F
-	"\x03\xb5\x03\x13\x00\x00\x1f\x10" + // 0x03B50313: 0x00001F10
-	"\x03\xb5\x03\x14\x00\x00\x1f\x11" + // 0x03B50314: 0x00001F11
-	"\x1f\x10\x03\x00\x00\x00\x1f\x12" + // 0x1F100300: 0x00001F12
-	"\x1f\x11\x03\x00\x00\x00\x1f\x13" + // 0x1F110300: 0x00001F13
-	"\x1f\x10\x03\x01\x00\x00\x1f\x14" + // 0x1F100301: 0x00001F14
-	"\x1f\x11\x03\x01\x00\x00\x1f\x15" + // 0x1F110301: 0x00001F15
-	"\x03\x95\x03\x13\x00\x00\x1f\x18" + // 0x03950313: 0x00001F18
-	"\x03\x95\x03\x14\x00\x00\x1f\x19" + // 0x03950314: 0x00001F19
-	"\x1f\x18\x03\x00\x00\x00\x1f\x1a" + // 0x1F180300: 0x00001F1A
-	"\x1f\x19\x03\x00\x00\x00\x1f\x1b" + // 0x1F190300: 0x00001F1B
-	"\x1f\x18\x03\x01\x00\x00\x1f\x1c" + // 0x1F180301: 0x00001F1C
-	"\x1f\x19\x03\x01\x00\x00\x1f\x1d" + // 0x1F190301: 0x00001F1D
-	"\x03\xb7\x03\x13\x00\x00\x1f " + // 0x03B70313: 0x00001F20
-	"\x03\xb7\x03\x14\x00\x00\x1f!" + // 0x03B70314: 0x00001F21
-	"\x1f \x03\x00\x00\x00\x1f\"" + // 0x1F200300: 0x00001F22
-	"\x1f!\x03\x00\x00\x00\x1f#" + // 0x1F210300: 0x00001F23
-	"\x1f \x03\x01\x00\x00\x1f$" + // 0x1F200301: 0x00001F24
-	"\x1f!\x03\x01\x00\x00\x1f%" + // 0x1F210301: 0x00001F25
-	"\x1f \x03B\x00\x00\x1f&" + // 0x1F200342: 0x00001F26
-	"\x1f!\x03B\x00\x00\x1f'" + // 0x1F210342: 0x00001F27
-	"\x03\x97\x03\x13\x00\x00\x1f(" + // 0x03970313: 0x00001F28
-	"\x03\x97\x03\x14\x00\x00\x1f)" + // 0x03970314: 0x00001F29
-	"\x1f(\x03\x00\x00\x00\x1f*" + // 0x1F280300: 0x00001F2A
-	"\x1f)\x03\x00\x00\x00\x1f+" + // 0x1F290300: 0x00001F2B
-	"\x1f(\x03\x01\x00\x00\x1f," + // 0x1F280301: 0x00001F2C
-	"\x1f)\x03\x01\x00\x00\x1f-" + // 0x1F290301: 0x00001F2D
-	"\x1f(\x03B\x00\x00\x1f." + // 0x1F280342: 0x00001F2E
-	"\x1f)\x03B\x00\x00\x1f/" + // 0x1F290342: 0x00001F2F
-	"\x03\xb9\x03\x13\x00\x00\x1f0" + // 0x03B90313: 0x00001F30
-	"\x03\xb9\x03\x14\x00\x00\x1f1" + // 0x03B90314: 0x00001F31
-	"\x1f0\x03\x00\x00\x00\x1f2" + // 0x1F300300: 0x00001F32
-	"\x1f1\x03\x00\x00\x00\x1f3" + // 0x1F310300: 0x00001F33
-	"\x1f0\x03\x01\x00\x00\x1f4" + // 0x1F300301: 0x00001F34
-	"\x1f1\x03\x01\x00\x00\x1f5" + // 0x1F310301: 0x00001F35
-	"\x1f0\x03B\x00\x00\x1f6" + // 0x1F300342: 0x00001F36
-	"\x1f1\x03B\x00\x00\x1f7" + // 0x1F310342: 0x00001F37
-	"\x03\x99\x03\x13\x00\x00\x1f8" + // 0x03990313: 0x00001F38
-	"\x03\x99\x03\x14\x00\x00\x1f9" + // 0x03990314: 0x00001F39
-	"\x1f8\x03\x00\x00\x00\x1f:" + // 0x1F380300: 0x00001F3A
-	"\x1f9\x03\x00\x00\x00\x1f;" + // 0x1F390300: 0x00001F3B
-	"\x1f8\x03\x01\x00\x00\x1f<" + // 0x1F380301: 0x00001F3C
-	"\x1f9\x03\x01\x00\x00\x1f=" + // 0x1F390301: 0x00001F3D
-	"\x1f8\x03B\x00\x00\x1f>" + // 0x1F380342: 0x00001F3E
-	"\x1f9\x03B\x00\x00\x1f?" + // 0x1F390342: 0x00001F3F
-	"\x03\xbf\x03\x13\x00\x00\x1f@" + // 0x03BF0313: 0x00001F40
-	"\x03\xbf\x03\x14\x00\x00\x1fA" + // 0x03BF0314: 0x00001F41
-	"\x1f@\x03\x00\x00\x00\x1fB" + // 0x1F400300: 0x00001F42
-	"\x1fA\x03\x00\x00\x00\x1fC" + // 0x1F410300: 0x00001F43
-	"\x1f@\x03\x01\x00\x00\x1fD" + // 0x1F400301: 0x00001F44
-	"\x1fA\x03\x01\x00\x00\x1fE" + // 0x1F410301: 0x00001F45
-	"\x03\x9f\x03\x13\x00\x00\x1fH" + // 0x039F0313: 0x00001F48
-	"\x03\x9f\x03\x14\x00\x00\x1fI" + // 0x039F0314: 0x00001F49
-	"\x1fH\x03\x00\x00\x00\x1fJ" + // 0x1F480300: 0x00001F4A
-	"\x1fI\x03\x00\x00\x00\x1fK" + // 0x1F490300: 0x00001F4B
-	"\x1fH\x03\x01\x00\x00\x1fL" + // 0x1F480301: 0x00001F4C
-	"\x1fI\x03\x01\x00\x00\x1fM" + // 0x1F490301: 0x00001F4D
-	"\x03\xc5\x03\x13\x00\x00\x1fP" + // 0x03C50313: 0x00001F50
-	"\x03\xc5\x03\x14\x00\x00\x1fQ" + // 0x03C50314: 0x00001F51
-	"\x1fP\x03\x00\x00\x00\x1fR" + // 0x1F500300: 0x00001F52
-	"\x1fQ\x03\x00\x00\x00\x1fS" + // 0x1F510300: 0x00001F53
-	"\x1fP\x03\x01\x00\x00\x1fT" + // 0x1F500301: 0x00001F54
-	"\x1fQ\x03\x01\x00\x00\x1fU" + // 0x1F510301: 0x00001F55
-	"\x1fP\x03B\x00\x00\x1fV" + // 0x1F500342: 0x00001F56
-	"\x1fQ\x03B\x00\x00\x1fW" + // 0x1F510342: 0x00001F57
-	"\x03\xa5\x03\x14\x00\x00\x1fY" + // 0x03A50314: 0x00001F59
-	"\x1fY\x03\x00\x00\x00\x1f[" + // 0x1F590300: 0x00001F5B
-	"\x1fY\x03\x01\x00\x00\x1f]" + // 0x1F590301: 0x00001F5D
-	"\x1fY\x03B\x00\x00\x1f_" + // 0x1F590342: 0x00001F5F
-	"\x03\xc9\x03\x13\x00\x00\x1f`" + // 0x03C90313: 0x00001F60
-	"\x03\xc9\x03\x14\x00\x00\x1fa" + // 0x03C90314: 0x00001F61
-	"\x1f`\x03\x00\x00\x00\x1fb" + // 0x1F600300: 0x00001F62
-	"\x1fa\x03\x00\x00\x00\x1fc" + // 0x1F610300: 0x00001F63
-	"\x1f`\x03\x01\x00\x00\x1fd" + // 0x1F600301: 0x00001F64
-	"\x1fa\x03\x01\x00\x00\x1fe" + // 0x1F610301: 0x00001F65
-	"\x1f`\x03B\x00\x00\x1ff" + // 0x1F600342: 0x00001F66
-	"\x1fa\x03B\x00\x00\x1fg" + // 0x1F610342: 0x00001F67
-	"\x03\xa9\x03\x13\x00\x00\x1fh" + // 0x03A90313: 0x00001F68
-	"\x03\xa9\x03\x14\x00\x00\x1fi" + // 0x03A90314: 0x00001F69
-	"\x1fh\x03\x00\x00\x00\x1fj" + // 0x1F680300: 0x00001F6A
-	"\x1fi\x03\x00\x00\x00\x1fk" + // 0x1F690300: 0x00001F6B
-	"\x1fh\x03\x01\x00\x00\x1fl" + // 0x1F680301: 0x00001F6C
-	"\x1fi\x03\x01\x00\x00\x1fm" + // 0x1F690301: 0x00001F6D
-	"\x1fh\x03B\x00\x00\x1fn" + // 0x1F680342: 0x00001F6E
-	"\x1fi\x03B\x00\x00\x1fo" + // 0x1F690342: 0x00001F6F
-	"\x03\xb1\x03\x00\x00\x00\x1fp" + // 0x03B10300: 0x00001F70
-	"\x03\xb5\x03\x00\x00\x00\x1fr" + // 0x03B50300: 0x00001F72
-	"\x03\xb7\x03\x00\x00\x00\x1ft" + // 0x03B70300: 0x00001F74
-	"\x03\xb9\x03\x00\x00\x00\x1fv" + // 0x03B90300: 0x00001F76
-	"\x03\xbf\x03\x00\x00\x00\x1fx" + // 0x03BF0300: 0x00001F78
-	"\x03\xc5\x03\x00\x00\x00\x1fz" + // 0x03C50300: 0x00001F7A
-	"\x03\xc9\x03\x00\x00\x00\x1f|" + // 0x03C90300: 0x00001F7C
-	"\x1f\x00\x03E\x00\x00\x1f\x80" + // 0x1F000345: 0x00001F80
-	"\x1f\x01\x03E\x00\x00\x1f\x81" + // 0x1F010345: 0x00001F81
-	"\x1f\x02\x03E\x00\x00\x1f\x82" + // 0x1F020345: 0x00001F82
-	"\x1f\x03\x03E\x00\x00\x1f\x83" + // 0x1F030345: 0x00001F83
-	"\x1f\x04\x03E\x00\x00\x1f\x84" + // 0x1F040345: 0x00001F84
-	"\x1f\x05\x03E\x00\x00\x1f\x85" + // 0x1F050345: 0x00001F85
-	"\x1f\x06\x03E\x00\x00\x1f\x86" + // 0x1F060345: 0x00001F86
-	"\x1f\a\x03E\x00\x00\x1f\x87" + // 0x1F070345: 0x00001F87
-	"\x1f\b\x03E\x00\x00\x1f\x88" + // 0x1F080345: 0x00001F88
-	"\x1f\t\x03E\x00\x00\x1f\x89" + // 0x1F090345: 0x00001F89
-	"\x1f\n\x03E\x00\x00\x1f\x8a" + // 0x1F0A0345: 0x00001F8A
-	"\x1f\v\x03E\x00\x00\x1f\x8b" + // 0x1F0B0345: 0x00001F8B
-	"\x1f\f\x03E\x00\x00\x1f\x8c" + // 0x1F0C0345: 0x00001F8C
-	"\x1f\r\x03E\x00\x00\x1f\x8d" + // 0x1F0D0345: 0x00001F8D
-	"\x1f\x0e\x03E\x00\x00\x1f\x8e" + // 0x1F0E0345: 0x00001F8E
-	"\x1f\x0f\x03E\x00\x00\x1f\x8f" + // 0x1F0F0345: 0x00001F8F
-	"\x1f \x03E\x00\x00\x1f\x90" + // 0x1F200345: 0x00001F90
-	"\x1f!\x03E\x00\x00\x1f\x91" + // 0x1F210345: 0x00001F91
-	"\x1f\"\x03E\x00\x00\x1f\x92" + // 0x1F220345: 0x00001F92
-	"\x1f#\x03E\x00\x00\x1f\x93" + // 0x1F230345: 0x00001F93
-	"\x1f$\x03E\x00\x00\x1f\x94" + // 0x1F240345: 0x00001F94
-	"\x1f%\x03E\x00\x00\x1f\x95" + // 0x1F250345: 0x00001F95
-	"\x1f&\x03E\x00\x00\x1f\x96" + // 0x1F260345: 0x00001F96
-	"\x1f'\x03E\x00\x00\x1f\x97" + // 0x1F270345: 0x00001F97
-	"\x1f(\x03E\x00\x00\x1f\x98" + // 0x1F280345: 0x00001F98
-	"\x1f)\x03E\x00\x00\x1f\x99" + // 0x1F290345: 0x00001F99
-	"\x1f*\x03E\x00\x00\x1f\x9a" + // 0x1F2A0345: 0x00001F9A
-	"\x1f+\x03E\x00\x00\x1f\x9b" + // 0x1F2B0345: 0x00001F9B
-	"\x1f,\x03E\x00\x00\x1f\x9c" + // 0x1F2C0345: 0x00001F9C
-	"\x1f-\x03E\x00\x00\x1f\x9d" + // 0x1F2D0345: 0x00001F9D
-	"\x1f.\x03E\x00\x00\x1f\x9e" + // 0x1F2E0345: 0x00001F9E
-	"\x1f/\x03E\x00\x00\x1f\x9f" + // 0x1F2F0345: 0x00001F9F
-	"\x1f`\x03E\x00\x00\x1f\xa0" + // 0x1F600345: 0x00001FA0
-	"\x1fa\x03E\x00\x00\x1f\xa1" + // 0x1F610345: 0x00001FA1
-	"\x1fb\x03E\x00\x00\x1f\xa2" + // 0x1F620345: 0x00001FA2
-	"\x1fc\x03E\x00\x00\x1f\xa3" + // 0x1F630345: 0x00001FA3
-	"\x1fd\x03E\x00\x00\x1f\xa4" + // 0x1F640345: 0x00001FA4
-	"\x1fe\x03E\x00\x00\x1f\xa5" + // 0x1F650345: 0x00001FA5
-	"\x1ff\x03E\x00\x00\x1f\xa6" + // 0x1F660345: 0x00001FA6
-	"\x1fg\x03E\x00\x00\x1f\xa7" + // 0x1F670345: 0x00001FA7
-	"\x1fh\x03E\x00\x00\x1f\xa8" + // 0x1F680345: 0x00001FA8
-	"\x1fi\x03E\x00\x00\x1f\xa9" + // 0x1F690345: 0x00001FA9
-	"\x1fj\x03E\x00\x00\x1f\xaa" + // 0x1F6A0345: 0x00001FAA
-	"\x1fk\x03E\x00\x00\x1f\xab" + // 0x1F6B0345: 0x00001FAB
-	"\x1fl\x03E\x00\x00\x1f\xac" + // 0x1F6C0345: 0x00001FAC
-	"\x1fm\x03E\x00\x00\x1f\xad" + // 0x1F6D0345: 0x00001FAD
-	"\x1fn\x03E\x00\x00\x1f\xae" + // 0x1F6E0345: 0x00001FAE
-	"\x1fo\x03E\x00\x00\x1f\xaf" + // 0x1F6F0345: 0x00001FAF
-	"\x03\xb1\x03\x06\x00\x00\x1f\xb0" + // 0x03B10306: 0x00001FB0
-	"\x03\xb1\x03\x04\x00\x00\x1f\xb1" + // 0x03B10304: 0x00001FB1
-	"\x1fp\x03E\x00\x00\x1f\xb2" + // 0x1F700345: 0x00001FB2
-	"\x03\xb1\x03E\x00\x00\x1f\xb3" + // 0x03B10345: 0x00001FB3
-	"\x03\xac\x03E\x00\x00\x1f\xb4" + // 0x03AC0345: 0x00001FB4
-	"\x03\xb1\x03B\x00\x00\x1f\xb6" + // 0x03B10342: 0x00001FB6
-	"\x1f\xb6\x03E\x00\x00\x1f\xb7" + // 0x1FB60345: 0x00001FB7
-	"\x03\x91\x03\x06\x00\x00\x1f\xb8" + // 0x03910306: 0x00001FB8
-	"\x03\x91\x03\x04\x00\x00\x1f\xb9" + // 0x03910304: 0x00001FB9
-	"\x03\x91\x03\x00\x00\x00\x1f\xba" + // 0x03910300: 0x00001FBA
-	"\x03\x91\x03E\x00\x00\x1f\xbc" + // 0x03910345: 0x00001FBC
-	"\x00\xa8\x03B\x00\x00\x1f\xc1" + // 0x00A80342: 0x00001FC1
-	"\x1ft\x03E\x00\x00\x1f\xc2" + // 0x1F740345: 0x00001FC2
-	"\x03\xb7\x03E\x00\x00\x1f\xc3" + // 0x03B70345: 0x00001FC3
-	"\x03\xae\x03E\x00\x00\x1f\xc4" + // 0x03AE0345: 0x00001FC4
-	"\x03\xb7\x03B\x00\x00\x1f\xc6" + // 0x03B70342: 0x00001FC6
-	"\x1f\xc6\x03E\x00\x00\x1f\xc7" + // 0x1FC60345: 0x00001FC7
-	"\x03\x95\x03\x00\x00\x00\x1f\xc8" + // 0x03950300: 0x00001FC8
-	"\x03\x97\x03\x00\x00\x00\x1f\xca" + // 0x03970300: 0x00001FCA
-	"\x03\x97\x03E\x00\x00\x1f\xcc" + // 0x03970345: 0x00001FCC
-	"\x1f\xbf\x03\x00\x00\x00\x1f\xcd" + // 0x1FBF0300: 0x00001FCD
-	"\x1f\xbf\x03\x01\x00\x00\x1f\xce" + // 0x1FBF0301: 0x00001FCE
-	"\x1f\xbf\x03B\x00\x00\x1f\xcf" + // 0x1FBF0342: 0x00001FCF
-	"\x03\xb9\x03\x06\x00\x00\x1f\xd0" + // 0x03B90306: 0x00001FD0
-	"\x03\xb9\x03\x04\x00\x00\x1f\xd1" + // 0x03B90304: 0x00001FD1
-	"\x03\xca\x03\x00\x00\x00\x1f\xd2" + // 0x03CA0300: 0x00001FD2
-	"\x03\xb9\x03B\x00\x00\x1f\xd6" + // 0x03B90342: 0x00001FD6
-	"\x03\xca\x03B\x00\x00\x1f\xd7" + // 0x03CA0342: 0x00001FD7
-	"\x03\x99\x03\x06\x00\x00\x1f\xd8" + // 0x03990306: 0x00001FD8
-	"\x03\x99\x03\x04\x00\x00\x1f\xd9" + // 0x03990304: 0x00001FD9
-	"\x03\x99\x03\x00\x00\x00\x1f\xda" + // 0x03990300: 0x00001FDA
-	"\x1f\xfe\x03\x00\x00\x00\x1f\xdd" + // 0x1FFE0300: 0x00001FDD
-	"\x1f\xfe\x03\x01\x00\x00\x1f\xde" + // 0x1FFE0301: 0x00001FDE
-	"\x1f\xfe\x03B\x00\x00\x1f\xdf" + // 0x1FFE0342: 0x00001FDF
-	"\x03\xc5\x03\x06\x00\x00\x1f\xe0" + // 0x03C50306: 0x00001FE0
-	"\x03\xc5\x03\x04\x00\x00\x1f\xe1" + // 0x03C50304: 0x00001FE1
-	"\x03\xcb\x03\x00\x00\x00\x1f\xe2" + // 0x03CB0300: 0x00001FE2
-	"\x03\xc1\x03\x13\x00\x00\x1f\xe4" + // 0x03C10313: 0x00001FE4
-	"\x03\xc1\x03\x14\x00\x00\x1f\xe5" + // 0x03C10314: 0x00001FE5
-	"\x03\xc5\x03B\x00\x00\x1f\xe6" + // 0x03C50342: 0x00001FE6
-	"\x03\xcb\x03B\x00\x00\x1f\xe7" + // 0x03CB0342: 0x00001FE7
-	"\x03\xa5\x03\x06\x00\x00\x1f\xe8" + // 0x03A50306: 0x00001FE8
-	"\x03\xa5\x03\x04\x00\x00\x1f\xe9" + // 0x03A50304: 0x00001FE9
-	"\x03\xa5\x03\x00\x00\x00\x1f\xea" + // 0x03A50300: 0x00001FEA
-	"\x03\xa1\x03\x14\x00\x00\x1f\xec" + // 0x03A10314: 0x00001FEC
-	"\x00\xa8\x03\x00\x00\x00\x1f\xed" + // 0x00A80300: 0x00001FED
-	"\x1f|\x03E\x00\x00\x1f\xf2" + // 0x1F7C0345: 0x00001FF2
-	"\x03\xc9\x03E\x00\x00\x1f\xf3" + // 0x03C90345: 0x00001FF3
-	"\x03\xce\x03E\x00\x00\x1f\xf4" + // 0x03CE0345: 0x00001FF4
-	"\x03\xc9\x03B\x00\x00\x1f\xf6" + // 0x03C90342: 0x00001FF6
-	"\x1f\xf6\x03E\x00\x00\x1f\xf7" + // 0x1FF60345: 0x00001FF7
-	"\x03\x9f\x03\x00\x00\x00\x1f\xf8" + // 0x039F0300: 0x00001FF8
-	"\x03\xa9\x03\x00\x00\x00\x1f\xfa" + // 0x03A90300: 0x00001FFA
-	"\x03\xa9\x03E\x00\x00\x1f\xfc" + // 0x03A90345: 0x00001FFC
-	"!\x90\x038\x00\x00!\x9a" + // 0x21900338: 0x0000219A
-	"!\x92\x038\x00\x00!\x9b" + // 0x21920338: 0x0000219B
-	"!\x94\x038\x00\x00!\xae" + // 0x21940338: 0x000021AE
-	"!\xd0\x038\x00\x00!\xcd" + // 0x21D00338: 0x000021CD
-	"!\xd4\x038\x00\x00!\xce" + // 0x21D40338: 0x000021CE
-	"!\xd2\x038\x00\x00!\xcf" + // 0x21D20338: 0x000021CF
-	"\"\x03\x038\x00\x00\"\x04" + // 0x22030338: 0x00002204
-	"\"\b\x038\x00\x00\"\t" + // 0x22080338: 0x00002209
-	"\"\v\x038\x00\x00\"\f" + // 0x220B0338: 0x0000220C
-	"\"#\x038\x00\x00\"$" + // 0x22230338: 0x00002224
-	"\"%\x038\x00\x00\"&" + // 0x22250338: 0x00002226
-	"\"<\x038\x00\x00\"A" + // 0x223C0338: 0x00002241
-	"\"C\x038\x00\x00\"D" + // 0x22430338: 0x00002244
-	"\"E\x038\x00\x00\"G" + // 0x22450338: 0x00002247
-	"\"H\x038\x00\x00\"I" + // 0x22480338: 0x00002249
-	"\x00=\x038\x00\x00\"`" + // 0x003D0338: 0x00002260
-	"\"a\x038\x00\x00\"b" + // 0x22610338: 0x00002262
-	"\"M\x038\x00\x00\"m" + // 0x224D0338: 0x0000226D
-	"\x00<\x038\x00\x00\"n" + // 0x003C0338: 0x0000226E
-	"\x00>\x038\x00\x00\"o" + // 0x003E0338: 0x0000226F
-	"\"d\x038\x00\x00\"p" + // 0x22640338: 0x00002270
-	"\"e\x038\x00\x00\"q" + // 0x22650338: 0x00002271
-	"\"r\x038\x00\x00\"t" + // 0x22720338: 0x00002274
-	"\"s\x038\x00\x00\"u" + // 0x22730338: 0x00002275
-	"\"v\x038\x00\x00\"x" + // 0x22760338: 0x00002278
-	"\"w\x038\x00\x00\"y" + // 0x22770338: 0x00002279
-	"\"z\x038\x00\x00\"\x80" + // 0x227A0338: 0x00002280
-	"\"{\x038\x00\x00\"\x81" + // 0x227B0338: 0x00002281
-	"\"\x82\x038\x00\x00\"\x84" + // 0x22820338: 0x00002284
-	"\"\x83\x038\x00\x00\"\x85" + // 0x22830338: 0x00002285
-	"\"\x86\x038\x00\x00\"\x88" + // 0x22860338: 0x00002288
-	"\"\x87\x038\x00\x00\"\x89" + // 0x22870338: 0x00002289
-	"\"\xa2\x038\x00\x00\"\xac" + // 0x22A20338: 0x000022AC
-	"\"\xa8\x038\x00\x00\"\xad" + // 0x22A80338: 0x000022AD
-	"\"\xa9\x038\x00\x00\"\xae" + // 0x22A90338: 0x000022AE
-	"\"\xab\x038\x00\x00\"\xaf" + // 0x22AB0338: 0x000022AF
-	"\"|\x038\x00\x00\"\xe0" + // 0x227C0338: 0x000022E0
-	"\"}\x038\x00\x00\"\xe1" + // 0x227D0338: 0x000022E1
-	"\"\x91\x038\x00\x00\"\xe2" + // 0x22910338: 0x000022E2
-	"\"\x92\x038\x00\x00\"\xe3" + // 0x22920338: 0x000022E3
-	"\"\xb2\x038\x00\x00\"\xea" + // 0x22B20338: 0x000022EA
-	"\"\xb3\x038\x00\x00\"\xeb" + // 0x22B30338: 0x000022EB
-	"\"\xb4\x038\x00\x00\"\xec" + // 0x22B40338: 0x000022EC
-	"\"\xb5\x038\x00\x00\"\xed" + // 0x22B50338: 0x000022ED
-	"0K0\x99\x00\x000L" + // 0x304B3099: 0x0000304C
-	"0M0\x99\x00\x000N" + // 0x304D3099: 0x0000304E
-	"0O0\x99\x00\x000P" + // 0x304F3099: 0x00003050
-	"0Q0\x99\x00\x000R" + // 0x30513099: 0x00003052
-	"0S0\x99\x00\x000T" + // 0x30533099: 0x00003054
-	"0U0\x99\x00\x000V" + // 0x30553099: 0x00003056
-	"0W0\x99\x00\x000X" + // 0x30573099: 0x00003058
-	"0Y0\x99\x00\x000Z" + // 0x30593099: 0x0000305A
-	"0[0\x99\x00\x000\\" + // 0x305B3099: 0x0000305C
-	"0]0\x99\x00\x000^" + // 0x305D3099: 0x0000305E
-	"0_0\x99\x00\x000`" + // 0x305F3099: 0x00003060
-	"0a0\x99\x00\x000b" + // 0x30613099: 0x00003062
-	"0d0\x99\x00\x000e" + // 0x30643099: 0x00003065
-	"0f0\x99\x00\x000g" + // 0x30663099: 0x00003067
-	"0h0\x99\x00\x000i" + // 0x30683099: 0x00003069
-	"0o0\x99\x00\x000p" + // 0x306F3099: 0x00003070
-	"0o0\x9a\x00\x000q" + // 0x306F309A: 0x00003071
-	"0r0\x99\x00\x000s" + // 0x30723099: 0x00003073
-	"0r0\x9a\x00\x000t" + // 0x3072309A: 0x00003074
-	"0u0\x99\x00\x000v" + // 0x30753099: 0x00003076
-	"0u0\x9a\x00\x000w" + // 0x3075309A: 0x00003077
-	"0x0\x99\x00\x000y" + // 0x30783099: 0x00003079
-	"0x0\x9a\x00\x000z" + // 0x3078309A: 0x0000307A
-	"0{0\x99\x00\x000|" + // 0x307B3099: 0x0000307C
-	"0{0\x9a\x00\x000}" + // 0x307B309A: 0x0000307D
-	"0F0\x99\x00\x000\x94" + // 0x30463099: 0x00003094
-	"0\x9d0\x99\x00\x000\x9e" + // 0x309D3099: 0x0000309E
-	"0\xab0\x99\x00\x000\xac" + // 0x30AB3099: 0x000030AC
-	"0\xad0\x99\x00\x000\xae" + // 0x30AD3099: 0x000030AE
-	"0\xaf0\x99\x00\x000\xb0" + // 0x30AF3099: 0x000030B0
-	"0\xb10\x99\x00\x000\xb2" + // 0x30B13099: 0x000030B2
-	"0\xb30\x99\x00\x000\xb4" + // 0x30B33099: 0x000030B4
-	"0\xb50\x99\x00\x000\xb6" + // 0x30B53099: 0x000030B6
-	"0\xb70\x99\x00\x000\xb8" + // 0x30B73099: 0x000030B8
-	"0\xb90\x99\x00\x000\xba" + // 0x30B93099: 0x000030BA
-	"0\xbb0\x99\x00\x000\xbc" + // 0x30BB3099: 0x000030BC
-	"0\xbd0\x99\x00\x000\xbe" + // 0x30BD3099: 0x000030BE
-	"0\xbf0\x99\x00\x000\xc0" + // 0x30BF3099: 0x000030C0
-	"0\xc10\x99\x00\x000\xc2" + // 0x30C13099: 0x000030C2
-	"0\xc40\x99\x00\x000\xc5" + // 0x30C43099: 0x000030C5
-	"0\xc60\x99\x00\x000\xc7" + // 0x30C63099: 0x000030C7
-	"0\xc80\x99\x00\x000\xc9" + // 0x30C83099: 0x000030C9
-	"0\xcf0\x99\x00\x000\xd0" + // 0x30CF3099: 0x000030D0
-	"0\xcf0\x9a\x00\x000\xd1" + // 0x30CF309A: 0x000030D1
-	"0\xd20\x99\x00\x000\xd3" + // 0x30D23099: 0x000030D3
-	"0\xd20\x9a\x00\x000\xd4" + // 0x30D2309A: 0x000030D4
-	"0\xd50\x99\x00\x000\xd6" + // 0x30D53099: 0x000030D6
-	"0\xd50\x9a\x00\x000\xd7" + // 0x30D5309A: 0x000030D7
-	"0\xd80\x99\x00\x000\xd9" + // 0x30D83099: 0x000030D9
-	"0\xd80\x9a\x00\x000\xda" + // 0x30D8309A: 0x000030DA
-	"0\xdb0\x99\x00\x000\xdc" + // 0x30DB3099: 0x000030DC
-	"0\xdb0\x9a\x00\x000\xdd" + // 0x30DB309A: 0x000030DD
-	"0\xa60\x99\x00\x000\xf4" + // 0x30A63099: 0x000030F4
-	"0\xef0\x99\x00\x000\xf7" + // 0x30EF3099: 0x000030F7
-	"0\xf00\x99\x00\x000\xf8" + // 0x30F03099: 0x000030F8
-	"0\xf10\x99\x00\x000\xf9" + // 0x30F13099: 0x000030F9
-	"0\xf20\x99\x00\x000\xfa" + // 0x30F23099: 0x000030FA
-	"0\xfd0\x99\x00\x000\xfe" + // 0x30FD3099: 0x000030FE
-	"\x10\x99\x10\xba\x00\x01\x10\x9a" + // 0x109910BA: 0x0001109A
-	"\x10\x9b\x10\xba\x00\x01\x10\x9c" + // 0x109B10BA: 0x0001109C
-	"\x10\xa5\x10\xba\x00\x01\x10\xab" + // 0x10A510BA: 0x000110AB
-	"\x111\x11'\x00\x01\x11." + // 0x11311127: 0x0001112E
-	"\x112\x11'\x00\x01\x11/" + // 0x11321127: 0x0001112F
-	"\x13G\x13>\x00\x01\x13K" + // 0x1347133E: 0x0001134B
-	"\x13G\x13W\x00\x01\x13L" + // 0x13471357: 0x0001134C
-	"\x14\xb9\x14\xba\x00\x01\x14\xbb" + // 0x14B914BA: 0x000114BB
-	"\x14\xb9\x14\xb0\x00\x01\x14\xbc" + // 0x14B914B0: 0x000114BC
-	"\x14\xb9\x14\xbd\x00\x01\x14\xbe" + // 0x14B914BD: 0x000114BE
-	"\x15\xb8\x15\xaf\x00\x01\x15\xba" + // 0x15B815AF: 0x000115BA
-	"\x15\xb9\x15\xaf\x00\x01\x15\xbb" + // 0x15B915AF: 0x000115BB
-	"\x195\x190\x00\x01\x198" + // 0x19351930: 0x00011938
-	""
-	// Total size of tables: 56KB (57068 bytes)
diff --git a/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
index bf65457..0175eae 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
@@ -1,6 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build !go1.10
+// +build !go1.10
 
 package norm
 
diff --git a/vendor/golang.org/x/text/unicode/norm/trie.go b/vendor/golang.org/x/text/unicode/norm/trie.go
index e4250ae..423386b 100644
--- a/vendor/golang.org/x/text/unicode/norm/trie.go
+++ b/vendor/golang.org/x/text/unicode/norm/trie.go
@@ -29,7 +29,7 @@ var (
 	nfkcData = newNfkcTrie(0)
 )
 
-// lookup determines the type of block n and looks up the value for b.
+// lookupValue determines the type of block n and looks up the value for b.
 // For n < t.cutoff, the block is a simple lookup table. Otherwise, the block
 // is a list of ranges with an accompanying value. Given a matching range r,
 // the value for b is by r.value + (b - r.lo) * stride.
diff --git a/vendor/golang.org/x/time/AUTHORS b/vendor/golang.org/x/time/AUTHORS
new file mode 100644
index 0000000..15167cd
--- /dev/null
+++ b/vendor/golang.org/x/time/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/time/CONTRIBUTORS b/vendor/golang.org/x/time/CONTRIBUTORS
new file mode 100644
index 0000000..1c4577e
--- /dev/null
+++ b/vendor/golang.org/x/time/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/time/LICENSE b/vendor/golang.org/x/time/LICENSE
index 2a7cf70..6a66aea 100644
--- a/vendor/golang.org/x/time/LICENSE
+++ b/vendor/golang.org/x/time/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 The Go Authors.
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google LLC nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/golang.org/x/time/rate/rate.go b/vendor/golang.org/x/time/rate/rate.go
index 794b2e3..0cfcc84 100644
--- a/vendor/golang.org/x/time/rate/rate.go
+++ b/vendor/golang.org/x/time/rate/rate.go
@@ -52,8 +52,6 @@ func Every(interval time.Duration) Limit {
 // or its associated context.Context is canceled.
 //
 // The methods AllowN, ReserveN, and WaitN consume n tokens.
-//
-// Limiter is safe for simultaneous use by multiple goroutines.
 type Limiter struct {
 	mu     sync.Mutex
 	limit  Limit
@@ -82,39 +80,25 @@ func (lim *Limiter) Burst() int {
 	return lim.burst
 }
 
-// TokensAt returns the number of tokens available at time t.
-func (lim *Limiter) TokensAt(t time.Time) float64 {
-	lim.mu.Lock()
-	tokens := lim.advance(t) // does not mutate lim
-	lim.mu.Unlock()
-	return tokens
-}
-
-// Tokens returns the number of tokens available now.
-func (lim *Limiter) Tokens() float64 {
-	return lim.TokensAt(time.Now())
-}
-
 // NewLimiter returns a new Limiter that allows events up to rate r and permits
 // bursts of at most b tokens.
 func NewLimiter(r Limit, b int) *Limiter {
 	return &Limiter{
-		limit:  r,
-		burst:  b,
-		tokens: float64(b),
+		limit: r,
+		burst: b,
 	}
 }
 
-// Allow reports whether an event may happen now.
+// Allow is shorthand for AllowN(time.Now(), 1).
 func (lim *Limiter) Allow() bool {
 	return lim.AllowN(time.Now(), 1)
 }
 
-// AllowN reports whether n events may happen at time t.
+// AllowN reports whether n events may happen at time now.
 // Use this method if you intend to drop / skip events that exceed the rate limit.
 // Otherwise use Reserve or Wait.
-func (lim *Limiter) AllowN(t time.Time, n int) bool {
-	return lim.reserveN(t, n, 0).ok
+func (lim *Limiter) AllowN(now time.Time, n int) bool {
+	return lim.reserveN(now, n, 0).ok
 }
 
 // A Reservation holds information about events that are permitted by a Limiter to happen after a delay.
@@ -141,17 +125,17 @@ func (r *Reservation) Delay() time.Duration {
 }
 
 // InfDuration is the duration returned by Delay when a Reservation is not OK.
-const InfDuration = time.Duration(math.MaxInt64)
+const InfDuration = time.Duration(1<<63 - 1)
 
 // DelayFrom returns the duration for which the reservation holder must wait
 // before taking the reserved action.  Zero duration means act immediately.
 // InfDuration means the limiter cannot grant the tokens requested in this
 // Reservation within the maximum wait time.
-func (r *Reservation) DelayFrom(t time.Time) time.Duration {
+func (r *Reservation) DelayFrom(now time.Time) time.Duration {
 	if !r.ok {
 		return InfDuration
 	}
-	delay := r.timeToAct.Sub(t)
+	delay := r.timeToAct.Sub(now)
 	if delay < 0 {
 		return 0
 	}
@@ -166,7 +150,7 @@ func (r *Reservation) Cancel() {
 // CancelAt indicates that the reservation holder will not perform the reserved action
 // and reverses the effects of this Reservation on the rate limit as much as possible,
 // considering that other reservations may have already been made.
-func (r *Reservation) CancelAt(t time.Time) {
+func (r *Reservation) CancelAt(now time.Time) {
 	if !r.ok {
 		return
 	}
@@ -174,7 +158,7 @@ func (r *Reservation) CancelAt(t time.Time) {
 	r.lim.mu.Lock()
 	defer r.lim.mu.Unlock()
 
-	if r.lim.limit == Inf || r.tokens == 0 || r.timeToAct.Before(t) {
+	if r.lim.limit == Inf || r.tokens == 0 || r.timeToAct.Before(now) {
 		return
 	}
 
@@ -186,18 +170,18 @@ func (r *Reservation) CancelAt(t time.Time) {
 		return
 	}
 	// advance time to now
-	tokens := r.lim.advance(t)
+	now, _, tokens := r.lim.advance(now)
 	// calculate new number of tokens
 	tokens += restoreTokens
 	if burst := float64(r.lim.burst); tokens > burst {
 		tokens = burst
 	}
 	// update state
-	r.lim.last = t
+	r.lim.last = now
 	r.lim.tokens = tokens
 	if r.timeToAct == r.lim.lastEvent {
 		prevEvent := r.timeToAct.Add(r.limit.durationFromTokens(float64(-r.tokens)))
-		if !prevEvent.Before(t) {
+		if !prevEvent.Before(now) {
 			r.lim.lastEvent = prevEvent
 		}
 	}
@@ -212,20 +196,18 @@ func (lim *Limiter) Reserve() *Reservation {
 // The Limiter takes this Reservation into account when allowing future events.
 // The returned Reservation’s OK() method returns false if n exceeds the Limiter's burst size.
 // Usage example:
-//
-//	r := lim.ReserveN(time.Now(), 1)
-//	if !r.OK() {
-//	  // Not allowed to act! Did you remember to set lim.burst to be > 0 ?
-//	  return
-//	}
-//	time.Sleep(r.Delay())
-//	Act()
-//
+//   r := lim.ReserveN(time.Now(), 1)
+//   if !r.OK() {
+//     // Not allowed to act! Did you remember to set lim.burst to be > 0 ?
+//     return
+//   }
+//   time.Sleep(r.Delay())
+//   Act()
 // Use this method if you wish to wait and slow down in accordance with the rate limit without dropping events.
 // If you need to respect a deadline or cancel the delay, use Wait instead.
 // To drop or skip events exceeding rate limit, use Allow instead.
-func (lim *Limiter) ReserveN(t time.Time, n int) *Reservation {
-	r := lim.reserveN(t, n, InfDuration)
+func (lim *Limiter) ReserveN(now time.Time, n int) *Reservation {
+	r := lim.reserveN(now, n, InfDuration)
 	return &r
 }
 
@@ -239,18 +221,6 @@ func (lim *Limiter) Wait(ctx context.Context) (err error) {
 // canceled, or the expected wait time exceeds the Context's Deadline.
 // The burst limit is ignored if the rate limit is Inf.
 func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) {
-	// The test code calls lim.wait with a fake timer generator.
-	// This is the real timer generator.
-	newTimer := func(d time.Duration) (<-chan time.Time, func() bool, func()) {
-		timer := time.NewTimer(d)
-		return timer.C, timer.Stop, func() {}
-	}
-
-	return lim.wait(ctx, n, time.Now(), newTimer)
-}
-
-// wait is the internal implementation of WaitN.
-func (lim *Limiter) wait(ctx context.Context, n int, t time.Time, newTimer func(d time.Duration) (<-chan time.Time, func() bool, func())) error {
 	lim.mu.Lock()
 	burst := lim.burst
 	limit := lim.limit
@@ -266,25 +236,25 @@ func (lim *Limiter) wait(ctx context.Context, n int, t time.Time, newTimer func(
 	default:
 	}
 	// Determine wait limit
+	now := time.Now()
 	waitLimit := InfDuration
 	if deadline, ok := ctx.Deadline(); ok {
-		waitLimit = deadline.Sub(t)
+		waitLimit = deadline.Sub(now)
 	}
 	// Reserve
-	r := lim.reserveN(t, n, waitLimit)
+	r := lim.reserveN(now, n, waitLimit)
 	if !r.ok {
 		return fmt.Errorf("rate: Wait(n=%d) would exceed context deadline", n)
 	}
 	// Wait if necessary
-	delay := r.DelayFrom(t)
+	delay := r.DelayFrom(now)
 	if delay == 0 {
 		return nil
 	}
-	ch, stop, advance := newTimer(delay)
-	defer stop()
-	advance() // only has an effect when testing
+	t := time.NewTimer(delay)
+	defer t.Stop()
 	select {
-	case <-ch:
+	case <-t.C:
 		// We can proceed.
 		return nil
 	case <-ctx.Done():
@@ -303,13 +273,13 @@ func (lim *Limiter) SetLimit(newLimit Limit) {
 // SetLimitAt sets a new Limit for the limiter. The new Limit, and Burst, may be violated
 // or underutilized by those which reserved (using Reserve or Wait) but did not yet act
 // before SetLimitAt was called.
-func (lim *Limiter) SetLimitAt(t time.Time, newLimit Limit) {
+func (lim *Limiter) SetLimitAt(now time.Time, newLimit Limit) {
 	lim.mu.Lock()
 	defer lim.mu.Unlock()
 
-	tokens := lim.advance(t)
+	now, _, tokens := lim.advance(now)
 
-	lim.last = t
+	lim.last = now
 	lim.tokens = tokens
 	lim.limit = newLimit
 }
@@ -320,13 +290,13 @@ func (lim *Limiter) SetBurst(newBurst int) {
 }
 
 // SetBurstAt sets a new burst size for the limiter.
-func (lim *Limiter) SetBurstAt(t time.Time, newBurst int) {
+func (lim *Limiter) SetBurstAt(now time.Time, newBurst int) {
 	lim.mu.Lock()
 	defer lim.mu.Unlock()
 
-	tokens := lim.advance(t)
+	now, _, tokens := lim.advance(now)
 
-	lim.last = t
+	lim.last = now
 	lim.tokens = tokens
 	lim.burst = newBurst
 }
@@ -334,20 +304,20 @@ func (lim *Limiter) SetBurstAt(t time.Time, newBurst int) {
 // reserveN is a helper method for AllowN, ReserveN, and WaitN.
 // maxFutureReserve specifies the maximum reservation wait duration allowed.
 // reserveN returns Reservation, not *Reservation, to avoid allocation in AllowN and WaitN.
-func (lim *Limiter) reserveN(t time.Time, n int, maxFutureReserve time.Duration) Reservation {
+func (lim *Limiter) reserveN(now time.Time, n int, maxFutureReserve time.Duration) Reservation {
 	lim.mu.Lock()
-	defer lim.mu.Unlock()
 
 	if lim.limit == Inf {
+		lim.mu.Unlock()
 		return Reservation{
 			ok:        true,
 			lim:       lim,
 			tokens:    n,
-			timeToAct: t,
+			timeToAct: now,
 		}
 	}
 
-	tokens := lim.advance(t)
+	now, last, tokens := lim.advance(now)
 
 	// Calculate the remaining number of tokens resulting from the request.
 	tokens -= float64(n)
@@ -369,59 +339,50 @@ func (lim *Limiter) reserveN(t time.Time, n int, maxFutureReserve time.Duration)
 	}
 	if ok {
 		r.tokens = n
-		r.timeToAct = t.Add(waitDuration)
-
-		// Update state
-		lim.last = t
-		lim.tokens = tokens
-		lim.lastEvent = r.timeToAct
+		r.timeToAct = now.Add(waitDuration)
 	}
 
+	// Update state
+	if ok {
+		lim.last = now
+		lim.tokens = tokens
+		lim.lastEvent = r.timeToAct
+	} else {
+		lim.last = last
+	}
+
+	lim.mu.Unlock()
 	return r
 }
 
-// advance calculates and returns an updated number of tokens for lim
-// resulting from the passage of time.
+// advance calculates and returns an updated state for lim resulting from the passage of time.
 // lim is not changed.
 // advance requires that lim.mu is held.
-func (lim *Limiter) advance(t time.Time) (newTokens float64) {
+func (lim *Limiter) advance(now time.Time) (newNow time.Time, newLast time.Time, newTokens float64) {
 	last := lim.last
-	if t.Before(last) {
-		last = t
+	if now.Before(last) {
+		last = now
 	}
 
 	// Calculate the new number of tokens, due to time that passed.
-	elapsed := t.Sub(last)
+	elapsed := now.Sub(last)
 	delta := lim.limit.tokensFromDuration(elapsed)
 	tokens := lim.tokens + delta
 	if burst := float64(lim.burst); tokens > burst {
 		tokens = burst
 	}
-	return tokens
+	return now, last, tokens
 }
 
 // durationFromTokens is a unit conversion function from the number of tokens to the duration
 // of time it takes to accumulate them at a rate of limit tokens per second.
 func (limit Limit) durationFromTokens(tokens float64) time.Duration {
-	if limit <= 0 {
-		return InfDuration
-	}
-
-	duration := (tokens / float64(limit)) * float64(time.Second)
-
-	// Cap the duration to the maximum representable int64 value, to avoid overflow.
-	if duration > float64(math.MaxInt64) {
-		return InfDuration
-	}
-
-	return time.Duration(duration)
+	seconds := tokens / float64(limit)
+	return time.Duration(float64(time.Second) * seconds)
 }
 
 // tokensFromDuration is a unit conversion function from a time duration to the number of tokens
 // which could be accumulated during that duration at a rate of limit tokens per second.
 func (limit Limit) tokensFromDuration(d time.Duration) float64 {
-	if limit <= 0 {
-		return 0
-	}
 	return d.Seconds() * float64(limit)
 }
diff --git a/vendor/golang.org/x/time/rate/sometimes.go b/vendor/golang.org/x/time/rate/sometimes.go
deleted file mode 100644
index 9b83932..0000000
--- a/vendor/golang.org/x/time/rate/sometimes.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rate
-
-import (
-	"sync"
-	"time"
-)
-
-// Sometimes will perform an action occasionally.  The First, Every, and
-// Interval fields govern the behavior of Do, which performs the action.
-// A zero Sometimes value will perform an action exactly once.
-//
-// # Example: logging with rate limiting
-//
-//	var sometimes = rate.Sometimes{First: 3, Interval: 10*time.Second}
-//	func Spammy() {
-//	        sometimes.Do(func() { log.Info("here I am!") })
-//	}
-type Sometimes struct {
-	First    int           // if non-zero, the first N calls to Do will run f.
-	Every    int           // if non-zero, every Nth call to Do will run f.
-	Interval time.Duration // if non-zero and Interval has elapsed since f's last run, Do will run f.
-
-	mu    sync.Mutex
-	count int       // number of Do calls
-	last  time.Time // last time f was run
-}
-
-// Do runs the function f as allowed by First, Every, and Interval.
-//
-// The model is a union (not intersection) of filters.  The first call to Do
-// always runs f.  Subsequent calls to Do run f if allowed by First or Every or
-// Interval.
-//
-// A non-zero First:N causes the first N Do(f) calls to run f.
-//
-// A non-zero Every:M causes every Mth Do(f) call, starting with the first, to
-// run f.
-//
-// A non-zero Interval causes Do(f) to run f if Interval has elapsed since
-// Do last ran f.
-//
-// Specifying multiple filters produces the union of these execution streams.
-// For example, specifying both First:N and Every:M causes the first N Do(f)
-// calls and every Mth Do(f) call, starting with the first, to run f.  See
-// Examples for more.
-//
-// If Do is called multiple times simultaneously, the calls will block and run
-// serially.  Therefore, Do is intended for lightweight operations.
-//
-// Because a call to Do may block until f returns, if f causes Do to be called,
-// it will deadlock.
-func (s *Sometimes) Do(f func()) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.count == 0 ||
-		(s.First > 0 && s.count < s.First) ||
-		(s.Every > 0 && s.count%s.Every == 0) ||
-		(s.Interval > 0 && time.Since(s.last) >= s.Interval) {
-		f()
-		if s.Interval > 0 {
-			s.last = time.Now()
-		}
-	}
-	s.count++
-}
diff --git a/vendor/golang.org/x/tools/LICENSE b/vendor/golang.org/x/tools/LICENSE
deleted file mode 100644
index 2a7cf70..0000000
--- a/vendor/golang.org/x/tools/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright 2009 The Go Authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google LLC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/tools/PATENTS b/vendor/golang.org/x/tools/PATENTS
deleted file mode 100644
index 7330990..0000000
--- a/vendor/golang.org/x/tools/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go b/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
deleted file mode 100644
index 7b90bc9..0000000
--- a/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package gcexportdata provides functions for reading and writing
-// export data, which is a serialized description of the API of a Go
-// package including the names, kinds, types, and locations of all
-// exported declarations.
-//
-// The standard Go compiler (cmd/compile) writes an export data file
-// for each package it compiles, which it later reads when compiling
-// packages that import the earlier one. The compiler must thus
-// contain logic to both write and read export data.
-// (See the "Export" section in the cmd/compile/README file.)
-//
-// The [Read] function in this package can read files produced by the
-// compiler, producing [go/types] data structures. As a matter of
-// policy, Read supports export data files produced by only the last
-// two Go releases plus tip; see https://go.dev/issue/68898. The
-// export data files produced by the compiler contain additional
-// details related to generics, inlining, and other optimizations that
-// cannot be decoded by the [Read] function.
-//
-// In files written by the compiler, the export data is not at the
-// start of the file. Before calling Read, use [NewReader] to locate
-// the desired portion of the file.
-//
-// The [Write] function in this package encodes the exported API of a
-// Go package ([types.Package]) as a file. Such files can be later
-// decoded by Read, but cannot be consumed by the compiler.
-//
-// # Future changes
-//
-// Although Read supports the formats written by both Write and the
-// compiler, the two are quite different, and there is an open
-// proposal (https://go.dev/issue/69491) to separate these APIs.
-//
-// Under that proposal, this package would ultimately provide only the
-// Read operation for compiler export data, which must be defined in
-// this module (golang.org/x/tools), not in the standard library, to
-// avoid version skew for developer tools that need to read compiler
-// export data both before and after a Go release, such as from Go
-// 1.23 to Go 1.24. Because this package lives in the tools module,
-// clients can update their version of the module some time before the
-// Go 1.24 release and rebuild and redeploy their tools, which will
-// then be able to consume both Go 1.23 and Go 1.24 export data files,
-// so they will work before and after the Go update. (See discussion
-// at https://go.dev/issue/15651.)
-//
-// The operations to import and export [go/types] data structures
-// would be defined in the go/types package as Import and Export.
-// [Write] would (eventually) delegate to Export,
-// and [Read], when it detects a file produced by Export,
-// would delegate to Import.
-//
-// # Deprecations
-//
-// The [NewImporter] and [Find] functions are deprecated and should
-// not be used in new code. The [WriteBundle] and [ReadBundle]
-// functions are experimental, and there is an open proposal to
-// deprecate them (https://go.dev/issue/69573).
-package gcexportdata
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"go/token"
-	"go/types"
-	"io"
-	"os/exec"
-
-	"golang.org/x/tools/internal/gcimporter"
-)
-
-// Find returns the name of an object (.o) or archive (.a) file
-// containing type information for the specified import path,
-// using the go command.
-// If no file was found, an empty filename is returned.
-//
-// A relative srcDir is interpreted relative to the current working directory.
-//
-// Find also returns the package's resolved (canonical) import path,
-// reflecting the effects of srcDir and vendoring on importPath.
-//
-// Deprecated: Use the higher-level API in golang.org/x/tools/go/packages,
-// which is more efficient.
-func Find(importPath, srcDir string) (filename, path string) {
-	cmd := exec.Command("go", "list", "-json", "-export", "--", importPath)
-	cmd.Dir = srcDir
-	out, err := cmd.Output()
-	if err != nil {
-		return "", ""
-	}
-	var data struct {
-		ImportPath string
-		Export     string
-	}
-	json.Unmarshal(out, &data)
-	return data.Export, data.ImportPath
-}
-
-// NewReader returns a reader for the export data section of an object
-// (.o) or archive (.a) file read from r.  The new reader may provide
-// additional trailing data beyond the end of the export data.
-func NewReader(r io.Reader) (io.Reader, error) {
-	buf := bufio.NewReader(r)
-	size, err := gcimporter.FindExportData(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	// We were given an archive and found the __.PKGDEF in it.
-	// This tells us the size of the export data, and we don't
-	// need to return the entire file.
-	return &io.LimitedReader{
-		R: buf,
-		N: size,
-	}, nil
-}
-
-// readAll works the same way as io.ReadAll, but avoids allocations and copies
-// by preallocating a byte slice of the necessary size if the size is known up
-// front. This is always possible when the input is an archive. In that case,
-// NewReader will return the known size using an io.LimitedReader.
-func readAll(r io.Reader) ([]byte, error) {
-	if lr, ok := r.(*io.LimitedReader); ok {
-		data := make([]byte, lr.N)
-		_, err := io.ReadFull(lr, data)
-		return data, err
-	}
-	return io.ReadAll(r)
-}
-
-// Read reads export data from in, decodes it, and returns type
-// information for the package.
-//
-// Read is capable of reading export data produced by [Write] at the
-// same source code version, or by the last two Go releases (plus tip)
-// of the standard Go compiler. Reading files from older compilers may
-// produce an error.
-//
-// The package path (effectively its linker symbol prefix) is
-// specified by path, since unlike the package name, this information
-// may not be recorded in the export data.
-//
-// File position information is added to fset.
-//
-// Read may inspect and add to the imports map to ensure that references
-// within the export data to other packages are consistent.  The caller
-// must ensure that imports[path] does not exist, or exists but is
-// incomplete (see types.Package.Complete), and Read inserts the
-// resulting package into this map entry.
-//
-// On return, the state of the reader is undefined.
-func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package, path string) (*types.Package, error) {
-	data, err := readAll(in)
-	if err != nil {
-		return nil, fmt.Errorf("reading export data for %q: %v", path, err)
-	}
-
-	if bytes.HasPrefix(data, []byte("!<arch>")) {
-		return nil, fmt.Errorf("can't read export data for %q directly from an archive file (call gcexportdata.NewReader first to extract export data)", path)
-	}
-
-	// The indexed export format starts with an 'i'; the older
-	// binary export format starts with a 'c', 'd', or 'v'
-	// (from "version"). Select appropriate importer.
-	if len(data) > 0 {
-		switch data[0] {
-		case 'v', 'c', 'd':
-			// binary, produced by cmd/compile till go1.10
-			return nil, fmt.Errorf("binary (%c) import format is no longer supported", data[0])
-
-		case 'i':
-			// indexed, produced by cmd/compile till go1.19,
-			// and also by [Write].
-			//
-			// If proposal #69491 is accepted, go/types
-			// serialization will be implemented by
-			// types.Export, to which Write would eventually
-			// delegate (explicitly dropping any pretence at
-			// inter-version Write-Read compatibility).
-			// This [Read] function would delegate to types.Import
-			// when it detects that the file was produced by Export.
-			_, pkg, err := gcimporter.IImportData(fset, imports, data[1:], path)
-			return pkg, err
-
-		case 'u':
-			// unified, produced by cmd/compile since go1.20
-			_, pkg, err := gcimporter.UImportData(fset, imports, data[1:], path)
-			return pkg, err
-
-		default:
-			l := min(len(data), 10)
-			return nil, fmt.Errorf("unexpected export data with prefix %q for path %s", string(data[:l]), path)
-		}
-	}
-	return nil, fmt.Errorf("empty export data for %s", path)
-}
-
-// Write writes encoded type information for the specified package to out.
-// The FileSet provides file position information for named objects.
-func Write(out io.Writer, fset *token.FileSet, pkg *types.Package) error {
-	if _, err := io.WriteString(out, "i"); err != nil {
-		return err
-	}
-	return gcimporter.IExportData(out, fset, pkg)
-}
-
-// ReadBundle reads an export bundle from in, decodes it, and returns type
-// information for the packages.
-// File position information is added to fset.
-//
-// ReadBundle may inspect and add to the imports map to ensure that references
-// within the export bundle to other packages are consistent.
-//
-// On return, the state of the reader is undefined.
-//
-// Experimental: This API is experimental and may change in the future.
-func ReadBundle(in io.Reader, fset *token.FileSet, imports map[string]*types.Package) ([]*types.Package, error) {
-	data, err := readAll(in)
-	if err != nil {
-		return nil, fmt.Errorf("reading export bundle: %v", err)
-	}
-	return gcimporter.IImportBundle(fset, imports, data)
-}
-
-// WriteBundle writes encoded type information for the specified packages to out.
-// The FileSet provides file position information for named objects.
-//
-// Experimental: This API is experimental and may change in the future.
-func WriteBundle(out io.Writer, fset *token.FileSet, pkgs []*types.Package) error {
-	return gcimporter.IExportBundle(out, fset, pkgs)
-}
diff --git a/vendor/golang.org/x/tools/go/gcexportdata/importer.go b/vendor/golang.org/x/tools/go/gcexportdata/importer.go
deleted file mode 100644
index 37a7247..0000000
--- a/vendor/golang.org/x/tools/go/gcexportdata/importer.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gcexportdata
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"os"
-)
-
-// NewImporter returns a new instance of the types.Importer interface
-// that reads type information from export data files written by gc.
-// The Importer also satisfies types.ImporterFrom.
-//
-// Export data files are located using "go build" workspace conventions
-// and the build.Default context.
-//
-// Use this importer instead of go/importer.For("gc", ...) to avoid the
-// version-skew problems described in the documentation of this package,
-// or to control the FileSet or access the imports map populated during
-// package loading.
-//
-// Deprecated: Use the higher-level API in golang.org/x/tools/go/packages,
-// which is more efficient.
-func NewImporter(fset *token.FileSet, imports map[string]*types.Package) types.ImporterFrom {
-	return importer{fset, imports}
-}
-
-type importer struct {
-	fset    *token.FileSet
-	imports map[string]*types.Package
-}
-
-func (imp importer) Import(importPath string) (*types.Package, error) {
-	return imp.ImportFrom(importPath, "", 0)
-}
-
-func (imp importer) ImportFrom(importPath, srcDir string, mode types.ImportMode) (_ *types.Package, err error) {
-	filename, path := Find(importPath, srcDir)
-	if filename == "" {
-		if importPath == "unsafe" {
-			// Even for unsafe, call Find first in case
-			// the package was vendored.
-			return types.Unsafe, nil
-		}
-		return nil, fmt.Errorf("can't find import: %s", importPath)
-	}
-
-	if pkg, ok := imp.imports[path]; ok && pkg.Complete() {
-		return pkg, nil // cache hit
-	}
-
-	// open file
-	f, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		f.Close()
-		if err != nil {
-			// add file name to error
-			err = fmt.Errorf("reading export data: %s: %v", filename, err)
-		}
-	}()
-
-	r, err := NewReader(f)
-	if err != nil {
-		return nil, err
-	}
-
-	return Read(r, imp.fset, imp.imports, path)
-}
diff --git a/vendor/golang.org/x/tools/go/packages/doc.go b/vendor/golang.org/x/tools/go/packages/doc.go
deleted file mode 100644
index f1931d1..0000000
--- a/vendor/golang.org/x/tools/go/packages/doc.go
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package packages loads Go packages for inspection and analysis.
-
-The [Load] function takes as input a list of patterns and returns a
-list of [Package] values describing individual packages matched by those
-patterns.
-A [Config] specifies configuration options, the most important of which is
-the [LoadMode], which controls the amount of detail in the loaded packages.
-
-Load passes most patterns directly to the underlying build tool.
-The default build tool is the go command.
-Its supported patterns are described at
-https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns.
-Other build systems may be supported by providing a "driver";
-see [The driver protocol].
-
-All patterns with the prefix "query=", where query is a
-non-empty string of letters from [a-z], are reserved and may be
-interpreted as query operators.
-
-Two query operators are currently supported: "file" and "pattern".
-
-The query "file=path/to/file.go" matches the package or packages enclosing
-the Go source file path/to/file.go.  For example "file=~/go/src/fmt/print.go"
-might return the packages "fmt" and "fmt [fmt.test]".
-
-The query "pattern=string" causes "string" to be passed directly to
-the underlying build tool. In most cases this is unnecessary,
-but an application can use Load("pattern=" + x) as an escaping mechanism
-to ensure that x is not interpreted as a query operator if it contains '='.
-
-All other query operators are reserved for future use and currently
-cause Load to report an error.
-
-The Package struct provides basic information about the package, including
-
-  - ID, a unique identifier for the package in the returned set;
-  - GoFiles, the names of the package's Go source files;
-  - Imports, a map from source import strings to the Packages they name;
-  - Types, the type information for the package's exported symbols;
-  - Syntax, the parsed syntax trees for the package's source code; and
-  - TypesInfo, the result of a complete type-check of the package syntax trees.
-
-(See the documentation for type Package for the complete list of fields
-and more detailed descriptions.)
-
-For example,
-
-	Load(nil, "bytes", "unicode...")
-
-returns four Package structs describing the standard library packages
-bytes, unicode, unicode/utf16, and unicode/utf8. Note that one pattern
-can match multiple packages and that a package might be matched by
-multiple patterns: in general it is not possible to determine which
-packages correspond to which patterns.
-
-Note that the list returned by Load contains only the packages matched
-by the patterns. Their dependencies can be found by walking the import
-graph using the Imports fields.
-
-The Load function can be configured by passing a pointer to a Config as
-the first argument. A nil Config is equivalent to the zero Config, which
-causes Load to run in [LoadFiles] mode, collecting minimal information.
-See the documentation for type Config for details.
-
-As noted earlier, the Config.Mode controls the amount of detail
-reported about the loaded packages. See the documentation for type LoadMode
-for details.
-
-Most tools should pass their command-line arguments (after any flags)
-uninterpreted to Load, so that it can interpret them
-according to the conventions of the underlying build system.
-
-See the Example function for typical usage.
-
-# The driver protocol
-
-Load may be used to load Go packages even in Go projects that use
-alternative build systems, by installing an appropriate "driver"
-program for the build system and specifying its location in the
-GOPACKAGESDRIVER environment variable.
-For example,
-https://github.com/bazelbuild/rules_go/wiki/Editor-and-tool-integration
-explains how to use the driver for Bazel.
-
-The driver program is responsible for interpreting patterns in its
-preferred notation and reporting information about the packages that
-those patterns identify. Drivers must also support the special "file="
-and "pattern=" patterns described above.
-
-The patterns are provided as positional command-line arguments. A
-JSON-encoded [DriverRequest] message providing additional information
-is written to the driver's standard input. The driver must write a
-JSON-encoded [DriverResponse] message to its standard output. (This
-message differs from the JSON schema produced by 'go list'.)
-
-The value of the PWD environment variable seen by the driver process
-is the preferred name of its working directory. (The working directory
-may have other aliases due to symbolic links; see the comment on the
-Dir field of [exec.Cmd] for related information.)
-When the driver process emits in its response the name of a file
-that is a descendant of this directory, it must use an absolute path
-that has the value of PWD as a prefix, to ensure that the returned
-filenames satisfy the original query.
-*/
-package packages // import "golang.org/x/tools/go/packages"
-
-/*
-
-Motivation and design considerations
-
-The new package's design solves problems addressed by two existing
-packages: go/build, which locates and describes packages, and
-golang.org/x/tools/go/loader, which loads, parses and type-checks them.
-The go/build.Package structure encodes too much of the 'go build' way
-of organizing projects, leaving us in need of a data type that describes a
-package of Go source code independent of the underlying build system.
-We wanted something that works equally well with go build and vgo, and
-also other build systems such as Bazel and Blaze, making it possible to
-construct analysis tools that work in all these environments.
-Tools such as errcheck and staticcheck were essentially unavailable to
-the Go community at Google, and some of Google's internal tools for Go
-are unavailable externally.
-This new package provides a uniform way to obtain package metadata by
-querying each of these build systems, optionally supporting their
-preferred command-line notations for packages, so that tools integrate
-neatly with users' build environments. The Metadata query function
-executes an external query tool appropriate to the current workspace.
-
-Loading packages always returns the complete import graph "all the way down",
-even if all you want is information about a single package, because the query
-mechanisms of all the build systems we currently support ({go,vgo} list, and
-blaze/bazel aspect-based query) cannot provide detailed information
-about one package without visiting all its dependencies too, so there is
-no additional asymptotic cost to providing transitive information.
-(This property might not be true of a hypothetical 5th build system.)
-
-In calls to TypeCheck, all initial packages, and any package that
-transitively depends on one of them, must be loaded from source.
-Consider A->B->C->D->E: if A,C are initial, A,B,C must be loaded from
-source; D may be loaded from export data, and E may not be loaded at all
-(though it's possible that D's export data mentions it, so a
-types.Package may be created for it and exposed.)
-
-The old loader had a feature to suppress type-checking of function
-bodies on a per-package basis, primarily intended to reduce the work of
-obtaining type information for imported packages. Now that imports are
-satisfied by export data, the optimization no longer seems necessary.
-
-Despite some early attempts, the old loader did not exploit export data,
-instead always using the equivalent of WholeProgram mode. This was due
-to the complexity of mixing source and export data packages (now
-resolved by the upward traversal mentioned above), and because export data
-files were nearly always missing or stale. Now that 'go build' supports
-caching, all the underlying build systems can guarantee to produce
-export data in a reasonable (amortized) time.
-
-Test "main" packages synthesized by the build system are now reported as
-first-class packages, avoiding the need for clients (such as go/ssa) to
-reinvent this generation logic.
-
-One way in which go/packages is simpler than the old loader is in its
-treatment of in-package tests. In-package tests are packages that
-consist of all the files of the library under test, plus the test files.
-The old loader constructed in-package tests by a two-phase process of
-mutation called "augmentation": first it would construct and type check
-all the ordinary library packages and type-check the packages that
-depend on them; then it would add more (test) files to the package and
-type-check again. This two-phase approach had four major problems:
-1) in processing the tests, the loader modified the library package,
-   leaving no way for a client application to see both the test
-   package and the library package; one would mutate into the other.
-2) because test files can declare additional methods on types defined in
-   the library portion of the package, the dispatch of method calls in
-   the library portion was affected by the presence of the test files.
-   This should have been a clue that the packages were logically
-   different.
-3) this model of "augmentation" assumed at most one in-package test
-   per library package, which is true of projects using 'go build',
-   but not other build systems.
-4) because of the two-phase nature of test processing, all packages that
-   import the library package had to be processed before augmentation,
-   forcing a "one-shot" API and preventing the client from calling Load
-   in several times in sequence as is now possible in WholeProgram mode.
-   (TypeCheck mode has a similar one-shot restriction for a different reason.)
-
-Early drafts of this package supported "multi-shot" operation.
-Although it allowed clients to make a sequence of calls (or concurrent
-calls) to Load, building up the graph of Packages incrementally,
-it was of marginal value: it complicated the API
-(since it allowed some options to vary across calls but not others),
-it complicated the implementation,
-it cannot be made to work in Types mode, as explained above,
-and it was less efficient than making one combined call (when this is possible).
-Among the clients we have inspected, none made multiple calls to load
-but could not be easily and satisfactorily modified to make only a single call.
-However, applications changes may be required.
-For example, the ssadump command loads the user-specified packages
-and in addition the runtime package.  It is tempting to simply append
-"runtime" to the user-provided list, but that does not work if the user
-specified an ad-hoc package such as [a.go b.go].
-Instead, ssadump no longer requests the runtime package,
-but seeks it among the dependencies of the user-specified packages,
-and emits an error if it is not found.
-
-Questions & Tasks
-
-- Add GOARCH/GOOS?
-  They are not portable concepts, but could be made portable.
-  Our goal has been to allow users to express themselves using the conventions
-  of the underlying build system: if the build system honors GOARCH
-  during a build and during a metadata query, then so should
-  applications built atop that query mechanism.
-  Conversely, if the target architecture of the build is determined by
-  command-line flags, the application can pass the relevant
-  flags through to the build system using a command such as:
-    myapp -query_flag="--cpu=amd64" -query_flag="--os=darwin"
-  However, this approach is low-level, unwieldy, and non-portable.
-  GOOS and GOARCH seem important enough to warrant a dedicated option.
-
-- How should we handle partial failures such as a mixture of good and
-  malformed patterns, existing and non-existent packages, successful and
-  failed builds, import failures, import cycles, and so on, in a call to
-  Load?
-
-- Support bazel, blaze, and go1.10 list, not just go1.11 list.
-
-- Handle (and test) various partial success cases, e.g.
-  a mixture of good packages and:
-  invalid patterns
-  nonexistent packages
-  empty packages
-  packages with malformed package or import declarations
-  unreadable files
-  import cycles
-  other parse errors
-  type errors
-  Make sure we record errors at the correct place in the graph.
-
-- Missing packages among initial arguments are not reported.
-  Return bogus packages for them, like golist does.
-
-- "undeclared name" errors (for example) are reported out of source file
-  order. I suspect this is due to the breadth-first resolution now used
-  by go/types. Is that a bug? Discuss with gri.
-
-*/
diff --git a/vendor/golang.org/x/tools/go/packages/external.go b/vendor/golang.org/x/tools/go/packages/external.go
deleted file mode 100644
index f37bc65..0000000
--- a/vendor/golang.org/x/tools/go/packages/external.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-// This file defines the protocol that enables an external "driver"
-// tool to supply package metadata in place of 'go list'.
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-	"slices"
-	"strings"
-)
-
-// DriverRequest defines the schema of a request for package metadata
-// from an external driver program. The JSON-encoded DriverRequest
-// message is provided to the driver program's standard input. The
-// query patterns are provided as command-line arguments.
-//
-// See the package documentation for an overview.
-type DriverRequest struct {
-	Mode LoadMode `json:"mode"`
-
-	// Env specifies the environment the underlying build system should be run in.
-	Env []string `json:"env"`
-
-	// BuildFlags are flags that should be passed to the underlying build system.
-	BuildFlags []string `json:"build_flags"`
-
-	// Tests specifies whether the patterns should also return test packages.
-	Tests bool `json:"tests"`
-
-	// Overlay maps file paths (relative to the driver's working directory)
-	// to the contents of overlay files (see Config.Overlay).
-	Overlay map[string][]byte `json:"overlay"`
-}
-
-// DriverResponse defines the schema of a response from an external
-// driver program, providing the results of a query for package
-// metadata. The driver program must write a JSON-encoded
-// DriverResponse message to its standard output.
-//
-// See the package documentation for an overview.
-type DriverResponse struct {
-	// NotHandled is returned if the request can't be handled by the current
-	// driver. If an external driver returns a response with NotHandled, the
-	// rest of the DriverResponse is ignored, and go/packages will fallback
-	// to the next driver. If go/packages is extended in the future to support
-	// lists of multiple drivers, go/packages will fall back to the next driver.
-	NotHandled bool
-
-	// Compiler and Arch are the arguments pass of types.SizesFor
-	// to get a types.Sizes to use when type checking.
-	Compiler string
-	Arch     string
-
-	// Roots is the set of package IDs that make up the root packages.
-	// We have to encode this separately because when we encode a single package
-	// we cannot know if it is one of the roots as that requires knowledge of the
-	// graph it is part of.
-	Roots []string `json:",omitempty"`
-
-	// Packages is the full set of packages in the graph.
-	// The packages are not connected into a graph.
-	// The Imports if populated will be stubs that only have their ID set.
-	// Imports will be connected and then type and syntax information added in a
-	// later pass (see refine).
-	Packages []*Package
-
-	// GoVersion is the minor version number used by the driver
-	// (e.g. the go command on the PATH) when selecting .go files.
-	// Zero means unknown.
-	GoVersion int
-}
-
-// driver is the type for functions that query the build system for the
-// packages named by the patterns.
-type driver func(cfg *Config, patterns []string) (*DriverResponse, error)
-
-// findExternalDriver returns the file path of a tool that supplies
-// the build system package structure, or "" if not found.
-// If GOPACKAGESDRIVER is set in the environment findExternalTool returns its
-// value, otherwise it searches for a binary named gopackagesdriver on the PATH.
-func findExternalDriver(cfg *Config) driver {
-	const toolPrefix = "GOPACKAGESDRIVER="
-	tool := ""
-	for _, env := range cfg.Env {
-		if val, ok := strings.CutPrefix(env, toolPrefix); ok {
-			tool = val
-		}
-	}
-	if tool != "" && tool == "off" {
-		return nil
-	}
-	if tool == "" {
-		var err error
-		tool, err = exec.LookPath("gopackagesdriver")
-		if err != nil {
-			return nil
-		}
-	}
-	return func(cfg *Config, patterns []string) (*DriverResponse, error) {
-		req, err := json.Marshal(DriverRequest{
-			Mode:       cfg.Mode,
-			Env:        cfg.Env,
-			BuildFlags: cfg.BuildFlags,
-			Tests:      cfg.Tests,
-			Overlay:    cfg.Overlay,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode message to driver tool: %v", err)
-		}
-
-		buf := new(bytes.Buffer)
-		stderr := new(bytes.Buffer)
-		cmd := exec.CommandContext(cfg.Context, tool, patterns...)
-		cmd.Dir = cfg.Dir
-		// The cwd gets resolved to the real path. On Darwin, where
-		// /tmp is a symlink, this breaks anything that expects the
-		// working directory to keep the original path, including the
-		// go command when dealing with modules.
-		//
-		// os.Getwd stdlib has a special feature where if the
-		// cwd and the PWD are the same node then it trusts
-		// the PWD, so by setting it in the env for the child
-		// process we fix up all the paths returned by the go
-		// command.
-		//
-		// (See similar trick in Invocation.run in ../../internal/gocommand/invoke.go)
-		cmd.Env = append(slices.Clip(cfg.Env), "PWD="+cfg.Dir)
-		cmd.Stdin = bytes.NewReader(req)
-		cmd.Stdout = buf
-		cmd.Stderr = stderr
-
-		if err := cmd.Run(); err != nil {
-			return nil, fmt.Errorf("%v: %v: %s", tool, err, cmd.Stderr)
-		}
-		if len(stderr.Bytes()) != 0 && os.Getenv("GOPACKAGESPRINTDRIVERERRORS") != "" {
-			fmt.Fprintf(os.Stderr, "%s stderr: <<%s>>\n", cmdDebugStr(cmd), stderr)
-		}
-
-		var response DriverResponse
-		if err := json.Unmarshal(buf.Bytes(), &response); err != nil {
-			return nil, err
-		}
-		return &response, nil
-	}
-}
diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go
deleted file mode 100644
index 96e43cd..0000000
--- a/vendor/golang.org/x/tools/go/packages/golist.go
+++ /dev/null
@@ -1,1084 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"unicode"
-
-	"golang.org/x/tools/internal/gocommand"
-	"golang.org/x/tools/internal/packagesinternal"
-)
-
-// debug controls verbose logging.
-var debug, _ = strconv.ParseBool(os.Getenv("GOPACKAGESDEBUG"))
-
-// A goTooOldError reports that the go command
-// found by exec.LookPath is too old to use the new go list behavior.
-type goTooOldError struct {
-	error
-}
-
-// responseDeduper wraps a DriverResponse, deduplicating its contents.
-type responseDeduper struct {
-	seenRoots    map[string]bool
-	seenPackages map[string]*Package
-	dr           *DriverResponse
-}
-
-func newDeduper() *responseDeduper {
-	return &responseDeduper{
-		dr:           &DriverResponse{},
-		seenRoots:    map[string]bool{},
-		seenPackages: map[string]*Package{},
-	}
-}
-
-// addAll fills in r with a DriverResponse.
-func (r *responseDeduper) addAll(dr *DriverResponse) {
-	for _, pkg := range dr.Packages {
-		r.addPackage(pkg)
-	}
-	for _, root := range dr.Roots {
-		r.addRoot(root)
-	}
-	r.dr.GoVersion = dr.GoVersion
-}
-
-func (r *responseDeduper) addPackage(p *Package) {
-	if r.seenPackages[p.ID] != nil {
-		return
-	}
-	r.seenPackages[p.ID] = p
-	r.dr.Packages = append(r.dr.Packages, p)
-}
-
-func (r *responseDeduper) addRoot(id string) {
-	if r.seenRoots[id] {
-		return
-	}
-	r.seenRoots[id] = true
-	r.dr.Roots = append(r.dr.Roots, id)
-}
-
-type golistState struct {
-	cfg *Config
-	ctx context.Context
-
-	runner *gocommand.Runner
-
-	// overlay is the JSON file that encodes the Config.Overlay
-	// mapping, used by 'go list -overlay=...'.
-	overlay string
-
-	envOnce    sync.Once
-	goEnvError error
-	goEnv      map[string]string
-
-	rootsOnce     sync.Once
-	rootDirsError error
-	rootDirs      map[string]string
-
-	goVersionOnce  sync.Once
-	goVersionError error
-	goVersion      int // The X in Go 1.X.
-
-	// vendorDirs caches the (non)existence of vendor directories.
-	vendorDirs map[string]bool
-}
-
-// getEnv returns Go environment variables. Only specific variables are
-// populated -- computing all of them is slow.
-func (state *golistState) getEnv() (map[string]string, error) {
-	state.envOnce.Do(func() {
-		var b *bytes.Buffer
-		b, state.goEnvError = state.invokeGo("env", "-json", "GOMOD", "GOPATH")
-		if state.goEnvError != nil {
-			return
-		}
-
-		state.goEnv = make(map[string]string)
-		decoder := json.NewDecoder(b)
-		if state.goEnvError = decoder.Decode(&state.goEnv); state.goEnvError != nil {
-			return
-		}
-	})
-	return state.goEnv, state.goEnvError
-}
-
-// mustGetEnv is a convenience function that can be used if getEnv has already succeeded.
-func (state *golistState) mustGetEnv() map[string]string {
-	env, err := state.getEnv()
-	if err != nil {
-		panic(fmt.Sprintf("mustGetEnv: %v", err))
-	}
-	return env
-}
-
-// goListDriver uses the go list command to interpret the patterns and produce
-// the build system package structure.
-// See driver for more details.
-//
-// overlay is the JSON file that encodes the cfg.Overlay
-// mapping, used by 'go list -overlay=...'
-func goListDriver(cfg *Config, runner *gocommand.Runner, overlay string, patterns []string) (_ *DriverResponse, err error) {
-	// Make sure that any asynchronous go commands are killed when we return.
-	parentCtx := cfg.Context
-	if parentCtx == nil {
-		parentCtx = context.Background()
-	}
-	ctx, cancel := context.WithCancel(parentCtx)
-	defer cancel()
-
-	response := newDeduper()
-
-	state := &golistState{
-		cfg:        cfg,
-		ctx:        ctx,
-		vendorDirs: map[string]bool{},
-		overlay:    overlay,
-		runner:     runner,
-	}
-
-	// Fill in response.Sizes asynchronously if necessary.
-	if cfg.Mode&NeedTypesSizes != 0 || cfg.Mode&(NeedTypes|NeedTypesInfo) != 0 {
-		errCh := make(chan error)
-		go func() {
-			compiler, arch, err := getSizesForArgs(ctx, state.cfgInvocation(), runner)
-			response.dr.Compiler = compiler
-			response.dr.Arch = arch
-			errCh <- err
-		}()
-		defer func() {
-			if sizesErr := <-errCh; sizesErr != nil {
-				err = sizesErr
-			}
-		}()
-	}
-
-	// Determine files requested in contains patterns
-	var containFiles []string
-	restPatterns := make([]string, 0, len(patterns))
-	// Extract file= and other [querytype]= patterns. Report an error if querytype
-	// doesn't exist.
-extractQueries:
-	for _, pattern := range patterns {
-		eqidx := strings.Index(pattern, "=")
-		if eqidx < 0 {
-			restPatterns = append(restPatterns, pattern)
-		} else {
-			query, value := pattern[:eqidx], pattern[eqidx+len("="):]
-			switch query {
-			case "file":
-				containFiles = append(containFiles, value)
-			case "pattern":
-				restPatterns = append(restPatterns, value)
-			case "": // not a reserved query
-				restPatterns = append(restPatterns, pattern)
-			default:
-				for _, rune := range query {
-					if rune < 'a' || rune > 'z' { // not a reserved query
-						restPatterns = append(restPatterns, pattern)
-						continue extractQueries
-					}
-				}
-				// Reject all other patterns containing "="
-				return nil, fmt.Errorf("invalid query type %q in query pattern %q", query, pattern)
-			}
-		}
-	}
-
-	// See if we have any patterns to pass through to go list. Zero initial
-	// patterns also requires a go list call, since it's the equivalent of
-	// ".".
-	if len(restPatterns) > 0 || len(patterns) == 0 {
-		dr, err := state.createDriverResponse(restPatterns...)
-		if err != nil {
-			return nil, err
-		}
-		response.addAll(dr)
-	}
-
-	if len(containFiles) != 0 {
-		if err := state.runContainsQueries(response, containFiles); err != nil {
-			return nil, err
-		}
-	}
-
-	// (We may yet return an error due to defer.)
-	return response.dr, nil
-}
-
-func (state *golistState) runContainsQueries(response *responseDeduper, queries []string) error {
-	for _, query := range queries {
-		// TODO(matloob): Do only one query per directory.
-		fdir := filepath.Dir(query)
-		// Pass absolute path of directory to go list so that it knows to treat it as a directory,
-		// not a package path.
-		pattern, err := filepath.Abs(fdir)
-		if err != nil {
-			return fmt.Errorf("could not determine absolute path of file= query path %q: %v", query, err)
-		}
-		dirResponse, err := state.createDriverResponse(pattern)
-
-		// If there was an error loading the package, or no packages are returned,
-		// or the package is returned with errors, try to load the file as an
-		// ad-hoc package.
-		// Usually the error will appear in a returned package, but may not if we're
-		// in module mode and the ad-hoc is located outside a module.
-		if err != nil || len(dirResponse.Packages) == 0 || len(dirResponse.Packages) == 1 && len(dirResponse.Packages[0].GoFiles) == 0 &&
-			len(dirResponse.Packages[0].Errors) == 1 {
-			var queryErr error
-			if dirResponse, queryErr = state.adhocPackage(pattern, query); queryErr != nil {
-				return err // return the original error
-			}
-		}
-		isRoot := make(map[string]bool, len(dirResponse.Roots))
-		for _, root := range dirResponse.Roots {
-			isRoot[root] = true
-		}
-		for _, pkg := range dirResponse.Packages {
-			// Add any new packages to the main set
-			// We don't bother to filter packages that will be dropped by the changes of roots,
-			// that will happen anyway during graph construction outside this function.
-			// Over-reporting packages is not a problem.
-			response.addPackage(pkg)
-			// if the package was not a root one, it cannot have the file
-			if !isRoot[pkg.ID] {
-				continue
-			}
-			for _, pkgFile := range pkg.GoFiles {
-				if filepath.Base(query) == filepath.Base(pkgFile) {
-					response.addRoot(pkg.ID)
-					break
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// adhocPackage attempts to load or construct an ad-hoc package for a given
-// query, if the original call to the driver produced inadequate results.
-func (state *golistState) adhocPackage(pattern, query string) (*DriverResponse, error) {
-	response, err := state.createDriverResponse(query)
-	if err != nil {
-		return nil, err
-	}
-	// If we get nothing back from `go list`,
-	// try to make this file into its own ad-hoc package.
-	// TODO(rstambler): Should this check against the original response?
-	if len(response.Packages) == 0 {
-		response.Packages = append(response.Packages, &Package{
-			ID:              "command-line-arguments",
-			PkgPath:         query,
-			GoFiles:         []string{query},
-			CompiledGoFiles: []string{query},
-			Imports:         make(map[string]*Package),
-		})
-		response.Roots = append(response.Roots, "command-line-arguments")
-	}
-	// Handle special cases.
-	if len(response.Packages) == 1 {
-		// golang/go#33482: If this is a file= query for ad-hoc packages where
-		// the file only exists on an overlay, and exists outside of a module,
-		// add the file to the package and remove the errors.
-		if response.Packages[0].ID == "command-line-arguments" ||
-			filepath.ToSlash(response.Packages[0].PkgPath) == filepath.ToSlash(query) {
-			if len(response.Packages[0].GoFiles) == 0 {
-				filename := filepath.Join(pattern, filepath.Base(query)) // avoid recomputing abspath
-				// TODO(matloob): check if the file is outside of a root dir?
-				for path := range state.cfg.Overlay {
-					if path == filename {
-						response.Packages[0].Errors = nil
-						response.Packages[0].GoFiles = []string{path}
-						response.Packages[0].CompiledGoFiles = []string{path}
-					}
-				}
-			}
-		}
-	}
-	return response, nil
-}
-
-// Fields must match go list;
-// see $GOROOT/src/cmd/go/internal/load/pkg.go.
-type jsonPackage struct {
-	ImportPath        string
-	Dir               string
-	Name              string
-	Target            string
-	Export            string
-	GoFiles           []string
-	CompiledGoFiles   []string
-	IgnoredGoFiles    []string
-	IgnoredOtherFiles []string
-	EmbedPatterns     []string
-	EmbedFiles        []string
-	CFiles            []string
-	CgoFiles          []string
-	CXXFiles          []string
-	MFiles            []string
-	HFiles            []string
-	FFiles            []string
-	SFiles            []string
-	SwigFiles         []string
-	SwigCXXFiles      []string
-	SysoFiles         []string
-	Imports           []string
-	ImportMap         map[string]string
-	Deps              []string
-	Module            *Module
-	TestGoFiles       []string
-	TestImports       []string
-	XTestGoFiles      []string
-	XTestImports      []string
-	ForTest           string // q in a "p [q.test]" package, else ""
-	DepOnly           bool
-
-	Error      *packagesinternal.PackageError
-	DepsErrors []*packagesinternal.PackageError
-}
-
-type jsonPackageError struct {
-	ImportStack []string
-	Pos         string
-	Err         string
-}
-
-func otherFiles(p *jsonPackage) [][]string {
-	return [][]string{p.CFiles, p.CXXFiles, p.MFiles, p.HFiles, p.FFiles, p.SFiles, p.SwigFiles, p.SwigCXXFiles, p.SysoFiles}
-}
-
-// createDriverResponse uses the "go list" command to expand the pattern
-// words and return a response for the specified packages.
-func (state *golistState) createDriverResponse(words ...string) (*DriverResponse, error) {
-	// go list uses the following identifiers in ImportPath and Imports:
-	//
-	// 	"p"			-- importable package or main (command)
-	// 	"q.test"		-- q's test executable
-	// 	"p [q.test]"		-- variant of p as built for q's test executable
-	// 	"q_test [q.test]"	-- q's external test package
-	//
-	// The packages p that are built differently for a test q.test
-	// are q itself, plus any helpers used by the external test q_test,
-	// typically including "testing" and all its dependencies.
-
-	// Run "go list" for complete
-	// information on the specified packages.
-	goVersion, err := state.getGoVersion()
-	if err != nil {
-		return nil, err
-	}
-	buf, err := state.invokeGo("list", golistargs(state.cfg, words, goVersion)...)
-	if err != nil {
-		return nil, err
-	}
-
-	seen := make(map[string]*jsonPackage)
-	pkgs := make(map[string]*Package)
-	additionalErrors := make(map[string][]Error)
-	// Decode the JSON and convert it to Package form.
-	response := &DriverResponse{
-		GoVersion: goVersion,
-	}
-	for dec := json.NewDecoder(buf); dec.More(); {
-		p := new(jsonPackage)
-		if err := dec.Decode(p); err != nil {
-			return nil, fmt.Errorf("JSON decoding failed: %v", err)
-		}
-
-		if p.ImportPath == "" {
-			// The documentation for go list says that “[e]rroneous packages will have
-			// a non-empty ImportPath�. If for some reason it comes back empty, we
-			// prefer to error out rather than silently discarding data or handing
-			// back a package without any way to refer to it.
-			if p.Error != nil {
-				return nil, Error{
-					Pos: p.Error.Pos,
-					Msg: p.Error.Err,
-				}
-			}
-			return nil, fmt.Errorf("package missing import path: %+v", p)
-		}
-
-		// Work around https://golang.org/issue/33157:
-		// go list -e, when given an absolute path, will find the package contained at
-		// that directory. But when no package exists there, it will return a fake package
-		// with an error and the ImportPath set to the absolute path provided to go list.
-		// Try to convert that absolute path to what its package path would be if it's
-		// contained in a known module or GOPATH entry. This will allow the package to be
-		// properly "reclaimed" when overlays are processed.
-		if filepath.IsAbs(p.ImportPath) && p.Error != nil {
-			pkgPath, ok, err := state.getPkgPath(p.ImportPath)
-			if err != nil {
-				return nil, err
-			}
-			if ok {
-				p.ImportPath = pkgPath
-			}
-		}
-
-		if old, found := seen[p.ImportPath]; found {
-			// If one version of the package has an error, and the other doesn't, assume
-			// that this is a case where go list is reporting a fake dependency variant
-			// of the imported package: When a package tries to invalidly import another
-			// package, go list emits a variant of the imported package (with the same
-			// import path, but with an error on it, and the package will have a
-			// DepError set on it). An example of when this can happen is for imports of
-			// main packages: main packages can not be imported, but they may be
-			// separately matched and listed by another pattern.
-			// See golang.org/issue/36188 for more details.
-
-			// The plan is that eventually, hopefully in Go 1.15, the error will be
-			// reported on the importing package rather than the duplicate "fake"
-			// version of the imported package. Once all supported versions of Go
-			// have the new behavior this logic can be deleted.
-			// TODO(matloob): delete the workaround logic once all supported versions of
-			// Go return the errors on the proper package.
-
-			// There should be exactly one version of a package that doesn't have an
-			// error.
-			if old.Error == nil && p.Error == nil {
-				if !reflect.DeepEqual(p, old) {
-					return nil, fmt.Errorf("internal error: go list gives conflicting information for package %v", p.ImportPath)
-				}
-				continue
-			}
-
-			// Determine if this package's error needs to be bubbled up.
-			// This is a hack, and we expect for go list to eventually set the error
-			// on the package.
-			if old.Error != nil {
-				var errkind string
-				if strings.Contains(old.Error.Err, "not an importable package") {
-					errkind = "not an importable package"
-				} else if strings.Contains(old.Error.Err, "use of internal package") && strings.Contains(old.Error.Err, "not allowed") {
-					errkind = "use of internal package not allowed"
-				}
-				if errkind != "" {
-					if len(old.Error.ImportStack) < 1 {
-						return nil, fmt.Errorf(`internal error: go list gave a %q error with empty import stack`, errkind)
-					}
-					importingPkg := old.Error.ImportStack[len(old.Error.ImportStack)-1]
-					if importingPkg == old.ImportPath {
-						// Using an older version of Go which put this package itself on top of import
-						// stack, instead of the importer. Look for importer in second from top
-						// position.
-						if len(old.Error.ImportStack) < 2 {
-							return nil, fmt.Errorf(`internal error: go list gave a %q error with an import stack without importing package`, errkind)
-						}
-						importingPkg = old.Error.ImportStack[len(old.Error.ImportStack)-2]
-					}
-					additionalErrors[importingPkg] = append(additionalErrors[importingPkg], Error{
-						Pos:  old.Error.Pos,
-						Msg:  old.Error.Err,
-						Kind: ListError,
-					})
-				}
-			}
-
-			// Make sure that if there's a version of the package without an error,
-			// that's the one reported to the user.
-			if old.Error == nil {
-				continue
-			}
-
-			// This package will replace the old one at the end of the loop.
-		}
-		seen[p.ImportPath] = p
-
-		pkg := &Package{
-			Name:            p.Name,
-			ID:              p.ImportPath,
-			Dir:             p.Dir,
-			Target:          p.Target,
-			GoFiles:         absJoin(p.Dir, p.GoFiles, p.CgoFiles),
-			CompiledGoFiles: absJoin(p.Dir, p.CompiledGoFiles),
-			OtherFiles:      absJoin(p.Dir, otherFiles(p)...),
-			EmbedFiles:      absJoin(p.Dir, p.EmbedFiles),
-			EmbedPatterns:   absJoin(p.Dir, p.EmbedPatterns),
-			IgnoredFiles:    absJoin(p.Dir, p.IgnoredGoFiles, p.IgnoredOtherFiles),
-			ForTest:         p.ForTest,
-			depsErrors:      p.DepsErrors,
-			Module:          p.Module,
-		}
-
-		if (state.cfg.Mode&typecheckCgo) != 0 && len(p.CgoFiles) != 0 {
-			if len(p.CompiledGoFiles) > len(p.GoFiles) {
-				// We need the cgo definitions, which are in the first
-				// CompiledGoFile after the non-cgo ones. This is a hack but there
-				// isn't currently a better way to find it. We also need the pure
-				// Go files and unprocessed cgo files, all of which are already
-				// in pkg.GoFiles.
-				cgoTypes := p.CompiledGoFiles[len(p.GoFiles)]
-				pkg.CompiledGoFiles = append([]string{cgoTypes}, pkg.GoFiles...)
-			} else {
-				// golang/go#38990: go list silently fails to do cgo processing
-				pkg.CompiledGoFiles = nil
-				pkg.Errors = append(pkg.Errors, Error{
-					Msg:  "go list failed to return CompiledGoFiles. This may indicate failure to perform cgo processing; try building at the command line. See https://golang.org/issue/38990.",
-					Kind: ListError,
-				})
-			}
-		}
-
-		// Work around https://golang.org/issue/28749:
-		// cmd/go puts assembly, C, and C++ files in CompiledGoFiles.
-		// Remove files from CompiledGoFiles that are non-go files
-		// (or are not files that look like they are from the cache).
-		if len(pkg.CompiledGoFiles) > 0 {
-			out := pkg.CompiledGoFiles[:0]
-			for _, f := range pkg.CompiledGoFiles {
-				if ext := filepath.Ext(f); ext != ".go" && ext != "" { // ext == "" means the file is from the cache, so probably cgo-processed file
-					continue
-				}
-				out = append(out, f)
-			}
-			pkg.CompiledGoFiles = out
-		}
-
-		// Extract the PkgPath from the package's ID.
-		if i := strings.IndexByte(pkg.ID, ' '); i >= 0 {
-			pkg.PkgPath = pkg.ID[:i]
-		} else {
-			pkg.PkgPath = pkg.ID
-		}
-
-		if pkg.PkgPath == "unsafe" {
-			pkg.CompiledGoFiles = nil // ignore fake unsafe.go file (#59929)
-		} else if len(pkg.CompiledGoFiles) == 0 {
-			// Work around for pre-go.1.11 versions of go list.
-			// TODO(matloob): they should be handled by the fallback.
-			// Can we delete this?
-			pkg.CompiledGoFiles = pkg.GoFiles
-		}
-
-		// Assume go list emits only absolute paths for Dir.
-		if p.Dir != "" && !filepath.IsAbs(p.Dir) {
-			log.Fatalf("internal error: go list returned non-absolute Package.Dir: %s", p.Dir)
-		}
-
-		if p.Export != "" && !filepath.IsAbs(p.Export) {
-			pkg.ExportFile = filepath.Join(p.Dir, p.Export)
-		} else {
-			pkg.ExportFile = p.Export
-		}
-
-		// imports
-		//
-		// Imports contains the IDs of all imported packages.
-		// ImportsMap records (path, ID) only where they differ.
-		ids := make(map[string]bool)
-		for _, id := range p.Imports {
-			ids[id] = true
-		}
-		pkg.Imports = make(map[string]*Package)
-		for path, id := range p.ImportMap {
-			pkg.Imports[path] = &Package{ID: id} // non-identity import
-			delete(ids, id)
-		}
-		for id := range ids {
-			if id == "C" {
-				continue
-			}
-
-			pkg.Imports[id] = &Package{ID: id} // identity import
-		}
-		if !p.DepOnly {
-			response.Roots = append(response.Roots, pkg.ID)
-		}
-
-		// Temporary work-around for golang/go#39986. Parse filenames out of
-		// error messages. This happens if there are unrecoverable syntax
-		// errors in the source, so we can't match on a specific error message.
-		//
-		// TODO(rfindley): remove this heuristic, in favor of considering
-		// InvalidGoFiles from the list driver.
-		if err := p.Error; err != nil && state.shouldAddFilenameFromError(p) {
-			addFilenameFromPos := func(pos string) bool {
-				split := strings.Split(pos, ":")
-				if len(split) < 1 {
-					return false
-				}
-				filename := strings.TrimSpace(split[0])
-				if filename == "" {
-					return false
-				}
-				if !filepath.IsAbs(filename) {
-					filename = filepath.Join(state.cfg.Dir, filename)
-				}
-				info, _ := os.Stat(filename)
-				if info == nil {
-					return false
-				}
-				pkg.CompiledGoFiles = append(pkg.CompiledGoFiles, filename)
-				pkg.GoFiles = append(pkg.GoFiles, filename)
-				return true
-			}
-			found := addFilenameFromPos(err.Pos)
-			// In some cases, go list only reports the error position in the
-			// error text, not the error position. One such case is when the
-			// file's package name is a keyword (see golang.org/issue/39763).
-			if !found {
-				addFilenameFromPos(err.Err)
-			}
-		}
-
-		if p.Error != nil {
-			msg := strings.TrimSpace(p.Error.Err) // Trim to work around golang.org/issue/32363.
-			// Address golang.org/issue/35964 by appending import stack to error message.
-			if msg == "import cycle not allowed" && len(p.Error.ImportStack) != 0 {
-				msg += fmt.Sprintf(": import stack: %v", p.Error.ImportStack)
-			}
-			pkg.Errors = append(pkg.Errors, Error{
-				Pos:  p.Error.Pos,
-				Msg:  msg,
-				Kind: ListError,
-			})
-		}
-
-		pkgs[pkg.ID] = pkg
-	}
-
-	for id, errs := range additionalErrors {
-		if p, ok := pkgs[id]; ok {
-			p.Errors = append(p.Errors, errs...)
-		}
-	}
-	for _, pkg := range pkgs {
-		response.Packages = append(response.Packages, pkg)
-	}
-	sort.Slice(response.Packages, func(i, j int) bool { return response.Packages[i].ID < response.Packages[j].ID })
-
-	return response, nil
-}
-
-func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool {
-	if len(p.GoFiles) > 0 || len(p.CompiledGoFiles) > 0 {
-		return false
-	}
-
-	goV, err := state.getGoVersion()
-	if err != nil {
-		return false
-	}
-
-	// On Go 1.14 and earlier, only add filenames from errors if the import stack is empty.
-	// The import stack behaves differently for these versions than newer Go versions.
-	if goV < 15 {
-		return len(p.Error.ImportStack) == 0
-	}
-
-	// On Go 1.15 and later, only parse filenames out of error if there's no import stack,
-	// or the current package is at the top of the import stack. This is not guaranteed
-	// to work perfectly, but should avoid some cases where files in errors don't belong to this
-	// package.
-	return len(p.Error.ImportStack) == 0 || p.Error.ImportStack[len(p.Error.ImportStack)-1] == p.ImportPath
-}
-
-// getGoVersion returns the effective minor version of the go command.
-func (state *golistState) getGoVersion() (int, error) {
-	state.goVersionOnce.Do(func() {
-		state.goVersion, state.goVersionError = gocommand.GoVersion(state.ctx, state.cfgInvocation(), state.runner)
-	})
-	return state.goVersion, state.goVersionError
-}
-
-// getPkgPath finds the package path of a directory if it's relative to a root
-// directory.
-func (state *golistState) getPkgPath(dir string) (string, bool, error) {
-	absDir, err := filepath.Abs(dir)
-	if err != nil {
-		return "", false, err
-	}
-	roots, err := state.determineRootDirs()
-	if err != nil {
-		return "", false, err
-	}
-
-	for rdir, rpath := range roots {
-		// Make sure that the directory is in the module,
-		// to avoid creating a path relative to another module.
-		if !strings.HasPrefix(absDir, rdir) {
-			continue
-		}
-		// TODO(matloob): This doesn't properly handle symlinks.
-		r, err := filepath.Rel(rdir, dir)
-		if err != nil {
-			continue
-		}
-		if rpath != "" {
-			// We choose only one root even though the directory even it can belong in multiple modules
-			// or GOPATH entries. This is okay because we only need to work with absolute dirs when a
-			// file is missing from disk, for instance when gopls calls go/packages in an overlay.
-			// Once the file is saved, gopls, or the next invocation of the tool will get the correct
-			// result straight from golist.
-			// TODO(matloob): Implement module tiebreaking?
-			return path.Join(rpath, filepath.ToSlash(r)), true, nil
-		}
-		return filepath.ToSlash(r), true, nil
-	}
-	return "", false, nil
-}
-
-// absJoin absolutizes and flattens the lists of files.
-func absJoin(dir string, fileses ...[]string) (res []string) {
-	for _, files := range fileses {
-		for _, file := range files {
-			if !filepath.IsAbs(file) {
-				file = filepath.Join(dir, file)
-			}
-			res = append(res, file)
-		}
-	}
-	return res
-}
-
-func jsonFlag(cfg *Config, goVersion int) string {
-	if goVersion < 19 {
-		return "-json"
-	}
-	var fields []string
-	added := make(map[string]bool)
-	addFields := func(fs ...string) {
-		for _, f := range fs {
-			if !added[f] {
-				added[f] = true
-				fields = append(fields, f)
-			}
-		}
-	}
-	addFields("Name", "ImportPath", "Error") // These fields are always needed
-	if cfg.Mode&NeedFiles != 0 || cfg.Mode&(NeedTypes|NeedTypesInfo) != 0 {
-		addFields("Dir", "GoFiles", "IgnoredGoFiles", "IgnoredOtherFiles", "CFiles",
-			"CgoFiles", "CXXFiles", "MFiles", "HFiles", "FFiles", "SFiles",
-			"SwigFiles", "SwigCXXFiles", "SysoFiles")
-		if cfg.Tests {
-			addFields("TestGoFiles", "XTestGoFiles")
-		}
-	}
-	if cfg.Mode&(NeedTypes|NeedTypesInfo) != 0 {
-		// CompiledGoFiles seems to be required for the test case TestCgoNoSyntax,
-		// even when -compiled isn't passed in.
-		// TODO(#52435): Should we make the test ask for -compiled, or automatically
-		// request CompiledGoFiles in certain circumstances?
-		addFields("Dir", "CompiledGoFiles")
-	}
-	if cfg.Mode&NeedCompiledGoFiles != 0 {
-		addFields("Dir", "CompiledGoFiles", "Export")
-	}
-	if cfg.Mode&NeedImports != 0 {
-		// When imports are requested, DepOnly is used to distinguish between packages
-		// explicitly requested and transitive imports of those packages.
-		addFields("DepOnly", "Imports", "ImportMap")
-		if cfg.Tests {
-			addFields("TestImports", "XTestImports")
-		}
-	}
-	if cfg.Mode&NeedDeps != 0 {
-		addFields("DepOnly")
-	}
-	if usesExportData(cfg) {
-		// Request Dir in the unlikely case Export is not absolute.
-		addFields("Dir", "Export")
-	}
-	if cfg.Mode&NeedForTest != 0 {
-		addFields("ForTest")
-	}
-	if cfg.Mode&needInternalDepsErrors != 0 {
-		addFields("DepsErrors")
-	}
-	if cfg.Mode&NeedModule != 0 {
-		addFields("Module")
-	}
-	if cfg.Mode&NeedEmbedFiles != 0 {
-		addFields("EmbedFiles")
-	}
-	if cfg.Mode&NeedEmbedPatterns != 0 {
-		addFields("EmbedPatterns")
-	}
-	if cfg.Mode&NeedTarget != 0 {
-		addFields("Target")
-	}
-	return "-json=" + strings.Join(fields, ",")
-}
-
-func golistargs(cfg *Config, words []string, goVersion int) []string {
-	const findFlags = NeedImports | NeedTypes | NeedSyntax | NeedTypesInfo
-	fullargs := []string{
-		"-e", jsonFlag(cfg, goVersion),
-		fmt.Sprintf("-compiled=%t", cfg.Mode&(NeedCompiledGoFiles|NeedSyntax|NeedTypes|NeedTypesInfo|NeedTypesSizes) != 0),
-		fmt.Sprintf("-test=%t", cfg.Tests),
-		fmt.Sprintf("-export=%t", usesExportData(cfg)),
-		fmt.Sprintf("-deps=%t", cfg.Mode&NeedImports != 0),
-		// go list doesn't let you pass -test and -find together,
-		// probably because you'd just get the TestMain.
-		fmt.Sprintf("-find=%t", !cfg.Tests && cfg.Mode&findFlags == 0 && !usesExportData(cfg)),
-	}
-
-	// golang/go#60456: with go1.21 and later, go list serves pgo variants, which
-	// can be costly to compute and may result in redundant processing for the
-	// caller. Disable these variants. If someone wants to add e.g. a NeedPGO
-	// mode flag, that should be a separate proposal.
-	if goVersion >= 21 {
-		fullargs = append(fullargs, "-pgo=off")
-	}
-
-	fullargs = append(fullargs, cfg.BuildFlags...)
-	fullargs = append(fullargs, "--")
-	fullargs = append(fullargs, words...)
-	return fullargs
-}
-
-// cfgInvocation returns an Invocation that reflects cfg's settings.
-func (state *golistState) cfgInvocation() gocommand.Invocation {
-	cfg := state.cfg
-	return gocommand.Invocation{
-		BuildFlags: cfg.BuildFlags,
-		CleanEnv:   cfg.Env != nil,
-		Env:        cfg.Env,
-		Logf:       cfg.Logf,
-		WorkingDir: cfg.Dir,
-		Overlay:    state.overlay,
-	}
-}
-
-// invokeGo returns the stdout of a go command invocation.
-func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) {
-	cfg := state.cfg
-
-	inv := state.cfgInvocation()
-	inv.Verb = verb
-	inv.Args = args
-
-	stdout, stderr, friendlyErr, err := state.runner.RunRaw(cfg.Context, inv)
-	if err != nil {
-		// Check for 'go' executable not being found.
-		if ee, ok := err.(*exec.Error); ok && ee.Err == exec.ErrNotFound {
-			return nil, fmt.Errorf("'go list' driver requires 'go', but %s", exec.ErrNotFound)
-		}
-
-		exitErr, ok := err.(*exec.ExitError)
-		if !ok {
-			// Catastrophic error:
-			// - context cancellation
-			return nil, fmt.Errorf("couldn't run 'go': %w", err)
-		}
-
-		// Old go version?
-		if strings.Contains(stderr.String(), "flag provided but not defined") {
-			return nil, goTooOldError{fmt.Errorf("unsupported version of go: %s: %s", exitErr, stderr)}
-		}
-
-		// Related to #24854
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "unexpected directory layout") {
-			return nil, friendlyErr
-		}
-
-		// Return an error if 'go list' failed due to missing tools in
-		// $GOROOT/pkg/tool/$GOOS_$GOARCH (#69606).
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), `go: no such tool`) {
-			return nil, friendlyErr
-		}
-
-		// Is there an error running the C compiler in cgo? This will be reported in the "Error" field
-		// and should be suppressed by go list -e.
-		//
-		// This condition is not perfect yet because the error message can include other error messages than runtime/cgo.
-		isPkgPathRune := func(r rune) bool {
-			// From https://golang.org/ref/spec#Import_declarations:
-			//    Implementation restriction: A compiler may restrict ImportPaths to non-empty strings
-			//    using only characters belonging to Unicode's L, M, N, P, and S general categories
-			//    (the Graphic characters without spaces) and may also exclude the
-			//    characters !"#$%&'()*,:;<=>?[\]^`{|} and the Unicode replacement character U+FFFD.
-			return unicode.IsOneOf([]*unicode.RangeTable{unicode.L, unicode.M, unicode.N, unicode.P, unicode.S}, r) &&
-				!strings.ContainsRune("!\"#$%&'()*,:;<=>?[\\]^`{|}\uFFFD", r)
-		}
-		// golang/go#36770: Handle case where cmd/go prints module download messages before the error.
-		msg := stderr.String()
-		for strings.HasPrefix(msg, "go: downloading") {
-			msg = msg[strings.IndexRune(msg, '\n')+1:]
-		}
-		if len(stderr.String()) > 0 && strings.HasPrefix(stderr.String(), "# ") {
-			msg := msg[len("# "):]
-			if strings.HasPrefix(strings.TrimLeftFunc(msg, isPkgPathRune), "\n") {
-				return stdout, nil
-			}
-			// Treat pkg-config errors as a special case (golang.org/issue/36770).
-			if strings.HasPrefix(msg, "pkg-config") {
-				return stdout, nil
-			}
-		}
-
-		// This error only appears in stderr. See golang.org/cl/166398 for a fix in go list to show
-		// the error in the Err section of stdout in case -e option is provided.
-		// This fix is provided for backwards compatibility.
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "named files must be .go files") {
-			output := fmt.Sprintf(`{"ImportPath": "command-line-arguments","Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Similar to the previous error, but currently lacks a fix in Go.
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "named files must all be in one directory") {
-			output := fmt.Sprintf(`{"ImportPath": "command-line-arguments","Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Backwards compatibility for Go 1.11 because 1.12 and 1.13 put the directory in the ImportPath.
-		// If the package doesn't exist, put the absolute path of the directory into the error message,
-		// as Go 1.13 list does.
-		const noSuchDirectory = "no such directory"
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), noSuchDirectory) {
-			errstr := stderr.String()
-			abspath := strings.TrimSpace(errstr[strings.Index(errstr, noSuchDirectory)+len(noSuchDirectory):])
-			output := fmt.Sprintf(`{"ImportPath": %q,"Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				abspath, strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Workaround for #29280: go list -e has incorrect behavior when an ad-hoc package doesn't exist.
-		// Note that the error message we look for in this case is different that the one looked for above.
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "no such file or directory") {
-			output := fmt.Sprintf(`{"ImportPath": "command-line-arguments","Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Workaround for #34273. go list -e with GO111MODULE=on has incorrect behavior when listing a
-		// directory outside any module.
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "outside available modules") {
-			output := fmt.Sprintf(`{"ImportPath": %q,"Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				// TODO(matloob): command-line-arguments isn't correct here.
-				"command-line-arguments", strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Another variation of the previous error
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "outside module root") {
-			output := fmt.Sprintf(`{"ImportPath": %q,"Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				// TODO(matloob): command-line-arguments isn't correct here.
-				"command-line-arguments", strings.Trim(stderr.String(), "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Workaround for an instance of golang.org/issue/26755: go list -e  will return a non-zero exit
-		// status if there's a dependency on a package that doesn't exist. But it should return
-		// a zero exit status and set an error on that package.
-		if len(stderr.String()) > 0 && strings.Contains(stderr.String(), "no Go files in") {
-			// Don't clobber stdout if `go list` actually returned something.
-			if len(stdout.String()) > 0 {
-				return stdout, nil
-			}
-			// try to extract package name from string
-			stderrStr := stderr.String()
-			var importPath string
-			colon := strings.Index(stderrStr, ":")
-			if colon > 0 && strings.HasPrefix(stderrStr, "go build ") {
-				importPath = stderrStr[len("go build "):colon]
-			}
-			output := fmt.Sprintf(`{"ImportPath": %q,"Incomplete": true,"Error": {"Pos": "","Err": %q}}`,
-				importPath, strings.Trim(stderrStr, "\n"))
-			return bytes.NewBufferString(output), nil
-		}
-
-		// Export mode entails a build.
-		// If that build fails, errors appear on stderr
-		// (despite the -e flag) and the Export field is blank.
-		// Do not fail in that case.
-		// The same is true if an ad-hoc package given to go list doesn't exist.
-		// TODO(matloob): Remove these once we can depend on go list to exit with a zero status with -e even when
-		// packages don't exist or a build fails.
-		if !usesExportData(cfg) && !containsGoFile(args) {
-			return nil, friendlyErr
-		}
-	}
-	return stdout, nil
-}
-
-func containsGoFile(s []string) bool {
-	for _, f := range s {
-		if strings.HasSuffix(f, ".go") {
-			return true
-		}
-	}
-	return false
-}
-
-func cmdDebugStr(cmd *exec.Cmd) string {
-	env := make(map[string]string)
-	for _, kv := range cmd.Env {
-		split := strings.SplitN(kv, "=", 2)
-		k, v := split[0], split[1]
-		env[k] = v
-	}
-
-	var args []string
-	for _, arg := range cmd.Args {
-		quoted := strconv.Quote(arg)
-		if quoted[1:len(quoted)-1] != arg || strings.Contains(arg, " ") {
-			args = append(args, quoted)
-		} else {
-			args = append(args, arg)
-		}
-	}
-	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], strings.Join(args, " "))
-}
-
-// getSizesForArgs queries 'go list' for the appropriate
-// Compiler and GOARCH arguments to pass to [types.SizesFor].
-func getSizesForArgs(ctx context.Context, inv gocommand.Invocation, gocmdRunner *gocommand.Runner) (string, string, error) {
-	inv.Verb = "list"
-	inv.Args = []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"}
-	stdout, stderr, friendlyErr, rawErr := gocmdRunner.RunRaw(ctx, inv)
-	var goarch, compiler string
-	if rawErr != nil {
-		rawErrMsg := rawErr.Error()
-		if strings.Contains(rawErrMsg, "cannot find main module") ||
-			strings.Contains(rawErrMsg, "go.mod file not found") {
-			// User's running outside of a module.
-			// All bets are off. Get GOARCH and guess compiler is gc.
-			// TODO(matloob): Is this a problem in practice?
-			inv.Verb = "env"
-			inv.Args = []string{"GOARCH"}
-			envout, enverr := gocmdRunner.Run(ctx, inv)
-			if enverr != nil {
-				return "", "", enverr
-			}
-			goarch = strings.TrimSpace(envout.String())
-			compiler = "gc"
-		} else if friendlyErr != nil {
-			return "", "", friendlyErr
-		} else {
-			// This should be unreachable, but be defensive
-			// in case RunRaw's error results are inconsistent.
-			return "", "", rawErr
-		}
-	} else {
-		fields := strings.Fields(stdout.String())
-		if len(fields) < 2 {
-			return "", "", fmt.Errorf("could not parse GOARCH and Go compiler in format \"<GOARCH> <compiler>\":\nstdout: <<%s>>\nstderr: <<%s>>",
-				stdout.String(), stderr.String())
-		}
-		goarch = fields[0]
-		compiler = fields[1]
-	}
-	return compiler, goarch, nil
-}
diff --git a/vendor/golang.org/x/tools/go/packages/golist_overlay.go b/vendor/golang.org/x/tools/go/packages/golist_overlay.go
deleted file mode 100644
index d823c47..0000000
--- a/vendor/golang.org/x/tools/go/packages/golist_overlay.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-import (
-	"encoding/json"
-	"path/filepath"
-
-	"golang.org/x/tools/internal/gocommand"
-)
-
-// determineRootDirs returns a mapping from absolute directories that could
-// contain code to their corresponding import path prefixes.
-func (state *golistState) determineRootDirs() (map[string]string, error) {
-	env, err := state.getEnv()
-	if err != nil {
-		return nil, err
-	}
-	if env["GOMOD"] != "" {
-		state.rootsOnce.Do(func() {
-			state.rootDirs, state.rootDirsError = state.determineRootDirsModules()
-		})
-	} else {
-		state.rootsOnce.Do(func() {
-			state.rootDirs, state.rootDirsError = state.determineRootDirsGOPATH()
-		})
-	}
-	return state.rootDirs, state.rootDirsError
-}
-
-func (state *golistState) determineRootDirsModules() (map[string]string, error) {
-	// List all of the modules--the first will be the directory for the main
-	// module. Any replaced modules will also need to be treated as roots.
-	// Editing files in the module cache isn't a great idea, so we don't
-	// plan to ever support that.
-	out, err := state.invokeGo("list", "-m", "-json", "all")
-	if err != nil {
-		// 'go list all' will fail if we're outside of a module and
-		// GO111MODULE=on. Try falling back without 'all'.
-		var innerErr error
-		out, innerErr = state.invokeGo("list", "-m", "-json")
-		if innerErr != nil {
-			return nil, err
-		}
-	}
-	roots := map[string]string{}
-	modules := map[string]string{}
-	var i int
-	for dec := json.NewDecoder(out); dec.More(); {
-		mod := new(gocommand.ModuleJSON)
-		if err := dec.Decode(mod); err != nil {
-			return nil, err
-		}
-		if mod.Dir != "" && mod.Path != "" {
-			// This is a valid module; add it to the map.
-			absDir, err := filepath.Abs(mod.Dir)
-			if err != nil {
-				return nil, err
-			}
-			modules[absDir] = mod.Path
-			// The first result is the main module.
-			if i == 0 || mod.Replace != nil && mod.Replace.Path != "" {
-				roots[absDir] = mod.Path
-			}
-		}
-		i++
-	}
-	return roots, nil
-}
-
-func (state *golistState) determineRootDirsGOPATH() (map[string]string, error) {
-	m := map[string]string{}
-	for _, dir := range filepath.SplitList(state.mustGetEnv()["GOPATH"]) {
-		absDir, err := filepath.Abs(dir)
-		if err != nil {
-			return nil, err
-		}
-		m[filepath.Join(absDir, "src")] = ""
-	}
-	return m, nil
-}
diff --git a/vendor/golang.org/x/tools/go/packages/loadmode_string.go b/vendor/golang.org/x/tools/go/packages/loadmode_string.go
deleted file mode 100644
index 69eec9f..0000000
--- a/vendor/golang.org/x/tools/go/packages/loadmode_string.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-import (
-	"fmt"
-	"strings"
-)
-
-var modes = [...]struct {
-	mode LoadMode
-	name string
-}{
-	{NeedName, "NeedName"},
-	{NeedFiles, "NeedFiles"},
-	{NeedCompiledGoFiles, "NeedCompiledGoFiles"},
-	{NeedImports, "NeedImports"},
-	{NeedDeps, "NeedDeps"},
-	{NeedExportFile, "NeedExportFile"},
-	{NeedTypes, "NeedTypes"},
-	{NeedSyntax, "NeedSyntax"},
-	{NeedTypesInfo, "NeedTypesInfo"},
-	{NeedTypesSizes, "NeedTypesSizes"},
-	{NeedForTest, "NeedForTest"},
-	{NeedModule, "NeedModule"},
-	{NeedEmbedFiles, "NeedEmbedFiles"},
-	{NeedEmbedPatterns, "NeedEmbedPatterns"},
-	{NeedTarget, "NeedTarget"},
-}
-
-func (mode LoadMode) String() string {
-	if mode == 0 {
-		return "LoadMode(0)"
-	}
-	var out []string
-	// named bits
-	for _, item := range modes {
-		if (mode & item.mode) != 0 {
-			mode ^= item.mode
-			out = append(out, item.name)
-		}
-	}
-	// unnamed residue
-	if mode != 0 {
-		if out == nil {
-			return fmt.Sprintf("LoadMode(%#x)", int(mode))
-		}
-		out = append(out, fmt.Sprintf("%#x", int(mode)))
-	}
-	if len(out) == 1 {
-		return out[0]
-	}
-	return "(" + strings.Join(out, "|") + ")"
-}
diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go
deleted file mode 100644
index 060ab08..0000000
--- a/vendor/golang.org/x/tools/go/packages/packages.go
+++ /dev/null
@@ -1,1559 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-// See doc.go for package documentation and implementation notes.
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/scanner"
-	"go/token"
-	"go/types"
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"golang.org/x/sync/errgroup"
-
-	"golang.org/x/tools/go/gcexportdata"
-	"golang.org/x/tools/internal/gocommand"
-	"golang.org/x/tools/internal/packagesinternal"
-	"golang.org/x/tools/internal/typesinternal"
-)
-
-// A LoadMode controls the amount of detail to return when loading.
-// The bits below can be combined to specify which fields should be
-// filled in the result packages.
-//
-// The zero value is a special case, equivalent to combining
-// the NeedName, NeedFiles, and NeedCompiledGoFiles bits.
-//
-// ID and Errors (if present) will always be filled.
-// [Load] may return more information than requested.
-//
-// The Mode flag is a union of several bits named NeedName,
-// NeedFiles, and so on, each of which determines whether
-// a given field of Package (Name, Files, etc) should be
-// populated.
-//
-// For convenience, we provide named constants for the most
-// common combinations of Need flags:
-//
-//	[LoadFiles]     lists of files in each package
-//	[LoadImports]   ... plus imports
-//	[LoadTypes]     ... plus type information
-//	[LoadSyntax]    ... plus type-annotated syntax
-//	[LoadAllSyntax] ... for all dependencies
-//
-// Unfortunately there are a number of open bugs related to
-// interactions among the LoadMode bits:
-//   - https://go.dev/issue/56633
-//   - https://go.dev/issue/56677
-//   - https://go.dev/issue/58726
-//   - https://go.dev/issue/63517
-type LoadMode int
-
-const (
-	// NeedName adds Name and PkgPath.
-	NeedName LoadMode = 1 << iota
-
-	// NeedFiles adds Dir, GoFiles, OtherFiles, and IgnoredFiles
-	NeedFiles
-
-	// NeedCompiledGoFiles adds CompiledGoFiles.
-	NeedCompiledGoFiles
-
-	// NeedImports adds Imports. If NeedDeps is not set, the Imports field will contain
-	// "placeholder" Packages with only the ID set.
-	NeedImports
-
-	// NeedDeps adds the fields requested by the LoadMode in the packages in Imports.
-	NeedDeps
-
-	// NeedExportFile adds ExportFile.
-	NeedExportFile
-
-	// NeedTypes adds Types, Fset, and IllTyped.
-	NeedTypes
-
-	// NeedSyntax adds Syntax and Fset.
-	NeedSyntax
-
-	// NeedTypesInfo adds TypesInfo and Fset.
-	NeedTypesInfo
-
-	// NeedTypesSizes adds TypesSizes.
-	NeedTypesSizes
-
-	// needInternalDepsErrors adds the internal deps errors field for use by gopls.
-	needInternalDepsErrors
-
-	// NeedForTest adds ForTest.
-	//
-	// Tests must also be set on the context for this field to be populated.
-	NeedForTest
-
-	// typecheckCgo enables full support for type checking cgo. Requires Go 1.15+.
-	// Modifies CompiledGoFiles and Types, and has no effect on its own.
-	typecheckCgo
-
-	// NeedModule adds Module.
-	NeedModule
-
-	// NeedEmbedFiles adds EmbedFiles.
-	NeedEmbedFiles
-
-	// NeedEmbedPatterns adds EmbedPatterns.
-	NeedEmbedPatterns
-
-	// NeedTarget adds Target.
-	NeedTarget
-
-	// Be sure to update loadmode_string.go when adding new items!
-)
-
-const (
-	// LoadFiles loads the name and file names for the initial packages.
-	LoadFiles = NeedName | NeedFiles | NeedCompiledGoFiles
-
-	// LoadImports loads the name, file names, and import mapping for the initial packages.
-	LoadImports = LoadFiles | NeedImports
-
-	// LoadTypes loads exported type information for the initial packages.
-	LoadTypes = LoadImports | NeedTypes | NeedTypesSizes
-
-	// LoadSyntax loads typed syntax for the initial packages.
-	LoadSyntax = LoadTypes | NeedSyntax | NeedTypesInfo
-
-	// LoadAllSyntax loads typed syntax for the initial packages and all dependencies.
-	LoadAllSyntax = LoadSyntax | NeedDeps
-
-	// Deprecated: NeedExportsFile is a historical misspelling of NeedExportFile.
-	//
-	//go:fix inline
-	NeedExportsFile = NeedExportFile
-)
-
-// A Config specifies details about how packages should be loaded.
-// The zero value is a valid configuration.
-//
-// Calls to [Load] do not modify this struct.
-type Config struct {
-	// Mode controls the level of information returned for each package.
-	Mode LoadMode
-
-	// Context specifies the context for the load operation.
-	// Cancelling the context may cause [Load] to abort and
-	// return an error.
-	Context context.Context
-
-	// Logf is the logger for the config.
-	// If the user provides a logger, debug logging is enabled.
-	// If the GOPACKAGESDEBUG environment variable is set to true,
-	// but the logger is nil, default to log.Printf.
-	Logf func(format string, args ...any)
-
-	// Dir is the directory in which to run the build system's query tool
-	// that provides information about the packages.
-	// If Dir is empty, the tool is run in the current directory.
-	Dir string
-
-	// Env is the environment to use when invoking the build system's query tool.
-	// If Env is nil, the current environment is used.
-	// As in os/exec's Cmd, only the last value in the slice for
-	// each environment key is used. To specify the setting of only
-	// a few variables, append to the current environment, as in:
-	//
-	//	opt.Env = append(os.Environ(), "GOOS=plan9", "GOARCH=386")
-	//
-	Env []string
-
-	// BuildFlags is a list of command-line flags to be passed through to
-	// the build system's query tool.
-	BuildFlags []string
-
-	// Fset provides source position information for syntax trees and types.
-	// If Fset is nil, Load will use a new fileset, but preserve Fset's value.
-	Fset *token.FileSet
-
-	// ParseFile is called to read and parse each file
-	// when preparing a package's type-checked syntax tree.
-	// It must be safe to call ParseFile simultaneously from multiple goroutines.
-	// If ParseFile is nil, the loader will uses parser.ParseFile.
-	//
-	// ParseFile should parse the source from src and use filename only for
-	// recording position information.
-	//
-	// An application may supply a custom implementation of ParseFile
-	// to change the effective file contents or the behavior of the parser,
-	// or to modify the syntax tree. For example, selectively eliminating
-	// unwanted function bodies can significantly accelerate type checking.
-	ParseFile func(fset *token.FileSet, filename string, src []byte) (*ast.File, error)
-
-	// If Tests is set, the loader includes not just the packages
-	// matching a particular pattern but also any related test packages,
-	// including test-only variants of the package and the test executable.
-	//
-	// For example, when using the go command, loading "fmt" with Tests=true
-	// returns four packages, with IDs "fmt" (the standard package),
-	// "fmt [fmt.test]" (the package as compiled for the test),
-	// "fmt_test" (the test functions from source files in package fmt_test),
-	// and "fmt.test" (the test binary).
-	//
-	// In build systems with explicit names for tests,
-	// setting Tests may have no effect.
-	Tests bool
-
-	// Overlay is a mapping from absolute file paths to file contents.
-	//
-	// For each map entry, [Load] uses the alternative file
-	// contents provided by the overlay mapping instead of reading
-	// from the file system. This mechanism can be used to enable
-	// editor-integrated tools to correctly analyze the contents
-	// of modified but unsaved buffers, for example.
-	//
-	// The overlay mapping is passed to the build system's driver
-	// (see "The driver protocol") so that it too can report
-	// consistent package metadata about unsaved files. However,
-	// drivers may vary in their level of support for overlays.
-	Overlay map[string][]byte
-}
-
-// Load loads and returns the Go packages named by the given patterns.
-//
-// The cfg parameter specifies loading options; nil behaves the same as an empty [Config].
-//
-// The [Config.Mode] field is a set of bits that determine what kinds
-// of information should be computed and returned. Modes that require
-// more information tend to be slower. See [LoadMode] for details
-// and important caveats. Its zero value is equivalent to
-// [NeedName] | [NeedFiles] | [NeedCompiledGoFiles].
-//
-// Each call to Load returns a new set of [Package] instances.
-// The Packages and their Imports form a directed acyclic graph.
-//
-// If the [NeedTypes] mode flag was set, each call to Load uses a new
-// [types.Importer], so [types.Object] and [types.Type] values from
-// different calls to Load must not be mixed as they will have
-// inconsistent notions of type identity.
-//
-// If any of the patterns was invalid as defined by the
-// underlying build system, Load returns an error.
-// It may return an empty list of packages without an error,
-// for instance for an empty expansion of a valid wildcard.
-// Errors associated with a particular package are recorded in the
-// corresponding Package's Errors list, and do not cause Load to
-// return an error. Clients may need to handle such errors before
-// proceeding with further analysis. The [PrintErrors] function is
-// provided for convenient display of all errors.
-func Load(cfg *Config, patterns ...string) ([]*Package, error) {
-	ld := newLoader(cfg)
-	response, external, err := defaultDriver(&ld.Config, patterns...)
-	if err != nil {
-		return nil, err
-	}
-
-	ld.sizes = types.SizesFor(response.Compiler, response.Arch)
-	if ld.sizes == nil && ld.Config.Mode&(NeedTypes|NeedTypesSizes|NeedTypesInfo) != 0 {
-		// Type size information is needed but unavailable.
-		if external {
-			// An external driver may fail to populate the Compiler/GOARCH fields,
-			// especially since they are relatively new (see #63700).
-			// Provide a sensible fallback in this case.
-			ld.sizes = types.SizesFor("gc", runtime.GOARCH)
-			if ld.sizes == nil { // gccgo-only arch
-				ld.sizes = types.SizesFor("gc", "amd64")
-			}
-		} else {
-			// Go list should never fail to deliver accurate size information.
-			// Reject the whole Load since the error is the same for every package.
-			return nil, fmt.Errorf("can't determine type sizes for compiler %q on GOARCH %q",
-				response.Compiler, response.Arch)
-		}
-	}
-
-	return ld.refine(response)
-}
-
-// defaultDriver is a driver that implements go/packages' fallback behavior.
-// It will try to request to an external driver, if one exists. If there's
-// no external driver, or the driver returns a response with NotHandled set,
-// defaultDriver will fall back to the go list driver.
-// The boolean result indicates that an external driver handled the request.
-func defaultDriver(cfg *Config, patterns ...string) (*DriverResponse, bool, error) {
-	const (
-		// windowsArgMax specifies the maximum command line length for
-		// the Windows' CreateProcess function.
-		windowsArgMax = 32767
-		// maxEnvSize is a very rough estimation of the maximum environment
-		// size of a user.
-		maxEnvSize = 16384
-		// safeArgMax specifies the maximum safe command line length to use
-		// by the underlying driver excl. the environment. We choose the Windows'
-		// ARG_MAX as the starting point because it's one of the lowest ARG_MAX
-		// constants out of the different supported platforms,
-		// e.g., https://www.in-ulm.de/~mascheck/various/argmax/#results.
-		safeArgMax = windowsArgMax - maxEnvSize
-	)
-	chunks, err := splitIntoChunks(patterns, safeArgMax)
-	if err != nil {
-		return nil, false, err
-	}
-
-	if driver := findExternalDriver(cfg); driver != nil {
-		response, err := callDriverOnChunks(driver, cfg, chunks)
-		if err != nil {
-			return nil, false, err
-		} else if !response.NotHandled {
-			return response, true, nil
-		}
-		// not handled: fall through
-	}
-
-	// go list fallback
-
-	// Write overlays once, as there are many calls
-	// to 'go list' (one per chunk plus others too).
-	overlayFile, cleanupOverlay, err := gocommand.WriteOverlays(cfg.Overlay)
-	if err != nil {
-		return nil, false, err
-	}
-	defer cleanupOverlay()
-
-	var runner gocommand.Runner // (shared across many 'go list' calls)
-	driver := func(cfg *Config, patterns []string) (*DriverResponse, error) {
-		return goListDriver(cfg, &runner, overlayFile, patterns)
-	}
-	response, err := callDriverOnChunks(driver, cfg, chunks)
-	if err != nil {
-		return nil, false, err
-	}
-	return response, false, err
-}
-
-// splitIntoChunks chunks the slice so that the total number of characters
-// in a chunk is no longer than argMax.
-func splitIntoChunks(patterns []string, argMax int) ([][]string, error) {
-	if argMax <= 0 {
-		return nil, errors.New("failed to split patterns into chunks, negative safe argMax value")
-	}
-	var chunks [][]string
-	charsInChunk := 0
-	nextChunkStart := 0
-	for i, v := range patterns {
-		vChars := len(v)
-		if vChars > argMax {
-			// a single pattern is longer than the maximum safe ARG_MAX, hardly should happen
-			return nil, errors.New("failed to split patterns into chunks, a pattern is too long")
-		}
-		charsInChunk += vChars + 1 // +1 is for a whitespace between patterns that has to be counted too
-		if charsInChunk > argMax {
-			chunks = append(chunks, patterns[nextChunkStart:i])
-			nextChunkStart = i
-			charsInChunk = vChars
-		}
-	}
-	// add the last chunk
-	if nextChunkStart < len(patterns) {
-		chunks = append(chunks, patterns[nextChunkStart:])
-	}
-	return chunks, nil
-}
-
-func callDriverOnChunks(driver driver, cfg *Config, chunks [][]string) (*DriverResponse, error) {
-	if len(chunks) == 0 {
-		return driver(cfg, nil)
-	}
-	responses := make([]*DriverResponse, len(chunks))
-	errNotHandled := errors.New("driver returned NotHandled")
-	var g errgroup.Group
-	for i, chunk := range chunks {
-		g.Go(func() (err error) {
-			responses[i], err = driver(cfg, chunk)
-			if responses[i] != nil && responses[i].NotHandled {
-				err = errNotHandled
-			}
-			return err
-		})
-	}
-	if err := g.Wait(); err != nil {
-		if errors.Is(err, errNotHandled) {
-			return &DriverResponse{NotHandled: true}, nil
-		}
-		return nil, err
-	}
-	return mergeResponses(responses...), nil
-}
-
-func mergeResponses(responses ...*DriverResponse) *DriverResponse {
-	if len(responses) == 0 {
-		return nil
-	}
-	response := newDeduper()
-	response.dr.NotHandled = false
-	response.dr.Compiler = responses[0].Compiler
-	response.dr.Arch = responses[0].Arch
-	response.dr.GoVersion = responses[0].GoVersion
-	for _, v := range responses {
-		response.addAll(v)
-	}
-	return response.dr
-}
-
-// A Package describes a loaded Go package.
-//
-// It also defines part of the JSON schema of [DriverResponse].
-// See the package documentation for an overview.
-type Package struct {
-	// ID is a unique identifier for a package,
-	// in a syntax provided by the underlying build system.
-	//
-	// Because the syntax varies based on the build system,
-	// clients should treat IDs as opaque and not attempt to
-	// interpret them.
-	ID string
-
-	// Name is the package name as it appears in the package source code.
-	Name string
-
-	// PkgPath is the package path as used by the go/types package.
-	PkgPath string
-
-	// Dir is the directory associated with the package, if it exists.
-	//
-	// For packages listed by the go command, this is the directory containing
-	// the package files.
-	Dir string
-
-	// Errors contains any errors encountered querying the metadata
-	// of the package, or while parsing or type-checking its files.
-	Errors []Error
-
-	// TypeErrors contains the subset of errors produced during type checking.
-	TypeErrors []types.Error
-
-	// GoFiles lists the absolute file paths of the package's Go source files.
-	// It may include files that should not be compiled, for example because
-	// they contain non-matching build tags, are documentary pseudo-files such as
-	// unsafe/unsafe.go or builtin/builtin.go, or are subject to cgo preprocessing.
-	GoFiles []string
-
-	// CompiledGoFiles lists the absolute file paths of the package's source
-	// files that are suitable for type checking.
-	// This may differ from GoFiles if files are processed before compilation.
-	CompiledGoFiles []string
-
-	// OtherFiles lists the absolute file paths of the package's non-Go source files,
-	// including assembly, C, C++, Fortran, Objective-C, SWIG, and so on.
-	OtherFiles []string
-
-	// EmbedFiles lists the absolute file paths of the package's files
-	// embedded with go:embed.
-	EmbedFiles []string
-
-	// EmbedPatterns lists the absolute file patterns of the package's
-	// files embedded with go:embed.
-	EmbedPatterns []string
-
-	// IgnoredFiles lists source files that are not part of the package
-	// using the current build configuration but that might be part of
-	// the package using other build configurations.
-	IgnoredFiles []string
-
-	// ExportFile is the absolute path to a file containing type
-	// information for the package as provided by the build system.
-	ExportFile string
-
-	// Target is the absolute install path of the .a file, for libraries,
-	// and of the executable file, for binaries.
-	Target string
-
-	// Imports maps import paths appearing in the package's Go source files
-	// to corresponding loaded Packages.
-	Imports map[string]*Package
-
-	// Module is the module information for the package if it exists.
-	//
-	// Note: it may be missing for std and cmd; see Go issue #65816.
-	Module *Module
-
-	// -- The following fields are not part of the driver JSON schema. --
-
-	// Types provides type information for the package.
-	// The NeedTypes LoadMode bit sets this field for packages matching the
-	// patterns; type information for dependencies may be missing or incomplete,
-	// unless NeedDeps and NeedImports are also set.
-	//
-	// Each call to [Load] returns a consistent set of type
-	// symbols, as defined by the comment at [types.Identical].
-	// Avoid mixing type information from two or more calls to [Load].
-	Types *types.Package `json:"-"`
-
-	// Fset provides position information for Types, TypesInfo, and Syntax.
-	// It is set only when Types is set.
-	Fset *token.FileSet `json:"-"`
-
-	// IllTyped indicates whether the package or any dependency contains errors.
-	// It is set only when Types is set.
-	IllTyped bool `json:"-"`
-
-	// Syntax is the package's syntax trees, for the files listed in CompiledGoFiles.
-	//
-	// The NeedSyntax LoadMode bit populates this field for packages matching the patterns.
-	// If NeedDeps and NeedImports are also set, this field will also be populated
-	// for dependencies.
-	//
-	// Syntax is kept in the same order as CompiledGoFiles, with the caveat that nils are
-	// removed.  If parsing returned nil, Syntax may be shorter than CompiledGoFiles.
-	Syntax []*ast.File `json:"-"`
-
-	// TypesInfo provides type information about the package's syntax trees.
-	// It is set only when Syntax is set.
-	TypesInfo *types.Info `json:"-"`
-
-	// TypesSizes provides the effective size function for types in TypesInfo.
-	TypesSizes types.Sizes `json:"-"`
-
-	// -- internal --
-
-	// ForTest is the package under test, if any.
-	ForTest string
-
-	// depsErrors is the DepsErrors field from the go list response, if any.
-	depsErrors []*packagesinternal.PackageError
-}
-
-// Module provides module information for a package.
-//
-// It also defines part of the JSON schema of [DriverResponse].
-// See the package documentation for an overview.
-type Module struct {
-	Path      string       // module path
-	Version   string       // module version
-	Replace   *Module      // replaced by this module
-	Time      *time.Time   // time version was created
-	Main      bool         // is this the main module?
-	Indirect  bool         // is this module only an indirect dependency of main module?
-	Dir       string       // directory holding files for this module, if any
-	GoMod     string       // path to go.mod file used when loading this module, if any
-	GoVersion string       // go version used in module
-	Error     *ModuleError // error loading module
-}
-
-// ModuleError holds errors loading a module.
-type ModuleError struct {
-	Err string // the error itself
-}
-
-func init() {
-	packagesinternal.GetDepsErrors = func(p any) []*packagesinternal.PackageError {
-		return p.(*Package).depsErrors
-	}
-	packagesinternal.TypecheckCgo = int(typecheckCgo)
-	packagesinternal.DepsErrors = int(needInternalDepsErrors)
-}
-
-// An Error describes a problem with a package's metadata, syntax, or types.
-type Error struct {
-	Pos  string // "file:line:col" or "file:line" or "" or "-"
-	Msg  string
-	Kind ErrorKind
-}
-
-// ErrorKind describes the source of the error, allowing the user to
-// differentiate between errors generated by the driver, the parser, or the
-// type-checker.
-type ErrorKind int
-
-const (
-	UnknownError ErrorKind = iota
-	ListError
-	ParseError
-	TypeError
-)
-
-func (err Error) Error() string {
-	pos := err.Pos
-	if pos == "" {
-		pos = "-" // like token.Position{}.String()
-	}
-	return pos + ": " + err.Msg
-}
-
-// flatPackage is the JSON form of Package
-// It drops all the type and syntax fields, and transforms the Imports
-//
-// TODO(adonovan): identify this struct with Package, effectively
-// publishing the JSON protocol.
-type flatPackage struct {
-	ID              string
-	Name            string            `json:",omitempty"`
-	PkgPath         string            `json:",omitempty"`
-	Errors          []Error           `json:",omitempty"`
-	GoFiles         []string          `json:",omitempty"`
-	CompiledGoFiles []string          `json:",omitempty"`
-	OtherFiles      []string          `json:",omitempty"`
-	EmbedFiles      []string          `json:",omitempty"`
-	EmbedPatterns   []string          `json:",omitempty"`
-	IgnoredFiles    []string          `json:",omitempty"`
-	ExportFile      string            `json:",omitempty"`
-	Imports         map[string]string `json:",omitempty"`
-}
-
-// MarshalJSON returns the Package in its JSON form.
-// For the most part, the structure fields are written out unmodified, and
-// the type and syntax fields are skipped.
-// The imports are written out as just a map of path to package id.
-// The errors are written using a custom type that tries to preserve the
-// structure of error types we know about.
-//
-// This method exists to enable support for additional build systems.  It is
-// not intended for use by clients of the API and we may change the format.
-func (p *Package) MarshalJSON() ([]byte, error) {
-	flat := &flatPackage{
-		ID:              p.ID,
-		Name:            p.Name,
-		PkgPath:         p.PkgPath,
-		Errors:          p.Errors,
-		GoFiles:         p.GoFiles,
-		CompiledGoFiles: p.CompiledGoFiles,
-		OtherFiles:      p.OtherFiles,
-		EmbedFiles:      p.EmbedFiles,
-		EmbedPatterns:   p.EmbedPatterns,
-		IgnoredFiles:    p.IgnoredFiles,
-		ExportFile:      p.ExportFile,
-	}
-	if len(p.Imports) > 0 {
-		flat.Imports = make(map[string]string, len(p.Imports))
-		for path, ipkg := range p.Imports {
-			flat.Imports[path] = ipkg.ID
-		}
-	}
-	return json.Marshal(flat)
-}
-
-// UnmarshalJSON reads in a Package from its JSON format.
-// See MarshalJSON for details about the format accepted.
-func (p *Package) UnmarshalJSON(b []byte) error {
-	flat := &flatPackage{}
-	if err := json.Unmarshal(b, &flat); err != nil {
-		return err
-	}
-	*p = Package{
-		ID:              flat.ID,
-		Name:            flat.Name,
-		PkgPath:         flat.PkgPath,
-		Errors:          flat.Errors,
-		GoFiles:         flat.GoFiles,
-		CompiledGoFiles: flat.CompiledGoFiles,
-		OtherFiles:      flat.OtherFiles,
-		EmbedFiles:      flat.EmbedFiles,
-		EmbedPatterns:   flat.EmbedPatterns,
-		IgnoredFiles:    flat.IgnoredFiles,
-		ExportFile:      flat.ExportFile,
-	}
-	if len(flat.Imports) > 0 {
-		p.Imports = make(map[string]*Package, len(flat.Imports))
-		for path, id := range flat.Imports {
-			p.Imports[path] = &Package{ID: id}
-		}
-	}
-	return nil
-}
-
-func (p *Package) String() string { return p.ID }
-
-// loaderPackage augments Package with state used during the loading phase
-type loaderPackage struct {
-	*Package
-	importErrors    map[string]error // maps each bad import to its error
-	preds           []*loaderPackage // packages that import this one
-	unfinishedSuccs atomic.Int32     // number of direct imports not yet loaded
-	color           uint8            // for cycle detection
-	needsrc         bool             // load from source (Mode >= LoadTypes)
-	needtypes       bool             // type information is either requested or depended on
-	initial         bool             // package was matched by a pattern
-	goVersion       int              // minor version number of go command on PATH
-}
-
-// loader holds the working state of a single call to load.
-type loader struct {
-	pkgs map[string]*loaderPackage // keyed by Package.ID
-	Config
-	sizes        types.Sizes // non-nil if needed by mode
-	parseCache   map[string]*parseValue
-	parseCacheMu sync.Mutex
-	exportMu     sync.Mutex // enforces mutual exclusion of exportdata operations
-
-	// Config.Mode contains the implied mode (see impliedLoadMode).
-	// Implied mode contains all the fields we need the data for.
-	// In requestedMode there are the actually requested fields.
-	// We'll zero them out before returning packages to the user.
-	// This makes it easier for us to get the conditions where
-	// we need certain modes right.
-	requestedMode LoadMode
-}
-
-type parseValue struct {
-	f     *ast.File
-	err   error
-	ready chan struct{}
-}
-
-func newLoader(cfg *Config) *loader {
-	ld := &loader{
-		parseCache: map[string]*parseValue{},
-	}
-	if cfg != nil {
-		ld.Config = *cfg
-		// If the user has provided a logger, use it.
-		ld.Config.Logf = cfg.Logf
-	}
-	if ld.Config.Logf == nil {
-		// If the GOPACKAGESDEBUG environment variable is set to true,
-		// but the user has not provided a logger, default to log.Printf.
-		if debug {
-			ld.Config.Logf = log.Printf
-		} else {
-			ld.Config.Logf = func(format string, args ...any) {}
-		}
-	}
-	if ld.Config.Mode == 0 {
-		ld.Config.Mode = NeedName | NeedFiles | NeedCompiledGoFiles // Preserve zero behavior of Mode for backwards compatibility.
-	}
-	if ld.Config.Env == nil {
-		ld.Config.Env = os.Environ()
-	}
-	if ld.Context == nil {
-		ld.Context = context.Background()
-	}
-	if ld.Dir == "" {
-		if dir, err := os.Getwd(); err == nil {
-			ld.Dir = dir
-		}
-	}
-
-	// Save the actually requested fields. We'll zero them out before returning packages to the user.
-	ld.requestedMode = ld.Mode
-	ld.Mode = impliedLoadMode(ld.Mode)
-
-	if ld.Mode&(NeedSyntax|NeedTypes|NeedTypesInfo) != 0 {
-		if ld.Fset == nil {
-			ld.Fset = token.NewFileSet()
-		}
-
-		// ParseFile is required even in LoadTypes mode
-		// because we load source if export data is missing.
-		if ld.ParseFile == nil {
-			ld.ParseFile = func(fset *token.FileSet, filename string, src []byte) (*ast.File, error) {
-				// We implicitly promise to keep doing ast.Object resolution. :(
-				const mode = parser.AllErrors | parser.ParseComments
-				return parser.ParseFile(fset, filename, src, mode)
-			}
-		}
-	}
-
-	return ld
-}
-
-// refine connects the supplied packages into a graph and then adds type
-// and syntax information as requested by the LoadMode.
-func (ld *loader) refine(response *DriverResponse) ([]*Package, error) {
-	roots := response.Roots
-	rootMap := make(map[string]int, len(roots))
-	for i, root := range roots {
-		rootMap[root] = i
-	}
-	ld.pkgs = make(map[string]*loaderPackage)
-	// first pass, fixup and build the map and roots
-	var initial = make([]*loaderPackage, len(roots))
-	for _, pkg := range response.Packages {
-		rootIndex := -1
-		if i, found := rootMap[pkg.ID]; found {
-			rootIndex = i
-		}
-
-		// Overlays can invalidate export data.
-		// TODO(matloob): make this check fine-grained based on dependencies on overlaid files
-		exportDataInvalid := len(ld.Overlay) > 0 || pkg.ExportFile == "" && pkg.PkgPath != "unsafe"
-		// This package needs type information if the caller requested types and the package is
-		// either a root, or it's a non-root and the user requested dependencies ...
-		needtypes := (ld.Mode&(NeedTypes|NeedTypesInfo) != 0 && (rootIndex >= 0 || ld.Mode&NeedDeps != 0))
-		// This package needs source if the call requested source (or types info, which implies source)
-		// and the package is either a root, or itas a non- root and the user requested dependencies...
-		needsrc := ((ld.Mode&(NeedSyntax|NeedTypesInfo) != 0 && (rootIndex >= 0 || ld.Mode&NeedDeps != 0)) ||
-			// ... or if we need types and the exportData is invalid. We fall back to (incompletely)
-			// typechecking packages from source if they fail to compile.
-			(ld.Mode&(NeedTypes|NeedTypesInfo) != 0 && exportDataInvalid)) && pkg.PkgPath != "unsafe"
-		lpkg := &loaderPackage{
-			Package:   pkg,
-			needtypes: needtypes,
-			needsrc:   needsrc,
-			goVersion: response.GoVersion,
-		}
-		ld.pkgs[lpkg.ID] = lpkg
-		if rootIndex >= 0 {
-			initial[rootIndex] = lpkg
-			lpkg.initial = true
-		}
-	}
-	for i, root := range roots {
-		if initial[i] == nil {
-			return nil, fmt.Errorf("root package %v is missing", root)
-		}
-	}
-
-	// Materialize the import graph if it is needed (NeedImports),
-	// or if we'll be using loadPackages (Need{Syntax|Types|TypesInfo}).
-	var leaves []*loaderPackage // packages with no unfinished successors
-	if ld.Mode&(NeedImports|NeedSyntax|NeedTypes|NeedTypesInfo) != 0 {
-		const (
-			white = 0 // new
-			grey  = 1 // in progress
-			black = 2 // complete
-		)
-
-		// visit traverses the import graph, depth-first,
-		// and materializes the graph as Packages.Imports.
-		//
-		// Valid imports are saved in the Packages.Import map.
-		// Invalid imports (cycles and missing nodes) are saved in the importErrors map.
-		// Thus, even in the presence of both kinds of errors,
-		// the Import graph remains a DAG.
-		//
-		// visit returns whether the package needs src or has a transitive
-		// dependency on a package that does. These are the only packages
-		// for which we load source code.
-		var stack []*loaderPackage
-		var visit func(from, lpkg *loaderPackage) bool
-		visit = func(from, lpkg *loaderPackage) bool {
-			if lpkg.color == grey {
-				panic("internal error: grey node")
-			}
-			if lpkg.color == white {
-				lpkg.color = grey
-				stack = append(stack, lpkg) // push
-				stubs := lpkg.Imports       // the structure form has only stubs with the ID in the Imports
-				lpkg.Imports = make(map[string]*Package, len(stubs))
-				for importPath, ipkg := range stubs {
-					var importErr error
-					imp := ld.pkgs[ipkg.ID]
-					if imp == nil {
-						// (includes package "C" when DisableCgo)
-						importErr = fmt.Errorf("missing package: %q", ipkg.ID)
-					} else if imp.color == grey {
-						importErr = fmt.Errorf("import cycle: %s", stack)
-					}
-					if importErr != nil {
-						if lpkg.importErrors == nil {
-							lpkg.importErrors = make(map[string]error)
-						}
-						lpkg.importErrors[importPath] = importErr
-						continue
-					}
-
-					if visit(lpkg, imp) {
-						lpkg.needsrc = true
-					}
-					lpkg.Imports[importPath] = imp.Package
-				}
-
-				// -- postorder --
-
-				// Complete type information is required for the
-				// immediate dependencies of each source package.
-				if lpkg.needsrc && ld.Mode&NeedTypes != 0 {
-					for _, ipkg := range lpkg.Imports {
-						ld.pkgs[ipkg.ID].needtypes = true
-					}
-				}
-
-				// NeedTypeSizes causes TypeSizes to be set even
-				// on packages for which types aren't needed.
-				if ld.Mode&NeedTypesSizes != 0 {
-					lpkg.TypesSizes = ld.sizes
-				}
-
-				// Add packages with no imports directly to the queue of leaves.
-				if len(lpkg.Imports) == 0 {
-					leaves = append(leaves, lpkg)
-				}
-
-				stack = stack[:len(stack)-1] // pop
-				lpkg.color = black
-			}
-
-			// Add edge from predecessor.
-			if from != nil {
-				from.unfinishedSuccs.Add(+1) // incref
-				lpkg.preds = append(lpkg.preds, from)
-			}
-
-			return lpkg.needsrc
-		}
-
-		// For each initial package, create its import DAG.
-		for _, lpkg := range initial {
-			visit(nil, lpkg)
-		}
-
-	} else {
-		// !NeedImports: drop the stub (ID-only) import packages
-		// that we are not even going to try to resolve.
-		for _, lpkg := range initial {
-			lpkg.Imports = nil
-		}
-	}
-
-	// Load type data and syntax if needed, starting at
-	// the initial packages (roots of the import DAG).
-	if ld.Mode&(NeedSyntax|NeedTypes|NeedTypesInfo) != 0 {
-
-		// We avoid using g.SetLimit to limit concurrency as
-		// it makes g.Go stop accepting work, which prevents
-		// workers from enqeuing, and thus finishing, and thus
-		// allowing the group to make progress: deadlock.
-		//
-		// Instead we use the ioLimit and cpuLimit semaphores.
-		g, _ := errgroup.WithContext(ld.Context)
-
-		// enqueues adds a package to the type-checking queue.
-		// It must have no unfinished successors.
-		var enqueue func(*loaderPackage)
-		enqueue = func(lpkg *loaderPackage) {
-			g.Go(func() error {
-				// Parse and type-check.
-				ld.loadPackage(lpkg)
-
-				// Notify each waiting predecessor,
-				// and enqueue it when it becomes a leaf.
-				for _, pred := range lpkg.preds {
-					if pred.unfinishedSuccs.Add(-1) == 0 { // decref
-						enqueue(pred)
-					}
-				}
-
-				return nil
-			})
-		}
-
-		// Load leaves first, adding new packages
-		// to the queue as they become leaves.
-		for _, leaf := range leaves {
-			enqueue(leaf)
-		}
-
-		if err := g.Wait(); err != nil {
-			return nil, err // cancelled
-		}
-	}
-
-	// If the context is done, return its error and
-	// throw out [likely] incomplete packages.
-	if err := ld.Context.Err(); err != nil {
-		return nil, err
-	}
-
-	result := make([]*Package, len(initial))
-	for i, lpkg := range initial {
-		result[i] = lpkg.Package
-	}
-	for i := range ld.pkgs {
-		// Clear all unrequested fields,
-		// to catch programs that use more than they request.
-		if ld.requestedMode&NeedName == 0 {
-			ld.pkgs[i].Name = ""
-			ld.pkgs[i].PkgPath = ""
-		}
-		if ld.requestedMode&NeedFiles == 0 {
-			ld.pkgs[i].GoFiles = nil
-			ld.pkgs[i].OtherFiles = nil
-			ld.pkgs[i].IgnoredFiles = nil
-		}
-		if ld.requestedMode&NeedEmbedFiles == 0 {
-			ld.pkgs[i].EmbedFiles = nil
-		}
-		if ld.requestedMode&NeedEmbedPatterns == 0 {
-			ld.pkgs[i].EmbedPatterns = nil
-		}
-		if ld.requestedMode&NeedCompiledGoFiles == 0 {
-			ld.pkgs[i].CompiledGoFiles = nil
-		}
-		if ld.requestedMode&NeedImports == 0 {
-			ld.pkgs[i].Imports = nil
-		}
-		if ld.requestedMode&NeedExportFile == 0 {
-			ld.pkgs[i].ExportFile = ""
-		}
-		if ld.requestedMode&NeedTypes == 0 {
-			ld.pkgs[i].Types = nil
-			ld.pkgs[i].IllTyped = false
-		}
-		if ld.requestedMode&NeedSyntax == 0 {
-			ld.pkgs[i].Syntax = nil
-		}
-		if ld.requestedMode&(NeedSyntax|NeedTypes|NeedTypesInfo) == 0 {
-			ld.pkgs[i].Fset = nil
-		}
-		if ld.requestedMode&NeedTypesInfo == 0 {
-			ld.pkgs[i].TypesInfo = nil
-		}
-		if ld.requestedMode&NeedTypesSizes == 0 {
-			ld.pkgs[i].TypesSizes = nil
-		}
-		if ld.requestedMode&NeedModule == 0 {
-			ld.pkgs[i].Module = nil
-		}
-	}
-
-	return result, nil
-}
-
-// loadPackage loads/parses/typechecks the specified package.
-// It must be called only once per Package,
-// after immediate dependencies are loaded.
-// Precondition: ld.Mode&(NeedSyntax|NeedTypes|NeedTypesInfo) != 0.
-func (ld *loader) loadPackage(lpkg *loaderPackage) {
-	if lpkg.PkgPath == "unsafe" {
-		// Fill in the blanks to avoid surprises.
-		lpkg.Types = types.Unsafe
-		lpkg.Fset = ld.Fset
-		lpkg.Syntax = []*ast.File{}
-		lpkg.TypesInfo = new(types.Info)
-		lpkg.TypesSizes = ld.sizes
-		return
-	}
-
-	// Call NewPackage directly with explicit name.
-	// This avoids skew between golist and go/types when the files'
-	// package declarations are inconsistent.
-	lpkg.Types = types.NewPackage(lpkg.PkgPath, lpkg.Name)
-	lpkg.Fset = ld.Fset
-
-	// Start shutting down if the context is done and do not load
-	// source or export data files.
-	// Packages that import this one will have ld.Context.Err() != nil.
-	// ld.Context.Err() will be returned later by refine.
-	if ld.Context.Err() != nil {
-		return
-	}
-
-	// Subtle: we populate all Types fields with an empty Package
-	// before loading export data so that export data processing
-	// never has to create a types.Package for an indirect dependency,
-	// which would then require that such created packages be explicitly
-	// inserted back into the Import graph as a final step after export data loading.
-	// (Hence this return is after the Types assignment.)
-	// The Diamond test exercises this case.
-	if !lpkg.needtypes && !lpkg.needsrc {
-		return
-	}
-
-	// TODO(adonovan): this condition looks wrong:
-	// I think it should be lpkg.needtypes && !lpg.needsrc,
-	// so that NeedSyntax without NeedTypes can be satisfied by export data.
-	if !lpkg.needsrc {
-		if err := ld.loadFromExportData(lpkg); err != nil {
-			lpkg.Errors = append(lpkg.Errors, Error{
-				Pos:  "-",
-				Msg:  err.Error(),
-				Kind: UnknownError, // e.g. can't find/open/parse export data
-			})
-		}
-		return // not a source package, don't get syntax trees
-	}
-
-	appendError := func(err error) {
-		// Convert various error types into the one true Error.
-		var errs []Error
-		switch err := err.(type) {
-		case Error:
-			// from driver
-			errs = append(errs, err)
-
-		case *os.PathError:
-			// from parser
-			errs = append(errs, Error{
-				Pos:  err.Path + ":1",
-				Msg:  err.Err.Error(),
-				Kind: ParseError,
-			})
-
-		case scanner.ErrorList:
-			// from parser
-			for _, err := range err {
-				errs = append(errs, Error{
-					Pos:  err.Pos.String(),
-					Msg:  err.Msg,
-					Kind: ParseError,
-				})
-			}
-
-		case types.Error:
-			// from type checker
-			lpkg.TypeErrors = append(lpkg.TypeErrors, err)
-			errs = append(errs, Error{
-				Pos:  err.Fset.Position(err.Pos).String(),
-				Msg:  err.Msg,
-				Kind: TypeError,
-			})
-
-		default:
-			// unexpected impoverished error from parser?
-			errs = append(errs, Error{
-				Pos:  "-",
-				Msg:  err.Error(),
-				Kind: UnknownError,
-			})
-
-			// If you see this error message, please file a bug.
-			log.Printf("internal error: error %q (%T) without position", err, err)
-		}
-
-		lpkg.Errors = append(lpkg.Errors, errs...)
-	}
-
-	// If the go command on the PATH is newer than the runtime,
-	// then the go/{scanner,ast,parser,types} packages from the
-	// standard library may be unable to process the files
-	// selected by go list.
-	//
-	// There is currently no way to downgrade the effective
-	// version of the go command (see issue 52078), so we proceed
-	// with the newer go command but, in case of parse or type
-	// errors, we emit an additional diagnostic.
-	//
-	// See:
-	// - golang.org/issue/52078 (flag to set release tags)
-	// - golang.org/issue/50825 (gopls legacy version support)
-	// - golang.org/issue/55883 (go/packages confusing error)
-	//
-	// Should we assert a hard minimum of (currently) go1.16 here?
-	var runtimeVersion int
-	if _, err := fmt.Sscanf(runtime.Version(), "go1.%d", &runtimeVersion); err == nil && runtimeVersion < lpkg.goVersion {
-		defer func() {
-			if len(lpkg.Errors) > 0 {
-				appendError(Error{
-					Pos:  "-",
-					Msg:  fmt.Sprintf("This application uses version go1.%d of the source-processing packages but runs version go1.%d of 'go list'. It may fail to process source files that rely on newer language features. If so, rebuild the application using a newer version of Go.", runtimeVersion, lpkg.goVersion),
-					Kind: UnknownError,
-				})
-			}
-		}()
-	}
-
-	if ld.Config.Mode&NeedTypes != 0 && len(lpkg.CompiledGoFiles) == 0 && lpkg.ExportFile != "" {
-		// The config requested loading sources and types, but sources are missing.
-		// Add an error to the package and fall back to loading from export data.
-		appendError(Error{"-", fmt.Sprintf("sources missing for package %s", lpkg.ID), ParseError})
-		_ = ld.loadFromExportData(lpkg) // ignore any secondary errors
-
-		return // can't get syntax trees for this package
-	}
-
-	files, errs := ld.parseFiles(lpkg.CompiledGoFiles)
-	for _, err := range errs {
-		appendError(err)
-	}
-
-	lpkg.Syntax = files
-	if ld.Config.Mode&(NeedTypes|NeedTypesInfo) == 0 {
-		return
-	}
-
-	// Start shutting down if the context is done and do not type check.
-	// Packages that import this one will have ld.Context.Err() != nil.
-	// ld.Context.Err() will be returned later by refine.
-	if ld.Context.Err() != nil {
-		return
-	}
-
-	// Populate TypesInfo only if needed, as it
-	// causes the type checker to work much harder.
-	if ld.Config.Mode&NeedTypesInfo != 0 {
-		lpkg.TypesInfo = &types.Info{
-			Types:        make(map[ast.Expr]types.TypeAndValue),
-			Defs:         make(map[*ast.Ident]types.Object),
-			Uses:         make(map[*ast.Ident]types.Object),
-			Implicits:    make(map[ast.Node]types.Object),
-			Instances:    make(map[*ast.Ident]types.Instance),
-			Scopes:       make(map[ast.Node]*types.Scope),
-			Selections:   make(map[*ast.SelectorExpr]*types.Selection),
-			FileVersions: make(map[*ast.File]string),
-		}
-	}
-	lpkg.TypesSizes = ld.sizes
-
-	importer := importerFunc(func(path string) (*types.Package, error) {
-		if path == "unsafe" {
-			return types.Unsafe, nil
-		}
-
-		// The imports map is keyed by import path.
-		ipkg := lpkg.Imports[path]
-		if ipkg == nil {
-			if err := lpkg.importErrors[path]; err != nil {
-				return nil, err
-			}
-			// There was skew between the metadata and the
-			// import declarations, likely due to an edit
-			// race, or because the ParseFile feature was
-			// used to supply alternative file contents.
-			return nil, fmt.Errorf("no metadata for %s", path)
-		}
-
-		if ipkg.Types != nil && ipkg.Types.Complete() {
-			return ipkg.Types, nil
-		}
-		log.Fatalf("internal error: package %q without types was imported from %q", path, lpkg)
-		panic("unreachable")
-	})
-
-	// type-check
-	tc := &types.Config{
-		Importer: importer,
-
-		// Type-check bodies of functions only in initial packages.
-		// Example: for import graph A->B->C and initial packages {A,C},
-		// we can ignore function bodies in B.
-		IgnoreFuncBodies: ld.Mode&NeedDeps == 0 && !lpkg.initial,
-
-		Error: appendError,
-		Sizes: ld.sizes, // may be nil
-	}
-	if lpkg.Module != nil && lpkg.Module.GoVersion != "" {
-		tc.GoVersion = "go" + lpkg.Module.GoVersion
-	}
-	if (ld.Mode & typecheckCgo) != 0 {
-		if !typesinternal.SetUsesCgo(tc) {
-			appendError(Error{
-				Msg:  "typecheckCgo requires Go 1.15+",
-				Kind: ListError,
-			})
-			return
-		}
-	}
-
-	// Type-checking is CPU intensive.
-	cpuLimit <- unit{}            // acquire a token
-	defer func() { <-cpuLimit }() // release a token
-
-	typErr := types.NewChecker(tc, ld.Fset, lpkg.Types, lpkg.TypesInfo).Files(lpkg.Syntax)
-	lpkg.importErrors = nil // no longer needed
-
-	// In go/types go1.21 and go1.22, Checker.Files failed fast with a
-	// a "too new" error, without calling tc.Error and without
-	// proceeding to type-check the package (#66525).
-	// We rely on the runtimeVersion error to give the suggested remedy.
-	if typErr != nil && len(lpkg.Errors) == 0 && len(lpkg.Syntax) > 0 {
-		if msg := typErr.Error(); strings.HasPrefix(msg, "package requires newer Go version") {
-			appendError(types.Error{
-				Fset: ld.Fset,
-				Pos:  lpkg.Syntax[0].Package,
-				Msg:  msg,
-			})
-		}
-	}
-
-	// If !Cgo, the type-checker uses FakeImportC mode, so
-	// it doesn't invoke the importer for import "C",
-	// nor report an error for the import,
-	// or for any undefined C.f reference.
-	// We must detect this explicitly and correctly
-	// mark the package as IllTyped (by reporting an error).
-	// TODO(adonovan): if these errors are annoying,
-	// we could just set IllTyped quietly.
-	if tc.FakeImportC {
-	outer:
-		for _, f := range lpkg.Syntax {
-			for _, imp := range f.Imports {
-				if imp.Path.Value == `"C"` {
-					err := types.Error{Fset: ld.Fset, Pos: imp.Pos(), Msg: `import "C" ignored`}
-					appendError(err)
-					break outer
-				}
-			}
-		}
-	}
-
-	// If types.Checker.Files had an error that was unreported,
-	// make sure to report the unknown error so the package is illTyped.
-	if typErr != nil && len(lpkg.Errors) == 0 {
-		appendError(typErr)
-	}
-
-	// Record accumulated errors.
-	illTyped := len(lpkg.Errors) > 0
-	if !illTyped {
-		for _, imp := range lpkg.Imports {
-			if imp.IllTyped {
-				illTyped = true
-				break
-			}
-		}
-	}
-	lpkg.IllTyped = illTyped
-}
-
-// An importFunc is an implementation of the single-method
-// types.Importer interface based on a function value.
-type importerFunc func(path string) (*types.Package, error)
-
-func (f importerFunc) Import(path string) (*types.Package, error) { return f(path) }
-
-// We use a counting semaphore to limit
-// the number of parallel I/O calls or CPU threads per process.
-var (
-	ioLimit  = make(chan unit, 20)
-	cpuLimit = make(chan unit, runtime.GOMAXPROCS(0))
-)
-
-func (ld *loader) parseFile(filename string) (*ast.File, error) {
-	ld.parseCacheMu.Lock()
-	v, ok := ld.parseCache[filename]
-	if ok {
-		// cache hit
-		ld.parseCacheMu.Unlock()
-		<-v.ready
-	} else {
-		// cache miss
-		v = &parseValue{ready: make(chan struct{})}
-		ld.parseCache[filename] = v
-		ld.parseCacheMu.Unlock()
-
-		var src []byte
-		for f, contents := range ld.Config.Overlay {
-			// TODO(adonovan): Inefficient for large overlays.
-			// Do an exact name-based map lookup
-			// (for nonexistent files) followed by a
-			// FileID-based map lookup (for existing ones).
-			if sameFile(f, filename) {
-				src = contents
-				break
-			}
-		}
-		var err error
-		if src == nil {
-			ioLimit <- unit{} // acquire a token
-			src, err = os.ReadFile(filename)
-			<-ioLimit // release a token
-		}
-		if err != nil {
-			v.err = err
-		} else {
-			// Parsing is CPU intensive.
-			cpuLimit <- unit{} // acquire a token
-			v.f, v.err = ld.ParseFile(ld.Fset, filename, src)
-			<-cpuLimit // release a token
-		}
-
-		close(v.ready)
-	}
-	return v.f, v.err
-}
-
-// parseFiles reads and parses the Go source files and returns the ASTs
-// of the ones that could be at least partially parsed, along with a
-// list of I/O and parse errors encountered.
-//
-// Because files are scanned in parallel, the token.Pos
-// positions of the resulting ast.Files are not ordered.
-func (ld *loader) parseFiles(filenames []string) ([]*ast.File, []error) {
-	var (
-		n      = len(filenames)
-		parsed = make([]*ast.File, n)
-		errors = make([]error, n)
-	)
-	var g errgroup.Group
-	for i, filename := range filenames {
-		// This creates goroutines unnecessarily in the
-		// cache-hit case, but that case is uncommon.
-		g.Go(func() error {
-			parsed[i], errors[i] = ld.parseFile(filename)
-			return nil
-		})
-	}
-	g.Wait()
-
-	// Eliminate nils, preserving order.
-	var o int
-	for _, f := range parsed {
-		if f != nil {
-			parsed[o] = f
-			o++
-		}
-	}
-	parsed = parsed[:o]
-
-	o = 0
-	for _, err := range errors {
-		if err != nil {
-			errors[o] = err
-			o++
-		}
-	}
-	errors = errors[:o]
-
-	return parsed, errors
-}
-
-// sameFile returns true if x and y have the same basename and denote
-// the same file.
-func sameFile(x, y string) bool {
-	if x == y {
-		// It could be the case that y doesn't exist.
-		// For instance, it may be an overlay file that
-		// hasn't been written to disk. To handle that case
-		// let x == y through. (We added the exact absolute path
-		// string to the CompiledGoFiles list, so the unwritten
-		// overlay case implies x==y.)
-		return true
-	}
-	if strings.EqualFold(filepath.Base(x), filepath.Base(y)) { // (optimisation)
-		if xi, err := os.Stat(x); err == nil {
-			if yi, err := os.Stat(y); err == nil {
-				return os.SameFile(xi, yi)
-			}
-		}
-	}
-	return false
-}
-
-// loadFromExportData ensures that type information is present for the specified
-// package, loading it from an export data file on the first request.
-// On success it sets lpkg.Types to a new Package.
-func (ld *loader) loadFromExportData(lpkg *loaderPackage) error {
-	if lpkg.PkgPath == "" {
-		log.Fatalf("internal error: Package %s has no PkgPath", lpkg)
-	}
-
-	// Because gcexportdata.Read has the potential to create or
-	// modify the types.Package for each node in the transitive
-	// closure of dependencies of lpkg, all exportdata operations
-	// must be sequential. (Finer-grained locking would require
-	// changes to the gcexportdata API.)
-	//
-	// The exportMu lock guards the lpkg.Types field and the
-	// types.Package it points to, for each loaderPackage in the graph.
-	//
-	// Not all accesses to Package.Pkg need to be protected by exportMu:
-	// graph ordering ensures that direct dependencies of source
-	// packages are fully loaded before the importer reads their Pkg field.
-	ld.exportMu.Lock()
-	defer ld.exportMu.Unlock()
-
-	if tpkg := lpkg.Types; tpkg != nil && tpkg.Complete() {
-		return nil // cache hit
-	}
-
-	lpkg.IllTyped = true // fail safe
-
-	if lpkg.ExportFile == "" {
-		// Errors while building export data will have been printed to stderr.
-		return fmt.Errorf("no export data file")
-	}
-	f, err := os.Open(lpkg.ExportFile)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	// Read gc export data.
-	//
-	// We don't currently support gccgo export data because all
-	// underlying workspaces use the gc toolchain. (Even build
-	// systems that support gccgo don't use it for workspace
-	// queries.)
-	r, err := gcexportdata.NewReader(f)
-	if err != nil {
-		return fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
-	}
-
-	// Build the view.
-	//
-	// The gcexportdata machinery has no concept of package ID.
-	// It identifies packages by their PkgPath, which although not
-	// globally unique is unique within the scope of one invocation
-	// of the linker, type-checker, or gcexportdata.
-	//
-	// So, we must build a PkgPath-keyed view of the global
-	// (conceptually ID-keyed) cache of packages and pass it to
-	// gcexportdata. The view must contain every existing
-	// package that might possibly be mentioned by the
-	// current package---its transitive closure.
-	//
-	// In loadPackage, we unconditionally create a types.Package for
-	// each dependency so that export data loading does not
-	// create new ones.
-	//
-	// TODO(adonovan): it would be simpler and more efficient
-	// if the export data machinery invoked a callback to
-	// get-or-create a package instead of a map.
-	//
-	view := make(map[string]*types.Package) // view seen by gcexportdata
-	seen := make(map[*loaderPackage]bool)   // all visited packages
-	var visit func(pkgs map[string]*Package)
-	visit = func(pkgs map[string]*Package) {
-		for _, p := range pkgs {
-			lpkg := ld.pkgs[p.ID]
-			if !seen[lpkg] {
-				seen[lpkg] = true
-				view[lpkg.PkgPath] = lpkg.Types
-				visit(lpkg.Imports)
-			}
-		}
-	}
-	visit(lpkg.Imports)
-
-	viewLen := len(view) + 1 // adding the self package
-	// Parse the export data.
-	// (May modify incomplete packages in view but not create new ones.)
-	tpkg, err := gcexportdata.Read(r, ld.Fset, view, lpkg.PkgPath)
-	if err != nil {
-		return fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
-	}
-	if _, ok := view["go.shape"]; ok {
-		// Account for the pseudopackage "go.shape" that gets
-		// created by generic code.
-		viewLen++
-	}
-	if viewLen != len(view) {
-		log.Panicf("golang.org/x/tools/go/packages: unexpected new packages during load of %s", lpkg.PkgPath)
-	}
-
-	lpkg.Types = tpkg
-	lpkg.IllTyped = false
-	return nil
-}
-
-// impliedLoadMode returns loadMode with its dependencies.
-func impliedLoadMode(loadMode LoadMode) LoadMode {
-	if loadMode&(NeedDeps|NeedTypes|NeedTypesInfo) != 0 {
-		// All these things require knowing the import graph.
-		loadMode |= NeedImports
-	}
-	if loadMode&NeedTypes != 0 {
-		// Types require the GoVersion from Module.
-		loadMode |= NeedModule
-	}
-
-	return loadMode
-}
-
-func usesExportData(cfg *Config) bool {
-	return cfg.Mode&NeedExportFile != 0 || cfg.Mode&NeedTypes != 0 && cfg.Mode&NeedDeps == 0
-}
-
-type unit struct{}
diff --git a/vendor/golang.org/x/tools/go/packages/visit.go b/vendor/golang.org/x/tools/go/packages/visit.go
deleted file mode 100644
index df14ffd..0000000
--- a/vendor/golang.org/x/tools/go/packages/visit.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packages
-
-import (
-	"fmt"
-	"os"
-	"sort"
-)
-
-// Visit visits all the packages in the import graph whose roots are
-// pkgs, calling the optional pre function the first time each package
-// is encountered (preorder), and the optional post function after a
-// package's dependencies have been visited (postorder).
-// The boolean result of pre(pkg) determines whether
-// the imports of package pkg are visited.
-func Visit(pkgs []*Package, pre func(*Package) bool, post func(*Package)) {
-	seen := make(map[*Package]bool)
-	var visit func(*Package)
-	visit = func(pkg *Package) {
-		if !seen[pkg] {
-			seen[pkg] = true
-
-			if pre == nil || pre(pkg) {
-				paths := make([]string, 0, len(pkg.Imports))
-				for path := range pkg.Imports {
-					paths = append(paths, path)
-				}
-				sort.Strings(paths) // Imports is a map, this makes visit stable
-				for _, path := range paths {
-					visit(pkg.Imports[path])
-				}
-			}
-
-			if post != nil {
-				post(pkg)
-			}
-		}
-	}
-	for _, pkg := range pkgs {
-		visit(pkg)
-	}
-}
-
-// PrintErrors prints to os.Stderr the accumulated errors of all
-// packages in the import graph rooted at pkgs, dependencies first.
-// PrintErrors returns the number of errors printed.
-func PrintErrors(pkgs []*Package) int {
-	var n int
-	errModules := make(map[*Module]bool)
-	Visit(pkgs, nil, func(pkg *Package) {
-		for _, err := range pkg.Errors {
-			fmt.Fprintln(os.Stderr, err)
-			n++
-		}
-
-		// Print pkg.Module.Error once if present.
-		mod := pkg.Module
-		if mod != nil && mod.Error != nil && !errModules[mod] {
-			errModules[mod] = true
-			fmt.Fprintln(os.Stderr, mod.Error.Err)
-			n++
-		}
-	})
-	return n
-}
diff --git a/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go b/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
deleted file mode 100644
index d3c2913..0000000
--- a/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
+++ /dev/null
@@ -1,817 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package objectpath defines a naming scheme for types.Objects
-// (that is, named entities in Go programs) relative to their enclosing
-// package.
-//
-// Type-checker objects are canonical, so they are usually identified by
-// their address in memory (a pointer), but a pointer has meaning only
-// within one address space. By contrast, objectpath names allow the
-// identity of an object to be sent from one program to another,
-// establishing a correspondence between types.Object variables that are
-// distinct but logically equivalent.
-//
-// A single object may have multiple paths. In this example,
-//
-//	type A struct{ X int }
-//	type B A
-//
-// the field X has two paths due to its membership of both A and B.
-// The For(obj) function always returns one of these paths, arbitrarily
-// but consistently.
-package objectpath
-
-import (
-	"fmt"
-	"go/types"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/internal/aliases"
-	"golang.org/x/tools/internal/typesinternal"
-)
-
-// TODO(adonovan): think about generic aliases.
-
-// A Path is an opaque name that identifies a types.Object
-// relative to its package. Conceptually, the name consists of a
-// sequence of destructuring operations applied to the package scope
-// to obtain the original object.
-// The name does not include the package itself.
-type Path string
-
-// Encoding
-//
-// An object path is a textual and (with training) human-readable encoding
-// of a sequence of destructuring operators, starting from a types.Package.
-// The sequences represent a path through the package/object/type graph.
-// We classify these operators by their type:
-//
-//	PO package->object	Package.Scope.Lookup
-//	OT  object->type 	Object.Type
-//	TT    type->type 	Type.{Elem,Key,{,{,Recv}Type}Params,Results,Underlying,Rhs} [EKPRUTrCa]
-//	TO   type->object	Type.{At,Field,Method,Obj} [AFMO]
-//
-// All valid paths start with a package and end at an object
-// and thus may be defined by the regular language:
-//
-//	objectpath = PO (OT TT* TO)*
-//
-// The concrete encoding follows directly:
-//   - The only PO operator is Package.Scope.Lookup, which requires an identifier.
-//   - The only OT operator is Object.Type,
-//     which we encode as '.' because dot cannot appear in an identifier.
-//   - The TT operators are encoded as [EKPRUTrCa];
-//     two of these ({,Recv}TypeParams) require an integer operand,
-//     which is encoded as a string of decimal digits.
-//   - The TO operators are encoded as [AFMO];
-//     three of these (At,Field,Method) require an integer operand,
-//     which is encoded as a string of decimal digits.
-//     These indices are stable across different representations
-//     of the same package, even source and export data.
-//     The indices used are implementation specific and may not correspond to
-//     the argument to the go/types function.
-//
-// In the example below,
-//
-//	package p
-//
-//	type T interface {
-//		f() (a string, b struct{ X int })
-//	}
-//
-// field X has the path "T.UM0.RA1.F0",
-// representing the following sequence of operations:
-//
-//	p.Lookup("T")					T
-//	.Type().Underlying().Method(0).			f
-//	.Type().Results().At(1)				b
-//	.Type().Field(0)					X
-//
-// The encoding is not maximally compact---every R or P is
-// followed by an A, for example---but this simplifies the
-// encoder and decoder.
-const (
-	// object->type operators
-	opType = '.' // .Type()		  (Object)
-
-	// type->type operators
-	opElem          = 'E' // .Elem()		(Pointer, Slice, Array, Chan, Map)
-	opKey           = 'K' // .Key()			(Map)
-	opParams        = 'P' // .Params()		(Signature)
-	opResults       = 'R' // .Results()		(Signature)
-	opUnderlying    = 'U' // .Underlying()		(Named)
-	opTypeParam     = 'T' // .TypeParams.At(i)	(Named, Signature)
-	opRecvTypeParam = 'r' // .RecvTypeParams.At(i)	(Signature)
-	opConstraint    = 'C' // .Constraint()		(TypeParam)
-	opRhs           = 'a' // .Rhs()			(Alias)
-
-	// type->object operators
-	opAt     = 'A' // .At(i)	(Tuple)
-	opField  = 'F' // .Field(i)	(Struct)
-	opMethod = 'M' // .Method(i)	(Named or Interface; not Struct: "promoted" names are ignored)
-	opObj    = 'O' // .Obj()	(Named, TypeParam)
-)
-
-// For is equivalent to new(Encoder).For(obj).
-//
-// It may be more efficient to reuse a single Encoder across several calls.
-func For(obj types.Object) (Path, error) {
-	return new(Encoder).For(obj)
-}
-
-// An Encoder amortizes the cost of encoding the paths of multiple objects.
-// The zero value of an Encoder is ready to use.
-type Encoder struct {
-	scopeMemo map[*types.Scope][]types.Object // memoization of scopeObjects
-}
-
-// For returns the path to an object relative to its package,
-// or an error if the object is not accessible from the package's Scope.
-//
-// The For function guarantees to return a path only for the following objects:
-// - package-level types
-// - exported package-level non-types
-// - methods
-// - parameter and result variables
-// - struct fields
-// These objects are sufficient to define the API of their package.
-// The objects described by a package's export data are drawn from this set.
-//
-// The set of objects accessible from a package's Scope depends on
-// whether the package was produced by type-checking syntax, or
-// reading export data; the latter may have a smaller Scope since
-// export data trims objects that are not reachable from an exported
-// declaration. For example, the For function will return a path for
-// an exported method of an unexported type that is not reachable
-// from any public declaration; this path will cause the Object
-// function to fail if called on a package loaded from export data.
-// TODO(adonovan): is this a bug or feature? Should this package
-// compute accessibility in the same way?
-//
-// For does not return a path for predeclared names, imported package
-// names, local names, and unexported package-level names (except
-// types).
-//
-// Example: given this definition,
-//
-//	package p
-//
-//	type T interface {
-//		f() (a string, b struct{ X int })
-//	}
-//
-// For(X) would return a path that denotes the following sequence of operations:
-//
-//	p.Scope().Lookup("T")				(TypeName T)
-//	.Type().Underlying().Method(0).			(method Func f)
-//	.Type().Results().At(1)				(field Var b)
-//	.Type().Field(0)					(field Var X)
-//
-// where p is the package (*types.Package) to which X belongs.
-func (enc *Encoder) For(obj types.Object) (Path, error) {
-	pkg := obj.Pkg()
-
-	// This table lists the cases of interest.
-	//
-	// Object				Action
-	// ------                               ------
-	// nil					reject
-	// builtin				reject
-	// pkgname				reject
-	// label				reject
-	// var
-	//    package-level			accept
-	//    func param/result			accept
-	//    local				reject
-	//    struct field			accept
-	// const
-	//    package-level			accept
-	//    local				reject
-	// func
-	//    package-level			accept
-	//    init functions			reject
-	//    concrete method			accept
-	//    interface method			accept
-	// type
-	//    package-level			accept
-	//    local				reject
-	//
-	// The only accessible package-level objects are members of pkg itself.
-	//
-	// The cases are handled in four steps:
-	//
-	// 1. reject nil and builtin
-	// 2. accept package-level objects
-	// 3. reject obviously invalid objects
-	// 4. search the API for the path to the param/result/field/method.
-
-	// 1. reference to nil or builtin?
-	if pkg == nil {
-		return "", fmt.Errorf("predeclared %s has no path", obj)
-	}
-	scope := pkg.Scope()
-
-	// 2. package-level object?
-	if scope.Lookup(obj.Name()) == obj {
-		// Only exported objects (and non-exported types) have a path.
-		// Non-exported types may be referenced by other objects.
-		if _, ok := obj.(*types.TypeName); !ok && !obj.Exported() {
-			return "", fmt.Errorf("no path for non-exported %v", obj)
-		}
-		return Path(obj.Name()), nil
-	}
-
-	// 3. Not a package-level object.
-	//    Reject obviously non-viable cases.
-	switch obj := obj.(type) {
-	case *types.TypeName:
-		if _, ok := types.Unalias(obj.Type()).(*types.TypeParam); !ok {
-			// With the exception of type parameters, only package-level type names
-			// have a path.
-			return "", fmt.Errorf("no path for %v", obj)
-		}
-	case *types.Const, // Only package-level constants have a path.
-		*types.Label,   // Labels are function-local.
-		*types.PkgName: // PkgNames are file-local.
-		return "", fmt.Errorf("no path for %v", obj)
-
-	case *types.Var:
-		// Could be:
-		// - a field (obj.IsField())
-		// - a func parameter or result
-		// - a local var.
-		// Sadly there is no way to distinguish
-		// a param/result from a local
-		// so we must proceed to the find.
-
-	case *types.Func:
-		// A func, if not package-level, must be a method.
-		if recv := obj.Type().(*types.Signature).Recv(); recv == nil {
-			return "", fmt.Errorf("func is not a method: %v", obj)
-		}
-
-		if path, ok := enc.concreteMethod(obj); ok {
-			// Fast path for concrete methods that avoids looping over scope.
-			return path, nil
-		}
-
-	default:
-		panic(obj)
-	}
-
-	// 4. Search the API for the path to the var (field/param/result) or method.
-
-	// First inspect package-level named types.
-	// In the presence of path aliases, these give
-	// the best paths because non-types may
-	// refer to types, but not the reverse.
-	empty := make([]byte, 0, 48) // initial space
-	objs := enc.scopeObjects(scope)
-	for _, o := range objs {
-		tname, ok := o.(*types.TypeName)
-		if !ok {
-			continue // handle non-types in second pass
-		}
-
-		path := append(empty, o.Name()...)
-		path = append(path, opType)
-
-		T := o.Type()
-		if alias, ok := T.(*types.Alias); ok {
-			if r := findTypeParam(obj, aliases.TypeParams(alias), path, opTypeParam); r != nil {
-				return Path(r), nil
-			}
-			if r := find(obj, aliases.Rhs(alias), append(path, opRhs)); r != nil {
-				return Path(r), nil
-			}
-
-		} else if tname.IsAlias() {
-			// legacy alias
-			if r := find(obj, T, path); r != nil {
-				return Path(r), nil
-			}
-
-		} else if named, ok := T.(*types.Named); ok {
-			// defined (named) type
-			if r := findTypeParam(obj, named.TypeParams(), path, opTypeParam); r != nil {
-				return Path(r), nil
-			}
-			if r := find(obj, named.Underlying(), append(path, opUnderlying)); r != nil {
-				return Path(r), nil
-			}
-		}
-	}
-
-	// Then inspect everything else:
-	// non-types, and declared methods of defined types.
-	for _, o := range objs {
-		path := append(empty, o.Name()...)
-		if _, ok := o.(*types.TypeName); !ok {
-			if o.Exported() {
-				// exported non-type (const, var, func)
-				if r := find(obj, o.Type(), append(path, opType)); r != nil {
-					return Path(r), nil
-				}
-			}
-			continue
-		}
-
-		// Inspect declared methods of defined types.
-		if T, ok := types.Unalias(o.Type()).(*types.Named); ok {
-			path = append(path, opType)
-			// The method index here is always with respect
-			// to the underlying go/types data structures,
-			// which ultimately derives from source order
-			// and must be preserved by export data.
-			for i := 0; i < T.NumMethods(); i++ {
-				m := T.Method(i)
-				path2 := appendOpArg(path, opMethod, i)
-				if m == obj {
-					return Path(path2), nil // found declared method
-				}
-				if r := find(obj, m.Type(), append(path2, opType)); r != nil {
-					return Path(r), nil
-				}
-			}
-		}
-	}
-
-	return "", fmt.Errorf("can't find path for %v in %s", obj, pkg.Path())
-}
-
-func appendOpArg(path []byte, op byte, arg int) []byte {
-	path = append(path, op)
-	path = strconv.AppendInt(path, int64(arg), 10)
-	return path
-}
-
-// concreteMethod returns the path for meth, which must have a non-nil receiver.
-// The second return value indicates success and may be false if the method is
-// an interface method or if it is an instantiated method.
-//
-// This function is just an optimization that avoids the general scope walking
-// approach. You are expected to fall back to the general approach if this
-// function fails.
-func (enc *Encoder) concreteMethod(meth *types.Func) (Path, bool) {
-	// Concrete methods can only be declared on package-scoped named types. For
-	// that reason we can skip the expensive walk over the package scope: the
-	// path will always be package -> named type -> method. We can trivially get
-	// the type name from the receiver, and only have to look over the type's
-	// methods to find the method index.
-	//
-	// Methods on generic types require special consideration, however. Consider
-	// the following package:
-	//
-	// 	L1: type S[T any] struct{}
-	// 	L2: func (recv S[A]) Foo() { recv.Bar() }
-	// 	L3: func (recv S[B]) Bar() { }
-	// 	L4: type Alias = S[int]
-	// 	L5: func _[T any]() { var s S[int]; s.Foo() }
-	//
-	// The receivers of methods on generic types are instantiations. L2 and L3
-	// instantiate S with the type-parameters A and B, which are scoped to the
-	// respective methods. L4 and L5 each instantiate S with int. Each of these
-	// instantiations has its own method set, full of methods (and thus objects)
-	// with receivers whose types are the respective instantiations. In other
-	// words, we have
-	//
-	// S[A].Foo, S[A].Bar
-	// S[B].Foo, S[B].Bar
-	// S[int].Foo, S[int].Bar
-	//
-	// We may thus be trying to produce object paths for any of these objects.
-	//
-	// S[A].Foo and S[B].Bar are the origin methods, and their paths are S.Foo
-	// and S.Bar, which are the paths that this function naturally produces.
-	//
-	// S[A].Bar, S[B].Foo, and both methods on S[int] are instantiations that
-	// don't correspond to the origin methods. For S[int], this is significant.
-	// The most precise object path for S[int].Foo, for example, is Alias.Foo,
-	// not S.Foo. Our function, however, would produce S.Foo, which would
-	// resolve to a different object.
-	//
-	// For S[A].Bar and S[B].Foo it could be argued that S.Bar and S.Foo are
-	// still the correct paths, since only the origin methods have meaningful
-	// paths. But this is likely only true for trivial cases and has edge cases.
-	// Since this function is only an optimization, we err on the side of giving
-	// up, deferring to the slower but definitely correct algorithm. Most users
-	// of objectpath will only be giving us origin methods, anyway, as referring
-	// to instantiated methods is usually not useful.
-
-	if meth.Origin() != meth {
-		return "", false
-	}
-
-	_, named := typesinternal.ReceiverNamed(meth.Type().(*types.Signature).Recv())
-	if named == nil {
-		return "", false
-	}
-
-	if types.IsInterface(named) {
-		// Named interfaces don't have to be package-scoped
-		//
-		// TODO(dominikh): opt: if scope.Lookup(name) == named, then we can apply this optimization to interface
-		// methods, too, I think.
-		return "", false
-	}
-
-	// Preallocate space for the name, opType, opMethod, and some digits.
-	name := named.Obj().Name()
-	path := make([]byte, 0, len(name)+8)
-	path = append(path, name...)
-	path = append(path, opType)
-
-	// Method indices are w.r.t. the go/types data structures,
-	// ultimately deriving from source order,
-	// which is preserved by export data.
-	for i := 0; i < named.NumMethods(); i++ {
-		if named.Method(i) == meth {
-			path = appendOpArg(path, opMethod, i)
-			return Path(path), true
-		}
-	}
-
-	// Due to golang/go#59944, go/types fails to associate the receiver with
-	// certain methods on cgo types.
-	//
-	// TODO(rfindley): replace this panic once golang/go#59944 is fixed in all Go
-	// versions gopls supports.
-	return "", false
-	// panic(fmt.Sprintf("couldn't find method %s on type %s; methods: %#v", meth, named, enc.namedMethods(named)))
-}
-
-// find finds obj within type T, returning the path to it, or nil if not found.
-//
-// The seen map is used to short circuit cycles through type parameters. If
-// nil, it will be allocated as necessary.
-//
-// The seenMethods map is used internally to short circuit cycles through
-// interface methods, such as occur in the following example:
-//
-//	type I interface { f() interface{I} }
-//
-// See golang/go#68046 for details.
-func find(obj types.Object, T types.Type, path []byte) []byte {
-	return (&finder{obj: obj}).find(T, path)
-}
-
-// finder closes over search state for a call to find.
-type finder struct {
-	obj             types.Object             // the sought object
-	seenTParamNames map[*types.TypeName]bool // for cycle breaking through type parameters
-	seenMethods     map[*types.Func]bool     // for cycle breaking through recursive interfaces
-}
-
-func (f *finder) find(T types.Type, path []byte) []byte {
-	switch T := T.(type) {
-	case *types.Alias:
-		return f.find(types.Unalias(T), path)
-	case *types.Basic, *types.Named:
-		// Named types belonging to pkg were handled already,
-		// so T must belong to another package. No path.
-		return nil
-	case *types.Pointer:
-		return f.find(T.Elem(), append(path, opElem))
-	case *types.Slice:
-		return f.find(T.Elem(), append(path, opElem))
-	case *types.Array:
-		return f.find(T.Elem(), append(path, opElem))
-	case *types.Chan:
-		return f.find(T.Elem(), append(path, opElem))
-	case *types.Map:
-		if r := f.find(T.Key(), append(path, opKey)); r != nil {
-			return r
-		}
-		return f.find(T.Elem(), append(path, opElem))
-	case *types.Signature:
-		if r := f.findTypeParam(T.RecvTypeParams(), path, opRecvTypeParam); r != nil {
-			return r
-		}
-		if r := f.findTypeParam(T.TypeParams(), path, opTypeParam); r != nil {
-			return r
-		}
-		if r := f.find(T.Params(), append(path, opParams)); r != nil {
-			return r
-		}
-		return f.find(T.Results(), append(path, opResults))
-	case *types.Struct:
-		for i := 0; i < T.NumFields(); i++ {
-			fld := T.Field(i)
-			path2 := appendOpArg(path, opField, i)
-			if fld == f.obj {
-				return path2 // found field var
-			}
-			if r := f.find(fld.Type(), append(path2, opType)); r != nil {
-				return r
-			}
-		}
-		return nil
-	case *types.Tuple:
-		for i := 0; i < T.Len(); i++ {
-			v := T.At(i)
-			path2 := appendOpArg(path, opAt, i)
-			if v == f.obj {
-				return path2 // found param/result var
-			}
-			if r := f.find(v.Type(), append(path2, opType)); r != nil {
-				return r
-			}
-		}
-		return nil
-	case *types.Interface:
-		for i := 0; i < T.NumMethods(); i++ {
-			m := T.Method(i)
-			if f.seenMethods[m] {
-				return nil
-			}
-			path2 := appendOpArg(path, opMethod, i)
-			if m == f.obj {
-				return path2 // found interface method
-			}
-			if f.seenMethods == nil {
-				f.seenMethods = make(map[*types.Func]bool)
-			}
-			f.seenMethods[m] = true
-			if r := f.find(m.Type(), append(path2, opType)); r != nil {
-				return r
-			}
-		}
-		return nil
-	case *types.TypeParam:
-		name := T.Obj()
-		if f.seenTParamNames[name] {
-			return nil
-		}
-		if name == f.obj {
-			return append(path, opObj)
-		}
-		if f.seenTParamNames == nil {
-			f.seenTParamNames = make(map[*types.TypeName]bool)
-		}
-		f.seenTParamNames[name] = true
-		if r := f.find(T.Constraint(), append(path, opConstraint)); r != nil {
-			return r
-		}
-		return nil
-	}
-	panic(T)
-}
-
-func findTypeParam(obj types.Object, list *types.TypeParamList, path []byte, op byte) []byte {
-	return (&finder{obj: obj}).findTypeParam(list, path, op)
-}
-
-func (f *finder) findTypeParam(list *types.TypeParamList, path []byte, op byte) []byte {
-	for i := 0; i < list.Len(); i++ {
-		tparam := list.At(i)
-		path2 := appendOpArg(path, op, i)
-		if r := f.find(tparam, path2); r != nil {
-			return r
-		}
-	}
-	return nil
-}
-
-// Object returns the object denoted by path p within the package pkg.
-func Object(pkg *types.Package, p Path) (types.Object, error) {
-	pathstr := string(p)
-	if pathstr == "" {
-		return nil, fmt.Errorf("empty path")
-	}
-
-	var pkgobj, suffix string
-	if dot := strings.IndexByte(pathstr, opType); dot < 0 {
-		pkgobj = pathstr
-	} else {
-		pkgobj = pathstr[:dot]
-		suffix = pathstr[dot:] // suffix starts with "."
-	}
-
-	obj := pkg.Scope().Lookup(pkgobj)
-	if obj == nil {
-		return nil, fmt.Errorf("package %s does not contain %q", pkg.Path(), pkgobj)
-	}
-
-	// abstraction of *types.{Pointer,Slice,Array,Chan,Map}
-	type hasElem interface {
-		Elem() types.Type
-	}
-	// abstraction of *types.{Named,Signature}
-	type hasTypeParams interface {
-		TypeParams() *types.TypeParamList
-	}
-	// abstraction of *types.{Alias,Named,TypeParam}
-	type hasObj interface {
-		Obj() *types.TypeName
-	}
-
-	// The loop state is the pair (t, obj),
-	// exactly one of which is non-nil, initially obj.
-	// All suffixes start with '.' (the only object->type operation),
-	// followed by optional type->type operations,
-	// then a type->object operation.
-	// The cycle then repeats.
-	var t types.Type
-	for suffix != "" {
-		code := suffix[0]
-		suffix = suffix[1:]
-
-		// Codes [AFMTr] have an integer operand.
-		var index int
-		switch code {
-		case opAt, opField, opMethod, opTypeParam, opRecvTypeParam:
-			rest := strings.TrimLeft(suffix, "0123456789")
-			numerals := suffix[:len(suffix)-len(rest)]
-			suffix = rest
-			i, err := strconv.Atoi(numerals)
-			if err != nil {
-				return nil, fmt.Errorf("invalid path: bad numeric operand %q for code %q", numerals, code)
-			}
-			index = int(i)
-		case opObj:
-			// no operand
-		default:
-			// The suffix must end with a type->object operation.
-			if suffix == "" {
-				return nil, fmt.Errorf("invalid path: ends with %q, want [AFMO]", code)
-			}
-		}
-
-		if code == opType {
-			if t != nil {
-				return nil, fmt.Errorf("invalid path: unexpected %q in type context", opType)
-			}
-			t = obj.Type()
-			obj = nil
-			continue
-		}
-
-		if t == nil {
-			return nil, fmt.Errorf("invalid path: code %q in object context", code)
-		}
-
-		// Inv: t != nil, obj == nil
-
-		t = types.Unalias(t)
-		switch code {
-		case opElem:
-			hasElem, ok := t.(hasElem) // Pointer, Slice, Array, Chan, Map
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want pointer, slice, array, chan or map)", code, t, t)
-			}
-			t = hasElem.Elem()
-
-		case opKey:
-			mapType, ok := t.(*types.Map)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want map)", code, t, t)
-			}
-			t = mapType.Key()
-
-		case opParams:
-			sig, ok := t.(*types.Signature)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want signature)", code, t, t)
-			}
-			t = sig.Params()
-
-		case opResults:
-			sig, ok := t.(*types.Signature)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want signature)", code, t, t)
-			}
-			t = sig.Results()
-
-		case opUnderlying:
-			named, ok := t.(*types.Named)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want named)", code, t, t)
-			}
-			t = named.Underlying()
-
-		case opRhs:
-			if alias, ok := t.(*types.Alias); ok {
-				t = aliases.Rhs(alias)
-			} else if false && aliases.Enabled() {
-				// The Enabled check is too expensive, so for now we
-				// simply assume that aliases are not enabled.
-				// TODO(adonovan): replace with "if true {" when go1.24 is assured.
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want alias)", code, t, t)
-			}
-
-		case opTypeParam:
-			hasTypeParams, ok := t.(hasTypeParams) // Named, Signature
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want named or signature)", code, t, t)
-			}
-			tparams := hasTypeParams.TypeParams()
-			if n := tparams.Len(); index >= n {
-				return nil, fmt.Errorf("tuple index %d out of range [0-%d)", index, n)
-			}
-			t = tparams.At(index)
-
-		case opRecvTypeParam:
-			sig, ok := t.(*types.Signature) // Signature
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want signature)", code, t, t)
-			}
-			rtparams := sig.RecvTypeParams()
-			if n := rtparams.Len(); index >= n {
-				return nil, fmt.Errorf("tuple index %d out of range [0-%d)", index, n)
-			}
-			t = rtparams.At(index)
-
-		case opConstraint:
-			tparam, ok := t.(*types.TypeParam)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want type parameter)", code, t, t)
-			}
-			t = tparam.Constraint()
-
-		case opAt:
-			tuple, ok := t.(*types.Tuple)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want tuple)", code, t, t)
-			}
-			if n := tuple.Len(); index >= n {
-				return nil, fmt.Errorf("tuple index %d out of range [0-%d)", index, n)
-			}
-			obj = tuple.At(index)
-			t = nil
-
-		case opField:
-			structType, ok := t.(*types.Struct)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want struct)", code, t, t)
-			}
-			if n := structType.NumFields(); index >= n {
-				return nil, fmt.Errorf("field index %d out of range [0-%d)", index, n)
-			}
-			obj = structType.Field(index)
-			t = nil
-
-		case opMethod:
-			switch t := t.(type) {
-			case *types.Interface:
-				if index >= t.NumMethods() {
-					return nil, fmt.Errorf("method index %d out of range [0-%d)", index, t.NumMethods())
-				}
-				obj = t.Method(index) // Id-ordered
-
-			case *types.Named:
-				if index >= t.NumMethods() {
-					return nil, fmt.Errorf("method index %d out of range [0-%d)", index, t.NumMethods())
-				}
-				obj = t.Method(index)
-
-			default:
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want interface or named)", code, t, t)
-			}
-			t = nil
-
-		case opObj:
-			hasObj, ok := t.(hasObj)
-			if !ok {
-				return nil, fmt.Errorf("cannot apply %q to %s (got %T, want named or type param)", code, t, t)
-			}
-			obj = hasObj.Obj()
-			t = nil
-
-		default:
-			return nil, fmt.Errorf("invalid path: unknown code %q", code)
-		}
-	}
-
-	if obj == nil {
-		panic(p) // path does not end in an object-valued operator
-	}
-
-	if obj.Pkg() != pkg {
-		return nil, fmt.Errorf("path denotes %s, which belongs to a different package", obj)
-	}
-
-	return obj, nil // success
-}
-
-// scopeObjects is a memoization of scope objects.
-// Callers must not modify the result.
-func (enc *Encoder) scopeObjects(scope *types.Scope) []types.Object {
-	m := enc.scopeMemo
-	if m == nil {
-		m = make(map[*types.Scope][]types.Object)
-		enc.scopeMemo = m
-	}
-	objs, ok := m[scope]
-	if !ok {
-		names := scope.Names() // allocates and sorts
-		objs = make([]types.Object, len(names))
-		for i, name := range names {
-			objs[i] = scope.Lookup(name)
-		}
-		m[scope] = objs
-	}
-	return objs
-}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/callee.go b/vendor/golang.org/x/tools/go/types/typeutil/callee.go
deleted file mode 100644
index 5f10f56..0000000
--- a/vendor/golang.org/x/tools/go/types/typeutil/callee.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil
-
-import (
-	"go/ast"
-	"go/types"
-	_ "unsafe" // for linkname
-)
-
-// Callee returns the named target of a function call, if any:
-// a function, method, builtin, or variable.
-//
-// Functions and methods may potentially have type parameters.
-//
-// Note: for calls of instantiated functions and methods, Callee returns
-// the corresponding generic function or method on the generic type.
-func Callee(info *types.Info, call *ast.CallExpr) types.Object {
-	obj := info.Uses[usedIdent(info, call.Fun)]
-	if obj == nil {
-		return nil
-	}
-	if _, ok := obj.(*types.TypeName); ok {
-		return nil
-	}
-	return obj
-}
-
-// StaticCallee returns the target (function or method) of a static function
-// call, if any. It returns nil for calls to builtins.
-//
-// Note: for calls of instantiated functions and methods, StaticCallee returns
-// the corresponding generic function or method on the generic type.
-func StaticCallee(info *types.Info, call *ast.CallExpr) *types.Func {
-	obj := info.Uses[usedIdent(info, call.Fun)]
-	fn, _ := obj.(*types.Func)
-	if fn == nil || interfaceMethod(fn) {
-		return nil
-	}
-	return fn
-}
-
-// usedIdent is the implementation of [internal/typesinternal.UsedIdent].
-// It returns the identifier associated with e.
-// See typesinternal.UsedIdent for a fuller description.
-// This function should live in typesinternal, but cannot because it would
-// create an import cycle.
-//
-//go:linkname usedIdent golang.org/x/tools/go/types/typeutil.usedIdent
-func usedIdent(info *types.Info, e ast.Expr) *ast.Ident {
-	if info.Types == nil || info.Uses == nil {
-		panic("one of info.Types or info.Uses is nil; both must be populated")
-	}
-	// Look through type instantiation if necessary.
-	switch d := ast.Unparen(e).(type) {
-	case *ast.IndexExpr:
-		if info.Types[d.Index].IsType() {
-			e = d.X
-		}
-	case *ast.IndexListExpr:
-		e = d.X
-	}
-
-	switch e := ast.Unparen(e).(type) {
-	// info.Uses always has the object we want, even for selector expressions.
-	// We don't need info.Selections.
-	// See go/types/recording.go:recordSelection.
-	case *ast.Ident:
-		return e
-	case *ast.SelectorExpr:
-		return e.Sel
-	}
-	return nil
-}
-
-// interfaceMethod reports whether its argument is a method of an interface.
-// This function should live in typesinternal, but cannot because it would create an import cycle.
-//
-//go:linkname interfaceMethod golang.org/x/tools/go/types/typeutil.interfaceMethod
-func interfaceMethod(f *types.Func) bool {
-	recv := f.Signature().Recv()
-	return recv != nil && types.IsInterface(recv.Type())
-}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/imports.go b/vendor/golang.org/x/tools/go/types/typeutil/imports.go
deleted file mode 100644
index b81ce0c..0000000
--- a/vendor/golang.org/x/tools/go/types/typeutil/imports.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil
-
-import "go/types"
-
-// Dependencies returns all dependencies of the specified packages.
-//
-// Dependent packages appear in topological order: if package P imports
-// package Q, Q appears earlier than P in the result.
-// The algorithm follows import statements in the order they
-// appear in the source code, so the result is a total order.
-func Dependencies(pkgs ...*types.Package) []*types.Package {
-	var result []*types.Package
-	seen := make(map[*types.Package]bool)
-	var visit func(pkgs []*types.Package)
-	visit = func(pkgs []*types.Package) {
-		for _, p := range pkgs {
-			if !seen[p] {
-				seen[p] = true
-				visit(p.Imports())
-				result = append(result, p)
-			}
-		}
-	}
-	visit(pkgs)
-	return result
-}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/map.go b/vendor/golang.org/x/tools/go/types/typeutil/map.go
deleted file mode 100644
index b6d542c..0000000
--- a/vendor/golang.org/x/tools/go/types/typeutil/map.go
+++ /dev/null
@@ -1,475 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package typeutil defines various utilities for types, such as [Map],
-// a hash table that maps [types.Type] to any value.
-package typeutil
-
-import (
-	"bytes"
-	"fmt"
-	"go/types"
-	"hash/maphash"
-	"unsafe"
-
-	"golang.org/x/tools/internal/typeparams"
-)
-
-// Map is a hash-table-based mapping from types (types.Type) to
-// arbitrary values.  The concrete types that implement
-// the Type interface are pointers.  Since they are not canonicalized,
-// == cannot be used to check for equivalence, and thus we cannot
-// simply use a Go map.
-//
-// Just as with map[K]V, a nil *Map is a valid empty map.
-//
-// Read-only map operations ([Map.At], [Map.Len], and so on) may
-// safely be called concurrently.
-//
-// TODO(adonovan): deprecate in favor of https://go.dev/issues/69420
-// and 69559, if the latter proposals for a generic hash-map type and
-// a types.Hash function are accepted.
-type Map struct {
-	table  map[uint32][]entry // maps hash to bucket; entry.key==nil means unused
-	length int                // number of map entries
-}
-
-// entry is an entry (key/value association) in a hash bucket.
-type entry struct {
-	key   types.Type
-	value any
-}
-
-// SetHasher has no effect.
-//
-// It is a relic of an optimization that is no longer profitable. Do
-// not use [Hasher], [MakeHasher], or [SetHasher] in new code.
-func (m *Map) SetHasher(Hasher) {}
-
-// Delete removes the entry with the given key, if any.
-// It returns true if the entry was found.
-func (m *Map) Delete(key types.Type) bool {
-	if m != nil && m.table != nil {
-		hash := hash(key)
-		bucket := m.table[hash]
-		for i, e := range bucket {
-			if e.key != nil && types.Identical(key, e.key) {
-				// We can't compact the bucket as it
-				// would disturb iterators.
-				bucket[i] = entry{}
-				m.length--
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// At returns the map entry for the given key.
-// The result is nil if the entry is not present.
-func (m *Map) At(key types.Type) any {
-	if m != nil && m.table != nil {
-		for _, e := range m.table[hash(key)] {
-			if e.key != nil && types.Identical(key, e.key) {
-				return e.value
-			}
-		}
-	}
-	return nil
-}
-
-// Set sets the map entry for key to val,
-// and returns the previous entry, if any.
-func (m *Map) Set(key types.Type, value any) (prev any) {
-	if m.table != nil {
-		hash := hash(key)
-		bucket := m.table[hash]
-		var hole *entry
-		for i, e := range bucket {
-			if e.key == nil {
-				hole = &bucket[i]
-			} else if types.Identical(key, e.key) {
-				prev = e.value
-				bucket[i].value = value
-				return
-			}
-		}
-
-		if hole != nil {
-			*hole = entry{key, value} // overwrite deleted entry
-		} else {
-			m.table[hash] = append(bucket, entry{key, value})
-		}
-	} else {
-		hash := hash(key)
-		m.table = map[uint32][]entry{hash: {entry{key, value}}}
-	}
-
-	m.length++
-	return
-}
-
-// Len returns the number of map entries.
-func (m *Map) Len() int {
-	if m != nil {
-		return m.length
-	}
-	return 0
-}
-
-// Iterate calls function f on each entry in the map in unspecified order.
-//
-// If f should mutate the map, Iterate provides the same guarantees as
-// Go maps: if f deletes a map entry that Iterate has not yet reached,
-// f will not be invoked for it, but if f inserts a map entry that
-// Iterate has not yet reached, whether or not f will be invoked for
-// it is unspecified.
-func (m *Map) Iterate(f func(key types.Type, value any)) {
-	if m != nil {
-		for _, bucket := range m.table {
-			for _, e := range bucket {
-				if e.key != nil {
-					f(e.key, e.value)
-				}
-			}
-		}
-	}
-}
-
-// Keys returns a new slice containing the set of map keys.
-// The order is unspecified.
-func (m *Map) Keys() []types.Type {
-	keys := make([]types.Type, 0, m.Len())
-	m.Iterate(func(key types.Type, _ any) {
-		keys = append(keys, key)
-	})
-	return keys
-}
-
-func (m *Map) toString(values bool) string {
-	if m == nil {
-		return "{}"
-	}
-	var buf bytes.Buffer
-	fmt.Fprint(&buf, "{")
-	sep := ""
-	m.Iterate(func(key types.Type, value any) {
-		fmt.Fprint(&buf, sep)
-		sep = ", "
-		fmt.Fprint(&buf, key)
-		if values {
-			fmt.Fprintf(&buf, ": %q", value)
-		}
-	})
-	fmt.Fprint(&buf, "}")
-	return buf.String()
-}
-
-// String returns a string representation of the map's entries.
-// Values are printed using fmt.Sprintf("%v", v).
-// Order is unspecified.
-func (m *Map) String() string {
-	return m.toString(true)
-}
-
-// KeysString returns a string representation of the map's key set.
-// Order is unspecified.
-func (m *Map) KeysString() string {
-	return m.toString(false)
-}
-
-// -- Hasher --
-
-// hash returns the hash of type t.
-// TODO(adonovan): replace by types.Hash when Go proposal #69420 is accepted.
-func hash(t types.Type) uint32 {
-	return theHasher.Hash(t)
-}
-
-// A Hasher provides a [Hasher.Hash] method to map a type to its hash value.
-// Hashers are stateless, and all are equivalent.
-type Hasher struct{}
-
-var theHasher Hasher
-
-// MakeHasher returns Hasher{}.
-// Hashers are stateless; all are equivalent.
-func MakeHasher() Hasher { return theHasher }
-
-// Hash computes a hash value for the given type t such that
-// Identical(t, t') => Hash(t) == Hash(t').
-func (h Hasher) Hash(t types.Type) uint32 {
-	return hasher{inGenericSig: false}.hash(t)
-}
-
-// hasher holds the state of a single Hash traversal: whether we are
-// inside the signature of a generic function; this is used to
-// optimize [hasher.hashTypeParam].
-type hasher struct{ inGenericSig bool }
-
-// hashString computes the Fowler–Noll–Vo hash of s.
-func hashString(s string) uint32 {
-	var h uint32
-	for i := 0; i < len(s); i++ {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-// hash computes the hash of t.
-func (h hasher) hash(t types.Type) uint32 {
-	// See Identical for rationale.
-	switch t := t.(type) {
-	case *types.Basic:
-		return uint32(t.Kind())
-
-	case *types.Alias:
-		return h.hash(types.Unalias(t))
-
-	case *types.Array:
-		return 9043 + 2*uint32(t.Len()) + 3*h.hash(t.Elem())
-
-	case *types.Slice:
-		return 9049 + 2*h.hash(t.Elem())
-
-	case *types.Struct:
-		var hash uint32 = 9059
-		for i, n := 0, t.NumFields(); i < n; i++ {
-			f := t.Field(i)
-			if f.Anonymous() {
-				hash += 8861
-			}
-			hash += hashString(t.Tag(i))
-			hash += hashString(f.Name()) // (ignore f.Pkg)
-			hash += h.hash(f.Type())
-		}
-		return hash
-
-	case *types.Pointer:
-		return 9067 + 2*h.hash(t.Elem())
-
-	case *types.Signature:
-		var hash uint32 = 9091
-		if t.Variadic() {
-			hash *= 8863
-		}
-
-		tparams := t.TypeParams()
-		if n := tparams.Len(); n > 0 {
-			h.inGenericSig = true // affects constraints, params, and results
-
-			for i := range n {
-				tparam := tparams.At(i)
-				hash += 7 * h.hash(tparam.Constraint())
-			}
-		}
-
-		return hash + 3*h.hashTuple(t.Params()) + 5*h.hashTuple(t.Results())
-
-	case *types.Union:
-		return h.hashUnion(t)
-
-	case *types.Interface:
-		// Interfaces are identical if they have the same set of methods, with
-		// identical names and types, and they have the same set of type
-		// restrictions. See go/types.identical for more details.
-		var hash uint32 = 9103
-
-		// Hash methods.
-		for i, n := 0, t.NumMethods(); i < n; i++ {
-			// Method order is not significant.
-			// Ignore m.Pkg().
-			m := t.Method(i)
-			// Use shallow hash on method signature to
-			// avoid anonymous interface cycles.
-			hash += 3*hashString(m.Name()) + 5*h.shallowHash(m.Type())
-		}
-
-		// Hash type restrictions.
-		terms, err := typeparams.InterfaceTermSet(t)
-		// if err != nil t has invalid type restrictions.
-		if err == nil {
-			hash += h.hashTermSet(terms)
-		}
-
-		return hash
-
-	case *types.Map:
-		return 9109 + 2*h.hash(t.Key()) + 3*h.hash(t.Elem())
-
-	case *types.Chan:
-		return 9127 + 2*uint32(t.Dir()) + 3*h.hash(t.Elem())
-
-	case *types.Named:
-		hash := h.hashTypeName(t.Obj())
-		targs := t.TypeArgs()
-		for i := 0; i < targs.Len(); i++ {
-			targ := targs.At(i)
-			hash += 2 * h.hash(targ)
-		}
-		return hash
-
-	case *types.TypeParam:
-		return h.hashTypeParam(t)
-
-	case *types.Tuple:
-		return h.hashTuple(t)
-	}
-
-	panic(fmt.Sprintf("%T: %v", t, t))
-}
-
-func (h hasher) hashTuple(tuple *types.Tuple) uint32 {
-	// See go/types.identicalTypes for rationale.
-	n := tuple.Len()
-	hash := 9137 + 2*uint32(n)
-	for i := range n {
-		hash += 3 * h.hash(tuple.At(i).Type())
-	}
-	return hash
-}
-
-func (h hasher) hashUnion(t *types.Union) uint32 {
-	// Hash type restrictions.
-	terms, err := typeparams.UnionTermSet(t)
-	// if err != nil t has invalid type restrictions. Fall back on a non-zero
-	// hash.
-	if err != nil {
-		return 9151
-	}
-	return h.hashTermSet(terms)
-}
-
-func (h hasher) hashTermSet(terms []*types.Term) uint32 {
-	hash := 9157 + 2*uint32(len(terms))
-	for _, term := range terms {
-		// term order is not significant.
-		termHash := h.hash(term.Type())
-		if term.Tilde() {
-			termHash *= 9161
-		}
-		hash += 3 * termHash
-	}
-	return hash
-}
-
-// hashTypeParam returns the hash of a type parameter.
-func (h hasher) hashTypeParam(t *types.TypeParam) uint32 {
-	// Within the signature of a generic function, TypeParams are
-	// identical if they have the same index and constraint, so we
-	// hash them based on index.
-	//
-	// When we are outside a generic function, free TypeParams are
-	// identical iff they are the same object, so we can use a
-	// more discriminating hash consistent with object identity.
-	// This optimization saves [Map] about 4% when hashing all the
-	// types.Info.Types in the forward closure of net/http.
-	if !h.inGenericSig {
-		// Optimization: outside a generic function signature,
-		// use a more discrimating hash consistent with object identity.
-		return h.hashTypeName(t.Obj())
-	}
-	return 9173 + 3*uint32(t.Index())
-}
-
-var theSeed = maphash.MakeSeed()
-
-// hashTypeName hashes the pointer of tname.
-func (hasher) hashTypeName(tname *types.TypeName) uint32 {
-	// Since types.Identical uses == to compare TypeNames,
-	// the Hash function uses maphash.Comparable.
-	// TODO(adonovan): or will, when it becomes available in go1.24.
-	// In the meantime we use the pointer's numeric value.
-	//
-	//   hash := maphash.Comparable(theSeed, tname)
-	//
-	// (Another approach would be to hash the name and package
-	// path, and whether or not it is a package-level typename. It
-	// is rare for a package to define multiple local types with
-	// the same name.)
-	ptr := uintptr(unsafe.Pointer(tname))
-	if unsafe.Sizeof(ptr) == 8 {
-		hash := uint64(ptr)
-		return uint32(hash ^ (hash >> 32))
-	} else {
-		return uint32(ptr)
-	}
-}
-
-// shallowHash computes a hash of t without looking at any of its
-// element Types, to avoid potential anonymous cycles in the types of
-// interface methods.
-//
-// When an unnamed non-empty interface type appears anywhere among the
-// arguments or results of an interface method, there is a potential
-// for endless recursion. Consider:
-//
-//	type X interface { m() []*interface { X } }
-//
-// The problem is that the Methods of the interface in m's result type
-// include m itself; there is no mention of the named type X that
-// might help us break the cycle.
-// (See comment in go/types.identical, case *Interface, for more.)
-func (h hasher) shallowHash(t types.Type) uint32 {
-	// t is the type of an interface method (Signature),
-	// its params or results (Tuples), or their immediate
-	// elements (mostly Slice, Pointer, Basic, Named),
-	// so there's no need to optimize anything else.
-	switch t := t.(type) {
-	case *types.Alias:
-		return h.shallowHash(types.Unalias(t))
-
-	case *types.Signature:
-		var hash uint32 = 604171
-		if t.Variadic() {
-			hash *= 971767
-		}
-		// The Signature/Tuple recursion is always finite
-		// and invariably shallow.
-		return hash + 1062599*h.shallowHash(t.Params()) + 1282529*h.shallowHash(t.Results())
-
-	case *types.Tuple:
-		n := t.Len()
-		hash := 9137 + 2*uint32(n)
-		for i := range n {
-			hash += 53471161 * h.shallowHash(t.At(i).Type())
-		}
-		return hash
-
-	case *types.Basic:
-		return 45212177 * uint32(t.Kind())
-
-	case *types.Array:
-		return 1524181 + 2*uint32(t.Len())
-
-	case *types.Slice:
-		return 2690201
-
-	case *types.Struct:
-		return 3326489
-
-	case *types.Pointer:
-		return 4393139
-
-	case *types.Union:
-		return 562448657
-
-	case *types.Interface:
-		return 2124679 // no recursion here
-
-	case *types.Map:
-		return 9109
-
-	case *types.Chan:
-		return 9127
-
-	case *types.Named:
-		return h.hashTypeName(t.Obj())
-
-	case *types.TypeParam:
-		return h.hashTypeParam(t)
-	}
-	panic(fmt.Sprintf("shallowHash: %T: %v", t, t))
-}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/methodsetcache.go b/vendor/golang.org/x/tools/go/types/typeutil/methodsetcache.go
deleted file mode 100644
index f766602..0000000
--- a/vendor/golang.org/x/tools/go/types/typeutil/methodsetcache.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements a cache of method sets.
-
-package typeutil
-
-import (
-	"go/types"
-	"sync"
-)
-
-// A MethodSetCache records the method set of each type T for which
-// MethodSet(T) is called so that repeat queries are fast.
-// The zero value is a ready-to-use cache instance.
-type MethodSetCache struct {
-	mu     sync.Mutex
-	named  map[*types.Named]struct{ value, pointer *types.MethodSet } // method sets for named N and *N
-	others map[types.Type]*types.MethodSet                            // all other types
-}
-
-// MethodSet returns the method set of type T.  It is thread-safe.
-//
-// If cache is nil, this function is equivalent to types.NewMethodSet(T).
-// Utility functions can thus expose an optional *MethodSetCache
-// parameter to clients that care about performance.
-func (cache *MethodSetCache) MethodSet(T types.Type) *types.MethodSet {
-	if cache == nil {
-		return types.NewMethodSet(T)
-	}
-	cache.mu.Lock()
-	defer cache.mu.Unlock()
-
-	switch T := types.Unalias(T).(type) {
-	case *types.Named:
-		return cache.lookupNamed(T).value
-
-	case *types.Pointer:
-		if N, ok := types.Unalias(T.Elem()).(*types.Named); ok {
-			return cache.lookupNamed(N).pointer
-		}
-	}
-
-	// all other types
-	// (The map uses pointer equivalence, not type identity.)
-	mset := cache.others[T]
-	if mset == nil {
-		mset = types.NewMethodSet(T)
-		if cache.others == nil {
-			cache.others = make(map[types.Type]*types.MethodSet)
-		}
-		cache.others[T] = mset
-	}
-	return mset
-}
-
-func (cache *MethodSetCache) lookupNamed(named *types.Named) struct{ value, pointer *types.MethodSet } {
-	if cache.named == nil {
-		cache.named = make(map[*types.Named]struct{ value, pointer *types.MethodSet })
-	}
-	// Avoid recomputing mset(*T) for each distinct Pointer
-	// instance whose underlying type is a named type.
-	msets, ok := cache.named[named]
-	if !ok {
-		msets.value = types.NewMethodSet(named)
-		msets.pointer = types.NewMethodSet(types.NewPointer(named))
-		cache.named[named] = msets
-	}
-	return msets
-}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/ui.go b/vendor/golang.org/x/tools/go/types/typeutil/ui.go
deleted file mode 100644
index 9dda6a2..0000000
--- a/vendor/golang.org/x/tools/go/types/typeutil/ui.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil
-
-// This file defines utilities for user interfaces that display types.
-
-import (
-	"go/types"
-)
-
-// IntuitiveMethodSet returns the intuitive method set of a type T,
-// which is the set of methods you can call on an addressable value of
-// that type.
-//
-// The result always contains MethodSet(T), and is exactly MethodSet(T)
-// for interface types and for pointer-to-concrete types.
-// For all other concrete types T, the result additionally
-// contains each method belonging to *T if there is no identically
-// named method on T itself.
-//
-// This corresponds to user intuition about method sets;
-// this function is intended only for user interfaces.
-//
-// The order of the result is as for types.MethodSet(T).
-func IntuitiveMethodSet(T types.Type, msets *MethodSetCache) []*types.Selection {
-	isPointerToConcrete := func(T types.Type) bool {
-		ptr, ok := types.Unalias(T).(*types.Pointer)
-		return ok && !types.IsInterface(ptr.Elem())
-	}
-
-	var result []*types.Selection
-	mset := msets.MethodSet(T)
-	if types.IsInterface(T) || isPointerToConcrete(T) {
-		for i, n := 0, mset.Len(); i < n; i++ {
-			result = append(result, mset.At(i))
-		}
-	} else {
-		// T is some other concrete type.
-		// Report methods of T and *T, preferring those of T.
-		pmset := msets.MethodSet(types.NewPointer(T))
-		for i, n := 0, pmset.Len(); i < n; i++ {
-			meth := pmset.At(i)
-			if m := mset.Lookup(meth.Obj().Pkg(), meth.Obj().Name()); m != nil {
-				meth = m
-			}
-			result = append(result, meth)
-		}
-
-	}
-	return result
-}
diff --git a/vendor/golang.org/x/tools/internal/aliases/aliases.go b/vendor/golang.org/x/tools/internal/aliases/aliases.go
deleted file mode 100644
index b9425f5..0000000
--- a/vendor/golang.org/x/tools/internal/aliases/aliases.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package aliases
-
-import (
-	"go/token"
-	"go/types"
-)
-
-// Package aliases defines backward compatible shims
-// for the types.Alias type representation added in 1.22.
-// This defines placeholders for x/tools until 1.26.
-
-// NewAlias creates a new TypeName in Package pkg that
-// is an alias for the type rhs.
-//
-// The enabled parameter determines whether the resulting [TypeName]'s
-// type is an [types.Alias]. Its value must be the result of a call to
-// [Enabled], which computes the effective value of
-// GODEBUG=gotypesalias=... by invoking the type checker. The Enabled
-// function is expensive and should be called once per task (e.g.
-// package import), not once per call to NewAlias.
-//
-// Precondition: enabled || len(tparams)==0.
-// If materialized aliases are disabled, there must not be any type parameters.
-func NewAlias(enabled bool, pos token.Pos, pkg *types.Package, name string, rhs types.Type, tparams []*types.TypeParam) *types.TypeName {
-	if enabled {
-		tname := types.NewTypeName(pos, pkg, name, nil)
-		SetTypeParams(types.NewAlias(tname, rhs), tparams)
-		return tname
-	}
-	if len(tparams) > 0 {
-		panic("cannot create an alias with type parameters when gotypesalias is not enabled")
-	}
-	return types.NewTypeName(pos, pkg, name, rhs)
-}
diff --git a/vendor/golang.org/x/tools/internal/aliases/aliases_go122.go b/vendor/golang.org/x/tools/internal/aliases/aliases_go122.go
deleted file mode 100644
index 7716a33..0000000
--- a/vendor/golang.org/x/tools/internal/aliases/aliases_go122.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package aliases
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-)
-
-// Rhs returns the type on the right-hand side of the alias declaration.
-func Rhs(alias *types.Alias) types.Type {
-	if alias, ok := any(alias).(interface{ Rhs() types.Type }); ok {
-		return alias.Rhs() // go1.23+
-	}
-
-	// go1.22's Alias didn't have the Rhs method,
-	// so Unalias is the best we can do.
-	return types.Unalias(alias)
-}
-
-// TypeParams returns the type parameter list of the alias.
-func TypeParams(alias *types.Alias) *types.TypeParamList {
-	if alias, ok := any(alias).(interface{ TypeParams() *types.TypeParamList }); ok {
-		return alias.TypeParams() // go1.23+
-	}
-	return nil
-}
-
-// SetTypeParams sets the type parameters of the alias type.
-func SetTypeParams(alias *types.Alias, tparams []*types.TypeParam) {
-	if alias, ok := any(alias).(interface {
-		SetTypeParams(tparams []*types.TypeParam)
-	}); ok {
-		alias.SetTypeParams(tparams) // go1.23+
-	} else if len(tparams) > 0 {
-		panic("cannot set type parameters of an Alias type in go1.22")
-	}
-}
-
-// TypeArgs returns the type arguments used to instantiate the Alias type.
-func TypeArgs(alias *types.Alias) *types.TypeList {
-	if alias, ok := any(alias).(interface{ TypeArgs() *types.TypeList }); ok {
-		return alias.TypeArgs() // go1.23+
-	}
-	return nil // empty (go1.22)
-}
-
-// Origin returns the generic Alias type of which alias is an instance.
-// If alias is not an instance of a generic alias, Origin returns alias.
-func Origin(alias *types.Alias) *types.Alias {
-	if alias, ok := any(alias).(interface{ Origin() *types.Alias }); ok {
-		return alias.Origin() // go1.23+
-	}
-	return alias // not an instance of a generic alias (go1.22)
-}
-
-// Enabled reports whether [NewAlias] should create [types.Alias] types.
-//
-// This function is expensive! Call it sparingly.
-func Enabled() bool {
-	// The only reliable way to compute the answer is to invoke go/types.
-	// We don't parse the GODEBUG environment variable, because
-	// (a) it's tricky to do so in a manner that is consistent
-	//     with the godebug package; in particular, a simple
-	//     substring check is not good enough. The value is a
-	//     rightmost-wins list of options. But more importantly:
-	// (b) it is impossible to detect changes to the effective
-	//     setting caused by os.Setenv("GODEBUG"), as happens in
-	//     many tests. Therefore any attempt to cache the result
-	//     is just incorrect.
-	fset := token.NewFileSet()
-	f, _ := parser.ParseFile(fset, "a.go", "package p; type A = int", parser.SkipObjectResolution)
-	pkg, _ := new(types.Config).Check("p", fset, []*ast.File{f}, nil)
-	_, enabled := pkg.Scope().Lookup("A").Type().(*types.Alias)
-	return enabled
-}
diff --git a/vendor/golang.org/x/tools/internal/event/core/event.go b/vendor/golang.org/x/tools/internal/event/core/event.go
deleted file mode 100644
index a6cf0e6..0000000
--- a/vendor/golang.org/x/tools/internal/event/core/event.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package core provides support for event based telemetry.
-package core
-
-import (
-	"fmt"
-	"time"
-
-	"golang.org/x/tools/internal/event/label"
-)
-
-// Event holds the information about an event of note that occurred.
-type Event struct {
-	at time.Time
-
-	// As events are often on the stack, storing the first few labels directly
-	// in the event can avoid an allocation at all for the very common cases of
-	// simple events.
-	// The length needs to be large enough to cope with the majority of events
-	// but no so large as to cause undue stack pressure.
-	// A log message with two values will use 3 labels (one for each value and
-	// one for the message itself).
-
-	static  [3]label.Label // inline storage for the first few labels
-	dynamic []label.Label  // dynamically sized storage for remaining labels
-}
-
-// eventLabelMap implements label.Map for a the labels of an Event.
-type eventLabelMap struct {
-	event Event
-}
-
-func (ev Event) At() time.Time { return ev.at }
-
-func (ev Event) Format(f fmt.State, r rune) {
-	if !ev.at.IsZero() {
-		fmt.Fprint(f, ev.at.Format("2006/01/02 15:04:05 "))
-	}
-	for index := 0; ev.Valid(index); index++ {
-		if l := ev.Label(index); l.Valid() {
-			fmt.Fprintf(f, "\n\t%v", l)
-		}
-	}
-}
-
-func (ev Event) Valid(index int) bool {
-	return index >= 0 && index < len(ev.static)+len(ev.dynamic)
-}
-
-func (ev Event) Label(index int) label.Label {
-	if index < len(ev.static) {
-		return ev.static[index]
-	}
-	return ev.dynamic[index-len(ev.static)]
-}
-
-func (ev Event) Find(key label.Key) label.Label {
-	for _, l := range ev.static {
-		if l.Key() == key {
-			return l
-		}
-	}
-	for _, l := range ev.dynamic {
-		if l.Key() == key {
-			return l
-		}
-	}
-	return label.Label{}
-}
-
-func MakeEvent(static [3]label.Label, labels []label.Label) Event {
-	return Event{
-		static:  static,
-		dynamic: labels,
-	}
-}
-
-// CloneEvent event returns a copy of the event with the time adjusted to at.
-func CloneEvent(ev Event, at time.Time) Event {
-	ev.at = at
-	return ev
-}
diff --git a/vendor/golang.org/x/tools/internal/event/core/export.go b/vendor/golang.org/x/tools/internal/event/core/export.go
deleted file mode 100644
index 05f3a9a..0000000
--- a/vendor/golang.org/x/tools/internal/event/core/export.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package core
-
-import (
-	"context"
-	"sync/atomic"
-	"time"
-	"unsafe"
-
-	"golang.org/x/tools/internal/event/label"
-)
-
-// Exporter is a function that handles events.
-// It may return a modified context and event.
-type Exporter func(context.Context, Event, label.Map) context.Context
-
-var (
-	exporter unsafe.Pointer
-)
-
-// SetExporter sets the global exporter function that handles all events.
-// The exporter is called synchronously from the event call site, so it should
-// return quickly so as not to hold up user code.
-func SetExporter(e Exporter) {
-	p := unsafe.Pointer(&e)
-	if e == nil {
-		// &e is always valid, and so p is always valid, but for the early abort
-		// of ProcessEvent to be efficient it needs to make the nil check on the
-		// pointer without having to dereference it, so we make the nil function
-		// also a nil pointer
-		p = nil
-	}
-	atomic.StorePointer(&exporter, p)
-}
-
-// deliver is called to deliver an event to the supplied exporter.
-// it will fill in the time.
-func deliver(ctx context.Context, exporter Exporter, ev Event) context.Context {
-	// add the current time to the event
-	ev.at = time.Now()
-	// hand the event off to the current exporter
-	return exporter(ctx, ev, ev)
-}
-
-// Export is called to deliver an event to the global exporter if set.
-func Export(ctx context.Context, ev Event) context.Context {
-	// get the global exporter and abort early if there is not one
-	exporterPtr := (*Exporter)(atomic.LoadPointer(&exporter))
-	if exporterPtr == nil {
-		return ctx
-	}
-	return deliver(ctx, *exporterPtr, ev)
-}
-
-// ExportPair is called to deliver a start event to the supplied exporter.
-// It also returns a function that will deliver the end event to the same
-// exporter.
-// It will fill in the time.
-func ExportPair(ctx context.Context, begin, end Event) (context.Context, func()) {
-	// get the global exporter and abort early if there is not one
-	exporterPtr := (*Exporter)(atomic.LoadPointer(&exporter))
-	if exporterPtr == nil {
-		return ctx, func() {}
-	}
-	ctx = deliver(ctx, *exporterPtr, begin)
-	return ctx, func() { deliver(ctx, *exporterPtr, end) }
-}
diff --git a/vendor/golang.org/x/tools/internal/event/core/fast.go b/vendor/golang.org/x/tools/internal/event/core/fast.go
deleted file mode 100644
index 06c1d46..0000000
--- a/vendor/golang.org/x/tools/internal/event/core/fast.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package core
-
-import (
-	"context"
-
-	"golang.org/x/tools/internal/event/keys"
-	"golang.org/x/tools/internal/event/label"
-)
-
-// Log1 takes a message and one label delivers a log event to the exporter.
-// It is a customized version of Print that is faster and does no allocation.
-func Log1(ctx context.Context, message string, t1 label.Label) {
-	Export(ctx, MakeEvent([3]label.Label{
-		keys.Msg.Of(message),
-		t1,
-	}, nil))
-}
-
-// Log2 takes a message and two labels and delivers a log event to the exporter.
-// It is a customized version of Print that is faster and does no allocation.
-func Log2(ctx context.Context, message string, t1 label.Label, t2 label.Label) {
-	Export(ctx, MakeEvent([3]label.Label{
-		keys.Msg.Of(message),
-		t1,
-		t2,
-	}, nil))
-}
-
-// Metric1 sends a label event to the exporter with the supplied labels.
-func Metric1(ctx context.Context, t1 label.Label) context.Context {
-	return Export(ctx, MakeEvent([3]label.Label{
-		keys.Metric.New(),
-		t1,
-	}, nil))
-}
-
-// Metric2 sends a label event to the exporter with the supplied labels.
-func Metric2(ctx context.Context, t1, t2 label.Label) context.Context {
-	return Export(ctx, MakeEvent([3]label.Label{
-		keys.Metric.New(),
-		t1,
-		t2,
-	}, nil))
-}
-
-// Start1 sends a span start event with the supplied label list to the exporter.
-// It also returns a function that will end the span, which should normally be
-// deferred.
-func Start1(ctx context.Context, name string, t1 label.Label) (context.Context, func()) {
-	return ExportPair(ctx,
-		MakeEvent([3]label.Label{
-			keys.Start.Of(name),
-			t1,
-		}, nil),
-		MakeEvent([3]label.Label{
-			keys.End.New(),
-		}, nil))
-}
-
-// Start2 sends a span start event with the supplied label list to the exporter.
-// It also returns a function that will end the span, which should normally be
-// deferred.
-func Start2(ctx context.Context, name string, t1, t2 label.Label) (context.Context, func()) {
-	return ExportPair(ctx,
-		MakeEvent([3]label.Label{
-			keys.Start.Of(name),
-			t1,
-			t2,
-		}, nil),
-		MakeEvent([3]label.Label{
-			keys.End.New(),
-		}, nil))
-}
diff --git a/vendor/golang.org/x/tools/internal/event/doc.go b/vendor/golang.org/x/tools/internal/event/doc.go
deleted file mode 100644
index 5dc6e6b..0000000
--- a/vendor/golang.org/x/tools/internal/event/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package event provides a set of packages that cover the main
-// concepts of telemetry in an implementation agnostic way.
-package event
diff --git a/vendor/golang.org/x/tools/internal/event/event.go b/vendor/golang.org/x/tools/internal/event/event.go
deleted file mode 100644
index 4d55e57..0000000
--- a/vendor/golang.org/x/tools/internal/event/event.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package event
-
-import (
-	"context"
-
-	"golang.org/x/tools/internal/event/core"
-	"golang.org/x/tools/internal/event/keys"
-	"golang.org/x/tools/internal/event/label"
-)
-
-// Exporter is a function that handles events.
-// It may return a modified context and event.
-type Exporter func(context.Context, core.Event, label.Map) context.Context
-
-// SetExporter sets the global exporter function that handles all events.
-// The exporter is called synchronously from the event call site, so it should
-// return quickly so as not to hold up user code.
-func SetExporter(e Exporter) {
-	core.SetExporter(core.Exporter(e))
-}
-
-// Log takes a message and a label list and combines them into a single event
-// before delivering them to the exporter.
-func Log(ctx context.Context, message string, labels ...label.Label) {
-	core.Export(ctx, core.MakeEvent([3]label.Label{
-		keys.Msg.Of(message),
-	}, labels))
-}
-
-// IsLog returns true if the event was built by the Log function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsLog(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Msg
-}
-
-// Error takes a message and a label list and combines them into a single event
-// before delivering them to the exporter. It captures the error in the
-// delivered event.
-func Error(ctx context.Context, message string, err error, labels ...label.Label) {
-	core.Export(ctx, core.MakeEvent([3]label.Label{
-		keys.Msg.Of(message),
-		keys.Err.Of(err),
-	}, labels))
-}
-
-// IsError returns true if the event was built by the Error function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsError(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Msg &&
-		ev.Label(1).Key() == keys.Err
-}
-
-// Metric sends a label event to the exporter with the supplied labels.
-func Metric(ctx context.Context, labels ...label.Label) {
-	core.Export(ctx, core.MakeEvent([3]label.Label{
-		keys.Metric.New(),
-	}, labels))
-}
-
-// IsMetric returns true if the event was built by the Metric function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsMetric(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Metric
-}
-
-// Label sends a label event to the exporter with the supplied labels.
-func Label(ctx context.Context, labels ...label.Label) context.Context {
-	return core.Export(ctx, core.MakeEvent([3]label.Label{
-		keys.Label.New(),
-	}, labels))
-}
-
-// IsLabel returns true if the event was built by the Label function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsLabel(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Label
-}
-
-// Start sends a span start event with the supplied label list to the exporter.
-// It also returns a function that will end the span, which should normally be
-// deferred.
-func Start(ctx context.Context, name string, labels ...label.Label) (context.Context, func()) {
-	return core.ExportPair(ctx,
-		core.MakeEvent([3]label.Label{
-			keys.Start.Of(name),
-		}, labels),
-		core.MakeEvent([3]label.Label{
-			keys.End.New(),
-		}, nil))
-}
-
-// IsStart returns true if the event was built by the Start function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsStart(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Start
-}
-
-// IsEnd returns true if the event was built by the End function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsEnd(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.End
-}
-
-// Detach returns a context without an associated span.
-// This allows the creation of spans that are not children of the current span.
-func Detach(ctx context.Context) context.Context {
-	return core.Export(ctx, core.MakeEvent([3]label.Label{
-		keys.Detach.New(),
-	}, nil))
-}
-
-// IsDetach returns true if the event was built by the Detach function.
-// It is intended to be used in exporters to identify the semantics of the
-// event when deciding what to do with it.
-func IsDetach(ev core.Event) bool {
-	return ev.Label(0).Key() == keys.Detach
-}
diff --git a/vendor/golang.org/x/tools/internal/event/keys/keys.go b/vendor/golang.org/x/tools/internal/event/keys/keys.go
deleted file mode 100644
index 4cfa51b..0000000
--- a/vendor/golang.org/x/tools/internal/event/keys/keys.go
+++ /dev/null
@@ -1,564 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package keys
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"strconv"
-
-	"golang.org/x/tools/internal/event/label"
-)
-
-// Value represents a key for untyped values.
-type Value struct {
-	name        string
-	description string
-}
-
-// New creates a new Key for untyped values.
-func New(name, description string) *Value {
-	return &Value{name: name, description: description}
-}
-
-func (k *Value) Name() string        { return k.name }
-func (k *Value) Description() string { return k.description }
-
-func (k *Value) Format(w io.Writer, buf []byte, l label.Label) {
-	fmt.Fprint(w, k.From(l))
-}
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Value) Get(lm label.Map) any {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return nil
-}
-
-// From can be used to get a value from a Label.
-func (k *Value) From(t label.Label) any { return t.UnpackValue() }
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Value) Of(value any) label.Label { return label.OfValue(k, value) }
-
-// Tag represents a key for tagging labels that have no value.
-// These are used when the existence of the label is the entire information it
-// carries, such as marking events to be of a specific kind, or from a specific
-// package.
-type Tag struct {
-	name        string
-	description string
-}
-
-// NewTag creates a new Key for tagging labels.
-func NewTag(name, description string) *Tag {
-	return &Tag{name: name, description: description}
-}
-
-func (k *Tag) Name() string        { return k.name }
-func (k *Tag) Description() string { return k.description }
-
-func (k *Tag) Format(w io.Writer, buf []byte, l label.Label) {}
-
-// New creates a new Label with this key.
-func (k *Tag) New() label.Label { return label.OfValue(k, nil) }
-
-// Int represents a key
-type Int struct {
-	name        string
-	description string
-}
-
-// NewInt creates a new Key for int values.
-func NewInt(name, description string) *Int {
-	return &Int{name: name, description: description}
-}
-
-func (k *Int) Name() string        { return k.name }
-func (k *Int) Description() string { return k.description }
-
-func (k *Int) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendInt(buf, int64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Int) Of(v int) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Int) Get(lm label.Map) int {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Int) From(t label.Label) int { return int(t.Unpack64()) }
-
-// Int8 represents a key
-type Int8 struct {
-	name        string
-	description string
-}
-
-// NewInt8 creates a new Key for int8 values.
-func NewInt8(name, description string) *Int8 {
-	return &Int8{name: name, description: description}
-}
-
-func (k *Int8) Name() string        { return k.name }
-func (k *Int8) Description() string { return k.description }
-
-func (k *Int8) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendInt(buf, int64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Int8) Of(v int8) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Int8) Get(lm label.Map) int8 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Int8) From(t label.Label) int8 { return int8(t.Unpack64()) }
-
-// Int16 represents a key
-type Int16 struct {
-	name        string
-	description string
-}
-
-// NewInt16 creates a new Key for int16 values.
-func NewInt16(name, description string) *Int16 {
-	return &Int16{name: name, description: description}
-}
-
-func (k *Int16) Name() string        { return k.name }
-func (k *Int16) Description() string { return k.description }
-
-func (k *Int16) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendInt(buf, int64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Int16) Of(v int16) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Int16) Get(lm label.Map) int16 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Int16) From(t label.Label) int16 { return int16(t.Unpack64()) }
-
-// Int32 represents a key
-type Int32 struct {
-	name        string
-	description string
-}
-
-// NewInt32 creates a new Key for int32 values.
-func NewInt32(name, description string) *Int32 {
-	return &Int32{name: name, description: description}
-}
-
-func (k *Int32) Name() string        { return k.name }
-func (k *Int32) Description() string { return k.description }
-
-func (k *Int32) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendInt(buf, int64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Int32) Of(v int32) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Int32) Get(lm label.Map) int32 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Int32) From(t label.Label) int32 { return int32(t.Unpack64()) }
-
-// Int64 represents a key
-type Int64 struct {
-	name        string
-	description string
-}
-
-// NewInt64 creates a new Key for int64 values.
-func NewInt64(name, description string) *Int64 {
-	return &Int64{name: name, description: description}
-}
-
-func (k *Int64) Name() string        { return k.name }
-func (k *Int64) Description() string { return k.description }
-
-func (k *Int64) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendInt(buf, k.From(l), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Int64) Of(v int64) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Int64) Get(lm label.Map) int64 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Int64) From(t label.Label) int64 { return int64(t.Unpack64()) }
-
-// UInt represents a key
-type UInt struct {
-	name        string
-	description string
-}
-
-// NewUInt creates a new Key for uint values.
-func NewUInt(name, description string) *UInt {
-	return &UInt{name: name, description: description}
-}
-
-func (k *UInt) Name() string        { return k.name }
-func (k *UInt) Description() string { return k.description }
-
-func (k *UInt) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendUint(buf, uint64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *UInt) Of(v uint) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *UInt) Get(lm label.Map) uint {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *UInt) From(t label.Label) uint { return uint(t.Unpack64()) }
-
-// UInt8 represents a key
-type UInt8 struct {
-	name        string
-	description string
-}
-
-// NewUInt8 creates a new Key for uint8 values.
-func NewUInt8(name, description string) *UInt8 {
-	return &UInt8{name: name, description: description}
-}
-
-func (k *UInt8) Name() string        { return k.name }
-func (k *UInt8) Description() string { return k.description }
-
-func (k *UInt8) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendUint(buf, uint64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *UInt8) Of(v uint8) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *UInt8) Get(lm label.Map) uint8 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *UInt8) From(t label.Label) uint8 { return uint8(t.Unpack64()) }
-
-// UInt16 represents a key
-type UInt16 struct {
-	name        string
-	description string
-}
-
-// NewUInt16 creates a new Key for uint16 values.
-func NewUInt16(name, description string) *UInt16 {
-	return &UInt16{name: name, description: description}
-}
-
-func (k *UInt16) Name() string        { return k.name }
-func (k *UInt16) Description() string { return k.description }
-
-func (k *UInt16) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendUint(buf, uint64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *UInt16) Of(v uint16) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *UInt16) Get(lm label.Map) uint16 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *UInt16) From(t label.Label) uint16 { return uint16(t.Unpack64()) }
-
-// UInt32 represents a key
-type UInt32 struct {
-	name        string
-	description string
-}
-
-// NewUInt32 creates a new Key for uint32 values.
-func NewUInt32(name, description string) *UInt32 {
-	return &UInt32{name: name, description: description}
-}
-
-func (k *UInt32) Name() string        { return k.name }
-func (k *UInt32) Description() string { return k.description }
-
-func (k *UInt32) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendUint(buf, uint64(k.From(l)), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *UInt32) Of(v uint32) label.Label { return label.Of64(k, uint64(v)) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *UInt32) Get(lm label.Map) uint32 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *UInt32) From(t label.Label) uint32 { return uint32(t.Unpack64()) }
-
-// UInt64 represents a key
-type UInt64 struct {
-	name        string
-	description string
-}
-
-// NewUInt64 creates a new Key for uint64 values.
-func NewUInt64(name, description string) *UInt64 {
-	return &UInt64{name: name, description: description}
-}
-
-func (k *UInt64) Name() string        { return k.name }
-func (k *UInt64) Description() string { return k.description }
-
-func (k *UInt64) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendUint(buf, k.From(l), 10))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *UInt64) Of(v uint64) label.Label { return label.Of64(k, v) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *UInt64) Get(lm label.Map) uint64 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *UInt64) From(t label.Label) uint64 { return t.Unpack64() }
-
-// Float32 represents a key
-type Float32 struct {
-	name        string
-	description string
-}
-
-// NewFloat32 creates a new Key for float32 values.
-func NewFloat32(name, description string) *Float32 {
-	return &Float32{name: name, description: description}
-}
-
-func (k *Float32) Name() string        { return k.name }
-func (k *Float32) Description() string { return k.description }
-
-func (k *Float32) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendFloat(buf, float64(k.From(l)), 'E', -1, 32))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Float32) Of(v float32) label.Label {
-	return label.Of64(k, uint64(math.Float32bits(v)))
-}
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Float32) Get(lm label.Map) float32 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Float32) From(t label.Label) float32 {
-	return math.Float32frombits(uint32(t.Unpack64()))
-}
-
-// Float64 represents a key
-type Float64 struct {
-	name        string
-	description string
-}
-
-// NewFloat64 creates a new Key for int64 values.
-func NewFloat64(name, description string) *Float64 {
-	return &Float64{name: name, description: description}
-}
-
-func (k *Float64) Name() string        { return k.name }
-func (k *Float64) Description() string { return k.description }
-
-func (k *Float64) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendFloat(buf, k.From(l), 'E', -1, 64))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Float64) Of(v float64) label.Label {
-	return label.Of64(k, math.Float64bits(v))
-}
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Float64) Get(lm label.Map) float64 {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return 0
-}
-
-// From can be used to get a value from a Label.
-func (k *Float64) From(t label.Label) float64 {
-	return math.Float64frombits(t.Unpack64())
-}
-
-// String represents a key
-type String struct {
-	name        string
-	description string
-}
-
-// NewString creates a new Key for int64 values.
-func NewString(name, description string) *String {
-	return &String{name: name, description: description}
-}
-
-func (k *String) Name() string        { return k.name }
-func (k *String) Description() string { return k.description }
-
-func (k *String) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendQuote(buf, k.From(l)))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *String) Of(v string) label.Label { return label.OfString(k, v) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *String) Get(lm label.Map) string {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return ""
-}
-
-// From can be used to get a value from a Label.
-func (k *String) From(t label.Label) string { return t.UnpackString() }
-
-// Boolean represents a key
-type Boolean struct {
-	name        string
-	description string
-}
-
-// NewBoolean creates a new Key for bool values.
-func NewBoolean(name, description string) *Boolean {
-	return &Boolean{name: name, description: description}
-}
-
-func (k *Boolean) Name() string        { return k.name }
-func (k *Boolean) Description() string { return k.description }
-
-func (k *Boolean) Format(w io.Writer, buf []byte, l label.Label) {
-	w.Write(strconv.AppendBool(buf, k.From(l)))
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Boolean) Of(v bool) label.Label {
-	if v {
-		return label.Of64(k, 1)
-	}
-	return label.Of64(k, 0)
-}
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Boolean) Get(lm label.Map) bool {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return false
-}
-
-// From can be used to get a value from a Label.
-func (k *Boolean) From(t label.Label) bool { return t.Unpack64() > 0 }
-
-// Error represents a key
-type Error struct {
-	name        string
-	description string
-}
-
-// NewError creates a new Key for int64 values.
-func NewError(name, description string) *Error {
-	return &Error{name: name, description: description}
-}
-
-func (k *Error) Name() string        { return k.name }
-func (k *Error) Description() string { return k.description }
-
-func (k *Error) Format(w io.Writer, buf []byte, l label.Label) {
-	io.WriteString(w, k.From(l).Error())
-}
-
-// Of creates a new Label with this key and the supplied value.
-func (k *Error) Of(v error) label.Label { return label.OfValue(k, v) }
-
-// Get can be used to get a label for the key from a label.Map.
-func (k *Error) Get(lm label.Map) error {
-	if t := lm.Find(k); t.Valid() {
-		return k.From(t)
-	}
-	return nil
-}
-
-// From can be used to get a value from a Label.
-func (k *Error) From(t label.Label) error {
-	err, _ := t.UnpackValue().(error)
-	return err
-}
diff --git a/vendor/golang.org/x/tools/internal/event/keys/standard.go b/vendor/golang.org/x/tools/internal/event/keys/standard.go
deleted file mode 100644
index 7e95866..0000000
--- a/vendor/golang.org/x/tools/internal/event/keys/standard.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package keys
-
-var (
-	// Msg is a key used to add message strings to label lists.
-	Msg = NewString("message", "a readable message")
-	// Label is a key used to indicate an event adds labels to the context.
-	Label = NewTag("label", "a label context marker")
-	// Start is used for things like traces that have a name.
-	Start = NewString("start", "span start")
-	// Metric is a key used to indicate an event records metrics.
-	End = NewTag("end", "a span end marker")
-	// Metric is a key used to indicate an event records metrics.
-	Detach = NewTag("detach", "a span detach marker")
-	// Err is a key used to add error values to label lists.
-	Err = NewError("error", "an error that occurred")
-	// Metric is a key used to indicate an event records metrics.
-	Metric = NewTag("metric", "a metric event marker")
-)
diff --git a/vendor/golang.org/x/tools/internal/event/keys/util.go b/vendor/golang.org/x/tools/internal/event/keys/util.go
deleted file mode 100644
index c0e8e73..0000000
--- a/vendor/golang.org/x/tools/internal/event/keys/util.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package keys
-
-import (
-	"sort"
-	"strings"
-)
-
-// Join returns a canonical join of the keys in S:
-// a sorted comma-separated string list.
-func Join[S ~[]T, T ~string](s S) string {
-	strs := make([]string, 0, len(s))
-	for _, v := range s {
-		strs = append(strs, string(v))
-	}
-	sort.Strings(strs)
-	return strings.Join(strs, ",")
-}
diff --git a/vendor/golang.org/x/tools/internal/event/label/label.go b/vendor/golang.org/x/tools/internal/event/label/label.go
deleted file mode 100644
index 92a3910..0000000
--- a/vendor/golang.org/x/tools/internal/event/label/label.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package label
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-	"slices"
-	"unsafe"
-)
-
-// Key is used as the identity of a Label.
-// Keys are intended to be compared by pointer only, the name should be unique
-// for communicating with external systems, but it is not required or enforced.
-type Key interface {
-	// Name returns the key name.
-	Name() string
-	// Description returns a string that can be used to describe the value.
-	Description() string
-
-	// Format is used in formatting to append the value of the label to the
-	// supplied buffer.
-	// The formatter may use the supplied buf as a scratch area to avoid
-	// allocations.
-	Format(w io.Writer, buf []byte, l Label)
-}
-
-// Label holds a key and value pair.
-// It is normally used when passing around lists of labels.
-type Label struct {
-	key     Key
-	packed  uint64
-	untyped any
-}
-
-// Map is the interface to a collection of Labels indexed by key.
-type Map interface {
-	// Find returns the label that matches the supplied key.
-	Find(key Key) Label
-}
-
-// List is the interface to something that provides an iterable
-// list of labels.
-// Iteration should start from 0 and continue until Valid returns false.
-type List interface {
-	// Valid returns true if the index is within range for the list.
-	// It does not imply the label at that index will itself be valid.
-	Valid(index int) bool
-	// Label returns the label at the given index.
-	Label(index int) Label
-}
-
-// list implements LabelList for a list of Labels.
-type list struct {
-	labels []Label
-}
-
-// filter wraps a LabelList filtering out specific labels.
-type filter struct {
-	keys       []Key
-	underlying List
-}
-
-// listMap implements LabelMap for a simple list of labels.
-type listMap struct {
-	labels []Label
-}
-
-// mapChain implements LabelMap for a list of underlying LabelMap.
-type mapChain struct {
-	maps []Map
-}
-
-// OfValue creates a new label from the key and value.
-// This method is for implementing new key types, label creation should
-// normally be done with the Of method of the key.
-func OfValue(k Key, value any) Label { return Label{key: k, untyped: value} }
-
-// UnpackValue assumes the label was built using LabelOfValue and returns the value
-// that was passed to that constructor.
-// This method is for implementing new key types, for type safety normal
-// access should be done with the From method of the key.
-func (t Label) UnpackValue() any { return t.untyped }
-
-// Of64 creates a new label from a key and a uint64. This is often
-// used for non uint64 values that can be packed into a uint64.
-// This method is for implementing new key types, label creation should
-// normally be done with the Of method of the key.
-func Of64(k Key, v uint64) Label { return Label{key: k, packed: v} }
-
-// Unpack64 assumes the label was built using LabelOf64 and returns the value that
-// was passed to that constructor.
-// This method is for implementing new key types, for type safety normal
-// access should be done with the From method of the key.
-func (t Label) Unpack64() uint64 { return t.packed }
-
-type stringptr unsafe.Pointer
-
-// OfString creates a new label from a key and a string.
-// This method is for implementing new key types, label creation should
-// normally be done with the Of method of the key.
-func OfString(k Key, v string) Label {
-	hdr := (*reflect.StringHeader)(unsafe.Pointer(&v))
-	return Label{
-		key:     k,
-		packed:  uint64(hdr.Len),
-		untyped: stringptr(hdr.Data),
-	}
-}
-
-// UnpackString assumes the label was built using LabelOfString and returns the
-// value that was passed to that constructor.
-// This method is for implementing new key types, for type safety normal
-// access should be done with the From method of the key.
-func (t Label) UnpackString() string {
-	var v string
-	hdr := (*reflect.StringHeader)(unsafe.Pointer(&v))
-	hdr.Data = uintptr(t.untyped.(stringptr))
-	hdr.Len = int(t.packed)
-	return v
-}
-
-// Valid returns true if the Label is a valid one (it has a key).
-func (t Label) Valid() bool { return t.key != nil }
-
-// Key returns the key of this Label.
-func (t Label) Key() Key { return t.key }
-
-// Format is used for debug printing of labels.
-func (t Label) Format(f fmt.State, r rune) {
-	if !t.Valid() {
-		io.WriteString(f, `nil`)
-		return
-	}
-	io.WriteString(f, t.Key().Name())
-	io.WriteString(f, "=")
-	var buf [128]byte
-	t.Key().Format(f, buf[:0], t)
-}
-
-func (l *list) Valid(index int) bool {
-	return index >= 0 && index < len(l.labels)
-}
-
-func (l *list) Label(index int) Label {
-	return l.labels[index]
-}
-
-func (f *filter) Valid(index int) bool {
-	return f.underlying.Valid(index)
-}
-
-func (f *filter) Label(index int) Label {
-	l := f.underlying.Label(index)
-	if slices.Contains(f.keys, l.Key()) {
-		return Label{}
-	}
-	return l
-}
-
-func (lm listMap) Find(key Key) Label {
-	for _, l := range lm.labels {
-		if l.Key() == key {
-			return l
-		}
-	}
-	return Label{}
-}
-
-func (c mapChain) Find(key Key) Label {
-	for _, src := range c.maps {
-		l := src.Find(key)
-		if l.Valid() {
-			return l
-		}
-	}
-	return Label{}
-}
-
-var emptyList = &list{}
-
-func NewList(labels ...Label) List {
-	if len(labels) == 0 {
-		return emptyList
-	}
-	return &list{labels: labels}
-}
-
-func Filter(l List, keys ...Key) List {
-	if len(keys) == 0 {
-		return l
-	}
-	return &filter{keys: keys, underlying: l}
-}
-
-func NewMap(labels ...Label) Map {
-	return listMap{labels: labels}
-}
-
-func MergeMaps(srcs ...Map) Map {
-	var nonNil []Map
-	for _, src := range srcs {
-		if src != nil {
-			nonNil = append(nonNil, src)
-		}
-	}
-	if len(nonNil) == 1 {
-		return nonNil[0]
-	}
-	return mapChain{maps: nonNil}
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/bimport.go b/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
deleted file mode 100644
index 734c461..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains the remaining vestiges of
-// $GOROOT/src/go/internal/gcimporter/bimport.go.
-
-package gcimporter
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"sync"
-)
-
-func errorf(format string, args ...any) {
-	panic(fmt.Sprintf(format, args...))
-}
-
-const deltaNewFile = -64 // see cmd/compile/internal/gc/bexport.go
-
-// Synthesize a token.Pos
-type fakeFileSet struct {
-	fset  *token.FileSet
-	files map[string]*fileInfo
-}
-
-type fileInfo struct {
-	file     *token.File
-	lastline int
-}
-
-const maxlines = 64 * 1024
-
-func (s *fakeFileSet) pos(file string, line, column int) token.Pos {
-	// TODO(mdempsky): Make use of column.
-
-	// Since we don't know the set of needed file positions, we reserve maxlines
-	// positions per file. We delay calling token.File.SetLines until all
-	// positions have been calculated (by way of fakeFileSet.setLines), so that
-	// we can avoid setting unnecessary lines. See also golang/go#46586.
-	f := s.files[file]
-	if f == nil {
-		f = &fileInfo{file: s.fset.AddFile(file, -1, maxlines)}
-		s.files[file] = f
-	}
-	if line > maxlines {
-		line = 1
-	}
-	if line > f.lastline {
-		f.lastline = line
-	}
-
-	// Return a fake position assuming that f.file consists only of newlines.
-	return token.Pos(f.file.Base() + line - 1)
-}
-
-func (s *fakeFileSet) setLines() {
-	fakeLinesOnce.Do(func() {
-		fakeLines = make([]int, maxlines)
-		for i := range fakeLines {
-			fakeLines[i] = i
-		}
-	})
-	for _, f := range s.files {
-		f.file.SetLines(fakeLines[:f.lastline])
-	}
-}
-
-var (
-	fakeLines     []int
-	fakeLinesOnce sync.Once
-)
-
-func chanDir(d int) types.ChanDir {
-	// tag values must match the constants in cmd/compile/internal/gc/go.go
-	switch d {
-	case 1 /* Crecv */ :
-		return types.RecvOnly
-	case 2 /* Csend */ :
-		return types.SendOnly
-	case 3 /* Cboth */ :
-		return types.SendRecv
-	default:
-		errorf("unexpected channel dir %d", d)
-		return 0
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go b/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
deleted file mode 100644
index 5662a31..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file should be kept in sync with $GOROOT/src/internal/exportdata/exportdata.go.
-// This file also additionally implements FindExportData for gcexportdata.NewReader.
-
-package gcimporter
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"go/build"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"sync"
-)
-
-// FindExportData positions the reader r at the beginning of the
-// export data section of an underlying cmd/compile created archive
-// file by reading from it. The reader must be positioned at the
-// start of the file before calling this function.
-// This returns the length of the export data in bytes.
-//
-// This function is needed by [gcexportdata.Read], which must
-// accept inputs produced by the last two releases of cmd/compile,
-// plus tip.
-func FindExportData(r *bufio.Reader) (size int64, err error) {
-	arsize, err := FindPackageDefinition(r)
-	if err != nil {
-		return
-	}
-	size = int64(arsize)
-
-	objapi, headers, err := ReadObjectHeaders(r)
-	if err != nil {
-		return
-	}
-	size -= int64(len(objapi))
-	for _, h := range headers {
-		size -= int64(len(h))
-	}
-
-	// Check for the binary export data section header "$$B\n".
-	// TODO(taking): Unify with ReadExportDataHeader so that it stops at the 'u' instead of reading
-	line, err := r.ReadSlice('\n')
-	if err != nil {
-		return
-	}
-	hdr := string(line)
-	if hdr != "$$B\n" {
-		err = fmt.Errorf("unknown export data header: %q", hdr)
-		return
-	}
-	size -= int64(len(hdr))
-
-	// For files with a binary export data header "$$B\n",
-	// these are always terminated by an end-of-section marker "\n$$\n".
-	// So the last bytes must always be this constant.
-	//
-	// The end-of-section marker is not a part of the export data itself.
-	// Do not include these in size.
-	//
-	// It would be nice to have sanity check that the final bytes after
-	// the export data are indeed the end-of-section marker. The split
-	// of gcexportdata.NewReader and gcexportdata.Read make checking this
-	// ugly so gcimporter gives up enforcing this. The compiler and go/types
-	// importer do enforce this, which seems good enough.
-	const endofsection = "\n$$\n"
-	size -= int64(len(endofsection))
-
-	if size < 0 {
-		err = fmt.Errorf("invalid size (%d) in the archive file: %d bytes remain without section headers (recompile package)", arsize, size)
-		return
-	}
-
-	return
-}
-
-// ReadUnified reads the contents of the unified export data from a reader r
-// that contains the contents of a GC-created archive file.
-//
-// On success, the reader will be positioned after the end-of-section marker "\n$$\n".
-//
-// Supported GC-created archive files have 4 layers of nesting:
-//   - An archive file containing a package definition file.
-//   - The package definition file contains headers followed by a data section.
-//     Headers are lines (≤ 4kb) that do not start with "$$".
-//   - The data section starts with "$$B\n" followed by export data followed
-//     by an end of section marker "\n$$\n". (The section start "$$\n" is no
-//     longer supported.)
-//   - The export data starts with a format byte ('u') followed by the <data> in
-//     the given format. (See ReadExportDataHeader for older formats.)
-//
-// Putting this together, the bytes in a GC-created archive files are expected
-// to look like the following.
-// See cmd/internal/archive for more details on ar file headers.
-//
-// | <!arch>\n             | ar file signature
-// | __.PKGDEF...size...\n | ar header for __.PKGDEF including size.
-// | go object <...>\n     | objabi header
-// | <optional headers>\n  | other headers such as build id
-// | $$B\n                 | binary format marker
-// | u<data>\n             | unified export <data>
-// | $$\n                  | end-of-section marker
-// | [optional padding]    | padding byte (0x0A) if size is odd
-// | [ar file header]      | other ar files
-// | [ar file data]        |
-func ReadUnified(r *bufio.Reader) (data []byte, err error) {
-	// We historically guaranteed headers at the default buffer size (4096) work.
-	// This ensures we can use ReadSlice throughout.
-	const minBufferSize = 4096
-	r = bufio.NewReaderSize(r, minBufferSize)
-
-	size, err := FindPackageDefinition(r)
-	if err != nil {
-		return
-	}
-	n := size
-
-	objapi, headers, err := ReadObjectHeaders(r)
-	if err != nil {
-		return
-	}
-	n -= len(objapi)
-	for _, h := range headers {
-		n -= len(h)
-	}
-
-	hdrlen, err := ReadExportDataHeader(r)
-	if err != nil {
-		return
-	}
-	n -= hdrlen
-
-	// size also includes the end of section marker. Remove that many bytes from the end.
-	const marker = "\n$$\n"
-	n -= len(marker)
-
-	if n < 0 {
-		err = fmt.Errorf("invalid size (%d) in the archive file: %d bytes remain without section headers (recompile package)", size, n)
-		return
-	}
-
-	// Read n bytes from buf.
-	data = make([]byte, n)
-	_, err = io.ReadFull(r, data)
-	if err != nil {
-		return
-	}
-
-	// Check for marker at the end.
-	var suffix [len(marker)]byte
-	_, err = io.ReadFull(r, suffix[:])
-	if err != nil {
-		return
-	}
-	if s := string(suffix[:]); s != marker {
-		err = fmt.Errorf("read %q instead of end-of-section marker (%q)", s, marker)
-		return
-	}
-
-	return
-}
-
-// FindPackageDefinition positions the reader r at the beginning of a package
-// definition file ("__.PKGDEF") within a GC-created archive by reading
-// from it, and returns the size of the package definition file in the archive.
-//
-// The reader must be positioned at the start of the archive file before calling
-// this function, and "__.PKGDEF" is assumed to be the first file in the archive.
-//
-// See cmd/internal/archive for details on the archive format.
-func FindPackageDefinition(r *bufio.Reader) (size int, err error) {
-	// Uses ReadSlice to limit risk of malformed inputs.
-
-	// Read first line to make sure this is an object file.
-	line, err := r.ReadSlice('\n')
-	if err != nil {
-		err = fmt.Errorf("can't find export data (%v)", err)
-		return
-	}
-
-	// Is the first line an archive file signature?
-	if string(line) != "!<arch>\n" {
-		err = fmt.Errorf("not the start of an archive file (%q)", line)
-		return
-	}
-
-	// package export block should be first
-	size = readArchiveHeader(r, "__.PKGDEF")
-	if size <= 0 {
-		err = fmt.Errorf("not a package file")
-		return
-	}
-
-	return
-}
-
-// ReadObjectHeaders reads object headers from the reader. Object headers are
-// lines that do not start with an end-of-section marker "$$". The first header
-// is the objabi header. On success, the reader will be positioned at the beginning
-// of the end-of-section marker.
-//
-// It returns an error if any header does not fit in r.Size() bytes.
-func ReadObjectHeaders(r *bufio.Reader) (objapi string, headers []string, err error) {
-	// line is a temporary buffer for headers.
-	// Use bounded reads (ReadSlice, Peek) to limit risk of malformed inputs.
-	var line []byte
-
-	// objapi header should be the first line
-	if line, err = r.ReadSlice('\n'); err != nil {
-		err = fmt.Errorf("can't find export data (%v)", err)
-		return
-	}
-	objapi = string(line)
-
-	// objapi header begins with "go object ".
-	if !strings.HasPrefix(objapi, "go object ") {
-		err = fmt.Errorf("not a go object file: %s", objapi)
-		return
-	}
-
-	// process remaining object header lines
-	for {
-		// check for an end of section marker "$$"
-		line, err = r.Peek(2)
-		if err != nil {
-			return
-		}
-		if string(line) == "$$" {
-			return // stop
-		}
-
-		// read next header
-		line, err = r.ReadSlice('\n')
-		if err != nil {
-			return
-		}
-		headers = append(headers, string(line))
-	}
-}
-
-// ReadExportDataHeader reads the export data header and format from r.
-// It returns the number of bytes read, or an error if the format is no longer
-// supported or it failed to read.
-//
-// The only currently supported format is binary export data in the
-// unified export format.
-func ReadExportDataHeader(r *bufio.Reader) (n int, err error) {
-	// Read export data header.
-	line, err := r.ReadSlice('\n')
-	if err != nil {
-		return
-	}
-
-	hdr := string(line)
-	switch hdr {
-	case "$$\n":
-		err = fmt.Errorf("old textual export format no longer supported (recompile package)")
-		return
-
-	case "$$B\n":
-		var format byte
-		format, err = r.ReadByte()
-		if err != nil {
-			return
-		}
-		// The unified export format starts with a 'u'.
-		switch format {
-		case 'u':
-		default:
-			// Older no longer supported export formats include:
-			// indexed export format which started with an 'i'; and
-			// the older binary export format which started with a 'c',
-			// 'd', or 'v' (from "version").
-			err = fmt.Errorf("binary export format %q is no longer supported (recompile package)", format)
-			return
-		}
-
-	default:
-		err = fmt.Errorf("unknown export data header: %q", hdr)
-		return
-	}
-
-	n = len(hdr) + 1 // + 1 is for 'u'
-	return
-}
-
-// FindPkg returns the filename and unique package id for an import
-// path based on package information provided by build.Import (using
-// the build.Default build.Context). A relative srcDir is interpreted
-// relative to the current working directory.
-//
-// FindPkg is only used in tests within x/tools.
-func FindPkg(path, srcDir string) (filename, id string, err error) {
-	// TODO(taking): Move internal/exportdata.FindPkg into its own file,
-	// and then this copy into a _test package.
-	if path == "" {
-		return "", "", errors.New("path is empty")
-	}
-
-	var noext string
-	switch {
-	default:
-		// "x" -> "$GOPATH/pkg/$GOOS_$GOARCH/x.ext", "x"
-		// Don't require the source files to be present.
-		if abs, err := filepath.Abs(srcDir); err == nil { // see issue 14282
-			srcDir = abs
-		}
-		var bp *build.Package
-		bp, err = build.Import(path, srcDir, build.FindOnly|build.AllowBinary)
-		if bp.PkgObj == "" {
-			if bp.Goroot && bp.Dir != "" {
-				filename, err = lookupGorootExport(bp.Dir)
-				if err == nil {
-					_, err = os.Stat(filename)
-				}
-				if err == nil {
-					return filename, bp.ImportPath, nil
-				}
-			}
-			goto notfound
-		} else {
-			noext = strings.TrimSuffix(bp.PkgObj, ".a")
-		}
-		id = bp.ImportPath
-
-	case build.IsLocalImport(path):
-		// "./x" -> "/this/directory/x.ext", "/this/directory/x"
-		noext = filepath.Join(srcDir, path)
-		id = noext
-
-	case filepath.IsAbs(path):
-		// for completeness only - go/build.Import
-		// does not support absolute imports
-		// "/x" -> "/x.ext", "/x"
-		noext = path
-		id = path
-	}
-
-	if false { // for debugging
-		if path != id {
-			fmt.Printf("%s -> %s\n", path, id)
-		}
-	}
-
-	// try extensions
-	for _, ext := range pkgExts {
-		filename = noext + ext
-		f, statErr := os.Stat(filename)
-		if statErr == nil && !f.IsDir() {
-			return filename, id, nil
-		}
-		if err == nil {
-			err = statErr
-		}
-	}
-
-notfound:
-	if err == nil {
-		return "", path, fmt.Errorf("can't find import: %q", path)
-	}
-	return "", path, fmt.Errorf("can't find import: %q: %w", path, err)
-}
-
-var pkgExts = [...]string{".a", ".o"} // a file from the build cache will have no extension
-
-var exportMap sync.Map // package dir → func() (string, error)
-
-// lookupGorootExport returns the location of the export data
-// (normally found in the build cache, but located in GOROOT/pkg
-// in prior Go releases) for the package located in pkgDir.
-//
-// (We use the package's directory instead of its import path
-// mainly to simplify handling of the packages in src/vendor
-// and cmd/vendor.)
-//
-// lookupGorootExport is only used in tests within x/tools.
-func lookupGorootExport(pkgDir string) (string, error) {
-	f, ok := exportMap.Load(pkgDir)
-	if !ok {
-		var (
-			listOnce   sync.Once
-			exportPath string
-			err        error
-		)
-		f, _ = exportMap.LoadOrStore(pkgDir, func() (string, error) {
-			listOnce.Do(func() {
-				cmd := exec.Command(filepath.Join(build.Default.GOROOT, "bin", "go"), "list", "-export", "-f", "{{.Export}}", pkgDir)
-				cmd.Dir = build.Default.GOROOT
-				cmd.Env = append(os.Environ(), "PWD="+cmd.Dir, "GOROOT="+build.Default.GOROOT)
-				var output []byte
-				output, err = cmd.Output()
-				if err != nil {
-					if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
-						err = errors.New(string(ee.Stderr))
-					}
-					return
-				}
-
-				exports := strings.Split(string(bytes.TrimSpace(output)), "\n")
-				if len(exports) != 1 {
-					err = fmt.Errorf("go list reported %d exports; expected 1", len(exports))
-					return
-				}
-
-				exportPath = exports[0]
-			})
-
-			return exportPath, err
-		})
-	}
-
-	return f.(func() (string, error))()
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go b/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
deleted file mode 100644
index 3dbd21d..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file is a reduced copy of $GOROOT/src/go/internal/gcimporter/gcimporter.go.
-
-// Package gcimporter provides various functions for reading
-// gc-generated object files that can be used to implement the
-// Importer interface defined by the Go 1.5 standard library package.
-//
-// The encoding is deterministic: if the encoder is applied twice to
-// the same types.Package data structure, both encodings are equal.
-// This property may be important to avoid spurious changes in
-// applications such as build systems.
-//
-// However, the encoder is not necessarily idempotent. Importing an
-// exported package may yield a types.Package that, while it
-// represents the same set of Go types as the original, may differ in
-// the details of its internal representation. Because of these
-// differences, re-encoding the imported package may yield a
-// different, but equally valid, encoding of the package.
-package gcimporter // import "golang.org/x/tools/internal/gcimporter"
-
-import (
-	"bufio"
-	"fmt"
-	"go/token"
-	"go/types"
-	"io"
-	"os"
-)
-
-const (
-	// Enable debug during development: it adds some additional checks, and
-	// prevents errors from being recovered.
-	debug = false
-
-	// If trace is set, debugging output is printed to std out.
-	trace = false
-)
-
-// Import imports a gc-generated package given its import path and srcDir, adds
-// the corresponding package object to the packages map, and returns the object.
-// The packages map must contain all packages already imported.
-//
-// Import is only used in tests.
-func Import(fset *token.FileSet, packages map[string]*types.Package, path, srcDir string, lookup func(path string) (io.ReadCloser, error)) (pkg *types.Package, err error) {
-	var rc io.ReadCloser
-	var id string
-	if lookup != nil {
-		// With custom lookup specified, assume that caller has
-		// converted path to a canonical import path for use in the map.
-		if path == "unsafe" {
-			return types.Unsafe, nil
-		}
-		id = path
-
-		// No need to re-import if the package was imported completely before.
-		if pkg = packages[id]; pkg != nil && pkg.Complete() {
-			return
-		}
-		f, err := lookup(path)
-		if err != nil {
-			return nil, err
-		}
-		rc = f
-	} else {
-		var filename string
-		filename, id, err = FindPkg(path, srcDir)
-		if filename == "" {
-			if path == "unsafe" {
-				return types.Unsafe, nil
-			}
-			return nil, err
-		}
-
-		// no need to re-import if the package was imported completely before
-		if pkg = packages[id]; pkg != nil && pkg.Complete() {
-			return
-		}
-
-		// open file
-		f, err := os.Open(filename)
-		if err != nil {
-			return nil, err
-		}
-		defer func() {
-			if err != nil {
-				// add file name to error
-				err = fmt.Errorf("%s: %v", filename, err)
-			}
-		}()
-		rc = f
-	}
-	defer rc.Close()
-
-	buf := bufio.NewReader(rc)
-	data, err := ReadUnified(buf)
-	if err != nil {
-		err = fmt.Errorf("import %q: %v", path, err)
-		return
-	}
-
-	// unified: emitted by cmd/compile since go1.20.
-	_, pkg, err = UImportData(fset, packages, data, id)
-
-	return
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/iexport.go b/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
deleted file mode 100644
index 780873e..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
+++ /dev/null
@@ -1,1596 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Indexed package export.
-//
-// The indexed export data format is an evolution of the previous
-// binary export data format. Its chief contribution is introducing an
-// index table, which allows efficient random access of individual
-// declarations and inline function bodies. In turn, this allows
-// avoiding unnecessary work for compilation units that import large
-// packages.
-//
-//
-// The top-level data format is structured as:
-//
-//     Header struct {
-//         Tag        byte   // 'i'
-//         Version    uvarint
-//         StringSize uvarint
-//         DataSize   uvarint
-//     }
-//
-//     Strings [StringSize]byte
-//     Data    [DataSize]byte
-//
-//     MainIndex []struct{
-//         PkgPath   stringOff
-//         PkgName   stringOff
-//         PkgHeight uvarint
-//
-//         Decls []struct{
-//             Name   stringOff
-//             Offset declOff
-//         }
-//     }
-//
-//     Fingerprint [8]byte
-//
-// uvarint means a uint64 written out using uvarint encoding.
-//
-// []T means a uvarint followed by that many T objects. In other
-// words:
-//
-//     Len   uvarint
-//     Elems [Len]T
-//
-// stringOff means a uvarint that indicates an offset within the
-// Strings section. At that offset is another uvarint, followed by
-// that many bytes, which form the string value.
-//
-// declOff means a uvarint that indicates an offset within the Data
-// section where the associated declaration can be found.
-//
-//
-// There are five kinds of declarations, distinguished by their first
-// byte:
-//
-//     type Var struct {
-//         Tag  byte // 'V'
-//         Pos  Pos
-//         Type typeOff
-//     }
-//
-//     type Func struct {
-//         Tag       byte // 'F' or 'G'
-//         Pos       Pos
-//         TypeParams []typeOff  // only present if Tag == 'G'
-//         Signature Signature
-//     }
-//
-//     type Const struct {
-//         Tag   byte // 'C'
-//         Pos   Pos
-//         Value Value
-//     }
-//
-//     type Type struct {
-//         Tag        byte // 'T' or 'U'
-//         Pos        Pos
-//         TypeParams []typeOff  // only present if Tag == 'U'
-//         Underlying typeOff
-//
-//         Methods []struct{  // omitted if Underlying is an interface type
-//             Pos       Pos
-//             Name      stringOff
-//             Recv      Param
-//             Signature Signature
-//         }
-//     }
-//
-//     type Alias struct {
-//         Tag  byte // 'A' or 'B'
-//         Pos  Pos
-//         TypeParams []typeOff  // only present if Tag == 'B'
-//         Type typeOff
-//     }
-//
-//     // "Automatic" declaration of each typeparam
-//     type TypeParam struct {
-//         Tag        byte // 'P'
-//         Pos        Pos
-//         Implicit   bool
-//         Constraint typeOff
-//     }
-//
-// typeOff means a uvarint that either indicates a predeclared type,
-// or an offset into the Data section. If the uvarint is less than
-// predeclReserved, then it indicates the index into the predeclared
-// types list (see predeclared in bexport.go for order). Otherwise,
-// subtracting predeclReserved yields the offset of a type descriptor.
-//
-// Value means a type, kind, and type-specific value. See
-// (*exportWriter).value for details.
-//
-//
-// There are twelve kinds of type descriptors, distinguished by an itag:
-//
-//     type DefinedType struct {
-//         Tag     itag // definedType
-//         Name    stringOff
-//         PkgPath stringOff
-//     }
-//
-//     type PointerType struct {
-//         Tag  itag // pointerType
-//         Elem typeOff
-//     }
-//
-//     type SliceType struct {
-//         Tag  itag // sliceType
-//         Elem typeOff
-//     }
-//
-//     type ArrayType struct {
-//         Tag  itag // arrayType
-//         Len  uint64
-//         Elem typeOff
-//     }
-//
-//     type ChanType struct {
-//         Tag  itag   // chanType
-//         Dir  uint64 // 1 RecvOnly; 2 SendOnly; 3 SendRecv
-//         Elem typeOff
-//     }
-//
-//     type MapType struct {
-//         Tag  itag // mapType
-//         Key  typeOff
-//         Elem typeOff
-//     }
-//
-//     type FuncType struct {
-//         Tag       itag // signatureType
-//         PkgPath   stringOff
-//         Signature Signature
-//     }
-//
-//     type StructType struct {
-//         Tag     itag // structType
-//         PkgPath stringOff
-//         Fields []struct {
-//             Pos      Pos
-//             Name     stringOff
-//             Type     typeOff
-//             Embedded bool
-//             Note     stringOff
-//         }
-//     }
-//
-//     type InterfaceType struct {
-//         Tag     itag // interfaceType
-//         PkgPath stringOff
-//         Embeddeds []struct {
-//             Pos  Pos
-//             Type typeOff
-//         }
-//         Methods []struct {
-//             Pos       Pos
-//             Name      stringOff
-//             Signature Signature
-//         }
-//     }
-//
-//     // Reference to a type param declaration
-//     type TypeParamType struct {
-//         Tag     itag // typeParamType
-//         Name    stringOff
-//         PkgPath stringOff
-//     }
-//
-//     // Instantiation of a generic type (like List[T2] or List[int])
-//     type InstanceType struct {
-//         Tag     itag // instanceType
-//         Pos     pos
-//         TypeArgs []typeOff
-//         BaseType typeOff
-//     }
-//
-//     type UnionType struct {
-//         Tag     itag // interfaceType
-//         Terms   []struct {
-//             tilde bool
-//             Type  typeOff
-//         }
-//     }
-//
-//
-//
-//     type Signature struct {
-//         Params   []Param
-//         Results  []Param
-//         Variadic bool  // omitted if Results is empty
-//     }
-//
-//     type Param struct {
-//         Pos  Pos
-//         Name stringOff
-//         Type typOff
-//     }
-//
-//
-// Pos encodes a file:line:column triple, incorporating a simple delta
-// encoding scheme within a data object. See exportWriter.pos for
-// details.
-
-package gcimporter
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"go/constant"
-	"go/token"
-	"go/types"
-	"io"
-	"math/big"
-	"reflect"
-	"slices"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/types/objectpath"
-	"golang.org/x/tools/internal/aliases"
-)
-
-// IExportShallow encodes "shallow" export data for the specified package.
-//
-// For types, we use "shallow" export data. Historically, the Go
-// compiler always produced a summary of the types for a given package
-// that included types from other packages that it indirectly
-// referenced: "deep" export data. This had the advantage that the
-// compiler (and analogous tools such as gopls) need only load one
-// file per direct import.  However, it meant that the files tended to
-// get larger based on the level of the package in the import
-// graph. For example, higher-level packages in the kubernetes module
-// have over 1MB of "deep" export data, even when they have almost no
-// content of their own, merely because they mention a major type that
-// references many others. In pathological cases the export data was
-// 300x larger than the source for a package due to this quadratic
-// growth.
-//
-// "Shallow" export data means that the serialized types describe only
-// a single package. If those types mention types from other packages,
-// the type checker may need to request additional packages beyond
-// just the direct imports. Type information for the entire transitive
-// closure of imports is provided (lazily) by the DAG.
-//
-// No promises are made about the encoding other than that it can be decoded by
-// the same version of IIExportShallow. If you plan to save export data in the
-// file system, be sure to include a cryptographic digest of the executable in
-// the key to avoid version skew.
-//
-// If the provided reportf func is non-nil, it is used for reporting
-// bugs (e.g. recovered panics) encountered during export, enabling us
-// to obtain via telemetry the stack that would otherwise be lost by
-// merely returning an error.
-func IExportShallow(fset *token.FileSet, pkg *types.Package, reportf ReportFunc) ([]byte, error) {
-	// In principle this operation can only fail if out.Write fails,
-	// but that's impossible for bytes.Buffer---and as a matter of
-	// fact iexportCommon doesn't even check for I/O errors.
-	// TODO(adonovan): handle I/O errors properly.
-	// TODO(adonovan): use byte slices throughout, avoiding copying.
-	const bundle, shallow = false, true
-	var out bytes.Buffer
-	err := iexportCommon(&out, fset, bundle, shallow, iexportVersion, []*types.Package{pkg}, reportf)
-	return out.Bytes(), err
-}
-
-// IImportShallow decodes "shallow" types.Package data encoded by
-// [IExportShallow] in the same executable. This function cannot import data
-// from cmd/compile or gcexportdata.Write.
-//
-// The importer calls getPackages to obtain package symbols for all
-// packages mentioned in the export data, including the one being
-// decoded.
-//
-// If the provided reportf func is non-nil, it will be used for reporting bugs
-// encountered during import.
-// TODO(rfindley): remove reportf when we are confident enough in the new
-// objectpath encoding.
-func IImportShallow(fset *token.FileSet, getPackages GetPackagesFunc, data []byte, path string, reportf ReportFunc) (*types.Package, error) {
-	const bundle = false
-	const shallow = true
-	pkgs, err := iimportCommon(fset, getPackages, data, bundle, path, shallow, reportf)
-	if err != nil {
-		return nil, err
-	}
-	return pkgs[0], nil
-}
-
-// ReportFunc is the type of a function used to report formatted bugs.
-type ReportFunc = func(string, ...any)
-
-// Current bundled export format version. Increase with each format change.
-// 0: initial implementation
-const bundleVersion = 0
-
-// IExportData writes indexed export data for pkg to out.
-//
-// If no file set is provided, position info will be missing.
-// The package path of the top-level package will not be recorded,
-// so that calls to IImportData can override with a provided package path.
-func IExportData(out io.Writer, fset *token.FileSet, pkg *types.Package) error {
-	const bundle, shallow = false, false
-	return iexportCommon(out, fset, bundle, shallow, iexportVersion, []*types.Package{pkg}, nil)
-}
-
-// IExportBundle writes an indexed export bundle for pkgs to out.
-func IExportBundle(out io.Writer, fset *token.FileSet, pkgs []*types.Package) error {
-	const bundle, shallow = true, false
-	return iexportCommon(out, fset, bundle, shallow, iexportVersion, pkgs, nil)
-}
-
-func iexportCommon(out io.Writer, fset *token.FileSet, bundle, shallow bool, version int, pkgs []*types.Package, reportf ReportFunc) (err error) {
-	if !debug {
-		defer func() {
-			if e := recover(); e != nil {
-				// Report the stack via telemetry (see #71067).
-				if reportf != nil {
-					reportf("panic in exporter")
-				}
-				if ierr, ok := e.(internalError); ok {
-					// internalError usually means we exported a
-					// bad go/types data structure: a violation
-					// of an implicit precondition of Export.
-					err = ierr
-					return
-				}
-				// Not an internal error; panic again.
-				panic(e)
-			}
-		}()
-	}
-
-	p := iexporter{
-		fset:        fset,
-		version:     version,
-		shallow:     shallow,
-		allPkgs:     map[*types.Package]bool{},
-		stringIndex: map[string]uint64{},
-		declIndex:   map[types.Object]uint64{},
-		tparamNames: map[types.Object]string{},
-		typIndex:    map[types.Type]uint64{},
-	}
-	if !bundle {
-		p.localpkg = pkgs[0]
-	}
-
-	for i, pt := range predeclared() {
-		p.typIndex[pt] = uint64(i)
-	}
-	if len(p.typIndex) > predeclReserved {
-		panic(internalErrorf("too many predeclared types: %d > %d", len(p.typIndex), predeclReserved))
-	}
-
-	// Initialize work queue with exported declarations.
-	for _, pkg := range pkgs {
-		scope := pkg.Scope()
-		for _, name := range scope.Names() {
-			if token.IsExported(name) {
-				p.pushDecl(scope.Lookup(name))
-			}
-		}
-
-		if bundle {
-			// Ensure pkg and its imports are included in the index.
-			p.allPkgs[pkg] = true
-			for _, imp := range pkg.Imports() {
-				p.allPkgs[imp] = true
-			}
-		}
-	}
-
-	// Loop until no more work.
-	for !p.declTodo.empty() {
-		p.doDecl(p.declTodo.popHead())
-	}
-
-	// Produce index of offset of each file record in files.
-	var files intWriter
-	var fileOffset []uint64 // fileOffset[i] is offset in files of file encoded as i
-	if p.shallow {
-		fileOffset = make([]uint64, len(p.fileInfos))
-		for i, info := range p.fileInfos {
-			fileOffset[i] = uint64(files.Len())
-			p.encodeFile(&files, info.file, info.needed)
-		}
-	}
-
-	// Append indices to data0 section.
-	dataLen := uint64(p.data0.Len())
-	w := p.newWriter()
-	w.writeIndex(p.declIndex)
-
-	if bundle {
-		w.uint64(uint64(len(pkgs)))
-		for _, pkg := range pkgs {
-			w.pkg(pkg)
-			imps := pkg.Imports()
-			w.uint64(uint64(len(imps)))
-			for _, imp := range imps {
-				w.pkg(imp)
-			}
-		}
-	}
-	w.flush()
-
-	// Assemble header.
-	var hdr intWriter
-	if bundle {
-		hdr.uint64(bundleVersion)
-	}
-	hdr.uint64(uint64(p.version))
-	hdr.uint64(uint64(p.strings.Len()))
-	if p.shallow {
-		hdr.uint64(uint64(files.Len()))
-		hdr.uint64(uint64(len(fileOffset)))
-		for _, offset := range fileOffset {
-			hdr.uint64(offset)
-		}
-	}
-	hdr.uint64(dataLen)
-
-	// Flush output.
-	io.Copy(out, &hdr)
-	io.Copy(out, &p.strings)
-	if p.shallow {
-		io.Copy(out, &files)
-	}
-	io.Copy(out, &p.data0)
-
-	return nil
-}
-
-// encodeFile writes to w a representation of the file sufficient to
-// faithfully restore position information about all needed offsets.
-// Mutates the needed array.
-func (p *iexporter) encodeFile(w *intWriter, file *token.File, needed []uint64) {
-	_ = needed[0] // precondition: needed is non-empty
-
-	w.uint64(p.stringOff(file.Name()))
-
-	size := uint64(file.Size())
-	w.uint64(size)
-
-	// Sort the set of needed offsets. Duplicates are harmless.
-	slices.Sort(needed)
-
-	lines := file.Lines() // byte offset of each line start
-	w.uint64(uint64(len(lines)))
-
-	// Rather than record the entire array of line start offsets,
-	// we save only a sparse list of (index, offset) pairs for
-	// the start of each line that contains a needed position.
-	var sparse [][2]int // (index, offset) pairs
-outer:
-	for i, lineStart := range lines {
-		lineEnd := size
-		if i < len(lines)-1 {
-			lineEnd = uint64(lines[i+1])
-		}
-		// Does this line contains a needed offset?
-		if needed[0] < lineEnd {
-			sparse = append(sparse, [2]int{i, lineStart})
-			for needed[0] < lineEnd {
-				needed = needed[1:]
-				if len(needed) == 0 {
-					break outer
-				}
-			}
-		}
-	}
-
-	// Delta-encode the columns.
-	w.uint64(uint64(len(sparse)))
-	var prev [2]int
-	for _, pair := range sparse {
-		w.uint64(uint64(pair[0] - prev[0]))
-		w.uint64(uint64(pair[1] - prev[1]))
-		prev = pair
-	}
-}
-
-// writeIndex writes out an object index. mainIndex indicates whether
-// we're writing out the main index, which is also read by
-// non-compiler tools and includes a complete package description
-// (i.e., name and height).
-func (w *exportWriter) writeIndex(index map[types.Object]uint64) {
-	type pkgObj struct {
-		obj  types.Object
-		name string // qualified name; differs from obj.Name for type params
-	}
-	// Build a map from packages to objects from that package.
-	pkgObjs := map[*types.Package][]pkgObj{}
-
-	// For the main index, make sure to include every package that
-	// we reference, even if we're not exporting (or reexporting)
-	// any symbols from it.
-	if w.p.localpkg != nil {
-		pkgObjs[w.p.localpkg] = nil
-	}
-	for pkg := range w.p.allPkgs {
-		pkgObjs[pkg] = nil
-	}
-
-	for obj := range index {
-		name := w.p.exportName(obj)
-		pkgObjs[obj.Pkg()] = append(pkgObjs[obj.Pkg()], pkgObj{obj, name})
-	}
-
-	var pkgs []*types.Package
-	for pkg, objs := range pkgObjs {
-		pkgs = append(pkgs, pkg)
-
-		sort.Slice(objs, func(i, j int) bool {
-			return objs[i].name < objs[j].name
-		})
-	}
-
-	sort.Slice(pkgs, func(i, j int) bool {
-		return w.exportPath(pkgs[i]) < w.exportPath(pkgs[j])
-	})
-
-	w.uint64(uint64(len(pkgs)))
-	for _, pkg := range pkgs {
-		w.string(w.exportPath(pkg))
-		w.string(pkg.Name())
-		w.uint64(uint64(0)) // package height is not needed for go/types
-
-		objs := pkgObjs[pkg]
-		w.uint64(uint64(len(objs)))
-		for _, obj := range objs {
-			w.string(obj.name)
-			w.uint64(index[obj.obj])
-		}
-	}
-}
-
-// exportName returns the 'exported' name of an object. It differs from
-// obj.Name() only for type parameters (see tparamExportName for details).
-func (p *iexporter) exportName(obj types.Object) (res string) {
-	if name := p.tparamNames[obj]; name != "" {
-		return name
-	}
-	return obj.Name()
-}
-
-type iexporter struct {
-	fset    *token.FileSet
-	out     *bytes.Buffer
-	version int
-
-	shallow    bool                // don't put types from other packages in the index
-	objEncoder *objectpath.Encoder // encodes objects from other packages in shallow mode; lazily allocated
-	localpkg   *types.Package      // (nil in bundle mode)
-
-	// allPkgs tracks all packages that have been referenced by
-	// the export data, so we can ensure to include them in the
-	// main index.
-	allPkgs map[*types.Package]bool
-
-	declTodo objQueue
-
-	strings     intWriter
-	stringIndex map[string]uint64
-
-	// In shallow mode, object positions are encoded as (file, offset).
-	// Each file is recorded as a line-number table.
-	// Only the lines of needed positions are saved faithfully.
-	fileInfo  map[*token.File]uint64 // value is index in fileInfos
-	fileInfos []*filePositions
-
-	data0       intWriter
-	declIndex   map[types.Object]uint64
-	tparamNames map[types.Object]string // typeparam->exported name
-	typIndex    map[types.Type]uint64
-
-	indent int // for tracing support
-}
-
-type filePositions struct {
-	file   *token.File
-	needed []uint64 // unordered list of needed file offsets
-}
-
-func (p *iexporter) trace(format string, args ...any) {
-	if !trace {
-		// Call sites should also be guarded, but having this check here allows
-		// easily enabling/disabling debug trace statements.
-		return
-	}
-	fmt.Printf(strings.Repeat("..", p.indent)+format+"\n", args...)
-}
-
-// objectpathEncoder returns the lazily allocated objectpath.Encoder to use
-// when encoding objects in other packages during shallow export.
-//
-// Using a shared Encoder amortizes some of cost of objectpath search.
-func (p *iexporter) objectpathEncoder() *objectpath.Encoder {
-	if p.objEncoder == nil {
-		p.objEncoder = new(objectpath.Encoder)
-	}
-	return p.objEncoder
-}
-
-// stringOff returns the offset of s within the string section.
-// If not already present, it's added to the end.
-func (p *iexporter) stringOff(s string) uint64 {
-	off, ok := p.stringIndex[s]
-	if !ok {
-		off = uint64(p.strings.Len())
-		p.stringIndex[s] = off
-
-		p.strings.uint64(uint64(len(s)))
-		p.strings.WriteString(s)
-	}
-	return off
-}
-
-// fileIndexAndOffset returns the index of the token.File and the byte offset of pos within it.
-func (p *iexporter) fileIndexAndOffset(file *token.File, pos token.Pos) (uint64, uint64) {
-	index, ok := p.fileInfo[file]
-	if !ok {
-		index = uint64(len(p.fileInfo))
-		p.fileInfos = append(p.fileInfos, &filePositions{file: file})
-		if p.fileInfo == nil {
-			p.fileInfo = make(map[*token.File]uint64)
-		}
-		p.fileInfo[file] = index
-	}
-	// Record each needed offset.
-	info := p.fileInfos[index]
-	offset := uint64(file.Offset(pos))
-	info.needed = append(info.needed, offset)
-
-	return index, offset
-}
-
-// pushDecl adds n to the declaration work queue, if not already present.
-func (p *iexporter) pushDecl(obj types.Object) {
-	// Package unsafe is known to the compiler and predeclared.
-	// Caller should not ask us to do export it.
-	if obj.Pkg() == types.Unsafe {
-		panic("cannot export package unsafe")
-	}
-
-	// Shallow export data: don't index decls from other packages.
-	if p.shallow && obj.Pkg() != p.localpkg {
-		return
-	}
-
-	if _, ok := p.declIndex[obj]; ok {
-		return
-	}
-
-	p.declIndex[obj] = ^uint64(0) // mark obj present in work queue
-	p.declTodo.pushTail(obj)
-}
-
-// exportWriter handles writing out individual data section chunks.
-type exportWriter struct {
-	p *iexporter
-
-	data       intWriter
-	prevFile   string
-	prevLine   int64
-	prevColumn int64
-}
-
-func (w *exportWriter) exportPath(pkg *types.Package) string {
-	if pkg == w.p.localpkg {
-		return ""
-	}
-	return pkg.Path()
-}
-
-func (p *iexporter) doDecl(obj types.Object) {
-	if trace {
-		p.trace("exporting decl %v (%T)", obj, obj)
-		p.indent++
-		defer func() {
-			p.indent--
-			p.trace("=> %s", obj)
-		}()
-	}
-	w := p.newWriter()
-
-	switch obj := obj.(type) {
-	case *types.Var:
-		w.tag(varTag)
-		w.pos(obj.Pos())
-		w.typ(obj.Type(), obj.Pkg())
-
-	case *types.Func:
-		sig, _ := obj.Type().(*types.Signature)
-		if sig.Recv() != nil {
-			// We shouldn't see methods in the package scope,
-			// but the type checker may repair "func () F() {}"
-			// to "func (Invalid) F()" and then treat it like "func F()",
-			// so allow that. See golang/go#57729.
-			if sig.Recv().Type() != types.Typ[types.Invalid] {
-				panic(internalErrorf("unexpected method: %v", sig))
-			}
-		}
-
-		// Function.
-		if sig.TypeParams().Len() == 0 {
-			w.tag(funcTag)
-		} else {
-			w.tag(genericFuncTag)
-		}
-		w.pos(obj.Pos())
-		// The tparam list of the function type is the declaration of the type
-		// params. So, write out the type params right now. Then those type params
-		// will be referenced via their type offset (via typOff) in all other
-		// places in the signature and function where they are used.
-		//
-		// While importing the type parameters, tparamList computes and records
-		// their export name, so that it can be later used when writing the index.
-		if tparams := sig.TypeParams(); tparams.Len() > 0 {
-			w.tparamList(obj.Name(), tparams, obj.Pkg())
-		}
-		w.signature(sig)
-
-	case *types.Const:
-		w.tag(constTag)
-		w.pos(obj.Pos())
-		w.value(obj.Type(), obj.Val())
-
-	case *types.TypeName:
-		t := obj.Type()
-
-		if tparam, ok := types.Unalias(t).(*types.TypeParam); ok {
-			w.tag(typeParamTag)
-			w.pos(obj.Pos())
-			constraint := tparam.Constraint()
-			if p.version >= iexportVersionGo1_18 {
-				implicit := false
-				if iface, _ := types.Unalias(constraint).(*types.Interface); iface != nil {
-					implicit = iface.IsImplicit()
-				}
-				w.bool(implicit)
-			}
-			w.typ(constraint, obj.Pkg())
-			break
-		}
-
-		if obj.IsAlias() {
-			alias, materialized := t.(*types.Alias) // may fail when aliases are not enabled
-
-			var tparams *types.TypeParamList
-			if materialized {
-				tparams = aliases.TypeParams(alias)
-			}
-			if tparams.Len() == 0 {
-				w.tag(aliasTag)
-			} else {
-				w.tag(genericAliasTag)
-			}
-			w.pos(obj.Pos())
-			if tparams.Len() > 0 {
-				w.tparamList(obj.Name(), tparams, obj.Pkg())
-			}
-			if materialized {
-				// Preserve materialized aliases,
-				// even of non-exported types.
-				t = aliases.Rhs(alias)
-			}
-			w.typ(t, obj.Pkg())
-			break
-		}
-
-		// Defined type.
-		named, ok := t.(*types.Named)
-		if !ok {
-			panic(internalErrorf("%s is not a defined type", t))
-		}
-
-		if named.TypeParams().Len() == 0 {
-			w.tag(typeTag)
-		} else {
-			w.tag(genericTypeTag)
-		}
-		w.pos(obj.Pos())
-
-		if named.TypeParams().Len() > 0 {
-			// While importing the type parameters, tparamList computes and records
-			// their export name, so that it can be later used when writing the index.
-			w.tparamList(obj.Name(), named.TypeParams(), obj.Pkg())
-		}
-
-		underlying := named.Underlying()
-		w.typ(underlying, obj.Pkg())
-
-		if types.IsInterface(t) {
-			break
-		}
-
-		n := named.NumMethods()
-		w.uint64(uint64(n))
-		for i := range n {
-			m := named.Method(i)
-			w.pos(m.Pos())
-			w.string(m.Name())
-			sig, _ := m.Type().(*types.Signature)
-
-			// Receiver type parameters are type arguments of the receiver type, so
-			// their name must be qualified before exporting recv.
-			if rparams := sig.RecvTypeParams(); rparams.Len() > 0 {
-				prefix := obj.Name() + "." + m.Name()
-				for i := 0; i < rparams.Len(); i++ {
-					rparam := rparams.At(i)
-					name := tparamExportName(prefix, rparam)
-					w.p.tparamNames[rparam.Obj()] = name
-				}
-			}
-			w.param(sig.Recv())
-			w.signature(sig)
-		}
-
-	default:
-		panic(internalErrorf("unexpected object: %v", obj))
-	}
-
-	p.declIndex[obj] = w.flush()
-}
-
-func (w *exportWriter) tag(tag byte) {
-	w.data.WriteByte(tag)
-}
-
-func (w *exportWriter) pos(pos token.Pos) {
-	if w.p.shallow {
-		w.posV2(pos)
-	} else if w.p.version >= iexportVersionPosCol {
-		w.posV1(pos)
-	} else {
-		w.posV0(pos)
-	}
-}
-
-// posV2 encoding (used only in shallow mode) records positions as
-// (file, offset), where file is the index in the token.File table
-// (which records the file name and newline offsets) and offset is a
-// byte offset. It effectively ignores //line directives.
-func (w *exportWriter) posV2(pos token.Pos) {
-	if pos == token.NoPos {
-		w.uint64(0)
-		return
-	}
-	file := w.p.fset.File(pos) // fset must be non-nil
-	index, offset := w.p.fileIndexAndOffset(file, pos)
-	w.uint64(1 + index)
-	w.uint64(offset)
-}
-
-func (w *exportWriter) posV1(pos token.Pos) {
-	if w.p.fset == nil {
-		w.int64(0)
-		return
-	}
-
-	p := w.p.fset.Position(pos)
-	file := p.Filename
-	line := int64(p.Line)
-	column := int64(p.Column)
-
-	deltaColumn := (column - w.prevColumn) << 1
-	deltaLine := (line - w.prevLine) << 1
-
-	if file != w.prevFile {
-		deltaLine |= 1
-	}
-	if deltaLine != 0 {
-		deltaColumn |= 1
-	}
-
-	w.int64(deltaColumn)
-	if deltaColumn&1 != 0 {
-		w.int64(deltaLine)
-		if deltaLine&1 != 0 {
-			w.string(file)
-		}
-	}
-
-	w.prevFile = file
-	w.prevLine = line
-	w.prevColumn = column
-}
-
-func (w *exportWriter) posV0(pos token.Pos) {
-	if w.p.fset == nil {
-		w.int64(0)
-		return
-	}
-
-	p := w.p.fset.Position(pos)
-	file := p.Filename
-	line := int64(p.Line)
-
-	// When file is the same as the last position (common case),
-	// we can save a few bytes by delta encoding just the line
-	// number.
-	//
-	// Note: Because data objects may be read out of order (or not
-	// at all), we can only apply delta encoding within a single
-	// object. This is handled implicitly by tracking prevFile and
-	// prevLine as fields of exportWriter.
-
-	if file == w.prevFile {
-		delta := line - w.prevLine
-		w.int64(delta)
-		if delta == deltaNewFile {
-			w.int64(-1)
-		}
-	} else {
-		w.int64(deltaNewFile)
-		w.int64(line) // line >= 0
-		w.string(file)
-		w.prevFile = file
-	}
-	w.prevLine = line
-}
-
-func (w *exportWriter) pkg(pkg *types.Package) {
-	// Ensure any referenced packages are declared in the main index.
-	w.p.allPkgs[pkg] = true
-
-	w.string(w.exportPath(pkg))
-}
-
-func (w *exportWriter) qualifiedType(obj *types.TypeName) {
-	name := w.p.exportName(obj)
-
-	// Ensure any referenced declarations are written out too.
-	w.p.pushDecl(obj)
-	w.string(name)
-	w.pkg(obj.Pkg())
-}
-
-// TODO(rfindley): what does 'pkg' even mean here? It would be better to pass
-// it in explicitly into signatures and structs that may use it for
-// constructing fields.
-func (w *exportWriter) typ(t types.Type, pkg *types.Package) {
-	w.data.uint64(w.p.typOff(t, pkg))
-}
-
-func (p *iexporter) newWriter() *exportWriter {
-	return &exportWriter{p: p}
-}
-
-func (w *exportWriter) flush() uint64 {
-	off := uint64(w.p.data0.Len())
-	io.Copy(&w.p.data0, &w.data)
-	return off
-}
-
-func (p *iexporter) typOff(t types.Type, pkg *types.Package) uint64 {
-	off, ok := p.typIndex[t]
-	if !ok {
-		w := p.newWriter()
-		w.doTyp(t, pkg)
-		off = predeclReserved + w.flush()
-		p.typIndex[t] = off
-	}
-	return off
-}
-
-func (w *exportWriter) startType(k itag) {
-	w.data.uint64(uint64(k))
-}
-
-func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
-	if trace {
-		w.p.trace("exporting type %s (%T)", t, t)
-		w.p.indent++
-		defer func() {
-			w.p.indent--
-			w.p.trace("=> %s", t)
-		}()
-	}
-	switch t := t.(type) {
-	case *types.Alias:
-		if targs := aliases.TypeArgs(t); targs.Len() > 0 {
-			w.startType(instanceType)
-			w.pos(t.Obj().Pos())
-			w.typeList(targs, pkg)
-			w.typ(aliases.Origin(t), pkg)
-			return
-		}
-		w.startType(aliasType)
-		w.qualifiedType(t.Obj())
-
-	case *types.Named:
-		if targs := t.TypeArgs(); targs.Len() > 0 {
-			w.startType(instanceType)
-			// TODO(rfindley): investigate if this position is correct, and if it
-			// matters.
-			w.pos(t.Obj().Pos())
-			w.typeList(targs, pkg)
-			w.typ(t.Origin(), pkg)
-			return
-		}
-		w.startType(definedType)
-		w.qualifiedType(t.Obj())
-
-	case *types.TypeParam:
-		w.startType(typeParamType)
-		w.qualifiedType(t.Obj())
-
-	case *types.Pointer:
-		w.startType(pointerType)
-		w.typ(t.Elem(), pkg)
-
-	case *types.Slice:
-		w.startType(sliceType)
-		w.typ(t.Elem(), pkg)
-
-	case *types.Array:
-		w.startType(arrayType)
-		w.uint64(uint64(t.Len()))
-		w.typ(t.Elem(), pkg)
-
-	case *types.Chan:
-		w.startType(chanType)
-		// 1 RecvOnly; 2 SendOnly; 3 SendRecv
-		var dir uint64
-		switch t.Dir() {
-		case types.RecvOnly:
-			dir = 1
-		case types.SendOnly:
-			dir = 2
-		case types.SendRecv:
-			dir = 3
-		}
-		w.uint64(dir)
-		w.typ(t.Elem(), pkg)
-
-	case *types.Map:
-		w.startType(mapType)
-		w.typ(t.Key(), pkg)
-		w.typ(t.Elem(), pkg)
-
-	case *types.Signature:
-		w.startType(signatureType)
-		w.pkg(pkg)
-		w.signature(t)
-
-	case *types.Struct:
-		w.startType(structType)
-		n := t.NumFields()
-		// Even for struct{} we must emit some qualifying package, because that's
-		// what the compiler does, and thus that's what the importer expects.
-		fieldPkg := pkg
-		if n > 0 {
-			fieldPkg = t.Field(0).Pkg()
-		}
-		if fieldPkg == nil {
-			// TODO(rfindley): improve this very hacky logic.
-			//
-			// The importer expects a package to be set for all struct types, even
-			// those with no fields. A better encoding might be to set NumFields
-			// before pkg. setPkg panics with a nil package, which may be possible
-			// to reach with invalid packages (and perhaps valid packages, too?), so
-			// (arbitrarily) set the localpkg if available.
-			//
-			// Alternatively, we may be able to simply guarantee that pkg != nil, by
-			// reconsidering the encoding of constant values.
-			if w.p.shallow {
-				fieldPkg = w.p.localpkg
-			} else {
-				panic(internalErrorf("no package to set for empty struct"))
-			}
-		}
-		w.pkg(fieldPkg)
-		w.uint64(uint64(n))
-
-		for i := range n {
-			f := t.Field(i)
-			if w.p.shallow {
-				w.objectPath(f)
-			}
-			w.pos(f.Pos())
-			w.string(f.Name()) // unexported fields implicitly qualified by prior setPkg
-			w.typ(f.Type(), fieldPkg)
-			w.bool(f.Anonymous())
-			w.string(t.Tag(i)) // note (or tag)
-		}
-
-	case *types.Interface:
-		w.startType(interfaceType)
-		w.pkg(pkg)
-
-		n := t.NumEmbeddeds()
-		w.uint64(uint64(n))
-		for i := 0; i < n; i++ {
-			ft := t.EmbeddedType(i)
-			tPkg := pkg
-			if named, _ := types.Unalias(ft).(*types.Named); named != nil {
-				w.pos(named.Obj().Pos())
-			} else {
-				w.pos(token.NoPos)
-			}
-			w.typ(ft, tPkg)
-		}
-
-		// See comment for struct fields. In shallow mode we change the encoding
-		// for interface methods that are promoted from other packages.
-
-		n = t.NumExplicitMethods()
-		w.uint64(uint64(n))
-		for i := 0; i < n; i++ {
-			m := t.ExplicitMethod(i)
-			if w.p.shallow {
-				w.objectPath(m)
-			}
-			w.pos(m.Pos())
-			w.string(m.Name())
-			sig, _ := m.Type().(*types.Signature)
-			w.signature(sig)
-		}
-
-	case *types.Union:
-		w.startType(unionType)
-		nt := t.Len()
-		w.uint64(uint64(nt))
-		for i := range nt {
-			term := t.Term(i)
-			w.bool(term.Tilde())
-			w.typ(term.Type(), pkg)
-		}
-
-	default:
-		panic(internalErrorf("unexpected type: %v, %v", t, reflect.TypeOf(t)))
-	}
-}
-
-// objectPath writes the package and objectPath to use to look up obj in a
-// different package, when encoding in "shallow" mode.
-//
-// When doing a shallow import, the importer creates only the local package,
-// and requests package symbols for dependencies from the client.
-// However, certain types defined in the local package may hold objects defined
-// (perhaps deeply) within another package.
-//
-// For example, consider the following:
-//
-//	package a
-//	func F() chan * map[string] struct { X int }
-//
-//	package b
-//	import "a"
-//	var B = a.F()
-//
-// In this example, the type of b.B holds fields defined in package a.
-// In order to have the correct canonical objects for the field defined in the
-// type of B, they are encoded as objectPaths and later looked up in the
-// importer. The same problem applies to interface methods.
-func (w *exportWriter) objectPath(obj types.Object) {
-	if obj.Pkg() == nil || obj.Pkg() == w.p.localpkg {
-		// obj.Pkg() may be nil for the builtin error.Error.
-		// In this case, or if obj is declared in the local package, no need to
-		// encode.
-		w.string("")
-		return
-	}
-	objectPath, err := w.p.objectpathEncoder().For(obj)
-	if err != nil {
-		// Fall back to the empty string, which will cause the importer to create a
-		// new object, which matches earlier behavior. Creating a new object is
-		// sufficient for many purposes (such as type checking), but causes certain
-		// references algorithms to fail (golang/go#60819). However, we didn't
-		// notice this problem during months of gopls@v0.12.0 testing.
-		//
-		// TODO(golang/go#61674): this workaround is insufficient, as in the case
-		// where the field forwarded from an instantiated type that may not appear
-		// in the export data of the original package:
-		//
-		//  // package a
-		//  type A[P any] struct{ F P }
-		//
-		//  // package b
-		//  type B a.A[int]
-		//
-		// We need to update references algorithms not to depend on this
-		// de-duplication, at which point we may want to simply remove the
-		// workaround here.
-		w.string("")
-		return
-	}
-	w.string(string(objectPath))
-	w.pkg(obj.Pkg())
-}
-
-func (w *exportWriter) signature(sig *types.Signature) {
-	w.paramList(sig.Params())
-	w.paramList(sig.Results())
-	if sig.Params().Len() > 0 {
-		w.bool(sig.Variadic())
-	}
-}
-
-func (w *exportWriter) typeList(ts *types.TypeList, pkg *types.Package) {
-	w.uint64(uint64(ts.Len()))
-	for i := 0; i < ts.Len(); i++ {
-		w.typ(ts.At(i), pkg)
-	}
-}
-
-func (w *exportWriter) tparamList(prefix string, list *types.TypeParamList, pkg *types.Package) {
-	ll := uint64(list.Len())
-	w.uint64(ll)
-	for i := 0; i < list.Len(); i++ {
-		tparam := list.At(i)
-		// Set the type parameter exportName before exporting its type.
-		exportName := tparamExportName(prefix, tparam)
-		w.p.tparamNames[tparam.Obj()] = exportName
-		w.typ(list.At(i), pkg)
-	}
-}
-
-const blankMarker = "$"
-
-// tparamExportName returns the 'exported' name of a type parameter, which
-// differs from its actual object name: it is prefixed with a qualifier, and
-// blank type parameter names are disambiguated by their index in the type
-// parameter list.
-func tparamExportName(prefix string, tparam *types.TypeParam) string {
-	assert(prefix != "")
-	name := tparam.Obj().Name()
-	if name == "_" {
-		name = blankMarker + strconv.Itoa(tparam.Index())
-	}
-	return prefix + "." + name
-}
-
-// tparamName returns the real name of a type parameter, after stripping its
-// qualifying prefix and reverting blank-name encoding. See tparamExportName
-// for details.
-func tparamName(exportName string) string {
-	// Remove the "path" from the type param name that makes it unique.
-	ix := strings.LastIndex(exportName, ".")
-	if ix < 0 {
-		errorf("malformed type parameter export name %s: missing prefix", exportName)
-	}
-	name := exportName[ix+1:]
-	if strings.HasPrefix(name, blankMarker) {
-		return "_"
-	}
-	return name
-}
-
-func (w *exportWriter) paramList(tup *types.Tuple) {
-	n := tup.Len()
-	w.uint64(uint64(n))
-	for i := range n {
-		w.param(tup.At(i))
-	}
-}
-
-func (w *exportWriter) param(obj types.Object) {
-	w.pos(obj.Pos())
-	w.localIdent(obj)
-	w.typ(obj.Type(), obj.Pkg())
-}
-
-func (w *exportWriter) value(typ types.Type, v constant.Value) {
-	w.typ(typ, nil)
-	if w.p.version >= iexportVersionGo1_18 {
-		w.int64(int64(v.Kind()))
-	}
-
-	if v.Kind() == constant.Unknown {
-		// golang/go#60605: treat unknown constant values as if they have invalid type
-		//
-		// This loses some fidelity over the package type-checked from source, but that
-		// is acceptable.
-		//
-		// TODO(rfindley): we should switch on the recorded constant kind rather
-		// than the constant type
-		return
-	}
-
-	switch b := typ.Underlying().(*types.Basic); b.Info() & types.IsConstType {
-	case types.IsBoolean:
-		w.bool(constant.BoolVal(v))
-	case types.IsInteger:
-		var i big.Int
-		if i64, exact := constant.Int64Val(v); exact {
-			i.SetInt64(i64)
-		} else if ui64, exact := constant.Uint64Val(v); exact {
-			i.SetUint64(ui64)
-		} else {
-			i.SetString(v.ExactString(), 10)
-		}
-		w.mpint(&i, typ)
-	case types.IsFloat:
-		f := constantToFloat(v)
-		w.mpfloat(f, typ)
-	case types.IsComplex:
-		w.mpfloat(constantToFloat(constant.Real(v)), typ)
-		w.mpfloat(constantToFloat(constant.Imag(v)), typ)
-	case types.IsString:
-		w.string(constant.StringVal(v))
-	default:
-		if b.Kind() == types.Invalid {
-			// package contains type errors
-			break
-		}
-		panic(internalErrorf("unexpected type %v (%v)", typ, typ.Underlying()))
-	}
-}
-
-// constantToFloat converts a constant.Value with kind constant.Float to a
-// big.Float.
-func constantToFloat(x constant.Value) *big.Float {
-	x = constant.ToFloat(x)
-	// Use the same floating-point precision (512) as cmd/compile
-	// (see Mpprec in cmd/compile/internal/gc/mpfloat.go).
-	const mpprec = 512
-	var f big.Float
-	f.SetPrec(mpprec)
-	if v, exact := constant.Float64Val(x); exact {
-		// float64
-		f.SetFloat64(v)
-	} else if num, denom := constant.Num(x), constant.Denom(x); num.Kind() == constant.Int {
-		// TODO(gri): add big.Rat accessor to constant.Value.
-		n := valueToRat(num)
-		d := valueToRat(denom)
-		f.SetRat(n.Quo(n, d))
-	} else {
-		// Value too large to represent as a fraction => inaccessible.
-		// TODO(gri): add big.Float accessor to constant.Value.
-		_, ok := f.SetString(x.ExactString())
-		assert(ok)
-	}
-	return &f
-}
-
-func valueToRat(x constant.Value) *big.Rat {
-	// Convert little-endian to big-endian.
-	// I can't believe this is necessary.
-	bytes := constant.Bytes(x)
-	for i := 0; i < len(bytes)/2; i++ {
-		bytes[i], bytes[len(bytes)-1-i] = bytes[len(bytes)-1-i], bytes[i]
-	}
-	return new(big.Rat).SetInt(new(big.Int).SetBytes(bytes))
-}
-
-// mpint exports a multi-precision integer.
-//
-// For unsigned types, small values are written out as a single
-// byte. Larger values are written out as a length-prefixed big-endian
-// byte string, where the length prefix is encoded as its complement.
-// For example, bytes 0, 1, and 2 directly represent the integer
-// values 0, 1, and 2; while bytes 255, 254, and 253 indicate a 1-,
-// 2-, and 3-byte big-endian string follow.
-//
-// Encoding for signed types use the same general approach as for
-// unsigned types, except small values use zig-zag encoding and the
-// bottom bit of length prefix byte for large values is reserved as a
-// sign bit.
-//
-// The exact boundary between small and large encodings varies
-// according to the maximum number of bytes needed to encode a value
-// of type typ. As a special case, 8-bit types are always encoded as a
-// single byte.
-//
-// TODO(mdempsky): Is this level of complexity really worthwhile?
-func (w *exportWriter) mpint(x *big.Int, typ types.Type) {
-	basic, ok := typ.Underlying().(*types.Basic)
-	if !ok {
-		panic(internalErrorf("unexpected type %v (%T)", typ.Underlying(), typ.Underlying()))
-	}
-
-	signed, maxBytes := intSize(basic)
-
-	negative := x.Sign() < 0
-	if !signed && negative {
-		panic(internalErrorf("negative unsigned integer; type %v, value %v", typ, x))
-	}
-
-	b := x.Bytes()
-	if len(b) > 0 && b[0] == 0 {
-		panic(internalErrorf("leading zeros"))
-	}
-	if uint(len(b)) > maxBytes {
-		panic(internalErrorf("bad mpint length: %d > %d (type %v, value %v)", len(b), maxBytes, typ, x))
-	}
-
-	maxSmall := 256 - maxBytes
-	if signed {
-		maxSmall = 256 - 2*maxBytes
-	}
-	if maxBytes == 1 {
-		maxSmall = 256
-	}
-
-	// Check if x can use small value encoding.
-	if len(b) <= 1 {
-		var ux uint
-		if len(b) == 1 {
-			ux = uint(b[0])
-		}
-		if signed {
-			ux <<= 1
-			if negative {
-				ux--
-			}
-		}
-		if ux < maxSmall {
-			w.data.WriteByte(byte(ux))
-			return
-		}
-	}
-
-	n := 256 - uint(len(b))
-	if signed {
-		n = 256 - 2*uint(len(b))
-		if negative {
-			n |= 1
-		}
-	}
-	if n < maxSmall || n >= 256 {
-		panic(internalErrorf("encoding mistake: %d, %v, %v => %d", len(b), signed, negative, n))
-	}
-
-	w.data.WriteByte(byte(n))
-	w.data.Write(b)
-}
-
-// mpfloat exports a multi-precision floating point number.
-//
-// The number's value is decomposed into mantissa × 2**exponent, where
-// mantissa is an integer. The value is written out as mantissa (as a
-// multi-precision integer) and then the exponent, except exponent is
-// omitted if mantissa is zero.
-func (w *exportWriter) mpfloat(f *big.Float, typ types.Type) {
-	if f.IsInf() {
-		panic("infinite constant")
-	}
-
-	// Break into f = mant × 2**exp, with 0.5 <= mant < 1.
-	var mant big.Float
-	exp := int64(f.MantExp(&mant))
-
-	// Scale so that mant is an integer.
-	prec := mant.MinPrec()
-	mant.SetMantExp(&mant, int(prec))
-	exp -= int64(prec)
-
-	manti, acc := mant.Int(nil)
-	if acc != big.Exact {
-		panic(internalErrorf("mantissa scaling failed for %f (%s)", f, acc))
-	}
-	w.mpint(manti, typ)
-	if manti.Sign() != 0 {
-		w.int64(exp)
-	}
-}
-
-func (w *exportWriter) bool(b bool) bool {
-	var x uint64
-	if b {
-		x = 1
-	}
-	w.uint64(x)
-	return b
-}
-
-func (w *exportWriter) int64(x int64)   { w.data.int64(x) }
-func (w *exportWriter) uint64(x uint64) { w.data.uint64(x) }
-func (w *exportWriter) string(s string) { w.uint64(w.p.stringOff(s)) }
-
-func (w *exportWriter) localIdent(obj types.Object) {
-	// Anonymous parameters.
-	if obj == nil {
-		w.string("")
-		return
-	}
-
-	name := obj.Name()
-	if name == "_" {
-		w.string("_")
-		return
-	}
-
-	w.string(name)
-}
-
-type intWriter struct {
-	bytes.Buffer
-}
-
-func (w *intWriter) int64(x int64) {
-	var buf [binary.MaxVarintLen64]byte
-	n := binary.PutVarint(buf[:], x)
-	w.Write(buf[:n])
-}
-
-func (w *intWriter) uint64(x uint64) {
-	var buf [binary.MaxVarintLen64]byte
-	n := binary.PutUvarint(buf[:], x)
-	w.Write(buf[:n])
-}
-
-func assert(cond bool) {
-	if !cond {
-		panic("internal error: assertion failed")
-	}
-}
-
-// The below is copied from go/src/cmd/compile/internal/gc/syntax.go.
-
-// objQueue is a FIFO queue of types.Object. The zero value of objQueue is
-// a ready-to-use empty queue.
-type objQueue struct {
-	ring       []types.Object
-	head, tail int
-}
-
-// empty returns true if q contains no Nodes.
-func (q *objQueue) empty() bool {
-	return q.head == q.tail
-}
-
-// pushTail appends n to the tail of the queue.
-func (q *objQueue) pushTail(obj types.Object) {
-	if len(q.ring) == 0 {
-		q.ring = make([]types.Object, 16)
-	} else if q.head+len(q.ring) == q.tail {
-		// Grow the ring.
-		nring := make([]types.Object, len(q.ring)*2)
-		// Copy the old elements.
-		part := q.ring[q.head%len(q.ring):]
-		if q.tail-q.head <= len(part) {
-			part = part[:q.tail-q.head]
-			copy(nring, part)
-		} else {
-			pos := copy(nring, part)
-			copy(nring[pos:], q.ring[:q.tail%len(q.ring)])
-		}
-		q.ring, q.head, q.tail = nring, 0, q.tail-q.head
-	}
-
-	q.ring[q.tail%len(q.ring)] = obj
-	q.tail++
-}
-
-// popHead pops a node from the head of the queue. It panics if q is empty.
-func (q *objQueue) popHead() types.Object {
-	if q.empty() {
-		panic("dequeue empty")
-	}
-	obj := q.ring[q.head%len(q.ring)]
-	q.head++
-	return obj
-}
-
-// internalError represents an error generated inside this package.
-type internalError string
-
-func (e internalError) Error() string { return "gcimporter: " + string(e) }
-
-// TODO(adonovan): make this call panic, so that it's symmetric with errorf.
-// Otherwise it's easy to forget to do anything with the error.
-//
-// TODO(adonovan): also, consider switching the names "errorf" and
-// "internalErrorf" as the former is used for bugs, whose cause is
-// internal inconsistency, whereas the latter is used for ordinary
-// situations like bad input, whose cause is external.
-func internalErrorf(format string, args ...any) error {
-	return internalError(fmt.Sprintf(format, args...))
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/iimport.go b/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
deleted file mode 100644
index 82e6c9d..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
+++ /dev/null
@@ -1,1120 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Indexed package import.
-// See iexport.go for the export data format.
-
-package gcimporter
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"go/constant"
-	"go/token"
-	"go/types"
-	"io"
-	"math/big"
-	"slices"
-	"sort"
-	"strings"
-
-	"golang.org/x/tools/go/types/objectpath"
-	"golang.org/x/tools/internal/aliases"
-	"golang.org/x/tools/internal/typesinternal"
-)
-
-type intReader struct {
-	*bytes.Reader
-	path string
-}
-
-func (r *intReader) int64() int64 {
-	i, err := binary.ReadVarint(r.Reader)
-	if err != nil {
-		errorf("import %q: read varint error: %v", r.path, err)
-	}
-	return i
-}
-
-func (r *intReader) uint64() uint64 {
-	i, err := binary.ReadUvarint(r.Reader)
-	if err != nil {
-		errorf("import %q: read varint error: %v", r.path, err)
-	}
-	return i
-}
-
-// Keep this in sync with constants in iexport.go.
-const (
-	iexportVersionGo1_11   = 0
-	iexportVersionPosCol   = 1
-	iexportVersionGo1_18   = 2
-	iexportVersionGenerics = 2
-	iexportVersion         = iexportVersionGenerics
-
-	iexportVersionCurrent = 2
-)
-
-type ident struct {
-	pkg  *types.Package
-	name string
-}
-
-const predeclReserved = 32
-
-type itag uint64
-
-const (
-	// Types
-	definedType itag = iota
-	pointerType
-	sliceType
-	arrayType
-	chanType
-	mapType
-	signatureType
-	structType
-	interfaceType
-	typeParamType
-	instanceType
-	unionType
-	aliasType
-)
-
-// Object tags
-const (
-	varTag          = 'V'
-	funcTag         = 'F'
-	genericFuncTag  = 'G'
-	constTag        = 'C'
-	aliasTag        = 'A'
-	genericAliasTag = 'B'
-	typeParamTag    = 'P'
-	typeTag         = 'T'
-	genericTypeTag  = 'U'
-)
-
-// IImportData imports a package from the serialized package data
-// and returns 0 and a reference to the package.
-// If the export data version is not recognized or the format is otherwise
-// compromised, an error is returned.
-func IImportData(fset *token.FileSet, imports map[string]*types.Package, data []byte, path string) (int, *types.Package, error) {
-	pkgs, err := iimportCommon(fset, GetPackagesFromMap(imports), data, false, path, false, nil)
-	if err != nil {
-		return 0, nil, err
-	}
-	return 0, pkgs[0], nil
-}
-
-// IImportBundle imports a set of packages from the serialized package bundle.
-func IImportBundle(fset *token.FileSet, imports map[string]*types.Package, data []byte) ([]*types.Package, error) {
-	return iimportCommon(fset, GetPackagesFromMap(imports), data, true, "", false, nil)
-}
-
-// A GetPackagesFunc function obtains the non-nil symbols for a set of
-// packages, creating and recursively importing them as needed. An
-// implementation should store each package symbol is in the Pkg
-// field of the items array.
-//
-// Any error causes importing to fail. This can be used to quickly read
-// the import manifest of an export data file without fully decoding it.
-type GetPackagesFunc = func(items []GetPackagesItem) error
-
-// A GetPackagesItem is a request from the importer for the package
-// symbol of the specified name and path.
-type GetPackagesItem struct {
-	Name, Path string
-	Pkg        *types.Package // to be filled in by GetPackagesFunc call
-
-	// private importer state
-	pathOffset uint64
-	nameIndex  map[string]uint64
-}
-
-// GetPackagesFromMap returns a GetPackagesFunc that retrieves
-// packages from the given map of package path to package.
-//
-// The returned function may mutate m: each requested package that is not
-// found is created with types.NewPackage and inserted into m.
-func GetPackagesFromMap(m map[string]*types.Package) GetPackagesFunc {
-	return func(items []GetPackagesItem) error {
-		for i, item := range items {
-			pkg, ok := m[item.Path]
-			if !ok {
-				pkg = types.NewPackage(item.Path, item.Name)
-				m[item.Path] = pkg
-			}
-			items[i].Pkg = pkg
-		}
-		return nil
-	}
-}
-
-func iimportCommon(fset *token.FileSet, getPackages GetPackagesFunc, data []byte, bundle bool, path string, shallow bool, reportf ReportFunc) (pkgs []*types.Package, err error) {
-	const currentVersion = iexportVersionCurrent
-	version := int64(-1)
-	if !debug {
-		defer func() {
-			if e := recover(); e != nil {
-				if bundle {
-					err = fmt.Errorf("%v", e)
-				} else if version > currentVersion {
-					err = fmt.Errorf("cannot import %q (%v), export data is newer version - update tool", path, e)
-				} else {
-					err = fmt.Errorf("internal error while importing %q (%v); please report an issue", path, e)
-				}
-			}
-		}()
-	}
-
-	r := &intReader{bytes.NewReader(data), path}
-
-	if bundle {
-		if v := r.uint64(); v != bundleVersion {
-			errorf("unknown bundle format version %d", v)
-		}
-	}
-
-	version = int64(r.uint64())
-	switch version {
-	case iexportVersionGo1_18, iexportVersionPosCol, iexportVersionGo1_11:
-	default:
-		if version > iexportVersionGo1_18 {
-			errorf("unstable iexport format version %d, just rebuild compiler and std library", version)
-		} else {
-			errorf("unknown iexport format version %d", version)
-		}
-	}
-
-	sLen := int64(r.uint64())
-	var fLen int64
-	var fileOffset []uint64
-	if shallow {
-		// Shallow mode uses a different position encoding.
-		fLen = int64(r.uint64())
-		fileOffset = make([]uint64, r.uint64())
-		for i := range fileOffset {
-			fileOffset[i] = r.uint64()
-		}
-	}
-	dLen := int64(r.uint64())
-
-	whence, _ := r.Seek(0, io.SeekCurrent)
-	stringData := data[whence : whence+sLen]
-	fileData := data[whence+sLen : whence+sLen+fLen]
-	declData := data[whence+sLen+fLen : whence+sLen+fLen+dLen]
-	r.Seek(sLen+fLen+dLen, io.SeekCurrent)
-
-	p := iimporter{
-		version: int(version),
-		ipath:   path,
-		aliases: aliases.Enabled(),
-		shallow: shallow,
-		reportf: reportf,
-
-		stringData:  stringData,
-		stringCache: make(map[uint64]string),
-		fileOffset:  fileOffset,
-		fileData:    fileData,
-		fileCache:   make([]*token.File, len(fileOffset)),
-		pkgCache:    make(map[uint64]*types.Package),
-
-		declData: declData,
-		pkgIndex: make(map[*types.Package]map[string]uint64),
-		typCache: make(map[uint64]types.Type),
-		// Separate map for typeparams, keyed by their package and unique
-		// name.
-		tparamIndex: make(map[ident]types.Type),
-
-		fake: fakeFileSet{
-			fset:  fset,
-			files: make(map[string]*fileInfo),
-		},
-	}
-	defer p.fake.setLines() // set lines for files in fset
-
-	for i, pt := range predeclared() {
-		p.typCache[uint64(i)] = pt
-	}
-
-	// Gather the relevant packages from the manifest.
-	items := make([]GetPackagesItem, r.uint64())
-	uniquePkgPaths := make(map[string]bool)
-	for i := range items {
-		pkgPathOff := r.uint64()
-		pkgPath := p.stringAt(pkgPathOff)
-		pkgName := p.stringAt(r.uint64())
-		_ = r.uint64() // package height; unused by go/types
-
-		if pkgPath == "" {
-			pkgPath = path
-		}
-		items[i].Name = pkgName
-		items[i].Path = pkgPath
-		items[i].pathOffset = pkgPathOff
-
-		// Read index for package.
-		nameIndex := make(map[string]uint64)
-		nSyms := r.uint64()
-		// In shallow mode, only the current package (i=0) has an index.
-		assert(!(shallow && i > 0 && nSyms != 0))
-		for ; nSyms > 0; nSyms-- {
-			name := p.stringAt(r.uint64())
-			nameIndex[name] = r.uint64()
-		}
-
-		items[i].nameIndex = nameIndex
-
-		uniquePkgPaths[pkgPath] = true
-	}
-	// Debugging #63822; hypothesis: there are duplicate PkgPaths.
-	if len(uniquePkgPaths) != len(items) {
-		reportf("found duplicate PkgPaths while reading export data manifest: %v", items)
-	}
-
-	// Request packages all at once from the client,
-	// enabling a parallel implementation.
-	if err := getPackages(items); err != nil {
-		return nil, err // don't wrap this error
-	}
-
-	// Check the results and complete the index.
-	pkgList := make([]*types.Package, len(items))
-	for i, item := range items {
-		pkg := item.Pkg
-		if pkg == nil {
-			errorf("internal error: getPackages returned nil package for %q", item.Path)
-		} else if pkg.Path() != item.Path {
-			errorf("internal error: getPackages returned wrong path %q, want %q", pkg.Path(), item.Path)
-		} else if pkg.Name() != item.Name {
-			errorf("internal error: getPackages returned wrong name %s for package %q, want %s", pkg.Name(), item.Path, item.Name)
-		}
-		p.pkgCache[item.pathOffset] = pkg
-		p.pkgIndex[pkg] = item.nameIndex
-		pkgList[i] = pkg
-	}
-
-	if bundle {
-		pkgs = make([]*types.Package, r.uint64())
-		for i := range pkgs {
-			pkg := p.pkgAt(r.uint64())
-			imps := make([]*types.Package, r.uint64())
-			for j := range imps {
-				imps[j] = p.pkgAt(r.uint64())
-			}
-			pkg.SetImports(imps)
-			pkgs[i] = pkg
-		}
-	} else {
-		if len(pkgList) == 0 {
-			errorf("no packages found for %s", path)
-			panic("unreachable")
-		}
-		pkgs = pkgList[:1]
-
-		// record all referenced packages as imports
-		list := slices.Clone(pkgList[1:])
-		sort.Sort(byPath(list))
-		pkgs[0].SetImports(list)
-	}
-
-	for _, pkg := range pkgs {
-		if pkg.Complete() {
-			continue
-		}
-
-		names := make([]string, 0, len(p.pkgIndex[pkg]))
-		for name := range p.pkgIndex[pkg] {
-			names = append(names, name)
-		}
-		sort.Strings(names)
-		for _, name := range names {
-			p.doDecl(pkg, name)
-		}
-
-		// package was imported completely and without errors
-		pkg.MarkComplete()
-	}
-
-	// SetConstraint can't be called if the constraint type is not yet complete.
-	// When type params are created in the typeParamTag case of (*importReader).obj(),
-	// the associated constraint type may not be complete due to recursion.
-	// Therefore, we defer calling SetConstraint there, and call it here instead
-	// after all types are complete.
-	for _, d := range p.later {
-		d.t.SetConstraint(d.constraint)
-	}
-
-	for _, typ := range p.interfaceList {
-		typ.Complete()
-	}
-
-	// Workaround for golang/go#61561. See the doc for instanceList for details.
-	for _, typ := range p.instanceList {
-		if iface, _ := typ.Underlying().(*types.Interface); iface != nil {
-			iface.Complete()
-		}
-	}
-
-	return pkgs, nil
-}
-
-type setConstraintArgs struct {
-	t          *types.TypeParam
-	constraint types.Type
-}
-
-type iimporter struct {
-	version int
-	ipath   string
-
-	aliases bool
-	shallow bool
-	reportf ReportFunc // if non-nil, used to report bugs
-
-	stringData  []byte
-	stringCache map[uint64]string
-	fileOffset  []uint64 // fileOffset[i] is offset in fileData for info about file encoded as i
-	fileData    []byte
-	fileCache   []*token.File // memoized decoding of file encoded as i
-	pkgCache    map[uint64]*types.Package
-
-	declData    []byte
-	pkgIndex    map[*types.Package]map[string]uint64
-	typCache    map[uint64]types.Type
-	tparamIndex map[ident]types.Type
-
-	fake          fakeFileSet
-	interfaceList []*types.Interface
-
-	// Workaround for the go/types bug golang/go#61561: instances produced during
-	// instantiation may contain incomplete interfaces. Here we only complete the
-	// underlying type of the instance, which is the most common case but doesn't
-	// handle parameterized interface literals defined deeper in the type.
-	instanceList []types.Type // instances for later completion (see golang/go#61561)
-
-	// Arguments for calls to SetConstraint that are deferred due to recursive types
-	later []setConstraintArgs
-
-	indent int // for tracing support
-}
-
-func (p *iimporter) trace(format string, args ...any) {
-	if !trace {
-		// Call sites should also be guarded, but having this check here allows
-		// easily enabling/disabling debug trace statements.
-		return
-	}
-	fmt.Printf(strings.Repeat("..", p.indent)+format+"\n", args...)
-}
-
-func (p *iimporter) doDecl(pkg *types.Package, name string) {
-	if debug {
-		p.trace("import decl %s", name)
-		p.indent++
-		defer func() {
-			p.indent--
-			p.trace("=> %s", name)
-		}()
-	}
-	// See if we've already imported this declaration.
-	if obj := pkg.Scope().Lookup(name); obj != nil {
-		return
-	}
-
-	off, ok := p.pkgIndex[pkg][name]
-	if !ok {
-		// In deep mode, the index should be complete. In shallow
-		// mode, we should have already recursively loaded necessary
-		// dependencies so the above Lookup succeeds.
-		errorf("%v.%v not in index", pkg, name)
-	}
-
-	r := &importReader{p: p, currPkg: pkg}
-	r.declReader.Reset(p.declData[off:])
-
-	r.obj(name)
-}
-
-func (p *iimporter) stringAt(off uint64) string {
-	if s, ok := p.stringCache[off]; ok {
-		return s
-	}
-
-	slen, n := binary.Uvarint(p.stringData[off:])
-	if n <= 0 {
-		errorf("varint failed")
-	}
-	spos := off + uint64(n)
-	s := string(p.stringData[spos : spos+slen])
-	p.stringCache[off] = s
-	return s
-}
-
-func (p *iimporter) fileAt(index uint64) *token.File {
-	file := p.fileCache[index]
-	if file == nil {
-		off := p.fileOffset[index]
-		file = p.decodeFile(intReader{bytes.NewReader(p.fileData[off:]), p.ipath})
-		p.fileCache[index] = file
-	}
-	return file
-}
-
-func (p *iimporter) decodeFile(rd intReader) *token.File {
-	filename := p.stringAt(rd.uint64())
-	size := int(rd.uint64())
-	file := p.fake.fset.AddFile(filename, -1, size)
-
-	// SetLines requires a nondecreasing sequence.
-	// Because it is common for clients to derive the interval
-	// [start, start+len(name)] from a start position, and we
-	// want to ensure that the end offset is on the same line,
-	// we fill in the gaps of the sparse encoding with values
-	// that strictly increase by the largest possible amount.
-	// This allows us to avoid having to record the actual end
-	// offset of each needed line.
-
-	lines := make([]int, int(rd.uint64()))
-	var index, offset int
-	for i, n := 0, int(rd.uint64()); i < n; i++ {
-		index += int(rd.uint64())
-		offset += int(rd.uint64())
-		lines[index] = offset
-
-		// Ensure monotonicity between points.
-		for j := index - 1; j > 0 && lines[j] == 0; j-- {
-			lines[j] = lines[j+1] - 1
-		}
-	}
-
-	// Ensure monotonicity after last point.
-	for j := len(lines) - 1; j > 0 && lines[j] == 0; j-- {
-		size--
-		lines[j] = size
-	}
-
-	if !file.SetLines(lines) {
-		errorf("SetLines failed: %d", lines) // can't happen
-	}
-	return file
-}
-
-func (p *iimporter) pkgAt(off uint64) *types.Package {
-	if pkg, ok := p.pkgCache[off]; ok {
-		return pkg
-	}
-	path := p.stringAt(off)
-	errorf("missing package %q in %q", path, p.ipath)
-	return nil
-}
-
-func (p *iimporter) typAt(off uint64, base *types.Named) types.Type {
-	if t, ok := p.typCache[off]; ok && canReuse(base, t) {
-		return t
-	}
-
-	if off < predeclReserved {
-		errorf("predeclared type missing from cache: %v", off)
-	}
-
-	r := &importReader{p: p}
-	r.declReader.Reset(p.declData[off-predeclReserved:])
-	t := r.doType(base)
-
-	if canReuse(base, t) {
-		p.typCache[off] = t
-	}
-	return t
-}
-
-// canReuse reports whether the type rhs on the RHS of the declaration for def
-// may be re-used.
-//
-// Specifically, if def is non-nil and rhs is an interface type with methods, it
-// may not be re-used because we have a convention of setting the receiver type
-// for interface methods to def.
-func canReuse(def *types.Named, rhs types.Type) bool {
-	if def == nil {
-		return true
-	}
-	iface, _ := types.Unalias(rhs).(*types.Interface)
-	if iface == nil {
-		return true
-	}
-	// Don't use iface.Empty() here as iface may not be complete.
-	return iface.NumEmbeddeds() == 0 && iface.NumExplicitMethods() == 0
-}
-
-type importReader struct {
-	p          *iimporter
-	declReader bytes.Reader
-	currPkg    *types.Package
-	prevFile   string
-	prevLine   int64
-	prevColumn int64
-}
-
-// markBlack is redefined in iimport_go123.go, to work around golang/go#69912.
-//
-// If TypeNames are not marked black (in the sense of go/types cycle
-// detection), they may be mutated when dot-imported. Fix this by punching a
-// hole through the type, when compiling with Go 1.23. (The bug has been fixed
-// for 1.24, but the fix was not worth back-porting).
-var markBlack = func(name *types.TypeName) {}
-
-func (r *importReader) obj(name string) {
-	tag := r.byte()
-	pos := r.pos()
-
-	switch tag {
-	case aliasTag, genericAliasTag:
-		var tparams []*types.TypeParam
-		if tag == genericAliasTag {
-			tparams = r.tparamList()
-		}
-		typ := r.typ()
-		obj := aliases.NewAlias(r.p.aliases, pos, r.currPkg, name, typ, tparams)
-		markBlack(obj) // workaround for golang/go#69912
-		r.declare(obj)
-
-	case constTag:
-		typ, val := r.value()
-
-		r.declare(types.NewConst(pos, r.currPkg, name, typ, val))
-
-	case funcTag, genericFuncTag:
-		var tparams []*types.TypeParam
-		if tag == genericFuncTag {
-			tparams = r.tparamList()
-		}
-		sig := r.signature(nil, nil, tparams)
-		r.declare(types.NewFunc(pos, r.currPkg, name, sig))
-
-	case typeTag, genericTypeTag:
-		// Types can be recursive. We need to setup a stub
-		// declaration before recursing.
-		obj := types.NewTypeName(pos, r.currPkg, name, nil)
-		named := types.NewNamed(obj, nil, nil)
-
-		markBlack(obj) // workaround for golang/go#69912
-
-		// Declare obj before calling r.tparamList, so the new type name is recognized
-		// if used in the constraint of one of its own typeparams (see #48280).
-		r.declare(obj)
-		if tag == genericTypeTag {
-			tparams := r.tparamList()
-			named.SetTypeParams(tparams)
-		}
-
-		underlying := r.p.typAt(r.uint64(), named).Underlying()
-		named.SetUnderlying(underlying)
-
-		if !isInterface(underlying) {
-			for n := r.uint64(); n > 0; n-- {
-				mpos := r.pos()
-				mname := r.ident()
-				recv := r.param()
-
-				// If the receiver has any targs, set those as the
-				// rparams of the method (since those are the
-				// typeparams being used in the method sig/body).
-				_, recvNamed := typesinternal.ReceiverNamed(recv)
-				targs := recvNamed.TypeArgs()
-				var rparams []*types.TypeParam
-				if targs.Len() > 0 {
-					rparams = make([]*types.TypeParam, targs.Len())
-					for i := range rparams {
-						rparams[i] = types.Unalias(targs.At(i)).(*types.TypeParam)
-					}
-				}
-				msig := r.signature(recv, rparams, nil)
-
-				named.AddMethod(types.NewFunc(mpos, r.currPkg, mname, msig))
-			}
-		}
-
-	case typeParamTag:
-		// We need to "declare" a typeparam in order to have a name that
-		// can be referenced recursively (if needed) in the type param's
-		// bound.
-		if r.p.version < iexportVersionGenerics {
-			errorf("unexpected type param type")
-		}
-		name0 := tparamName(name)
-		tn := types.NewTypeName(pos, r.currPkg, name0, nil)
-		t := types.NewTypeParam(tn, nil)
-
-		// To handle recursive references to the typeparam within its
-		// bound, save the partial type in tparamIndex before reading the bounds.
-		id := ident{r.currPkg, name}
-		r.p.tparamIndex[id] = t
-		var implicit bool
-		if r.p.version >= iexportVersionGo1_18 {
-			implicit = r.bool()
-		}
-		constraint := r.typ()
-		if implicit {
-			iface, _ := types.Unalias(constraint).(*types.Interface)
-			if iface == nil {
-				errorf("non-interface constraint marked implicit")
-			}
-			iface.MarkImplicit()
-		}
-		// The constraint type may not be complete, if we
-		// are in the middle of a type recursion involving type
-		// constraints. So, we defer SetConstraint until we have
-		// completely set up all types in ImportData.
-		r.p.later = append(r.p.later, setConstraintArgs{t: t, constraint: constraint})
-
-	case varTag:
-		typ := r.typ()
-
-		v := types.NewVar(pos, r.currPkg, name, typ)
-		typesinternal.SetVarKind(v, typesinternal.PackageVar)
-		r.declare(v)
-
-	default:
-		errorf("unexpected tag: %v", tag)
-	}
-}
-
-func (r *importReader) declare(obj types.Object) {
-	obj.Pkg().Scope().Insert(obj)
-}
-
-func (r *importReader) value() (typ types.Type, val constant.Value) {
-	typ = r.typ()
-	if r.p.version >= iexportVersionGo1_18 {
-		// TODO: add support for using the kind.
-		_ = constant.Kind(r.int64())
-	}
-
-	switch b := typ.Underlying().(*types.Basic); b.Info() & types.IsConstType {
-	case types.IsBoolean:
-		val = constant.MakeBool(r.bool())
-
-	case types.IsString:
-		val = constant.MakeString(r.string())
-
-	case types.IsInteger:
-		var x big.Int
-		r.mpint(&x, b)
-		val = constant.Make(&x)
-
-	case types.IsFloat:
-		val = r.mpfloat(b)
-
-	case types.IsComplex:
-		re := r.mpfloat(b)
-		im := r.mpfloat(b)
-		val = constant.BinaryOp(re, token.ADD, constant.MakeImag(im))
-
-	default:
-		if b.Kind() == types.Invalid {
-			val = constant.MakeUnknown()
-			return
-		}
-		errorf("unexpected type %v", typ) // panics
-		panic("unreachable")
-	}
-
-	return
-}
-
-func intSize(b *types.Basic) (signed bool, maxBytes uint) {
-	if (b.Info() & types.IsUntyped) != 0 {
-		return true, 64
-	}
-
-	switch b.Kind() {
-	case types.Float32, types.Complex64:
-		return true, 3
-	case types.Float64, types.Complex128:
-		return true, 7
-	}
-
-	signed = (b.Info() & types.IsUnsigned) == 0
-	switch b.Kind() {
-	case types.Int8, types.Uint8:
-		maxBytes = 1
-	case types.Int16, types.Uint16:
-		maxBytes = 2
-	case types.Int32, types.Uint32:
-		maxBytes = 4
-	default:
-		maxBytes = 8
-	}
-
-	return
-}
-
-func (r *importReader) mpint(x *big.Int, typ *types.Basic) {
-	signed, maxBytes := intSize(typ)
-
-	maxSmall := 256 - maxBytes
-	if signed {
-		maxSmall = 256 - 2*maxBytes
-	}
-	if maxBytes == 1 {
-		maxSmall = 256
-	}
-
-	n, _ := r.declReader.ReadByte()
-	if uint(n) < maxSmall {
-		v := int64(n)
-		if signed {
-			v >>= 1
-			if n&1 != 0 {
-				v = ^v
-			}
-		}
-		x.SetInt64(v)
-		return
-	}
-
-	v := -n
-	if signed {
-		v = -(n &^ 1) >> 1
-	}
-	if v < 1 || uint(v) > maxBytes {
-		errorf("weird decoding: %v, %v => %v", n, signed, v)
-	}
-	b := make([]byte, v)
-	io.ReadFull(&r.declReader, b)
-	x.SetBytes(b)
-	if signed && n&1 != 0 {
-		x.Neg(x)
-	}
-}
-
-func (r *importReader) mpfloat(typ *types.Basic) constant.Value {
-	var mant big.Int
-	r.mpint(&mant, typ)
-	var f big.Float
-	f.SetInt(&mant)
-	if f.Sign() != 0 {
-		f.SetMantExp(&f, int(r.int64()))
-	}
-	return constant.Make(&f)
-}
-
-func (r *importReader) ident() string {
-	return r.string()
-}
-
-func (r *importReader) qualifiedIdent() (*types.Package, string) {
-	name := r.string()
-	pkg := r.pkg()
-	return pkg, name
-}
-
-func (r *importReader) pos() token.Pos {
-	if r.p.shallow {
-		// precise offsets are encoded only in shallow mode
-		return r.posv2()
-	}
-	if r.p.version >= iexportVersionPosCol {
-		r.posv1()
-	} else {
-		r.posv0()
-	}
-
-	if r.prevFile == "" && r.prevLine == 0 && r.prevColumn == 0 {
-		return token.NoPos
-	}
-	return r.p.fake.pos(r.prevFile, int(r.prevLine), int(r.prevColumn))
-}
-
-func (r *importReader) posv0() {
-	delta := r.int64()
-	if delta != deltaNewFile {
-		r.prevLine += delta
-	} else if l := r.int64(); l == -1 {
-		r.prevLine += deltaNewFile
-	} else {
-		r.prevFile = r.string()
-		r.prevLine = l
-	}
-}
-
-func (r *importReader) posv1() {
-	delta := r.int64()
-	r.prevColumn += delta >> 1
-	if delta&1 != 0 {
-		delta = r.int64()
-		r.prevLine += delta >> 1
-		if delta&1 != 0 {
-			r.prevFile = r.string()
-		}
-	}
-}
-
-func (r *importReader) posv2() token.Pos {
-	file := r.uint64()
-	if file == 0 {
-		return token.NoPos
-	}
-	tf := r.p.fileAt(file - 1)
-	return tf.Pos(int(r.uint64()))
-}
-
-func (r *importReader) typ() types.Type {
-	return r.p.typAt(r.uint64(), nil)
-}
-
-func isInterface(t types.Type) bool {
-	_, ok := types.Unalias(t).(*types.Interface)
-	return ok
-}
-
-func (r *importReader) pkg() *types.Package { return r.p.pkgAt(r.uint64()) }
-func (r *importReader) string() string      { return r.p.stringAt(r.uint64()) }
-
-func (r *importReader) doType(base *types.Named) (res types.Type) {
-	k := r.kind()
-	if debug {
-		r.p.trace("importing type %d (base: %v)", k, base)
-		r.p.indent++
-		defer func() {
-			r.p.indent--
-			r.p.trace("=> %s", res)
-		}()
-	}
-	switch k {
-	default:
-		errorf("unexpected kind tag in %q: %v", r.p.ipath, k)
-		return nil
-
-	case aliasType, definedType:
-		pkg, name := r.qualifiedIdent()
-		r.p.doDecl(pkg, name)
-		return pkg.Scope().Lookup(name).(*types.TypeName).Type()
-	case pointerType:
-		return types.NewPointer(r.typ())
-	case sliceType:
-		return types.NewSlice(r.typ())
-	case arrayType:
-		n := r.uint64()
-		return types.NewArray(r.typ(), int64(n))
-	case chanType:
-		dir := chanDir(int(r.uint64()))
-		return types.NewChan(dir, r.typ())
-	case mapType:
-		return types.NewMap(r.typ(), r.typ())
-	case signatureType:
-		r.currPkg = r.pkg()
-		return r.signature(nil, nil, nil)
-
-	case structType:
-		r.currPkg = r.pkg()
-
-		fields := make([]*types.Var, r.uint64())
-		tags := make([]string, len(fields))
-		for i := range fields {
-			var field *types.Var
-			if r.p.shallow {
-				field, _ = r.objectPathObject().(*types.Var)
-			}
-
-			fpos := r.pos()
-			fname := r.ident()
-			ftyp := r.typ()
-			emb := r.bool()
-			tag := r.string()
-
-			// Either this is not a shallow import, the field is local, or the
-			// encoded objectPath failed to produce an object (a bug).
-			//
-			// Even in this last, buggy case, fall back on creating a new field. As
-			// discussed in iexport.go, this is not correct, but mostly works and is
-			// preferable to failing (for now at least).
-			if field == nil {
-				field = types.NewField(fpos, r.currPkg, fname, ftyp, emb)
-			}
-
-			fields[i] = field
-			tags[i] = tag
-		}
-		return types.NewStruct(fields, tags)
-
-	case interfaceType:
-		r.currPkg = r.pkg()
-
-		embeddeds := make([]types.Type, r.uint64())
-		for i := range embeddeds {
-			_ = r.pos()
-			embeddeds[i] = r.typ()
-		}
-
-		methods := make([]*types.Func, r.uint64())
-		for i := range methods {
-			var method *types.Func
-			if r.p.shallow {
-				method, _ = r.objectPathObject().(*types.Func)
-			}
-
-			mpos := r.pos()
-			mname := r.ident()
-
-			// TODO(mdempsky): Matches bimport.go, but I
-			// don't agree with this.
-			var recv *types.Var
-			if base != nil {
-				recv = types.NewVar(token.NoPos, r.currPkg, "", base)
-			}
-			msig := r.signature(recv, nil, nil)
-
-			if method == nil {
-				method = types.NewFunc(mpos, r.currPkg, mname, msig)
-			}
-			methods[i] = method
-		}
-
-		typ := types.NewInterfaceType(methods, embeddeds)
-		r.p.interfaceList = append(r.p.interfaceList, typ)
-		return typ
-
-	case typeParamType:
-		if r.p.version < iexportVersionGenerics {
-			errorf("unexpected type param type")
-		}
-		pkg, name := r.qualifiedIdent()
-		id := ident{pkg, name}
-		if t, ok := r.p.tparamIndex[id]; ok {
-			// We're already in the process of importing this typeparam.
-			return t
-		}
-		// Otherwise, import the definition of the typeparam now.
-		r.p.doDecl(pkg, name)
-		return r.p.tparamIndex[id]
-
-	case instanceType:
-		if r.p.version < iexportVersionGenerics {
-			errorf("unexpected instantiation type")
-		}
-		// pos does not matter for instances: they are positioned on the original
-		// type.
-		_ = r.pos()
-		len := r.uint64()
-		targs := make([]types.Type, len)
-		for i := range targs {
-			targs[i] = r.typ()
-		}
-		baseType := r.typ()
-		// The imported instantiated type doesn't include any methods, so
-		// we must always use the methods of the base (orig) type.
-		// TODO provide a non-nil *Environment
-		t, _ := types.Instantiate(nil, baseType, targs, false)
-
-		// Workaround for golang/go#61561. See the doc for instanceList for details.
-		r.p.instanceList = append(r.p.instanceList, t)
-		return t
-
-	case unionType:
-		if r.p.version < iexportVersionGenerics {
-			errorf("unexpected instantiation type")
-		}
-		terms := make([]*types.Term, r.uint64())
-		for i := range terms {
-			terms[i] = types.NewTerm(r.bool(), r.typ())
-		}
-		return types.NewUnion(terms)
-	}
-}
-
-func (r *importReader) kind() itag {
-	return itag(r.uint64())
-}
-
-// objectPathObject is the inverse of exportWriter.objectPath.
-//
-// In shallow mode, certain fields and methods may need to be looked up in an
-// imported package. See the doc for exportWriter.objectPath for a full
-// explanation.
-func (r *importReader) objectPathObject() types.Object {
-	objPath := objectpath.Path(r.string())
-	if objPath == "" {
-		return nil
-	}
-	pkg := r.pkg()
-	obj, err := objectpath.Object(pkg, objPath)
-	if err != nil {
-		if r.p.reportf != nil {
-			r.p.reportf("failed to find object for objectPath %q: %v", objPath, err)
-		}
-	}
-	return obj
-}
-
-func (r *importReader) signature(recv *types.Var, rparams []*types.TypeParam, tparams []*types.TypeParam) *types.Signature {
-	params := r.paramList()
-	results := r.paramList()
-	variadic := params.Len() > 0 && r.bool()
-	return types.NewSignatureType(recv, rparams, tparams, params, results, variadic)
-}
-
-func (r *importReader) tparamList() []*types.TypeParam {
-	n := r.uint64()
-	if n == 0 {
-		return nil
-	}
-	xs := make([]*types.TypeParam, n)
-	for i := range xs {
-		// Note: the standard library importer is tolerant of nil types here,
-		// though would panic in SetTypeParams.
-		xs[i] = types.Unalias(r.typ()).(*types.TypeParam)
-	}
-	return xs
-}
-
-func (r *importReader) paramList() *types.Tuple {
-	xs := make([]*types.Var, r.uint64())
-	for i := range xs {
-		xs[i] = r.param()
-	}
-	return types.NewTuple(xs...)
-}
-
-func (r *importReader) param() *types.Var {
-	pos := r.pos()
-	name := r.ident()
-	typ := r.typ()
-	return types.NewParam(pos, r.currPkg, name, typ)
-}
-
-func (r *importReader) bool() bool {
-	return r.uint64() != 0
-}
-
-func (r *importReader) int64() int64 {
-	n, err := binary.ReadVarint(&r.declReader)
-	if err != nil {
-		errorf("readVarint: %v", err)
-	}
-	return n
-}
-
-func (r *importReader) uint64() uint64 {
-	n, err := binary.ReadUvarint(&r.declReader)
-	if err != nil {
-		errorf("readUvarint: %v", err)
-	}
-	return n
-}
-
-func (r *importReader) byte() byte {
-	x, err := r.declReader.ReadByte()
-	if err != nil {
-		errorf("declReader.ReadByte: %v", err)
-	}
-	return x
-}
-
-type byPath []*types.Package
-
-func (a byPath) Len() int           { return len(a) }
-func (a byPath) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byPath) Less(i, j int) bool { return a[i].Path() < a[j].Path() }
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/iimport_go122.go b/vendor/golang.org/x/tools/internal/gcimporter/iimport_go122.go
deleted file mode 100644
index 7586bfa..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/iimport_go122.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.22 && !go1.24
-
-package gcimporter
-
-import (
-	"go/token"
-	"go/types"
-	"unsafe"
-)
-
-// TODO(rfindley): delete this workaround once go1.24 is assured.
-
-func init() {
-	// Update markBlack so that it correctly sets the color
-	// of imported TypeNames.
-	//
-	// See the doc comment for markBlack for details.
-
-	type color uint32
-	const (
-		white color = iota
-		black
-		grey
-	)
-	type object struct {
-		_      *types.Scope
-		_      token.Pos
-		_      *types.Package
-		_      string
-		_      types.Type
-		_      uint32
-		color_ color
-		_      token.Pos
-	}
-	type typeName struct {
-		object
-	}
-
-	// If the size of types.TypeName changes, this will fail to compile.
-	const delta = int64(unsafe.Sizeof(typeName{})) - int64(unsafe.Sizeof(types.TypeName{}))
-	var _ [-delta * delta]int
-
-	markBlack = func(obj *types.TypeName) {
-		type uP = unsafe.Pointer
-		var ptr *typeName
-		*(*uP)(uP(&ptr)) = uP(obj)
-		ptr.color_ = black
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/predeclared.go b/vendor/golang.org/x/tools/internal/gcimporter/predeclared.go
deleted file mode 100644
index 907c855..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/predeclared.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gcimporter
-
-import (
-	"go/types"
-	"sync"
-)
-
-// predecl is a cache for the predeclared types in types.Universe.
-//
-// Cache a distinct result based on the runtime value of any.
-// The pointer value of the any type varies based on GODEBUG settings.
-var predeclMu sync.Mutex
-var predecl map[types.Type][]types.Type
-
-func predeclared() []types.Type {
-	anyt := types.Universe.Lookup("any").Type()
-
-	predeclMu.Lock()
-	defer predeclMu.Unlock()
-
-	if pre, ok := predecl[anyt]; ok {
-		return pre
-	}
-
-	if predecl == nil {
-		predecl = make(map[types.Type][]types.Type)
-	}
-
-	decls := []types.Type{ // basic types
-		types.Typ[types.Bool],
-		types.Typ[types.Int],
-		types.Typ[types.Int8],
-		types.Typ[types.Int16],
-		types.Typ[types.Int32],
-		types.Typ[types.Int64],
-		types.Typ[types.Uint],
-		types.Typ[types.Uint8],
-		types.Typ[types.Uint16],
-		types.Typ[types.Uint32],
-		types.Typ[types.Uint64],
-		types.Typ[types.Uintptr],
-		types.Typ[types.Float32],
-		types.Typ[types.Float64],
-		types.Typ[types.Complex64],
-		types.Typ[types.Complex128],
-		types.Typ[types.String],
-
-		// basic type aliases
-		types.Universe.Lookup("byte").Type(),
-		types.Universe.Lookup("rune").Type(),
-
-		// error
-		types.Universe.Lookup("error").Type(),
-
-		// untyped types
-		types.Typ[types.UntypedBool],
-		types.Typ[types.UntypedInt],
-		types.Typ[types.UntypedRune],
-		types.Typ[types.UntypedFloat],
-		types.Typ[types.UntypedComplex],
-		types.Typ[types.UntypedString],
-		types.Typ[types.UntypedNil],
-
-		// package unsafe
-		types.Typ[types.UnsafePointer],
-
-		// invalid type
-		types.Typ[types.Invalid], // only appears in packages with errors
-
-		// used internally by gc; never used by this package or in .a files
-		anyType{},
-
-		// comparable
-		types.Universe.Lookup("comparable").Type(),
-
-		// any
-		anyt,
-	}
-
-	predecl[anyt] = decls
-	return decls
-}
-
-type anyType struct{}
-
-func (t anyType) Underlying() types.Type { return t }
-func (t anyType) String() string         { return "any" }
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/support.go b/vendor/golang.org/x/tools/internal/gcimporter/support.go
deleted file mode 100644
index 4af810d..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/support.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gcimporter
-
-import (
-	"bufio"
-	"io"
-	"strconv"
-	"strings"
-)
-
-// Copy of $GOROOT/src/cmd/internal/archive.ReadHeader.
-func readArchiveHeader(b *bufio.Reader, name string) int {
-	// architecture-independent object file output
-	const HeaderSize = 60
-
-	var buf [HeaderSize]byte
-	if _, err := io.ReadFull(b, buf[:]); err != nil {
-		return -1
-	}
-	aname := strings.Trim(string(buf[0:16]), " ")
-	if !strings.HasPrefix(aname, name) {
-		return -1
-	}
-	asize := strings.Trim(string(buf[48:58]), " ")
-	i, _ := strconv.Atoi(asize)
-	return i
-}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go b/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
deleted file mode 100644
index 37b4a39..0000000
--- a/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
+++ /dev/null
@@ -1,761 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Derived from go/internal/gcimporter/ureader.go
-
-package gcimporter
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/internal/aliases"
-	"golang.org/x/tools/internal/pkgbits"
-	"golang.org/x/tools/internal/typesinternal"
-)
-
-// A pkgReader holds the shared state for reading a unified IR package
-// description.
-type pkgReader struct {
-	pkgbits.PkgDecoder
-
-	fake fakeFileSet
-
-	ctxt    *types.Context
-	imports map[string]*types.Package // previously imported packages, indexed by path
-	aliases bool                      // create types.Alias nodes
-
-	// lazily initialized arrays corresponding to the unified IR
-	// PosBase, Pkg, and Type sections, respectively.
-	posBases []string // position bases (i.e., file names)
-	pkgs     []*types.Package
-	typs     []types.Type
-
-	// laterFns holds functions that need to be invoked at the end of
-	// import reading.
-	laterFns []func()
-	// laterFors is used in case of 'type A B' to ensure that B is processed before A.
-	laterFors map[types.Type]int
-
-	// ifaces holds a list of constructed Interfaces, which need to have
-	// Complete called after importing is done.
-	ifaces []*types.Interface
-}
-
-// later adds a function to be invoked at the end of import reading.
-func (pr *pkgReader) later(fn func()) {
-	pr.laterFns = append(pr.laterFns, fn)
-}
-
-// See cmd/compile/internal/noder.derivedInfo.
-type derivedInfo struct {
-	idx pkgbits.Index
-}
-
-// See cmd/compile/internal/noder.typeInfo.
-type typeInfo struct {
-	idx     pkgbits.Index
-	derived bool
-}
-
-func UImportData(fset *token.FileSet, imports map[string]*types.Package, data []byte, path string) (_ int, pkg *types.Package, err error) {
-	if !debug {
-		defer func() {
-			if x := recover(); x != nil {
-				err = fmt.Errorf("internal error in importing %q (%v); please report an issue", path, x)
-			}
-		}()
-	}
-
-	s := string(data)
-	input := pkgbits.NewPkgDecoder(path, s)
-	pkg = readUnifiedPackage(fset, nil, imports, input)
-	return
-}
-
-// laterFor adds a function to be invoked at the end of import reading, and records the type that function is finishing.
-func (pr *pkgReader) laterFor(t types.Type, fn func()) {
-	if pr.laterFors == nil {
-		pr.laterFors = make(map[types.Type]int)
-	}
-	pr.laterFors[t] = len(pr.laterFns)
-	pr.laterFns = append(pr.laterFns, fn)
-}
-
-// readUnifiedPackage reads a package description from the given
-// unified IR export data decoder.
-func readUnifiedPackage(fset *token.FileSet, ctxt *types.Context, imports map[string]*types.Package, input pkgbits.PkgDecoder) *types.Package {
-	pr := pkgReader{
-		PkgDecoder: input,
-
-		fake: fakeFileSet{
-			fset:  fset,
-			files: make(map[string]*fileInfo),
-		},
-
-		ctxt:    ctxt,
-		imports: imports,
-		aliases: aliases.Enabled(),
-
-		posBases: make([]string, input.NumElems(pkgbits.RelocPosBase)),
-		pkgs:     make([]*types.Package, input.NumElems(pkgbits.RelocPkg)),
-		typs:     make([]types.Type, input.NumElems(pkgbits.RelocType)),
-	}
-	defer pr.fake.setLines()
-
-	r := pr.newReader(pkgbits.RelocMeta, pkgbits.PublicRootIdx, pkgbits.SyncPublic)
-	pkg := r.pkg()
-	if r.Version().Has(pkgbits.HasInit) {
-		r.Bool()
-	}
-
-	for i, n := 0, r.Len(); i < n; i++ {
-		// As if r.obj(), but avoiding the Scope.Lookup call,
-		// to avoid eager loading of imports.
-		r.Sync(pkgbits.SyncObject)
-		if r.Version().Has(pkgbits.DerivedFuncInstance) {
-			assert(!r.Bool())
-		}
-		r.p.objIdx(r.Reloc(pkgbits.RelocObj))
-		assert(r.Len() == 0)
-	}
-
-	r.Sync(pkgbits.SyncEOF)
-
-	for _, fn := range pr.laterFns {
-		fn()
-	}
-
-	for _, iface := range pr.ifaces {
-		iface.Complete()
-	}
-
-	// Imports() of pkg are all of the transitive packages that were loaded.
-	var imps []*types.Package
-	for _, imp := range pr.pkgs {
-		if imp != nil && imp != pkg {
-			imps = append(imps, imp)
-		}
-	}
-	sort.Sort(byPath(imps))
-	pkg.SetImports(imps)
-
-	pkg.MarkComplete()
-	return pkg
-}
-
-// A reader holds the state for reading a single unified IR element
-// within a package.
-type reader struct {
-	pkgbits.Decoder
-
-	p *pkgReader
-
-	dict *readerDict
-}
-
-// A readerDict holds the state for type parameters that parameterize
-// the current unified IR element.
-type readerDict struct {
-	// bounds is a slice of typeInfos corresponding to the underlying
-	// bounds of the element's type parameters.
-	bounds []typeInfo
-
-	// tparams is a slice of the constructed TypeParams for the element.
-	tparams []*types.TypeParam
-
-	// derived is a slice of types derived from tparams, which may be
-	// instantiated while reading the current element.
-	derived      []derivedInfo
-	derivedTypes []types.Type // lazily instantiated from derived
-}
-
-func (pr *pkgReader) newReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
-	return &reader{
-		Decoder: pr.NewDecoder(k, idx, marker),
-		p:       pr,
-	}
-}
-
-func (pr *pkgReader) tempReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
-	return &reader{
-		Decoder: pr.TempDecoder(k, idx, marker),
-		p:       pr,
-	}
-}
-
-func (pr *pkgReader) retireReader(r *reader) {
-	pr.RetireDecoder(&r.Decoder)
-}
-
-// @@@ Positions
-
-func (r *reader) pos() token.Pos {
-	r.Sync(pkgbits.SyncPos)
-	if !r.Bool() {
-		return token.NoPos
-	}
-
-	// TODO(mdempsky): Delta encoding.
-	posBase := r.posBase()
-	line := r.Uint()
-	col := r.Uint()
-	return r.p.fake.pos(posBase, int(line), int(col))
-}
-
-func (r *reader) posBase() string {
-	return r.p.posBaseIdx(r.Reloc(pkgbits.RelocPosBase))
-}
-
-func (pr *pkgReader) posBaseIdx(idx pkgbits.Index) string {
-	if b := pr.posBases[idx]; b != "" {
-		return b
-	}
-
-	var filename string
-	{
-		r := pr.tempReader(pkgbits.RelocPosBase, idx, pkgbits.SyncPosBase)
-
-		// Within types2, position bases have a lot more details (e.g.,
-		// keeping track of where //line directives appeared exactly).
-		//
-		// For go/types, we just track the file name.
-
-		filename = r.String()
-
-		if r.Bool() { // file base
-			// Was: "b = token.NewTrimmedFileBase(filename, true)"
-		} else { // line base
-			pos := r.pos()
-			line := r.Uint()
-			col := r.Uint()
-
-			// Was: "b = token.NewLineBase(pos, filename, true, line, col)"
-			_, _, _ = pos, line, col
-		}
-		pr.retireReader(r)
-	}
-	b := filename
-	pr.posBases[idx] = b
-	return b
-}
-
-// @@@ Packages
-
-func (r *reader) pkg() *types.Package {
-	r.Sync(pkgbits.SyncPkg)
-	return r.p.pkgIdx(r.Reloc(pkgbits.RelocPkg))
-}
-
-func (pr *pkgReader) pkgIdx(idx pkgbits.Index) *types.Package {
-	// TODO(mdempsky): Consider using some non-nil pointer to indicate
-	// the universe scope, so we don't need to keep re-reading it.
-	if pkg := pr.pkgs[idx]; pkg != nil {
-		return pkg
-	}
-
-	pkg := pr.newReader(pkgbits.RelocPkg, idx, pkgbits.SyncPkgDef).doPkg()
-	pr.pkgs[idx] = pkg
-	return pkg
-}
-
-func (r *reader) doPkg() *types.Package {
-	path := r.String()
-	switch path {
-	// cmd/compile emits path="main" for main packages because
-	// that's the linker symbol prefix it used; but we need
-	// the package's path as it would be reported by go list,
-	// hence "main" below.
-	// See test at go/packages.TestMainPackagePathInModeTypes.
-	case "", "main":
-		path = r.p.PkgPath()
-	case "builtin":
-		return nil // universe
-	case "unsafe":
-		return types.Unsafe
-	}
-
-	if pkg := r.p.imports[path]; pkg != nil {
-		return pkg
-	}
-
-	name := r.String()
-
-	pkg := types.NewPackage(path, name)
-	r.p.imports[path] = pkg
-
-	return pkg
-}
-
-// @@@ Types
-
-func (r *reader) typ() types.Type {
-	return r.p.typIdx(r.typInfo(), r.dict)
-}
-
-func (r *reader) typInfo() typeInfo {
-	r.Sync(pkgbits.SyncType)
-	if r.Bool() {
-		return typeInfo{idx: pkgbits.Index(r.Len()), derived: true}
-	}
-	return typeInfo{idx: r.Reloc(pkgbits.RelocType), derived: false}
-}
-
-func (pr *pkgReader) typIdx(info typeInfo, dict *readerDict) types.Type {
-	idx := info.idx
-	var where *types.Type
-	if info.derived {
-		where = &dict.derivedTypes[idx]
-		idx = dict.derived[idx].idx
-	} else {
-		where = &pr.typs[idx]
-	}
-
-	if typ := *where; typ != nil {
-		return typ
-	}
-
-	var typ types.Type
-	{
-		r := pr.tempReader(pkgbits.RelocType, idx, pkgbits.SyncTypeIdx)
-		r.dict = dict
-
-		typ = r.doTyp()
-		assert(typ != nil)
-		pr.retireReader(r)
-	}
-	// See comment in pkgReader.typIdx explaining how this happens.
-	if prev := *where; prev != nil {
-		return prev
-	}
-
-	*where = typ
-	return typ
-}
-
-func (r *reader) doTyp() (res types.Type) {
-	switch tag := pkgbits.CodeType(r.Code(pkgbits.SyncType)); tag {
-	default:
-		errorf("unhandled type tag: %v", tag)
-		panic("unreachable")
-
-	case pkgbits.TypeBasic:
-		return types.Typ[r.Len()]
-
-	case pkgbits.TypeNamed:
-		obj, targs := r.obj()
-		name := obj.(*types.TypeName)
-		if len(targs) != 0 {
-			t, _ := types.Instantiate(r.p.ctxt, name.Type(), targs, false)
-			return t
-		}
-		return name.Type()
-
-	case pkgbits.TypeTypeParam:
-		return r.dict.tparams[r.Len()]
-
-	case pkgbits.TypeArray:
-		len := int64(r.Uint64())
-		return types.NewArray(r.typ(), len)
-	case pkgbits.TypeChan:
-		dir := types.ChanDir(r.Len())
-		return types.NewChan(dir, r.typ())
-	case pkgbits.TypeMap:
-		return types.NewMap(r.typ(), r.typ())
-	case pkgbits.TypePointer:
-		return types.NewPointer(r.typ())
-	case pkgbits.TypeSignature:
-		return r.signature(nil, nil, nil)
-	case pkgbits.TypeSlice:
-		return types.NewSlice(r.typ())
-	case pkgbits.TypeStruct:
-		return r.structType()
-	case pkgbits.TypeInterface:
-		return r.interfaceType()
-	case pkgbits.TypeUnion:
-		return r.unionType()
-	}
-}
-
-func (r *reader) structType() *types.Struct {
-	fields := make([]*types.Var, r.Len())
-	var tags []string
-	for i := range fields {
-		pos := r.pos()
-		pkg, name := r.selector()
-		ftyp := r.typ()
-		tag := r.String()
-		embedded := r.Bool()
-
-		fields[i] = types.NewField(pos, pkg, name, ftyp, embedded)
-		if tag != "" {
-			for len(tags) < i {
-				tags = append(tags, "")
-			}
-			tags = append(tags, tag)
-		}
-	}
-	return types.NewStruct(fields, tags)
-}
-
-func (r *reader) unionType() *types.Union {
-	terms := make([]*types.Term, r.Len())
-	for i := range terms {
-		terms[i] = types.NewTerm(r.Bool(), r.typ())
-	}
-	return types.NewUnion(terms)
-}
-
-func (r *reader) interfaceType() *types.Interface {
-	methods := make([]*types.Func, r.Len())
-	embeddeds := make([]types.Type, r.Len())
-	implicit := len(methods) == 0 && len(embeddeds) == 1 && r.Bool()
-
-	for i := range methods {
-		pos := r.pos()
-		pkg, name := r.selector()
-		mtyp := r.signature(nil, nil, nil)
-		methods[i] = types.NewFunc(pos, pkg, name, mtyp)
-	}
-
-	for i := range embeddeds {
-		embeddeds[i] = r.typ()
-	}
-
-	iface := types.NewInterfaceType(methods, embeddeds)
-	if implicit {
-		iface.MarkImplicit()
-	}
-
-	// We need to call iface.Complete(), but if there are any embedded
-	// defined types, then we may not have set their underlying
-	// interface type yet. So we need to defer calling Complete until
-	// after we've called SetUnderlying everywhere.
-	//
-	// TODO(mdempsky): After CL 424876 lands, it should be safe to call
-	// iface.Complete() immediately.
-	r.p.ifaces = append(r.p.ifaces, iface)
-
-	return iface
-}
-
-func (r *reader) signature(recv *types.Var, rtparams, tparams []*types.TypeParam) *types.Signature {
-	r.Sync(pkgbits.SyncSignature)
-
-	params := r.params()
-	results := r.params()
-	variadic := r.Bool()
-
-	return types.NewSignatureType(recv, rtparams, tparams, params, results, variadic)
-}
-
-func (r *reader) params() *types.Tuple {
-	r.Sync(pkgbits.SyncParams)
-
-	params := make([]*types.Var, r.Len())
-	for i := range params {
-		params[i] = r.param()
-	}
-
-	return types.NewTuple(params...)
-}
-
-func (r *reader) param() *types.Var {
-	r.Sync(pkgbits.SyncParam)
-
-	pos := r.pos()
-	pkg, name := r.localIdent()
-	typ := r.typ()
-
-	return types.NewParam(pos, pkg, name, typ)
-}
-
-// @@@ Objects
-
-func (r *reader) obj() (types.Object, []types.Type) {
-	r.Sync(pkgbits.SyncObject)
-
-	if r.Version().Has(pkgbits.DerivedFuncInstance) {
-		assert(!r.Bool())
-	}
-
-	pkg, name := r.p.objIdx(r.Reloc(pkgbits.RelocObj))
-	obj := pkgScope(pkg).Lookup(name)
-
-	targs := make([]types.Type, r.Len())
-	for i := range targs {
-		targs[i] = r.typ()
-	}
-
-	return obj, targs
-}
-
-func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types.Package, string) {
-
-	var objPkg *types.Package
-	var objName string
-	var tag pkgbits.CodeObj
-	{
-		rname := pr.tempReader(pkgbits.RelocName, idx, pkgbits.SyncObject1)
-
-		objPkg, objName = rname.qualifiedIdent()
-		assert(objName != "")
-
-		tag = pkgbits.CodeObj(rname.Code(pkgbits.SyncCodeObj))
-		pr.retireReader(rname)
-	}
-
-	if tag == pkgbits.ObjStub {
-		assert(objPkg == nil || objPkg == types.Unsafe)
-		return objPkg, objName
-	}
-
-	// Ignore local types promoted to global scope (#55110).
-	if _, suffix := splitVargenSuffix(objName); suffix != "" {
-		return objPkg, objName
-	}
-
-	if objPkg.Scope().Lookup(objName) == nil {
-		dict := pr.objDictIdx(idx)
-
-		r := pr.newReader(pkgbits.RelocObj, idx, pkgbits.SyncObject1)
-		r.dict = dict
-
-		declare := func(obj types.Object) {
-			objPkg.Scope().Insert(obj)
-		}
-
-		switch tag {
-		default:
-			panic("weird")
-
-		case pkgbits.ObjAlias:
-			pos := r.pos()
-			var tparams []*types.TypeParam
-			if r.Version().Has(pkgbits.AliasTypeParamNames) {
-				tparams = r.typeParamNames()
-			}
-			typ := r.typ()
-			declare(aliases.NewAlias(r.p.aliases, pos, objPkg, objName, typ, tparams))
-
-		case pkgbits.ObjConst:
-			pos := r.pos()
-			typ := r.typ()
-			val := r.Value()
-			declare(types.NewConst(pos, objPkg, objName, typ, val))
-
-		case pkgbits.ObjFunc:
-			pos := r.pos()
-			tparams := r.typeParamNames()
-			sig := r.signature(nil, nil, tparams)
-			declare(types.NewFunc(pos, objPkg, objName, sig))
-
-		case pkgbits.ObjType:
-			pos := r.pos()
-
-			obj := types.NewTypeName(pos, objPkg, objName, nil)
-			named := types.NewNamed(obj, nil, nil)
-			declare(obj)
-
-			named.SetTypeParams(r.typeParamNames())
-
-			setUnderlying := func(underlying types.Type) {
-				// If the underlying type is an interface, we need to
-				// duplicate its methods so we can replace the receiver
-				// parameter's type (#49906).
-				if iface, ok := types.Unalias(underlying).(*types.Interface); ok && iface.NumExplicitMethods() != 0 {
-					methods := make([]*types.Func, iface.NumExplicitMethods())
-					for i := range methods {
-						fn := iface.ExplicitMethod(i)
-						sig := fn.Type().(*types.Signature)
-
-						recv := types.NewVar(fn.Pos(), fn.Pkg(), "", named)
-						typesinternal.SetVarKind(recv, typesinternal.RecvVar)
-						methods[i] = types.NewFunc(fn.Pos(), fn.Pkg(), fn.Name(), types.NewSignatureType(recv, nil, nil, sig.Params(), sig.Results(), sig.Variadic()))
-					}
-
-					embeds := make([]types.Type, iface.NumEmbeddeds())
-					for i := range embeds {
-						embeds[i] = iface.EmbeddedType(i)
-					}
-
-					newIface := types.NewInterfaceType(methods, embeds)
-					r.p.ifaces = append(r.p.ifaces, newIface)
-					underlying = newIface
-				}
-
-				named.SetUnderlying(underlying)
-			}
-
-			// Since go.dev/cl/455279, we can assume rhs.Underlying() will
-			// always be non-nil. However, to temporarily support users of
-			// older snapshot releases, we continue to fallback to the old
-			// behavior for now.
-			//
-			// TODO(mdempsky): Remove fallback code and simplify after
-			// allowing time for snapshot users to upgrade.
-			rhs := r.typ()
-			if underlying := rhs.Underlying(); underlying != nil {
-				setUnderlying(underlying)
-			} else {
-				pk := r.p
-				pk.laterFor(named, func() {
-					// First be sure that the rhs is initialized, if it needs to be initialized.
-					delete(pk.laterFors, named) // prevent cycles
-					if i, ok := pk.laterFors[rhs]; ok {
-						f := pk.laterFns[i]
-						pk.laterFns[i] = func() {} // function is running now, so replace it with a no-op
-						f()                        // initialize RHS
-					}
-					setUnderlying(rhs.Underlying())
-				})
-			}
-
-			for i, n := 0, r.Len(); i < n; i++ {
-				named.AddMethod(r.method())
-			}
-
-		case pkgbits.ObjVar:
-			pos := r.pos()
-			typ := r.typ()
-			v := types.NewVar(pos, objPkg, objName, typ)
-			typesinternal.SetVarKind(v, typesinternal.PackageVar)
-			declare(v)
-		}
-	}
-
-	return objPkg, objName
-}
-
-func (pr *pkgReader) objDictIdx(idx pkgbits.Index) *readerDict {
-
-	var dict readerDict
-
-	{
-		r := pr.tempReader(pkgbits.RelocObjDict, idx, pkgbits.SyncObject1)
-		if implicits := r.Len(); implicits != 0 {
-			errorf("unexpected object with %v implicit type parameter(s)", implicits)
-		}
-
-		dict.bounds = make([]typeInfo, r.Len())
-		for i := range dict.bounds {
-			dict.bounds[i] = r.typInfo()
-		}
-
-		dict.derived = make([]derivedInfo, r.Len())
-		dict.derivedTypes = make([]types.Type, len(dict.derived))
-		for i := range dict.derived {
-			dict.derived[i] = derivedInfo{idx: r.Reloc(pkgbits.RelocType)}
-			if r.Version().Has(pkgbits.DerivedInfoNeeded) {
-				assert(!r.Bool())
-			}
-		}
-
-		pr.retireReader(r)
-	}
-	// function references follow, but reader doesn't need those
-
-	return &dict
-}
-
-func (r *reader) typeParamNames() []*types.TypeParam {
-	r.Sync(pkgbits.SyncTypeParamNames)
-
-	// Note: This code assumes it only processes objects without
-	// implement type parameters. This is currently fine, because
-	// reader is only used to read in exported declarations, which are
-	// always package scoped.
-
-	if len(r.dict.bounds) == 0 {
-		return nil
-	}
-
-	// Careful: Type parameter lists may have cycles. To allow for this,
-	// we construct the type parameter list in two passes: first we
-	// create all the TypeNames and TypeParams, then we construct and
-	// set the bound type.
-
-	r.dict.tparams = make([]*types.TypeParam, len(r.dict.bounds))
-	for i := range r.dict.bounds {
-		pos := r.pos()
-		pkg, name := r.localIdent()
-
-		tname := types.NewTypeName(pos, pkg, name, nil)
-		r.dict.tparams[i] = types.NewTypeParam(tname, nil)
-	}
-
-	typs := make([]types.Type, len(r.dict.bounds))
-	for i, bound := range r.dict.bounds {
-		typs[i] = r.p.typIdx(bound, r.dict)
-	}
-
-	// TODO(mdempsky): This is subtle, elaborate further.
-	//
-	// We have to save tparams outside of the closure, because
-	// typeParamNames() can be called multiple times with the same
-	// dictionary instance.
-	//
-	// Also, this needs to happen later to make sure SetUnderlying has
-	// been called.
-	//
-	// TODO(mdempsky): Is it safe to have a single "later" slice or do
-	// we need to have multiple passes? See comments on CL 386002 and
-	// go.dev/issue/52104.
-	tparams := r.dict.tparams
-	r.p.later(func() {
-		for i, typ := range typs {
-			tparams[i].SetConstraint(typ)
-		}
-	})
-
-	return r.dict.tparams
-}
-
-func (r *reader) method() *types.Func {
-	r.Sync(pkgbits.SyncMethod)
-	pos := r.pos()
-	pkg, name := r.selector()
-
-	rparams := r.typeParamNames()
-	sig := r.signature(r.param(), rparams, nil)
-
-	_ = r.pos() // TODO(mdempsky): Remove; this is a hacker for linker.go.
-	return types.NewFunc(pos, pkg, name, sig)
-}
-
-func (r *reader) qualifiedIdent() (*types.Package, string) { return r.ident(pkgbits.SyncSym) }
-func (r *reader) localIdent() (*types.Package, string)     { return r.ident(pkgbits.SyncLocalIdent) }
-func (r *reader) selector() (*types.Package, string)       { return r.ident(pkgbits.SyncSelector) }
-
-func (r *reader) ident(marker pkgbits.SyncMarker) (*types.Package, string) {
-	r.Sync(marker)
-	return r.pkg(), r.String()
-}
-
-// pkgScope returns pkg.Scope().
-// If pkg is nil, it returns types.Universe instead.
-//
-// TODO(mdempsky): Remove after x/tools can depend on Go 1.19.
-func pkgScope(pkg *types.Package) *types.Scope {
-	if pkg != nil {
-		return pkg.Scope()
-	}
-	return types.Universe
-}
-
-// See cmd/compile/internal/types.SplitVargenSuffix.
-func splitVargenSuffix(name string) (base, suffix string) {
-	i := len(name)
-	for i > 0 && name[i-1] >= '0' && name[i-1] <= '9' {
-		i--
-	}
-	const dot = "·"
-	if i >= len(dot) && name[i-len(dot):i] == dot {
-		i -= len(dot)
-		return name[:i], name[i:]
-	}
-	return name, ""
-}
diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
deleted file mode 100644
index 5872120..0000000
--- a/vendor/golang.org/x/tools/internal/gocommand/invoke.go
+++ /dev/null
@@ -1,567 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package gocommand is a helper for calling the go command.
-package gocommand
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/tools/internal/event"
-	"golang.org/x/tools/internal/event/keys"
-	"golang.org/x/tools/internal/event/label"
-)
-
-// A Runner will run go command invocations and serialize
-// them if it sees a concurrency error.
-type Runner struct {
-	// once guards the runner initialization.
-	once sync.Once
-
-	// inFlight tracks available workers.
-	inFlight chan struct{}
-
-	// serialized guards the ability to run a go command serially,
-	// to avoid deadlocks when claiming workers.
-	serialized chan struct{}
-}
-
-const maxInFlight = 10
-
-func (runner *Runner) initialize() {
-	runner.once.Do(func() {
-		runner.inFlight = make(chan struct{}, maxInFlight)
-		runner.serialized = make(chan struct{}, 1)
-	})
-}
-
-// 1.13: go: updates to go.mod needed, but contents have changed
-// 1.14: go: updating go.mod: existing contents have changed since last read
-var modConcurrencyError = regexp.MustCompile(`go:.*go.mod.*contents have changed`)
-
-// event keys for go command invocations
-var (
-	verb      = keys.NewString("verb", "go command verb")
-	directory = keys.NewString("directory", "")
-)
-
-func invLabels(inv Invocation) []label.Label {
-	return []label.Label{verb.Of(inv.Verb), directory.Of(inv.WorkingDir)}
-}
-
-// Run is a convenience wrapper around RunRaw.
-// It returns only stdout and a "friendly" error.
-func (runner *Runner) Run(ctx context.Context, inv Invocation) (*bytes.Buffer, error) {
-	ctx, done := event.Start(ctx, "gocommand.Runner.Run", invLabels(inv)...)
-	defer done()
-
-	stdout, _, friendly, _ := runner.RunRaw(ctx, inv)
-	return stdout, friendly
-}
-
-// RunPiped runs the invocation serially, always waiting for any concurrent
-// invocations to complete first.
-func (runner *Runner) RunPiped(ctx context.Context, inv Invocation, stdout, stderr io.Writer) error {
-	ctx, done := event.Start(ctx, "gocommand.Runner.RunPiped", invLabels(inv)...)
-	defer done()
-
-	_, err := runner.runPiped(ctx, inv, stdout, stderr)
-	return err
-}
-
-// RunRaw runs the invocation, serializing requests only if they fight over
-// go.mod changes.
-// Postcondition: both error results have same nilness.
-func (runner *Runner) RunRaw(ctx context.Context, inv Invocation) (*bytes.Buffer, *bytes.Buffer, error, error) {
-	ctx, done := event.Start(ctx, "gocommand.Runner.RunRaw", invLabels(inv)...)
-	defer done()
-	// Make sure the runner is always initialized.
-	runner.initialize()
-
-	// First, try to run the go command concurrently.
-	stdout, stderr, friendlyErr, err := runner.runConcurrent(ctx, inv)
-
-	// If we encounter a load concurrency error, we need to retry serially.
-	if friendlyErr != nil && modConcurrencyError.MatchString(friendlyErr.Error()) {
-		event.Error(ctx, "Load concurrency error, will retry serially", err)
-
-		// Run serially by calling runPiped.
-		stdout.Reset()
-		stderr.Reset()
-		friendlyErr, err = runner.runPiped(ctx, inv, stdout, stderr)
-	}
-
-	return stdout, stderr, friendlyErr, err
-}
-
-// Postcondition: both error results have same nilness.
-func (runner *Runner) runConcurrent(ctx context.Context, inv Invocation) (*bytes.Buffer, *bytes.Buffer, error, error) {
-	// Wait for 1 worker to become available.
-	select {
-	case <-ctx.Done():
-		return nil, nil, ctx.Err(), ctx.Err()
-	case runner.inFlight <- struct{}{}:
-		defer func() { <-runner.inFlight }()
-	}
-
-	stdout, stderr := &bytes.Buffer{}, &bytes.Buffer{}
-	friendlyErr, err := inv.runWithFriendlyError(ctx, stdout, stderr)
-	return stdout, stderr, friendlyErr, err
-}
-
-// Postcondition: both error results have same nilness.
-func (runner *Runner) runPiped(ctx context.Context, inv Invocation, stdout, stderr io.Writer) (error, error) {
-	// Make sure the runner is always initialized.
-	runner.initialize()
-
-	// Acquire the serialization lock. This avoids deadlocks between two
-	// runPiped commands.
-	select {
-	case <-ctx.Done():
-		return ctx.Err(), ctx.Err()
-	case runner.serialized <- struct{}{}:
-		defer func() { <-runner.serialized }()
-	}
-
-	// Wait for all in-progress go commands to return before proceeding,
-	// to avoid load concurrency errors.
-	for range maxInFlight {
-		select {
-		case <-ctx.Done():
-			return ctx.Err(), ctx.Err()
-		case runner.inFlight <- struct{}{}:
-			// Make sure we always "return" any workers we took.
-			defer func() { <-runner.inFlight }()
-		}
-	}
-
-	return inv.runWithFriendlyError(ctx, stdout, stderr)
-}
-
-// An Invocation represents a call to the go command.
-type Invocation struct {
-	Verb       string
-	Args       []string
-	BuildFlags []string
-
-	// If ModFlag is set, the go command is invoked with -mod=ModFlag.
-	// TODO(rfindley): remove, in favor of Args.
-	ModFlag string
-
-	// If ModFile is set, the go command is invoked with -modfile=ModFile.
-	// TODO(rfindley): remove, in favor of Args.
-	ModFile string
-
-	// Overlay is the name of the JSON overlay file that describes
-	// unsaved editor buffers; see [WriteOverlays].
-	// If set, the go command is invoked with -overlay=Overlay.
-	// TODO(rfindley): remove, in favor of Args.
-	Overlay string
-
-	// If CleanEnv is set, the invocation will run only with the environment
-	// in Env, not starting with os.Environ.
-	CleanEnv   bool
-	Env        []string
-	WorkingDir string
-	Logf       func(format string, args ...any)
-}
-
-// Postcondition: both error results have same nilness.
-func (i *Invocation) runWithFriendlyError(ctx context.Context, stdout, stderr io.Writer) (friendlyError error, rawError error) {
-	rawError = i.run(ctx, stdout, stderr)
-	if rawError != nil {
-		friendlyError = rawError
-		// Check for 'go' executable not being found.
-		if ee, ok := rawError.(*exec.Error); ok && ee.Err == exec.ErrNotFound {
-			friendlyError = fmt.Errorf("go command required, not found: %v", ee)
-		}
-		if ctx.Err() != nil {
-			friendlyError = ctx.Err()
-		}
-		friendlyError = fmt.Errorf("err: %v: stderr: %s", friendlyError, stderr)
-	}
-	return
-}
-
-// logf logs if i.Logf is non-nil.
-func (i *Invocation) logf(format string, args ...any) {
-	if i.Logf != nil {
-		i.Logf(format, args...)
-	}
-}
-
-func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
-	goArgs := []string{i.Verb}
-
-	appendModFile := func() {
-		if i.ModFile != "" {
-			goArgs = append(goArgs, "-modfile="+i.ModFile)
-		}
-	}
-	appendModFlag := func() {
-		if i.ModFlag != "" {
-			goArgs = append(goArgs, "-mod="+i.ModFlag)
-		}
-	}
-	appendOverlayFlag := func() {
-		if i.Overlay != "" {
-			goArgs = append(goArgs, "-overlay="+i.Overlay)
-		}
-	}
-
-	switch i.Verb {
-	case "env", "version":
-		goArgs = append(goArgs, i.Args...)
-	case "mod":
-		// mod needs the sub-verb before flags.
-		goArgs = append(goArgs, i.Args[0])
-		appendModFile()
-		goArgs = append(goArgs, i.Args[1:]...)
-	case "get":
-		goArgs = append(goArgs, i.BuildFlags...)
-		appendModFile()
-		goArgs = append(goArgs, i.Args...)
-
-	default: // notably list and build.
-		goArgs = append(goArgs, i.BuildFlags...)
-		appendModFile()
-		appendModFlag()
-		appendOverlayFlag()
-		goArgs = append(goArgs, i.Args...)
-	}
-	cmd := exec.Command("go", goArgs...)
-	cmd.Stdout = stdout
-	cmd.Stderr = stderr
-
-	// https://go.dev/issue/59541: don't wait forever copying stderr
-	// after the command has exited.
-	// After CL 484741 we copy stdout manually, so we we'll stop reading that as
-	// soon as ctx is done. However, we also don't want to wait around forever
-	// for stderr. Give a much-longer-than-reasonable delay and then assume that
-	// something has wedged in the kernel or runtime.
-	cmd.WaitDelay = 30 * time.Second
-
-	// The cwd gets resolved to the real path. On Darwin, where
-	// /tmp is a symlink, this breaks anything that expects the
-	// working directory to keep the original path, including the
-	// go command when dealing with modules.
-	//
-	// os.Getwd has a special feature where if the cwd and the PWD
-	// are the same node then it trusts the PWD, so by setting it
-	// in the env for the child process we fix up all the paths
-	// returned by the go command.
-	if !i.CleanEnv {
-		cmd.Env = os.Environ()
-	}
-	cmd.Env = append(cmd.Env, i.Env...)
-	if i.WorkingDir != "" {
-		cmd.Env = append(cmd.Env, "PWD="+i.WorkingDir)
-		cmd.Dir = i.WorkingDir
-	}
-
-	debugStr := cmdDebugStr(cmd)
-	i.logf("starting %v", debugStr)
-	start := time.Now()
-	defer func() {
-		i.logf("%s for %v", time.Since(start), debugStr)
-	}()
-
-	return runCmdContext(ctx, cmd)
-}
-
-// DebugHangingGoCommands may be set by tests to enable additional
-// instrumentation (including panics) for debugging hanging Go commands.
-//
-// See golang/go#54461 for details.
-var DebugHangingGoCommands = false
-
-// runCmdContext is like exec.CommandContext except it sends os.Interrupt
-// before os.Kill.
-func runCmdContext(ctx context.Context, cmd *exec.Cmd) (err error) {
-	// If cmd.Stdout is not an *os.File, the exec package will create a pipe and
-	// copy it to the Writer in a goroutine until the process has finished and
-	// either the pipe reaches EOF or command's WaitDelay expires.
-	//
-	// However, the output from 'go list' can be quite large, and we don't want to
-	// keep reading (and allocating buffers) if we've already decided we don't
-	// care about the output. We don't want to wait for the process to finish, and
-	// we don't wait to wait for the WaitDelay to expire either.
-	//
-	// Instead, if cmd.Stdout requires a copying goroutine we explicitly replace
-	// it with a pipe (which is an *os.File), which we can close in order to stop
-	// copying output as soon as we realize we don't care about it.
-	var stdoutW *os.File
-	if cmd.Stdout != nil {
-		if _, ok := cmd.Stdout.(*os.File); !ok {
-			var stdoutR *os.File
-			stdoutR, stdoutW, err = os.Pipe()
-			if err != nil {
-				return err
-			}
-			prevStdout := cmd.Stdout
-			cmd.Stdout = stdoutW
-
-			stdoutErr := make(chan error, 1)
-			go func() {
-				_, err := io.Copy(prevStdout, stdoutR)
-				if err != nil {
-					err = fmt.Errorf("copying stdout: %w", err)
-				}
-				stdoutErr <- err
-			}()
-			defer func() {
-				// We started a goroutine to copy a stdout pipe.
-				// Wait for it to finish, or terminate it if need be.
-				var err2 error
-				select {
-				case err2 = <-stdoutErr:
-					stdoutR.Close()
-				case <-ctx.Done():
-					stdoutR.Close()
-					// Per https://pkg.go.dev/os#File.Close, the call to stdoutR.Close
-					// should cause the Read call in io.Copy to unblock and return
-					// immediately, but we still need to receive from stdoutErr to confirm
-					// that it has happened.
-					<-stdoutErr
-					err2 = ctx.Err()
-				}
-				if err == nil {
-					err = err2
-				}
-			}()
-
-			// Per https://pkg.go.dev/os/exec#Cmd, “If Stdout and Stderr are the
-			// same writer, and have a type that can be compared with ==, at most
-			// one goroutine at a time will call Write.�
-			//
-			// Since we're starting a goroutine that writes to cmd.Stdout, we must
-			// also update cmd.Stderr so that it still holds.
-			func() {
-				defer func() { recover() }()
-				if cmd.Stderr == prevStdout {
-					cmd.Stderr = cmd.Stdout
-				}
-			}()
-		}
-	}
-
-	startTime := time.Now()
-	err = cmd.Start()
-	if stdoutW != nil {
-		// The child process has inherited the pipe file,
-		// so close the copy held in this process.
-		stdoutW.Close()
-		stdoutW = nil
-	}
-	if err != nil {
-		return err
-	}
-
-	resChan := make(chan error, 1)
-	go func() {
-		resChan <- cmd.Wait()
-	}()
-
-	// If we're interested in debugging hanging Go commands, stop waiting after a
-	// minute and panic with interesting information.
-	debug := DebugHangingGoCommands
-	if debug {
-		timer := time.NewTimer(1 * time.Minute)
-		defer timer.Stop()
-		select {
-		case err := <-resChan:
-			return err
-		case <-timer.C:
-			// HandleHangingGoCommand terminates this process.
-			// Pass off resChan in case we can collect the command error.
-			handleHangingGoCommand(startTime, cmd, resChan)
-		case <-ctx.Done():
-		}
-	} else {
-		select {
-		case err := <-resChan:
-			return err
-		case <-ctx.Done():
-		}
-	}
-
-	// Cancelled. Interrupt and see if it ends voluntarily.
-	if err := cmd.Process.Signal(os.Interrupt); err == nil {
-		// (We used to wait only 1s but this proved
-		// fragile on loaded builder machines.)
-		timer := time.NewTimer(5 * time.Second)
-		defer timer.Stop()
-		select {
-		case err := <-resChan:
-			return err
-		case <-timer.C:
-		}
-	}
-
-	// Didn't shut down in response to interrupt. Kill it hard.
-	if err := cmd.Process.Kill(); err != nil && !errors.Is(err, os.ErrProcessDone) && debug {
-		log.Printf("error killing the Go command: %v", err)
-	}
-
-	return <-resChan
-}
-
-// handleHangingGoCommand outputs debugging information to help diagnose the
-// cause of a hanging Go command, and then exits with log.Fatalf.
-func handleHangingGoCommand(start time.Time, cmd *exec.Cmd, resChan chan error) {
-	switch runtime.GOOS {
-	case "linux", "darwin", "freebsd", "netbsd", "openbsd":
-		fmt.Fprintln(os.Stderr, `DETECTED A HANGING GO COMMAND
-
-			The gopls test runner has detected a hanging go command. In order to debug
-			this, the output of ps and lsof/fstat is printed below.
-
-			See golang/go#54461 for more details.`)
-
-		fmt.Fprintln(os.Stderr, "\nps axo ppid,pid,command:")
-		fmt.Fprintln(os.Stderr, "-------------------------")
-		psCmd := exec.Command("ps", "axo", "ppid,pid,command")
-		psCmd.Stdout = os.Stderr
-		psCmd.Stderr = os.Stderr
-		if err := psCmd.Run(); err != nil {
-			log.Printf("Handling hanging Go command: running ps: %v", err)
-		}
-
-		listFiles := "lsof"
-		if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
-			listFiles = "fstat"
-		}
-
-		fmt.Fprintln(os.Stderr, "\n"+listFiles+":")
-		fmt.Fprintln(os.Stderr, "-----")
-		listFilesCmd := exec.Command(listFiles)
-		listFilesCmd.Stdout = os.Stderr
-		listFilesCmd.Stderr = os.Stderr
-		if err := listFilesCmd.Run(); err != nil {
-			log.Printf("Handling hanging Go command: running %s: %v", listFiles, err)
-		}
-		// Try to extract information about the slow go process by issuing a SIGQUIT.
-		if err := cmd.Process.Signal(sigStuckProcess); err == nil {
-			select {
-			case err := <-resChan:
-				stderr := "not a bytes.Buffer"
-				if buf, _ := cmd.Stderr.(*bytes.Buffer); buf != nil {
-					stderr = buf.String()
-				}
-				log.Printf("Quit hanging go command:\n\terr:%v\n\tstderr:\n%v\n\n", err, stderr)
-			case <-time.After(5 * time.Second):
-			}
-		} else {
-			log.Printf("Sending signal %d to hanging go command: %v", sigStuckProcess, err)
-		}
-	}
-	log.Fatalf("detected hanging go command (golang/go#54461); waited %s\n\tcommand:%s\n\tpid:%d", time.Since(start), cmd, cmd.Process.Pid)
-}
-
-func cmdDebugStr(cmd *exec.Cmd) string {
-	env := make(map[string]string)
-	for _, kv := range cmd.Env {
-		split := strings.SplitN(kv, "=", 2)
-		if len(split) == 2 {
-			k, v := split[0], split[1]
-			env[k] = v
-		}
-	}
-
-	var args []string
-	for _, arg := range cmd.Args {
-		quoted := strconv.Quote(arg)
-		if quoted[1:len(quoted)-1] != arg || strings.Contains(arg, " ") {
-			args = append(args, quoted)
-		} else {
-			args = append(args, arg)
-		}
-	}
-	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], strings.Join(args, " "))
-}
-
-// WriteOverlays writes each value in the overlay (see the Overlay
-// field of go/packages.Config) to a temporary file and returns the name
-// of a JSON file describing the mapping that is suitable for the "go
-// list -overlay" flag.
-//
-// On success, the caller must call the cleanup function exactly once
-// when the files are no longer needed.
-func WriteOverlays(overlay map[string][]byte) (filename string, cleanup func(), err error) {
-	// Do nothing if there are no overlays in the config.
-	if len(overlay) == 0 {
-		return "", func() {}, nil
-	}
-
-	dir, err := os.MkdirTemp("", "gocommand-*")
-	if err != nil {
-		return "", nil, err
-	}
-
-	// The caller must clean up this directory,
-	// unless this function returns an error.
-	// (The cleanup operand of each return
-	// statement below is ignored.)
-	defer func() {
-		cleanup = func() {
-			os.RemoveAll(dir)
-		}
-		if err != nil {
-			cleanup()
-			cleanup = nil
-		}
-	}()
-
-	// Write each map entry to a temporary file.
-	overlays := make(map[string]string)
-	for k, v := range overlay {
-		// Use a unique basename for each file (001-foo.go),
-		// to avoid creating nested directories.
-		base := fmt.Sprintf("%d-%s", 1+len(overlays), filepath.Base(k))
-		filename := filepath.Join(dir, base)
-		err := os.WriteFile(filename, v, 0666)
-		if err != nil {
-			return "", nil, err
-		}
-		overlays[k] = filename
-	}
-
-	// Write the JSON overlay file that maps logical file names to temp files.
-	//
-	// OverlayJSON is the format overlay files are expected to be in.
-	// The Replace map maps from overlaid paths to replacement paths:
-	// the Go command will forward all reads trying to open
-	// each overlaid path to its replacement path, or consider the overlaid
-	// path not to exist if the replacement path is empty.
-	//
-	// From golang/go#39958.
-	type OverlayJSON struct {
-		Replace map[string]string `json:"replace,omitempty"`
-	}
-	b, err := json.Marshal(OverlayJSON{Replace: overlays})
-	if err != nil {
-		return "", nil, err
-	}
-	filename = filepath.Join(dir, "overlay.json")
-	if err := os.WriteFile(filename, b, 0666); err != nil {
-		return "", nil, err
-	}
-
-	return filename, nil, nil
-}
diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke_notunix.go b/vendor/golang.org/x/tools/internal/gocommand/invoke_notunix.go
deleted file mode 100644
index 469c648..0000000
--- a/vendor/golang.org/x/tools/internal/gocommand/invoke_notunix.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !unix
-
-package gocommand
-
-import "os"
-
-// sigStuckProcess is the signal to send to kill a hanging subprocess.
-// On Unix we send SIGQUIT, but on non-Unix we only have os.Kill.
-var sigStuckProcess = os.Kill
diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke_unix.go b/vendor/golang.org/x/tools/internal/gocommand/invoke_unix.go
deleted file mode 100644
index 169d37c..0000000
--- a/vendor/golang.org/x/tools/internal/gocommand/invoke_unix.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build unix
-
-package gocommand
-
-import "syscall"
-
-// Sigstuckprocess is the signal to send to kill a hanging subprocess.
-// Send SIGQUIT to get a stack trace.
-var sigStuckProcess = syscall.SIGQUIT
diff --git a/vendor/golang.org/x/tools/internal/gocommand/vendor.go b/vendor/golang.org/x/tools/internal/gocommand/vendor.go
deleted file mode 100644
index e38d1fb..0000000
--- a/vendor/golang.org/x/tools/internal/gocommand/vendor.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gocommand
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"golang.org/x/mod/semver"
-)
-
-// ModuleJSON holds information about a module.
-type ModuleJSON struct {
-	Path      string      // module path
-	Version   string      // module version
-	Versions  []string    // available module versions (with -versions)
-	Replace   *ModuleJSON // replaced by this module
-	Time      *time.Time  // time version was created
-	Update    *ModuleJSON // available update, if any (with -u)
-	Main      bool        // is this the main module?
-	Indirect  bool        // is this module only an indirect dependency of main module?
-	Dir       string      // directory holding files for this module, if any
-	GoMod     string      // path to go.mod file used when loading this module, if any
-	GoVersion string      // go version used in module
-}
-
-var modFlagRegexp = regexp.MustCompile(`-mod[ =](\w+)`)
-
-// VendorEnabled reports whether vendoring is enabled. It takes a *Runner to execute Go commands
-// with the supplied context.Context and Invocation. The Invocation can contain pre-defined fields,
-// of which only Verb and Args are modified to run the appropriate Go command.
-// Inspired by setDefaultBuildMod in modload/init.go
-func VendorEnabled(ctx context.Context, inv Invocation, r *Runner) (bool, *ModuleJSON, error) {
-	mainMod, go114, err := getMainModuleAnd114(ctx, inv, r)
-	if err != nil {
-		return false, nil, err
-	}
-
-	// We check the GOFLAGS to see if there is anything overridden or not.
-	inv.Verb = "env"
-	inv.Args = []string{"GOFLAGS"}
-	stdout, err := r.Run(ctx, inv)
-	if err != nil {
-		return false, nil, err
-	}
-	goflags := string(bytes.TrimSpace(stdout.Bytes()))
-	matches := modFlagRegexp.FindStringSubmatch(goflags)
-	var modFlag string
-	if len(matches) != 0 {
-		modFlag = matches[1]
-	}
-	// Don't override an explicit '-mod=' argument.
-	if modFlag == "vendor" {
-		return true, mainMod, nil
-	} else if modFlag != "" {
-		return false, nil, nil
-	}
-	if mainMod == nil || !go114 {
-		return false, nil, nil
-	}
-	// Check 1.14's automatic vendor mode.
-	if fi, err := os.Stat(filepath.Join(mainMod.Dir, "vendor")); err == nil && fi.IsDir() {
-		if mainMod.GoVersion != "" && semver.Compare("v"+mainMod.GoVersion, "v1.14") >= 0 {
-			// The Go version is at least 1.14, and a vendor directory exists.
-			// Set -mod=vendor by default.
-			return true, mainMod, nil
-		}
-	}
-	return false, nil, nil
-}
-
-// getMainModuleAnd114 gets one of the main modules' information and whether the
-// go command in use is 1.14+. This is the information needed to figure out
-// if vendoring should be enabled.
-func getMainModuleAnd114(ctx context.Context, inv Invocation, r *Runner) (*ModuleJSON, bool, error) {
-	const format = `{{.Path}}
-{{.Dir}}
-{{.GoMod}}
-{{.GoVersion}}
-{{range context.ReleaseTags}}{{if eq . "go1.14"}}{{.}}{{end}}{{end}}
-`
-	inv.Verb = "list"
-	inv.Args = []string{"-m", "-f", format}
-	stdout, err := r.Run(ctx, inv)
-	if err != nil {
-		return nil, false, err
-	}
-
-	lines := strings.Split(stdout.String(), "\n")
-	if len(lines) < 5 {
-		return nil, false, fmt.Errorf("unexpected stdout: %q", stdout.String())
-	}
-	mod := &ModuleJSON{
-		Path:      lines[0],
-		Dir:       lines[1],
-		GoMod:     lines[2],
-		GoVersion: lines[3],
-		Main:      true,
-	}
-	return mod, lines[4] == "go1.14", nil
-}
-
-// WorkspaceVendorEnabled reports whether workspace vendoring is enabled. It takes a *Runner to execute Go commands
-// with the supplied context.Context and Invocation. The Invocation can contain pre-defined fields,
-// of which only Verb and Args are modified to run the appropriate Go command.
-// Inspired by setDefaultBuildMod in modload/init.go
-func WorkspaceVendorEnabled(ctx context.Context, inv Invocation, r *Runner) (bool, []*ModuleJSON, error) {
-	inv.Verb = "env"
-	inv.Args = []string{"GOWORK"}
-	stdout, err := r.Run(ctx, inv)
-	if err != nil {
-		return false, nil, err
-	}
-	goWork := string(bytes.TrimSpace(stdout.Bytes()))
-	if fi, err := os.Stat(filepath.Join(filepath.Dir(goWork), "vendor")); err == nil && fi.IsDir() {
-		mainMods, err := getWorkspaceMainModules(ctx, inv, r)
-		if err != nil {
-			return false, nil, err
-		}
-		return true, mainMods, nil
-	}
-	return false, nil, nil
-}
-
-// getWorkspaceMainModules gets the main modules' information.
-// This is the information needed to figure out if vendoring should be enabled.
-func getWorkspaceMainModules(ctx context.Context, inv Invocation, r *Runner) ([]*ModuleJSON, error) {
-	const format = `{{.Path}}
-{{.Dir}}
-{{.GoMod}}
-{{.GoVersion}}
-`
-	inv.Verb = "list"
-	inv.Args = []string{"-m", "-f", format}
-	stdout, err := r.Run(ctx, inv)
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(strings.TrimSuffix(stdout.String(), "\n"), "\n")
-	if len(lines) < 4 {
-		return nil, fmt.Errorf("unexpected stdout: %q", stdout.String())
-	}
-	mods := make([]*ModuleJSON, 0, len(lines)/4)
-	for i := 0; i < len(lines); i += 4 {
-		mods = append(mods, &ModuleJSON{
-			Path:      lines[i],
-			Dir:       lines[i+1],
-			GoMod:     lines[i+2],
-			GoVersion: lines[i+3],
-			Main:      true,
-		})
-	}
-	return mods, nil
-}
diff --git a/vendor/golang.org/x/tools/internal/gocommand/version.go b/vendor/golang.org/x/tools/internal/gocommand/version.go
deleted file mode 100644
index 446c584..0000000
--- a/vendor/golang.org/x/tools/internal/gocommand/version.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gocommand
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-// GoVersion reports the minor version number of the highest release
-// tag built into the go command on the PATH.
-//
-// Note that this may be higher than the version of the go tool used
-// to build this application, and thus the versions of the standard
-// go/{scanner,parser,ast,types} packages that are linked into it.
-// In that case, callers should either downgrade to the version of
-// go used to build the application, or report an error that the
-// application is too old to use the go command on the PATH.
-func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
-	inv.Verb = "list"
-	inv.Args = []string{"-e", "-f", `{{context.ReleaseTags}}`, `--`, `unsafe`}
-	inv.BuildFlags = nil // This is not a build command.
-	inv.ModFlag = ""
-	inv.ModFile = ""
-	inv.Env = append(inv.Env[:len(inv.Env):len(inv.Env)], "GO111MODULE=off")
-
-	stdoutBytes, err := r.Run(ctx, inv)
-	if err != nil {
-		return 0, err
-	}
-	stdout := stdoutBytes.String()
-	if len(stdout) < 3 {
-		return 0, fmt.Errorf("bad ReleaseTags output: %q", stdout)
-	}
-	// Split up "[go1.1 go1.15]" and return highest go1.X value.
-	tags := strings.Fields(stdout[1 : len(stdout)-2])
-	for i := len(tags) - 1; i >= 0; i-- {
-		var version int
-		if _, err := fmt.Sscanf(tags[i], "go1.%d", &version); err != nil {
-			continue
-		}
-		return version, nil
-	}
-	return 0, fmt.Errorf("no parseable ReleaseTags in %v", tags)
-}
-
-// GoVersionOutput returns the complete output of the go version command.
-func GoVersionOutput(ctx context.Context, inv Invocation, r *Runner) (string, error) {
-	inv.Verb = "version"
-	goVersion, err := r.Run(ctx, inv)
-	if err != nil {
-		return "", err
-	}
-	return goVersion.String(), nil
-}
-
-// ParseGoVersionOutput extracts the Go version string
-// from the output of the "go version" command.
-// Given an unrecognized form, it returns an empty string.
-func ParseGoVersionOutput(data string) string {
-	re := regexp.MustCompile(`^go version (go\S+|devel \S+)`)
-	m := re.FindStringSubmatch(data)
-	if len(m) != 2 {
-		return "" // unrecognized version
-	}
-	return m[1]
-}
diff --git a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
deleted file mode 100644
index 73eefa2..0000000
--- a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package packagesinternal exposes internal-only fields from go/packages.
-package packagesinternal
-
-var GetDepsErrors = func(p any) []*PackageError { return nil }
-
-type PackageError struct {
-	ImportStack []string // shortest path from package named on command line to this one
-	Pos         string   // position of error (if present, file:line:col)
-	Err         string   // the error itself
-}
-
-var TypecheckCgo int
-var DepsErrors int // must be set as a LoadMode to call GetDepsErrors
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/codes.go b/vendor/golang.org/x/tools/internal/pkgbits/codes.go
deleted file mode 100644
index f0cabde..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/codes.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-// A Code is an enum value that can be encoded into bitstreams.
-//
-// Code types are preferable for enum types, because they allow
-// Decoder to detect desyncs.
-type Code interface {
-	// Marker returns the SyncMarker for the Code's dynamic type.
-	Marker() SyncMarker
-
-	// Value returns the Code's ordinal value.
-	Value() int
-}
-
-// A CodeVal distinguishes among go/constant.Value encodings.
-type CodeVal int
-
-func (c CodeVal) Marker() SyncMarker { return SyncVal }
-func (c CodeVal) Value() int         { return int(c) }
-
-// Note: These values are public and cannot be changed without
-// updating the go/types importers.
-
-const (
-	ValBool CodeVal = iota
-	ValString
-	ValInt64
-	ValBigInt
-	ValBigRat
-	ValBigFloat
-)
-
-// A CodeType distinguishes among go/types.Type encodings.
-type CodeType int
-
-func (c CodeType) Marker() SyncMarker { return SyncType }
-func (c CodeType) Value() int         { return int(c) }
-
-// Note: These values are public and cannot be changed without
-// updating the go/types importers.
-
-const (
-	TypeBasic CodeType = iota
-	TypeNamed
-	TypePointer
-	TypeSlice
-	TypeArray
-	TypeChan
-	TypeMap
-	TypeSignature
-	TypeStruct
-	TypeInterface
-	TypeUnion
-	TypeTypeParam
-)
-
-// A CodeObj distinguishes among go/types.Object encodings.
-type CodeObj int
-
-func (c CodeObj) Marker() SyncMarker { return SyncCodeObj }
-func (c CodeObj) Value() int         { return int(c) }
-
-// Note: These values are public and cannot be changed without
-// updating the go/types importers.
-
-const (
-	ObjAlias CodeObj = iota
-	ObjConst
-	ObjType
-	ObjFunc
-	ObjVar
-	ObjStub
-)
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/decoder.go b/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
deleted file mode 100644
index c0aba26..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"go/constant"
-	"go/token"
-	"io"
-	"math/big"
-	"os"
-	"runtime"
-	"strings"
-)
-
-// A PkgDecoder provides methods for decoding a package's Unified IR
-// export data.
-type PkgDecoder struct {
-	// version is the file format version.
-	version Version
-
-	// sync indicates whether the file uses sync markers.
-	sync bool
-
-	// pkgPath is the package path for the package to be decoded.
-	//
-	// TODO(mdempsky): Remove; unneeded since CL 391014.
-	pkgPath string
-
-	// elemData is the full data payload of the encoded package.
-	// Elements are densely and contiguously packed together.
-	//
-	// The last 8 bytes of elemData are the package fingerprint.
-	elemData string
-
-	// elemEnds stores the byte-offset end positions of element
-	// bitstreams within elemData.
-	//
-	// For example, element I's bitstream data starts at elemEnds[I-1]
-	// (or 0, if I==0) and ends at elemEnds[I].
-	//
-	// Note: elemEnds is indexed by absolute indices, not
-	// section-relative indices.
-	elemEnds []uint32
-
-	// elemEndsEnds stores the index-offset end positions of relocation
-	// sections within elemEnds.
-	//
-	// For example, section K's end positions start at elemEndsEnds[K-1]
-	// (or 0, if K==0) and end at elemEndsEnds[K].
-	elemEndsEnds [numRelocs]uint32
-
-	scratchRelocEnt []RelocEnt
-}
-
-// PkgPath returns the package path for the package
-//
-// TODO(mdempsky): Remove; unneeded since CL 391014.
-func (pr *PkgDecoder) PkgPath() string { return pr.pkgPath }
-
-// SyncMarkers reports whether pr uses sync markers.
-func (pr *PkgDecoder) SyncMarkers() bool { return pr.sync }
-
-// NewPkgDecoder returns a PkgDecoder initialized to read the Unified
-// IR export data from input. pkgPath is the package path for the
-// compilation unit that produced the export data.
-func NewPkgDecoder(pkgPath, input string) PkgDecoder {
-	pr := PkgDecoder{
-		pkgPath: pkgPath,
-	}
-
-	// TODO(mdempsky): Implement direct indexing of input string to
-	// avoid copying the position information.
-
-	r := strings.NewReader(input)
-
-	var ver uint32
-	assert(binary.Read(r, binary.LittleEndian, &ver) == nil)
-	pr.version = Version(ver)
-
-	if pr.version >= numVersions {
-		panic(fmt.Errorf("cannot decode %q, export data version %d is greater than maximum supported version %d", pkgPath, pr.version, numVersions-1))
-	}
-
-	if pr.version.Has(Flags) {
-		var flags uint32
-		assert(binary.Read(r, binary.LittleEndian, &flags) == nil)
-		pr.sync = flags&flagSyncMarkers != 0
-	}
-
-	assert(binary.Read(r, binary.LittleEndian, pr.elemEndsEnds[:]) == nil)
-
-	pr.elemEnds = make([]uint32, pr.elemEndsEnds[len(pr.elemEndsEnds)-1])
-	assert(binary.Read(r, binary.LittleEndian, pr.elemEnds[:]) == nil)
-
-	pos, err := r.Seek(0, io.SeekCurrent)
-	assert(err == nil)
-
-	pr.elemData = input[pos:]
-
-	const fingerprintSize = 8
-	assert(len(pr.elemData)-fingerprintSize == int(pr.elemEnds[len(pr.elemEnds)-1]))
-
-	return pr
-}
-
-// NumElems returns the number of elements in section k.
-func (pr *PkgDecoder) NumElems(k RelocKind) int {
-	count := int(pr.elemEndsEnds[k])
-	if k > 0 {
-		count -= int(pr.elemEndsEnds[k-1])
-	}
-	return count
-}
-
-// TotalElems returns the total number of elements across all sections.
-func (pr *PkgDecoder) TotalElems() int {
-	return len(pr.elemEnds)
-}
-
-// Fingerprint returns the package fingerprint.
-func (pr *PkgDecoder) Fingerprint() [8]byte {
-	var fp [8]byte
-	copy(fp[:], pr.elemData[len(pr.elemData)-8:])
-	return fp
-}
-
-// AbsIdx returns the absolute index for the given (section, index)
-// pair.
-func (pr *PkgDecoder) AbsIdx(k RelocKind, idx Index) int {
-	absIdx := int(idx)
-	if k > 0 {
-		absIdx += int(pr.elemEndsEnds[k-1])
-	}
-	if absIdx >= int(pr.elemEndsEnds[k]) {
-		panicf("%v:%v is out of bounds; %v", k, idx, pr.elemEndsEnds)
-	}
-	return absIdx
-}
-
-// DataIdx returns the raw element bitstream for the given (section,
-// index) pair.
-func (pr *PkgDecoder) DataIdx(k RelocKind, idx Index) string {
-	absIdx := pr.AbsIdx(k, idx)
-
-	var start uint32
-	if absIdx > 0 {
-		start = pr.elemEnds[absIdx-1]
-	}
-	end := pr.elemEnds[absIdx]
-
-	return pr.elemData[start:end]
-}
-
-// StringIdx returns the string value for the given string index.
-func (pr *PkgDecoder) StringIdx(idx Index) string {
-	return pr.DataIdx(RelocString, idx)
-}
-
-// NewDecoder returns a Decoder for the given (section, index) pair,
-// and decodes the given SyncMarker from the element bitstream.
-func (pr *PkgDecoder) NewDecoder(k RelocKind, idx Index, marker SyncMarker) Decoder {
-	r := pr.NewDecoderRaw(k, idx)
-	r.Sync(marker)
-	return r
-}
-
-// TempDecoder returns a Decoder for the given (section, index) pair,
-// and decodes the given SyncMarker from the element bitstream.
-// If possible the Decoder should be RetireDecoder'd when it is no longer
-// needed, this will avoid heap allocations.
-func (pr *PkgDecoder) TempDecoder(k RelocKind, idx Index, marker SyncMarker) Decoder {
-	r := pr.TempDecoderRaw(k, idx)
-	r.Sync(marker)
-	return r
-}
-
-func (pr *PkgDecoder) RetireDecoder(d *Decoder) {
-	pr.scratchRelocEnt = d.Relocs
-	d.Relocs = nil
-}
-
-// NewDecoderRaw returns a Decoder for the given (section, index) pair.
-//
-// Most callers should use NewDecoder instead.
-func (pr *PkgDecoder) NewDecoderRaw(k RelocKind, idx Index) Decoder {
-	r := Decoder{
-		common: pr,
-		k:      k,
-		Idx:    idx,
-	}
-
-	r.Data.Reset(pr.DataIdx(k, idx))
-	r.Sync(SyncRelocs)
-	r.Relocs = make([]RelocEnt, r.Len())
-	for i := range r.Relocs {
-		r.Sync(SyncReloc)
-		r.Relocs[i] = RelocEnt{RelocKind(r.Len()), Index(r.Len())}
-	}
-
-	return r
-}
-
-func (pr *PkgDecoder) TempDecoderRaw(k RelocKind, idx Index) Decoder {
-	r := Decoder{
-		common: pr,
-		k:      k,
-		Idx:    idx,
-	}
-
-	r.Data.Reset(pr.DataIdx(k, idx))
-	r.Sync(SyncRelocs)
-	l := r.Len()
-	if cap(pr.scratchRelocEnt) >= l {
-		r.Relocs = pr.scratchRelocEnt[:l]
-		pr.scratchRelocEnt = nil
-	} else {
-		r.Relocs = make([]RelocEnt, l)
-	}
-	for i := range r.Relocs {
-		r.Sync(SyncReloc)
-		r.Relocs[i] = RelocEnt{RelocKind(r.Len()), Index(r.Len())}
-	}
-
-	return r
-}
-
-// A Decoder provides methods for decoding an individual element's
-// bitstream data.
-type Decoder struct {
-	common *PkgDecoder
-
-	Relocs []RelocEnt
-	Data   strings.Reader
-
-	k   RelocKind
-	Idx Index
-}
-
-func (r *Decoder) checkErr(err error) {
-	if err != nil {
-		panicf("unexpected decoding error: %w", err)
-	}
-}
-
-func (r *Decoder) rawUvarint() uint64 {
-	x, err := readUvarint(&r.Data)
-	r.checkErr(err)
-	return x
-}
-
-// readUvarint is a type-specialized copy of encoding/binary.ReadUvarint.
-// This avoids the interface conversion and thus has better escape properties,
-// which flows up the stack.
-func readUvarint(r *strings.Reader) (uint64, error) {
-	var x uint64
-	var s uint
-	for i := range binary.MaxVarintLen64 {
-		b, err := r.ReadByte()
-		if err != nil {
-			if i > 0 && err == io.EOF {
-				err = io.ErrUnexpectedEOF
-			}
-			return x, err
-		}
-		if b < 0x80 {
-			if i == binary.MaxVarintLen64-1 && b > 1 {
-				return x, overflow
-			}
-			return x | uint64(b)<<s, nil
-		}
-		x |= uint64(b&0x7f) << s
-		s += 7
-	}
-	return x, overflow
-}
-
-var overflow = errors.New("pkgbits: readUvarint overflows a 64-bit integer")
-
-func (r *Decoder) rawVarint() int64 {
-	ux := r.rawUvarint()
-
-	// Zig-zag decode.
-	x := int64(ux >> 1)
-	if ux&1 != 0 {
-		x = ^x
-	}
-	return x
-}
-
-func (r *Decoder) rawReloc(k RelocKind, idx int) Index {
-	e := r.Relocs[idx]
-	assert(e.Kind == k)
-	return e.Idx
-}
-
-// Sync decodes a sync marker from the element bitstream and asserts
-// that it matches the expected marker.
-//
-// If r.common.sync is false, then Sync is a no-op.
-func (r *Decoder) Sync(mWant SyncMarker) {
-	if !r.common.sync {
-		return
-	}
-
-	pos, _ := r.Data.Seek(0, io.SeekCurrent)
-	mHave := SyncMarker(r.rawUvarint())
-	writerPCs := make([]int, r.rawUvarint())
-	for i := range writerPCs {
-		writerPCs[i] = int(r.rawUvarint())
-	}
-
-	if mHave == mWant {
-		return
-	}
-
-	// There's some tension here between printing:
-	//
-	// (1) full file paths that tools can recognize (e.g., so emacs
-	//     hyperlinks the "file:line" text for easy navigation), or
-	//
-	// (2) short file paths that are easier for humans to read (e.g., by
-	//     omitting redundant or irrelevant details, so it's easier to
-	//     focus on the useful bits that remain).
-	//
-	// The current formatting favors the former, as it seems more
-	// helpful in practice. But perhaps the formatting could be improved
-	// to better address both concerns. For example, use relative file
-	// paths if they would be shorter, or rewrite file paths to contain
-	// "$GOROOT" (like objabi.AbsFile does) if tools can be taught how
-	// to reliably expand that again.
-
-	fmt.Printf("export data desync: package %q, section %v, index %v, offset %v\n", r.common.pkgPath, r.k, r.Idx, pos)
-
-	fmt.Printf("\nfound %v, written at:\n", mHave)
-	if len(writerPCs) == 0 {
-		fmt.Printf("\t[stack trace unavailable; recompile package %q with -d=syncframes]\n", r.common.pkgPath)
-	}
-	for _, pc := range writerPCs {
-		fmt.Printf("\t%s\n", r.common.StringIdx(r.rawReloc(RelocString, pc)))
-	}
-
-	fmt.Printf("\nexpected %v, reading at:\n", mWant)
-	var readerPCs [32]uintptr // TODO(mdempsky): Dynamically size?
-	n := runtime.Callers(2, readerPCs[:])
-	for _, pc := range fmtFrames(readerPCs[:n]...) {
-		fmt.Printf("\t%s\n", pc)
-	}
-
-	// We already printed a stack trace for the reader, so now we can
-	// simply exit. Printing a second one with panic or base.Fatalf
-	// would just be noise.
-	os.Exit(1)
-}
-
-// Bool decodes and returns a bool value from the element bitstream.
-func (r *Decoder) Bool() bool {
-	r.Sync(SyncBool)
-	x, err := r.Data.ReadByte()
-	r.checkErr(err)
-	assert(x < 2)
-	return x != 0
-}
-
-// Int64 decodes and returns an int64 value from the element bitstream.
-func (r *Decoder) Int64() int64 {
-	r.Sync(SyncInt64)
-	return r.rawVarint()
-}
-
-// Uint64 decodes and returns a uint64 value from the element bitstream.
-func (r *Decoder) Uint64() uint64 {
-	r.Sync(SyncUint64)
-	return r.rawUvarint()
-}
-
-// Len decodes and returns a non-negative int value from the element bitstream.
-func (r *Decoder) Len() int { x := r.Uint64(); v := int(x); assert(uint64(v) == x); return v }
-
-// Int decodes and returns an int value from the element bitstream.
-func (r *Decoder) Int() int { x := r.Int64(); v := int(x); assert(int64(v) == x); return v }
-
-// Uint decodes and returns a uint value from the element bitstream.
-func (r *Decoder) Uint() uint { x := r.Uint64(); v := uint(x); assert(uint64(v) == x); return v }
-
-// Code decodes a Code value from the element bitstream and returns
-// its ordinal value. It's the caller's responsibility to convert the
-// result to an appropriate Code type.
-//
-// TODO(mdempsky): Ideally this method would have signature "Code[T
-// Code] T" instead, but we don't allow generic methods and the
-// compiler can't depend on generics yet anyway.
-func (r *Decoder) Code(mark SyncMarker) int {
-	r.Sync(mark)
-	return r.Len()
-}
-
-// Reloc decodes a relocation of expected section k from the element
-// bitstream and returns an index to the referenced element.
-func (r *Decoder) Reloc(k RelocKind) Index {
-	r.Sync(SyncUseReloc)
-	return r.rawReloc(k, r.Len())
-}
-
-// String decodes and returns a string value from the element
-// bitstream.
-func (r *Decoder) String() string {
-	r.Sync(SyncString)
-	return r.common.StringIdx(r.Reloc(RelocString))
-}
-
-// Strings decodes and returns a variable-length slice of strings from
-// the element bitstream.
-func (r *Decoder) Strings() []string {
-	res := make([]string, r.Len())
-	for i := range res {
-		res[i] = r.String()
-	}
-	return res
-}
-
-// Value decodes and returns a constant.Value from the element
-// bitstream.
-func (r *Decoder) Value() constant.Value {
-	r.Sync(SyncValue)
-	isComplex := r.Bool()
-	val := r.scalar()
-	if isComplex {
-		val = constant.BinaryOp(val, token.ADD, constant.MakeImag(r.scalar()))
-	}
-	return val
-}
-
-func (r *Decoder) scalar() constant.Value {
-	switch tag := CodeVal(r.Code(SyncVal)); tag {
-	default:
-		panic(fmt.Errorf("unexpected scalar tag: %v", tag))
-
-	case ValBool:
-		return constant.MakeBool(r.Bool())
-	case ValString:
-		return constant.MakeString(r.String())
-	case ValInt64:
-		return constant.MakeInt64(r.Int64())
-	case ValBigInt:
-		return constant.Make(r.bigInt())
-	case ValBigRat:
-		num := r.bigInt()
-		denom := r.bigInt()
-		return constant.Make(new(big.Rat).SetFrac(num, denom))
-	case ValBigFloat:
-		return constant.Make(r.bigFloat())
-	}
-}
-
-func (r *Decoder) bigInt() *big.Int {
-	v := new(big.Int).SetBytes([]byte(r.String()))
-	if r.Bool() {
-		v.Neg(v)
-	}
-	return v
-}
-
-func (r *Decoder) bigFloat() *big.Float {
-	v := new(big.Float).SetPrec(512)
-	assert(v.UnmarshalText([]byte(r.String())) == nil)
-	return v
-}
-
-// @@@ Helpers
-
-// TODO(mdempsky): These should probably be removed. I think they're a
-// smell that the export data format is not yet quite right.
-
-// PeekPkgPath returns the package path for the specified package
-// index.
-func (pr *PkgDecoder) PeekPkgPath(idx Index) string {
-	var path string
-	{
-		r := pr.TempDecoder(RelocPkg, idx, SyncPkgDef)
-		path = r.String()
-		pr.RetireDecoder(&r)
-	}
-	if path == "" {
-		path = pr.pkgPath
-	}
-	return path
-}
-
-// PeekObj returns the package path, object name, and CodeObj for the
-// specified object index.
-func (pr *PkgDecoder) PeekObj(idx Index) (string, string, CodeObj) {
-	var ridx Index
-	var name string
-	var rcode int
-	{
-		r := pr.TempDecoder(RelocName, idx, SyncObject1)
-		r.Sync(SyncSym)
-		r.Sync(SyncPkg)
-		ridx = r.Reloc(RelocPkg)
-		name = r.String()
-		rcode = r.Code(SyncCodeObj)
-		pr.RetireDecoder(&r)
-	}
-
-	path := pr.PeekPkgPath(ridx)
-	assert(name != "")
-
-	tag := CodeObj(rcode)
-
-	return path, name, tag
-}
-
-// Version reports the version of the bitstream.
-func (w *Decoder) Version() Version { return w.common.version }
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/doc.go b/vendor/golang.org/x/tools/internal/pkgbits/doc.go
deleted file mode 100644
index c8a2796..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/doc.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package pkgbits implements low-level coding abstractions for
-// Unified IR's export data format.
-//
-// At a low-level, a package is a collection of bitstream elements.
-// Each element has a "kind" and a dense, non-negative index.
-// Elements can be randomly accessed given their kind and index.
-//
-// Individual elements are sequences of variable-length values (e.g.,
-// integers, booleans, strings, go/constant values, cross-references
-// to other elements). Package pkgbits provides APIs for encoding and
-// decoding these low-level values, but the details of mapping
-// higher-level Go constructs into elements is left to higher-level
-// abstractions.
-//
-// Elements may cross-reference each other with "relocations." For
-// example, an element representing a pointer type has a relocation
-// referring to the element type.
-//
-// Go constructs may be composed as a constellation of multiple
-// elements. For example, a declared function may have one element to
-// describe the object (e.g., its name, type, position), and a
-// separate element to describe its function body. This allows readers
-// some flexibility in efficiently seeking or re-reading data (e.g.,
-// inlining requires re-reading the function body for each inlined
-// call, without needing to re-read the object-level details).
-//
-// This is a copy of internal/pkgbits in the Go implementation.
-package pkgbits
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/encoder.go b/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
deleted file mode 100644
index c17a123..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/binary"
-	"go/constant"
-	"io"
-	"math/big"
-	"runtime"
-	"strings"
-)
-
-// A PkgEncoder provides methods for encoding a package's Unified IR
-// export data.
-type PkgEncoder struct {
-	// version of the bitstream.
-	version Version
-
-	// elems holds the bitstream for previously encoded elements.
-	elems [numRelocs][]string
-
-	// stringsIdx maps previously encoded strings to their index within
-	// the RelocString section, to allow deduplication. That is,
-	// elems[RelocString][stringsIdx[s]] == s (if present).
-	stringsIdx map[string]Index
-
-	// syncFrames is the number of frames to write at each sync
-	// marker. A negative value means sync markers are omitted.
-	syncFrames int
-}
-
-// SyncMarkers reports whether pw uses sync markers.
-func (pw *PkgEncoder) SyncMarkers() bool { return pw.syncFrames >= 0 }
-
-// NewPkgEncoder returns an initialized PkgEncoder.
-//
-// syncFrames is the number of caller frames that should be serialized
-// at Sync points. Serializing additional frames results in larger
-// export data files, but can help diagnosing desync errors in
-// higher-level Unified IR reader/writer code. If syncFrames is
-// negative, then sync markers are omitted entirely.
-func NewPkgEncoder(version Version, syncFrames int) PkgEncoder {
-	return PkgEncoder{
-		version:    version,
-		stringsIdx: make(map[string]Index),
-		syncFrames: syncFrames,
-	}
-}
-
-// DumpTo writes the package's encoded data to out0 and returns the
-// package fingerprint.
-func (pw *PkgEncoder) DumpTo(out0 io.Writer) (fingerprint [8]byte) {
-	h := md5.New()
-	out := io.MultiWriter(out0, h)
-
-	writeUint32 := func(x uint32) {
-		assert(binary.Write(out, binary.LittleEndian, x) == nil)
-	}
-
-	writeUint32(uint32(pw.version))
-
-	if pw.version.Has(Flags) {
-		var flags uint32
-		if pw.SyncMarkers() {
-			flags |= flagSyncMarkers
-		}
-		writeUint32(flags)
-	}
-
-	// Write elemEndsEnds.
-	var sum uint32
-	for _, elems := range &pw.elems {
-		sum += uint32(len(elems))
-		writeUint32(sum)
-	}
-
-	// Write elemEnds.
-	sum = 0
-	for _, elems := range &pw.elems {
-		for _, elem := range elems {
-			sum += uint32(len(elem))
-			writeUint32(sum)
-		}
-	}
-
-	// Write elemData.
-	for _, elems := range &pw.elems {
-		for _, elem := range elems {
-			_, err := io.WriteString(out, elem)
-			assert(err == nil)
-		}
-	}
-
-	// Write fingerprint.
-	copy(fingerprint[:], h.Sum(nil))
-	_, err := out0.Write(fingerprint[:])
-	assert(err == nil)
-
-	return
-}
-
-// StringIdx adds a string value to the strings section, if not
-// already present, and returns its index.
-func (pw *PkgEncoder) StringIdx(s string) Index {
-	if idx, ok := pw.stringsIdx[s]; ok {
-		assert(pw.elems[RelocString][idx] == s)
-		return idx
-	}
-
-	idx := Index(len(pw.elems[RelocString]))
-	pw.elems[RelocString] = append(pw.elems[RelocString], s)
-	pw.stringsIdx[s] = idx
-	return idx
-}
-
-// NewEncoder returns an Encoder for a new element within the given
-// section, and encodes the given SyncMarker as the start of the
-// element bitstream.
-func (pw *PkgEncoder) NewEncoder(k RelocKind, marker SyncMarker) Encoder {
-	e := pw.NewEncoderRaw(k)
-	e.Sync(marker)
-	return e
-}
-
-// NewEncoderRaw returns an Encoder for a new element within the given
-// section.
-//
-// Most callers should use NewEncoder instead.
-func (pw *PkgEncoder) NewEncoderRaw(k RelocKind) Encoder {
-	idx := Index(len(pw.elems[k]))
-	pw.elems[k] = append(pw.elems[k], "") // placeholder
-
-	return Encoder{
-		p:   pw,
-		k:   k,
-		Idx: idx,
-	}
-}
-
-// An Encoder provides methods for encoding an individual element's
-// bitstream data.
-type Encoder struct {
-	p *PkgEncoder
-
-	Relocs   []RelocEnt
-	RelocMap map[RelocEnt]uint32
-	Data     bytes.Buffer // accumulated element bitstream data
-
-	encodingRelocHeader bool
-
-	k   RelocKind
-	Idx Index // index within relocation section
-}
-
-// Flush finalizes the element's bitstream and returns its Index.
-func (w *Encoder) Flush() Index {
-	var sb strings.Builder
-
-	// Backup the data so we write the relocations at the front.
-	var tmp bytes.Buffer
-	io.Copy(&tmp, &w.Data)
-
-	// TODO(mdempsky): Consider writing these out separately so they're
-	// easier to strip, along with function bodies, so that we can prune
-	// down to just the data that's relevant to go/types.
-	if w.encodingRelocHeader {
-		panic("encodingRelocHeader already true; recursive flush?")
-	}
-	w.encodingRelocHeader = true
-	w.Sync(SyncRelocs)
-	w.Len(len(w.Relocs))
-	for _, rEnt := range w.Relocs {
-		w.Sync(SyncReloc)
-		w.Len(int(rEnt.Kind))
-		w.Len(int(rEnt.Idx))
-	}
-
-	io.Copy(&sb, &w.Data)
-	io.Copy(&sb, &tmp)
-	w.p.elems[w.k][w.Idx] = sb.String()
-
-	return w.Idx
-}
-
-func (w *Encoder) checkErr(err error) {
-	if err != nil {
-		panicf("unexpected encoding error: %v", err)
-	}
-}
-
-func (w *Encoder) rawUvarint(x uint64) {
-	var buf [binary.MaxVarintLen64]byte
-	n := binary.PutUvarint(buf[:], x)
-	_, err := w.Data.Write(buf[:n])
-	w.checkErr(err)
-}
-
-func (w *Encoder) rawVarint(x int64) {
-	// Zig-zag encode.
-	ux := uint64(x) << 1
-	if x < 0 {
-		ux = ^ux
-	}
-
-	w.rawUvarint(ux)
-}
-
-func (w *Encoder) rawReloc(r RelocKind, idx Index) int {
-	e := RelocEnt{r, idx}
-	if w.RelocMap != nil {
-		if i, ok := w.RelocMap[e]; ok {
-			return int(i)
-		}
-	} else {
-		w.RelocMap = make(map[RelocEnt]uint32)
-	}
-
-	i := len(w.Relocs)
-	w.RelocMap[e] = uint32(i)
-	w.Relocs = append(w.Relocs, e)
-	return i
-}
-
-func (w *Encoder) Sync(m SyncMarker) {
-	if !w.p.SyncMarkers() {
-		return
-	}
-
-	// Writing out stack frame string references requires working
-	// relocations, but writing out the relocations themselves involves
-	// sync markers. To prevent infinite recursion, we simply trim the
-	// stack frame for sync markers within the relocation header.
-	var frames []string
-	if !w.encodingRelocHeader && w.p.syncFrames > 0 {
-		pcs := make([]uintptr, w.p.syncFrames)
-		n := runtime.Callers(2, pcs)
-		frames = fmtFrames(pcs[:n]...)
-	}
-
-	// TODO(mdempsky): Save space by writing out stack frames as a
-	// linked list so we can share common stack frames.
-	w.rawUvarint(uint64(m))
-	w.rawUvarint(uint64(len(frames)))
-	for _, frame := range frames {
-		w.rawUvarint(uint64(w.rawReloc(RelocString, w.p.StringIdx(frame))))
-	}
-}
-
-// Bool encodes and writes a bool value into the element bitstream,
-// and then returns the bool value.
-//
-// For simple, 2-alternative encodings, the idiomatic way to call Bool
-// is something like:
-//
-//	if w.Bool(x != 0) {
-//		// alternative #1
-//	} else {
-//		// alternative #2
-//	}
-//
-// For multi-alternative encodings, use Code instead.
-func (w *Encoder) Bool(b bool) bool {
-	w.Sync(SyncBool)
-	var x byte
-	if b {
-		x = 1
-	}
-	err := w.Data.WriteByte(x)
-	w.checkErr(err)
-	return b
-}
-
-// Int64 encodes and writes an int64 value into the element bitstream.
-func (w *Encoder) Int64(x int64) {
-	w.Sync(SyncInt64)
-	w.rawVarint(x)
-}
-
-// Uint64 encodes and writes a uint64 value into the element bitstream.
-func (w *Encoder) Uint64(x uint64) {
-	w.Sync(SyncUint64)
-	w.rawUvarint(x)
-}
-
-// Len encodes and writes a non-negative int value into the element bitstream.
-func (w *Encoder) Len(x int) { assert(x >= 0); w.Uint64(uint64(x)) }
-
-// Int encodes and writes an int value into the element bitstream.
-func (w *Encoder) Int(x int) { w.Int64(int64(x)) }
-
-// Uint encodes and writes a uint value into the element bitstream.
-func (w *Encoder) Uint(x uint) { w.Uint64(uint64(x)) }
-
-// Reloc encodes and writes a relocation for the given (section,
-// index) pair into the element bitstream.
-//
-// Note: Only the index is formally written into the element
-// bitstream, so bitstream decoders must know from context which
-// section an encoded relocation refers to.
-func (w *Encoder) Reloc(r RelocKind, idx Index) {
-	w.Sync(SyncUseReloc)
-	w.Len(w.rawReloc(r, idx))
-}
-
-// Code encodes and writes a Code value into the element bitstream.
-func (w *Encoder) Code(c Code) {
-	w.Sync(c.Marker())
-	w.Len(c.Value())
-}
-
-// String encodes and writes a string value into the element
-// bitstream.
-//
-// Internally, strings are deduplicated by adding them to the strings
-// section (if not already present), and then writing a relocation
-// into the element bitstream.
-func (w *Encoder) String(s string) {
-	w.StringRef(w.p.StringIdx(s))
-}
-
-// StringRef writes a reference to the given index, which must be a
-// previously encoded string value.
-func (w *Encoder) StringRef(idx Index) {
-	w.Sync(SyncString)
-	w.Reloc(RelocString, idx)
-}
-
-// Strings encodes and writes a variable-length slice of strings into
-// the element bitstream.
-func (w *Encoder) Strings(ss []string) {
-	w.Len(len(ss))
-	for _, s := range ss {
-		w.String(s)
-	}
-}
-
-// Value encodes and writes a constant.Value into the element
-// bitstream.
-func (w *Encoder) Value(val constant.Value) {
-	w.Sync(SyncValue)
-	if w.Bool(val.Kind() == constant.Complex) {
-		w.scalar(constant.Real(val))
-		w.scalar(constant.Imag(val))
-	} else {
-		w.scalar(val)
-	}
-}
-
-func (w *Encoder) scalar(val constant.Value) {
-	switch v := constant.Val(val).(type) {
-	default:
-		panicf("unhandled %v (%v)", val, val.Kind())
-	case bool:
-		w.Code(ValBool)
-		w.Bool(v)
-	case string:
-		w.Code(ValString)
-		w.String(v)
-	case int64:
-		w.Code(ValInt64)
-		w.Int64(v)
-	case *big.Int:
-		w.Code(ValBigInt)
-		w.bigInt(v)
-	case *big.Rat:
-		w.Code(ValBigRat)
-		w.bigInt(v.Num())
-		w.bigInt(v.Denom())
-	case *big.Float:
-		w.Code(ValBigFloat)
-		w.bigFloat(v)
-	}
-}
-
-func (w *Encoder) bigInt(v *big.Int) {
-	b := v.Bytes()
-	w.String(string(b)) // TODO: More efficient encoding.
-	w.Bool(v.Sign() < 0)
-}
-
-func (w *Encoder) bigFloat(v *big.Float) {
-	b := v.Append(nil, 'p', -1)
-	w.String(string(b)) // TODO: More efficient encoding.
-}
-
-// Version reports the version of the bitstream.
-func (w *Encoder) Version() Version { return w.p.version }
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/flags.go b/vendor/golang.org/x/tools/internal/pkgbits/flags.go
deleted file mode 100644
index 6542227..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/flags.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-const (
-	flagSyncMarkers = 1 << iota // file format contains sync markers
-)
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/reloc.go b/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
deleted file mode 100644
index fcdfb97..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-// A RelocKind indicates a particular section within a unified IR export.
-type RelocKind int32
-
-// An Index represents a bitstream element index within a particular
-// section.
-type Index int32
-
-// A relocEnt (relocation entry) is an entry in an element's local
-// reference table.
-//
-// TODO(mdempsky): Rename this too.
-type RelocEnt struct {
-	Kind RelocKind
-	Idx  Index
-}
-
-// Reserved indices within the meta relocation section.
-const (
-	PublicRootIdx  Index = 0
-	PrivateRootIdx Index = 1
-)
-
-const (
-	RelocString RelocKind = iota
-	RelocMeta
-	RelocPosBase
-	RelocPkg
-	RelocName
-	RelocType
-	RelocObj
-	RelocObjExt
-	RelocObjDict
-	RelocBody
-
-	numRelocs = iota
-)
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/support.go b/vendor/golang.org/x/tools/internal/pkgbits/support.go
deleted file mode 100644
index 50534a2..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/support.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-import "fmt"
-
-func assert(b bool) {
-	if !b {
-		panic("assertion failed")
-	}
-}
-
-func panicf(format string, args ...any) {
-	panic(fmt.Errorf(format, args...))
-}
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/sync.go b/vendor/golang.org/x/tools/internal/pkgbits/sync.go
deleted file mode 100644
index 1520b73..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/sync.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-)
-
-// fmtFrames formats a backtrace for reporting reader/writer desyncs.
-func fmtFrames(pcs ...uintptr) []string {
-	res := make([]string, 0, len(pcs))
-	walkFrames(pcs, func(file string, line int, name string, offset uintptr) {
-		// Trim package from function name. It's just redundant noise.
-		name = strings.TrimPrefix(name, "cmd/compile/internal/noder.")
-
-		res = append(res, fmt.Sprintf("%s:%v: %s +0x%v", file, line, name, offset))
-	})
-	return res
-}
-
-type frameVisitor func(file string, line int, name string, offset uintptr)
-
-// walkFrames calls visit for each call frame represented by pcs.
-//
-// pcs should be a slice of PCs, as returned by runtime.Callers.
-func walkFrames(pcs []uintptr, visit frameVisitor) {
-	if len(pcs) == 0 {
-		return
-	}
-
-	frames := runtime.CallersFrames(pcs)
-	for {
-		frame, more := frames.Next()
-		visit(frame.File, frame.Line, frame.Function, frame.PC-frame.Entry)
-		if !more {
-			return
-		}
-	}
-}
-
-// SyncMarker is an enum type that represents markers that may be
-// written to export data to ensure the reader and writer stay
-// synchronized.
-type SyncMarker int
-
-//go:generate stringer -type=SyncMarker -trimprefix=Sync
-
-const (
-	_ SyncMarker = iota
-
-	// Public markers (known to go/types importers).
-
-	// Low-level coding markers.
-	SyncEOF
-	SyncBool
-	SyncInt64
-	SyncUint64
-	SyncString
-	SyncValue
-	SyncVal
-	SyncRelocs
-	SyncReloc
-	SyncUseReloc
-
-	// Higher-level object and type markers.
-	SyncPublic
-	SyncPos
-	SyncPosBase
-	SyncObject
-	SyncObject1
-	SyncPkg
-	SyncPkgDef
-	SyncMethod
-	SyncType
-	SyncTypeIdx
-	SyncTypeParamNames
-	SyncSignature
-	SyncParams
-	SyncParam
-	SyncCodeObj
-	SyncSym
-	SyncLocalIdent
-	SyncSelector
-
-	// Private markers (only known to cmd/compile).
-	SyncPrivate
-
-	SyncFuncExt
-	SyncVarExt
-	SyncTypeExt
-	SyncPragma
-
-	SyncExprList
-	SyncExprs
-	SyncExpr
-	SyncExprType
-	SyncAssign
-	SyncOp
-	SyncFuncLit
-	SyncCompLit
-
-	SyncDecl
-	SyncFuncBody
-	SyncOpenScope
-	SyncCloseScope
-	SyncCloseAnotherScope
-	SyncDeclNames
-	SyncDeclName
-
-	SyncStmts
-	SyncBlockStmt
-	SyncIfStmt
-	SyncForStmt
-	SyncSwitchStmt
-	SyncRangeStmt
-	SyncCaseClause
-	SyncCommClause
-	SyncSelectStmt
-	SyncDecls
-	SyncLabeledStmt
-	SyncUseObjLocal
-	SyncAddLocal
-	SyncLinkname
-	SyncStmt1
-	SyncStmtsEnd
-	SyncLabel
-	SyncOptLabel
-
-	SyncMultiExpr
-	SyncRType
-	SyncConvRTTI
-)
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go b/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
deleted file mode 100644
index 582ad56..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Code generated by "stringer -type=SyncMarker -trimprefix=Sync"; DO NOT EDIT.
-
-package pkgbits
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[SyncEOF-1]
-	_ = x[SyncBool-2]
-	_ = x[SyncInt64-3]
-	_ = x[SyncUint64-4]
-	_ = x[SyncString-5]
-	_ = x[SyncValue-6]
-	_ = x[SyncVal-7]
-	_ = x[SyncRelocs-8]
-	_ = x[SyncReloc-9]
-	_ = x[SyncUseReloc-10]
-	_ = x[SyncPublic-11]
-	_ = x[SyncPos-12]
-	_ = x[SyncPosBase-13]
-	_ = x[SyncObject-14]
-	_ = x[SyncObject1-15]
-	_ = x[SyncPkg-16]
-	_ = x[SyncPkgDef-17]
-	_ = x[SyncMethod-18]
-	_ = x[SyncType-19]
-	_ = x[SyncTypeIdx-20]
-	_ = x[SyncTypeParamNames-21]
-	_ = x[SyncSignature-22]
-	_ = x[SyncParams-23]
-	_ = x[SyncParam-24]
-	_ = x[SyncCodeObj-25]
-	_ = x[SyncSym-26]
-	_ = x[SyncLocalIdent-27]
-	_ = x[SyncSelector-28]
-	_ = x[SyncPrivate-29]
-	_ = x[SyncFuncExt-30]
-	_ = x[SyncVarExt-31]
-	_ = x[SyncTypeExt-32]
-	_ = x[SyncPragma-33]
-	_ = x[SyncExprList-34]
-	_ = x[SyncExprs-35]
-	_ = x[SyncExpr-36]
-	_ = x[SyncExprType-37]
-	_ = x[SyncAssign-38]
-	_ = x[SyncOp-39]
-	_ = x[SyncFuncLit-40]
-	_ = x[SyncCompLit-41]
-	_ = x[SyncDecl-42]
-	_ = x[SyncFuncBody-43]
-	_ = x[SyncOpenScope-44]
-	_ = x[SyncCloseScope-45]
-	_ = x[SyncCloseAnotherScope-46]
-	_ = x[SyncDeclNames-47]
-	_ = x[SyncDeclName-48]
-	_ = x[SyncStmts-49]
-	_ = x[SyncBlockStmt-50]
-	_ = x[SyncIfStmt-51]
-	_ = x[SyncForStmt-52]
-	_ = x[SyncSwitchStmt-53]
-	_ = x[SyncRangeStmt-54]
-	_ = x[SyncCaseClause-55]
-	_ = x[SyncCommClause-56]
-	_ = x[SyncSelectStmt-57]
-	_ = x[SyncDecls-58]
-	_ = x[SyncLabeledStmt-59]
-	_ = x[SyncUseObjLocal-60]
-	_ = x[SyncAddLocal-61]
-	_ = x[SyncLinkname-62]
-	_ = x[SyncStmt1-63]
-	_ = x[SyncStmtsEnd-64]
-	_ = x[SyncLabel-65]
-	_ = x[SyncOptLabel-66]
-	_ = x[SyncMultiExpr-67]
-	_ = x[SyncRType-68]
-	_ = x[SyncConvRTTI-69]
-}
-
-const _SyncMarker_name = "EOFBoolInt64Uint64StringValueValRelocsRelocUseRelocPublicPosPosBaseObjectObject1PkgPkgDefMethodTypeTypeIdxTypeParamNamesSignatureParamsParamCodeObjSymLocalIdentSelectorPrivateFuncExtVarExtTypeExtPragmaExprListExprsExprExprTypeAssignOpFuncLitCompLitDeclFuncBodyOpenScopeCloseScopeCloseAnotherScopeDeclNamesDeclNameStmtsBlockStmtIfStmtForStmtSwitchStmtRangeStmtCaseClauseCommClauseSelectStmtDeclsLabeledStmtUseObjLocalAddLocalLinknameStmt1StmtsEndLabelOptLabelMultiExprRTypeConvRTTI"
-
-var _SyncMarker_index = [...]uint16{0, 3, 7, 12, 18, 24, 29, 32, 38, 43, 51, 57, 60, 67, 73, 80, 83, 89, 95, 99, 106, 120, 129, 135, 140, 147, 150, 160, 168, 175, 182, 188, 195, 201, 209, 214, 218, 226, 232, 234, 241, 248, 252, 260, 269, 279, 296, 305, 313, 318, 327, 333, 340, 350, 359, 369, 379, 389, 394, 405, 416, 424, 432, 437, 445, 450, 458, 467, 472, 480}
-
-func (i SyncMarker) String() string {
-	i -= 1
-	if i < 0 || i >= SyncMarker(len(_SyncMarker_index)-1) {
-		return "SyncMarker(" + strconv.FormatInt(int64(i+1), 10) + ")"
-	}
-	return _SyncMarker_name[_SyncMarker_index[i]:_SyncMarker_index[i+1]]
-}
diff --git a/vendor/golang.org/x/tools/internal/pkgbits/version.go b/vendor/golang.org/x/tools/internal/pkgbits/version.go
deleted file mode 100644
index 53af9df..0000000
--- a/vendor/golang.org/x/tools/internal/pkgbits/version.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgbits
-
-// Version indicates a version of a unified IR bitstream.
-// Each Version indicates the addition, removal, or change of
-// new data in the bitstream.
-//
-// These are serialized to disk and the interpretation remains fixed.
-type Version uint32
-
-const (
-	// V0: initial prototype.
-	//
-	// All data that is not assigned a Field is in version V0
-	// and has not been deprecated.
-	V0 Version = iota
-
-	// V1: adds the Flags uint32 word
-	V1
-
-	// V2: removes unused legacy fields and supports type parameters for aliases.
-	// - remove the legacy "has init" bool from the public root
-	// - remove obj's "derived func instance" bool
-	// - add a TypeParamNames field to ObjAlias
-	// - remove derived info "needed" bool
-	V2
-
-	numVersions = iota
-)
-
-// Field denotes a unit of data in the serialized unified IR bitstream.
-// It is conceptually a like field in a structure.
-//
-// We only really need Fields when the data may or may not be present
-// in a stream based on the Version of the bitstream.
-//
-// Unlike much of pkgbits, Fields are not serialized and
-// can change values as needed.
-type Field int
-
-const (
-	// Flags in a uint32 in the header of a bitstream
-	// that is used to indicate whether optional features are enabled.
-	Flags Field = iota
-
-	// Deprecated: HasInit was a bool indicating whether a package
-	// has any init functions.
-	HasInit
-
-	// Deprecated: DerivedFuncInstance was a bool indicating
-	// whether an object was a function instance.
-	DerivedFuncInstance
-
-	// ObjAlias has a list of TypeParamNames.
-	AliasTypeParamNames
-
-	// Deprecated: DerivedInfoNeeded was a bool indicating
-	// whether a type was a derived type.
-	DerivedInfoNeeded
-
-	numFields = iota
-)
-
-// introduced is the version a field was added.
-var introduced = [numFields]Version{
-	Flags:               V1,
-	AliasTypeParamNames: V2,
-}
-
-// removed is the version a field was removed in or 0 for fields
-// that have not yet been deprecated.
-// (So removed[f]-1 is the last version it is included in.)
-var removed = [numFields]Version{
-	HasInit:             V2,
-	DerivedFuncInstance: V2,
-	DerivedInfoNeeded:   V2,
-}
-
-// Has reports whether field f is present in a bitstream at version v.
-func (v Version) Has(f Field) bool {
-	return introduced[f] <= v && (v < removed[f] || removed[f] == V0)
-}
diff --git a/vendor/golang.org/x/tools/internal/stdlib/deps.go b/vendor/golang.org/x/tools/internal/stdlib/deps.go
deleted file mode 100644
index 77cf8d2..0000000
--- a/vendor/golang.org/x/tools/internal/stdlib/deps.go
+++ /dev/null
@@ -1,359 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by generate.go. DO NOT EDIT.
-
-package stdlib
-
-type pkginfo struct {
-	name string
-	deps string // list of indices of dependencies, as varint-encoded deltas
-}
-
-var deps = [...]pkginfo{
-	{"archive/tar", "\x03j\x03E5\x01\v\x01#\x01\x01\x02\x05\n\x02\x01\x02\x02\v"},
-	{"archive/zip", "\x02\x04`\a\x16\x0205\x01+\x05\x01\x11\x03\x02\r\x04"},
-	{"bufio", "\x03j}F\x13"},
-	{"bytes", "m+R\x03\fH\x02\x02"},
-	{"cmp", ""},
-	{"compress/bzip2", "\x02\x02\xe6\x01C"},
-	{"compress/flate", "\x02k\x03z\r\x025\x01\x03"},
-	{"compress/gzip", "\x02\x04`\a\x03\x15eU"},
-	{"compress/lzw", "\x02k\x03z"},
-	{"compress/zlib", "\x02\x04`\a\x03\x13\x01f"},
-	{"container/heap", "\xae\x02"},
-	{"container/list", ""},
-	{"container/ring", ""},
-	{"context", "m\\i\x01\f"},
-	{"crypto", "\x83\x01gE"},
-	{"crypto/aes", "\x10\n\a\x8e\x02"},
-	{"crypto/cipher", "\x03\x1e\x01\x01\x1d\x11\x1c,Q"},
-	{"crypto/des", "\x10\x13\x1d-,\x96\x01\x03"},
-	{"crypto/dsa", "@\x04)}\x0e"},
-	{"crypto/ecdh", "\x03\v\f\x0e\x04\x14\x04\r\x1c}"},
-	{"crypto/ecdsa", "\x0e\x05\x03\x04\x01\x0e\x16\x01\x04\f\x01\x1c}\x0e\x04L\x01"},
-	{"crypto/ed25519", "\x0e\x1c\x16\n\a\x1c}E"},
-	{"crypto/elliptic", "0=}\x0e:"},
-	{"crypto/fips140", " \x05\x90\x01"},
-	{"crypto/hkdf", "-\x12\x01-\x16"},
-	{"crypto/hmac", "\x1a\x14\x11\x01\x112"},
-	{"crypto/internal/boring", "\x0e\x02\rf"},
-	{"crypto/internal/boring/bbig", "\x1a\xde\x01M"},
-	{"crypto/internal/boring/bcache", "\xb3\x02\x12"},
-	{"crypto/internal/boring/sig", ""},
-	{"crypto/internal/cryptotest", "\x03\r\n)\x0e\x19\x06\x13\x12#\a\t\x11\x11\x11\x1b\x01\f\r\x05\n"},
-	{"crypto/internal/entropy", "E"},
-	{"crypto/internal/fips140", ">/}9\r\x15"},
-	{"crypto/internal/fips140/aes", "\x03\x1d\x03\x02\x13\x04\x01\x01\x05*\x8c\x016"},
-	{"crypto/internal/fips140/aes/gcm", " \x01\x02\x02\x02\x11\x04\x01\x06*\x8a\x01"},
-	{"crypto/internal/fips140/alias", "\xc5\x02"},
-	{"crypto/internal/fips140/bigmod", "%\x17\x01\x06*\x8c\x01"},
-	{"crypto/internal/fips140/check", " \x0e\x06\b\x02\xac\x01["},
-	{"crypto/internal/fips140/check/checktest", "%\xfe\x01\""},
-	{"crypto/internal/fips140/drbg", "\x03\x1c\x01\x01\x04\x13\x04\b\x01(}\x0f9"},
-	{"crypto/internal/fips140/ecdh", "\x03\x1d\x05\x02\t\f1}\x0f9"},
-	{"crypto/internal/fips140/ecdsa", "\x03\x1d\x04\x01\x02\a\x02\x067}H"},
-	{"crypto/internal/fips140/ed25519", "\x03\x1d\x05\x02\x04\v7\xc2\x01\x03"},
-	{"crypto/internal/fips140/edwards25519", "%\a\f\x041\x8c\x019"},
-	{"crypto/internal/fips140/edwards25519/field", "%\x13\x041\x8c\x01"},
-	{"crypto/internal/fips140/hkdf", "\x03\x1d\x05\t\x069"},
-	{"crypto/internal/fips140/hmac", "\x03\x1d\x14\x01\x017"},
-	{"crypto/internal/fips140/mlkem", "\x03\x1d\x05\x02\x0e\x03\x041"},
-	{"crypto/internal/fips140/nistec", "%\f\a\x041\x8c\x01*\x0f\x13"},
-	{"crypto/internal/fips140/nistec/fiat", "%\x135\x8c\x01"},
-	{"crypto/internal/fips140/pbkdf2", "\x03\x1d\x05\t\x069"},
-	{"crypto/internal/fips140/rsa", "\x03\x1d\x04\x01\x02\r\x01\x01\x025}H"},
-	{"crypto/internal/fips140/sha256", "\x03\x1d\x1c\x01\x06*\x8c\x01"},
-	{"crypto/internal/fips140/sha3", "\x03\x1d\x18\x04\x010\x8c\x01L"},
-	{"crypto/internal/fips140/sha512", "\x03\x1d\x1c\x01\x06*\x8c\x01"},
-	{"crypto/internal/fips140/ssh", " \x05"},
-	{"crypto/internal/fips140/subtle", "#"},
-	{"crypto/internal/fips140/tls12", "\x03\x1d\x05\t\x06\x027"},
-	{"crypto/internal/fips140/tls13", "\x03\x1d\x05\b\a\b1"},
-	{"crypto/internal/fips140deps", ""},
-	{"crypto/internal/fips140deps/byteorder", "\x99\x01"},
-	{"crypto/internal/fips140deps/cpu", "\xad\x01\a"},
-	{"crypto/internal/fips140deps/godebug", "\xb5\x01"},
-	{"crypto/internal/fips140hash", "5\x1a4\xc2\x01"},
-	{"crypto/internal/fips140only", "'\r\x01\x01M25"},
-	{"crypto/internal/fips140test", ""},
-	{"crypto/internal/hpke", "\x0e\x01\x01\x03\x1a\x1d#,`N"},
-	{"crypto/internal/impl", "\xb0\x02"},
-	{"crypto/internal/randutil", "\xea\x01\x12"},
-	{"crypto/internal/sysrand", "mi!\x1f\r\x0f\x01\x01\v\x06"},
-	{"crypto/internal/sysrand/internal/seccomp", "m"},
-	{"crypto/md5", "\x0e2-\x16\x16`"},
-	{"crypto/mlkem", "/"},
-	{"crypto/pbkdf2", "2\r\x01-\x16"},
-	{"crypto/rand", "\x1a\x06\a\x19\x04\x01(}\x0eM"},
-	{"crypto/rc4", "#\x1d-\xc2\x01"},
-	{"crypto/rsa", "\x0e\f\x01\t\x0f\f\x01\x04\x06\a\x1c\x03\x1325\r\x01"},
-	{"crypto/sha1", "\x0e\f&-\x16\x16\x14L"},
-	{"crypto/sha256", "\x0e\f\x1aO"},
-	{"crypto/sha3", "\x0e'N\xc2\x01"},
-	{"crypto/sha512", "\x0e\f\x1cM"},
-	{"crypto/subtle", "8\x96\x01U"},
-	{"crypto/tls", "\x03\b\x02\x01\x01\x01\x01\x02\x01\x01\x01\x03\x01\a\x01\v\x02\n\x01\b\x05\x03\x01\x01\x01\x01\x02\x01\x02\x01\x17\x02\x03\x13\x16\x14\b5\x16\x16\r\n\x01\x01\x01\x02\x01\f\x06\x02\x01"},
-	{"crypto/tls/internal/fips140tls", " \x93\x02"},
-	{"crypto/x509", "\x03\v\x01\x01\x01\x01\x01\x01\x01\x011\x03\x02\x01\x01\x02\x05\x0e\x06\x02\x02\x03E\x032\x01\x02\t\x01\x01\x01\a\x10\x05\x01\x06\x02\x05\f\x01\x02\r\x02\x01\x01\x02\x03\x01"},
-	{"crypto/x509/pkix", "c\x06\a\x88\x01G"},
-	{"database/sql", "\x03\nJ\x16\x03z\f\x06\"\x05\n\x02\x03\x01\f\x02\x02\x02"},
-	{"database/sql/driver", "\r`\x03\xae\x01\x11\x10"},
-	{"debug/buildinfo", "\x03W\x02\x01\x01\b\a\x03`\x18\x02\x01+\x0f "},
-	{"debug/dwarf", "\x03c\a\x03z1\x13\x01\x01"},
-	{"debug/elf", "\x03\x06P\r\a\x03`\x19\x01,\x19\x01\x15"},
-	{"debug/gosym", "\x03c\n\xbe\x01\x01\x01\x02"},
-	{"debug/macho", "\x03\x06P\r\n`\x1a,\x19\x01"},
-	{"debug/pe", "\x03\x06P\r\a\x03`\x1a,\x19\x01\x15"},
-	{"debug/plan9obj", "f\a\x03`\x1a,"},
-	{"embed", "m+:\x18\x01T"},
-	{"embed/internal/embedtest", ""},
-	{"encoding", ""},
-	{"encoding/ascii85", "\xea\x01E"},
-	{"encoding/asn1", "\x03j\x03\x87\x01\x01&\x0f\x02\x01\x0f\x03\x01"},
-	{"encoding/base32", "\xea\x01C\x02"},
-	{"encoding/base64", "\x99\x01QC\x02"},
-	{"encoding/binary", "m}\r'\x0f\x05"},
-	{"encoding/csv", "\x02\x01j\x03zF\x11\x02"},
-	{"encoding/gob", "\x02_\x05\a\x03`\x1a\f\x01\x02\x1d\b\x14\x01\x0e\x02"},
-	{"encoding/hex", "m\x03zC\x03"},
-	{"encoding/json", "\x03\x01]\x04\b\x03z\r'\x0f\x02\x01\x02\x0f\x01\x01\x02"},
-	{"encoding/pem", "\x03b\b}C\x03"},
-	{"encoding/xml", "\x02\x01^\f\x03z4\x05\f\x01\x02\x0f\x02"},
-	{"errors", "\xc9\x01|"},
-	{"expvar", "jK9\t\n\x15\r\n\x02\x03\x01\x10"},
-	{"flag", "a\f\x03z,\b\x05\n\x02\x01\x0f"},
-	{"fmt", "mE8\r\x1f\b\x0f\x02\x03\x11"},
-	{"go/ast", "\x03\x01l\x0f\x01j\x03)\b\x0f\x02\x01"},
-	{"go/ast/internal/tests", ""},
-	{"go/build", "\x02\x01j\x03\x01\x03\x02\a\x02\x01\x17\x1e\x04\x02\t\x14\x12\x01+\x01\x04\x01\a\n\x02\x01\x11\x02\x02"},
-	{"go/build/constraint", "m\xc2\x01\x01\x11\x02"},
-	{"go/constant", "p\x10w\x01\x016\x01\x02\x11"},
-	{"go/doc", "\x04l\x01\x06\t=-1\x12\x02\x01\x11\x02"},
-	{"go/doc/comment", "\x03m\xbd\x01\x01\x01\x01\x11\x02"},
-	{"go/format", "\x03m\x01\f\x01\x02jF"},
-	{"go/importer", "s\a\x01\x01\x04\x01i9"},
-	{"go/internal/gccgoimporter", "\x02\x01W\x13\x03\x05\v\x01g\x02,\x01\x05\x13\x01\v\b"},
-	{"go/internal/gcimporter", "\x02n\x10\x01/\x05\x0e',\x17\x03\x02"},
-	{"go/internal/srcimporter", "p\x01\x02\n\x03\x01i,\x01\x05\x14\x02\x13"},
-	{"go/parser", "\x03j\x03\x01\x03\v\x01j\x01+\x06\x14"},
-	{"go/printer", "p\x01\x03\x03\tj\r\x1f\x17\x02\x01\x02\n\x05\x02"},
-	{"go/scanner", "\x03m\x10j2\x12\x01\x12\x02"},
-	{"go/token", "\x04l\xbd\x01\x02\x03\x01\x0e\x02"},
-	{"go/types", "\x03\x01\x06c\x03\x01\x04\b\x03\x02\x15\x1e\x06+\x04\x03\n%\a\n\x01\x01\x01\x02\x01\x0e\x02\x02"},
-	{"go/version", "\xba\x01v"},
-	{"hash", "\xea\x01"},
-	{"hash/adler32", "m\x16\x16"},
-	{"hash/crc32", "m\x16\x16\x14\x85\x01\x01\x12"},
-	{"hash/crc64", "m\x16\x16\x99\x01"},
-	{"hash/fnv", "m\x16\x16`"},
-	{"hash/maphash", "\x94\x01\x05\x1b\x03@N"},
-	{"html", "\xb0\x02\x02\x11"},
-	{"html/template", "\x03g\x06\x19,5\x01\v \x05\x01\x02\x03\x0e\x01\x02\v\x01\x03\x02"},
-	{"image", "\x02k\x1f^\x0f6\x03\x01"},
-	{"image/color", ""},
-	{"image/color/palette", "\x8c\x01"},
-	{"image/draw", "\x8b\x01\x01\x04"},
-	{"image/gif", "\x02\x01\x05e\x03\x1b\x01\x01\x01\vQ"},
-	{"image/internal/imageutil", "\x8b\x01"},
-	{"image/jpeg", "\x02k\x1e\x01\x04Z"},
-	{"image/png", "\x02\a]\n\x13\x02\x06\x01^E"},
-	{"index/suffixarray", "\x03c\a}\r*\f\x01"},
-	{"internal/abi", "\xb4\x01\x91\x01"},
-	{"internal/asan", "\xc5\x02"},
-	{"internal/bisect", "\xa3\x02\x0f\x01"},
-	{"internal/buildcfg", "pG_\x06\x02\x05\f\x01"},
-	{"internal/bytealg", "\xad\x01\x98\x01"},
-	{"internal/byteorder", ""},
-	{"internal/cfg", ""},
-	{"internal/chacha8rand", "\x99\x01\x1b\x91\x01"},
-	{"internal/copyright", ""},
-	{"internal/coverage", ""},
-	{"internal/coverage/calloc", ""},
-	{"internal/coverage/cfile", "j\x06\x17\x16\x01\x02\x01\x01\x01\x01\x01\x01\x01#\x01\x1f,\x06\a\f\x01\x03\f\x06"},
-	{"internal/coverage/cformat", "\x04l-\x04I\f7\x01\x02\f"},
-	{"internal/coverage/cmerge", "p-Z"},
-	{"internal/coverage/decodecounter", "f\n-\v\x02@,\x19\x16"},
-	{"internal/coverage/decodemeta", "\x02d\n\x17\x16\v\x02@,"},
-	{"internal/coverage/encodecounter", "\x02d\n-\f\x01\x02>\f \x17"},
-	{"internal/coverage/encodemeta", "\x02\x01c\n\x13\x04\x16\r\x02>,/"},
-	{"internal/coverage/pods", "\x04l-y\x06\x05\f\x02\x01"},
-	{"internal/coverage/rtcov", "\xc5\x02"},
-	{"internal/coverage/slicereader", "f\nz["},
-	{"internal/coverage/slicewriter", "pz"},
-	{"internal/coverage/stringtab", "p8\x04>"},
-	{"internal/coverage/test", ""},
-	{"internal/coverage/uleb128", ""},
-	{"internal/cpu", "\xc5\x02"},
-	{"internal/dag", "\x04l\xbd\x01\x03"},
-	{"internal/diff", "\x03m\xbe\x01\x02"},
-	{"internal/exportdata", "\x02\x01j\x03\x03]\x1a,\x01\x05\x13\x01\x02"},
-	{"internal/filepathlite", "m+:\x19B"},
-	{"internal/fmtsort", "\x04\x9a\x02\x0f"},
-	{"internal/fuzz", "\x03\nA\x18\x04\x03\x03\x01\f\x0355\r\x02\x1d\x01\x05\x02\x05\f\x01\x02\x01\x01\v\x04\x02"},
-	{"internal/goarch", ""},
-	{"internal/godebug", "\x96\x01 |\x01\x12"},
-	{"internal/godebugs", ""},
-	{"internal/goexperiment", ""},
-	{"internal/goos", ""},
-	{"internal/goroot", "\x96\x02\x01\x05\x14\x02"},
-	{"internal/gover", "\x04"},
-	{"internal/goversion", ""},
-	{"internal/itoa", ""},
-	{"internal/lazyregexp", "\x96\x02\v\x0f\x02"},
-	{"internal/lazytemplate", "\xea\x01,\x1a\x02\v"},
-	{"internal/msan", "\xc5\x02"},
-	{"internal/nettrace", ""},
-	{"internal/obscuretestdata", "e\x85\x01,"},
-	{"internal/oserror", "m"},
-	{"internal/pkgbits", "\x03K\x18\a\x03\x05\vj\x0e\x1e\r\f\x01"},
-	{"internal/platform", ""},
-	{"internal/poll", "mO\x1a\x149\x0f\x01\x01\v\x06"},
-	{"internal/profile", "\x03\x04f\x03z7\r\x01\x01\x0f"},
-	{"internal/profilerecord", ""},
-	{"internal/race", "\x94\x01\xb1\x01"},
-	{"internal/reflectlite", "\x94\x01 3<\""},
-	{"internal/runtime/atomic", "\xc5\x02"},
-	{"internal/runtime/exithook", "\xca\x01{"},
-	{"internal/runtime/maps", "\x94\x01\x01\x1f\v\t\x05\x01w"},
-	{"internal/runtime/math", "\xb4\x01"},
-	{"internal/runtime/sys", "\xb4\x01\x04"},
-	{"internal/runtime/syscall", "\xc5\x02"},
-	{"internal/saferio", "\xea\x01["},
-	{"internal/singleflight", "\xb2\x02"},
-	{"internal/stringslite", "\x98\x01\xad\x01"},
-	{"internal/sync", "\x94\x01 \x14k\x12"},
-	{"internal/synctest", "\xc5\x02"},
-	{"internal/syscall/execenv", "\xb4\x02"},
-	{"internal/syscall/unix", "\xa3\x02\x10\x01\x11"},
-	{"internal/sysinfo", "\x02\x01\xaa\x01=,\x1a\x02"},
-	{"internal/syslist", ""},
-	{"internal/testenv", "\x03\n`\x02\x01*\x1a\x10'+\x01\x05\a\f\x01\x02\x02\x01\n"},
-	{"internal/testlog", "\xb2\x02\x01\x12"},
-	{"internal/testpty", "m\x03\xa6\x01"},
-	{"internal/trace", "\x02\x01\x01\x06\\\a\x03n\x03\x03\x06\x03\n6\x01\x02\x0f\x06"},
-	{"internal/trace/internal/testgen", "\x03c\nl\x03\x02\x03\x011\v\x0f"},
-	{"internal/trace/internal/tracev1", "\x03\x01b\a\x03t\x06\r6\x01"},
-	{"internal/trace/raw", "\x02d\nq\x03\x06E\x01\x11"},
-	{"internal/trace/testtrace", "\x02\x01j\x03l\x03\x06\x057\f\x02\x01"},
-	{"internal/trace/tracev2", ""},
-	{"internal/trace/traceviewer", "\x02]\v\x06\x1a<\x16\a\a\x04\t\n\x15\x01\x05\a\f\x01\x02\r"},
-	{"internal/trace/traceviewer/format", ""},
-	{"internal/trace/version", "pq\t"},
-	{"internal/txtar", "\x03m\xa6\x01\x1a"},
-	{"internal/types/errors", "\xaf\x02"},
-	{"internal/unsafeheader", "\xc5\x02"},
-	{"internal/xcoff", "Y\r\a\x03`\x1a,\x19\x01"},
-	{"internal/zstd", "f\a\x03z\x0f"},
-	{"io", "m\xc5\x01"},
-	{"io/fs", "m+*(1\x12\x12\x04"},
-	{"io/ioutil", "\xea\x01\x01+\x17\x03"},
-	{"iter", "\xc8\x01[\""},
-	{"log", "pz\x05'\r\x0f\x01\f"},
-	{"log/internal", ""},
-	{"log/slog", "\x03\nT\t\x03\x03z\x04\x01\x02\x02\x04'\x05\n\x02\x01\x02\x01\f\x02\x02\x02"},
-	{"log/slog/internal", ""},
-	{"log/slog/internal/benchmarks", "\r`\x03z\x06\x03<\x10"},
-	{"log/slog/internal/buffer", "\xb2\x02"},
-	{"log/slog/internal/slogtest", "\xf0\x01"},
-	{"log/syslog", "m\x03~\x12\x16\x1a\x02\r"},
-	{"maps", "\xed\x01X"},
-	{"math", "\xad\x01LL"},
-	{"math/big", "\x03j\x03)\x14=\r\x02\x024\x01\x02\x13"},
-	{"math/bits", "\xc5\x02"},
-	{"math/cmplx", "\xf7\x01\x02"},
-	{"math/rand", "\xb5\x01B;\x01\x12"},
-	{"math/rand/v2", "m,\x02\\\x02L"},
-	{"mime", "\x02\x01b\b\x03z\f \x17\x03\x02\x0f\x02"},
-	{"mime/multipart", "\x02\x01G#\x03E5\f\x01\x06\x02\x15\x02\x06\x11\x02\x01\x15"},
-	{"mime/quotedprintable", "\x02\x01mz"},
-	{"net", "\x04\t`+\x1d\a\x04\x05\f\x01\x04\x14\x01%\x06\r\n\x05\x01\x01\v\x06\a"},
-	{"net/http", "\x02\x01\x04\x04\x02=\b\x13\x01\a\x03E5\x01\x03\b\x01\x02\x02\x02\x01\x02\x06\x02\x01\x01\n\x01\x01\x05\x01\x02\x05\n\x01\x01\x01\x02\x01\x01\v\x02\x02\x02\b\x01\x01\x01"},
-	{"net/http/cgi", "\x02P\x1b\x03z\x04\b\n\x01\x13\x01\x01\x01\x04\x01\x05\x02\n\x02\x01\x0f\x0e"},
-	{"net/http/cookiejar", "\x04i\x03\x90\x01\x01\b\f\x18\x03\x02\r\x04"},
-	{"net/http/fcgi", "\x02\x01\nY\a\x03z\x16\x01\x01\x14\x1a\x02\r"},
-	{"net/http/httptest", "\x02\x01\nE\x02\x1b\x01z\x04\x12\x01\n\t\x02\x19\x01\x02\r\x0e"},
-	{"net/http/httptrace", "\rEn@\x14\n!"},
-	{"net/http/httputil", "\x02\x01\n`\x03z\x04\x0f\x03\x01\x05\x02\x01\v\x01\x1b\x02\r\x0e"},
-	{"net/http/internal", "\x02\x01j\x03z"},
-	{"net/http/internal/ascii", "\xb0\x02\x11"},
-	{"net/http/internal/httpcommon", "\r`\x03\x96\x01\x0e\x01\x19\x01\x01\x02\x1b\x02"},
-	{"net/http/internal/testcert", "\xb0\x02"},
-	{"net/http/pprof", "\x02\x01\nc\x19,\x11$\x04\x13\x14\x01\r\x06\x03\x01\x02\x01\x0f"},
-	{"net/internal/cgotest", ""},
-	{"net/internal/socktest", "p\xc2\x01\x02"},
-	{"net/mail", "\x02k\x03z\x04\x0f\x03\x14\x1c\x02\r\x04"},
-	{"net/netip", "\x04i+\x01#;\x026\x15"},
-	{"net/rpc", "\x02f\x05\x03\x10\n`\x04\x12\x01\x1d\x0f\x03\x02"},
-	{"net/rpc/jsonrpc", "j\x03\x03z\x16\x11!"},
-	{"net/smtp", "\x19.\v\x13\b\x03z\x16\x14\x1c"},
-	{"net/textproto", "\x02\x01j\x03z\r\t/\x01\x02\x13"},
-	{"net/url", "m\x03\x86\x01%\x12\x02\x01\x15"},
-	{"os", "m+\x01\x18\x03\b\t\r\x03\x01\x04\x10\x018\n\x05\x01\x01\v\x06"},
-	{"os/exec", "\x03\n`H \x01\x14\x01+\x06\a\f\x01\x04\v"},
-	{"os/exec/internal/fdtest", "\xb4\x02"},
-	{"os/signal", "\r\x89\x02\x17\x05\x02"},
-	{"os/user", "\x02\x01j\x03z,\r\f\x01\x02"},
-	{"path", "m+\xab\x01"},
-	{"path/filepath", "m+\x19:+\r\n\x03\x04\x0f"},
-	{"plugin", "m"},
-	{"reflect", "m'\x04\x1c\b\f\x04\x02\x19\x10,\f\x03\x0f\x02\x02"},
-	{"reflect/internal/example1", ""},
-	{"reflect/internal/example2", ""},
-	{"regexp", "\x03\xe7\x018\v\x02\x01\x02\x0f\x02"},
-	{"regexp/syntax", "\xad\x02\x01\x01\x01\x11\x02"},
-	{"runtime", "\x94\x01\x04\x01\x02\f\x06\a\x02\x01\x01\x0f\x03\x01\x01\x01\x01\x01\x03\x0fd"},
-	{"runtime/coverage", "\x9f\x01K"},
-	{"runtime/debug", "pUQ\r\n\x02\x01\x0f\x06"},
-	{"runtime/internal/startlinetest", ""},
-	{"runtime/internal/wasitest", ""},
-	{"runtime/metrics", "\xb6\x01A,\""},
-	{"runtime/pprof", "\x02\x01\x01\x03\x06Y\a\x03$3#\r\x1f\r\n\x01\x01\x01\x02\x02\b\x03\x06"},
-	{"runtime/race", "\xab\x02"},
-	{"runtime/race/internal/amd64v1", ""},
-	{"runtime/trace", "\rcz9\x0f\x01\x12"},
-	{"slices", "\x04\xe9\x01\fL"},
-	{"sort", "\xc9\x0104"},
-	{"strconv", "m+:%\x02J"},
-	{"strings", "m'\x04:\x18\x03\f9\x0f\x02\x02"},
-	{"structs", ""},
-	{"sync", "\xc8\x01\vP\x10\x12"},
-	{"sync/atomic", "\xc5\x02"},
-	{"syscall", "m(\x03\x01\x1b\b\x03\x03\x06\aT\n\x05\x01\x12"},
-	{"testing", "\x03\n`\x02\x01X\x0f\x13\r\x04\x1b\x06\x02\x05\x02\a\x01\x02\x01\x02\x01\f\x02\x02\x02"},
-	{"testing/fstest", "m\x03z\x01\v%\x12\x03\b\a"},
-	{"testing/internal/testdeps", "\x02\v\xa6\x01'\x10,\x03\x05\x03\b\a\x02\r"},
-	{"testing/iotest", "\x03j\x03z\x04"},
-	{"testing/quick", "o\x01\x87\x01\x04#\x12\x0f"},
-	{"testing/slogtest", "\r`\x03\x80\x01.\x05\x12\n"},
-	{"text/scanner", "\x03mz,+\x02"},
-	{"text/tabwriter", "pzY"},
-	{"text/template", "m\x03B8\x01\v\x1f\x01\x05\x01\x02\x05\r\x02\f\x03\x02"},
-	{"text/template/parse", "\x03m\xb3\x01\f\x01\x11\x02"},
-	{"time", "m+\x1d\x1d'*\x0f\x02\x11"},
-	{"time/tzdata", "m\xc7\x01\x11"},
-	{"unicode", ""},
-	{"unicode/utf16", ""},
-	{"unicode/utf8", ""},
-	{"unique", "\x94\x01>\x01P\x0f\x13\x12"},
-	{"unsafe", ""},
-	{"vendor/golang.org/x/crypto/chacha20", "\x10V\a\x8c\x01*'"},
-	{"vendor/golang.org/x/crypto/chacha20poly1305", "\x10V\a\xd9\x01\x04\x01\a"},
-	{"vendor/golang.org/x/crypto/cryptobyte", "c\n\x03\x88\x01&!\n"},
-	{"vendor/golang.org/x/crypto/cryptobyte/asn1", ""},
-	{"vendor/golang.org/x/crypto/internal/alias", "\xc5\x02"},
-	{"vendor/golang.org/x/crypto/internal/poly1305", "Q\x15\x93\x01"},
-	{"vendor/golang.org/x/net/dns/dnsmessage", "m"},
-	{"vendor/golang.org/x/net/http/httpguts", "\x80\x02\x14\x1c\x13\r"},
-	{"vendor/golang.org/x/net/http/httpproxy", "m\x03\x90\x01\x15\x01\x1a\x13\r"},
-	{"vendor/golang.org/x/net/http2/hpack", "\x03j\x03zH"},
-	{"vendor/golang.org/x/net/idna", "p\x87\x019\x13\x10\x02\x01"},
-	{"vendor/golang.org/x/net/nettest", "\x03c\a\x03z\x11\x05\x16\x01\f\f\x01\x02\x02\x01\n"},
-	{"vendor/golang.org/x/sys/cpu", "\x96\x02\r\f\x01\x15"},
-	{"vendor/golang.org/x/text/secure/bidirule", "m\xd6\x01\x11\x01"},
-	{"vendor/golang.org/x/text/transform", "\x03j}Y"},
-	{"vendor/golang.org/x/text/unicode/bidi", "\x03\be~@\x15"},
-	{"vendor/golang.org/x/text/unicode/norm", "f\nzH\x11\x11"},
-	{"weak", "\x94\x01\x8f\x01\""},
-}
diff --git a/vendor/golang.org/x/tools/internal/stdlib/import.go b/vendor/golang.org/x/tools/internal/stdlib/import.go
deleted file mode 100644
index f690987..0000000
--- a/vendor/golang.org/x/tools/internal/stdlib/import.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package stdlib
-
-// This file provides the API for the import graph of the standard library.
-//
-// Be aware that the compiler-generated code for every package
-// implicitly depends on package "runtime" and a handful of others
-// (see runtimePkgs in GOROOT/src/cmd/internal/objabi/pkgspecial.go).
-
-import (
-	"encoding/binary"
-	"iter"
-	"slices"
-	"strings"
-)
-
-// Imports returns the sequence of packages directly imported by the
-// named standard packages, in name order.
-// The imports of an unknown package are the empty set.
-//
-// The graph is built into the application and may differ from the
-// graph in the Go source tree being analyzed by the application.
-func Imports(pkgs ...string) iter.Seq[string] {
-	return func(yield func(string) bool) {
-		for _, pkg := range pkgs {
-			if i, ok := find(pkg); ok {
-				var depIndex uint64
-				for data := []byte(deps[i].deps); len(data) > 0; {
-					delta, n := binary.Uvarint(data)
-					depIndex += delta
-					if !yield(deps[depIndex].name) {
-						return
-					}
-					data = data[n:]
-				}
-			}
-		}
-	}
-}
-
-// Dependencies returns the set of all dependencies of the named
-// standard packages, including the initial package,
-// in a deterministic topological order.
-// The dependencies of an unknown package are the empty set.
-//
-// The graph is built into the application and may differ from the
-// graph in the Go source tree being analyzed by the application.
-func Dependencies(pkgs ...string) iter.Seq[string] {
-	return func(yield func(string) bool) {
-		for _, pkg := range pkgs {
-			if i, ok := find(pkg); ok {
-				var seen [1 + len(deps)/8]byte // bit set of seen packages
-				var visit func(i int) bool
-				visit = func(i int) bool {
-					bit := byte(1) << (i % 8)
-					if seen[i/8]&bit == 0 {
-						seen[i/8] |= bit
-						var depIndex uint64
-						for data := []byte(deps[i].deps); len(data) > 0; {
-							delta, n := binary.Uvarint(data)
-							depIndex += delta
-							if !visit(int(depIndex)) {
-								return false
-							}
-							data = data[n:]
-						}
-						if !yield(deps[i].name) {
-							return false
-						}
-					}
-					return true
-				}
-				if !visit(i) {
-					return
-				}
-			}
-		}
-	}
-}
-
-// find returns the index of pkg in the deps table.
-func find(pkg string) (int, bool) {
-	return slices.BinarySearchFunc(deps[:], pkg, func(p pkginfo, n string) int {
-		return strings.Compare(p.name, n)
-	})
-}
diff --git a/vendor/golang.org/x/tools/internal/stdlib/manifest.go b/vendor/golang.org/x/tools/internal/stdlib/manifest.go
deleted file mode 100644
index 64f0326..0000000
--- a/vendor/golang.org/x/tools/internal/stdlib/manifest.go
+++ /dev/null
@@ -1,17676 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by generate.go. DO NOT EDIT.
-
-package stdlib
-
-var PackageSymbols = map[string][]Symbol{
-	"archive/tar": {
-		{"(*Header).FileInfo", Method, 1, ""},
-		{"(*Reader).Next", Method, 0, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Writer).AddFS", Method, 22, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"(*Writer).WriteHeader", Method, 0, ""},
-		{"(Format).String", Method, 10, ""},
-		{"ErrFieldTooLong", Var, 0, ""},
-		{"ErrHeader", Var, 0, ""},
-		{"ErrInsecurePath", Var, 20, ""},
-		{"ErrWriteAfterClose", Var, 0, ""},
-		{"ErrWriteTooLong", Var, 0, ""},
-		{"FileInfoHeader", Func, 1, "func(fi fs.FileInfo, link string) (*Header, error)"},
-		{"FileInfoNames", Type, 23, ""},
-		{"Format", Type, 10, ""},
-		{"FormatGNU", Const, 10, ""},
-		{"FormatPAX", Const, 10, ""},
-		{"FormatUSTAR", Const, 10, ""},
-		{"FormatUnknown", Const, 10, ""},
-		{"Header", Type, 0, ""},
-		{"Header.AccessTime", Field, 0, ""},
-		{"Header.ChangeTime", Field, 0, ""},
-		{"Header.Devmajor", Field, 0, ""},
-		{"Header.Devminor", Field, 0, ""},
-		{"Header.Format", Field, 10, ""},
-		{"Header.Gid", Field, 0, ""},
-		{"Header.Gname", Field, 0, ""},
-		{"Header.Linkname", Field, 0, ""},
-		{"Header.ModTime", Field, 0, ""},
-		{"Header.Mode", Field, 0, ""},
-		{"Header.Name", Field, 0, ""},
-		{"Header.PAXRecords", Field, 10, ""},
-		{"Header.Size", Field, 0, ""},
-		{"Header.Typeflag", Field, 0, ""},
-		{"Header.Uid", Field, 0, ""},
-		{"Header.Uname", Field, 0, ""},
-		{"Header.Xattrs", Field, 3, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) *Reader"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"Reader", Type, 0, ""},
-		{"TypeBlock", Const, 0, ""},
-		{"TypeChar", Const, 0, ""},
-		{"TypeCont", Const, 0, ""},
-		{"TypeDir", Const, 0, ""},
-		{"TypeFifo", Const, 0, ""},
-		{"TypeGNULongLink", Const, 1, ""},
-		{"TypeGNULongName", Const, 1, ""},
-		{"TypeGNUSparse", Const, 3, ""},
-		{"TypeLink", Const, 0, ""},
-		{"TypeReg", Const, 0, ""},
-		{"TypeRegA", Const, 0, ""},
-		{"TypeSymlink", Const, 0, ""},
-		{"TypeXGlobalHeader", Const, 0, ""},
-		{"TypeXHeader", Const, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"archive/zip": {
-		{"(*File).DataOffset", Method, 2, ""},
-		{"(*File).FileInfo", Method, 0, ""},
-		{"(*File).ModTime", Method, 0, ""},
-		{"(*File).Mode", Method, 0, ""},
-		{"(*File).Open", Method, 0, ""},
-		{"(*File).OpenRaw", Method, 17, ""},
-		{"(*File).SetModTime", Method, 0, ""},
-		{"(*File).SetMode", Method, 0, ""},
-		{"(*FileHeader).FileInfo", Method, 0, ""},
-		{"(*FileHeader).ModTime", Method, 0, ""},
-		{"(*FileHeader).Mode", Method, 0, ""},
-		{"(*FileHeader).SetModTime", Method, 0, ""},
-		{"(*FileHeader).SetMode", Method, 0, ""},
-		{"(*ReadCloser).Close", Method, 0, ""},
-		{"(*ReadCloser).Open", Method, 16, ""},
-		{"(*ReadCloser).RegisterDecompressor", Method, 6, ""},
-		{"(*Reader).Open", Method, 16, ""},
-		{"(*Reader).RegisterDecompressor", Method, 6, ""},
-		{"(*Writer).AddFS", Method, 22, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Copy", Method, 17, ""},
-		{"(*Writer).Create", Method, 0, ""},
-		{"(*Writer).CreateHeader", Method, 0, ""},
-		{"(*Writer).CreateRaw", Method, 17, ""},
-		{"(*Writer).Flush", Method, 4, ""},
-		{"(*Writer).RegisterCompressor", Method, 6, ""},
-		{"(*Writer).SetComment", Method, 10, ""},
-		{"(*Writer).SetOffset", Method, 5, ""},
-		{"Compressor", Type, 2, ""},
-		{"Decompressor", Type, 2, ""},
-		{"Deflate", Const, 0, ""},
-		{"ErrAlgorithm", Var, 0, ""},
-		{"ErrChecksum", Var, 0, ""},
-		{"ErrFormat", Var, 0, ""},
-		{"ErrInsecurePath", Var, 20, ""},
-		{"File", Type, 0, ""},
-		{"File.FileHeader", Field, 0, ""},
-		{"FileHeader", Type, 0, ""},
-		{"FileHeader.CRC32", Field, 0, ""},
-		{"FileHeader.Comment", Field, 0, ""},
-		{"FileHeader.CompressedSize", Field, 0, ""},
-		{"FileHeader.CompressedSize64", Field, 1, ""},
-		{"FileHeader.CreatorVersion", Field, 0, ""},
-		{"FileHeader.ExternalAttrs", Field, 0, ""},
-		{"FileHeader.Extra", Field, 0, ""},
-		{"FileHeader.Flags", Field, 0, ""},
-		{"FileHeader.Method", Field, 0, ""},
-		{"FileHeader.Modified", Field, 10, ""},
-		{"FileHeader.ModifiedDate", Field, 0, ""},
-		{"FileHeader.ModifiedTime", Field, 0, ""},
-		{"FileHeader.Name", Field, 0, ""},
-		{"FileHeader.NonUTF8", Field, 10, ""},
-		{"FileHeader.ReaderVersion", Field, 0, ""},
-		{"FileHeader.UncompressedSize", Field, 0, ""},
-		{"FileHeader.UncompressedSize64", Field, 1, ""},
-		{"FileInfoHeader", Func, 0, "func(fi fs.FileInfo) (*FileHeader, error)"},
-		{"NewReader", Func, 0, "func(r io.ReaderAt, size int64) (*Reader, error)"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"OpenReader", Func, 0, "func(name string) (*ReadCloser, error)"},
-		{"ReadCloser", Type, 0, ""},
-		{"ReadCloser.Reader", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"Reader.Comment", Field, 0, ""},
-		{"Reader.File", Field, 0, ""},
-		{"RegisterCompressor", Func, 2, "func(method uint16, comp Compressor)"},
-		{"RegisterDecompressor", Func, 2, "func(method uint16, dcomp Decompressor)"},
-		{"Store", Const, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"bufio": {
-		{"(*Reader).Buffered", Method, 0, ""},
-		{"(*Reader).Discard", Method, 5, ""},
-		{"(*Reader).Peek", Method, 0, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Reader).ReadByte", Method, 0, ""},
-		{"(*Reader).ReadBytes", Method, 0, ""},
-		{"(*Reader).ReadLine", Method, 0, ""},
-		{"(*Reader).ReadRune", Method, 0, ""},
-		{"(*Reader).ReadSlice", Method, 0, ""},
-		{"(*Reader).ReadString", Method, 0, ""},
-		{"(*Reader).Reset", Method, 2, ""},
-		{"(*Reader).Size", Method, 10, ""},
-		{"(*Reader).UnreadByte", Method, 0, ""},
-		{"(*Reader).UnreadRune", Method, 0, ""},
-		{"(*Reader).WriteTo", Method, 1, ""},
-		{"(*Scanner).Buffer", Method, 6, ""},
-		{"(*Scanner).Bytes", Method, 1, ""},
-		{"(*Scanner).Err", Method, 1, ""},
-		{"(*Scanner).Scan", Method, 1, ""},
-		{"(*Scanner).Split", Method, 1, ""},
-		{"(*Scanner).Text", Method, 1, ""},
-		{"(*Writer).Available", Method, 0, ""},
-		{"(*Writer).AvailableBuffer", Method, 18, ""},
-		{"(*Writer).Buffered", Method, 0, ""},
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).ReadFrom", Method, 1, ""},
-		{"(*Writer).Reset", Method, 2, ""},
-		{"(*Writer).Size", Method, 10, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"(*Writer).WriteByte", Method, 0, ""},
-		{"(*Writer).WriteRune", Method, 0, ""},
-		{"(*Writer).WriteString", Method, 0, ""},
-		{"(ReadWriter).Available", Method, 0, ""},
-		{"(ReadWriter).AvailableBuffer", Method, 18, ""},
-		{"(ReadWriter).Discard", Method, 5, ""},
-		{"(ReadWriter).Flush", Method, 0, ""},
-		{"(ReadWriter).Peek", Method, 0, ""},
-		{"(ReadWriter).Read", Method, 0, ""},
-		{"(ReadWriter).ReadByte", Method, 0, ""},
-		{"(ReadWriter).ReadBytes", Method, 0, ""},
-		{"(ReadWriter).ReadFrom", Method, 1, ""},
-		{"(ReadWriter).ReadLine", Method, 0, ""},
-		{"(ReadWriter).ReadRune", Method, 0, ""},
-		{"(ReadWriter).ReadSlice", Method, 0, ""},
-		{"(ReadWriter).ReadString", Method, 0, ""},
-		{"(ReadWriter).UnreadByte", Method, 0, ""},
-		{"(ReadWriter).UnreadRune", Method, 0, ""},
-		{"(ReadWriter).Write", Method, 0, ""},
-		{"(ReadWriter).WriteByte", Method, 0, ""},
-		{"(ReadWriter).WriteRune", Method, 0, ""},
-		{"(ReadWriter).WriteString", Method, 0, ""},
-		{"(ReadWriter).WriteTo", Method, 1, ""},
-		{"ErrAdvanceTooFar", Var, 1, ""},
-		{"ErrBadReadCount", Var, 15, ""},
-		{"ErrBufferFull", Var, 0, ""},
-		{"ErrFinalToken", Var, 6, ""},
-		{"ErrInvalidUnreadByte", Var, 0, ""},
-		{"ErrInvalidUnreadRune", Var, 0, ""},
-		{"ErrNegativeAdvance", Var, 1, ""},
-		{"ErrNegativeCount", Var, 0, ""},
-		{"ErrTooLong", Var, 1, ""},
-		{"MaxScanTokenSize", Const, 1, ""},
-		{"NewReadWriter", Func, 0, "func(r *Reader, w *Writer) *ReadWriter"},
-		{"NewReader", Func, 0, "func(rd io.Reader) *Reader"},
-		{"NewReaderSize", Func, 0, "func(rd io.Reader, size int) *Reader"},
-		{"NewScanner", Func, 1, "func(r io.Reader) *Scanner"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"NewWriterSize", Func, 0, "func(w io.Writer, size int) *Writer"},
-		{"ReadWriter", Type, 0, ""},
-		{"ReadWriter.Reader", Field, 0, ""},
-		{"ReadWriter.Writer", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"ScanBytes", Func, 1, "func(data []byte, atEOF bool) (advance int, token []byte, err error)"},
-		{"ScanLines", Func, 1, "func(data []byte, atEOF bool) (advance int, token []byte, err error)"},
-		{"ScanRunes", Func, 1, "func(data []byte, atEOF bool) (advance int, token []byte, err error)"},
-		{"ScanWords", Func, 1, "func(data []byte, atEOF bool) (advance int, token []byte, err error)"},
-		{"Scanner", Type, 1, ""},
-		{"SplitFunc", Type, 1, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"bytes": {
-		{"(*Buffer).Available", Method, 21, ""},
-		{"(*Buffer).AvailableBuffer", Method, 21, ""},
-		{"(*Buffer).Bytes", Method, 0, ""},
-		{"(*Buffer).Cap", Method, 5, ""},
-		{"(*Buffer).Grow", Method, 1, ""},
-		{"(*Buffer).Len", Method, 0, ""},
-		{"(*Buffer).Next", Method, 0, ""},
-		{"(*Buffer).Read", Method, 0, ""},
-		{"(*Buffer).ReadByte", Method, 0, ""},
-		{"(*Buffer).ReadBytes", Method, 0, ""},
-		{"(*Buffer).ReadFrom", Method, 0, ""},
-		{"(*Buffer).ReadRune", Method, 0, ""},
-		{"(*Buffer).ReadString", Method, 0, ""},
-		{"(*Buffer).Reset", Method, 0, ""},
-		{"(*Buffer).String", Method, 0, ""},
-		{"(*Buffer).Truncate", Method, 0, ""},
-		{"(*Buffer).UnreadByte", Method, 0, ""},
-		{"(*Buffer).UnreadRune", Method, 0, ""},
-		{"(*Buffer).Write", Method, 0, ""},
-		{"(*Buffer).WriteByte", Method, 0, ""},
-		{"(*Buffer).WriteRune", Method, 0, ""},
-		{"(*Buffer).WriteString", Method, 0, ""},
-		{"(*Buffer).WriteTo", Method, 0, ""},
-		{"(*Reader).Len", Method, 0, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Reader).ReadAt", Method, 0, ""},
-		{"(*Reader).ReadByte", Method, 0, ""},
-		{"(*Reader).ReadRune", Method, 0, ""},
-		{"(*Reader).Reset", Method, 7, ""},
-		{"(*Reader).Seek", Method, 0, ""},
-		{"(*Reader).Size", Method, 5, ""},
-		{"(*Reader).UnreadByte", Method, 0, ""},
-		{"(*Reader).UnreadRune", Method, 0, ""},
-		{"(*Reader).WriteTo", Method, 1, ""},
-		{"Buffer", Type, 0, ""},
-		{"Clone", Func, 20, "func(b []byte) []byte"},
-		{"Compare", Func, 0, "func(a []byte, b []byte) int"},
-		{"Contains", Func, 0, "func(b []byte, subslice []byte) bool"},
-		{"ContainsAny", Func, 7, "func(b []byte, chars string) bool"},
-		{"ContainsFunc", Func, 21, "func(b []byte, f func(rune) bool) bool"},
-		{"ContainsRune", Func, 7, "func(b []byte, r rune) bool"},
-		{"Count", Func, 0, "func(s []byte, sep []byte) int"},
-		{"Cut", Func, 18, "func(s []byte, sep []byte) (before []byte, after []byte, found bool)"},
-		{"CutPrefix", Func, 20, "func(s []byte, prefix []byte) (after []byte, found bool)"},
-		{"CutSuffix", Func, 20, "func(s []byte, suffix []byte) (before []byte, found bool)"},
-		{"Equal", Func, 0, "func(a []byte, b []byte) bool"},
-		{"EqualFold", Func, 0, "func(s []byte, t []byte) bool"},
-		{"ErrTooLarge", Var, 0, ""},
-		{"Fields", Func, 0, "func(s []byte) [][]byte"},
-		{"FieldsFunc", Func, 0, "func(s []byte, f func(rune) bool) [][]byte"},
-		{"FieldsFuncSeq", Func, 24, "func(s []byte, f func(rune) bool) iter.Seq[[]byte]"},
-		{"FieldsSeq", Func, 24, "func(s []byte) iter.Seq[[]byte]"},
-		{"HasPrefix", Func, 0, "func(s []byte, prefix []byte) bool"},
-		{"HasSuffix", Func, 0, "func(s []byte, suffix []byte) bool"},
-		{"Index", Func, 0, "func(s []byte, sep []byte) int"},
-		{"IndexAny", Func, 0, "func(s []byte, chars string) int"},
-		{"IndexByte", Func, 0, "func(b []byte, c byte) int"},
-		{"IndexFunc", Func, 0, "func(s []byte, f func(r rune) bool) int"},
-		{"IndexRune", Func, 0, "func(s []byte, r rune) int"},
-		{"Join", Func, 0, "func(s [][]byte, sep []byte) []byte"},
-		{"LastIndex", Func, 0, "func(s []byte, sep []byte) int"},
-		{"LastIndexAny", Func, 0, "func(s []byte, chars string) int"},
-		{"LastIndexByte", Func, 5, "func(s []byte, c byte) int"},
-		{"LastIndexFunc", Func, 0, "func(s []byte, f func(r rune) bool) int"},
-		{"Lines", Func, 24, "func(s []byte) iter.Seq[[]byte]"},
-		{"Map", Func, 0, "func(mapping func(r rune) rune, s []byte) []byte"},
-		{"MinRead", Const, 0, ""},
-		{"NewBuffer", Func, 0, "func(buf []byte) *Buffer"},
-		{"NewBufferString", Func, 0, "func(s string) *Buffer"},
-		{"NewReader", Func, 0, "func(b []byte) *Reader"},
-		{"Reader", Type, 0, ""},
-		{"Repeat", Func, 0, "func(b []byte, count int) []byte"},
-		{"Replace", Func, 0, "func(s []byte, old []byte, new []byte, n int) []byte"},
-		{"ReplaceAll", Func, 12, "func(s []byte, old []byte, new []byte) []byte"},
-		{"Runes", Func, 0, "func(s []byte) []rune"},
-		{"Split", Func, 0, "func(s []byte, sep []byte) [][]byte"},
-		{"SplitAfter", Func, 0, "func(s []byte, sep []byte) [][]byte"},
-		{"SplitAfterN", Func, 0, "func(s []byte, sep []byte, n int) [][]byte"},
-		{"SplitAfterSeq", Func, 24, "func(s []byte, sep []byte) iter.Seq[[]byte]"},
-		{"SplitN", Func, 0, "func(s []byte, sep []byte, n int) [][]byte"},
-		{"SplitSeq", Func, 24, "func(s []byte, sep []byte) iter.Seq[[]byte]"},
-		{"Title", Func, 0, "func(s []byte) []byte"},
-		{"ToLower", Func, 0, "func(s []byte) []byte"},
-		{"ToLowerSpecial", Func, 0, "func(c unicode.SpecialCase, s []byte) []byte"},
-		{"ToTitle", Func, 0, "func(s []byte) []byte"},
-		{"ToTitleSpecial", Func, 0, "func(c unicode.SpecialCase, s []byte) []byte"},
-		{"ToUpper", Func, 0, "func(s []byte) []byte"},
-		{"ToUpperSpecial", Func, 0, "func(c unicode.SpecialCase, s []byte) []byte"},
-		{"ToValidUTF8", Func, 13, "func(s []byte, replacement []byte) []byte"},
-		{"Trim", Func, 0, "func(s []byte, cutset string) []byte"},
-		{"TrimFunc", Func, 0, "func(s []byte, f func(r rune) bool) []byte"},
-		{"TrimLeft", Func, 0, "func(s []byte, cutset string) []byte"},
-		{"TrimLeftFunc", Func, 0, "func(s []byte, f func(r rune) bool) []byte"},
-		{"TrimPrefix", Func, 1, "func(s []byte, prefix []byte) []byte"},
-		{"TrimRight", Func, 0, "func(s []byte, cutset string) []byte"},
-		{"TrimRightFunc", Func, 0, "func(s []byte, f func(r rune) bool) []byte"},
-		{"TrimSpace", Func, 0, "func(s []byte) []byte"},
-		{"TrimSuffix", Func, 1, "func(s []byte, suffix []byte) []byte"},
-	},
-	"cmp": {
-		{"Compare", Func, 21, "func[T Ordered](x T, y T) int"},
-		{"Less", Func, 21, "func[T Ordered](x T, y T) bool"},
-		{"Or", Func, 22, "func[T comparable](vals ...T) T"},
-		{"Ordered", Type, 21, ""},
-	},
-	"compress/bzip2": {
-		{"(StructuralError).Error", Method, 0, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"StructuralError", Type, 0, ""},
-	},
-	"compress/flate": {
-		{"(*ReadError).Error", Method, 0, ""},
-		{"(*WriteError).Error", Method, 0, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).Reset", Method, 2, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"(CorruptInputError).Error", Method, 0, ""},
-		{"(InternalError).Error", Method, 0, ""},
-		{"BestCompression", Const, 0, ""},
-		{"BestSpeed", Const, 0, ""},
-		{"CorruptInputError", Type, 0, ""},
-		{"DefaultCompression", Const, 0, ""},
-		{"HuffmanOnly", Const, 7, ""},
-		{"InternalError", Type, 0, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) io.ReadCloser"},
-		{"NewReaderDict", Func, 0, "func(r io.Reader, dict []byte) io.ReadCloser"},
-		{"NewWriter", Func, 0, "func(w io.Writer, level int) (*Writer, error)"},
-		{"NewWriterDict", Func, 0, "func(w io.Writer, level int, dict []byte) (*Writer, error)"},
-		{"NoCompression", Const, 0, ""},
-		{"ReadError", Type, 0, ""},
-		{"ReadError.Err", Field, 0, ""},
-		{"ReadError.Offset", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"Resetter", Type, 4, ""},
-		{"WriteError", Type, 0, ""},
-		{"WriteError.Err", Field, 0, ""},
-		{"WriteError.Offset", Field, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"compress/gzip": {
-		{"(*Reader).Close", Method, 0, ""},
-		{"(*Reader).Multistream", Method, 4, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Reader).Reset", Method, 3, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Flush", Method, 1, ""},
-		{"(*Writer).Reset", Method, 2, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"BestCompression", Const, 0, ""},
-		{"BestSpeed", Const, 0, ""},
-		{"DefaultCompression", Const, 0, ""},
-		{"ErrChecksum", Var, 0, ""},
-		{"ErrHeader", Var, 0, ""},
-		{"Header", Type, 0, ""},
-		{"Header.Comment", Field, 0, ""},
-		{"Header.Extra", Field, 0, ""},
-		{"Header.ModTime", Field, 0, ""},
-		{"Header.Name", Field, 0, ""},
-		{"Header.OS", Field, 0, ""},
-		{"HuffmanOnly", Const, 8, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) (*Reader, error)"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"NewWriterLevel", Func, 0, "func(w io.Writer, level int) (*Writer, error)"},
-		{"NoCompression", Const, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"Reader.Header", Field, 0, ""},
-		{"Writer", Type, 0, ""},
-		{"Writer.Header", Field, 0, ""},
-	},
-	"compress/lzw": {
-		{"(*Reader).Close", Method, 17, ""},
-		{"(*Reader).Read", Method, 17, ""},
-		{"(*Reader).Reset", Method, 17, ""},
-		{"(*Writer).Close", Method, 17, ""},
-		{"(*Writer).Reset", Method, 17, ""},
-		{"(*Writer).Write", Method, 17, ""},
-		{"LSB", Const, 0, ""},
-		{"MSB", Const, 0, ""},
-		{"NewReader", Func, 0, "func(r io.Reader, order Order, litWidth int) io.ReadCloser"},
-		{"NewWriter", Func, 0, "func(w io.Writer, order Order, litWidth int) io.WriteCloser"},
-		{"Order", Type, 0, ""},
-		{"Reader", Type, 17, ""},
-		{"Writer", Type, 17, ""},
-	},
-	"compress/zlib": {
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).Reset", Method, 2, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"BestCompression", Const, 0, ""},
-		{"BestSpeed", Const, 0, ""},
-		{"DefaultCompression", Const, 0, ""},
-		{"ErrChecksum", Var, 0, ""},
-		{"ErrDictionary", Var, 0, ""},
-		{"ErrHeader", Var, 0, ""},
-		{"HuffmanOnly", Const, 8, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) (io.ReadCloser, error)"},
-		{"NewReaderDict", Func, 0, "func(r io.Reader, dict []byte) (io.ReadCloser, error)"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"NewWriterLevel", Func, 0, "func(w io.Writer, level int) (*Writer, error)"},
-		{"NewWriterLevelDict", Func, 0, "func(w io.Writer, level int, dict []byte) (*Writer, error)"},
-		{"NoCompression", Const, 0, ""},
-		{"Resetter", Type, 4, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"container/heap": {
-		{"Fix", Func, 2, "func(h Interface, i int)"},
-		{"Init", Func, 0, "func(h Interface)"},
-		{"Interface", Type, 0, ""},
-		{"Pop", Func, 0, "func(h Interface) any"},
-		{"Push", Func, 0, "func(h Interface, x any)"},
-		{"Remove", Func, 0, "func(h Interface, i int) any"},
-	},
-	"container/list": {
-		{"(*Element).Next", Method, 0, ""},
-		{"(*Element).Prev", Method, 0, ""},
-		{"(*List).Back", Method, 0, ""},
-		{"(*List).Front", Method, 0, ""},
-		{"(*List).Init", Method, 0, ""},
-		{"(*List).InsertAfter", Method, 0, ""},
-		{"(*List).InsertBefore", Method, 0, ""},
-		{"(*List).Len", Method, 0, ""},
-		{"(*List).MoveAfter", Method, 2, ""},
-		{"(*List).MoveBefore", Method, 2, ""},
-		{"(*List).MoveToBack", Method, 0, ""},
-		{"(*List).MoveToFront", Method, 0, ""},
-		{"(*List).PushBack", Method, 0, ""},
-		{"(*List).PushBackList", Method, 0, ""},
-		{"(*List).PushFront", Method, 0, ""},
-		{"(*List).PushFrontList", Method, 0, ""},
-		{"(*List).Remove", Method, 0, ""},
-		{"Element", Type, 0, ""},
-		{"Element.Value", Field, 0, ""},
-		{"List", Type, 0, ""},
-		{"New", Func, 0, "func() *List"},
-	},
-	"container/ring": {
-		{"(*Ring).Do", Method, 0, ""},
-		{"(*Ring).Len", Method, 0, ""},
-		{"(*Ring).Link", Method, 0, ""},
-		{"(*Ring).Move", Method, 0, ""},
-		{"(*Ring).Next", Method, 0, ""},
-		{"(*Ring).Prev", Method, 0, ""},
-		{"(*Ring).Unlink", Method, 0, ""},
-		{"New", Func, 0, "func(n int) *Ring"},
-		{"Ring", Type, 0, ""},
-		{"Ring.Value", Field, 0, ""},
-	},
-	"context": {
-		{"AfterFunc", Func, 21, "func(ctx Context, f func()) (stop func() bool)"},
-		{"Background", Func, 7, "func() Context"},
-		{"CancelCauseFunc", Type, 20, ""},
-		{"CancelFunc", Type, 7, ""},
-		{"Canceled", Var, 7, ""},
-		{"Cause", Func, 20, "func(c Context) error"},
-		{"Context", Type, 7, ""},
-		{"DeadlineExceeded", Var, 7, ""},
-		{"TODO", Func, 7, "func() Context"},
-		{"WithCancel", Func, 7, "func(parent Context) (ctx Context, cancel CancelFunc)"},
-		{"WithCancelCause", Func, 20, "func(parent Context) (ctx Context, cancel CancelCauseFunc)"},
-		{"WithDeadline", Func, 7, "func(parent Context, d time.Time) (Context, CancelFunc)"},
-		{"WithDeadlineCause", Func, 21, "func(parent Context, d time.Time, cause error) (Context, CancelFunc)"},
-		{"WithTimeout", Func, 7, "func(parent Context, timeout time.Duration) (Context, CancelFunc)"},
-		{"WithTimeoutCause", Func, 21, "func(parent Context, timeout time.Duration, cause error) (Context, CancelFunc)"},
-		{"WithValue", Func, 7, "func(parent Context, key any, val any) Context"},
-		{"WithoutCancel", Func, 21, "func(parent Context) Context"},
-	},
-	"crypto": {
-		{"(Hash).Available", Method, 0, ""},
-		{"(Hash).HashFunc", Method, 4, ""},
-		{"(Hash).New", Method, 0, ""},
-		{"(Hash).Size", Method, 0, ""},
-		{"(Hash).String", Method, 15, ""},
-		{"BLAKE2b_256", Const, 9, ""},
-		{"BLAKE2b_384", Const, 9, ""},
-		{"BLAKE2b_512", Const, 9, ""},
-		{"BLAKE2s_256", Const, 9, ""},
-		{"Decrypter", Type, 5, ""},
-		{"DecrypterOpts", Type, 5, ""},
-		{"Hash", Type, 0, ""},
-		{"MD4", Const, 0, ""},
-		{"MD5", Const, 0, ""},
-		{"MD5SHA1", Const, 0, ""},
-		{"PrivateKey", Type, 0, ""},
-		{"PublicKey", Type, 2, ""},
-		{"RIPEMD160", Const, 0, ""},
-		{"RegisterHash", Func, 0, "func(h Hash, f func() hash.Hash)"},
-		{"SHA1", Const, 0, ""},
-		{"SHA224", Const, 0, ""},
-		{"SHA256", Const, 0, ""},
-		{"SHA384", Const, 0, ""},
-		{"SHA3_224", Const, 4, ""},
-		{"SHA3_256", Const, 4, ""},
-		{"SHA3_384", Const, 4, ""},
-		{"SHA3_512", Const, 4, ""},
-		{"SHA512", Const, 0, ""},
-		{"SHA512_224", Const, 5, ""},
-		{"SHA512_256", Const, 5, ""},
-		{"Signer", Type, 4, ""},
-		{"SignerOpts", Type, 4, ""},
-	},
-	"crypto/aes": {
-		{"(KeySizeError).Error", Method, 0, ""},
-		{"BlockSize", Const, 0, ""},
-		{"KeySizeError", Type, 0, ""},
-		{"NewCipher", Func, 0, "func(key []byte) (cipher.Block, error)"},
-	},
-	"crypto/cipher": {
-		{"(StreamReader).Read", Method, 0, ""},
-		{"(StreamWriter).Close", Method, 0, ""},
-		{"(StreamWriter).Write", Method, 0, ""},
-		{"AEAD", Type, 2, ""},
-		{"Block", Type, 0, ""},
-		{"BlockMode", Type, 0, ""},
-		{"NewCBCDecrypter", Func, 0, "func(b Block, iv []byte) BlockMode"},
-		{"NewCBCEncrypter", Func, 0, "func(b Block, iv []byte) BlockMode"},
-		{"NewCFBDecrypter", Func, 0, "func(block Block, iv []byte) Stream"},
-		{"NewCFBEncrypter", Func, 0, "func(block Block, iv []byte) Stream"},
-		{"NewCTR", Func, 0, "func(block Block, iv []byte) Stream"},
-		{"NewGCM", Func, 2, "func(cipher Block) (AEAD, error)"},
-		{"NewGCMWithNonceSize", Func, 5, "func(cipher Block, size int) (AEAD, error)"},
-		{"NewGCMWithRandomNonce", Func, 24, "func(cipher Block) (AEAD, error)"},
-		{"NewGCMWithTagSize", Func, 11, "func(cipher Block, tagSize int) (AEAD, error)"},
-		{"NewOFB", Func, 0, "func(b Block, iv []byte) Stream"},
-		{"Stream", Type, 0, ""},
-		{"StreamReader", Type, 0, ""},
-		{"StreamReader.R", Field, 0, ""},
-		{"StreamReader.S", Field, 0, ""},
-		{"StreamWriter", Type, 0, ""},
-		{"StreamWriter.Err", Field, 0, ""},
-		{"StreamWriter.S", Field, 0, ""},
-		{"StreamWriter.W", Field, 0, ""},
-	},
-	"crypto/des": {
-		{"(KeySizeError).Error", Method, 0, ""},
-		{"BlockSize", Const, 0, ""},
-		{"KeySizeError", Type, 0, ""},
-		{"NewCipher", Func, 0, "func(key []byte) (cipher.Block, error)"},
-		{"NewTripleDESCipher", Func, 0, "func(key []byte) (cipher.Block, error)"},
-	},
-	"crypto/dsa": {
-		{"ErrInvalidPublicKey", Var, 0, ""},
-		{"GenerateKey", Func, 0, "func(priv *PrivateKey, rand io.Reader) error"},
-		{"GenerateParameters", Func, 0, "func(params *Parameters, rand io.Reader, sizes ParameterSizes) error"},
-		{"L1024N160", Const, 0, ""},
-		{"L2048N224", Const, 0, ""},
-		{"L2048N256", Const, 0, ""},
-		{"L3072N256", Const, 0, ""},
-		{"ParameterSizes", Type, 0, ""},
-		{"Parameters", Type, 0, ""},
-		{"Parameters.G", Field, 0, ""},
-		{"Parameters.P", Field, 0, ""},
-		{"Parameters.Q", Field, 0, ""},
-		{"PrivateKey", Type, 0, ""},
-		{"PrivateKey.PublicKey", Field, 0, ""},
-		{"PrivateKey.X", Field, 0, ""},
-		{"PublicKey", Type, 0, ""},
-		{"PublicKey.Parameters", Field, 0, ""},
-		{"PublicKey.Y", Field, 0, ""},
-		{"Sign", Func, 0, "func(rand io.Reader, priv *PrivateKey, hash []byte) (r *big.Int, s *big.Int, err error)"},
-		{"Verify", Func, 0, "func(pub *PublicKey, hash []byte, r *big.Int, s *big.Int) bool"},
-	},
-	"crypto/ecdh": {
-		{"(*PrivateKey).Bytes", Method, 20, ""},
-		{"(*PrivateKey).Curve", Method, 20, ""},
-		{"(*PrivateKey).ECDH", Method, 20, ""},
-		{"(*PrivateKey).Equal", Method, 20, ""},
-		{"(*PrivateKey).Public", Method, 20, ""},
-		{"(*PrivateKey).PublicKey", Method, 20, ""},
-		{"(*PublicKey).Bytes", Method, 20, ""},
-		{"(*PublicKey).Curve", Method, 20, ""},
-		{"(*PublicKey).Equal", Method, 20, ""},
-		{"Curve", Type, 20, ""},
-		{"P256", Func, 20, "func() Curve"},
-		{"P384", Func, 20, "func() Curve"},
-		{"P521", Func, 20, "func() Curve"},
-		{"PrivateKey", Type, 20, ""},
-		{"PublicKey", Type, 20, ""},
-		{"X25519", Func, 20, "func() Curve"},
-	},
-	"crypto/ecdsa": {
-		{"(*PrivateKey).ECDH", Method, 20, ""},
-		{"(*PrivateKey).Equal", Method, 15, ""},
-		{"(*PrivateKey).Public", Method, 4, ""},
-		{"(*PrivateKey).Sign", Method, 4, ""},
-		{"(*PublicKey).ECDH", Method, 20, ""},
-		{"(*PublicKey).Equal", Method, 15, ""},
-		{"(PrivateKey).Add", Method, 0, ""},
-		{"(PrivateKey).Double", Method, 0, ""},
-		{"(PrivateKey).IsOnCurve", Method, 0, ""},
-		{"(PrivateKey).Params", Method, 0, ""},
-		{"(PrivateKey).ScalarBaseMult", Method, 0, ""},
-		{"(PrivateKey).ScalarMult", Method, 0, ""},
-		{"(PublicKey).Add", Method, 0, ""},
-		{"(PublicKey).Double", Method, 0, ""},
-		{"(PublicKey).IsOnCurve", Method, 0, ""},
-		{"(PublicKey).Params", Method, 0, ""},
-		{"(PublicKey).ScalarBaseMult", Method, 0, ""},
-		{"(PublicKey).ScalarMult", Method, 0, ""},
-		{"GenerateKey", Func, 0, "func(c elliptic.Curve, rand io.Reader) (*PrivateKey, error)"},
-		{"PrivateKey", Type, 0, ""},
-		{"PrivateKey.D", Field, 0, ""},
-		{"PrivateKey.PublicKey", Field, 0, ""},
-		{"PublicKey", Type, 0, ""},
-		{"PublicKey.Curve", Field, 0, ""},
-		{"PublicKey.X", Field, 0, ""},
-		{"PublicKey.Y", Field, 0, ""},
-		{"Sign", Func, 0, "func(rand io.Reader, priv *PrivateKey, hash []byte) (r *big.Int, s *big.Int, err error)"},
-		{"SignASN1", Func, 15, "func(rand io.Reader, priv *PrivateKey, hash []byte) ([]byte, error)"},
-		{"Verify", Func, 0, "func(pub *PublicKey, hash []byte, r *big.Int, s *big.Int) bool"},
-		{"VerifyASN1", Func, 15, "func(pub *PublicKey, hash []byte, sig []byte) bool"},
-	},
-	"crypto/ed25519": {
-		{"(*Options).HashFunc", Method, 20, ""},
-		{"(PrivateKey).Equal", Method, 15, ""},
-		{"(PrivateKey).Public", Method, 13, ""},
-		{"(PrivateKey).Seed", Method, 13, ""},
-		{"(PrivateKey).Sign", Method, 13, ""},
-		{"(PublicKey).Equal", Method, 15, ""},
-		{"GenerateKey", Func, 13, "func(rand io.Reader) (PublicKey, PrivateKey, error)"},
-		{"NewKeyFromSeed", Func, 13, "func(seed []byte) PrivateKey"},
-		{"Options", Type, 20, ""},
-		{"Options.Context", Field, 20, ""},
-		{"Options.Hash", Field, 20, ""},
-		{"PrivateKey", Type, 13, ""},
-		{"PrivateKeySize", Const, 13, ""},
-		{"PublicKey", Type, 13, ""},
-		{"PublicKeySize", Const, 13, ""},
-		{"SeedSize", Const, 13, ""},
-		{"Sign", Func, 13, "func(privateKey PrivateKey, message []byte) []byte"},
-		{"SignatureSize", Const, 13, ""},
-		{"Verify", Func, 13, "func(publicKey PublicKey, message []byte, sig []byte) bool"},
-		{"VerifyWithOptions", Func, 20, "func(publicKey PublicKey, message []byte, sig []byte, opts *Options) error"},
-	},
-	"crypto/elliptic": {
-		{"(*CurveParams).Add", Method, 0, ""},
-		{"(*CurveParams).Double", Method, 0, ""},
-		{"(*CurveParams).IsOnCurve", Method, 0, ""},
-		{"(*CurveParams).Params", Method, 0, ""},
-		{"(*CurveParams).ScalarBaseMult", Method, 0, ""},
-		{"(*CurveParams).ScalarMult", Method, 0, ""},
-		{"Curve", Type, 0, ""},
-		{"CurveParams", Type, 0, ""},
-		{"CurveParams.B", Field, 0, ""},
-		{"CurveParams.BitSize", Field, 0, ""},
-		{"CurveParams.Gx", Field, 0, ""},
-		{"CurveParams.Gy", Field, 0, ""},
-		{"CurveParams.N", Field, 0, ""},
-		{"CurveParams.Name", Field, 5, ""},
-		{"CurveParams.P", Field, 0, ""},
-		{"GenerateKey", Func, 0, "func(curve Curve, rand io.Reader) (priv []byte, x *big.Int, y *big.Int, err error)"},
-		{"Marshal", Func, 0, "func(curve Curve, x *big.Int, y *big.Int) []byte"},
-		{"MarshalCompressed", Func, 15, "func(curve Curve, x *big.Int, y *big.Int) []byte"},
-		{"P224", Func, 0, "func() Curve"},
-		{"P256", Func, 0, "func() Curve"},
-		{"P384", Func, 0, "func() Curve"},
-		{"P521", Func, 0, "func() Curve"},
-		{"Unmarshal", Func, 0, "func(curve Curve, data []byte) (x *big.Int, y *big.Int)"},
-		{"UnmarshalCompressed", Func, 15, "func(curve Curve, data []byte) (x *big.Int, y *big.Int)"},
-	},
-	"crypto/fips140": {
-		{"Enabled", Func, 24, "func() bool"},
-	},
-	"crypto/hkdf": {
-		{"Expand", Func, 24, "func[H hash.Hash](h func() H, pseudorandomKey []byte, info string, keyLength int) ([]byte, error)"},
-		{"Extract", Func, 24, "func[H hash.Hash](h func() H, secret []byte, salt []byte) ([]byte, error)"},
-		{"Key", Func, 24, "func[Hash hash.Hash](h func() Hash, secret []byte, salt []byte, info string, keyLength int) ([]byte, error)"},
-	},
-	"crypto/hmac": {
-		{"Equal", Func, 1, "func(mac1 []byte, mac2 []byte) bool"},
-		{"New", Func, 0, "func(h func() hash.Hash, key []byte) hash.Hash"},
-	},
-	"crypto/md5": {
-		{"BlockSize", Const, 0, ""},
-		{"New", Func, 0, "func() hash.Hash"},
-		{"Size", Const, 0, ""},
-		{"Sum", Func, 2, "func(data []byte) [16]byte"},
-	},
-	"crypto/mlkem": {
-		{"(*DecapsulationKey1024).Bytes", Method, 24, ""},
-		{"(*DecapsulationKey1024).Decapsulate", Method, 24, ""},
-		{"(*DecapsulationKey1024).EncapsulationKey", Method, 24, ""},
-		{"(*DecapsulationKey768).Bytes", Method, 24, ""},
-		{"(*DecapsulationKey768).Decapsulate", Method, 24, ""},
-		{"(*DecapsulationKey768).EncapsulationKey", Method, 24, ""},
-		{"(*EncapsulationKey1024).Bytes", Method, 24, ""},
-		{"(*EncapsulationKey1024).Encapsulate", Method, 24, ""},
-		{"(*EncapsulationKey768).Bytes", Method, 24, ""},
-		{"(*EncapsulationKey768).Encapsulate", Method, 24, ""},
-		{"CiphertextSize1024", Const, 24, ""},
-		{"CiphertextSize768", Const, 24, ""},
-		{"DecapsulationKey1024", Type, 24, ""},
-		{"DecapsulationKey768", Type, 24, ""},
-		{"EncapsulationKey1024", Type, 24, ""},
-		{"EncapsulationKey768", Type, 24, ""},
-		{"EncapsulationKeySize1024", Const, 24, ""},
-		{"EncapsulationKeySize768", Const, 24, ""},
-		{"GenerateKey1024", Func, 24, "func() (*DecapsulationKey1024, error)"},
-		{"GenerateKey768", Func, 24, "func() (*DecapsulationKey768, error)"},
-		{"NewDecapsulationKey1024", Func, 24, "func(seed []byte) (*DecapsulationKey1024, error)"},
-		{"NewDecapsulationKey768", Func, 24, "func(seed []byte) (*DecapsulationKey768, error)"},
-		{"NewEncapsulationKey1024", Func, 24, "func(encapsulationKey []byte) (*EncapsulationKey1024, error)"},
-		{"NewEncapsulationKey768", Func, 24, "func(encapsulationKey []byte) (*EncapsulationKey768, error)"},
-		{"SeedSize", Const, 24, ""},
-		{"SharedKeySize", Const, 24, ""},
-	},
-	"crypto/pbkdf2": {
-		{"Key", Func, 24, "func[Hash hash.Hash](h func() Hash, password string, salt []byte, iter int, keyLength int) ([]byte, error)"},
-	},
-	"crypto/rand": {
-		{"Int", Func, 0, "func(rand io.Reader, max *big.Int) (n *big.Int, err error)"},
-		{"Prime", Func, 0, "func(rand io.Reader, bits int) (*big.Int, error)"},
-		{"Read", Func, 0, "func(b []byte) (n int, err error)"},
-		{"Reader", Var, 0, ""},
-		{"Text", Func, 24, "func() string"},
-	},
-	"crypto/rc4": {
-		{"(*Cipher).Reset", Method, 0, ""},
-		{"(*Cipher).XORKeyStream", Method, 0, ""},
-		{"(KeySizeError).Error", Method, 0, ""},
-		{"Cipher", Type, 0, ""},
-		{"KeySizeError", Type, 0, ""},
-		{"NewCipher", Func, 0, "func(key []byte) (*Cipher, error)"},
-	},
-	"crypto/rsa": {
-		{"(*PSSOptions).HashFunc", Method, 4, ""},
-		{"(*PrivateKey).Decrypt", Method, 5, ""},
-		{"(*PrivateKey).Equal", Method, 15, ""},
-		{"(*PrivateKey).Precompute", Method, 0, ""},
-		{"(*PrivateKey).Public", Method, 4, ""},
-		{"(*PrivateKey).Sign", Method, 4, ""},
-		{"(*PrivateKey).Size", Method, 11, ""},
-		{"(*PrivateKey).Validate", Method, 0, ""},
-		{"(*PublicKey).Equal", Method, 15, ""},
-		{"(*PublicKey).Size", Method, 11, ""},
-		{"CRTValue", Type, 0, ""},
-		{"CRTValue.Coeff", Field, 0, ""},
-		{"CRTValue.Exp", Field, 0, ""},
-		{"CRTValue.R", Field, 0, ""},
-		{"DecryptOAEP", Func, 0, "func(hash hash.Hash, random io.Reader, priv *PrivateKey, ciphertext []byte, label []byte) ([]byte, error)"},
-		{"DecryptPKCS1v15", Func, 0, "func(random io.Reader, priv *PrivateKey, ciphertext []byte) ([]byte, error)"},
-		{"DecryptPKCS1v15SessionKey", Func, 0, "func(random io.Reader, priv *PrivateKey, ciphertext []byte, key []byte) error"},
-		{"EncryptOAEP", Func, 0, "func(hash hash.Hash, random io.Reader, pub *PublicKey, msg []byte, label []byte) ([]byte, error)"},
-		{"EncryptPKCS1v15", Func, 0, "func(random io.Reader, pub *PublicKey, msg []byte) ([]byte, error)"},
-		{"ErrDecryption", Var, 0, ""},
-		{"ErrMessageTooLong", Var, 0, ""},
-		{"ErrVerification", Var, 0, ""},
-		{"GenerateKey", Func, 0, "func(random io.Reader, bits int) (*PrivateKey, error)"},
-		{"GenerateMultiPrimeKey", Func, 0, "func(random io.Reader, nprimes int, bits int) (*PrivateKey, error)"},
-		{"OAEPOptions", Type, 5, ""},
-		{"OAEPOptions.Hash", Field, 5, ""},
-		{"OAEPOptions.Label", Field, 5, ""},
-		{"OAEPOptions.MGFHash", Field, 20, ""},
-		{"PKCS1v15DecryptOptions", Type, 5, ""},
-		{"PKCS1v15DecryptOptions.SessionKeyLen", Field, 5, ""},
-		{"PSSOptions", Type, 2, ""},
-		{"PSSOptions.Hash", Field, 4, ""},
-		{"PSSOptions.SaltLength", Field, 2, ""},
-		{"PSSSaltLengthAuto", Const, 2, ""},
-		{"PSSSaltLengthEqualsHash", Const, 2, ""},
-		{"PrecomputedValues", Type, 0, ""},
-		{"PrecomputedValues.CRTValues", Field, 0, ""},
-		{"PrecomputedValues.Dp", Field, 0, ""},
-		{"PrecomputedValues.Dq", Field, 0, ""},
-		{"PrecomputedValues.Qinv", Field, 0, ""},
-		{"PrivateKey", Type, 0, ""},
-		{"PrivateKey.D", Field, 0, ""},
-		{"PrivateKey.Precomputed", Field, 0, ""},
-		{"PrivateKey.Primes", Field, 0, ""},
-		{"PrivateKey.PublicKey", Field, 0, ""},
-		{"PublicKey", Type, 0, ""},
-		{"PublicKey.E", Field, 0, ""},
-		{"PublicKey.N", Field, 0, ""},
-		{"SignPKCS1v15", Func, 0, "func(random io.Reader, priv *PrivateKey, hash crypto.Hash, hashed []byte) ([]byte, error)"},
-		{"SignPSS", Func, 2, "func(rand io.Reader, priv *PrivateKey, hash crypto.Hash, digest []byte, opts *PSSOptions) ([]byte, error)"},
-		{"VerifyPKCS1v15", Func, 0, "func(pub *PublicKey, hash crypto.Hash, hashed []byte, sig []byte) error"},
-		{"VerifyPSS", Func, 2, "func(pub *PublicKey, hash crypto.Hash, digest []byte, sig []byte, opts *PSSOptions) error"},
-	},
-	"crypto/sha1": {
-		{"BlockSize", Const, 0, ""},
-		{"New", Func, 0, "func() hash.Hash"},
-		{"Size", Const, 0, ""},
-		{"Sum", Func, 2, "func(data []byte) [20]byte"},
-	},
-	"crypto/sha256": {
-		{"BlockSize", Const, 0, ""},
-		{"New", Func, 0, "func() hash.Hash"},
-		{"New224", Func, 0, "func() hash.Hash"},
-		{"Size", Const, 0, ""},
-		{"Size224", Const, 0, ""},
-		{"Sum224", Func, 2, "func(data []byte) [28]byte"},
-		{"Sum256", Func, 2, "func(data []byte) [32]byte"},
-	},
-	"crypto/sha3": {
-		{"(*SHA3).AppendBinary", Method, 24, ""},
-		{"(*SHA3).BlockSize", Method, 24, ""},
-		{"(*SHA3).MarshalBinary", Method, 24, ""},
-		{"(*SHA3).Reset", Method, 24, ""},
-		{"(*SHA3).Size", Method, 24, ""},
-		{"(*SHA3).Sum", Method, 24, ""},
-		{"(*SHA3).UnmarshalBinary", Method, 24, ""},
-		{"(*SHA3).Write", Method, 24, ""},
-		{"(*SHAKE).AppendBinary", Method, 24, ""},
-		{"(*SHAKE).BlockSize", Method, 24, ""},
-		{"(*SHAKE).MarshalBinary", Method, 24, ""},
-		{"(*SHAKE).Read", Method, 24, ""},
-		{"(*SHAKE).Reset", Method, 24, ""},
-		{"(*SHAKE).UnmarshalBinary", Method, 24, ""},
-		{"(*SHAKE).Write", Method, 24, ""},
-		{"New224", Func, 24, "func() *SHA3"},
-		{"New256", Func, 24, "func() *SHA3"},
-		{"New384", Func, 24, "func() *SHA3"},
-		{"New512", Func, 24, "func() *SHA3"},
-		{"NewCSHAKE128", Func, 24, "func(N []byte, S []byte) *SHAKE"},
-		{"NewCSHAKE256", Func, 24, "func(N []byte, S []byte) *SHAKE"},
-		{"NewSHAKE128", Func, 24, "func() *SHAKE"},
-		{"NewSHAKE256", Func, 24, "func() *SHAKE"},
-		{"SHA3", Type, 24, ""},
-		{"SHAKE", Type, 24, ""},
-		{"Sum224", Func, 24, "func(data []byte) [28]byte"},
-		{"Sum256", Func, 24, "func(data []byte) [32]byte"},
-		{"Sum384", Func, 24, "func(data []byte) [48]byte"},
-		{"Sum512", Func, 24, "func(data []byte) [64]byte"},
-		{"SumSHAKE128", Func, 24, "func(data []byte, length int) []byte"},
-		{"SumSHAKE256", Func, 24, "func(data []byte, length int) []byte"},
-	},
-	"crypto/sha512": {
-		{"BlockSize", Const, 0, ""},
-		{"New", Func, 0, "func() hash.Hash"},
-		{"New384", Func, 0, "func() hash.Hash"},
-		{"New512_224", Func, 5, "func() hash.Hash"},
-		{"New512_256", Func, 5, "func() hash.Hash"},
-		{"Size", Const, 0, ""},
-		{"Size224", Const, 5, ""},
-		{"Size256", Const, 5, ""},
-		{"Size384", Const, 0, ""},
-		{"Sum384", Func, 2, "func(data []byte) [48]byte"},
-		{"Sum512", Func, 2, "func(data []byte) [64]byte"},
-		{"Sum512_224", Func, 5, "func(data []byte) [28]byte"},
-		{"Sum512_256", Func, 5, "func(data []byte) [32]byte"},
-	},
-	"crypto/subtle": {
-		{"ConstantTimeByteEq", Func, 0, "func(x uint8, y uint8) int"},
-		{"ConstantTimeCompare", Func, 0, "func(x []byte, y []byte) int"},
-		{"ConstantTimeCopy", Func, 0, "func(v int, x []byte, y []byte)"},
-		{"ConstantTimeEq", Func, 0, "func(x int32, y int32) int"},
-		{"ConstantTimeLessOrEq", Func, 2, "func(x int, y int) int"},
-		{"ConstantTimeSelect", Func, 0, "func(v int, x int, y int) int"},
-		{"WithDataIndependentTiming", Func, 24, "func(f func())"},
-		{"XORBytes", Func, 20, "func(dst []byte, x []byte, y []byte) int"},
-	},
-	"crypto/tls": {
-		{"(*CertificateRequestInfo).Context", Method, 17, ""},
-		{"(*CertificateRequestInfo).SupportsCertificate", Method, 14, ""},
-		{"(*CertificateVerificationError).Error", Method, 20, ""},
-		{"(*CertificateVerificationError).Unwrap", Method, 20, ""},
-		{"(*ClientHelloInfo).Context", Method, 17, ""},
-		{"(*ClientHelloInfo).SupportsCertificate", Method, 14, ""},
-		{"(*ClientSessionState).ResumptionState", Method, 21, ""},
-		{"(*Config).BuildNameToCertificate", Method, 0, ""},
-		{"(*Config).Clone", Method, 8, ""},
-		{"(*Config).DecryptTicket", Method, 21, ""},
-		{"(*Config).EncryptTicket", Method, 21, ""},
-		{"(*Config).SetSessionTicketKeys", Method, 5, ""},
-		{"(*Conn).Close", Method, 0, ""},
-		{"(*Conn).CloseWrite", Method, 8, ""},
-		{"(*Conn).ConnectionState", Method, 0, ""},
-		{"(*Conn).Handshake", Method, 0, ""},
-		{"(*Conn).HandshakeContext", Method, 17, ""},
-		{"(*Conn).LocalAddr", Method, 0, ""},
-		{"(*Conn).NetConn", Method, 18, ""},
-		{"(*Conn).OCSPResponse", Method, 0, ""},
-		{"(*Conn).Read", Method, 0, ""},
-		{"(*Conn).RemoteAddr", Method, 0, ""},
-		{"(*Conn).SetDeadline", Method, 0, ""},
-		{"(*Conn).SetReadDeadline", Method, 0, ""},
-		{"(*Conn).SetWriteDeadline", Method, 0, ""},
-		{"(*Conn).VerifyHostname", Method, 0, ""},
-		{"(*Conn).Write", Method, 0, ""},
-		{"(*ConnectionState).ExportKeyingMaterial", Method, 11, ""},
-		{"(*Dialer).Dial", Method, 15, ""},
-		{"(*Dialer).DialContext", Method, 15, ""},
-		{"(*ECHRejectionError).Error", Method, 23, ""},
-		{"(*QUICConn).Close", Method, 21, ""},
-		{"(*QUICConn).ConnectionState", Method, 21, ""},
-		{"(*QUICConn).HandleData", Method, 21, ""},
-		{"(*QUICConn).NextEvent", Method, 21, ""},
-		{"(*QUICConn).SendSessionTicket", Method, 21, ""},
-		{"(*QUICConn).SetTransportParameters", Method, 21, ""},
-		{"(*QUICConn).Start", Method, 21, ""},
-		{"(*QUICConn).StoreSession", Method, 23, ""},
-		{"(*SessionState).Bytes", Method, 21, ""},
-		{"(AlertError).Error", Method, 21, ""},
-		{"(ClientAuthType).String", Method, 15, ""},
-		{"(CurveID).String", Method, 15, ""},
-		{"(QUICEncryptionLevel).String", Method, 21, ""},
-		{"(RecordHeaderError).Error", Method, 6, ""},
-		{"(SignatureScheme).String", Method, 15, ""},
-		{"AlertError", Type, 21, ""},
-		{"Certificate", Type, 0, ""},
-		{"Certificate.Certificate", Field, 0, ""},
-		{"Certificate.Leaf", Field, 0, ""},
-		{"Certificate.OCSPStaple", Field, 0, ""},
-		{"Certificate.PrivateKey", Field, 0, ""},
-		{"Certificate.SignedCertificateTimestamps", Field, 5, ""},
-		{"Certificate.SupportedSignatureAlgorithms", Field, 14, ""},
-		{"CertificateRequestInfo", Type, 8, ""},
-		{"CertificateRequestInfo.AcceptableCAs", Field, 8, ""},
-		{"CertificateRequestInfo.SignatureSchemes", Field, 8, ""},
-		{"CertificateRequestInfo.Version", Field, 14, ""},
-		{"CertificateVerificationError", Type, 20, ""},
-		{"CertificateVerificationError.Err", Field, 20, ""},
-		{"CertificateVerificationError.UnverifiedCertificates", Field, 20, ""},
-		{"CipherSuite", Type, 14, ""},
-		{"CipherSuite.ID", Field, 14, ""},
-		{"CipherSuite.Insecure", Field, 14, ""},
-		{"CipherSuite.Name", Field, 14, ""},
-		{"CipherSuite.SupportedVersions", Field, 14, ""},
-		{"CipherSuiteName", Func, 14, "func(id uint16) string"},
-		{"CipherSuites", Func, 14, "func() []*CipherSuite"},
-		{"Client", Func, 0, "func(conn net.Conn, config *Config) *Conn"},
-		{"ClientAuthType", Type, 0, ""},
-		{"ClientHelloInfo", Type, 4, ""},
-		{"ClientHelloInfo.CipherSuites", Field, 4, ""},
-		{"ClientHelloInfo.Conn", Field, 8, ""},
-		{"ClientHelloInfo.Extensions", Field, 24, ""},
-		{"ClientHelloInfo.ServerName", Field, 4, ""},
-		{"ClientHelloInfo.SignatureSchemes", Field, 8, ""},
-		{"ClientHelloInfo.SupportedCurves", Field, 4, ""},
-		{"ClientHelloInfo.SupportedPoints", Field, 4, ""},
-		{"ClientHelloInfo.SupportedProtos", Field, 8, ""},
-		{"ClientHelloInfo.SupportedVersions", Field, 8, ""},
-		{"ClientSessionCache", Type, 3, ""},
-		{"ClientSessionState", Type, 3, ""},
-		{"Config", Type, 0, ""},
-		{"Config.Certificates", Field, 0, ""},
-		{"Config.CipherSuites", Field, 0, ""},
-		{"Config.ClientAuth", Field, 0, ""},
-		{"Config.ClientCAs", Field, 0, ""},
-		{"Config.ClientSessionCache", Field, 3, ""},
-		{"Config.CurvePreferences", Field, 3, ""},
-		{"Config.DynamicRecordSizingDisabled", Field, 7, ""},
-		{"Config.EncryptedClientHelloConfigList", Field, 23, ""},
-		{"Config.EncryptedClientHelloKeys", Field, 24, ""},
-		{"Config.EncryptedClientHelloRejectionVerify", Field, 23, ""},
-		{"Config.GetCertificate", Field, 4, ""},
-		{"Config.GetClientCertificate", Field, 8, ""},
-		{"Config.GetConfigForClient", Field, 8, ""},
-		{"Config.InsecureSkipVerify", Field, 0, ""},
-		{"Config.KeyLogWriter", Field, 8, ""},
-		{"Config.MaxVersion", Field, 2, ""},
-		{"Config.MinVersion", Field, 2, ""},
-		{"Config.NameToCertificate", Field, 0, ""},
-		{"Config.NextProtos", Field, 0, ""},
-		{"Config.PreferServerCipherSuites", Field, 1, ""},
-		{"Config.Rand", Field, 0, ""},
-		{"Config.Renegotiation", Field, 7, ""},
-		{"Config.RootCAs", Field, 0, ""},
-		{"Config.ServerName", Field, 0, ""},
-		{"Config.SessionTicketKey", Field, 1, ""},
-		{"Config.SessionTicketsDisabled", Field, 1, ""},
-		{"Config.Time", Field, 0, ""},
-		{"Config.UnwrapSession", Field, 21, ""},
-		{"Config.VerifyConnection", Field, 15, ""},
-		{"Config.VerifyPeerCertificate", Field, 8, ""},
-		{"Config.WrapSession", Field, 21, ""},
-		{"Conn", Type, 0, ""},
-		{"ConnectionState", Type, 0, ""},
-		{"ConnectionState.CipherSuite", Field, 0, ""},
-		{"ConnectionState.CurveID", Field, 25, ""},
-		{"ConnectionState.DidResume", Field, 1, ""},
-		{"ConnectionState.ECHAccepted", Field, 23, ""},
-		{"ConnectionState.HandshakeComplete", Field, 0, ""},
-		{"ConnectionState.NegotiatedProtocol", Field, 0, ""},
-		{"ConnectionState.NegotiatedProtocolIsMutual", Field, 0, ""},
-		{"ConnectionState.OCSPResponse", Field, 5, ""},
-		{"ConnectionState.PeerCertificates", Field, 0, ""},
-		{"ConnectionState.ServerName", Field, 0, ""},
-		{"ConnectionState.SignedCertificateTimestamps", Field, 5, ""},
-		{"ConnectionState.TLSUnique", Field, 4, ""},
-		{"ConnectionState.VerifiedChains", Field, 0, ""},
-		{"ConnectionState.Version", Field, 3, ""},
-		{"CurveID", Type, 3, ""},
-		{"CurveP256", Const, 3, ""},
-		{"CurveP384", Const, 3, ""},
-		{"CurveP521", Const, 3, ""},
-		{"Dial", Func, 0, "func(network string, addr string, config *Config) (*Conn, error)"},
-		{"DialWithDialer", Func, 3, "func(dialer *net.Dialer, network string, addr string, config *Config) (*Conn, error)"},
-		{"Dialer", Type, 15, ""},
-		{"Dialer.Config", Field, 15, ""},
-		{"Dialer.NetDialer", Field, 15, ""},
-		{"ECDSAWithP256AndSHA256", Const, 8, ""},
-		{"ECDSAWithP384AndSHA384", Const, 8, ""},
-		{"ECDSAWithP521AndSHA512", Const, 8, ""},
-		{"ECDSAWithSHA1", Const, 10, ""},
-		{"ECHRejectionError", Type, 23, ""},
-		{"ECHRejectionError.RetryConfigList", Field, 23, ""},
-		{"Ed25519", Const, 13, ""},
-		{"EncryptedClientHelloKey", Type, 24, ""},
-		{"EncryptedClientHelloKey.Config", Field, 24, ""},
-		{"EncryptedClientHelloKey.PrivateKey", Field, 24, ""},
-		{"EncryptedClientHelloKey.SendAsRetry", Field, 24, ""},
-		{"InsecureCipherSuites", Func, 14, "func() []*CipherSuite"},
-		{"Listen", Func, 0, "func(network string, laddr string, config *Config) (net.Listener, error)"},
-		{"LoadX509KeyPair", Func, 0, "func(certFile string, keyFile string) (Certificate, error)"},
-		{"NewLRUClientSessionCache", Func, 3, "func(capacity int) ClientSessionCache"},
-		{"NewListener", Func, 0, "func(inner net.Listener, config *Config) net.Listener"},
-		{"NewResumptionState", Func, 21, "func(ticket []byte, state *SessionState) (*ClientSessionState, error)"},
-		{"NoClientCert", Const, 0, ""},
-		{"PKCS1WithSHA1", Const, 8, ""},
-		{"PKCS1WithSHA256", Const, 8, ""},
-		{"PKCS1WithSHA384", Const, 8, ""},
-		{"PKCS1WithSHA512", Const, 8, ""},
-		{"PSSWithSHA256", Const, 8, ""},
-		{"PSSWithSHA384", Const, 8, ""},
-		{"PSSWithSHA512", Const, 8, ""},
-		{"ParseSessionState", Func, 21, "func(data []byte) (*SessionState, error)"},
-		{"QUICClient", Func, 21, "func(config *QUICConfig) *QUICConn"},
-		{"QUICConfig", Type, 21, ""},
-		{"QUICConfig.EnableSessionEvents", Field, 23, ""},
-		{"QUICConfig.TLSConfig", Field, 21, ""},
-		{"QUICConn", Type, 21, ""},
-		{"QUICEncryptionLevel", Type, 21, ""},
-		{"QUICEncryptionLevelApplication", Const, 21, ""},
-		{"QUICEncryptionLevelEarly", Const, 21, ""},
-		{"QUICEncryptionLevelHandshake", Const, 21, ""},
-		{"QUICEncryptionLevelInitial", Const, 21, ""},
-		{"QUICEvent", Type, 21, ""},
-		{"QUICEvent.Data", Field, 21, ""},
-		{"QUICEvent.Kind", Field, 21, ""},
-		{"QUICEvent.Level", Field, 21, ""},
-		{"QUICEvent.SessionState", Field, 23, ""},
-		{"QUICEvent.Suite", Field, 21, ""},
-		{"QUICEventKind", Type, 21, ""},
-		{"QUICHandshakeDone", Const, 21, ""},
-		{"QUICNoEvent", Const, 21, ""},
-		{"QUICRejectedEarlyData", Const, 21, ""},
-		{"QUICResumeSession", Const, 23, ""},
-		{"QUICServer", Func, 21, "func(config *QUICConfig) *QUICConn"},
-		{"QUICSessionTicketOptions", Type, 21, ""},
-		{"QUICSessionTicketOptions.EarlyData", Field, 21, ""},
-		{"QUICSessionTicketOptions.Extra", Field, 23, ""},
-		{"QUICSetReadSecret", Const, 21, ""},
-		{"QUICSetWriteSecret", Const, 21, ""},
-		{"QUICStoreSession", Const, 23, ""},
-		{"QUICTransportParameters", Const, 21, ""},
-		{"QUICTransportParametersRequired", Const, 21, ""},
-		{"QUICWriteData", Const, 21, ""},
-		{"RecordHeaderError", Type, 6, ""},
-		{"RecordHeaderError.Conn", Field, 12, ""},
-		{"RecordHeaderError.Msg", Field, 6, ""},
-		{"RecordHeaderError.RecordHeader", Field, 6, ""},
-		{"RenegotiateFreelyAsClient", Const, 7, ""},
-		{"RenegotiateNever", Const, 7, ""},
-		{"RenegotiateOnceAsClient", Const, 7, ""},
-		{"RenegotiationSupport", Type, 7, ""},
-		{"RequestClientCert", Const, 0, ""},
-		{"RequireAndVerifyClientCert", Const, 0, ""},
-		{"RequireAnyClientCert", Const, 0, ""},
-		{"Server", Func, 0, "func(conn net.Conn, config *Config) *Conn"},
-		{"SessionState", Type, 21, ""},
-		{"SessionState.EarlyData", Field, 21, ""},
-		{"SessionState.Extra", Field, 21, ""},
-		{"SignatureScheme", Type, 8, ""},
-		{"TLS_AES_128_GCM_SHA256", Const, 12, ""},
-		{"TLS_AES_256_GCM_SHA384", Const, 12, ""},
-		{"TLS_CHACHA20_POLY1305_SHA256", Const, 12, ""},
-		{"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", Const, 2, ""},
-		{"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", Const, 8, ""},
-		{"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", Const, 2, ""},
-		{"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", Const, 2, ""},
-		{"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", Const, 5, ""},
-		{"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", Const, 8, ""},
-		{"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", Const, 14, ""},
-		{"TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", Const, 2, ""},
-		{"TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", Const, 0, ""},
-		{"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", Const, 0, ""},
-		{"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", Const, 8, ""},
-		{"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", Const, 2, ""},
-		{"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", Const, 1, ""},
-		{"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", Const, 5, ""},
-		{"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", Const, 8, ""},
-		{"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256", Const, 14, ""},
-		{"TLS_ECDHE_RSA_WITH_RC4_128_SHA", Const, 0, ""},
-		{"TLS_FALLBACK_SCSV", Const, 4, ""},
-		{"TLS_RSA_WITH_3DES_EDE_CBC_SHA", Const, 0, ""},
-		{"TLS_RSA_WITH_AES_128_CBC_SHA", Const, 0, ""},
-		{"TLS_RSA_WITH_AES_128_CBC_SHA256", Const, 8, ""},
-		{"TLS_RSA_WITH_AES_128_GCM_SHA256", Const, 6, ""},
-		{"TLS_RSA_WITH_AES_256_CBC_SHA", Const, 1, ""},
-		{"TLS_RSA_WITH_AES_256_GCM_SHA384", Const, 6, ""},
-		{"TLS_RSA_WITH_RC4_128_SHA", Const, 0, ""},
-		{"VerifyClientCertIfGiven", Const, 0, ""},
-		{"VersionName", Func, 21, "func(version uint16) string"},
-		{"VersionSSL30", Const, 2, ""},
-		{"VersionTLS10", Const, 2, ""},
-		{"VersionTLS11", Const, 2, ""},
-		{"VersionTLS12", Const, 2, ""},
-		{"VersionTLS13", Const, 12, ""},
-		{"X25519", Const, 8, ""},
-		{"X25519MLKEM768", Const, 24, ""},
-		{"X509KeyPair", Func, 0, "func(certPEMBlock []byte, keyPEMBlock []byte) (Certificate, error)"},
-	},
-	"crypto/x509": {
-		{"(*CertPool).AddCert", Method, 0, ""},
-		{"(*CertPool).AddCertWithConstraint", Method, 22, ""},
-		{"(*CertPool).AppendCertsFromPEM", Method, 0, ""},
-		{"(*CertPool).Clone", Method, 19, ""},
-		{"(*CertPool).Equal", Method, 19, ""},
-		{"(*CertPool).Subjects", Method, 0, ""},
-		{"(*Certificate).CheckCRLSignature", Method, 0, ""},
-		{"(*Certificate).CheckSignature", Method, 0, ""},
-		{"(*Certificate).CheckSignatureFrom", Method, 0, ""},
-		{"(*Certificate).CreateCRL", Method, 0, ""},
-		{"(*Certificate).Equal", Method, 0, ""},
-		{"(*Certificate).Verify", Method, 0, ""},
-		{"(*Certificate).VerifyHostname", Method, 0, ""},
-		{"(*CertificateRequest).CheckSignature", Method, 5, ""},
-		{"(*OID).UnmarshalBinary", Method, 23, ""},
-		{"(*OID).UnmarshalText", Method, 23, ""},
-		{"(*RevocationList).CheckSignatureFrom", Method, 19, ""},
-		{"(CertificateInvalidError).Error", Method, 0, ""},
-		{"(ConstraintViolationError).Error", Method, 0, ""},
-		{"(HostnameError).Error", Method, 0, ""},
-		{"(InsecureAlgorithmError).Error", Method, 6, ""},
-		{"(OID).AppendBinary", Method, 24, ""},
-		{"(OID).AppendText", Method, 24, ""},
-		{"(OID).Equal", Method, 22, ""},
-		{"(OID).EqualASN1OID", Method, 22, ""},
-		{"(OID).MarshalBinary", Method, 23, ""},
-		{"(OID).MarshalText", Method, 23, ""},
-		{"(OID).String", Method, 22, ""},
-		{"(PublicKeyAlgorithm).String", Method, 10, ""},
-		{"(SignatureAlgorithm).String", Method, 6, ""},
-		{"(SystemRootsError).Error", Method, 1, ""},
-		{"(SystemRootsError).Unwrap", Method, 16, ""},
-		{"(UnhandledCriticalExtension).Error", Method, 0, ""},
-		{"(UnknownAuthorityError).Error", Method, 0, ""},
-		{"CANotAuthorizedForExtKeyUsage", Const, 10, ""},
-		{"CANotAuthorizedForThisName", Const, 0, ""},
-		{"CertPool", Type, 0, ""},
-		{"Certificate", Type, 0, ""},
-		{"Certificate.AuthorityKeyId", Field, 0, ""},
-		{"Certificate.BasicConstraintsValid", Field, 0, ""},
-		{"Certificate.CRLDistributionPoints", Field, 2, ""},
-		{"Certificate.DNSNames", Field, 0, ""},
-		{"Certificate.EmailAddresses", Field, 0, ""},
-		{"Certificate.ExcludedDNSDomains", Field, 9, ""},
-		{"Certificate.ExcludedEmailAddresses", Field, 10, ""},
-		{"Certificate.ExcludedIPRanges", Field, 10, ""},
-		{"Certificate.ExcludedURIDomains", Field, 10, ""},
-		{"Certificate.ExtKeyUsage", Field, 0, ""},
-		{"Certificate.Extensions", Field, 2, ""},
-		{"Certificate.ExtraExtensions", Field, 2, ""},
-		{"Certificate.IPAddresses", Field, 1, ""},
-		{"Certificate.InhibitAnyPolicy", Field, 24, ""},
-		{"Certificate.InhibitAnyPolicyZero", Field, 24, ""},
-		{"Certificate.InhibitPolicyMapping", Field, 24, ""},
-		{"Certificate.InhibitPolicyMappingZero", Field, 24, ""},
-		{"Certificate.IsCA", Field, 0, ""},
-		{"Certificate.Issuer", Field, 0, ""},
-		{"Certificate.IssuingCertificateURL", Field, 2, ""},
-		{"Certificate.KeyUsage", Field, 0, ""},
-		{"Certificate.MaxPathLen", Field, 0, ""},
-		{"Certificate.MaxPathLenZero", Field, 4, ""},
-		{"Certificate.NotAfter", Field, 0, ""},
-		{"Certificate.NotBefore", Field, 0, ""},
-		{"Certificate.OCSPServer", Field, 2, ""},
-		{"Certificate.PermittedDNSDomains", Field, 0, ""},
-		{"Certificate.PermittedDNSDomainsCritical", Field, 0, ""},
-		{"Certificate.PermittedEmailAddresses", Field, 10, ""},
-		{"Certificate.PermittedIPRanges", Field, 10, ""},
-		{"Certificate.PermittedURIDomains", Field, 10, ""},
-		{"Certificate.Policies", Field, 22, ""},
-		{"Certificate.PolicyIdentifiers", Field, 0, ""},
-		{"Certificate.PolicyMappings", Field, 24, ""},
-		{"Certificate.PublicKey", Field, 0, ""},
-		{"Certificate.PublicKeyAlgorithm", Field, 0, ""},
-		{"Certificate.Raw", Field, 0, ""},
-		{"Certificate.RawIssuer", Field, 0, ""},
-		{"Certificate.RawSubject", Field, 0, ""},
-		{"Certificate.RawSubjectPublicKeyInfo", Field, 0, ""},
-		{"Certificate.RawTBSCertificate", Field, 0, ""},
-		{"Certificate.RequireExplicitPolicy", Field, 24, ""},
-		{"Certificate.RequireExplicitPolicyZero", Field, 24, ""},
-		{"Certificate.SerialNumber", Field, 0, ""},
-		{"Certificate.Signature", Field, 0, ""},
-		{"Certificate.SignatureAlgorithm", Field, 0, ""},
-		{"Certificate.Subject", Field, 0, ""},
-		{"Certificate.SubjectKeyId", Field, 0, ""},
-		{"Certificate.URIs", Field, 10, ""},
-		{"Certificate.UnhandledCriticalExtensions", Field, 5, ""},
-		{"Certificate.UnknownExtKeyUsage", Field, 0, ""},
-		{"Certificate.Version", Field, 0, ""},
-		{"CertificateInvalidError", Type, 0, ""},
-		{"CertificateInvalidError.Cert", Field, 0, ""},
-		{"CertificateInvalidError.Detail", Field, 10, ""},
-		{"CertificateInvalidError.Reason", Field, 0, ""},
-		{"CertificateRequest", Type, 3, ""},
-		{"CertificateRequest.Attributes", Field, 3, ""},
-		{"CertificateRequest.DNSNames", Field, 3, ""},
-		{"CertificateRequest.EmailAddresses", Field, 3, ""},
-		{"CertificateRequest.Extensions", Field, 3, ""},
-		{"CertificateRequest.ExtraExtensions", Field, 3, ""},
-		{"CertificateRequest.IPAddresses", Field, 3, ""},
-		{"CertificateRequest.PublicKey", Field, 3, ""},
-		{"CertificateRequest.PublicKeyAlgorithm", Field, 3, ""},
-		{"CertificateRequest.Raw", Field, 3, ""},
-		{"CertificateRequest.RawSubject", Field, 3, ""},
-		{"CertificateRequest.RawSubjectPublicKeyInfo", Field, 3, ""},
-		{"CertificateRequest.RawTBSCertificateRequest", Field, 3, ""},
-		{"CertificateRequest.Signature", Field, 3, ""},
-		{"CertificateRequest.SignatureAlgorithm", Field, 3, ""},
-		{"CertificateRequest.Subject", Field, 3, ""},
-		{"CertificateRequest.URIs", Field, 10, ""},
-		{"CertificateRequest.Version", Field, 3, ""},
-		{"ConstraintViolationError", Type, 0, ""},
-		{"CreateCertificate", Func, 0, "func(rand io.Reader, template *Certificate, parent *Certificate, pub any, priv any) ([]byte, error)"},
-		{"CreateCertificateRequest", Func, 3, "func(rand io.Reader, template *CertificateRequest, priv any) (csr []byte, err error)"},
-		{"CreateRevocationList", Func, 15, "func(rand io.Reader, template *RevocationList, issuer *Certificate, priv crypto.Signer) ([]byte, error)"},
-		{"DSA", Const, 0, ""},
-		{"DSAWithSHA1", Const, 0, ""},
-		{"DSAWithSHA256", Const, 0, ""},
-		{"DecryptPEMBlock", Func, 1, "func(b *pem.Block, password []byte) ([]byte, error)"},
-		{"ECDSA", Const, 1, ""},
-		{"ECDSAWithSHA1", Const, 1, ""},
-		{"ECDSAWithSHA256", Const, 1, ""},
-		{"ECDSAWithSHA384", Const, 1, ""},
-		{"ECDSAWithSHA512", Const, 1, ""},
-		{"Ed25519", Const, 13, ""},
-		{"EncryptPEMBlock", Func, 1, "func(rand io.Reader, blockType string, data []byte, password []byte, alg PEMCipher) (*pem.Block, error)"},
-		{"ErrUnsupportedAlgorithm", Var, 0, ""},
-		{"Expired", Const, 0, ""},
-		{"ExtKeyUsage", Type, 0, ""},
-		{"ExtKeyUsageAny", Const, 0, ""},
-		{"ExtKeyUsageClientAuth", Const, 0, ""},
-		{"ExtKeyUsageCodeSigning", Const, 0, ""},
-		{"ExtKeyUsageEmailProtection", Const, 0, ""},
-		{"ExtKeyUsageIPSECEndSystem", Const, 1, ""},
-		{"ExtKeyUsageIPSECTunnel", Const, 1, ""},
-		{"ExtKeyUsageIPSECUser", Const, 1, ""},
-		{"ExtKeyUsageMicrosoftCommercialCodeSigning", Const, 10, ""},
-		{"ExtKeyUsageMicrosoftKernelCodeSigning", Const, 10, ""},
-		{"ExtKeyUsageMicrosoftServerGatedCrypto", Const, 1, ""},
-		{"ExtKeyUsageNetscapeServerGatedCrypto", Const, 1, ""},
-		{"ExtKeyUsageOCSPSigning", Const, 0, ""},
-		{"ExtKeyUsageServerAuth", Const, 0, ""},
-		{"ExtKeyUsageTimeStamping", Const, 0, ""},
-		{"HostnameError", Type, 0, ""},
-		{"HostnameError.Certificate", Field, 0, ""},
-		{"HostnameError.Host", Field, 0, ""},
-		{"IncompatibleUsage", Const, 1, ""},
-		{"IncorrectPasswordError", Var, 1, ""},
-		{"InsecureAlgorithmError", Type, 6, ""},
-		{"InvalidReason", Type, 0, ""},
-		{"IsEncryptedPEMBlock", Func, 1, "func(b *pem.Block) bool"},
-		{"KeyUsage", Type, 0, ""},
-		{"KeyUsageCRLSign", Const, 0, ""},
-		{"KeyUsageCertSign", Const, 0, ""},
-		{"KeyUsageContentCommitment", Const, 0, ""},
-		{"KeyUsageDataEncipherment", Const, 0, ""},
-		{"KeyUsageDecipherOnly", Const, 0, ""},
-		{"KeyUsageDigitalSignature", Const, 0, ""},
-		{"KeyUsageEncipherOnly", Const, 0, ""},
-		{"KeyUsageKeyAgreement", Const, 0, ""},
-		{"KeyUsageKeyEncipherment", Const, 0, ""},
-		{"MD2WithRSA", Const, 0, ""},
-		{"MD5WithRSA", Const, 0, ""},
-		{"MarshalECPrivateKey", Func, 2, "func(key *ecdsa.PrivateKey) ([]byte, error)"},
-		{"MarshalPKCS1PrivateKey", Func, 0, "func(key *rsa.PrivateKey) []byte"},
-		{"MarshalPKCS1PublicKey", Func, 10, "func(key *rsa.PublicKey) []byte"},
-		{"MarshalPKCS8PrivateKey", Func, 10, "func(key any) ([]byte, error)"},
-		{"MarshalPKIXPublicKey", Func, 0, "func(pub any) ([]byte, error)"},
-		{"NameConstraintsWithoutSANs", Const, 10, ""},
-		{"NameMismatch", Const, 8, ""},
-		{"NewCertPool", Func, 0, "func() *CertPool"},
-		{"NoValidChains", Const, 24, ""},
-		{"NotAuthorizedToSign", Const, 0, ""},
-		{"OID", Type, 22, ""},
-		{"OIDFromInts", Func, 22, "func(oid []uint64) (OID, error)"},
-		{"PEMCipher", Type, 1, ""},
-		{"PEMCipher3DES", Const, 1, ""},
-		{"PEMCipherAES128", Const, 1, ""},
-		{"PEMCipherAES192", Const, 1, ""},
-		{"PEMCipherAES256", Const, 1, ""},
-		{"PEMCipherDES", Const, 1, ""},
-		{"ParseCRL", Func, 0, "func(crlBytes []byte) (*pkix.CertificateList, error)"},
-		{"ParseCertificate", Func, 0, "func(der []byte) (*Certificate, error)"},
-		{"ParseCertificateRequest", Func, 3, "func(asn1Data []byte) (*CertificateRequest, error)"},
-		{"ParseCertificates", Func, 0, "func(der []byte) ([]*Certificate, error)"},
-		{"ParseDERCRL", Func, 0, "func(derBytes []byte) (*pkix.CertificateList, error)"},
-		{"ParseECPrivateKey", Func, 1, "func(der []byte) (*ecdsa.PrivateKey, error)"},
-		{"ParseOID", Func, 23, "func(oid string) (OID, error)"},
-		{"ParsePKCS1PrivateKey", Func, 0, "func(der []byte) (*rsa.PrivateKey, error)"},
-		{"ParsePKCS1PublicKey", Func, 10, "func(der []byte) (*rsa.PublicKey, error)"},
-		{"ParsePKCS8PrivateKey", Func, 0, "func(der []byte) (key any, err error)"},
-		{"ParsePKIXPublicKey", Func, 0, "func(derBytes []byte) (pub any, err error)"},
-		{"ParseRevocationList", Func, 19, "func(der []byte) (*RevocationList, error)"},
-		{"PolicyMapping", Type, 24, ""},
-		{"PolicyMapping.IssuerDomainPolicy", Field, 24, ""},
-		{"PolicyMapping.SubjectDomainPolicy", Field, 24, ""},
-		{"PublicKeyAlgorithm", Type, 0, ""},
-		{"PureEd25519", Const, 13, ""},
-		{"RSA", Const, 0, ""},
-		{"RevocationList", Type, 15, ""},
-		{"RevocationList.AuthorityKeyId", Field, 19, ""},
-		{"RevocationList.Extensions", Field, 19, ""},
-		{"RevocationList.ExtraExtensions", Field, 15, ""},
-		{"RevocationList.Issuer", Field, 19, ""},
-		{"RevocationList.NextUpdate", Field, 15, ""},
-		{"RevocationList.Number", Field, 15, ""},
-		{"RevocationList.Raw", Field, 19, ""},
-		{"RevocationList.RawIssuer", Field, 19, ""},
-		{"RevocationList.RawTBSRevocationList", Field, 19, ""},
-		{"RevocationList.RevokedCertificateEntries", Field, 21, ""},
-		{"RevocationList.RevokedCertificates", Field, 15, ""},
-		{"RevocationList.Signature", Field, 19, ""},
-		{"RevocationList.SignatureAlgorithm", Field, 15, ""},
-		{"RevocationList.ThisUpdate", Field, 15, ""},
-		{"RevocationListEntry", Type, 21, ""},
-		{"RevocationListEntry.Extensions", Field, 21, ""},
-		{"RevocationListEntry.ExtraExtensions", Field, 21, ""},
-		{"RevocationListEntry.Raw", Field, 21, ""},
-		{"RevocationListEntry.ReasonCode", Field, 21, ""},
-		{"RevocationListEntry.RevocationTime", Field, 21, ""},
-		{"RevocationListEntry.SerialNumber", Field, 21, ""},
-		{"SHA1WithRSA", Const, 0, ""},
-		{"SHA256WithRSA", Const, 0, ""},
-		{"SHA256WithRSAPSS", Const, 8, ""},
-		{"SHA384WithRSA", Const, 0, ""},
-		{"SHA384WithRSAPSS", Const, 8, ""},
-		{"SHA512WithRSA", Const, 0, ""},
-		{"SHA512WithRSAPSS", Const, 8, ""},
-		{"SetFallbackRoots", Func, 20, "func(roots *CertPool)"},
-		{"SignatureAlgorithm", Type, 0, ""},
-		{"SystemCertPool", Func, 7, "func() (*CertPool, error)"},
-		{"SystemRootsError", Type, 1, ""},
-		{"SystemRootsError.Err", Field, 7, ""},
-		{"TooManyConstraints", Const, 10, ""},
-		{"TooManyIntermediates", Const, 0, ""},
-		{"UnconstrainedName", Const, 10, ""},
-		{"UnhandledCriticalExtension", Type, 0, ""},
-		{"UnknownAuthorityError", Type, 0, ""},
-		{"UnknownAuthorityError.Cert", Field, 8, ""},
-		{"UnknownPublicKeyAlgorithm", Const, 0, ""},
-		{"UnknownSignatureAlgorithm", Const, 0, ""},
-		{"VerifyOptions", Type, 0, ""},
-		{"VerifyOptions.CertificatePolicies", Field, 24, ""},
-		{"VerifyOptions.CurrentTime", Field, 0, ""},
-		{"VerifyOptions.DNSName", Field, 0, ""},
-		{"VerifyOptions.Intermediates", Field, 0, ""},
-		{"VerifyOptions.KeyUsages", Field, 1, ""},
-		{"VerifyOptions.MaxConstraintComparisions", Field, 10, ""},
-		{"VerifyOptions.Roots", Field, 0, ""},
-	},
-	"crypto/x509/pkix": {
-		{"(*CertificateList).HasExpired", Method, 0, ""},
-		{"(*Name).FillFromRDNSequence", Method, 0, ""},
-		{"(Name).String", Method, 10, ""},
-		{"(Name).ToRDNSequence", Method, 0, ""},
-		{"(RDNSequence).String", Method, 10, ""},
-		{"AlgorithmIdentifier", Type, 0, ""},
-		{"AlgorithmIdentifier.Algorithm", Field, 0, ""},
-		{"AlgorithmIdentifier.Parameters", Field, 0, ""},
-		{"AttributeTypeAndValue", Type, 0, ""},
-		{"AttributeTypeAndValue.Type", Field, 0, ""},
-		{"AttributeTypeAndValue.Value", Field, 0, ""},
-		{"AttributeTypeAndValueSET", Type, 3, ""},
-		{"AttributeTypeAndValueSET.Type", Field, 3, ""},
-		{"AttributeTypeAndValueSET.Value", Field, 3, ""},
-		{"CertificateList", Type, 0, ""},
-		{"CertificateList.SignatureAlgorithm", Field, 0, ""},
-		{"CertificateList.SignatureValue", Field, 0, ""},
-		{"CertificateList.TBSCertList", Field, 0, ""},
-		{"Extension", Type, 0, ""},
-		{"Extension.Critical", Field, 0, ""},
-		{"Extension.Id", Field, 0, ""},
-		{"Extension.Value", Field, 0, ""},
-		{"Name", Type, 0, ""},
-		{"Name.CommonName", Field, 0, ""},
-		{"Name.Country", Field, 0, ""},
-		{"Name.ExtraNames", Field, 5, ""},
-		{"Name.Locality", Field, 0, ""},
-		{"Name.Names", Field, 0, ""},
-		{"Name.Organization", Field, 0, ""},
-		{"Name.OrganizationalUnit", Field, 0, ""},
-		{"Name.PostalCode", Field, 0, ""},
-		{"Name.Province", Field, 0, ""},
-		{"Name.SerialNumber", Field, 0, ""},
-		{"Name.StreetAddress", Field, 0, ""},
-		{"RDNSequence", Type, 0, ""},
-		{"RelativeDistinguishedNameSET", Type, 0, ""},
-		{"RevokedCertificate", Type, 0, ""},
-		{"RevokedCertificate.Extensions", Field, 0, ""},
-		{"RevokedCertificate.RevocationTime", Field, 0, ""},
-		{"RevokedCertificate.SerialNumber", Field, 0, ""},
-		{"TBSCertificateList", Type, 0, ""},
-		{"TBSCertificateList.Extensions", Field, 0, ""},
-		{"TBSCertificateList.Issuer", Field, 0, ""},
-		{"TBSCertificateList.NextUpdate", Field, 0, ""},
-		{"TBSCertificateList.Raw", Field, 0, ""},
-		{"TBSCertificateList.RevokedCertificates", Field, 0, ""},
-		{"TBSCertificateList.Signature", Field, 0, ""},
-		{"TBSCertificateList.ThisUpdate", Field, 0, ""},
-		{"TBSCertificateList.Version", Field, 0, ""},
-	},
-	"database/sql": {
-		{"(*ColumnType).DatabaseTypeName", Method, 8, ""},
-		{"(*ColumnType).DecimalSize", Method, 8, ""},
-		{"(*ColumnType).Length", Method, 8, ""},
-		{"(*ColumnType).Name", Method, 8, ""},
-		{"(*ColumnType).Nullable", Method, 8, ""},
-		{"(*ColumnType).ScanType", Method, 8, ""},
-		{"(*Conn).BeginTx", Method, 9, ""},
-		{"(*Conn).Close", Method, 9, ""},
-		{"(*Conn).ExecContext", Method, 9, ""},
-		{"(*Conn).PingContext", Method, 9, ""},
-		{"(*Conn).PrepareContext", Method, 9, ""},
-		{"(*Conn).QueryContext", Method, 9, ""},
-		{"(*Conn).QueryRowContext", Method, 9, ""},
-		{"(*Conn).Raw", Method, 13, ""},
-		{"(*DB).Begin", Method, 0, ""},
-		{"(*DB).BeginTx", Method, 8, ""},
-		{"(*DB).Close", Method, 0, ""},
-		{"(*DB).Conn", Method, 9, ""},
-		{"(*DB).Driver", Method, 0, ""},
-		{"(*DB).Exec", Method, 0, ""},
-		{"(*DB).ExecContext", Method, 8, ""},
-		{"(*DB).Ping", Method, 1, ""},
-		{"(*DB).PingContext", Method, 8, ""},
-		{"(*DB).Prepare", Method, 0, ""},
-		{"(*DB).PrepareContext", Method, 8, ""},
-		{"(*DB).Query", Method, 0, ""},
-		{"(*DB).QueryContext", Method, 8, ""},
-		{"(*DB).QueryRow", Method, 0, ""},
-		{"(*DB).QueryRowContext", Method, 8, ""},
-		{"(*DB).SetConnMaxIdleTime", Method, 15, ""},
-		{"(*DB).SetConnMaxLifetime", Method, 6, ""},
-		{"(*DB).SetMaxIdleConns", Method, 1, ""},
-		{"(*DB).SetMaxOpenConns", Method, 2, ""},
-		{"(*DB).Stats", Method, 5, ""},
-		{"(*Null).Scan", Method, 22, ""},
-		{"(*NullBool).Scan", Method, 0, ""},
-		{"(*NullByte).Scan", Method, 17, ""},
-		{"(*NullFloat64).Scan", Method, 0, ""},
-		{"(*NullInt16).Scan", Method, 17, ""},
-		{"(*NullInt32).Scan", Method, 13, ""},
-		{"(*NullInt64).Scan", Method, 0, ""},
-		{"(*NullString).Scan", Method, 0, ""},
-		{"(*NullTime).Scan", Method, 13, ""},
-		{"(*Row).Err", Method, 15, ""},
-		{"(*Row).Scan", Method, 0, ""},
-		{"(*Rows).Close", Method, 0, ""},
-		{"(*Rows).ColumnTypes", Method, 8, ""},
-		{"(*Rows).Columns", Method, 0, ""},
-		{"(*Rows).Err", Method, 0, ""},
-		{"(*Rows).Next", Method, 0, ""},
-		{"(*Rows).NextResultSet", Method, 8, ""},
-		{"(*Rows).Scan", Method, 0, ""},
-		{"(*Stmt).Close", Method, 0, ""},
-		{"(*Stmt).Exec", Method, 0, ""},
-		{"(*Stmt).ExecContext", Method, 8, ""},
-		{"(*Stmt).Query", Method, 0, ""},
-		{"(*Stmt).QueryContext", Method, 8, ""},
-		{"(*Stmt).QueryRow", Method, 0, ""},
-		{"(*Stmt).QueryRowContext", Method, 8, ""},
-		{"(*Tx).Commit", Method, 0, ""},
-		{"(*Tx).Exec", Method, 0, ""},
-		{"(*Tx).ExecContext", Method, 8, ""},
-		{"(*Tx).Prepare", Method, 0, ""},
-		{"(*Tx).PrepareContext", Method, 8, ""},
-		{"(*Tx).Query", Method, 0, ""},
-		{"(*Tx).QueryContext", Method, 8, ""},
-		{"(*Tx).QueryRow", Method, 0, ""},
-		{"(*Tx).QueryRowContext", Method, 8, ""},
-		{"(*Tx).Rollback", Method, 0, ""},
-		{"(*Tx).Stmt", Method, 0, ""},
-		{"(*Tx).StmtContext", Method, 8, ""},
-		{"(IsolationLevel).String", Method, 11, ""},
-		{"(Null).Value", Method, 22, ""},
-		{"(NullBool).Value", Method, 0, ""},
-		{"(NullByte).Value", Method, 17, ""},
-		{"(NullFloat64).Value", Method, 0, ""},
-		{"(NullInt16).Value", Method, 17, ""},
-		{"(NullInt32).Value", Method, 13, ""},
-		{"(NullInt64).Value", Method, 0, ""},
-		{"(NullString).Value", Method, 0, ""},
-		{"(NullTime).Value", Method, 13, ""},
-		{"ColumnType", Type, 8, ""},
-		{"Conn", Type, 9, ""},
-		{"DB", Type, 0, ""},
-		{"DBStats", Type, 5, ""},
-		{"DBStats.Idle", Field, 11, ""},
-		{"DBStats.InUse", Field, 11, ""},
-		{"DBStats.MaxIdleClosed", Field, 11, ""},
-		{"DBStats.MaxIdleTimeClosed", Field, 15, ""},
-		{"DBStats.MaxLifetimeClosed", Field, 11, ""},
-		{"DBStats.MaxOpenConnections", Field, 11, ""},
-		{"DBStats.OpenConnections", Field, 5, ""},
-		{"DBStats.WaitCount", Field, 11, ""},
-		{"DBStats.WaitDuration", Field, 11, ""},
-		{"Drivers", Func, 4, "func() []string"},
-		{"ErrConnDone", Var, 9, ""},
-		{"ErrNoRows", Var, 0, ""},
-		{"ErrTxDone", Var, 0, ""},
-		{"IsolationLevel", Type, 8, ""},
-		{"LevelDefault", Const, 8, ""},
-		{"LevelLinearizable", Const, 8, ""},
-		{"LevelReadCommitted", Const, 8, ""},
-		{"LevelReadUncommitted", Const, 8, ""},
-		{"LevelRepeatableRead", Const, 8, ""},
-		{"LevelSerializable", Const, 8, ""},
-		{"LevelSnapshot", Const, 8, ""},
-		{"LevelWriteCommitted", Const, 8, ""},
-		{"Named", Func, 8, "func(name string, value any) NamedArg"},
-		{"NamedArg", Type, 8, ""},
-		{"NamedArg.Name", Field, 8, ""},
-		{"NamedArg.Value", Field, 8, ""},
-		{"Null", Type, 22, ""},
-		{"Null.V", Field, 22, ""},
-		{"Null.Valid", Field, 22, ""},
-		{"NullBool", Type, 0, ""},
-		{"NullBool.Bool", Field, 0, ""},
-		{"NullBool.Valid", Field, 0, ""},
-		{"NullByte", Type, 17, ""},
-		{"NullByte.Byte", Field, 17, ""},
-		{"NullByte.Valid", Field, 17, ""},
-		{"NullFloat64", Type, 0, ""},
-		{"NullFloat64.Float64", Field, 0, ""},
-		{"NullFloat64.Valid", Field, 0, ""},
-		{"NullInt16", Type, 17, ""},
-		{"NullInt16.Int16", Field, 17, ""},
-		{"NullInt16.Valid", Field, 17, ""},
-		{"NullInt32", Type, 13, ""},
-		{"NullInt32.Int32", Field, 13, ""},
-		{"NullInt32.Valid", Field, 13, ""},
-		{"NullInt64", Type, 0, ""},
-		{"NullInt64.Int64", Field, 0, ""},
-		{"NullInt64.Valid", Field, 0, ""},
-		{"NullString", Type, 0, ""},
-		{"NullString.String", Field, 0, ""},
-		{"NullString.Valid", Field, 0, ""},
-		{"NullTime", Type, 13, ""},
-		{"NullTime.Time", Field, 13, ""},
-		{"NullTime.Valid", Field, 13, ""},
-		{"Open", Func, 0, "func(driverName string, dataSourceName string) (*DB, error)"},
-		{"OpenDB", Func, 10, "func(c driver.Connector) *DB"},
-		{"Out", Type, 9, ""},
-		{"Out.Dest", Field, 9, ""},
-		{"Out.In", Field, 9, ""},
-		{"RawBytes", Type, 0, ""},
-		{"Register", Func, 0, "func(name string, driver driver.Driver)"},
-		{"Result", Type, 0, ""},
-		{"Row", Type, 0, ""},
-		{"Rows", Type, 0, ""},
-		{"Scanner", Type, 0, ""},
-		{"Stmt", Type, 0, ""},
-		{"Tx", Type, 0, ""},
-		{"TxOptions", Type, 8, ""},
-		{"TxOptions.Isolation", Field, 8, ""},
-		{"TxOptions.ReadOnly", Field, 8, ""},
-	},
-	"database/sql/driver": {
-		{"(NotNull).ConvertValue", Method, 0, ""},
-		{"(Null).ConvertValue", Method, 0, ""},
-		{"(RowsAffected).LastInsertId", Method, 0, ""},
-		{"(RowsAffected).RowsAffected", Method, 0, ""},
-		{"Bool", Var, 0, ""},
-		{"ColumnConverter", Type, 0, ""},
-		{"Conn", Type, 0, ""},
-		{"ConnBeginTx", Type, 8, ""},
-		{"ConnPrepareContext", Type, 8, ""},
-		{"Connector", Type, 10, ""},
-		{"DefaultParameterConverter", Var, 0, ""},
-		{"Driver", Type, 0, ""},
-		{"DriverContext", Type, 10, ""},
-		{"ErrBadConn", Var, 0, ""},
-		{"ErrRemoveArgument", Var, 9, ""},
-		{"ErrSkip", Var, 0, ""},
-		{"Execer", Type, 0, ""},
-		{"ExecerContext", Type, 8, ""},
-		{"Int32", Var, 0, ""},
-		{"IsScanValue", Func, 0, "func(v any) bool"},
-		{"IsValue", Func, 0, "func(v any) bool"},
-		{"IsolationLevel", Type, 8, ""},
-		{"NamedValue", Type, 8, ""},
-		{"NamedValue.Name", Field, 8, ""},
-		{"NamedValue.Ordinal", Field, 8, ""},
-		{"NamedValue.Value", Field, 8, ""},
-		{"NamedValueChecker", Type, 9, ""},
-		{"NotNull", Type, 0, ""},
-		{"NotNull.Converter", Field, 0, ""},
-		{"Null", Type, 0, ""},
-		{"Null.Converter", Field, 0, ""},
-		{"Pinger", Type, 8, ""},
-		{"Queryer", Type, 1, ""},
-		{"QueryerContext", Type, 8, ""},
-		{"Result", Type, 0, ""},
-		{"ResultNoRows", Var, 0, ""},
-		{"Rows", Type, 0, ""},
-		{"RowsAffected", Type, 0, ""},
-		{"RowsColumnTypeDatabaseTypeName", Type, 8, ""},
-		{"RowsColumnTypeLength", Type, 8, ""},
-		{"RowsColumnTypeNullable", Type, 8, ""},
-		{"RowsColumnTypePrecisionScale", Type, 8, ""},
-		{"RowsColumnTypeScanType", Type, 8, ""},
-		{"RowsNextResultSet", Type, 8, ""},
-		{"SessionResetter", Type, 10, ""},
-		{"Stmt", Type, 0, ""},
-		{"StmtExecContext", Type, 8, ""},
-		{"StmtQueryContext", Type, 8, ""},
-		{"String", Var, 0, ""},
-		{"Tx", Type, 0, ""},
-		{"TxOptions", Type, 8, ""},
-		{"TxOptions.Isolation", Field, 8, ""},
-		{"TxOptions.ReadOnly", Field, 8, ""},
-		{"Validator", Type, 15, ""},
-		{"Value", Type, 0, ""},
-		{"ValueConverter", Type, 0, ""},
-		{"Valuer", Type, 0, ""},
-	},
-	"debug/buildinfo": {
-		{"BuildInfo", Type, 18, ""},
-		{"Read", Func, 18, "func(r io.ReaderAt) (*BuildInfo, error)"},
-		{"ReadFile", Func, 18, "func(name string) (info *BuildInfo, err error)"},
-	},
-	"debug/dwarf": {
-		{"(*AddrType).Basic", Method, 0, ""},
-		{"(*AddrType).Common", Method, 0, ""},
-		{"(*AddrType).Size", Method, 0, ""},
-		{"(*AddrType).String", Method, 0, ""},
-		{"(*ArrayType).Common", Method, 0, ""},
-		{"(*ArrayType).Size", Method, 0, ""},
-		{"(*ArrayType).String", Method, 0, ""},
-		{"(*BasicType).Basic", Method, 0, ""},
-		{"(*BasicType).Common", Method, 0, ""},
-		{"(*BasicType).Size", Method, 0, ""},
-		{"(*BasicType).String", Method, 0, ""},
-		{"(*BoolType).Basic", Method, 0, ""},
-		{"(*BoolType).Common", Method, 0, ""},
-		{"(*BoolType).Size", Method, 0, ""},
-		{"(*BoolType).String", Method, 0, ""},
-		{"(*CharType).Basic", Method, 0, ""},
-		{"(*CharType).Common", Method, 0, ""},
-		{"(*CharType).Size", Method, 0, ""},
-		{"(*CharType).String", Method, 0, ""},
-		{"(*CommonType).Common", Method, 0, ""},
-		{"(*CommonType).Size", Method, 0, ""},
-		{"(*ComplexType).Basic", Method, 0, ""},
-		{"(*ComplexType).Common", Method, 0, ""},
-		{"(*ComplexType).Size", Method, 0, ""},
-		{"(*ComplexType).String", Method, 0, ""},
-		{"(*Data).AddSection", Method, 14, ""},
-		{"(*Data).AddTypes", Method, 3, ""},
-		{"(*Data).LineReader", Method, 5, ""},
-		{"(*Data).Ranges", Method, 7, ""},
-		{"(*Data).Reader", Method, 0, ""},
-		{"(*Data).Type", Method, 0, ""},
-		{"(*DotDotDotType).Common", Method, 0, ""},
-		{"(*DotDotDotType).Size", Method, 0, ""},
-		{"(*DotDotDotType).String", Method, 0, ""},
-		{"(*Entry).AttrField", Method, 5, ""},
-		{"(*Entry).Val", Method, 0, ""},
-		{"(*EnumType).Common", Method, 0, ""},
-		{"(*EnumType).Size", Method, 0, ""},
-		{"(*EnumType).String", Method, 0, ""},
-		{"(*FloatType).Basic", Method, 0, ""},
-		{"(*FloatType).Common", Method, 0, ""},
-		{"(*FloatType).Size", Method, 0, ""},
-		{"(*FloatType).String", Method, 0, ""},
-		{"(*FuncType).Common", Method, 0, ""},
-		{"(*FuncType).Size", Method, 0, ""},
-		{"(*FuncType).String", Method, 0, ""},
-		{"(*IntType).Basic", Method, 0, ""},
-		{"(*IntType).Common", Method, 0, ""},
-		{"(*IntType).Size", Method, 0, ""},
-		{"(*IntType).String", Method, 0, ""},
-		{"(*LineReader).Files", Method, 14, ""},
-		{"(*LineReader).Next", Method, 5, ""},
-		{"(*LineReader).Reset", Method, 5, ""},
-		{"(*LineReader).Seek", Method, 5, ""},
-		{"(*LineReader).SeekPC", Method, 5, ""},
-		{"(*LineReader).Tell", Method, 5, ""},
-		{"(*PtrType).Common", Method, 0, ""},
-		{"(*PtrType).Size", Method, 0, ""},
-		{"(*PtrType).String", Method, 0, ""},
-		{"(*QualType).Common", Method, 0, ""},
-		{"(*QualType).Size", Method, 0, ""},
-		{"(*QualType).String", Method, 0, ""},
-		{"(*Reader).AddressSize", Method, 5, ""},
-		{"(*Reader).ByteOrder", Method, 14, ""},
-		{"(*Reader).Next", Method, 0, ""},
-		{"(*Reader).Seek", Method, 0, ""},
-		{"(*Reader).SeekPC", Method, 7, ""},
-		{"(*Reader).SkipChildren", Method, 0, ""},
-		{"(*StructType).Common", Method, 0, ""},
-		{"(*StructType).Defn", Method, 0, ""},
-		{"(*StructType).Size", Method, 0, ""},
-		{"(*StructType).String", Method, 0, ""},
-		{"(*TypedefType).Common", Method, 0, ""},
-		{"(*TypedefType).Size", Method, 0, ""},
-		{"(*TypedefType).String", Method, 0, ""},
-		{"(*UcharType).Basic", Method, 0, ""},
-		{"(*UcharType).Common", Method, 0, ""},
-		{"(*UcharType).Size", Method, 0, ""},
-		{"(*UcharType).String", Method, 0, ""},
-		{"(*UintType).Basic", Method, 0, ""},
-		{"(*UintType).Common", Method, 0, ""},
-		{"(*UintType).Size", Method, 0, ""},
-		{"(*UintType).String", Method, 0, ""},
-		{"(*UnspecifiedType).Basic", Method, 4, ""},
-		{"(*UnspecifiedType).Common", Method, 4, ""},
-		{"(*UnspecifiedType).Size", Method, 4, ""},
-		{"(*UnspecifiedType).String", Method, 4, ""},
-		{"(*UnsupportedType).Common", Method, 13, ""},
-		{"(*UnsupportedType).Size", Method, 13, ""},
-		{"(*UnsupportedType).String", Method, 13, ""},
-		{"(*VoidType).Common", Method, 0, ""},
-		{"(*VoidType).Size", Method, 0, ""},
-		{"(*VoidType).String", Method, 0, ""},
-		{"(Attr).GoString", Method, 0, ""},
-		{"(Attr).String", Method, 0, ""},
-		{"(Class).GoString", Method, 5, ""},
-		{"(Class).String", Method, 5, ""},
-		{"(DecodeError).Error", Method, 0, ""},
-		{"(Tag).GoString", Method, 0, ""},
-		{"(Tag).String", Method, 0, ""},
-		{"AddrType", Type, 0, ""},
-		{"AddrType.BasicType", Field, 0, ""},
-		{"ArrayType", Type, 0, ""},
-		{"ArrayType.CommonType", Field, 0, ""},
-		{"ArrayType.Count", Field, 0, ""},
-		{"ArrayType.StrideBitSize", Field, 0, ""},
-		{"ArrayType.Type", Field, 0, ""},
-		{"Attr", Type, 0, ""},
-		{"AttrAbstractOrigin", Const, 0, ""},
-		{"AttrAccessibility", Const, 0, ""},
-		{"AttrAddrBase", Const, 14, ""},
-		{"AttrAddrClass", Const, 0, ""},
-		{"AttrAlignment", Const, 14, ""},
-		{"AttrAllocated", Const, 0, ""},
-		{"AttrArtificial", Const, 0, ""},
-		{"AttrAssociated", Const, 0, ""},
-		{"AttrBaseTypes", Const, 0, ""},
-		{"AttrBinaryScale", Const, 14, ""},
-		{"AttrBitOffset", Const, 0, ""},
-		{"AttrBitSize", Const, 0, ""},
-		{"AttrByteSize", Const, 0, ""},
-		{"AttrCallAllCalls", Const, 14, ""},
-		{"AttrCallAllSourceCalls", Const, 14, ""},
-		{"AttrCallAllTailCalls", Const, 14, ""},
-		{"AttrCallColumn", Const, 0, ""},
-		{"AttrCallDataLocation", Const, 14, ""},
-		{"AttrCallDataValue", Const, 14, ""},
-		{"AttrCallFile", Const, 0, ""},
-		{"AttrCallLine", Const, 0, ""},
-		{"AttrCallOrigin", Const, 14, ""},
-		{"AttrCallPC", Const, 14, ""},
-		{"AttrCallParameter", Const, 14, ""},
-		{"AttrCallReturnPC", Const, 14, ""},
-		{"AttrCallTailCall", Const, 14, ""},
-		{"AttrCallTarget", Const, 14, ""},
-		{"AttrCallTargetClobbered", Const, 14, ""},
-		{"AttrCallValue", Const, 14, ""},
-		{"AttrCalling", Const, 0, ""},
-		{"AttrCommonRef", Const, 0, ""},
-		{"AttrCompDir", Const, 0, ""},
-		{"AttrConstExpr", Const, 14, ""},
-		{"AttrConstValue", Const, 0, ""},
-		{"AttrContainingType", Const, 0, ""},
-		{"AttrCount", Const, 0, ""},
-		{"AttrDataBitOffset", Const, 14, ""},
-		{"AttrDataLocation", Const, 0, ""},
-		{"AttrDataMemberLoc", Const, 0, ""},
-		{"AttrDecimalScale", Const, 14, ""},
-		{"AttrDecimalSign", Const, 14, ""},
-		{"AttrDeclColumn", Const, 0, ""},
-		{"AttrDeclFile", Const, 0, ""},
-		{"AttrDeclLine", Const, 0, ""},
-		{"AttrDeclaration", Const, 0, ""},
-		{"AttrDefaultValue", Const, 0, ""},
-		{"AttrDefaulted", Const, 14, ""},
-		{"AttrDeleted", Const, 14, ""},
-		{"AttrDescription", Const, 0, ""},
-		{"AttrDigitCount", Const, 14, ""},
-		{"AttrDiscr", Const, 0, ""},
-		{"AttrDiscrList", Const, 0, ""},
-		{"AttrDiscrValue", Const, 0, ""},
-		{"AttrDwoName", Const, 14, ""},
-		{"AttrElemental", Const, 14, ""},
-		{"AttrEncoding", Const, 0, ""},
-		{"AttrEndianity", Const, 14, ""},
-		{"AttrEntrypc", Const, 0, ""},
-		{"AttrEnumClass", Const, 14, ""},
-		{"AttrExplicit", Const, 14, ""},
-		{"AttrExportSymbols", Const, 14, ""},
-		{"AttrExtension", Const, 0, ""},
-		{"AttrExternal", Const, 0, ""},
-		{"AttrFrameBase", Const, 0, ""},
-		{"AttrFriend", Const, 0, ""},
-		{"AttrHighpc", Const, 0, ""},
-		{"AttrIdentifierCase", Const, 0, ""},
-		{"AttrImport", Const, 0, ""},
-		{"AttrInline", Const, 0, ""},
-		{"AttrIsOptional", Const, 0, ""},
-		{"AttrLanguage", Const, 0, ""},
-		{"AttrLinkageName", Const, 14, ""},
-		{"AttrLocation", Const, 0, ""},
-		{"AttrLoclistsBase", Const, 14, ""},
-		{"AttrLowerBound", Const, 0, ""},
-		{"AttrLowpc", Const, 0, ""},
-		{"AttrMacroInfo", Const, 0, ""},
-		{"AttrMacros", Const, 14, ""},
-		{"AttrMainSubprogram", Const, 14, ""},
-		{"AttrMutable", Const, 14, ""},
-		{"AttrName", Const, 0, ""},
-		{"AttrNamelistItem", Const, 0, ""},
-		{"AttrNoreturn", Const, 14, ""},
-		{"AttrObjectPointer", Const, 14, ""},
-		{"AttrOrdering", Const, 0, ""},
-		{"AttrPictureString", Const, 14, ""},
-		{"AttrPriority", Const, 0, ""},
-		{"AttrProducer", Const, 0, ""},
-		{"AttrPrototyped", Const, 0, ""},
-		{"AttrPure", Const, 14, ""},
-		{"AttrRanges", Const, 0, ""},
-		{"AttrRank", Const, 14, ""},
-		{"AttrRecursive", Const, 14, ""},
-		{"AttrReference", Const, 14, ""},
-		{"AttrReturnAddr", Const, 0, ""},
-		{"AttrRnglistsBase", Const, 14, ""},
-		{"AttrRvalueReference", Const, 14, ""},
-		{"AttrSegment", Const, 0, ""},
-		{"AttrSibling", Const, 0, ""},
-		{"AttrSignature", Const, 14, ""},
-		{"AttrSmall", Const, 14, ""},
-		{"AttrSpecification", Const, 0, ""},
-		{"AttrStartScope", Const, 0, ""},
-		{"AttrStaticLink", Const, 0, ""},
-		{"AttrStmtList", Const, 0, ""},
-		{"AttrStrOffsetsBase", Const, 14, ""},
-		{"AttrStride", Const, 0, ""},
-		{"AttrStrideSize", Const, 0, ""},
-		{"AttrStringLength", Const, 0, ""},
-		{"AttrStringLengthBitSize", Const, 14, ""},
-		{"AttrStringLengthByteSize", Const, 14, ""},
-		{"AttrThreadsScaled", Const, 14, ""},
-		{"AttrTrampoline", Const, 0, ""},
-		{"AttrType", Const, 0, ""},
-		{"AttrUpperBound", Const, 0, ""},
-		{"AttrUseLocation", Const, 0, ""},
-		{"AttrUseUTF8", Const, 0, ""},
-		{"AttrVarParam", Const, 0, ""},
-		{"AttrVirtuality", Const, 0, ""},
-		{"AttrVisibility", Const, 0, ""},
-		{"AttrVtableElemLoc", Const, 0, ""},
-		{"BasicType", Type, 0, ""},
-		{"BasicType.BitOffset", Field, 0, ""},
-		{"BasicType.BitSize", Field, 0, ""},
-		{"BasicType.CommonType", Field, 0, ""},
-		{"BasicType.DataBitOffset", Field, 18, ""},
-		{"BoolType", Type, 0, ""},
-		{"BoolType.BasicType", Field, 0, ""},
-		{"CharType", Type, 0, ""},
-		{"CharType.BasicType", Field, 0, ""},
-		{"Class", Type, 5, ""},
-		{"ClassAddrPtr", Const, 14, ""},
-		{"ClassAddress", Const, 5, ""},
-		{"ClassBlock", Const, 5, ""},
-		{"ClassConstant", Const, 5, ""},
-		{"ClassExprLoc", Const, 5, ""},
-		{"ClassFlag", Const, 5, ""},
-		{"ClassLinePtr", Const, 5, ""},
-		{"ClassLocList", Const, 14, ""},
-		{"ClassLocListPtr", Const, 5, ""},
-		{"ClassMacPtr", Const, 5, ""},
-		{"ClassRangeListPtr", Const, 5, ""},
-		{"ClassReference", Const, 5, ""},
-		{"ClassReferenceAlt", Const, 5, ""},
-		{"ClassReferenceSig", Const, 5, ""},
-		{"ClassRngList", Const, 14, ""},
-		{"ClassRngListsPtr", Const, 14, ""},
-		{"ClassStrOffsetsPtr", Const, 14, ""},
-		{"ClassString", Const, 5, ""},
-		{"ClassStringAlt", Const, 5, ""},
-		{"ClassUnknown", Const, 6, ""},
-		{"CommonType", Type, 0, ""},
-		{"CommonType.ByteSize", Field, 0, ""},
-		{"CommonType.Name", Field, 0, ""},
-		{"ComplexType", Type, 0, ""},
-		{"ComplexType.BasicType", Field, 0, ""},
-		{"Data", Type, 0, ""},
-		{"DecodeError", Type, 0, ""},
-		{"DecodeError.Err", Field, 0, ""},
-		{"DecodeError.Name", Field, 0, ""},
-		{"DecodeError.Offset", Field, 0, ""},
-		{"DotDotDotType", Type, 0, ""},
-		{"DotDotDotType.CommonType", Field, 0, ""},
-		{"Entry", Type, 0, ""},
-		{"Entry.Children", Field, 0, ""},
-		{"Entry.Field", Field, 0, ""},
-		{"Entry.Offset", Field, 0, ""},
-		{"Entry.Tag", Field, 0, ""},
-		{"EnumType", Type, 0, ""},
-		{"EnumType.CommonType", Field, 0, ""},
-		{"EnumType.EnumName", Field, 0, ""},
-		{"EnumType.Val", Field, 0, ""},
-		{"EnumValue", Type, 0, ""},
-		{"EnumValue.Name", Field, 0, ""},
-		{"EnumValue.Val", Field, 0, ""},
-		{"ErrUnknownPC", Var, 5, ""},
-		{"Field", Type, 0, ""},
-		{"Field.Attr", Field, 0, ""},
-		{"Field.Class", Field, 5, ""},
-		{"Field.Val", Field, 0, ""},
-		{"FloatType", Type, 0, ""},
-		{"FloatType.BasicType", Field, 0, ""},
-		{"FuncType", Type, 0, ""},
-		{"FuncType.CommonType", Field, 0, ""},
-		{"FuncType.ParamType", Field, 0, ""},
-		{"FuncType.ReturnType", Field, 0, ""},
-		{"IntType", Type, 0, ""},
-		{"IntType.BasicType", Field, 0, ""},
-		{"LineEntry", Type, 5, ""},
-		{"LineEntry.Address", Field, 5, ""},
-		{"LineEntry.BasicBlock", Field, 5, ""},
-		{"LineEntry.Column", Field, 5, ""},
-		{"LineEntry.Discriminator", Field, 5, ""},
-		{"LineEntry.EndSequence", Field, 5, ""},
-		{"LineEntry.EpilogueBegin", Field, 5, ""},
-		{"LineEntry.File", Field, 5, ""},
-		{"LineEntry.ISA", Field, 5, ""},
-		{"LineEntry.IsStmt", Field, 5, ""},
-		{"LineEntry.Line", Field, 5, ""},
-		{"LineEntry.OpIndex", Field, 5, ""},
-		{"LineEntry.PrologueEnd", Field, 5, ""},
-		{"LineFile", Type, 5, ""},
-		{"LineFile.Length", Field, 5, ""},
-		{"LineFile.Mtime", Field, 5, ""},
-		{"LineFile.Name", Field, 5, ""},
-		{"LineReader", Type, 5, ""},
-		{"LineReaderPos", Type, 5, ""},
-		{"New", Func, 0, "func(abbrev []byte, aranges []byte, frame []byte, info []byte, line []byte, pubnames []byte, ranges []byte, str []byte) (*Data, error)"},
-		{"Offset", Type, 0, ""},
-		{"PtrType", Type, 0, ""},
-		{"PtrType.CommonType", Field, 0, ""},
-		{"PtrType.Type", Field, 0, ""},
-		{"QualType", Type, 0, ""},
-		{"QualType.CommonType", Field, 0, ""},
-		{"QualType.Qual", Field, 0, ""},
-		{"QualType.Type", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"StructField", Type, 0, ""},
-		{"StructField.BitOffset", Field, 0, ""},
-		{"StructField.BitSize", Field, 0, ""},
-		{"StructField.ByteOffset", Field, 0, ""},
-		{"StructField.ByteSize", Field, 0, ""},
-		{"StructField.DataBitOffset", Field, 18, ""},
-		{"StructField.Name", Field, 0, ""},
-		{"StructField.Type", Field, 0, ""},
-		{"StructType", Type, 0, ""},
-		{"StructType.CommonType", Field, 0, ""},
-		{"StructType.Field", Field, 0, ""},
-		{"StructType.Incomplete", Field, 0, ""},
-		{"StructType.Kind", Field, 0, ""},
-		{"StructType.StructName", Field, 0, ""},
-		{"Tag", Type, 0, ""},
-		{"TagAccessDeclaration", Const, 0, ""},
-		{"TagArrayType", Const, 0, ""},
-		{"TagAtomicType", Const, 14, ""},
-		{"TagBaseType", Const, 0, ""},
-		{"TagCallSite", Const, 14, ""},
-		{"TagCallSiteParameter", Const, 14, ""},
-		{"TagCatchDwarfBlock", Const, 0, ""},
-		{"TagClassType", Const, 0, ""},
-		{"TagCoarrayType", Const, 14, ""},
-		{"TagCommonDwarfBlock", Const, 0, ""},
-		{"TagCommonInclusion", Const, 0, ""},
-		{"TagCompileUnit", Const, 0, ""},
-		{"TagCondition", Const, 3, ""},
-		{"TagConstType", Const, 0, ""},
-		{"TagConstant", Const, 0, ""},
-		{"TagDwarfProcedure", Const, 0, ""},
-		{"TagDynamicType", Const, 14, ""},
-		{"TagEntryPoint", Const, 0, ""},
-		{"TagEnumerationType", Const, 0, ""},
-		{"TagEnumerator", Const, 0, ""},
-		{"TagFileType", Const, 0, ""},
-		{"TagFormalParameter", Const, 0, ""},
-		{"TagFriend", Const, 0, ""},
-		{"TagGenericSubrange", Const, 14, ""},
-		{"TagImmutableType", Const, 14, ""},
-		{"TagImportedDeclaration", Const, 0, ""},
-		{"TagImportedModule", Const, 0, ""},
-		{"TagImportedUnit", Const, 0, ""},
-		{"TagInheritance", Const, 0, ""},
-		{"TagInlinedSubroutine", Const, 0, ""},
-		{"TagInterfaceType", Const, 0, ""},
-		{"TagLabel", Const, 0, ""},
-		{"TagLexDwarfBlock", Const, 0, ""},
-		{"TagMember", Const, 0, ""},
-		{"TagModule", Const, 0, ""},
-		{"TagMutableType", Const, 0, ""},
-		{"TagNamelist", Const, 0, ""},
-		{"TagNamelistItem", Const, 0, ""},
-		{"TagNamespace", Const, 0, ""},
-		{"TagPackedType", Const, 0, ""},
-		{"TagPartialUnit", Const, 0, ""},
-		{"TagPointerType", Const, 0, ""},
-		{"TagPtrToMemberType", Const, 0, ""},
-		{"TagReferenceType", Const, 0, ""},
-		{"TagRestrictType", Const, 0, ""},
-		{"TagRvalueReferenceType", Const, 3, ""},
-		{"TagSetType", Const, 0, ""},
-		{"TagSharedType", Const, 3, ""},
-		{"TagSkeletonUnit", Const, 14, ""},
-		{"TagStringType", Const, 0, ""},
-		{"TagStructType", Const, 0, ""},
-		{"TagSubprogram", Const, 0, ""},
-		{"TagSubrangeType", Const, 0, ""},
-		{"TagSubroutineType", Const, 0, ""},
-		{"TagTemplateAlias", Const, 3, ""},
-		{"TagTemplateTypeParameter", Const, 0, ""},
-		{"TagTemplateValueParameter", Const, 0, ""},
-		{"TagThrownType", Const, 0, ""},
-		{"TagTryDwarfBlock", Const, 0, ""},
-		{"TagTypeUnit", Const, 3, ""},
-		{"TagTypedef", Const, 0, ""},
-		{"TagUnionType", Const, 0, ""},
-		{"TagUnspecifiedParameters", Const, 0, ""},
-		{"TagUnspecifiedType", Const, 0, ""},
-		{"TagVariable", Const, 0, ""},
-		{"TagVariant", Const, 0, ""},
-		{"TagVariantPart", Const, 0, ""},
-		{"TagVolatileType", Const, 0, ""},
-		{"TagWithStmt", Const, 0, ""},
-		{"Type", Type, 0, ""},
-		{"TypedefType", Type, 0, ""},
-		{"TypedefType.CommonType", Field, 0, ""},
-		{"TypedefType.Type", Field, 0, ""},
-		{"UcharType", Type, 0, ""},
-		{"UcharType.BasicType", Field, 0, ""},
-		{"UintType", Type, 0, ""},
-		{"UintType.BasicType", Field, 0, ""},
-		{"UnspecifiedType", Type, 4, ""},
-		{"UnspecifiedType.BasicType", Field, 4, ""},
-		{"UnsupportedType", Type, 13, ""},
-		{"UnsupportedType.CommonType", Field, 13, ""},
-		{"UnsupportedType.Tag", Field, 13, ""},
-		{"VoidType", Type, 0, ""},
-		{"VoidType.CommonType", Field, 0, ""},
-	},
-	"debug/elf": {
-		{"(*File).Close", Method, 0, ""},
-		{"(*File).DWARF", Method, 0, ""},
-		{"(*File).DynString", Method, 1, ""},
-		{"(*File).DynValue", Method, 21, ""},
-		{"(*File).DynamicSymbols", Method, 4, ""},
-		{"(*File).DynamicVersionNeeds", Method, 24, ""},
-		{"(*File).DynamicVersions", Method, 24, ""},
-		{"(*File).ImportedLibraries", Method, 0, ""},
-		{"(*File).ImportedSymbols", Method, 0, ""},
-		{"(*File).Section", Method, 0, ""},
-		{"(*File).SectionByType", Method, 0, ""},
-		{"(*File).Symbols", Method, 0, ""},
-		{"(*FormatError).Error", Method, 0, ""},
-		{"(*Prog).Open", Method, 0, ""},
-		{"(*Section).Data", Method, 0, ""},
-		{"(*Section).Open", Method, 0, ""},
-		{"(Class).GoString", Method, 0, ""},
-		{"(Class).String", Method, 0, ""},
-		{"(CompressionType).GoString", Method, 6, ""},
-		{"(CompressionType).String", Method, 6, ""},
-		{"(Data).GoString", Method, 0, ""},
-		{"(Data).String", Method, 0, ""},
-		{"(DynFlag).GoString", Method, 0, ""},
-		{"(DynFlag).String", Method, 0, ""},
-		{"(DynFlag1).GoString", Method, 21, ""},
-		{"(DynFlag1).String", Method, 21, ""},
-		{"(DynTag).GoString", Method, 0, ""},
-		{"(DynTag).String", Method, 0, ""},
-		{"(Machine).GoString", Method, 0, ""},
-		{"(Machine).String", Method, 0, ""},
-		{"(NType).GoString", Method, 0, ""},
-		{"(NType).String", Method, 0, ""},
-		{"(OSABI).GoString", Method, 0, ""},
-		{"(OSABI).String", Method, 0, ""},
-		{"(Prog).ReadAt", Method, 0, ""},
-		{"(ProgFlag).GoString", Method, 0, ""},
-		{"(ProgFlag).String", Method, 0, ""},
-		{"(ProgType).GoString", Method, 0, ""},
-		{"(ProgType).String", Method, 0, ""},
-		{"(R_386).GoString", Method, 0, ""},
-		{"(R_386).String", Method, 0, ""},
-		{"(R_390).GoString", Method, 7, ""},
-		{"(R_390).String", Method, 7, ""},
-		{"(R_AARCH64).GoString", Method, 4, ""},
-		{"(R_AARCH64).String", Method, 4, ""},
-		{"(R_ALPHA).GoString", Method, 0, ""},
-		{"(R_ALPHA).String", Method, 0, ""},
-		{"(R_ARM).GoString", Method, 0, ""},
-		{"(R_ARM).String", Method, 0, ""},
-		{"(R_LARCH).GoString", Method, 19, ""},
-		{"(R_LARCH).String", Method, 19, ""},
-		{"(R_MIPS).GoString", Method, 6, ""},
-		{"(R_MIPS).String", Method, 6, ""},
-		{"(R_PPC).GoString", Method, 0, ""},
-		{"(R_PPC).String", Method, 0, ""},
-		{"(R_PPC64).GoString", Method, 5, ""},
-		{"(R_PPC64).String", Method, 5, ""},
-		{"(R_RISCV).GoString", Method, 11, ""},
-		{"(R_RISCV).String", Method, 11, ""},
-		{"(R_SPARC).GoString", Method, 0, ""},
-		{"(R_SPARC).String", Method, 0, ""},
-		{"(R_X86_64).GoString", Method, 0, ""},
-		{"(R_X86_64).String", Method, 0, ""},
-		{"(Section).ReadAt", Method, 0, ""},
-		{"(SectionFlag).GoString", Method, 0, ""},
-		{"(SectionFlag).String", Method, 0, ""},
-		{"(SectionIndex).GoString", Method, 0, ""},
-		{"(SectionIndex).String", Method, 0, ""},
-		{"(SectionType).GoString", Method, 0, ""},
-		{"(SectionType).String", Method, 0, ""},
-		{"(SymBind).GoString", Method, 0, ""},
-		{"(SymBind).String", Method, 0, ""},
-		{"(SymType).GoString", Method, 0, ""},
-		{"(SymType).String", Method, 0, ""},
-		{"(SymVis).GoString", Method, 0, ""},
-		{"(SymVis).String", Method, 0, ""},
-		{"(Type).GoString", Method, 0, ""},
-		{"(Type).String", Method, 0, ""},
-		{"(Version).GoString", Method, 0, ""},
-		{"(Version).String", Method, 0, ""},
-		{"(VersionIndex).Index", Method, 24, ""},
-		{"(VersionIndex).IsHidden", Method, 24, ""},
-		{"ARM_MAGIC_TRAMP_NUMBER", Const, 0, ""},
-		{"COMPRESS_HIOS", Const, 6, ""},
-		{"COMPRESS_HIPROC", Const, 6, ""},
-		{"COMPRESS_LOOS", Const, 6, ""},
-		{"COMPRESS_LOPROC", Const, 6, ""},
-		{"COMPRESS_ZLIB", Const, 6, ""},
-		{"COMPRESS_ZSTD", Const, 21, ""},
-		{"Chdr32", Type, 6, ""},
-		{"Chdr32.Addralign", Field, 6, ""},
-		{"Chdr32.Size", Field, 6, ""},
-		{"Chdr32.Type", Field, 6, ""},
-		{"Chdr64", Type, 6, ""},
-		{"Chdr64.Addralign", Field, 6, ""},
-		{"Chdr64.Size", Field, 6, ""},
-		{"Chdr64.Type", Field, 6, ""},
-		{"Class", Type, 0, ""},
-		{"CompressionType", Type, 6, ""},
-		{"DF_1_CONFALT", Const, 21, ""},
-		{"DF_1_DIRECT", Const, 21, ""},
-		{"DF_1_DISPRELDNE", Const, 21, ""},
-		{"DF_1_DISPRELPND", Const, 21, ""},
-		{"DF_1_EDITED", Const, 21, ""},
-		{"DF_1_ENDFILTEE", Const, 21, ""},
-		{"DF_1_GLOBAL", Const, 21, ""},
-		{"DF_1_GLOBAUDIT", Const, 21, ""},
-		{"DF_1_GROUP", Const, 21, ""},
-		{"DF_1_IGNMULDEF", Const, 21, ""},
-		{"DF_1_INITFIRST", Const, 21, ""},
-		{"DF_1_INTERPOSE", Const, 21, ""},
-		{"DF_1_KMOD", Const, 21, ""},
-		{"DF_1_LOADFLTR", Const, 21, ""},
-		{"DF_1_NOCOMMON", Const, 21, ""},
-		{"DF_1_NODEFLIB", Const, 21, ""},
-		{"DF_1_NODELETE", Const, 21, ""},
-		{"DF_1_NODIRECT", Const, 21, ""},
-		{"DF_1_NODUMP", Const, 21, ""},
-		{"DF_1_NOHDR", Const, 21, ""},
-		{"DF_1_NOKSYMS", Const, 21, ""},
-		{"DF_1_NOOPEN", Const, 21, ""},
-		{"DF_1_NORELOC", Const, 21, ""},
-		{"DF_1_NOW", Const, 21, ""},
-		{"DF_1_ORIGIN", Const, 21, ""},
-		{"DF_1_PIE", Const, 21, ""},
-		{"DF_1_SINGLETON", Const, 21, ""},
-		{"DF_1_STUB", Const, 21, ""},
-		{"DF_1_SYMINTPOSE", Const, 21, ""},
-		{"DF_1_TRANS", Const, 21, ""},
-		{"DF_1_WEAKFILTER", Const, 21, ""},
-		{"DF_BIND_NOW", Const, 0, ""},
-		{"DF_ORIGIN", Const, 0, ""},
-		{"DF_STATIC_TLS", Const, 0, ""},
-		{"DF_SYMBOLIC", Const, 0, ""},
-		{"DF_TEXTREL", Const, 0, ""},
-		{"DT_ADDRRNGHI", Const, 16, ""},
-		{"DT_ADDRRNGLO", Const, 16, ""},
-		{"DT_AUDIT", Const, 16, ""},
-		{"DT_AUXILIARY", Const, 16, ""},
-		{"DT_BIND_NOW", Const, 0, ""},
-		{"DT_CHECKSUM", Const, 16, ""},
-		{"DT_CONFIG", Const, 16, ""},
-		{"DT_DEBUG", Const, 0, ""},
-		{"DT_DEPAUDIT", Const, 16, ""},
-		{"DT_ENCODING", Const, 0, ""},
-		{"DT_FEATURE", Const, 16, ""},
-		{"DT_FILTER", Const, 16, ""},
-		{"DT_FINI", Const, 0, ""},
-		{"DT_FINI_ARRAY", Const, 0, ""},
-		{"DT_FINI_ARRAYSZ", Const, 0, ""},
-		{"DT_FLAGS", Const, 0, ""},
-		{"DT_FLAGS_1", Const, 16, ""},
-		{"DT_GNU_CONFLICT", Const, 16, ""},
-		{"DT_GNU_CONFLICTSZ", Const, 16, ""},
-		{"DT_GNU_HASH", Const, 16, ""},
-		{"DT_GNU_LIBLIST", Const, 16, ""},
-		{"DT_GNU_LIBLISTSZ", Const, 16, ""},
-		{"DT_GNU_PRELINKED", Const, 16, ""},
-		{"DT_HASH", Const, 0, ""},
-		{"DT_HIOS", Const, 0, ""},
-		{"DT_HIPROC", Const, 0, ""},
-		{"DT_INIT", Const, 0, ""},
-		{"DT_INIT_ARRAY", Const, 0, ""},
-		{"DT_INIT_ARRAYSZ", Const, 0, ""},
-		{"DT_JMPREL", Const, 0, ""},
-		{"DT_LOOS", Const, 0, ""},
-		{"DT_LOPROC", Const, 0, ""},
-		{"DT_MIPS_AUX_DYNAMIC", Const, 16, ""},
-		{"DT_MIPS_BASE_ADDRESS", Const, 16, ""},
-		{"DT_MIPS_COMPACT_SIZE", Const, 16, ""},
-		{"DT_MIPS_CONFLICT", Const, 16, ""},
-		{"DT_MIPS_CONFLICTNO", Const, 16, ""},
-		{"DT_MIPS_CXX_FLAGS", Const, 16, ""},
-		{"DT_MIPS_DELTA_CLASS", Const, 16, ""},
-		{"DT_MIPS_DELTA_CLASSSYM", Const, 16, ""},
-		{"DT_MIPS_DELTA_CLASSSYM_NO", Const, 16, ""},
-		{"DT_MIPS_DELTA_CLASS_NO", Const, 16, ""},
-		{"DT_MIPS_DELTA_INSTANCE", Const, 16, ""},
-		{"DT_MIPS_DELTA_INSTANCE_NO", Const, 16, ""},
-		{"DT_MIPS_DELTA_RELOC", Const, 16, ""},
-		{"DT_MIPS_DELTA_RELOC_NO", Const, 16, ""},
-		{"DT_MIPS_DELTA_SYM", Const, 16, ""},
-		{"DT_MIPS_DELTA_SYM_NO", Const, 16, ""},
-		{"DT_MIPS_DYNSTR_ALIGN", Const, 16, ""},
-		{"DT_MIPS_FLAGS", Const, 16, ""},
-		{"DT_MIPS_GOTSYM", Const, 16, ""},
-		{"DT_MIPS_GP_VALUE", Const, 16, ""},
-		{"DT_MIPS_HIDDEN_GOTIDX", Const, 16, ""},
-		{"DT_MIPS_HIPAGENO", Const, 16, ""},
-		{"DT_MIPS_ICHECKSUM", Const, 16, ""},
-		{"DT_MIPS_INTERFACE", Const, 16, ""},
-		{"DT_MIPS_INTERFACE_SIZE", Const, 16, ""},
-		{"DT_MIPS_IVERSION", Const, 16, ""},
-		{"DT_MIPS_LIBLIST", Const, 16, ""},
-		{"DT_MIPS_LIBLISTNO", Const, 16, ""},
-		{"DT_MIPS_LOCALPAGE_GOTIDX", Const, 16, ""},
-		{"DT_MIPS_LOCAL_GOTIDX", Const, 16, ""},
-		{"DT_MIPS_LOCAL_GOTNO", Const, 16, ""},
-		{"DT_MIPS_MSYM", Const, 16, ""},
-		{"DT_MIPS_OPTIONS", Const, 16, ""},
-		{"DT_MIPS_PERF_SUFFIX", Const, 16, ""},
-		{"DT_MIPS_PIXIE_INIT", Const, 16, ""},
-		{"DT_MIPS_PLTGOT", Const, 16, ""},
-		{"DT_MIPS_PROTECTED_GOTIDX", Const, 16, ""},
-		{"DT_MIPS_RLD_MAP", Const, 16, ""},
-		{"DT_MIPS_RLD_MAP_REL", Const, 16, ""},
-		{"DT_MIPS_RLD_TEXT_RESOLVE_ADDR", Const, 16, ""},
-		{"DT_MIPS_RLD_VERSION", Const, 16, ""},
-		{"DT_MIPS_RWPLT", Const, 16, ""},
-		{"DT_MIPS_SYMBOL_LIB", Const, 16, ""},
-		{"DT_MIPS_SYMTABNO", Const, 16, ""},
-		{"DT_MIPS_TIME_STAMP", Const, 16, ""},
-		{"DT_MIPS_UNREFEXTNO", Const, 16, ""},
-		{"DT_MOVEENT", Const, 16, ""},
-		{"DT_MOVESZ", Const, 16, ""},
-		{"DT_MOVETAB", Const, 16, ""},
-		{"DT_NEEDED", Const, 0, ""},
-		{"DT_NULL", Const, 0, ""},
-		{"DT_PLTGOT", Const, 0, ""},
-		{"DT_PLTPAD", Const, 16, ""},
-		{"DT_PLTPADSZ", Const, 16, ""},
-		{"DT_PLTREL", Const, 0, ""},
-		{"DT_PLTRELSZ", Const, 0, ""},
-		{"DT_POSFLAG_1", Const, 16, ""},
-		{"DT_PPC64_GLINK", Const, 16, ""},
-		{"DT_PPC64_OPD", Const, 16, ""},
-		{"DT_PPC64_OPDSZ", Const, 16, ""},
-		{"DT_PPC64_OPT", Const, 16, ""},
-		{"DT_PPC_GOT", Const, 16, ""},
-		{"DT_PPC_OPT", Const, 16, ""},
-		{"DT_PREINIT_ARRAY", Const, 0, ""},
-		{"DT_PREINIT_ARRAYSZ", Const, 0, ""},
-		{"DT_REL", Const, 0, ""},
-		{"DT_RELA", Const, 0, ""},
-		{"DT_RELACOUNT", Const, 16, ""},
-		{"DT_RELAENT", Const, 0, ""},
-		{"DT_RELASZ", Const, 0, ""},
-		{"DT_RELCOUNT", Const, 16, ""},
-		{"DT_RELENT", Const, 0, ""},
-		{"DT_RELSZ", Const, 0, ""},
-		{"DT_RPATH", Const, 0, ""},
-		{"DT_RUNPATH", Const, 0, ""},
-		{"DT_SONAME", Const, 0, ""},
-		{"DT_SPARC_REGISTER", Const, 16, ""},
-		{"DT_STRSZ", Const, 0, ""},
-		{"DT_STRTAB", Const, 0, ""},
-		{"DT_SYMBOLIC", Const, 0, ""},
-		{"DT_SYMENT", Const, 0, ""},
-		{"DT_SYMINENT", Const, 16, ""},
-		{"DT_SYMINFO", Const, 16, ""},
-		{"DT_SYMINSZ", Const, 16, ""},
-		{"DT_SYMTAB", Const, 0, ""},
-		{"DT_SYMTAB_SHNDX", Const, 16, ""},
-		{"DT_TEXTREL", Const, 0, ""},
-		{"DT_TLSDESC_GOT", Const, 16, ""},
-		{"DT_TLSDESC_PLT", Const, 16, ""},
-		{"DT_USED", Const, 16, ""},
-		{"DT_VALRNGHI", Const, 16, ""},
-		{"DT_VALRNGLO", Const, 16, ""},
-		{"DT_VERDEF", Const, 16, ""},
-		{"DT_VERDEFNUM", Const, 16, ""},
-		{"DT_VERNEED", Const, 0, ""},
-		{"DT_VERNEEDNUM", Const, 0, ""},
-		{"DT_VERSYM", Const, 0, ""},
-		{"Data", Type, 0, ""},
-		{"Dyn32", Type, 0, ""},
-		{"Dyn32.Tag", Field, 0, ""},
-		{"Dyn32.Val", Field, 0, ""},
-		{"Dyn64", Type, 0, ""},
-		{"Dyn64.Tag", Field, 0, ""},
-		{"Dyn64.Val", Field, 0, ""},
-		{"DynFlag", Type, 0, ""},
-		{"DynFlag1", Type, 21, ""},
-		{"DynTag", Type, 0, ""},
-		{"DynamicVersion", Type, 24, ""},
-		{"DynamicVersion.Deps", Field, 24, ""},
-		{"DynamicVersion.Flags", Field, 24, ""},
-		{"DynamicVersion.Index", Field, 24, ""},
-		{"DynamicVersion.Name", Field, 24, ""},
-		{"DynamicVersionDep", Type, 24, ""},
-		{"DynamicVersionDep.Dep", Field, 24, ""},
-		{"DynamicVersionDep.Flags", Field, 24, ""},
-		{"DynamicVersionDep.Index", Field, 24, ""},
-		{"DynamicVersionFlag", Type, 24, ""},
-		{"DynamicVersionNeed", Type, 24, ""},
-		{"DynamicVersionNeed.Name", Field, 24, ""},
-		{"DynamicVersionNeed.Needs", Field, 24, ""},
-		{"EI_ABIVERSION", Const, 0, ""},
-		{"EI_CLASS", Const, 0, ""},
-		{"EI_DATA", Const, 0, ""},
-		{"EI_NIDENT", Const, 0, ""},
-		{"EI_OSABI", Const, 0, ""},
-		{"EI_PAD", Const, 0, ""},
-		{"EI_VERSION", Const, 0, ""},
-		{"ELFCLASS32", Const, 0, ""},
-		{"ELFCLASS64", Const, 0, ""},
-		{"ELFCLASSNONE", Const, 0, ""},
-		{"ELFDATA2LSB", Const, 0, ""},
-		{"ELFDATA2MSB", Const, 0, ""},
-		{"ELFDATANONE", Const, 0, ""},
-		{"ELFMAG", Const, 0, ""},
-		{"ELFOSABI_86OPEN", Const, 0, ""},
-		{"ELFOSABI_AIX", Const, 0, ""},
-		{"ELFOSABI_ARM", Const, 0, ""},
-		{"ELFOSABI_AROS", Const, 11, ""},
-		{"ELFOSABI_CLOUDABI", Const, 11, ""},
-		{"ELFOSABI_FENIXOS", Const, 11, ""},
-		{"ELFOSABI_FREEBSD", Const, 0, ""},
-		{"ELFOSABI_HPUX", Const, 0, ""},
-		{"ELFOSABI_HURD", Const, 0, ""},
-		{"ELFOSABI_IRIX", Const, 0, ""},
-		{"ELFOSABI_LINUX", Const, 0, ""},
-		{"ELFOSABI_MODESTO", Const, 0, ""},
-		{"ELFOSABI_NETBSD", Const, 0, ""},
-		{"ELFOSABI_NONE", Const, 0, ""},
-		{"ELFOSABI_NSK", Const, 0, ""},
-		{"ELFOSABI_OPENBSD", Const, 0, ""},
-		{"ELFOSABI_OPENVMS", Const, 0, ""},
-		{"ELFOSABI_SOLARIS", Const, 0, ""},
-		{"ELFOSABI_STANDALONE", Const, 0, ""},
-		{"ELFOSABI_TRU64", Const, 0, ""},
-		{"EM_386", Const, 0, ""},
-		{"EM_486", Const, 0, ""},
-		{"EM_56800EX", Const, 11, ""},
-		{"EM_68HC05", Const, 11, ""},
-		{"EM_68HC08", Const, 11, ""},
-		{"EM_68HC11", Const, 11, ""},
-		{"EM_68HC12", Const, 0, ""},
-		{"EM_68HC16", Const, 11, ""},
-		{"EM_68K", Const, 0, ""},
-		{"EM_78KOR", Const, 11, ""},
-		{"EM_8051", Const, 11, ""},
-		{"EM_860", Const, 0, ""},
-		{"EM_88K", Const, 0, ""},
-		{"EM_960", Const, 0, ""},
-		{"EM_AARCH64", Const, 4, ""},
-		{"EM_ALPHA", Const, 0, ""},
-		{"EM_ALPHA_STD", Const, 0, ""},
-		{"EM_ALTERA_NIOS2", Const, 11, ""},
-		{"EM_AMDGPU", Const, 11, ""},
-		{"EM_ARC", Const, 0, ""},
-		{"EM_ARCA", Const, 11, ""},
-		{"EM_ARC_COMPACT", Const, 11, ""},
-		{"EM_ARC_COMPACT2", Const, 11, ""},
-		{"EM_ARM", Const, 0, ""},
-		{"EM_AVR", Const, 11, ""},
-		{"EM_AVR32", Const, 11, ""},
-		{"EM_BA1", Const, 11, ""},
-		{"EM_BA2", Const, 11, ""},
-		{"EM_BLACKFIN", Const, 11, ""},
-		{"EM_BPF", Const, 11, ""},
-		{"EM_C166", Const, 11, ""},
-		{"EM_CDP", Const, 11, ""},
-		{"EM_CE", Const, 11, ""},
-		{"EM_CLOUDSHIELD", Const, 11, ""},
-		{"EM_COGE", Const, 11, ""},
-		{"EM_COLDFIRE", Const, 0, ""},
-		{"EM_COOL", Const, 11, ""},
-		{"EM_COREA_1ST", Const, 11, ""},
-		{"EM_COREA_2ND", Const, 11, ""},
-		{"EM_CR", Const, 11, ""},
-		{"EM_CR16", Const, 11, ""},
-		{"EM_CRAYNV2", Const, 11, ""},
-		{"EM_CRIS", Const, 11, ""},
-		{"EM_CRX", Const, 11, ""},
-		{"EM_CSR_KALIMBA", Const, 11, ""},
-		{"EM_CUDA", Const, 11, ""},
-		{"EM_CYPRESS_M8C", Const, 11, ""},
-		{"EM_D10V", Const, 11, ""},
-		{"EM_D30V", Const, 11, ""},
-		{"EM_DSP24", Const, 11, ""},
-		{"EM_DSPIC30F", Const, 11, ""},
-		{"EM_DXP", Const, 11, ""},
-		{"EM_ECOG1", Const, 11, ""},
-		{"EM_ECOG16", Const, 11, ""},
-		{"EM_ECOG1X", Const, 11, ""},
-		{"EM_ECOG2", Const, 11, ""},
-		{"EM_ETPU", Const, 11, ""},
-		{"EM_EXCESS", Const, 11, ""},
-		{"EM_F2MC16", Const, 11, ""},
-		{"EM_FIREPATH", Const, 11, ""},
-		{"EM_FR20", Const, 0, ""},
-		{"EM_FR30", Const, 11, ""},
-		{"EM_FT32", Const, 11, ""},
-		{"EM_FX66", Const, 11, ""},
-		{"EM_H8S", Const, 0, ""},
-		{"EM_H8_300", Const, 0, ""},
-		{"EM_H8_300H", Const, 0, ""},
-		{"EM_H8_500", Const, 0, ""},
-		{"EM_HUANY", Const, 11, ""},
-		{"EM_IA_64", Const, 0, ""},
-		{"EM_INTEL205", Const, 11, ""},
-		{"EM_INTEL206", Const, 11, ""},
-		{"EM_INTEL207", Const, 11, ""},
-		{"EM_INTEL208", Const, 11, ""},
-		{"EM_INTEL209", Const, 11, ""},
-		{"EM_IP2K", Const, 11, ""},
-		{"EM_JAVELIN", Const, 11, ""},
-		{"EM_K10M", Const, 11, ""},
-		{"EM_KM32", Const, 11, ""},
-		{"EM_KMX16", Const, 11, ""},
-		{"EM_KMX32", Const, 11, ""},
-		{"EM_KMX8", Const, 11, ""},
-		{"EM_KVARC", Const, 11, ""},
-		{"EM_L10M", Const, 11, ""},
-		{"EM_LANAI", Const, 11, ""},
-		{"EM_LATTICEMICO32", Const, 11, ""},
-		{"EM_LOONGARCH", Const, 19, ""},
-		{"EM_M16C", Const, 11, ""},
-		{"EM_M32", Const, 0, ""},
-		{"EM_M32C", Const, 11, ""},
-		{"EM_M32R", Const, 11, ""},
-		{"EM_MANIK", Const, 11, ""},
-		{"EM_MAX", Const, 11, ""},
-		{"EM_MAXQ30", Const, 11, ""},
-		{"EM_MCHP_PIC", Const, 11, ""},
-		{"EM_MCST_ELBRUS", Const, 11, ""},
-		{"EM_ME16", Const, 0, ""},
-		{"EM_METAG", Const, 11, ""},
-		{"EM_MICROBLAZE", Const, 11, ""},
-		{"EM_MIPS", Const, 0, ""},
-		{"EM_MIPS_RS3_LE", Const, 0, ""},
-		{"EM_MIPS_RS4_BE", Const, 0, ""},
-		{"EM_MIPS_X", Const, 0, ""},
-		{"EM_MMA", Const, 0, ""},
-		{"EM_MMDSP_PLUS", Const, 11, ""},
-		{"EM_MMIX", Const, 11, ""},
-		{"EM_MN10200", Const, 11, ""},
-		{"EM_MN10300", Const, 11, ""},
-		{"EM_MOXIE", Const, 11, ""},
-		{"EM_MSP430", Const, 11, ""},
-		{"EM_NCPU", Const, 0, ""},
-		{"EM_NDR1", Const, 0, ""},
-		{"EM_NDS32", Const, 11, ""},
-		{"EM_NONE", Const, 0, ""},
-		{"EM_NORC", Const, 11, ""},
-		{"EM_NS32K", Const, 11, ""},
-		{"EM_OPEN8", Const, 11, ""},
-		{"EM_OPENRISC", Const, 11, ""},
-		{"EM_PARISC", Const, 0, ""},
-		{"EM_PCP", Const, 0, ""},
-		{"EM_PDP10", Const, 11, ""},
-		{"EM_PDP11", Const, 11, ""},
-		{"EM_PDSP", Const, 11, ""},
-		{"EM_PJ", Const, 11, ""},
-		{"EM_PPC", Const, 0, ""},
-		{"EM_PPC64", Const, 0, ""},
-		{"EM_PRISM", Const, 11, ""},
-		{"EM_QDSP6", Const, 11, ""},
-		{"EM_R32C", Const, 11, ""},
-		{"EM_RCE", Const, 0, ""},
-		{"EM_RH32", Const, 0, ""},
-		{"EM_RISCV", Const, 11, ""},
-		{"EM_RL78", Const, 11, ""},
-		{"EM_RS08", Const, 11, ""},
-		{"EM_RX", Const, 11, ""},
-		{"EM_S370", Const, 0, ""},
-		{"EM_S390", Const, 0, ""},
-		{"EM_SCORE7", Const, 11, ""},
-		{"EM_SEP", Const, 11, ""},
-		{"EM_SE_C17", Const, 11, ""},
-		{"EM_SE_C33", Const, 11, ""},
-		{"EM_SH", Const, 0, ""},
-		{"EM_SHARC", Const, 11, ""},
-		{"EM_SLE9X", Const, 11, ""},
-		{"EM_SNP1K", Const, 11, ""},
-		{"EM_SPARC", Const, 0, ""},
-		{"EM_SPARC32PLUS", Const, 0, ""},
-		{"EM_SPARCV9", Const, 0, ""},
-		{"EM_ST100", Const, 0, ""},
-		{"EM_ST19", Const, 11, ""},
-		{"EM_ST200", Const, 11, ""},
-		{"EM_ST7", Const, 11, ""},
-		{"EM_ST9PLUS", Const, 11, ""},
-		{"EM_STARCORE", Const, 0, ""},
-		{"EM_STM8", Const, 11, ""},
-		{"EM_STXP7X", Const, 11, ""},
-		{"EM_SVX", Const, 11, ""},
-		{"EM_TILE64", Const, 11, ""},
-		{"EM_TILEGX", Const, 11, ""},
-		{"EM_TILEPRO", Const, 11, ""},
-		{"EM_TINYJ", Const, 0, ""},
-		{"EM_TI_ARP32", Const, 11, ""},
-		{"EM_TI_C2000", Const, 11, ""},
-		{"EM_TI_C5500", Const, 11, ""},
-		{"EM_TI_C6000", Const, 11, ""},
-		{"EM_TI_PRU", Const, 11, ""},
-		{"EM_TMM_GPP", Const, 11, ""},
-		{"EM_TPC", Const, 11, ""},
-		{"EM_TRICORE", Const, 0, ""},
-		{"EM_TRIMEDIA", Const, 11, ""},
-		{"EM_TSK3000", Const, 11, ""},
-		{"EM_UNICORE", Const, 11, ""},
-		{"EM_V800", Const, 0, ""},
-		{"EM_V850", Const, 11, ""},
-		{"EM_VAX", Const, 11, ""},
-		{"EM_VIDEOCORE", Const, 11, ""},
-		{"EM_VIDEOCORE3", Const, 11, ""},
-		{"EM_VIDEOCORE5", Const, 11, ""},
-		{"EM_VISIUM", Const, 11, ""},
-		{"EM_VPP500", Const, 0, ""},
-		{"EM_X86_64", Const, 0, ""},
-		{"EM_XCORE", Const, 11, ""},
-		{"EM_XGATE", Const, 11, ""},
-		{"EM_XIMO16", Const, 11, ""},
-		{"EM_XTENSA", Const, 11, ""},
-		{"EM_Z80", Const, 11, ""},
-		{"EM_ZSP", Const, 11, ""},
-		{"ET_CORE", Const, 0, ""},
-		{"ET_DYN", Const, 0, ""},
-		{"ET_EXEC", Const, 0, ""},
-		{"ET_HIOS", Const, 0, ""},
-		{"ET_HIPROC", Const, 0, ""},
-		{"ET_LOOS", Const, 0, ""},
-		{"ET_LOPROC", Const, 0, ""},
-		{"ET_NONE", Const, 0, ""},
-		{"ET_REL", Const, 0, ""},
-		{"EV_CURRENT", Const, 0, ""},
-		{"EV_NONE", Const, 0, ""},
-		{"ErrNoSymbols", Var, 4, ""},
-		{"File", Type, 0, ""},
-		{"File.FileHeader", Field, 0, ""},
-		{"File.Progs", Field, 0, ""},
-		{"File.Sections", Field, 0, ""},
-		{"FileHeader", Type, 0, ""},
-		{"FileHeader.ABIVersion", Field, 0, ""},
-		{"FileHeader.ByteOrder", Field, 0, ""},
-		{"FileHeader.Class", Field, 0, ""},
-		{"FileHeader.Data", Field, 0, ""},
-		{"FileHeader.Entry", Field, 1, ""},
-		{"FileHeader.Machine", Field, 0, ""},
-		{"FileHeader.OSABI", Field, 0, ""},
-		{"FileHeader.Type", Field, 0, ""},
-		{"FileHeader.Version", Field, 0, ""},
-		{"FormatError", Type, 0, ""},
-		{"Header32", Type, 0, ""},
-		{"Header32.Ehsize", Field, 0, ""},
-		{"Header32.Entry", Field, 0, ""},
-		{"Header32.Flags", Field, 0, ""},
-		{"Header32.Ident", Field, 0, ""},
-		{"Header32.Machine", Field, 0, ""},
-		{"Header32.Phentsize", Field, 0, ""},
-		{"Header32.Phnum", Field, 0, ""},
-		{"Header32.Phoff", Field, 0, ""},
-		{"Header32.Shentsize", Field, 0, ""},
-		{"Header32.Shnum", Field, 0, ""},
-		{"Header32.Shoff", Field, 0, ""},
-		{"Header32.Shstrndx", Field, 0, ""},
-		{"Header32.Type", Field, 0, ""},
-		{"Header32.Version", Field, 0, ""},
-		{"Header64", Type, 0, ""},
-		{"Header64.Ehsize", Field, 0, ""},
-		{"Header64.Entry", Field, 0, ""},
-		{"Header64.Flags", Field, 0, ""},
-		{"Header64.Ident", Field, 0, ""},
-		{"Header64.Machine", Field, 0, ""},
-		{"Header64.Phentsize", Field, 0, ""},
-		{"Header64.Phnum", Field, 0, ""},
-		{"Header64.Phoff", Field, 0, ""},
-		{"Header64.Shentsize", Field, 0, ""},
-		{"Header64.Shnum", Field, 0, ""},
-		{"Header64.Shoff", Field, 0, ""},
-		{"Header64.Shstrndx", Field, 0, ""},
-		{"Header64.Type", Field, 0, ""},
-		{"Header64.Version", Field, 0, ""},
-		{"ImportedSymbol", Type, 0, ""},
-		{"ImportedSymbol.Library", Field, 0, ""},
-		{"ImportedSymbol.Name", Field, 0, ""},
-		{"ImportedSymbol.Version", Field, 0, ""},
-		{"Machine", Type, 0, ""},
-		{"NT_FPREGSET", Const, 0, ""},
-		{"NT_PRPSINFO", Const, 0, ""},
-		{"NT_PRSTATUS", Const, 0, ""},
-		{"NType", Type, 0, ""},
-		{"NewFile", Func, 0, "func(r io.ReaderAt) (*File, error)"},
-		{"OSABI", Type, 0, ""},
-		{"Open", Func, 0, "func(name string) (*File, error)"},
-		{"PF_MASKOS", Const, 0, ""},
-		{"PF_MASKPROC", Const, 0, ""},
-		{"PF_R", Const, 0, ""},
-		{"PF_W", Const, 0, ""},
-		{"PF_X", Const, 0, ""},
-		{"PT_AARCH64_ARCHEXT", Const, 16, ""},
-		{"PT_AARCH64_UNWIND", Const, 16, ""},
-		{"PT_ARM_ARCHEXT", Const, 16, ""},
-		{"PT_ARM_EXIDX", Const, 16, ""},
-		{"PT_DYNAMIC", Const, 0, ""},
-		{"PT_GNU_EH_FRAME", Const, 16, ""},
-		{"PT_GNU_MBIND_HI", Const, 16, ""},
-		{"PT_GNU_MBIND_LO", Const, 16, ""},
-		{"PT_GNU_PROPERTY", Const, 16, ""},
-		{"PT_GNU_RELRO", Const, 16, ""},
-		{"PT_GNU_STACK", Const, 16, ""},
-		{"PT_HIOS", Const, 0, ""},
-		{"PT_HIPROC", Const, 0, ""},
-		{"PT_INTERP", Const, 0, ""},
-		{"PT_LOAD", Const, 0, ""},
-		{"PT_LOOS", Const, 0, ""},
-		{"PT_LOPROC", Const, 0, ""},
-		{"PT_MIPS_ABIFLAGS", Const, 16, ""},
-		{"PT_MIPS_OPTIONS", Const, 16, ""},
-		{"PT_MIPS_REGINFO", Const, 16, ""},
-		{"PT_MIPS_RTPROC", Const, 16, ""},
-		{"PT_NOTE", Const, 0, ""},
-		{"PT_NULL", Const, 0, ""},
-		{"PT_OPENBSD_BOOTDATA", Const, 16, ""},
-		{"PT_OPENBSD_NOBTCFI", Const, 23, ""},
-		{"PT_OPENBSD_RANDOMIZE", Const, 16, ""},
-		{"PT_OPENBSD_WXNEEDED", Const, 16, ""},
-		{"PT_PAX_FLAGS", Const, 16, ""},
-		{"PT_PHDR", Const, 0, ""},
-		{"PT_RISCV_ATTRIBUTES", Const, 25, ""},
-		{"PT_S390_PGSTE", Const, 16, ""},
-		{"PT_SHLIB", Const, 0, ""},
-		{"PT_SUNWSTACK", Const, 16, ""},
-		{"PT_SUNW_EH_FRAME", Const, 16, ""},
-		{"PT_TLS", Const, 0, ""},
-		{"Prog", Type, 0, ""},
-		{"Prog.ProgHeader", Field, 0, ""},
-		{"Prog.ReaderAt", Field, 0, ""},
-		{"Prog32", Type, 0, ""},
-		{"Prog32.Align", Field, 0, ""},
-		{"Prog32.Filesz", Field, 0, ""},
-		{"Prog32.Flags", Field, 0, ""},
-		{"Prog32.Memsz", Field, 0, ""},
-		{"Prog32.Off", Field, 0, ""},
-		{"Prog32.Paddr", Field, 0, ""},
-		{"Prog32.Type", Field, 0, ""},
-		{"Prog32.Vaddr", Field, 0, ""},
-		{"Prog64", Type, 0, ""},
-		{"Prog64.Align", Field, 0, ""},
-		{"Prog64.Filesz", Field, 0, ""},
-		{"Prog64.Flags", Field, 0, ""},
-		{"Prog64.Memsz", Field, 0, ""},
-		{"Prog64.Off", Field, 0, ""},
-		{"Prog64.Paddr", Field, 0, ""},
-		{"Prog64.Type", Field, 0, ""},
-		{"Prog64.Vaddr", Field, 0, ""},
-		{"ProgFlag", Type, 0, ""},
-		{"ProgHeader", Type, 0, ""},
-		{"ProgHeader.Align", Field, 0, ""},
-		{"ProgHeader.Filesz", Field, 0, ""},
-		{"ProgHeader.Flags", Field, 0, ""},
-		{"ProgHeader.Memsz", Field, 0, ""},
-		{"ProgHeader.Off", Field, 0, ""},
-		{"ProgHeader.Paddr", Field, 0, ""},
-		{"ProgHeader.Type", Field, 0, ""},
-		{"ProgHeader.Vaddr", Field, 0, ""},
-		{"ProgType", Type, 0, ""},
-		{"R_386", Type, 0, ""},
-		{"R_386_16", Const, 10, ""},
-		{"R_386_32", Const, 0, ""},
-		{"R_386_32PLT", Const, 10, ""},
-		{"R_386_8", Const, 10, ""},
-		{"R_386_COPY", Const, 0, ""},
-		{"R_386_GLOB_DAT", Const, 0, ""},
-		{"R_386_GOT32", Const, 0, ""},
-		{"R_386_GOT32X", Const, 10, ""},
-		{"R_386_GOTOFF", Const, 0, ""},
-		{"R_386_GOTPC", Const, 0, ""},
-		{"R_386_IRELATIVE", Const, 10, ""},
-		{"R_386_JMP_SLOT", Const, 0, ""},
-		{"R_386_NONE", Const, 0, ""},
-		{"R_386_PC16", Const, 10, ""},
-		{"R_386_PC32", Const, 0, ""},
-		{"R_386_PC8", Const, 10, ""},
-		{"R_386_PLT32", Const, 0, ""},
-		{"R_386_RELATIVE", Const, 0, ""},
-		{"R_386_SIZE32", Const, 10, ""},
-		{"R_386_TLS_DESC", Const, 10, ""},
-		{"R_386_TLS_DESC_CALL", Const, 10, ""},
-		{"R_386_TLS_DTPMOD32", Const, 0, ""},
-		{"R_386_TLS_DTPOFF32", Const, 0, ""},
-		{"R_386_TLS_GD", Const, 0, ""},
-		{"R_386_TLS_GD_32", Const, 0, ""},
-		{"R_386_TLS_GD_CALL", Const, 0, ""},
-		{"R_386_TLS_GD_POP", Const, 0, ""},
-		{"R_386_TLS_GD_PUSH", Const, 0, ""},
-		{"R_386_TLS_GOTDESC", Const, 10, ""},
-		{"R_386_TLS_GOTIE", Const, 0, ""},
-		{"R_386_TLS_IE", Const, 0, ""},
-		{"R_386_TLS_IE_32", Const, 0, ""},
-		{"R_386_TLS_LDM", Const, 0, ""},
-		{"R_386_TLS_LDM_32", Const, 0, ""},
-		{"R_386_TLS_LDM_CALL", Const, 0, ""},
-		{"R_386_TLS_LDM_POP", Const, 0, ""},
-		{"R_386_TLS_LDM_PUSH", Const, 0, ""},
-		{"R_386_TLS_LDO_32", Const, 0, ""},
-		{"R_386_TLS_LE", Const, 0, ""},
-		{"R_386_TLS_LE_32", Const, 0, ""},
-		{"R_386_TLS_TPOFF", Const, 0, ""},
-		{"R_386_TLS_TPOFF32", Const, 0, ""},
-		{"R_390", Type, 7, ""},
-		{"R_390_12", Const, 7, ""},
-		{"R_390_16", Const, 7, ""},
-		{"R_390_20", Const, 7, ""},
-		{"R_390_32", Const, 7, ""},
-		{"R_390_64", Const, 7, ""},
-		{"R_390_8", Const, 7, ""},
-		{"R_390_COPY", Const, 7, ""},
-		{"R_390_GLOB_DAT", Const, 7, ""},
-		{"R_390_GOT12", Const, 7, ""},
-		{"R_390_GOT16", Const, 7, ""},
-		{"R_390_GOT20", Const, 7, ""},
-		{"R_390_GOT32", Const, 7, ""},
-		{"R_390_GOT64", Const, 7, ""},
-		{"R_390_GOTENT", Const, 7, ""},
-		{"R_390_GOTOFF", Const, 7, ""},
-		{"R_390_GOTOFF16", Const, 7, ""},
-		{"R_390_GOTOFF64", Const, 7, ""},
-		{"R_390_GOTPC", Const, 7, ""},
-		{"R_390_GOTPCDBL", Const, 7, ""},
-		{"R_390_GOTPLT12", Const, 7, ""},
-		{"R_390_GOTPLT16", Const, 7, ""},
-		{"R_390_GOTPLT20", Const, 7, ""},
-		{"R_390_GOTPLT32", Const, 7, ""},
-		{"R_390_GOTPLT64", Const, 7, ""},
-		{"R_390_GOTPLTENT", Const, 7, ""},
-		{"R_390_GOTPLTOFF16", Const, 7, ""},
-		{"R_390_GOTPLTOFF32", Const, 7, ""},
-		{"R_390_GOTPLTOFF64", Const, 7, ""},
-		{"R_390_JMP_SLOT", Const, 7, ""},
-		{"R_390_NONE", Const, 7, ""},
-		{"R_390_PC16", Const, 7, ""},
-		{"R_390_PC16DBL", Const, 7, ""},
-		{"R_390_PC32", Const, 7, ""},
-		{"R_390_PC32DBL", Const, 7, ""},
-		{"R_390_PC64", Const, 7, ""},
-		{"R_390_PLT16DBL", Const, 7, ""},
-		{"R_390_PLT32", Const, 7, ""},
-		{"R_390_PLT32DBL", Const, 7, ""},
-		{"R_390_PLT64", Const, 7, ""},
-		{"R_390_RELATIVE", Const, 7, ""},
-		{"R_390_TLS_DTPMOD", Const, 7, ""},
-		{"R_390_TLS_DTPOFF", Const, 7, ""},
-		{"R_390_TLS_GD32", Const, 7, ""},
-		{"R_390_TLS_GD64", Const, 7, ""},
-		{"R_390_TLS_GDCALL", Const, 7, ""},
-		{"R_390_TLS_GOTIE12", Const, 7, ""},
-		{"R_390_TLS_GOTIE20", Const, 7, ""},
-		{"R_390_TLS_GOTIE32", Const, 7, ""},
-		{"R_390_TLS_GOTIE64", Const, 7, ""},
-		{"R_390_TLS_IE32", Const, 7, ""},
-		{"R_390_TLS_IE64", Const, 7, ""},
-		{"R_390_TLS_IEENT", Const, 7, ""},
-		{"R_390_TLS_LDCALL", Const, 7, ""},
-		{"R_390_TLS_LDM32", Const, 7, ""},
-		{"R_390_TLS_LDM64", Const, 7, ""},
-		{"R_390_TLS_LDO32", Const, 7, ""},
-		{"R_390_TLS_LDO64", Const, 7, ""},
-		{"R_390_TLS_LE32", Const, 7, ""},
-		{"R_390_TLS_LE64", Const, 7, ""},
-		{"R_390_TLS_LOAD", Const, 7, ""},
-		{"R_390_TLS_TPOFF", Const, 7, ""},
-		{"R_AARCH64", Type, 4, ""},
-		{"R_AARCH64_ABS16", Const, 4, ""},
-		{"R_AARCH64_ABS32", Const, 4, ""},
-		{"R_AARCH64_ABS64", Const, 4, ""},
-		{"R_AARCH64_ADD_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_ADR_GOT_PAGE", Const, 4, ""},
-		{"R_AARCH64_ADR_PREL_LO21", Const, 4, ""},
-		{"R_AARCH64_ADR_PREL_PG_HI21", Const, 4, ""},
-		{"R_AARCH64_ADR_PREL_PG_HI21_NC", Const, 4, ""},
-		{"R_AARCH64_CALL26", Const, 4, ""},
-		{"R_AARCH64_CONDBR19", Const, 4, ""},
-		{"R_AARCH64_COPY", Const, 4, ""},
-		{"R_AARCH64_GLOB_DAT", Const, 4, ""},
-		{"R_AARCH64_GOT_LD_PREL19", Const, 4, ""},
-		{"R_AARCH64_IRELATIVE", Const, 4, ""},
-		{"R_AARCH64_JUMP26", Const, 4, ""},
-		{"R_AARCH64_JUMP_SLOT", Const, 4, ""},
-		{"R_AARCH64_LD64_GOTOFF_LO15", Const, 10, ""},
-		{"R_AARCH64_LD64_GOTPAGE_LO15", Const, 10, ""},
-		{"R_AARCH64_LD64_GOT_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LDST128_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LDST16_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LDST32_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LDST64_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LDST8_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_LD_PREL_LO19", Const, 4, ""},
-		{"R_AARCH64_MOVW_SABS_G0", Const, 4, ""},
-		{"R_AARCH64_MOVW_SABS_G1", Const, 4, ""},
-		{"R_AARCH64_MOVW_SABS_G2", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G0", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G0_NC", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G1", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G1_NC", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G2", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G2_NC", Const, 4, ""},
-		{"R_AARCH64_MOVW_UABS_G3", Const, 4, ""},
-		{"R_AARCH64_NONE", Const, 4, ""},
-		{"R_AARCH64_NULL", Const, 4, ""},
-		{"R_AARCH64_P32_ABS16", Const, 4, ""},
-		{"R_AARCH64_P32_ABS32", Const, 4, ""},
-		{"R_AARCH64_P32_ADD_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_ADR_GOT_PAGE", Const, 4, ""},
-		{"R_AARCH64_P32_ADR_PREL_LO21", Const, 4, ""},
-		{"R_AARCH64_P32_ADR_PREL_PG_HI21", Const, 4, ""},
-		{"R_AARCH64_P32_CALL26", Const, 4, ""},
-		{"R_AARCH64_P32_CONDBR19", Const, 4, ""},
-		{"R_AARCH64_P32_COPY", Const, 4, ""},
-		{"R_AARCH64_P32_GLOB_DAT", Const, 4, ""},
-		{"R_AARCH64_P32_GOT_LD_PREL19", Const, 4, ""},
-		{"R_AARCH64_P32_IRELATIVE", Const, 4, ""},
-		{"R_AARCH64_P32_JUMP26", Const, 4, ""},
-		{"R_AARCH64_P32_JUMP_SLOT", Const, 4, ""},
-		{"R_AARCH64_P32_LD32_GOT_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LDST128_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LDST16_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LDST32_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LDST64_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LDST8_ABS_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_LD_PREL_LO19", Const, 4, ""},
-		{"R_AARCH64_P32_MOVW_SABS_G0", Const, 4, ""},
-		{"R_AARCH64_P32_MOVW_UABS_G0", Const, 4, ""},
-		{"R_AARCH64_P32_MOVW_UABS_G0_NC", Const, 4, ""},
-		{"R_AARCH64_P32_MOVW_UABS_G1", Const, 4, ""},
-		{"R_AARCH64_P32_PREL16", Const, 4, ""},
-		{"R_AARCH64_P32_PREL32", Const, 4, ""},
-		{"R_AARCH64_P32_RELATIVE", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_ADD_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_ADR_PAGE21", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_ADR_PREL21", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_CALL", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_LD32_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSDESC_LD_PREL19", Const, 4, ""},
-		{"R_AARCH64_P32_TLSGD_ADD_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSGD_ADR_PAGE21", Const, 4, ""},
-		{"R_AARCH64_P32_TLSIE_ADR_GOTTPREL_PAGE21", Const, 4, ""},
-		{"R_AARCH64_P32_TLSIE_LD32_GOTTPREL_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSIE_LD_GOTTPREL_PREL19", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_ADD_TPREL_HI12", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_ADD_TPREL_LO12", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_ADD_TPREL_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_MOVW_TPREL_G0", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_MOVW_TPREL_G0_NC", Const, 4, ""},
-		{"R_AARCH64_P32_TLSLE_MOVW_TPREL_G1", Const, 4, ""},
-		{"R_AARCH64_P32_TLS_DTPMOD", Const, 4, ""},
-		{"R_AARCH64_P32_TLS_DTPREL", Const, 4, ""},
-		{"R_AARCH64_P32_TLS_TPREL", Const, 4, ""},
-		{"R_AARCH64_P32_TSTBR14", Const, 4, ""},
-		{"R_AARCH64_PREL16", Const, 4, ""},
-		{"R_AARCH64_PREL32", Const, 4, ""},
-		{"R_AARCH64_PREL64", Const, 4, ""},
-		{"R_AARCH64_RELATIVE", Const, 4, ""},
-		{"R_AARCH64_TLSDESC", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_ADD", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_ADD_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_ADR_PAGE21", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_ADR_PREL21", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_CALL", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_LD64_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_LDR", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_LD_PREL19", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_OFF_G0_NC", Const, 4, ""},
-		{"R_AARCH64_TLSDESC_OFF_G1", Const, 4, ""},
-		{"R_AARCH64_TLSGD_ADD_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_TLSGD_ADR_PAGE21", Const, 4, ""},
-		{"R_AARCH64_TLSGD_ADR_PREL21", Const, 10, ""},
-		{"R_AARCH64_TLSGD_MOVW_G0_NC", Const, 10, ""},
-		{"R_AARCH64_TLSGD_MOVW_G1", Const, 10, ""},
-		{"R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21", Const, 4, ""},
-		{"R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_TLSIE_LD_GOTTPREL_PREL19", Const, 4, ""},
-		{"R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC", Const, 4, ""},
-		{"R_AARCH64_TLSIE_MOVW_GOTTPREL_G1", Const, 4, ""},
-		{"R_AARCH64_TLSLD_ADR_PAGE21", Const, 10, ""},
-		{"R_AARCH64_TLSLD_ADR_PREL21", Const, 10, ""},
-		{"R_AARCH64_TLSLD_LDST128_DTPREL_LO12", Const, 10, ""},
-		{"R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC", Const, 10, ""},
-		{"R_AARCH64_TLSLE_ADD_TPREL_HI12", Const, 4, ""},
-		{"R_AARCH64_TLSLE_ADD_TPREL_LO12", Const, 4, ""},
-		{"R_AARCH64_TLSLE_ADD_TPREL_LO12_NC", Const, 4, ""},
-		{"R_AARCH64_TLSLE_LDST128_TPREL_LO12", Const, 10, ""},
-		{"R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC", Const, 10, ""},
-		{"R_AARCH64_TLSLE_MOVW_TPREL_G0", Const, 4, ""},
-		{"R_AARCH64_TLSLE_MOVW_TPREL_G0_NC", Const, 4, ""},
-		{"R_AARCH64_TLSLE_MOVW_TPREL_G1", Const, 4, ""},
-		{"R_AARCH64_TLSLE_MOVW_TPREL_G1_NC", Const, 4, ""},
-		{"R_AARCH64_TLSLE_MOVW_TPREL_G2", Const, 4, ""},
-		{"R_AARCH64_TLS_DTPMOD64", Const, 4, ""},
-		{"R_AARCH64_TLS_DTPREL64", Const, 4, ""},
-		{"R_AARCH64_TLS_TPREL64", Const, 4, ""},
-		{"R_AARCH64_TSTBR14", Const, 4, ""},
-		{"R_ALPHA", Type, 0, ""},
-		{"R_ALPHA_BRADDR", Const, 0, ""},
-		{"R_ALPHA_COPY", Const, 0, ""},
-		{"R_ALPHA_GLOB_DAT", Const, 0, ""},
-		{"R_ALPHA_GPDISP", Const, 0, ""},
-		{"R_ALPHA_GPREL32", Const, 0, ""},
-		{"R_ALPHA_GPRELHIGH", Const, 0, ""},
-		{"R_ALPHA_GPRELLOW", Const, 0, ""},
-		{"R_ALPHA_GPVALUE", Const, 0, ""},
-		{"R_ALPHA_HINT", Const, 0, ""},
-		{"R_ALPHA_IMMED_BR_HI32", Const, 0, ""},
-		{"R_ALPHA_IMMED_GP_16", Const, 0, ""},
-		{"R_ALPHA_IMMED_GP_HI32", Const, 0, ""},
-		{"R_ALPHA_IMMED_LO32", Const, 0, ""},
-		{"R_ALPHA_IMMED_SCN_HI32", Const, 0, ""},
-		{"R_ALPHA_JMP_SLOT", Const, 0, ""},
-		{"R_ALPHA_LITERAL", Const, 0, ""},
-		{"R_ALPHA_LITUSE", Const, 0, ""},
-		{"R_ALPHA_NONE", Const, 0, ""},
-		{"R_ALPHA_OP_PRSHIFT", Const, 0, ""},
-		{"R_ALPHA_OP_PSUB", Const, 0, ""},
-		{"R_ALPHA_OP_PUSH", Const, 0, ""},
-		{"R_ALPHA_OP_STORE", Const, 0, ""},
-		{"R_ALPHA_REFLONG", Const, 0, ""},
-		{"R_ALPHA_REFQUAD", Const, 0, ""},
-		{"R_ALPHA_RELATIVE", Const, 0, ""},
-		{"R_ALPHA_SREL16", Const, 0, ""},
-		{"R_ALPHA_SREL32", Const, 0, ""},
-		{"R_ALPHA_SREL64", Const, 0, ""},
-		{"R_ARM", Type, 0, ""},
-		{"R_ARM_ABS12", Const, 0, ""},
-		{"R_ARM_ABS16", Const, 0, ""},
-		{"R_ARM_ABS32", Const, 0, ""},
-		{"R_ARM_ABS32_NOI", Const, 10, ""},
-		{"R_ARM_ABS8", Const, 0, ""},
-		{"R_ARM_ALU_PCREL_15_8", Const, 10, ""},
-		{"R_ARM_ALU_PCREL_23_15", Const, 10, ""},
-		{"R_ARM_ALU_PCREL_7_0", Const, 10, ""},
-		{"R_ARM_ALU_PC_G0", Const, 10, ""},
-		{"R_ARM_ALU_PC_G0_NC", Const, 10, ""},
-		{"R_ARM_ALU_PC_G1", Const, 10, ""},
-		{"R_ARM_ALU_PC_G1_NC", Const, 10, ""},
-		{"R_ARM_ALU_PC_G2", Const, 10, ""},
-		{"R_ARM_ALU_SBREL_19_12_NC", Const, 10, ""},
-		{"R_ARM_ALU_SBREL_27_20_CK", Const, 10, ""},
-		{"R_ARM_ALU_SB_G0", Const, 10, ""},
-		{"R_ARM_ALU_SB_G0_NC", Const, 10, ""},
-		{"R_ARM_ALU_SB_G1", Const, 10, ""},
-		{"R_ARM_ALU_SB_G1_NC", Const, 10, ""},
-		{"R_ARM_ALU_SB_G2", Const, 10, ""},
-		{"R_ARM_AMP_VCALL9", Const, 0, ""},
-		{"R_ARM_BASE_ABS", Const, 10, ""},
-		{"R_ARM_CALL", Const, 10, ""},
-		{"R_ARM_COPY", Const, 0, ""},
-		{"R_ARM_GLOB_DAT", Const, 0, ""},
-		{"R_ARM_GNU_VTENTRY", Const, 0, ""},
-		{"R_ARM_GNU_VTINHERIT", Const, 0, ""},
-		{"R_ARM_GOT32", Const, 0, ""},
-		{"R_ARM_GOTOFF", Const, 0, ""},
-		{"R_ARM_GOTOFF12", Const, 10, ""},
-		{"R_ARM_GOTPC", Const, 0, ""},
-		{"R_ARM_GOTRELAX", Const, 10, ""},
-		{"R_ARM_GOT_ABS", Const, 10, ""},
-		{"R_ARM_GOT_BREL12", Const, 10, ""},
-		{"R_ARM_GOT_PREL", Const, 10, ""},
-		{"R_ARM_IRELATIVE", Const, 10, ""},
-		{"R_ARM_JUMP24", Const, 10, ""},
-		{"R_ARM_JUMP_SLOT", Const, 0, ""},
-		{"R_ARM_LDC_PC_G0", Const, 10, ""},
-		{"R_ARM_LDC_PC_G1", Const, 10, ""},
-		{"R_ARM_LDC_PC_G2", Const, 10, ""},
-		{"R_ARM_LDC_SB_G0", Const, 10, ""},
-		{"R_ARM_LDC_SB_G1", Const, 10, ""},
-		{"R_ARM_LDC_SB_G2", Const, 10, ""},
-		{"R_ARM_LDRS_PC_G0", Const, 10, ""},
-		{"R_ARM_LDRS_PC_G1", Const, 10, ""},
-		{"R_ARM_LDRS_PC_G2", Const, 10, ""},
-		{"R_ARM_LDRS_SB_G0", Const, 10, ""},
-		{"R_ARM_LDRS_SB_G1", Const, 10, ""},
-		{"R_ARM_LDRS_SB_G2", Const, 10, ""},
-		{"R_ARM_LDR_PC_G1", Const, 10, ""},
-		{"R_ARM_LDR_PC_G2", Const, 10, ""},
-		{"R_ARM_LDR_SBREL_11_10_NC", Const, 10, ""},
-		{"R_ARM_LDR_SB_G0", Const, 10, ""},
-		{"R_ARM_LDR_SB_G1", Const, 10, ""},
-		{"R_ARM_LDR_SB_G2", Const, 10, ""},
-		{"R_ARM_ME_TOO", Const, 10, ""},
-		{"R_ARM_MOVT_ABS", Const, 10, ""},
-		{"R_ARM_MOVT_BREL", Const, 10, ""},
-		{"R_ARM_MOVT_PREL", Const, 10, ""},
-		{"R_ARM_MOVW_ABS_NC", Const, 10, ""},
-		{"R_ARM_MOVW_BREL", Const, 10, ""},
-		{"R_ARM_MOVW_BREL_NC", Const, 10, ""},
-		{"R_ARM_MOVW_PREL_NC", Const, 10, ""},
-		{"R_ARM_NONE", Const, 0, ""},
-		{"R_ARM_PC13", Const, 0, ""},
-		{"R_ARM_PC24", Const, 0, ""},
-		{"R_ARM_PLT32", Const, 0, ""},
-		{"R_ARM_PLT32_ABS", Const, 10, ""},
-		{"R_ARM_PREL31", Const, 10, ""},
-		{"R_ARM_PRIVATE_0", Const, 10, ""},
-		{"R_ARM_PRIVATE_1", Const, 10, ""},
-		{"R_ARM_PRIVATE_10", Const, 10, ""},
-		{"R_ARM_PRIVATE_11", Const, 10, ""},
-		{"R_ARM_PRIVATE_12", Const, 10, ""},
-		{"R_ARM_PRIVATE_13", Const, 10, ""},
-		{"R_ARM_PRIVATE_14", Const, 10, ""},
-		{"R_ARM_PRIVATE_15", Const, 10, ""},
-		{"R_ARM_PRIVATE_2", Const, 10, ""},
-		{"R_ARM_PRIVATE_3", Const, 10, ""},
-		{"R_ARM_PRIVATE_4", Const, 10, ""},
-		{"R_ARM_PRIVATE_5", Const, 10, ""},
-		{"R_ARM_PRIVATE_6", Const, 10, ""},
-		{"R_ARM_PRIVATE_7", Const, 10, ""},
-		{"R_ARM_PRIVATE_8", Const, 10, ""},
-		{"R_ARM_PRIVATE_9", Const, 10, ""},
-		{"R_ARM_RABS32", Const, 0, ""},
-		{"R_ARM_RBASE", Const, 0, ""},
-		{"R_ARM_REL32", Const, 0, ""},
-		{"R_ARM_REL32_NOI", Const, 10, ""},
-		{"R_ARM_RELATIVE", Const, 0, ""},
-		{"R_ARM_RPC24", Const, 0, ""},
-		{"R_ARM_RREL32", Const, 0, ""},
-		{"R_ARM_RSBREL32", Const, 0, ""},
-		{"R_ARM_RXPC25", Const, 10, ""},
-		{"R_ARM_SBREL31", Const, 10, ""},
-		{"R_ARM_SBREL32", Const, 0, ""},
-		{"R_ARM_SWI24", Const, 0, ""},
-		{"R_ARM_TARGET1", Const, 10, ""},
-		{"R_ARM_TARGET2", Const, 10, ""},
-		{"R_ARM_THM_ABS5", Const, 0, ""},
-		{"R_ARM_THM_ALU_ABS_G0_NC", Const, 10, ""},
-		{"R_ARM_THM_ALU_ABS_G1_NC", Const, 10, ""},
-		{"R_ARM_THM_ALU_ABS_G2_NC", Const, 10, ""},
-		{"R_ARM_THM_ALU_ABS_G3", Const, 10, ""},
-		{"R_ARM_THM_ALU_PREL_11_0", Const, 10, ""},
-		{"R_ARM_THM_GOT_BREL12", Const, 10, ""},
-		{"R_ARM_THM_JUMP11", Const, 10, ""},
-		{"R_ARM_THM_JUMP19", Const, 10, ""},
-		{"R_ARM_THM_JUMP24", Const, 10, ""},
-		{"R_ARM_THM_JUMP6", Const, 10, ""},
-		{"R_ARM_THM_JUMP8", Const, 10, ""},
-		{"R_ARM_THM_MOVT_ABS", Const, 10, ""},
-		{"R_ARM_THM_MOVT_BREL", Const, 10, ""},
-		{"R_ARM_THM_MOVT_PREL", Const, 10, ""},
-		{"R_ARM_THM_MOVW_ABS_NC", Const, 10, ""},
-		{"R_ARM_THM_MOVW_BREL", Const, 10, ""},
-		{"R_ARM_THM_MOVW_BREL_NC", Const, 10, ""},
-		{"R_ARM_THM_MOVW_PREL_NC", Const, 10, ""},
-		{"R_ARM_THM_PC12", Const, 10, ""},
-		{"R_ARM_THM_PC22", Const, 0, ""},
-		{"R_ARM_THM_PC8", Const, 0, ""},
-		{"R_ARM_THM_RPC22", Const, 0, ""},
-		{"R_ARM_THM_SWI8", Const, 0, ""},
-		{"R_ARM_THM_TLS_CALL", Const, 10, ""},
-		{"R_ARM_THM_TLS_DESCSEQ16", Const, 10, ""},
-		{"R_ARM_THM_TLS_DESCSEQ32", Const, 10, ""},
-		{"R_ARM_THM_XPC22", Const, 0, ""},
-		{"R_ARM_TLS_CALL", Const, 10, ""},
-		{"R_ARM_TLS_DESCSEQ", Const, 10, ""},
-		{"R_ARM_TLS_DTPMOD32", Const, 10, ""},
-		{"R_ARM_TLS_DTPOFF32", Const, 10, ""},
-		{"R_ARM_TLS_GD32", Const, 10, ""},
-		{"R_ARM_TLS_GOTDESC", Const, 10, ""},
-		{"R_ARM_TLS_IE12GP", Const, 10, ""},
-		{"R_ARM_TLS_IE32", Const, 10, ""},
-		{"R_ARM_TLS_LDM32", Const, 10, ""},
-		{"R_ARM_TLS_LDO12", Const, 10, ""},
-		{"R_ARM_TLS_LDO32", Const, 10, ""},
-		{"R_ARM_TLS_LE12", Const, 10, ""},
-		{"R_ARM_TLS_LE32", Const, 10, ""},
-		{"R_ARM_TLS_TPOFF32", Const, 10, ""},
-		{"R_ARM_V4BX", Const, 10, ""},
-		{"R_ARM_XPC25", Const, 0, ""},
-		{"R_INFO", Func, 0, "func(sym uint32, typ uint32) uint64"},
-		{"R_INFO32", Func, 0, "func(sym uint32, typ uint32) uint32"},
-		{"R_LARCH", Type, 19, ""},
-		{"R_LARCH_32", Const, 19, ""},
-		{"R_LARCH_32_PCREL", Const, 20, ""},
-		{"R_LARCH_64", Const, 19, ""},
-		{"R_LARCH_64_PCREL", Const, 22, ""},
-		{"R_LARCH_ABS64_HI12", Const, 20, ""},
-		{"R_LARCH_ABS64_LO20", Const, 20, ""},
-		{"R_LARCH_ABS_HI20", Const, 20, ""},
-		{"R_LARCH_ABS_LO12", Const, 20, ""},
-		{"R_LARCH_ADD16", Const, 19, ""},
-		{"R_LARCH_ADD24", Const, 19, ""},
-		{"R_LARCH_ADD32", Const, 19, ""},
-		{"R_LARCH_ADD6", Const, 22, ""},
-		{"R_LARCH_ADD64", Const, 19, ""},
-		{"R_LARCH_ADD8", Const, 19, ""},
-		{"R_LARCH_ADD_ULEB128", Const, 22, ""},
-		{"R_LARCH_ALIGN", Const, 22, ""},
-		{"R_LARCH_B16", Const, 20, ""},
-		{"R_LARCH_B21", Const, 20, ""},
-		{"R_LARCH_B26", Const, 20, ""},
-		{"R_LARCH_CFA", Const, 22, ""},
-		{"R_LARCH_COPY", Const, 19, ""},
-		{"R_LARCH_DELETE", Const, 22, ""},
-		{"R_LARCH_GNU_VTENTRY", Const, 20, ""},
-		{"R_LARCH_GNU_VTINHERIT", Const, 20, ""},
-		{"R_LARCH_GOT64_HI12", Const, 20, ""},
-		{"R_LARCH_GOT64_LO20", Const, 20, ""},
-		{"R_LARCH_GOT64_PC_HI12", Const, 20, ""},
-		{"R_LARCH_GOT64_PC_LO20", Const, 20, ""},
-		{"R_LARCH_GOT_HI20", Const, 20, ""},
-		{"R_LARCH_GOT_LO12", Const, 20, ""},
-		{"R_LARCH_GOT_PC_HI20", Const, 20, ""},
-		{"R_LARCH_GOT_PC_LO12", Const, 20, ""},
-		{"R_LARCH_IRELATIVE", Const, 19, ""},
-		{"R_LARCH_JUMP_SLOT", Const, 19, ""},
-		{"R_LARCH_MARK_LA", Const, 19, ""},
-		{"R_LARCH_MARK_PCREL", Const, 19, ""},
-		{"R_LARCH_NONE", Const, 19, ""},
-		{"R_LARCH_PCALA64_HI12", Const, 20, ""},
-		{"R_LARCH_PCALA64_LO20", Const, 20, ""},
-		{"R_LARCH_PCALA_HI20", Const, 20, ""},
-		{"R_LARCH_PCALA_LO12", Const, 20, ""},
-		{"R_LARCH_PCREL20_S2", Const, 22, ""},
-		{"R_LARCH_RELATIVE", Const, 19, ""},
-		{"R_LARCH_RELAX", Const, 20, ""},
-		{"R_LARCH_SOP_ADD", Const, 19, ""},
-		{"R_LARCH_SOP_AND", Const, 19, ""},
-		{"R_LARCH_SOP_ASSERT", Const, 19, ""},
-		{"R_LARCH_SOP_IF_ELSE", Const, 19, ""},
-		{"R_LARCH_SOP_NOT", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_0_10_10_16_S2", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_0_5_10_16_S2", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_10_12", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_10_16", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_10_16_S2", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_10_5", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_S_5_20", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_U", Const, 19, ""},
-		{"R_LARCH_SOP_POP_32_U_10_12", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_ABSOLUTE", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_DUP", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_GPREL", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_PCREL", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_PLT_PCREL", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_TLS_GD", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_TLS_GOT", Const, 19, ""},
-		{"R_LARCH_SOP_PUSH_TLS_TPREL", Const, 19, ""},
-		{"R_LARCH_SOP_SL", Const, 19, ""},
-		{"R_LARCH_SOP_SR", Const, 19, ""},
-		{"R_LARCH_SOP_SUB", Const, 19, ""},
-		{"R_LARCH_SUB16", Const, 19, ""},
-		{"R_LARCH_SUB24", Const, 19, ""},
-		{"R_LARCH_SUB32", Const, 19, ""},
-		{"R_LARCH_SUB6", Const, 22, ""},
-		{"R_LARCH_SUB64", Const, 19, ""},
-		{"R_LARCH_SUB8", Const, 19, ""},
-		{"R_LARCH_SUB_ULEB128", Const, 22, ""},
-		{"R_LARCH_TLS_DTPMOD32", Const, 19, ""},
-		{"R_LARCH_TLS_DTPMOD64", Const, 19, ""},
-		{"R_LARCH_TLS_DTPREL32", Const, 19, ""},
-		{"R_LARCH_TLS_DTPREL64", Const, 19, ""},
-		{"R_LARCH_TLS_GD_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_GD_PC_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_IE64_HI12", Const, 20, ""},
-		{"R_LARCH_TLS_IE64_LO20", Const, 20, ""},
-		{"R_LARCH_TLS_IE64_PC_HI12", Const, 20, ""},
-		{"R_LARCH_TLS_IE64_PC_LO20", Const, 20, ""},
-		{"R_LARCH_TLS_IE_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_IE_LO12", Const, 20, ""},
-		{"R_LARCH_TLS_IE_PC_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_IE_PC_LO12", Const, 20, ""},
-		{"R_LARCH_TLS_LD_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_LD_PC_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_LE64_HI12", Const, 20, ""},
-		{"R_LARCH_TLS_LE64_LO20", Const, 20, ""},
-		{"R_LARCH_TLS_LE_HI20", Const, 20, ""},
-		{"R_LARCH_TLS_LE_LO12", Const, 20, ""},
-		{"R_LARCH_TLS_TPREL32", Const, 19, ""},
-		{"R_LARCH_TLS_TPREL64", Const, 19, ""},
-		{"R_MIPS", Type, 6, ""},
-		{"R_MIPS_16", Const, 6, ""},
-		{"R_MIPS_26", Const, 6, ""},
-		{"R_MIPS_32", Const, 6, ""},
-		{"R_MIPS_64", Const, 6, ""},
-		{"R_MIPS_ADD_IMMEDIATE", Const, 6, ""},
-		{"R_MIPS_CALL16", Const, 6, ""},
-		{"R_MIPS_CALL_HI16", Const, 6, ""},
-		{"R_MIPS_CALL_LO16", Const, 6, ""},
-		{"R_MIPS_DELETE", Const, 6, ""},
-		{"R_MIPS_GOT16", Const, 6, ""},
-		{"R_MIPS_GOT_DISP", Const, 6, ""},
-		{"R_MIPS_GOT_HI16", Const, 6, ""},
-		{"R_MIPS_GOT_LO16", Const, 6, ""},
-		{"R_MIPS_GOT_OFST", Const, 6, ""},
-		{"R_MIPS_GOT_PAGE", Const, 6, ""},
-		{"R_MIPS_GPREL16", Const, 6, ""},
-		{"R_MIPS_GPREL32", Const, 6, ""},
-		{"R_MIPS_HI16", Const, 6, ""},
-		{"R_MIPS_HIGHER", Const, 6, ""},
-		{"R_MIPS_HIGHEST", Const, 6, ""},
-		{"R_MIPS_INSERT_A", Const, 6, ""},
-		{"R_MIPS_INSERT_B", Const, 6, ""},
-		{"R_MIPS_JALR", Const, 6, ""},
-		{"R_MIPS_LITERAL", Const, 6, ""},
-		{"R_MIPS_LO16", Const, 6, ""},
-		{"R_MIPS_NONE", Const, 6, ""},
-		{"R_MIPS_PC16", Const, 6, ""},
-		{"R_MIPS_PC32", Const, 22, ""},
-		{"R_MIPS_PJUMP", Const, 6, ""},
-		{"R_MIPS_REL16", Const, 6, ""},
-		{"R_MIPS_REL32", Const, 6, ""},
-		{"R_MIPS_RELGOT", Const, 6, ""},
-		{"R_MIPS_SCN_DISP", Const, 6, ""},
-		{"R_MIPS_SHIFT5", Const, 6, ""},
-		{"R_MIPS_SHIFT6", Const, 6, ""},
-		{"R_MIPS_SUB", Const, 6, ""},
-		{"R_MIPS_TLS_DTPMOD32", Const, 6, ""},
-		{"R_MIPS_TLS_DTPMOD64", Const, 6, ""},
-		{"R_MIPS_TLS_DTPREL32", Const, 6, ""},
-		{"R_MIPS_TLS_DTPREL64", Const, 6, ""},
-		{"R_MIPS_TLS_DTPREL_HI16", Const, 6, ""},
-		{"R_MIPS_TLS_DTPREL_LO16", Const, 6, ""},
-		{"R_MIPS_TLS_GD", Const, 6, ""},
-		{"R_MIPS_TLS_GOTTPREL", Const, 6, ""},
-		{"R_MIPS_TLS_LDM", Const, 6, ""},
-		{"R_MIPS_TLS_TPREL32", Const, 6, ""},
-		{"R_MIPS_TLS_TPREL64", Const, 6, ""},
-		{"R_MIPS_TLS_TPREL_HI16", Const, 6, ""},
-		{"R_MIPS_TLS_TPREL_LO16", Const, 6, ""},
-		{"R_PPC", Type, 0, ""},
-		{"R_PPC64", Type, 5, ""},
-		{"R_PPC64_ADDR14", Const, 5, ""},
-		{"R_PPC64_ADDR14_BRNTAKEN", Const, 5, ""},
-		{"R_PPC64_ADDR14_BRTAKEN", Const, 5, ""},
-		{"R_PPC64_ADDR16", Const, 5, ""},
-		{"R_PPC64_ADDR16_DS", Const, 5, ""},
-		{"R_PPC64_ADDR16_HA", Const, 5, ""},
-		{"R_PPC64_ADDR16_HI", Const, 5, ""},
-		{"R_PPC64_ADDR16_HIGH", Const, 10, ""},
-		{"R_PPC64_ADDR16_HIGHA", Const, 10, ""},
-		{"R_PPC64_ADDR16_HIGHER", Const, 5, ""},
-		{"R_PPC64_ADDR16_HIGHER34", Const, 20, ""},
-		{"R_PPC64_ADDR16_HIGHERA", Const, 5, ""},
-		{"R_PPC64_ADDR16_HIGHERA34", Const, 20, ""},
-		{"R_PPC64_ADDR16_HIGHEST", Const, 5, ""},
-		{"R_PPC64_ADDR16_HIGHEST34", Const, 20, ""},
-		{"R_PPC64_ADDR16_HIGHESTA", Const, 5, ""},
-		{"R_PPC64_ADDR16_HIGHESTA34", Const, 20, ""},
-		{"R_PPC64_ADDR16_LO", Const, 5, ""},
-		{"R_PPC64_ADDR16_LO_DS", Const, 5, ""},
-		{"R_PPC64_ADDR24", Const, 5, ""},
-		{"R_PPC64_ADDR32", Const, 5, ""},
-		{"R_PPC64_ADDR64", Const, 5, ""},
-		{"R_PPC64_ADDR64_LOCAL", Const, 10, ""},
-		{"R_PPC64_COPY", Const, 20, ""},
-		{"R_PPC64_D28", Const, 20, ""},
-		{"R_PPC64_D34", Const, 20, ""},
-		{"R_PPC64_D34_HA30", Const, 20, ""},
-		{"R_PPC64_D34_HI30", Const, 20, ""},
-		{"R_PPC64_D34_LO", Const, 20, ""},
-		{"R_PPC64_DTPMOD64", Const, 5, ""},
-		{"R_PPC64_DTPREL16", Const, 5, ""},
-		{"R_PPC64_DTPREL16_DS", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HA", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HI", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HIGH", Const, 10, ""},
-		{"R_PPC64_DTPREL16_HIGHA", Const, 10, ""},
-		{"R_PPC64_DTPREL16_HIGHER", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HIGHERA", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HIGHEST", Const, 5, ""},
-		{"R_PPC64_DTPREL16_HIGHESTA", Const, 5, ""},
-		{"R_PPC64_DTPREL16_LO", Const, 5, ""},
-		{"R_PPC64_DTPREL16_LO_DS", Const, 5, ""},
-		{"R_PPC64_DTPREL34", Const, 20, ""},
-		{"R_PPC64_DTPREL64", Const, 5, ""},
-		{"R_PPC64_ENTRY", Const, 10, ""},
-		{"R_PPC64_GLOB_DAT", Const, 20, ""},
-		{"R_PPC64_GNU_VTENTRY", Const, 20, ""},
-		{"R_PPC64_GNU_VTINHERIT", Const, 20, ""},
-		{"R_PPC64_GOT16", Const, 5, ""},
-		{"R_PPC64_GOT16_DS", Const, 5, ""},
-		{"R_PPC64_GOT16_HA", Const, 5, ""},
-		{"R_PPC64_GOT16_HI", Const, 5, ""},
-		{"R_PPC64_GOT16_LO", Const, 5, ""},
-		{"R_PPC64_GOT16_LO_DS", Const, 5, ""},
-		{"R_PPC64_GOT_DTPREL16_DS", Const, 5, ""},
-		{"R_PPC64_GOT_DTPREL16_HA", Const, 5, ""},
-		{"R_PPC64_GOT_DTPREL16_HI", Const, 5, ""},
-		{"R_PPC64_GOT_DTPREL16_LO_DS", Const, 5, ""},
-		{"R_PPC64_GOT_DTPREL_PCREL34", Const, 20, ""},
-		{"R_PPC64_GOT_PCREL34", Const, 20, ""},
-		{"R_PPC64_GOT_TLSGD16", Const, 5, ""},
-		{"R_PPC64_GOT_TLSGD16_HA", Const, 5, ""},
-		{"R_PPC64_GOT_TLSGD16_HI", Const, 5, ""},
-		{"R_PPC64_GOT_TLSGD16_LO", Const, 5, ""},
-		{"R_PPC64_GOT_TLSGD_PCREL34", Const, 20, ""},
-		{"R_PPC64_GOT_TLSLD16", Const, 5, ""},
-		{"R_PPC64_GOT_TLSLD16_HA", Const, 5, ""},
-		{"R_PPC64_GOT_TLSLD16_HI", Const, 5, ""},
-		{"R_PPC64_GOT_TLSLD16_LO", Const, 5, ""},
-		{"R_PPC64_GOT_TLSLD_PCREL34", Const, 20, ""},
-		{"R_PPC64_GOT_TPREL16_DS", Const, 5, ""},
-		{"R_PPC64_GOT_TPREL16_HA", Const, 5, ""},
-		{"R_PPC64_GOT_TPREL16_HI", Const, 5, ""},
-		{"R_PPC64_GOT_TPREL16_LO_DS", Const, 5, ""},
-		{"R_PPC64_GOT_TPREL_PCREL34", Const, 20, ""},
-		{"R_PPC64_IRELATIVE", Const, 10, ""},
-		{"R_PPC64_JMP_IREL", Const, 10, ""},
-		{"R_PPC64_JMP_SLOT", Const, 5, ""},
-		{"R_PPC64_NONE", Const, 5, ""},
-		{"R_PPC64_PCREL28", Const, 20, ""},
-		{"R_PPC64_PCREL34", Const, 20, ""},
-		{"R_PPC64_PCREL_OPT", Const, 20, ""},
-		{"R_PPC64_PLT16_HA", Const, 20, ""},
-		{"R_PPC64_PLT16_HI", Const, 20, ""},
-		{"R_PPC64_PLT16_LO", Const, 20, ""},
-		{"R_PPC64_PLT16_LO_DS", Const, 10, ""},
-		{"R_PPC64_PLT32", Const, 20, ""},
-		{"R_PPC64_PLT64", Const, 20, ""},
-		{"R_PPC64_PLTCALL", Const, 20, ""},
-		{"R_PPC64_PLTCALL_NOTOC", Const, 20, ""},
-		{"R_PPC64_PLTGOT16", Const, 10, ""},
-		{"R_PPC64_PLTGOT16_DS", Const, 10, ""},
-		{"R_PPC64_PLTGOT16_HA", Const, 10, ""},
-		{"R_PPC64_PLTGOT16_HI", Const, 10, ""},
-		{"R_PPC64_PLTGOT16_LO", Const, 10, ""},
-		{"R_PPC64_PLTGOT_LO_DS", Const, 10, ""},
-		{"R_PPC64_PLTREL32", Const, 20, ""},
-		{"R_PPC64_PLTREL64", Const, 20, ""},
-		{"R_PPC64_PLTSEQ", Const, 20, ""},
-		{"R_PPC64_PLTSEQ_NOTOC", Const, 20, ""},
-		{"R_PPC64_PLT_PCREL34", Const, 20, ""},
-		{"R_PPC64_PLT_PCREL34_NOTOC", Const, 20, ""},
-		{"R_PPC64_REL14", Const, 5, ""},
-		{"R_PPC64_REL14_BRNTAKEN", Const, 5, ""},
-		{"R_PPC64_REL14_BRTAKEN", Const, 5, ""},
-		{"R_PPC64_REL16", Const, 5, ""},
-		{"R_PPC64_REL16DX_HA", Const, 10, ""},
-		{"R_PPC64_REL16_HA", Const, 5, ""},
-		{"R_PPC64_REL16_HI", Const, 5, ""},
-		{"R_PPC64_REL16_HIGH", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHA", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHER", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHER34", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHERA", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHERA34", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHEST", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHEST34", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHESTA", Const, 20, ""},
-		{"R_PPC64_REL16_HIGHESTA34", Const, 20, ""},
-		{"R_PPC64_REL16_LO", Const, 5, ""},
-		{"R_PPC64_REL24", Const, 5, ""},
-		{"R_PPC64_REL24_NOTOC", Const, 10, ""},
-		{"R_PPC64_REL24_P9NOTOC", Const, 21, ""},
-		{"R_PPC64_REL30", Const, 20, ""},
-		{"R_PPC64_REL32", Const, 5, ""},
-		{"R_PPC64_REL64", Const, 5, ""},
-		{"R_PPC64_RELATIVE", Const, 18, ""},
-		{"R_PPC64_SECTOFF", Const, 20, ""},
-		{"R_PPC64_SECTOFF_DS", Const, 10, ""},
-		{"R_PPC64_SECTOFF_HA", Const, 20, ""},
-		{"R_PPC64_SECTOFF_HI", Const, 20, ""},
-		{"R_PPC64_SECTOFF_LO", Const, 20, ""},
-		{"R_PPC64_SECTOFF_LO_DS", Const, 10, ""},
-		{"R_PPC64_TLS", Const, 5, ""},
-		{"R_PPC64_TLSGD", Const, 5, ""},
-		{"R_PPC64_TLSLD", Const, 5, ""},
-		{"R_PPC64_TOC", Const, 5, ""},
-		{"R_PPC64_TOC16", Const, 5, ""},
-		{"R_PPC64_TOC16_DS", Const, 5, ""},
-		{"R_PPC64_TOC16_HA", Const, 5, ""},
-		{"R_PPC64_TOC16_HI", Const, 5, ""},
-		{"R_PPC64_TOC16_LO", Const, 5, ""},
-		{"R_PPC64_TOC16_LO_DS", Const, 5, ""},
-		{"R_PPC64_TOCSAVE", Const, 10, ""},
-		{"R_PPC64_TPREL16", Const, 5, ""},
-		{"R_PPC64_TPREL16_DS", Const, 5, ""},
-		{"R_PPC64_TPREL16_HA", Const, 5, ""},
-		{"R_PPC64_TPREL16_HI", Const, 5, ""},
-		{"R_PPC64_TPREL16_HIGH", Const, 10, ""},
-		{"R_PPC64_TPREL16_HIGHA", Const, 10, ""},
-		{"R_PPC64_TPREL16_HIGHER", Const, 5, ""},
-		{"R_PPC64_TPREL16_HIGHERA", Const, 5, ""},
-		{"R_PPC64_TPREL16_HIGHEST", Const, 5, ""},
-		{"R_PPC64_TPREL16_HIGHESTA", Const, 5, ""},
-		{"R_PPC64_TPREL16_LO", Const, 5, ""},
-		{"R_PPC64_TPREL16_LO_DS", Const, 5, ""},
-		{"R_PPC64_TPREL34", Const, 20, ""},
-		{"R_PPC64_TPREL64", Const, 5, ""},
-		{"R_PPC64_UADDR16", Const, 20, ""},
-		{"R_PPC64_UADDR32", Const, 20, ""},
-		{"R_PPC64_UADDR64", Const, 20, ""},
-		{"R_PPC_ADDR14", Const, 0, ""},
-		{"R_PPC_ADDR14_BRNTAKEN", Const, 0, ""},
-		{"R_PPC_ADDR14_BRTAKEN", Const, 0, ""},
-		{"R_PPC_ADDR16", Const, 0, ""},
-		{"R_PPC_ADDR16_HA", Const, 0, ""},
-		{"R_PPC_ADDR16_HI", Const, 0, ""},
-		{"R_PPC_ADDR16_LO", Const, 0, ""},
-		{"R_PPC_ADDR24", Const, 0, ""},
-		{"R_PPC_ADDR32", Const, 0, ""},
-		{"R_PPC_COPY", Const, 0, ""},
-		{"R_PPC_DTPMOD32", Const, 0, ""},
-		{"R_PPC_DTPREL16", Const, 0, ""},
-		{"R_PPC_DTPREL16_HA", Const, 0, ""},
-		{"R_PPC_DTPREL16_HI", Const, 0, ""},
-		{"R_PPC_DTPREL16_LO", Const, 0, ""},
-		{"R_PPC_DTPREL32", Const, 0, ""},
-		{"R_PPC_EMB_BIT_FLD", Const, 0, ""},
-		{"R_PPC_EMB_MRKREF", Const, 0, ""},
-		{"R_PPC_EMB_NADDR16", Const, 0, ""},
-		{"R_PPC_EMB_NADDR16_HA", Const, 0, ""},
-		{"R_PPC_EMB_NADDR16_HI", Const, 0, ""},
-		{"R_PPC_EMB_NADDR16_LO", Const, 0, ""},
-		{"R_PPC_EMB_NADDR32", Const, 0, ""},
-		{"R_PPC_EMB_RELSDA", Const, 0, ""},
-		{"R_PPC_EMB_RELSEC16", Const, 0, ""},
-		{"R_PPC_EMB_RELST_HA", Const, 0, ""},
-		{"R_PPC_EMB_RELST_HI", Const, 0, ""},
-		{"R_PPC_EMB_RELST_LO", Const, 0, ""},
-		{"R_PPC_EMB_SDA21", Const, 0, ""},
-		{"R_PPC_EMB_SDA2I16", Const, 0, ""},
-		{"R_PPC_EMB_SDA2REL", Const, 0, ""},
-		{"R_PPC_EMB_SDAI16", Const, 0, ""},
-		{"R_PPC_GLOB_DAT", Const, 0, ""},
-		{"R_PPC_GOT16", Const, 0, ""},
-		{"R_PPC_GOT16_HA", Const, 0, ""},
-		{"R_PPC_GOT16_HI", Const, 0, ""},
-		{"R_PPC_GOT16_LO", Const, 0, ""},
-		{"R_PPC_GOT_TLSGD16", Const, 0, ""},
-		{"R_PPC_GOT_TLSGD16_HA", Const, 0, ""},
-		{"R_PPC_GOT_TLSGD16_HI", Const, 0, ""},
-		{"R_PPC_GOT_TLSGD16_LO", Const, 0, ""},
-		{"R_PPC_GOT_TLSLD16", Const, 0, ""},
-		{"R_PPC_GOT_TLSLD16_HA", Const, 0, ""},
-		{"R_PPC_GOT_TLSLD16_HI", Const, 0, ""},
-		{"R_PPC_GOT_TLSLD16_LO", Const, 0, ""},
-		{"R_PPC_GOT_TPREL16", Const, 0, ""},
-		{"R_PPC_GOT_TPREL16_HA", Const, 0, ""},
-		{"R_PPC_GOT_TPREL16_HI", Const, 0, ""},
-		{"R_PPC_GOT_TPREL16_LO", Const, 0, ""},
-		{"R_PPC_JMP_SLOT", Const, 0, ""},
-		{"R_PPC_LOCAL24PC", Const, 0, ""},
-		{"R_PPC_NONE", Const, 0, ""},
-		{"R_PPC_PLT16_HA", Const, 0, ""},
-		{"R_PPC_PLT16_HI", Const, 0, ""},
-		{"R_PPC_PLT16_LO", Const, 0, ""},
-		{"R_PPC_PLT32", Const, 0, ""},
-		{"R_PPC_PLTREL24", Const, 0, ""},
-		{"R_PPC_PLTREL32", Const, 0, ""},
-		{"R_PPC_REL14", Const, 0, ""},
-		{"R_PPC_REL14_BRNTAKEN", Const, 0, ""},
-		{"R_PPC_REL14_BRTAKEN", Const, 0, ""},
-		{"R_PPC_REL24", Const, 0, ""},
-		{"R_PPC_REL32", Const, 0, ""},
-		{"R_PPC_RELATIVE", Const, 0, ""},
-		{"R_PPC_SDAREL16", Const, 0, ""},
-		{"R_PPC_SECTOFF", Const, 0, ""},
-		{"R_PPC_SECTOFF_HA", Const, 0, ""},
-		{"R_PPC_SECTOFF_HI", Const, 0, ""},
-		{"R_PPC_SECTOFF_LO", Const, 0, ""},
-		{"R_PPC_TLS", Const, 0, ""},
-		{"R_PPC_TPREL16", Const, 0, ""},
-		{"R_PPC_TPREL16_HA", Const, 0, ""},
-		{"R_PPC_TPREL16_HI", Const, 0, ""},
-		{"R_PPC_TPREL16_LO", Const, 0, ""},
-		{"R_PPC_TPREL32", Const, 0, ""},
-		{"R_PPC_UADDR16", Const, 0, ""},
-		{"R_PPC_UADDR32", Const, 0, ""},
-		{"R_RISCV", Type, 11, ""},
-		{"R_RISCV_32", Const, 11, ""},
-		{"R_RISCV_32_PCREL", Const, 12, ""},
-		{"R_RISCV_64", Const, 11, ""},
-		{"R_RISCV_ADD16", Const, 11, ""},
-		{"R_RISCV_ADD32", Const, 11, ""},
-		{"R_RISCV_ADD64", Const, 11, ""},
-		{"R_RISCV_ADD8", Const, 11, ""},
-		{"R_RISCV_ALIGN", Const, 11, ""},
-		{"R_RISCV_BRANCH", Const, 11, ""},
-		{"R_RISCV_CALL", Const, 11, ""},
-		{"R_RISCV_CALL_PLT", Const, 11, ""},
-		{"R_RISCV_COPY", Const, 11, ""},
-		{"R_RISCV_GNU_VTENTRY", Const, 11, ""},
-		{"R_RISCV_GNU_VTINHERIT", Const, 11, ""},
-		{"R_RISCV_GOT_HI20", Const, 11, ""},
-		{"R_RISCV_GPREL_I", Const, 11, ""},
-		{"R_RISCV_GPREL_S", Const, 11, ""},
-		{"R_RISCV_HI20", Const, 11, ""},
-		{"R_RISCV_JAL", Const, 11, ""},
-		{"R_RISCV_JUMP_SLOT", Const, 11, ""},
-		{"R_RISCV_LO12_I", Const, 11, ""},
-		{"R_RISCV_LO12_S", Const, 11, ""},
-		{"R_RISCV_NONE", Const, 11, ""},
-		{"R_RISCV_PCREL_HI20", Const, 11, ""},
-		{"R_RISCV_PCREL_LO12_I", Const, 11, ""},
-		{"R_RISCV_PCREL_LO12_S", Const, 11, ""},
-		{"R_RISCV_RELATIVE", Const, 11, ""},
-		{"R_RISCV_RELAX", Const, 11, ""},
-		{"R_RISCV_RVC_BRANCH", Const, 11, ""},
-		{"R_RISCV_RVC_JUMP", Const, 11, ""},
-		{"R_RISCV_RVC_LUI", Const, 11, ""},
-		{"R_RISCV_SET16", Const, 11, ""},
-		{"R_RISCV_SET32", Const, 11, ""},
-		{"R_RISCV_SET6", Const, 11, ""},
-		{"R_RISCV_SET8", Const, 11, ""},
-		{"R_RISCV_SUB16", Const, 11, ""},
-		{"R_RISCV_SUB32", Const, 11, ""},
-		{"R_RISCV_SUB6", Const, 11, ""},
-		{"R_RISCV_SUB64", Const, 11, ""},
-		{"R_RISCV_SUB8", Const, 11, ""},
-		{"R_RISCV_TLS_DTPMOD32", Const, 11, ""},
-		{"R_RISCV_TLS_DTPMOD64", Const, 11, ""},
-		{"R_RISCV_TLS_DTPREL32", Const, 11, ""},
-		{"R_RISCV_TLS_DTPREL64", Const, 11, ""},
-		{"R_RISCV_TLS_GD_HI20", Const, 11, ""},
-		{"R_RISCV_TLS_GOT_HI20", Const, 11, ""},
-		{"R_RISCV_TLS_TPREL32", Const, 11, ""},
-		{"R_RISCV_TLS_TPREL64", Const, 11, ""},
-		{"R_RISCV_TPREL_ADD", Const, 11, ""},
-		{"R_RISCV_TPREL_HI20", Const, 11, ""},
-		{"R_RISCV_TPREL_I", Const, 11, ""},
-		{"R_RISCV_TPREL_LO12_I", Const, 11, ""},
-		{"R_RISCV_TPREL_LO12_S", Const, 11, ""},
-		{"R_RISCV_TPREL_S", Const, 11, ""},
-		{"R_SPARC", Type, 0, ""},
-		{"R_SPARC_10", Const, 0, ""},
-		{"R_SPARC_11", Const, 0, ""},
-		{"R_SPARC_13", Const, 0, ""},
-		{"R_SPARC_16", Const, 0, ""},
-		{"R_SPARC_22", Const, 0, ""},
-		{"R_SPARC_32", Const, 0, ""},
-		{"R_SPARC_5", Const, 0, ""},
-		{"R_SPARC_6", Const, 0, ""},
-		{"R_SPARC_64", Const, 0, ""},
-		{"R_SPARC_7", Const, 0, ""},
-		{"R_SPARC_8", Const, 0, ""},
-		{"R_SPARC_COPY", Const, 0, ""},
-		{"R_SPARC_DISP16", Const, 0, ""},
-		{"R_SPARC_DISP32", Const, 0, ""},
-		{"R_SPARC_DISP64", Const, 0, ""},
-		{"R_SPARC_DISP8", Const, 0, ""},
-		{"R_SPARC_GLOB_DAT", Const, 0, ""},
-		{"R_SPARC_GLOB_JMP", Const, 0, ""},
-		{"R_SPARC_GOT10", Const, 0, ""},
-		{"R_SPARC_GOT13", Const, 0, ""},
-		{"R_SPARC_GOT22", Const, 0, ""},
-		{"R_SPARC_H44", Const, 0, ""},
-		{"R_SPARC_HH22", Const, 0, ""},
-		{"R_SPARC_HI22", Const, 0, ""},
-		{"R_SPARC_HIPLT22", Const, 0, ""},
-		{"R_SPARC_HIX22", Const, 0, ""},
-		{"R_SPARC_HM10", Const, 0, ""},
-		{"R_SPARC_JMP_SLOT", Const, 0, ""},
-		{"R_SPARC_L44", Const, 0, ""},
-		{"R_SPARC_LM22", Const, 0, ""},
-		{"R_SPARC_LO10", Const, 0, ""},
-		{"R_SPARC_LOPLT10", Const, 0, ""},
-		{"R_SPARC_LOX10", Const, 0, ""},
-		{"R_SPARC_M44", Const, 0, ""},
-		{"R_SPARC_NONE", Const, 0, ""},
-		{"R_SPARC_OLO10", Const, 0, ""},
-		{"R_SPARC_PC10", Const, 0, ""},
-		{"R_SPARC_PC22", Const, 0, ""},
-		{"R_SPARC_PCPLT10", Const, 0, ""},
-		{"R_SPARC_PCPLT22", Const, 0, ""},
-		{"R_SPARC_PCPLT32", Const, 0, ""},
-		{"R_SPARC_PC_HH22", Const, 0, ""},
-		{"R_SPARC_PC_HM10", Const, 0, ""},
-		{"R_SPARC_PC_LM22", Const, 0, ""},
-		{"R_SPARC_PLT32", Const, 0, ""},
-		{"R_SPARC_PLT64", Const, 0, ""},
-		{"R_SPARC_REGISTER", Const, 0, ""},
-		{"R_SPARC_RELATIVE", Const, 0, ""},
-		{"R_SPARC_UA16", Const, 0, ""},
-		{"R_SPARC_UA32", Const, 0, ""},
-		{"R_SPARC_UA64", Const, 0, ""},
-		{"R_SPARC_WDISP16", Const, 0, ""},
-		{"R_SPARC_WDISP19", Const, 0, ""},
-		{"R_SPARC_WDISP22", Const, 0, ""},
-		{"R_SPARC_WDISP30", Const, 0, ""},
-		{"R_SPARC_WPLT30", Const, 0, ""},
-		{"R_SYM32", Func, 0, "func(info uint32) uint32"},
-		{"R_SYM64", Func, 0, "func(info uint64) uint32"},
-		{"R_TYPE32", Func, 0, "func(info uint32) uint32"},
-		{"R_TYPE64", Func, 0, "func(info uint64) uint32"},
-		{"R_X86_64", Type, 0, ""},
-		{"R_X86_64_16", Const, 0, ""},
-		{"R_X86_64_32", Const, 0, ""},
-		{"R_X86_64_32S", Const, 0, ""},
-		{"R_X86_64_64", Const, 0, ""},
-		{"R_X86_64_8", Const, 0, ""},
-		{"R_X86_64_COPY", Const, 0, ""},
-		{"R_X86_64_DTPMOD64", Const, 0, ""},
-		{"R_X86_64_DTPOFF32", Const, 0, ""},
-		{"R_X86_64_DTPOFF64", Const, 0, ""},
-		{"R_X86_64_GLOB_DAT", Const, 0, ""},
-		{"R_X86_64_GOT32", Const, 0, ""},
-		{"R_X86_64_GOT64", Const, 10, ""},
-		{"R_X86_64_GOTOFF64", Const, 10, ""},
-		{"R_X86_64_GOTPC32", Const, 10, ""},
-		{"R_X86_64_GOTPC32_TLSDESC", Const, 10, ""},
-		{"R_X86_64_GOTPC64", Const, 10, ""},
-		{"R_X86_64_GOTPCREL", Const, 0, ""},
-		{"R_X86_64_GOTPCREL64", Const, 10, ""},
-		{"R_X86_64_GOTPCRELX", Const, 10, ""},
-		{"R_X86_64_GOTPLT64", Const, 10, ""},
-		{"R_X86_64_GOTTPOFF", Const, 0, ""},
-		{"R_X86_64_IRELATIVE", Const, 10, ""},
-		{"R_X86_64_JMP_SLOT", Const, 0, ""},
-		{"R_X86_64_NONE", Const, 0, ""},
-		{"R_X86_64_PC16", Const, 0, ""},
-		{"R_X86_64_PC32", Const, 0, ""},
-		{"R_X86_64_PC32_BND", Const, 10, ""},
-		{"R_X86_64_PC64", Const, 10, ""},
-		{"R_X86_64_PC8", Const, 0, ""},
-		{"R_X86_64_PLT32", Const, 0, ""},
-		{"R_X86_64_PLT32_BND", Const, 10, ""},
-		{"R_X86_64_PLTOFF64", Const, 10, ""},
-		{"R_X86_64_RELATIVE", Const, 0, ""},
-		{"R_X86_64_RELATIVE64", Const, 10, ""},
-		{"R_X86_64_REX_GOTPCRELX", Const, 10, ""},
-		{"R_X86_64_SIZE32", Const, 10, ""},
-		{"R_X86_64_SIZE64", Const, 10, ""},
-		{"R_X86_64_TLSDESC", Const, 10, ""},
-		{"R_X86_64_TLSDESC_CALL", Const, 10, ""},
-		{"R_X86_64_TLSGD", Const, 0, ""},
-		{"R_X86_64_TLSLD", Const, 0, ""},
-		{"R_X86_64_TPOFF32", Const, 0, ""},
-		{"R_X86_64_TPOFF64", Const, 0, ""},
-		{"Rel32", Type, 0, ""},
-		{"Rel32.Info", Field, 0, ""},
-		{"Rel32.Off", Field, 0, ""},
-		{"Rel64", Type, 0, ""},
-		{"Rel64.Info", Field, 0, ""},
-		{"Rel64.Off", Field, 0, ""},
-		{"Rela32", Type, 0, ""},
-		{"Rela32.Addend", Field, 0, ""},
-		{"Rela32.Info", Field, 0, ""},
-		{"Rela32.Off", Field, 0, ""},
-		{"Rela64", Type, 0, ""},
-		{"Rela64.Addend", Field, 0, ""},
-		{"Rela64.Info", Field, 0, ""},
-		{"Rela64.Off", Field, 0, ""},
-		{"SHF_ALLOC", Const, 0, ""},
-		{"SHF_COMPRESSED", Const, 6, ""},
-		{"SHF_EXECINSTR", Const, 0, ""},
-		{"SHF_GROUP", Const, 0, ""},
-		{"SHF_INFO_LINK", Const, 0, ""},
-		{"SHF_LINK_ORDER", Const, 0, ""},
-		{"SHF_MASKOS", Const, 0, ""},
-		{"SHF_MASKPROC", Const, 0, ""},
-		{"SHF_MERGE", Const, 0, ""},
-		{"SHF_OS_NONCONFORMING", Const, 0, ""},
-		{"SHF_STRINGS", Const, 0, ""},
-		{"SHF_TLS", Const, 0, ""},
-		{"SHF_WRITE", Const, 0, ""},
-		{"SHN_ABS", Const, 0, ""},
-		{"SHN_COMMON", Const, 0, ""},
-		{"SHN_HIOS", Const, 0, ""},
-		{"SHN_HIPROC", Const, 0, ""},
-		{"SHN_HIRESERVE", Const, 0, ""},
-		{"SHN_LOOS", Const, 0, ""},
-		{"SHN_LOPROC", Const, 0, ""},
-		{"SHN_LORESERVE", Const, 0, ""},
-		{"SHN_UNDEF", Const, 0, ""},
-		{"SHN_XINDEX", Const, 0, ""},
-		{"SHT_DYNAMIC", Const, 0, ""},
-		{"SHT_DYNSYM", Const, 0, ""},
-		{"SHT_FINI_ARRAY", Const, 0, ""},
-		{"SHT_GNU_ATTRIBUTES", Const, 0, ""},
-		{"SHT_GNU_HASH", Const, 0, ""},
-		{"SHT_GNU_LIBLIST", Const, 0, ""},
-		{"SHT_GNU_VERDEF", Const, 0, ""},
-		{"SHT_GNU_VERNEED", Const, 0, ""},
-		{"SHT_GNU_VERSYM", Const, 0, ""},
-		{"SHT_GROUP", Const, 0, ""},
-		{"SHT_HASH", Const, 0, ""},
-		{"SHT_HIOS", Const, 0, ""},
-		{"SHT_HIPROC", Const, 0, ""},
-		{"SHT_HIUSER", Const, 0, ""},
-		{"SHT_INIT_ARRAY", Const, 0, ""},
-		{"SHT_LOOS", Const, 0, ""},
-		{"SHT_LOPROC", Const, 0, ""},
-		{"SHT_LOUSER", Const, 0, ""},
-		{"SHT_MIPS_ABIFLAGS", Const, 17, ""},
-		{"SHT_NOBITS", Const, 0, ""},
-		{"SHT_NOTE", Const, 0, ""},
-		{"SHT_NULL", Const, 0, ""},
-		{"SHT_PREINIT_ARRAY", Const, 0, ""},
-		{"SHT_PROGBITS", Const, 0, ""},
-		{"SHT_REL", Const, 0, ""},
-		{"SHT_RELA", Const, 0, ""},
-		{"SHT_RISCV_ATTRIBUTES", Const, 25, ""},
-		{"SHT_SHLIB", Const, 0, ""},
-		{"SHT_STRTAB", Const, 0, ""},
-		{"SHT_SYMTAB", Const, 0, ""},
-		{"SHT_SYMTAB_SHNDX", Const, 0, ""},
-		{"STB_GLOBAL", Const, 0, ""},
-		{"STB_HIOS", Const, 0, ""},
-		{"STB_HIPROC", Const, 0, ""},
-		{"STB_LOCAL", Const, 0, ""},
-		{"STB_LOOS", Const, 0, ""},
-		{"STB_LOPROC", Const, 0, ""},
-		{"STB_WEAK", Const, 0, ""},
-		{"STT_COMMON", Const, 0, ""},
-		{"STT_FILE", Const, 0, ""},
-		{"STT_FUNC", Const, 0, ""},
-		{"STT_GNU_IFUNC", Const, 23, ""},
-		{"STT_HIOS", Const, 0, ""},
-		{"STT_HIPROC", Const, 0, ""},
-		{"STT_LOOS", Const, 0, ""},
-		{"STT_LOPROC", Const, 0, ""},
-		{"STT_NOTYPE", Const, 0, ""},
-		{"STT_OBJECT", Const, 0, ""},
-		{"STT_RELC", Const, 23, ""},
-		{"STT_SECTION", Const, 0, ""},
-		{"STT_SRELC", Const, 23, ""},
-		{"STT_TLS", Const, 0, ""},
-		{"STV_DEFAULT", Const, 0, ""},
-		{"STV_HIDDEN", Const, 0, ""},
-		{"STV_INTERNAL", Const, 0, ""},
-		{"STV_PROTECTED", Const, 0, ""},
-		{"ST_BIND", Func, 0, "func(info uint8) SymBind"},
-		{"ST_INFO", Func, 0, "func(bind SymBind, typ SymType) uint8"},
-		{"ST_TYPE", Func, 0, "func(info uint8) SymType"},
-		{"ST_VISIBILITY", Func, 0, "func(other uint8) SymVis"},
-		{"Section", Type, 0, ""},
-		{"Section.ReaderAt", Field, 0, ""},
-		{"Section.SectionHeader", Field, 0, ""},
-		{"Section32", Type, 0, ""},
-		{"Section32.Addr", Field, 0, ""},
-		{"Section32.Addralign", Field, 0, ""},
-		{"Section32.Entsize", Field, 0, ""},
-		{"Section32.Flags", Field, 0, ""},
-		{"Section32.Info", Field, 0, ""},
-		{"Section32.Link", Field, 0, ""},
-		{"Section32.Name", Field, 0, ""},
-		{"Section32.Off", Field, 0, ""},
-		{"Section32.Size", Field, 0, ""},
-		{"Section32.Type", Field, 0, ""},
-		{"Section64", Type, 0, ""},
-		{"Section64.Addr", Field, 0, ""},
-		{"Section64.Addralign", Field, 0, ""},
-		{"Section64.Entsize", Field, 0, ""},
-		{"Section64.Flags", Field, 0, ""},
-		{"Section64.Info", Field, 0, ""},
-		{"Section64.Link", Field, 0, ""},
-		{"Section64.Name", Field, 0, ""},
-		{"Section64.Off", Field, 0, ""},
-		{"Section64.Size", Field, 0, ""},
-		{"Section64.Type", Field, 0, ""},
-		{"SectionFlag", Type, 0, ""},
-		{"SectionHeader", Type, 0, ""},
-		{"SectionHeader.Addr", Field, 0, ""},
-		{"SectionHeader.Addralign", Field, 0, ""},
-		{"SectionHeader.Entsize", Field, 0, ""},
-		{"SectionHeader.FileSize", Field, 6, ""},
-		{"SectionHeader.Flags", Field, 0, ""},
-		{"SectionHeader.Info", Field, 0, ""},
-		{"SectionHeader.Link", Field, 0, ""},
-		{"SectionHeader.Name", Field, 0, ""},
-		{"SectionHeader.Offset", Field, 0, ""},
-		{"SectionHeader.Size", Field, 0, ""},
-		{"SectionHeader.Type", Field, 0, ""},
-		{"SectionIndex", Type, 0, ""},
-		{"SectionType", Type, 0, ""},
-		{"Sym32", Type, 0, ""},
-		{"Sym32.Info", Field, 0, ""},
-		{"Sym32.Name", Field, 0, ""},
-		{"Sym32.Other", Field, 0, ""},
-		{"Sym32.Shndx", Field, 0, ""},
-		{"Sym32.Size", Field, 0, ""},
-		{"Sym32.Value", Field, 0, ""},
-		{"Sym32Size", Const, 0, ""},
-		{"Sym64", Type, 0, ""},
-		{"Sym64.Info", Field, 0, ""},
-		{"Sym64.Name", Field, 0, ""},
-		{"Sym64.Other", Field, 0, ""},
-		{"Sym64.Shndx", Field, 0, ""},
-		{"Sym64.Size", Field, 0, ""},
-		{"Sym64.Value", Field, 0, ""},
-		{"Sym64Size", Const, 0, ""},
-		{"SymBind", Type, 0, ""},
-		{"SymType", Type, 0, ""},
-		{"SymVis", Type, 0, ""},
-		{"Symbol", Type, 0, ""},
-		{"Symbol.HasVersion", Field, 24, ""},
-		{"Symbol.Info", Field, 0, ""},
-		{"Symbol.Library", Field, 13, ""},
-		{"Symbol.Name", Field, 0, ""},
-		{"Symbol.Other", Field, 0, ""},
-		{"Symbol.Section", Field, 0, ""},
-		{"Symbol.Size", Field, 0, ""},
-		{"Symbol.Value", Field, 0, ""},
-		{"Symbol.Version", Field, 13, ""},
-		{"Symbol.VersionIndex", Field, 24, ""},
-		{"Type", Type, 0, ""},
-		{"VER_FLG_BASE", Const, 24, ""},
-		{"VER_FLG_INFO", Const, 24, ""},
-		{"VER_FLG_WEAK", Const, 24, ""},
-		{"Version", Type, 0, ""},
-		{"VersionIndex", Type, 24, ""},
-	},
-	"debug/gosym": {
-		{"(*DecodingError).Error", Method, 0, ""},
-		{"(*LineTable).LineToPC", Method, 0, ""},
-		{"(*LineTable).PCToLine", Method, 0, ""},
-		{"(*Sym).BaseName", Method, 0, ""},
-		{"(*Sym).PackageName", Method, 0, ""},
-		{"(*Sym).ReceiverName", Method, 0, ""},
-		{"(*Sym).Static", Method, 0, ""},
-		{"(*Table).LineToPC", Method, 0, ""},
-		{"(*Table).LookupFunc", Method, 0, ""},
-		{"(*Table).LookupSym", Method, 0, ""},
-		{"(*Table).PCToFunc", Method, 0, ""},
-		{"(*Table).PCToLine", Method, 0, ""},
-		{"(*Table).SymByAddr", Method, 0, ""},
-		{"(*UnknownLineError).Error", Method, 0, ""},
-		{"(Func).BaseName", Method, 0, ""},
-		{"(Func).PackageName", Method, 0, ""},
-		{"(Func).ReceiverName", Method, 0, ""},
-		{"(Func).Static", Method, 0, ""},
-		{"(UnknownFileError).Error", Method, 0, ""},
-		{"DecodingError", Type, 0, ""},
-		{"Func", Type, 0, ""},
-		{"Func.End", Field, 0, ""},
-		{"Func.Entry", Field, 0, ""},
-		{"Func.FrameSize", Field, 0, ""},
-		{"Func.LineTable", Field, 0, ""},
-		{"Func.Locals", Field, 0, ""},
-		{"Func.Obj", Field, 0, ""},
-		{"Func.Params", Field, 0, ""},
-		{"Func.Sym", Field, 0, ""},
-		{"LineTable", Type, 0, ""},
-		{"LineTable.Data", Field, 0, ""},
-		{"LineTable.Line", Field, 0, ""},
-		{"LineTable.PC", Field, 0, ""},
-		{"NewLineTable", Func, 0, "func(data []byte, text uint64) *LineTable"},
-		{"NewTable", Func, 0, "func(symtab []byte, pcln *LineTable) (*Table, error)"},
-		{"Obj", Type, 0, ""},
-		{"Obj.Funcs", Field, 0, ""},
-		{"Obj.Paths", Field, 0, ""},
-		{"Sym", Type, 0, ""},
-		{"Sym.Func", Field, 0, ""},
-		{"Sym.GoType", Field, 0, ""},
-		{"Sym.Name", Field, 0, ""},
-		{"Sym.Type", Field, 0, ""},
-		{"Sym.Value", Field, 0, ""},
-		{"Table", Type, 0, ""},
-		{"Table.Files", Field, 0, ""},
-		{"Table.Funcs", Field, 0, ""},
-		{"Table.Objs", Field, 0, ""},
-		{"Table.Syms", Field, 0, ""},
-		{"UnknownFileError", Type, 0, ""},
-		{"UnknownLineError", Type, 0, ""},
-		{"UnknownLineError.File", Field, 0, ""},
-		{"UnknownLineError.Line", Field, 0, ""},
-	},
-	"debug/macho": {
-		{"(*FatFile).Close", Method, 3, ""},
-		{"(*File).Close", Method, 0, ""},
-		{"(*File).DWARF", Method, 0, ""},
-		{"(*File).ImportedLibraries", Method, 0, ""},
-		{"(*File).ImportedSymbols", Method, 0, ""},
-		{"(*File).Section", Method, 0, ""},
-		{"(*File).Segment", Method, 0, ""},
-		{"(*FormatError).Error", Method, 0, ""},
-		{"(*Section).Data", Method, 0, ""},
-		{"(*Section).Open", Method, 0, ""},
-		{"(*Segment).Data", Method, 0, ""},
-		{"(*Segment).Open", Method, 0, ""},
-		{"(Cpu).GoString", Method, 0, ""},
-		{"(Cpu).String", Method, 0, ""},
-		{"(Dylib).Raw", Method, 0, ""},
-		{"(Dysymtab).Raw", Method, 0, ""},
-		{"(FatArch).Close", Method, 3, ""},
-		{"(FatArch).DWARF", Method, 3, ""},
-		{"(FatArch).ImportedLibraries", Method, 3, ""},
-		{"(FatArch).ImportedSymbols", Method, 3, ""},
-		{"(FatArch).Section", Method, 3, ""},
-		{"(FatArch).Segment", Method, 3, ""},
-		{"(LoadBytes).Raw", Method, 0, ""},
-		{"(LoadCmd).GoString", Method, 0, ""},
-		{"(LoadCmd).String", Method, 0, ""},
-		{"(RelocTypeARM).GoString", Method, 10, ""},
-		{"(RelocTypeARM).String", Method, 10, ""},
-		{"(RelocTypeARM64).GoString", Method, 10, ""},
-		{"(RelocTypeARM64).String", Method, 10, ""},
-		{"(RelocTypeGeneric).GoString", Method, 10, ""},
-		{"(RelocTypeGeneric).String", Method, 10, ""},
-		{"(RelocTypeX86_64).GoString", Method, 10, ""},
-		{"(RelocTypeX86_64).String", Method, 10, ""},
-		{"(Rpath).Raw", Method, 10, ""},
-		{"(Section).ReadAt", Method, 0, ""},
-		{"(Segment).Raw", Method, 0, ""},
-		{"(Segment).ReadAt", Method, 0, ""},
-		{"(Symtab).Raw", Method, 0, ""},
-		{"(Type).GoString", Method, 10, ""},
-		{"(Type).String", Method, 10, ""},
-		{"ARM64_RELOC_ADDEND", Const, 10, ""},
-		{"ARM64_RELOC_BRANCH26", Const, 10, ""},
-		{"ARM64_RELOC_GOT_LOAD_PAGE21", Const, 10, ""},
-		{"ARM64_RELOC_GOT_LOAD_PAGEOFF12", Const, 10, ""},
-		{"ARM64_RELOC_PAGE21", Const, 10, ""},
-		{"ARM64_RELOC_PAGEOFF12", Const, 10, ""},
-		{"ARM64_RELOC_POINTER_TO_GOT", Const, 10, ""},
-		{"ARM64_RELOC_SUBTRACTOR", Const, 10, ""},
-		{"ARM64_RELOC_TLVP_LOAD_PAGE21", Const, 10, ""},
-		{"ARM64_RELOC_TLVP_LOAD_PAGEOFF12", Const, 10, ""},
-		{"ARM64_RELOC_UNSIGNED", Const, 10, ""},
-		{"ARM_RELOC_BR24", Const, 10, ""},
-		{"ARM_RELOC_HALF", Const, 10, ""},
-		{"ARM_RELOC_HALF_SECTDIFF", Const, 10, ""},
-		{"ARM_RELOC_LOCAL_SECTDIFF", Const, 10, ""},
-		{"ARM_RELOC_PAIR", Const, 10, ""},
-		{"ARM_RELOC_PB_LA_PTR", Const, 10, ""},
-		{"ARM_RELOC_SECTDIFF", Const, 10, ""},
-		{"ARM_RELOC_VANILLA", Const, 10, ""},
-		{"ARM_THUMB_32BIT_BRANCH", Const, 10, ""},
-		{"ARM_THUMB_RELOC_BR22", Const, 10, ""},
-		{"Cpu", Type, 0, ""},
-		{"Cpu386", Const, 0, ""},
-		{"CpuAmd64", Const, 0, ""},
-		{"CpuArm", Const, 3, ""},
-		{"CpuArm64", Const, 11, ""},
-		{"CpuPpc", Const, 3, ""},
-		{"CpuPpc64", Const, 3, ""},
-		{"Dylib", Type, 0, ""},
-		{"Dylib.CompatVersion", Field, 0, ""},
-		{"Dylib.CurrentVersion", Field, 0, ""},
-		{"Dylib.LoadBytes", Field, 0, ""},
-		{"Dylib.Name", Field, 0, ""},
-		{"Dylib.Time", Field, 0, ""},
-		{"DylibCmd", Type, 0, ""},
-		{"DylibCmd.Cmd", Field, 0, ""},
-		{"DylibCmd.CompatVersion", Field, 0, ""},
-		{"DylibCmd.CurrentVersion", Field, 0, ""},
-		{"DylibCmd.Len", Field, 0, ""},
-		{"DylibCmd.Name", Field, 0, ""},
-		{"DylibCmd.Time", Field, 0, ""},
-		{"Dysymtab", Type, 0, ""},
-		{"Dysymtab.DysymtabCmd", Field, 0, ""},
-		{"Dysymtab.IndirectSyms", Field, 0, ""},
-		{"Dysymtab.LoadBytes", Field, 0, ""},
-		{"DysymtabCmd", Type, 0, ""},
-		{"DysymtabCmd.Cmd", Field, 0, ""},
-		{"DysymtabCmd.Extrefsymoff", Field, 0, ""},
-		{"DysymtabCmd.Extreloff", Field, 0, ""},
-		{"DysymtabCmd.Iextdefsym", Field, 0, ""},
-		{"DysymtabCmd.Ilocalsym", Field, 0, ""},
-		{"DysymtabCmd.Indirectsymoff", Field, 0, ""},
-		{"DysymtabCmd.Iundefsym", Field, 0, ""},
-		{"DysymtabCmd.Len", Field, 0, ""},
-		{"DysymtabCmd.Locreloff", Field, 0, ""},
-		{"DysymtabCmd.Modtaboff", Field, 0, ""},
-		{"DysymtabCmd.Nextdefsym", Field, 0, ""},
-		{"DysymtabCmd.Nextrefsyms", Field, 0, ""},
-		{"DysymtabCmd.Nextrel", Field, 0, ""},
-		{"DysymtabCmd.Nindirectsyms", Field, 0, ""},
-		{"DysymtabCmd.Nlocalsym", Field, 0, ""},
-		{"DysymtabCmd.Nlocrel", Field, 0, ""},
-		{"DysymtabCmd.Nmodtab", Field, 0, ""},
-		{"DysymtabCmd.Ntoc", Field, 0, ""},
-		{"DysymtabCmd.Nundefsym", Field, 0, ""},
-		{"DysymtabCmd.Tocoffset", Field, 0, ""},
-		{"ErrNotFat", Var, 3, ""},
-		{"FatArch", Type, 3, ""},
-		{"FatArch.FatArchHeader", Field, 3, ""},
-		{"FatArch.File", Field, 3, ""},
-		{"FatArchHeader", Type, 3, ""},
-		{"FatArchHeader.Align", Field, 3, ""},
-		{"FatArchHeader.Cpu", Field, 3, ""},
-		{"FatArchHeader.Offset", Field, 3, ""},
-		{"FatArchHeader.Size", Field, 3, ""},
-		{"FatArchHeader.SubCpu", Field, 3, ""},
-		{"FatFile", Type, 3, ""},
-		{"FatFile.Arches", Field, 3, ""},
-		{"FatFile.Magic", Field, 3, ""},
-		{"File", Type, 0, ""},
-		{"File.ByteOrder", Field, 0, ""},
-		{"File.Dysymtab", Field, 0, ""},
-		{"File.FileHeader", Field, 0, ""},
-		{"File.Loads", Field, 0, ""},
-		{"File.Sections", Field, 0, ""},
-		{"File.Symtab", Field, 0, ""},
-		{"FileHeader", Type, 0, ""},
-		{"FileHeader.Cmdsz", Field, 0, ""},
-		{"FileHeader.Cpu", Field, 0, ""},
-		{"FileHeader.Flags", Field, 0, ""},
-		{"FileHeader.Magic", Field, 0, ""},
-		{"FileHeader.Ncmd", Field, 0, ""},
-		{"FileHeader.SubCpu", Field, 0, ""},
-		{"FileHeader.Type", Field, 0, ""},
-		{"FlagAllModsBound", Const, 10, ""},
-		{"FlagAllowStackExecution", Const, 10, ""},
-		{"FlagAppExtensionSafe", Const, 10, ""},
-		{"FlagBindAtLoad", Const, 10, ""},
-		{"FlagBindsToWeak", Const, 10, ""},
-		{"FlagCanonical", Const, 10, ""},
-		{"FlagDeadStrippableDylib", Const, 10, ""},
-		{"FlagDyldLink", Const, 10, ""},
-		{"FlagForceFlat", Const, 10, ""},
-		{"FlagHasTLVDescriptors", Const, 10, ""},
-		{"FlagIncrLink", Const, 10, ""},
-		{"FlagLazyInit", Const, 10, ""},
-		{"FlagNoFixPrebinding", Const, 10, ""},
-		{"FlagNoHeapExecution", Const, 10, ""},
-		{"FlagNoMultiDefs", Const, 10, ""},
-		{"FlagNoReexportedDylibs", Const, 10, ""},
-		{"FlagNoUndefs", Const, 10, ""},
-		{"FlagPIE", Const, 10, ""},
-		{"FlagPrebindable", Const, 10, ""},
-		{"FlagPrebound", Const, 10, ""},
-		{"FlagRootSafe", Const, 10, ""},
-		{"FlagSetuidSafe", Const, 10, ""},
-		{"FlagSplitSegs", Const, 10, ""},
-		{"FlagSubsectionsViaSymbols", Const, 10, ""},
-		{"FlagTwoLevel", Const, 10, ""},
-		{"FlagWeakDefines", Const, 10, ""},
-		{"FormatError", Type, 0, ""},
-		{"GENERIC_RELOC_LOCAL_SECTDIFF", Const, 10, ""},
-		{"GENERIC_RELOC_PAIR", Const, 10, ""},
-		{"GENERIC_RELOC_PB_LA_PTR", Const, 10, ""},
-		{"GENERIC_RELOC_SECTDIFF", Const, 10, ""},
-		{"GENERIC_RELOC_TLV", Const, 10, ""},
-		{"GENERIC_RELOC_VANILLA", Const, 10, ""},
-		{"Load", Type, 0, ""},
-		{"LoadBytes", Type, 0, ""},
-		{"LoadCmd", Type, 0, ""},
-		{"LoadCmdDylib", Const, 0, ""},
-		{"LoadCmdDylinker", Const, 0, ""},
-		{"LoadCmdDysymtab", Const, 0, ""},
-		{"LoadCmdRpath", Const, 10, ""},
-		{"LoadCmdSegment", Const, 0, ""},
-		{"LoadCmdSegment64", Const, 0, ""},
-		{"LoadCmdSymtab", Const, 0, ""},
-		{"LoadCmdThread", Const, 0, ""},
-		{"LoadCmdUnixThread", Const, 0, ""},
-		{"Magic32", Const, 0, ""},
-		{"Magic64", Const, 0, ""},
-		{"MagicFat", Const, 3, ""},
-		{"NewFatFile", Func, 3, "func(r io.ReaderAt) (*FatFile, error)"},
-		{"NewFile", Func, 0, "func(r io.ReaderAt) (*File, error)"},
-		{"Nlist32", Type, 0, ""},
-		{"Nlist32.Desc", Field, 0, ""},
-		{"Nlist32.Name", Field, 0, ""},
-		{"Nlist32.Sect", Field, 0, ""},
-		{"Nlist32.Type", Field, 0, ""},
-		{"Nlist32.Value", Field, 0, ""},
-		{"Nlist64", Type, 0, ""},
-		{"Nlist64.Desc", Field, 0, ""},
-		{"Nlist64.Name", Field, 0, ""},
-		{"Nlist64.Sect", Field, 0, ""},
-		{"Nlist64.Type", Field, 0, ""},
-		{"Nlist64.Value", Field, 0, ""},
-		{"Open", Func, 0, "func(name string) (*File, error)"},
-		{"OpenFat", Func, 3, "func(name string) (*FatFile, error)"},
-		{"Regs386", Type, 0, ""},
-		{"Regs386.AX", Field, 0, ""},
-		{"Regs386.BP", Field, 0, ""},
-		{"Regs386.BX", Field, 0, ""},
-		{"Regs386.CS", Field, 0, ""},
-		{"Regs386.CX", Field, 0, ""},
-		{"Regs386.DI", Field, 0, ""},
-		{"Regs386.DS", Field, 0, ""},
-		{"Regs386.DX", Field, 0, ""},
-		{"Regs386.ES", Field, 0, ""},
-		{"Regs386.FLAGS", Field, 0, ""},
-		{"Regs386.FS", Field, 0, ""},
-		{"Regs386.GS", Field, 0, ""},
-		{"Regs386.IP", Field, 0, ""},
-		{"Regs386.SI", Field, 0, ""},
-		{"Regs386.SP", Field, 0, ""},
-		{"Regs386.SS", Field, 0, ""},
-		{"RegsAMD64", Type, 0, ""},
-		{"RegsAMD64.AX", Field, 0, ""},
-		{"RegsAMD64.BP", Field, 0, ""},
-		{"RegsAMD64.BX", Field, 0, ""},
-		{"RegsAMD64.CS", Field, 0, ""},
-		{"RegsAMD64.CX", Field, 0, ""},
-		{"RegsAMD64.DI", Field, 0, ""},
-		{"RegsAMD64.DX", Field, 0, ""},
-		{"RegsAMD64.FLAGS", Field, 0, ""},
-		{"RegsAMD64.FS", Field, 0, ""},
-		{"RegsAMD64.GS", Field, 0, ""},
-		{"RegsAMD64.IP", Field, 0, ""},
-		{"RegsAMD64.R10", Field, 0, ""},
-		{"RegsAMD64.R11", Field, 0, ""},
-		{"RegsAMD64.R12", Field, 0, ""},
-		{"RegsAMD64.R13", Field, 0, ""},
-		{"RegsAMD64.R14", Field, 0, ""},
-		{"RegsAMD64.R15", Field, 0, ""},
-		{"RegsAMD64.R8", Field, 0, ""},
-		{"RegsAMD64.R9", Field, 0, ""},
-		{"RegsAMD64.SI", Field, 0, ""},
-		{"RegsAMD64.SP", Field, 0, ""},
-		{"Reloc", Type, 10, ""},
-		{"Reloc.Addr", Field, 10, ""},
-		{"Reloc.Extern", Field, 10, ""},
-		{"Reloc.Len", Field, 10, ""},
-		{"Reloc.Pcrel", Field, 10, ""},
-		{"Reloc.Scattered", Field, 10, ""},
-		{"Reloc.Type", Field, 10, ""},
-		{"Reloc.Value", Field, 10, ""},
-		{"RelocTypeARM", Type, 10, ""},
-		{"RelocTypeARM64", Type, 10, ""},
-		{"RelocTypeGeneric", Type, 10, ""},
-		{"RelocTypeX86_64", Type, 10, ""},
-		{"Rpath", Type, 10, ""},
-		{"Rpath.LoadBytes", Field, 10, ""},
-		{"Rpath.Path", Field, 10, ""},
-		{"RpathCmd", Type, 10, ""},
-		{"RpathCmd.Cmd", Field, 10, ""},
-		{"RpathCmd.Len", Field, 10, ""},
-		{"RpathCmd.Path", Field, 10, ""},
-		{"Section", Type, 0, ""},
-		{"Section.ReaderAt", Field, 0, ""},
-		{"Section.Relocs", Field, 10, ""},
-		{"Section.SectionHeader", Field, 0, ""},
-		{"Section32", Type, 0, ""},
-		{"Section32.Addr", Field, 0, ""},
-		{"Section32.Align", Field, 0, ""},
-		{"Section32.Flags", Field, 0, ""},
-		{"Section32.Name", Field, 0, ""},
-		{"Section32.Nreloc", Field, 0, ""},
-		{"Section32.Offset", Field, 0, ""},
-		{"Section32.Reloff", Field, 0, ""},
-		{"Section32.Reserve1", Field, 0, ""},
-		{"Section32.Reserve2", Field, 0, ""},
-		{"Section32.Seg", Field, 0, ""},
-		{"Section32.Size", Field, 0, ""},
-		{"Section64", Type, 0, ""},
-		{"Section64.Addr", Field, 0, ""},
-		{"Section64.Align", Field, 0, ""},
-		{"Section64.Flags", Field, 0, ""},
-		{"Section64.Name", Field, 0, ""},
-		{"Section64.Nreloc", Field, 0, ""},
-		{"Section64.Offset", Field, 0, ""},
-		{"Section64.Reloff", Field, 0, ""},
-		{"Section64.Reserve1", Field, 0, ""},
-		{"Section64.Reserve2", Field, 0, ""},
-		{"Section64.Reserve3", Field, 0, ""},
-		{"Section64.Seg", Field, 0, ""},
-		{"Section64.Size", Field, 0, ""},
-		{"SectionHeader", Type, 0, ""},
-		{"SectionHeader.Addr", Field, 0, ""},
-		{"SectionHeader.Align", Field, 0, ""},
-		{"SectionHeader.Flags", Field, 0, ""},
-		{"SectionHeader.Name", Field, 0, ""},
-		{"SectionHeader.Nreloc", Field, 0, ""},
-		{"SectionHeader.Offset", Field, 0, ""},
-		{"SectionHeader.Reloff", Field, 0, ""},
-		{"SectionHeader.Seg", Field, 0, ""},
-		{"SectionHeader.Size", Field, 0, ""},
-		{"Segment", Type, 0, ""},
-		{"Segment.LoadBytes", Field, 0, ""},
-		{"Segment.ReaderAt", Field, 0, ""},
-		{"Segment.SegmentHeader", Field, 0, ""},
-		{"Segment32", Type, 0, ""},
-		{"Segment32.Addr", Field, 0, ""},
-		{"Segment32.Cmd", Field, 0, ""},
-		{"Segment32.Filesz", Field, 0, ""},
-		{"Segment32.Flag", Field, 0, ""},
-		{"Segment32.Len", Field, 0, ""},
-		{"Segment32.Maxprot", Field, 0, ""},
-		{"Segment32.Memsz", Field, 0, ""},
-		{"Segment32.Name", Field, 0, ""},
-		{"Segment32.Nsect", Field, 0, ""},
-		{"Segment32.Offset", Field, 0, ""},
-		{"Segment32.Prot", Field, 0, ""},
-		{"Segment64", Type, 0, ""},
-		{"Segment64.Addr", Field, 0, ""},
-		{"Segment64.Cmd", Field, 0, ""},
-		{"Segment64.Filesz", Field, 0, ""},
-		{"Segment64.Flag", Field, 0, ""},
-		{"Segment64.Len", Field, 0, ""},
-		{"Segment64.Maxprot", Field, 0, ""},
-		{"Segment64.Memsz", Field, 0, ""},
-		{"Segment64.Name", Field, 0, ""},
-		{"Segment64.Nsect", Field, 0, ""},
-		{"Segment64.Offset", Field, 0, ""},
-		{"Segment64.Prot", Field, 0, ""},
-		{"SegmentHeader", Type, 0, ""},
-		{"SegmentHeader.Addr", Field, 0, ""},
-		{"SegmentHeader.Cmd", Field, 0, ""},
-		{"SegmentHeader.Filesz", Field, 0, ""},
-		{"SegmentHeader.Flag", Field, 0, ""},
-		{"SegmentHeader.Len", Field, 0, ""},
-		{"SegmentHeader.Maxprot", Field, 0, ""},
-		{"SegmentHeader.Memsz", Field, 0, ""},
-		{"SegmentHeader.Name", Field, 0, ""},
-		{"SegmentHeader.Nsect", Field, 0, ""},
-		{"SegmentHeader.Offset", Field, 0, ""},
-		{"SegmentHeader.Prot", Field, 0, ""},
-		{"Symbol", Type, 0, ""},
-		{"Symbol.Desc", Field, 0, ""},
-		{"Symbol.Name", Field, 0, ""},
-		{"Symbol.Sect", Field, 0, ""},
-		{"Symbol.Type", Field, 0, ""},
-		{"Symbol.Value", Field, 0, ""},
-		{"Symtab", Type, 0, ""},
-		{"Symtab.LoadBytes", Field, 0, ""},
-		{"Symtab.Syms", Field, 0, ""},
-		{"Symtab.SymtabCmd", Field, 0, ""},
-		{"SymtabCmd", Type, 0, ""},
-		{"SymtabCmd.Cmd", Field, 0, ""},
-		{"SymtabCmd.Len", Field, 0, ""},
-		{"SymtabCmd.Nsyms", Field, 0, ""},
-		{"SymtabCmd.Stroff", Field, 0, ""},
-		{"SymtabCmd.Strsize", Field, 0, ""},
-		{"SymtabCmd.Symoff", Field, 0, ""},
-		{"Thread", Type, 0, ""},
-		{"Thread.Cmd", Field, 0, ""},
-		{"Thread.Data", Field, 0, ""},
-		{"Thread.Len", Field, 0, ""},
-		{"Thread.Type", Field, 0, ""},
-		{"Type", Type, 0, ""},
-		{"TypeBundle", Const, 3, ""},
-		{"TypeDylib", Const, 3, ""},
-		{"TypeExec", Const, 0, ""},
-		{"TypeObj", Const, 0, ""},
-		{"X86_64_RELOC_BRANCH", Const, 10, ""},
-		{"X86_64_RELOC_GOT", Const, 10, ""},
-		{"X86_64_RELOC_GOT_LOAD", Const, 10, ""},
-		{"X86_64_RELOC_SIGNED", Const, 10, ""},
-		{"X86_64_RELOC_SIGNED_1", Const, 10, ""},
-		{"X86_64_RELOC_SIGNED_2", Const, 10, ""},
-		{"X86_64_RELOC_SIGNED_4", Const, 10, ""},
-		{"X86_64_RELOC_SUBTRACTOR", Const, 10, ""},
-		{"X86_64_RELOC_TLV", Const, 10, ""},
-		{"X86_64_RELOC_UNSIGNED", Const, 10, ""},
-	},
-	"debug/pe": {
-		{"(*COFFSymbol).FullName", Method, 8, ""},
-		{"(*File).COFFSymbolReadSectionDefAux", Method, 19, ""},
-		{"(*File).Close", Method, 0, ""},
-		{"(*File).DWARF", Method, 0, ""},
-		{"(*File).ImportedLibraries", Method, 0, ""},
-		{"(*File).ImportedSymbols", Method, 0, ""},
-		{"(*File).Section", Method, 0, ""},
-		{"(*FormatError).Error", Method, 0, ""},
-		{"(*Section).Data", Method, 0, ""},
-		{"(*Section).Open", Method, 0, ""},
-		{"(Section).ReadAt", Method, 0, ""},
-		{"(StringTable).String", Method, 8, ""},
-		{"COFFSymbol", Type, 1, ""},
-		{"COFFSymbol.Name", Field, 1, ""},
-		{"COFFSymbol.NumberOfAuxSymbols", Field, 1, ""},
-		{"COFFSymbol.SectionNumber", Field, 1, ""},
-		{"COFFSymbol.StorageClass", Field, 1, ""},
-		{"COFFSymbol.Type", Field, 1, ""},
-		{"COFFSymbol.Value", Field, 1, ""},
-		{"COFFSymbolAuxFormat5", Type, 19, ""},
-		{"COFFSymbolAuxFormat5.Checksum", Field, 19, ""},
-		{"COFFSymbolAuxFormat5.NumLineNumbers", Field, 19, ""},
-		{"COFFSymbolAuxFormat5.NumRelocs", Field, 19, ""},
-		{"COFFSymbolAuxFormat5.SecNum", Field, 19, ""},
-		{"COFFSymbolAuxFormat5.Selection", Field, 19, ""},
-		{"COFFSymbolAuxFormat5.Size", Field, 19, ""},
-		{"COFFSymbolSize", Const, 1, ""},
-		{"DataDirectory", Type, 3, ""},
-		{"DataDirectory.Size", Field, 3, ""},
-		{"DataDirectory.VirtualAddress", Field, 3, ""},
-		{"File", Type, 0, ""},
-		{"File.COFFSymbols", Field, 8, ""},
-		{"File.FileHeader", Field, 0, ""},
-		{"File.OptionalHeader", Field, 3, ""},
-		{"File.Sections", Field, 0, ""},
-		{"File.StringTable", Field, 8, ""},
-		{"File.Symbols", Field, 1, ""},
-		{"FileHeader", Type, 0, ""},
-		{"FileHeader.Characteristics", Field, 0, ""},
-		{"FileHeader.Machine", Field, 0, ""},
-		{"FileHeader.NumberOfSections", Field, 0, ""},
-		{"FileHeader.NumberOfSymbols", Field, 0, ""},
-		{"FileHeader.PointerToSymbolTable", Field, 0, ""},
-		{"FileHeader.SizeOfOptionalHeader", Field, 0, ""},
-		{"FileHeader.TimeDateStamp", Field, 0, ""},
-		{"FormatError", Type, 0, ""},
-		{"IMAGE_COMDAT_SELECT_ANY", Const, 19, ""},
-		{"IMAGE_COMDAT_SELECT_ASSOCIATIVE", Const, 19, ""},
-		{"IMAGE_COMDAT_SELECT_EXACT_MATCH", Const, 19, ""},
-		{"IMAGE_COMDAT_SELECT_LARGEST", Const, 19, ""},
-		{"IMAGE_COMDAT_SELECT_NODUPLICATES", Const, 19, ""},
-		{"IMAGE_COMDAT_SELECT_SAME_SIZE", Const, 19, ""},
-		{"IMAGE_DIRECTORY_ENTRY_ARCHITECTURE", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_BASERELOC", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_DEBUG", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_EXCEPTION", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_EXPORT", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_GLOBALPTR", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_IAT", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_IMPORT", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_RESOURCE", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_SECURITY", Const, 11, ""},
-		{"IMAGE_DIRECTORY_ENTRY_TLS", Const, 11, ""},
-		{"IMAGE_DLLCHARACTERISTICS_APPCONTAINER", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_GUARD_CF", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_NO_BIND", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_NO_ISOLATION", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_NO_SEH", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_NX_COMPAT", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE", Const, 15, ""},
-		{"IMAGE_DLLCHARACTERISTICS_WDM_DRIVER", Const, 15, ""},
-		{"IMAGE_FILE_32BIT_MACHINE", Const, 15, ""},
-		{"IMAGE_FILE_AGGRESIVE_WS_TRIM", Const, 15, ""},
-		{"IMAGE_FILE_BYTES_REVERSED_HI", Const, 15, ""},
-		{"IMAGE_FILE_BYTES_REVERSED_LO", Const, 15, ""},
-		{"IMAGE_FILE_DEBUG_STRIPPED", Const, 15, ""},
-		{"IMAGE_FILE_DLL", Const, 15, ""},
-		{"IMAGE_FILE_EXECUTABLE_IMAGE", Const, 15, ""},
-		{"IMAGE_FILE_LARGE_ADDRESS_AWARE", Const, 15, ""},
-		{"IMAGE_FILE_LINE_NUMS_STRIPPED", Const, 15, ""},
-		{"IMAGE_FILE_LOCAL_SYMS_STRIPPED", Const, 15, ""},
-		{"IMAGE_FILE_MACHINE_AM33", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_AMD64", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_ARM", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_ARM64", Const, 11, ""},
-		{"IMAGE_FILE_MACHINE_ARMNT", Const, 12, ""},
-		{"IMAGE_FILE_MACHINE_EBC", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_I386", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_IA64", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_LOONGARCH32", Const, 19, ""},
-		{"IMAGE_FILE_MACHINE_LOONGARCH64", Const, 19, ""},
-		{"IMAGE_FILE_MACHINE_M32R", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_MIPS16", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_MIPSFPU", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_MIPSFPU16", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_POWERPC", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_POWERPCFP", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_R4000", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_RISCV128", Const, 20, ""},
-		{"IMAGE_FILE_MACHINE_RISCV32", Const, 20, ""},
-		{"IMAGE_FILE_MACHINE_RISCV64", Const, 20, ""},
-		{"IMAGE_FILE_MACHINE_SH3", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_SH3DSP", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_SH4", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_SH5", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_THUMB", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_UNKNOWN", Const, 0, ""},
-		{"IMAGE_FILE_MACHINE_WCEMIPSV2", Const, 0, ""},
-		{"IMAGE_FILE_NET_RUN_FROM_SWAP", Const, 15, ""},
-		{"IMAGE_FILE_RELOCS_STRIPPED", Const, 15, ""},
-		{"IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP", Const, 15, ""},
-		{"IMAGE_FILE_SYSTEM", Const, 15, ""},
-		{"IMAGE_FILE_UP_SYSTEM_ONLY", Const, 15, ""},
-		{"IMAGE_SCN_CNT_CODE", Const, 19, ""},
-		{"IMAGE_SCN_CNT_INITIALIZED_DATA", Const, 19, ""},
-		{"IMAGE_SCN_CNT_UNINITIALIZED_DATA", Const, 19, ""},
-		{"IMAGE_SCN_LNK_COMDAT", Const, 19, ""},
-		{"IMAGE_SCN_MEM_DISCARDABLE", Const, 19, ""},
-		{"IMAGE_SCN_MEM_EXECUTE", Const, 19, ""},
-		{"IMAGE_SCN_MEM_READ", Const, 19, ""},
-		{"IMAGE_SCN_MEM_WRITE", Const, 19, ""},
-		{"IMAGE_SUBSYSTEM_EFI_APPLICATION", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_EFI_ROM", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_NATIVE", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_NATIVE_WINDOWS", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_OS2_CUI", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_POSIX_CUI", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_UNKNOWN", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_WINDOWS_CE_GUI", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_WINDOWS_CUI", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_WINDOWS_GUI", Const, 15, ""},
-		{"IMAGE_SUBSYSTEM_XBOX", Const, 15, ""},
-		{"ImportDirectory", Type, 0, ""},
-		{"ImportDirectory.FirstThunk", Field, 0, ""},
-		{"ImportDirectory.ForwarderChain", Field, 0, ""},
-		{"ImportDirectory.Name", Field, 0, ""},
-		{"ImportDirectory.OriginalFirstThunk", Field, 0, ""},
-		{"ImportDirectory.TimeDateStamp", Field, 0, ""},
-		{"NewFile", Func, 0, "func(r io.ReaderAt) (*File, error)"},
-		{"Open", Func, 0, "func(name string) (*File, error)"},
-		{"OptionalHeader32", Type, 3, ""},
-		{"OptionalHeader32.AddressOfEntryPoint", Field, 3, ""},
-		{"OptionalHeader32.BaseOfCode", Field, 3, ""},
-		{"OptionalHeader32.BaseOfData", Field, 3, ""},
-		{"OptionalHeader32.CheckSum", Field, 3, ""},
-		{"OptionalHeader32.DataDirectory", Field, 3, ""},
-		{"OptionalHeader32.DllCharacteristics", Field, 3, ""},
-		{"OptionalHeader32.FileAlignment", Field, 3, ""},
-		{"OptionalHeader32.ImageBase", Field, 3, ""},
-		{"OptionalHeader32.LoaderFlags", Field, 3, ""},
-		{"OptionalHeader32.Magic", Field, 3, ""},
-		{"OptionalHeader32.MajorImageVersion", Field, 3, ""},
-		{"OptionalHeader32.MajorLinkerVersion", Field, 3, ""},
-		{"OptionalHeader32.MajorOperatingSystemVersion", Field, 3, ""},
-		{"OptionalHeader32.MajorSubsystemVersion", Field, 3, ""},
-		{"OptionalHeader32.MinorImageVersion", Field, 3, ""},
-		{"OptionalHeader32.MinorLinkerVersion", Field, 3, ""},
-		{"OptionalHeader32.MinorOperatingSystemVersion", Field, 3, ""},
-		{"OptionalHeader32.MinorSubsystemVersion", Field, 3, ""},
-		{"OptionalHeader32.NumberOfRvaAndSizes", Field, 3, ""},
-		{"OptionalHeader32.SectionAlignment", Field, 3, ""},
-		{"OptionalHeader32.SizeOfCode", Field, 3, ""},
-		{"OptionalHeader32.SizeOfHeaders", Field, 3, ""},
-		{"OptionalHeader32.SizeOfHeapCommit", Field, 3, ""},
-		{"OptionalHeader32.SizeOfHeapReserve", Field, 3, ""},
-		{"OptionalHeader32.SizeOfImage", Field, 3, ""},
-		{"OptionalHeader32.SizeOfInitializedData", Field, 3, ""},
-		{"OptionalHeader32.SizeOfStackCommit", Field, 3, ""},
-		{"OptionalHeader32.SizeOfStackReserve", Field, 3, ""},
-		{"OptionalHeader32.SizeOfUninitializedData", Field, 3, ""},
-		{"OptionalHeader32.Subsystem", Field, 3, ""},
-		{"OptionalHeader32.Win32VersionValue", Field, 3, ""},
-		{"OptionalHeader64", Type, 3, ""},
-		{"OptionalHeader64.AddressOfEntryPoint", Field, 3, ""},
-		{"OptionalHeader64.BaseOfCode", Field, 3, ""},
-		{"OptionalHeader64.CheckSum", Field, 3, ""},
-		{"OptionalHeader64.DataDirectory", Field, 3, ""},
-		{"OptionalHeader64.DllCharacteristics", Field, 3, ""},
-		{"OptionalHeader64.FileAlignment", Field, 3, ""},
-		{"OptionalHeader64.ImageBase", Field, 3, ""},
-		{"OptionalHeader64.LoaderFlags", Field, 3, ""},
-		{"OptionalHeader64.Magic", Field, 3, ""},
-		{"OptionalHeader64.MajorImageVersion", Field, 3, ""},
-		{"OptionalHeader64.MajorLinkerVersion", Field, 3, ""},
-		{"OptionalHeader64.MajorOperatingSystemVersion", Field, 3, ""},
-		{"OptionalHeader64.MajorSubsystemVersion", Field, 3, ""},
-		{"OptionalHeader64.MinorImageVersion", Field, 3, ""},
-		{"OptionalHeader64.MinorLinkerVersion", Field, 3, ""},
-		{"OptionalHeader64.MinorOperatingSystemVersion", Field, 3, ""},
-		{"OptionalHeader64.MinorSubsystemVersion", Field, 3, ""},
-		{"OptionalHeader64.NumberOfRvaAndSizes", Field, 3, ""},
-		{"OptionalHeader64.SectionAlignment", Field, 3, ""},
-		{"OptionalHeader64.SizeOfCode", Field, 3, ""},
-		{"OptionalHeader64.SizeOfHeaders", Field, 3, ""},
-		{"OptionalHeader64.SizeOfHeapCommit", Field, 3, ""},
-		{"OptionalHeader64.SizeOfHeapReserve", Field, 3, ""},
-		{"OptionalHeader64.SizeOfImage", Field, 3, ""},
-		{"OptionalHeader64.SizeOfInitializedData", Field, 3, ""},
-		{"OptionalHeader64.SizeOfStackCommit", Field, 3, ""},
-		{"OptionalHeader64.SizeOfStackReserve", Field, 3, ""},
-		{"OptionalHeader64.SizeOfUninitializedData", Field, 3, ""},
-		{"OptionalHeader64.Subsystem", Field, 3, ""},
-		{"OptionalHeader64.Win32VersionValue", Field, 3, ""},
-		{"Reloc", Type, 8, ""},
-		{"Reloc.SymbolTableIndex", Field, 8, ""},
-		{"Reloc.Type", Field, 8, ""},
-		{"Reloc.VirtualAddress", Field, 8, ""},
-		{"Section", Type, 0, ""},
-		{"Section.ReaderAt", Field, 0, ""},
-		{"Section.Relocs", Field, 8, ""},
-		{"Section.SectionHeader", Field, 0, ""},
-		{"SectionHeader", Type, 0, ""},
-		{"SectionHeader.Characteristics", Field, 0, ""},
-		{"SectionHeader.Name", Field, 0, ""},
-		{"SectionHeader.NumberOfLineNumbers", Field, 0, ""},
-		{"SectionHeader.NumberOfRelocations", Field, 0, ""},
-		{"SectionHeader.Offset", Field, 0, ""},
-		{"SectionHeader.PointerToLineNumbers", Field, 0, ""},
-		{"SectionHeader.PointerToRelocations", Field, 0, ""},
-		{"SectionHeader.Size", Field, 0, ""},
-		{"SectionHeader.VirtualAddress", Field, 0, ""},
-		{"SectionHeader.VirtualSize", Field, 0, ""},
-		{"SectionHeader32", Type, 0, ""},
-		{"SectionHeader32.Characteristics", Field, 0, ""},
-		{"SectionHeader32.Name", Field, 0, ""},
-		{"SectionHeader32.NumberOfLineNumbers", Field, 0, ""},
-		{"SectionHeader32.NumberOfRelocations", Field, 0, ""},
-		{"SectionHeader32.PointerToLineNumbers", Field, 0, ""},
-		{"SectionHeader32.PointerToRawData", Field, 0, ""},
-		{"SectionHeader32.PointerToRelocations", Field, 0, ""},
-		{"SectionHeader32.SizeOfRawData", Field, 0, ""},
-		{"SectionHeader32.VirtualAddress", Field, 0, ""},
-		{"SectionHeader32.VirtualSize", Field, 0, ""},
-		{"StringTable", Type, 8, ""},
-		{"Symbol", Type, 1, ""},
-		{"Symbol.Name", Field, 1, ""},
-		{"Symbol.SectionNumber", Field, 1, ""},
-		{"Symbol.StorageClass", Field, 1, ""},
-		{"Symbol.Type", Field, 1, ""},
-		{"Symbol.Value", Field, 1, ""},
-	},
-	"debug/plan9obj": {
-		{"(*File).Close", Method, 3, ""},
-		{"(*File).Section", Method, 3, ""},
-		{"(*File).Symbols", Method, 3, ""},
-		{"(*Section).Data", Method, 3, ""},
-		{"(*Section).Open", Method, 3, ""},
-		{"(Section).ReadAt", Method, 3, ""},
-		{"ErrNoSymbols", Var, 18, ""},
-		{"File", Type, 3, ""},
-		{"File.FileHeader", Field, 3, ""},
-		{"File.Sections", Field, 3, ""},
-		{"FileHeader", Type, 3, ""},
-		{"FileHeader.Bss", Field, 3, ""},
-		{"FileHeader.Entry", Field, 3, ""},
-		{"FileHeader.HdrSize", Field, 4, ""},
-		{"FileHeader.LoadAddress", Field, 4, ""},
-		{"FileHeader.Magic", Field, 3, ""},
-		{"FileHeader.PtrSize", Field, 3, ""},
-		{"Magic386", Const, 3, ""},
-		{"Magic64", Const, 3, ""},
-		{"MagicAMD64", Const, 3, ""},
-		{"MagicARM", Const, 3, ""},
-		{"NewFile", Func, 3, "func(r io.ReaderAt) (*File, error)"},
-		{"Open", Func, 3, "func(name string) (*File, error)"},
-		{"Section", Type, 3, ""},
-		{"Section.ReaderAt", Field, 3, ""},
-		{"Section.SectionHeader", Field, 3, ""},
-		{"SectionHeader", Type, 3, ""},
-		{"SectionHeader.Name", Field, 3, ""},
-		{"SectionHeader.Offset", Field, 3, ""},
-		{"SectionHeader.Size", Field, 3, ""},
-		{"Sym", Type, 3, ""},
-		{"Sym.Name", Field, 3, ""},
-		{"Sym.Type", Field, 3, ""},
-		{"Sym.Value", Field, 3, ""},
-	},
-	"embed": {
-		{"(FS).Open", Method, 16, ""},
-		{"(FS).ReadDir", Method, 16, ""},
-		{"(FS).ReadFile", Method, 16, ""},
-		{"FS", Type, 16, ""},
-	},
-	"encoding": {
-		{"BinaryAppender", Type, 24, ""},
-		{"BinaryMarshaler", Type, 2, ""},
-		{"BinaryUnmarshaler", Type, 2, ""},
-		{"TextAppender", Type, 24, ""},
-		{"TextMarshaler", Type, 2, ""},
-		{"TextUnmarshaler", Type, 2, ""},
-	},
-	"encoding/ascii85": {
-		{"(CorruptInputError).Error", Method, 0, ""},
-		{"CorruptInputError", Type, 0, ""},
-		{"Decode", Func, 0, "func(dst []byte, src []byte, flush bool) (ndst int, nsrc int, err error)"},
-		{"Encode", Func, 0, "func(dst []byte, src []byte) int"},
-		{"MaxEncodedLen", Func, 0, "func(n int) int"},
-		{"NewDecoder", Func, 0, "func(r io.Reader) io.Reader"},
-		{"NewEncoder", Func, 0, "func(w io.Writer) io.WriteCloser"},
-	},
-	"encoding/asn1": {
-		{"(BitString).At", Method, 0, ""},
-		{"(BitString).RightAlign", Method, 0, ""},
-		{"(ObjectIdentifier).Equal", Method, 0, ""},
-		{"(ObjectIdentifier).String", Method, 3, ""},
-		{"(StructuralError).Error", Method, 0, ""},
-		{"(SyntaxError).Error", Method, 0, ""},
-		{"BitString", Type, 0, ""},
-		{"BitString.BitLength", Field, 0, ""},
-		{"BitString.Bytes", Field, 0, ""},
-		{"ClassApplication", Const, 6, ""},
-		{"ClassContextSpecific", Const, 6, ""},
-		{"ClassPrivate", Const, 6, ""},
-		{"ClassUniversal", Const, 6, ""},
-		{"Enumerated", Type, 0, ""},
-		{"Flag", Type, 0, ""},
-		{"Marshal", Func, 0, "func(val any) ([]byte, error)"},
-		{"MarshalWithParams", Func, 10, "func(val any, params string) ([]byte, error)"},
-		{"NullBytes", Var, 9, ""},
-		{"NullRawValue", Var, 9, ""},
-		{"ObjectIdentifier", Type, 0, ""},
-		{"RawContent", Type, 0, ""},
-		{"RawValue", Type, 0, ""},
-		{"RawValue.Bytes", Field, 0, ""},
-		{"RawValue.Class", Field, 0, ""},
-		{"RawValue.FullBytes", Field, 0, ""},
-		{"RawValue.IsCompound", Field, 0, ""},
-		{"RawValue.Tag", Field, 0, ""},
-		{"StructuralError", Type, 0, ""},
-		{"StructuralError.Msg", Field, 0, ""},
-		{"SyntaxError", Type, 0, ""},
-		{"SyntaxError.Msg", Field, 0, ""},
-		{"TagBMPString", Const, 14, ""},
-		{"TagBitString", Const, 6, ""},
-		{"TagBoolean", Const, 6, ""},
-		{"TagEnum", Const, 6, ""},
-		{"TagGeneralString", Const, 6, ""},
-		{"TagGeneralizedTime", Const, 6, ""},
-		{"TagIA5String", Const, 6, ""},
-		{"TagInteger", Const, 6, ""},
-		{"TagNull", Const, 9, ""},
-		{"TagNumericString", Const, 10, ""},
-		{"TagOID", Const, 6, ""},
-		{"TagOctetString", Const, 6, ""},
-		{"TagPrintableString", Const, 6, ""},
-		{"TagSequence", Const, 6, ""},
-		{"TagSet", Const, 6, ""},
-		{"TagT61String", Const, 6, ""},
-		{"TagUTCTime", Const, 6, ""},
-		{"TagUTF8String", Const, 6, ""},
-		{"Unmarshal", Func, 0, "func(b []byte, val any) (rest []byte, err error)"},
-		{"UnmarshalWithParams", Func, 0, "func(b []byte, val any, params string) (rest []byte, err error)"},
-	},
-	"encoding/base32": {
-		{"(*Encoding).AppendDecode", Method, 22, ""},
-		{"(*Encoding).AppendEncode", Method, 22, ""},
-		{"(*Encoding).Decode", Method, 0, ""},
-		{"(*Encoding).DecodeString", Method, 0, ""},
-		{"(*Encoding).DecodedLen", Method, 0, ""},
-		{"(*Encoding).Encode", Method, 0, ""},
-		{"(*Encoding).EncodeToString", Method, 0, ""},
-		{"(*Encoding).EncodedLen", Method, 0, ""},
-		{"(CorruptInputError).Error", Method, 0, ""},
-		{"(Encoding).WithPadding", Method, 9, ""},
-		{"CorruptInputError", Type, 0, ""},
-		{"Encoding", Type, 0, ""},
-		{"HexEncoding", Var, 0, ""},
-		{"NewDecoder", Func, 0, "func(enc *Encoding, r io.Reader) io.Reader"},
-		{"NewEncoder", Func, 0, "func(enc *Encoding, w io.Writer) io.WriteCloser"},
-		{"NewEncoding", Func, 0, "func(encoder string) *Encoding"},
-		{"NoPadding", Const, 9, ""},
-		{"StdEncoding", Var, 0, ""},
-		{"StdPadding", Const, 9, ""},
-	},
-	"encoding/base64": {
-		{"(*Encoding).AppendDecode", Method, 22, ""},
-		{"(*Encoding).AppendEncode", Method, 22, ""},
-		{"(*Encoding).Decode", Method, 0, ""},
-		{"(*Encoding).DecodeString", Method, 0, ""},
-		{"(*Encoding).DecodedLen", Method, 0, ""},
-		{"(*Encoding).Encode", Method, 0, ""},
-		{"(*Encoding).EncodeToString", Method, 0, ""},
-		{"(*Encoding).EncodedLen", Method, 0, ""},
-		{"(CorruptInputError).Error", Method, 0, ""},
-		{"(Encoding).Strict", Method, 8, ""},
-		{"(Encoding).WithPadding", Method, 5, ""},
-		{"CorruptInputError", Type, 0, ""},
-		{"Encoding", Type, 0, ""},
-		{"NewDecoder", Func, 0, "func(enc *Encoding, r io.Reader) io.Reader"},
-		{"NewEncoder", Func, 0, "func(enc *Encoding, w io.Writer) io.WriteCloser"},
-		{"NewEncoding", Func, 0, "func(encoder string) *Encoding"},
-		{"NoPadding", Const, 5, ""},
-		{"RawStdEncoding", Var, 5, ""},
-		{"RawURLEncoding", Var, 5, ""},
-		{"StdEncoding", Var, 0, ""},
-		{"StdPadding", Const, 5, ""},
-		{"URLEncoding", Var, 0, ""},
-	},
-	"encoding/binary": {
-		{"Append", Func, 23, "func(buf []byte, order ByteOrder, data any) ([]byte, error)"},
-		{"AppendByteOrder", Type, 19, ""},
-		{"AppendUvarint", Func, 19, "func(buf []byte, x uint64) []byte"},
-		{"AppendVarint", Func, 19, "func(buf []byte, x int64) []byte"},
-		{"BigEndian", Var, 0, ""},
-		{"ByteOrder", Type, 0, ""},
-		{"Decode", Func, 23, "func(buf []byte, order ByteOrder, data any) (int, error)"},
-		{"Encode", Func, 23, "func(buf []byte, order ByteOrder, data any) (int, error)"},
-		{"LittleEndian", Var, 0, ""},
-		{"MaxVarintLen16", Const, 0, ""},
-		{"MaxVarintLen32", Const, 0, ""},
-		{"MaxVarintLen64", Const, 0, ""},
-		{"NativeEndian", Var, 21, ""},
-		{"PutUvarint", Func, 0, "func(buf []byte, x uint64) int"},
-		{"PutVarint", Func, 0, "func(buf []byte, x int64) int"},
-		{"Read", Func, 0, "func(r io.Reader, order ByteOrder, data any) error"},
-		{"ReadUvarint", Func, 0, "func(r io.ByteReader) (uint64, error)"},
-		{"ReadVarint", Func, 0, "func(r io.ByteReader) (int64, error)"},
-		{"Size", Func, 0, "func(v any) int"},
-		{"Uvarint", Func, 0, "func(buf []byte) (uint64, int)"},
-		{"Varint", Func, 0, "func(buf []byte) (int64, int)"},
-		{"Write", Func, 0, "func(w io.Writer, order ByteOrder, data any) error"},
-	},
-	"encoding/csv": {
-		{"(*ParseError).Error", Method, 0, ""},
-		{"(*ParseError).Unwrap", Method, 13, ""},
-		{"(*Reader).FieldPos", Method, 17, ""},
-		{"(*Reader).InputOffset", Method, 19, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Reader).ReadAll", Method, 0, ""},
-		{"(*Writer).Error", Method, 1, ""},
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"(*Writer).WriteAll", Method, 0, ""},
-		{"ErrBareQuote", Var, 0, ""},
-		{"ErrFieldCount", Var, 0, ""},
-		{"ErrQuote", Var, 0, ""},
-		{"ErrTrailingComma", Var, 0, ""},
-		{"NewReader", Func, 0, "func(r io.Reader) *Reader"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"ParseError", Type, 0, ""},
-		{"ParseError.Column", Field, 0, ""},
-		{"ParseError.Err", Field, 0, ""},
-		{"ParseError.Line", Field, 0, ""},
-		{"ParseError.StartLine", Field, 10, ""},
-		{"Reader", Type, 0, ""},
-		{"Reader.Comma", Field, 0, ""},
-		{"Reader.Comment", Field, 0, ""},
-		{"Reader.FieldsPerRecord", Field, 0, ""},
-		{"Reader.LazyQuotes", Field, 0, ""},
-		{"Reader.ReuseRecord", Field, 9, ""},
-		{"Reader.TrailingComma", Field, 0, ""},
-		{"Reader.TrimLeadingSpace", Field, 0, ""},
-		{"Writer", Type, 0, ""},
-		{"Writer.Comma", Field, 0, ""},
-		{"Writer.UseCRLF", Field, 0, ""},
-	},
-	"encoding/gob": {
-		{"(*Decoder).Decode", Method, 0, ""},
-		{"(*Decoder).DecodeValue", Method, 0, ""},
-		{"(*Encoder).Encode", Method, 0, ""},
-		{"(*Encoder).EncodeValue", Method, 0, ""},
-		{"CommonType", Type, 0, ""},
-		{"CommonType.Id", Field, 0, ""},
-		{"CommonType.Name", Field, 0, ""},
-		{"Decoder", Type, 0, ""},
-		{"Encoder", Type, 0, ""},
-		{"GobDecoder", Type, 0, ""},
-		{"GobEncoder", Type, 0, ""},
-		{"NewDecoder", Func, 0, "func(r io.Reader) *Decoder"},
-		{"NewEncoder", Func, 0, "func(w io.Writer) *Encoder"},
-		{"Register", Func, 0, "func(value any)"},
-		{"RegisterName", Func, 0, "func(name string, value any)"},
-	},
-	"encoding/hex": {
-		{"(InvalidByteError).Error", Method, 0, ""},
-		{"AppendDecode", Func, 22, "func(dst []byte, src []byte) ([]byte, error)"},
-		{"AppendEncode", Func, 22, "func(dst []byte, src []byte) []byte"},
-		{"Decode", Func, 0, "func(dst []byte, src []byte) (int, error)"},
-		{"DecodeString", Func, 0, "func(s string) ([]byte, error)"},
-		{"DecodedLen", Func, 0, "func(x int) int"},
-		{"Dump", Func, 0, "func(data []byte) string"},
-		{"Dumper", Func, 0, "func(w io.Writer) io.WriteCloser"},
-		{"Encode", Func, 0, "func(dst []byte, src []byte) int"},
-		{"EncodeToString", Func, 0, "func(src []byte) string"},
-		{"EncodedLen", Func, 0, "func(n int) int"},
-		{"ErrLength", Var, 0, ""},
-		{"InvalidByteError", Type, 0, ""},
-		{"NewDecoder", Func, 10, "func(r io.Reader) io.Reader"},
-		{"NewEncoder", Func, 10, "func(w io.Writer) io.Writer"},
-	},
-	"encoding/json": {
-		{"(*Decoder).Buffered", Method, 1, ""},
-		{"(*Decoder).Decode", Method, 0, ""},
-		{"(*Decoder).DisallowUnknownFields", Method, 10, ""},
-		{"(*Decoder).InputOffset", Method, 14, ""},
-		{"(*Decoder).More", Method, 5, ""},
-		{"(*Decoder).Token", Method, 5, ""},
-		{"(*Decoder).UseNumber", Method, 1, ""},
-		{"(*Encoder).Encode", Method, 0, ""},
-		{"(*Encoder).SetEscapeHTML", Method, 7, ""},
-		{"(*Encoder).SetIndent", Method, 7, ""},
-		{"(*InvalidUTF8Error).Error", Method, 0, ""},
-		{"(*InvalidUnmarshalError).Error", Method, 0, ""},
-		{"(*MarshalerError).Error", Method, 0, ""},
-		{"(*MarshalerError).Unwrap", Method, 13, ""},
-		{"(*RawMessage).MarshalJSON", Method, 0, ""},
-		{"(*RawMessage).UnmarshalJSON", Method, 0, ""},
-		{"(*SyntaxError).Error", Method, 0, ""},
-		{"(*UnmarshalFieldError).Error", Method, 0, ""},
-		{"(*UnmarshalTypeError).Error", Method, 0, ""},
-		{"(*UnsupportedTypeError).Error", Method, 0, ""},
-		{"(*UnsupportedValueError).Error", Method, 0, ""},
-		{"(Delim).String", Method, 5, ""},
-		{"(Number).Float64", Method, 1, ""},
-		{"(Number).Int64", Method, 1, ""},
-		{"(Number).String", Method, 1, ""},
-		{"(RawMessage).MarshalJSON", Method, 8, ""},
-		{"Compact", Func, 0, "func(dst *bytes.Buffer, src []byte) error"},
-		{"Decoder", Type, 0, ""},
-		{"Delim", Type, 5, ""},
-		{"Encoder", Type, 0, ""},
-		{"HTMLEscape", Func, 0, "func(dst *bytes.Buffer, src []byte)"},
-		{"Indent", Func, 0, "func(dst *bytes.Buffer, src []byte, prefix string, indent string) error"},
-		{"InvalidUTF8Error", Type, 0, ""},
-		{"InvalidUTF8Error.S", Field, 0, ""},
-		{"InvalidUnmarshalError", Type, 0, ""},
-		{"InvalidUnmarshalError.Type", Field, 0, ""},
-		{"Marshal", Func, 0, "func(v any) ([]byte, error)"},
-		{"MarshalIndent", Func, 0, "func(v any, prefix string, indent string) ([]byte, error)"},
-		{"Marshaler", Type, 0, ""},
-		{"MarshalerError", Type, 0, ""},
-		{"MarshalerError.Err", Field, 0, ""},
-		{"MarshalerError.Type", Field, 0, ""},
-		{"NewDecoder", Func, 0, "func(r io.Reader) *Decoder"},
-		{"NewEncoder", Func, 0, "func(w io.Writer) *Encoder"},
-		{"Number", Type, 1, ""},
-		{"RawMessage", Type, 0, ""},
-		{"SyntaxError", Type, 0, ""},
-		{"SyntaxError.Offset", Field, 0, ""},
-		{"Token", Type, 5, ""},
-		{"Unmarshal", Func, 0, "func(data []byte, v any) error"},
-		{"UnmarshalFieldError", Type, 0, ""},
-		{"UnmarshalFieldError.Field", Field, 0, ""},
-		{"UnmarshalFieldError.Key", Field, 0, ""},
-		{"UnmarshalFieldError.Type", Field, 0, ""},
-		{"UnmarshalTypeError", Type, 0, ""},
-		{"UnmarshalTypeError.Field", Field, 8, ""},
-		{"UnmarshalTypeError.Offset", Field, 5, ""},
-		{"UnmarshalTypeError.Struct", Field, 8, ""},
-		{"UnmarshalTypeError.Type", Field, 0, ""},
-		{"UnmarshalTypeError.Value", Field, 0, ""},
-		{"Unmarshaler", Type, 0, ""},
-		{"UnsupportedTypeError", Type, 0, ""},
-		{"UnsupportedTypeError.Type", Field, 0, ""},
-		{"UnsupportedValueError", Type, 0, ""},
-		{"UnsupportedValueError.Str", Field, 0, ""},
-		{"UnsupportedValueError.Value", Field, 0, ""},
-		{"Valid", Func, 9, "func(data []byte) bool"},
-	},
-	"encoding/pem": {
-		{"Block", Type, 0, ""},
-		{"Block.Bytes", Field, 0, ""},
-		{"Block.Headers", Field, 0, ""},
-		{"Block.Type", Field, 0, ""},
-		{"Decode", Func, 0, "func(data []byte) (p *Block, rest []byte)"},
-		{"Encode", Func, 0, "func(out io.Writer, b *Block) error"},
-		{"EncodeToMemory", Func, 0, "func(b *Block) []byte"},
-	},
-	"encoding/xml": {
-		{"(*Decoder).Decode", Method, 0, ""},
-		{"(*Decoder).DecodeElement", Method, 0, ""},
-		{"(*Decoder).InputOffset", Method, 4, ""},
-		{"(*Decoder).InputPos", Method, 19, ""},
-		{"(*Decoder).RawToken", Method, 0, ""},
-		{"(*Decoder).Skip", Method, 0, ""},
-		{"(*Decoder).Token", Method, 0, ""},
-		{"(*Encoder).Close", Method, 20, ""},
-		{"(*Encoder).Encode", Method, 0, ""},
-		{"(*Encoder).EncodeElement", Method, 2, ""},
-		{"(*Encoder).EncodeToken", Method, 2, ""},
-		{"(*Encoder).Flush", Method, 2, ""},
-		{"(*Encoder).Indent", Method, 1, ""},
-		{"(*SyntaxError).Error", Method, 0, ""},
-		{"(*TagPathError).Error", Method, 0, ""},
-		{"(*UnsupportedTypeError).Error", Method, 0, ""},
-		{"(CharData).Copy", Method, 0, ""},
-		{"(Comment).Copy", Method, 0, ""},
-		{"(Directive).Copy", Method, 0, ""},
-		{"(ProcInst).Copy", Method, 0, ""},
-		{"(StartElement).Copy", Method, 0, ""},
-		{"(StartElement).End", Method, 2, ""},
-		{"(UnmarshalError).Error", Method, 0, ""},
-		{"Attr", Type, 0, ""},
-		{"Attr.Name", Field, 0, ""},
-		{"Attr.Value", Field, 0, ""},
-		{"CharData", Type, 0, ""},
-		{"Comment", Type, 0, ""},
-		{"CopyToken", Func, 0, "func(t Token) Token"},
-		{"Decoder", Type, 0, ""},
-		{"Decoder.AutoClose", Field, 0, ""},
-		{"Decoder.CharsetReader", Field, 0, ""},
-		{"Decoder.DefaultSpace", Field, 1, ""},
-		{"Decoder.Entity", Field, 0, ""},
-		{"Decoder.Strict", Field, 0, ""},
-		{"Directive", Type, 0, ""},
-		{"Encoder", Type, 0, ""},
-		{"EndElement", Type, 0, ""},
-		{"EndElement.Name", Field, 0, ""},
-		{"Escape", Func, 0, "func(w io.Writer, s []byte)"},
-		{"EscapeText", Func, 1, "func(w io.Writer, s []byte) error"},
-		{"HTMLAutoClose", Var, 0, ""},
-		{"HTMLEntity", Var, 0, ""},
-		{"Header", Const, 0, ""},
-		{"Marshal", Func, 0, "func(v any) ([]byte, error)"},
-		{"MarshalIndent", Func, 0, "func(v any, prefix string, indent string) ([]byte, error)"},
-		{"Marshaler", Type, 2, ""},
-		{"MarshalerAttr", Type, 2, ""},
-		{"Name", Type, 0, ""},
-		{"Name.Local", Field, 0, ""},
-		{"Name.Space", Field, 0, ""},
-		{"NewDecoder", Func, 0, "func(r io.Reader) *Decoder"},
-		{"NewEncoder", Func, 0, "func(w io.Writer) *Encoder"},
-		{"NewTokenDecoder", Func, 10, "func(t TokenReader) *Decoder"},
-		{"ProcInst", Type, 0, ""},
-		{"ProcInst.Inst", Field, 0, ""},
-		{"ProcInst.Target", Field, 0, ""},
-		{"StartElement", Type, 0, ""},
-		{"StartElement.Attr", Field, 0, ""},
-		{"StartElement.Name", Field, 0, ""},
-		{"SyntaxError", Type, 0, ""},
-		{"SyntaxError.Line", Field, 0, ""},
-		{"SyntaxError.Msg", Field, 0, ""},
-		{"TagPathError", Type, 0, ""},
-		{"TagPathError.Field1", Field, 0, ""},
-		{"TagPathError.Field2", Field, 0, ""},
-		{"TagPathError.Struct", Field, 0, ""},
-		{"TagPathError.Tag1", Field, 0, ""},
-		{"TagPathError.Tag2", Field, 0, ""},
-		{"Token", Type, 0, ""},
-		{"TokenReader", Type, 10, ""},
-		{"Unmarshal", Func, 0, "func(data []byte, v any) error"},
-		{"UnmarshalError", Type, 0, ""},
-		{"Unmarshaler", Type, 2, ""},
-		{"UnmarshalerAttr", Type, 2, ""},
-		{"UnsupportedTypeError", Type, 0, ""},
-		{"UnsupportedTypeError.Type", Field, 0, ""},
-	},
-	"errors": {
-		{"As", Func, 13, "func(err error, target any) bool"},
-		{"ErrUnsupported", Var, 21, ""},
-		{"Is", Func, 13, "func(err error, target error) bool"},
-		{"Join", Func, 20, "func(errs ...error) error"},
-		{"New", Func, 0, "func(text string) error"},
-		{"Unwrap", Func, 13, "func(err error) error"},
-	},
-	"expvar": {
-		{"(*Float).Add", Method, 0, ""},
-		{"(*Float).Set", Method, 0, ""},
-		{"(*Float).String", Method, 0, ""},
-		{"(*Float).Value", Method, 8, ""},
-		{"(*Int).Add", Method, 0, ""},
-		{"(*Int).Set", Method, 0, ""},
-		{"(*Int).String", Method, 0, ""},
-		{"(*Int).Value", Method, 8, ""},
-		{"(*Map).Add", Method, 0, ""},
-		{"(*Map).AddFloat", Method, 0, ""},
-		{"(*Map).Delete", Method, 12, ""},
-		{"(*Map).Do", Method, 0, ""},
-		{"(*Map).Get", Method, 0, ""},
-		{"(*Map).Init", Method, 0, ""},
-		{"(*Map).Set", Method, 0, ""},
-		{"(*Map).String", Method, 0, ""},
-		{"(*String).Set", Method, 0, ""},
-		{"(*String).String", Method, 0, ""},
-		{"(*String).Value", Method, 8, ""},
-		{"(Func).String", Method, 0, ""},
-		{"(Func).Value", Method, 8, ""},
-		{"Do", Func, 0, "func(f func(KeyValue))"},
-		{"Float", Type, 0, ""},
-		{"Func", Type, 0, ""},
-		{"Get", Func, 0, "func(name string) Var"},
-		{"Handler", Func, 8, "func() http.Handler"},
-		{"Int", Type, 0, ""},
-		{"KeyValue", Type, 0, ""},
-		{"KeyValue.Key", Field, 0, ""},
-		{"KeyValue.Value", Field, 0, ""},
-		{"Map", Type, 0, ""},
-		{"NewFloat", Func, 0, "func(name string) *Float"},
-		{"NewInt", Func, 0, "func(name string) *Int"},
-		{"NewMap", Func, 0, "func(name string) *Map"},
-		{"NewString", Func, 0, "func(name string) *String"},
-		{"Publish", Func, 0, "func(name string, v Var)"},
-		{"String", Type, 0, ""},
-		{"Var", Type, 0, ""},
-	},
-	"flag": {
-		{"(*FlagSet).Arg", Method, 0, ""},
-		{"(*FlagSet).Args", Method, 0, ""},
-		{"(*FlagSet).Bool", Method, 0, ""},
-		{"(*FlagSet).BoolFunc", Method, 21, ""},
-		{"(*FlagSet).BoolVar", Method, 0, ""},
-		{"(*FlagSet).Duration", Method, 0, ""},
-		{"(*FlagSet).DurationVar", Method, 0, ""},
-		{"(*FlagSet).ErrorHandling", Method, 10, ""},
-		{"(*FlagSet).Float64", Method, 0, ""},
-		{"(*FlagSet).Float64Var", Method, 0, ""},
-		{"(*FlagSet).Func", Method, 16, ""},
-		{"(*FlagSet).Init", Method, 0, ""},
-		{"(*FlagSet).Int", Method, 0, ""},
-		{"(*FlagSet).Int64", Method, 0, ""},
-		{"(*FlagSet).Int64Var", Method, 0, ""},
-		{"(*FlagSet).IntVar", Method, 0, ""},
-		{"(*FlagSet).Lookup", Method, 0, ""},
-		{"(*FlagSet).NArg", Method, 0, ""},
-		{"(*FlagSet).NFlag", Method, 0, ""},
-		{"(*FlagSet).Name", Method, 10, ""},
-		{"(*FlagSet).Output", Method, 10, ""},
-		{"(*FlagSet).Parse", Method, 0, ""},
-		{"(*FlagSet).Parsed", Method, 0, ""},
-		{"(*FlagSet).PrintDefaults", Method, 0, ""},
-		{"(*FlagSet).Set", Method, 0, ""},
-		{"(*FlagSet).SetOutput", Method, 0, ""},
-		{"(*FlagSet).String", Method, 0, ""},
-		{"(*FlagSet).StringVar", Method, 0, ""},
-		{"(*FlagSet).TextVar", Method, 19, ""},
-		{"(*FlagSet).Uint", Method, 0, ""},
-		{"(*FlagSet).Uint64", Method, 0, ""},
-		{"(*FlagSet).Uint64Var", Method, 0, ""},
-		{"(*FlagSet).UintVar", Method, 0, ""},
-		{"(*FlagSet).Var", Method, 0, ""},
-		{"(*FlagSet).Visit", Method, 0, ""},
-		{"(*FlagSet).VisitAll", Method, 0, ""},
-		{"Arg", Func, 0, "func(i int) string"},
-		{"Args", Func, 0, "func() []string"},
-		{"Bool", Func, 0, "func(name string, value bool, usage string) *bool"},
-		{"BoolFunc", Func, 21, "func(name string, usage string, fn func(string) error)"},
-		{"BoolVar", Func, 0, "func(p *bool, name string, value bool, usage string)"},
-		{"CommandLine", Var, 2, ""},
-		{"ContinueOnError", Const, 0, ""},
-		{"Duration", Func, 0, "func(name string, value time.Duration, usage string) *time.Duration"},
-		{"DurationVar", Func, 0, "func(p *time.Duration, name string, value time.Duration, usage string)"},
-		{"ErrHelp", Var, 0, ""},
-		{"ErrorHandling", Type, 0, ""},
-		{"ExitOnError", Const, 0, ""},
-		{"Flag", Type, 0, ""},
-		{"Flag.DefValue", Field, 0, ""},
-		{"Flag.Name", Field, 0, ""},
-		{"Flag.Usage", Field, 0, ""},
-		{"Flag.Value", Field, 0, ""},
-		{"FlagSet", Type, 0, ""},
-		{"FlagSet.Usage", Field, 0, ""},
-		{"Float64", Func, 0, "func(name string, value float64, usage string) *float64"},
-		{"Float64Var", Func, 0, "func(p *float64, name string, value float64, usage string)"},
-		{"Func", Func, 16, "func(name string, usage string, fn func(string) error)"},
-		{"Getter", Type, 2, ""},
-		{"Int", Func, 0, "func(name string, value int, usage string) *int"},
-		{"Int64", Func, 0, "func(name string, value int64, usage string) *int64"},
-		{"Int64Var", Func, 0, "func(p *int64, name string, value int64, usage string)"},
-		{"IntVar", Func, 0, "func(p *int, name string, value int, usage string)"},
-		{"Lookup", Func, 0, "func(name string) *Flag"},
-		{"NArg", Func, 0, "func() int"},
-		{"NFlag", Func, 0, "func() int"},
-		{"NewFlagSet", Func, 0, "func(name string, errorHandling ErrorHandling) *FlagSet"},
-		{"PanicOnError", Const, 0, ""},
-		{"Parse", Func, 0, "func()"},
-		{"Parsed", Func, 0, "func() bool"},
-		{"PrintDefaults", Func, 0, "func()"},
-		{"Set", Func, 0, "func(name string, value string) error"},
-		{"String", Func, 0, "func(name string, value string, usage string) *string"},
-		{"StringVar", Func, 0, "func(p *string, name string, value string, usage string)"},
-		{"TextVar", Func, 19, "func(p encoding.TextUnmarshaler, name string, value encoding.TextMarshaler, usage string)"},
-		{"Uint", Func, 0, "func(name string, value uint, usage string) *uint"},
-		{"Uint64", Func, 0, "func(name string, value uint64, usage string) *uint64"},
-		{"Uint64Var", Func, 0, "func(p *uint64, name string, value uint64, usage string)"},
-		{"UintVar", Func, 0, "func(p *uint, name string, value uint, usage string)"},
-		{"UnquoteUsage", Func, 5, "func(flag *Flag) (name string, usage string)"},
-		{"Usage", Var, 0, ""},
-		{"Value", Type, 0, ""},
-		{"Var", Func, 0, "func(value Value, name string, usage string)"},
-		{"Visit", Func, 0, "func(fn func(*Flag))"},
-		{"VisitAll", Func, 0, "func(fn func(*Flag))"},
-	},
-	"fmt": {
-		{"Append", Func, 19, "func(b []byte, a ...any) []byte"},
-		{"Appendf", Func, 19, "func(b []byte, format string, a ...any) []byte"},
-		{"Appendln", Func, 19, "func(b []byte, a ...any) []byte"},
-		{"Errorf", Func, 0, "func(format string, a ...any) error"},
-		{"FormatString", Func, 20, "func(state State, verb rune) string"},
-		{"Formatter", Type, 0, ""},
-		{"Fprint", Func, 0, "func(w io.Writer, a ...any) (n int, err error)"},
-		{"Fprintf", Func, 0, "func(w io.Writer, format string, a ...any) (n int, err error)"},
-		{"Fprintln", Func, 0, "func(w io.Writer, a ...any) (n int, err error)"},
-		{"Fscan", Func, 0, "func(r io.Reader, a ...any) (n int, err error)"},
-		{"Fscanf", Func, 0, "func(r io.Reader, format string, a ...any) (n int, err error)"},
-		{"Fscanln", Func, 0, "func(r io.Reader, a ...any) (n int, err error)"},
-		{"GoStringer", Type, 0, ""},
-		{"Print", Func, 0, "func(a ...any) (n int, err error)"},
-		{"Printf", Func, 0, "func(format string, a ...any) (n int, err error)"},
-		{"Println", Func, 0, "func(a ...any) (n int, err error)"},
-		{"Scan", Func, 0, "func(a ...any) (n int, err error)"},
-		{"ScanState", Type, 0, ""},
-		{"Scanf", Func, 0, "func(format string, a ...any) (n int, err error)"},
-		{"Scanln", Func, 0, "func(a ...any) (n int, err error)"},
-		{"Scanner", Type, 0, ""},
-		{"Sprint", Func, 0, "func(a ...any) string"},
-		{"Sprintf", Func, 0, "func(format string, a ...any) string"},
-		{"Sprintln", Func, 0, "func(a ...any) string"},
-		{"Sscan", Func, 0, "func(str string, a ...any) (n int, err error)"},
-		{"Sscanf", Func, 0, "func(str string, format string, a ...any) (n int, err error)"},
-		{"Sscanln", Func, 0, "func(str string, a ...any) (n int, err error)"},
-		{"State", Type, 0, ""},
-		{"Stringer", Type, 0, ""},
-	},
-	"go/ast": {
-		{"(*ArrayType).End", Method, 0, ""},
-		{"(*ArrayType).Pos", Method, 0, ""},
-		{"(*AssignStmt).End", Method, 0, ""},
-		{"(*AssignStmt).Pos", Method, 0, ""},
-		{"(*BadDecl).End", Method, 0, ""},
-		{"(*BadDecl).Pos", Method, 0, ""},
-		{"(*BadExpr).End", Method, 0, ""},
-		{"(*BadExpr).Pos", Method, 0, ""},
-		{"(*BadStmt).End", Method, 0, ""},
-		{"(*BadStmt).Pos", Method, 0, ""},
-		{"(*BasicLit).End", Method, 0, ""},
-		{"(*BasicLit).Pos", Method, 0, ""},
-		{"(*BinaryExpr).End", Method, 0, ""},
-		{"(*BinaryExpr).Pos", Method, 0, ""},
-		{"(*BlockStmt).End", Method, 0, ""},
-		{"(*BlockStmt).Pos", Method, 0, ""},
-		{"(*BranchStmt).End", Method, 0, ""},
-		{"(*BranchStmt).Pos", Method, 0, ""},
-		{"(*CallExpr).End", Method, 0, ""},
-		{"(*CallExpr).Pos", Method, 0, ""},
-		{"(*CaseClause).End", Method, 0, ""},
-		{"(*CaseClause).Pos", Method, 0, ""},
-		{"(*ChanType).End", Method, 0, ""},
-		{"(*ChanType).Pos", Method, 0, ""},
-		{"(*CommClause).End", Method, 0, ""},
-		{"(*CommClause).Pos", Method, 0, ""},
-		{"(*Comment).End", Method, 0, ""},
-		{"(*Comment).Pos", Method, 0, ""},
-		{"(*CommentGroup).End", Method, 0, ""},
-		{"(*CommentGroup).Pos", Method, 0, ""},
-		{"(*CommentGroup).Text", Method, 0, ""},
-		{"(*CompositeLit).End", Method, 0, ""},
-		{"(*CompositeLit).Pos", Method, 0, ""},
-		{"(*DeclStmt).End", Method, 0, ""},
-		{"(*DeclStmt).Pos", Method, 0, ""},
-		{"(*DeferStmt).End", Method, 0, ""},
-		{"(*DeferStmt).Pos", Method, 0, ""},
-		{"(*Ellipsis).End", Method, 0, ""},
-		{"(*Ellipsis).Pos", Method, 0, ""},
-		{"(*EmptyStmt).End", Method, 0, ""},
-		{"(*EmptyStmt).Pos", Method, 0, ""},
-		{"(*ExprStmt).End", Method, 0, ""},
-		{"(*ExprStmt).Pos", Method, 0, ""},
-		{"(*Field).End", Method, 0, ""},
-		{"(*Field).Pos", Method, 0, ""},
-		{"(*FieldList).End", Method, 0, ""},
-		{"(*FieldList).NumFields", Method, 0, ""},
-		{"(*FieldList).Pos", Method, 0, ""},
-		{"(*File).End", Method, 0, ""},
-		{"(*File).Pos", Method, 0, ""},
-		{"(*ForStmt).End", Method, 0, ""},
-		{"(*ForStmt).Pos", Method, 0, ""},
-		{"(*FuncDecl).End", Method, 0, ""},
-		{"(*FuncDecl).Pos", Method, 0, ""},
-		{"(*FuncLit).End", Method, 0, ""},
-		{"(*FuncLit).Pos", Method, 0, ""},
-		{"(*FuncType).End", Method, 0, ""},
-		{"(*FuncType).Pos", Method, 0, ""},
-		{"(*GenDecl).End", Method, 0, ""},
-		{"(*GenDecl).Pos", Method, 0, ""},
-		{"(*GoStmt).End", Method, 0, ""},
-		{"(*GoStmt).Pos", Method, 0, ""},
-		{"(*Ident).End", Method, 0, ""},
-		{"(*Ident).IsExported", Method, 0, ""},
-		{"(*Ident).Pos", Method, 0, ""},
-		{"(*Ident).String", Method, 0, ""},
-		{"(*IfStmt).End", Method, 0, ""},
-		{"(*IfStmt).Pos", Method, 0, ""},
-		{"(*ImportSpec).End", Method, 0, ""},
-		{"(*ImportSpec).Pos", Method, 0, ""},
-		{"(*IncDecStmt).End", Method, 0, ""},
-		{"(*IncDecStmt).Pos", Method, 0, ""},
-		{"(*IndexExpr).End", Method, 0, ""},
-		{"(*IndexExpr).Pos", Method, 0, ""},
-		{"(*IndexListExpr).End", Method, 18, ""},
-		{"(*IndexListExpr).Pos", Method, 18, ""},
-		{"(*InterfaceType).End", Method, 0, ""},
-		{"(*InterfaceType).Pos", Method, 0, ""},
-		{"(*KeyValueExpr).End", Method, 0, ""},
-		{"(*KeyValueExpr).Pos", Method, 0, ""},
-		{"(*LabeledStmt).End", Method, 0, ""},
-		{"(*LabeledStmt).Pos", Method, 0, ""},
-		{"(*MapType).End", Method, 0, ""},
-		{"(*MapType).Pos", Method, 0, ""},
-		{"(*Object).Pos", Method, 0, ""},
-		{"(*Package).End", Method, 0, ""},
-		{"(*Package).Pos", Method, 0, ""},
-		{"(*ParenExpr).End", Method, 0, ""},
-		{"(*ParenExpr).Pos", Method, 0, ""},
-		{"(*RangeStmt).End", Method, 0, ""},
-		{"(*RangeStmt).Pos", Method, 0, ""},
-		{"(*ReturnStmt).End", Method, 0, ""},
-		{"(*ReturnStmt).Pos", Method, 0, ""},
-		{"(*Scope).Insert", Method, 0, ""},
-		{"(*Scope).Lookup", Method, 0, ""},
-		{"(*Scope).String", Method, 0, ""},
-		{"(*SelectStmt).End", Method, 0, ""},
-		{"(*SelectStmt).Pos", Method, 0, ""},
-		{"(*SelectorExpr).End", Method, 0, ""},
-		{"(*SelectorExpr).Pos", Method, 0, ""},
-		{"(*SendStmt).End", Method, 0, ""},
-		{"(*SendStmt).Pos", Method, 0, ""},
-		{"(*SliceExpr).End", Method, 0, ""},
-		{"(*SliceExpr).Pos", Method, 0, ""},
-		{"(*StarExpr).End", Method, 0, ""},
-		{"(*StarExpr).Pos", Method, 0, ""},
-		{"(*StructType).End", Method, 0, ""},
-		{"(*StructType).Pos", Method, 0, ""},
-		{"(*SwitchStmt).End", Method, 0, ""},
-		{"(*SwitchStmt).Pos", Method, 0, ""},
-		{"(*TypeAssertExpr).End", Method, 0, ""},
-		{"(*TypeAssertExpr).Pos", Method, 0, ""},
-		{"(*TypeSpec).End", Method, 0, ""},
-		{"(*TypeSpec).Pos", Method, 0, ""},
-		{"(*TypeSwitchStmt).End", Method, 0, ""},
-		{"(*TypeSwitchStmt).Pos", Method, 0, ""},
-		{"(*UnaryExpr).End", Method, 0, ""},
-		{"(*UnaryExpr).Pos", Method, 0, ""},
-		{"(*ValueSpec).End", Method, 0, ""},
-		{"(*ValueSpec).Pos", Method, 0, ""},
-		{"(CommentMap).Comments", Method, 1, ""},
-		{"(CommentMap).Filter", Method, 1, ""},
-		{"(CommentMap).String", Method, 1, ""},
-		{"(CommentMap).Update", Method, 1, ""},
-		{"(ObjKind).String", Method, 0, ""},
-		{"ArrayType", Type, 0, ""},
-		{"ArrayType.Elt", Field, 0, ""},
-		{"ArrayType.Lbrack", Field, 0, ""},
-		{"ArrayType.Len", Field, 0, ""},
-		{"AssignStmt", Type, 0, ""},
-		{"AssignStmt.Lhs", Field, 0, ""},
-		{"AssignStmt.Rhs", Field, 0, ""},
-		{"AssignStmt.Tok", Field, 0, ""},
-		{"AssignStmt.TokPos", Field, 0, ""},
-		{"Bad", Const, 0, ""},
-		{"BadDecl", Type, 0, ""},
-		{"BadDecl.From", Field, 0, ""},
-		{"BadDecl.To", Field, 0, ""},
-		{"BadExpr", Type, 0, ""},
-		{"BadExpr.From", Field, 0, ""},
-		{"BadExpr.To", Field, 0, ""},
-		{"BadStmt", Type, 0, ""},
-		{"BadStmt.From", Field, 0, ""},
-		{"BadStmt.To", Field, 0, ""},
-		{"BasicLit", Type, 0, ""},
-		{"BasicLit.Kind", Field, 0, ""},
-		{"BasicLit.Value", Field, 0, ""},
-		{"BasicLit.ValuePos", Field, 0, ""},
-		{"BinaryExpr", Type, 0, ""},
-		{"BinaryExpr.Op", Field, 0, ""},
-		{"BinaryExpr.OpPos", Field, 0, ""},
-		{"BinaryExpr.X", Field, 0, ""},
-		{"BinaryExpr.Y", Field, 0, ""},
-		{"BlockStmt", Type, 0, ""},
-		{"BlockStmt.Lbrace", Field, 0, ""},
-		{"BlockStmt.List", Field, 0, ""},
-		{"BlockStmt.Rbrace", Field, 0, ""},
-		{"BranchStmt", Type, 0, ""},
-		{"BranchStmt.Label", Field, 0, ""},
-		{"BranchStmt.Tok", Field, 0, ""},
-		{"BranchStmt.TokPos", Field, 0, ""},
-		{"CallExpr", Type, 0, ""},
-		{"CallExpr.Args", Field, 0, ""},
-		{"CallExpr.Ellipsis", Field, 0, ""},
-		{"CallExpr.Fun", Field, 0, ""},
-		{"CallExpr.Lparen", Field, 0, ""},
-		{"CallExpr.Rparen", Field, 0, ""},
-		{"CaseClause", Type, 0, ""},
-		{"CaseClause.Body", Field, 0, ""},
-		{"CaseClause.Case", Field, 0, ""},
-		{"CaseClause.Colon", Field, 0, ""},
-		{"CaseClause.List", Field, 0, ""},
-		{"ChanDir", Type, 0, ""},
-		{"ChanType", Type, 0, ""},
-		{"ChanType.Arrow", Field, 1, ""},
-		{"ChanType.Begin", Field, 0, ""},
-		{"ChanType.Dir", Field, 0, ""},
-		{"ChanType.Value", Field, 0, ""},
-		{"CommClause", Type, 0, ""},
-		{"CommClause.Body", Field, 0, ""},
-		{"CommClause.Case", Field, 0, ""},
-		{"CommClause.Colon", Field, 0, ""},
-		{"CommClause.Comm", Field, 0, ""},
-		{"Comment", Type, 0, ""},
-		{"Comment.Slash", Field, 0, ""},
-		{"Comment.Text", Field, 0, ""},
-		{"CommentGroup", Type, 0, ""},
-		{"CommentGroup.List", Field, 0, ""},
-		{"CommentMap", Type, 1, ""},
-		{"CompositeLit", Type, 0, ""},
-		{"CompositeLit.Elts", Field, 0, ""},
-		{"CompositeLit.Incomplete", Field, 11, ""},
-		{"CompositeLit.Lbrace", Field, 0, ""},
-		{"CompositeLit.Rbrace", Field, 0, ""},
-		{"CompositeLit.Type", Field, 0, ""},
-		{"Con", Const, 0, ""},
-		{"Decl", Type, 0, ""},
-		{"DeclStmt", Type, 0, ""},
-		{"DeclStmt.Decl", Field, 0, ""},
-		{"DeferStmt", Type, 0, ""},
-		{"DeferStmt.Call", Field, 0, ""},
-		{"DeferStmt.Defer", Field, 0, ""},
-		{"Ellipsis", Type, 0, ""},
-		{"Ellipsis.Ellipsis", Field, 0, ""},
-		{"Ellipsis.Elt", Field, 0, ""},
-		{"EmptyStmt", Type, 0, ""},
-		{"EmptyStmt.Implicit", Field, 5, ""},
-		{"EmptyStmt.Semicolon", Field, 0, ""},
-		{"Expr", Type, 0, ""},
-		{"ExprStmt", Type, 0, ""},
-		{"ExprStmt.X", Field, 0, ""},
-		{"Field", Type, 0, ""},
-		{"Field.Comment", Field, 0, ""},
-		{"Field.Doc", Field, 0, ""},
-		{"Field.Names", Field, 0, ""},
-		{"Field.Tag", Field, 0, ""},
-		{"Field.Type", Field, 0, ""},
-		{"FieldFilter", Type, 0, ""},
-		{"FieldList", Type, 0, ""},
-		{"FieldList.Closing", Field, 0, ""},
-		{"FieldList.List", Field, 0, ""},
-		{"FieldList.Opening", Field, 0, ""},
-		{"File", Type, 0, ""},
-		{"File.Comments", Field, 0, ""},
-		{"File.Decls", Field, 0, ""},
-		{"File.Doc", Field, 0, ""},
-		{"File.FileEnd", Field, 20, ""},
-		{"File.FileStart", Field, 20, ""},
-		{"File.GoVersion", Field, 21, ""},
-		{"File.Imports", Field, 0, ""},
-		{"File.Name", Field, 0, ""},
-		{"File.Package", Field, 0, ""},
-		{"File.Scope", Field, 0, ""},
-		{"File.Unresolved", Field, 0, ""},
-		{"FileExports", Func, 0, "func(src *File) bool"},
-		{"Filter", Type, 0, ""},
-		{"FilterDecl", Func, 0, "func(decl Decl, f Filter) bool"},
-		{"FilterFile", Func, 0, "func(src *File, f Filter) bool"},
-		{"FilterFuncDuplicates", Const, 0, ""},
-		{"FilterImportDuplicates", Const, 0, ""},
-		{"FilterPackage", Func, 0, "func(pkg *Package, f Filter) bool"},
-		{"FilterUnassociatedComments", Const, 0, ""},
-		{"ForStmt", Type, 0, ""},
-		{"ForStmt.Body", Field, 0, ""},
-		{"ForStmt.Cond", Field, 0, ""},
-		{"ForStmt.For", Field, 0, ""},
-		{"ForStmt.Init", Field, 0, ""},
-		{"ForStmt.Post", Field, 0, ""},
-		{"Fprint", Func, 0, "func(w io.Writer, fset *token.FileSet, x any, f FieldFilter) error"},
-		{"Fun", Const, 0, ""},
-		{"FuncDecl", Type, 0, ""},
-		{"FuncDecl.Body", Field, 0, ""},
-		{"FuncDecl.Doc", Field, 0, ""},
-		{"FuncDecl.Name", Field, 0, ""},
-		{"FuncDecl.Recv", Field, 0, ""},
-		{"FuncDecl.Type", Field, 0, ""},
-		{"FuncLit", Type, 0, ""},
-		{"FuncLit.Body", Field, 0, ""},
-		{"FuncLit.Type", Field, 0, ""},
-		{"FuncType", Type, 0, ""},
-		{"FuncType.Func", Field, 0, ""},
-		{"FuncType.Params", Field, 0, ""},
-		{"FuncType.Results", Field, 0, ""},
-		{"FuncType.TypeParams", Field, 18, ""},
-		{"GenDecl", Type, 0, ""},
-		{"GenDecl.Doc", Field, 0, ""},
-		{"GenDecl.Lparen", Field, 0, ""},
-		{"GenDecl.Rparen", Field, 0, ""},
-		{"GenDecl.Specs", Field, 0, ""},
-		{"GenDecl.Tok", Field, 0, ""},
-		{"GenDecl.TokPos", Field, 0, ""},
-		{"GoStmt", Type, 0, ""},
-		{"GoStmt.Call", Field, 0, ""},
-		{"GoStmt.Go", Field, 0, ""},
-		{"Ident", Type, 0, ""},
-		{"Ident.Name", Field, 0, ""},
-		{"Ident.NamePos", Field, 0, ""},
-		{"Ident.Obj", Field, 0, ""},
-		{"IfStmt", Type, 0, ""},
-		{"IfStmt.Body", Field, 0, ""},
-		{"IfStmt.Cond", Field, 0, ""},
-		{"IfStmt.Else", Field, 0, ""},
-		{"IfStmt.If", Field, 0, ""},
-		{"IfStmt.Init", Field, 0, ""},
-		{"ImportSpec", Type, 0, ""},
-		{"ImportSpec.Comment", Field, 0, ""},
-		{"ImportSpec.Doc", Field, 0, ""},
-		{"ImportSpec.EndPos", Field, 0, ""},
-		{"ImportSpec.Name", Field, 0, ""},
-		{"ImportSpec.Path", Field, 0, ""},
-		{"Importer", Type, 0, ""},
-		{"IncDecStmt", Type, 0, ""},
-		{"IncDecStmt.Tok", Field, 0, ""},
-		{"IncDecStmt.TokPos", Field, 0, ""},
-		{"IncDecStmt.X", Field, 0, ""},
-		{"IndexExpr", Type, 0, ""},
-		{"IndexExpr.Index", Field, 0, ""},
-		{"IndexExpr.Lbrack", Field, 0, ""},
-		{"IndexExpr.Rbrack", Field, 0, ""},
-		{"IndexExpr.X", Field, 0, ""},
-		{"IndexListExpr", Type, 18, ""},
-		{"IndexListExpr.Indices", Field, 18, ""},
-		{"IndexListExpr.Lbrack", Field, 18, ""},
-		{"IndexListExpr.Rbrack", Field, 18, ""},
-		{"IndexListExpr.X", Field, 18, ""},
-		{"Inspect", Func, 0, "func(node Node, f func(Node) bool)"},
-		{"InterfaceType", Type, 0, ""},
-		{"InterfaceType.Incomplete", Field, 0, ""},
-		{"InterfaceType.Interface", Field, 0, ""},
-		{"InterfaceType.Methods", Field, 0, ""},
-		{"IsExported", Func, 0, "func(name string) bool"},
-		{"IsGenerated", Func, 21, "func(file *File) bool"},
-		{"KeyValueExpr", Type, 0, ""},
-		{"KeyValueExpr.Colon", Field, 0, ""},
-		{"KeyValueExpr.Key", Field, 0, ""},
-		{"KeyValueExpr.Value", Field, 0, ""},
-		{"LabeledStmt", Type, 0, ""},
-		{"LabeledStmt.Colon", Field, 0, ""},
-		{"LabeledStmt.Label", Field, 0, ""},
-		{"LabeledStmt.Stmt", Field, 0, ""},
-		{"Lbl", Const, 0, ""},
-		{"MapType", Type, 0, ""},
-		{"MapType.Key", Field, 0, ""},
-		{"MapType.Map", Field, 0, ""},
-		{"MapType.Value", Field, 0, ""},
-		{"MergeMode", Type, 0, ""},
-		{"MergePackageFiles", Func, 0, "func(pkg *Package, mode MergeMode) *File"},
-		{"NewCommentMap", Func, 1, "func(fset *token.FileSet, node Node, comments []*CommentGroup) CommentMap"},
-		{"NewIdent", Func, 0, "func(name string) *Ident"},
-		{"NewObj", Func, 0, "func(kind ObjKind, name string) *Object"},
-		{"NewPackage", Func, 0, "func(fset *token.FileSet, files map[string]*File, importer Importer, universe *Scope) (*Package, error)"},
-		{"NewScope", Func, 0, "func(outer *Scope) *Scope"},
-		{"Node", Type, 0, ""},
-		{"NotNilFilter", Func, 0, "func(_ string, v reflect.Value) bool"},
-		{"ObjKind", Type, 0, ""},
-		{"Object", Type, 0, ""},
-		{"Object.Data", Field, 0, ""},
-		{"Object.Decl", Field, 0, ""},
-		{"Object.Kind", Field, 0, ""},
-		{"Object.Name", Field, 0, ""},
-		{"Object.Type", Field, 0, ""},
-		{"Package", Type, 0, ""},
-		{"Package.Files", Field, 0, ""},
-		{"Package.Imports", Field, 0, ""},
-		{"Package.Name", Field, 0, ""},
-		{"Package.Scope", Field, 0, ""},
-		{"PackageExports", Func, 0, "func(pkg *Package) bool"},
-		{"ParenExpr", Type, 0, ""},
-		{"ParenExpr.Lparen", Field, 0, ""},
-		{"ParenExpr.Rparen", Field, 0, ""},
-		{"ParenExpr.X", Field, 0, ""},
-		{"Pkg", Const, 0, ""},
-		{"Preorder", Func, 23, "func(root Node) iter.Seq[Node]"},
-		{"Print", Func, 0, "func(fset *token.FileSet, x any) error"},
-		{"RECV", Const, 0, ""},
-		{"RangeStmt", Type, 0, ""},
-		{"RangeStmt.Body", Field, 0, ""},
-		{"RangeStmt.For", Field, 0, ""},
-		{"RangeStmt.Key", Field, 0, ""},
-		{"RangeStmt.Range", Field, 20, ""},
-		{"RangeStmt.Tok", Field, 0, ""},
-		{"RangeStmt.TokPos", Field, 0, ""},
-		{"RangeStmt.Value", Field, 0, ""},
-		{"RangeStmt.X", Field, 0, ""},
-		{"ReturnStmt", Type, 0, ""},
-		{"ReturnStmt.Results", Field, 0, ""},
-		{"ReturnStmt.Return", Field, 0, ""},
-		{"SEND", Const, 0, ""},
-		{"Scope", Type, 0, ""},
-		{"Scope.Objects", Field, 0, ""},
-		{"Scope.Outer", Field, 0, ""},
-		{"SelectStmt", Type, 0, ""},
-		{"SelectStmt.Body", Field, 0, ""},
-		{"SelectStmt.Select", Field, 0, ""},
-		{"SelectorExpr", Type, 0, ""},
-		{"SelectorExpr.Sel", Field, 0, ""},
-		{"SelectorExpr.X", Field, 0, ""},
-		{"SendStmt", Type, 0, ""},
-		{"SendStmt.Arrow", Field, 0, ""},
-		{"SendStmt.Chan", Field, 0, ""},
-		{"SendStmt.Value", Field, 0, ""},
-		{"SliceExpr", Type, 0, ""},
-		{"SliceExpr.High", Field, 0, ""},
-		{"SliceExpr.Lbrack", Field, 0, ""},
-		{"SliceExpr.Low", Field, 0, ""},
-		{"SliceExpr.Max", Field, 2, ""},
-		{"SliceExpr.Rbrack", Field, 0, ""},
-		{"SliceExpr.Slice3", Field, 2, ""},
-		{"SliceExpr.X", Field, 0, ""},
-		{"SortImports", Func, 0, "func(fset *token.FileSet, f *File)"},
-		{"Spec", Type, 0, ""},
-		{"StarExpr", Type, 0, ""},
-		{"StarExpr.Star", Field, 0, ""},
-		{"StarExpr.X", Field, 0, ""},
-		{"Stmt", Type, 0, ""},
-		{"StructType", Type, 0, ""},
-		{"StructType.Fields", Field, 0, ""},
-		{"StructType.Incomplete", Field, 0, ""},
-		{"StructType.Struct", Field, 0, ""},
-		{"SwitchStmt", Type, 0, ""},
-		{"SwitchStmt.Body", Field, 0, ""},
-		{"SwitchStmt.Init", Field, 0, ""},
-		{"SwitchStmt.Switch", Field, 0, ""},
-		{"SwitchStmt.Tag", Field, 0, ""},
-		{"Typ", Const, 0, ""},
-		{"TypeAssertExpr", Type, 0, ""},
-		{"TypeAssertExpr.Lparen", Field, 2, ""},
-		{"TypeAssertExpr.Rparen", Field, 2, ""},
-		{"TypeAssertExpr.Type", Field, 0, ""},
-		{"TypeAssertExpr.X", Field, 0, ""},
-		{"TypeSpec", Type, 0, ""},
-		{"TypeSpec.Assign", Field, 9, ""},
-		{"TypeSpec.Comment", Field, 0, ""},
-		{"TypeSpec.Doc", Field, 0, ""},
-		{"TypeSpec.Name", Field, 0, ""},
-		{"TypeSpec.Type", Field, 0, ""},
-		{"TypeSpec.TypeParams", Field, 18, ""},
-		{"TypeSwitchStmt", Type, 0, ""},
-		{"TypeSwitchStmt.Assign", Field, 0, ""},
-		{"TypeSwitchStmt.Body", Field, 0, ""},
-		{"TypeSwitchStmt.Init", Field, 0, ""},
-		{"TypeSwitchStmt.Switch", Field, 0, ""},
-		{"UnaryExpr", Type, 0, ""},
-		{"UnaryExpr.Op", Field, 0, ""},
-		{"UnaryExpr.OpPos", Field, 0, ""},
-		{"UnaryExpr.X", Field, 0, ""},
-		{"Unparen", Func, 22, "func(e Expr) Expr"},
-		{"ValueSpec", Type, 0, ""},
-		{"ValueSpec.Comment", Field, 0, ""},
-		{"ValueSpec.Doc", Field, 0, ""},
-		{"ValueSpec.Names", Field, 0, ""},
-		{"ValueSpec.Type", Field, 0, ""},
-		{"ValueSpec.Values", Field, 0, ""},
-		{"Var", Const, 0, ""},
-		{"Visitor", Type, 0, ""},
-		{"Walk", Func, 0, "func(v Visitor, node Node)"},
-	},
-	"go/build": {
-		{"(*Context).Import", Method, 0, ""},
-		{"(*Context).ImportDir", Method, 0, ""},
-		{"(*Context).MatchFile", Method, 2, ""},
-		{"(*Context).SrcDirs", Method, 0, ""},
-		{"(*MultiplePackageError).Error", Method, 4, ""},
-		{"(*NoGoError).Error", Method, 0, ""},
-		{"(*Package).IsCommand", Method, 0, ""},
-		{"AllowBinary", Const, 0, ""},
-		{"ArchChar", Func, 0, "func(goarch string) (string, error)"},
-		{"Context", Type, 0, ""},
-		{"Context.BuildTags", Field, 0, ""},
-		{"Context.CgoEnabled", Field, 0, ""},
-		{"Context.Compiler", Field, 0, ""},
-		{"Context.Dir", Field, 14, ""},
-		{"Context.GOARCH", Field, 0, ""},
-		{"Context.GOOS", Field, 0, ""},
-		{"Context.GOPATH", Field, 0, ""},
-		{"Context.GOROOT", Field, 0, ""},
-		{"Context.HasSubdir", Field, 0, ""},
-		{"Context.InstallSuffix", Field, 1, ""},
-		{"Context.IsAbsPath", Field, 0, ""},
-		{"Context.IsDir", Field, 0, ""},
-		{"Context.JoinPath", Field, 0, ""},
-		{"Context.OpenFile", Field, 0, ""},
-		{"Context.ReadDir", Field, 0, ""},
-		{"Context.ReleaseTags", Field, 1, ""},
-		{"Context.SplitPathList", Field, 0, ""},
-		{"Context.ToolTags", Field, 17, ""},
-		{"Context.UseAllFiles", Field, 0, ""},
-		{"Default", Var, 0, ""},
-		{"Directive", Type, 21, ""},
-		{"Directive.Pos", Field, 21, ""},
-		{"Directive.Text", Field, 21, ""},
-		{"FindOnly", Const, 0, ""},
-		{"IgnoreVendor", Const, 6, ""},
-		{"Import", Func, 0, "func(path string, srcDir string, mode ImportMode) (*Package, error)"},
-		{"ImportComment", Const, 4, ""},
-		{"ImportDir", Func, 0, "func(dir string, mode ImportMode) (*Package, error)"},
-		{"ImportMode", Type, 0, ""},
-		{"IsLocalImport", Func, 0, "func(path string) bool"},
-		{"MultiplePackageError", Type, 4, ""},
-		{"MultiplePackageError.Dir", Field, 4, ""},
-		{"MultiplePackageError.Files", Field, 4, ""},
-		{"MultiplePackageError.Packages", Field, 4, ""},
-		{"NoGoError", Type, 0, ""},
-		{"NoGoError.Dir", Field, 0, ""},
-		{"Package", Type, 0, ""},
-		{"Package.AllTags", Field, 2, ""},
-		{"Package.BinDir", Field, 0, ""},
-		{"Package.BinaryOnly", Field, 7, ""},
-		{"Package.CFiles", Field, 0, ""},
-		{"Package.CXXFiles", Field, 2, ""},
-		{"Package.CgoCFLAGS", Field, 0, ""},
-		{"Package.CgoCPPFLAGS", Field, 2, ""},
-		{"Package.CgoCXXFLAGS", Field, 2, ""},
-		{"Package.CgoFFLAGS", Field, 7, ""},
-		{"Package.CgoFiles", Field, 0, ""},
-		{"Package.CgoLDFLAGS", Field, 0, ""},
-		{"Package.CgoPkgConfig", Field, 0, ""},
-		{"Package.ConflictDir", Field, 2, ""},
-		{"Package.Dir", Field, 0, ""},
-		{"Package.Directives", Field, 21, ""},
-		{"Package.Doc", Field, 0, ""},
-		{"Package.EmbedPatternPos", Field, 16, ""},
-		{"Package.EmbedPatterns", Field, 16, ""},
-		{"Package.FFiles", Field, 7, ""},
-		{"Package.GoFiles", Field, 0, ""},
-		{"Package.Goroot", Field, 0, ""},
-		{"Package.HFiles", Field, 0, ""},
-		{"Package.IgnoredGoFiles", Field, 1, ""},
-		{"Package.IgnoredOtherFiles", Field, 16, ""},
-		{"Package.ImportComment", Field, 4, ""},
-		{"Package.ImportPath", Field, 0, ""},
-		{"Package.ImportPos", Field, 0, ""},
-		{"Package.Imports", Field, 0, ""},
-		{"Package.InvalidGoFiles", Field, 6, ""},
-		{"Package.MFiles", Field, 3, ""},
-		{"Package.Name", Field, 0, ""},
-		{"Package.PkgObj", Field, 0, ""},
-		{"Package.PkgRoot", Field, 0, ""},
-		{"Package.PkgTargetRoot", Field, 5, ""},
-		{"Package.Root", Field, 0, ""},
-		{"Package.SFiles", Field, 0, ""},
-		{"Package.SrcRoot", Field, 0, ""},
-		{"Package.SwigCXXFiles", Field, 1, ""},
-		{"Package.SwigFiles", Field, 1, ""},
-		{"Package.SysoFiles", Field, 0, ""},
-		{"Package.TestDirectives", Field, 21, ""},
-		{"Package.TestEmbedPatternPos", Field, 16, ""},
-		{"Package.TestEmbedPatterns", Field, 16, ""},
-		{"Package.TestGoFiles", Field, 0, ""},
-		{"Package.TestImportPos", Field, 0, ""},
-		{"Package.TestImports", Field, 0, ""},
-		{"Package.XTestDirectives", Field, 21, ""},
-		{"Package.XTestEmbedPatternPos", Field, 16, ""},
-		{"Package.XTestEmbedPatterns", Field, 16, ""},
-		{"Package.XTestGoFiles", Field, 0, ""},
-		{"Package.XTestImportPos", Field, 0, ""},
-		{"Package.XTestImports", Field, 0, ""},
-		{"ToolDir", Var, 0, ""},
-	},
-	"go/build/constraint": {
-		{"(*AndExpr).Eval", Method, 16, ""},
-		{"(*AndExpr).String", Method, 16, ""},
-		{"(*NotExpr).Eval", Method, 16, ""},
-		{"(*NotExpr).String", Method, 16, ""},
-		{"(*OrExpr).Eval", Method, 16, ""},
-		{"(*OrExpr).String", Method, 16, ""},
-		{"(*SyntaxError).Error", Method, 16, ""},
-		{"(*TagExpr).Eval", Method, 16, ""},
-		{"(*TagExpr).String", Method, 16, ""},
-		{"AndExpr", Type, 16, ""},
-		{"AndExpr.X", Field, 16, ""},
-		{"AndExpr.Y", Field, 16, ""},
-		{"Expr", Type, 16, ""},
-		{"GoVersion", Func, 21, "func(x Expr) string"},
-		{"IsGoBuild", Func, 16, "func(line string) bool"},
-		{"IsPlusBuild", Func, 16, "func(line string) bool"},
-		{"NotExpr", Type, 16, ""},
-		{"NotExpr.X", Field, 16, ""},
-		{"OrExpr", Type, 16, ""},
-		{"OrExpr.X", Field, 16, ""},
-		{"OrExpr.Y", Field, 16, ""},
-		{"Parse", Func, 16, "func(line string) (Expr, error)"},
-		{"PlusBuildLines", Func, 16, "func(x Expr) ([]string, error)"},
-		{"SyntaxError", Type, 16, ""},
-		{"SyntaxError.Err", Field, 16, ""},
-		{"SyntaxError.Offset", Field, 16, ""},
-		{"TagExpr", Type, 16, ""},
-		{"TagExpr.Tag", Field, 16, ""},
-	},
-	"go/constant": {
-		{"(Kind).String", Method, 18, ""},
-		{"BinaryOp", Func, 5, "func(x_ Value, op token.Token, y_ Value) Value"},
-		{"BitLen", Func, 5, "func(x Value) int"},
-		{"Bool", Const, 5, ""},
-		{"BoolVal", Func, 5, "func(x Value) bool"},
-		{"Bytes", Func, 5, "func(x Value) []byte"},
-		{"Compare", Func, 5, "func(x_ Value, op token.Token, y_ Value) bool"},
-		{"Complex", Const, 5, ""},
-		{"Denom", Func, 5, "func(x Value) Value"},
-		{"Float", Const, 5, ""},
-		{"Float32Val", Func, 5, "func(x Value) (float32, bool)"},
-		{"Float64Val", Func, 5, "func(x Value) (float64, bool)"},
-		{"Imag", Func, 5, "func(x Value) Value"},
-		{"Int", Const, 5, ""},
-		{"Int64Val", Func, 5, "func(x Value) (int64, bool)"},
-		{"Kind", Type, 5, ""},
-		{"Make", Func, 13, "func(x any) Value"},
-		{"MakeBool", Func, 5, "func(b bool) Value"},
-		{"MakeFloat64", Func, 5, "func(x float64) Value"},
-		{"MakeFromBytes", Func, 5, "func(bytes []byte) Value"},
-		{"MakeFromLiteral", Func, 5, "func(lit string, tok token.Token, zero uint) Value"},
-		{"MakeImag", Func, 5, "func(x Value) Value"},
-		{"MakeInt64", Func, 5, "func(x int64) Value"},
-		{"MakeString", Func, 5, "func(s string) Value"},
-		{"MakeUint64", Func, 5, "func(x uint64) Value"},
-		{"MakeUnknown", Func, 5, "func() Value"},
-		{"Num", Func, 5, "func(x Value) Value"},
-		{"Real", Func, 5, "func(x Value) Value"},
-		{"Shift", Func, 5, "func(x Value, op token.Token, s uint) Value"},
-		{"Sign", Func, 5, "func(x Value) int"},
-		{"String", Const, 5, ""},
-		{"StringVal", Func, 5, "func(x Value) string"},
-		{"ToComplex", Func, 6, "func(x Value) Value"},
-		{"ToFloat", Func, 6, "func(x Value) Value"},
-		{"ToInt", Func, 6, "func(x Value) Value"},
-		{"Uint64Val", Func, 5, "func(x Value) (uint64, bool)"},
-		{"UnaryOp", Func, 5, "func(op token.Token, y Value, prec uint) Value"},
-		{"Unknown", Const, 5, ""},
-		{"Val", Func, 13, "func(x Value) any"},
-		{"Value", Type, 5, ""},
-	},
-	"go/doc": {
-		{"(*Package).Filter", Method, 0, ""},
-		{"(*Package).HTML", Method, 19, ""},
-		{"(*Package).Markdown", Method, 19, ""},
-		{"(*Package).Parser", Method, 19, ""},
-		{"(*Package).Printer", Method, 19, ""},
-		{"(*Package).Synopsis", Method, 19, ""},
-		{"(*Package).Text", Method, 19, ""},
-		{"AllDecls", Const, 0, ""},
-		{"AllMethods", Const, 0, ""},
-		{"Example", Type, 0, ""},
-		{"Example.Code", Field, 0, ""},
-		{"Example.Comments", Field, 0, ""},
-		{"Example.Doc", Field, 0, ""},
-		{"Example.EmptyOutput", Field, 1, ""},
-		{"Example.Name", Field, 0, ""},
-		{"Example.Order", Field, 1, ""},
-		{"Example.Output", Field, 0, ""},
-		{"Example.Play", Field, 1, ""},
-		{"Example.Suffix", Field, 14, ""},
-		{"Example.Unordered", Field, 7, ""},
-		{"Examples", Func, 0, "func(testFiles ...*ast.File) []*Example"},
-		{"Filter", Type, 0, ""},
-		{"Func", Type, 0, ""},
-		{"Func.Decl", Field, 0, ""},
-		{"Func.Doc", Field, 0, ""},
-		{"Func.Examples", Field, 14, ""},
-		{"Func.Level", Field, 0, ""},
-		{"Func.Name", Field, 0, ""},
-		{"Func.Orig", Field, 0, ""},
-		{"Func.Recv", Field, 0, ""},
-		{"IllegalPrefixes", Var, 1, ""},
-		{"IsPredeclared", Func, 8, "func(s string) bool"},
-		{"Mode", Type, 0, ""},
-		{"New", Func, 0, "func(pkg *ast.Package, importPath string, mode Mode) *Package"},
-		{"NewFromFiles", Func, 14, "func(fset *token.FileSet, files []*ast.File, importPath string, opts ...any) (*Package, error)"},
-		{"Note", Type, 1, ""},
-		{"Note.Body", Field, 1, ""},
-		{"Note.End", Field, 1, ""},
-		{"Note.Pos", Field, 1, ""},
-		{"Note.UID", Field, 1, ""},
-		{"Package", Type, 0, ""},
-		{"Package.Bugs", Field, 0, ""},
-		{"Package.Consts", Field, 0, ""},
-		{"Package.Doc", Field, 0, ""},
-		{"Package.Examples", Field, 14, ""},
-		{"Package.Filenames", Field, 0, ""},
-		{"Package.Funcs", Field, 0, ""},
-		{"Package.ImportPath", Field, 0, ""},
-		{"Package.Imports", Field, 0, ""},
-		{"Package.Name", Field, 0, ""},
-		{"Package.Notes", Field, 1, ""},
-		{"Package.Types", Field, 0, ""},
-		{"Package.Vars", Field, 0, ""},
-		{"PreserveAST", Const, 12, ""},
-		{"Synopsis", Func, 0, "func(text string) string"},
-		{"ToHTML", Func, 0, "func(w io.Writer, text string, words map[string]string)"},
-		{"ToText", Func, 0, "func(w io.Writer, text string, prefix string, codePrefix string, width int)"},
-		{"Type", Type, 0, ""},
-		{"Type.Consts", Field, 0, ""},
-		{"Type.Decl", Field, 0, ""},
-		{"Type.Doc", Field, 0, ""},
-		{"Type.Examples", Field, 14, ""},
-		{"Type.Funcs", Field, 0, ""},
-		{"Type.Methods", Field, 0, ""},
-		{"Type.Name", Field, 0, ""},
-		{"Type.Vars", Field, 0, ""},
-		{"Value", Type, 0, ""},
-		{"Value.Decl", Field, 0, ""},
-		{"Value.Doc", Field, 0, ""},
-		{"Value.Names", Field, 0, ""},
-	},
-	"go/doc/comment": {
-		{"(*DocLink).DefaultURL", Method, 19, ""},
-		{"(*Heading).DefaultID", Method, 19, ""},
-		{"(*List).BlankBefore", Method, 19, ""},
-		{"(*List).BlankBetween", Method, 19, ""},
-		{"(*Parser).Parse", Method, 19, ""},
-		{"(*Printer).Comment", Method, 19, ""},
-		{"(*Printer).HTML", Method, 19, ""},
-		{"(*Printer).Markdown", Method, 19, ""},
-		{"(*Printer).Text", Method, 19, ""},
-		{"Block", Type, 19, ""},
-		{"Code", Type, 19, ""},
-		{"Code.Text", Field, 19, ""},
-		{"DefaultLookupPackage", Func, 19, "func(name string) (importPath string, ok bool)"},
-		{"Doc", Type, 19, ""},
-		{"Doc.Content", Field, 19, ""},
-		{"Doc.Links", Field, 19, ""},
-		{"DocLink", Type, 19, ""},
-		{"DocLink.ImportPath", Field, 19, ""},
-		{"DocLink.Name", Field, 19, ""},
-		{"DocLink.Recv", Field, 19, ""},
-		{"DocLink.Text", Field, 19, ""},
-		{"Heading", Type, 19, ""},
-		{"Heading.Text", Field, 19, ""},
-		{"Italic", Type, 19, ""},
-		{"Link", Type, 19, ""},
-		{"Link.Auto", Field, 19, ""},
-		{"Link.Text", Field, 19, ""},
-		{"Link.URL", Field, 19, ""},
-		{"LinkDef", Type, 19, ""},
-		{"LinkDef.Text", Field, 19, ""},
-		{"LinkDef.URL", Field, 19, ""},
-		{"LinkDef.Used", Field, 19, ""},
-		{"List", Type, 19, ""},
-		{"List.ForceBlankBefore", Field, 19, ""},
-		{"List.ForceBlankBetween", Field, 19, ""},
-		{"List.Items", Field, 19, ""},
-		{"ListItem", Type, 19, ""},
-		{"ListItem.Content", Field, 19, ""},
-		{"ListItem.Number", Field, 19, ""},
-		{"Paragraph", Type, 19, ""},
-		{"Paragraph.Text", Field, 19, ""},
-		{"Parser", Type, 19, ""},
-		{"Parser.LookupPackage", Field, 19, ""},
-		{"Parser.LookupSym", Field, 19, ""},
-		{"Parser.Words", Field, 19, ""},
-		{"Plain", Type, 19, ""},
-		{"Printer", Type, 19, ""},
-		{"Printer.DocLinkBaseURL", Field, 19, ""},
-		{"Printer.DocLinkURL", Field, 19, ""},
-		{"Printer.HeadingID", Field, 19, ""},
-		{"Printer.HeadingLevel", Field, 19, ""},
-		{"Printer.TextCodePrefix", Field, 19, ""},
-		{"Printer.TextPrefix", Field, 19, ""},
-		{"Printer.TextWidth", Field, 19, ""},
-		{"Text", Type, 19, ""},
-	},
-	"go/format": {
-		{"Node", Func, 1, "func(dst io.Writer, fset *token.FileSet, node any) error"},
-		{"Source", Func, 1, "func(src []byte) ([]byte, error)"},
-	},
-	"go/importer": {
-		{"Default", Func, 5, "func() types.Importer"},
-		{"For", Func, 5, "func(compiler string, lookup Lookup) types.Importer"},
-		{"ForCompiler", Func, 12, "func(fset *token.FileSet, compiler string, lookup Lookup) types.Importer"},
-		{"Lookup", Type, 5, ""},
-	},
-	"go/parser": {
-		{"AllErrors", Const, 1, ""},
-		{"DeclarationErrors", Const, 0, ""},
-		{"ImportsOnly", Const, 0, ""},
-		{"Mode", Type, 0, ""},
-		{"PackageClauseOnly", Const, 0, ""},
-		{"ParseComments", Const, 0, ""},
-		{"ParseDir", Func, 0, "func(fset *token.FileSet, path string, filter func(fs.FileInfo) bool, mode Mode) (pkgs map[string]*ast.Package, first error)"},
-		{"ParseExpr", Func, 0, "func(x string) (ast.Expr, error)"},
-		{"ParseExprFrom", Func, 5, "func(fset *token.FileSet, filename string, src any, mode Mode) (expr ast.Expr, err error)"},
-		{"ParseFile", Func, 0, "func(fset *token.FileSet, filename string, src any, mode Mode) (f *ast.File, err error)"},
-		{"SkipObjectResolution", Const, 17, ""},
-		{"SpuriousErrors", Const, 0, ""},
-		{"Trace", Const, 0, ""},
-	},
-	"go/printer": {
-		{"(*Config).Fprint", Method, 0, ""},
-		{"CommentedNode", Type, 0, ""},
-		{"CommentedNode.Comments", Field, 0, ""},
-		{"CommentedNode.Node", Field, 0, ""},
-		{"Config", Type, 0, ""},
-		{"Config.Indent", Field, 1, ""},
-		{"Config.Mode", Field, 0, ""},
-		{"Config.Tabwidth", Field, 0, ""},
-		{"Fprint", Func, 0, "func(output io.Writer, fset *token.FileSet, node any) error"},
-		{"Mode", Type, 0, ""},
-		{"RawFormat", Const, 0, ""},
-		{"SourcePos", Const, 0, ""},
-		{"TabIndent", Const, 0, ""},
-		{"UseSpaces", Const, 0, ""},
-	},
-	"go/scanner": {
-		{"(*ErrorList).Add", Method, 0, ""},
-		{"(*ErrorList).RemoveMultiples", Method, 0, ""},
-		{"(*ErrorList).Reset", Method, 0, ""},
-		{"(*Scanner).Init", Method, 0, ""},
-		{"(*Scanner).Scan", Method, 0, ""},
-		{"(Error).Error", Method, 0, ""},
-		{"(ErrorList).Err", Method, 0, ""},
-		{"(ErrorList).Error", Method, 0, ""},
-		{"(ErrorList).Len", Method, 0, ""},
-		{"(ErrorList).Less", Method, 0, ""},
-		{"(ErrorList).Sort", Method, 0, ""},
-		{"(ErrorList).Swap", Method, 0, ""},
-		{"Error", Type, 0, ""},
-		{"Error.Msg", Field, 0, ""},
-		{"Error.Pos", Field, 0, ""},
-		{"ErrorHandler", Type, 0, ""},
-		{"ErrorList", Type, 0, ""},
-		{"Mode", Type, 0, ""},
-		{"PrintError", Func, 0, "func(w io.Writer, err error)"},
-		{"ScanComments", Const, 0, ""},
-		{"Scanner", Type, 0, ""},
-		{"Scanner.ErrorCount", Field, 0, ""},
-	},
-	"go/token": {
-		{"(*File).AddLine", Method, 0, ""},
-		{"(*File).AddLineColumnInfo", Method, 11, ""},
-		{"(*File).AddLineInfo", Method, 0, ""},
-		{"(*File).Base", Method, 0, ""},
-		{"(*File).Line", Method, 0, ""},
-		{"(*File).LineCount", Method, 0, ""},
-		{"(*File).LineStart", Method, 12, ""},
-		{"(*File).Lines", Method, 21, ""},
-		{"(*File).MergeLine", Method, 2, ""},
-		{"(*File).Name", Method, 0, ""},
-		{"(*File).Offset", Method, 0, ""},
-		{"(*File).Pos", Method, 0, ""},
-		{"(*File).Position", Method, 0, ""},
-		{"(*File).PositionFor", Method, 4, ""},
-		{"(*File).SetLines", Method, 0, ""},
-		{"(*File).SetLinesForContent", Method, 0, ""},
-		{"(*File).Size", Method, 0, ""},
-		{"(*FileSet).AddFile", Method, 0, ""},
-		{"(*FileSet).Base", Method, 0, ""},
-		{"(*FileSet).File", Method, 0, ""},
-		{"(*FileSet).Iterate", Method, 0, ""},
-		{"(*FileSet).Position", Method, 0, ""},
-		{"(*FileSet).PositionFor", Method, 4, ""},
-		{"(*FileSet).Read", Method, 0, ""},
-		{"(*FileSet).RemoveFile", Method, 20, ""},
-		{"(*FileSet).Write", Method, 0, ""},
-		{"(*Position).IsValid", Method, 0, ""},
-		{"(Pos).IsValid", Method, 0, ""},
-		{"(Position).String", Method, 0, ""},
-		{"(Token).IsKeyword", Method, 0, ""},
-		{"(Token).IsLiteral", Method, 0, ""},
-		{"(Token).IsOperator", Method, 0, ""},
-		{"(Token).Precedence", Method, 0, ""},
-		{"(Token).String", Method, 0, ""},
-		{"ADD", Const, 0, ""},
-		{"ADD_ASSIGN", Const, 0, ""},
-		{"AND", Const, 0, ""},
-		{"AND_ASSIGN", Const, 0, ""},
-		{"AND_NOT", Const, 0, ""},
-		{"AND_NOT_ASSIGN", Const, 0, ""},
-		{"ARROW", Const, 0, ""},
-		{"ASSIGN", Const, 0, ""},
-		{"BREAK", Const, 0, ""},
-		{"CASE", Const, 0, ""},
-		{"CHAN", Const, 0, ""},
-		{"CHAR", Const, 0, ""},
-		{"COLON", Const, 0, ""},
-		{"COMMA", Const, 0, ""},
-		{"COMMENT", Const, 0, ""},
-		{"CONST", Const, 0, ""},
-		{"CONTINUE", Const, 0, ""},
-		{"DEC", Const, 0, ""},
-		{"DEFAULT", Const, 0, ""},
-		{"DEFER", Const, 0, ""},
-		{"DEFINE", Const, 0, ""},
-		{"ELLIPSIS", Const, 0, ""},
-		{"ELSE", Const, 0, ""},
-		{"EOF", Const, 0, ""},
-		{"EQL", Const, 0, ""},
-		{"FALLTHROUGH", Const, 0, ""},
-		{"FLOAT", Const, 0, ""},
-		{"FOR", Const, 0, ""},
-		{"FUNC", Const, 0, ""},
-		{"File", Type, 0, ""},
-		{"FileSet", Type, 0, ""},
-		{"GEQ", Const, 0, ""},
-		{"GO", Const, 0, ""},
-		{"GOTO", Const, 0, ""},
-		{"GTR", Const, 0, ""},
-		{"HighestPrec", Const, 0, ""},
-		{"IDENT", Const, 0, ""},
-		{"IF", Const, 0, ""},
-		{"ILLEGAL", Const, 0, ""},
-		{"IMAG", Const, 0, ""},
-		{"IMPORT", Const, 0, ""},
-		{"INC", Const, 0, ""},
-		{"INT", Const, 0, ""},
-		{"INTERFACE", Const, 0, ""},
-		{"IsExported", Func, 13, "func(name string) bool"},
-		{"IsIdentifier", Func, 13, "func(name string) bool"},
-		{"IsKeyword", Func, 13, "func(name string) bool"},
-		{"LAND", Const, 0, ""},
-		{"LBRACE", Const, 0, ""},
-		{"LBRACK", Const, 0, ""},
-		{"LEQ", Const, 0, ""},
-		{"LOR", Const, 0, ""},
-		{"LPAREN", Const, 0, ""},
-		{"LSS", Const, 0, ""},
-		{"Lookup", Func, 0, "func(ident string) Token"},
-		{"LowestPrec", Const, 0, ""},
-		{"MAP", Const, 0, ""},
-		{"MUL", Const, 0, ""},
-		{"MUL_ASSIGN", Const, 0, ""},
-		{"NEQ", Const, 0, ""},
-		{"NOT", Const, 0, ""},
-		{"NewFileSet", Func, 0, "func() *FileSet"},
-		{"NoPos", Const, 0, ""},
-		{"OR", Const, 0, ""},
-		{"OR_ASSIGN", Const, 0, ""},
-		{"PACKAGE", Const, 0, ""},
-		{"PERIOD", Const, 0, ""},
-		{"Pos", Type, 0, ""},
-		{"Position", Type, 0, ""},
-		{"Position.Column", Field, 0, ""},
-		{"Position.Filename", Field, 0, ""},
-		{"Position.Line", Field, 0, ""},
-		{"Position.Offset", Field, 0, ""},
-		{"QUO", Const, 0, ""},
-		{"QUO_ASSIGN", Const, 0, ""},
-		{"RANGE", Const, 0, ""},
-		{"RBRACE", Const, 0, ""},
-		{"RBRACK", Const, 0, ""},
-		{"REM", Const, 0, ""},
-		{"REM_ASSIGN", Const, 0, ""},
-		{"RETURN", Const, 0, ""},
-		{"RPAREN", Const, 0, ""},
-		{"SELECT", Const, 0, ""},
-		{"SEMICOLON", Const, 0, ""},
-		{"SHL", Const, 0, ""},
-		{"SHL_ASSIGN", Const, 0, ""},
-		{"SHR", Const, 0, ""},
-		{"SHR_ASSIGN", Const, 0, ""},
-		{"STRING", Const, 0, ""},
-		{"STRUCT", Const, 0, ""},
-		{"SUB", Const, 0, ""},
-		{"SUB_ASSIGN", Const, 0, ""},
-		{"SWITCH", Const, 0, ""},
-		{"TILDE", Const, 18, ""},
-		{"TYPE", Const, 0, ""},
-		{"Token", Type, 0, ""},
-		{"UnaryPrec", Const, 0, ""},
-		{"VAR", Const, 0, ""},
-		{"XOR", Const, 0, ""},
-		{"XOR_ASSIGN", Const, 0, ""},
-	},
-	"go/types": {
-		{"(*Alias).Obj", Method, 22, ""},
-		{"(*Alias).Origin", Method, 23, ""},
-		{"(*Alias).Rhs", Method, 23, ""},
-		{"(*Alias).SetTypeParams", Method, 23, ""},
-		{"(*Alias).String", Method, 22, ""},
-		{"(*Alias).TypeArgs", Method, 23, ""},
-		{"(*Alias).TypeParams", Method, 23, ""},
-		{"(*Alias).Underlying", Method, 22, ""},
-		{"(*ArgumentError).Error", Method, 18, ""},
-		{"(*ArgumentError).Unwrap", Method, 18, ""},
-		{"(*Array).Elem", Method, 5, ""},
-		{"(*Array).Len", Method, 5, ""},
-		{"(*Array).String", Method, 5, ""},
-		{"(*Array).Underlying", Method, 5, ""},
-		{"(*Basic).Info", Method, 5, ""},
-		{"(*Basic).Kind", Method, 5, ""},
-		{"(*Basic).Name", Method, 5, ""},
-		{"(*Basic).String", Method, 5, ""},
-		{"(*Basic).Underlying", Method, 5, ""},
-		{"(*Builtin).Exported", Method, 5, ""},
-		{"(*Builtin).Id", Method, 5, ""},
-		{"(*Builtin).Name", Method, 5, ""},
-		{"(*Builtin).Parent", Method, 5, ""},
-		{"(*Builtin).Pkg", Method, 5, ""},
-		{"(*Builtin).Pos", Method, 5, ""},
-		{"(*Builtin).String", Method, 5, ""},
-		{"(*Builtin).Type", Method, 5, ""},
-		{"(*Chan).Dir", Method, 5, ""},
-		{"(*Chan).Elem", Method, 5, ""},
-		{"(*Chan).String", Method, 5, ""},
-		{"(*Chan).Underlying", Method, 5, ""},
-		{"(*Checker).Files", Method, 5, ""},
-		{"(*Config).Check", Method, 5, ""},
-		{"(*Const).Exported", Method, 5, ""},
-		{"(*Const).Id", Method, 5, ""},
-		{"(*Const).Name", Method, 5, ""},
-		{"(*Const).Parent", Method, 5, ""},
-		{"(*Const).Pkg", Method, 5, ""},
-		{"(*Const).Pos", Method, 5, ""},
-		{"(*Const).String", Method, 5, ""},
-		{"(*Const).Type", Method, 5, ""},
-		{"(*Const).Val", Method, 5, ""},
-		{"(*Func).Exported", Method, 5, ""},
-		{"(*Func).FullName", Method, 5, ""},
-		{"(*Func).Id", Method, 5, ""},
-		{"(*Func).Name", Method, 5, ""},
-		{"(*Func).Origin", Method, 19, ""},
-		{"(*Func).Parent", Method, 5, ""},
-		{"(*Func).Pkg", Method, 5, ""},
-		{"(*Func).Pos", Method, 5, ""},
-		{"(*Func).Scope", Method, 5, ""},
-		{"(*Func).Signature", Method, 23, ""},
-		{"(*Func).String", Method, 5, ""},
-		{"(*Func).Type", Method, 5, ""},
-		{"(*Info).ObjectOf", Method, 5, ""},
-		{"(*Info).PkgNameOf", Method, 22, ""},
-		{"(*Info).TypeOf", Method, 5, ""},
-		{"(*Initializer).String", Method, 5, ""},
-		{"(*Interface).Complete", Method, 5, ""},
-		{"(*Interface).Embedded", Method, 5, ""},
-		{"(*Interface).EmbeddedType", Method, 11, ""},
-		{"(*Interface).EmbeddedTypes", Method, 24, ""},
-		{"(*Interface).Empty", Method, 5, ""},
-		{"(*Interface).ExplicitMethod", Method, 5, ""},
-		{"(*Interface).ExplicitMethods", Method, 24, ""},
-		{"(*Interface).IsComparable", Method, 18, ""},
-		{"(*Interface).IsImplicit", Method, 18, ""},
-		{"(*Interface).IsMethodSet", Method, 18, ""},
-		{"(*Interface).MarkImplicit", Method, 18, ""},
-		{"(*Interface).Method", Method, 5, ""},
-		{"(*Interface).Methods", Method, 24, ""},
-		{"(*Interface).NumEmbeddeds", Method, 5, ""},
-		{"(*Interface).NumExplicitMethods", Method, 5, ""},
-		{"(*Interface).NumMethods", Method, 5, ""},
-		{"(*Interface).String", Method, 5, ""},
-		{"(*Interface).Underlying", Method, 5, ""},
-		{"(*Label).Exported", Method, 5, ""},
-		{"(*Label).Id", Method, 5, ""},
-		{"(*Label).Name", Method, 5, ""},
-		{"(*Label).Parent", Method, 5, ""},
-		{"(*Label).Pkg", Method, 5, ""},
-		{"(*Label).Pos", Method, 5, ""},
-		{"(*Label).String", Method, 5, ""},
-		{"(*Label).Type", Method, 5, ""},
-		{"(*Map).Elem", Method, 5, ""},
-		{"(*Map).Key", Method, 5, ""},
-		{"(*Map).String", Method, 5, ""},
-		{"(*Map).Underlying", Method, 5, ""},
-		{"(*MethodSet).At", Method, 5, ""},
-		{"(*MethodSet).Len", Method, 5, ""},
-		{"(*MethodSet).Lookup", Method, 5, ""},
-		{"(*MethodSet).Methods", Method, 24, ""},
-		{"(*MethodSet).String", Method, 5, ""},
-		{"(*Named).AddMethod", Method, 5, ""},
-		{"(*Named).Method", Method, 5, ""},
-		{"(*Named).Methods", Method, 24, ""},
-		{"(*Named).NumMethods", Method, 5, ""},
-		{"(*Named).Obj", Method, 5, ""},
-		{"(*Named).Origin", Method, 18, ""},
-		{"(*Named).SetTypeParams", Method, 18, ""},
-		{"(*Named).SetUnderlying", Method, 5, ""},
-		{"(*Named).String", Method, 5, ""},
-		{"(*Named).TypeArgs", Method, 18, ""},
-		{"(*Named).TypeParams", Method, 18, ""},
-		{"(*Named).Underlying", Method, 5, ""},
-		{"(*Nil).Exported", Method, 5, ""},
-		{"(*Nil).Id", Method, 5, ""},
-		{"(*Nil).Name", Method, 5, ""},
-		{"(*Nil).Parent", Method, 5, ""},
-		{"(*Nil).Pkg", Method, 5, ""},
-		{"(*Nil).Pos", Method, 5, ""},
-		{"(*Nil).String", Method, 5, ""},
-		{"(*Nil).Type", Method, 5, ""},
-		{"(*Package).Complete", Method, 5, ""},
-		{"(*Package).GoVersion", Method, 21, ""},
-		{"(*Package).Imports", Method, 5, ""},
-		{"(*Package).MarkComplete", Method, 5, ""},
-		{"(*Package).Name", Method, 5, ""},
-		{"(*Package).Path", Method, 5, ""},
-		{"(*Package).Scope", Method, 5, ""},
-		{"(*Package).SetImports", Method, 5, ""},
-		{"(*Package).SetName", Method, 6, ""},
-		{"(*Package).String", Method, 5, ""},
-		{"(*PkgName).Exported", Method, 5, ""},
-		{"(*PkgName).Id", Method, 5, ""},
-		{"(*PkgName).Imported", Method, 5, ""},
-		{"(*PkgName).Name", Method, 5, ""},
-		{"(*PkgName).Parent", Method, 5, ""},
-		{"(*PkgName).Pkg", Method, 5, ""},
-		{"(*PkgName).Pos", Method, 5, ""},
-		{"(*PkgName).String", Method, 5, ""},
-		{"(*PkgName).Type", Method, 5, ""},
-		{"(*Pointer).Elem", Method, 5, ""},
-		{"(*Pointer).String", Method, 5, ""},
-		{"(*Pointer).Underlying", Method, 5, ""},
-		{"(*Scope).Child", Method, 5, ""},
-		{"(*Scope).Children", Method, 24, ""},
-		{"(*Scope).Contains", Method, 5, ""},
-		{"(*Scope).End", Method, 5, ""},
-		{"(*Scope).Innermost", Method, 5, ""},
-		{"(*Scope).Insert", Method, 5, ""},
-		{"(*Scope).Len", Method, 5, ""},
-		{"(*Scope).Lookup", Method, 5, ""},
-		{"(*Scope).LookupParent", Method, 5, ""},
-		{"(*Scope).Names", Method, 5, ""},
-		{"(*Scope).NumChildren", Method, 5, ""},
-		{"(*Scope).Parent", Method, 5, ""},
-		{"(*Scope).Pos", Method, 5, ""},
-		{"(*Scope).String", Method, 5, ""},
-		{"(*Scope).WriteTo", Method, 5, ""},
-		{"(*Selection).Index", Method, 5, ""},
-		{"(*Selection).Indirect", Method, 5, ""},
-		{"(*Selection).Kind", Method, 5, ""},
-		{"(*Selection).Obj", Method, 5, ""},
-		{"(*Selection).Recv", Method, 5, ""},
-		{"(*Selection).String", Method, 5, ""},
-		{"(*Selection).Type", Method, 5, ""},
-		{"(*Signature).Params", Method, 5, ""},
-		{"(*Signature).Recv", Method, 5, ""},
-		{"(*Signature).RecvTypeParams", Method, 18, ""},
-		{"(*Signature).Results", Method, 5, ""},
-		{"(*Signature).String", Method, 5, ""},
-		{"(*Signature).TypeParams", Method, 18, ""},
-		{"(*Signature).Underlying", Method, 5, ""},
-		{"(*Signature).Variadic", Method, 5, ""},
-		{"(*Slice).Elem", Method, 5, ""},
-		{"(*Slice).String", Method, 5, ""},
-		{"(*Slice).Underlying", Method, 5, ""},
-		{"(*StdSizes).Alignof", Method, 5, ""},
-		{"(*StdSizes).Offsetsof", Method, 5, ""},
-		{"(*StdSizes).Sizeof", Method, 5, ""},
-		{"(*Struct).Field", Method, 5, ""},
-		{"(*Struct).Fields", Method, 24, ""},
-		{"(*Struct).NumFields", Method, 5, ""},
-		{"(*Struct).String", Method, 5, ""},
-		{"(*Struct).Tag", Method, 5, ""},
-		{"(*Struct).Underlying", Method, 5, ""},
-		{"(*Term).String", Method, 18, ""},
-		{"(*Term).Tilde", Method, 18, ""},
-		{"(*Term).Type", Method, 18, ""},
-		{"(*Tuple).At", Method, 5, ""},
-		{"(*Tuple).Len", Method, 5, ""},
-		{"(*Tuple).String", Method, 5, ""},
-		{"(*Tuple).Underlying", Method, 5, ""},
-		{"(*Tuple).Variables", Method, 24, ""},
-		{"(*TypeList).At", Method, 18, ""},
-		{"(*TypeList).Len", Method, 18, ""},
-		{"(*TypeList).Types", Method, 24, ""},
-		{"(*TypeName).Exported", Method, 5, ""},
-		{"(*TypeName).Id", Method, 5, ""},
-		{"(*TypeName).IsAlias", Method, 9, ""},
-		{"(*TypeName).Name", Method, 5, ""},
-		{"(*TypeName).Parent", Method, 5, ""},
-		{"(*TypeName).Pkg", Method, 5, ""},
-		{"(*TypeName).Pos", Method, 5, ""},
-		{"(*TypeName).String", Method, 5, ""},
-		{"(*TypeName).Type", Method, 5, ""},
-		{"(*TypeParam).Constraint", Method, 18, ""},
-		{"(*TypeParam).Index", Method, 18, ""},
-		{"(*TypeParam).Obj", Method, 18, ""},
-		{"(*TypeParam).SetConstraint", Method, 18, ""},
-		{"(*TypeParam).String", Method, 18, ""},
-		{"(*TypeParam).Underlying", Method, 18, ""},
-		{"(*TypeParamList).At", Method, 18, ""},
-		{"(*TypeParamList).Len", Method, 18, ""},
-		{"(*TypeParamList).TypeParams", Method, 24, ""},
-		{"(*Union).Len", Method, 18, ""},
-		{"(*Union).String", Method, 18, ""},
-		{"(*Union).Term", Method, 18, ""},
-		{"(*Union).Terms", Method, 24, ""},
-		{"(*Union).Underlying", Method, 18, ""},
-		{"(*Var).Anonymous", Method, 5, ""},
-		{"(*Var).Embedded", Method, 11, ""},
-		{"(*Var).Exported", Method, 5, ""},
-		{"(*Var).Id", Method, 5, ""},
-		{"(*Var).IsField", Method, 5, ""},
-		{"(*Var).Kind", Method, 25, ""},
-		{"(*Var).Name", Method, 5, ""},
-		{"(*Var).Origin", Method, 19, ""},
-		{"(*Var).Parent", Method, 5, ""},
-		{"(*Var).Pkg", Method, 5, ""},
-		{"(*Var).Pos", Method, 5, ""},
-		{"(*Var).SetKind", Method, 25, ""},
-		{"(*Var).String", Method, 5, ""},
-		{"(*Var).Type", Method, 5, ""},
-		{"(Checker).ObjectOf", Method, 5, ""},
-		{"(Checker).PkgNameOf", Method, 22, ""},
-		{"(Checker).TypeOf", Method, 5, ""},
-		{"(Error).Error", Method, 5, ""},
-		{"(TypeAndValue).Addressable", Method, 5, ""},
-		{"(TypeAndValue).Assignable", Method, 5, ""},
-		{"(TypeAndValue).HasOk", Method, 5, ""},
-		{"(TypeAndValue).IsBuiltin", Method, 5, ""},
-		{"(TypeAndValue).IsNil", Method, 5, ""},
-		{"(TypeAndValue).IsType", Method, 5, ""},
-		{"(TypeAndValue).IsValue", Method, 5, ""},
-		{"(TypeAndValue).IsVoid", Method, 5, ""},
-		{"(VarKind).String", Method, 25, ""},
-		{"Alias", Type, 22, ""},
-		{"ArgumentError", Type, 18, ""},
-		{"ArgumentError.Err", Field, 18, ""},
-		{"ArgumentError.Index", Field, 18, ""},
-		{"Array", Type, 5, ""},
-		{"AssertableTo", Func, 5, "func(V *Interface, T Type) bool"},
-		{"AssignableTo", Func, 5, "func(V Type, T Type) bool"},
-		{"Basic", Type, 5, ""},
-		{"BasicInfo", Type, 5, ""},
-		{"BasicKind", Type, 5, ""},
-		{"Bool", Const, 5, ""},
-		{"Builtin", Type, 5, ""},
-		{"Byte", Const, 5, ""},
-		{"Chan", Type, 5, ""},
-		{"ChanDir", Type, 5, ""},
-		{"CheckExpr", Func, 13, "func(fset *token.FileSet, pkg *Package, pos token.Pos, expr ast.Expr, info *Info) (err error)"},
-		{"Checker", Type, 5, ""},
-		{"Checker.Info", Field, 5, ""},
-		{"Comparable", Func, 5, "func(T Type) bool"},
-		{"Complex128", Const, 5, ""},
-		{"Complex64", Const, 5, ""},
-		{"Config", Type, 5, ""},
-		{"Config.Context", Field, 18, ""},
-		{"Config.DisableUnusedImportCheck", Field, 5, ""},
-		{"Config.Error", Field, 5, ""},
-		{"Config.FakeImportC", Field, 5, ""},
-		{"Config.GoVersion", Field, 18, ""},
-		{"Config.IgnoreFuncBodies", Field, 5, ""},
-		{"Config.Importer", Field, 5, ""},
-		{"Config.Sizes", Field, 5, ""},
-		{"Const", Type, 5, ""},
-		{"Context", Type, 18, ""},
-		{"ConvertibleTo", Func, 5, "func(V Type, T Type) bool"},
-		{"DefPredeclaredTestFuncs", Func, 5, "func()"},
-		{"Default", Func, 8, "func(t Type) Type"},
-		{"Error", Type, 5, ""},
-		{"Error.Fset", Field, 5, ""},
-		{"Error.Msg", Field, 5, ""},
-		{"Error.Pos", Field, 5, ""},
-		{"Error.Soft", Field, 5, ""},
-		{"Eval", Func, 5, "func(fset *token.FileSet, pkg *Package, pos token.Pos, expr string) (_ TypeAndValue, err error)"},
-		{"ExprString", Func, 5, "func(x ast.Expr) string"},
-		{"FieldVal", Const, 5, ""},
-		{"FieldVar", Const, 25, ""},
-		{"Float32", Const, 5, ""},
-		{"Float64", Const, 5, ""},
-		{"Func", Type, 5, ""},
-		{"Id", Func, 5, "func(pkg *Package, name string) string"},
-		{"Identical", Func, 5, "func(x Type, y Type) bool"},
-		{"IdenticalIgnoreTags", Func, 8, "func(x Type, y Type) bool"},
-		{"Implements", Func, 5, "func(V Type, T *Interface) bool"},
-		{"ImportMode", Type, 6, ""},
-		{"Importer", Type, 5, ""},
-		{"ImporterFrom", Type, 6, ""},
-		{"Info", Type, 5, ""},
-		{"Info.Defs", Field, 5, ""},
-		{"Info.FileVersions", Field, 22, ""},
-		{"Info.Implicits", Field, 5, ""},
-		{"Info.InitOrder", Field, 5, ""},
-		{"Info.Instances", Field, 18, ""},
-		{"Info.Scopes", Field, 5, ""},
-		{"Info.Selections", Field, 5, ""},
-		{"Info.Types", Field, 5, ""},
-		{"Info.Uses", Field, 5, ""},
-		{"Initializer", Type, 5, ""},
-		{"Initializer.Lhs", Field, 5, ""},
-		{"Initializer.Rhs", Field, 5, ""},
-		{"Instance", Type, 18, ""},
-		{"Instance.Type", Field, 18, ""},
-		{"Instance.TypeArgs", Field, 18, ""},
-		{"Instantiate", Func, 18, "func(ctxt *Context, orig Type, targs []Type, validate bool) (Type, error)"},
-		{"Int", Const, 5, ""},
-		{"Int16", Const, 5, ""},
-		{"Int32", Const, 5, ""},
-		{"Int64", Const, 5, ""},
-		{"Int8", Const, 5, ""},
-		{"Interface", Type, 5, ""},
-		{"Invalid", Const, 5, ""},
-		{"IsBoolean", Const, 5, ""},
-		{"IsComplex", Const, 5, ""},
-		{"IsConstType", Const, 5, ""},
-		{"IsFloat", Const, 5, ""},
-		{"IsInteger", Const, 5, ""},
-		{"IsInterface", Func, 5, "func(t Type) bool"},
-		{"IsNumeric", Const, 5, ""},
-		{"IsOrdered", Const, 5, ""},
-		{"IsString", Const, 5, ""},
-		{"IsUnsigned", Const, 5, ""},
-		{"IsUntyped", Const, 5, ""},
-		{"Label", Type, 5, ""},
-		{"LocalVar", Const, 25, ""},
-		{"LookupFieldOrMethod", Func, 5, "func(T Type, addressable bool, pkg *Package, name string) (obj Object, index []int, indirect bool)"},
-		{"LookupSelection", Func, 25, ""},
-		{"Map", Type, 5, ""},
-		{"MethodExpr", Const, 5, ""},
-		{"MethodSet", Type, 5, ""},
-		{"MethodVal", Const, 5, ""},
-		{"MissingMethod", Func, 5, "func(V Type, T *Interface, static bool) (method *Func, wrongType bool)"},
-		{"Named", Type, 5, ""},
-		{"NewAlias", Func, 22, "func(obj *TypeName, rhs Type) *Alias"},
-		{"NewArray", Func, 5, "func(elem Type, len int64) *Array"},
-		{"NewChan", Func, 5, "func(dir ChanDir, elem Type) *Chan"},
-		{"NewChecker", Func, 5, "func(conf *Config, fset *token.FileSet, pkg *Package, info *Info) *Checker"},
-		{"NewConst", Func, 5, "func(pos token.Pos, pkg *Package, name string, typ Type, val constant.Value) *Const"},
-		{"NewContext", Func, 18, "func() *Context"},
-		{"NewField", Func, 5, "func(pos token.Pos, pkg *Package, name string, typ Type, embedded bool) *Var"},
-		{"NewFunc", Func, 5, "func(pos token.Pos, pkg *Package, name string, sig *Signature) *Func"},
-		{"NewInterface", Func, 5, "func(methods []*Func, embeddeds []*Named) *Interface"},
-		{"NewInterfaceType", Func, 11, "func(methods []*Func, embeddeds []Type) *Interface"},
-		{"NewLabel", Func, 5, "func(pos token.Pos, pkg *Package, name string) *Label"},
-		{"NewMap", Func, 5, "func(key Type, elem Type) *Map"},
-		{"NewMethodSet", Func, 5, "func(T Type) *MethodSet"},
-		{"NewNamed", Func, 5, "func(obj *TypeName, underlying Type, methods []*Func) *Named"},
-		{"NewPackage", Func, 5, "func(path string, name string) *Package"},
-		{"NewParam", Func, 5, "func(pos token.Pos, pkg *Package, name string, typ Type) *Var"},
-		{"NewPkgName", Func, 5, "func(pos token.Pos, pkg *Package, name string, imported *Package) *PkgName"},
-		{"NewPointer", Func, 5, "func(elem Type) *Pointer"},
-		{"NewScope", Func, 5, "func(parent *Scope, pos token.Pos, end token.Pos, comment string) *Scope"},
-		{"NewSignature", Func, 5, "func(recv *Var, params *Tuple, results *Tuple, variadic bool) *Signature"},
-		{"NewSignatureType", Func, 18, "func(recv *Var, recvTypeParams []*TypeParam, typeParams []*TypeParam, params *Tuple, results *Tuple, variadic bool) *Signature"},
-		{"NewSlice", Func, 5, "func(elem Type) *Slice"},
-		{"NewStruct", Func, 5, "func(fields []*Var, tags []string) *Struct"},
-		{"NewTerm", Func, 18, "func(tilde bool, typ Type) *Term"},
-		{"NewTuple", Func, 5, "func(x ...*Var) *Tuple"},
-		{"NewTypeName", Func, 5, "func(pos token.Pos, pkg *Package, name string, typ Type) *TypeName"},
-		{"NewTypeParam", Func, 18, "func(obj *TypeName, constraint Type) *TypeParam"},
-		{"NewUnion", Func, 18, "func(terms []*Term) *Union"},
-		{"NewVar", Func, 5, "func(pos token.Pos, pkg *Package, name string, typ Type) *Var"},
-		{"Nil", Type, 5, ""},
-		{"Object", Type, 5, ""},
-		{"ObjectString", Func, 5, "func(obj Object, qf Qualifier) string"},
-		{"Package", Type, 5, ""},
-		{"PackageVar", Const, 25, ""},
-		{"ParamVar", Const, 25, ""},
-		{"PkgName", Type, 5, ""},
-		{"Pointer", Type, 5, ""},
-		{"Qualifier", Type, 5, ""},
-		{"RecvOnly", Const, 5, ""},
-		{"RecvVar", Const, 25, ""},
-		{"RelativeTo", Func, 5, "func(pkg *Package) Qualifier"},
-		{"ResultVar", Const, 25, ""},
-		{"Rune", Const, 5, ""},
-		{"Satisfies", Func, 20, "func(V Type, T *Interface) bool"},
-		{"Scope", Type, 5, ""},
-		{"Selection", Type, 5, ""},
-		{"SelectionKind", Type, 5, ""},
-		{"SelectionString", Func, 5, "func(s *Selection, qf Qualifier) string"},
-		{"SendOnly", Const, 5, ""},
-		{"SendRecv", Const, 5, ""},
-		{"Signature", Type, 5, ""},
-		{"Sizes", Type, 5, ""},
-		{"SizesFor", Func, 9, "func(compiler string, arch string) Sizes"},
-		{"Slice", Type, 5, ""},
-		{"StdSizes", Type, 5, ""},
-		{"StdSizes.MaxAlign", Field, 5, ""},
-		{"StdSizes.WordSize", Field, 5, ""},
-		{"String", Const, 5, ""},
-		{"Struct", Type, 5, ""},
-		{"Term", Type, 18, ""},
-		{"Tuple", Type, 5, ""},
-		{"Typ", Var, 5, ""},
-		{"Type", Type, 5, ""},
-		{"TypeAndValue", Type, 5, ""},
-		{"TypeAndValue.Type", Field, 5, ""},
-		{"TypeAndValue.Value", Field, 5, ""},
-		{"TypeList", Type, 18, ""},
-		{"TypeName", Type, 5, ""},
-		{"TypeParam", Type, 18, ""},
-		{"TypeParamList", Type, 18, ""},
-		{"TypeString", Func, 5, "func(typ Type, qf Qualifier) string"},
-		{"Uint", Const, 5, ""},
-		{"Uint16", Const, 5, ""},
-		{"Uint32", Const, 5, ""},
-		{"Uint64", Const, 5, ""},
-		{"Uint8", Const, 5, ""},
-		{"Uintptr", Const, 5, ""},
-		{"Unalias", Func, 22, "func(t Type) Type"},
-		{"Union", Type, 18, ""},
-		{"Universe", Var, 5, ""},
-		{"Unsafe", Var, 5, ""},
-		{"UnsafePointer", Const, 5, ""},
-		{"UntypedBool", Const, 5, ""},
-		{"UntypedComplex", Const, 5, ""},
-		{"UntypedFloat", Const, 5, ""},
-		{"UntypedInt", Const, 5, ""},
-		{"UntypedNil", Const, 5, ""},
-		{"UntypedRune", Const, 5, ""},
-		{"UntypedString", Const, 5, ""},
-		{"Var", Type, 5, ""},
-		{"VarKind", Type, 25, ""},
-		{"WriteExpr", Func, 5, "func(buf *bytes.Buffer, x ast.Expr)"},
-		{"WriteSignature", Func, 5, "func(buf *bytes.Buffer, sig *Signature, qf Qualifier)"},
-		{"WriteType", Func, 5, "func(buf *bytes.Buffer, typ Type, qf Qualifier)"},
-	},
-	"go/version": {
-		{"Compare", Func, 22, "func(x string, y string) int"},
-		{"IsValid", Func, 22, "func(x string) bool"},
-		{"Lang", Func, 22, "func(x string) string"},
-	},
-	"hash": {
-		{"Hash", Type, 0, ""},
-		{"Hash32", Type, 0, ""},
-		{"Hash64", Type, 0, ""},
-	},
-	"hash/adler32": {
-		{"Checksum", Func, 0, "func(data []byte) uint32"},
-		{"New", Func, 0, "func() hash.Hash32"},
-		{"Size", Const, 0, ""},
-	},
-	"hash/crc32": {
-		{"Castagnoli", Const, 0, ""},
-		{"Checksum", Func, 0, "func(data []byte, tab *Table) uint32"},
-		{"ChecksumIEEE", Func, 0, "func(data []byte) uint32"},
-		{"IEEE", Const, 0, ""},
-		{"IEEETable", Var, 0, ""},
-		{"Koopman", Const, 0, ""},
-		{"MakeTable", Func, 0, "func(poly uint32) *Table"},
-		{"New", Func, 0, "func(tab *Table) hash.Hash32"},
-		{"NewIEEE", Func, 0, "func() hash.Hash32"},
-		{"Size", Const, 0, ""},
-		{"Table", Type, 0, ""},
-		{"Update", Func, 0, "func(crc uint32, tab *Table, p []byte) uint32"},
-	},
-	"hash/crc64": {
-		{"Checksum", Func, 0, "func(data []byte, tab *Table) uint64"},
-		{"ECMA", Const, 0, ""},
-		{"ISO", Const, 0, ""},
-		{"MakeTable", Func, 0, "func(poly uint64) *Table"},
-		{"New", Func, 0, "func(tab *Table) hash.Hash64"},
-		{"Size", Const, 0, ""},
-		{"Table", Type, 0, ""},
-		{"Update", Func, 0, "func(crc uint64, tab *Table, p []byte) uint64"},
-	},
-	"hash/fnv": {
-		{"New128", Func, 9, "func() hash.Hash"},
-		{"New128a", Func, 9, "func() hash.Hash"},
-		{"New32", Func, 0, "func() hash.Hash32"},
-		{"New32a", Func, 0, "func() hash.Hash32"},
-		{"New64", Func, 0, "func() hash.Hash64"},
-		{"New64a", Func, 0, "func() hash.Hash64"},
-	},
-	"hash/maphash": {
-		{"(*Hash).BlockSize", Method, 14, ""},
-		{"(*Hash).Reset", Method, 14, ""},
-		{"(*Hash).Seed", Method, 14, ""},
-		{"(*Hash).SetSeed", Method, 14, ""},
-		{"(*Hash).Size", Method, 14, ""},
-		{"(*Hash).Sum", Method, 14, ""},
-		{"(*Hash).Sum64", Method, 14, ""},
-		{"(*Hash).Write", Method, 14, ""},
-		{"(*Hash).WriteByte", Method, 14, ""},
-		{"(*Hash).WriteString", Method, 14, ""},
-		{"Bytes", Func, 19, "func(seed Seed, b []byte) uint64"},
-		{"Comparable", Func, 24, "func[T comparable](seed Seed, v T) uint64"},
-		{"Hash", Type, 14, ""},
-		{"MakeSeed", Func, 14, "func() Seed"},
-		{"Seed", Type, 14, ""},
-		{"String", Func, 19, "func(seed Seed, s string) uint64"},
-		{"WriteComparable", Func, 24, "func[T comparable](h *Hash, x T)"},
-	},
-	"html": {
-		{"EscapeString", Func, 0, "func(s string) string"},
-		{"UnescapeString", Func, 0, "func(s string) string"},
-	},
-	"html/template": {
-		{"(*Error).Error", Method, 0, ""},
-		{"(*Template).AddParseTree", Method, 0, ""},
-		{"(*Template).Clone", Method, 0, ""},
-		{"(*Template).DefinedTemplates", Method, 6, ""},
-		{"(*Template).Delims", Method, 0, ""},
-		{"(*Template).Execute", Method, 0, ""},
-		{"(*Template).ExecuteTemplate", Method, 0, ""},
-		{"(*Template).Funcs", Method, 0, ""},
-		{"(*Template).Lookup", Method, 0, ""},
-		{"(*Template).Name", Method, 0, ""},
-		{"(*Template).New", Method, 0, ""},
-		{"(*Template).Option", Method, 5, ""},
-		{"(*Template).Parse", Method, 0, ""},
-		{"(*Template).ParseFS", Method, 16, ""},
-		{"(*Template).ParseFiles", Method, 0, ""},
-		{"(*Template).ParseGlob", Method, 0, ""},
-		{"(*Template).Templates", Method, 0, ""},
-		{"CSS", Type, 0, ""},
-		{"ErrAmbigContext", Const, 0, ""},
-		{"ErrBadHTML", Const, 0, ""},
-		{"ErrBranchEnd", Const, 0, ""},
-		{"ErrEndContext", Const, 0, ""},
-		{"ErrJSTemplate", Const, 21, ""},
-		{"ErrNoSuchTemplate", Const, 0, ""},
-		{"ErrOutputContext", Const, 0, ""},
-		{"ErrPartialCharset", Const, 0, ""},
-		{"ErrPartialEscape", Const, 0, ""},
-		{"ErrPredefinedEscaper", Const, 9, ""},
-		{"ErrRangeLoopReentry", Const, 0, ""},
-		{"ErrSlashAmbig", Const, 0, ""},
-		{"Error", Type, 0, ""},
-		{"Error.Description", Field, 0, ""},
-		{"Error.ErrorCode", Field, 0, ""},
-		{"Error.Line", Field, 0, ""},
-		{"Error.Name", Field, 0, ""},
-		{"Error.Node", Field, 4, ""},
-		{"ErrorCode", Type, 0, ""},
-		{"FuncMap", Type, 0, ""},
-		{"HTML", Type, 0, ""},
-		{"HTMLAttr", Type, 0, ""},
-		{"HTMLEscape", Func, 0, "func(w io.Writer, b []byte)"},
-		{"HTMLEscapeString", Func, 0, "func(s string) string"},
-		{"HTMLEscaper", Func, 0, "func(args ...any) string"},
-		{"IsTrue", Func, 6, "func(val any) (truth bool, ok bool)"},
-		{"JS", Type, 0, ""},
-		{"JSEscape", Func, 0, "func(w io.Writer, b []byte)"},
-		{"JSEscapeString", Func, 0, "func(s string) string"},
-		{"JSEscaper", Func, 0, "func(args ...any) string"},
-		{"JSStr", Type, 0, ""},
-		{"Must", Func, 0, "func(t *Template, err error) *Template"},
-		{"New", Func, 0, "func(name string) *Template"},
-		{"OK", Const, 0, ""},
-		{"ParseFS", Func, 16, "func(fs fs.FS, patterns ...string) (*Template, error)"},
-		{"ParseFiles", Func, 0, "func(filenames ...string) (*Template, error)"},
-		{"ParseGlob", Func, 0, "func(pattern string) (*Template, error)"},
-		{"Srcset", Type, 10, ""},
-		{"Template", Type, 0, ""},
-		{"Template.Tree", Field, 2, ""},
-		{"URL", Type, 0, ""},
-		{"URLQueryEscaper", Func, 0, "func(args ...any) string"},
-	},
-	"image": {
-		{"(*Alpha).AlphaAt", Method, 4, ""},
-		{"(*Alpha).At", Method, 0, ""},
-		{"(*Alpha).Bounds", Method, 0, ""},
-		{"(*Alpha).ColorModel", Method, 0, ""},
-		{"(*Alpha).Opaque", Method, 0, ""},
-		{"(*Alpha).PixOffset", Method, 0, ""},
-		{"(*Alpha).RGBA64At", Method, 17, ""},
-		{"(*Alpha).Set", Method, 0, ""},
-		{"(*Alpha).SetAlpha", Method, 0, ""},
-		{"(*Alpha).SetRGBA64", Method, 17, ""},
-		{"(*Alpha).SubImage", Method, 0, ""},
-		{"(*Alpha16).Alpha16At", Method, 4, ""},
-		{"(*Alpha16).At", Method, 0, ""},
-		{"(*Alpha16).Bounds", Method, 0, ""},
-		{"(*Alpha16).ColorModel", Method, 0, ""},
-		{"(*Alpha16).Opaque", Method, 0, ""},
-		{"(*Alpha16).PixOffset", Method, 0, ""},
-		{"(*Alpha16).RGBA64At", Method, 17, ""},
-		{"(*Alpha16).Set", Method, 0, ""},
-		{"(*Alpha16).SetAlpha16", Method, 0, ""},
-		{"(*Alpha16).SetRGBA64", Method, 17, ""},
-		{"(*Alpha16).SubImage", Method, 0, ""},
-		{"(*CMYK).At", Method, 5, ""},
-		{"(*CMYK).Bounds", Method, 5, ""},
-		{"(*CMYK).CMYKAt", Method, 5, ""},
-		{"(*CMYK).ColorModel", Method, 5, ""},
-		{"(*CMYK).Opaque", Method, 5, ""},
-		{"(*CMYK).PixOffset", Method, 5, ""},
-		{"(*CMYK).RGBA64At", Method, 17, ""},
-		{"(*CMYK).Set", Method, 5, ""},
-		{"(*CMYK).SetCMYK", Method, 5, ""},
-		{"(*CMYK).SetRGBA64", Method, 17, ""},
-		{"(*CMYK).SubImage", Method, 5, ""},
-		{"(*Gray).At", Method, 0, ""},
-		{"(*Gray).Bounds", Method, 0, ""},
-		{"(*Gray).ColorModel", Method, 0, ""},
-		{"(*Gray).GrayAt", Method, 4, ""},
-		{"(*Gray).Opaque", Method, 0, ""},
-		{"(*Gray).PixOffset", Method, 0, ""},
-		{"(*Gray).RGBA64At", Method, 17, ""},
-		{"(*Gray).Set", Method, 0, ""},
-		{"(*Gray).SetGray", Method, 0, ""},
-		{"(*Gray).SetRGBA64", Method, 17, ""},
-		{"(*Gray).SubImage", Method, 0, ""},
-		{"(*Gray16).At", Method, 0, ""},
-		{"(*Gray16).Bounds", Method, 0, ""},
-		{"(*Gray16).ColorModel", Method, 0, ""},
-		{"(*Gray16).Gray16At", Method, 4, ""},
-		{"(*Gray16).Opaque", Method, 0, ""},
-		{"(*Gray16).PixOffset", Method, 0, ""},
-		{"(*Gray16).RGBA64At", Method, 17, ""},
-		{"(*Gray16).Set", Method, 0, ""},
-		{"(*Gray16).SetGray16", Method, 0, ""},
-		{"(*Gray16).SetRGBA64", Method, 17, ""},
-		{"(*Gray16).SubImage", Method, 0, ""},
-		{"(*NRGBA).At", Method, 0, ""},
-		{"(*NRGBA).Bounds", Method, 0, ""},
-		{"(*NRGBA).ColorModel", Method, 0, ""},
-		{"(*NRGBA).NRGBAAt", Method, 4, ""},
-		{"(*NRGBA).Opaque", Method, 0, ""},
-		{"(*NRGBA).PixOffset", Method, 0, ""},
-		{"(*NRGBA).RGBA64At", Method, 17, ""},
-		{"(*NRGBA).Set", Method, 0, ""},
-		{"(*NRGBA).SetNRGBA", Method, 0, ""},
-		{"(*NRGBA).SetRGBA64", Method, 17, ""},
-		{"(*NRGBA).SubImage", Method, 0, ""},
-		{"(*NRGBA64).At", Method, 0, ""},
-		{"(*NRGBA64).Bounds", Method, 0, ""},
-		{"(*NRGBA64).ColorModel", Method, 0, ""},
-		{"(*NRGBA64).NRGBA64At", Method, 4, ""},
-		{"(*NRGBA64).Opaque", Method, 0, ""},
-		{"(*NRGBA64).PixOffset", Method, 0, ""},
-		{"(*NRGBA64).RGBA64At", Method, 17, ""},
-		{"(*NRGBA64).Set", Method, 0, ""},
-		{"(*NRGBA64).SetNRGBA64", Method, 0, ""},
-		{"(*NRGBA64).SetRGBA64", Method, 17, ""},
-		{"(*NRGBA64).SubImage", Method, 0, ""},
-		{"(*NYCbCrA).AOffset", Method, 6, ""},
-		{"(*NYCbCrA).At", Method, 6, ""},
-		{"(*NYCbCrA).Bounds", Method, 6, ""},
-		{"(*NYCbCrA).COffset", Method, 6, ""},
-		{"(*NYCbCrA).ColorModel", Method, 6, ""},
-		{"(*NYCbCrA).NYCbCrAAt", Method, 6, ""},
-		{"(*NYCbCrA).Opaque", Method, 6, ""},
-		{"(*NYCbCrA).RGBA64At", Method, 17, ""},
-		{"(*NYCbCrA).SubImage", Method, 6, ""},
-		{"(*NYCbCrA).YCbCrAt", Method, 6, ""},
-		{"(*NYCbCrA).YOffset", Method, 6, ""},
-		{"(*Paletted).At", Method, 0, ""},
-		{"(*Paletted).Bounds", Method, 0, ""},
-		{"(*Paletted).ColorIndexAt", Method, 0, ""},
-		{"(*Paletted).ColorModel", Method, 0, ""},
-		{"(*Paletted).Opaque", Method, 0, ""},
-		{"(*Paletted).PixOffset", Method, 0, ""},
-		{"(*Paletted).RGBA64At", Method, 17, ""},
-		{"(*Paletted).Set", Method, 0, ""},
-		{"(*Paletted).SetColorIndex", Method, 0, ""},
-		{"(*Paletted).SetRGBA64", Method, 17, ""},
-		{"(*Paletted).SubImage", Method, 0, ""},
-		{"(*RGBA).At", Method, 0, ""},
-		{"(*RGBA).Bounds", Method, 0, ""},
-		{"(*RGBA).ColorModel", Method, 0, ""},
-		{"(*RGBA).Opaque", Method, 0, ""},
-		{"(*RGBA).PixOffset", Method, 0, ""},
-		{"(*RGBA).RGBA64At", Method, 17, ""},
-		{"(*RGBA).RGBAAt", Method, 4, ""},
-		{"(*RGBA).Set", Method, 0, ""},
-		{"(*RGBA).SetRGBA", Method, 0, ""},
-		{"(*RGBA).SetRGBA64", Method, 17, ""},
-		{"(*RGBA).SubImage", Method, 0, ""},
-		{"(*RGBA64).At", Method, 0, ""},
-		{"(*RGBA64).Bounds", Method, 0, ""},
-		{"(*RGBA64).ColorModel", Method, 0, ""},
-		{"(*RGBA64).Opaque", Method, 0, ""},
-		{"(*RGBA64).PixOffset", Method, 0, ""},
-		{"(*RGBA64).RGBA64At", Method, 4, ""},
-		{"(*RGBA64).Set", Method, 0, ""},
-		{"(*RGBA64).SetRGBA64", Method, 0, ""},
-		{"(*RGBA64).SubImage", Method, 0, ""},
-		{"(*Uniform).At", Method, 0, ""},
-		{"(*Uniform).Bounds", Method, 0, ""},
-		{"(*Uniform).ColorModel", Method, 0, ""},
-		{"(*Uniform).Convert", Method, 0, ""},
-		{"(*Uniform).Opaque", Method, 0, ""},
-		{"(*Uniform).RGBA", Method, 0, ""},
-		{"(*Uniform).RGBA64At", Method, 17, ""},
-		{"(*YCbCr).At", Method, 0, ""},
-		{"(*YCbCr).Bounds", Method, 0, ""},
-		{"(*YCbCr).COffset", Method, 0, ""},
-		{"(*YCbCr).ColorModel", Method, 0, ""},
-		{"(*YCbCr).Opaque", Method, 0, ""},
-		{"(*YCbCr).RGBA64At", Method, 17, ""},
-		{"(*YCbCr).SubImage", Method, 0, ""},
-		{"(*YCbCr).YCbCrAt", Method, 4, ""},
-		{"(*YCbCr).YOffset", Method, 0, ""},
-		{"(Point).Add", Method, 0, ""},
-		{"(Point).Div", Method, 0, ""},
-		{"(Point).Eq", Method, 0, ""},
-		{"(Point).In", Method, 0, ""},
-		{"(Point).Mod", Method, 0, ""},
-		{"(Point).Mul", Method, 0, ""},
-		{"(Point).String", Method, 0, ""},
-		{"(Point).Sub", Method, 0, ""},
-		{"(Rectangle).Add", Method, 0, ""},
-		{"(Rectangle).At", Method, 5, ""},
-		{"(Rectangle).Bounds", Method, 5, ""},
-		{"(Rectangle).Canon", Method, 0, ""},
-		{"(Rectangle).ColorModel", Method, 5, ""},
-		{"(Rectangle).Dx", Method, 0, ""},
-		{"(Rectangle).Dy", Method, 0, ""},
-		{"(Rectangle).Empty", Method, 0, ""},
-		{"(Rectangle).Eq", Method, 0, ""},
-		{"(Rectangle).In", Method, 0, ""},
-		{"(Rectangle).Inset", Method, 0, ""},
-		{"(Rectangle).Intersect", Method, 0, ""},
-		{"(Rectangle).Overlaps", Method, 0, ""},
-		{"(Rectangle).RGBA64At", Method, 17, ""},
-		{"(Rectangle).Size", Method, 0, ""},
-		{"(Rectangle).String", Method, 0, ""},
-		{"(Rectangle).Sub", Method, 0, ""},
-		{"(Rectangle).Union", Method, 0, ""},
-		{"(YCbCrSubsampleRatio).String", Method, 0, ""},
-		{"Alpha", Type, 0, ""},
-		{"Alpha.Pix", Field, 0, ""},
-		{"Alpha.Rect", Field, 0, ""},
-		{"Alpha.Stride", Field, 0, ""},
-		{"Alpha16", Type, 0, ""},
-		{"Alpha16.Pix", Field, 0, ""},
-		{"Alpha16.Rect", Field, 0, ""},
-		{"Alpha16.Stride", Field, 0, ""},
-		{"Black", Var, 0, ""},
-		{"CMYK", Type, 5, ""},
-		{"CMYK.Pix", Field, 5, ""},
-		{"CMYK.Rect", Field, 5, ""},
-		{"CMYK.Stride", Field, 5, ""},
-		{"Config", Type, 0, ""},
-		{"Config.ColorModel", Field, 0, ""},
-		{"Config.Height", Field, 0, ""},
-		{"Config.Width", Field, 0, ""},
-		{"Decode", Func, 0, "func(r io.Reader) (Image, string, error)"},
-		{"DecodeConfig", Func, 0, "func(r io.Reader) (Config, string, error)"},
-		{"ErrFormat", Var, 0, ""},
-		{"Gray", Type, 0, ""},
-		{"Gray.Pix", Field, 0, ""},
-		{"Gray.Rect", Field, 0, ""},
-		{"Gray.Stride", Field, 0, ""},
-		{"Gray16", Type, 0, ""},
-		{"Gray16.Pix", Field, 0, ""},
-		{"Gray16.Rect", Field, 0, ""},
-		{"Gray16.Stride", Field, 0, ""},
-		{"Image", Type, 0, ""},
-		{"NRGBA", Type, 0, ""},
-		{"NRGBA.Pix", Field, 0, ""},
-		{"NRGBA.Rect", Field, 0, ""},
-		{"NRGBA.Stride", Field, 0, ""},
-		{"NRGBA64", Type, 0, ""},
-		{"NRGBA64.Pix", Field, 0, ""},
-		{"NRGBA64.Rect", Field, 0, ""},
-		{"NRGBA64.Stride", Field, 0, ""},
-		{"NYCbCrA", Type, 6, ""},
-		{"NYCbCrA.A", Field, 6, ""},
-		{"NYCbCrA.AStride", Field, 6, ""},
-		{"NYCbCrA.YCbCr", Field, 6, ""},
-		{"NewAlpha", Func, 0, "func(r Rectangle) *Alpha"},
-		{"NewAlpha16", Func, 0, "func(r Rectangle) *Alpha16"},
-		{"NewCMYK", Func, 5, "func(r Rectangle) *CMYK"},
-		{"NewGray", Func, 0, "func(r Rectangle) *Gray"},
-		{"NewGray16", Func, 0, "func(r Rectangle) *Gray16"},
-		{"NewNRGBA", Func, 0, "func(r Rectangle) *NRGBA"},
-		{"NewNRGBA64", Func, 0, "func(r Rectangle) *NRGBA64"},
-		{"NewNYCbCrA", Func, 6, "func(r Rectangle, subsampleRatio YCbCrSubsampleRatio) *NYCbCrA"},
-		{"NewPaletted", Func, 0, "func(r Rectangle, p color.Palette) *Paletted"},
-		{"NewRGBA", Func, 0, "func(r Rectangle) *RGBA"},
-		{"NewRGBA64", Func, 0, "func(r Rectangle) *RGBA64"},
-		{"NewUniform", Func, 0, "func(c color.Color) *Uniform"},
-		{"NewYCbCr", Func, 0, "func(r Rectangle, subsampleRatio YCbCrSubsampleRatio) *YCbCr"},
-		{"Opaque", Var, 0, ""},
-		{"Paletted", Type, 0, ""},
-		{"Paletted.Palette", Field, 0, ""},
-		{"Paletted.Pix", Field, 0, ""},
-		{"Paletted.Rect", Field, 0, ""},
-		{"Paletted.Stride", Field, 0, ""},
-		{"PalettedImage", Type, 0, ""},
-		{"Point", Type, 0, ""},
-		{"Point.X", Field, 0, ""},
-		{"Point.Y", Field, 0, ""},
-		{"Pt", Func, 0, "func(X int, Y int) Point"},
-		{"RGBA", Type, 0, ""},
-		{"RGBA.Pix", Field, 0, ""},
-		{"RGBA.Rect", Field, 0, ""},
-		{"RGBA.Stride", Field, 0, ""},
-		{"RGBA64", Type, 0, ""},
-		{"RGBA64.Pix", Field, 0, ""},
-		{"RGBA64.Rect", Field, 0, ""},
-		{"RGBA64.Stride", Field, 0, ""},
-		{"RGBA64Image", Type, 17, ""},
-		{"Rect", Func, 0, "func(x0 int, y0 int, x1 int, y1 int) Rectangle"},
-		{"Rectangle", Type, 0, ""},
-		{"Rectangle.Max", Field, 0, ""},
-		{"Rectangle.Min", Field, 0, ""},
-		{"RegisterFormat", Func, 0, "func(name string, magic string, decode func(io.Reader) (Image, error), decodeConfig func(io.Reader) (Config, error))"},
-		{"Transparent", Var, 0, ""},
-		{"Uniform", Type, 0, ""},
-		{"Uniform.C", Field, 0, ""},
-		{"White", Var, 0, ""},
-		{"YCbCr", Type, 0, ""},
-		{"YCbCr.CStride", Field, 0, ""},
-		{"YCbCr.Cb", Field, 0, ""},
-		{"YCbCr.Cr", Field, 0, ""},
-		{"YCbCr.Rect", Field, 0, ""},
-		{"YCbCr.SubsampleRatio", Field, 0, ""},
-		{"YCbCr.Y", Field, 0, ""},
-		{"YCbCr.YStride", Field, 0, ""},
-		{"YCbCrSubsampleRatio", Type, 0, ""},
-		{"YCbCrSubsampleRatio410", Const, 5, ""},
-		{"YCbCrSubsampleRatio411", Const, 5, ""},
-		{"YCbCrSubsampleRatio420", Const, 0, ""},
-		{"YCbCrSubsampleRatio422", Const, 0, ""},
-		{"YCbCrSubsampleRatio440", Const, 1, ""},
-		{"YCbCrSubsampleRatio444", Const, 0, ""},
-		{"ZP", Var, 0, ""},
-		{"ZR", Var, 0, ""},
-	},
-	"image/color": {
-		{"(Alpha).RGBA", Method, 0, ""},
-		{"(Alpha16).RGBA", Method, 0, ""},
-		{"(CMYK).RGBA", Method, 5, ""},
-		{"(Gray).RGBA", Method, 0, ""},
-		{"(Gray16).RGBA", Method, 0, ""},
-		{"(NRGBA).RGBA", Method, 0, ""},
-		{"(NRGBA64).RGBA", Method, 0, ""},
-		{"(NYCbCrA).RGBA", Method, 6, ""},
-		{"(Palette).Convert", Method, 0, ""},
-		{"(Palette).Index", Method, 0, ""},
-		{"(RGBA).RGBA", Method, 0, ""},
-		{"(RGBA64).RGBA", Method, 0, ""},
-		{"(YCbCr).RGBA", Method, 0, ""},
-		{"Alpha", Type, 0, ""},
-		{"Alpha.A", Field, 0, ""},
-		{"Alpha16", Type, 0, ""},
-		{"Alpha16.A", Field, 0, ""},
-		{"Alpha16Model", Var, 0, ""},
-		{"AlphaModel", Var, 0, ""},
-		{"Black", Var, 0, ""},
-		{"CMYK", Type, 5, ""},
-		{"CMYK.C", Field, 5, ""},
-		{"CMYK.K", Field, 5, ""},
-		{"CMYK.M", Field, 5, ""},
-		{"CMYK.Y", Field, 5, ""},
-		{"CMYKModel", Var, 5, ""},
-		{"CMYKToRGB", Func, 5, "func(c uint8, m uint8, y uint8, k uint8) (uint8, uint8, uint8)"},
-		{"Color", Type, 0, ""},
-		{"Gray", Type, 0, ""},
-		{"Gray.Y", Field, 0, ""},
-		{"Gray16", Type, 0, ""},
-		{"Gray16.Y", Field, 0, ""},
-		{"Gray16Model", Var, 0, ""},
-		{"GrayModel", Var, 0, ""},
-		{"Model", Type, 0, ""},
-		{"ModelFunc", Func, 0, "func(f func(Color) Color) Model"},
-		{"NRGBA", Type, 0, ""},
-		{"NRGBA.A", Field, 0, ""},
-		{"NRGBA.B", Field, 0, ""},
-		{"NRGBA.G", Field, 0, ""},
-		{"NRGBA.R", Field, 0, ""},
-		{"NRGBA64", Type, 0, ""},
-		{"NRGBA64.A", Field, 0, ""},
-		{"NRGBA64.B", Field, 0, ""},
-		{"NRGBA64.G", Field, 0, ""},
-		{"NRGBA64.R", Field, 0, ""},
-		{"NRGBA64Model", Var, 0, ""},
-		{"NRGBAModel", Var, 0, ""},
-		{"NYCbCrA", Type, 6, ""},
-		{"NYCbCrA.A", Field, 6, ""},
-		{"NYCbCrA.YCbCr", Field, 6, ""},
-		{"NYCbCrAModel", Var, 6, ""},
-		{"Opaque", Var, 0, ""},
-		{"Palette", Type, 0, ""},
-		{"RGBA", Type, 0, ""},
-		{"RGBA.A", Field, 0, ""},
-		{"RGBA.B", Field, 0, ""},
-		{"RGBA.G", Field, 0, ""},
-		{"RGBA.R", Field, 0, ""},
-		{"RGBA64", Type, 0, ""},
-		{"RGBA64.A", Field, 0, ""},
-		{"RGBA64.B", Field, 0, ""},
-		{"RGBA64.G", Field, 0, ""},
-		{"RGBA64.R", Field, 0, ""},
-		{"RGBA64Model", Var, 0, ""},
-		{"RGBAModel", Var, 0, ""},
-		{"RGBToCMYK", Func, 5, "func(r uint8, g uint8, b uint8) (uint8, uint8, uint8, uint8)"},
-		{"RGBToYCbCr", Func, 0, "func(r uint8, g uint8, b uint8) (uint8, uint8, uint8)"},
-		{"Transparent", Var, 0, ""},
-		{"White", Var, 0, ""},
-		{"YCbCr", Type, 0, ""},
-		{"YCbCr.Cb", Field, 0, ""},
-		{"YCbCr.Cr", Field, 0, ""},
-		{"YCbCr.Y", Field, 0, ""},
-		{"YCbCrModel", Var, 0, ""},
-		{"YCbCrToRGB", Func, 0, "func(y uint8, cb uint8, cr uint8) (uint8, uint8, uint8)"},
-	},
-	"image/color/palette": {
-		{"Plan9", Var, 2, ""},
-		{"WebSafe", Var, 2, ""},
-	},
-	"image/draw": {
-		{"(Op).Draw", Method, 2, ""},
-		{"Draw", Func, 0, "func(dst Image, r image.Rectangle, src image.Image, sp image.Point, op Op)"},
-		{"DrawMask", Func, 0, "func(dst Image, r image.Rectangle, src image.Image, sp image.Point, mask image.Image, mp image.Point, op Op)"},
-		{"Drawer", Type, 2, ""},
-		{"FloydSteinberg", Var, 2, ""},
-		{"Image", Type, 0, ""},
-		{"Op", Type, 0, ""},
-		{"Over", Const, 0, ""},
-		{"Quantizer", Type, 2, ""},
-		{"RGBA64Image", Type, 17, ""},
-		{"Src", Const, 0, ""},
-	},
-	"image/gif": {
-		{"Decode", Func, 0, "func(r io.Reader) (image.Image, error)"},
-		{"DecodeAll", Func, 0, "func(r io.Reader) (*GIF, error)"},
-		{"DecodeConfig", Func, 0, "func(r io.Reader) (image.Config, error)"},
-		{"DisposalBackground", Const, 5, ""},
-		{"DisposalNone", Const, 5, ""},
-		{"DisposalPrevious", Const, 5, ""},
-		{"Encode", Func, 2, "func(w io.Writer, m image.Image, o *Options) error"},
-		{"EncodeAll", Func, 2, "func(w io.Writer, g *GIF) error"},
-		{"GIF", Type, 0, ""},
-		{"GIF.BackgroundIndex", Field, 5, ""},
-		{"GIF.Config", Field, 5, ""},
-		{"GIF.Delay", Field, 0, ""},
-		{"GIF.Disposal", Field, 5, ""},
-		{"GIF.Image", Field, 0, ""},
-		{"GIF.LoopCount", Field, 0, ""},
-		{"Options", Type, 2, ""},
-		{"Options.Drawer", Field, 2, ""},
-		{"Options.NumColors", Field, 2, ""},
-		{"Options.Quantizer", Field, 2, ""},
-	},
-	"image/jpeg": {
-		{"(FormatError).Error", Method, 0, ""},
-		{"(UnsupportedError).Error", Method, 0, ""},
-		{"Decode", Func, 0, "func(r io.Reader) (image.Image, error)"},
-		{"DecodeConfig", Func, 0, "func(r io.Reader) (image.Config, error)"},
-		{"DefaultQuality", Const, 0, ""},
-		{"Encode", Func, 0, "func(w io.Writer, m image.Image, o *Options) error"},
-		{"FormatError", Type, 0, ""},
-		{"Options", Type, 0, ""},
-		{"Options.Quality", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"UnsupportedError", Type, 0, ""},
-	},
-	"image/png": {
-		{"(*Encoder).Encode", Method, 4, ""},
-		{"(FormatError).Error", Method, 0, ""},
-		{"(UnsupportedError).Error", Method, 0, ""},
-		{"BestCompression", Const, 4, ""},
-		{"BestSpeed", Const, 4, ""},
-		{"CompressionLevel", Type, 4, ""},
-		{"Decode", Func, 0, "func(r io.Reader) (image.Image, error)"},
-		{"DecodeConfig", Func, 0, "func(r io.Reader) (image.Config, error)"},
-		{"DefaultCompression", Const, 4, ""},
-		{"Encode", Func, 0, "func(w io.Writer, m image.Image) error"},
-		{"Encoder", Type, 4, ""},
-		{"Encoder.BufferPool", Field, 9, ""},
-		{"Encoder.CompressionLevel", Field, 4, ""},
-		{"EncoderBuffer", Type, 9, ""},
-		{"EncoderBufferPool", Type, 9, ""},
-		{"FormatError", Type, 0, ""},
-		{"NoCompression", Const, 4, ""},
-		{"UnsupportedError", Type, 0, ""},
-	},
-	"index/suffixarray": {
-		{"(*Index).Bytes", Method, 0, ""},
-		{"(*Index).FindAllIndex", Method, 0, ""},
-		{"(*Index).Lookup", Method, 0, ""},
-		{"(*Index).Read", Method, 0, ""},
-		{"(*Index).Write", Method, 0, ""},
-		{"Index", Type, 0, ""},
-		{"New", Func, 0, "func(data []byte) *Index"},
-	},
-	"io": {
-		{"(*LimitedReader).Read", Method, 0, ""},
-		{"(*OffsetWriter).Seek", Method, 20, ""},
-		{"(*OffsetWriter).Write", Method, 20, ""},
-		{"(*OffsetWriter).WriteAt", Method, 20, ""},
-		{"(*PipeReader).Close", Method, 0, ""},
-		{"(*PipeReader).CloseWithError", Method, 0, ""},
-		{"(*PipeReader).Read", Method, 0, ""},
-		{"(*PipeWriter).Close", Method, 0, ""},
-		{"(*PipeWriter).CloseWithError", Method, 0, ""},
-		{"(*PipeWriter).Write", Method, 0, ""},
-		{"(*SectionReader).Outer", Method, 22, ""},
-		{"(*SectionReader).Read", Method, 0, ""},
-		{"(*SectionReader).ReadAt", Method, 0, ""},
-		{"(*SectionReader).Seek", Method, 0, ""},
-		{"(*SectionReader).Size", Method, 0, ""},
-		{"ByteReader", Type, 0, ""},
-		{"ByteScanner", Type, 0, ""},
-		{"ByteWriter", Type, 1, ""},
-		{"Closer", Type, 0, ""},
-		{"Copy", Func, 0, "func(dst Writer, src Reader) (written int64, err error)"},
-		{"CopyBuffer", Func, 5, "func(dst Writer, src Reader, buf []byte) (written int64, err error)"},
-		{"CopyN", Func, 0, "func(dst Writer, src Reader, n int64) (written int64, err error)"},
-		{"Discard", Var, 16, ""},
-		{"EOF", Var, 0, ""},
-		{"ErrClosedPipe", Var, 0, ""},
-		{"ErrNoProgress", Var, 1, ""},
-		{"ErrShortBuffer", Var, 0, ""},
-		{"ErrShortWrite", Var, 0, ""},
-		{"ErrUnexpectedEOF", Var, 0, ""},
-		{"LimitReader", Func, 0, "func(r Reader, n int64) Reader"},
-		{"LimitedReader", Type, 0, ""},
-		{"LimitedReader.N", Field, 0, ""},
-		{"LimitedReader.R", Field, 0, ""},
-		{"MultiReader", Func, 0, "func(readers ...Reader) Reader"},
-		{"MultiWriter", Func, 0, "func(writers ...Writer) Writer"},
-		{"NewOffsetWriter", Func, 20, "func(w WriterAt, off int64) *OffsetWriter"},
-		{"NewSectionReader", Func, 0, "func(r ReaderAt, off int64, n int64) *SectionReader"},
-		{"NopCloser", Func, 16, "func(r Reader) ReadCloser"},
-		{"OffsetWriter", Type, 20, ""},
-		{"Pipe", Func, 0, "func() (*PipeReader, *PipeWriter)"},
-		{"PipeReader", Type, 0, ""},
-		{"PipeWriter", Type, 0, ""},
-		{"ReadAll", Func, 16, "func(r Reader) ([]byte, error)"},
-		{"ReadAtLeast", Func, 0, "func(r Reader, buf []byte, min int) (n int, err error)"},
-		{"ReadCloser", Type, 0, ""},
-		{"ReadFull", Func, 0, "func(r Reader, buf []byte) (n int, err error)"},
-		{"ReadSeekCloser", Type, 16, ""},
-		{"ReadSeeker", Type, 0, ""},
-		{"ReadWriteCloser", Type, 0, ""},
-		{"ReadWriteSeeker", Type, 0, ""},
-		{"ReadWriter", Type, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"ReaderAt", Type, 0, ""},
-		{"ReaderFrom", Type, 0, ""},
-		{"RuneReader", Type, 0, ""},
-		{"RuneScanner", Type, 0, ""},
-		{"SectionReader", Type, 0, ""},
-		{"SeekCurrent", Const, 7, ""},
-		{"SeekEnd", Const, 7, ""},
-		{"SeekStart", Const, 7, ""},
-		{"Seeker", Type, 0, ""},
-		{"StringWriter", Type, 12, ""},
-		{"TeeReader", Func, 0, "func(r Reader, w Writer) Reader"},
-		{"WriteCloser", Type, 0, ""},
-		{"WriteSeeker", Type, 0, ""},
-		{"WriteString", Func, 0, "func(w Writer, s string) (n int, err error)"},
-		{"Writer", Type, 0, ""},
-		{"WriterAt", Type, 0, ""},
-		{"WriterTo", Type, 0, ""},
-	},
-	"io/fs": {
-		{"(*PathError).Error", Method, 16, ""},
-		{"(*PathError).Timeout", Method, 16, ""},
-		{"(*PathError).Unwrap", Method, 16, ""},
-		{"(FileMode).IsDir", Method, 16, ""},
-		{"(FileMode).IsRegular", Method, 16, ""},
-		{"(FileMode).Perm", Method, 16, ""},
-		{"(FileMode).String", Method, 16, ""},
-		{"(FileMode).Type", Method, 16, ""},
-		{"DirEntry", Type, 16, ""},
-		{"ErrClosed", Var, 16, ""},
-		{"ErrExist", Var, 16, ""},
-		{"ErrInvalid", Var, 16, ""},
-		{"ErrNotExist", Var, 16, ""},
-		{"ErrPermission", Var, 16, ""},
-		{"FS", Type, 16, ""},
-		{"File", Type, 16, ""},
-		{"FileInfo", Type, 16, ""},
-		{"FileInfoToDirEntry", Func, 17, "func(info FileInfo) DirEntry"},
-		{"FileMode", Type, 16, ""},
-		{"FormatDirEntry", Func, 21, "func(dir DirEntry) string"},
-		{"FormatFileInfo", Func, 21, "func(info FileInfo) string"},
-		{"Glob", Func, 16, "func(fsys FS, pattern string) (matches []string, err error)"},
-		{"GlobFS", Type, 16, ""},
-		{"Lstat", Func, 25, ""},
-		{"ModeAppend", Const, 16, ""},
-		{"ModeCharDevice", Const, 16, ""},
-		{"ModeDevice", Const, 16, ""},
-		{"ModeDir", Const, 16, ""},
-		{"ModeExclusive", Const, 16, ""},
-		{"ModeIrregular", Const, 16, ""},
-		{"ModeNamedPipe", Const, 16, ""},
-		{"ModePerm", Const, 16, ""},
-		{"ModeSetgid", Const, 16, ""},
-		{"ModeSetuid", Const, 16, ""},
-		{"ModeSocket", Const, 16, ""},
-		{"ModeSticky", Const, 16, ""},
-		{"ModeSymlink", Const, 16, ""},
-		{"ModeTemporary", Const, 16, ""},
-		{"ModeType", Const, 16, ""},
-		{"PathError", Type, 16, ""},
-		{"PathError.Err", Field, 16, ""},
-		{"PathError.Op", Field, 16, ""},
-		{"PathError.Path", Field, 16, ""},
-		{"ReadDir", Func, 16, "func(fsys FS, name string) ([]DirEntry, error)"},
-		{"ReadDirFS", Type, 16, ""},
-		{"ReadDirFile", Type, 16, ""},
-		{"ReadFile", Func, 16, "func(fsys FS, name string) ([]byte, error)"},
-		{"ReadFileFS", Type, 16, ""},
-		{"ReadLink", Func, 25, ""},
-		{"ReadLinkFS", Type, 25, ""},
-		{"SkipAll", Var, 20, ""},
-		{"SkipDir", Var, 16, ""},
-		{"Stat", Func, 16, "func(fsys FS, name string) (FileInfo, error)"},
-		{"StatFS", Type, 16, ""},
-		{"Sub", Func, 16, "func(fsys FS, dir string) (FS, error)"},
-		{"SubFS", Type, 16, ""},
-		{"ValidPath", Func, 16, "func(name string) bool"},
-		{"WalkDir", Func, 16, "func(fsys FS, root string, fn WalkDirFunc) error"},
-		{"WalkDirFunc", Type, 16, ""},
-	},
-	"io/ioutil": {
-		{"Discard", Var, 0, ""},
-		{"NopCloser", Func, 0, "func(r io.Reader) io.ReadCloser"},
-		{"ReadAll", Func, 0, "func(r io.Reader) ([]byte, error)"},
-		{"ReadDir", Func, 0, "func(dirname string) ([]fs.FileInfo, error)"},
-		{"ReadFile", Func, 0, "func(filename string) ([]byte, error)"},
-		{"TempDir", Func, 0, "func(dir string, pattern string) (name string, err error)"},
-		{"TempFile", Func, 0, "func(dir string, pattern string) (f *os.File, err error)"},
-		{"WriteFile", Func, 0, "func(filename string, data []byte, perm fs.FileMode) error"},
-	},
-	"iter": {
-		{"Pull", Func, 23, "func[V any](seq Seq[V]) (next func() (V, bool), stop func())"},
-		{"Pull2", Func, 23, "func[K, V any](seq Seq2[K, V]) (next func() (K, V, bool), stop func())"},
-		{"Seq", Type, 23, ""},
-		{"Seq2", Type, 23, ""},
-	},
-	"log": {
-		{"(*Logger).Fatal", Method, 0, ""},
-		{"(*Logger).Fatalf", Method, 0, ""},
-		{"(*Logger).Fatalln", Method, 0, ""},
-		{"(*Logger).Flags", Method, 0, ""},
-		{"(*Logger).Output", Method, 0, ""},
-		{"(*Logger).Panic", Method, 0, ""},
-		{"(*Logger).Panicf", Method, 0, ""},
-		{"(*Logger).Panicln", Method, 0, ""},
-		{"(*Logger).Prefix", Method, 0, ""},
-		{"(*Logger).Print", Method, 0, ""},
-		{"(*Logger).Printf", Method, 0, ""},
-		{"(*Logger).Println", Method, 0, ""},
-		{"(*Logger).SetFlags", Method, 0, ""},
-		{"(*Logger).SetOutput", Method, 5, ""},
-		{"(*Logger).SetPrefix", Method, 0, ""},
-		{"(*Logger).Writer", Method, 12, ""},
-		{"Default", Func, 16, "func() *Logger"},
-		{"Fatal", Func, 0, "func(v ...any)"},
-		{"Fatalf", Func, 0, "func(format string, v ...any)"},
-		{"Fatalln", Func, 0, "func(v ...any)"},
-		{"Flags", Func, 0, "func() int"},
-		{"LUTC", Const, 5, ""},
-		{"Ldate", Const, 0, ""},
-		{"Llongfile", Const, 0, ""},
-		{"Lmicroseconds", Const, 0, ""},
-		{"Lmsgprefix", Const, 14, ""},
-		{"Logger", Type, 0, ""},
-		{"Lshortfile", Const, 0, ""},
-		{"LstdFlags", Const, 0, ""},
-		{"Ltime", Const, 0, ""},
-		{"New", Func, 0, "func(out io.Writer, prefix string, flag int) *Logger"},
-		{"Output", Func, 5, "func(calldepth int, s string) error"},
-		{"Panic", Func, 0, "func(v ...any)"},
-		{"Panicf", Func, 0, "func(format string, v ...any)"},
-		{"Panicln", Func, 0, "func(v ...any)"},
-		{"Prefix", Func, 0, "func() string"},
-		{"Print", Func, 0, "func(v ...any)"},
-		{"Printf", Func, 0, "func(format string, v ...any)"},
-		{"Println", Func, 0, "func(v ...any)"},
-		{"SetFlags", Func, 0, "func(flag int)"},
-		{"SetOutput", Func, 0, "func(w io.Writer)"},
-		{"SetPrefix", Func, 0, "func(prefix string)"},
-		{"Writer", Func, 13, "func() io.Writer"},
-	},
-	"log/slog": {
-		{"(*JSONHandler).Enabled", Method, 21, ""},
-		{"(*JSONHandler).Handle", Method, 21, ""},
-		{"(*JSONHandler).WithAttrs", Method, 21, ""},
-		{"(*JSONHandler).WithGroup", Method, 21, ""},
-		{"(*Level).UnmarshalJSON", Method, 21, ""},
-		{"(*Level).UnmarshalText", Method, 21, ""},
-		{"(*LevelVar).AppendText", Method, 24, ""},
-		{"(*LevelVar).Level", Method, 21, ""},
-		{"(*LevelVar).MarshalText", Method, 21, ""},
-		{"(*LevelVar).Set", Method, 21, ""},
-		{"(*LevelVar).String", Method, 21, ""},
-		{"(*LevelVar).UnmarshalText", Method, 21, ""},
-		{"(*Logger).Debug", Method, 21, ""},
-		{"(*Logger).DebugContext", Method, 21, ""},
-		{"(*Logger).Enabled", Method, 21, ""},
-		{"(*Logger).Error", Method, 21, ""},
-		{"(*Logger).ErrorContext", Method, 21, ""},
-		{"(*Logger).Handler", Method, 21, ""},
-		{"(*Logger).Info", Method, 21, ""},
-		{"(*Logger).InfoContext", Method, 21, ""},
-		{"(*Logger).Log", Method, 21, ""},
-		{"(*Logger).LogAttrs", Method, 21, ""},
-		{"(*Logger).Warn", Method, 21, ""},
-		{"(*Logger).WarnContext", Method, 21, ""},
-		{"(*Logger).With", Method, 21, ""},
-		{"(*Logger).WithGroup", Method, 21, ""},
-		{"(*Record).Add", Method, 21, ""},
-		{"(*Record).AddAttrs", Method, 21, ""},
-		{"(*TextHandler).Enabled", Method, 21, ""},
-		{"(*TextHandler).Handle", Method, 21, ""},
-		{"(*TextHandler).WithAttrs", Method, 21, ""},
-		{"(*TextHandler).WithGroup", Method, 21, ""},
-		{"(Attr).Equal", Method, 21, ""},
-		{"(Attr).String", Method, 21, ""},
-		{"(Kind).String", Method, 21, ""},
-		{"(Level).AppendText", Method, 24, ""},
-		{"(Level).Level", Method, 21, ""},
-		{"(Level).MarshalJSON", Method, 21, ""},
-		{"(Level).MarshalText", Method, 21, ""},
-		{"(Level).String", Method, 21, ""},
-		{"(Record).Attrs", Method, 21, ""},
-		{"(Record).Clone", Method, 21, ""},
-		{"(Record).NumAttrs", Method, 21, ""},
-		{"(Value).Any", Method, 21, ""},
-		{"(Value).Bool", Method, 21, ""},
-		{"(Value).Duration", Method, 21, ""},
-		{"(Value).Equal", Method, 21, ""},
-		{"(Value).Float64", Method, 21, ""},
-		{"(Value).Group", Method, 21, ""},
-		{"(Value).Int64", Method, 21, ""},
-		{"(Value).Kind", Method, 21, ""},
-		{"(Value).LogValuer", Method, 21, ""},
-		{"(Value).Resolve", Method, 21, ""},
-		{"(Value).String", Method, 21, ""},
-		{"(Value).Time", Method, 21, ""},
-		{"(Value).Uint64", Method, 21, ""},
-		{"Any", Func, 21, "func(key string, value any) Attr"},
-		{"AnyValue", Func, 21, "func(v any) Value"},
-		{"Attr", Type, 21, ""},
-		{"Attr.Key", Field, 21, ""},
-		{"Attr.Value", Field, 21, ""},
-		{"Bool", Func, 21, "func(key string, v bool) Attr"},
-		{"BoolValue", Func, 21, "func(v bool) Value"},
-		{"Debug", Func, 21, "func(msg string, args ...any)"},
-		{"DebugContext", Func, 21, "func(ctx context.Context, msg string, args ...any)"},
-		{"Default", Func, 21, "func() *Logger"},
-		{"DiscardHandler", Var, 24, ""},
-		{"Duration", Func, 21, "func(key string, v time.Duration) Attr"},
-		{"DurationValue", Func, 21, "func(v time.Duration) Value"},
-		{"Error", Func, 21, "func(msg string, args ...any)"},
-		{"ErrorContext", Func, 21, "func(ctx context.Context, msg string, args ...any)"},
-		{"Float64", Func, 21, "func(key string, v float64) Attr"},
-		{"Float64Value", Func, 21, "func(v float64) Value"},
-		{"Group", Func, 21, "func(key string, args ...any) Attr"},
-		{"GroupValue", Func, 21, "func(as ...Attr) Value"},
-		{"Handler", Type, 21, ""},
-		{"HandlerOptions", Type, 21, ""},
-		{"HandlerOptions.AddSource", Field, 21, ""},
-		{"HandlerOptions.Level", Field, 21, ""},
-		{"HandlerOptions.ReplaceAttr", Field, 21, ""},
-		{"Info", Func, 21, "func(msg string, args ...any)"},
-		{"InfoContext", Func, 21, "func(ctx context.Context, msg string, args ...any)"},
-		{"Int", Func, 21, "func(key string, value int) Attr"},
-		{"Int64", Func, 21, "func(key string, value int64) Attr"},
-		{"Int64Value", Func, 21, "func(v int64) Value"},
-		{"IntValue", Func, 21, "func(v int) Value"},
-		{"JSONHandler", Type, 21, ""},
-		{"Kind", Type, 21, ""},
-		{"KindAny", Const, 21, ""},
-		{"KindBool", Const, 21, ""},
-		{"KindDuration", Const, 21, ""},
-		{"KindFloat64", Const, 21, ""},
-		{"KindGroup", Const, 21, ""},
-		{"KindInt64", Const, 21, ""},
-		{"KindLogValuer", Const, 21, ""},
-		{"KindString", Const, 21, ""},
-		{"KindTime", Const, 21, ""},
-		{"KindUint64", Const, 21, ""},
-		{"Level", Type, 21, ""},
-		{"LevelDebug", Const, 21, ""},
-		{"LevelError", Const, 21, ""},
-		{"LevelInfo", Const, 21, ""},
-		{"LevelKey", Const, 21, ""},
-		{"LevelVar", Type, 21, ""},
-		{"LevelWarn", Const, 21, ""},
-		{"Leveler", Type, 21, ""},
-		{"Log", Func, 21, "func(ctx context.Context, level Level, msg string, args ...any)"},
-		{"LogAttrs", Func, 21, "func(ctx context.Context, level Level, msg string, attrs ...Attr)"},
-		{"LogValuer", Type, 21, ""},
-		{"Logger", Type, 21, ""},
-		{"MessageKey", Const, 21, ""},
-		{"New", Func, 21, "func(h Handler) *Logger"},
-		{"NewJSONHandler", Func, 21, "func(w io.Writer, opts *HandlerOptions) *JSONHandler"},
-		{"NewLogLogger", Func, 21, "func(h Handler, level Level) *log.Logger"},
-		{"NewRecord", Func, 21, "func(t time.Time, level Level, msg string, pc uintptr) Record"},
-		{"NewTextHandler", Func, 21, "func(w io.Writer, opts *HandlerOptions) *TextHandler"},
-		{"Record", Type, 21, ""},
-		{"Record.Level", Field, 21, ""},
-		{"Record.Message", Field, 21, ""},
-		{"Record.PC", Field, 21, ""},
-		{"Record.Time", Field, 21, ""},
-		{"SetDefault", Func, 21, "func(l *Logger)"},
-		{"SetLogLoggerLevel", Func, 22, "func(level Level) (oldLevel Level)"},
-		{"Source", Type, 21, ""},
-		{"Source.File", Field, 21, ""},
-		{"Source.Function", Field, 21, ""},
-		{"Source.Line", Field, 21, ""},
-		{"SourceKey", Const, 21, ""},
-		{"String", Func, 21, "func(key string, value string) Attr"},
-		{"StringValue", Func, 21, "func(value string) Value"},
-		{"TextHandler", Type, 21, ""},
-		{"Time", Func, 21, "func(key string, v time.Time) Attr"},
-		{"TimeKey", Const, 21, ""},
-		{"TimeValue", Func, 21, "func(v time.Time) Value"},
-		{"Uint64", Func, 21, "func(key string, v uint64) Attr"},
-		{"Uint64Value", Func, 21, "func(v uint64) Value"},
-		{"Value", Type, 21, ""},
-		{"Warn", Func, 21, "func(msg string, args ...any)"},
-		{"WarnContext", Func, 21, "func(ctx context.Context, msg string, args ...any)"},
-		{"With", Func, 21, "func(args ...any) *Logger"},
-	},
-	"log/syslog": {
-		{"(*Writer).Alert", Method, 0, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).Crit", Method, 0, ""},
-		{"(*Writer).Debug", Method, 0, ""},
-		{"(*Writer).Emerg", Method, 0, ""},
-		{"(*Writer).Err", Method, 0, ""},
-		{"(*Writer).Info", Method, 0, ""},
-		{"(*Writer).Notice", Method, 0, ""},
-		{"(*Writer).Warning", Method, 0, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"Dial", Func, 0, "func(network string, raddr string, priority Priority, tag string) (*Writer, error)"},
-		{"LOG_ALERT", Const, 0, ""},
-		{"LOG_AUTH", Const, 1, ""},
-		{"LOG_AUTHPRIV", Const, 1, ""},
-		{"LOG_CRIT", Const, 0, ""},
-		{"LOG_CRON", Const, 1, ""},
-		{"LOG_DAEMON", Const, 1, ""},
-		{"LOG_DEBUG", Const, 0, ""},
-		{"LOG_EMERG", Const, 0, ""},
-		{"LOG_ERR", Const, 0, ""},
-		{"LOG_FTP", Const, 1, ""},
-		{"LOG_INFO", Const, 0, ""},
-		{"LOG_KERN", Const, 1, ""},
-		{"LOG_LOCAL0", Const, 1, ""},
-		{"LOG_LOCAL1", Const, 1, ""},
-		{"LOG_LOCAL2", Const, 1, ""},
-		{"LOG_LOCAL3", Const, 1, ""},
-		{"LOG_LOCAL4", Const, 1, ""},
-		{"LOG_LOCAL5", Const, 1, ""},
-		{"LOG_LOCAL6", Const, 1, ""},
-		{"LOG_LOCAL7", Const, 1, ""},
-		{"LOG_LPR", Const, 1, ""},
-		{"LOG_MAIL", Const, 1, ""},
-		{"LOG_NEWS", Const, 1, ""},
-		{"LOG_NOTICE", Const, 0, ""},
-		{"LOG_SYSLOG", Const, 1, ""},
-		{"LOG_USER", Const, 1, ""},
-		{"LOG_UUCP", Const, 1, ""},
-		{"LOG_WARNING", Const, 0, ""},
-		{"New", Func, 0, "func(priority Priority, tag string) (*Writer, error)"},
-		{"NewLogger", Func, 0, "func(p Priority, logFlag int) (*log.Logger, error)"},
-		{"Priority", Type, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"maps": {
-		{"All", Func, 23, "func[Map ~map[K]V, K comparable, V any](m Map) iter.Seq2[K, V]"},
-		{"Clone", Func, 21, "func[M ~map[K]V, K comparable, V any](m M) M"},
-		{"Collect", Func, 23, "func[K comparable, V any](seq iter.Seq2[K, V]) map[K]V"},
-		{"Copy", Func, 21, "func[M1 ~map[K]V, M2 ~map[K]V, K comparable, V any](dst M1, src M2)"},
-		{"DeleteFunc", Func, 21, "func[M ~map[K]V, K comparable, V any](m M, del func(K, V) bool)"},
-		{"Equal", Func, 21, "func[M1, M2 ~map[K]V, K, V comparable](m1 M1, m2 M2) bool"},
-		{"EqualFunc", Func, 21, "func[M1 ~map[K]V1, M2 ~map[K]V2, K comparable, V1, V2 any](m1 M1, m2 M2, eq func(V1, V2) bool) bool"},
-		{"Insert", Func, 23, "func[Map ~map[K]V, K comparable, V any](m Map, seq iter.Seq2[K, V])"},
-		{"Keys", Func, 23, "func[Map ~map[K]V, K comparable, V any](m Map) iter.Seq[K]"},
-		{"Values", Func, 23, "func[Map ~map[K]V, K comparable, V any](m Map) iter.Seq[V]"},
-	},
-	"math": {
-		{"Abs", Func, 0, "func(x float64) float64"},
-		{"Acos", Func, 0, "func(x float64) float64"},
-		{"Acosh", Func, 0, "func(x float64) float64"},
-		{"Asin", Func, 0, "func(x float64) float64"},
-		{"Asinh", Func, 0, "func(x float64) float64"},
-		{"Atan", Func, 0, "func(x float64) float64"},
-		{"Atan2", Func, 0, "func(y float64, x float64) float64"},
-		{"Atanh", Func, 0, "func(x float64) float64"},
-		{"Cbrt", Func, 0, "func(x float64) float64"},
-		{"Ceil", Func, 0, "func(x float64) float64"},
-		{"Copysign", Func, 0, "func(f float64, sign float64) float64"},
-		{"Cos", Func, 0, "func(x float64) float64"},
-		{"Cosh", Func, 0, "func(x float64) float64"},
-		{"Dim", Func, 0, "func(x float64, y float64) float64"},
-		{"E", Const, 0, ""},
-		{"Erf", Func, 0, "func(x float64) float64"},
-		{"Erfc", Func, 0, "func(x float64) float64"},
-		{"Erfcinv", Func, 10, "func(x float64) float64"},
-		{"Erfinv", Func, 10, "func(x float64) float64"},
-		{"Exp", Func, 0, "func(x float64) float64"},
-		{"Exp2", Func, 0, "func(x float64) float64"},
-		{"Expm1", Func, 0, "func(x float64) float64"},
-		{"FMA", Func, 14, "func(x float64, y float64, z float64) float64"},
-		{"Float32bits", Func, 0, "func(f float32) uint32"},
-		{"Float32frombits", Func, 0, "func(b uint32) float32"},
-		{"Float64bits", Func, 0, "func(f float64) uint64"},
-		{"Float64frombits", Func, 0, "func(b uint64) float64"},
-		{"Floor", Func, 0, "func(x float64) float64"},
-		{"Frexp", Func, 0, "func(f float64) (frac float64, exp int)"},
-		{"Gamma", Func, 0, "func(x float64) float64"},
-		{"Hypot", Func, 0, "func(p float64, q float64) float64"},
-		{"Ilogb", Func, 0, "func(x float64) int"},
-		{"Inf", Func, 0, "func(sign int) float64"},
-		{"IsInf", Func, 0, "func(f float64, sign int) bool"},
-		{"IsNaN", Func, 0, "func(f float64) (is bool)"},
-		{"J0", Func, 0, "func(x float64) float64"},
-		{"J1", Func, 0, "func(x float64) float64"},
-		{"Jn", Func, 0, "func(n int, x float64) float64"},
-		{"Ldexp", Func, 0, "func(frac float64, exp int) float64"},
-		{"Lgamma", Func, 0, "func(x float64) (lgamma float64, sign int)"},
-		{"Ln10", Const, 0, ""},
-		{"Ln2", Const, 0, ""},
-		{"Log", Func, 0, "func(x float64) float64"},
-		{"Log10", Func, 0, "func(x float64) float64"},
-		{"Log10E", Const, 0, ""},
-		{"Log1p", Func, 0, "func(x float64) float64"},
-		{"Log2", Func, 0, "func(x float64) float64"},
-		{"Log2E", Const, 0, ""},
-		{"Logb", Func, 0, "func(x float64) float64"},
-		{"Max", Func, 0, "func(x float64, y float64) float64"},
-		{"MaxFloat32", Const, 0, ""},
-		{"MaxFloat64", Const, 0, ""},
-		{"MaxInt", Const, 17, ""},
-		{"MaxInt16", Const, 0, ""},
-		{"MaxInt32", Const, 0, ""},
-		{"MaxInt64", Const, 0, ""},
-		{"MaxInt8", Const, 0, ""},
-		{"MaxUint", Const, 17, ""},
-		{"MaxUint16", Const, 0, ""},
-		{"MaxUint32", Const, 0, ""},
-		{"MaxUint64", Const, 0, ""},
-		{"MaxUint8", Const, 0, ""},
-		{"Min", Func, 0, "func(x float64, y float64) float64"},
-		{"MinInt", Const, 17, ""},
-		{"MinInt16", Const, 0, ""},
-		{"MinInt32", Const, 0, ""},
-		{"MinInt64", Const, 0, ""},
-		{"MinInt8", Const, 0, ""},
-		{"Mod", Func, 0, "func(x float64, y float64) float64"},
-		{"Modf", Func, 0, "func(f float64) (int float64, frac float64)"},
-		{"NaN", Func, 0, "func() float64"},
-		{"Nextafter", Func, 0, "func(x float64, y float64) (r float64)"},
-		{"Nextafter32", Func, 4, "func(x float32, y float32) (r float32)"},
-		{"Phi", Const, 0, ""},
-		{"Pi", Const, 0, ""},
-		{"Pow", Func, 0, "func(x float64, y float64) float64"},
-		{"Pow10", Func, 0, "func(n int) float64"},
-		{"Remainder", Func, 0, "func(x float64, y float64) float64"},
-		{"Round", Func, 10, "func(x float64) float64"},
-		{"RoundToEven", Func, 10, "func(x float64) float64"},
-		{"Signbit", Func, 0, "func(x float64) bool"},
-		{"Sin", Func, 0, "func(x float64) float64"},
-		{"Sincos", Func, 0, "func(x float64) (sin float64, cos float64)"},
-		{"Sinh", Func, 0, "func(x float64) float64"},
-		{"SmallestNonzeroFloat32", Const, 0, ""},
-		{"SmallestNonzeroFloat64", Const, 0, ""},
-		{"Sqrt", Func, 0, "func(x float64) float64"},
-		{"Sqrt2", Const, 0, ""},
-		{"SqrtE", Const, 0, ""},
-		{"SqrtPhi", Const, 0, ""},
-		{"SqrtPi", Const, 0, ""},
-		{"Tan", Func, 0, "func(x float64) float64"},
-		{"Tanh", Func, 0, "func(x float64) float64"},
-		{"Trunc", Func, 0, "func(x float64) float64"},
-		{"Y0", Func, 0, "func(x float64) float64"},
-		{"Y1", Func, 0, "func(x float64) float64"},
-		{"Yn", Func, 0, "func(n int, x float64) float64"},
-	},
-	"math/big": {
-		{"(*Float).Abs", Method, 5, ""},
-		{"(*Float).Acc", Method, 5, ""},
-		{"(*Float).Add", Method, 5, ""},
-		{"(*Float).Append", Method, 5, ""},
-		{"(*Float).AppendText", Method, 24, ""},
-		{"(*Float).Cmp", Method, 5, ""},
-		{"(*Float).Copy", Method, 5, ""},
-		{"(*Float).Float32", Method, 5, ""},
-		{"(*Float).Float64", Method, 5, ""},
-		{"(*Float).Format", Method, 5, ""},
-		{"(*Float).GobDecode", Method, 7, ""},
-		{"(*Float).GobEncode", Method, 7, ""},
-		{"(*Float).Int", Method, 5, ""},
-		{"(*Float).Int64", Method, 5, ""},
-		{"(*Float).IsInf", Method, 5, ""},
-		{"(*Float).IsInt", Method, 5, ""},
-		{"(*Float).MantExp", Method, 5, ""},
-		{"(*Float).MarshalText", Method, 6, ""},
-		{"(*Float).MinPrec", Method, 5, ""},
-		{"(*Float).Mode", Method, 5, ""},
-		{"(*Float).Mul", Method, 5, ""},
-		{"(*Float).Neg", Method, 5, ""},
-		{"(*Float).Parse", Method, 5, ""},
-		{"(*Float).Prec", Method, 5, ""},
-		{"(*Float).Quo", Method, 5, ""},
-		{"(*Float).Rat", Method, 5, ""},
-		{"(*Float).Scan", Method, 8, ""},
-		{"(*Float).Set", Method, 5, ""},
-		{"(*Float).SetFloat64", Method, 5, ""},
-		{"(*Float).SetInf", Method, 5, ""},
-		{"(*Float).SetInt", Method, 5, ""},
-		{"(*Float).SetInt64", Method, 5, ""},
-		{"(*Float).SetMantExp", Method, 5, ""},
-		{"(*Float).SetMode", Method, 5, ""},
-		{"(*Float).SetPrec", Method, 5, ""},
-		{"(*Float).SetRat", Method, 5, ""},
-		{"(*Float).SetString", Method, 5, ""},
-		{"(*Float).SetUint64", Method, 5, ""},
-		{"(*Float).Sign", Method, 5, ""},
-		{"(*Float).Signbit", Method, 5, ""},
-		{"(*Float).Sqrt", Method, 10, ""},
-		{"(*Float).String", Method, 5, ""},
-		{"(*Float).Sub", Method, 5, ""},
-		{"(*Float).Text", Method, 5, ""},
-		{"(*Float).Uint64", Method, 5, ""},
-		{"(*Float).UnmarshalText", Method, 6, ""},
-		{"(*Int).Abs", Method, 0, ""},
-		{"(*Int).Add", Method, 0, ""},
-		{"(*Int).And", Method, 0, ""},
-		{"(*Int).AndNot", Method, 0, ""},
-		{"(*Int).Append", Method, 6, ""},
-		{"(*Int).AppendText", Method, 24, ""},
-		{"(*Int).Binomial", Method, 0, ""},
-		{"(*Int).Bit", Method, 0, ""},
-		{"(*Int).BitLen", Method, 0, ""},
-		{"(*Int).Bits", Method, 0, ""},
-		{"(*Int).Bytes", Method, 0, ""},
-		{"(*Int).Cmp", Method, 0, ""},
-		{"(*Int).CmpAbs", Method, 10, ""},
-		{"(*Int).Div", Method, 0, ""},
-		{"(*Int).DivMod", Method, 0, ""},
-		{"(*Int).Exp", Method, 0, ""},
-		{"(*Int).FillBytes", Method, 15, ""},
-		{"(*Int).Float64", Method, 21, ""},
-		{"(*Int).Format", Method, 0, ""},
-		{"(*Int).GCD", Method, 0, ""},
-		{"(*Int).GobDecode", Method, 0, ""},
-		{"(*Int).GobEncode", Method, 0, ""},
-		{"(*Int).Int64", Method, 0, ""},
-		{"(*Int).IsInt64", Method, 9, ""},
-		{"(*Int).IsUint64", Method, 9, ""},
-		{"(*Int).Lsh", Method, 0, ""},
-		{"(*Int).MarshalJSON", Method, 1, ""},
-		{"(*Int).MarshalText", Method, 3, ""},
-		{"(*Int).Mod", Method, 0, ""},
-		{"(*Int).ModInverse", Method, 0, ""},
-		{"(*Int).ModSqrt", Method, 5, ""},
-		{"(*Int).Mul", Method, 0, ""},
-		{"(*Int).MulRange", Method, 0, ""},
-		{"(*Int).Neg", Method, 0, ""},
-		{"(*Int).Not", Method, 0, ""},
-		{"(*Int).Or", Method, 0, ""},
-		{"(*Int).ProbablyPrime", Method, 0, ""},
-		{"(*Int).Quo", Method, 0, ""},
-		{"(*Int).QuoRem", Method, 0, ""},
-		{"(*Int).Rand", Method, 0, ""},
-		{"(*Int).Rem", Method, 0, ""},
-		{"(*Int).Rsh", Method, 0, ""},
-		{"(*Int).Scan", Method, 0, ""},
-		{"(*Int).Set", Method, 0, ""},
-		{"(*Int).SetBit", Method, 0, ""},
-		{"(*Int).SetBits", Method, 0, ""},
-		{"(*Int).SetBytes", Method, 0, ""},
-		{"(*Int).SetInt64", Method, 0, ""},
-		{"(*Int).SetString", Method, 0, ""},
-		{"(*Int).SetUint64", Method, 1, ""},
-		{"(*Int).Sign", Method, 0, ""},
-		{"(*Int).Sqrt", Method, 8, ""},
-		{"(*Int).String", Method, 0, ""},
-		{"(*Int).Sub", Method, 0, ""},
-		{"(*Int).Text", Method, 6, ""},
-		{"(*Int).TrailingZeroBits", Method, 13, ""},
-		{"(*Int).Uint64", Method, 1, ""},
-		{"(*Int).UnmarshalJSON", Method, 1, ""},
-		{"(*Int).UnmarshalText", Method, 3, ""},
-		{"(*Int).Xor", Method, 0, ""},
-		{"(*Rat).Abs", Method, 0, ""},
-		{"(*Rat).Add", Method, 0, ""},
-		{"(*Rat).AppendText", Method, 24, ""},
-		{"(*Rat).Cmp", Method, 0, ""},
-		{"(*Rat).Denom", Method, 0, ""},
-		{"(*Rat).Float32", Method, 4, ""},
-		{"(*Rat).Float64", Method, 1, ""},
-		{"(*Rat).FloatPrec", Method, 22, ""},
-		{"(*Rat).FloatString", Method, 0, ""},
-		{"(*Rat).GobDecode", Method, 0, ""},
-		{"(*Rat).GobEncode", Method, 0, ""},
-		{"(*Rat).Inv", Method, 0, ""},
-		{"(*Rat).IsInt", Method, 0, ""},
-		{"(*Rat).MarshalText", Method, 3, ""},
-		{"(*Rat).Mul", Method, 0, ""},
-		{"(*Rat).Neg", Method, 0, ""},
-		{"(*Rat).Num", Method, 0, ""},
-		{"(*Rat).Quo", Method, 0, ""},
-		{"(*Rat).RatString", Method, 0, ""},
-		{"(*Rat).Scan", Method, 0, ""},
-		{"(*Rat).Set", Method, 0, ""},
-		{"(*Rat).SetFloat64", Method, 1, ""},
-		{"(*Rat).SetFrac", Method, 0, ""},
-		{"(*Rat).SetFrac64", Method, 0, ""},
-		{"(*Rat).SetInt", Method, 0, ""},
-		{"(*Rat).SetInt64", Method, 0, ""},
-		{"(*Rat).SetString", Method, 0, ""},
-		{"(*Rat).SetUint64", Method, 13, ""},
-		{"(*Rat).Sign", Method, 0, ""},
-		{"(*Rat).String", Method, 0, ""},
-		{"(*Rat).Sub", Method, 0, ""},
-		{"(*Rat).UnmarshalText", Method, 3, ""},
-		{"(Accuracy).String", Method, 5, ""},
-		{"(ErrNaN).Error", Method, 5, ""},
-		{"(RoundingMode).String", Method, 5, ""},
-		{"Above", Const, 5, ""},
-		{"Accuracy", Type, 5, ""},
-		{"AwayFromZero", Const, 5, ""},
-		{"Below", Const, 5, ""},
-		{"ErrNaN", Type, 5, ""},
-		{"Exact", Const, 5, ""},
-		{"Float", Type, 5, ""},
-		{"Int", Type, 0, ""},
-		{"Jacobi", Func, 5, "func(x *Int, y *Int) int"},
-		{"MaxBase", Const, 0, ""},
-		{"MaxExp", Const, 5, ""},
-		{"MaxPrec", Const, 5, ""},
-		{"MinExp", Const, 5, ""},
-		{"NewFloat", Func, 5, "func(x float64) *Float"},
-		{"NewInt", Func, 0, "func(x int64) *Int"},
-		{"NewRat", Func, 0, "func(a int64, b int64) *Rat"},
-		{"ParseFloat", Func, 5, "func(s string, base int, prec uint, mode RoundingMode) (f *Float, b int, err error)"},
-		{"Rat", Type, 0, ""},
-		{"RoundingMode", Type, 5, ""},
-		{"ToNearestAway", Const, 5, ""},
-		{"ToNearestEven", Const, 5, ""},
-		{"ToNegativeInf", Const, 5, ""},
-		{"ToPositiveInf", Const, 5, ""},
-		{"ToZero", Const, 5, ""},
-		{"Word", Type, 0, ""},
-	},
-	"math/bits": {
-		{"Add", Func, 12, "func(x uint, y uint, carry uint) (sum uint, carryOut uint)"},
-		{"Add32", Func, 12, "func(x uint32, y uint32, carry uint32) (sum uint32, carryOut uint32)"},
-		{"Add64", Func, 12, "func(x uint64, y uint64, carry uint64) (sum uint64, carryOut uint64)"},
-		{"Div", Func, 12, "func(hi uint, lo uint, y uint) (quo uint, rem uint)"},
-		{"Div32", Func, 12, "func(hi uint32, lo uint32, y uint32) (quo uint32, rem uint32)"},
-		{"Div64", Func, 12, "func(hi uint64, lo uint64, y uint64) (quo uint64, rem uint64)"},
-		{"LeadingZeros", Func, 9, "func(x uint) int"},
-		{"LeadingZeros16", Func, 9, "func(x uint16) int"},
-		{"LeadingZeros32", Func, 9, "func(x uint32) int"},
-		{"LeadingZeros64", Func, 9, "func(x uint64) int"},
-		{"LeadingZeros8", Func, 9, "func(x uint8) int"},
-		{"Len", Func, 9, "func(x uint) int"},
-		{"Len16", Func, 9, "func(x uint16) (n int)"},
-		{"Len32", Func, 9, "func(x uint32) (n int)"},
-		{"Len64", Func, 9, "func(x uint64) (n int)"},
-		{"Len8", Func, 9, "func(x uint8) int"},
-		{"Mul", Func, 12, "func(x uint, y uint) (hi uint, lo uint)"},
-		{"Mul32", Func, 12, "func(x uint32, y uint32) (hi uint32, lo uint32)"},
-		{"Mul64", Func, 12, "func(x uint64, y uint64) (hi uint64, lo uint64)"},
-		{"OnesCount", Func, 9, "func(x uint) int"},
-		{"OnesCount16", Func, 9, "func(x uint16) int"},
-		{"OnesCount32", Func, 9, "func(x uint32) int"},
-		{"OnesCount64", Func, 9, "func(x uint64) int"},
-		{"OnesCount8", Func, 9, "func(x uint8) int"},
-		{"Rem", Func, 14, "func(hi uint, lo uint, y uint) uint"},
-		{"Rem32", Func, 14, "func(hi uint32, lo uint32, y uint32) uint32"},
-		{"Rem64", Func, 14, "func(hi uint64, lo uint64, y uint64) uint64"},
-		{"Reverse", Func, 9, "func(x uint) uint"},
-		{"Reverse16", Func, 9, "func(x uint16) uint16"},
-		{"Reverse32", Func, 9, "func(x uint32) uint32"},
-		{"Reverse64", Func, 9, "func(x uint64) uint64"},
-		{"Reverse8", Func, 9, "func(x uint8) uint8"},
-		{"ReverseBytes", Func, 9, "func(x uint) uint"},
-		{"ReverseBytes16", Func, 9, "func(x uint16) uint16"},
-		{"ReverseBytes32", Func, 9, "func(x uint32) uint32"},
-		{"ReverseBytes64", Func, 9, "func(x uint64) uint64"},
-		{"RotateLeft", Func, 9, "func(x uint, k int) uint"},
-		{"RotateLeft16", Func, 9, "func(x uint16, k int) uint16"},
-		{"RotateLeft32", Func, 9, "func(x uint32, k int) uint32"},
-		{"RotateLeft64", Func, 9, "func(x uint64, k int) uint64"},
-		{"RotateLeft8", Func, 9, "func(x uint8, k int) uint8"},
-		{"Sub", Func, 12, "func(x uint, y uint, borrow uint) (diff uint, borrowOut uint)"},
-		{"Sub32", Func, 12, "func(x uint32, y uint32, borrow uint32) (diff uint32, borrowOut uint32)"},
-		{"Sub64", Func, 12, "func(x uint64, y uint64, borrow uint64) (diff uint64, borrowOut uint64)"},
-		{"TrailingZeros", Func, 9, "func(x uint) int"},
-		{"TrailingZeros16", Func, 9, "func(x uint16) int"},
-		{"TrailingZeros32", Func, 9, "func(x uint32) int"},
-		{"TrailingZeros64", Func, 9, "func(x uint64) int"},
-		{"TrailingZeros8", Func, 9, "func(x uint8) int"},
-		{"UintSize", Const, 9, ""},
-	},
-	"math/cmplx": {
-		{"Abs", Func, 0, "func(x complex128) float64"},
-		{"Acos", Func, 0, "func(x complex128) complex128"},
-		{"Acosh", Func, 0, "func(x complex128) complex128"},
-		{"Asin", Func, 0, "func(x complex128) complex128"},
-		{"Asinh", Func, 0, "func(x complex128) complex128"},
-		{"Atan", Func, 0, "func(x complex128) complex128"},
-		{"Atanh", Func, 0, "func(x complex128) complex128"},
-		{"Conj", Func, 0, "func(x complex128) complex128"},
-		{"Cos", Func, 0, "func(x complex128) complex128"},
-		{"Cosh", Func, 0, "func(x complex128) complex128"},
-		{"Cot", Func, 0, "func(x complex128) complex128"},
-		{"Exp", Func, 0, "func(x complex128) complex128"},
-		{"Inf", Func, 0, "func() complex128"},
-		{"IsInf", Func, 0, "func(x complex128) bool"},
-		{"IsNaN", Func, 0, "func(x complex128) bool"},
-		{"Log", Func, 0, "func(x complex128) complex128"},
-		{"Log10", Func, 0, "func(x complex128) complex128"},
-		{"NaN", Func, 0, "func() complex128"},
-		{"Phase", Func, 0, "func(x complex128) float64"},
-		{"Polar", Func, 0, "func(x complex128) (r float64, θ float64)"},
-		{"Pow", Func, 0, "func(x complex128, y complex128) complex128"},
-		{"Rect", Func, 0, "func(r float64, θ float64) complex128"},
-		{"Sin", Func, 0, "func(x complex128) complex128"},
-		{"Sinh", Func, 0, "func(x complex128) complex128"},
-		{"Sqrt", Func, 0, "func(x complex128) complex128"},
-		{"Tan", Func, 0, "func(x complex128) complex128"},
-		{"Tanh", Func, 0, "func(x complex128) complex128"},
-	},
-	"math/rand": {
-		{"(*Rand).ExpFloat64", Method, 0, ""},
-		{"(*Rand).Float32", Method, 0, ""},
-		{"(*Rand).Float64", Method, 0, ""},
-		{"(*Rand).Int", Method, 0, ""},
-		{"(*Rand).Int31", Method, 0, ""},
-		{"(*Rand).Int31n", Method, 0, ""},
-		{"(*Rand).Int63", Method, 0, ""},
-		{"(*Rand).Int63n", Method, 0, ""},
-		{"(*Rand).Intn", Method, 0, ""},
-		{"(*Rand).NormFloat64", Method, 0, ""},
-		{"(*Rand).Perm", Method, 0, ""},
-		{"(*Rand).Read", Method, 6, ""},
-		{"(*Rand).Seed", Method, 0, ""},
-		{"(*Rand).Shuffle", Method, 10, ""},
-		{"(*Rand).Uint32", Method, 0, ""},
-		{"(*Rand).Uint64", Method, 8, ""},
-		{"(*Zipf).Uint64", Method, 0, ""},
-		{"ExpFloat64", Func, 0, "func() float64"},
-		{"Float32", Func, 0, "func() float32"},
-		{"Float64", Func, 0, "func() float64"},
-		{"Int", Func, 0, "func() int"},
-		{"Int31", Func, 0, "func() int32"},
-		{"Int31n", Func, 0, "func(n int32) int32"},
-		{"Int63", Func, 0, "func() int64"},
-		{"Int63n", Func, 0, "func(n int64) int64"},
-		{"Intn", Func, 0, "func(n int) int"},
-		{"New", Func, 0, "func(src Source) *Rand"},
-		{"NewSource", Func, 0, "func(seed int64) Source"},
-		{"NewZipf", Func, 0, "func(r *Rand, s float64, v float64, imax uint64) *Zipf"},
-		{"NormFloat64", Func, 0, "func() float64"},
-		{"Perm", Func, 0, "func(n int) []int"},
-		{"Rand", Type, 0, ""},
-		{"Read", Func, 6, "func(p []byte) (n int, err error)"},
-		{"Seed", Func, 0, "func(seed int64)"},
-		{"Shuffle", Func, 10, "func(n int, swap func(i int, j int))"},
-		{"Source", Type, 0, ""},
-		{"Source64", Type, 8, ""},
-		{"Uint32", Func, 0, "func() uint32"},
-		{"Uint64", Func, 8, "func() uint64"},
-		{"Zipf", Type, 0, ""},
-	},
-	"math/rand/v2": {
-		{"(*ChaCha8).AppendBinary", Method, 24, ""},
-		{"(*ChaCha8).MarshalBinary", Method, 22, ""},
-		{"(*ChaCha8).Read", Method, 23, ""},
-		{"(*ChaCha8).Seed", Method, 22, ""},
-		{"(*ChaCha8).Uint64", Method, 22, ""},
-		{"(*ChaCha8).UnmarshalBinary", Method, 22, ""},
-		{"(*PCG).AppendBinary", Method, 24, ""},
-		{"(*PCG).MarshalBinary", Method, 22, ""},
-		{"(*PCG).Seed", Method, 22, ""},
-		{"(*PCG).Uint64", Method, 22, ""},
-		{"(*PCG).UnmarshalBinary", Method, 22, ""},
-		{"(*Rand).ExpFloat64", Method, 22, ""},
-		{"(*Rand).Float32", Method, 22, ""},
-		{"(*Rand).Float64", Method, 22, ""},
-		{"(*Rand).Int", Method, 22, ""},
-		{"(*Rand).Int32", Method, 22, ""},
-		{"(*Rand).Int32N", Method, 22, ""},
-		{"(*Rand).Int64", Method, 22, ""},
-		{"(*Rand).Int64N", Method, 22, ""},
-		{"(*Rand).IntN", Method, 22, ""},
-		{"(*Rand).NormFloat64", Method, 22, ""},
-		{"(*Rand).Perm", Method, 22, ""},
-		{"(*Rand).Shuffle", Method, 22, ""},
-		{"(*Rand).Uint", Method, 23, ""},
-		{"(*Rand).Uint32", Method, 22, ""},
-		{"(*Rand).Uint32N", Method, 22, ""},
-		{"(*Rand).Uint64", Method, 22, ""},
-		{"(*Rand).Uint64N", Method, 22, ""},
-		{"(*Rand).UintN", Method, 22, ""},
-		{"(*Zipf).Uint64", Method, 22, ""},
-		{"ChaCha8", Type, 22, ""},
-		{"ExpFloat64", Func, 22, "func() float64"},
-		{"Float32", Func, 22, "func() float32"},
-		{"Float64", Func, 22, "func() float64"},
-		{"Int", Func, 22, "func() int"},
-		{"Int32", Func, 22, "func() int32"},
-		{"Int32N", Func, 22, "func(n int32) int32"},
-		{"Int64", Func, 22, "func() int64"},
-		{"Int64N", Func, 22, "func(n int64) int64"},
-		{"IntN", Func, 22, "func(n int) int"},
-		{"N", Func, 22, "func[Int intType](n Int) Int"},
-		{"New", Func, 22, "func(src Source) *Rand"},
-		{"NewChaCha8", Func, 22, "func(seed [32]byte) *ChaCha8"},
-		{"NewPCG", Func, 22, "func(seed1 uint64, seed2 uint64) *PCG"},
-		{"NewZipf", Func, 22, "func(r *Rand, s float64, v float64, imax uint64) *Zipf"},
-		{"NormFloat64", Func, 22, "func() float64"},
-		{"PCG", Type, 22, ""},
-		{"Perm", Func, 22, "func(n int) []int"},
-		{"Rand", Type, 22, ""},
-		{"Shuffle", Func, 22, "func(n int, swap func(i int, j int))"},
-		{"Source", Type, 22, ""},
-		{"Uint", Func, 23, "func() uint"},
-		{"Uint32", Func, 22, "func() uint32"},
-		{"Uint32N", Func, 22, "func(n uint32) uint32"},
-		{"Uint64", Func, 22, "func() uint64"},
-		{"Uint64N", Func, 22, "func(n uint64) uint64"},
-		{"UintN", Func, 22, "func(n uint) uint"},
-		{"Zipf", Type, 22, ""},
-	},
-	"mime": {
-		{"(*WordDecoder).Decode", Method, 5, ""},
-		{"(*WordDecoder).DecodeHeader", Method, 5, ""},
-		{"(WordEncoder).Encode", Method, 5, ""},
-		{"AddExtensionType", Func, 0, "func(ext string, typ string) error"},
-		{"BEncoding", Const, 5, ""},
-		{"ErrInvalidMediaParameter", Var, 9, ""},
-		{"ExtensionsByType", Func, 5, "func(typ string) ([]string, error)"},
-		{"FormatMediaType", Func, 0, "func(t string, param map[string]string) string"},
-		{"ParseMediaType", Func, 0, "func(v string) (mediatype string, params map[string]string, err error)"},
-		{"QEncoding", Const, 5, ""},
-		{"TypeByExtension", Func, 0, "func(ext string) string"},
-		{"WordDecoder", Type, 5, ""},
-		{"WordDecoder.CharsetReader", Field, 5, ""},
-		{"WordEncoder", Type, 5, ""},
-	},
-	"mime/multipart": {
-		{"(*FileHeader).Open", Method, 0, ""},
-		{"(*Form).RemoveAll", Method, 0, ""},
-		{"(*Part).Close", Method, 0, ""},
-		{"(*Part).FileName", Method, 0, ""},
-		{"(*Part).FormName", Method, 0, ""},
-		{"(*Part).Read", Method, 0, ""},
-		{"(*Reader).NextPart", Method, 0, ""},
-		{"(*Reader).NextRawPart", Method, 14, ""},
-		{"(*Reader).ReadForm", Method, 0, ""},
-		{"(*Writer).Boundary", Method, 0, ""},
-		{"(*Writer).Close", Method, 0, ""},
-		{"(*Writer).CreateFormField", Method, 0, ""},
-		{"(*Writer).CreateFormFile", Method, 0, ""},
-		{"(*Writer).CreatePart", Method, 0, ""},
-		{"(*Writer).FormDataContentType", Method, 0, ""},
-		{"(*Writer).SetBoundary", Method, 1, ""},
-		{"(*Writer).WriteField", Method, 0, ""},
-		{"ErrMessageTooLarge", Var, 9, ""},
-		{"File", Type, 0, ""},
-		{"FileContentDisposition", Func, 25, ""},
-		{"FileHeader", Type, 0, ""},
-		{"FileHeader.Filename", Field, 0, ""},
-		{"FileHeader.Header", Field, 0, ""},
-		{"FileHeader.Size", Field, 9, ""},
-		{"Form", Type, 0, ""},
-		{"Form.File", Field, 0, ""},
-		{"Form.Value", Field, 0, ""},
-		{"NewReader", Func, 0, "func(r io.Reader, boundary string) *Reader"},
-		{"NewWriter", Func, 0, "func(w io.Writer) *Writer"},
-		{"Part", Type, 0, ""},
-		{"Part.Header", Field, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"mime/quotedprintable": {
-		{"(*Reader).Read", Method, 5, ""},
-		{"(*Writer).Close", Method, 5, ""},
-		{"(*Writer).Write", Method, 5, ""},
-		{"NewReader", Func, 5, "func(r io.Reader) *Reader"},
-		{"NewWriter", Func, 5, "func(w io.Writer) *Writer"},
-		{"Reader", Type, 5, ""},
-		{"Writer", Type, 5, ""},
-		{"Writer.Binary", Field, 5, ""},
-	},
-	"net": {
-		{"(*AddrError).Error", Method, 0, ""},
-		{"(*AddrError).Temporary", Method, 0, ""},
-		{"(*AddrError).Timeout", Method, 0, ""},
-		{"(*Buffers).Read", Method, 8, ""},
-		{"(*Buffers).WriteTo", Method, 8, ""},
-		{"(*DNSConfigError).Error", Method, 0, ""},
-		{"(*DNSConfigError).Temporary", Method, 0, ""},
-		{"(*DNSConfigError).Timeout", Method, 0, ""},
-		{"(*DNSConfigError).Unwrap", Method, 13, ""},
-		{"(*DNSError).Error", Method, 0, ""},
-		{"(*DNSError).Temporary", Method, 0, ""},
-		{"(*DNSError).Timeout", Method, 0, ""},
-		{"(*DNSError).Unwrap", Method, 23, ""},
-		{"(*Dialer).Dial", Method, 1, ""},
-		{"(*Dialer).DialContext", Method, 7, ""},
-		{"(*Dialer).MultipathTCP", Method, 21, ""},
-		{"(*Dialer).SetMultipathTCP", Method, 21, ""},
-		{"(*IP).UnmarshalText", Method, 2, ""},
-		{"(*IPAddr).Network", Method, 0, ""},
-		{"(*IPAddr).String", Method, 0, ""},
-		{"(*IPConn).Close", Method, 0, ""},
-		{"(*IPConn).File", Method, 0, ""},
-		{"(*IPConn).LocalAddr", Method, 0, ""},
-		{"(*IPConn).Read", Method, 0, ""},
-		{"(*IPConn).ReadFrom", Method, 0, ""},
-		{"(*IPConn).ReadFromIP", Method, 0, ""},
-		{"(*IPConn).ReadMsgIP", Method, 1, ""},
-		{"(*IPConn).RemoteAddr", Method, 0, ""},
-		{"(*IPConn).SetDeadline", Method, 0, ""},
-		{"(*IPConn).SetReadBuffer", Method, 0, ""},
-		{"(*IPConn).SetReadDeadline", Method, 0, ""},
-		{"(*IPConn).SetWriteBuffer", Method, 0, ""},
-		{"(*IPConn).SetWriteDeadline", Method, 0, ""},
-		{"(*IPConn).SyscallConn", Method, 9, ""},
-		{"(*IPConn).Write", Method, 0, ""},
-		{"(*IPConn).WriteMsgIP", Method, 1, ""},
-		{"(*IPConn).WriteTo", Method, 0, ""},
-		{"(*IPConn).WriteToIP", Method, 0, ""},
-		{"(*IPNet).Contains", Method, 0, ""},
-		{"(*IPNet).Network", Method, 0, ""},
-		{"(*IPNet).String", Method, 0, ""},
-		{"(*Interface).Addrs", Method, 0, ""},
-		{"(*Interface).MulticastAddrs", Method, 0, ""},
-		{"(*ListenConfig).Listen", Method, 11, ""},
-		{"(*ListenConfig).ListenPacket", Method, 11, ""},
-		{"(*ListenConfig).MultipathTCP", Method, 21, ""},
-		{"(*ListenConfig).SetMultipathTCP", Method, 21, ""},
-		{"(*OpError).Error", Method, 0, ""},
-		{"(*OpError).Temporary", Method, 0, ""},
-		{"(*OpError).Timeout", Method, 0, ""},
-		{"(*OpError).Unwrap", Method, 13, ""},
-		{"(*ParseError).Error", Method, 0, ""},
-		{"(*ParseError).Temporary", Method, 17, ""},
-		{"(*ParseError).Timeout", Method, 17, ""},
-		{"(*Resolver).LookupAddr", Method, 8, ""},
-		{"(*Resolver).LookupCNAME", Method, 8, ""},
-		{"(*Resolver).LookupHost", Method, 8, ""},
-		{"(*Resolver).LookupIP", Method, 15, ""},
-		{"(*Resolver).LookupIPAddr", Method, 8, ""},
-		{"(*Resolver).LookupMX", Method, 8, ""},
-		{"(*Resolver).LookupNS", Method, 8, ""},
-		{"(*Resolver).LookupNetIP", Method, 18, ""},
-		{"(*Resolver).LookupPort", Method, 8, ""},
-		{"(*Resolver).LookupSRV", Method, 8, ""},
-		{"(*Resolver).LookupTXT", Method, 8, ""},
-		{"(*TCPAddr).AddrPort", Method, 18, ""},
-		{"(*TCPAddr).Network", Method, 0, ""},
-		{"(*TCPAddr).String", Method, 0, ""},
-		{"(*TCPConn).Close", Method, 0, ""},
-		{"(*TCPConn).CloseRead", Method, 0, ""},
-		{"(*TCPConn).CloseWrite", Method, 0, ""},
-		{"(*TCPConn).File", Method, 0, ""},
-		{"(*TCPConn).LocalAddr", Method, 0, ""},
-		{"(*TCPConn).MultipathTCP", Method, 21, ""},
-		{"(*TCPConn).Read", Method, 0, ""},
-		{"(*TCPConn).ReadFrom", Method, 0, ""},
-		{"(*TCPConn).RemoteAddr", Method, 0, ""},
-		{"(*TCPConn).SetDeadline", Method, 0, ""},
-		{"(*TCPConn).SetKeepAlive", Method, 0, ""},
-		{"(*TCPConn).SetKeepAliveConfig", Method, 23, ""},
-		{"(*TCPConn).SetKeepAlivePeriod", Method, 2, ""},
-		{"(*TCPConn).SetLinger", Method, 0, ""},
-		{"(*TCPConn).SetNoDelay", Method, 0, ""},
-		{"(*TCPConn).SetReadBuffer", Method, 0, ""},
-		{"(*TCPConn).SetReadDeadline", Method, 0, ""},
-		{"(*TCPConn).SetWriteBuffer", Method, 0, ""},
-		{"(*TCPConn).SetWriteDeadline", Method, 0, ""},
-		{"(*TCPConn).SyscallConn", Method, 9, ""},
-		{"(*TCPConn).Write", Method, 0, ""},
-		{"(*TCPConn).WriteTo", Method, 22, ""},
-		{"(*TCPListener).Accept", Method, 0, ""},
-		{"(*TCPListener).AcceptTCP", Method, 0, ""},
-		{"(*TCPListener).Addr", Method, 0, ""},
-		{"(*TCPListener).Close", Method, 0, ""},
-		{"(*TCPListener).File", Method, 0, ""},
-		{"(*TCPListener).SetDeadline", Method, 0, ""},
-		{"(*TCPListener).SyscallConn", Method, 10, ""},
-		{"(*UDPAddr).AddrPort", Method, 18, ""},
-		{"(*UDPAddr).Network", Method, 0, ""},
-		{"(*UDPAddr).String", Method, 0, ""},
-		{"(*UDPConn).Close", Method, 0, ""},
-		{"(*UDPConn).File", Method, 0, ""},
-		{"(*UDPConn).LocalAddr", Method, 0, ""},
-		{"(*UDPConn).Read", Method, 0, ""},
-		{"(*UDPConn).ReadFrom", Method, 0, ""},
-		{"(*UDPConn).ReadFromUDP", Method, 0, ""},
-		{"(*UDPConn).ReadFromUDPAddrPort", Method, 18, ""},
-		{"(*UDPConn).ReadMsgUDP", Method, 1, ""},
-		{"(*UDPConn).ReadMsgUDPAddrPort", Method, 18, ""},
-		{"(*UDPConn).RemoteAddr", Method, 0, ""},
-		{"(*UDPConn).SetDeadline", Method, 0, ""},
-		{"(*UDPConn).SetReadBuffer", Method, 0, ""},
-		{"(*UDPConn).SetReadDeadline", Method, 0, ""},
-		{"(*UDPConn).SetWriteBuffer", Method, 0, ""},
-		{"(*UDPConn).SetWriteDeadline", Method, 0, ""},
-		{"(*UDPConn).SyscallConn", Method, 9, ""},
-		{"(*UDPConn).Write", Method, 0, ""},
-		{"(*UDPConn).WriteMsgUDP", Method, 1, ""},
-		{"(*UDPConn).WriteMsgUDPAddrPort", Method, 18, ""},
-		{"(*UDPConn).WriteTo", Method, 0, ""},
-		{"(*UDPConn).WriteToUDP", Method, 0, ""},
-		{"(*UDPConn).WriteToUDPAddrPort", Method, 18, ""},
-		{"(*UnixAddr).Network", Method, 0, ""},
-		{"(*UnixAddr).String", Method, 0, ""},
-		{"(*UnixConn).Close", Method, 0, ""},
-		{"(*UnixConn).CloseRead", Method, 1, ""},
-		{"(*UnixConn).CloseWrite", Method, 1, ""},
-		{"(*UnixConn).File", Method, 0, ""},
-		{"(*UnixConn).LocalAddr", Method, 0, ""},
-		{"(*UnixConn).Read", Method, 0, ""},
-		{"(*UnixConn).ReadFrom", Method, 0, ""},
-		{"(*UnixConn).ReadFromUnix", Method, 0, ""},
-		{"(*UnixConn).ReadMsgUnix", Method, 0, ""},
-		{"(*UnixConn).RemoteAddr", Method, 0, ""},
-		{"(*UnixConn).SetDeadline", Method, 0, ""},
-		{"(*UnixConn).SetReadBuffer", Method, 0, ""},
-		{"(*UnixConn).SetReadDeadline", Method, 0, ""},
-		{"(*UnixConn).SetWriteBuffer", Method, 0, ""},
-		{"(*UnixConn).SetWriteDeadline", Method, 0, ""},
-		{"(*UnixConn).SyscallConn", Method, 9, ""},
-		{"(*UnixConn).Write", Method, 0, ""},
-		{"(*UnixConn).WriteMsgUnix", Method, 0, ""},
-		{"(*UnixConn).WriteTo", Method, 0, ""},
-		{"(*UnixConn).WriteToUnix", Method, 0, ""},
-		{"(*UnixListener).Accept", Method, 0, ""},
-		{"(*UnixListener).AcceptUnix", Method, 0, ""},
-		{"(*UnixListener).Addr", Method, 0, ""},
-		{"(*UnixListener).Close", Method, 0, ""},
-		{"(*UnixListener).File", Method, 0, ""},
-		{"(*UnixListener).SetDeadline", Method, 0, ""},
-		{"(*UnixListener).SetUnlinkOnClose", Method, 8, ""},
-		{"(*UnixListener).SyscallConn", Method, 10, ""},
-		{"(Flags).String", Method, 0, ""},
-		{"(HardwareAddr).String", Method, 0, ""},
-		{"(IP).AppendText", Method, 24, ""},
-		{"(IP).DefaultMask", Method, 0, ""},
-		{"(IP).Equal", Method, 0, ""},
-		{"(IP).IsGlobalUnicast", Method, 0, ""},
-		{"(IP).IsInterfaceLocalMulticast", Method, 0, ""},
-		{"(IP).IsLinkLocalMulticast", Method, 0, ""},
-		{"(IP).IsLinkLocalUnicast", Method, 0, ""},
-		{"(IP).IsLoopback", Method, 0, ""},
-		{"(IP).IsMulticast", Method, 0, ""},
-		{"(IP).IsPrivate", Method, 17, ""},
-		{"(IP).IsUnspecified", Method, 0, ""},
-		{"(IP).MarshalText", Method, 2, ""},
-		{"(IP).Mask", Method, 0, ""},
-		{"(IP).String", Method, 0, ""},
-		{"(IP).To16", Method, 0, ""},
-		{"(IP).To4", Method, 0, ""},
-		{"(IPMask).Size", Method, 0, ""},
-		{"(IPMask).String", Method, 0, ""},
-		{"(InvalidAddrError).Error", Method, 0, ""},
-		{"(InvalidAddrError).Temporary", Method, 0, ""},
-		{"(InvalidAddrError).Timeout", Method, 0, ""},
-		{"(UnknownNetworkError).Error", Method, 0, ""},
-		{"(UnknownNetworkError).Temporary", Method, 0, ""},
-		{"(UnknownNetworkError).Timeout", Method, 0, ""},
-		{"Addr", Type, 0, ""},
-		{"AddrError", Type, 0, ""},
-		{"AddrError.Addr", Field, 0, ""},
-		{"AddrError.Err", Field, 0, ""},
-		{"Buffers", Type, 8, ""},
-		{"CIDRMask", Func, 0, "func(ones int, bits int) IPMask"},
-		{"Conn", Type, 0, ""},
-		{"DNSConfigError", Type, 0, ""},
-		{"DNSConfigError.Err", Field, 0, ""},
-		{"DNSError", Type, 0, ""},
-		{"DNSError.Err", Field, 0, ""},
-		{"DNSError.IsNotFound", Field, 13, ""},
-		{"DNSError.IsTemporary", Field, 6, ""},
-		{"DNSError.IsTimeout", Field, 0, ""},
-		{"DNSError.Name", Field, 0, ""},
-		{"DNSError.Server", Field, 0, ""},
-		{"DNSError.UnwrapErr", Field, 23, ""},
-		{"DefaultResolver", Var, 8, ""},
-		{"Dial", Func, 0, "func(network string, address string) (Conn, error)"},
-		{"DialIP", Func, 0, "func(network string, laddr *IPAddr, raddr *IPAddr) (*IPConn, error)"},
-		{"DialTCP", Func, 0, "func(network string, laddr *TCPAddr, raddr *TCPAddr) (*TCPConn, error)"},
-		{"DialTimeout", Func, 0, "func(network string, address string, timeout time.Duration) (Conn, error)"},
-		{"DialUDP", Func, 0, "func(network string, laddr *UDPAddr, raddr *UDPAddr) (*UDPConn, error)"},
-		{"DialUnix", Func, 0, "func(network string, laddr *UnixAddr, raddr *UnixAddr) (*UnixConn, error)"},
-		{"Dialer", Type, 1, ""},
-		{"Dialer.Cancel", Field, 6, ""},
-		{"Dialer.Control", Field, 11, ""},
-		{"Dialer.ControlContext", Field, 20, ""},
-		{"Dialer.Deadline", Field, 1, ""},
-		{"Dialer.DualStack", Field, 2, ""},
-		{"Dialer.FallbackDelay", Field, 5, ""},
-		{"Dialer.KeepAlive", Field, 3, ""},
-		{"Dialer.KeepAliveConfig", Field, 23, ""},
-		{"Dialer.LocalAddr", Field, 1, ""},
-		{"Dialer.Resolver", Field, 8, ""},
-		{"Dialer.Timeout", Field, 1, ""},
-		{"ErrClosed", Var, 16, ""},
-		{"ErrWriteToConnected", Var, 0, ""},
-		{"Error", Type, 0, ""},
-		{"FileConn", Func, 0, "func(f *os.File) (c Conn, err error)"},
-		{"FileListener", Func, 0, "func(f *os.File) (ln Listener, err error)"},
-		{"FilePacketConn", Func, 0, "func(f *os.File) (c PacketConn, err error)"},
-		{"FlagBroadcast", Const, 0, ""},
-		{"FlagLoopback", Const, 0, ""},
-		{"FlagMulticast", Const, 0, ""},
-		{"FlagPointToPoint", Const, 0, ""},
-		{"FlagRunning", Const, 20, ""},
-		{"FlagUp", Const, 0, ""},
-		{"Flags", Type, 0, ""},
-		{"HardwareAddr", Type, 0, ""},
-		{"IP", Type, 0, ""},
-		{"IPAddr", Type, 0, ""},
-		{"IPAddr.IP", Field, 0, ""},
-		{"IPAddr.Zone", Field, 1, ""},
-		{"IPConn", Type, 0, ""},
-		{"IPMask", Type, 0, ""},
-		{"IPNet", Type, 0, ""},
-		{"IPNet.IP", Field, 0, ""},
-		{"IPNet.Mask", Field, 0, ""},
-		{"IPv4", Func, 0, "func(a byte, b byte, c byte, d byte) IP"},
-		{"IPv4Mask", Func, 0, "func(a byte, b byte, c byte, d byte) IPMask"},
-		{"IPv4allrouter", Var, 0, ""},
-		{"IPv4allsys", Var, 0, ""},
-		{"IPv4bcast", Var, 0, ""},
-		{"IPv4len", Const, 0, ""},
-		{"IPv4zero", Var, 0, ""},
-		{"IPv6interfacelocalallnodes", Var, 0, ""},
-		{"IPv6len", Const, 0, ""},
-		{"IPv6linklocalallnodes", Var, 0, ""},
-		{"IPv6linklocalallrouters", Var, 0, ""},
-		{"IPv6loopback", Var, 0, ""},
-		{"IPv6unspecified", Var, 0, ""},
-		{"IPv6zero", Var, 0, ""},
-		{"Interface", Type, 0, ""},
-		{"Interface.Flags", Field, 0, ""},
-		{"Interface.HardwareAddr", Field, 0, ""},
-		{"Interface.Index", Field, 0, ""},
-		{"Interface.MTU", Field, 0, ""},
-		{"Interface.Name", Field, 0, ""},
-		{"InterfaceAddrs", Func, 0, "func() ([]Addr, error)"},
-		{"InterfaceByIndex", Func, 0, "func(index int) (*Interface, error)"},
-		{"InterfaceByName", Func, 0, "func(name string) (*Interface, error)"},
-		{"Interfaces", Func, 0, "func() ([]Interface, error)"},
-		{"InvalidAddrError", Type, 0, ""},
-		{"JoinHostPort", Func, 0, "func(host string, port string) string"},
-		{"KeepAliveConfig", Type, 23, ""},
-		{"KeepAliveConfig.Count", Field, 23, ""},
-		{"KeepAliveConfig.Enable", Field, 23, ""},
-		{"KeepAliveConfig.Idle", Field, 23, ""},
-		{"KeepAliveConfig.Interval", Field, 23, ""},
-		{"Listen", Func, 0, "func(network string, address string) (Listener, error)"},
-		{"ListenConfig", Type, 11, ""},
-		{"ListenConfig.Control", Field, 11, ""},
-		{"ListenConfig.KeepAlive", Field, 13, ""},
-		{"ListenConfig.KeepAliveConfig", Field, 23, ""},
-		{"ListenIP", Func, 0, "func(network string, laddr *IPAddr) (*IPConn, error)"},
-		{"ListenMulticastUDP", Func, 0, "func(network string, ifi *Interface, gaddr *UDPAddr) (*UDPConn, error)"},
-		{"ListenPacket", Func, 0, "func(network string, address string) (PacketConn, error)"},
-		{"ListenTCP", Func, 0, "func(network string, laddr *TCPAddr) (*TCPListener, error)"},
-		{"ListenUDP", Func, 0, "func(network string, laddr *UDPAddr) (*UDPConn, error)"},
-		{"ListenUnix", Func, 0, "func(network string, laddr *UnixAddr) (*UnixListener, error)"},
-		{"ListenUnixgram", Func, 0, "func(network string, laddr *UnixAddr) (*UnixConn, error)"},
-		{"Listener", Type, 0, ""},
-		{"LookupAddr", Func, 0, "func(addr string) (names []string, err error)"},
-		{"LookupCNAME", Func, 0, "func(host string) (cname string, err error)"},
-		{"LookupHost", Func, 0, "func(host string) (addrs []string, err error)"},
-		{"LookupIP", Func, 0, "func(host string) ([]IP, error)"},
-		{"LookupMX", Func, 0, "func(name string) ([]*MX, error)"},
-		{"LookupNS", Func, 1, "func(name string) ([]*NS, error)"},
-		{"LookupPort", Func, 0, "func(network string, service string) (port int, err error)"},
-		{"LookupSRV", Func, 0, "func(service string, proto string, name string) (cname string, addrs []*SRV, err error)"},
-		{"LookupTXT", Func, 0, "func(name string) ([]string, error)"},
-		{"MX", Type, 0, ""},
-		{"MX.Host", Field, 0, ""},
-		{"MX.Pref", Field, 0, ""},
-		{"NS", Type, 1, ""},
-		{"NS.Host", Field, 1, ""},
-		{"OpError", Type, 0, ""},
-		{"OpError.Addr", Field, 0, ""},
-		{"OpError.Err", Field, 0, ""},
-		{"OpError.Net", Field, 0, ""},
-		{"OpError.Op", Field, 0, ""},
-		{"OpError.Source", Field, 5, ""},
-		{"PacketConn", Type, 0, ""},
-		{"ParseCIDR", Func, 0, "func(s string) (IP, *IPNet, error)"},
-		{"ParseError", Type, 0, ""},
-		{"ParseError.Text", Field, 0, ""},
-		{"ParseError.Type", Field, 0, ""},
-		{"ParseIP", Func, 0, "func(s string) IP"},
-		{"ParseMAC", Func, 0, "func(s string) (hw HardwareAddr, err error)"},
-		{"Pipe", Func, 0, "func() (Conn, Conn)"},
-		{"ResolveIPAddr", Func, 0, "func(network string, address string) (*IPAddr, error)"},
-		{"ResolveTCPAddr", Func, 0, "func(network string, address string) (*TCPAddr, error)"},
-		{"ResolveUDPAddr", Func, 0, "func(network string, address string) (*UDPAddr, error)"},
-		{"ResolveUnixAddr", Func, 0, "func(network string, address string) (*UnixAddr, error)"},
-		{"Resolver", Type, 8, ""},
-		{"Resolver.Dial", Field, 9, ""},
-		{"Resolver.PreferGo", Field, 8, ""},
-		{"Resolver.StrictErrors", Field, 9, ""},
-		{"SRV", Type, 0, ""},
-		{"SRV.Port", Field, 0, ""},
-		{"SRV.Priority", Field, 0, ""},
-		{"SRV.Target", Field, 0, ""},
-		{"SRV.Weight", Field, 0, ""},
-		{"SplitHostPort", Func, 0, "func(hostport string) (host string, port string, err error)"},
-		{"TCPAddr", Type, 0, ""},
-		{"TCPAddr.IP", Field, 0, ""},
-		{"TCPAddr.Port", Field, 0, ""},
-		{"TCPAddr.Zone", Field, 1, ""},
-		{"TCPAddrFromAddrPort", Func, 18, "func(addr netip.AddrPort) *TCPAddr"},
-		{"TCPConn", Type, 0, ""},
-		{"TCPListener", Type, 0, ""},
-		{"UDPAddr", Type, 0, ""},
-		{"UDPAddr.IP", Field, 0, ""},
-		{"UDPAddr.Port", Field, 0, ""},
-		{"UDPAddr.Zone", Field, 1, ""},
-		{"UDPAddrFromAddrPort", Func, 18, "func(addr netip.AddrPort) *UDPAddr"},
-		{"UDPConn", Type, 0, ""},
-		{"UnixAddr", Type, 0, ""},
-		{"UnixAddr.Name", Field, 0, ""},
-		{"UnixAddr.Net", Field, 0, ""},
-		{"UnixConn", Type, 0, ""},
-		{"UnixListener", Type, 0, ""},
-		{"UnknownNetworkError", Type, 0, ""},
-	},
-	"net/http": {
-		{"(*Client).CloseIdleConnections", Method, 12, ""},
-		{"(*Client).Do", Method, 0, ""},
-		{"(*Client).Get", Method, 0, ""},
-		{"(*Client).Head", Method, 0, ""},
-		{"(*Client).Post", Method, 0, ""},
-		{"(*Client).PostForm", Method, 0, ""},
-		{"(*Cookie).String", Method, 0, ""},
-		{"(*Cookie).Valid", Method, 18, ""},
-		{"(*MaxBytesError).Error", Method, 19, ""},
-		{"(*ProtocolError).Error", Method, 0, ""},
-		{"(*ProtocolError).Is", Method, 21, ""},
-		{"(*Protocols).SetHTTP1", Method, 24, ""},
-		{"(*Protocols).SetHTTP2", Method, 24, ""},
-		{"(*Protocols).SetUnencryptedHTTP2", Method, 24, ""},
-		{"(*Request).AddCookie", Method, 0, ""},
-		{"(*Request).BasicAuth", Method, 4, ""},
-		{"(*Request).Clone", Method, 13, ""},
-		{"(*Request).Context", Method, 7, ""},
-		{"(*Request).Cookie", Method, 0, ""},
-		{"(*Request).Cookies", Method, 0, ""},
-		{"(*Request).CookiesNamed", Method, 23, ""},
-		{"(*Request).FormFile", Method, 0, ""},
-		{"(*Request).FormValue", Method, 0, ""},
-		{"(*Request).MultipartReader", Method, 0, ""},
-		{"(*Request).ParseForm", Method, 0, ""},
-		{"(*Request).ParseMultipartForm", Method, 0, ""},
-		{"(*Request).PathValue", Method, 22, ""},
-		{"(*Request).PostFormValue", Method, 1, ""},
-		{"(*Request).ProtoAtLeast", Method, 0, ""},
-		{"(*Request).Referer", Method, 0, ""},
-		{"(*Request).SetBasicAuth", Method, 0, ""},
-		{"(*Request).SetPathValue", Method, 22, ""},
-		{"(*Request).UserAgent", Method, 0, ""},
-		{"(*Request).WithContext", Method, 7, ""},
-		{"(*Request).Write", Method, 0, ""},
-		{"(*Request).WriteProxy", Method, 0, ""},
-		{"(*Response).Cookies", Method, 0, ""},
-		{"(*Response).Location", Method, 0, ""},
-		{"(*Response).ProtoAtLeast", Method, 0, ""},
-		{"(*Response).Write", Method, 0, ""},
-		{"(*ResponseController).EnableFullDuplex", Method, 21, ""},
-		{"(*ResponseController).Flush", Method, 20, ""},
-		{"(*ResponseController).Hijack", Method, 20, ""},
-		{"(*ResponseController).SetReadDeadline", Method, 20, ""},
-		{"(*ResponseController).SetWriteDeadline", Method, 20, ""},
-		{"(*ServeMux).Handle", Method, 0, ""},
-		{"(*ServeMux).HandleFunc", Method, 0, ""},
-		{"(*ServeMux).Handler", Method, 1, ""},
-		{"(*ServeMux).ServeHTTP", Method, 0, ""},
-		{"(*Server).Close", Method, 8, ""},
-		{"(*Server).ListenAndServe", Method, 0, ""},
-		{"(*Server).ListenAndServeTLS", Method, 0, ""},
-		{"(*Server).RegisterOnShutdown", Method, 9, ""},
-		{"(*Server).Serve", Method, 0, ""},
-		{"(*Server).ServeTLS", Method, 9, ""},
-		{"(*Server).SetKeepAlivesEnabled", Method, 3, ""},
-		{"(*Server).Shutdown", Method, 8, ""},
-		{"(*Transport).CancelRequest", Method, 1, ""},
-		{"(*Transport).Clone", Method, 13, ""},
-		{"(*Transport).CloseIdleConnections", Method, 0, ""},
-		{"(*Transport).RegisterProtocol", Method, 0, ""},
-		{"(*Transport).RoundTrip", Method, 0, ""},
-		{"(ConnState).String", Method, 3, ""},
-		{"(Dir).Open", Method, 0, ""},
-		{"(HandlerFunc).ServeHTTP", Method, 0, ""},
-		{"(Header).Add", Method, 0, ""},
-		{"(Header).Clone", Method, 13, ""},
-		{"(Header).Del", Method, 0, ""},
-		{"(Header).Get", Method, 0, ""},
-		{"(Header).Set", Method, 0, ""},
-		{"(Header).Values", Method, 14, ""},
-		{"(Header).Write", Method, 0, ""},
-		{"(Header).WriteSubset", Method, 0, ""},
-		{"(Protocols).HTTP1", Method, 24, ""},
-		{"(Protocols).HTTP2", Method, 24, ""},
-		{"(Protocols).String", Method, 24, ""},
-		{"(Protocols).UnencryptedHTTP2", Method, 24, ""},
-		{"AllowQuerySemicolons", Func, 17, "func(h Handler) Handler"},
-		{"CanonicalHeaderKey", Func, 0, "func(s string) string"},
-		{"Client", Type, 0, ""},
-		{"Client.CheckRedirect", Field, 0, ""},
-		{"Client.Jar", Field, 0, ""},
-		{"Client.Timeout", Field, 3, ""},
-		{"Client.Transport", Field, 0, ""},
-		{"CloseNotifier", Type, 1, ""},
-		{"ConnState", Type, 3, ""},
-		{"Cookie", Type, 0, ""},
-		{"Cookie.Domain", Field, 0, ""},
-		{"Cookie.Expires", Field, 0, ""},
-		{"Cookie.HttpOnly", Field, 0, ""},
-		{"Cookie.MaxAge", Field, 0, ""},
-		{"Cookie.Name", Field, 0, ""},
-		{"Cookie.Partitioned", Field, 23, ""},
-		{"Cookie.Path", Field, 0, ""},
-		{"Cookie.Quoted", Field, 23, ""},
-		{"Cookie.Raw", Field, 0, ""},
-		{"Cookie.RawExpires", Field, 0, ""},
-		{"Cookie.SameSite", Field, 11, ""},
-		{"Cookie.Secure", Field, 0, ""},
-		{"Cookie.Unparsed", Field, 0, ""},
-		{"Cookie.Value", Field, 0, ""},
-		{"CookieJar", Type, 0, ""},
-		{"DefaultClient", Var, 0, ""},
-		{"DefaultMaxHeaderBytes", Const, 0, ""},
-		{"DefaultMaxIdleConnsPerHost", Const, 0, ""},
-		{"DefaultServeMux", Var, 0, ""},
-		{"DefaultTransport", Var, 0, ""},
-		{"DetectContentType", Func, 0, "func(data []byte) string"},
-		{"Dir", Type, 0, ""},
-		{"ErrAbortHandler", Var, 8, ""},
-		{"ErrBodyNotAllowed", Var, 0, ""},
-		{"ErrBodyReadAfterClose", Var, 0, ""},
-		{"ErrContentLength", Var, 0, ""},
-		{"ErrHandlerTimeout", Var, 0, ""},
-		{"ErrHeaderTooLong", Var, 0, ""},
-		{"ErrHijacked", Var, 0, ""},
-		{"ErrLineTooLong", Var, 0, ""},
-		{"ErrMissingBoundary", Var, 0, ""},
-		{"ErrMissingContentLength", Var, 0, ""},
-		{"ErrMissingFile", Var, 0, ""},
-		{"ErrNoCookie", Var, 0, ""},
-		{"ErrNoLocation", Var, 0, ""},
-		{"ErrNotMultipart", Var, 0, ""},
-		{"ErrNotSupported", Var, 0, ""},
-		{"ErrSchemeMismatch", Var, 21, ""},
-		{"ErrServerClosed", Var, 8, ""},
-		{"ErrShortBody", Var, 0, ""},
-		{"ErrSkipAltProtocol", Var, 6, ""},
-		{"ErrUnexpectedTrailer", Var, 0, ""},
-		{"ErrUseLastResponse", Var, 7, ""},
-		{"ErrWriteAfterFlush", Var, 0, ""},
-		{"Error", Func, 0, "func(w ResponseWriter, error string, code int)"},
-		{"FS", Func, 16, "func(fsys fs.FS) FileSystem"},
-		{"File", Type, 0, ""},
-		{"FileServer", Func, 0, "func(root FileSystem) Handler"},
-		{"FileServerFS", Func, 22, "func(root fs.FS) Handler"},
-		{"FileSystem", Type, 0, ""},
-		{"Flusher", Type, 0, ""},
-		{"Get", Func, 0, "func(url string) (resp *Response, err error)"},
-		{"HTTP2Config", Type, 24, ""},
-		{"HTTP2Config.CountError", Field, 24, ""},
-		{"HTTP2Config.MaxConcurrentStreams", Field, 24, ""},
-		{"HTTP2Config.MaxDecoderHeaderTableSize", Field, 24, ""},
-		{"HTTP2Config.MaxEncoderHeaderTableSize", Field, 24, ""},
-		{"HTTP2Config.MaxReadFrameSize", Field, 24, ""},
-		{"HTTP2Config.MaxReceiveBufferPerConnection", Field, 24, ""},
-		{"HTTP2Config.MaxReceiveBufferPerStream", Field, 24, ""},
-		{"HTTP2Config.PermitProhibitedCipherSuites", Field, 24, ""},
-		{"HTTP2Config.PingTimeout", Field, 24, ""},
-		{"HTTP2Config.SendPingTimeout", Field, 24, ""},
-		{"HTTP2Config.WriteByteTimeout", Field, 24, ""},
-		{"Handle", Func, 0, "func(pattern string, handler Handler)"},
-		{"HandleFunc", Func, 0, "func(pattern string, handler func(ResponseWriter, *Request))"},
-		{"Handler", Type, 0, ""},
-		{"HandlerFunc", Type, 0, ""},
-		{"Head", Func, 0, "func(url string) (resp *Response, err error)"},
-		{"Header", Type, 0, ""},
-		{"Hijacker", Type, 0, ""},
-		{"ListenAndServe", Func, 0, "func(addr string, handler Handler) error"},
-		{"ListenAndServeTLS", Func, 0, "func(addr string, certFile string, keyFile string, handler Handler) error"},
-		{"LocalAddrContextKey", Var, 7, ""},
-		{"MaxBytesError", Type, 19, ""},
-		{"MaxBytesError.Limit", Field, 19, ""},
-		{"MaxBytesHandler", Func, 18, "func(h Handler, n int64) Handler"},
-		{"MaxBytesReader", Func, 0, "func(w ResponseWriter, r io.ReadCloser, n int64) io.ReadCloser"},
-		{"MethodConnect", Const, 6, ""},
-		{"MethodDelete", Const, 6, ""},
-		{"MethodGet", Const, 6, ""},
-		{"MethodHead", Const, 6, ""},
-		{"MethodOptions", Const, 6, ""},
-		{"MethodPatch", Const, 6, ""},
-		{"MethodPost", Const, 6, ""},
-		{"MethodPut", Const, 6, ""},
-		{"MethodTrace", Const, 6, ""},
-		{"NewFileTransport", Func, 0, "func(fs FileSystem) RoundTripper"},
-		{"NewFileTransportFS", Func, 22, "func(fsys fs.FS) RoundTripper"},
-		{"NewRequest", Func, 0, "func(method string, url string, body io.Reader) (*Request, error)"},
-		{"NewRequestWithContext", Func, 13, "func(ctx context.Context, method string, url string, body io.Reader) (*Request, error)"},
-		{"NewResponseController", Func, 20, "func(rw ResponseWriter) *ResponseController"},
-		{"NewServeMux", Func, 0, "func() *ServeMux"},
-		{"NoBody", Var, 8, ""},
-		{"NotFound", Func, 0, "func(w ResponseWriter, r *Request)"},
-		{"NotFoundHandler", Func, 0, "func() Handler"},
-		{"ParseCookie", Func, 23, "func(line string) ([]*Cookie, error)"},
-		{"ParseHTTPVersion", Func, 0, "func(vers string) (major int, minor int, ok bool)"},
-		{"ParseSetCookie", Func, 23, "func(line string) (*Cookie, error)"},
-		{"ParseTime", Func, 1, "func(text string) (t time.Time, err error)"},
-		{"Post", Func, 0, "func(url string, contentType string, body io.Reader) (resp *Response, err error)"},
-		{"PostForm", Func, 0, "func(url string, data url.Values) (resp *Response, err error)"},
-		{"ProtocolError", Type, 0, ""},
-		{"ProtocolError.ErrorString", Field, 0, ""},
-		{"Protocols", Type, 24, ""},
-		{"ProxyFromEnvironment", Func, 0, "func(req *Request) (*url.URL, error)"},
-		{"ProxyURL", Func, 0, "func(fixedURL *url.URL) func(*Request) (*url.URL, error)"},
-		{"PushOptions", Type, 8, ""},
-		{"PushOptions.Header", Field, 8, ""},
-		{"PushOptions.Method", Field, 8, ""},
-		{"Pusher", Type, 8, ""},
-		{"ReadRequest", Func, 0, "func(b *bufio.Reader) (*Request, error)"},
-		{"ReadResponse", Func, 0, "func(r *bufio.Reader, req *Request) (*Response, error)"},
-		{"Redirect", Func, 0, "func(w ResponseWriter, r *Request, url string, code int)"},
-		{"RedirectHandler", Func, 0, "func(url string, code int) Handler"},
-		{"Request", Type, 0, ""},
-		{"Request.Body", Field, 0, ""},
-		{"Request.Cancel", Field, 5, ""},
-		{"Request.Close", Field, 0, ""},
-		{"Request.ContentLength", Field, 0, ""},
-		{"Request.Form", Field, 0, ""},
-		{"Request.GetBody", Field, 8, ""},
-		{"Request.Header", Field, 0, ""},
-		{"Request.Host", Field, 0, ""},
-		{"Request.Method", Field, 0, ""},
-		{"Request.MultipartForm", Field, 0, ""},
-		{"Request.Pattern", Field, 23, ""},
-		{"Request.PostForm", Field, 1, ""},
-		{"Request.Proto", Field, 0, ""},
-		{"Request.ProtoMajor", Field, 0, ""},
-		{"Request.ProtoMinor", Field, 0, ""},
-		{"Request.RemoteAddr", Field, 0, ""},
-		{"Request.RequestURI", Field, 0, ""},
-		{"Request.Response", Field, 7, ""},
-		{"Request.TLS", Field, 0, ""},
-		{"Request.Trailer", Field, 0, ""},
-		{"Request.TransferEncoding", Field, 0, ""},
-		{"Request.URL", Field, 0, ""},
-		{"Response", Type, 0, ""},
-		{"Response.Body", Field, 0, ""},
-		{"Response.Close", Field, 0, ""},
-		{"Response.ContentLength", Field, 0, ""},
-		{"Response.Header", Field, 0, ""},
-		{"Response.Proto", Field, 0, ""},
-		{"Response.ProtoMajor", Field, 0, ""},
-		{"Response.ProtoMinor", Field, 0, ""},
-		{"Response.Request", Field, 0, ""},
-		{"Response.Status", Field, 0, ""},
-		{"Response.StatusCode", Field, 0, ""},
-		{"Response.TLS", Field, 3, ""},
-		{"Response.Trailer", Field, 0, ""},
-		{"Response.TransferEncoding", Field, 0, ""},
-		{"Response.Uncompressed", Field, 7, ""},
-		{"ResponseController", Type, 20, ""},
-		{"ResponseWriter", Type, 0, ""},
-		{"RoundTripper", Type, 0, ""},
-		{"SameSite", Type, 11, ""},
-		{"SameSiteDefaultMode", Const, 11, ""},
-		{"SameSiteLaxMode", Const, 11, ""},
-		{"SameSiteNoneMode", Const, 13, ""},
-		{"SameSiteStrictMode", Const, 11, ""},
-		{"Serve", Func, 0, "func(l net.Listener, handler Handler) error"},
-		{"ServeContent", Func, 0, "func(w ResponseWriter, req *Request, name string, modtime time.Time, content io.ReadSeeker)"},
-		{"ServeFile", Func, 0, "func(w ResponseWriter, r *Request, name string)"},
-		{"ServeFileFS", Func, 22, "func(w ResponseWriter, r *Request, fsys fs.FS, name string)"},
-		{"ServeMux", Type, 0, ""},
-		{"ServeTLS", Func, 9, "func(l net.Listener, handler Handler, certFile string, keyFile string) error"},
-		{"Server", Type, 0, ""},
-		{"Server.Addr", Field, 0, ""},
-		{"Server.BaseContext", Field, 13, ""},
-		{"Server.ConnContext", Field, 13, ""},
-		{"Server.ConnState", Field, 3, ""},
-		{"Server.DisableGeneralOptionsHandler", Field, 20, ""},
-		{"Server.ErrorLog", Field, 3, ""},
-		{"Server.HTTP2", Field, 24, ""},
-		{"Server.Handler", Field, 0, ""},
-		{"Server.IdleTimeout", Field, 8, ""},
-		{"Server.MaxHeaderBytes", Field, 0, ""},
-		{"Server.Protocols", Field, 24, ""},
-		{"Server.ReadHeaderTimeout", Field, 8, ""},
-		{"Server.ReadTimeout", Field, 0, ""},
-		{"Server.TLSConfig", Field, 0, ""},
-		{"Server.TLSNextProto", Field, 1, ""},
-		{"Server.WriteTimeout", Field, 0, ""},
-		{"ServerContextKey", Var, 7, ""},
-		{"SetCookie", Func, 0, "func(w ResponseWriter, cookie *Cookie)"},
-		{"StateActive", Const, 3, ""},
-		{"StateClosed", Const, 3, ""},
-		{"StateHijacked", Const, 3, ""},
-		{"StateIdle", Const, 3, ""},
-		{"StateNew", Const, 3, ""},
-		{"StatusAccepted", Const, 0, ""},
-		{"StatusAlreadyReported", Const, 7, ""},
-		{"StatusBadGateway", Const, 0, ""},
-		{"StatusBadRequest", Const, 0, ""},
-		{"StatusConflict", Const, 0, ""},
-		{"StatusContinue", Const, 0, ""},
-		{"StatusCreated", Const, 0, ""},
-		{"StatusEarlyHints", Const, 13, ""},
-		{"StatusExpectationFailed", Const, 0, ""},
-		{"StatusFailedDependency", Const, 7, ""},
-		{"StatusForbidden", Const, 0, ""},
-		{"StatusFound", Const, 0, ""},
-		{"StatusGatewayTimeout", Const, 0, ""},
-		{"StatusGone", Const, 0, ""},
-		{"StatusHTTPVersionNotSupported", Const, 0, ""},
-		{"StatusIMUsed", Const, 7, ""},
-		{"StatusInsufficientStorage", Const, 7, ""},
-		{"StatusInternalServerError", Const, 0, ""},
-		{"StatusLengthRequired", Const, 0, ""},
-		{"StatusLocked", Const, 7, ""},
-		{"StatusLoopDetected", Const, 7, ""},
-		{"StatusMethodNotAllowed", Const, 0, ""},
-		{"StatusMisdirectedRequest", Const, 11, ""},
-		{"StatusMovedPermanently", Const, 0, ""},
-		{"StatusMultiStatus", Const, 7, ""},
-		{"StatusMultipleChoices", Const, 0, ""},
-		{"StatusNetworkAuthenticationRequired", Const, 6, ""},
-		{"StatusNoContent", Const, 0, ""},
-		{"StatusNonAuthoritativeInfo", Const, 0, ""},
-		{"StatusNotAcceptable", Const, 0, ""},
-		{"StatusNotExtended", Const, 7, ""},
-		{"StatusNotFound", Const, 0, ""},
-		{"StatusNotImplemented", Const, 0, ""},
-		{"StatusNotModified", Const, 0, ""},
-		{"StatusOK", Const, 0, ""},
-		{"StatusPartialContent", Const, 0, ""},
-		{"StatusPaymentRequired", Const, 0, ""},
-		{"StatusPermanentRedirect", Const, 7, ""},
-		{"StatusPreconditionFailed", Const, 0, ""},
-		{"StatusPreconditionRequired", Const, 6, ""},
-		{"StatusProcessing", Const, 7, ""},
-		{"StatusProxyAuthRequired", Const, 0, ""},
-		{"StatusRequestEntityTooLarge", Const, 0, ""},
-		{"StatusRequestHeaderFieldsTooLarge", Const, 6, ""},
-		{"StatusRequestTimeout", Const, 0, ""},
-		{"StatusRequestURITooLong", Const, 0, ""},
-		{"StatusRequestedRangeNotSatisfiable", Const, 0, ""},
-		{"StatusResetContent", Const, 0, ""},
-		{"StatusSeeOther", Const, 0, ""},
-		{"StatusServiceUnavailable", Const, 0, ""},
-		{"StatusSwitchingProtocols", Const, 0, ""},
-		{"StatusTeapot", Const, 0, ""},
-		{"StatusTemporaryRedirect", Const, 0, ""},
-		{"StatusText", Func, 0, "func(code int) string"},
-		{"StatusTooEarly", Const, 12, ""},
-		{"StatusTooManyRequests", Const, 6, ""},
-		{"StatusUnauthorized", Const, 0, ""},
-		{"StatusUnavailableForLegalReasons", Const, 6, ""},
-		{"StatusUnprocessableEntity", Const, 7, ""},
-		{"StatusUnsupportedMediaType", Const, 0, ""},
-		{"StatusUpgradeRequired", Const, 7, ""},
-		{"StatusUseProxy", Const, 0, ""},
-		{"StatusVariantAlsoNegotiates", Const, 7, ""},
-		{"StripPrefix", Func, 0, "func(prefix string, h Handler) Handler"},
-		{"TimeFormat", Const, 0, ""},
-		{"TimeoutHandler", Func, 0, "func(h Handler, dt time.Duration, msg string) Handler"},
-		{"TrailerPrefix", Const, 8, ""},
-		{"Transport", Type, 0, ""},
-		{"Transport.Dial", Field, 0, ""},
-		{"Transport.DialContext", Field, 7, ""},
-		{"Transport.DialTLS", Field, 4, ""},
-		{"Transport.DialTLSContext", Field, 14, ""},
-		{"Transport.DisableCompression", Field, 0, ""},
-		{"Transport.DisableKeepAlives", Field, 0, ""},
-		{"Transport.ExpectContinueTimeout", Field, 6, ""},
-		{"Transport.ForceAttemptHTTP2", Field, 13, ""},
-		{"Transport.GetProxyConnectHeader", Field, 16, ""},
-		{"Transport.HTTP2", Field, 24, ""},
-		{"Transport.IdleConnTimeout", Field, 7, ""},
-		{"Transport.MaxConnsPerHost", Field, 11, ""},
-		{"Transport.MaxIdleConns", Field, 7, ""},
-		{"Transport.MaxIdleConnsPerHost", Field, 0, ""},
-		{"Transport.MaxResponseHeaderBytes", Field, 7, ""},
-		{"Transport.OnProxyConnectResponse", Field, 20, ""},
-		{"Transport.Protocols", Field, 24, ""},
-		{"Transport.Proxy", Field, 0, ""},
-		{"Transport.ProxyConnectHeader", Field, 8, ""},
-		{"Transport.ReadBufferSize", Field, 13, ""},
-		{"Transport.ResponseHeaderTimeout", Field, 1, ""},
-		{"Transport.TLSClientConfig", Field, 0, ""},
-		{"Transport.TLSHandshakeTimeout", Field, 3, ""},
-		{"Transport.TLSNextProto", Field, 6, ""},
-		{"Transport.WriteBufferSize", Field, 13, ""},
-	},
-	"net/http/cgi": {
-		{"(*Handler).ServeHTTP", Method, 0, ""},
-		{"Handler", Type, 0, ""},
-		{"Handler.Args", Field, 0, ""},
-		{"Handler.Dir", Field, 0, ""},
-		{"Handler.Env", Field, 0, ""},
-		{"Handler.InheritEnv", Field, 0, ""},
-		{"Handler.Logger", Field, 0, ""},
-		{"Handler.Path", Field, 0, ""},
-		{"Handler.PathLocationHandler", Field, 0, ""},
-		{"Handler.Root", Field, 0, ""},
-		{"Handler.Stderr", Field, 7, ""},
-		{"Request", Func, 0, "func() (*http.Request, error)"},
-		{"RequestFromMap", Func, 0, "func(params map[string]string) (*http.Request, error)"},
-		{"Serve", Func, 0, "func(handler http.Handler) error"},
-	},
-	"net/http/cookiejar": {
-		{"(*Jar).Cookies", Method, 1, ""},
-		{"(*Jar).SetCookies", Method, 1, ""},
-		{"Jar", Type, 1, ""},
-		{"New", Func, 1, "func(o *Options) (*Jar, error)"},
-		{"Options", Type, 1, ""},
-		{"Options.PublicSuffixList", Field, 1, ""},
-		{"PublicSuffixList", Type, 1, ""},
-	},
-	"net/http/fcgi": {
-		{"ErrConnClosed", Var, 5, ""},
-		{"ErrRequestAborted", Var, 5, ""},
-		{"ProcessEnv", Func, 9, "func(r *http.Request) map[string]string"},
-		{"Serve", Func, 0, "func(l net.Listener, handler http.Handler) error"},
-	},
-	"net/http/httptest": {
-		{"(*ResponseRecorder).Flush", Method, 0, ""},
-		{"(*ResponseRecorder).Header", Method, 0, ""},
-		{"(*ResponseRecorder).Result", Method, 7, ""},
-		{"(*ResponseRecorder).Write", Method, 0, ""},
-		{"(*ResponseRecorder).WriteHeader", Method, 0, ""},
-		{"(*ResponseRecorder).WriteString", Method, 6, ""},
-		{"(*Server).Certificate", Method, 9, ""},
-		{"(*Server).Client", Method, 9, ""},
-		{"(*Server).Close", Method, 0, ""},
-		{"(*Server).CloseClientConnections", Method, 0, ""},
-		{"(*Server).Start", Method, 0, ""},
-		{"(*Server).StartTLS", Method, 0, ""},
-		{"DefaultRemoteAddr", Const, 0, ""},
-		{"NewRecorder", Func, 0, "func() *ResponseRecorder"},
-		{"NewRequest", Func, 7, "func(method string, target string, body io.Reader) *http.Request"},
-		{"NewRequestWithContext", Func, 23, "func(ctx context.Context, method string, target string, body io.Reader) *http.Request"},
-		{"NewServer", Func, 0, "func(handler http.Handler) *Server"},
-		{"NewTLSServer", Func, 0, "func(handler http.Handler) *Server"},
-		{"NewUnstartedServer", Func, 0, "func(handler http.Handler) *Server"},
-		{"ResponseRecorder", Type, 0, ""},
-		{"ResponseRecorder.Body", Field, 0, ""},
-		{"ResponseRecorder.Code", Field, 0, ""},
-		{"ResponseRecorder.Flushed", Field, 0, ""},
-		{"ResponseRecorder.HeaderMap", Field, 0, ""},
-		{"Server", Type, 0, ""},
-		{"Server.Config", Field, 0, ""},
-		{"Server.EnableHTTP2", Field, 14, ""},
-		{"Server.Listener", Field, 0, ""},
-		{"Server.TLS", Field, 0, ""},
-		{"Server.URL", Field, 0, ""},
-	},
-	"net/http/httptrace": {
-		{"ClientTrace", Type, 7, ""},
-		{"ClientTrace.ConnectDone", Field, 7, ""},
-		{"ClientTrace.ConnectStart", Field, 7, ""},
-		{"ClientTrace.DNSDone", Field, 7, ""},
-		{"ClientTrace.DNSStart", Field, 7, ""},
-		{"ClientTrace.GetConn", Field, 7, ""},
-		{"ClientTrace.Got100Continue", Field, 7, ""},
-		{"ClientTrace.Got1xxResponse", Field, 11, ""},
-		{"ClientTrace.GotConn", Field, 7, ""},
-		{"ClientTrace.GotFirstResponseByte", Field, 7, ""},
-		{"ClientTrace.PutIdleConn", Field, 7, ""},
-		{"ClientTrace.TLSHandshakeDone", Field, 8, ""},
-		{"ClientTrace.TLSHandshakeStart", Field, 8, ""},
-		{"ClientTrace.Wait100Continue", Field, 7, ""},
-		{"ClientTrace.WroteHeaderField", Field, 11, ""},
-		{"ClientTrace.WroteHeaders", Field, 7, ""},
-		{"ClientTrace.WroteRequest", Field, 7, ""},
-		{"ContextClientTrace", Func, 7, "func(ctx context.Context) *ClientTrace"},
-		{"DNSDoneInfo", Type, 7, ""},
-		{"DNSDoneInfo.Addrs", Field, 7, ""},
-		{"DNSDoneInfo.Coalesced", Field, 7, ""},
-		{"DNSDoneInfo.Err", Field, 7, ""},
-		{"DNSStartInfo", Type, 7, ""},
-		{"DNSStartInfo.Host", Field, 7, ""},
-		{"GotConnInfo", Type, 7, ""},
-		{"GotConnInfo.Conn", Field, 7, ""},
-		{"GotConnInfo.IdleTime", Field, 7, ""},
-		{"GotConnInfo.Reused", Field, 7, ""},
-		{"GotConnInfo.WasIdle", Field, 7, ""},
-		{"WithClientTrace", Func, 7, "func(ctx context.Context, trace *ClientTrace) context.Context"},
-		{"WroteRequestInfo", Type, 7, ""},
-		{"WroteRequestInfo.Err", Field, 7, ""},
-	},
-	"net/http/httputil": {
-		{"(*ClientConn).Close", Method, 0, ""},
-		{"(*ClientConn).Do", Method, 0, ""},
-		{"(*ClientConn).Hijack", Method, 0, ""},
-		{"(*ClientConn).Pending", Method, 0, ""},
-		{"(*ClientConn).Read", Method, 0, ""},
-		{"(*ClientConn).Write", Method, 0, ""},
-		{"(*ProxyRequest).SetURL", Method, 20, ""},
-		{"(*ProxyRequest).SetXForwarded", Method, 20, ""},
-		{"(*ReverseProxy).ServeHTTP", Method, 0, ""},
-		{"(*ServerConn).Close", Method, 0, ""},
-		{"(*ServerConn).Hijack", Method, 0, ""},
-		{"(*ServerConn).Pending", Method, 0, ""},
-		{"(*ServerConn).Read", Method, 0, ""},
-		{"(*ServerConn).Write", Method, 0, ""},
-		{"BufferPool", Type, 6, ""},
-		{"ClientConn", Type, 0, ""},
-		{"DumpRequest", Func, 0, "func(req *http.Request, body bool) ([]byte, error)"},
-		{"DumpRequestOut", Func, 0, "func(req *http.Request, body bool) ([]byte, error)"},
-		{"DumpResponse", Func, 0, "func(resp *http.Response, body bool) ([]byte, error)"},
-		{"ErrClosed", Var, 0, ""},
-		{"ErrLineTooLong", Var, 0, ""},
-		{"ErrPersistEOF", Var, 0, ""},
-		{"ErrPipeline", Var, 0, ""},
-		{"NewChunkedReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"NewChunkedWriter", Func, 0, "func(w io.Writer) io.WriteCloser"},
-		{"NewClientConn", Func, 0, "func(c net.Conn, r *bufio.Reader) *ClientConn"},
-		{"NewProxyClientConn", Func, 0, "func(c net.Conn, r *bufio.Reader) *ClientConn"},
-		{"NewServerConn", Func, 0, "func(c net.Conn, r *bufio.Reader) *ServerConn"},
-		{"NewSingleHostReverseProxy", Func, 0, "func(target *url.URL) *ReverseProxy"},
-		{"ProxyRequest", Type, 20, ""},
-		{"ProxyRequest.In", Field, 20, ""},
-		{"ProxyRequest.Out", Field, 20, ""},
-		{"ReverseProxy", Type, 0, ""},
-		{"ReverseProxy.BufferPool", Field, 6, ""},
-		{"ReverseProxy.Director", Field, 0, ""},
-		{"ReverseProxy.ErrorHandler", Field, 11, ""},
-		{"ReverseProxy.ErrorLog", Field, 4, ""},
-		{"ReverseProxy.FlushInterval", Field, 0, ""},
-		{"ReverseProxy.ModifyResponse", Field, 8, ""},
-		{"ReverseProxy.Rewrite", Field, 20, ""},
-		{"ReverseProxy.Transport", Field, 0, ""},
-		{"ServerConn", Type, 0, ""},
-	},
-	"net/http/pprof": {
-		{"Cmdline", Func, 0, "func(w http.ResponseWriter, r *http.Request)"},
-		{"Handler", Func, 0, "func(name string) http.Handler"},
-		{"Index", Func, 0, "func(w http.ResponseWriter, r *http.Request)"},
-		{"Profile", Func, 0, "func(w http.ResponseWriter, r *http.Request)"},
-		{"Symbol", Func, 0, "func(w http.ResponseWriter, r *http.Request)"},
-		{"Trace", Func, 5, "func(w http.ResponseWriter, r *http.Request)"},
-	},
-	"net/mail": {
-		{"(*Address).String", Method, 0, ""},
-		{"(*AddressParser).Parse", Method, 5, ""},
-		{"(*AddressParser).ParseList", Method, 5, ""},
-		{"(Header).AddressList", Method, 0, ""},
-		{"(Header).Date", Method, 0, ""},
-		{"(Header).Get", Method, 0, ""},
-		{"Address", Type, 0, ""},
-		{"Address.Address", Field, 0, ""},
-		{"Address.Name", Field, 0, ""},
-		{"AddressParser", Type, 5, ""},
-		{"AddressParser.WordDecoder", Field, 5, ""},
-		{"ErrHeaderNotPresent", Var, 0, ""},
-		{"Header", Type, 0, ""},
-		{"Message", Type, 0, ""},
-		{"Message.Body", Field, 0, ""},
-		{"Message.Header", Field, 0, ""},
-		{"ParseAddress", Func, 1, "func(address string) (*Address, error)"},
-		{"ParseAddressList", Func, 1, "func(list string) ([]*Address, error)"},
-		{"ParseDate", Func, 8, "func(date string) (time.Time, error)"},
-		{"ReadMessage", Func, 0, "func(r io.Reader) (msg *Message, err error)"},
-	},
-	"net/netip": {
-		{"(*Addr).UnmarshalBinary", Method, 18, ""},
-		{"(*Addr).UnmarshalText", Method, 18, ""},
-		{"(*AddrPort).UnmarshalBinary", Method, 18, ""},
-		{"(*AddrPort).UnmarshalText", Method, 18, ""},
-		{"(*Prefix).UnmarshalBinary", Method, 18, ""},
-		{"(*Prefix).UnmarshalText", Method, 18, ""},
-		{"(Addr).AppendBinary", Method, 24, ""},
-		{"(Addr).AppendText", Method, 24, ""},
-		{"(Addr).AppendTo", Method, 18, ""},
-		{"(Addr).As16", Method, 18, ""},
-		{"(Addr).As4", Method, 18, ""},
-		{"(Addr).AsSlice", Method, 18, ""},
-		{"(Addr).BitLen", Method, 18, ""},
-		{"(Addr).Compare", Method, 18, ""},
-		{"(Addr).Is4", Method, 18, ""},
-		{"(Addr).Is4In6", Method, 18, ""},
-		{"(Addr).Is6", Method, 18, ""},
-		{"(Addr).IsGlobalUnicast", Method, 18, ""},
-		{"(Addr).IsInterfaceLocalMulticast", Method, 18, ""},
-		{"(Addr).IsLinkLocalMulticast", Method, 18, ""},
-		{"(Addr).IsLinkLocalUnicast", Method, 18, ""},
-		{"(Addr).IsLoopback", Method, 18, ""},
-		{"(Addr).IsMulticast", Method, 18, ""},
-		{"(Addr).IsPrivate", Method, 18, ""},
-		{"(Addr).IsUnspecified", Method, 18, ""},
-		{"(Addr).IsValid", Method, 18, ""},
-		{"(Addr).Less", Method, 18, ""},
-		{"(Addr).MarshalBinary", Method, 18, ""},
-		{"(Addr).MarshalText", Method, 18, ""},
-		{"(Addr).Next", Method, 18, ""},
-		{"(Addr).Prefix", Method, 18, ""},
-		{"(Addr).Prev", Method, 18, ""},
-		{"(Addr).String", Method, 18, ""},
-		{"(Addr).StringExpanded", Method, 18, ""},
-		{"(Addr).Unmap", Method, 18, ""},
-		{"(Addr).WithZone", Method, 18, ""},
-		{"(Addr).Zone", Method, 18, ""},
-		{"(AddrPort).Addr", Method, 18, ""},
-		{"(AddrPort).AppendBinary", Method, 24, ""},
-		{"(AddrPort).AppendText", Method, 24, ""},
-		{"(AddrPort).AppendTo", Method, 18, ""},
-		{"(AddrPort).Compare", Method, 22, ""},
-		{"(AddrPort).IsValid", Method, 18, ""},
-		{"(AddrPort).MarshalBinary", Method, 18, ""},
-		{"(AddrPort).MarshalText", Method, 18, ""},
-		{"(AddrPort).Port", Method, 18, ""},
-		{"(AddrPort).String", Method, 18, ""},
-		{"(Prefix).Addr", Method, 18, ""},
-		{"(Prefix).AppendBinary", Method, 24, ""},
-		{"(Prefix).AppendText", Method, 24, ""},
-		{"(Prefix).AppendTo", Method, 18, ""},
-		{"(Prefix).Bits", Method, 18, ""},
-		{"(Prefix).Contains", Method, 18, ""},
-		{"(Prefix).IsSingleIP", Method, 18, ""},
-		{"(Prefix).IsValid", Method, 18, ""},
-		{"(Prefix).MarshalBinary", Method, 18, ""},
-		{"(Prefix).MarshalText", Method, 18, ""},
-		{"(Prefix).Masked", Method, 18, ""},
-		{"(Prefix).Overlaps", Method, 18, ""},
-		{"(Prefix).String", Method, 18, ""},
-		{"Addr", Type, 18, ""},
-		{"AddrFrom16", Func, 18, "func(addr [16]byte) Addr"},
-		{"AddrFrom4", Func, 18, "func(addr [4]byte) Addr"},
-		{"AddrFromSlice", Func, 18, "func(slice []byte) (ip Addr, ok bool)"},
-		{"AddrPort", Type, 18, ""},
-		{"AddrPortFrom", Func, 18, "func(ip Addr, port uint16) AddrPort"},
-		{"IPv4Unspecified", Func, 18, "func() Addr"},
-		{"IPv6LinkLocalAllNodes", Func, 18, "func() Addr"},
-		{"IPv6LinkLocalAllRouters", Func, 20, "func() Addr"},
-		{"IPv6Loopback", Func, 20, "func() Addr"},
-		{"IPv6Unspecified", Func, 18, "func() Addr"},
-		{"MustParseAddr", Func, 18, "func(s string) Addr"},
-		{"MustParseAddrPort", Func, 18, "func(s string) AddrPort"},
-		{"MustParsePrefix", Func, 18, "func(s string) Prefix"},
-		{"ParseAddr", Func, 18, "func(s string) (Addr, error)"},
-		{"ParseAddrPort", Func, 18, "func(s string) (AddrPort, error)"},
-		{"ParsePrefix", Func, 18, "func(s string) (Prefix, error)"},
-		{"Prefix", Type, 18, ""},
-		{"PrefixFrom", Func, 18, "func(ip Addr, bits int) Prefix"},
-	},
-	"net/rpc": {
-		{"(*Client).Call", Method, 0, ""},
-		{"(*Client).Close", Method, 0, ""},
-		{"(*Client).Go", Method, 0, ""},
-		{"(*Server).Accept", Method, 0, ""},
-		{"(*Server).HandleHTTP", Method, 0, ""},
-		{"(*Server).Register", Method, 0, ""},
-		{"(*Server).RegisterName", Method, 0, ""},
-		{"(*Server).ServeCodec", Method, 0, ""},
-		{"(*Server).ServeConn", Method, 0, ""},
-		{"(*Server).ServeHTTP", Method, 0, ""},
-		{"(*Server).ServeRequest", Method, 0, ""},
-		{"(ServerError).Error", Method, 0, ""},
-		{"Accept", Func, 0, "func(lis net.Listener)"},
-		{"Call", Type, 0, ""},
-		{"Call.Args", Field, 0, ""},
-		{"Call.Done", Field, 0, ""},
-		{"Call.Error", Field, 0, ""},
-		{"Call.Reply", Field, 0, ""},
-		{"Call.ServiceMethod", Field, 0, ""},
-		{"Client", Type, 0, ""},
-		{"ClientCodec", Type, 0, ""},
-		{"DefaultDebugPath", Const, 0, ""},
-		{"DefaultRPCPath", Const, 0, ""},
-		{"DefaultServer", Var, 0, ""},
-		{"Dial", Func, 0, "func(network string, address string) (*Client, error)"},
-		{"DialHTTP", Func, 0, "func(network string, address string) (*Client, error)"},
-		{"DialHTTPPath", Func, 0, "func(network string, address string, path string) (*Client, error)"},
-		{"ErrShutdown", Var, 0, ""},
-		{"HandleHTTP", Func, 0, "func()"},
-		{"NewClient", Func, 0, "func(conn io.ReadWriteCloser) *Client"},
-		{"NewClientWithCodec", Func, 0, "func(codec ClientCodec) *Client"},
-		{"NewServer", Func, 0, "func() *Server"},
-		{"Register", Func, 0, "func(rcvr any) error"},
-		{"RegisterName", Func, 0, "func(name string, rcvr any) error"},
-		{"Request", Type, 0, ""},
-		{"Request.Seq", Field, 0, ""},
-		{"Request.ServiceMethod", Field, 0, ""},
-		{"Response", Type, 0, ""},
-		{"Response.Error", Field, 0, ""},
-		{"Response.Seq", Field, 0, ""},
-		{"Response.ServiceMethod", Field, 0, ""},
-		{"ServeCodec", Func, 0, "func(codec ServerCodec)"},
-		{"ServeConn", Func, 0, "func(conn io.ReadWriteCloser)"},
-		{"ServeRequest", Func, 0, "func(codec ServerCodec) error"},
-		{"Server", Type, 0, ""},
-		{"ServerCodec", Type, 0, ""},
-		{"ServerError", Type, 0, ""},
-	},
-	"net/rpc/jsonrpc": {
-		{"Dial", Func, 0, "func(network string, address string) (*rpc.Client, error)"},
-		{"NewClient", Func, 0, "func(conn io.ReadWriteCloser) *rpc.Client"},
-		{"NewClientCodec", Func, 0, "func(conn io.ReadWriteCloser) rpc.ClientCodec"},
-		{"NewServerCodec", Func, 0, "func(conn io.ReadWriteCloser) rpc.ServerCodec"},
-		{"ServeConn", Func, 0, "func(conn io.ReadWriteCloser)"},
-	},
-	"net/smtp": {
-		{"(*Client).Auth", Method, 0, ""},
-		{"(*Client).Close", Method, 2, ""},
-		{"(*Client).Data", Method, 0, ""},
-		{"(*Client).Extension", Method, 0, ""},
-		{"(*Client).Hello", Method, 1, ""},
-		{"(*Client).Mail", Method, 0, ""},
-		{"(*Client).Noop", Method, 10, ""},
-		{"(*Client).Quit", Method, 0, ""},
-		{"(*Client).Rcpt", Method, 0, ""},
-		{"(*Client).Reset", Method, 0, ""},
-		{"(*Client).StartTLS", Method, 0, ""},
-		{"(*Client).TLSConnectionState", Method, 5, ""},
-		{"(*Client).Verify", Method, 0, ""},
-		{"Auth", Type, 0, ""},
-		{"CRAMMD5Auth", Func, 0, "func(username string, secret string) Auth"},
-		{"Client", Type, 0, ""},
-		{"Client.Text", Field, 0, ""},
-		{"Dial", Func, 0, "func(addr string) (*Client, error)"},
-		{"NewClient", Func, 0, "func(conn net.Conn, host string) (*Client, error)"},
-		{"PlainAuth", Func, 0, "func(identity string, username string, password string, host string) Auth"},
-		{"SendMail", Func, 0, "func(addr string, a Auth, from string, to []string, msg []byte) error"},
-		{"ServerInfo", Type, 0, ""},
-		{"ServerInfo.Auth", Field, 0, ""},
-		{"ServerInfo.Name", Field, 0, ""},
-		{"ServerInfo.TLS", Field, 0, ""},
-	},
-	"net/textproto": {
-		{"(*Conn).Close", Method, 0, ""},
-		{"(*Conn).Cmd", Method, 0, ""},
-		{"(*Conn).DotReader", Method, 0, ""},
-		{"(*Conn).DotWriter", Method, 0, ""},
-		{"(*Conn).EndRequest", Method, 0, ""},
-		{"(*Conn).EndResponse", Method, 0, ""},
-		{"(*Conn).Next", Method, 0, ""},
-		{"(*Conn).PrintfLine", Method, 0, ""},
-		{"(*Conn).ReadCodeLine", Method, 0, ""},
-		{"(*Conn).ReadContinuedLine", Method, 0, ""},
-		{"(*Conn).ReadContinuedLineBytes", Method, 0, ""},
-		{"(*Conn).ReadDotBytes", Method, 0, ""},
-		{"(*Conn).ReadDotLines", Method, 0, ""},
-		{"(*Conn).ReadLine", Method, 0, ""},
-		{"(*Conn).ReadLineBytes", Method, 0, ""},
-		{"(*Conn).ReadMIMEHeader", Method, 0, ""},
-		{"(*Conn).ReadResponse", Method, 0, ""},
-		{"(*Conn).StartRequest", Method, 0, ""},
-		{"(*Conn).StartResponse", Method, 0, ""},
-		{"(*Error).Error", Method, 0, ""},
-		{"(*Pipeline).EndRequest", Method, 0, ""},
-		{"(*Pipeline).EndResponse", Method, 0, ""},
-		{"(*Pipeline).Next", Method, 0, ""},
-		{"(*Pipeline).StartRequest", Method, 0, ""},
-		{"(*Pipeline).StartResponse", Method, 0, ""},
-		{"(*Reader).DotReader", Method, 0, ""},
-		{"(*Reader).ReadCodeLine", Method, 0, ""},
-		{"(*Reader).ReadContinuedLine", Method, 0, ""},
-		{"(*Reader).ReadContinuedLineBytes", Method, 0, ""},
-		{"(*Reader).ReadDotBytes", Method, 0, ""},
-		{"(*Reader).ReadDotLines", Method, 0, ""},
-		{"(*Reader).ReadLine", Method, 0, ""},
-		{"(*Reader).ReadLineBytes", Method, 0, ""},
-		{"(*Reader).ReadMIMEHeader", Method, 0, ""},
-		{"(*Reader).ReadResponse", Method, 0, ""},
-		{"(*Writer).DotWriter", Method, 0, ""},
-		{"(*Writer).PrintfLine", Method, 0, ""},
-		{"(MIMEHeader).Add", Method, 0, ""},
-		{"(MIMEHeader).Del", Method, 0, ""},
-		{"(MIMEHeader).Get", Method, 0, ""},
-		{"(MIMEHeader).Set", Method, 0, ""},
-		{"(MIMEHeader).Values", Method, 14, ""},
-		{"(ProtocolError).Error", Method, 0, ""},
-		{"CanonicalMIMEHeaderKey", Func, 0, "func(s string) string"},
-		{"Conn", Type, 0, ""},
-		{"Conn.Pipeline", Field, 0, ""},
-		{"Conn.Reader", Field, 0, ""},
-		{"Conn.Writer", Field, 0, ""},
-		{"Dial", Func, 0, "func(network string, addr string) (*Conn, error)"},
-		{"Error", Type, 0, ""},
-		{"Error.Code", Field, 0, ""},
-		{"Error.Msg", Field, 0, ""},
-		{"MIMEHeader", Type, 0, ""},
-		{"NewConn", Func, 0, "func(conn io.ReadWriteCloser) *Conn"},
-		{"NewReader", Func, 0, "func(r *bufio.Reader) *Reader"},
-		{"NewWriter", Func, 0, "func(w *bufio.Writer) *Writer"},
-		{"Pipeline", Type, 0, ""},
-		{"ProtocolError", Type, 0, ""},
-		{"Reader", Type, 0, ""},
-		{"Reader.R", Field, 0, ""},
-		{"TrimBytes", Func, 1, "func(b []byte) []byte"},
-		{"TrimString", Func, 1, "func(s string) string"},
-		{"Writer", Type, 0, ""},
-		{"Writer.W", Field, 0, ""},
-	},
-	"net/url": {
-		{"(*Error).Error", Method, 0, ""},
-		{"(*Error).Temporary", Method, 6, ""},
-		{"(*Error).Timeout", Method, 6, ""},
-		{"(*Error).Unwrap", Method, 13, ""},
-		{"(*URL).AppendBinary", Method, 24, ""},
-		{"(*URL).EscapedFragment", Method, 15, ""},
-		{"(*URL).EscapedPath", Method, 5, ""},
-		{"(*URL).Hostname", Method, 8, ""},
-		{"(*URL).IsAbs", Method, 0, ""},
-		{"(*URL).JoinPath", Method, 19, ""},
-		{"(*URL).MarshalBinary", Method, 8, ""},
-		{"(*URL).Parse", Method, 0, ""},
-		{"(*URL).Port", Method, 8, ""},
-		{"(*URL).Query", Method, 0, ""},
-		{"(*URL).Redacted", Method, 15, ""},
-		{"(*URL).RequestURI", Method, 0, ""},
-		{"(*URL).ResolveReference", Method, 0, ""},
-		{"(*URL).String", Method, 0, ""},
-		{"(*URL).UnmarshalBinary", Method, 8, ""},
-		{"(*Userinfo).Password", Method, 0, ""},
-		{"(*Userinfo).String", Method, 0, ""},
-		{"(*Userinfo).Username", Method, 0, ""},
-		{"(EscapeError).Error", Method, 0, ""},
-		{"(InvalidHostError).Error", Method, 6, ""},
-		{"(Values).Add", Method, 0, ""},
-		{"(Values).Del", Method, 0, ""},
-		{"(Values).Encode", Method, 0, ""},
-		{"(Values).Get", Method, 0, ""},
-		{"(Values).Has", Method, 17, ""},
-		{"(Values).Set", Method, 0, ""},
-		{"Error", Type, 0, ""},
-		{"Error.Err", Field, 0, ""},
-		{"Error.Op", Field, 0, ""},
-		{"Error.URL", Field, 0, ""},
-		{"EscapeError", Type, 0, ""},
-		{"InvalidHostError", Type, 6, ""},
-		{"JoinPath", Func, 19, "func(base string, elem ...string) (result string, err error)"},
-		{"Parse", Func, 0, "func(rawURL string) (*URL, error)"},
-		{"ParseQuery", Func, 0, "func(query string) (Values, error)"},
-		{"ParseRequestURI", Func, 0, "func(rawURL string) (*URL, error)"},
-		{"PathEscape", Func, 8, "func(s string) string"},
-		{"PathUnescape", Func, 8, "func(s string) (string, error)"},
-		{"QueryEscape", Func, 0, "func(s string) string"},
-		{"QueryUnescape", Func, 0, "func(s string) (string, error)"},
-		{"URL", Type, 0, ""},
-		{"URL.ForceQuery", Field, 7, ""},
-		{"URL.Fragment", Field, 0, ""},
-		{"URL.Host", Field, 0, ""},
-		{"URL.OmitHost", Field, 19, ""},
-		{"URL.Opaque", Field, 0, ""},
-		{"URL.Path", Field, 0, ""},
-		{"URL.RawFragment", Field, 15, ""},
-		{"URL.RawPath", Field, 5, ""},
-		{"URL.RawQuery", Field, 0, ""},
-		{"URL.Scheme", Field, 0, ""},
-		{"URL.User", Field, 0, ""},
-		{"User", Func, 0, "func(username string) *Userinfo"},
-		{"UserPassword", Func, 0, "func(username string, password string) *Userinfo"},
-		{"Userinfo", Type, 0, ""},
-		{"Values", Type, 0, ""},
-	},
-	"os": {
-		{"(*File).Chdir", Method, 0, ""},
-		{"(*File).Chmod", Method, 0, ""},
-		{"(*File).Chown", Method, 0, ""},
-		{"(*File).Close", Method, 0, ""},
-		{"(*File).Fd", Method, 0, ""},
-		{"(*File).Name", Method, 0, ""},
-		{"(*File).Read", Method, 0, ""},
-		{"(*File).ReadAt", Method, 0, ""},
-		{"(*File).ReadDir", Method, 16, ""},
-		{"(*File).ReadFrom", Method, 15, ""},
-		{"(*File).Readdir", Method, 0, ""},
-		{"(*File).Readdirnames", Method, 0, ""},
-		{"(*File).Seek", Method, 0, ""},
-		{"(*File).SetDeadline", Method, 10, ""},
-		{"(*File).SetReadDeadline", Method, 10, ""},
-		{"(*File).SetWriteDeadline", Method, 10, ""},
-		{"(*File).Stat", Method, 0, ""},
-		{"(*File).Sync", Method, 0, ""},
-		{"(*File).SyscallConn", Method, 12, ""},
-		{"(*File).Truncate", Method, 0, ""},
-		{"(*File).Write", Method, 0, ""},
-		{"(*File).WriteAt", Method, 0, ""},
-		{"(*File).WriteString", Method, 0, ""},
-		{"(*File).WriteTo", Method, 22, ""},
-		{"(*LinkError).Error", Method, 0, ""},
-		{"(*LinkError).Unwrap", Method, 13, ""},
-		{"(*PathError).Error", Method, 0, ""},
-		{"(*PathError).Timeout", Method, 10, ""},
-		{"(*PathError).Unwrap", Method, 13, ""},
-		{"(*Process).Kill", Method, 0, ""},
-		{"(*Process).Release", Method, 0, ""},
-		{"(*Process).Signal", Method, 0, ""},
-		{"(*Process).Wait", Method, 0, ""},
-		{"(*ProcessState).ExitCode", Method, 12, ""},
-		{"(*ProcessState).Exited", Method, 0, ""},
-		{"(*ProcessState).Pid", Method, 0, ""},
-		{"(*ProcessState).String", Method, 0, ""},
-		{"(*ProcessState).Success", Method, 0, ""},
-		{"(*ProcessState).Sys", Method, 0, ""},
-		{"(*ProcessState).SysUsage", Method, 0, ""},
-		{"(*ProcessState).SystemTime", Method, 0, ""},
-		{"(*ProcessState).UserTime", Method, 0, ""},
-		{"(*Root).Chmod", Method, 25, ""},
-		{"(*Root).Chown", Method, 25, ""},
-		{"(*Root).Chtimes", Method, 25, ""},
-		{"(*Root).Close", Method, 24, ""},
-		{"(*Root).Create", Method, 24, ""},
-		{"(*Root).FS", Method, 24, ""},
-		{"(*Root).Lchown", Method, 25, ""},
-		{"(*Root).Link", Method, 25, ""},
-		{"(*Root).Lstat", Method, 24, ""},
-		{"(*Root).Mkdir", Method, 24, ""},
-		{"(*Root).Name", Method, 24, ""},
-		{"(*Root).Open", Method, 24, ""},
-		{"(*Root).OpenFile", Method, 24, ""},
-		{"(*Root).OpenRoot", Method, 24, ""},
-		{"(*Root).Readlink", Method, 25, ""},
-		{"(*Root).Remove", Method, 24, ""},
-		{"(*Root).Rename", Method, 25, ""},
-		{"(*Root).Stat", Method, 24, ""},
-		{"(*Root).Symlink", Method, 25, ""},
-		{"(*SyscallError).Error", Method, 0, ""},
-		{"(*SyscallError).Timeout", Method, 10, ""},
-		{"(*SyscallError).Unwrap", Method, 13, ""},
-		{"(FileMode).IsDir", Method, 0, ""},
-		{"(FileMode).IsRegular", Method, 1, ""},
-		{"(FileMode).Perm", Method, 0, ""},
-		{"(FileMode).String", Method, 0, ""},
-		{"Args", Var, 0, ""},
-		{"Chdir", Func, 0, "func(dir string) error"},
-		{"Chmod", Func, 0, "func(name string, mode FileMode) error"},
-		{"Chown", Func, 0, "func(name string, uid int, gid int) error"},
-		{"Chtimes", Func, 0, "func(name string, atime time.Time, mtime time.Time) error"},
-		{"Clearenv", Func, 0, "func()"},
-		{"CopyFS", Func, 23, "func(dir string, fsys fs.FS) error"},
-		{"Create", Func, 0, "func(name string) (*File, error)"},
-		{"CreateTemp", Func, 16, "func(dir string, pattern string) (*File, error)"},
-		{"DevNull", Const, 0, ""},
-		{"DirEntry", Type, 16, ""},
-		{"DirFS", Func, 16, "func(dir string) fs.FS"},
-		{"Environ", Func, 0, "func() []string"},
-		{"ErrClosed", Var, 8, ""},
-		{"ErrDeadlineExceeded", Var, 15, ""},
-		{"ErrExist", Var, 0, ""},
-		{"ErrInvalid", Var, 0, ""},
-		{"ErrNoDeadline", Var, 10, ""},
-		{"ErrNotExist", Var, 0, ""},
-		{"ErrPermission", Var, 0, ""},
-		{"ErrProcessDone", Var, 16, ""},
-		{"Executable", Func, 8, "func() (string, error)"},
-		{"Exit", Func, 0, "func(code int)"},
-		{"Expand", Func, 0, "func(s string, mapping func(string) string) string"},
-		{"ExpandEnv", Func, 0, "func(s string) string"},
-		{"File", Type, 0, ""},
-		{"FileInfo", Type, 0, ""},
-		{"FileMode", Type, 0, ""},
-		{"FindProcess", Func, 0, "func(pid int) (*Process, error)"},
-		{"Getegid", Func, 0, "func() int"},
-		{"Getenv", Func, 0, "func(key string) string"},
-		{"Geteuid", Func, 0, "func() int"},
-		{"Getgid", Func, 0, "func() int"},
-		{"Getgroups", Func, 0, "func() ([]int, error)"},
-		{"Getpagesize", Func, 0, "func() int"},
-		{"Getpid", Func, 0, "func() int"},
-		{"Getppid", Func, 0, "func() int"},
-		{"Getuid", Func, 0, "func() int"},
-		{"Getwd", Func, 0, "func() (dir string, err error)"},
-		{"Hostname", Func, 0, "func() (name string, err error)"},
-		{"Interrupt", Var, 0, ""},
-		{"IsExist", Func, 0, "func(err error) bool"},
-		{"IsNotExist", Func, 0, "func(err error) bool"},
-		{"IsPathSeparator", Func, 0, "func(c uint8) bool"},
-		{"IsPermission", Func, 0, "func(err error) bool"},
-		{"IsTimeout", Func, 10, "func(err error) bool"},
-		{"Kill", Var, 0, ""},
-		{"Lchown", Func, 0, "func(name string, uid int, gid int) error"},
-		{"Link", Func, 0, "func(oldname string, newname string) error"},
-		{"LinkError", Type, 0, ""},
-		{"LinkError.Err", Field, 0, ""},
-		{"LinkError.New", Field, 0, ""},
-		{"LinkError.Old", Field, 0, ""},
-		{"LinkError.Op", Field, 0, ""},
-		{"LookupEnv", Func, 5, "func(key string) (string, bool)"},
-		{"Lstat", Func, 0, "func(name string) (FileInfo, error)"},
-		{"Mkdir", Func, 0, "func(name string, perm FileMode) error"},
-		{"MkdirAll", Func, 0, "func(path string, perm FileMode) error"},
-		{"MkdirTemp", Func, 16, "func(dir string, pattern string) (string, error)"},
-		{"ModeAppend", Const, 0, ""},
-		{"ModeCharDevice", Const, 0, ""},
-		{"ModeDevice", Const, 0, ""},
-		{"ModeDir", Const, 0, ""},
-		{"ModeExclusive", Const, 0, ""},
-		{"ModeIrregular", Const, 11, ""},
-		{"ModeNamedPipe", Const, 0, ""},
-		{"ModePerm", Const, 0, ""},
-		{"ModeSetgid", Const, 0, ""},
-		{"ModeSetuid", Const, 0, ""},
-		{"ModeSocket", Const, 0, ""},
-		{"ModeSticky", Const, 0, ""},
-		{"ModeSymlink", Const, 0, ""},
-		{"ModeTemporary", Const, 0, ""},
-		{"ModeType", Const, 0, ""},
-		{"NewFile", Func, 0, "func(fd uintptr, name string) *File"},
-		{"NewSyscallError", Func, 0, "func(syscall string, err error) error"},
-		{"O_APPEND", Const, 0, ""},
-		{"O_CREATE", Const, 0, ""},
-		{"O_EXCL", Const, 0, ""},
-		{"O_RDONLY", Const, 0, ""},
-		{"O_RDWR", Const, 0, ""},
-		{"O_SYNC", Const, 0, ""},
-		{"O_TRUNC", Const, 0, ""},
-		{"O_WRONLY", Const, 0, ""},
-		{"Open", Func, 0, "func(name string) (*File, error)"},
-		{"OpenFile", Func, 0, "func(name string, flag int, perm FileMode) (*File, error)"},
-		{"OpenInRoot", Func, 24, "func(dir string, name string) (*File, error)"},
-		{"OpenRoot", Func, 24, "func(name string) (*Root, error)"},
-		{"PathError", Type, 0, ""},
-		{"PathError.Err", Field, 0, ""},
-		{"PathError.Op", Field, 0, ""},
-		{"PathError.Path", Field, 0, ""},
-		{"PathListSeparator", Const, 0, ""},
-		{"PathSeparator", Const, 0, ""},
-		{"Pipe", Func, 0, "func() (r *File, w *File, err error)"},
-		{"ProcAttr", Type, 0, ""},
-		{"ProcAttr.Dir", Field, 0, ""},
-		{"ProcAttr.Env", Field, 0, ""},
-		{"ProcAttr.Files", Field, 0, ""},
-		{"ProcAttr.Sys", Field, 0, ""},
-		{"Process", Type, 0, ""},
-		{"Process.Pid", Field, 0, ""},
-		{"ProcessState", Type, 0, ""},
-		{"ReadDir", Func, 16, "func(name string) ([]DirEntry, error)"},
-		{"ReadFile", Func, 16, "func(name string) ([]byte, error)"},
-		{"Readlink", Func, 0, "func(name string) (string, error)"},
-		{"Remove", Func, 0, "func(name string) error"},
-		{"RemoveAll", Func, 0, "func(path string) error"},
-		{"Rename", Func, 0, "func(oldpath string, newpath string) error"},
-		{"Root", Type, 24, ""},
-		{"SEEK_CUR", Const, 0, ""},
-		{"SEEK_END", Const, 0, ""},
-		{"SEEK_SET", Const, 0, ""},
-		{"SameFile", Func, 0, "func(fi1 FileInfo, fi2 FileInfo) bool"},
-		{"Setenv", Func, 0, "func(key string, value string) error"},
-		{"Signal", Type, 0, ""},
-		{"StartProcess", Func, 0, "func(name string, argv []string, attr *ProcAttr) (*Process, error)"},
-		{"Stat", Func, 0, "func(name string) (FileInfo, error)"},
-		{"Stderr", Var, 0, ""},
-		{"Stdin", Var, 0, ""},
-		{"Stdout", Var, 0, ""},
-		{"Symlink", Func, 0, "func(oldname string, newname string) error"},
-		{"SyscallError", Type, 0, ""},
-		{"SyscallError.Err", Field, 0, ""},
-		{"SyscallError.Syscall", Field, 0, ""},
-		{"TempDir", Func, 0, "func() string"},
-		{"Truncate", Func, 0, "func(name string, size int64) error"},
-		{"Unsetenv", Func, 4, "func(key string) error"},
-		{"UserCacheDir", Func, 11, "func() (string, error)"},
-		{"UserConfigDir", Func, 13, "func() (string, error)"},
-		{"UserHomeDir", Func, 12, "func() (string, error)"},
-		{"WriteFile", Func, 16, "func(name string, data []byte, perm FileMode) error"},
-	},
-	"os/exec": {
-		{"(*Cmd).CombinedOutput", Method, 0, ""},
-		{"(*Cmd).Environ", Method, 19, ""},
-		{"(*Cmd).Output", Method, 0, ""},
-		{"(*Cmd).Run", Method, 0, ""},
-		{"(*Cmd).Start", Method, 0, ""},
-		{"(*Cmd).StderrPipe", Method, 0, ""},
-		{"(*Cmd).StdinPipe", Method, 0, ""},
-		{"(*Cmd).StdoutPipe", Method, 0, ""},
-		{"(*Cmd).String", Method, 13, ""},
-		{"(*Cmd).Wait", Method, 0, ""},
-		{"(*Error).Error", Method, 0, ""},
-		{"(*Error).Unwrap", Method, 13, ""},
-		{"(*ExitError).Error", Method, 0, ""},
-		{"(ExitError).ExitCode", Method, 12, ""},
-		{"(ExitError).Exited", Method, 0, ""},
-		{"(ExitError).Pid", Method, 0, ""},
-		{"(ExitError).String", Method, 0, ""},
-		{"(ExitError).Success", Method, 0, ""},
-		{"(ExitError).Sys", Method, 0, ""},
-		{"(ExitError).SysUsage", Method, 0, ""},
-		{"(ExitError).SystemTime", Method, 0, ""},
-		{"(ExitError).UserTime", Method, 0, ""},
-		{"Cmd", Type, 0, ""},
-		{"Cmd.Args", Field, 0, ""},
-		{"Cmd.Cancel", Field, 20, ""},
-		{"Cmd.Dir", Field, 0, ""},
-		{"Cmd.Env", Field, 0, ""},
-		{"Cmd.Err", Field, 19, ""},
-		{"Cmd.ExtraFiles", Field, 0, ""},
-		{"Cmd.Path", Field, 0, ""},
-		{"Cmd.Process", Field, 0, ""},
-		{"Cmd.ProcessState", Field, 0, ""},
-		{"Cmd.Stderr", Field, 0, ""},
-		{"Cmd.Stdin", Field, 0, ""},
-		{"Cmd.Stdout", Field, 0, ""},
-		{"Cmd.SysProcAttr", Field, 0, ""},
-		{"Cmd.WaitDelay", Field, 20, ""},
-		{"Command", Func, 0, "func(name string, arg ...string) *Cmd"},
-		{"CommandContext", Func, 7, "func(ctx context.Context, name string, arg ...string) *Cmd"},
-		{"ErrDot", Var, 19, ""},
-		{"ErrNotFound", Var, 0, ""},
-		{"ErrWaitDelay", Var, 20, ""},
-		{"Error", Type, 0, ""},
-		{"Error.Err", Field, 0, ""},
-		{"Error.Name", Field, 0, ""},
-		{"ExitError", Type, 0, ""},
-		{"ExitError.ProcessState", Field, 0, ""},
-		{"ExitError.Stderr", Field, 6, ""},
-		{"LookPath", Func, 0, "func(file string) (string, error)"},
-	},
-	"os/signal": {
-		{"Ignore", Func, 5, "func(sig ...os.Signal)"},
-		{"Ignored", Func, 11, "func(sig os.Signal) bool"},
-		{"Notify", Func, 0, "func(c chan<- os.Signal, sig ...os.Signal)"},
-		{"NotifyContext", Func, 16, "func(parent context.Context, signals ...os.Signal) (ctx context.Context, stop context.CancelFunc)"},
-		{"Reset", Func, 5, "func(sig ...os.Signal)"},
-		{"Stop", Func, 1, "func(c chan<- os.Signal)"},
-	},
-	"os/user": {
-		{"(*User).GroupIds", Method, 7, ""},
-		{"(UnknownGroupError).Error", Method, 7, ""},
-		{"(UnknownGroupIdError).Error", Method, 7, ""},
-		{"(UnknownUserError).Error", Method, 0, ""},
-		{"(UnknownUserIdError).Error", Method, 0, ""},
-		{"Current", Func, 0, "func() (*User, error)"},
-		{"Group", Type, 7, ""},
-		{"Group.Gid", Field, 7, ""},
-		{"Group.Name", Field, 7, ""},
-		{"Lookup", Func, 0, "func(username string) (*User, error)"},
-		{"LookupGroup", Func, 7, "func(name string) (*Group, error)"},
-		{"LookupGroupId", Func, 7, "func(gid string) (*Group, error)"},
-		{"LookupId", Func, 0, "func(uid string) (*User, error)"},
-		{"UnknownGroupError", Type, 7, ""},
-		{"UnknownGroupIdError", Type, 7, ""},
-		{"UnknownUserError", Type, 0, ""},
-		{"UnknownUserIdError", Type, 0, ""},
-		{"User", Type, 0, ""},
-		{"User.Gid", Field, 0, ""},
-		{"User.HomeDir", Field, 0, ""},
-		{"User.Name", Field, 0, ""},
-		{"User.Uid", Field, 0, ""},
-		{"User.Username", Field, 0, ""},
-	},
-	"path": {
-		{"Base", Func, 0, "func(path string) string"},
-		{"Clean", Func, 0, "func(path string) string"},
-		{"Dir", Func, 0, "func(path string) string"},
-		{"ErrBadPattern", Var, 0, ""},
-		{"Ext", Func, 0, "func(path string) string"},
-		{"IsAbs", Func, 0, "func(path string) bool"},
-		{"Join", Func, 0, "func(elem ...string) string"},
-		{"Match", Func, 0, "func(pattern string, name string) (matched bool, err error)"},
-		{"Split", Func, 0, "func(path string) (dir string, file string)"},
-	},
-	"path/filepath": {
-		{"Abs", Func, 0, "func(path string) (string, error)"},
-		{"Base", Func, 0, "func(path string) string"},
-		{"Clean", Func, 0, "func(path string) string"},
-		{"Dir", Func, 0, "func(path string) string"},
-		{"ErrBadPattern", Var, 0, ""},
-		{"EvalSymlinks", Func, 0, "func(path string) (string, error)"},
-		{"Ext", Func, 0, "func(path string) string"},
-		{"FromSlash", Func, 0, "func(path string) string"},
-		{"Glob", Func, 0, "func(pattern string) (matches []string, err error)"},
-		{"HasPrefix", Func, 0, "func(p string, prefix string) bool"},
-		{"IsAbs", Func, 0, "func(path string) bool"},
-		{"IsLocal", Func, 20, "func(path string) bool"},
-		{"Join", Func, 0, "func(elem ...string) string"},
-		{"ListSeparator", Const, 0, ""},
-		{"Localize", Func, 23, "func(path string) (string, error)"},
-		{"Match", Func, 0, "func(pattern string, name string) (matched bool, err error)"},
-		{"Rel", Func, 0, "func(basepath string, targpath string) (string, error)"},
-		{"Separator", Const, 0, ""},
-		{"SkipAll", Var, 20, ""},
-		{"SkipDir", Var, 0, ""},
-		{"Split", Func, 0, "func(path string) (dir string, file string)"},
-		{"SplitList", Func, 0, "func(path string) []string"},
-		{"ToSlash", Func, 0, "func(path string) string"},
-		{"VolumeName", Func, 0, "func(path string) string"},
-		{"Walk", Func, 0, "func(root string, fn WalkFunc) error"},
-		{"WalkDir", Func, 16, "func(root string, fn fs.WalkDirFunc) error"},
-		{"WalkFunc", Type, 0, ""},
-	},
-	"plugin": {
-		{"(*Plugin).Lookup", Method, 8, ""},
-		{"Open", Func, 8, "func(path string) (*Plugin, error)"},
-		{"Plugin", Type, 8, ""},
-		{"Symbol", Type, 8, ""},
-	},
-	"reflect": {
-		{"(*MapIter).Key", Method, 12, ""},
-		{"(*MapIter).Next", Method, 12, ""},
-		{"(*MapIter).Reset", Method, 18, ""},
-		{"(*MapIter).Value", Method, 12, ""},
-		{"(*ValueError).Error", Method, 0, ""},
-		{"(ChanDir).String", Method, 0, ""},
-		{"(Kind).String", Method, 0, ""},
-		{"(Method).IsExported", Method, 17, ""},
-		{"(StructField).IsExported", Method, 17, ""},
-		{"(StructTag).Get", Method, 0, ""},
-		{"(StructTag).Lookup", Method, 7, ""},
-		{"(Value).Addr", Method, 0, ""},
-		{"(Value).Bool", Method, 0, ""},
-		{"(Value).Bytes", Method, 0, ""},
-		{"(Value).Call", Method, 0, ""},
-		{"(Value).CallSlice", Method, 0, ""},
-		{"(Value).CanAddr", Method, 0, ""},
-		{"(Value).CanComplex", Method, 18, ""},
-		{"(Value).CanConvert", Method, 17, ""},
-		{"(Value).CanFloat", Method, 18, ""},
-		{"(Value).CanInt", Method, 18, ""},
-		{"(Value).CanInterface", Method, 0, ""},
-		{"(Value).CanSet", Method, 0, ""},
-		{"(Value).CanUint", Method, 18, ""},
-		{"(Value).Cap", Method, 0, ""},
-		{"(Value).Clear", Method, 21, ""},
-		{"(Value).Close", Method, 0, ""},
-		{"(Value).Comparable", Method, 20, ""},
-		{"(Value).Complex", Method, 0, ""},
-		{"(Value).Convert", Method, 1, ""},
-		{"(Value).Elem", Method, 0, ""},
-		{"(Value).Equal", Method, 20, ""},
-		{"(Value).Field", Method, 0, ""},
-		{"(Value).FieldByIndex", Method, 0, ""},
-		{"(Value).FieldByIndexErr", Method, 18, ""},
-		{"(Value).FieldByName", Method, 0, ""},
-		{"(Value).FieldByNameFunc", Method, 0, ""},
-		{"(Value).Float", Method, 0, ""},
-		{"(Value).Grow", Method, 20, ""},
-		{"(Value).Index", Method, 0, ""},
-		{"(Value).Int", Method, 0, ""},
-		{"(Value).Interface", Method, 0, ""},
-		{"(Value).InterfaceData", Method, 0, ""},
-		{"(Value).IsNil", Method, 0, ""},
-		{"(Value).IsValid", Method, 0, ""},
-		{"(Value).IsZero", Method, 13, ""},
-		{"(Value).Kind", Method, 0, ""},
-		{"(Value).Len", Method, 0, ""},
-		{"(Value).MapIndex", Method, 0, ""},
-		{"(Value).MapKeys", Method, 0, ""},
-		{"(Value).MapRange", Method, 12, ""},
-		{"(Value).Method", Method, 0, ""},
-		{"(Value).MethodByName", Method, 0, ""},
-		{"(Value).NumField", Method, 0, ""},
-		{"(Value).NumMethod", Method, 0, ""},
-		{"(Value).OverflowComplex", Method, 0, ""},
-		{"(Value).OverflowFloat", Method, 0, ""},
-		{"(Value).OverflowInt", Method, 0, ""},
-		{"(Value).OverflowUint", Method, 0, ""},
-		{"(Value).Pointer", Method, 0, ""},
-		{"(Value).Recv", Method, 0, ""},
-		{"(Value).Send", Method, 0, ""},
-		{"(Value).Seq", Method, 23, ""},
-		{"(Value).Seq2", Method, 23, ""},
-		{"(Value).Set", Method, 0, ""},
-		{"(Value).SetBool", Method, 0, ""},
-		{"(Value).SetBytes", Method, 0, ""},
-		{"(Value).SetCap", Method, 2, ""},
-		{"(Value).SetComplex", Method, 0, ""},
-		{"(Value).SetFloat", Method, 0, ""},
-		{"(Value).SetInt", Method, 0, ""},
-		{"(Value).SetIterKey", Method, 18, ""},
-		{"(Value).SetIterValue", Method, 18, ""},
-		{"(Value).SetLen", Method, 0, ""},
-		{"(Value).SetMapIndex", Method, 0, ""},
-		{"(Value).SetPointer", Method, 0, ""},
-		{"(Value).SetString", Method, 0, ""},
-		{"(Value).SetUint", Method, 0, ""},
-		{"(Value).SetZero", Method, 20, ""},
-		{"(Value).Slice", Method, 0, ""},
-		{"(Value).Slice3", Method, 2, ""},
-		{"(Value).String", Method, 0, ""},
-		{"(Value).TryRecv", Method, 0, ""},
-		{"(Value).TrySend", Method, 0, ""},
-		{"(Value).Type", Method, 0, ""},
-		{"(Value).Uint", Method, 0, ""},
-		{"(Value).UnsafeAddr", Method, 0, ""},
-		{"(Value).UnsafePointer", Method, 18, ""},
-		{"Append", Func, 0, "func(s Value, x ...Value) Value"},
-		{"AppendSlice", Func, 0, "func(s Value, t Value) Value"},
-		{"Array", Const, 0, ""},
-		{"ArrayOf", Func, 5, "func(length int, elem Type) Type"},
-		{"Bool", Const, 0, ""},
-		{"BothDir", Const, 0, ""},
-		{"Chan", Const, 0, ""},
-		{"ChanDir", Type, 0, ""},
-		{"ChanOf", Func, 1, "func(dir ChanDir, t Type) Type"},
-		{"Complex128", Const, 0, ""},
-		{"Complex64", Const, 0, ""},
-		{"Copy", Func, 0, "func(dst Value, src Value) int"},
-		{"DeepEqual", Func, 0, "func(x any, y any) bool"},
-		{"Float32", Const, 0, ""},
-		{"Float64", Const, 0, ""},
-		{"Func", Const, 0, ""},
-		{"FuncOf", Func, 5, "func(in []Type, out []Type, variadic bool) Type"},
-		{"Indirect", Func, 0, "func(v Value) Value"},
-		{"Int", Const, 0, ""},
-		{"Int16", Const, 0, ""},
-		{"Int32", Const, 0, ""},
-		{"Int64", Const, 0, ""},
-		{"Int8", Const, 0, ""},
-		{"Interface", Const, 0, ""},
-		{"Invalid", Const, 0, ""},
-		{"Kind", Type, 0, ""},
-		{"MakeChan", Func, 0, "func(typ Type, buffer int) Value"},
-		{"MakeFunc", Func, 1, "func(typ Type, fn func(args []Value) (results []Value)) Value"},
-		{"MakeMap", Func, 0, "func(typ Type) Value"},
-		{"MakeMapWithSize", Func, 9, "func(typ Type, n int) Value"},
-		{"MakeSlice", Func, 0, "func(typ Type, len int, cap int) Value"},
-		{"Map", Const, 0, ""},
-		{"MapIter", Type, 12, ""},
-		{"MapOf", Func, 1, "func(key Type, elem Type) Type"},
-		{"Method", Type, 0, ""},
-		{"Method.Func", Field, 0, ""},
-		{"Method.Index", Field, 0, ""},
-		{"Method.Name", Field, 0, ""},
-		{"Method.PkgPath", Field, 0, ""},
-		{"Method.Type", Field, 0, ""},
-		{"New", Func, 0, "func(typ Type) Value"},
-		{"NewAt", Func, 0, "func(typ Type, p unsafe.Pointer) Value"},
-		{"Pointer", Const, 18, ""},
-		{"PointerTo", Func, 18, "func(t Type) Type"},
-		{"Ptr", Const, 0, ""},
-		{"PtrTo", Func, 0, "func(t Type) Type"},
-		{"RecvDir", Const, 0, ""},
-		{"Select", Func, 1, "func(cases []SelectCase) (chosen int, recv Value, recvOK bool)"},
-		{"SelectCase", Type, 1, ""},
-		{"SelectCase.Chan", Field, 1, ""},
-		{"SelectCase.Dir", Field, 1, ""},
-		{"SelectCase.Send", Field, 1, ""},
-		{"SelectDefault", Const, 1, ""},
-		{"SelectDir", Type, 1, ""},
-		{"SelectRecv", Const, 1, ""},
-		{"SelectSend", Const, 1, ""},
-		{"SendDir", Const, 0, ""},
-		{"Slice", Const, 0, ""},
-		{"SliceAt", Func, 23, "func(typ Type, p unsafe.Pointer, n int) Value"},
-		{"SliceHeader", Type, 0, ""},
-		{"SliceHeader.Cap", Field, 0, ""},
-		{"SliceHeader.Data", Field, 0, ""},
-		{"SliceHeader.Len", Field, 0, ""},
-		{"SliceOf", Func, 1, "func(t Type) Type"},
-		{"String", Const, 0, ""},
-		{"StringHeader", Type, 0, ""},
-		{"StringHeader.Data", Field, 0, ""},
-		{"StringHeader.Len", Field, 0, ""},
-		{"Struct", Const, 0, ""},
-		{"StructField", Type, 0, ""},
-		{"StructField.Anonymous", Field, 0, ""},
-		{"StructField.Index", Field, 0, ""},
-		{"StructField.Name", Field, 0, ""},
-		{"StructField.Offset", Field, 0, ""},
-		{"StructField.PkgPath", Field, 0, ""},
-		{"StructField.Tag", Field, 0, ""},
-		{"StructField.Type", Field, 0, ""},
-		{"StructOf", Func, 7, "func(fields []StructField) Type"},
-		{"StructTag", Type, 0, ""},
-		{"Swapper", Func, 8, "func(slice any) func(i int, j int)"},
-		{"Type", Type, 0, ""},
-		{"TypeFor", Func, 22, "func[T any]() Type"},
-		{"TypeOf", Func, 0, "func(i any) Type"},
-		{"Uint", Const, 0, ""},
-		{"Uint16", Const, 0, ""},
-		{"Uint32", Const, 0, ""},
-		{"Uint64", Const, 0, ""},
-		{"Uint8", Const, 0, ""},
-		{"Uintptr", Const, 0, ""},
-		{"UnsafePointer", Const, 0, ""},
-		{"Value", Type, 0, ""},
-		{"ValueError", Type, 0, ""},
-		{"ValueError.Kind", Field, 0, ""},
-		{"ValueError.Method", Field, 0, ""},
-		{"ValueOf", Func, 0, "func(i any) Value"},
-		{"VisibleFields", Func, 17, "func(t Type) []StructField"},
-		{"Zero", Func, 0, "func(typ Type) Value"},
-	},
-	"regexp": {
-		{"(*Regexp).AppendText", Method, 24, ""},
-		{"(*Regexp).Copy", Method, 6, ""},
-		{"(*Regexp).Expand", Method, 0, ""},
-		{"(*Regexp).ExpandString", Method, 0, ""},
-		{"(*Regexp).Find", Method, 0, ""},
-		{"(*Regexp).FindAll", Method, 0, ""},
-		{"(*Regexp).FindAllIndex", Method, 0, ""},
-		{"(*Regexp).FindAllString", Method, 0, ""},
-		{"(*Regexp).FindAllStringIndex", Method, 0, ""},
-		{"(*Regexp).FindAllStringSubmatch", Method, 0, ""},
-		{"(*Regexp).FindAllStringSubmatchIndex", Method, 0, ""},
-		{"(*Regexp).FindAllSubmatch", Method, 0, ""},
-		{"(*Regexp).FindAllSubmatchIndex", Method, 0, ""},
-		{"(*Regexp).FindIndex", Method, 0, ""},
-		{"(*Regexp).FindReaderIndex", Method, 0, ""},
-		{"(*Regexp).FindReaderSubmatchIndex", Method, 0, ""},
-		{"(*Regexp).FindString", Method, 0, ""},
-		{"(*Regexp).FindStringIndex", Method, 0, ""},
-		{"(*Regexp).FindStringSubmatch", Method, 0, ""},
-		{"(*Regexp).FindStringSubmatchIndex", Method, 0, ""},
-		{"(*Regexp).FindSubmatch", Method, 0, ""},
-		{"(*Regexp).FindSubmatchIndex", Method, 0, ""},
-		{"(*Regexp).LiteralPrefix", Method, 0, ""},
-		{"(*Regexp).Longest", Method, 1, ""},
-		{"(*Regexp).MarshalText", Method, 21, ""},
-		{"(*Regexp).Match", Method, 0, ""},
-		{"(*Regexp).MatchReader", Method, 0, ""},
-		{"(*Regexp).MatchString", Method, 0, ""},
-		{"(*Regexp).NumSubexp", Method, 0, ""},
-		{"(*Regexp).ReplaceAll", Method, 0, ""},
-		{"(*Regexp).ReplaceAllFunc", Method, 0, ""},
-		{"(*Regexp).ReplaceAllLiteral", Method, 0, ""},
-		{"(*Regexp).ReplaceAllLiteralString", Method, 0, ""},
-		{"(*Regexp).ReplaceAllString", Method, 0, ""},
-		{"(*Regexp).ReplaceAllStringFunc", Method, 0, ""},
-		{"(*Regexp).Split", Method, 1, ""},
-		{"(*Regexp).String", Method, 0, ""},
-		{"(*Regexp).SubexpIndex", Method, 15, ""},
-		{"(*Regexp).SubexpNames", Method, 0, ""},
-		{"(*Regexp).UnmarshalText", Method, 21, ""},
-		{"Compile", Func, 0, "func(expr string) (*Regexp, error)"},
-		{"CompilePOSIX", Func, 0, "func(expr string) (*Regexp, error)"},
-		{"Match", Func, 0, "func(pattern string, b []byte) (matched bool, err error)"},
-		{"MatchReader", Func, 0, "func(pattern string, r io.RuneReader) (matched bool, err error)"},
-		{"MatchString", Func, 0, "func(pattern string, s string) (matched bool, err error)"},
-		{"MustCompile", Func, 0, "func(str string) *Regexp"},
-		{"MustCompilePOSIX", Func, 0, "func(str string) *Regexp"},
-		{"QuoteMeta", Func, 0, "func(s string) string"},
-		{"Regexp", Type, 0, ""},
-	},
-	"regexp/syntax": {
-		{"(*Error).Error", Method, 0, ""},
-		{"(*Inst).MatchEmptyWidth", Method, 0, ""},
-		{"(*Inst).MatchRune", Method, 0, ""},
-		{"(*Inst).MatchRunePos", Method, 3, ""},
-		{"(*Inst).String", Method, 0, ""},
-		{"(*Prog).Prefix", Method, 0, ""},
-		{"(*Prog).StartCond", Method, 0, ""},
-		{"(*Prog).String", Method, 0, ""},
-		{"(*Regexp).CapNames", Method, 0, ""},
-		{"(*Regexp).Equal", Method, 0, ""},
-		{"(*Regexp).MaxCap", Method, 0, ""},
-		{"(*Regexp).Simplify", Method, 0, ""},
-		{"(*Regexp).String", Method, 0, ""},
-		{"(ErrorCode).String", Method, 0, ""},
-		{"(InstOp).String", Method, 3, ""},
-		{"(Op).String", Method, 11, ""},
-		{"ClassNL", Const, 0, ""},
-		{"Compile", Func, 0, "func(re *Regexp) (*Prog, error)"},
-		{"DotNL", Const, 0, ""},
-		{"EmptyBeginLine", Const, 0, ""},
-		{"EmptyBeginText", Const, 0, ""},
-		{"EmptyEndLine", Const, 0, ""},
-		{"EmptyEndText", Const, 0, ""},
-		{"EmptyNoWordBoundary", Const, 0, ""},
-		{"EmptyOp", Type, 0, ""},
-		{"EmptyOpContext", Func, 0, "func(r1 rune, r2 rune) EmptyOp"},
-		{"EmptyWordBoundary", Const, 0, ""},
-		{"ErrInternalError", Const, 0, ""},
-		{"ErrInvalidCharClass", Const, 0, ""},
-		{"ErrInvalidCharRange", Const, 0, ""},
-		{"ErrInvalidEscape", Const, 0, ""},
-		{"ErrInvalidNamedCapture", Const, 0, ""},
-		{"ErrInvalidPerlOp", Const, 0, ""},
-		{"ErrInvalidRepeatOp", Const, 0, ""},
-		{"ErrInvalidRepeatSize", Const, 0, ""},
-		{"ErrInvalidUTF8", Const, 0, ""},
-		{"ErrLarge", Const, 20, ""},
-		{"ErrMissingBracket", Const, 0, ""},
-		{"ErrMissingParen", Const, 0, ""},
-		{"ErrMissingRepeatArgument", Const, 0, ""},
-		{"ErrNestingDepth", Const, 19, ""},
-		{"ErrTrailingBackslash", Const, 0, ""},
-		{"ErrUnexpectedParen", Const, 1, ""},
-		{"Error", Type, 0, ""},
-		{"Error.Code", Field, 0, ""},
-		{"Error.Expr", Field, 0, ""},
-		{"ErrorCode", Type, 0, ""},
-		{"Flags", Type, 0, ""},
-		{"FoldCase", Const, 0, ""},
-		{"Inst", Type, 0, ""},
-		{"Inst.Arg", Field, 0, ""},
-		{"Inst.Op", Field, 0, ""},
-		{"Inst.Out", Field, 0, ""},
-		{"Inst.Rune", Field, 0, ""},
-		{"InstAlt", Const, 0, ""},
-		{"InstAltMatch", Const, 0, ""},
-		{"InstCapture", Const, 0, ""},
-		{"InstEmptyWidth", Const, 0, ""},
-		{"InstFail", Const, 0, ""},
-		{"InstMatch", Const, 0, ""},
-		{"InstNop", Const, 0, ""},
-		{"InstOp", Type, 0, ""},
-		{"InstRune", Const, 0, ""},
-		{"InstRune1", Const, 0, ""},
-		{"InstRuneAny", Const, 0, ""},
-		{"InstRuneAnyNotNL", Const, 0, ""},
-		{"IsWordChar", Func, 0, "func(r rune) bool"},
-		{"Literal", Const, 0, ""},
-		{"MatchNL", Const, 0, ""},
-		{"NonGreedy", Const, 0, ""},
-		{"OneLine", Const, 0, ""},
-		{"Op", Type, 0, ""},
-		{"OpAlternate", Const, 0, ""},
-		{"OpAnyChar", Const, 0, ""},
-		{"OpAnyCharNotNL", Const, 0, ""},
-		{"OpBeginLine", Const, 0, ""},
-		{"OpBeginText", Const, 0, ""},
-		{"OpCapture", Const, 0, ""},
-		{"OpCharClass", Const, 0, ""},
-		{"OpConcat", Const, 0, ""},
-		{"OpEmptyMatch", Const, 0, ""},
-		{"OpEndLine", Const, 0, ""},
-		{"OpEndText", Const, 0, ""},
-		{"OpLiteral", Const, 0, ""},
-		{"OpNoMatch", Const, 0, ""},
-		{"OpNoWordBoundary", Const, 0, ""},
-		{"OpPlus", Const, 0, ""},
-		{"OpQuest", Const, 0, ""},
-		{"OpRepeat", Const, 0, ""},
-		{"OpStar", Const, 0, ""},
-		{"OpWordBoundary", Const, 0, ""},
-		{"POSIX", Const, 0, ""},
-		{"Parse", Func, 0, "func(s string, flags Flags) (*Regexp, error)"},
-		{"Perl", Const, 0, ""},
-		{"PerlX", Const, 0, ""},
-		{"Prog", Type, 0, ""},
-		{"Prog.Inst", Field, 0, ""},
-		{"Prog.NumCap", Field, 0, ""},
-		{"Prog.Start", Field, 0, ""},
-		{"Regexp", Type, 0, ""},
-		{"Regexp.Cap", Field, 0, ""},
-		{"Regexp.Flags", Field, 0, ""},
-		{"Regexp.Max", Field, 0, ""},
-		{"Regexp.Min", Field, 0, ""},
-		{"Regexp.Name", Field, 0, ""},
-		{"Regexp.Op", Field, 0, ""},
-		{"Regexp.Rune", Field, 0, ""},
-		{"Regexp.Rune0", Field, 0, ""},
-		{"Regexp.Sub", Field, 0, ""},
-		{"Regexp.Sub0", Field, 0, ""},
-		{"Simple", Const, 0, ""},
-		{"UnicodeGroups", Const, 0, ""},
-		{"WasDollar", Const, 0, ""},
-	},
-	"runtime": {
-		{"(*BlockProfileRecord).Stack", Method, 1, ""},
-		{"(*Frames).Next", Method, 7, ""},
-		{"(*Func).Entry", Method, 0, ""},
-		{"(*Func).FileLine", Method, 0, ""},
-		{"(*Func).Name", Method, 0, ""},
-		{"(*MemProfileRecord).InUseBytes", Method, 0, ""},
-		{"(*MemProfileRecord).InUseObjects", Method, 0, ""},
-		{"(*MemProfileRecord).Stack", Method, 0, ""},
-		{"(*PanicNilError).Error", Method, 21, ""},
-		{"(*PanicNilError).RuntimeError", Method, 21, ""},
-		{"(*Pinner).Pin", Method, 21, ""},
-		{"(*Pinner).Unpin", Method, 21, ""},
-		{"(*StackRecord).Stack", Method, 0, ""},
-		{"(*TypeAssertionError).Error", Method, 0, ""},
-		{"(*TypeAssertionError).RuntimeError", Method, 0, ""},
-		{"(Cleanup).Stop", Method, 24, ""},
-		{"AddCleanup", Func, 24, "func[T, S any](ptr *T, cleanup func(S), arg S) Cleanup"},
-		{"BlockProfile", Func, 1, "func(p []BlockProfileRecord) (n int, ok bool)"},
-		{"BlockProfileRecord", Type, 1, ""},
-		{"BlockProfileRecord.Count", Field, 1, ""},
-		{"BlockProfileRecord.Cycles", Field, 1, ""},
-		{"BlockProfileRecord.StackRecord", Field, 1, ""},
-		{"Breakpoint", Func, 0, "func()"},
-		{"CPUProfile", Func, 0, "func() []byte"},
-		{"Caller", Func, 0, "func(skip int) (pc uintptr, file string, line int, ok bool)"},
-		{"Callers", Func, 0, "func(skip int, pc []uintptr) int"},
-		{"CallersFrames", Func, 7, "func(callers []uintptr) *Frames"},
-		{"Cleanup", Type, 24, ""},
-		{"Compiler", Const, 0, ""},
-		{"Error", Type, 0, ""},
-		{"Frame", Type, 7, ""},
-		{"Frame.Entry", Field, 7, ""},
-		{"Frame.File", Field, 7, ""},
-		{"Frame.Func", Field, 7, ""},
-		{"Frame.Function", Field, 7, ""},
-		{"Frame.Line", Field, 7, ""},
-		{"Frame.PC", Field, 7, ""},
-		{"Frames", Type, 7, ""},
-		{"Func", Type, 0, ""},
-		{"FuncForPC", Func, 0, "func(pc uintptr) *Func"},
-		{"GC", Func, 0, "func()"},
-		{"GOARCH", Const, 0, ""},
-		{"GOMAXPROCS", Func, 0, "func(n int) int"},
-		{"GOOS", Const, 0, ""},
-		{"GOROOT", Func, 0, "func() string"},
-		{"Goexit", Func, 0, "func()"},
-		{"GoroutineProfile", Func, 0, "func(p []StackRecord) (n int, ok bool)"},
-		{"Gosched", Func, 0, "func()"},
-		{"KeepAlive", Func, 7, "func(x any)"},
-		{"LockOSThread", Func, 0, "func()"},
-		{"MemProfile", Func, 0, "func(p []MemProfileRecord, inuseZero bool) (n int, ok bool)"},
-		{"MemProfileRate", Var, 0, ""},
-		{"MemProfileRecord", Type, 0, ""},
-		{"MemProfileRecord.AllocBytes", Field, 0, ""},
-		{"MemProfileRecord.AllocObjects", Field, 0, ""},
-		{"MemProfileRecord.FreeBytes", Field, 0, ""},
-		{"MemProfileRecord.FreeObjects", Field, 0, ""},
-		{"MemProfileRecord.Stack0", Field, 0, ""},
-		{"MemStats", Type, 0, ""},
-		{"MemStats.Alloc", Field, 0, ""},
-		{"MemStats.BuckHashSys", Field, 0, ""},
-		{"MemStats.BySize", Field, 0, ""},
-		{"MemStats.DebugGC", Field, 0, ""},
-		{"MemStats.EnableGC", Field, 0, ""},
-		{"MemStats.Frees", Field, 0, ""},
-		{"MemStats.GCCPUFraction", Field, 5, ""},
-		{"MemStats.GCSys", Field, 2, ""},
-		{"MemStats.HeapAlloc", Field, 0, ""},
-		{"MemStats.HeapIdle", Field, 0, ""},
-		{"MemStats.HeapInuse", Field, 0, ""},
-		{"MemStats.HeapObjects", Field, 0, ""},
-		{"MemStats.HeapReleased", Field, 0, ""},
-		{"MemStats.HeapSys", Field, 0, ""},
-		{"MemStats.LastGC", Field, 0, ""},
-		{"MemStats.Lookups", Field, 0, ""},
-		{"MemStats.MCacheInuse", Field, 0, ""},
-		{"MemStats.MCacheSys", Field, 0, ""},
-		{"MemStats.MSpanInuse", Field, 0, ""},
-		{"MemStats.MSpanSys", Field, 0, ""},
-		{"MemStats.Mallocs", Field, 0, ""},
-		{"MemStats.NextGC", Field, 0, ""},
-		{"MemStats.NumForcedGC", Field, 8, ""},
-		{"MemStats.NumGC", Field, 0, ""},
-		{"MemStats.OtherSys", Field, 2, ""},
-		{"MemStats.PauseEnd", Field, 4, ""},
-		{"MemStats.PauseNs", Field, 0, ""},
-		{"MemStats.PauseTotalNs", Field, 0, ""},
-		{"MemStats.StackInuse", Field, 0, ""},
-		{"MemStats.StackSys", Field, 0, ""},
-		{"MemStats.Sys", Field, 0, ""},
-		{"MemStats.TotalAlloc", Field, 0, ""},
-		{"MutexProfile", Func, 8, "func(p []BlockProfileRecord) (n int, ok bool)"},
-		{"NumCPU", Func, 0, "func() int"},
-		{"NumCgoCall", Func, 0, "func() int64"},
-		{"NumGoroutine", Func, 0, "func() int"},
-		{"PanicNilError", Type, 21, ""},
-		{"Pinner", Type, 21, ""},
-		{"ReadMemStats", Func, 0, "func(m *MemStats)"},
-		{"ReadTrace", Func, 5, "func() []byte"},
-		{"SetBlockProfileRate", Func, 1, "func(rate int)"},
-		{"SetCPUProfileRate", Func, 0, "func(hz int)"},
-		{"SetCgoTraceback", Func, 7, "func(version int, traceback unsafe.Pointer, context unsafe.Pointer, symbolizer unsafe.Pointer)"},
-		{"SetFinalizer", Func, 0, "func(obj any, finalizer any)"},
-		{"SetMutexProfileFraction", Func, 8, "func(rate int) int"},
-		{"Stack", Func, 0, "func(buf []byte, all bool) int"},
-		{"StackRecord", Type, 0, ""},
-		{"StackRecord.Stack0", Field, 0, ""},
-		{"StartTrace", Func, 5, "func() error"},
-		{"StopTrace", Func, 5, "func()"},
-		{"ThreadCreateProfile", Func, 0, "func(p []StackRecord) (n int, ok bool)"},
-		{"TypeAssertionError", Type, 0, ""},
-		{"UnlockOSThread", Func, 0, "func()"},
-		{"Version", Func, 0, "func() string"},
-	},
-	"runtime/cgo": {
-		{"(Handle).Delete", Method, 17, ""},
-		{"(Handle).Value", Method, 17, ""},
-		{"Handle", Type, 17, ""},
-		{"Incomplete", Type, 20, ""},
-		{"NewHandle", Func, 17, ""},
-	},
-	"runtime/coverage": {
-		{"ClearCounters", Func, 20, "func() error"},
-		{"WriteCounters", Func, 20, "func(w io.Writer) error"},
-		{"WriteCountersDir", Func, 20, "func(dir string) error"},
-		{"WriteMeta", Func, 20, "func(w io.Writer) error"},
-		{"WriteMetaDir", Func, 20, "func(dir string) error"},
-	},
-	"runtime/debug": {
-		{"(*BuildInfo).String", Method, 18, ""},
-		{"BuildInfo", Type, 12, ""},
-		{"BuildInfo.Deps", Field, 12, ""},
-		{"BuildInfo.GoVersion", Field, 18, ""},
-		{"BuildInfo.Main", Field, 12, ""},
-		{"BuildInfo.Path", Field, 12, ""},
-		{"BuildInfo.Settings", Field, 18, ""},
-		{"BuildSetting", Type, 18, ""},
-		{"BuildSetting.Key", Field, 18, ""},
-		{"BuildSetting.Value", Field, 18, ""},
-		{"CrashOptions", Type, 23, ""},
-		{"FreeOSMemory", Func, 1, "func()"},
-		{"GCStats", Type, 1, ""},
-		{"GCStats.LastGC", Field, 1, ""},
-		{"GCStats.NumGC", Field, 1, ""},
-		{"GCStats.Pause", Field, 1, ""},
-		{"GCStats.PauseEnd", Field, 4, ""},
-		{"GCStats.PauseQuantiles", Field, 1, ""},
-		{"GCStats.PauseTotal", Field, 1, ""},
-		{"Module", Type, 12, ""},
-		{"Module.Path", Field, 12, ""},
-		{"Module.Replace", Field, 12, ""},
-		{"Module.Sum", Field, 12, ""},
-		{"Module.Version", Field, 12, ""},
-		{"ParseBuildInfo", Func, 18, "func(data string) (bi *BuildInfo, err error)"},
-		{"PrintStack", Func, 0, "func()"},
-		{"ReadBuildInfo", Func, 12, "func() (info *BuildInfo, ok bool)"},
-		{"ReadGCStats", Func, 1, "func(stats *GCStats)"},
-		{"SetCrashOutput", Func, 23, "func(f *os.File, opts CrashOptions) error"},
-		{"SetGCPercent", Func, 1, "func(percent int) int"},
-		{"SetMaxStack", Func, 2, "func(bytes int) int"},
-		{"SetMaxThreads", Func, 2, "func(threads int) int"},
-		{"SetMemoryLimit", Func, 19, "func(limit int64) int64"},
-		{"SetPanicOnFault", Func, 3, "func(enabled bool) bool"},
-		{"SetTraceback", Func, 6, "func(level string)"},
-		{"Stack", Func, 0, "func() []byte"},
-		{"WriteHeapDump", Func, 3, "func(fd uintptr)"},
-	},
-	"runtime/metrics": {
-		{"(Value).Float64", Method, 16, ""},
-		{"(Value).Float64Histogram", Method, 16, ""},
-		{"(Value).Kind", Method, 16, ""},
-		{"(Value).Uint64", Method, 16, ""},
-		{"All", Func, 16, "func() []Description"},
-		{"Description", Type, 16, ""},
-		{"Description.Cumulative", Field, 16, ""},
-		{"Description.Description", Field, 16, ""},
-		{"Description.Kind", Field, 16, ""},
-		{"Description.Name", Field, 16, ""},
-		{"Float64Histogram", Type, 16, ""},
-		{"Float64Histogram.Buckets", Field, 16, ""},
-		{"Float64Histogram.Counts", Field, 16, ""},
-		{"KindBad", Const, 16, ""},
-		{"KindFloat64", Const, 16, ""},
-		{"KindFloat64Histogram", Const, 16, ""},
-		{"KindUint64", Const, 16, ""},
-		{"Read", Func, 16, "func(m []Sample)"},
-		{"Sample", Type, 16, ""},
-		{"Sample.Name", Field, 16, ""},
-		{"Sample.Value", Field, 16, ""},
-		{"Value", Type, 16, ""},
-		{"ValueKind", Type, 16, ""},
-	},
-	"runtime/pprof": {
-		{"(*Profile).Add", Method, 0, ""},
-		{"(*Profile).Count", Method, 0, ""},
-		{"(*Profile).Name", Method, 0, ""},
-		{"(*Profile).Remove", Method, 0, ""},
-		{"(*Profile).WriteTo", Method, 0, ""},
-		{"Do", Func, 9, "func(ctx context.Context, labels LabelSet, f func(context.Context))"},
-		{"ForLabels", Func, 9, "func(ctx context.Context, f func(key string, value string) bool)"},
-		{"Label", Func, 9, "func(ctx context.Context, key string) (string, bool)"},
-		{"LabelSet", Type, 9, ""},
-		{"Labels", Func, 9, "func(args ...string) LabelSet"},
-		{"Lookup", Func, 0, "func(name string) *Profile"},
-		{"NewProfile", Func, 0, "func(name string) *Profile"},
-		{"Profile", Type, 0, ""},
-		{"Profiles", Func, 0, "func() []*Profile"},
-		{"SetGoroutineLabels", Func, 9, "func(ctx context.Context)"},
-		{"StartCPUProfile", Func, 0, "func(w io.Writer) error"},
-		{"StopCPUProfile", Func, 0, "func()"},
-		{"WithLabels", Func, 9, "func(ctx context.Context, labels LabelSet) context.Context"},
-		{"WriteHeapProfile", Func, 0, "func(w io.Writer) error"},
-	},
-	"runtime/trace": {
-		{"(*Region).End", Method, 11, ""},
-		{"(*Task).End", Method, 11, ""},
-		{"IsEnabled", Func, 11, "func() bool"},
-		{"Log", Func, 11, "func(ctx context.Context, category string, message string)"},
-		{"Logf", Func, 11, "func(ctx context.Context, category string, format string, args ...any)"},
-		{"NewTask", Func, 11, "func(pctx context.Context, taskType string) (ctx context.Context, task *Task)"},
-		{"Region", Type, 11, ""},
-		{"Start", Func, 5, "func(w io.Writer) error"},
-		{"StartRegion", Func, 11, "func(ctx context.Context, regionType string) *Region"},
-		{"Stop", Func, 5, "func()"},
-		{"Task", Type, 11, ""},
-		{"WithRegion", Func, 11, "func(ctx context.Context, regionType string, fn func())"},
-	},
-	"slices": {
-		{"All", Func, 23, "func[Slice ~[]E, E any](s Slice) iter.Seq2[int, E]"},
-		{"AppendSeq", Func, 23, "func[Slice ~[]E, E any](s Slice, seq iter.Seq[E]) Slice"},
-		{"Backward", Func, 23, "func[Slice ~[]E, E any](s Slice) iter.Seq2[int, E]"},
-		{"BinarySearch", Func, 21, "func[S ~[]E, E cmp.Ordered](x S, target E) (int, bool)"},
-		{"BinarySearchFunc", Func, 21, "func[S ~[]E, E, T any](x S, target T, cmp func(E, T) int) (int, bool)"},
-		{"Chunk", Func, 23, "func[Slice ~[]E, E any](s Slice, n int) iter.Seq[Slice]"},
-		{"Clip", Func, 21, "func[S ~[]E, E any](s S) S"},
-		{"Clone", Func, 21, "func[S ~[]E, E any](s S) S"},
-		{"Collect", Func, 23, "func[E any](seq iter.Seq[E]) []E"},
-		{"Compact", Func, 21, "func[S ~[]E, E comparable](s S) S"},
-		{"CompactFunc", Func, 21, "func[S ~[]E, E any](s S, eq func(E, E) bool) S"},
-		{"Compare", Func, 21, "func[S ~[]E, E cmp.Ordered](s1 S, s2 S) int"},
-		{"CompareFunc", Func, 21, "func[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, cmp func(E1, E2) int) int"},
-		{"Concat", Func, 22, "func[S ~[]E, E any](slices ...S) S"},
-		{"Contains", Func, 21, "func[S ~[]E, E comparable](s S, v E) bool"},
-		{"ContainsFunc", Func, 21, "func[S ~[]E, E any](s S, f func(E) bool) bool"},
-		{"Delete", Func, 21, "func[S ~[]E, E any](s S, i int, j int) S"},
-		{"DeleteFunc", Func, 21, "func[S ~[]E, E any](s S, del func(E) bool) S"},
-		{"Equal", Func, 21, "func[S ~[]E, E comparable](s1 S, s2 S) bool"},
-		{"EqualFunc", Func, 21, "func[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool"},
-		{"Grow", Func, 21, "func[S ~[]E, E any](s S, n int) S"},
-		{"Index", Func, 21, "func[S ~[]E, E comparable](s S, v E) int"},
-		{"IndexFunc", Func, 21, "func[S ~[]E, E any](s S, f func(E) bool) int"},
-		{"Insert", Func, 21, "func[S ~[]E, E any](s S, i int, v ...E) S"},
-		{"IsSorted", Func, 21, "func[S ~[]E, E cmp.Ordered](x S) bool"},
-		{"IsSortedFunc", Func, 21, "func[S ~[]E, E any](x S, cmp func(a E, b E) int) bool"},
-		{"Max", Func, 21, "func[S ~[]E, E cmp.Ordered](x S) E"},
-		{"MaxFunc", Func, 21, "func[S ~[]E, E any](x S, cmp func(a E, b E) int) E"},
-		{"Min", Func, 21, "func[S ~[]E, E cmp.Ordered](x S) E"},
-		{"MinFunc", Func, 21, "func[S ~[]E, E any](x S, cmp func(a E, b E) int) E"},
-		{"Repeat", Func, 23, "func[S ~[]E, E any](x S, count int) S"},
-		{"Replace", Func, 21, "func[S ~[]E, E any](s S, i int, j int, v ...E) S"},
-		{"Reverse", Func, 21, "func[S ~[]E, E any](s S)"},
-		{"Sort", Func, 21, "func[S ~[]E, E cmp.Ordered](x S)"},
-		{"SortFunc", Func, 21, "func[S ~[]E, E any](x S, cmp func(a E, b E) int)"},
-		{"SortStableFunc", Func, 21, "func[S ~[]E, E any](x S, cmp func(a E, b E) int)"},
-		{"Sorted", Func, 23, "func[E cmp.Ordered](seq iter.Seq[E]) []E"},
-		{"SortedFunc", Func, 23, "func[E any](seq iter.Seq[E], cmp func(E, E) int) []E"},
-		{"SortedStableFunc", Func, 23, "func[E any](seq iter.Seq[E], cmp func(E, E) int) []E"},
-		{"Values", Func, 23, "func[Slice ~[]E, E any](s Slice) iter.Seq[E]"},
-	},
-	"sort": {
-		{"(Float64Slice).Len", Method, 0, ""},
-		{"(Float64Slice).Less", Method, 0, ""},
-		{"(Float64Slice).Search", Method, 0, ""},
-		{"(Float64Slice).Sort", Method, 0, ""},
-		{"(Float64Slice).Swap", Method, 0, ""},
-		{"(IntSlice).Len", Method, 0, ""},
-		{"(IntSlice).Less", Method, 0, ""},
-		{"(IntSlice).Search", Method, 0, ""},
-		{"(IntSlice).Sort", Method, 0, ""},
-		{"(IntSlice).Swap", Method, 0, ""},
-		{"(StringSlice).Len", Method, 0, ""},
-		{"(StringSlice).Less", Method, 0, ""},
-		{"(StringSlice).Search", Method, 0, ""},
-		{"(StringSlice).Sort", Method, 0, ""},
-		{"(StringSlice).Swap", Method, 0, ""},
-		{"Find", Func, 19, "func(n int, cmp func(int) int) (i int, found bool)"},
-		{"Float64Slice", Type, 0, ""},
-		{"Float64s", Func, 0, "func(x []float64)"},
-		{"Float64sAreSorted", Func, 0, "func(x []float64) bool"},
-		{"IntSlice", Type, 0, ""},
-		{"Interface", Type, 0, ""},
-		{"Ints", Func, 0, "func(x []int)"},
-		{"IntsAreSorted", Func, 0, "func(x []int) bool"},
-		{"IsSorted", Func, 0, "func(data Interface) bool"},
-		{"Reverse", Func, 1, "func(data Interface) Interface"},
-		{"Search", Func, 0, "func(n int, f func(int) bool) int"},
-		{"SearchFloat64s", Func, 0, "func(a []float64, x float64) int"},
-		{"SearchInts", Func, 0, "func(a []int, x int) int"},
-		{"SearchStrings", Func, 0, "func(a []string, x string) int"},
-		{"Slice", Func, 8, "func(x any, less func(i int, j int) bool)"},
-		{"SliceIsSorted", Func, 8, "func(x any, less func(i int, j int) bool) bool"},
-		{"SliceStable", Func, 8, "func(x any, less func(i int, j int) bool)"},
-		{"Sort", Func, 0, "func(data Interface)"},
-		{"Stable", Func, 2, "func(data Interface)"},
-		{"StringSlice", Type, 0, ""},
-		{"Strings", Func, 0, "func(x []string)"},
-		{"StringsAreSorted", Func, 0, "func(x []string) bool"},
-	},
-	"strconv": {
-		{"(*NumError).Error", Method, 0, ""},
-		{"(*NumError).Unwrap", Method, 14, ""},
-		{"AppendBool", Func, 0, "func(dst []byte, b bool) []byte"},
-		{"AppendFloat", Func, 0, "func(dst []byte, f float64, fmt byte, prec int, bitSize int) []byte"},
-		{"AppendInt", Func, 0, "func(dst []byte, i int64, base int) []byte"},
-		{"AppendQuote", Func, 0, "func(dst []byte, s string) []byte"},
-		{"AppendQuoteRune", Func, 0, "func(dst []byte, r rune) []byte"},
-		{"AppendQuoteRuneToASCII", Func, 0, "func(dst []byte, r rune) []byte"},
-		{"AppendQuoteRuneToGraphic", Func, 6, "func(dst []byte, r rune) []byte"},
-		{"AppendQuoteToASCII", Func, 0, "func(dst []byte, s string) []byte"},
-		{"AppendQuoteToGraphic", Func, 6, "func(dst []byte, s string) []byte"},
-		{"AppendUint", Func, 0, "func(dst []byte, i uint64, base int) []byte"},
-		{"Atoi", Func, 0, "func(s string) (int, error)"},
-		{"CanBackquote", Func, 0, "func(s string) bool"},
-		{"ErrRange", Var, 0, ""},
-		{"ErrSyntax", Var, 0, ""},
-		{"FormatBool", Func, 0, "func(b bool) string"},
-		{"FormatComplex", Func, 15, "func(c complex128, fmt byte, prec int, bitSize int) string"},
-		{"FormatFloat", Func, 0, "func(f float64, fmt byte, prec int, bitSize int) string"},
-		{"FormatInt", Func, 0, "func(i int64, base int) string"},
-		{"FormatUint", Func, 0, "func(i uint64, base int) string"},
-		{"IntSize", Const, 0, ""},
-		{"IsGraphic", Func, 6, "func(r rune) bool"},
-		{"IsPrint", Func, 0, "func(r rune) bool"},
-		{"Itoa", Func, 0, "func(i int) string"},
-		{"NumError", Type, 0, ""},
-		{"NumError.Err", Field, 0, ""},
-		{"NumError.Func", Field, 0, ""},
-		{"NumError.Num", Field, 0, ""},
-		{"ParseBool", Func, 0, "func(str string) (bool, error)"},
-		{"ParseComplex", Func, 15, "func(s string, bitSize int) (complex128, error)"},
-		{"ParseFloat", Func, 0, "func(s string, bitSize int) (float64, error)"},
-		{"ParseInt", Func, 0, "func(s string, base int, bitSize int) (i int64, err error)"},
-		{"ParseUint", Func, 0, "func(s string, base int, bitSize int) (uint64, error)"},
-		{"Quote", Func, 0, "func(s string) string"},
-		{"QuoteRune", Func, 0, "func(r rune) string"},
-		{"QuoteRuneToASCII", Func, 0, "func(r rune) string"},
-		{"QuoteRuneToGraphic", Func, 6, "func(r rune) string"},
-		{"QuoteToASCII", Func, 0, "func(s string) string"},
-		{"QuoteToGraphic", Func, 6, "func(s string) string"},
-		{"QuotedPrefix", Func, 17, "func(s string) (string, error)"},
-		{"Unquote", Func, 0, "func(s string) (string, error)"},
-		{"UnquoteChar", Func, 0, "func(s string, quote byte) (value rune, multibyte bool, tail string, err error)"},
-	},
-	"strings": {
-		{"(*Builder).Cap", Method, 12, ""},
-		{"(*Builder).Grow", Method, 10, ""},
-		{"(*Builder).Len", Method, 10, ""},
-		{"(*Builder).Reset", Method, 10, ""},
-		{"(*Builder).String", Method, 10, ""},
-		{"(*Builder).Write", Method, 10, ""},
-		{"(*Builder).WriteByte", Method, 10, ""},
-		{"(*Builder).WriteRune", Method, 10, ""},
-		{"(*Builder).WriteString", Method, 10, ""},
-		{"(*Reader).Len", Method, 0, ""},
-		{"(*Reader).Read", Method, 0, ""},
-		{"(*Reader).ReadAt", Method, 0, ""},
-		{"(*Reader).ReadByte", Method, 0, ""},
-		{"(*Reader).ReadRune", Method, 0, ""},
-		{"(*Reader).Reset", Method, 7, ""},
-		{"(*Reader).Seek", Method, 0, ""},
-		{"(*Reader).Size", Method, 5, ""},
-		{"(*Reader).UnreadByte", Method, 0, ""},
-		{"(*Reader).UnreadRune", Method, 0, ""},
-		{"(*Reader).WriteTo", Method, 1, ""},
-		{"(*Replacer).Replace", Method, 0, ""},
-		{"(*Replacer).WriteString", Method, 0, ""},
-		{"Builder", Type, 10, ""},
-		{"Clone", Func, 18, "func(s string) string"},
-		{"Compare", Func, 5, "func(a string, b string) int"},
-		{"Contains", Func, 0, "func(s string, substr string) bool"},
-		{"ContainsAny", Func, 0, "func(s string, chars string) bool"},
-		{"ContainsFunc", Func, 21, "func(s string, f func(rune) bool) bool"},
-		{"ContainsRune", Func, 0, "func(s string, r rune) bool"},
-		{"Count", Func, 0, "func(s string, substr string) int"},
-		{"Cut", Func, 18, "func(s string, sep string) (before string, after string, found bool)"},
-		{"CutPrefix", Func, 20, "func(s string, prefix string) (after string, found bool)"},
-		{"CutSuffix", Func, 20, "func(s string, suffix string) (before string, found bool)"},
-		{"EqualFold", Func, 0, "func(s string, t string) bool"},
-		{"Fields", Func, 0, "func(s string) []string"},
-		{"FieldsFunc", Func, 0, "func(s string, f func(rune) bool) []string"},
-		{"FieldsFuncSeq", Func, 24, "func(s string, f func(rune) bool) iter.Seq[string]"},
-		{"FieldsSeq", Func, 24, "func(s string) iter.Seq[string]"},
-		{"HasPrefix", Func, 0, "func(s string, prefix string) bool"},
-		{"HasSuffix", Func, 0, "func(s string, suffix string) bool"},
-		{"Index", Func, 0, "func(s string, substr string) int"},
-		{"IndexAny", Func, 0, "func(s string, chars string) int"},
-		{"IndexByte", Func, 2, "func(s string, c byte) int"},
-		{"IndexFunc", Func, 0, "func(s string, f func(rune) bool) int"},
-		{"IndexRune", Func, 0, "func(s string, r rune) int"},
-		{"Join", Func, 0, "func(elems []string, sep string) string"},
-		{"LastIndex", Func, 0, "func(s string, substr string) int"},
-		{"LastIndexAny", Func, 0, "func(s string, chars string) int"},
-		{"LastIndexByte", Func, 5, "func(s string, c byte) int"},
-		{"LastIndexFunc", Func, 0, "func(s string, f func(rune) bool) int"},
-		{"Lines", Func, 24, "func(s string) iter.Seq[string]"},
-		{"Map", Func, 0, "func(mapping func(rune) rune, s string) string"},
-		{"NewReader", Func, 0, "func(s string) *Reader"},
-		{"NewReplacer", Func, 0, "func(oldnew ...string) *Replacer"},
-		{"Reader", Type, 0, ""},
-		{"Repeat", Func, 0, "func(s string, count int) string"},
-		{"Replace", Func, 0, "func(s string, old string, new string, n int) string"},
-		{"ReplaceAll", Func, 12, "func(s string, old string, new string) string"},
-		{"Replacer", Type, 0, ""},
-		{"Split", Func, 0, "func(s string, sep string) []string"},
-		{"SplitAfter", Func, 0, "func(s string, sep string) []string"},
-		{"SplitAfterN", Func, 0, "func(s string, sep string, n int) []string"},
-		{"SplitAfterSeq", Func, 24, "func(s string, sep string) iter.Seq[string]"},
-		{"SplitN", Func, 0, "func(s string, sep string, n int) []string"},
-		{"SplitSeq", Func, 24, "func(s string, sep string) iter.Seq[string]"},
-		{"Title", Func, 0, "func(s string) string"},
-		{"ToLower", Func, 0, "func(s string) string"},
-		{"ToLowerSpecial", Func, 0, "func(c unicode.SpecialCase, s string) string"},
-		{"ToTitle", Func, 0, "func(s string) string"},
-		{"ToTitleSpecial", Func, 0, "func(c unicode.SpecialCase, s string) string"},
-		{"ToUpper", Func, 0, "func(s string) string"},
-		{"ToUpperSpecial", Func, 0, "func(c unicode.SpecialCase, s string) string"},
-		{"ToValidUTF8", Func, 13, "func(s string, replacement string) string"},
-		{"Trim", Func, 0, "func(s string, cutset string) string"},
-		{"TrimFunc", Func, 0, "func(s string, f func(rune) bool) string"},
-		{"TrimLeft", Func, 0, "func(s string, cutset string) string"},
-		{"TrimLeftFunc", Func, 0, "func(s string, f func(rune) bool) string"},
-		{"TrimPrefix", Func, 1, "func(s string, prefix string) string"},
-		{"TrimRight", Func, 0, "func(s string, cutset string) string"},
-		{"TrimRightFunc", Func, 0, "func(s string, f func(rune) bool) string"},
-		{"TrimSpace", Func, 0, "func(s string) string"},
-		{"TrimSuffix", Func, 1, "func(s string, suffix string) string"},
-	},
-	"structs": {
-		{"HostLayout", Type, 23, ""},
-	},
-	"sync": {
-		{"(*Cond).Broadcast", Method, 0, ""},
-		{"(*Cond).Signal", Method, 0, ""},
-		{"(*Cond).Wait", Method, 0, ""},
-		{"(*Map).Clear", Method, 23, ""},
-		{"(*Map).CompareAndDelete", Method, 20, ""},
-		{"(*Map).CompareAndSwap", Method, 20, ""},
-		{"(*Map).Delete", Method, 9, ""},
-		{"(*Map).Load", Method, 9, ""},
-		{"(*Map).LoadAndDelete", Method, 15, ""},
-		{"(*Map).LoadOrStore", Method, 9, ""},
-		{"(*Map).Range", Method, 9, ""},
-		{"(*Map).Store", Method, 9, ""},
-		{"(*Map).Swap", Method, 20, ""},
-		{"(*Mutex).Lock", Method, 0, ""},
-		{"(*Mutex).TryLock", Method, 18, ""},
-		{"(*Mutex).Unlock", Method, 0, ""},
-		{"(*Once).Do", Method, 0, ""},
-		{"(*Pool).Get", Method, 3, ""},
-		{"(*Pool).Put", Method, 3, ""},
-		{"(*RWMutex).Lock", Method, 0, ""},
-		{"(*RWMutex).RLock", Method, 0, ""},
-		{"(*RWMutex).RLocker", Method, 0, ""},
-		{"(*RWMutex).RUnlock", Method, 0, ""},
-		{"(*RWMutex).TryLock", Method, 18, ""},
-		{"(*RWMutex).TryRLock", Method, 18, ""},
-		{"(*RWMutex).Unlock", Method, 0, ""},
-		{"(*WaitGroup).Add", Method, 0, ""},
-		{"(*WaitGroup).Done", Method, 0, ""},
-		{"(*WaitGroup).Go", Method, 25, ""},
-		{"(*WaitGroup).Wait", Method, 0, ""},
-		{"Cond", Type, 0, ""},
-		{"Cond.L", Field, 0, ""},
-		{"Locker", Type, 0, ""},
-		{"Map", Type, 9, ""},
-		{"Mutex", Type, 0, ""},
-		{"NewCond", Func, 0, "func(l Locker) *Cond"},
-		{"Once", Type, 0, ""},
-		{"OnceFunc", Func, 21, "func(f func()) func()"},
-		{"OnceValue", Func, 21, "func[T any](f func() T) func() T"},
-		{"OnceValues", Func, 21, "func[T1, T2 any](f func() (T1, T2)) func() (T1, T2)"},
-		{"Pool", Type, 3, ""},
-		{"Pool.New", Field, 3, ""},
-		{"RWMutex", Type, 0, ""},
-		{"WaitGroup", Type, 0, ""},
-	},
-	"sync/atomic": {
-		{"(*Bool).CompareAndSwap", Method, 19, ""},
-		{"(*Bool).Load", Method, 19, ""},
-		{"(*Bool).Store", Method, 19, ""},
-		{"(*Bool).Swap", Method, 19, ""},
-		{"(*Int32).Add", Method, 19, ""},
-		{"(*Int32).And", Method, 23, ""},
-		{"(*Int32).CompareAndSwap", Method, 19, ""},
-		{"(*Int32).Load", Method, 19, ""},
-		{"(*Int32).Or", Method, 23, ""},
-		{"(*Int32).Store", Method, 19, ""},
-		{"(*Int32).Swap", Method, 19, ""},
-		{"(*Int64).Add", Method, 19, ""},
-		{"(*Int64).And", Method, 23, ""},
-		{"(*Int64).CompareAndSwap", Method, 19, ""},
-		{"(*Int64).Load", Method, 19, ""},
-		{"(*Int64).Or", Method, 23, ""},
-		{"(*Int64).Store", Method, 19, ""},
-		{"(*Int64).Swap", Method, 19, ""},
-		{"(*Pointer).CompareAndSwap", Method, 19, ""},
-		{"(*Pointer).Load", Method, 19, ""},
-		{"(*Pointer).Store", Method, 19, ""},
-		{"(*Pointer).Swap", Method, 19, ""},
-		{"(*Uint32).Add", Method, 19, ""},
-		{"(*Uint32).And", Method, 23, ""},
-		{"(*Uint32).CompareAndSwap", Method, 19, ""},
-		{"(*Uint32).Load", Method, 19, ""},
-		{"(*Uint32).Or", Method, 23, ""},
-		{"(*Uint32).Store", Method, 19, ""},
-		{"(*Uint32).Swap", Method, 19, ""},
-		{"(*Uint64).Add", Method, 19, ""},
-		{"(*Uint64).And", Method, 23, ""},
-		{"(*Uint64).CompareAndSwap", Method, 19, ""},
-		{"(*Uint64).Load", Method, 19, ""},
-		{"(*Uint64).Or", Method, 23, ""},
-		{"(*Uint64).Store", Method, 19, ""},
-		{"(*Uint64).Swap", Method, 19, ""},
-		{"(*Uintptr).Add", Method, 19, ""},
-		{"(*Uintptr).And", Method, 23, ""},
-		{"(*Uintptr).CompareAndSwap", Method, 19, ""},
-		{"(*Uintptr).Load", Method, 19, ""},
-		{"(*Uintptr).Or", Method, 23, ""},
-		{"(*Uintptr).Store", Method, 19, ""},
-		{"(*Uintptr).Swap", Method, 19, ""},
-		{"(*Value).CompareAndSwap", Method, 17, ""},
-		{"(*Value).Load", Method, 4, ""},
-		{"(*Value).Store", Method, 4, ""},
-		{"(*Value).Swap", Method, 17, ""},
-		{"AddInt32", Func, 0, "func(addr *int32, delta int32) (new int32)"},
-		{"AddInt64", Func, 0, "func(addr *int64, delta int64) (new int64)"},
-		{"AddUint32", Func, 0, "func(addr *uint32, delta uint32) (new uint32)"},
-		{"AddUint64", Func, 0, "func(addr *uint64, delta uint64) (new uint64)"},
-		{"AddUintptr", Func, 0, "func(addr *uintptr, delta uintptr) (new uintptr)"},
-		{"AndInt32", Func, 23, "func(addr *int32, mask int32) (old int32)"},
-		{"AndInt64", Func, 23, "func(addr *int64, mask int64) (old int64)"},
-		{"AndUint32", Func, 23, "func(addr *uint32, mask uint32) (old uint32)"},
-		{"AndUint64", Func, 23, "func(addr *uint64, mask uint64) (old uint64)"},
-		{"AndUintptr", Func, 23, "func(addr *uintptr, mask uintptr) (old uintptr)"},
-		{"Bool", Type, 19, ""},
-		{"CompareAndSwapInt32", Func, 0, "func(addr *int32, old int32, new int32) (swapped bool)"},
-		{"CompareAndSwapInt64", Func, 0, "func(addr *int64, old int64, new int64) (swapped bool)"},
-		{"CompareAndSwapPointer", Func, 0, "func(addr *unsafe.Pointer, old unsafe.Pointer, new unsafe.Pointer) (swapped bool)"},
-		{"CompareAndSwapUint32", Func, 0, "func(addr *uint32, old uint32, new uint32) (swapped bool)"},
-		{"CompareAndSwapUint64", Func, 0, "func(addr *uint64, old uint64, new uint64) (swapped bool)"},
-		{"CompareAndSwapUintptr", Func, 0, "func(addr *uintptr, old uintptr, new uintptr) (swapped bool)"},
-		{"Int32", Type, 19, ""},
-		{"Int64", Type, 19, ""},
-		{"LoadInt32", Func, 0, "func(addr *int32) (val int32)"},
-		{"LoadInt64", Func, 0, "func(addr *int64) (val int64)"},
-		{"LoadPointer", Func, 0, "func(addr *unsafe.Pointer) (val unsafe.Pointer)"},
-		{"LoadUint32", Func, 0, "func(addr *uint32) (val uint32)"},
-		{"LoadUint64", Func, 0, "func(addr *uint64) (val uint64)"},
-		{"LoadUintptr", Func, 0, "func(addr *uintptr) (val uintptr)"},
-		{"OrInt32", Func, 23, "func(addr *int32, mask int32) (old int32)"},
-		{"OrInt64", Func, 23, "func(addr *int64, mask int64) (old int64)"},
-		{"OrUint32", Func, 23, "func(addr *uint32, mask uint32) (old uint32)"},
-		{"OrUint64", Func, 23, "func(addr *uint64, mask uint64) (old uint64)"},
-		{"OrUintptr", Func, 23, "func(addr *uintptr, mask uintptr) (old uintptr)"},
-		{"Pointer", Type, 19, ""},
-		{"StoreInt32", Func, 0, "func(addr *int32, val int32)"},
-		{"StoreInt64", Func, 0, "func(addr *int64, val int64)"},
-		{"StorePointer", Func, 0, "func(addr *unsafe.Pointer, val unsafe.Pointer)"},
-		{"StoreUint32", Func, 0, "func(addr *uint32, val uint32)"},
-		{"StoreUint64", Func, 0, "func(addr *uint64, val uint64)"},
-		{"StoreUintptr", Func, 0, "func(addr *uintptr, val uintptr)"},
-		{"SwapInt32", Func, 2, "func(addr *int32, new int32) (old int32)"},
-		{"SwapInt64", Func, 2, "func(addr *int64, new int64) (old int64)"},
-		{"SwapPointer", Func, 2, "func(addr *unsafe.Pointer, new unsafe.Pointer) (old unsafe.Pointer)"},
-		{"SwapUint32", Func, 2, "func(addr *uint32, new uint32) (old uint32)"},
-		{"SwapUint64", Func, 2, "func(addr *uint64, new uint64) (old uint64)"},
-		{"SwapUintptr", Func, 2, "func(addr *uintptr, new uintptr) (old uintptr)"},
-		{"Uint32", Type, 19, ""},
-		{"Uint64", Type, 19, ""},
-		{"Uintptr", Type, 19, ""},
-		{"Value", Type, 4, ""},
-	},
-	"syscall": {
-		{"(*Cmsghdr).SetLen", Method, 0, ""},
-		{"(*DLL).FindProc", Method, 0, ""},
-		{"(*DLL).MustFindProc", Method, 0, ""},
-		{"(*DLL).Release", Method, 0, ""},
-		{"(*DLLError).Error", Method, 0, ""},
-		{"(*DLLError).Unwrap", Method, 16, ""},
-		{"(*Filetime).Nanoseconds", Method, 0, ""},
-		{"(*Iovec).SetLen", Method, 0, ""},
-		{"(*LazyDLL).Handle", Method, 0, ""},
-		{"(*LazyDLL).Load", Method, 0, ""},
-		{"(*LazyDLL).NewProc", Method, 0, ""},
-		{"(*LazyProc).Addr", Method, 0, ""},
-		{"(*LazyProc).Call", Method, 0, ""},
-		{"(*LazyProc).Find", Method, 0, ""},
-		{"(*Msghdr).SetControllen", Method, 0, ""},
-		{"(*Proc).Addr", Method, 0, ""},
-		{"(*Proc).Call", Method, 0, ""},
-		{"(*PtraceRegs).PC", Method, 0, ""},
-		{"(*PtraceRegs).SetPC", Method, 0, ""},
-		{"(*RawSockaddrAny).Sockaddr", Method, 0, ""},
-		{"(*SID).Copy", Method, 0, ""},
-		{"(*SID).Len", Method, 0, ""},
-		{"(*SID).LookupAccount", Method, 0, ""},
-		{"(*SID).String", Method, 0, ""},
-		{"(*Timespec).Nano", Method, 0, ""},
-		{"(*Timespec).Unix", Method, 0, ""},
-		{"(*Timeval).Nano", Method, 0, ""},
-		{"(*Timeval).Nanoseconds", Method, 0, ""},
-		{"(*Timeval).Unix", Method, 0, ""},
-		{"(Errno).Error", Method, 0, ""},
-		{"(Errno).Is", Method, 13, ""},
-		{"(Errno).Temporary", Method, 0, ""},
-		{"(Errno).Timeout", Method, 0, ""},
-		{"(Signal).Signal", Method, 0, ""},
-		{"(Signal).String", Method, 0, ""},
-		{"(Token).Close", Method, 0, ""},
-		{"(Token).GetTokenPrimaryGroup", Method, 0, ""},
-		{"(Token).GetTokenUser", Method, 0, ""},
-		{"(Token).GetUserProfileDirectory", Method, 0, ""},
-		{"(WaitStatus).Continued", Method, 0, ""},
-		{"(WaitStatus).CoreDump", Method, 0, ""},
-		{"(WaitStatus).ExitStatus", Method, 0, ""},
-		{"(WaitStatus).Exited", Method, 0, ""},
-		{"(WaitStatus).Signal", Method, 0, ""},
-		{"(WaitStatus).Signaled", Method, 0, ""},
-		{"(WaitStatus).StopSignal", Method, 0, ""},
-		{"(WaitStatus).Stopped", Method, 0, ""},
-		{"(WaitStatus).TrapCause", Method, 0, ""},
-		{"AF_ALG", Const, 0, ""},
-		{"AF_APPLETALK", Const, 0, ""},
-		{"AF_ARP", Const, 0, ""},
-		{"AF_ASH", Const, 0, ""},
-		{"AF_ATM", Const, 0, ""},
-		{"AF_ATMPVC", Const, 0, ""},
-		{"AF_ATMSVC", Const, 0, ""},
-		{"AF_AX25", Const, 0, ""},
-		{"AF_BLUETOOTH", Const, 0, ""},
-		{"AF_BRIDGE", Const, 0, ""},
-		{"AF_CAIF", Const, 0, ""},
-		{"AF_CAN", Const, 0, ""},
-		{"AF_CCITT", Const, 0, ""},
-		{"AF_CHAOS", Const, 0, ""},
-		{"AF_CNT", Const, 0, ""},
-		{"AF_COIP", Const, 0, ""},
-		{"AF_DATAKIT", Const, 0, ""},
-		{"AF_DECnet", Const, 0, ""},
-		{"AF_DLI", Const, 0, ""},
-		{"AF_E164", Const, 0, ""},
-		{"AF_ECMA", Const, 0, ""},
-		{"AF_ECONET", Const, 0, ""},
-		{"AF_ENCAP", Const, 1, ""},
-		{"AF_FILE", Const, 0, ""},
-		{"AF_HYLINK", Const, 0, ""},
-		{"AF_IEEE80211", Const, 0, ""},
-		{"AF_IEEE802154", Const, 0, ""},
-		{"AF_IMPLINK", Const, 0, ""},
-		{"AF_INET", Const, 0, ""},
-		{"AF_INET6", Const, 0, ""},
-		{"AF_INET6_SDP", Const, 3, ""},
-		{"AF_INET_SDP", Const, 3, ""},
-		{"AF_IPX", Const, 0, ""},
-		{"AF_IRDA", Const, 0, ""},
-		{"AF_ISDN", Const, 0, ""},
-		{"AF_ISO", Const, 0, ""},
-		{"AF_IUCV", Const, 0, ""},
-		{"AF_KEY", Const, 0, ""},
-		{"AF_LAT", Const, 0, ""},
-		{"AF_LINK", Const, 0, ""},
-		{"AF_LLC", Const, 0, ""},
-		{"AF_LOCAL", Const, 0, ""},
-		{"AF_MAX", Const, 0, ""},
-		{"AF_MPLS", Const, 1, ""},
-		{"AF_NATM", Const, 0, ""},
-		{"AF_NDRV", Const, 0, ""},
-		{"AF_NETBEUI", Const, 0, ""},
-		{"AF_NETBIOS", Const, 0, ""},
-		{"AF_NETGRAPH", Const, 0, ""},
-		{"AF_NETLINK", Const, 0, ""},
-		{"AF_NETROM", Const, 0, ""},
-		{"AF_NS", Const, 0, ""},
-		{"AF_OROUTE", Const, 1, ""},
-		{"AF_OSI", Const, 0, ""},
-		{"AF_PACKET", Const, 0, ""},
-		{"AF_PHONET", Const, 0, ""},
-		{"AF_PPP", Const, 0, ""},
-		{"AF_PPPOX", Const, 0, ""},
-		{"AF_PUP", Const, 0, ""},
-		{"AF_RDS", Const, 0, ""},
-		{"AF_RESERVED_36", Const, 0, ""},
-		{"AF_ROSE", Const, 0, ""},
-		{"AF_ROUTE", Const, 0, ""},
-		{"AF_RXRPC", Const, 0, ""},
-		{"AF_SCLUSTER", Const, 0, ""},
-		{"AF_SECURITY", Const, 0, ""},
-		{"AF_SIP", Const, 0, ""},
-		{"AF_SLOW", Const, 0, ""},
-		{"AF_SNA", Const, 0, ""},
-		{"AF_SYSTEM", Const, 0, ""},
-		{"AF_TIPC", Const, 0, ""},
-		{"AF_UNIX", Const, 0, ""},
-		{"AF_UNSPEC", Const, 0, ""},
-		{"AF_UTUN", Const, 16, ""},
-		{"AF_VENDOR00", Const, 0, ""},
-		{"AF_VENDOR01", Const, 0, ""},
-		{"AF_VENDOR02", Const, 0, ""},
-		{"AF_VENDOR03", Const, 0, ""},
-		{"AF_VENDOR04", Const, 0, ""},
-		{"AF_VENDOR05", Const, 0, ""},
-		{"AF_VENDOR06", Const, 0, ""},
-		{"AF_VENDOR07", Const, 0, ""},
-		{"AF_VENDOR08", Const, 0, ""},
-		{"AF_VENDOR09", Const, 0, ""},
-		{"AF_VENDOR10", Const, 0, ""},
-		{"AF_VENDOR11", Const, 0, ""},
-		{"AF_VENDOR12", Const, 0, ""},
-		{"AF_VENDOR13", Const, 0, ""},
-		{"AF_VENDOR14", Const, 0, ""},
-		{"AF_VENDOR15", Const, 0, ""},
-		{"AF_VENDOR16", Const, 0, ""},
-		{"AF_VENDOR17", Const, 0, ""},
-		{"AF_VENDOR18", Const, 0, ""},
-		{"AF_VENDOR19", Const, 0, ""},
-		{"AF_VENDOR20", Const, 0, ""},
-		{"AF_VENDOR21", Const, 0, ""},
-		{"AF_VENDOR22", Const, 0, ""},
-		{"AF_VENDOR23", Const, 0, ""},
-		{"AF_VENDOR24", Const, 0, ""},
-		{"AF_VENDOR25", Const, 0, ""},
-		{"AF_VENDOR26", Const, 0, ""},
-		{"AF_VENDOR27", Const, 0, ""},
-		{"AF_VENDOR28", Const, 0, ""},
-		{"AF_VENDOR29", Const, 0, ""},
-		{"AF_VENDOR30", Const, 0, ""},
-		{"AF_VENDOR31", Const, 0, ""},
-		{"AF_VENDOR32", Const, 0, ""},
-		{"AF_VENDOR33", Const, 0, ""},
-		{"AF_VENDOR34", Const, 0, ""},
-		{"AF_VENDOR35", Const, 0, ""},
-		{"AF_VENDOR36", Const, 0, ""},
-		{"AF_VENDOR37", Const, 0, ""},
-		{"AF_VENDOR38", Const, 0, ""},
-		{"AF_VENDOR39", Const, 0, ""},
-		{"AF_VENDOR40", Const, 0, ""},
-		{"AF_VENDOR41", Const, 0, ""},
-		{"AF_VENDOR42", Const, 0, ""},
-		{"AF_VENDOR43", Const, 0, ""},
-		{"AF_VENDOR44", Const, 0, ""},
-		{"AF_VENDOR45", Const, 0, ""},
-		{"AF_VENDOR46", Const, 0, ""},
-		{"AF_VENDOR47", Const, 0, ""},
-		{"AF_WANPIPE", Const, 0, ""},
-		{"AF_X25", Const, 0, ""},
-		{"AI_CANONNAME", Const, 1, ""},
-		{"AI_NUMERICHOST", Const, 1, ""},
-		{"AI_PASSIVE", Const, 1, ""},
-		{"APPLICATION_ERROR", Const, 0, ""},
-		{"ARPHRD_ADAPT", Const, 0, ""},
-		{"ARPHRD_APPLETLK", Const, 0, ""},
-		{"ARPHRD_ARCNET", Const, 0, ""},
-		{"ARPHRD_ASH", Const, 0, ""},
-		{"ARPHRD_ATM", Const, 0, ""},
-		{"ARPHRD_AX25", Const, 0, ""},
-		{"ARPHRD_BIF", Const, 0, ""},
-		{"ARPHRD_CHAOS", Const, 0, ""},
-		{"ARPHRD_CISCO", Const, 0, ""},
-		{"ARPHRD_CSLIP", Const, 0, ""},
-		{"ARPHRD_CSLIP6", Const, 0, ""},
-		{"ARPHRD_DDCMP", Const, 0, ""},
-		{"ARPHRD_DLCI", Const, 0, ""},
-		{"ARPHRD_ECONET", Const, 0, ""},
-		{"ARPHRD_EETHER", Const, 0, ""},
-		{"ARPHRD_ETHER", Const, 0, ""},
-		{"ARPHRD_EUI64", Const, 0, ""},
-		{"ARPHRD_FCAL", Const, 0, ""},
-		{"ARPHRD_FCFABRIC", Const, 0, ""},
-		{"ARPHRD_FCPL", Const, 0, ""},
-		{"ARPHRD_FCPP", Const, 0, ""},
-		{"ARPHRD_FDDI", Const, 0, ""},
-		{"ARPHRD_FRAD", Const, 0, ""},
-		{"ARPHRD_FRELAY", Const, 1, ""},
-		{"ARPHRD_HDLC", Const, 0, ""},
-		{"ARPHRD_HIPPI", Const, 0, ""},
-		{"ARPHRD_HWX25", Const, 0, ""},
-		{"ARPHRD_IEEE1394", Const, 0, ""},
-		{"ARPHRD_IEEE802", Const, 0, ""},
-		{"ARPHRD_IEEE80211", Const, 0, ""},
-		{"ARPHRD_IEEE80211_PRISM", Const, 0, ""},
-		{"ARPHRD_IEEE80211_RADIOTAP", Const, 0, ""},
-		{"ARPHRD_IEEE802154", Const, 0, ""},
-		{"ARPHRD_IEEE802154_PHY", Const, 0, ""},
-		{"ARPHRD_IEEE802_TR", Const, 0, ""},
-		{"ARPHRD_INFINIBAND", Const, 0, ""},
-		{"ARPHRD_IPDDP", Const, 0, ""},
-		{"ARPHRD_IPGRE", Const, 0, ""},
-		{"ARPHRD_IRDA", Const, 0, ""},
-		{"ARPHRD_LAPB", Const, 0, ""},
-		{"ARPHRD_LOCALTLK", Const, 0, ""},
-		{"ARPHRD_LOOPBACK", Const, 0, ""},
-		{"ARPHRD_METRICOM", Const, 0, ""},
-		{"ARPHRD_NETROM", Const, 0, ""},
-		{"ARPHRD_NONE", Const, 0, ""},
-		{"ARPHRD_PIMREG", Const, 0, ""},
-		{"ARPHRD_PPP", Const, 0, ""},
-		{"ARPHRD_PRONET", Const, 0, ""},
-		{"ARPHRD_RAWHDLC", Const, 0, ""},
-		{"ARPHRD_ROSE", Const, 0, ""},
-		{"ARPHRD_RSRVD", Const, 0, ""},
-		{"ARPHRD_SIT", Const, 0, ""},
-		{"ARPHRD_SKIP", Const, 0, ""},
-		{"ARPHRD_SLIP", Const, 0, ""},
-		{"ARPHRD_SLIP6", Const, 0, ""},
-		{"ARPHRD_STRIP", Const, 1, ""},
-		{"ARPHRD_TUNNEL", Const, 0, ""},
-		{"ARPHRD_TUNNEL6", Const, 0, ""},
-		{"ARPHRD_VOID", Const, 0, ""},
-		{"ARPHRD_X25", Const, 0, ""},
-		{"AUTHTYPE_CLIENT", Const, 0, ""},
-		{"AUTHTYPE_SERVER", Const, 0, ""},
-		{"Accept", Func, 0, "func(fd int) (nfd int, sa Sockaddr, err error)"},
-		{"Accept4", Func, 1, "func(fd int, flags int) (nfd int, sa Sockaddr, err error)"},
-		{"AcceptEx", Func, 0, ""},
-		{"Access", Func, 0, "func(path string, mode uint32) (err error)"},
-		{"Acct", Func, 0, "func(path string) (err error)"},
-		{"AddrinfoW", Type, 1, ""},
-		{"AddrinfoW.Addr", Field, 1, ""},
-		{"AddrinfoW.Addrlen", Field, 1, ""},
-		{"AddrinfoW.Canonname", Field, 1, ""},
-		{"AddrinfoW.Family", Field, 1, ""},
-		{"AddrinfoW.Flags", Field, 1, ""},
-		{"AddrinfoW.Next", Field, 1, ""},
-		{"AddrinfoW.Protocol", Field, 1, ""},
-		{"AddrinfoW.Socktype", Field, 1, ""},
-		{"Adjtime", Func, 0, ""},
-		{"Adjtimex", Func, 0, "func(buf *Timex) (state int, err error)"},
-		{"AllThreadsSyscall", Func, 16, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"AllThreadsSyscall6", Func, 16, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr, a4 uintptr, a5 uintptr, a6 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"AttachLsf", Func, 0, "func(fd int, i []SockFilter) error"},
-		{"B0", Const, 0, ""},
-		{"B1000000", Const, 0, ""},
-		{"B110", Const, 0, ""},
-		{"B115200", Const, 0, ""},
-		{"B1152000", Const, 0, ""},
-		{"B1200", Const, 0, ""},
-		{"B134", Const, 0, ""},
-		{"B14400", Const, 1, ""},
-		{"B150", Const, 0, ""},
-		{"B1500000", Const, 0, ""},
-		{"B1800", Const, 0, ""},
-		{"B19200", Const, 0, ""},
-		{"B200", Const, 0, ""},
-		{"B2000000", Const, 0, ""},
-		{"B230400", Const, 0, ""},
-		{"B2400", Const, 0, ""},
-		{"B2500000", Const, 0, ""},
-		{"B28800", Const, 1, ""},
-		{"B300", Const, 0, ""},
-		{"B3000000", Const, 0, ""},
-		{"B3500000", Const, 0, ""},
-		{"B38400", Const, 0, ""},
-		{"B4000000", Const, 0, ""},
-		{"B460800", Const, 0, ""},
-		{"B4800", Const, 0, ""},
-		{"B50", Const, 0, ""},
-		{"B500000", Const, 0, ""},
-		{"B57600", Const, 0, ""},
-		{"B576000", Const, 0, ""},
-		{"B600", Const, 0, ""},
-		{"B7200", Const, 1, ""},
-		{"B75", Const, 0, ""},
-		{"B76800", Const, 1, ""},
-		{"B921600", Const, 0, ""},
-		{"B9600", Const, 0, ""},
-		{"BASE_PROTOCOL", Const, 2, ""},
-		{"BIOCFEEDBACK", Const, 0, ""},
-		{"BIOCFLUSH", Const, 0, ""},
-		{"BIOCGBLEN", Const, 0, ""},
-		{"BIOCGDIRECTION", Const, 0, ""},
-		{"BIOCGDIRFILT", Const, 1, ""},
-		{"BIOCGDLT", Const, 0, ""},
-		{"BIOCGDLTLIST", Const, 0, ""},
-		{"BIOCGETBUFMODE", Const, 0, ""},
-		{"BIOCGETIF", Const, 0, ""},
-		{"BIOCGETZMAX", Const, 0, ""},
-		{"BIOCGFEEDBACK", Const, 1, ""},
-		{"BIOCGFILDROP", Const, 1, ""},
-		{"BIOCGHDRCMPLT", Const, 0, ""},
-		{"BIOCGRSIG", Const, 0, ""},
-		{"BIOCGRTIMEOUT", Const, 0, ""},
-		{"BIOCGSEESENT", Const, 0, ""},
-		{"BIOCGSTATS", Const, 0, ""},
-		{"BIOCGSTATSOLD", Const, 1, ""},
-		{"BIOCGTSTAMP", Const, 1, ""},
-		{"BIOCIMMEDIATE", Const, 0, ""},
-		{"BIOCLOCK", Const, 0, ""},
-		{"BIOCPROMISC", Const, 0, ""},
-		{"BIOCROTZBUF", Const, 0, ""},
-		{"BIOCSBLEN", Const, 0, ""},
-		{"BIOCSDIRECTION", Const, 0, ""},
-		{"BIOCSDIRFILT", Const, 1, ""},
-		{"BIOCSDLT", Const, 0, ""},
-		{"BIOCSETBUFMODE", Const, 0, ""},
-		{"BIOCSETF", Const, 0, ""},
-		{"BIOCSETFNR", Const, 0, ""},
-		{"BIOCSETIF", Const, 0, ""},
-		{"BIOCSETWF", Const, 0, ""},
-		{"BIOCSETZBUF", Const, 0, ""},
-		{"BIOCSFEEDBACK", Const, 1, ""},
-		{"BIOCSFILDROP", Const, 1, ""},
-		{"BIOCSHDRCMPLT", Const, 0, ""},
-		{"BIOCSRSIG", Const, 0, ""},
-		{"BIOCSRTIMEOUT", Const, 0, ""},
-		{"BIOCSSEESENT", Const, 0, ""},
-		{"BIOCSTCPF", Const, 1, ""},
-		{"BIOCSTSTAMP", Const, 1, ""},
-		{"BIOCSUDPF", Const, 1, ""},
-		{"BIOCVERSION", Const, 0, ""},
-		{"BPF_A", Const, 0, ""},
-		{"BPF_ABS", Const, 0, ""},
-		{"BPF_ADD", Const, 0, ""},
-		{"BPF_ALIGNMENT", Const, 0, ""},
-		{"BPF_ALIGNMENT32", Const, 1, ""},
-		{"BPF_ALU", Const, 0, ""},
-		{"BPF_AND", Const, 0, ""},
-		{"BPF_B", Const, 0, ""},
-		{"BPF_BUFMODE_BUFFER", Const, 0, ""},
-		{"BPF_BUFMODE_ZBUF", Const, 0, ""},
-		{"BPF_DFLTBUFSIZE", Const, 1, ""},
-		{"BPF_DIRECTION_IN", Const, 1, ""},
-		{"BPF_DIRECTION_OUT", Const, 1, ""},
-		{"BPF_DIV", Const, 0, ""},
-		{"BPF_H", Const, 0, ""},
-		{"BPF_IMM", Const, 0, ""},
-		{"BPF_IND", Const, 0, ""},
-		{"BPF_JA", Const, 0, ""},
-		{"BPF_JEQ", Const, 0, ""},
-		{"BPF_JGE", Const, 0, ""},
-		{"BPF_JGT", Const, 0, ""},
-		{"BPF_JMP", Const, 0, ""},
-		{"BPF_JSET", Const, 0, ""},
-		{"BPF_K", Const, 0, ""},
-		{"BPF_LD", Const, 0, ""},
-		{"BPF_LDX", Const, 0, ""},
-		{"BPF_LEN", Const, 0, ""},
-		{"BPF_LSH", Const, 0, ""},
-		{"BPF_MAJOR_VERSION", Const, 0, ""},
-		{"BPF_MAXBUFSIZE", Const, 0, ""},
-		{"BPF_MAXINSNS", Const, 0, ""},
-		{"BPF_MEM", Const, 0, ""},
-		{"BPF_MEMWORDS", Const, 0, ""},
-		{"BPF_MINBUFSIZE", Const, 0, ""},
-		{"BPF_MINOR_VERSION", Const, 0, ""},
-		{"BPF_MISC", Const, 0, ""},
-		{"BPF_MSH", Const, 0, ""},
-		{"BPF_MUL", Const, 0, ""},
-		{"BPF_NEG", Const, 0, ""},
-		{"BPF_OR", Const, 0, ""},
-		{"BPF_RELEASE", Const, 0, ""},
-		{"BPF_RET", Const, 0, ""},
-		{"BPF_RSH", Const, 0, ""},
-		{"BPF_ST", Const, 0, ""},
-		{"BPF_STX", Const, 0, ""},
-		{"BPF_SUB", Const, 0, ""},
-		{"BPF_TAX", Const, 0, ""},
-		{"BPF_TXA", Const, 0, ""},
-		{"BPF_T_BINTIME", Const, 1, ""},
-		{"BPF_T_BINTIME_FAST", Const, 1, ""},
-		{"BPF_T_BINTIME_MONOTONIC", Const, 1, ""},
-		{"BPF_T_BINTIME_MONOTONIC_FAST", Const, 1, ""},
-		{"BPF_T_FAST", Const, 1, ""},
-		{"BPF_T_FLAG_MASK", Const, 1, ""},
-		{"BPF_T_FORMAT_MASK", Const, 1, ""},
-		{"BPF_T_MICROTIME", Const, 1, ""},
-		{"BPF_T_MICROTIME_FAST", Const, 1, ""},
-		{"BPF_T_MICROTIME_MONOTONIC", Const, 1, ""},
-		{"BPF_T_MICROTIME_MONOTONIC_FAST", Const, 1, ""},
-		{"BPF_T_MONOTONIC", Const, 1, ""},
-		{"BPF_T_MONOTONIC_FAST", Const, 1, ""},
-		{"BPF_T_NANOTIME", Const, 1, ""},
-		{"BPF_T_NANOTIME_FAST", Const, 1, ""},
-		{"BPF_T_NANOTIME_MONOTONIC", Const, 1, ""},
-		{"BPF_T_NANOTIME_MONOTONIC_FAST", Const, 1, ""},
-		{"BPF_T_NONE", Const, 1, ""},
-		{"BPF_T_NORMAL", Const, 1, ""},
-		{"BPF_W", Const, 0, ""},
-		{"BPF_X", Const, 0, ""},
-		{"BRKINT", Const, 0, ""},
-		{"Bind", Func, 0, "func(fd int, sa Sockaddr) (err error)"},
-		{"BindToDevice", Func, 0, "func(fd int, device string) (err error)"},
-		{"BpfBuflen", Func, 0, ""},
-		{"BpfDatalink", Func, 0, ""},
-		{"BpfHdr", Type, 0, ""},
-		{"BpfHdr.Caplen", Field, 0, ""},
-		{"BpfHdr.Datalen", Field, 0, ""},
-		{"BpfHdr.Hdrlen", Field, 0, ""},
-		{"BpfHdr.Pad_cgo_0", Field, 0, ""},
-		{"BpfHdr.Tstamp", Field, 0, ""},
-		{"BpfHeadercmpl", Func, 0, ""},
-		{"BpfInsn", Type, 0, ""},
-		{"BpfInsn.Code", Field, 0, ""},
-		{"BpfInsn.Jf", Field, 0, ""},
-		{"BpfInsn.Jt", Field, 0, ""},
-		{"BpfInsn.K", Field, 0, ""},
-		{"BpfInterface", Func, 0, ""},
-		{"BpfJump", Func, 0, ""},
-		{"BpfProgram", Type, 0, ""},
-		{"BpfProgram.Insns", Field, 0, ""},
-		{"BpfProgram.Len", Field, 0, ""},
-		{"BpfProgram.Pad_cgo_0", Field, 0, ""},
-		{"BpfStat", Type, 0, ""},
-		{"BpfStat.Capt", Field, 2, ""},
-		{"BpfStat.Drop", Field, 0, ""},
-		{"BpfStat.Padding", Field, 2, ""},
-		{"BpfStat.Recv", Field, 0, ""},
-		{"BpfStats", Func, 0, ""},
-		{"BpfStmt", Func, 0, ""},
-		{"BpfTimeout", Func, 0, ""},
-		{"BpfTimeval", Type, 2, ""},
-		{"BpfTimeval.Sec", Field, 2, ""},
-		{"BpfTimeval.Usec", Field, 2, ""},
-		{"BpfVersion", Type, 0, ""},
-		{"BpfVersion.Major", Field, 0, ""},
-		{"BpfVersion.Minor", Field, 0, ""},
-		{"BpfZbuf", Type, 0, ""},
-		{"BpfZbuf.Bufa", Field, 0, ""},
-		{"BpfZbuf.Bufb", Field, 0, ""},
-		{"BpfZbuf.Buflen", Field, 0, ""},
-		{"BpfZbufHeader", Type, 0, ""},
-		{"BpfZbufHeader.Kernel_gen", Field, 0, ""},
-		{"BpfZbufHeader.Kernel_len", Field, 0, ""},
-		{"BpfZbufHeader.User_gen", Field, 0, ""},
-		{"BpfZbufHeader.X_bzh_pad", Field, 0, ""},
-		{"ByHandleFileInformation", Type, 0, ""},
-		{"ByHandleFileInformation.CreationTime", Field, 0, ""},
-		{"ByHandleFileInformation.FileAttributes", Field, 0, ""},
-		{"ByHandleFileInformation.FileIndexHigh", Field, 0, ""},
-		{"ByHandleFileInformation.FileIndexLow", Field, 0, ""},
-		{"ByHandleFileInformation.FileSizeHigh", Field, 0, ""},
-		{"ByHandleFileInformation.FileSizeLow", Field, 0, ""},
-		{"ByHandleFileInformation.LastAccessTime", Field, 0, ""},
-		{"ByHandleFileInformation.LastWriteTime", Field, 0, ""},
-		{"ByHandleFileInformation.NumberOfLinks", Field, 0, ""},
-		{"ByHandleFileInformation.VolumeSerialNumber", Field, 0, ""},
-		{"BytePtrFromString", Func, 1, "func(s string) (*byte, error)"},
-		{"ByteSliceFromString", Func, 1, "func(s string) ([]byte, error)"},
-		{"CCR0_FLUSH", Const, 1, ""},
-		{"CERT_CHAIN_POLICY_AUTHENTICODE", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_AUTHENTICODE_TS", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_BASE", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_BASIC_CONSTRAINTS", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_EV", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_MICROSOFT_ROOT", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_NT_AUTH", Const, 0, ""},
-		{"CERT_CHAIN_POLICY_SSL", Const, 0, ""},
-		{"CERT_E_CN_NO_MATCH", Const, 0, ""},
-		{"CERT_E_EXPIRED", Const, 0, ""},
-		{"CERT_E_PURPOSE", Const, 0, ""},
-		{"CERT_E_ROLE", Const, 0, ""},
-		{"CERT_E_UNTRUSTEDROOT", Const, 0, ""},
-		{"CERT_STORE_ADD_ALWAYS", Const, 0, ""},
-		{"CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG", Const, 0, ""},
-		{"CERT_STORE_PROV_MEMORY", Const, 0, ""},
-		{"CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT", Const, 0, ""},
-		{"CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT", Const, 0, ""},
-		{"CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT", Const, 0, ""},
-		{"CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT", Const, 0, ""},
-		{"CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT", Const, 0, ""},
-		{"CERT_TRUST_INVALID_BASIC_CONSTRAINTS", Const, 0, ""},
-		{"CERT_TRUST_INVALID_EXTENSION", Const, 0, ""},
-		{"CERT_TRUST_INVALID_NAME_CONSTRAINTS", Const, 0, ""},
-		{"CERT_TRUST_INVALID_POLICY_CONSTRAINTS", Const, 0, ""},
-		{"CERT_TRUST_IS_CYCLIC", Const, 0, ""},
-		{"CERT_TRUST_IS_EXPLICIT_DISTRUST", Const, 0, ""},
-		{"CERT_TRUST_IS_NOT_SIGNATURE_VALID", Const, 0, ""},
-		{"CERT_TRUST_IS_NOT_TIME_VALID", Const, 0, ""},
-		{"CERT_TRUST_IS_NOT_VALID_FOR_USAGE", Const, 0, ""},
-		{"CERT_TRUST_IS_OFFLINE_REVOCATION", Const, 0, ""},
-		{"CERT_TRUST_IS_REVOKED", Const, 0, ""},
-		{"CERT_TRUST_IS_UNTRUSTED_ROOT", Const, 0, ""},
-		{"CERT_TRUST_NO_ERROR", Const, 0, ""},
-		{"CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY", Const, 0, ""},
-		{"CERT_TRUST_REVOCATION_STATUS_UNKNOWN", Const, 0, ""},
-		{"CFLUSH", Const, 1, ""},
-		{"CLOCAL", Const, 0, ""},
-		{"CLONE_CHILD_CLEARTID", Const, 2, ""},
-		{"CLONE_CHILD_SETTID", Const, 2, ""},
-		{"CLONE_CLEAR_SIGHAND", Const, 20, ""},
-		{"CLONE_CSIGNAL", Const, 3, ""},
-		{"CLONE_DETACHED", Const, 2, ""},
-		{"CLONE_FILES", Const, 2, ""},
-		{"CLONE_FS", Const, 2, ""},
-		{"CLONE_INTO_CGROUP", Const, 20, ""},
-		{"CLONE_IO", Const, 2, ""},
-		{"CLONE_NEWCGROUP", Const, 20, ""},
-		{"CLONE_NEWIPC", Const, 2, ""},
-		{"CLONE_NEWNET", Const, 2, ""},
-		{"CLONE_NEWNS", Const, 2, ""},
-		{"CLONE_NEWPID", Const, 2, ""},
-		{"CLONE_NEWTIME", Const, 20, ""},
-		{"CLONE_NEWUSER", Const, 2, ""},
-		{"CLONE_NEWUTS", Const, 2, ""},
-		{"CLONE_PARENT", Const, 2, ""},
-		{"CLONE_PARENT_SETTID", Const, 2, ""},
-		{"CLONE_PID", Const, 3, ""},
-		{"CLONE_PIDFD", Const, 20, ""},
-		{"CLONE_PTRACE", Const, 2, ""},
-		{"CLONE_SETTLS", Const, 2, ""},
-		{"CLONE_SIGHAND", Const, 2, ""},
-		{"CLONE_SYSVSEM", Const, 2, ""},
-		{"CLONE_THREAD", Const, 2, ""},
-		{"CLONE_UNTRACED", Const, 2, ""},
-		{"CLONE_VFORK", Const, 2, ""},
-		{"CLONE_VM", Const, 2, ""},
-		{"CPUID_CFLUSH", Const, 1, ""},
-		{"CREAD", Const, 0, ""},
-		{"CREATE_ALWAYS", Const, 0, ""},
-		{"CREATE_NEW", Const, 0, ""},
-		{"CREATE_NEW_PROCESS_GROUP", Const, 1, ""},
-		{"CREATE_UNICODE_ENVIRONMENT", Const, 0, ""},
-		{"CRYPT_DEFAULT_CONTAINER_OPTIONAL", Const, 0, ""},
-		{"CRYPT_DELETEKEYSET", Const, 0, ""},
-		{"CRYPT_MACHINE_KEYSET", Const, 0, ""},
-		{"CRYPT_NEWKEYSET", Const, 0, ""},
-		{"CRYPT_SILENT", Const, 0, ""},
-		{"CRYPT_VERIFYCONTEXT", Const, 0, ""},
-		{"CS5", Const, 0, ""},
-		{"CS6", Const, 0, ""},
-		{"CS7", Const, 0, ""},
-		{"CS8", Const, 0, ""},
-		{"CSIZE", Const, 0, ""},
-		{"CSTART", Const, 1, ""},
-		{"CSTATUS", Const, 1, ""},
-		{"CSTOP", Const, 1, ""},
-		{"CSTOPB", Const, 0, ""},
-		{"CSUSP", Const, 1, ""},
-		{"CTL_MAXNAME", Const, 0, ""},
-		{"CTL_NET", Const, 0, ""},
-		{"CTL_QUERY", Const, 1, ""},
-		{"CTRL_BREAK_EVENT", Const, 1, ""},
-		{"CTRL_CLOSE_EVENT", Const, 14, ""},
-		{"CTRL_C_EVENT", Const, 1, ""},
-		{"CTRL_LOGOFF_EVENT", Const, 14, ""},
-		{"CTRL_SHUTDOWN_EVENT", Const, 14, ""},
-		{"CancelIo", Func, 0, ""},
-		{"CancelIoEx", Func, 1, ""},
-		{"CertAddCertificateContextToStore", Func, 0, ""},
-		{"CertChainContext", Type, 0, ""},
-		{"CertChainContext.ChainCount", Field, 0, ""},
-		{"CertChainContext.Chains", Field, 0, ""},
-		{"CertChainContext.HasRevocationFreshnessTime", Field, 0, ""},
-		{"CertChainContext.LowerQualityChainCount", Field, 0, ""},
-		{"CertChainContext.LowerQualityChains", Field, 0, ""},
-		{"CertChainContext.RevocationFreshnessTime", Field, 0, ""},
-		{"CertChainContext.Size", Field, 0, ""},
-		{"CertChainContext.TrustStatus", Field, 0, ""},
-		{"CertChainElement", Type, 0, ""},
-		{"CertChainElement.ApplicationUsage", Field, 0, ""},
-		{"CertChainElement.CertContext", Field, 0, ""},
-		{"CertChainElement.ExtendedErrorInfo", Field, 0, ""},
-		{"CertChainElement.IssuanceUsage", Field, 0, ""},
-		{"CertChainElement.RevocationInfo", Field, 0, ""},
-		{"CertChainElement.Size", Field, 0, ""},
-		{"CertChainElement.TrustStatus", Field, 0, ""},
-		{"CertChainPara", Type, 0, ""},
-		{"CertChainPara.CacheResync", Field, 0, ""},
-		{"CertChainPara.CheckRevocationFreshnessTime", Field, 0, ""},
-		{"CertChainPara.RequestedUsage", Field, 0, ""},
-		{"CertChainPara.RequstedIssuancePolicy", Field, 0, ""},
-		{"CertChainPara.RevocationFreshnessTime", Field, 0, ""},
-		{"CertChainPara.Size", Field, 0, ""},
-		{"CertChainPara.URLRetrievalTimeout", Field, 0, ""},
-		{"CertChainPolicyPara", Type, 0, ""},
-		{"CertChainPolicyPara.ExtraPolicyPara", Field, 0, ""},
-		{"CertChainPolicyPara.Flags", Field, 0, ""},
-		{"CertChainPolicyPara.Size", Field, 0, ""},
-		{"CertChainPolicyStatus", Type, 0, ""},
-		{"CertChainPolicyStatus.ChainIndex", Field, 0, ""},
-		{"CertChainPolicyStatus.ElementIndex", Field, 0, ""},
-		{"CertChainPolicyStatus.Error", Field, 0, ""},
-		{"CertChainPolicyStatus.ExtraPolicyStatus", Field, 0, ""},
-		{"CertChainPolicyStatus.Size", Field, 0, ""},
-		{"CertCloseStore", Func, 0, ""},
-		{"CertContext", Type, 0, ""},
-		{"CertContext.CertInfo", Field, 0, ""},
-		{"CertContext.EncodedCert", Field, 0, ""},
-		{"CertContext.EncodingType", Field, 0, ""},
-		{"CertContext.Length", Field, 0, ""},
-		{"CertContext.Store", Field, 0, ""},
-		{"CertCreateCertificateContext", Func, 0, ""},
-		{"CertEnhKeyUsage", Type, 0, ""},
-		{"CertEnhKeyUsage.Length", Field, 0, ""},
-		{"CertEnhKeyUsage.UsageIdentifiers", Field, 0, ""},
-		{"CertEnumCertificatesInStore", Func, 0, ""},
-		{"CertFreeCertificateChain", Func, 0, ""},
-		{"CertFreeCertificateContext", Func, 0, ""},
-		{"CertGetCertificateChain", Func, 0, ""},
-		{"CertInfo", Type, 11, ""},
-		{"CertOpenStore", Func, 0, ""},
-		{"CertOpenSystemStore", Func, 0, ""},
-		{"CertRevocationCrlInfo", Type, 11, ""},
-		{"CertRevocationInfo", Type, 0, ""},
-		{"CertRevocationInfo.CrlInfo", Field, 0, ""},
-		{"CertRevocationInfo.FreshnessTime", Field, 0, ""},
-		{"CertRevocationInfo.HasFreshnessTime", Field, 0, ""},
-		{"CertRevocationInfo.OidSpecificInfo", Field, 0, ""},
-		{"CertRevocationInfo.RevocationOid", Field, 0, ""},
-		{"CertRevocationInfo.RevocationResult", Field, 0, ""},
-		{"CertRevocationInfo.Size", Field, 0, ""},
-		{"CertSimpleChain", Type, 0, ""},
-		{"CertSimpleChain.Elements", Field, 0, ""},
-		{"CertSimpleChain.HasRevocationFreshnessTime", Field, 0, ""},
-		{"CertSimpleChain.NumElements", Field, 0, ""},
-		{"CertSimpleChain.RevocationFreshnessTime", Field, 0, ""},
-		{"CertSimpleChain.Size", Field, 0, ""},
-		{"CertSimpleChain.TrustListInfo", Field, 0, ""},
-		{"CertSimpleChain.TrustStatus", Field, 0, ""},
-		{"CertTrustListInfo", Type, 11, ""},
-		{"CertTrustStatus", Type, 0, ""},
-		{"CertTrustStatus.ErrorStatus", Field, 0, ""},
-		{"CertTrustStatus.InfoStatus", Field, 0, ""},
-		{"CertUsageMatch", Type, 0, ""},
-		{"CertUsageMatch.Type", Field, 0, ""},
-		{"CertUsageMatch.Usage", Field, 0, ""},
-		{"CertVerifyCertificateChainPolicy", Func, 0, ""},
-		{"Chdir", Func, 0, "func(path string) (err error)"},
-		{"CheckBpfVersion", Func, 0, ""},
-		{"Chflags", Func, 0, ""},
-		{"Chmod", Func, 0, "func(path string, mode uint32) (err error)"},
-		{"Chown", Func, 0, "func(path string, uid int, gid int) (err error)"},
-		{"Chroot", Func, 0, "func(path string) (err error)"},
-		{"Clearenv", Func, 0, "func()"},
-		{"Close", Func, 0, "func(fd int) (err error)"},
-		{"CloseHandle", Func, 0, ""},
-		{"CloseOnExec", Func, 0, "func(fd int)"},
-		{"Closesocket", Func, 0, ""},
-		{"CmsgLen", Func, 0, "func(datalen int) int"},
-		{"CmsgSpace", Func, 0, "func(datalen int) int"},
-		{"Cmsghdr", Type, 0, ""},
-		{"Cmsghdr.Len", Field, 0, ""},
-		{"Cmsghdr.Level", Field, 0, ""},
-		{"Cmsghdr.Type", Field, 0, ""},
-		{"Cmsghdr.X__cmsg_data", Field, 0, ""},
-		{"CommandLineToArgv", Func, 0, ""},
-		{"ComputerName", Func, 0, ""},
-		{"Conn", Type, 9, ""},
-		{"Connect", Func, 0, "func(fd int, sa Sockaddr) (err error)"},
-		{"ConnectEx", Func, 1, ""},
-		{"ConvertSidToStringSid", Func, 0, ""},
-		{"ConvertStringSidToSid", Func, 0, ""},
-		{"CopySid", Func, 0, ""},
-		{"Creat", Func, 0, "func(path string, mode uint32) (fd int, err error)"},
-		{"CreateDirectory", Func, 0, ""},
-		{"CreateFile", Func, 0, ""},
-		{"CreateFileMapping", Func, 0, ""},
-		{"CreateHardLink", Func, 4, ""},
-		{"CreateIoCompletionPort", Func, 0, ""},
-		{"CreatePipe", Func, 0, ""},
-		{"CreateProcess", Func, 0, ""},
-		{"CreateProcessAsUser", Func, 10, ""},
-		{"CreateSymbolicLink", Func, 4, ""},
-		{"CreateToolhelp32Snapshot", Func, 4, ""},
-		{"Credential", Type, 0, ""},
-		{"Credential.Gid", Field, 0, ""},
-		{"Credential.Groups", Field, 0, ""},
-		{"Credential.NoSetGroups", Field, 9, ""},
-		{"Credential.Uid", Field, 0, ""},
-		{"CryptAcquireContext", Func, 0, ""},
-		{"CryptGenRandom", Func, 0, ""},
-		{"CryptReleaseContext", Func, 0, ""},
-		{"DIOCBSFLUSH", Const, 1, ""},
-		{"DIOCOSFPFLUSH", Const, 1, ""},
-		{"DLL", Type, 0, ""},
-		{"DLL.Handle", Field, 0, ""},
-		{"DLL.Name", Field, 0, ""},
-		{"DLLError", Type, 0, ""},
-		{"DLLError.Err", Field, 0, ""},
-		{"DLLError.Msg", Field, 0, ""},
-		{"DLLError.ObjName", Field, 0, ""},
-		{"DLT_A429", Const, 0, ""},
-		{"DLT_A653_ICM", Const, 0, ""},
-		{"DLT_AIRONET_HEADER", Const, 0, ""},
-		{"DLT_AOS", Const, 1, ""},
-		{"DLT_APPLE_IP_OVER_IEEE1394", Const, 0, ""},
-		{"DLT_ARCNET", Const, 0, ""},
-		{"DLT_ARCNET_LINUX", Const, 0, ""},
-		{"DLT_ATM_CLIP", Const, 0, ""},
-		{"DLT_ATM_RFC1483", Const, 0, ""},
-		{"DLT_AURORA", Const, 0, ""},
-		{"DLT_AX25", Const, 0, ""},
-		{"DLT_AX25_KISS", Const, 0, ""},
-		{"DLT_BACNET_MS_TP", Const, 0, ""},
-		{"DLT_BLUETOOTH_HCI_H4", Const, 0, ""},
-		{"DLT_BLUETOOTH_HCI_H4_WITH_PHDR", Const, 0, ""},
-		{"DLT_CAN20B", Const, 0, ""},
-		{"DLT_CAN_SOCKETCAN", Const, 1, ""},
-		{"DLT_CHAOS", Const, 0, ""},
-		{"DLT_CHDLC", Const, 0, ""},
-		{"DLT_CISCO_IOS", Const, 0, ""},
-		{"DLT_C_HDLC", Const, 0, ""},
-		{"DLT_C_HDLC_WITH_DIR", Const, 0, ""},
-		{"DLT_DBUS", Const, 1, ""},
-		{"DLT_DECT", Const, 1, ""},
-		{"DLT_DOCSIS", Const, 0, ""},
-		{"DLT_DVB_CI", Const, 1, ""},
-		{"DLT_ECONET", Const, 0, ""},
-		{"DLT_EN10MB", Const, 0, ""},
-		{"DLT_EN3MB", Const, 0, ""},
-		{"DLT_ENC", Const, 0, ""},
-		{"DLT_ERF", Const, 0, ""},
-		{"DLT_ERF_ETH", Const, 0, ""},
-		{"DLT_ERF_POS", Const, 0, ""},
-		{"DLT_FC_2", Const, 1, ""},
-		{"DLT_FC_2_WITH_FRAME_DELIMS", Const, 1, ""},
-		{"DLT_FDDI", Const, 0, ""},
-		{"DLT_FLEXRAY", Const, 0, ""},
-		{"DLT_FRELAY", Const, 0, ""},
-		{"DLT_FRELAY_WITH_DIR", Const, 0, ""},
-		{"DLT_GCOM_SERIAL", Const, 0, ""},
-		{"DLT_GCOM_T1E1", Const, 0, ""},
-		{"DLT_GPF_F", Const, 0, ""},
-		{"DLT_GPF_T", Const, 0, ""},
-		{"DLT_GPRS_LLC", Const, 0, ""},
-		{"DLT_GSMTAP_ABIS", Const, 1, ""},
-		{"DLT_GSMTAP_UM", Const, 1, ""},
-		{"DLT_HDLC", Const, 1, ""},
-		{"DLT_HHDLC", Const, 0, ""},
-		{"DLT_HIPPI", Const, 1, ""},
-		{"DLT_IBM_SN", Const, 0, ""},
-		{"DLT_IBM_SP", Const, 0, ""},
-		{"DLT_IEEE802", Const, 0, ""},
-		{"DLT_IEEE802_11", Const, 0, ""},
-		{"DLT_IEEE802_11_RADIO", Const, 0, ""},
-		{"DLT_IEEE802_11_RADIO_AVS", Const, 0, ""},
-		{"DLT_IEEE802_15_4", Const, 0, ""},
-		{"DLT_IEEE802_15_4_LINUX", Const, 0, ""},
-		{"DLT_IEEE802_15_4_NOFCS", Const, 1, ""},
-		{"DLT_IEEE802_15_4_NONASK_PHY", Const, 0, ""},
-		{"DLT_IEEE802_16_MAC_CPS", Const, 0, ""},
-		{"DLT_IEEE802_16_MAC_CPS_RADIO", Const, 0, ""},
-		{"DLT_IPFILTER", Const, 0, ""},
-		{"DLT_IPMB", Const, 0, ""},
-		{"DLT_IPMB_LINUX", Const, 0, ""},
-		{"DLT_IPNET", Const, 1, ""},
-		{"DLT_IPOIB", Const, 1, ""},
-		{"DLT_IPV4", Const, 1, ""},
-		{"DLT_IPV6", Const, 1, ""},
-		{"DLT_IP_OVER_FC", Const, 0, ""},
-		{"DLT_JUNIPER_ATM1", Const, 0, ""},
-		{"DLT_JUNIPER_ATM2", Const, 0, ""},
-		{"DLT_JUNIPER_ATM_CEMIC", Const, 1, ""},
-		{"DLT_JUNIPER_CHDLC", Const, 0, ""},
-		{"DLT_JUNIPER_ES", Const, 0, ""},
-		{"DLT_JUNIPER_ETHER", Const, 0, ""},
-		{"DLT_JUNIPER_FIBRECHANNEL", Const, 1, ""},
-		{"DLT_JUNIPER_FRELAY", Const, 0, ""},
-		{"DLT_JUNIPER_GGSN", Const, 0, ""},
-		{"DLT_JUNIPER_ISM", Const, 0, ""},
-		{"DLT_JUNIPER_MFR", Const, 0, ""},
-		{"DLT_JUNIPER_MLFR", Const, 0, ""},
-		{"DLT_JUNIPER_MLPPP", Const, 0, ""},
-		{"DLT_JUNIPER_MONITOR", Const, 0, ""},
-		{"DLT_JUNIPER_PIC_PEER", Const, 0, ""},
-		{"DLT_JUNIPER_PPP", Const, 0, ""},
-		{"DLT_JUNIPER_PPPOE", Const, 0, ""},
-		{"DLT_JUNIPER_PPPOE_ATM", Const, 0, ""},
-		{"DLT_JUNIPER_SERVICES", Const, 0, ""},
-		{"DLT_JUNIPER_SRX_E2E", Const, 1, ""},
-		{"DLT_JUNIPER_ST", Const, 0, ""},
-		{"DLT_JUNIPER_VP", Const, 0, ""},
-		{"DLT_JUNIPER_VS", Const, 1, ""},
-		{"DLT_LAPB_WITH_DIR", Const, 0, ""},
-		{"DLT_LAPD", Const, 0, ""},
-		{"DLT_LIN", Const, 0, ""},
-		{"DLT_LINUX_EVDEV", Const, 1, ""},
-		{"DLT_LINUX_IRDA", Const, 0, ""},
-		{"DLT_LINUX_LAPD", Const, 0, ""},
-		{"DLT_LINUX_PPP_WITHDIRECTION", Const, 0, ""},
-		{"DLT_LINUX_SLL", Const, 0, ""},
-		{"DLT_LOOP", Const, 0, ""},
-		{"DLT_LTALK", Const, 0, ""},
-		{"DLT_MATCHING_MAX", Const, 1, ""},
-		{"DLT_MATCHING_MIN", Const, 1, ""},
-		{"DLT_MFR", Const, 0, ""},
-		{"DLT_MOST", Const, 0, ""},
-		{"DLT_MPEG_2_TS", Const, 1, ""},
-		{"DLT_MPLS", Const, 1, ""},
-		{"DLT_MTP2", Const, 0, ""},
-		{"DLT_MTP2_WITH_PHDR", Const, 0, ""},
-		{"DLT_MTP3", Const, 0, ""},
-		{"DLT_MUX27010", Const, 1, ""},
-		{"DLT_NETANALYZER", Const, 1, ""},
-		{"DLT_NETANALYZER_TRANSPARENT", Const, 1, ""},
-		{"DLT_NFC_LLCP", Const, 1, ""},
-		{"DLT_NFLOG", Const, 1, ""},
-		{"DLT_NG40", Const, 1, ""},
-		{"DLT_NULL", Const, 0, ""},
-		{"DLT_PCI_EXP", Const, 0, ""},
-		{"DLT_PFLOG", Const, 0, ""},
-		{"DLT_PFSYNC", Const, 0, ""},
-		{"DLT_PPI", Const, 0, ""},
-		{"DLT_PPP", Const, 0, ""},
-		{"DLT_PPP_BSDOS", Const, 0, ""},
-		{"DLT_PPP_ETHER", Const, 0, ""},
-		{"DLT_PPP_PPPD", Const, 0, ""},
-		{"DLT_PPP_SERIAL", Const, 0, ""},
-		{"DLT_PPP_WITH_DIR", Const, 0, ""},
-		{"DLT_PPP_WITH_DIRECTION", Const, 0, ""},
-		{"DLT_PRISM_HEADER", Const, 0, ""},
-		{"DLT_PRONET", Const, 0, ""},
-		{"DLT_RAIF1", Const, 0, ""},
-		{"DLT_RAW", Const, 0, ""},
-		{"DLT_RAWAF_MASK", Const, 1, ""},
-		{"DLT_RIO", Const, 0, ""},
-		{"DLT_SCCP", Const, 0, ""},
-		{"DLT_SITA", Const, 0, ""},
-		{"DLT_SLIP", Const, 0, ""},
-		{"DLT_SLIP_BSDOS", Const, 0, ""},
-		{"DLT_STANAG_5066_D_PDU", Const, 1, ""},
-		{"DLT_SUNATM", Const, 0, ""},
-		{"DLT_SYMANTEC_FIREWALL", Const, 0, ""},
-		{"DLT_TZSP", Const, 0, ""},
-		{"DLT_USB", Const, 0, ""},
-		{"DLT_USB_LINUX", Const, 0, ""},
-		{"DLT_USB_LINUX_MMAPPED", Const, 1, ""},
-		{"DLT_USER0", Const, 0, ""},
-		{"DLT_USER1", Const, 0, ""},
-		{"DLT_USER10", Const, 0, ""},
-		{"DLT_USER11", Const, 0, ""},
-		{"DLT_USER12", Const, 0, ""},
-		{"DLT_USER13", Const, 0, ""},
-		{"DLT_USER14", Const, 0, ""},
-		{"DLT_USER15", Const, 0, ""},
-		{"DLT_USER2", Const, 0, ""},
-		{"DLT_USER3", Const, 0, ""},
-		{"DLT_USER4", Const, 0, ""},
-		{"DLT_USER5", Const, 0, ""},
-		{"DLT_USER6", Const, 0, ""},
-		{"DLT_USER7", Const, 0, ""},
-		{"DLT_USER8", Const, 0, ""},
-		{"DLT_USER9", Const, 0, ""},
-		{"DLT_WIHART", Const, 1, ""},
-		{"DLT_X2E_SERIAL", Const, 0, ""},
-		{"DLT_X2E_XORAYA", Const, 0, ""},
-		{"DNSMXData", Type, 0, ""},
-		{"DNSMXData.NameExchange", Field, 0, ""},
-		{"DNSMXData.Pad", Field, 0, ""},
-		{"DNSMXData.Preference", Field, 0, ""},
-		{"DNSPTRData", Type, 0, ""},
-		{"DNSPTRData.Host", Field, 0, ""},
-		{"DNSRecord", Type, 0, ""},
-		{"DNSRecord.Data", Field, 0, ""},
-		{"DNSRecord.Dw", Field, 0, ""},
-		{"DNSRecord.Length", Field, 0, ""},
-		{"DNSRecord.Name", Field, 0, ""},
-		{"DNSRecord.Next", Field, 0, ""},
-		{"DNSRecord.Reserved", Field, 0, ""},
-		{"DNSRecord.Ttl", Field, 0, ""},
-		{"DNSRecord.Type", Field, 0, ""},
-		{"DNSSRVData", Type, 0, ""},
-		{"DNSSRVData.Pad", Field, 0, ""},
-		{"DNSSRVData.Port", Field, 0, ""},
-		{"DNSSRVData.Priority", Field, 0, ""},
-		{"DNSSRVData.Target", Field, 0, ""},
-		{"DNSSRVData.Weight", Field, 0, ""},
-		{"DNSTXTData", Type, 0, ""},
-		{"DNSTXTData.StringArray", Field, 0, ""},
-		{"DNSTXTData.StringCount", Field, 0, ""},
-		{"DNS_INFO_NO_RECORDS", Const, 4, ""},
-		{"DNS_TYPE_A", Const, 0, ""},
-		{"DNS_TYPE_A6", Const, 0, ""},
-		{"DNS_TYPE_AAAA", Const, 0, ""},
-		{"DNS_TYPE_ADDRS", Const, 0, ""},
-		{"DNS_TYPE_AFSDB", Const, 0, ""},
-		{"DNS_TYPE_ALL", Const, 0, ""},
-		{"DNS_TYPE_ANY", Const, 0, ""},
-		{"DNS_TYPE_ATMA", Const, 0, ""},
-		{"DNS_TYPE_AXFR", Const, 0, ""},
-		{"DNS_TYPE_CERT", Const, 0, ""},
-		{"DNS_TYPE_CNAME", Const, 0, ""},
-		{"DNS_TYPE_DHCID", Const, 0, ""},
-		{"DNS_TYPE_DNAME", Const, 0, ""},
-		{"DNS_TYPE_DNSKEY", Const, 0, ""},
-		{"DNS_TYPE_DS", Const, 0, ""},
-		{"DNS_TYPE_EID", Const, 0, ""},
-		{"DNS_TYPE_GID", Const, 0, ""},
-		{"DNS_TYPE_GPOS", Const, 0, ""},
-		{"DNS_TYPE_HINFO", Const, 0, ""},
-		{"DNS_TYPE_ISDN", Const, 0, ""},
-		{"DNS_TYPE_IXFR", Const, 0, ""},
-		{"DNS_TYPE_KEY", Const, 0, ""},
-		{"DNS_TYPE_KX", Const, 0, ""},
-		{"DNS_TYPE_LOC", Const, 0, ""},
-		{"DNS_TYPE_MAILA", Const, 0, ""},
-		{"DNS_TYPE_MAILB", Const, 0, ""},
-		{"DNS_TYPE_MB", Const, 0, ""},
-		{"DNS_TYPE_MD", Const, 0, ""},
-		{"DNS_TYPE_MF", Const, 0, ""},
-		{"DNS_TYPE_MG", Const, 0, ""},
-		{"DNS_TYPE_MINFO", Const, 0, ""},
-		{"DNS_TYPE_MR", Const, 0, ""},
-		{"DNS_TYPE_MX", Const, 0, ""},
-		{"DNS_TYPE_NAPTR", Const, 0, ""},
-		{"DNS_TYPE_NBSTAT", Const, 0, ""},
-		{"DNS_TYPE_NIMLOC", Const, 0, ""},
-		{"DNS_TYPE_NS", Const, 0, ""},
-		{"DNS_TYPE_NSAP", Const, 0, ""},
-		{"DNS_TYPE_NSAPPTR", Const, 0, ""},
-		{"DNS_TYPE_NSEC", Const, 0, ""},
-		{"DNS_TYPE_NULL", Const, 0, ""},
-		{"DNS_TYPE_NXT", Const, 0, ""},
-		{"DNS_TYPE_OPT", Const, 0, ""},
-		{"DNS_TYPE_PTR", Const, 0, ""},
-		{"DNS_TYPE_PX", Const, 0, ""},
-		{"DNS_TYPE_RP", Const, 0, ""},
-		{"DNS_TYPE_RRSIG", Const, 0, ""},
-		{"DNS_TYPE_RT", Const, 0, ""},
-		{"DNS_TYPE_SIG", Const, 0, ""},
-		{"DNS_TYPE_SINK", Const, 0, ""},
-		{"DNS_TYPE_SOA", Const, 0, ""},
-		{"DNS_TYPE_SRV", Const, 0, ""},
-		{"DNS_TYPE_TEXT", Const, 0, ""},
-		{"DNS_TYPE_TKEY", Const, 0, ""},
-		{"DNS_TYPE_TSIG", Const, 0, ""},
-		{"DNS_TYPE_UID", Const, 0, ""},
-		{"DNS_TYPE_UINFO", Const, 0, ""},
-		{"DNS_TYPE_UNSPEC", Const, 0, ""},
-		{"DNS_TYPE_WINS", Const, 0, ""},
-		{"DNS_TYPE_WINSR", Const, 0, ""},
-		{"DNS_TYPE_WKS", Const, 0, ""},
-		{"DNS_TYPE_X25", Const, 0, ""},
-		{"DT_BLK", Const, 0, ""},
-		{"DT_CHR", Const, 0, ""},
-		{"DT_DIR", Const, 0, ""},
-		{"DT_FIFO", Const, 0, ""},
-		{"DT_LNK", Const, 0, ""},
-		{"DT_REG", Const, 0, ""},
-		{"DT_SOCK", Const, 0, ""},
-		{"DT_UNKNOWN", Const, 0, ""},
-		{"DT_WHT", Const, 0, ""},
-		{"DUPLICATE_CLOSE_SOURCE", Const, 0, ""},
-		{"DUPLICATE_SAME_ACCESS", Const, 0, ""},
-		{"DeleteFile", Func, 0, ""},
-		{"DetachLsf", Func, 0, "func(fd int) error"},
-		{"DeviceIoControl", Func, 4, ""},
-		{"Dirent", Type, 0, ""},
-		{"Dirent.Fileno", Field, 0, ""},
-		{"Dirent.Ino", Field, 0, ""},
-		{"Dirent.Name", Field, 0, ""},
-		{"Dirent.Namlen", Field, 0, ""},
-		{"Dirent.Off", Field, 0, ""},
-		{"Dirent.Pad0", Field, 12, ""},
-		{"Dirent.Pad1", Field, 12, ""},
-		{"Dirent.Pad_cgo_0", Field, 0, ""},
-		{"Dirent.Reclen", Field, 0, ""},
-		{"Dirent.Seekoff", Field, 0, ""},
-		{"Dirent.Type", Field, 0, ""},
-		{"Dirent.X__d_padding", Field, 3, ""},
-		{"DnsNameCompare", Func, 4, ""},
-		{"DnsQuery", Func, 0, ""},
-		{"DnsRecordListFree", Func, 0, ""},
-		{"DnsSectionAdditional", Const, 4, ""},
-		{"DnsSectionAnswer", Const, 4, ""},
-		{"DnsSectionAuthority", Const, 4, ""},
-		{"DnsSectionQuestion", Const, 4, ""},
-		{"Dup", Func, 0, "func(oldfd int) (fd int, err error)"},
-		{"Dup2", Func, 0, "func(oldfd int, newfd int) (err error)"},
-		{"Dup3", Func, 2, "func(oldfd int, newfd int, flags int) (err error)"},
-		{"DuplicateHandle", Func, 0, ""},
-		{"E2BIG", Const, 0, ""},
-		{"EACCES", Const, 0, ""},
-		{"EADDRINUSE", Const, 0, ""},
-		{"EADDRNOTAVAIL", Const, 0, ""},
-		{"EADV", Const, 0, ""},
-		{"EAFNOSUPPORT", Const, 0, ""},
-		{"EAGAIN", Const, 0, ""},
-		{"EALREADY", Const, 0, ""},
-		{"EAUTH", Const, 0, ""},
-		{"EBADARCH", Const, 0, ""},
-		{"EBADE", Const, 0, ""},
-		{"EBADEXEC", Const, 0, ""},
-		{"EBADF", Const, 0, ""},
-		{"EBADFD", Const, 0, ""},
-		{"EBADMACHO", Const, 0, ""},
-		{"EBADMSG", Const, 0, ""},
-		{"EBADR", Const, 0, ""},
-		{"EBADRPC", Const, 0, ""},
-		{"EBADRQC", Const, 0, ""},
-		{"EBADSLT", Const, 0, ""},
-		{"EBFONT", Const, 0, ""},
-		{"EBUSY", Const, 0, ""},
-		{"ECANCELED", Const, 0, ""},
-		{"ECAPMODE", Const, 1, ""},
-		{"ECHILD", Const, 0, ""},
-		{"ECHO", Const, 0, ""},
-		{"ECHOCTL", Const, 0, ""},
-		{"ECHOE", Const, 0, ""},
-		{"ECHOK", Const, 0, ""},
-		{"ECHOKE", Const, 0, ""},
-		{"ECHONL", Const, 0, ""},
-		{"ECHOPRT", Const, 0, ""},
-		{"ECHRNG", Const, 0, ""},
-		{"ECOMM", Const, 0, ""},
-		{"ECONNABORTED", Const, 0, ""},
-		{"ECONNREFUSED", Const, 0, ""},
-		{"ECONNRESET", Const, 0, ""},
-		{"EDEADLK", Const, 0, ""},
-		{"EDEADLOCK", Const, 0, ""},
-		{"EDESTADDRREQ", Const, 0, ""},
-		{"EDEVERR", Const, 0, ""},
-		{"EDOM", Const, 0, ""},
-		{"EDOOFUS", Const, 0, ""},
-		{"EDOTDOT", Const, 0, ""},
-		{"EDQUOT", Const, 0, ""},
-		{"EEXIST", Const, 0, ""},
-		{"EFAULT", Const, 0, ""},
-		{"EFBIG", Const, 0, ""},
-		{"EFER_LMA", Const, 1, ""},
-		{"EFER_LME", Const, 1, ""},
-		{"EFER_NXE", Const, 1, ""},
-		{"EFER_SCE", Const, 1, ""},
-		{"EFTYPE", Const, 0, ""},
-		{"EHOSTDOWN", Const, 0, ""},
-		{"EHOSTUNREACH", Const, 0, ""},
-		{"EHWPOISON", Const, 0, ""},
-		{"EIDRM", Const, 0, ""},
-		{"EILSEQ", Const, 0, ""},
-		{"EINPROGRESS", Const, 0, ""},
-		{"EINTR", Const, 0, ""},
-		{"EINVAL", Const, 0, ""},
-		{"EIO", Const, 0, ""},
-		{"EIPSEC", Const, 1, ""},
-		{"EISCONN", Const, 0, ""},
-		{"EISDIR", Const, 0, ""},
-		{"EISNAM", Const, 0, ""},
-		{"EKEYEXPIRED", Const, 0, ""},
-		{"EKEYREJECTED", Const, 0, ""},
-		{"EKEYREVOKED", Const, 0, ""},
-		{"EL2HLT", Const, 0, ""},
-		{"EL2NSYNC", Const, 0, ""},
-		{"EL3HLT", Const, 0, ""},
-		{"EL3RST", Const, 0, ""},
-		{"ELAST", Const, 0, ""},
-		{"ELF_NGREG", Const, 0, ""},
-		{"ELF_PRARGSZ", Const, 0, ""},
-		{"ELIBACC", Const, 0, ""},
-		{"ELIBBAD", Const, 0, ""},
-		{"ELIBEXEC", Const, 0, ""},
-		{"ELIBMAX", Const, 0, ""},
-		{"ELIBSCN", Const, 0, ""},
-		{"ELNRNG", Const, 0, ""},
-		{"ELOOP", Const, 0, ""},
-		{"EMEDIUMTYPE", Const, 0, ""},
-		{"EMFILE", Const, 0, ""},
-		{"EMLINK", Const, 0, ""},
-		{"EMSGSIZE", Const, 0, ""},
-		{"EMT_TAGOVF", Const, 1, ""},
-		{"EMULTIHOP", Const, 0, ""},
-		{"EMUL_ENABLED", Const, 1, ""},
-		{"EMUL_LINUX", Const, 1, ""},
-		{"EMUL_LINUX32", Const, 1, ""},
-		{"EMUL_MAXID", Const, 1, ""},
-		{"EMUL_NATIVE", Const, 1, ""},
-		{"ENAMETOOLONG", Const, 0, ""},
-		{"ENAVAIL", Const, 0, ""},
-		{"ENDRUNDISC", Const, 1, ""},
-		{"ENEEDAUTH", Const, 0, ""},
-		{"ENETDOWN", Const, 0, ""},
-		{"ENETRESET", Const, 0, ""},
-		{"ENETUNREACH", Const, 0, ""},
-		{"ENFILE", Const, 0, ""},
-		{"ENOANO", Const, 0, ""},
-		{"ENOATTR", Const, 0, ""},
-		{"ENOBUFS", Const, 0, ""},
-		{"ENOCSI", Const, 0, ""},
-		{"ENODATA", Const, 0, ""},
-		{"ENODEV", Const, 0, ""},
-		{"ENOENT", Const, 0, ""},
-		{"ENOEXEC", Const, 0, ""},
-		{"ENOKEY", Const, 0, ""},
-		{"ENOLCK", Const, 0, ""},
-		{"ENOLINK", Const, 0, ""},
-		{"ENOMEDIUM", Const, 0, ""},
-		{"ENOMEM", Const, 0, ""},
-		{"ENOMSG", Const, 0, ""},
-		{"ENONET", Const, 0, ""},
-		{"ENOPKG", Const, 0, ""},
-		{"ENOPOLICY", Const, 0, ""},
-		{"ENOPROTOOPT", Const, 0, ""},
-		{"ENOSPC", Const, 0, ""},
-		{"ENOSR", Const, 0, ""},
-		{"ENOSTR", Const, 0, ""},
-		{"ENOSYS", Const, 0, ""},
-		{"ENOTBLK", Const, 0, ""},
-		{"ENOTCAPABLE", Const, 0, ""},
-		{"ENOTCONN", Const, 0, ""},
-		{"ENOTDIR", Const, 0, ""},
-		{"ENOTEMPTY", Const, 0, ""},
-		{"ENOTNAM", Const, 0, ""},
-		{"ENOTRECOVERABLE", Const, 0, ""},
-		{"ENOTSOCK", Const, 0, ""},
-		{"ENOTSUP", Const, 0, ""},
-		{"ENOTTY", Const, 0, ""},
-		{"ENOTUNIQ", Const, 0, ""},
-		{"ENXIO", Const, 0, ""},
-		{"EN_SW_CTL_INF", Const, 1, ""},
-		{"EN_SW_CTL_PREC", Const, 1, ""},
-		{"EN_SW_CTL_ROUND", Const, 1, ""},
-		{"EN_SW_DATACHAIN", Const, 1, ""},
-		{"EN_SW_DENORM", Const, 1, ""},
-		{"EN_SW_INVOP", Const, 1, ""},
-		{"EN_SW_OVERFLOW", Const, 1, ""},
-		{"EN_SW_PRECLOSS", Const, 1, ""},
-		{"EN_SW_UNDERFLOW", Const, 1, ""},
-		{"EN_SW_ZERODIV", Const, 1, ""},
-		{"EOPNOTSUPP", Const, 0, ""},
-		{"EOVERFLOW", Const, 0, ""},
-		{"EOWNERDEAD", Const, 0, ""},
-		{"EPERM", Const, 0, ""},
-		{"EPFNOSUPPORT", Const, 0, ""},
-		{"EPIPE", Const, 0, ""},
-		{"EPOLLERR", Const, 0, ""},
-		{"EPOLLET", Const, 0, ""},
-		{"EPOLLHUP", Const, 0, ""},
-		{"EPOLLIN", Const, 0, ""},
-		{"EPOLLMSG", Const, 0, ""},
-		{"EPOLLONESHOT", Const, 0, ""},
-		{"EPOLLOUT", Const, 0, ""},
-		{"EPOLLPRI", Const, 0, ""},
-		{"EPOLLRDBAND", Const, 0, ""},
-		{"EPOLLRDHUP", Const, 0, ""},
-		{"EPOLLRDNORM", Const, 0, ""},
-		{"EPOLLWRBAND", Const, 0, ""},
-		{"EPOLLWRNORM", Const, 0, ""},
-		{"EPOLL_CLOEXEC", Const, 0, ""},
-		{"EPOLL_CTL_ADD", Const, 0, ""},
-		{"EPOLL_CTL_DEL", Const, 0, ""},
-		{"EPOLL_CTL_MOD", Const, 0, ""},
-		{"EPOLL_NONBLOCK", Const, 0, ""},
-		{"EPROCLIM", Const, 0, ""},
-		{"EPROCUNAVAIL", Const, 0, ""},
-		{"EPROGMISMATCH", Const, 0, ""},
-		{"EPROGUNAVAIL", Const, 0, ""},
-		{"EPROTO", Const, 0, ""},
-		{"EPROTONOSUPPORT", Const, 0, ""},
-		{"EPROTOTYPE", Const, 0, ""},
-		{"EPWROFF", Const, 0, ""},
-		{"EQFULL", Const, 16, ""},
-		{"ERANGE", Const, 0, ""},
-		{"EREMCHG", Const, 0, ""},
-		{"EREMOTE", Const, 0, ""},
-		{"EREMOTEIO", Const, 0, ""},
-		{"ERESTART", Const, 0, ""},
-		{"ERFKILL", Const, 0, ""},
-		{"EROFS", Const, 0, ""},
-		{"ERPCMISMATCH", Const, 0, ""},
-		{"ERROR_ACCESS_DENIED", Const, 0, ""},
-		{"ERROR_ALREADY_EXISTS", Const, 0, ""},
-		{"ERROR_BROKEN_PIPE", Const, 0, ""},
-		{"ERROR_BUFFER_OVERFLOW", Const, 0, ""},
-		{"ERROR_DIR_NOT_EMPTY", Const, 8, ""},
-		{"ERROR_ENVVAR_NOT_FOUND", Const, 0, ""},
-		{"ERROR_FILE_EXISTS", Const, 0, ""},
-		{"ERROR_FILE_NOT_FOUND", Const, 0, ""},
-		{"ERROR_HANDLE_EOF", Const, 2, ""},
-		{"ERROR_INSUFFICIENT_BUFFER", Const, 0, ""},
-		{"ERROR_IO_PENDING", Const, 0, ""},
-		{"ERROR_MOD_NOT_FOUND", Const, 0, ""},
-		{"ERROR_MORE_DATA", Const, 3, ""},
-		{"ERROR_NETNAME_DELETED", Const, 3, ""},
-		{"ERROR_NOT_FOUND", Const, 1, ""},
-		{"ERROR_NO_MORE_FILES", Const, 0, ""},
-		{"ERROR_OPERATION_ABORTED", Const, 0, ""},
-		{"ERROR_PATH_NOT_FOUND", Const, 0, ""},
-		{"ERROR_PRIVILEGE_NOT_HELD", Const, 4, ""},
-		{"ERROR_PROC_NOT_FOUND", Const, 0, ""},
-		{"ESHLIBVERS", Const, 0, ""},
-		{"ESHUTDOWN", Const, 0, ""},
-		{"ESOCKTNOSUPPORT", Const, 0, ""},
-		{"ESPIPE", Const, 0, ""},
-		{"ESRCH", Const, 0, ""},
-		{"ESRMNT", Const, 0, ""},
-		{"ESTALE", Const, 0, ""},
-		{"ESTRPIPE", Const, 0, ""},
-		{"ETHERCAP_JUMBO_MTU", Const, 1, ""},
-		{"ETHERCAP_VLAN_HWTAGGING", Const, 1, ""},
-		{"ETHERCAP_VLAN_MTU", Const, 1, ""},
-		{"ETHERMIN", Const, 1, ""},
-		{"ETHERMTU", Const, 1, ""},
-		{"ETHERMTU_JUMBO", Const, 1, ""},
-		{"ETHERTYPE_8023", Const, 1, ""},
-		{"ETHERTYPE_AARP", Const, 1, ""},
-		{"ETHERTYPE_ACCTON", Const, 1, ""},
-		{"ETHERTYPE_AEONIC", Const, 1, ""},
-		{"ETHERTYPE_ALPHA", Const, 1, ""},
-		{"ETHERTYPE_AMBER", Const, 1, ""},
-		{"ETHERTYPE_AMOEBA", Const, 1, ""},
-		{"ETHERTYPE_AOE", Const, 1, ""},
-		{"ETHERTYPE_APOLLO", Const, 1, ""},
-		{"ETHERTYPE_APOLLODOMAIN", Const, 1, ""},
-		{"ETHERTYPE_APPLETALK", Const, 1, ""},
-		{"ETHERTYPE_APPLITEK", Const, 1, ""},
-		{"ETHERTYPE_ARGONAUT", Const, 1, ""},
-		{"ETHERTYPE_ARP", Const, 1, ""},
-		{"ETHERTYPE_AT", Const, 1, ""},
-		{"ETHERTYPE_ATALK", Const, 1, ""},
-		{"ETHERTYPE_ATOMIC", Const, 1, ""},
-		{"ETHERTYPE_ATT", Const, 1, ""},
-		{"ETHERTYPE_ATTSTANFORD", Const, 1, ""},
-		{"ETHERTYPE_AUTOPHON", Const, 1, ""},
-		{"ETHERTYPE_AXIS", Const, 1, ""},
-		{"ETHERTYPE_BCLOOP", Const, 1, ""},
-		{"ETHERTYPE_BOFL", Const, 1, ""},
-		{"ETHERTYPE_CABLETRON", Const, 1, ""},
-		{"ETHERTYPE_CHAOS", Const, 1, ""},
-		{"ETHERTYPE_COMDESIGN", Const, 1, ""},
-		{"ETHERTYPE_COMPUGRAPHIC", Const, 1, ""},
-		{"ETHERTYPE_COUNTERPOINT", Const, 1, ""},
-		{"ETHERTYPE_CRONUS", Const, 1, ""},
-		{"ETHERTYPE_CRONUSVLN", Const, 1, ""},
-		{"ETHERTYPE_DCA", Const, 1, ""},
-		{"ETHERTYPE_DDE", Const, 1, ""},
-		{"ETHERTYPE_DEBNI", Const, 1, ""},
-		{"ETHERTYPE_DECAM", Const, 1, ""},
-		{"ETHERTYPE_DECCUST", Const, 1, ""},
-		{"ETHERTYPE_DECDIAG", Const, 1, ""},
-		{"ETHERTYPE_DECDNS", Const, 1, ""},
-		{"ETHERTYPE_DECDTS", Const, 1, ""},
-		{"ETHERTYPE_DECEXPER", Const, 1, ""},
-		{"ETHERTYPE_DECLAST", Const, 1, ""},
-		{"ETHERTYPE_DECLTM", Const, 1, ""},
-		{"ETHERTYPE_DECMUMPS", Const, 1, ""},
-		{"ETHERTYPE_DECNETBIOS", Const, 1, ""},
-		{"ETHERTYPE_DELTACON", Const, 1, ""},
-		{"ETHERTYPE_DIDDLE", Const, 1, ""},
-		{"ETHERTYPE_DLOG1", Const, 1, ""},
-		{"ETHERTYPE_DLOG2", Const, 1, ""},
-		{"ETHERTYPE_DN", Const, 1, ""},
-		{"ETHERTYPE_DOGFIGHT", Const, 1, ""},
-		{"ETHERTYPE_DSMD", Const, 1, ""},
-		{"ETHERTYPE_ECMA", Const, 1, ""},
-		{"ETHERTYPE_ENCRYPT", Const, 1, ""},
-		{"ETHERTYPE_ES", Const, 1, ""},
-		{"ETHERTYPE_EXCELAN", Const, 1, ""},
-		{"ETHERTYPE_EXPERDATA", Const, 1, ""},
-		{"ETHERTYPE_FLIP", Const, 1, ""},
-		{"ETHERTYPE_FLOWCONTROL", Const, 1, ""},
-		{"ETHERTYPE_FRARP", Const, 1, ""},
-		{"ETHERTYPE_GENDYN", Const, 1, ""},
-		{"ETHERTYPE_HAYES", Const, 1, ""},
-		{"ETHERTYPE_HIPPI_FP", Const, 1, ""},
-		{"ETHERTYPE_HITACHI", Const, 1, ""},
-		{"ETHERTYPE_HP", Const, 1, ""},
-		{"ETHERTYPE_IEEEPUP", Const, 1, ""},
-		{"ETHERTYPE_IEEEPUPAT", Const, 1, ""},
-		{"ETHERTYPE_IMLBL", Const, 1, ""},
-		{"ETHERTYPE_IMLBLDIAG", Const, 1, ""},
-		{"ETHERTYPE_IP", Const, 1, ""},
-		{"ETHERTYPE_IPAS", Const, 1, ""},
-		{"ETHERTYPE_IPV6", Const, 1, ""},
-		{"ETHERTYPE_IPX", Const, 1, ""},
-		{"ETHERTYPE_IPXNEW", Const, 1, ""},
-		{"ETHERTYPE_KALPANA", Const, 1, ""},
-		{"ETHERTYPE_LANBRIDGE", Const, 1, ""},
-		{"ETHERTYPE_LANPROBE", Const, 1, ""},
-		{"ETHERTYPE_LAT", Const, 1, ""},
-		{"ETHERTYPE_LBACK", Const, 1, ""},
-		{"ETHERTYPE_LITTLE", Const, 1, ""},
-		{"ETHERTYPE_LLDP", Const, 1, ""},
-		{"ETHERTYPE_LOGICRAFT", Const, 1, ""},
-		{"ETHERTYPE_LOOPBACK", Const, 1, ""},
-		{"ETHERTYPE_MATRA", Const, 1, ""},
-		{"ETHERTYPE_MAX", Const, 1, ""},
-		{"ETHERTYPE_MERIT", Const, 1, ""},
-		{"ETHERTYPE_MICP", Const, 1, ""},
-		{"ETHERTYPE_MOPDL", Const, 1, ""},
-		{"ETHERTYPE_MOPRC", Const, 1, ""},
-		{"ETHERTYPE_MOTOROLA", Const, 1, ""},
-		{"ETHERTYPE_MPLS", Const, 1, ""},
-		{"ETHERTYPE_MPLS_MCAST", Const, 1, ""},
-		{"ETHERTYPE_MUMPS", Const, 1, ""},
-		{"ETHERTYPE_NBPCC", Const, 1, ""},
-		{"ETHERTYPE_NBPCLAIM", Const, 1, ""},
-		{"ETHERTYPE_NBPCLREQ", Const, 1, ""},
-		{"ETHERTYPE_NBPCLRSP", Const, 1, ""},
-		{"ETHERTYPE_NBPCREQ", Const, 1, ""},
-		{"ETHERTYPE_NBPCRSP", Const, 1, ""},
-		{"ETHERTYPE_NBPDG", Const, 1, ""},
-		{"ETHERTYPE_NBPDGB", Const, 1, ""},
-		{"ETHERTYPE_NBPDLTE", Const, 1, ""},
-		{"ETHERTYPE_NBPRAR", Const, 1, ""},
-		{"ETHERTYPE_NBPRAS", Const, 1, ""},
-		{"ETHERTYPE_NBPRST", Const, 1, ""},
-		{"ETHERTYPE_NBPSCD", Const, 1, ""},
-		{"ETHERTYPE_NBPVCD", Const, 1, ""},
-		{"ETHERTYPE_NBS", Const, 1, ""},
-		{"ETHERTYPE_NCD", Const, 1, ""},
-		{"ETHERTYPE_NESTAR", Const, 1, ""},
-		{"ETHERTYPE_NETBEUI", Const, 1, ""},
-		{"ETHERTYPE_NOVELL", Const, 1, ""},
-		{"ETHERTYPE_NS", Const, 1, ""},
-		{"ETHERTYPE_NSAT", Const, 1, ""},
-		{"ETHERTYPE_NSCOMPAT", Const, 1, ""},
-		{"ETHERTYPE_NTRAILER", Const, 1, ""},
-		{"ETHERTYPE_OS9", Const, 1, ""},
-		{"ETHERTYPE_OS9NET", Const, 1, ""},
-		{"ETHERTYPE_PACER", Const, 1, ""},
-		{"ETHERTYPE_PAE", Const, 1, ""},
-		{"ETHERTYPE_PCS", Const, 1, ""},
-		{"ETHERTYPE_PLANNING", Const, 1, ""},
-		{"ETHERTYPE_PPP", Const, 1, ""},
-		{"ETHERTYPE_PPPOE", Const, 1, ""},
-		{"ETHERTYPE_PPPOEDISC", Const, 1, ""},
-		{"ETHERTYPE_PRIMENTS", Const, 1, ""},
-		{"ETHERTYPE_PUP", Const, 1, ""},
-		{"ETHERTYPE_PUPAT", Const, 1, ""},
-		{"ETHERTYPE_QINQ", Const, 1, ""},
-		{"ETHERTYPE_RACAL", Const, 1, ""},
-		{"ETHERTYPE_RATIONAL", Const, 1, ""},
-		{"ETHERTYPE_RAWFR", Const, 1, ""},
-		{"ETHERTYPE_RCL", Const, 1, ""},
-		{"ETHERTYPE_RDP", Const, 1, ""},
-		{"ETHERTYPE_RETIX", Const, 1, ""},
-		{"ETHERTYPE_REVARP", Const, 1, ""},
-		{"ETHERTYPE_SCA", Const, 1, ""},
-		{"ETHERTYPE_SECTRA", Const, 1, ""},
-		{"ETHERTYPE_SECUREDATA", Const, 1, ""},
-		{"ETHERTYPE_SGITW", Const, 1, ""},
-		{"ETHERTYPE_SG_BOUNCE", Const, 1, ""},
-		{"ETHERTYPE_SG_DIAG", Const, 1, ""},
-		{"ETHERTYPE_SG_NETGAMES", Const, 1, ""},
-		{"ETHERTYPE_SG_RESV", Const, 1, ""},
-		{"ETHERTYPE_SIMNET", Const, 1, ""},
-		{"ETHERTYPE_SLOW", Const, 1, ""},
-		{"ETHERTYPE_SLOWPROTOCOLS", Const, 1, ""},
-		{"ETHERTYPE_SNA", Const, 1, ""},
-		{"ETHERTYPE_SNMP", Const, 1, ""},
-		{"ETHERTYPE_SONIX", Const, 1, ""},
-		{"ETHERTYPE_SPIDER", Const, 1, ""},
-		{"ETHERTYPE_SPRITE", Const, 1, ""},
-		{"ETHERTYPE_STP", Const, 1, ""},
-		{"ETHERTYPE_TALARIS", Const, 1, ""},
-		{"ETHERTYPE_TALARISMC", Const, 1, ""},
-		{"ETHERTYPE_TCPCOMP", Const, 1, ""},
-		{"ETHERTYPE_TCPSM", Const, 1, ""},
-		{"ETHERTYPE_TEC", Const, 1, ""},
-		{"ETHERTYPE_TIGAN", Const, 1, ""},
-		{"ETHERTYPE_TRAIL", Const, 1, ""},
-		{"ETHERTYPE_TRANSETHER", Const, 1, ""},
-		{"ETHERTYPE_TYMSHARE", Const, 1, ""},
-		{"ETHERTYPE_UBBST", Const, 1, ""},
-		{"ETHERTYPE_UBDEBUG", Const, 1, ""},
-		{"ETHERTYPE_UBDIAGLOOP", Const, 1, ""},
-		{"ETHERTYPE_UBDL", Const, 1, ""},
-		{"ETHERTYPE_UBNIU", Const, 1, ""},
-		{"ETHERTYPE_UBNMC", Const, 1, ""},
-		{"ETHERTYPE_VALID", Const, 1, ""},
-		{"ETHERTYPE_VARIAN", Const, 1, ""},
-		{"ETHERTYPE_VAXELN", Const, 1, ""},
-		{"ETHERTYPE_VEECO", Const, 1, ""},
-		{"ETHERTYPE_VEXP", Const, 1, ""},
-		{"ETHERTYPE_VGLAB", Const, 1, ""},
-		{"ETHERTYPE_VINES", Const, 1, ""},
-		{"ETHERTYPE_VINESECHO", Const, 1, ""},
-		{"ETHERTYPE_VINESLOOP", Const, 1, ""},
-		{"ETHERTYPE_VITAL", Const, 1, ""},
-		{"ETHERTYPE_VLAN", Const, 1, ""},
-		{"ETHERTYPE_VLTLMAN", Const, 1, ""},
-		{"ETHERTYPE_VPROD", Const, 1, ""},
-		{"ETHERTYPE_VURESERVED", Const, 1, ""},
-		{"ETHERTYPE_WATERLOO", Const, 1, ""},
-		{"ETHERTYPE_WELLFLEET", Const, 1, ""},
-		{"ETHERTYPE_X25", Const, 1, ""},
-		{"ETHERTYPE_X75", Const, 1, ""},
-		{"ETHERTYPE_XNSSM", Const, 1, ""},
-		{"ETHERTYPE_XTP", Const, 1, ""},
-		{"ETHER_ADDR_LEN", Const, 1, ""},
-		{"ETHER_ALIGN", Const, 1, ""},
-		{"ETHER_CRC_LEN", Const, 1, ""},
-		{"ETHER_CRC_POLY_BE", Const, 1, ""},
-		{"ETHER_CRC_POLY_LE", Const, 1, ""},
-		{"ETHER_HDR_LEN", Const, 1, ""},
-		{"ETHER_MAX_DIX_LEN", Const, 1, ""},
-		{"ETHER_MAX_LEN", Const, 1, ""},
-		{"ETHER_MAX_LEN_JUMBO", Const, 1, ""},
-		{"ETHER_MIN_LEN", Const, 1, ""},
-		{"ETHER_PPPOE_ENCAP_LEN", Const, 1, ""},
-		{"ETHER_TYPE_LEN", Const, 1, ""},
-		{"ETHER_VLAN_ENCAP_LEN", Const, 1, ""},
-		{"ETH_P_1588", Const, 0, ""},
-		{"ETH_P_8021Q", Const, 0, ""},
-		{"ETH_P_802_2", Const, 0, ""},
-		{"ETH_P_802_3", Const, 0, ""},
-		{"ETH_P_AARP", Const, 0, ""},
-		{"ETH_P_ALL", Const, 0, ""},
-		{"ETH_P_AOE", Const, 0, ""},
-		{"ETH_P_ARCNET", Const, 0, ""},
-		{"ETH_P_ARP", Const, 0, ""},
-		{"ETH_P_ATALK", Const, 0, ""},
-		{"ETH_P_ATMFATE", Const, 0, ""},
-		{"ETH_P_ATMMPOA", Const, 0, ""},
-		{"ETH_P_AX25", Const, 0, ""},
-		{"ETH_P_BPQ", Const, 0, ""},
-		{"ETH_P_CAIF", Const, 0, ""},
-		{"ETH_P_CAN", Const, 0, ""},
-		{"ETH_P_CONTROL", Const, 0, ""},
-		{"ETH_P_CUST", Const, 0, ""},
-		{"ETH_P_DDCMP", Const, 0, ""},
-		{"ETH_P_DEC", Const, 0, ""},
-		{"ETH_P_DIAG", Const, 0, ""},
-		{"ETH_P_DNA_DL", Const, 0, ""},
-		{"ETH_P_DNA_RC", Const, 0, ""},
-		{"ETH_P_DNA_RT", Const, 0, ""},
-		{"ETH_P_DSA", Const, 0, ""},
-		{"ETH_P_ECONET", Const, 0, ""},
-		{"ETH_P_EDSA", Const, 0, ""},
-		{"ETH_P_FCOE", Const, 0, ""},
-		{"ETH_P_FIP", Const, 0, ""},
-		{"ETH_P_HDLC", Const, 0, ""},
-		{"ETH_P_IEEE802154", Const, 0, ""},
-		{"ETH_P_IEEEPUP", Const, 0, ""},
-		{"ETH_P_IEEEPUPAT", Const, 0, ""},
-		{"ETH_P_IP", Const, 0, ""},
-		{"ETH_P_IPV6", Const, 0, ""},
-		{"ETH_P_IPX", Const, 0, ""},
-		{"ETH_P_IRDA", Const, 0, ""},
-		{"ETH_P_LAT", Const, 0, ""},
-		{"ETH_P_LINK_CTL", Const, 0, ""},
-		{"ETH_P_LOCALTALK", Const, 0, ""},
-		{"ETH_P_LOOP", Const, 0, ""},
-		{"ETH_P_MOBITEX", Const, 0, ""},
-		{"ETH_P_MPLS_MC", Const, 0, ""},
-		{"ETH_P_MPLS_UC", Const, 0, ""},
-		{"ETH_P_PAE", Const, 0, ""},
-		{"ETH_P_PAUSE", Const, 0, ""},
-		{"ETH_P_PHONET", Const, 0, ""},
-		{"ETH_P_PPPTALK", Const, 0, ""},
-		{"ETH_P_PPP_DISC", Const, 0, ""},
-		{"ETH_P_PPP_MP", Const, 0, ""},
-		{"ETH_P_PPP_SES", Const, 0, ""},
-		{"ETH_P_PUP", Const, 0, ""},
-		{"ETH_P_PUPAT", Const, 0, ""},
-		{"ETH_P_RARP", Const, 0, ""},
-		{"ETH_P_SCA", Const, 0, ""},
-		{"ETH_P_SLOW", Const, 0, ""},
-		{"ETH_P_SNAP", Const, 0, ""},
-		{"ETH_P_TEB", Const, 0, ""},
-		{"ETH_P_TIPC", Const, 0, ""},
-		{"ETH_P_TRAILER", Const, 0, ""},
-		{"ETH_P_TR_802_2", Const, 0, ""},
-		{"ETH_P_WAN_PPP", Const, 0, ""},
-		{"ETH_P_WCCP", Const, 0, ""},
-		{"ETH_P_X25", Const, 0, ""},
-		{"ETIME", Const, 0, ""},
-		{"ETIMEDOUT", Const, 0, ""},
-		{"ETOOMANYREFS", Const, 0, ""},
-		{"ETXTBSY", Const, 0, ""},
-		{"EUCLEAN", Const, 0, ""},
-		{"EUNATCH", Const, 0, ""},
-		{"EUSERS", Const, 0, ""},
-		{"EVFILT_AIO", Const, 0, ""},
-		{"EVFILT_FS", Const, 0, ""},
-		{"EVFILT_LIO", Const, 0, ""},
-		{"EVFILT_MACHPORT", Const, 0, ""},
-		{"EVFILT_PROC", Const, 0, ""},
-		{"EVFILT_READ", Const, 0, ""},
-		{"EVFILT_SIGNAL", Const, 0, ""},
-		{"EVFILT_SYSCOUNT", Const, 0, ""},
-		{"EVFILT_THREADMARKER", Const, 0, ""},
-		{"EVFILT_TIMER", Const, 0, ""},
-		{"EVFILT_USER", Const, 0, ""},
-		{"EVFILT_VM", Const, 0, ""},
-		{"EVFILT_VNODE", Const, 0, ""},
-		{"EVFILT_WRITE", Const, 0, ""},
-		{"EV_ADD", Const, 0, ""},
-		{"EV_CLEAR", Const, 0, ""},
-		{"EV_DELETE", Const, 0, ""},
-		{"EV_DISABLE", Const, 0, ""},
-		{"EV_DISPATCH", Const, 0, ""},
-		{"EV_DROP", Const, 3, ""},
-		{"EV_ENABLE", Const, 0, ""},
-		{"EV_EOF", Const, 0, ""},
-		{"EV_ERROR", Const, 0, ""},
-		{"EV_FLAG0", Const, 0, ""},
-		{"EV_FLAG1", Const, 0, ""},
-		{"EV_ONESHOT", Const, 0, ""},
-		{"EV_OOBAND", Const, 0, ""},
-		{"EV_POLL", Const, 0, ""},
-		{"EV_RECEIPT", Const, 0, ""},
-		{"EV_SYSFLAGS", Const, 0, ""},
-		{"EWINDOWS", Const, 0, ""},
-		{"EWOULDBLOCK", Const, 0, ""},
-		{"EXDEV", Const, 0, ""},
-		{"EXFULL", Const, 0, ""},
-		{"EXTA", Const, 0, ""},
-		{"EXTB", Const, 0, ""},
-		{"EXTPROC", Const, 0, ""},
-		{"Environ", Func, 0, "func() []string"},
-		{"EpollCreate", Func, 0, "func(size int) (fd int, err error)"},
-		{"EpollCreate1", Func, 0, "func(flag int) (fd int, err error)"},
-		{"EpollCtl", Func, 0, "func(epfd int, op int, fd int, event *EpollEvent) (err error)"},
-		{"EpollEvent", Type, 0, ""},
-		{"EpollEvent.Events", Field, 0, ""},
-		{"EpollEvent.Fd", Field, 0, ""},
-		{"EpollEvent.Pad", Field, 0, ""},
-		{"EpollEvent.PadFd", Field, 0, ""},
-		{"EpollWait", Func, 0, "func(epfd int, events []EpollEvent, msec int) (n int, err error)"},
-		{"Errno", Type, 0, ""},
-		{"EscapeArg", Func, 0, ""},
-		{"Exchangedata", Func, 0, ""},
-		{"Exec", Func, 0, "func(argv0 string, argv []string, envv []string) (err error)"},
-		{"Exit", Func, 0, "func(code int)"},
-		{"ExitProcess", Func, 0, ""},
-		{"FD_CLOEXEC", Const, 0, ""},
-		{"FD_SETSIZE", Const, 0, ""},
-		{"FILE_ACTION_ADDED", Const, 0, ""},
-		{"FILE_ACTION_MODIFIED", Const, 0, ""},
-		{"FILE_ACTION_REMOVED", Const, 0, ""},
-		{"FILE_ACTION_RENAMED_NEW_NAME", Const, 0, ""},
-		{"FILE_ACTION_RENAMED_OLD_NAME", Const, 0, ""},
-		{"FILE_APPEND_DATA", Const, 0, ""},
-		{"FILE_ATTRIBUTE_ARCHIVE", Const, 0, ""},
-		{"FILE_ATTRIBUTE_DIRECTORY", Const, 0, ""},
-		{"FILE_ATTRIBUTE_HIDDEN", Const, 0, ""},
-		{"FILE_ATTRIBUTE_NORMAL", Const, 0, ""},
-		{"FILE_ATTRIBUTE_READONLY", Const, 0, ""},
-		{"FILE_ATTRIBUTE_REPARSE_POINT", Const, 4, ""},
-		{"FILE_ATTRIBUTE_SYSTEM", Const, 0, ""},
-		{"FILE_BEGIN", Const, 0, ""},
-		{"FILE_CURRENT", Const, 0, ""},
-		{"FILE_END", Const, 0, ""},
-		{"FILE_FLAG_BACKUP_SEMANTICS", Const, 0, ""},
-		{"FILE_FLAG_OPEN_REPARSE_POINT", Const, 4, ""},
-		{"FILE_FLAG_OVERLAPPED", Const, 0, ""},
-		{"FILE_LIST_DIRECTORY", Const, 0, ""},
-		{"FILE_MAP_COPY", Const, 0, ""},
-		{"FILE_MAP_EXECUTE", Const, 0, ""},
-		{"FILE_MAP_READ", Const, 0, ""},
-		{"FILE_MAP_WRITE", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_ATTRIBUTES", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_CREATION", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_DIR_NAME", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_FILE_NAME", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_LAST_ACCESS", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_LAST_WRITE", Const, 0, ""},
-		{"FILE_NOTIFY_CHANGE_SIZE", Const, 0, ""},
-		{"FILE_SHARE_DELETE", Const, 0, ""},
-		{"FILE_SHARE_READ", Const, 0, ""},
-		{"FILE_SHARE_WRITE", Const, 0, ""},
-		{"FILE_SKIP_COMPLETION_PORT_ON_SUCCESS", Const, 2, ""},
-		{"FILE_SKIP_SET_EVENT_ON_HANDLE", Const, 2, ""},
-		{"FILE_TYPE_CHAR", Const, 0, ""},
-		{"FILE_TYPE_DISK", Const, 0, ""},
-		{"FILE_TYPE_PIPE", Const, 0, ""},
-		{"FILE_TYPE_REMOTE", Const, 0, ""},
-		{"FILE_TYPE_UNKNOWN", Const, 0, ""},
-		{"FILE_WRITE_ATTRIBUTES", Const, 0, ""},
-		{"FLUSHO", Const, 0, ""},
-		{"FORMAT_MESSAGE_ALLOCATE_BUFFER", Const, 0, ""},
-		{"FORMAT_MESSAGE_ARGUMENT_ARRAY", Const, 0, ""},
-		{"FORMAT_MESSAGE_FROM_HMODULE", Const, 0, ""},
-		{"FORMAT_MESSAGE_FROM_STRING", Const, 0, ""},
-		{"FORMAT_MESSAGE_FROM_SYSTEM", Const, 0, ""},
-		{"FORMAT_MESSAGE_IGNORE_INSERTS", Const, 0, ""},
-		{"FORMAT_MESSAGE_MAX_WIDTH_MASK", Const, 0, ""},
-		{"FSCTL_GET_REPARSE_POINT", Const, 4, ""},
-		{"F_ADDFILESIGS", Const, 0, ""},
-		{"F_ADDSIGS", Const, 0, ""},
-		{"F_ALLOCATEALL", Const, 0, ""},
-		{"F_ALLOCATECONTIG", Const, 0, ""},
-		{"F_CANCEL", Const, 0, ""},
-		{"F_CHKCLEAN", Const, 0, ""},
-		{"F_CLOSEM", Const, 1, ""},
-		{"F_DUP2FD", Const, 0, ""},
-		{"F_DUP2FD_CLOEXEC", Const, 1, ""},
-		{"F_DUPFD", Const, 0, ""},
-		{"F_DUPFD_CLOEXEC", Const, 0, ""},
-		{"F_EXLCK", Const, 0, ""},
-		{"F_FINDSIGS", Const, 16, ""},
-		{"F_FLUSH_DATA", Const, 0, ""},
-		{"F_FREEZE_FS", Const, 0, ""},
-		{"F_FSCTL", Const, 1, ""},
-		{"F_FSDIRMASK", Const, 1, ""},
-		{"F_FSIN", Const, 1, ""},
-		{"F_FSINOUT", Const, 1, ""},
-		{"F_FSOUT", Const, 1, ""},
-		{"F_FSPRIV", Const, 1, ""},
-		{"F_FSVOID", Const, 1, ""},
-		{"F_FULLFSYNC", Const, 0, ""},
-		{"F_GETCODEDIR", Const, 16, ""},
-		{"F_GETFD", Const, 0, ""},
-		{"F_GETFL", Const, 0, ""},
-		{"F_GETLEASE", Const, 0, ""},
-		{"F_GETLK", Const, 0, ""},
-		{"F_GETLK64", Const, 0, ""},
-		{"F_GETLKPID", Const, 0, ""},
-		{"F_GETNOSIGPIPE", Const, 0, ""},
-		{"F_GETOWN", Const, 0, ""},
-		{"F_GETOWN_EX", Const, 0, ""},
-		{"F_GETPATH", Const, 0, ""},
-		{"F_GETPATH_MTMINFO", Const, 0, ""},
-		{"F_GETPIPE_SZ", Const, 0, ""},
-		{"F_GETPROTECTIONCLASS", Const, 0, ""},
-		{"F_GETPROTECTIONLEVEL", Const, 16, ""},
-		{"F_GETSIG", Const, 0, ""},
-		{"F_GLOBAL_NOCACHE", Const, 0, ""},
-		{"F_LOCK", Const, 0, ""},
-		{"F_LOG2PHYS", Const, 0, ""},
-		{"F_LOG2PHYS_EXT", Const, 0, ""},
-		{"F_MARKDEPENDENCY", Const, 0, ""},
-		{"F_MAXFD", Const, 1, ""},
-		{"F_NOCACHE", Const, 0, ""},
-		{"F_NODIRECT", Const, 0, ""},
-		{"F_NOTIFY", Const, 0, ""},
-		{"F_OGETLK", Const, 0, ""},
-		{"F_OK", Const, 0, ""},
-		{"F_OSETLK", Const, 0, ""},
-		{"F_OSETLKW", Const, 0, ""},
-		{"F_PARAM_MASK", Const, 1, ""},
-		{"F_PARAM_MAX", Const, 1, ""},
-		{"F_PATHPKG_CHECK", Const, 0, ""},
-		{"F_PEOFPOSMODE", Const, 0, ""},
-		{"F_PREALLOCATE", Const, 0, ""},
-		{"F_RDADVISE", Const, 0, ""},
-		{"F_RDAHEAD", Const, 0, ""},
-		{"F_RDLCK", Const, 0, ""},
-		{"F_READAHEAD", Const, 0, ""},
-		{"F_READBOOTSTRAP", Const, 0, ""},
-		{"F_SETBACKINGSTORE", Const, 0, ""},
-		{"F_SETFD", Const, 0, ""},
-		{"F_SETFL", Const, 0, ""},
-		{"F_SETLEASE", Const, 0, ""},
-		{"F_SETLK", Const, 0, ""},
-		{"F_SETLK64", Const, 0, ""},
-		{"F_SETLKW", Const, 0, ""},
-		{"F_SETLKW64", Const, 0, ""},
-		{"F_SETLKWTIMEOUT", Const, 16, ""},
-		{"F_SETLK_REMOTE", Const, 0, ""},
-		{"F_SETNOSIGPIPE", Const, 0, ""},
-		{"F_SETOWN", Const, 0, ""},
-		{"F_SETOWN_EX", Const, 0, ""},
-		{"F_SETPIPE_SZ", Const, 0, ""},
-		{"F_SETPROTECTIONCLASS", Const, 0, ""},
-		{"F_SETSIG", Const, 0, ""},
-		{"F_SETSIZE", Const, 0, ""},
-		{"F_SHLCK", Const, 0, ""},
-		{"F_SINGLE_WRITER", Const, 16, ""},
-		{"F_TEST", Const, 0, ""},
-		{"F_THAW_FS", Const, 0, ""},
-		{"F_TLOCK", Const, 0, ""},
-		{"F_TRANSCODEKEY", Const, 16, ""},
-		{"F_ULOCK", Const, 0, ""},
-		{"F_UNLCK", Const, 0, ""},
-		{"F_UNLCKSYS", Const, 0, ""},
-		{"F_VOLPOSMODE", Const, 0, ""},
-		{"F_WRITEBOOTSTRAP", Const, 0, ""},
-		{"F_WRLCK", Const, 0, ""},
-		{"Faccessat", Func, 0, "func(dirfd int, path string, mode uint32, flags int) (err error)"},
-		{"Fallocate", Func, 0, "func(fd int, mode uint32, off int64, len int64) (err error)"},
-		{"Fbootstraptransfer_t", Type, 0, ""},
-		{"Fbootstraptransfer_t.Buffer", Field, 0, ""},
-		{"Fbootstraptransfer_t.Length", Field, 0, ""},
-		{"Fbootstraptransfer_t.Offset", Field, 0, ""},
-		{"Fchdir", Func, 0, "func(fd int) (err error)"},
-		{"Fchflags", Func, 0, ""},
-		{"Fchmod", Func, 0, "func(fd int, mode uint32) (err error)"},
-		{"Fchmodat", Func, 0, "func(dirfd int, path string, mode uint32, flags int) error"},
-		{"Fchown", Func, 0, "func(fd int, uid int, gid int) (err error)"},
-		{"Fchownat", Func, 0, "func(dirfd int, path string, uid int, gid int, flags int) (err error)"},
-		{"FcntlFlock", Func, 3, "func(fd uintptr, cmd int, lk *Flock_t) error"},
-		{"FdSet", Type, 0, ""},
-		{"FdSet.Bits", Field, 0, ""},
-		{"FdSet.X__fds_bits", Field, 0, ""},
-		{"Fdatasync", Func, 0, "func(fd int) (err error)"},
-		{"FileNotifyInformation", Type, 0, ""},
-		{"FileNotifyInformation.Action", Field, 0, ""},
-		{"FileNotifyInformation.FileName", Field, 0, ""},
-		{"FileNotifyInformation.FileNameLength", Field, 0, ""},
-		{"FileNotifyInformation.NextEntryOffset", Field, 0, ""},
-		{"Filetime", Type, 0, ""},
-		{"Filetime.HighDateTime", Field, 0, ""},
-		{"Filetime.LowDateTime", Field, 0, ""},
-		{"FindClose", Func, 0, ""},
-		{"FindFirstFile", Func, 0, ""},
-		{"FindNextFile", Func, 0, ""},
-		{"Flock", Func, 0, "func(fd int, how int) (err error)"},
-		{"Flock_t", Type, 0, ""},
-		{"Flock_t.Len", Field, 0, ""},
-		{"Flock_t.Pad_cgo_0", Field, 0, ""},
-		{"Flock_t.Pad_cgo_1", Field, 3, ""},
-		{"Flock_t.Pid", Field, 0, ""},
-		{"Flock_t.Start", Field, 0, ""},
-		{"Flock_t.Sysid", Field, 0, ""},
-		{"Flock_t.Type", Field, 0, ""},
-		{"Flock_t.Whence", Field, 0, ""},
-		{"FlushBpf", Func, 0, ""},
-		{"FlushFileBuffers", Func, 0, ""},
-		{"FlushViewOfFile", Func, 0, ""},
-		{"ForkExec", Func, 0, "func(argv0 string, argv []string, attr *ProcAttr) (pid int, err error)"},
-		{"ForkLock", Var, 0, ""},
-		{"FormatMessage", Func, 0, ""},
-		{"Fpathconf", Func, 0, ""},
-		{"FreeAddrInfoW", Func, 1, ""},
-		{"FreeEnvironmentStrings", Func, 0, ""},
-		{"FreeLibrary", Func, 0, ""},
-		{"Fsid", Type, 0, ""},
-		{"Fsid.Val", Field, 0, ""},
-		{"Fsid.X__fsid_val", Field, 2, ""},
-		{"Fsid.X__val", Field, 0, ""},
-		{"Fstat", Func, 0, "func(fd int, stat *Stat_t) (err error)"},
-		{"Fstatat", Func, 12, ""},
-		{"Fstatfs", Func, 0, "func(fd int, buf *Statfs_t) (err error)"},
-		{"Fstore_t", Type, 0, ""},
-		{"Fstore_t.Bytesalloc", Field, 0, ""},
-		{"Fstore_t.Flags", Field, 0, ""},
-		{"Fstore_t.Length", Field, 0, ""},
-		{"Fstore_t.Offset", Field, 0, ""},
-		{"Fstore_t.Posmode", Field, 0, ""},
-		{"Fsync", Func, 0, "func(fd int) (err error)"},
-		{"Ftruncate", Func, 0, "func(fd int, length int64) (err error)"},
-		{"FullPath", Func, 4, ""},
-		{"Futimes", Func, 0, "func(fd int, tv []Timeval) (err error)"},
-		{"Futimesat", Func, 0, "func(dirfd int, path string, tv []Timeval) (err error)"},
-		{"GENERIC_ALL", Const, 0, ""},
-		{"GENERIC_EXECUTE", Const, 0, ""},
-		{"GENERIC_READ", Const, 0, ""},
-		{"GENERIC_WRITE", Const, 0, ""},
-		{"GUID", Type, 1, ""},
-		{"GUID.Data1", Field, 1, ""},
-		{"GUID.Data2", Field, 1, ""},
-		{"GUID.Data3", Field, 1, ""},
-		{"GUID.Data4", Field, 1, ""},
-		{"GetAcceptExSockaddrs", Func, 0, ""},
-		{"GetAdaptersInfo", Func, 0, ""},
-		{"GetAddrInfoW", Func, 1, ""},
-		{"GetCommandLine", Func, 0, ""},
-		{"GetComputerName", Func, 0, ""},
-		{"GetConsoleMode", Func, 1, ""},
-		{"GetCurrentDirectory", Func, 0, ""},
-		{"GetCurrentProcess", Func, 0, ""},
-		{"GetEnvironmentStrings", Func, 0, ""},
-		{"GetEnvironmentVariable", Func, 0, ""},
-		{"GetExitCodeProcess", Func, 0, ""},
-		{"GetFileAttributes", Func, 0, ""},
-		{"GetFileAttributesEx", Func, 0, ""},
-		{"GetFileExInfoStandard", Const, 0, ""},
-		{"GetFileExMaxInfoLevel", Const, 0, ""},
-		{"GetFileInformationByHandle", Func, 0, ""},
-		{"GetFileType", Func, 0, ""},
-		{"GetFullPathName", Func, 0, ""},
-		{"GetHostByName", Func, 0, ""},
-		{"GetIfEntry", Func, 0, ""},
-		{"GetLastError", Func, 0, ""},
-		{"GetLengthSid", Func, 0, ""},
-		{"GetLongPathName", Func, 0, ""},
-		{"GetProcAddress", Func, 0, ""},
-		{"GetProcessTimes", Func, 0, ""},
-		{"GetProtoByName", Func, 0, ""},
-		{"GetQueuedCompletionStatus", Func, 0, ""},
-		{"GetServByName", Func, 0, ""},
-		{"GetShortPathName", Func, 0, ""},
-		{"GetStartupInfo", Func, 0, ""},
-		{"GetStdHandle", Func, 0, ""},
-		{"GetSystemTimeAsFileTime", Func, 0, ""},
-		{"GetTempPath", Func, 0, ""},
-		{"GetTimeZoneInformation", Func, 0, ""},
-		{"GetTokenInformation", Func, 0, ""},
-		{"GetUserNameEx", Func, 0, ""},
-		{"GetUserProfileDirectory", Func, 0, ""},
-		{"GetVersion", Func, 0, ""},
-		{"Getcwd", Func, 0, "func(buf []byte) (n int, err error)"},
-		{"Getdents", Func, 0, "func(fd int, buf []byte) (n int, err error)"},
-		{"Getdirentries", Func, 0, ""},
-		{"Getdtablesize", Func, 0, ""},
-		{"Getegid", Func, 0, "func() (egid int)"},
-		{"Getenv", Func, 0, "func(key string) (value string, found bool)"},
-		{"Geteuid", Func, 0, "func() (euid int)"},
-		{"Getfsstat", Func, 0, ""},
-		{"Getgid", Func, 0, "func() (gid int)"},
-		{"Getgroups", Func, 0, "func() (gids []int, err error)"},
-		{"Getpagesize", Func, 0, "func() int"},
-		{"Getpeername", Func, 0, "func(fd int) (sa Sockaddr, err error)"},
-		{"Getpgid", Func, 0, "func(pid int) (pgid int, err error)"},
-		{"Getpgrp", Func, 0, "func() (pid int)"},
-		{"Getpid", Func, 0, "func() (pid int)"},
-		{"Getppid", Func, 0, "func() (ppid int)"},
-		{"Getpriority", Func, 0, "func(which int, who int) (prio int, err error)"},
-		{"Getrlimit", Func, 0, "func(resource int, rlim *Rlimit) (err error)"},
-		{"Getrusage", Func, 0, "func(who int, rusage *Rusage) (err error)"},
-		{"Getsid", Func, 0, ""},
-		{"Getsockname", Func, 0, "func(fd int) (sa Sockaddr, err error)"},
-		{"Getsockopt", Func, 1, ""},
-		{"GetsockoptByte", Func, 0, ""},
-		{"GetsockoptICMPv6Filter", Func, 2, "func(fd int, level int, opt int) (*ICMPv6Filter, error)"},
-		{"GetsockoptIPMreq", Func, 0, "func(fd int, level int, opt int) (*IPMreq, error)"},
-		{"GetsockoptIPMreqn", Func, 0, "func(fd int, level int, opt int) (*IPMreqn, error)"},
-		{"GetsockoptIPv6MTUInfo", Func, 2, "func(fd int, level int, opt int) (*IPv6MTUInfo, error)"},
-		{"GetsockoptIPv6Mreq", Func, 0, "func(fd int, level int, opt int) (*IPv6Mreq, error)"},
-		{"GetsockoptInet4Addr", Func, 0, "func(fd int, level int, opt int) (value [4]byte, err error)"},
-		{"GetsockoptInt", Func, 0, "func(fd int, level int, opt int) (value int, err error)"},
-		{"GetsockoptUcred", Func, 1, "func(fd int, level int, opt int) (*Ucred, error)"},
-		{"Gettid", Func, 0, "func() (tid int)"},
-		{"Gettimeofday", Func, 0, "func(tv *Timeval) (err error)"},
-		{"Getuid", Func, 0, "func() (uid int)"},
-		{"Getwd", Func, 0, "func() (wd string, err error)"},
-		{"Getxattr", Func, 1, "func(path string, attr string, dest []byte) (sz int, err error)"},
-		{"HANDLE_FLAG_INHERIT", Const, 0, ""},
-		{"HKEY_CLASSES_ROOT", Const, 0, ""},
-		{"HKEY_CURRENT_CONFIG", Const, 0, ""},
-		{"HKEY_CURRENT_USER", Const, 0, ""},
-		{"HKEY_DYN_DATA", Const, 0, ""},
-		{"HKEY_LOCAL_MACHINE", Const, 0, ""},
-		{"HKEY_PERFORMANCE_DATA", Const, 0, ""},
-		{"HKEY_USERS", Const, 0, ""},
-		{"HUPCL", Const, 0, ""},
-		{"Handle", Type, 0, ""},
-		{"Hostent", Type, 0, ""},
-		{"Hostent.AddrList", Field, 0, ""},
-		{"Hostent.AddrType", Field, 0, ""},
-		{"Hostent.Aliases", Field, 0, ""},
-		{"Hostent.Length", Field, 0, ""},
-		{"Hostent.Name", Field, 0, ""},
-		{"ICANON", Const, 0, ""},
-		{"ICMP6_FILTER", Const, 2, ""},
-		{"ICMPV6_FILTER", Const, 2, ""},
-		{"ICMPv6Filter", Type, 2, ""},
-		{"ICMPv6Filter.Data", Field, 2, ""},
-		{"ICMPv6Filter.Filt", Field, 2, ""},
-		{"ICRNL", Const, 0, ""},
-		{"IEXTEN", Const, 0, ""},
-		{"IFAN_ARRIVAL", Const, 1, ""},
-		{"IFAN_DEPARTURE", Const, 1, ""},
-		{"IFA_ADDRESS", Const, 0, ""},
-		{"IFA_ANYCAST", Const, 0, ""},
-		{"IFA_BROADCAST", Const, 0, ""},
-		{"IFA_CACHEINFO", Const, 0, ""},
-		{"IFA_F_DADFAILED", Const, 0, ""},
-		{"IFA_F_DEPRECATED", Const, 0, ""},
-		{"IFA_F_HOMEADDRESS", Const, 0, ""},
-		{"IFA_F_NODAD", Const, 0, ""},
-		{"IFA_F_OPTIMISTIC", Const, 0, ""},
-		{"IFA_F_PERMANENT", Const, 0, ""},
-		{"IFA_F_SECONDARY", Const, 0, ""},
-		{"IFA_F_TEMPORARY", Const, 0, ""},
-		{"IFA_F_TENTATIVE", Const, 0, ""},
-		{"IFA_LABEL", Const, 0, ""},
-		{"IFA_LOCAL", Const, 0, ""},
-		{"IFA_MAX", Const, 0, ""},
-		{"IFA_MULTICAST", Const, 0, ""},
-		{"IFA_ROUTE", Const, 1, ""},
-		{"IFA_UNSPEC", Const, 0, ""},
-		{"IFF_ALLMULTI", Const, 0, ""},
-		{"IFF_ALTPHYS", Const, 0, ""},
-		{"IFF_AUTOMEDIA", Const, 0, ""},
-		{"IFF_BROADCAST", Const, 0, ""},
-		{"IFF_CANTCHANGE", Const, 0, ""},
-		{"IFF_CANTCONFIG", Const, 1, ""},
-		{"IFF_DEBUG", Const, 0, ""},
-		{"IFF_DRV_OACTIVE", Const, 0, ""},
-		{"IFF_DRV_RUNNING", Const, 0, ""},
-		{"IFF_DYING", Const, 0, ""},
-		{"IFF_DYNAMIC", Const, 0, ""},
-		{"IFF_LINK0", Const, 0, ""},
-		{"IFF_LINK1", Const, 0, ""},
-		{"IFF_LINK2", Const, 0, ""},
-		{"IFF_LOOPBACK", Const, 0, ""},
-		{"IFF_MASTER", Const, 0, ""},
-		{"IFF_MONITOR", Const, 0, ""},
-		{"IFF_MULTICAST", Const, 0, ""},
-		{"IFF_NOARP", Const, 0, ""},
-		{"IFF_NOTRAILERS", Const, 0, ""},
-		{"IFF_NO_PI", Const, 0, ""},
-		{"IFF_OACTIVE", Const, 0, ""},
-		{"IFF_ONE_QUEUE", Const, 0, ""},
-		{"IFF_POINTOPOINT", Const, 0, ""},
-		{"IFF_POINTTOPOINT", Const, 0, ""},
-		{"IFF_PORTSEL", Const, 0, ""},
-		{"IFF_PPROMISC", Const, 0, ""},
-		{"IFF_PROMISC", Const, 0, ""},
-		{"IFF_RENAMING", Const, 0, ""},
-		{"IFF_RUNNING", Const, 0, ""},
-		{"IFF_SIMPLEX", Const, 0, ""},
-		{"IFF_SLAVE", Const, 0, ""},
-		{"IFF_SMART", Const, 0, ""},
-		{"IFF_STATICARP", Const, 0, ""},
-		{"IFF_TAP", Const, 0, ""},
-		{"IFF_TUN", Const, 0, ""},
-		{"IFF_TUN_EXCL", Const, 0, ""},
-		{"IFF_UP", Const, 0, ""},
-		{"IFF_VNET_HDR", Const, 0, ""},
-		{"IFLA_ADDRESS", Const, 0, ""},
-		{"IFLA_BROADCAST", Const, 0, ""},
-		{"IFLA_COST", Const, 0, ""},
-		{"IFLA_IFALIAS", Const, 0, ""},
-		{"IFLA_IFNAME", Const, 0, ""},
-		{"IFLA_LINK", Const, 0, ""},
-		{"IFLA_LINKINFO", Const, 0, ""},
-		{"IFLA_LINKMODE", Const, 0, ""},
-		{"IFLA_MAP", Const, 0, ""},
-		{"IFLA_MASTER", Const, 0, ""},
-		{"IFLA_MAX", Const, 0, ""},
-		{"IFLA_MTU", Const, 0, ""},
-		{"IFLA_NET_NS_PID", Const, 0, ""},
-		{"IFLA_OPERSTATE", Const, 0, ""},
-		{"IFLA_PRIORITY", Const, 0, ""},
-		{"IFLA_PROTINFO", Const, 0, ""},
-		{"IFLA_QDISC", Const, 0, ""},
-		{"IFLA_STATS", Const, 0, ""},
-		{"IFLA_TXQLEN", Const, 0, ""},
-		{"IFLA_UNSPEC", Const, 0, ""},
-		{"IFLA_WEIGHT", Const, 0, ""},
-		{"IFLA_WIRELESS", Const, 0, ""},
-		{"IFNAMSIZ", Const, 0, ""},
-		{"IFT_1822", Const, 0, ""},
-		{"IFT_A12MPPSWITCH", Const, 0, ""},
-		{"IFT_AAL2", Const, 0, ""},
-		{"IFT_AAL5", Const, 0, ""},
-		{"IFT_ADSL", Const, 0, ""},
-		{"IFT_AFLANE8023", Const, 0, ""},
-		{"IFT_AFLANE8025", Const, 0, ""},
-		{"IFT_ARAP", Const, 0, ""},
-		{"IFT_ARCNET", Const, 0, ""},
-		{"IFT_ARCNETPLUS", Const, 0, ""},
-		{"IFT_ASYNC", Const, 0, ""},
-		{"IFT_ATM", Const, 0, ""},
-		{"IFT_ATMDXI", Const, 0, ""},
-		{"IFT_ATMFUNI", Const, 0, ""},
-		{"IFT_ATMIMA", Const, 0, ""},
-		{"IFT_ATMLOGICAL", Const, 0, ""},
-		{"IFT_ATMRADIO", Const, 0, ""},
-		{"IFT_ATMSUBINTERFACE", Const, 0, ""},
-		{"IFT_ATMVCIENDPT", Const, 0, ""},
-		{"IFT_ATMVIRTUAL", Const, 0, ""},
-		{"IFT_BGPPOLICYACCOUNTING", Const, 0, ""},
-		{"IFT_BLUETOOTH", Const, 1, ""},
-		{"IFT_BRIDGE", Const, 0, ""},
-		{"IFT_BSC", Const, 0, ""},
-		{"IFT_CARP", Const, 0, ""},
-		{"IFT_CCTEMUL", Const, 0, ""},
-		{"IFT_CELLULAR", Const, 0, ""},
-		{"IFT_CEPT", Const, 0, ""},
-		{"IFT_CES", Const, 0, ""},
-		{"IFT_CHANNEL", Const, 0, ""},
-		{"IFT_CNR", Const, 0, ""},
-		{"IFT_COFFEE", Const, 0, ""},
-		{"IFT_COMPOSITELINK", Const, 0, ""},
-		{"IFT_DCN", Const, 0, ""},
-		{"IFT_DIGITALPOWERLINE", Const, 0, ""},
-		{"IFT_DIGITALWRAPPEROVERHEADCHANNEL", Const, 0, ""},
-		{"IFT_DLSW", Const, 0, ""},
-		{"IFT_DOCSCABLEDOWNSTREAM", Const, 0, ""},
-		{"IFT_DOCSCABLEMACLAYER", Const, 0, ""},
-		{"IFT_DOCSCABLEUPSTREAM", Const, 0, ""},
-		{"IFT_DOCSCABLEUPSTREAMCHANNEL", Const, 1, ""},
-		{"IFT_DS0", Const, 0, ""},
-		{"IFT_DS0BUNDLE", Const, 0, ""},
-		{"IFT_DS1FDL", Const, 0, ""},
-		{"IFT_DS3", Const, 0, ""},
-		{"IFT_DTM", Const, 0, ""},
-		{"IFT_DUMMY", Const, 1, ""},
-		{"IFT_DVBASILN", Const, 0, ""},
-		{"IFT_DVBASIOUT", Const, 0, ""},
-		{"IFT_DVBRCCDOWNSTREAM", Const, 0, ""},
-		{"IFT_DVBRCCMACLAYER", Const, 0, ""},
-		{"IFT_DVBRCCUPSTREAM", Const, 0, ""},
-		{"IFT_ECONET", Const, 1, ""},
-		{"IFT_ENC", Const, 0, ""},
-		{"IFT_EON", Const, 0, ""},
-		{"IFT_EPLRS", Const, 0, ""},
-		{"IFT_ESCON", Const, 0, ""},
-		{"IFT_ETHER", Const, 0, ""},
-		{"IFT_FAITH", Const, 0, ""},
-		{"IFT_FAST", Const, 0, ""},
-		{"IFT_FASTETHER", Const, 0, ""},
-		{"IFT_FASTETHERFX", Const, 0, ""},
-		{"IFT_FDDI", Const, 0, ""},
-		{"IFT_FIBRECHANNEL", Const, 0, ""},
-		{"IFT_FRAMERELAYINTERCONNECT", Const, 0, ""},
-		{"IFT_FRAMERELAYMPI", Const, 0, ""},
-		{"IFT_FRDLCIENDPT", Const, 0, ""},
-		{"IFT_FRELAY", Const, 0, ""},
-		{"IFT_FRELAYDCE", Const, 0, ""},
-		{"IFT_FRF16MFRBUNDLE", Const, 0, ""},
-		{"IFT_FRFORWARD", Const, 0, ""},
-		{"IFT_G703AT2MB", Const, 0, ""},
-		{"IFT_G703AT64K", Const, 0, ""},
-		{"IFT_GIF", Const, 0, ""},
-		{"IFT_GIGABITETHERNET", Const, 0, ""},
-		{"IFT_GR303IDT", Const, 0, ""},
-		{"IFT_GR303RDT", Const, 0, ""},
-		{"IFT_H323GATEKEEPER", Const, 0, ""},
-		{"IFT_H323PROXY", Const, 0, ""},
-		{"IFT_HDH1822", Const, 0, ""},
-		{"IFT_HDLC", Const, 0, ""},
-		{"IFT_HDSL2", Const, 0, ""},
-		{"IFT_HIPERLAN2", Const, 0, ""},
-		{"IFT_HIPPI", Const, 0, ""},
-		{"IFT_HIPPIINTERFACE", Const, 0, ""},
-		{"IFT_HOSTPAD", Const, 0, ""},
-		{"IFT_HSSI", Const, 0, ""},
-		{"IFT_HY", Const, 0, ""},
-		{"IFT_IBM370PARCHAN", Const, 0, ""},
-		{"IFT_IDSL", Const, 0, ""},
-		{"IFT_IEEE1394", Const, 0, ""},
-		{"IFT_IEEE80211", Const, 0, ""},
-		{"IFT_IEEE80212", Const, 0, ""},
-		{"IFT_IEEE8023ADLAG", Const, 0, ""},
-		{"IFT_IFGSN", Const, 0, ""},
-		{"IFT_IMT", Const, 0, ""},
-		{"IFT_INFINIBAND", Const, 1, ""},
-		{"IFT_INTERLEAVE", Const, 0, ""},
-		{"IFT_IP", Const, 0, ""},
-		{"IFT_IPFORWARD", Const, 0, ""},
-		{"IFT_IPOVERATM", Const, 0, ""},
-		{"IFT_IPOVERCDLC", Const, 0, ""},
-		{"IFT_IPOVERCLAW", Const, 0, ""},
-		{"IFT_IPSWITCH", Const, 0, ""},
-		{"IFT_IPXIP", Const, 0, ""},
-		{"IFT_ISDN", Const, 0, ""},
-		{"IFT_ISDNBASIC", Const, 0, ""},
-		{"IFT_ISDNPRIMARY", Const, 0, ""},
-		{"IFT_ISDNS", Const, 0, ""},
-		{"IFT_ISDNU", Const, 0, ""},
-		{"IFT_ISO88022LLC", Const, 0, ""},
-		{"IFT_ISO88023", Const, 0, ""},
-		{"IFT_ISO88024", Const, 0, ""},
-		{"IFT_ISO88025", Const, 0, ""},
-		{"IFT_ISO88025CRFPINT", Const, 0, ""},
-		{"IFT_ISO88025DTR", Const, 0, ""},
-		{"IFT_ISO88025FIBER", Const, 0, ""},
-		{"IFT_ISO88026", Const, 0, ""},
-		{"IFT_ISUP", Const, 0, ""},
-		{"IFT_L2VLAN", Const, 0, ""},
-		{"IFT_L3IPVLAN", Const, 0, ""},
-		{"IFT_L3IPXVLAN", Const, 0, ""},
-		{"IFT_LAPB", Const, 0, ""},
-		{"IFT_LAPD", Const, 0, ""},
-		{"IFT_LAPF", Const, 0, ""},
-		{"IFT_LINEGROUP", Const, 1, ""},
-		{"IFT_LOCALTALK", Const, 0, ""},
-		{"IFT_LOOP", Const, 0, ""},
-		{"IFT_MEDIAMAILOVERIP", Const, 0, ""},
-		{"IFT_MFSIGLINK", Const, 0, ""},
-		{"IFT_MIOX25", Const, 0, ""},
-		{"IFT_MODEM", Const, 0, ""},
-		{"IFT_MPC", Const, 0, ""},
-		{"IFT_MPLS", Const, 0, ""},
-		{"IFT_MPLSTUNNEL", Const, 0, ""},
-		{"IFT_MSDSL", Const, 0, ""},
-		{"IFT_MVL", Const, 0, ""},
-		{"IFT_MYRINET", Const, 0, ""},
-		{"IFT_NFAS", Const, 0, ""},
-		{"IFT_NSIP", Const, 0, ""},
-		{"IFT_OPTICALCHANNEL", Const, 0, ""},
-		{"IFT_OPTICALTRANSPORT", Const, 0, ""},
-		{"IFT_OTHER", Const, 0, ""},
-		{"IFT_P10", Const, 0, ""},
-		{"IFT_P80", Const, 0, ""},
-		{"IFT_PARA", Const, 0, ""},
-		{"IFT_PDP", Const, 0, ""},
-		{"IFT_PFLOG", Const, 0, ""},
-		{"IFT_PFLOW", Const, 1, ""},
-		{"IFT_PFSYNC", Const, 0, ""},
-		{"IFT_PLC", Const, 0, ""},
-		{"IFT_PON155", Const, 1, ""},
-		{"IFT_PON622", Const, 1, ""},
-		{"IFT_POS", Const, 0, ""},
-		{"IFT_PPP", Const, 0, ""},
-		{"IFT_PPPMULTILINKBUNDLE", Const, 0, ""},
-		{"IFT_PROPATM", Const, 1, ""},
-		{"IFT_PROPBWAP2MP", Const, 0, ""},
-		{"IFT_PROPCNLS", Const, 0, ""},
-		{"IFT_PROPDOCSWIRELESSDOWNSTREAM", Const, 0, ""},
-		{"IFT_PROPDOCSWIRELESSMACLAYER", Const, 0, ""},
-		{"IFT_PROPDOCSWIRELESSUPSTREAM", Const, 0, ""},
-		{"IFT_PROPMUX", Const, 0, ""},
-		{"IFT_PROPVIRTUAL", Const, 0, ""},
-		{"IFT_PROPWIRELESSP2P", Const, 0, ""},
-		{"IFT_PTPSERIAL", Const, 0, ""},
-		{"IFT_PVC", Const, 0, ""},
-		{"IFT_Q2931", Const, 1, ""},
-		{"IFT_QLLC", Const, 0, ""},
-		{"IFT_RADIOMAC", Const, 0, ""},
-		{"IFT_RADSL", Const, 0, ""},
-		{"IFT_REACHDSL", Const, 0, ""},
-		{"IFT_RFC1483", Const, 0, ""},
-		{"IFT_RS232", Const, 0, ""},
-		{"IFT_RSRB", Const, 0, ""},
-		{"IFT_SDLC", Const, 0, ""},
-		{"IFT_SDSL", Const, 0, ""},
-		{"IFT_SHDSL", Const, 0, ""},
-		{"IFT_SIP", Const, 0, ""},
-		{"IFT_SIPSIG", Const, 1, ""},
-		{"IFT_SIPTG", Const, 1, ""},
-		{"IFT_SLIP", Const, 0, ""},
-		{"IFT_SMDSDXI", Const, 0, ""},
-		{"IFT_SMDSICIP", Const, 0, ""},
-		{"IFT_SONET", Const, 0, ""},
-		{"IFT_SONETOVERHEADCHANNEL", Const, 0, ""},
-		{"IFT_SONETPATH", Const, 0, ""},
-		{"IFT_SONETVT", Const, 0, ""},
-		{"IFT_SRP", Const, 0, ""},
-		{"IFT_SS7SIGLINK", Const, 0, ""},
-		{"IFT_STACKTOSTACK", Const, 0, ""},
-		{"IFT_STARLAN", Const, 0, ""},
-		{"IFT_STF", Const, 0, ""},
-		{"IFT_T1", Const, 0, ""},
-		{"IFT_TDLC", Const, 0, ""},
-		{"IFT_TELINK", Const, 1, ""},
-		{"IFT_TERMPAD", Const, 0, ""},
-		{"IFT_TR008", Const, 0, ""},
-		{"IFT_TRANSPHDLC", Const, 0, ""},
-		{"IFT_TUNNEL", Const, 0, ""},
-		{"IFT_ULTRA", Const, 0, ""},
-		{"IFT_USB", Const, 0, ""},
-		{"IFT_V11", Const, 0, ""},
-		{"IFT_V35", Const, 0, ""},
-		{"IFT_V36", Const, 0, ""},
-		{"IFT_V37", Const, 0, ""},
-		{"IFT_VDSL", Const, 0, ""},
-		{"IFT_VIRTUALIPADDRESS", Const, 0, ""},
-		{"IFT_VIRTUALTG", Const, 1, ""},
-		{"IFT_VOICEDID", Const, 1, ""},
-		{"IFT_VOICEEM", Const, 0, ""},
-		{"IFT_VOICEEMFGD", Const, 1, ""},
-		{"IFT_VOICEENCAP", Const, 0, ""},
-		{"IFT_VOICEFGDEANA", Const, 1, ""},
-		{"IFT_VOICEFXO", Const, 0, ""},
-		{"IFT_VOICEFXS", Const, 0, ""},
-		{"IFT_VOICEOVERATM", Const, 0, ""},
-		{"IFT_VOICEOVERCABLE", Const, 1, ""},
-		{"IFT_VOICEOVERFRAMERELAY", Const, 0, ""},
-		{"IFT_VOICEOVERIP", Const, 0, ""},
-		{"IFT_X213", Const, 0, ""},
-		{"IFT_X25", Const, 0, ""},
-		{"IFT_X25DDN", Const, 0, ""},
-		{"IFT_X25HUNTGROUP", Const, 0, ""},
-		{"IFT_X25MLP", Const, 0, ""},
-		{"IFT_X25PLE", Const, 0, ""},
-		{"IFT_XETHER", Const, 0, ""},
-		{"IGNBRK", Const, 0, ""},
-		{"IGNCR", Const, 0, ""},
-		{"IGNORE", Const, 0, ""},
-		{"IGNPAR", Const, 0, ""},
-		{"IMAXBEL", Const, 0, ""},
-		{"INFINITE", Const, 0, ""},
-		{"INLCR", Const, 0, ""},
-		{"INPCK", Const, 0, ""},
-		{"INVALID_FILE_ATTRIBUTES", Const, 0, ""},
-		{"IN_ACCESS", Const, 0, ""},
-		{"IN_ALL_EVENTS", Const, 0, ""},
-		{"IN_ATTRIB", Const, 0, ""},
-		{"IN_CLASSA_HOST", Const, 0, ""},
-		{"IN_CLASSA_MAX", Const, 0, ""},
-		{"IN_CLASSA_NET", Const, 0, ""},
-		{"IN_CLASSA_NSHIFT", Const, 0, ""},
-		{"IN_CLASSB_HOST", Const, 0, ""},
-		{"IN_CLASSB_MAX", Const, 0, ""},
-		{"IN_CLASSB_NET", Const, 0, ""},
-		{"IN_CLASSB_NSHIFT", Const, 0, ""},
-		{"IN_CLASSC_HOST", Const, 0, ""},
-		{"IN_CLASSC_NET", Const, 0, ""},
-		{"IN_CLASSC_NSHIFT", Const, 0, ""},
-		{"IN_CLASSD_HOST", Const, 0, ""},
-		{"IN_CLASSD_NET", Const, 0, ""},
-		{"IN_CLASSD_NSHIFT", Const, 0, ""},
-		{"IN_CLOEXEC", Const, 0, ""},
-		{"IN_CLOSE", Const, 0, ""},
-		{"IN_CLOSE_NOWRITE", Const, 0, ""},
-		{"IN_CLOSE_WRITE", Const, 0, ""},
-		{"IN_CREATE", Const, 0, ""},
-		{"IN_DELETE", Const, 0, ""},
-		{"IN_DELETE_SELF", Const, 0, ""},
-		{"IN_DONT_FOLLOW", Const, 0, ""},
-		{"IN_EXCL_UNLINK", Const, 0, ""},
-		{"IN_IGNORED", Const, 0, ""},
-		{"IN_ISDIR", Const, 0, ""},
-		{"IN_LINKLOCALNETNUM", Const, 0, ""},
-		{"IN_LOOPBACKNET", Const, 0, ""},
-		{"IN_MASK_ADD", Const, 0, ""},
-		{"IN_MODIFY", Const, 0, ""},
-		{"IN_MOVE", Const, 0, ""},
-		{"IN_MOVED_FROM", Const, 0, ""},
-		{"IN_MOVED_TO", Const, 0, ""},
-		{"IN_MOVE_SELF", Const, 0, ""},
-		{"IN_NONBLOCK", Const, 0, ""},
-		{"IN_ONESHOT", Const, 0, ""},
-		{"IN_ONLYDIR", Const, 0, ""},
-		{"IN_OPEN", Const, 0, ""},
-		{"IN_Q_OVERFLOW", Const, 0, ""},
-		{"IN_RFC3021_HOST", Const, 1, ""},
-		{"IN_RFC3021_MASK", Const, 1, ""},
-		{"IN_RFC3021_NET", Const, 1, ""},
-		{"IN_RFC3021_NSHIFT", Const, 1, ""},
-		{"IN_UNMOUNT", Const, 0, ""},
-		{"IOC_IN", Const, 1, ""},
-		{"IOC_INOUT", Const, 1, ""},
-		{"IOC_OUT", Const, 1, ""},
-		{"IOC_VENDOR", Const, 3, ""},
-		{"IOC_WS2", Const, 1, ""},
-		{"IO_REPARSE_TAG_SYMLINK", Const, 4, ""},
-		{"IPMreq", Type, 0, ""},
-		{"IPMreq.Interface", Field, 0, ""},
-		{"IPMreq.Multiaddr", Field, 0, ""},
-		{"IPMreqn", Type, 0, ""},
-		{"IPMreqn.Address", Field, 0, ""},
-		{"IPMreqn.Ifindex", Field, 0, ""},
-		{"IPMreqn.Multiaddr", Field, 0, ""},
-		{"IPPROTO_3PC", Const, 0, ""},
-		{"IPPROTO_ADFS", Const, 0, ""},
-		{"IPPROTO_AH", Const, 0, ""},
-		{"IPPROTO_AHIP", Const, 0, ""},
-		{"IPPROTO_APES", Const, 0, ""},
-		{"IPPROTO_ARGUS", Const, 0, ""},
-		{"IPPROTO_AX25", Const, 0, ""},
-		{"IPPROTO_BHA", Const, 0, ""},
-		{"IPPROTO_BLT", Const, 0, ""},
-		{"IPPROTO_BRSATMON", Const, 0, ""},
-		{"IPPROTO_CARP", Const, 0, ""},
-		{"IPPROTO_CFTP", Const, 0, ""},
-		{"IPPROTO_CHAOS", Const, 0, ""},
-		{"IPPROTO_CMTP", Const, 0, ""},
-		{"IPPROTO_COMP", Const, 0, ""},
-		{"IPPROTO_CPHB", Const, 0, ""},
-		{"IPPROTO_CPNX", Const, 0, ""},
-		{"IPPROTO_DCCP", Const, 0, ""},
-		{"IPPROTO_DDP", Const, 0, ""},
-		{"IPPROTO_DGP", Const, 0, ""},
-		{"IPPROTO_DIVERT", Const, 0, ""},
-		{"IPPROTO_DIVERT_INIT", Const, 3, ""},
-		{"IPPROTO_DIVERT_RESP", Const, 3, ""},
-		{"IPPROTO_DONE", Const, 0, ""},
-		{"IPPROTO_DSTOPTS", Const, 0, ""},
-		{"IPPROTO_EGP", Const, 0, ""},
-		{"IPPROTO_EMCON", Const, 0, ""},
-		{"IPPROTO_ENCAP", Const, 0, ""},
-		{"IPPROTO_EON", Const, 0, ""},
-		{"IPPROTO_ESP", Const, 0, ""},
-		{"IPPROTO_ETHERIP", Const, 0, ""},
-		{"IPPROTO_FRAGMENT", Const, 0, ""},
-		{"IPPROTO_GGP", Const, 0, ""},
-		{"IPPROTO_GMTP", Const, 0, ""},
-		{"IPPROTO_GRE", Const, 0, ""},
-		{"IPPROTO_HELLO", Const, 0, ""},
-		{"IPPROTO_HMP", Const, 0, ""},
-		{"IPPROTO_HOPOPTS", Const, 0, ""},
-		{"IPPROTO_ICMP", Const, 0, ""},
-		{"IPPROTO_ICMPV6", Const, 0, ""},
-		{"IPPROTO_IDP", Const, 0, ""},
-		{"IPPROTO_IDPR", Const, 0, ""},
-		{"IPPROTO_IDRP", Const, 0, ""},
-		{"IPPROTO_IGMP", Const, 0, ""},
-		{"IPPROTO_IGP", Const, 0, ""},
-		{"IPPROTO_IGRP", Const, 0, ""},
-		{"IPPROTO_IL", Const, 0, ""},
-		{"IPPROTO_INLSP", Const, 0, ""},
-		{"IPPROTO_INP", Const, 0, ""},
-		{"IPPROTO_IP", Const, 0, ""},
-		{"IPPROTO_IPCOMP", Const, 0, ""},
-		{"IPPROTO_IPCV", Const, 0, ""},
-		{"IPPROTO_IPEIP", Const, 0, ""},
-		{"IPPROTO_IPIP", Const, 0, ""},
-		{"IPPROTO_IPPC", Const, 0, ""},
-		{"IPPROTO_IPV4", Const, 0, ""},
-		{"IPPROTO_IPV6", Const, 0, ""},
-		{"IPPROTO_IPV6_ICMP", Const, 1, ""},
-		{"IPPROTO_IRTP", Const, 0, ""},
-		{"IPPROTO_KRYPTOLAN", Const, 0, ""},
-		{"IPPROTO_LARP", Const, 0, ""},
-		{"IPPROTO_LEAF1", Const, 0, ""},
-		{"IPPROTO_LEAF2", Const, 0, ""},
-		{"IPPROTO_MAX", Const, 0, ""},
-		{"IPPROTO_MAXID", Const, 0, ""},
-		{"IPPROTO_MEAS", Const, 0, ""},
-		{"IPPROTO_MH", Const, 1, ""},
-		{"IPPROTO_MHRP", Const, 0, ""},
-		{"IPPROTO_MICP", Const, 0, ""},
-		{"IPPROTO_MOBILE", Const, 0, ""},
-		{"IPPROTO_MPLS", Const, 1, ""},
-		{"IPPROTO_MTP", Const, 0, ""},
-		{"IPPROTO_MUX", Const, 0, ""},
-		{"IPPROTO_ND", Const, 0, ""},
-		{"IPPROTO_NHRP", Const, 0, ""},
-		{"IPPROTO_NONE", Const, 0, ""},
-		{"IPPROTO_NSP", Const, 0, ""},
-		{"IPPROTO_NVPII", Const, 0, ""},
-		{"IPPROTO_OLD_DIVERT", Const, 0, ""},
-		{"IPPROTO_OSPFIGP", Const, 0, ""},
-		{"IPPROTO_PFSYNC", Const, 0, ""},
-		{"IPPROTO_PGM", Const, 0, ""},
-		{"IPPROTO_PIGP", Const, 0, ""},
-		{"IPPROTO_PIM", Const, 0, ""},
-		{"IPPROTO_PRM", Const, 0, ""},
-		{"IPPROTO_PUP", Const, 0, ""},
-		{"IPPROTO_PVP", Const, 0, ""},
-		{"IPPROTO_RAW", Const, 0, ""},
-		{"IPPROTO_RCCMON", Const, 0, ""},
-		{"IPPROTO_RDP", Const, 0, ""},
-		{"IPPROTO_ROUTING", Const, 0, ""},
-		{"IPPROTO_RSVP", Const, 0, ""},
-		{"IPPROTO_RVD", Const, 0, ""},
-		{"IPPROTO_SATEXPAK", Const, 0, ""},
-		{"IPPROTO_SATMON", Const, 0, ""},
-		{"IPPROTO_SCCSP", Const, 0, ""},
-		{"IPPROTO_SCTP", Const, 0, ""},
-		{"IPPROTO_SDRP", Const, 0, ""},
-		{"IPPROTO_SEND", Const, 1, ""},
-		{"IPPROTO_SEP", Const, 0, ""},
-		{"IPPROTO_SKIP", Const, 0, ""},
-		{"IPPROTO_SPACER", Const, 0, ""},
-		{"IPPROTO_SRPC", Const, 0, ""},
-		{"IPPROTO_ST", Const, 0, ""},
-		{"IPPROTO_SVMTP", Const, 0, ""},
-		{"IPPROTO_SWIPE", Const, 0, ""},
-		{"IPPROTO_TCF", Const, 0, ""},
-		{"IPPROTO_TCP", Const, 0, ""},
-		{"IPPROTO_TLSP", Const, 0, ""},
-		{"IPPROTO_TP", Const, 0, ""},
-		{"IPPROTO_TPXX", Const, 0, ""},
-		{"IPPROTO_TRUNK1", Const, 0, ""},
-		{"IPPROTO_TRUNK2", Const, 0, ""},
-		{"IPPROTO_TTP", Const, 0, ""},
-		{"IPPROTO_UDP", Const, 0, ""},
-		{"IPPROTO_UDPLITE", Const, 0, ""},
-		{"IPPROTO_VINES", Const, 0, ""},
-		{"IPPROTO_VISA", Const, 0, ""},
-		{"IPPROTO_VMTP", Const, 0, ""},
-		{"IPPROTO_VRRP", Const, 1, ""},
-		{"IPPROTO_WBEXPAK", Const, 0, ""},
-		{"IPPROTO_WBMON", Const, 0, ""},
-		{"IPPROTO_WSN", Const, 0, ""},
-		{"IPPROTO_XNET", Const, 0, ""},
-		{"IPPROTO_XTP", Const, 0, ""},
-		{"IPV6_2292DSTOPTS", Const, 0, ""},
-		{"IPV6_2292HOPLIMIT", Const, 0, ""},
-		{"IPV6_2292HOPOPTS", Const, 0, ""},
-		{"IPV6_2292NEXTHOP", Const, 0, ""},
-		{"IPV6_2292PKTINFO", Const, 0, ""},
-		{"IPV6_2292PKTOPTIONS", Const, 0, ""},
-		{"IPV6_2292RTHDR", Const, 0, ""},
-		{"IPV6_ADDRFORM", Const, 0, ""},
-		{"IPV6_ADD_MEMBERSHIP", Const, 0, ""},
-		{"IPV6_AUTHHDR", Const, 0, ""},
-		{"IPV6_AUTH_LEVEL", Const, 1, ""},
-		{"IPV6_AUTOFLOWLABEL", Const, 0, ""},
-		{"IPV6_BINDANY", Const, 0, ""},
-		{"IPV6_BINDV6ONLY", Const, 0, ""},
-		{"IPV6_BOUND_IF", Const, 0, ""},
-		{"IPV6_CHECKSUM", Const, 0, ""},
-		{"IPV6_DEFAULT_MULTICAST_HOPS", Const, 0, ""},
-		{"IPV6_DEFAULT_MULTICAST_LOOP", Const, 0, ""},
-		{"IPV6_DEFHLIM", Const, 0, ""},
-		{"IPV6_DONTFRAG", Const, 0, ""},
-		{"IPV6_DROP_MEMBERSHIP", Const, 0, ""},
-		{"IPV6_DSTOPTS", Const, 0, ""},
-		{"IPV6_ESP_NETWORK_LEVEL", Const, 1, ""},
-		{"IPV6_ESP_TRANS_LEVEL", Const, 1, ""},
-		{"IPV6_FAITH", Const, 0, ""},
-		{"IPV6_FLOWINFO_MASK", Const, 0, ""},
-		{"IPV6_FLOWLABEL_MASK", Const, 0, ""},
-		{"IPV6_FRAGTTL", Const, 0, ""},
-		{"IPV6_FW_ADD", Const, 0, ""},
-		{"IPV6_FW_DEL", Const, 0, ""},
-		{"IPV6_FW_FLUSH", Const, 0, ""},
-		{"IPV6_FW_GET", Const, 0, ""},
-		{"IPV6_FW_ZERO", Const, 0, ""},
-		{"IPV6_HLIMDEC", Const, 0, ""},
-		{"IPV6_HOPLIMIT", Const, 0, ""},
-		{"IPV6_HOPOPTS", Const, 0, ""},
-		{"IPV6_IPCOMP_LEVEL", Const, 1, ""},
-		{"IPV6_IPSEC_POLICY", Const, 0, ""},
-		{"IPV6_JOIN_ANYCAST", Const, 0, ""},
-		{"IPV6_JOIN_GROUP", Const, 0, ""},
-		{"IPV6_LEAVE_ANYCAST", Const, 0, ""},
-		{"IPV6_LEAVE_GROUP", Const, 0, ""},
-		{"IPV6_MAXHLIM", Const, 0, ""},
-		{"IPV6_MAXOPTHDR", Const, 0, ""},
-		{"IPV6_MAXPACKET", Const, 0, ""},
-		{"IPV6_MAX_GROUP_SRC_FILTER", Const, 0, ""},
-		{"IPV6_MAX_MEMBERSHIPS", Const, 0, ""},
-		{"IPV6_MAX_SOCK_SRC_FILTER", Const, 0, ""},
-		{"IPV6_MIN_MEMBERSHIPS", Const, 0, ""},
-		{"IPV6_MMTU", Const, 0, ""},
-		{"IPV6_MSFILTER", Const, 0, ""},
-		{"IPV6_MTU", Const, 0, ""},
-		{"IPV6_MTU_DISCOVER", Const, 0, ""},
-		{"IPV6_MULTICAST_HOPS", Const, 0, ""},
-		{"IPV6_MULTICAST_IF", Const, 0, ""},
-		{"IPV6_MULTICAST_LOOP", Const, 0, ""},
-		{"IPV6_NEXTHOP", Const, 0, ""},
-		{"IPV6_OPTIONS", Const, 1, ""},
-		{"IPV6_PATHMTU", Const, 0, ""},
-		{"IPV6_PIPEX", Const, 1, ""},
-		{"IPV6_PKTINFO", Const, 0, ""},
-		{"IPV6_PMTUDISC_DO", Const, 0, ""},
-		{"IPV6_PMTUDISC_DONT", Const, 0, ""},
-		{"IPV6_PMTUDISC_PROBE", Const, 0, ""},
-		{"IPV6_PMTUDISC_WANT", Const, 0, ""},
-		{"IPV6_PORTRANGE", Const, 0, ""},
-		{"IPV6_PORTRANGE_DEFAULT", Const, 0, ""},
-		{"IPV6_PORTRANGE_HIGH", Const, 0, ""},
-		{"IPV6_PORTRANGE_LOW", Const, 0, ""},
-		{"IPV6_PREFER_TEMPADDR", Const, 0, ""},
-		{"IPV6_RECVDSTOPTS", Const, 0, ""},
-		{"IPV6_RECVDSTPORT", Const, 3, ""},
-		{"IPV6_RECVERR", Const, 0, ""},
-		{"IPV6_RECVHOPLIMIT", Const, 0, ""},
-		{"IPV6_RECVHOPOPTS", Const, 0, ""},
-		{"IPV6_RECVPATHMTU", Const, 0, ""},
-		{"IPV6_RECVPKTINFO", Const, 0, ""},
-		{"IPV6_RECVRTHDR", Const, 0, ""},
-		{"IPV6_RECVTCLASS", Const, 0, ""},
-		{"IPV6_ROUTER_ALERT", Const, 0, ""},
-		{"IPV6_RTABLE", Const, 1, ""},
-		{"IPV6_RTHDR", Const, 0, ""},
-		{"IPV6_RTHDRDSTOPTS", Const, 0, ""},
-		{"IPV6_RTHDR_LOOSE", Const, 0, ""},
-		{"IPV6_RTHDR_STRICT", Const, 0, ""},
-		{"IPV6_RTHDR_TYPE_0", Const, 0, ""},
-		{"IPV6_RXDSTOPTS", Const, 0, ""},
-		{"IPV6_RXHOPOPTS", Const, 0, ""},
-		{"IPV6_SOCKOPT_RESERVED1", Const, 0, ""},
-		{"IPV6_TCLASS", Const, 0, ""},
-		{"IPV6_UNICAST_HOPS", Const, 0, ""},
-		{"IPV6_USE_MIN_MTU", Const, 0, ""},
-		{"IPV6_V6ONLY", Const, 0, ""},
-		{"IPV6_VERSION", Const, 0, ""},
-		{"IPV6_VERSION_MASK", Const, 0, ""},
-		{"IPV6_XFRM_POLICY", Const, 0, ""},
-		{"IP_ADD_MEMBERSHIP", Const, 0, ""},
-		{"IP_ADD_SOURCE_MEMBERSHIP", Const, 0, ""},
-		{"IP_AUTH_LEVEL", Const, 1, ""},
-		{"IP_BINDANY", Const, 0, ""},
-		{"IP_BLOCK_SOURCE", Const, 0, ""},
-		{"IP_BOUND_IF", Const, 0, ""},
-		{"IP_DEFAULT_MULTICAST_LOOP", Const, 0, ""},
-		{"IP_DEFAULT_MULTICAST_TTL", Const, 0, ""},
-		{"IP_DF", Const, 0, ""},
-		{"IP_DIVERTFL", Const, 3, ""},
-		{"IP_DONTFRAG", Const, 0, ""},
-		{"IP_DROP_MEMBERSHIP", Const, 0, ""},
-		{"IP_DROP_SOURCE_MEMBERSHIP", Const, 0, ""},
-		{"IP_DUMMYNET3", Const, 0, ""},
-		{"IP_DUMMYNET_CONFIGURE", Const, 0, ""},
-		{"IP_DUMMYNET_DEL", Const, 0, ""},
-		{"IP_DUMMYNET_FLUSH", Const, 0, ""},
-		{"IP_DUMMYNET_GET", Const, 0, ""},
-		{"IP_EF", Const, 1, ""},
-		{"IP_ERRORMTU", Const, 1, ""},
-		{"IP_ESP_NETWORK_LEVEL", Const, 1, ""},
-		{"IP_ESP_TRANS_LEVEL", Const, 1, ""},
-		{"IP_FAITH", Const, 0, ""},
-		{"IP_FREEBIND", Const, 0, ""},
-		{"IP_FW3", Const, 0, ""},
-		{"IP_FW_ADD", Const, 0, ""},
-		{"IP_FW_DEL", Const, 0, ""},
-		{"IP_FW_FLUSH", Const, 0, ""},
-		{"IP_FW_GET", Const, 0, ""},
-		{"IP_FW_NAT_CFG", Const, 0, ""},
-		{"IP_FW_NAT_DEL", Const, 0, ""},
-		{"IP_FW_NAT_GET_CONFIG", Const, 0, ""},
-		{"IP_FW_NAT_GET_LOG", Const, 0, ""},
-		{"IP_FW_RESETLOG", Const, 0, ""},
-		{"IP_FW_TABLE_ADD", Const, 0, ""},
-		{"IP_FW_TABLE_DEL", Const, 0, ""},
-		{"IP_FW_TABLE_FLUSH", Const, 0, ""},
-		{"IP_FW_TABLE_GETSIZE", Const, 0, ""},
-		{"IP_FW_TABLE_LIST", Const, 0, ""},
-		{"IP_FW_ZERO", Const, 0, ""},
-		{"IP_HDRINCL", Const, 0, ""},
-		{"IP_IPCOMP_LEVEL", Const, 1, ""},
-		{"IP_IPSECFLOWINFO", Const, 1, ""},
-		{"IP_IPSEC_LOCAL_AUTH", Const, 1, ""},
-		{"IP_IPSEC_LOCAL_CRED", Const, 1, ""},
-		{"IP_IPSEC_LOCAL_ID", Const, 1, ""},
-		{"IP_IPSEC_POLICY", Const, 0, ""},
-		{"IP_IPSEC_REMOTE_AUTH", Const, 1, ""},
-		{"IP_IPSEC_REMOTE_CRED", Const, 1, ""},
-		{"IP_IPSEC_REMOTE_ID", Const, 1, ""},
-		{"IP_MAXPACKET", Const, 0, ""},
-		{"IP_MAX_GROUP_SRC_FILTER", Const, 0, ""},
-		{"IP_MAX_MEMBERSHIPS", Const, 0, ""},
-		{"IP_MAX_SOCK_MUTE_FILTER", Const, 0, ""},
-		{"IP_MAX_SOCK_SRC_FILTER", Const, 0, ""},
-		{"IP_MAX_SOURCE_FILTER", Const, 0, ""},
-		{"IP_MF", Const, 0, ""},
-		{"IP_MINFRAGSIZE", Const, 1, ""},
-		{"IP_MINTTL", Const, 0, ""},
-		{"IP_MIN_MEMBERSHIPS", Const, 0, ""},
-		{"IP_MSFILTER", Const, 0, ""},
-		{"IP_MSS", Const, 0, ""},
-		{"IP_MTU", Const, 0, ""},
-		{"IP_MTU_DISCOVER", Const, 0, ""},
-		{"IP_MULTICAST_IF", Const, 0, ""},
-		{"IP_MULTICAST_IFINDEX", Const, 0, ""},
-		{"IP_MULTICAST_LOOP", Const, 0, ""},
-		{"IP_MULTICAST_TTL", Const, 0, ""},
-		{"IP_MULTICAST_VIF", Const, 0, ""},
-		{"IP_NAT__XXX", Const, 0, ""},
-		{"IP_OFFMASK", Const, 0, ""},
-		{"IP_OLD_FW_ADD", Const, 0, ""},
-		{"IP_OLD_FW_DEL", Const, 0, ""},
-		{"IP_OLD_FW_FLUSH", Const, 0, ""},
-		{"IP_OLD_FW_GET", Const, 0, ""},
-		{"IP_OLD_FW_RESETLOG", Const, 0, ""},
-		{"IP_OLD_FW_ZERO", Const, 0, ""},
-		{"IP_ONESBCAST", Const, 0, ""},
-		{"IP_OPTIONS", Const, 0, ""},
-		{"IP_ORIGDSTADDR", Const, 0, ""},
-		{"IP_PASSSEC", Const, 0, ""},
-		{"IP_PIPEX", Const, 1, ""},
-		{"IP_PKTINFO", Const, 0, ""},
-		{"IP_PKTOPTIONS", Const, 0, ""},
-		{"IP_PMTUDISC", Const, 0, ""},
-		{"IP_PMTUDISC_DO", Const, 0, ""},
-		{"IP_PMTUDISC_DONT", Const, 0, ""},
-		{"IP_PMTUDISC_PROBE", Const, 0, ""},
-		{"IP_PMTUDISC_WANT", Const, 0, ""},
-		{"IP_PORTRANGE", Const, 0, ""},
-		{"IP_PORTRANGE_DEFAULT", Const, 0, ""},
-		{"IP_PORTRANGE_HIGH", Const, 0, ""},
-		{"IP_PORTRANGE_LOW", Const, 0, ""},
-		{"IP_RECVDSTADDR", Const, 0, ""},
-		{"IP_RECVDSTPORT", Const, 1, ""},
-		{"IP_RECVERR", Const, 0, ""},
-		{"IP_RECVIF", Const, 0, ""},
-		{"IP_RECVOPTS", Const, 0, ""},
-		{"IP_RECVORIGDSTADDR", Const, 0, ""},
-		{"IP_RECVPKTINFO", Const, 0, ""},
-		{"IP_RECVRETOPTS", Const, 0, ""},
-		{"IP_RECVRTABLE", Const, 1, ""},
-		{"IP_RECVTOS", Const, 0, ""},
-		{"IP_RECVTTL", Const, 0, ""},
-		{"IP_RETOPTS", Const, 0, ""},
-		{"IP_RF", Const, 0, ""},
-		{"IP_ROUTER_ALERT", Const, 0, ""},
-		{"IP_RSVP_OFF", Const, 0, ""},
-		{"IP_RSVP_ON", Const, 0, ""},
-		{"IP_RSVP_VIF_OFF", Const, 0, ""},
-		{"IP_RSVP_VIF_ON", Const, 0, ""},
-		{"IP_RTABLE", Const, 1, ""},
-		{"IP_SENDSRCADDR", Const, 0, ""},
-		{"IP_STRIPHDR", Const, 0, ""},
-		{"IP_TOS", Const, 0, ""},
-		{"IP_TRAFFIC_MGT_BACKGROUND", Const, 0, ""},
-		{"IP_TRANSPARENT", Const, 0, ""},
-		{"IP_TTL", Const, 0, ""},
-		{"IP_UNBLOCK_SOURCE", Const, 0, ""},
-		{"IP_XFRM_POLICY", Const, 0, ""},
-		{"IPv6MTUInfo", Type, 2, ""},
-		{"IPv6MTUInfo.Addr", Field, 2, ""},
-		{"IPv6MTUInfo.Mtu", Field, 2, ""},
-		{"IPv6Mreq", Type, 0, ""},
-		{"IPv6Mreq.Interface", Field, 0, ""},
-		{"IPv6Mreq.Multiaddr", Field, 0, ""},
-		{"ISIG", Const, 0, ""},
-		{"ISTRIP", Const, 0, ""},
-		{"IUCLC", Const, 0, ""},
-		{"IUTF8", Const, 0, ""},
-		{"IXANY", Const, 0, ""},
-		{"IXOFF", Const, 0, ""},
-		{"IXON", Const, 0, ""},
-		{"IfAddrmsg", Type, 0, ""},
-		{"IfAddrmsg.Family", Field, 0, ""},
-		{"IfAddrmsg.Flags", Field, 0, ""},
-		{"IfAddrmsg.Index", Field, 0, ""},
-		{"IfAddrmsg.Prefixlen", Field, 0, ""},
-		{"IfAddrmsg.Scope", Field, 0, ""},
-		{"IfAnnounceMsghdr", Type, 1, ""},
-		{"IfAnnounceMsghdr.Hdrlen", Field, 2, ""},
-		{"IfAnnounceMsghdr.Index", Field, 1, ""},
-		{"IfAnnounceMsghdr.Msglen", Field, 1, ""},
-		{"IfAnnounceMsghdr.Name", Field, 1, ""},
-		{"IfAnnounceMsghdr.Type", Field, 1, ""},
-		{"IfAnnounceMsghdr.Version", Field, 1, ""},
-		{"IfAnnounceMsghdr.What", Field, 1, ""},
-		{"IfData", Type, 0, ""},
-		{"IfData.Addrlen", Field, 0, ""},
-		{"IfData.Baudrate", Field, 0, ""},
-		{"IfData.Capabilities", Field, 2, ""},
-		{"IfData.Collisions", Field, 0, ""},
-		{"IfData.Datalen", Field, 0, ""},
-		{"IfData.Epoch", Field, 0, ""},
-		{"IfData.Hdrlen", Field, 0, ""},
-		{"IfData.Hwassist", Field, 0, ""},
-		{"IfData.Ibytes", Field, 0, ""},
-		{"IfData.Ierrors", Field, 0, ""},
-		{"IfData.Imcasts", Field, 0, ""},
-		{"IfData.Ipackets", Field, 0, ""},
-		{"IfData.Iqdrops", Field, 0, ""},
-		{"IfData.Lastchange", Field, 0, ""},
-		{"IfData.Link_state", Field, 0, ""},
-		{"IfData.Mclpool", Field, 2, ""},
-		{"IfData.Metric", Field, 0, ""},
-		{"IfData.Mtu", Field, 0, ""},
-		{"IfData.Noproto", Field, 0, ""},
-		{"IfData.Obytes", Field, 0, ""},
-		{"IfData.Oerrors", Field, 0, ""},
-		{"IfData.Omcasts", Field, 0, ""},
-		{"IfData.Opackets", Field, 0, ""},
-		{"IfData.Pad", Field, 2, ""},
-		{"IfData.Pad_cgo_0", Field, 2, ""},
-		{"IfData.Pad_cgo_1", Field, 2, ""},
-		{"IfData.Physical", Field, 0, ""},
-		{"IfData.Recvquota", Field, 0, ""},
-		{"IfData.Recvtiming", Field, 0, ""},
-		{"IfData.Reserved1", Field, 0, ""},
-		{"IfData.Reserved2", Field, 0, ""},
-		{"IfData.Spare_char1", Field, 0, ""},
-		{"IfData.Spare_char2", Field, 0, ""},
-		{"IfData.Type", Field, 0, ""},
-		{"IfData.Typelen", Field, 0, ""},
-		{"IfData.Unused1", Field, 0, ""},
-		{"IfData.Unused2", Field, 0, ""},
-		{"IfData.Xmitquota", Field, 0, ""},
-		{"IfData.Xmittiming", Field, 0, ""},
-		{"IfInfomsg", Type, 0, ""},
-		{"IfInfomsg.Change", Field, 0, ""},
-		{"IfInfomsg.Family", Field, 0, ""},
-		{"IfInfomsg.Flags", Field, 0, ""},
-		{"IfInfomsg.Index", Field, 0, ""},
-		{"IfInfomsg.Type", Field, 0, ""},
-		{"IfInfomsg.X__ifi_pad", Field, 0, ""},
-		{"IfMsghdr", Type, 0, ""},
-		{"IfMsghdr.Addrs", Field, 0, ""},
-		{"IfMsghdr.Data", Field, 0, ""},
-		{"IfMsghdr.Flags", Field, 0, ""},
-		{"IfMsghdr.Hdrlen", Field, 2, ""},
-		{"IfMsghdr.Index", Field, 0, ""},
-		{"IfMsghdr.Msglen", Field, 0, ""},
-		{"IfMsghdr.Pad1", Field, 2, ""},
-		{"IfMsghdr.Pad2", Field, 2, ""},
-		{"IfMsghdr.Pad_cgo_0", Field, 0, ""},
-		{"IfMsghdr.Pad_cgo_1", Field, 2, ""},
-		{"IfMsghdr.Tableid", Field, 2, ""},
-		{"IfMsghdr.Type", Field, 0, ""},
-		{"IfMsghdr.Version", Field, 0, ""},
-		{"IfMsghdr.Xflags", Field, 2, ""},
-		{"IfaMsghdr", Type, 0, ""},
-		{"IfaMsghdr.Addrs", Field, 0, ""},
-		{"IfaMsghdr.Flags", Field, 0, ""},
-		{"IfaMsghdr.Hdrlen", Field, 2, ""},
-		{"IfaMsghdr.Index", Field, 0, ""},
-		{"IfaMsghdr.Metric", Field, 0, ""},
-		{"IfaMsghdr.Msglen", Field, 0, ""},
-		{"IfaMsghdr.Pad1", Field, 2, ""},
-		{"IfaMsghdr.Pad2", Field, 2, ""},
-		{"IfaMsghdr.Pad_cgo_0", Field, 0, ""},
-		{"IfaMsghdr.Tableid", Field, 2, ""},
-		{"IfaMsghdr.Type", Field, 0, ""},
-		{"IfaMsghdr.Version", Field, 0, ""},
-		{"IfmaMsghdr", Type, 0, ""},
-		{"IfmaMsghdr.Addrs", Field, 0, ""},
-		{"IfmaMsghdr.Flags", Field, 0, ""},
-		{"IfmaMsghdr.Index", Field, 0, ""},
-		{"IfmaMsghdr.Msglen", Field, 0, ""},
-		{"IfmaMsghdr.Pad_cgo_0", Field, 0, ""},
-		{"IfmaMsghdr.Type", Field, 0, ""},
-		{"IfmaMsghdr.Version", Field, 0, ""},
-		{"IfmaMsghdr2", Type, 0, ""},
-		{"IfmaMsghdr2.Addrs", Field, 0, ""},
-		{"IfmaMsghdr2.Flags", Field, 0, ""},
-		{"IfmaMsghdr2.Index", Field, 0, ""},
-		{"IfmaMsghdr2.Msglen", Field, 0, ""},
-		{"IfmaMsghdr2.Pad_cgo_0", Field, 0, ""},
-		{"IfmaMsghdr2.Refcount", Field, 0, ""},
-		{"IfmaMsghdr2.Type", Field, 0, ""},
-		{"IfmaMsghdr2.Version", Field, 0, ""},
-		{"ImplementsGetwd", Const, 0, ""},
-		{"Inet4Pktinfo", Type, 0, ""},
-		{"Inet4Pktinfo.Addr", Field, 0, ""},
-		{"Inet4Pktinfo.Ifindex", Field, 0, ""},
-		{"Inet4Pktinfo.Spec_dst", Field, 0, ""},
-		{"Inet6Pktinfo", Type, 0, ""},
-		{"Inet6Pktinfo.Addr", Field, 0, ""},
-		{"Inet6Pktinfo.Ifindex", Field, 0, ""},
-		{"InotifyAddWatch", Func, 0, "func(fd int, pathname string, mask uint32) (watchdesc int, err error)"},
-		{"InotifyEvent", Type, 0, ""},
-		{"InotifyEvent.Cookie", Field, 0, ""},
-		{"InotifyEvent.Len", Field, 0, ""},
-		{"InotifyEvent.Mask", Field, 0, ""},
-		{"InotifyEvent.Name", Field, 0, ""},
-		{"InotifyEvent.Wd", Field, 0, ""},
-		{"InotifyInit", Func, 0, "func() (fd int, err error)"},
-		{"InotifyInit1", Func, 0, "func(flags int) (fd int, err error)"},
-		{"InotifyRmWatch", Func, 0, "func(fd int, watchdesc uint32) (success int, err error)"},
-		{"InterfaceAddrMessage", Type, 0, ""},
-		{"InterfaceAddrMessage.Data", Field, 0, ""},
-		{"InterfaceAddrMessage.Header", Field, 0, ""},
-		{"InterfaceAnnounceMessage", Type, 1, ""},
-		{"InterfaceAnnounceMessage.Header", Field, 1, ""},
-		{"InterfaceInfo", Type, 0, ""},
-		{"InterfaceInfo.Address", Field, 0, ""},
-		{"InterfaceInfo.BroadcastAddress", Field, 0, ""},
-		{"InterfaceInfo.Flags", Field, 0, ""},
-		{"InterfaceInfo.Netmask", Field, 0, ""},
-		{"InterfaceMessage", Type, 0, ""},
-		{"InterfaceMessage.Data", Field, 0, ""},
-		{"InterfaceMessage.Header", Field, 0, ""},
-		{"InterfaceMulticastAddrMessage", Type, 0, ""},
-		{"InterfaceMulticastAddrMessage.Data", Field, 0, ""},
-		{"InterfaceMulticastAddrMessage.Header", Field, 0, ""},
-		{"InvalidHandle", Const, 0, ""},
-		{"Ioperm", Func, 0, "func(from int, num int, on int) (err error)"},
-		{"Iopl", Func, 0, "func(level int) (err error)"},
-		{"Iovec", Type, 0, ""},
-		{"Iovec.Base", Field, 0, ""},
-		{"Iovec.Len", Field, 0, ""},
-		{"IpAdapterInfo", Type, 0, ""},
-		{"IpAdapterInfo.AdapterName", Field, 0, ""},
-		{"IpAdapterInfo.Address", Field, 0, ""},
-		{"IpAdapterInfo.AddressLength", Field, 0, ""},
-		{"IpAdapterInfo.ComboIndex", Field, 0, ""},
-		{"IpAdapterInfo.CurrentIpAddress", Field, 0, ""},
-		{"IpAdapterInfo.Description", Field, 0, ""},
-		{"IpAdapterInfo.DhcpEnabled", Field, 0, ""},
-		{"IpAdapterInfo.DhcpServer", Field, 0, ""},
-		{"IpAdapterInfo.GatewayList", Field, 0, ""},
-		{"IpAdapterInfo.HaveWins", Field, 0, ""},
-		{"IpAdapterInfo.Index", Field, 0, ""},
-		{"IpAdapterInfo.IpAddressList", Field, 0, ""},
-		{"IpAdapterInfo.LeaseExpires", Field, 0, ""},
-		{"IpAdapterInfo.LeaseObtained", Field, 0, ""},
-		{"IpAdapterInfo.Next", Field, 0, ""},
-		{"IpAdapterInfo.PrimaryWinsServer", Field, 0, ""},
-		{"IpAdapterInfo.SecondaryWinsServer", Field, 0, ""},
-		{"IpAdapterInfo.Type", Field, 0, ""},
-		{"IpAddrString", Type, 0, ""},
-		{"IpAddrString.Context", Field, 0, ""},
-		{"IpAddrString.IpAddress", Field, 0, ""},
-		{"IpAddrString.IpMask", Field, 0, ""},
-		{"IpAddrString.Next", Field, 0, ""},
-		{"IpAddressString", Type, 0, ""},
-		{"IpAddressString.String", Field, 0, ""},
-		{"IpMaskString", Type, 0, ""},
-		{"IpMaskString.String", Field, 2, ""},
-		{"Issetugid", Func, 0, ""},
-		{"KEY_ALL_ACCESS", Const, 0, ""},
-		{"KEY_CREATE_LINK", Const, 0, ""},
-		{"KEY_CREATE_SUB_KEY", Const, 0, ""},
-		{"KEY_ENUMERATE_SUB_KEYS", Const, 0, ""},
-		{"KEY_EXECUTE", Const, 0, ""},
-		{"KEY_NOTIFY", Const, 0, ""},
-		{"KEY_QUERY_VALUE", Const, 0, ""},
-		{"KEY_READ", Const, 0, ""},
-		{"KEY_SET_VALUE", Const, 0, ""},
-		{"KEY_WOW64_32KEY", Const, 0, ""},
-		{"KEY_WOW64_64KEY", Const, 0, ""},
-		{"KEY_WRITE", Const, 0, ""},
-		{"Kevent", Func, 0, ""},
-		{"Kevent_t", Type, 0, ""},
-		{"Kevent_t.Data", Field, 0, ""},
-		{"Kevent_t.Fflags", Field, 0, ""},
-		{"Kevent_t.Filter", Field, 0, ""},
-		{"Kevent_t.Flags", Field, 0, ""},
-		{"Kevent_t.Ident", Field, 0, ""},
-		{"Kevent_t.Pad_cgo_0", Field, 2, ""},
-		{"Kevent_t.Udata", Field, 0, ""},
-		{"Kill", Func, 0, "func(pid int, sig Signal) (err error)"},
-		{"Klogctl", Func, 0, "func(typ int, buf []byte) (n int, err error)"},
-		{"Kqueue", Func, 0, ""},
-		{"LANG_ENGLISH", Const, 0, ""},
-		{"LAYERED_PROTOCOL", Const, 2, ""},
-		{"LCNT_OVERLOAD_FLUSH", Const, 1, ""},
-		{"LINUX_REBOOT_CMD_CAD_OFF", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_CAD_ON", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_HALT", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_KEXEC", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_POWER_OFF", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_RESTART", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_RESTART2", Const, 0, ""},
-		{"LINUX_REBOOT_CMD_SW_SUSPEND", Const, 0, ""},
-		{"LINUX_REBOOT_MAGIC1", Const, 0, ""},
-		{"LINUX_REBOOT_MAGIC2", Const, 0, ""},
-		{"LOCK_EX", Const, 0, ""},
-		{"LOCK_NB", Const, 0, ""},
-		{"LOCK_SH", Const, 0, ""},
-		{"LOCK_UN", Const, 0, ""},
-		{"LazyDLL", Type, 0, ""},
-		{"LazyDLL.Name", Field, 0, ""},
-		{"LazyProc", Type, 0, ""},
-		{"LazyProc.Name", Field, 0, ""},
-		{"Lchown", Func, 0, "func(path string, uid int, gid int) (err error)"},
-		{"Linger", Type, 0, ""},
-		{"Linger.Linger", Field, 0, ""},
-		{"Linger.Onoff", Field, 0, ""},
-		{"Link", Func, 0, "func(oldpath string, newpath string) (err error)"},
-		{"Listen", Func, 0, "func(s int, n int) (err error)"},
-		{"Listxattr", Func, 1, "func(path string, dest []byte) (sz int, err error)"},
-		{"LoadCancelIoEx", Func, 1, ""},
-		{"LoadConnectEx", Func, 1, ""},
-		{"LoadCreateSymbolicLink", Func, 4, ""},
-		{"LoadDLL", Func, 0, ""},
-		{"LoadGetAddrInfo", Func, 1, ""},
-		{"LoadLibrary", Func, 0, ""},
-		{"LoadSetFileCompletionNotificationModes", Func, 2, ""},
-		{"LocalFree", Func, 0, ""},
-		{"Log2phys_t", Type, 0, ""},
-		{"Log2phys_t.Contigbytes", Field, 0, ""},
-		{"Log2phys_t.Devoffset", Field, 0, ""},
-		{"Log2phys_t.Flags", Field, 0, ""},
-		{"LookupAccountName", Func, 0, ""},
-		{"LookupAccountSid", Func, 0, ""},
-		{"LookupSID", Func, 0, ""},
-		{"LsfJump", Func, 0, "func(code int, k int, jt int, jf int) *SockFilter"},
-		{"LsfSocket", Func, 0, "func(ifindex int, proto int) (int, error)"},
-		{"LsfStmt", Func, 0, "func(code int, k int) *SockFilter"},
-		{"Lstat", Func, 0, "func(path string, stat *Stat_t) (err error)"},
-		{"MADV_AUTOSYNC", Const, 1, ""},
-		{"MADV_CAN_REUSE", Const, 0, ""},
-		{"MADV_CORE", Const, 1, ""},
-		{"MADV_DOFORK", Const, 0, ""},
-		{"MADV_DONTFORK", Const, 0, ""},
-		{"MADV_DONTNEED", Const, 0, ""},
-		{"MADV_FREE", Const, 0, ""},
-		{"MADV_FREE_REUSABLE", Const, 0, ""},
-		{"MADV_FREE_REUSE", Const, 0, ""},
-		{"MADV_HUGEPAGE", Const, 0, ""},
-		{"MADV_HWPOISON", Const, 0, ""},
-		{"MADV_MERGEABLE", Const, 0, ""},
-		{"MADV_NOCORE", Const, 1, ""},
-		{"MADV_NOHUGEPAGE", Const, 0, ""},
-		{"MADV_NORMAL", Const, 0, ""},
-		{"MADV_NOSYNC", Const, 1, ""},
-		{"MADV_PROTECT", Const, 1, ""},
-		{"MADV_RANDOM", Const, 0, ""},
-		{"MADV_REMOVE", Const, 0, ""},
-		{"MADV_SEQUENTIAL", Const, 0, ""},
-		{"MADV_SPACEAVAIL", Const, 3, ""},
-		{"MADV_UNMERGEABLE", Const, 0, ""},
-		{"MADV_WILLNEED", Const, 0, ""},
-		{"MADV_ZERO_WIRED_PAGES", Const, 0, ""},
-		{"MAP_32BIT", Const, 0, ""},
-		{"MAP_ALIGNED_SUPER", Const, 3, ""},
-		{"MAP_ALIGNMENT_16MB", Const, 3, ""},
-		{"MAP_ALIGNMENT_1TB", Const, 3, ""},
-		{"MAP_ALIGNMENT_256TB", Const, 3, ""},
-		{"MAP_ALIGNMENT_4GB", Const, 3, ""},
-		{"MAP_ALIGNMENT_64KB", Const, 3, ""},
-		{"MAP_ALIGNMENT_64PB", Const, 3, ""},
-		{"MAP_ALIGNMENT_MASK", Const, 3, ""},
-		{"MAP_ALIGNMENT_SHIFT", Const, 3, ""},
-		{"MAP_ANON", Const, 0, ""},
-		{"MAP_ANONYMOUS", Const, 0, ""},
-		{"MAP_COPY", Const, 0, ""},
-		{"MAP_DENYWRITE", Const, 0, ""},
-		{"MAP_EXECUTABLE", Const, 0, ""},
-		{"MAP_FILE", Const, 0, ""},
-		{"MAP_FIXED", Const, 0, ""},
-		{"MAP_FLAGMASK", Const, 3, ""},
-		{"MAP_GROWSDOWN", Const, 0, ""},
-		{"MAP_HASSEMAPHORE", Const, 0, ""},
-		{"MAP_HUGETLB", Const, 0, ""},
-		{"MAP_INHERIT", Const, 3, ""},
-		{"MAP_INHERIT_COPY", Const, 3, ""},
-		{"MAP_INHERIT_DEFAULT", Const, 3, ""},
-		{"MAP_INHERIT_DONATE_COPY", Const, 3, ""},
-		{"MAP_INHERIT_NONE", Const, 3, ""},
-		{"MAP_INHERIT_SHARE", Const, 3, ""},
-		{"MAP_JIT", Const, 0, ""},
-		{"MAP_LOCKED", Const, 0, ""},
-		{"MAP_NOCACHE", Const, 0, ""},
-		{"MAP_NOCORE", Const, 1, ""},
-		{"MAP_NOEXTEND", Const, 0, ""},
-		{"MAP_NONBLOCK", Const, 0, ""},
-		{"MAP_NORESERVE", Const, 0, ""},
-		{"MAP_NOSYNC", Const, 1, ""},
-		{"MAP_POPULATE", Const, 0, ""},
-		{"MAP_PREFAULT_READ", Const, 1, ""},
-		{"MAP_PRIVATE", Const, 0, ""},
-		{"MAP_RENAME", Const, 0, ""},
-		{"MAP_RESERVED0080", Const, 0, ""},
-		{"MAP_RESERVED0100", Const, 1, ""},
-		{"MAP_SHARED", Const, 0, ""},
-		{"MAP_STACK", Const, 0, ""},
-		{"MAP_TRYFIXED", Const, 3, ""},
-		{"MAP_TYPE", Const, 0, ""},
-		{"MAP_WIRED", Const, 3, ""},
-		{"MAXIMUM_REPARSE_DATA_BUFFER_SIZE", Const, 4, ""},
-		{"MAXLEN_IFDESCR", Const, 0, ""},
-		{"MAXLEN_PHYSADDR", Const, 0, ""},
-		{"MAX_ADAPTER_ADDRESS_LENGTH", Const, 0, ""},
-		{"MAX_ADAPTER_DESCRIPTION_LENGTH", Const, 0, ""},
-		{"MAX_ADAPTER_NAME_LENGTH", Const, 0, ""},
-		{"MAX_COMPUTERNAME_LENGTH", Const, 0, ""},
-		{"MAX_INTERFACE_NAME_LEN", Const, 0, ""},
-		{"MAX_LONG_PATH", Const, 0, ""},
-		{"MAX_PATH", Const, 0, ""},
-		{"MAX_PROTOCOL_CHAIN", Const, 2, ""},
-		{"MCL_CURRENT", Const, 0, ""},
-		{"MCL_FUTURE", Const, 0, ""},
-		{"MNT_DETACH", Const, 0, ""},
-		{"MNT_EXPIRE", Const, 0, ""},
-		{"MNT_FORCE", Const, 0, ""},
-		{"MSG_BCAST", Const, 1, ""},
-		{"MSG_CMSG_CLOEXEC", Const, 0, ""},
-		{"MSG_COMPAT", Const, 0, ""},
-		{"MSG_CONFIRM", Const, 0, ""},
-		{"MSG_CONTROLMBUF", Const, 1, ""},
-		{"MSG_CTRUNC", Const, 0, ""},
-		{"MSG_DONTROUTE", Const, 0, ""},
-		{"MSG_DONTWAIT", Const, 0, ""},
-		{"MSG_EOF", Const, 0, ""},
-		{"MSG_EOR", Const, 0, ""},
-		{"MSG_ERRQUEUE", Const, 0, ""},
-		{"MSG_FASTOPEN", Const, 1, ""},
-		{"MSG_FIN", Const, 0, ""},
-		{"MSG_FLUSH", Const, 0, ""},
-		{"MSG_HAVEMORE", Const, 0, ""},
-		{"MSG_HOLD", Const, 0, ""},
-		{"MSG_IOVUSRSPACE", Const, 1, ""},
-		{"MSG_LENUSRSPACE", Const, 1, ""},
-		{"MSG_MCAST", Const, 1, ""},
-		{"MSG_MORE", Const, 0, ""},
-		{"MSG_NAMEMBUF", Const, 1, ""},
-		{"MSG_NBIO", Const, 0, ""},
-		{"MSG_NEEDSA", Const, 0, ""},
-		{"MSG_NOSIGNAL", Const, 0, ""},
-		{"MSG_NOTIFICATION", Const, 0, ""},
-		{"MSG_OOB", Const, 0, ""},
-		{"MSG_PEEK", Const, 0, ""},
-		{"MSG_PROXY", Const, 0, ""},
-		{"MSG_RCVMORE", Const, 0, ""},
-		{"MSG_RST", Const, 0, ""},
-		{"MSG_SEND", Const, 0, ""},
-		{"MSG_SYN", Const, 0, ""},
-		{"MSG_TRUNC", Const, 0, ""},
-		{"MSG_TRYHARD", Const, 0, ""},
-		{"MSG_USERFLAGS", Const, 1, ""},
-		{"MSG_WAITALL", Const, 0, ""},
-		{"MSG_WAITFORONE", Const, 0, ""},
-		{"MSG_WAITSTREAM", Const, 0, ""},
-		{"MS_ACTIVE", Const, 0, ""},
-		{"MS_ASYNC", Const, 0, ""},
-		{"MS_BIND", Const, 0, ""},
-		{"MS_DEACTIVATE", Const, 0, ""},
-		{"MS_DIRSYNC", Const, 0, ""},
-		{"MS_INVALIDATE", Const, 0, ""},
-		{"MS_I_VERSION", Const, 0, ""},
-		{"MS_KERNMOUNT", Const, 0, ""},
-		{"MS_KILLPAGES", Const, 0, ""},
-		{"MS_MANDLOCK", Const, 0, ""},
-		{"MS_MGC_MSK", Const, 0, ""},
-		{"MS_MGC_VAL", Const, 0, ""},
-		{"MS_MOVE", Const, 0, ""},
-		{"MS_NOATIME", Const, 0, ""},
-		{"MS_NODEV", Const, 0, ""},
-		{"MS_NODIRATIME", Const, 0, ""},
-		{"MS_NOEXEC", Const, 0, ""},
-		{"MS_NOSUID", Const, 0, ""},
-		{"MS_NOUSER", Const, 0, ""},
-		{"MS_POSIXACL", Const, 0, ""},
-		{"MS_PRIVATE", Const, 0, ""},
-		{"MS_RDONLY", Const, 0, ""},
-		{"MS_REC", Const, 0, ""},
-		{"MS_RELATIME", Const, 0, ""},
-		{"MS_REMOUNT", Const, 0, ""},
-		{"MS_RMT_MASK", Const, 0, ""},
-		{"MS_SHARED", Const, 0, ""},
-		{"MS_SILENT", Const, 0, ""},
-		{"MS_SLAVE", Const, 0, ""},
-		{"MS_STRICTATIME", Const, 0, ""},
-		{"MS_SYNC", Const, 0, ""},
-		{"MS_SYNCHRONOUS", Const, 0, ""},
-		{"MS_UNBINDABLE", Const, 0, ""},
-		{"Madvise", Func, 0, "func(b []byte, advice int) (err error)"},
-		{"MapViewOfFile", Func, 0, ""},
-		{"MaxTokenInfoClass", Const, 0, ""},
-		{"Mclpool", Type, 2, ""},
-		{"Mclpool.Alive", Field, 2, ""},
-		{"Mclpool.Cwm", Field, 2, ""},
-		{"Mclpool.Grown", Field, 2, ""},
-		{"Mclpool.Hwm", Field, 2, ""},
-		{"Mclpool.Lwm", Field, 2, ""},
-		{"MibIfRow", Type, 0, ""},
-		{"MibIfRow.AdminStatus", Field, 0, ""},
-		{"MibIfRow.Descr", Field, 0, ""},
-		{"MibIfRow.DescrLen", Field, 0, ""},
-		{"MibIfRow.InDiscards", Field, 0, ""},
-		{"MibIfRow.InErrors", Field, 0, ""},
-		{"MibIfRow.InNUcastPkts", Field, 0, ""},
-		{"MibIfRow.InOctets", Field, 0, ""},
-		{"MibIfRow.InUcastPkts", Field, 0, ""},
-		{"MibIfRow.InUnknownProtos", Field, 0, ""},
-		{"MibIfRow.Index", Field, 0, ""},
-		{"MibIfRow.LastChange", Field, 0, ""},
-		{"MibIfRow.Mtu", Field, 0, ""},
-		{"MibIfRow.Name", Field, 0, ""},
-		{"MibIfRow.OperStatus", Field, 0, ""},
-		{"MibIfRow.OutDiscards", Field, 0, ""},
-		{"MibIfRow.OutErrors", Field, 0, ""},
-		{"MibIfRow.OutNUcastPkts", Field, 0, ""},
-		{"MibIfRow.OutOctets", Field, 0, ""},
-		{"MibIfRow.OutQLen", Field, 0, ""},
-		{"MibIfRow.OutUcastPkts", Field, 0, ""},
-		{"MibIfRow.PhysAddr", Field, 0, ""},
-		{"MibIfRow.PhysAddrLen", Field, 0, ""},
-		{"MibIfRow.Speed", Field, 0, ""},
-		{"MibIfRow.Type", Field, 0, ""},
-		{"Mkdir", Func, 0, "func(path string, mode uint32) (err error)"},
-		{"Mkdirat", Func, 0, "func(dirfd int, path string, mode uint32) (err error)"},
-		{"Mkfifo", Func, 0, "func(path string, mode uint32) (err error)"},
-		{"Mknod", Func, 0, "func(path string, mode uint32, dev int) (err error)"},
-		{"Mknodat", Func, 0, "func(dirfd int, path string, mode uint32, dev int) (err error)"},
-		{"Mlock", Func, 0, "func(b []byte) (err error)"},
-		{"Mlockall", Func, 0, "func(flags int) (err error)"},
-		{"Mmap", Func, 0, "func(fd int, offset int64, length int, prot int, flags int) (data []byte, err error)"},
-		{"Mount", Func, 0, "func(source string, target string, fstype string, flags uintptr, data string) (err error)"},
-		{"MoveFile", Func, 0, ""},
-		{"Mprotect", Func, 0, "func(b []byte, prot int) (err error)"},
-		{"Msghdr", Type, 0, ""},
-		{"Msghdr.Control", Field, 0, ""},
-		{"Msghdr.Controllen", Field, 0, ""},
-		{"Msghdr.Flags", Field, 0, ""},
-		{"Msghdr.Iov", Field, 0, ""},
-		{"Msghdr.Iovlen", Field, 0, ""},
-		{"Msghdr.Name", Field, 0, ""},
-		{"Msghdr.Namelen", Field, 0, ""},
-		{"Msghdr.Pad_cgo_0", Field, 0, ""},
-		{"Msghdr.Pad_cgo_1", Field, 0, ""},
-		{"Munlock", Func, 0, "func(b []byte) (err error)"},
-		{"Munlockall", Func, 0, "func() (err error)"},
-		{"Munmap", Func, 0, "func(b []byte) (err error)"},
-		{"MustLoadDLL", Func, 0, ""},
-		{"NAME_MAX", Const, 0, ""},
-		{"NETLINK_ADD_MEMBERSHIP", Const, 0, ""},
-		{"NETLINK_AUDIT", Const, 0, ""},
-		{"NETLINK_BROADCAST_ERROR", Const, 0, ""},
-		{"NETLINK_CONNECTOR", Const, 0, ""},
-		{"NETLINK_DNRTMSG", Const, 0, ""},
-		{"NETLINK_DROP_MEMBERSHIP", Const, 0, ""},
-		{"NETLINK_ECRYPTFS", Const, 0, ""},
-		{"NETLINK_FIB_LOOKUP", Const, 0, ""},
-		{"NETLINK_FIREWALL", Const, 0, ""},
-		{"NETLINK_GENERIC", Const, 0, ""},
-		{"NETLINK_INET_DIAG", Const, 0, ""},
-		{"NETLINK_IP6_FW", Const, 0, ""},
-		{"NETLINK_ISCSI", Const, 0, ""},
-		{"NETLINK_KOBJECT_UEVENT", Const, 0, ""},
-		{"NETLINK_NETFILTER", Const, 0, ""},
-		{"NETLINK_NFLOG", Const, 0, ""},
-		{"NETLINK_NO_ENOBUFS", Const, 0, ""},
-		{"NETLINK_PKTINFO", Const, 0, ""},
-		{"NETLINK_RDMA", Const, 0, ""},
-		{"NETLINK_ROUTE", Const, 0, ""},
-		{"NETLINK_SCSITRANSPORT", Const, 0, ""},
-		{"NETLINK_SELINUX", Const, 0, ""},
-		{"NETLINK_UNUSED", Const, 0, ""},
-		{"NETLINK_USERSOCK", Const, 0, ""},
-		{"NETLINK_XFRM", Const, 0, ""},
-		{"NET_RT_DUMP", Const, 0, ""},
-		{"NET_RT_DUMP2", Const, 0, ""},
-		{"NET_RT_FLAGS", Const, 0, ""},
-		{"NET_RT_IFLIST", Const, 0, ""},
-		{"NET_RT_IFLIST2", Const, 0, ""},
-		{"NET_RT_IFLISTL", Const, 1, ""},
-		{"NET_RT_IFMALIST", Const, 0, ""},
-		{"NET_RT_MAXID", Const, 0, ""},
-		{"NET_RT_OIFLIST", Const, 1, ""},
-		{"NET_RT_OOIFLIST", Const, 1, ""},
-		{"NET_RT_STAT", Const, 0, ""},
-		{"NET_RT_STATS", Const, 1, ""},
-		{"NET_RT_TABLE", Const, 1, ""},
-		{"NET_RT_TRASH", Const, 0, ""},
-		{"NLA_ALIGNTO", Const, 0, ""},
-		{"NLA_F_NESTED", Const, 0, ""},
-		{"NLA_F_NET_BYTEORDER", Const, 0, ""},
-		{"NLA_HDRLEN", Const, 0, ""},
-		{"NLMSG_ALIGNTO", Const, 0, ""},
-		{"NLMSG_DONE", Const, 0, ""},
-		{"NLMSG_ERROR", Const, 0, ""},
-		{"NLMSG_HDRLEN", Const, 0, ""},
-		{"NLMSG_MIN_TYPE", Const, 0, ""},
-		{"NLMSG_NOOP", Const, 0, ""},
-		{"NLMSG_OVERRUN", Const, 0, ""},
-		{"NLM_F_ACK", Const, 0, ""},
-		{"NLM_F_APPEND", Const, 0, ""},
-		{"NLM_F_ATOMIC", Const, 0, ""},
-		{"NLM_F_CREATE", Const, 0, ""},
-		{"NLM_F_DUMP", Const, 0, ""},
-		{"NLM_F_ECHO", Const, 0, ""},
-		{"NLM_F_EXCL", Const, 0, ""},
-		{"NLM_F_MATCH", Const, 0, ""},
-		{"NLM_F_MULTI", Const, 0, ""},
-		{"NLM_F_REPLACE", Const, 0, ""},
-		{"NLM_F_REQUEST", Const, 0, ""},
-		{"NLM_F_ROOT", Const, 0, ""},
-		{"NOFLSH", Const, 0, ""},
-		{"NOTE_ABSOLUTE", Const, 0, ""},
-		{"NOTE_ATTRIB", Const, 0, ""},
-		{"NOTE_BACKGROUND", Const, 16, ""},
-		{"NOTE_CHILD", Const, 0, ""},
-		{"NOTE_CRITICAL", Const, 16, ""},
-		{"NOTE_DELETE", Const, 0, ""},
-		{"NOTE_EOF", Const, 1, ""},
-		{"NOTE_EXEC", Const, 0, ""},
-		{"NOTE_EXIT", Const, 0, ""},
-		{"NOTE_EXITSTATUS", Const, 0, ""},
-		{"NOTE_EXIT_CSERROR", Const, 16, ""},
-		{"NOTE_EXIT_DECRYPTFAIL", Const, 16, ""},
-		{"NOTE_EXIT_DETAIL", Const, 16, ""},
-		{"NOTE_EXIT_DETAIL_MASK", Const, 16, ""},
-		{"NOTE_EXIT_MEMORY", Const, 16, ""},
-		{"NOTE_EXIT_REPARENTED", Const, 16, ""},
-		{"NOTE_EXTEND", Const, 0, ""},
-		{"NOTE_FFAND", Const, 0, ""},
-		{"NOTE_FFCOPY", Const, 0, ""},
-		{"NOTE_FFCTRLMASK", Const, 0, ""},
-		{"NOTE_FFLAGSMASK", Const, 0, ""},
-		{"NOTE_FFNOP", Const, 0, ""},
-		{"NOTE_FFOR", Const, 0, ""},
-		{"NOTE_FORK", Const, 0, ""},
-		{"NOTE_LEEWAY", Const, 16, ""},
-		{"NOTE_LINK", Const, 0, ""},
-		{"NOTE_LOWAT", Const, 0, ""},
-		{"NOTE_NONE", Const, 0, ""},
-		{"NOTE_NSECONDS", Const, 0, ""},
-		{"NOTE_PCTRLMASK", Const, 0, ""},
-		{"NOTE_PDATAMASK", Const, 0, ""},
-		{"NOTE_REAP", Const, 0, ""},
-		{"NOTE_RENAME", Const, 0, ""},
-		{"NOTE_RESOURCEEND", Const, 0, ""},
-		{"NOTE_REVOKE", Const, 0, ""},
-		{"NOTE_SECONDS", Const, 0, ""},
-		{"NOTE_SIGNAL", Const, 0, ""},
-		{"NOTE_TRACK", Const, 0, ""},
-		{"NOTE_TRACKERR", Const, 0, ""},
-		{"NOTE_TRIGGER", Const, 0, ""},
-		{"NOTE_TRUNCATE", Const, 1, ""},
-		{"NOTE_USECONDS", Const, 0, ""},
-		{"NOTE_VM_ERROR", Const, 0, ""},
-		{"NOTE_VM_PRESSURE", Const, 0, ""},
-		{"NOTE_VM_PRESSURE_SUDDEN_TERMINATE", Const, 0, ""},
-		{"NOTE_VM_PRESSURE_TERMINATE", Const, 0, ""},
-		{"NOTE_WRITE", Const, 0, ""},
-		{"NameCanonical", Const, 0, ""},
-		{"NameCanonicalEx", Const, 0, ""},
-		{"NameDisplay", Const, 0, ""},
-		{"NameDnsDomain", Const, 0, ""},
-		{"NameFullyQualifiedDN", Const, 0, ""},
-		{"NameSamCompatible", Const, 0, ""},
-		{"NameServicePrincipal", Const, 0, ""},
-		{"NameUniqueId", Const, 0, ""},
-		{"NameUnknown", Const, 0, ""},
-		{"NameUserPrincipal", Const, 0, ""},
-		{"Nanosleep", Func, 0, "func(time *Timespec, leftover *Timespec) (err error)"},
-		{"NetApiBufferFree", Func, 0, ""},
-		{"NetGetJoinInformation", Func, 2, ""},
-		{"NetSetupDomainName", Const, 2, ""},
-		{"NetSetupUnjoined", Const, 2, ""},
-		{"NetSetupUnknownStatus", Const, 2, ""},
-		{"NetSetupWorkgroupName", Const, 2, ""},
-		{"NetUserGetInfo", Func, 0, ""},
-		{"NetlinkMessage", Type, 0, ""},
-		{"NetlinkMessage.Data", Field, 0, ""},
-		{"NetlinkMessage.Header", Field, 0, ""},
-		{"NetlinkRIB", Func, 0, "func(proto int, family int) ([]byte, error)"},
-		{"NetlinkRouteAttr", Type, 0, ""},
-		{"NetlinkRouteAttr.Attr", Field, 0, ""},
-		{"NetlinkRouteAttr.Value", Field, 0, ""},
-		{"NetlinkRouteRequest", Type, 0, ""},
-		{"NetlinkRouteRequest.Data", Field, 0, ""},
-		{"NetlinkRouteRequest.Header", Field, 0, ""},
-		{"NewCallback", Func, 0, ""},
-		{"NewCallbackCDecl", Func, 3, ""},
-		{"NewLazyDLL", Func, 0, ""},
-		{"NlAttr", Type, 0, ""},
-		{"NlAttr.Len", Field, 0, ""},
-		{"NlAttr.Type", Field, 0, ""},
-		{"NlMsgerr", Type, 0, ""},
-		{"NlMsgerr.Error", Field, 0, ""},
-		{"NlMsgerr.Msg", Field, 0, ""},
-		{"NlMsghdr", Type, 0, ""},
-		{"NlMsghdr.Flags", Field, 0, ""},
-		{"NlMsghdr.Len", Field, 0, ""},
-		{"NlMsghdr.Pid", Field, 0, ""},
-		{"NlMsghdr.Seq", Field, 0, ""},
-		{"NlMsghdr.Type", Field, 0, ""},
-		{"NsecToFiletime", Func, 0, ""},
-		{"NsecToTimespec", Func, 0, "func(nsec int64) Timespec"},
-		{"NsecToTimeval", Func, 0, "func(nsec int64) Timeval"},
-		{"Ntohs", Func, 0, ""},
-		{"OCRNL", Const, 0, ""},
-		{"OFDEL", Const, 0, ""},
-		{"OFILL", Const, 0, ""},
-		{"OFIOGETBMAP", Const, 1, ""},
-		{"OID_PKIX_KP_SERVER_AUTH", Var, 0, ""},
-		{"OID_SERVER_GATED_CRYPTO", Var, 0, ""},
-		{"OID_SGC_NETSCAPE", Var, 0, ""},
-		{"OLCUC", Const, 0, ""},
-		{"ONLCR", Const, 0, ""},
-		{"ONLRET", Const, 0, ""},
-		{"ONOCR", Const, 0, ""},
-		{"ONOEOT", Const, 1, ""},
-		{"OPEN_ALWAYS", Const, 0, ""},
-		{"OPEN_EXISTING", Const, 0, ""},
-		{"OPOST", Const, 0, ""},
-		{"O_ACCMODE", Const, 0, ""},
-		{"O_ALERT", Const, 0, ""},
-		{"O_ALT_IO", Const, 1, ""},
-		{"O_APPEND", Const, 0, ""},
-		{"O_ASYNC", Const, 0, ""},
-		{"O_CLOEXEC", Const, 0, ""},
-		{"O_CREAT", Const, 0, ""},
-		{"O_DIRECT", Const, 0, ""},
-		{"O_DIRECTORY", Const, 0, ""},
-		{"O_DP_GETRAWENCRYPTED", Const, 16, ""},
-		{"O_DSYNC", Const, 0, ""},
-		{"O_EVTONLY", Const, 0, ""},
-		{"O_EXCL", Const, 0, ""},
-		{"O_EXEC", Const, 0, ""},
-		{"O_EXLOCK", Const, 0, ""},
-		{"O_FSYNC", Const, 0, ""},
-		{"O_LARGEFILE", Const, 0, ""},
-		{"O_NDELAY", Const, 0, ""},
-		{"O_NOATIME", Const, 0, ""},
-		{"O_NOCTTY", Const, 0, ""},
-		{"O_NOFOLLOW", Const, 0, ""},
-		{"O_NONBLOCK", Const, 0, ""},
-		{"O_NOSIGPIPE", Const, 1, ""},
-		{"O_POPUP", Const, 0, ""},
-		{"O_RDONLY", Const, 0, ""},
-		{"O_RDWR", Const, 0, ""},
-		{"O_RSYNC", Const, 0, ""},
-		{"O_SHLOCK", Const, 0, ""},
-		{"O_SYMLINK", Const, 0, ""},
-		{"O_SYNC", Const, 0, ""},
-		{"O_TRUNC", Const, 0, ""},
-		{"O_TTY_INIT", Const, 0, ""},
-		{"O_WRONLY", Const, 0, ""},
-		{"Open", Func, 0, "func(path string, mode int, perm uint32) (fd int, err error)"},
-		{"OpenCurrentProcessToken", Func, 0, ""},
-		{"OpenProcess", Func, 0, ""},
-		{"OpenProcessToken", Func, 0, ""},
-		{"Openat", Func, 0, "func(dirfd int, path string, flags int, mode uint32) (fd int, err error)"},
-		{"Overlapped", Type, 0, ""},
-		{"Overlapped.HEvent", Field, 0, ""},
-		{"Overlapped.Internal", Field, 0, ""},
-		{"Overlapped.InternalHigh", Field, 0, ""},
-		{"Overlapped.Offset", Field, 0, ""},
-		{"Overlapped.OffsetHigh", Field, 0, ""},
-		{"PACKET_ADD_MEMBERSHIP", Const, 0, ""},
-		{"PACKET_BROADCAST", Const, 0, ""},
-		{"PACKET_DROP_MEMBERSHIP", Const, 0, ""},
-		{"PACKET_FASTROUTE", Const, 0, ""},
-		{"PACKET_HOST", Const, 0, ""},
-		{"PACKET_LOOPBACK", Const, 0, ""},
-		{"PACKET_MR_ALLMULTI", Const, 0, ""},
-		{"PACKET_MR_MULTICAST", Const, 0, ""},
-		{"PACKET_MR_PROMISC", Const, 0, ""},
-		{"PACKET_MULTICAST", Const, 0, ""},
-		{"PACKET_OTHERHOST", Const, 0, ""},
-		{"PACKET_OUTGOING", Const, 0, ""},
-		{"PACKET_RECV_OUTPUT", Const, 0, ""},
-		{"PACKET_RX_RING", Const, 0, ""},
-		{"PACKET_STATISTICS", Const, 0, ""},
-		{"PAGE_EXECUTE_READ", Const, 0, ""},
-		{"PAGE_EXECUTE_READWRITE", Const, 0, ""},
-		{"PAGE_EXECUTE_WRITECOPY", Const, 0, ""},
-		{"PAGE_READONLY", Const, 0, ""},
-		{"PAGE_READWRITE", Const, 0, ""},
-		{"PAGE_WRITECOPY", Const, 0, ""},
-		{"PARENB", Const, 0, ""},
-		{"PARMRK", Const, 0, ""},
-		{"PARODD", Const, 0, ""},
-		{"PENDIN", Const, 0, ""},
-		{"PFL_HIDDEN", Const, 2, ""},
-		{"PFL_MATCHES_PROTOCOL_ZERO", Const, 2, ""},
-		{"PFL_MULTIPLE_PROTO_ENTRIES", Const, 2, ""},
-		{"PFL_NETWORKDIRECT_PROVIDER", Const, 2, ""},
-		{"PFL_RECOMMENDED_PROTO_ENTRY", Const, 2, ""},
-		{"PF_FLUSH", Const, 1, ""},
-		{"PKCS_7_ASN_ENCODING", Const, 0, ""},
-		{"PMC5_PIPELINE_FLUSH", Const, 1, ""},
-		{"PRIO_PGRP", Const, 2, ""},
-		{"PRIO_PROCESS", Const, 2, ""},
-		{"PRIO_USER", Const, 2, ""},
-		{"PRI_IOFLUSH", Const, 1, ""},
-		{"PROCESS_QUERY_INFORMATION", Const, 0, ""},
-		{"PROCESS_TERMINATE", Const, 2, ""},
-		{"PROT_EXEC", Const, 0, ""},
-		{"PROT_GROWSDOWN", Const, 0, ""},
-		{"PROT_GROWSUP", Const, 0, ""},
-		{"PROT_NONE", Const, 0, ""},
-		{"PROT_READ", Const, 0, ""},
-		{"PROT_WRITE", Const, 0, ""},
-		{"PROV_DH_SCHANNEL", Const, 0, ""},
-		{"PROV_DSS", Const, 0, ""},
-		{"PROV_DSS_DH", Const, 0, ""},
-		{"PROV_EC_ECDSA_FULL", Const, 0, ""},
-		{"PROV_EC_ECDSA_SIG", Const, 0, ""},
-		{"PROV_EC_ECNRA_FULL", Const, 0, ""},
-		{"PROV_EC_ECNRA_SIG", Const, 0, ""},
-		{"PROV_FORTEZZA", Const, 0, ""},
-		{"PROV_INTEL_SEC", Const, 0, ""},
-		{"PROV_MS_EXCHANGE", Const, 0, ""},
-		{"PROV_REPLACE_OWF", Const, 0, ""},
-		{"PROV_RNG", Const, 0, ""},
-		{"PROV_RSA_AES", Const, 0, ""},
-		{"PROV_RSA_FULL", Const, 0, ""},
-		{"PROV_RSA_SCHANNEL", Const, 0, ""},
-		{"PROV_RSA_SIG", Const, 0, ""},
-		{"PROV_SPYRUS_LYNKS", Const, 0, ""},
-		{"PROV_SSL", Const, 0, ""},
-		{"PR_CAPBSET_DROP", Const, 0, ""},
-		{"PR_CAPBSET_READ", Const, 0, ""},
-		{"PR_CLEAR_SECCOMP_FILTER", Const, 0, ""},
-		{"PR_ENDIAN_BIG", Const, 0, ""},
-		{"PR_ENDIAN_LITTLE", Const, 0, ""},
-		{"PR_ENDIAN_PPC_LITTLE", Const, 0, ""},
-		{"PR_FPEMU_NOPRINT", Const, 0, ""},
-		{"PR_FPEMU_SIGFPE", Const, 0, ""},
-		{"PR_FP_EXC_ASYNC", Const, 0, ""},
-		{"PR_FP_EXC_DISABLED", Const, 0, ""},
-		{"PR_FP_EXC_DIV", Const, 0, ""},
-		{"PR_FP_EXC_INV", Const, 0, ""},
-		{"PR_FP_EXC_NONRECOV", Const, 0, ""},
-		{"PR_FP_EXC_OVF", Const, 0, ""},
-		{"PR_FP_EXC_PRECISE", Const, 0, ""},
-		{"PR_FP_EXC_RES", Const, 0, ""},
-		{"PR_FP_EXC_SW_ENABLE", Const, 0, ""},
-		{"PR_FP_EXC_UND", Const, 0, ""},
-		{"PR_GET_DUMPABLE", Const, 0, ""},
-		{"PR_GET_ENDIAN", Const, 0, ""},
-		{"PR_GET_FPEMU", Const, 0, ""},
-		{"PR_GET_FPEXC", Const, 0, ""},
-		{"PR_GET_KEEPCAPS", Const, 0, ""},
-		{"PR_GET_NAME", Const, 0, ""},
-		{"PR_GET_PDEATHSIG", Const, 0, ""},
-		{"PR_GET_SECCOMP", Const, 0, ""},
-		{"PR_GET_SECCOMP_FILTER", Const, 0, ""},
-		{"PR_GET_SECUREBITS", Const, 0, ""},
-		{"PR_GET_TIMERSLACK", Const, 0, ""},
-		{"PR_GET_TIMING", Const, 0, ""},
-		{"PR_GET_TSC", Const, 0, ""},
-		{"PR_GET_UNALIGN", Const, 0, ""},
-		{"PR_MCE_KILL", Const, 0, ""},
-		{"PR_MCE_KILL_CLEAR", Const, 0, ""},
-		{"PR_MCE_KILL_DEFAULT", Const, 0, ""},
-		{"PR_MCE_KILL_EARLY", Const, 0, ""},
-		{"PR_MCE_KILL_GET", Const, 0, ""},
-		{"PR_MCE_KILL_LATE", Const, 0, ""},
-		{"PR_MCE_KILL_SET", Const, 0, ""},
-		{"PR_SECCOMP_FILTER_EVENT", Const, 0, ""},
-		{"PR_SECCOMP_FILTER_SYSCALL", Const, 0, ""},
-		{"PR_SET_DUMPABLE", Const, 0, ""},
-		{"PR_SET_ENDIAN", Const, 0, ""},
-		{"PR_SET_FPEMU", Const, 0, ""},
-		{"PR_SET_FPEXC", Const, 0, ""},
-		{"PR_SET_KEEPCAPS", Const, 0, ""},
-		{"PR_SET_NAME", Const, 0, ""},
-		{"PR_SET_PDEATHSIG", Const, 0, ""},
-		{"PR_SET_PTRACER", Const, 0, ""},
-		{"PR_SET_SECCOMP", Const, 0, ""},
-		{"PR_SET_SECCOMP_FILTER", Const, 0, ""},
-		{"PR_SET_SECUREBITS", Const, 0, ""},
-		{"PR_SET_TIMERSLACK", Const, 0, ""},
-		{"PR_SET_TIMING", Const, 0, ""},
-		{"PR_SET_TSC", Const, 0, ""},
-		{"PR_SET_UNALIGN", Const, 0, ""},
-		{"PR_TASK_PERF_EVENTS_DISABLE", Const, 0, ""},
-		{"PR_TASK_PERF_EVENTS_ENABLE", Const, 0, ""},
-		{"PR_TIMING_STATISTICAL", Const, 0, ""},
-		{"PR_TIMING_TIMESTAMP", Const, 0, ""},
-		{"PR_TSC_ENABLE", Const, 0, ""},
-		{"PR_TSC_SIGSEGV", Const, 0, ""},
-		{"PR_UNALIGN_NOPRINT", Const, 0, ""},
-		{"PR_UNALIGN_SIGBUS", Const, 0, ""},
-		{"PTRACE_ARCH_PRCTL", Const, 0, ""},
-		{"PTRACE_ATTACH", Const, 0, ""},
-		{"PTRACE_CONT", Const, 0, ""},
-		{"PTRACE_DETACH", Const, 0, ""},
-		{"PTRACE_EVENT_CLONE", Const, 0, ""},
-		{"PTRACE_EVENT_EXEC", Const, 0, ""},
-		{"PTRACE_EVENT_EXIT", Const, 0, ""},
-		{"PTRACE_EVENT_FORK", Const, 0, ""},
-		{"PTRACE_EVENT_VFORK", Const, 0, ""},
-		{"PTRACE_EVENT_VFORK_DONE", Const, 0, ""},
-		{"PTRACE_GETCRUNCHREGS", Const, 0, ""},
-		{"PTRACE_GETEVENTMSG", Const, 0, ""},
-		{"PTRACE_GETFPREGS", Const, 0, ""},
-		{"PTRACE_GETFPXREGS", Const, 0, ""},
-		{"PTRACE_GETHBPREGS", Const, 0, ""},
-		{"PTRACE_GETREGS", Const, 0, ""},
-		{"PTRACE_GETREGSET", Const, 0, ""},
-		{"PTRACE_GETSIGINFO", Const, 0, ""},
-		{"PTRACE_GETVFPREGS", Const, 0, ""},
-		{"PTRACE_GETWMMXREGS", Const, 0, ""},
-		{"PTRACE_GET_THREAD_AREA", Const, 0, ""},
-		{"PTRACE_KILL", Const, 0, ""},
-		{"PTRACE_OLDSETOPTIONS", Const, 0, ""},
-		{"PTRACE_O_MASK", Const, 0, ""},
-		{"PTRACE_O_TRACECLONE", Const, 0, ""},
-		{"PTRACE_O_TRACEEXEC", Const, 0, ""},
-		{"PTRACE_O_TRACEEXIT", Const, 0, ""},
-		{"PTRACE_O_TRACEFORK", Const, 0, ""},
-		{"PTRACE_O_TRACESYSGOOD", Const, 0, ""},
-		{"PTRACE_O_TRACEVFORK", Const, 0, ""},
-		{"PTRACE_O_TRACEVFORKDONE", Const, 0, ""},
-		{"PTRACE_PEEKDATA", Const, 0, ""},
-		{"PTRACE_PEEKTEXT", Const, 0, ""},
-		{"PTRACE_PEEKUSR", Const, 0, ""},
-		{"PTRACE_POKEDATA", Const, 0, ""},
-		{"PTRACE_POKETEXT", Const, 0, ""},
-		{"PTRACE_POKEUSR", Const, 0, ""},
-		{"PTRACE_SETCRUNCHREGS", Const, 0, ""},
-		{"PTRACE_SETFPREGS", Const, 0, ""},
-		{"PTRACE_SETFPXREGS", Const, 0, ""},
-		{"PTRACE_SETHBPREGS", Const, 0, ""},
-		{"PTRACE_SETOPTIONS", Const, 0, ""},
-		{"PTRACE_SETREGS", Const, 0, ""},
-		{"PTRACE_SETREGSET", Const, 0, ""},
-		{"PTRACE_SETSIGINFO", Const, 0, ""},
-		{"PTRACE_SETVFPREGS", Const, 0, ""},
-		{"PTRACE_SETWMMXREGS", Const, 0, ""},
-		{"PTRACE_SET_SYSCALL", Const, 0, ""},
-		{"PTRACE_SET_THREAD_AREA", Const, 0, ""},
-		{"PTRACE_SINGLEBLOCK", Const, 0, ""},
-		{"PTRACE_SINGLESTEP", Const, 0, ""},
-		{"PTRACE_SYSCALL", Const, 0, ""},
-		{"PTRACE_SYSEMU", Const, 0, ""},
-		{"PTRACE_SYSEMU_SINGLESTEP", Const, 0, ""},
-		{"PTRACE_TRACEME", Const, 0, ""},
-		{"PT_ATTACH", Const, 0, ""},
-		{"PT_ATTACHEXC", Const, 0, ""},
-		{"PT_CONTINUE", Const, 0, ""},
-		{"PT_DATA_ADDR", Const, 0, ""},
-		{"PT_DENY_ATTACH", Const, 0, ""},
-		{"PT_DETACH", Const, 0, ""},
-		{"PT_FIRSTMACH", Const, 0, ""},
-		{"PT_FORCEQUOTA", Const, 0, ""},
-		{"PT_KILL", Const, 0, ""},
-		{"PT_MASK", Const, 1, ""},
-		{"PT_READ_D", Const, 0, ""},
-		{"PT_READ_I", Const, 0, ""},
-		{"PT_READ_U", Const, 0, ""},
-		{"PT_SIGEXC", Const, 0, ""},
-		{"PT_STEP", Const, 0, ""},
-		{"PT_TEXT_ADDR", Const, 0, ""},
-		{"PT_TEXT_END_ADDR", Const, 0, ""},
-		{"PT_THUPDATE", Const, 0, ""},
-		{"PT_TRACE_ME", Const, 0, ""},
-		{"PT_WRITE_D", Const, 0, ""},
-		{"PT_WRITE_I", Const, 0, ""},
-		{"PT_WRITE_U", Const, 0, ""},
-		{"ParseDirent", Func, 0, "func(buf []byte, max int, names []string) (consumed int, count int, newnames []string)"},
-		{"ParseNetlinkMessage", Func, 0, "func(b []byte) ([]NetlinkMessage, error)"},
-		{"ParseNetlinkRouteAttr", Func, 0, "func(m *NetlinkMessage) ([]NetlinkRouteAttr, error)"},
-		{"ParseRoutingMessage", Func, 0, ""},
-		{"ParseRoutingSockaddr", Func, 0, ""},
-		{"ParseSocketControlMessage", Func, 0, "func(b []byte) ([]SocketControlMessage, error)"},
-		{"ParseUnixCredentials", Func, 0, "func(m *SocketControlMessage) (*Ucred, error)"},
-		{"ParseUnixRights", Func, 0, "func(m *SocketControlMessage) ([]int, error)"},
-		{"PathMax", Const, 0, ""},
-		{"Pathconf", Func, 0, ""},
-		{"Pause", Func, 0, "func() (err error)"},
-		{"Pipe", Func, 0, "func(p []int) error"},
-		{"Pipe2", Func, 1, "func(p []int, flags int) error"},
-		{"PivotRoot", Func, 0, "func(newroot string, putold string) (err error)"},
-		{"Pointer", Type, 11, ""},
-		{"PostQueuedCompletionStatus", Func, 0, ""},
-		{"Pread", Func, 0, "func(fd int, p []byte, offset int64) (n int, err error)"},
-		{"Proc", Type, 0, ""},
-		{"Proc.Dll", Field, 0, ""},
-		{"Proc.Name", Field, 0, ""},
-		{"ProcAttr", Type, 0, ""},
-		{"ProcAttr.Dir", Field, 0, ""},
-		{"ProcAttr.Env", Field, 0, ""},
-		{"ProcAttr.Files", Field, 0, ""},
-		{"ProcAttr.Sys", Field, 0, ""},
-		{"Process32First", Func, 4, ""},
-		{"Process32Next", Func, 4, ""},
-		{"ProcessEntry32", Type, 4, ""},
-		{"ProcessEntry32.DefaultHeapID", Field, 4, ""},
-		{"ProcessEntry32.ExeFile", Field, 4, ""},
-		{"ProcessEntry32.Flags", Field, 4, ""},
-		{"ProcessEntry32.ModuleID", Field, 4, ""},
-		{"ProcessEntry32.ParentProcessID", Field, 4, ""},
-		{"ProcessEntry32.PriClassBase", Field, 4, ""},
-		{"ProcessEntry32.ProcessID", Field, 4, ""},
-		{"ProcessEntry32.Size", Field, 4, ""},
-		{"ProcessEntry32.Threads", Field, 4, ""},
-		{"ProcessEntry32.Usage", Field, 4, ""},
-		{"ProcessInformation", Type, 0, ""},
-		{"ProcessInformation.Process", Field, 0, ""},
-		{"ProcessInformation.ProcessId", Field, 0, ""},
-		{"ProcessInformation.Thread", Field, 0, ""},
-		{"ProcessInformation.ThreadId", Field, 0, ""},
-		{"Protoent", Type, 0, ""},
-		{"Protoent.Aliases", Field, 0, ""},
-		{"Protoent.Name", Field, 0, ""},
-		{"Protoent.Proto", Field, 0, ""},
-		{"PtraceAttach", Func, 0, "func(pid int) (err error)"},
-		{"PtraceCont", Func, 0, "func(pid int, signal int) (err error)"},
-		{"PtraceDetach", Func, 0, "func(pid int) (err error)"},
-		{"PtraceGetEventMsg", Func, 0, "func(pid int) (msg uint, err error)"},
-		{"PtraceGetRegs", Func, 0, "func(pid int, regsout *PtraceRegs) (err error)"},
-		{"PtracePeekData", Func, 0, "func(pid int, addr uintptr, out []byte) (count int, err error)"},
-		{"PtracePeekText", Func, 0, "func(pid int, addr uintptr, out []byte) (count int, err error)"},
-		{"PtracePokeData", Func, 0, "func(pid int, addr uintptr, data []byte) (count int, err error)"},
-		{"PtracePokeText", Func, 0, "func(pid int, addr uintptr, data []byte) (count int, err error)"},
-		{"PtraceRegs", Type, 0, ""},
-		{"PtraceRegs.Cs", Field, 0, ""},
-		{"PtraceRegs.Ds", Field, 0, ""},
-		{"PtraceRegs.Eax", Field, 0, ""},
-		{"PtraceRegs.Ebp", Field, 0, ""},
-		{"PtraceRegs.Ebx", Field, 0, ""},
-		{"PtraceRegs.Ecx", Field, 0, ""},
-		{"PtraceRegs.Edi", Field, 0, ""},
-		{"PtraceRegs.Edx", Field, 0, ""},
-		{"PtraceRegs.Eflags", Field, 0, ""},
-		{"PtraceRegs.Eip", Field, 0, ""},
-		{"PtraceRegs.Es", Field, 0, ""},
-		{"PtraceRegs.Esi", Field, 0, ""},
-		{"PtraceRegs.Esp", Field, 0, ""},
-		{"PtraceRegs.Fs", Field, 0, ""},
-		{"PtraceRegs.Fs_base", Field, 0, ""},
-		{"PtraceRegs.Gs", Field, 0, ""},
-		{"PtraceRegs.Gs_base", Field, 0, ""},
-		{"PtraceRegs.Orig_eax", Field, 0, ""},
-		{"PtraceRegs.Orig_rax", Field, 0, ""},
-		{"PtraceRegs.R10", Field, 0, ""},
-		{"PtraceRegs.R11", Field, 0, ""},
-		{"PtraceRegs.R12", Field, 0, ""},
-		{"PtraceRegs.R13", Field, 0, ""},
-		{"PtraceRegs.R14", Field, 0, ""},
-		{"PtraceRegs.R15", Field, 0, ""},
-		{"PtraceRegs.R8", Field, 0, ""},
-		{"PtraceRegs.R9", Field, 0, ""},
-		{"PtraceRegs.Rax", Field, 0, ""},
-		{"PtraceRegs.Rbp", Field, 0, ""},
-		{"PtraceRegs.Rbx", Field, 0, ""},
-		{"PtraceRegs.Rcx", Field, 0, ""},
-		{"PtraceRegs.Rdi", Field, 0, ""},
-		{"PtraceRegs.Rdx", Field, 0, ""},
-		{"PtraceRegs.Rip", Field, 0, ""},
-		{"PtraceRegs.Rsi", Field, 0, ""},
-		{"PtraceRegs.Rsp", Field, 0, ""},
-		{"PtraceRegs.Ss", Field, 0, ""},
-		{"PtraceRegs.Uregs", Field, 0, ""},
-		{"PtraceRegs.Xcs", Field, 0, ""},
-		{"PtraceRegs.Xds", Field, 0, ""},
-		{"PtraceRegs.Xes", Field, 0, ""},
-		{"PtraceRegs.Xfs", Field, 0, ""},
-		{"PtraceRegs.Xgs", Field, 0, ""},
-		{"PtraceRegs.Xss", Field, 0, ""},
-		{"PtraceSetOptions", Func, 0, "func(pid int, options int) (err error)"},
-		{"PtraceSetRegs", Func, 0, "func(pid int, regs *PtraceRegs) (err error)"},
-		{"PtraceSingleStep", Func, 0, "func(pid int) (err error)"},
-		{"PtraceSyscall", Func, 1, "func(pid int, signal int) (err error)"},
-		{"Pwrite", Func, 0, "func(fd int, p []byte, offset int64) (n int, err error)"},
-		{"REG_BINARY", Const, 0, ""},
-		{"REG_DWORD", Const, 0, ""},
-		{"REG_DWORD_BIG_ENDIAN", Const, 0, ""},
-		{"REG_DWORD_LITTLE_ENDIAN", Const, 0, ""},
-		{"REG_EXPAND_SZ", Const, 0, ""},
-		{"REG_FULL_RESOURCE_DESCRIPTOR", Const, 0, ""},
-		{"REG_LINK", Const, 0, ""},
-		{"REG_MULTI_SZ", Const, 0, ""},
-		{"REG_NONE", Const, 0, ""},
-		{"REG_QWORD", Const, 0, ""},
-		{"REG_QWORD_LITTLE_ENDIAN", Const, 0, ""},
-		{"REG_RESOURCE_LIST", Const, 0, ""},
-		{"REG_RESOURCE_REQUIREMENTS_LIST", Const, 0, ""},
-		{"REG_SZ", Const, 0, ""},
-		{"RLIMIT_AS", Const, 0, ""},
-		{"RLIMIT_CORE", Const, 0, ""},
-		{"RLIMIT_CPU", Const, 0, ""},
-		{"RLIMIT_CPU_USAGE_MONITOR", Const, 16, ""},
-		{"RLIMIT_DATA", Const, 0, ""},
-		{"RLIMIT_FSIZE", Const, 0, ""},
-		{"RLIMIT_NOFILE", Const, 0, ""},
-		{"RLIMIT_STACK", Const, 0, ""},
-		{"RLIM_INFINITY", Const, 0, ""},
-		{"RTAX_ADVMSS", Const, 0, ""},
-		{"RTAX_AUTHOR", Const, 0, ""},
-		{"RTAX_BRD", Const, 0, ""},
-		{"RTAX_CWND", Const, 0, ""},
-		{"RTAX_DST", Const, 0, ""},
-		{"RTAX_FEATURES", Const, 0, ""},
-		{"RTAX_FEATURE_ALLFRAG", Const, 0, ""},
-		{"RTAX_FEATURE_ECN", Const, 0, ""},
-		{"RTAX_FEATURE_SACK", Const, 0, ""},
-		{"RTAX_FEATURE_TIMESTAMP", Const, 0, ""},
-		{"RTAX_GATEWAY", Const, 0, ""},
-		{"RTAX_GENMASK", Const, 0, ""},
-		{"RTAX_HOPLIMIT", Const, 0, ""},
-		{"RTAX_IFA", Const, 0, ""},
-		{"RTAX_IFP", Const, 0, ""},
-		{"RTAX_INITCWND", Const, 0, ""},
-		{"RTAX_INITRWND", Const, 0, ""},
-		{"RTAX_LABEL", Const, 1, ""},
-		{"RTAX_LOCK", Const, 0, ""},
-		{"RTAX_MAX", Const, 0, ""},
-		{"RTAX_MTU", Const, 0, ""},
-		{"RTAX_NETMASK", Const, 0, ""},
-		{"RTAX_REORDERING", Const, 0, ""},
-		{"RTAX_RTO_MIN", Const, 0, ""},
-		{"RTAX_RTT", Const, 0, ""},
-		{"RTAX_RTTVAR", Const, 0, ""},
-		{"RTAX_SRC", Const, 1, ""},
-		{"RTAX_SRCMASK", Const, 1, ""},
-		{"RTAX_SSTHRESH", Const, 0, ""},
-		{"RTAX_TAG", Const, 1, ""},
-		{"RTAX_UNSPEC", Const, 0, ""},
-		{"RTAX_WINDOW", Const, 0, ""},
-		{"RTA_ALIGNTO", Const, 0, ""},
-		{"RTA_AUTHOR", Const, 0, ""},
-		{"RTA_BRD", Const, 0, ""},
-		{"RTA_CACHEINFO", Const, 0, ""},
-		{"RTA_DST", Const, 0, ""},
-		{"RTA_FLOW", Const, 0, ""},
-		{"RTA_GATEWAY", Const, 0, ""},
-		{"RTA_GENMASK", Const, 0, ""},
-		{"RTA_IFA", Const, 0, ""},
-		{"RTA_IFP", Const, 0, ""},
-		{"RTA_IIF", Const, 0, ""},
-		{"RTA_LABEL", Const, 1, ""},
-		{"RTA_MAX", Const, 0, ""},
-		{"RTA_METRICS", Const, 0, ""},
-		{"RTA_MULTIPATH", Const, 0, ""},
-		{"RTA_NETMASK", Const, 0, ""},
-		{"RTA_OIF", Const, 0, ""},
-		{"RTA_PREFSRC", Const, 0, ""},
-		{"RTA_PRIORITY", Const, 0, ""},
-		{"RTA_SRC", Const, 0, ""},
-		{"RTA_SRCMASK", Const, 1, ""},
-		{"RTA_TABLE", Const, 0, ""},
-		{"RTA_TAG", Const, 1, ""},
-		{"RTA_UNSPEC", Const, 0, ""},
-		{"RTCF_DIRECTSRC", Const, 0, ""},
-		{"RTCF_DOREDIRECT", Const, 0, ""},
-		{"RTCF_LOG", Const, 0, ""},
-		{"RTCF_MASQ", Const, 0, ""},
-		{"RTCF_NAT", Const, 0, ""},
-		{"RTCF_VALVE", Const, 0, ""},
-		{"RTF_ADDRCLASSMASK", Const, 0, ""},
-		{"RTF_ADDRCONF", Const, 0, ""},
-		{"RTF_ALLONLINK", Const, 0, ""},
-		{"RTF_ANNOUNCE", Const, 1, ""},
-		{"RTF_BLACKHOLE", Const, 0, ""},
-		{"RTF_BROADCAST", Const, 0, ""},
-		{"RTF_CACHE", Const, 0, ""},
-		{"RTF_CLONED", Const, 1, ""},
-		{"RTF_CLONING", Const, 0, ""},
-		{"RTF_CONDEMNED", Const, 0, ""},
-		{"RTF_DEFAULT", Const, 0, ""},
-		{"RTF_DELCLONE", Const, 0, ""},
-		{"RTF_DONE", Const, 0, ""},
-		{"RTF_DYNAMIC", Const, 0, ""},
-		{"RTF_FLOW", Const, 0, ""},
-		{"RTF_FMASK", Const, 0, ""},
-		{"RTF_GATEWAY", Const, 0, ""},
-		{"RTF_GWFLAG_COMPAT", Const, 3, ""},
-		{"RTF_HOST", Const, 0, ""},
-		{"RTF_IFREF", Const, 0, ""},
-		{"RTF_IFSCOPE", Const, 0, ""},
-		{"RTF_INTERFACE", Const, 0, ""},
-		{"RTF_IRTT", Const, 0, ""},
-		{"RTF_LINKRT", Const, 0, ""},
-		{"RTF_LLDATA", Const, 0, ""},
-		{"RTF_LLINFO", Const, 0, ""},
-		{"RTF_LOCAL", Const, 0, ""},
-		{"RTF_MASK", Const, 1, ""},
-		{"RTF_MODIFIED", Const, 0, ""},
-		{"RTF_MPATH", Const, 1, ""},
-		{"RTF_MPLS", Const, 1, ""},
-		{"RTF_MSS", Const, 0, ""},
-		{"RTF_MTU", Const, 0, ""},
-		{"RTF_MULTICAST", Const, 0, ""},
-		{"RTF_NAT", Const, 0, ""},
-		{"RTF_NOFORWARD", Const, 0, ""},
-		{"RTF_NONEXTHOP", Const, 0, ""},
-		{"RTF_NOPMTUDISC", Const, 0, ""},
-		{"RTF_PERMANENT_ARP", Const, 1, ""},
-		{"RTF_PINNED", Const, 0, ""},
-		{"RTF_POLICY", Const, 0, ""},
-		{"RTF_PRCLONING", Const, 0, ""},
-		{"RTF_PROTO1", Const, 0, ""},
-		{"RTF_PROTO2", Const, 0, ""},
-		{"RTF_PROTO3", Const, 0, ""},
-		{"RTF_PROXY", Const, 16, ""},
-		{"RTF_REINSTATE", Const, 0, ""},
-		{"RTF_REJECT", Const, 0, ""},
-		{"RTF_RNH_LOCKED", Const, 0, ""},
-		{"RTF_ROUTER", Const, 16, ""},
-		{"RTF_SOURCE", Const, 1, ""},
-		{"RTF_SRC", Const, 1, ""},
-		{"RTF_STATIC", Const, 0, ""},
-		{"RTF_STICKY", Const, 0, ""},
-		{"RTF_THROW", Const, 0, ""},
-		{"RTF_TUNNEL", Const, 1, ""},
-		{"RTF_UP", Const, 0, ""},
-		{"RTF_USETRAILERS", Const, 1, ""},
-		{"RTF_WASCLONED", Const, 0, ""},
-		{"RTF_WINDOW", Const, 0, ""},
-		{"RTF_XRESOLVE", Const, 0, ""},
-		{"RTM_ADD", Const, 0, ""},
-		{"RTM_BASE", Const, 0, ""},
-		{"RTM_CHANGE", Const, 0, ""},
-		{"RTM_CHGADDR", Const, 1, ""},
-		{"RTM_DELACTION", Const, 0, ""},
-		{"RTM_DELADDR", Const, 0, ""},
-		{"RTM_DELADDRLABEL", Const, 0, ""},
-		{"RTM_DELETE", Const, 0, ""},
-		{"RTM_DELLINK", Const, 0, ""},
-		{"RTM_DELMADDR", Const, 0, ""},
-		{"RTM_DELNEIGH", Const, 0, ""},
-		{"RTM_DELQDISC", Const, 0, ""},
-		{"RTM_DELROUTE", Const, 0, ""},
-		{"RTM_DELRULE", Const, 0, ""},
-		{"RTM_DELTCLASS", Const, 0, ""},
-		{"RTM_DELTFILTER", Const, 0, ""},
-		{"RTM_DESYNC", Const, 1, ""},
-		{"RTM_F_CLONED", Const, 0, ""},
-		{"RTM_F_EQUALIZE", Const, 0, ""},
-		{"RTM_F_NOTIFY", Const, 0, ""},
-		{"RTM_F_PREFIX", Const, 0, ""},
-		{"RTM_GET", Const, 0, ""},
-		{"RTM_GET2", Const, 0, ""},
-		{"RTM_GETACTION", Const, 0, ""},
-		{"RTM_GETADDR", Const, 0, ""},
-		{"RTM_GETADDRLABEL", Const, 0, ""},
-		{"RTM_GETANYCAST", Const, 0, ""},
-		{"RTM_GETDCB", Const, 0, ""},
-		{"RTM_GETLINK", Const, 0, ""},
-		{"RTM_GETMULTICAST", Const, 0, ""},
-		{"RTM_GETNEIGH", Const, 0, ""},
-		{"RTM_GETNEIGHTBL", Const, 0, ""},
-		{"RTM_GETQDISC", Const, 0, ""},
-		{"RTM_GETROUTE", Const, 0, ""},
-		{"RTM_GETRULE", Const, 0, ""},
-		{"RTM_GETTCLASS", Const, 0, ""},
-		{"RTM_GETTFILTER", Const, 0, ""},
-		{"RTM_IEEE80211", Const, 0, ""},
-		{"RTM_IFANNOUNCE", Const, 0, ""},
-		{"RTM_IFINFO", Const, 0, ""},
-		{"RTM_IFINFO2", Const, 0, ""},
-		{"RTM_LLINFO_UPD", Const, 1, ""},
-		{"RTM_LOCK", Const, 0, ""},
-		{"RTM_LOSING", Const, 0, ""},
-		{"RTM_MAX", Const, 0, ""},
-		{"RTM_MAXSIZE", Const, 1, ""},
-		{"RTM_MISS", Const, 0, ""},
-		{"RTM_NEWACTION", Const, 0, ""},
-		{"RTM_NEWADDR", Const, 0, ""},
-		{"RTM_NEWADDRLABEL", Const, 0, ""},
-		{"RTM_NEWLINK", Const, 0, ""},
-		{"RTM_NEWMADDR", Const, 0, ""},
-		{"RTM_NEWMADDR2", Const, 0, ""},
-		{"RTM_NEWNDUSEROPT", Const, 0, ""},
-		{"RTM_NEWNEIGH", Const, 0, ""},
-		{"RTM_NEWNEIGHTBL", Const, 0, ""},
-		{"RTM_NEWPREFIX", Const, 0, ""},
-		{"RTM_NEWQDISC", Const, 0, ""},
-		{"RTM_NEWROUTE", Const, 0, ""},
-		{"RTM_NEWRULE", Const, 0, ""},
-		{"RTM_NEWTCLASS", Const, 0, ""},
-		{"RTM_NEWTFILTER", Const, 0, ""},
-		{"RTM_NR_FAMILIES", Const, 0, ""},
-		{"RTM_NR_MSGTYPES", Const, 0, ""},
-		{"RTM_OIFINFO", Const, 1, ""},
-		{"RTM_OLDADD", Const, 0, ""},
-		{"RTM_OLDDEL", Const, 0, ""},
-		{"RTM_OOIFINFO", Const, 1, ""},
-		{"RTM_REDIRECT", Const, 0, ""},
-		{"RTM_RESOLVE", Const, 0, ""},
-		{"RTM_RTTUNIT", Const, 0, ""},
-		{"RTM_SETDCB", Const, 0, ""},
-		{"RTM_SETGATE", Const, 1, ""},
-		{"RTM_SETLINK", Const, 0, ""},
-		{"RTM_SETNEIGHTBL", Const, 0, ""},
-		{"RTM_VERSION", Const, 0, ""},
-		{"RTNH_ALIGNTO", Const, 0, ""},
-		{"RTNH_F_DEAD", Const, 0, ""},
-		{"RTNH_F_ONLINK", Const, 0, ""},
-		{"RTNH_F_PERVASIVE", Const, 0, ""},
-		{"RTNLGRP_IPV4_IFADDR", Const, 1, ""},
-		{"RTNLGRP_IPV4_MROUTE", Const, 1, ""},
-		{"RTNLGRP_IPV4_ROUTE", Const, 1, ""},
-		{"RTNLGRP_IPV4_RULE", Const, 1, ""},
-		{"RTNLGRP_IPV6_IFADDR", Const, 1, ""},
-		{"RTNLGRP_IPV6_IFINFO", Const, 1, ""},
-		{"RTNLGRP_IPV6_MROUTE", Const, 1, ""},
-		{"RTNLGRP_IPV6_PREFIX", Const, 1, ""},
-		{"RTNLGRP_IPV6_ROUTE", Const, 1, ""},
-		{"RTNLGRP_IPV6_RULE", Const, 1, ""},
-		{"RTNLGRP_LINK", Const, 1, ""},
-		{"RTNLGRP_ND_USEROPT", Const, 1, ""},
-		{"RTNLGRP_NEIGH", Const, 1, ""},
-		{"RTNLGRP_NONE", Const, 1, ""},
-		{"RTNLGRP_NOTIFY", Const, 1, ""},
-		{"RTNLGRP_TC", Const, 1, ""},
-		{"RTN_ANYCAST", Const, 0, ""},
-		{"RTN_BLACKHOLE", Const, 0, ""},
-		{"RTN_BROADCAST", Const, 0, ""},
-		{"RTN_LOCAL", Const, 0, ""},
-		{"RTN_MAX", Const, 0, ""},
-		{"RTN_MULTICAST", Const, 0, ""},
-		{"RTN_NAT", Const, 0, ""},
-		{"RTN_PROHIBIT", Const, 0, ""},
-		{"RTN_THROW", Const, 0, ""},
-		{"RTN_UNICAST", Const, 0, ""},
-		{"RTN_UNREACHABLE", Const, 0, ""},
-		{"RTN_UNSPEC", Const, 0, ""},
-		{"RTN_XRESOLVE", Const, 0, ""},
-		{"RTPROT_BIRD", Const, 0, ""},
-		{"RTPROT_BOOT", Const, 0, ""},
-		{"RTPROT_DHCP", Const, 0, ""},
-		{"RTPROT_DNROUTED", Const, 0, ""},
-		{"RTPROT_GATED", Const, 0, ""},
-		{"RTPROT_KERNEL", Const, 0, ""},
-		{"RTPROT_MRT", Const, 0, ""},
-		{"RTPROT_NTK", Const, 0, ""},
-		{"RTPROT_RA", Const, 0, ""},
-		{"RTPROT_REDIRECT", Const, 0, ""},
-		{"RTPROT_STATIC", Const, 0, ""},
-		{"RTPROT_UNSPEC", Const, 0, ""},
-		{"RTPROT_XORP", Const, 0, ""},
-		{"RTPROT_ZEBRA", Const, 0, ""},
-		{"RTV_EXPIRE", Const, 0, ""},
-		{"RTV_HOPCOUNT", Const, 0, ""},
-		{"RTV_MTU", Const, 0, ""},
-		{"RTV_RPIPE", Const, 0, ""},
-		{"RTV_RTT", Const, 0, ""},
-		{"RTV_RTTVAR", Const, 0, ""},
-		{"RTV_SPIPE", Const, 0, ""},
-		{"RTV_SSTHRESH", Const, 0, ""},
-		{"RTV_WEIGHT", Const, 0, ""},
-		{"RT_CACHING_CONTEXT", Const, 1, ""},
-		{"RT_CLASS_DEFAULT", Const, 0, ""},
-		{"RT_CLASS_LOCAL", Const, 0, ""},
-		{"RT_CLASS_MAIN", Const, 0, ""},
-		{"RT_CLASS_MAX", Const, 0, ""},
-		{"RT_CLASS_UNSPEC", Const, 0, ""},
-		{"RT_DEFAULT_FIB", Const, 1, ""},
-		{"RT_NORTREF", Const, 1, ""},
-		{"RT_SCOPE_HOST", Const, 0, ""},
-		{"RT_SCOPE_LINK", Const, 0, ""},
-		{"RT_SCOPE_NOWHERE", Const, 0, ""},
-		{"RT_SCOPE_SITE", Const, 0, ""},
-		{"RT_SCOPE_UNIVERSE", Const, 0, ""},
-		{"RT_TABLEID_MAX", Const, 1, ""},
-		{"RT_TABLE_COMPAT", Const, 0, ""},
-		{"RT_TABLE_DEFAULT", Const, 0, ""},
-		{"RT_TABLE_LOCAL", Const, 0, ""},
-		{"RT_TABLE_MAIN", Const, 0, ""},
-		{"RT_TABLE_MAX", Const, 0, ""},
-		{"RT_TABLE_UNSPEC", Const, 0, ""},
-		{"RUSAGE_CHILDREN", Const, 0, ""},
-		{"RUSAGE_SELF", Const, 0, ""},
-		{"RUSAGE_THREAD", Const, 0, ""},
-		{"Radvisory_t", Type, 0, ""},
-		{"Radvisory_t.Count", Field, 0, ""},
-		{"Radvisory_t.Offset", Field, 0, ""},
-		{"Radvisory_t.Pad_cgo_0", Field, 0, ""},
-		{"RawConn", Type, 9, ""},
-		{"RawSockaddr", Type, 0, ""},
-		{"RawSockaddr.Data", Field, 0, ""},
-		{"RawSockaddr.Family", Field, 0, ""},
-		{"RawSockaddr.Len", Field, 0, ""},
-		{"RawSockaddrAny", Type, 0, ""},
-		{"RawSockaddrAny.Addr", Field, 0, ""},
-		{"RawSockaddrAny.Pad", Field, 0, ""},
-		{"RawSockaddrDatalink", Type, 0, ""},
-		{"RawSockaddrDatalink.Alen", Field, 0, ""},
-		{"RawSockaddrDatalink.Data", Field, 0, ""},
-		{"RawSockaddrDatalink.Family", Field, 0, ""},
-		{"RawSockaddrDatalink.Index", Field, 0, ""},
-		{"RawSockaddrDatalink.Len", Field, 0, ""},
-		{"RawSockaddrDatalink.Nlen", Field, 0, ""},
-		{"RawSockaddrDatalink.Pad_cgo_0", Field, 2, ""},
-		{"RawSockaddrDatalink.Slen", Field, 0, ""},
-		{"RawSockaddrDatalink.Type", Field, 0, ""},
-		{"RawSockaddrInet4", Type, 0, ""},
-		{"RawSockaddrInet4.Addr", Field, 0, ""},
-		{"RawSockaddrInet4.Family", Field, 0, ""},
-		{"RawSockaddrInet4.Len", Field, 0, ""},
-		{"RawSockaddrInet4.Port", Field, 0, ""},
-		{"RawSockaddrInet4.Zero", Field, 0, ""},
-		{"RawSockaddrInet6", Type, 0, ""},
-		{"RawSockaddrInet6.Addr", Field, 0, ""},
-		{"RawSockaddrInet6.Family", Field, 0, ""},
-		{"RawSockaddrInet6.Flowinfo", Field, 0, ""},
-		{"RawSockaddrInet6.Len", Field, 0, ""},
-		{"RawSockaddrInet6.Port", Field, 0, ""},
-		{"RawSockaddrInet6.Scope_id", Field, 0, ""},
-		{"RawSockaddrLinklayer", Type, 0, ""},
-		{"RawSockaddrLinklayer.Addr", Field, 0, ""},
-		{"RawSockaddrLinklayer.Family", Field, 0, ""},
-		{"RawSockaddrLinklayer.Halen", Field, 0, ""},
-		{"RawSockaddrLinklayer.Hatype", Field, 0, ""},
-		{"RawSockaddrLinklayer.Ifindex", Field, 0, ""},
-		{"RawSockaddrLinklayer.Pkttype", Field, 0, ""},
-		{"RawSockaddrLinklayer.Protocol", Field, 0, ""},
-		{"RawSockaddrNetlink", Type, 0, ""},
-		{"RawSockaddrNetlink.Family", Field, 0, ""},
-		{"RawSockaddrNetlink.Groups", Field, 0, ""},
-		{"RawSockaddrNetlink.Pad", Field, 0, ""},
-		{"RawSockaddrNetlink.Pid", Field, 0, ""},
-		{"RawSockaddrUnix", Type, 0, ""},
-		{"RawSockaddrUnix.Family", Field, 0, ""},
-		{"RawSockaddrUnix.Len", Field, 0, ""},
-		{"RawSockaddrUnix.Pad_cgo_0", Field, 2, ""},
-		{"RawSockaddrUnix.Path", Field, 0, ""},
-		{"RawSyscall", Func, 0, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"RawSyscall6", Func, 0, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr, a4 uintptr, a5 uintptr, a6 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"Read", Func, 0, "func(fd int, p []byte) (n int, err error)"},
-		{"ReadConsole", Func, 1, ""},
-		{"ReadDirectoryChanges", Func, 0, ""},
-		{"ReadDirent", Func, 0, "func(fd int, buf []byte) (n int, err error)"},
-		{"ReadFile", Func, 0, ""},
-		{"Readlink", Func, 0, "func(path string, buf []byte) (n int, err error)"},
-		{"Reboot", Func, 0, "func(cmd int) (err error)"},
-		{"Recvfrom", Func, 0, "func(fd int, p []byte, flags int) (n int, from Sockaddr, err error)"},
-		{"Recvmsg", Func, 0, "func(fd int, p []byte, oob []byte, flags int) (n int, oobn int, recvflags int, from Sockaddr, err error)"},
-		{"RegCloseKey", Func, 0, ""},
-		{"RegEnumKeyEx", Func, 0, ""},
-		{"RegOpenKeyEx", Func, 0, ""},
-		{"RegQueryInfoKey", Func, 0, ""},
-		{"RegQueryValueEx", Func, 0, ""},
-		{"RemoveDirectory", Func, 0, ""},
-		{"Removexattr", Func, 1, "func(path string, attr string) (err error)"},
-		{"Rename", Func, 0, "func(oldpath string, newpath string) (err error)"},
-		{"Renameat", Func, 0, "func(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)"},
-		{"Revoke", Func, 0, ""},
-		{"Rlimit", Type, 0, ""},
-		{"Rlimit.Cur", Field, 0, ""},
-		{"Rlimit.Max", Field, 0, ""},
-		{"Rmdir", Func, 0, "func(path string) error"},
-		{"RouteMessage", Type, 0, ""},
-		{"RouteMessage.Data", Field, 0, ""},
-		{"RouteMessage.Header", Field, 0, ""},
-		{"RouteRIB", Func, 0, ""},
-		{"RoutingMessage", Type, 0, ""},
-		{"RtAttr", Type, 0, ""},
-		{"RtAttr.Len", Field, 0, ""},
-		{"RtAttr.Type", Field, 0, ""},
-		{"RtGenmsg", Type, 0, ""},
-		{"RtGenmsg.Family", Field, 0, ""},
-		{"RtMetrics", Type, 0, ""},
-		{"RtMetrics.Expire", Field, 0, ""},
-		{"RtMetrics.Filler", Field, 0, ""},
-		{"RtMetrics.Hopcount", Field, 0, ""},
-		{"RtMetrics.Locks", Field, 0, ""},
-		{"RtMetrics.Mtu", Field, 0, ""},
-		{"RtMetrics.Pad", Field, 3, ""},
-		{"RtMetrics.Pksent", Field, 0, ""},
-		{"RtMetrics.Recvpipe", Field, 0, ""},
-		{"RtMetrics.Refcnt", Field, 2, ""},
-		{"RtMetrics.Rtt", Field, 0, ""},
-		{"RtMetrics.Rttvar", Field, 0, ""},
-		{"RtMetrics.Sendpipe", Field, 0, ""},
-		{"RtMetrics.Ssthresh", Field, 0, ""},
-		{"RtMetrics.Weight", Field, 0, ""},
-		{"RtMsg", Type, 0, ""},
-		{"RtMsg.Dst_len", Field, 0, ""},
-		{"RtMsg.Family", Field, 0, ""},
-		{"RtMsg.Flags", Field, 0, ""},
-		{"RtMsg.Protocol", Field, 0, ""},
-		{"RtMsg.Scope", Field, 0, ""},
-		{"RtMsg.Src_len", Field, 0, ""},
-		{"RtMsg.Table", Field, 0, ""},
-		{"RtMsg.Tos", Field, 0, ""},
-		{"RtMsg.Type", Field, 0, ""},
-		{"RtMsghdr", Type, 0, ""},
-		{"RtMsghdr.Addrs", Field, 0, ""},
-		{"RtMsghdr.Errno", Field, 0, ""},
-		{"RtMsghdr.Flags", Field, 0, ""},
-		{"RtMsghdr.Fmask", Field, 0, ""},
-		{"RtMsghdr.Hdrlen", Field, 2, ""},
-		{"RtMsghdr.Index", Field, 0, ""},
-		{"RtMsghdr.Inits", Field, 0, ""},
-		{"RtMsghdr.Mpls", Field, 2, ""},
-		{"RtMsghdr.Msglen", Field, 0, ""},
-		{"RtMsghdr.Pad_cgo_0", Field, 0, ""},
-		{"RtMsghdr.Pad_cgo_1", Field, 2, ""},
-		{"RtMsghdr.Pid", Field, 0, ""},
-		{"RtMsghdr.Priority", Field, 2, ""},
-		{"RtMsghdr.Rmx", Field, 0, ""},
-		{"RtMsghdr.Seq", Field, 0, ""},
-		{"RtMsghdr.Tableid", Field, 2, ""},
-		{"RtMsghdr.Type", Field, 0, ""},
-		{"RtMsghdr.Use", Field, 0, ""},
-		{"RtMsghdr.Version", Field, 0, ""},
-		{"RtNexthop", Type, 0, ""},
-		{"RtNexthop.Flags", Field, 0, ""},
-		{"RtNexthop.Hops", Field, 0, ""},
-		{"RtNexthop.Ifindex", Field, 0, ""},
-		{"RtNexthop.Len", Field, 0, ""},
-		{"Rusage", Type, 0, ""},
-		{"Rusage.CreationTime", Field, 0, ""},
-		{"Rusage.ExitTime", Field, 0, ""},
-		{"Rusage.Idrss", Field, 0, ""},
-		{"Rusage.Inblock", Field, 0, ""},
-		{"Rusage.Isrss", Field, 0, ""},
-		{"Rusage.Ixrss", Field, 0, ""},
-		{"Rusage.KernelTime", Field, 0, ""},
-		{"Rusage.Majflt", Field, 0, ""},
-		{"Rusage.Maxrss", Field, 0, ""},
-		{"Rusage.Minflt", Field, 0, ""},
-		{"Rusage.Msgrcv", Field, 0, ""},
-		{"Rusage.Msgsnd", Field, 0, ""},
-		{"Rusage.Nivcsw", Field, 0, ""},
-		{"Rusage.Nsignals", Field, 0, ""},
-		{"Rusage.Nswap", Field, 0, ""},
-		{"Rusage.Nvcsw", Field, 0, ""},
-		{"Rusage.Oublock", Field, 0, ""},
-		{"Rusage.Stime", Field, 0, ""},
-		{"Rusage.UserTime", Field, 0, ""},
-		{"Rusage.Utime", Field, 0, ""},
-		{"SCM_BINTIME", Const, 0, ""},
-		{"SCM_CREDENTIALS", Const, 0, ""},
-		{"SCM_CREDS", Const, 0, ""},
-		{"SCM_RIGHTS", Const, 0, ""},
-		{"SCM_TIMESTAMP", Const, 0, ""},
-		{"SCM_TIMESTAMPING", Const, 0, ""},
-		{"SCM_TIMESTAMPNS", Const, 0, ""},
-		{"SCM_TIMESTAMP_MONOTONIC", Const, 0, ""},
-		{"SHUT_RD", Const, 0, ""},
-		{"SHUT_RDWR", Const, 0, ""},
-		{"SHUT_WR", Const, 0, ""},
-		{"SID", Type, 0, ""},
-		{"SIDAndAttributes", Type, 0, ""},
-		{"SIDAndAttributes.Attributes", Field, 0, ""},
-		{"SIDAndAttributes.Sid", Field, 0, ""},
-		{"SIGABRT", Const, 0, ""},
-		{"SIGALRM", Const, 0, ""},
-		{"SIGBUS", Const, 0, ""},
-		{"SIGCHLD", Const, 0, ""},
-		{"SIGCLD", Const, 0, ""},
-		{"SIGCONT", Const, 0, ""},
-		{"SIGEMT", Const, 0, ""},
-		{"SIGFPE", Const, 0, ""},
-		{"SIGHUP", Const, 0, ""},
-		{"SIGILL", Const, 0, ""},
-		{"SIGINFO", Const, 0, ""},
-		{"SIGINT", Const, 0, ""},
-		{"SIGIO", Const, 0, ""},
-		{"SIGIOT", Const, 0, ""},
-		{"SIGKILL", Const, 0, ""},
-		{"SIGLIBRT", Const, 1, ""},
-		{"SIGLWP", Const, 0, ""},
-		{"SIGPIPE", Const, 0, ""},
-		{"SIGPOLL", Const, 0, ""},
-		{"SIGPROF", Const, 0, ""},
-		{"SIGPWR", Const, 0, ""},
-		{"SIGQUIT", Const, 0, ""},
-		{"SIGSEGV", Const, 0, ""},
-		{"SIGSTKFLT", Const, 0, ""},
-		{"SIGSTOP", Const, 0, ""},
-		{"SIGSYS", Const, 0, ""},
-		{"SIGTERM", Const, 0, ""},
-		{"SIGTHR", Const, 0, ""},
-		{"SIGTRAP", Const, 0, ""},
-		{"SIGTSTP", Const, 0, ""},
-		{"SIGTTIN", Const, 0, ""},
-		{"SIGTTOU", Const, 0, ""},
-		{"SIGUNUSED", Const, 0, ""},
-		{"SIGURG", Const, 0, ""},
-		{"SIGUSR1", Const, 0, ""},
-		{"SIGUSR2", Const, 0, ""},
-		{"SIGVTALRM", Const, 0, ""},
-		{"SIGWINCH", Const, 0, ""},
-		{"SIGXCPU", Const, 0, ""},
-		{"SIGXFSZ", Const, 0, ""},
-		{"SIOCADDDLCI", Const, 0, ""},
-		{"SIOCADDMULTI", Const, 0, ""},
-		{"SIOCADDRT", Const, 0, ""},
-		{"SIOCAIFADDR", Const, 0, ""},
-		{"SIOCAIFGROUP", Const, 0, ""},
-		{"SIOCALIFADDR", Const, 0, ""},
-		{"SIOCARPIPLL", Const, 0, ""},
-		{"SIOCATMARK", Const, 0, ""},
-		{"SIOCAUTOADDR", Const, 0, ""},
-		{"SIOCAUTONETMASK", Const, 0, ""},
-		{"SIOCBRDGADD", Const, 1, ""},
-		{"SIOCBRDGADDS", Const, 1, ""},
-		{"SIOCBRDGARL", Const, 1, ""},
-		{"SIOCBRDGDADDR", Const, 1, ""},
-		{"SIOCBRDGDEL", Const, 1, ""},
-		{"SIOCBRDGDELS", Const, 1, ""},
-		{"SIOCBRDGFLUSH", Const, 1, ""},
-		{"SIOCBRDGFRL", Const, 1, ""},
-		{"SIOCBRDGGCACHE", Const, 1, ""},
-		{"SIOCBRDGGFD", Const, 1, ""},
-		{"SIOCBRDGGHT", Const, 1, ""},
-		{"SIOCBRDGGIFFLGS", Const, 1, ""},
-		{"SIOCBRDGGMA", Const, 1, ""},
-		{"SIOCBRDGGPARAM", Const, 1, ""},
-		{"SIOCBRDGGPRI", Const, 1, ""},
-		{"SIOCBRDGGRL", Const, 1, ""},
-		{"SIOCBRDGGSIFS", Const, 1, ""},
-		{"SIOCBRDGGTO", Const, 1, ""},
-		{"SIOCBRDGIFS", Const, 1, ""},
-		{"SIOCBRDGRTS", Const, 1, ""},
-		{"SIOCBRDGSADDR", Const, 1, ""},
-		{"SIOCBRDGSCACHE", Const, 1, ""},
-		{"SIOCBRDGSFD", Const, 1, ""},
-		{"SIOCBRDGSHT", Const, 1, ""},
-		{"SIOCBRDGSIFCOST", Const, 1, ""},
-		{"SIOCBRDGSIFFLGS", Const, 1, ""},
-		{"SIOCBRDGSIFPRIO", Const, 1, ""},
-		{"SIOCBRDGSMA", Const, 1, ""},
-		{"SIOCBRDGSPRI", Const, 1, ""},
-		{"SIOCBRDGSPROTO", Const, 1, ""},
-		{"SIOCBRDGSTO", Const, 1, ""},
-		{"SIOCBRDGSTXHC", Const, 1, ""},
-		{"SIOCDARP", Const, 0, ""},
-		{"SIOCDELDLCI", Const, 0, ""},
-		{"SIOCDELMULTI", Const, 0, ""},
-		{"SIOCDELRT", Const, 0, ""},
-		{"SIOCDEVPRIVATE", Const, 0, ""},
-		{"SIOCDIFADDR", Const, 0, ""},
-		{"SIOCDIFGROUP", Const, 0, ""},
-		{"SIOCDIFPHYADDR", Const, 0, ""},
-		{"SIOCDLIFADDR", Const, 0, ""},
-		{"SIOCDRARP", Const, 0, ""},
-		{"SIOCGARP", Const, 0, ""},
-		{"SIOCGDRVSPEC", Const, 0, ""},
-		{"SIOCGETKALIVE", Const, 1, ""},
-		{"SIOCGETLABEL", Const, 1, ""},
-		{"SIOCGETPFLOW", Const, 1, ""},
-		{"SIOCGETPFSYNC", Const, 1, ""},
-		{"SIOCGETSGCNT", Const, 0, ""},
-		{"SIOCGETVIFCNT", Const, 0, ""},
-		{"SIOCGETVLAN", Const, 0, ""},
-		{"SIOCGHIWAT", Const, 0, ""},
-		{"SIOCGIFADDR", Const, 0, ""},
-		{"SIOCGIFADDRPREF", Const, 1, ""},
-		{"SIOCGIFALIAS", Const, 1, ""},
-		{"SIOCGIFALTMTU", Const, 0, ""},
-		{"SIOCGIFASYNCMAP", Const, 0, ""},
-		{"SIOCGIFBOND", Const, 0, ""},
-		{"SIOCGIFBR", Const, 0, ""},
-		{"SIOCGIFBRDADDR", Const, 0, ""},
-		{"SIOCGIFCAP", Const, 0, ""},
-		{"SIOCGIFCONF", Const, 0, ""},
-		{"SIOCGIFCOUNT", Const, 0, ""},
-		{"SIOCGIFDATA", Const, 1, ""},
-		{"SIOCGIFDESCR", Const, 0, ""},
-		{"SIOCGIFDEVMTU", Const, 0, ""},
-		{"SIOCGIFDLT", Const, 1, ""},
-		{"SIOCGIFDSTADDR", Const, 0, ""},
-		{"SIOCGIFENCAP", Const, 0, ""},
-		{"SIOCGIFFIB", Const, 1, ""},
-		{"SIOCGIFFLAGS", Const, 0, ""},
-		{"SIOCGIFGATTR", Const, 1, ""},
-		{"SIOCGIFGENERIC", Const, 0, ""},
-		{"SIOCGIFGMEMB", Const, 0, ""},
-		{"SIOCGIFGROUP", Const, 0, ""},
-		{"SIOCGIFHARDMTU", Const, 3, ""},
-		{"SIOCGIFHWADDR", Const, 0, ""},
-		{"SIOCGIFINDEX", Const, 0, ""},
-		{"SIOCGIFKPI", Const, 0, ""},
-		{"SIOCGIFMAC", Const, 0, ""},
-		{"SIOCGIFMAP", Const, 0, ""},
-		{"SIOCGIFMEDIA", Const, 0, ""},
-		{"SIOCGIFMEM", Const, 0, ""},
-		{"SIOCGIFMETRIC", Const, 0, ""},
-		{"SIOCGIFMTU", Const, 0, ""},
-		{"SIOCGIFNAME", Const, 0, ""},
-		{"SIOCGIFNETMASK", Const, 0, ""},
-		{"SIOCGIFPDSTADDR", Const, 0, ""},
-		{"SIOCGIFPFLAGS", Const, 0, ""},
-		{"SIOCGIFPHYS", Const, 0, ""},
-		{"SIOCGIFPRIORITY", Const, 1, ""},
-		{"SIOCGIFPSRCADDR", Const, 0, ""},
-		{"SIOCGIFRDOMAIN", Const, 1, ""},
-		{"SIOCGIFRTLABEL", Const, 1, ""},
-		{"SIOCGIFSLAVE", Const, 0, ""},
-		{"SIOCGIFSTATUS", Const, 0, ""},
-		{"SIOCGIFTIMESLOT", Const, 1, ""},
-		{"SIOCGIFTXQLEN", Const, 0, ""},
-		{"SIOCGIFVLAN", Const, 0, ""},
-		{"SIOCGIFWAKEFLAGS", Const, 0, ""},
-		{"SIOCGIFXFLAGS", Const, 1, ""},
-		{"SIOCGLIFADDR", Const, 0, ""},
-		{"SIOCGLIFPHYADDR", Const, 0, ""},
-		{"SIOCGLIFPHYRTABLE", Const, 1, ""},
-		{"SIOCGLIFPHYTTL", Const, 3, ""},
-		{"SIOCGLINKSTR", Const, 1, ""},
-		{"SIOCGLOWAT", Const, 0, ""},
-		{"SIOCGPGRP", Const, 0, ""},
-		{"SIOCGPRIVATE_0", Const, 0, ""},
-		{"SIOCGPRIVATE_1", Const, 0, ""},
-		{"SIOCGRARP", Const, 0, ""},
-		{"SIOCGSPPPPARAMS", Const, 3, ""},
-		{"SIOCGSTAMP", Const, 0, ""},
-		{"SIOCGSTAMPNS", Const, 0, ""},
-		{"SIOCGVH", Const, 1, ""},
-		{"SIOCGVNETID", Const, 3, ""},
-		{"SIOCIFCREATE", Const, 0, ""},
-		{"SIOCIFCREATE2", Const, 0, ""},
-		{"SIOCIFDESTROY", Const, 0, ""},
-		{"SIOCIFGCLONERS", Const, 0, ""},
-		{"SIOCINITIFADDR", Const, 1, ""},
-		{"SIOCPROTOPRIVATE", Const, 0, ""},
-		{"SIOCRSLVMULTI", Const, 0, ""},
-		{"SIOCRTMSG", Const, 0, ""},
-		{"SIOCSARP", Const, 0, ""},
-		{"SIOCSDRVSPEC", Const, 0, ""},
-		{"SIOCSETKALIVE", Const, 1, ""},
-		{"SIOCSETLABEL", Const, 1, ""},
-		{"SIOCSETPFLOW", Const, 1, ""},
-		{"SIOCSETPFSYNC", Const, 1, ""},
-		{"SIOCSETVLAN", Const, 0, ""},
-		{"SIOCSHIWAT", Const, 0, ""},
-		{"SIOCSIFADDR", Const, 0, ""},
-		{"SIOCSIFADDRPREF", Const, 1, ""},
-		{"SIOCSIFALTMTU", Const, 0, ""},
-		{"SIOCSIFASYNCMAP", Const, 0, ""},
-		{"SIOCSIFBOND", Const, 0, ""},
-		{"SIOCSIFBR", Const, 0, ""},
-		{"SIOCSIFBRDADDR", Const, 0, ""},
-		{"SIOCSIFCAP", Const, 0, ""},
-		{"SIOCSIFDESCR", Const, 0, ""},
-		{"SIOCSIFDSTADDR", Const, 0, ""},
-		{"SIOCSIFENCAP", Const, 0, ""},
-		{"SIOCSIFFIB", Const, 1, ""},
-		{"SIOCSIFFLAGS", Const, 0, ""},
-		{"SIOCSIFGATTR", Const, 1, ""},
-		{"SIOCSIFGENERIC", Const, 0, ""},
-		{"SIOCSIFHWADDR", Const, 0, ""},
-		{"SIOCSIFHWBROADCAST", Const, 0, ""},
-		{"SIOCSIFKPI", Const, 0, ""},
-		{"SIOCSIFLINK", Const, 0, ""},
-		{"SIOCSIFLLADDR", Const, 0, ""},
-		{"SIOCSIFMAC", Const, 0, ""},
-		{"SIOCSIFMAP", Const, 0, ""},
-		{"SIOCSIFMEDIA", Const, 0, ""},
-		{"SIOCSIFMEM", Const, 0, ""},
-		{"SIOCSIFMETRIC", Const, 0, ""},
-		{"SIOCSIFMTU", Const, 0, ""},
-		{"SIOCSIFNAME", Const, 0, ""},
-		{"SIOCSIFNETMASK", Const, 0, ""},
-		{"SIOCSIFPFLAGS", Const, 0, ""},
-		{"SIOCSIFPHYADDR", Const, 0, ""},
-		{"SIOCSIFPHYS", Const, 0, ""},
-		{"SIOCSIFPRIORITY", Const, 1, ""},
-		{"SIOCSIFRDOMAIN", Const, 1, ""},
-		{"SIOCSIFRTLABEL", Const, 1, ""},
-		{"SIOCSIFRVNET", Const, 0, ""},
-		{"SIOCSIFSLAVE", Const, 0, ""},
-		{"SIOCSIFTIMESLOT", Const, 1, ""},
-		{"SIOCSIFTXQLEN", Const, 0, ""},
-		{"SIOCSIFVLAN", Const, 0, ""},
-		{"SIOCSIFVNET", Const, 0, ""},
-		{"SIOCSIFXFLAGS", Const, 1, ""},
-		{"SIOCSLIFPHYADDR", Const, 0, ""},
-		{"SIOCSLIFPHYRTABLE", Const, 1, ""},
-		{"SIOCSLIFPHYTTL", Const, 3, ""},
-		{"SIOCSLINKSTR", Const, 1, ""},
-		{"SIOCSLOWAT", Const, 0, ""},
-		{"SIOCSPGRP", Const, 0, ""},
-		{"SIOCSRARP", Const, 0, ""},
-		{"SIOCSSPPPPARAMS", Const, 3, ""},
-		{"SIOCSVH", Const, 1, ""},
-		{"SIOCSVNETID", Const, 3, ""},
-		{"SIOCZIFDATA", Const, 1, ""},
-		{"SIO_GET_EXTENSION_FUNCTION_POINTER", Const, 1, ""},
-		{"SIO_GET_INTERFACE_LIST", Const, 0, ""},
-		{"SIO_KEEPALIVE_VALS", Const, 3, ""},
-		{"SIO_UDP_CONNRESET", Const, 4, ""},
-		{"SOCK_CLOEXEC", Const, 0, ""},
-		{"SOCK_DCCP", Const, 0, ""},
-		{"SOCK_DGRAM", Const, 0, ""},
-		{"SOCK_FLAGS_MASK", Const, 1, ""},
-		{"SOCK_MAXADDRLEN", Const, 0, ""},
-		{"SOCK_NONBLOCK", Const, 0, ""},
-		{"SOCK_NOSIGPIPE", Const, 1, ""},
-		{"SOCK_PACKET", Const, 0, ""},
-		{"SOCK_RAW", Const, 0, ""},
-		{"SOCK_RDM", Const, 0, ""},
-		{"SOCK_SEQPACKET", Const, 0, ""},
-		{"SOCK_STREAM", Const, 0, ""},
-		{"SOL_AAL", Const, 0, ""},
-		{"SOL_ATM", Const, 0, ""},
-		{"SOL_DECNET", Const, 0, ""},
-		{"SOL_ICMPV6", Const, 0, ""},
-		{"SOL_IP", Const, 0, ""},
-		{"SOL_IPV6", Const, 0, ""},
-		{"SOL_IRDA", Const, 0, ""},
-		{"SOL_PACKET", Const, 0, ""},
-		{"SOL_RAW", Const, 0, ""},
-		{"SOL_SOCKET", Const, 0, ""},
-		{"SOL_TCP", Const, 0, ""},
-		{"SOL_X25", Const, 0, ""},
-		{"SOMAXCONN", Const, 0, ""},
-		{"SO_ACCEPTCONN", Const, 0, ""},
-		{"SO_ACCEPTFILTER", Const, 0, ""},
-		{"SO_ATTACH_FILTER", Const, 0, ""},
-		{"SO_BINDANY", Const, 1, ""},
-		{"SO_BINDTODEVICE", Const, 0, ""},
-		{"SO_BINTIME", Const, 0, ""},
-		{"SO_BROADCAST", Const, 0, ""},
-		{"SO_BSDCOMPAT", Const, 0, ""},
-		{"SO_DEBUG", Const, 0, ""},
-		{"SO_DETACH_FILTER", Const, 0, ""},
-		{"SO_DOMAIN", Const, 0, ""},
-		{"SO_DONTROUTE", Const, 0, ""},
-		{"SO_DONTTRUNC", Const, 0, ""},
-		{"SO_ERROR", Const, 0, ""},
-		{"SO_KEEPALIVE", Const, 0, ""},
-		{"SO_LABEL", Const, 0, ""},
-		{"SO_LINGER", Const, 0, ""},
-		{"SO_LINGER_SEC", Const, 0, ""},
-		{"SO_LISTENINCQLEN", Const, 0, ""},
-		{"SO_LISTENQLEN", Const, 0, ""},
-		{"SO_LISTENQLIMIT", Const, 0, ""},
-		{"SO_MARK", Const, 0, ""},
-		{"SO_NETPROC", Const, 1, ""},
-		{"SO_NKE", Const, 0, ""},
-		{"SO_NOADDRERR", Const, 0, ""},
-		{"SO_NOHEADER", Const, 1, ""},
-		{"SO_NOSIGPIPE", Const, 0, ""},
-		{"SO_NOTIFYCONFLICT", Const, 0, ""},
-		{"SO_NO_CHECK", Const, 0, ""},
-		{"SO_NO_DDP", Const, 0, ""},
-		{"SO_NO_OFFLOAD", Const, 0, ""},
-		{"SO_NP_EXTENSIONS", Const, 0, ""},
-		{"SO_NREAD", Const, 0, ""},
-		{"SO_NUMRCVPKT", Const, 16, ""},
-		{"SO_NWRITE", Const, 0, ""},
-		{"SO_OOBINLINE", Const, 0, ""},
-		{"SO_OVERFLOWED", Const, 1, ""},
-		{"SO_PASSCRED", Const, 0, ""},
-		{"SO_PASSSEC", Const, 0, ""},
-		{"SO_PEERCRED", Const, 0, ""},
-		{"SO_PEERLABEL", Const, 0, ""},
-		{"SO_PEERNAME", Const, 0, ""},
-		{"SO_PEERSEC", Const, 0, ""},
-		{"SO_PRIORITY", Const, 0, ""},
-		{"SO_PROTOCOL", Const, 0, ""},
-		{"SO_PROTOTYPE", Const, 1, ""},
-		{"SO_RANDOMPORT", Const, 0, ""},
-		{"SO_RCVBUF", Const, 0, ""},
-		{"SO_RCVBUFFORCE", Const, 0, ""},
-		{"SO_RCVLOWAT", Const, 0, ""},
-		{"SO_RCVTIMEO", Const, 0, ""},
-		{"SO_RESTRICTIONS", Const, 0, ""},
-		{"SO_RESTRICT_DENYIN", Const, 0, ""},
-		{"SO_RESTRICT_DENYOUT", Const, 0, ""},
-		{"SO_RESTRICT_DENYSET", Const, 0, ""},
-		{"SO_REUSEADDR", Const, 0, ""},
-		{"SO_REUSEPORT", Const, 0, ""},
-		{"SO_REUSESHAREUID", Const, 0, ""},
-		{"SO_RTABLE", Const, 1, ""},
-		{"SO_RXQ_OVFL", Const, 0, ""},
-		{"SO_SECURITY_AUTHENTICATION", Const, 0, ""},
-		{"SO_SECURITY_ENCRYPTION_NETWORK", Const, 0, ""},
-		{"SO_SECURITY_ENCRYPTION_TRANSPORT", Const, 0, ""},
-		{"SO_SETFIB", Const, 0, ""},
-		{"SO_SNDBUF", Const, 0, ""},
-		{"SO_SNDBUFFORCE", Const, 0, ""},
-		{"SO_SNDLOWAT", Const, 0, ""},
-		{"SO_SNDTIMEO", Const, 0, ""},
-		{"SO_SPLICE", Const, 1, ""},
-		{"SO_TIMESTAMP", Const, 0, ""},
-		{"SO_TIMESTAMPING", Const, 0, ""},
-		{"SO_TIMESTAMPNS", Const, 0, ""},
-		{"SO_TIMESTAMP_MONOTONIC", Const, 0, ""},
-		{"SO_TYPE", Const, 0, ""},
-		{"SO_UPCALLCLOSEWAIT", Const, 0, ""},
-		{"SO_UPDATE_ACCEPT_CONTEXT", Const, 0, ""},
-		{"SO_UPDATE_CONNECT_CONTEXT", Const, 1, ""},
-		{"SO_USELOOPBACK", Const, 0, ""},
-		{"SO_USER_COOKIE", Const, 1, ""},
-		{"SO_VENDOR", Const, 3, ""},
-		{"SO_WANTMORE", Const, 0, ""},
-		{"SO_WANTOOBFLAG", Const, 0, ""},
-		{"SSLExtraCertChainPolicyPara", Type, 0, ""},
-		{"SSLExtraCertChainPolicyPara.AuthType", Field, 0, ""},
-		{"SSLExtraCertChainPolicyPara.Checks", Field, 0, ""},
-		{"SSLExtraCertChainPolicyPara.ServerName", Field, 0, ""},
-		{"SSLExtraCertChainPolicyPara.Size", Field, 0, ""},
-		{"STANDARD_RIGHTS_ALL", Const, 0, ""},
-		{"STANDARD_RIGHTS_EXECUTE", Const, 0, ""},
-		{"STANDARD_RIGHTS_READ", Const, 0, ""},
-		{"STANDARD_RIGHTS_REQUIRED", Const, 0, ""},
-		{"STANDARD_RIGHTS_WRITE", Const, 0, ""},
-		{"STARTF_USESHOWWINDOW", Const, 0, ""},
-		{"STARTF_USESTDHANDLES", Const, 0, ""},
-		{"STD_ERROR_HANDLE", Const, 0, ""},
-		{"STD_INPUT_HANDLE", Const, 0, ""},
-		{"STD_OUTPUT_HANDLE", Const, 0, ""},
-		{"SUBLANG_ENGLISH_US", Const, 0, ""},
-		{"SW_FORCEMINIMIZE", Const, 0, ""},
-		{"SW_HIDE", Const, 0, ""},
-		{"SW_MAXIMIZE", Const, 0, ""},
-		{"SW_MINIMIZE", Const, 0, ""},
-		{"SW_NORMAL", Const, 0, ""},
-		{"SW_RESTORE", Const, 0, ""},
-		{"SW_SHOW", Const, 0, ""},
-		{"SW_SHOWDEFAULT", Const, 0, ""},
-		{"SW_SHOWMAXIMIZED", Const, 0, ""},
-		{"SW_SHOWMINIMIZED", Const, 0, ""},
-		{"SW_SHOWMINNOACTIVE", Const, 0, ""},
-		{"SW_SHOWNA", Const, 0, ""},
-		{"SW_SHOWNOACTIVATE", Const, 0, ""},
-		{"SW_SHOWNORMAL", Const, 0, ""},
-		{"SYMBOLIC_LINK_FLAG_DIRECTORY", Const, 4, ""},
-		{"SYNCHRONIZE", Const, 0, ""},
-		{"SYSCTL_VERSION", Const, 1, ""},
-		{"SYSCTL_VERS_0", Const, 1, ""},
-		{"SYSCTL_VERS_1", Const, 1, ""},
-		{"SYSCTL_VERS_MASK", Const, 1, ""},
-		{"SYS_ABORT2", Const, 0, ""},
-		{"SYS_ACCEPT", Const, 0, ""},
-		{"SYS_ACCEPT4", Const, 0, ""},
-		{"SYS_ACCEPT_NOCANCEL", Const, 0, ""},
-		{"SYS_ACCESS", Const, 0, ""},
-		{"SYS_ACCESS_EXTENDED", Const, 0, ""},
-		{"SYS_ACCT", Const, 0, ""},
-		{"SYS_ADD_KEY", Const, 0, ""},
-		{"SYS_ADD_PROFIL", Const, 0, ""},
-		{"SYS_ADJFREQ", Const, 1, ""},
-		{"SYS_ADJTIME", Const, 0, ""},
-		{"SYS_ADJTIMEX", Const, 0, ""},
-		{"SYS_AFS_SYSCALL", Const, 0, ""},
-		{"SYS_AIO_CANCEL", Const, 0, ""},
-		{"SYS_AIO_ERROR", Const, 0, ""},
-		{"SYS_AIO_FSYNC", Const, 0, ""},
-		{"SYS_AIO_MLOCK", Const, 14, ""},
-		{"SYS_AIO_READ", Const, 0, ""},
-		{"SYS_AIO_RETURN", Const, 0, ""},
-		{"SYS_AIO_SUSPEND", Const, 0, ""},
-		{"SYS_AIO_SUSPEND_NOCANCEL", Const, 0, ""},
-		{"SYS_AIO_WAITCOMPLETE", Const, 14, ""},
-		{"SYS_AIO_WRITE", Const, 0, ""},
-		{"SYS_ALARM", Const, 0, ""},
-		{"SYS_ARCH_PRCTL", Const, 0, ""},
-		{"SYS_ARM_FADVISE64_64", Const, 0, ""},
-		{"SYS_ARM_SYNC_FILE_RANGE", Const, 0, ""},
-		{"SYS_ATGETMSG", Const, 0, ""},
-		{"SYS_ATPGETREQ", Const, 0, ""},
-		{"SYS_ATPGETRSP", Const, 0, ""},
-		{"SYS_ATPSNDREQ", Const, 0, ""},
-		{"SYS_ATPSNDRSP", Const, 0, ""},
-		{"SYS_ATPUTMSG", Const, 0, ""},
-		{"SYS_ATSOCKET", Const, 0, ""},
-		{"SYS_AUDIT", Const, 0, ""},
-		{"SYS_AUDITCTL", Const, 0, ""},
-		{"SYS_AUDITON", Const, 0, ""},
-		{"SYS_AUDIT_SESSION_JOIN", Const, 0, ""},
-		{"SYS_AUDIT_SESSION_PORT", Const, 0, ""},
-		{"SYS_AUDIT_SESSION_SELF", Const, 0, ""},
-		{"SYS_BDFLUSH", Const, 0, ""},
-		{"SYS_BIND", Const, 0, ""},
-		{"SYS_BINDAT", Const, 3, ""},
-		{"SYS_BREAK", Const, 0, ""},
-		{"SYS_BRK", Const, 0, ""},
-		{"SYS_BSDTHREAD_CREATE", Const, 0, ""},
-		{"SYS_BSDTHREAD_REGISTER", Const, 0, ""},
-		{"SYS_BSDTHREAD_TERMINATE", Const, 0, ""},
-		{"SYS_CAPGET", Const, 0, ""},
-		{"SYS_CAPSET", Const, 0, ""},
-		{"SYS_CAP_ENTER", Const, 0, ""},
-		{"SYS_CAP_FCNTLS_GET", Const, 1, ""},
-		{"SYS_CAP_FCNTLS_LIMIT", Const, 1, ""},
-		{"SYS_CAP_GETMODE", Const, 0, ""},
-		{"SYS_CAP_GETRIGHTS", Const, 0, ""},
-		{"SYS_CAP_IOCTLS_GET", Const, 1, ""},
-		{"SYS_CAP_IOCTLS_LIMIT", Const, 1, ""},
-		{"SYS_CAP_NEW", Const, 0, ""},
-		{"SYS_CAP_RIGHTS_GET", Const, 1, ""},
-		{"SYS_CAP_RIGHTS_LIMIT", Const, 1, ""},
-		{"SYS_CHDIR", Const, 0, ""},
-		{"SYS_CHFLAGS", Const, 0, ""},
-		{"SYS_CHFLAGSAT", Const, 3, ""},
-		{"SYS_CHMOD", Const, 0, ""},
-		{"SYS_CHMOD_EXTENDED", Const, 0, ""},
-		{"SYS_CHOWN", Const, 0, ""},
-		{"SYS_CHOWN32", Const, 0, ""},
-		{"SYS_CHROOT", Const, 0, ""},
-		{"SYS_CHUD", Const, 0, ""},
-		{"SYS_CLOCK_ADJTIME", Const, 0, ""},
-		{"SYS_CLOCK_GETCPUCLOCKID2", Const, 1, ""},
-		{"SYS_CLOCK_GETRES", Const, 0, ""},
-		{"SYS_CLOCK_GETTIME", Const, 0, ""},
-		{"SYS_CLOCK_NANOSLEEP", Const, 0, ""},
-		{"SYS_CLOCK_SETTIME", Const, 0, ""},
-		{"SYS_CLONE", Const, 0, ""},
-		{"SYS_CLOSE", Const, 0, ""},
-		{"SYS_CLOSEFROM", Const, 0, ""},
-		{"SYS_CLOSE_NOCANCEL", Const, 0, ""},
-		{"SYS_CONNECT", Const, 0, ""},
-		{"SYS_CONNECTAT", Const, 3, ""},
-		{"SYS_CONNECT_NOCANCEL", Const, 0, ""},
-		{"SYS_COPYFILE", Const, 0, ""},
-		{"SYS_CPUSET", Const, 0, ""},
-		{"SYS_CPUSET_GETAFFINITY", Const, 0, ""},
-		{"SYS_CPUSET_GETID", Const, 0, ""},
-		{"SYS_CPUSET_SETAFFINITY", Const, 0, ""},
-		{"SYS_CPUSET_SETID", Const, 0, ""},
-		{"SYS_CREAT", Const, 0, ""},
-		{"SYS_CREATE_MODULE", Const, 0, ""},
-		{"SYS_CSOPS", Const, 0, ""},
-		{"SYS_CSOPS_AUDITTOKEN", Const, 16, ""},
-		{"SYS_DELETE", Const, 0, ""},
-		{"SYS_DELETE_MODULE", Const, 0, ""},
-		{"SYS_DUP", Const, 0, ""},
-		{"SYS_DUP2", Const, 0, ""},
-		{"SYS_DUP3", Const, 0, ""},
-		{"SYS_EACCESS", Const, 0, ""},
-		{"SYS_EPOLL_CREATE", Const, 0, ""},
-		{"SYS_EPOLL_CREATE1", Const, 0, ""},
-		{"SYS_EPOLL_CTL", Const, 0, ""},
-		{"SYS_EPOLL_CTL_OLD", Const, 0, ""},
-		{"SYS_EPOLL_PWAIT", Const, 0, ""},
-		{"SYS_EPOLL_WAIT", Const, 0, ""},
-		{"SYS_EPOLL_WAIT_OLD", Const, 0, ""},
-		{"SYS_EVENTFD", Const, 0, ""},
-		{"SYS_EVENTFD2", Const, 0, ""},
-		{"SYS_EXCHANGEDATA", Const, 0, ""},
-		{"SYS_EXECVE", Const, 0, ""},
-		{"SYS_EXIT", Const, 0, ""},
-		{"SYS_EXIT_GROUP", Const, 0, ""},
-		{"SYS_EXTATTRCTL", Const, 0, ""},
-		{"SYS_EXTATTR_DELETE_FD", Const, 0, ""},
-		{"SYS_EXTATTR_DELETE_FILE", Const, 0, ""},
-		{"SYS_EXTATTR_DELETE_LINK", Const, 0, ""},
-		{"SYS_EXTATTR_GET_FD", Const, 0, ""},
-		{"SYS_EXTATTR_GET_FILE", Const, 0, ""},
-		{"SYS_EXTATTR_GET_LINK", Const, 0, ""},
-		{"SYS_EXTATTR_LIST_FD", Const, 0, ""},
-		{"SYS_EXTATTR_LIST_FILE", Const, 0, ""},
-		{"SYS_EXTATTR_LIST_LINK", Const, 0, ""},
-		{"SYS_EXTATTR_SET_FD", Const, 0, ""},
-		{"SYS_EXTATTR_SET_FILE", Const, 0, ""},
-		{"SYS_EXTATTR_SET_LINK", Const, 0, ""},
-		{"SYS_FACCESSAT", Const, 0, ""},
-		{"SYS_FADVISE64", Const, 0, ""},
-		{"SYS_FADVISE64_64", Const, 0, ""},
-		{"SYS_FALLOCATE", Const, 0, ""},
-		{"SYS_FANOTIFY_INIT", Const, 0, ""},
-		{"SYS_FANOTIFY_MARK", Const, 0, ""},
-		{"SYS_FCHDIR", Const, 0, ""},
-		{"SYS_FCHFLAGS", Const, 0, ""},
-		{"SYS_FCHMOD", Const, 0, ""},
-		{"SYS_FCHMODAT", Const, 0, ""},
-		{"SYS_FCHMOD_EXTENDED", Const, 0, ""},
-		{"SYS_FCHOWN", Const, 0, ""},
-		{"SYS_FCHOWN32", Const, 0, ""},
-		{"SYS_FCHOWNAT", Const, 0, ""},
-		{"SYS_FCHROOT", Const, 1, ""},
-		{"SYS_FCNTL", Const, 0, ""},
-		{"SYS_FCNTL64", Const, 0, ""},
-		{"SYS_FCNTL_NOCANCEL", Const, 0, ""},
-		{"SYS_FDATASYNC", Const, 0, ""},
-		{"SYS_FEXECVE", Const, 0, ""},
-		{"SYS_FFCLOCK_GETCOUNTER", Const, 0, ""},
-		{"SYS_FFCLOCK_GETESTIMATE", Const, 0, ""},
-		{"SYS_FFCLOCK_SETESTIMATE", Const, 0, ""},
-		{"SYS_FFSCTL", Const, 0, ""},
-		{"SYS_FGETATTRLIST", Const, 0, ""},
-		{"SYS_FGETXATTR", Const, 0, ""},
-		{"SYS_FHOPEN", Const, 0, ""},
-		{"SYS_FHSTAT", Const, 0, ""},
-		{"SYS_FHSTATFS", Const, 0, ""},
-		{"SYS_FILEPORT_MAKEFD", Const, 0, ""},
-		{"SYS_FILEPORT_MAKEPORT", Const, 0, ""},
-		{"SYS_FKTRACE", Const, 1, ""},
-		{"SYS_FLISTXATTR", Const, 0, ""},
-		{"SYS_FLOCK", Const, 0, ""},
-		{"SYS_FORK", Const, 0, ""},
-		{"SYS_FPATHCONF", Const, 0, ""},
-		{"SYS_FREEBSD6_FTRUNCATE", Const, 0, ""},
-		{"SYS_FREEBSD6_LSEEK", Const, 0, ""},
-		{"SYS_FREEBSD6_MMAP", Const, 0, ""},
-		{"SYS_FREEBSD6_PREAD", Const, 0, ""},
-		{"SYS_FREEBSD6_PWRITE", Const, 0, ""},
-		{"SYS_FREEBSD6_TRUNCATE", Const, 0, ""},
-		{"SYS_FREMOVEXATTR", Const, 0, ""},
-		{"SYS_FSCTL", Const, 0, ""},
-		{"SYS_FSETATTRLIST", Const, 0, ""},
-		{"SYS_FSETXATTR", Const, 0, ""},
-		{"SYS_FSGETPATH", Const, 0, ""},
-		{"SYS_FSTAT", Const, 0, ""},
-		{"SYS_FSTAT64", Const, 0, ""},
-		{"SYS_FSTAT64_EXTENDED", Const, 0, ""},
-		{"SYS_FSTATAT", Const, 0, ""},
-		{"SYS_FSTATAT64", Const, 0, ""},
-		{"SYS_FSTATFS", Const, 0, ""},
-		{"SYS_FSTATFS64", Const, 0, ""},
-		{"SYS_FSTATV", Const, 0, ""},
-		{"SYS_FSTATVFS1", Const, 1, ""},
-		{"SYS_FSTAT_EXTENDED", Const, 0, ""},
-		{"SYS_FSYNC", Const, 0, ""},
-		{"SYS_FSYNC_NOCANCEL", Const, 0, ""},
-		{"SYS_FSYNC_RANGE", Const, 1, ""},
-		{"SYS_FTIME", Const, 0, ""},
-		{"SYS_FTRUNCATE", Const, 0, ""},
-		{"SYS_FTRUNCATE64", Const, 0, ""},
-		{"SYS_FUTEX", Const, 0, ""},
-		{"SYS_FUTIMENS", Const, 1, ""},
-		{"SYS_FUTIMES", Const, 0, ""},
-		{"SYS_FUTIMESAT", Const, 0, ""},
-		{"SYS_GETATTRLIST", Const, 0, ""},
-		{"SYS_GETAUDIT", Const, 0, ""},
-		{"SYS_GETAUDIT_ADDR", Const, 0, ""},
-		{"SYS_GETAUID", Const, 0, ""},
-		{"SYS_GETCONTEXT", Const, 0, ""},
-		{"SYS_GETCPU", Const, 0, ""},
-		{"SYS_GETCWD", Const, 0, ""},
-		{"SYS_GETDENTS", Const, 0, ""},
-		{"SYS_GETDENTS64", Const, 0, ""},
-		{"SYS_GETDIRENTRIES", Const, 0, ""},
-		{"SYS_GETDIRENTRIES64", Const, 0, ""},
-		{"SYS_GETDIRENTRIESATTR", Const, 0, ""},
-		{"SYS_GETDTABLECOUNT", Const, 1, ""},
-		{"SYS_GETDTABLESIZE", Const, 0, ""},
-		{"SYS_GETEGID", Const, 0, ""},
-		{"SYS_GETEGID32", Const, 0, ""},
-		{"SYS_GETEUID", Const, 0, ""},
-		{"SYS_GETEUID32", Const, 0, ""},
-		{"SYS_GETFH", Const, 0, ""},
-		{"SYS_GETFSSTAT", Const, 0, ""},
-		{"SYS_GETFSSTAT64", Const, 0, ""},
-		{"SYS_GETGID", Const, 0, ""},
-		{"SYS_GETGID32", Const, 0, ""},
-		{"SYS_GETGROUPS", Const, 0, ""},
-		{"SYS_GETGROUPS32", Const, 0, ""},
-		{"SYS_GETHOSTUUID", Const, 0, ""},
-		{"SYS_GETITIMER", Const, 0, ""},
-		{"SYS_GETLCID", Const, 0, ""},
-		{"SYS_GETLOGIN", Const, 0, ""},
-		{"SYS_GETLOGINCLASS", Const, 0, ""},
-		{"SYS_GETPEERNAME", Const, 0, ""},
-		{"SYS_GETPGID", Const, 0, ""},
-		{"SYS_GETPGRP", Const, 0, ""},
-		{"SYS_GETPID", Const, 0, ""},
-		{"SYS_GETPMSG", Const, 0, ""},
-		{"SYS_GETPPID", Const, 0, ""},
-		{"SYS_GETPRIORITY", Const, 0, ""},
-		{"SYS_GETRESGID", Const, 0, ""},
-		{"SYS_GETRESGID32", Const, 0, ""},
-		{"SYS_GETRESUID", Const, 0, ""},
-		{"SYS_GETRESUID32", Const, 0, ""},
-		{"SYS_GETRLIMIT", Const, 0, ""},
-		{"SYS_GETRTABLE", Const, 1, ""},
-		{"SYS_GETRUSAGE", Const, 0, ""},
-		{"SYS_GETSGROUPS", Const, 0, ""},
-		{"SYS_GETSID", Const, 0, ""},
-		{"SYS_GETSOCKNAME", Const, 0, ""},
-		{"SYS_GETSOCKOPT", Const, 0, ""},
-		{"SYS_GETTHRID", Const, 1, ""},
-		{"SYS_GETTID", Const, 0, ""},
-		{"SYS_GETTIMEOFDAY", Const, 0, ""},
-		{"SYS_GETUID", Const, 0, ""},
-		{"SYS_GETUID32", Const, 0, ""},
-		{"SYS_GETVFSSTAT", Const, 1, ""},
-		{"SYS_GETWGROUPS", Const, 0, ""},
-		{"SYS_GETXATTR", Const, 0, ""},
-		{"SYS_GET_KERNEL_SYMS", Const, 0, ""},
-		{"SYS_GET_MEMPOLICY", Const, 0, ""},
-		{"SYS_GET_ROBUST_LIST", Const, 0, ""},
-		{"SYS_GET_THREAD_AREA", Const, 0, ""},
-		{"SYS_GSSD_SYSCALL", Const, 14, ""},
-		{"SYS_GTTY", Const, 0, ""},
-		{"SYS_IDENTITYSVC", Const, 0, ""},
-		{"SYS_IDLE", Const, 0, ""},
-		{"SYS_INITGROUPS", Const, 0, ""},
-		{"SYS_INIT_MODULE", Const, 0, ""},
-		{"SYS_INOTIFY_ADD_WATCH", Const, 0, ""},
-		{"SYS_INOTIFY_INIT", Const, 0, ""},
-		{"SYS_INOTIFY_INIT1", Const, 0, ""},
-		{"SYS_INOTIFY_RM_WATCH", Const, 0, ""},
-		{"SYS_IOCTL", Const, 0, ""},
-		{"SYS_IOPERM", Const, 0, ""},
-		{"SYS_IOPL", Const, 0, ""},
-		{"SYS_IOPOLICYSYS", Const, 0, ""},
-		{"SYS_IOPRIO_GET", Const, 0, ""},
-		{"SYS_IOPRIO_SET", Const, 0, ""},
-		{"SYS_IO_CANCEL", Const, 0, ""},
-		{"SYS_IO_DESTROY", Const, 0, ""},
-		{"SYS_IO_GETEVENTS", Const, 0, ""},
-		{"SYS_IO_SETUP", Const, 0, ""},
-		{"SYS_IO_SUBMIT", Const, 0, ""},
-		{"SYS_IPC", Const, 0, ""},
-		{"SYS_ISSETUGID", Const, 0, ""},
-		{"SYS_JAIL", Const, 0, ""},
-		{"SYS_JAIL_ATTACH", Const, 0, ""},
-		{"SYS_JAIL_GET", Const, 0, ""},
-		{"SYS_JAIL_REMOVE", Const, 0, ""},
-		{"SYS_JAIL_SET", Const, 0, ""},
-		{"SYS_KAS_INFO", Const, 16, ""},
-		{"SYS_KDEBUG_TRACE", Const, 0, ""},
-		{"SYS_KENV", Const, 0, ""},
-		{"SYS_KEVENT", Const, 0, ""},
-		{"SYS_KEVENT64", Const, 0, ""},
-		{"SYS_KEXEC_LOAD", Const, 0, ""},
-		{"SYS_KEYCTL", Const, 0, ""},
-		{"SYS_KILL", Const, 0, ""},
-		{"SYS_KLDFIND", Const, 0, ""},
-		{"SYS_KLDFIRSTMOD", Const, 0, ""},
-		{"SYS_KLDLOAD", Const, 0, ""},
-		{"SYS_KLDNEXT", Const, 0, ""},
-		{"SYS_KLDSTAT", Const, 0, ""},
-		{"SYS_KLDSYM", Const, 0, ""},
-		{"SYS_KLDUNLOAD", Const, 0, ""},
-		{"SYS_KLDUNLOADF", Const, 0, ""},
-		{"SYS_KMQ_NOTIFY", Const, 14, ""},
-		{"SYS_KMQ_OPEN", Const, 14, ""},
-		{"SYS_KMQ_SETATTR", Const, 14, ""},
-		{"SYS_KMQ_TIMEDRECEIVE", Const, 14, ""},
-		{"SYS_KMQ_TIMEDSEND", Const, 14, ""},
-		{"SYS_KMQ_UNLINK", Const, 14, ""},
-		{"SYS_KQUEUE", Const, 0, ""},
-		{"SYS_KQUEUE1", Const, 1, ""},
-		{"SYS_KSEM_CLOSE", Const, 14, ""},
-		{"SYS_KSEM_DESTROY", Const, 14, ""},
-		{"SYS_KSEM_GETVALUE", Const, 14, ""},
-		{"SYS_KSEM_INIT", Const, 14, ""},
-		{"SYS_KSEM_OPEN", Const, 14, ""},
-		{"SYS_KSEM_POST", Const, 14, ""},
-		{"SYS_KSEM_TIMEDWAIT", Const, 14, ""},
-		{"SYS_KSEM_TRYWAIT", Const, 14, ""},
-		{"SYS_KSEM_UNLINK", Const, 14, ""},
-		{"SYS_KSEM_WAIT", Const, 14, ""},
-		{"SYS_KTIMER_CREATE", Const, 0, ""},
-		{"SYS_KTIMER_DELETE", Const, 0, ""},
-		{"SYS_KTIMER_GETOVERRUN", Const, 0, ""},
-		{"SYS_KTIMER_GETTIME", Const, 0, ""},
-		{"SYS_KTIMER_SETTIME", Const, 0, ""},
-		{"SYS_KTRACE", Const, 0, ""},
-		{"SYS_LCHFLAGS", Const, 0, ""},
-		{"SYS_LCHMOD", Const, 0, ""},
-		{"SYS_LCHOWN", Const, 0, ""},
-		{"SYS_LCHOWN32", Const, 0, ""},
-		{"SYS_LEDGER", Const, 16, ""},
-		{"SYS_LGETFH", Const, 0, ""},
-		{"SYS_LGETXATTR", Const, 0, ""},
-		{"SYS_LINK", Const, 0, ""},
-		{"SYS_LINKAT", Const, 0, ""},
-		{"SYS_LIO_LISTIO", Const, 0, ""},
-		{"SYS_LISTEN", Const, 0, ""},
-		{"SYS_LISTXATTR", Const, 0, ""},
-		{"SYS_LLISTXATTR", Const, 0, ""},
-		{"SYS_LOCK", Const, 0, ""},
-		{"SYS_LOOKUP_DCOOKIE", Const, 0, ""},
-		{"SYS_LPATHCONF", Const, 0, ""},
-		{"SYS_LREMOVEXATTR", Const, 0, ""},
-		{"SYS_LSEEK", Const, 0, ""},
-		{"SYS_LSETXATTR", Const, 0, ""},
-		{"SYS_LSTAT", Const, 0, ""},
-		{"SYS_LSTAT64", Const, 0, ""},
-		{"SYS_LSTAT64_EXTENDED", Const, 0, ""},
-		{"SYS_LSTATV", Const, 0, ""},
-		{"SYS_LSTAT_EXTENDED", Const, 0, ""},
-		{"SYS_LUTIMES", Const, 0, ""},
-		{"SYS_MAC_SYSCALL", Const, 0, ""},
-		{"SYS_MADVISE", Const, 0, ""},
-		{"SYS_MADVISE1", Const, 0, ""},
-		{"SYS_MAXSYSCALL", Const, 0, ""},
-		{"SYS_MBIND", Const, 0, ""},
-		{"SYS_MIGRATE_PAGES", Const, 0, ""},
-		{"SYS_MINCORE", Const, 0, ""},
-		{"SYS_MINHERIT", Const, 0, ""},
-		{"SYS_MKCOMPLEX", Const, 0, ""},
-		{"SYS_MKDIR", Const, 0, ""},
-		{"SYS_MKDIRAT", Const, 0, ""},
-		{"SYS_MKDIR_EXTENDED", Const, 0, ""},
-		{"SYS_MKFIFO", Const, 0, ""},
-		{"SYS_MKFIFOAT", Const, 0, ""},
-		{"SYS_MKFIFO_EXTENDED", Const, 0, ""},
-		{"SYS_MKNOD", Const, 0, ""},
-		{"SYS_MKNODAT", Const, 0, ""},
-		{"SYS_MLOCK", Const, 0, ""},
-		{"SYS_MLOCKALL", Const, 0, ""},
-		{"SYS_MMAP", Const, 0, ""},
-		{"SYS_MMAP2", Const, 0, ""},
-		{"SYS_MODCTL", Const, 1, ""},
-		{"SYS_MODFIND", Const, 0, ""},
-		{"SYS_MODFNEXT", Const, 0, ""},
-		{"SYS_MODIFY_LDT", Const, 0, ""},
-		{"SYS_MODNEXT", Const, 0, ""},
-		{"SYS_MODSTAT", Const, 0, ""},
-		{"SYS_MODWATCH", Const, 0, ""},
-		{"SYS_MOUNT", Const, 0, ""},
-		{"SYS_MOVE_PAGES", Const, 0, ""},
-		{"SYS_MPROTECT", Const, 0, ""},
-		{"SYS_MPX", Const, 0, ""},
-		{"SYS_MQUERY", Const, 1, ""},
-		{"SYS_MQ_GETSETATTR", Const, 0, ""},
-		{"SYS_MQ_NOTIFY", Const, 0, ""},
-		{"SYS_MQ_OPEN", Const, 0, ""},
-		{"SYS_MQ_TIMEDRECEIVE", Const, 0, ""},
-		{"SYS_MQ_TIMEDSEND", Const, 0, ""},
-		{"SYS_MQ_UNLINK", Const, 0, ""},
-		{"SYS_MREMAP", Const, 0, ""},
-		{"SYS_MSGCTL", Const, 0, ""},
-		{"SYS_MSGGET", Const, 0, ""},
-		{"SYS_MSGRCV", Const, 0, ""},
-		{"SYS_MSGRCV_NOCANCEL", Const, 0, ""},
-		{"SYS_MSGSND", Const, 0, ""},
-		{"SYS_MSGSND_NOCANCEL", Const, 0, ""},
-		{"SYS_MSGSYS", Const, 0, ""},
-		{"SYS_MSYNC", Const, 0, ""},
-		{"SYS_MSYNC_NOCANCEL", Const, 0, ""},
-		{"SYS_MUNLOCK", Const, 0, ""},
-		{"SYS_MUNLOCKALL", Const, 0, ""},
-		{"SYS_MUNMAP", Const, 0, ""},
-		{"SYS_NAME_TO_HANDLE_AT", Const, 0, ""},
-		{"SYS_NANOSLEEP", Const, 0, ""},
-		{"SYS_NEWFSTATAT", Const, 0, ""},
-		{"SYS_NFSCLNT", Const, 0, ""},
-		{"SYS_NFSSERVCTL", Const, 0, ""},
-		{"SYS_NFSSVC", Const, 0, ""},
-		{"SYS_NFSTAT", Const, 0, ""},
-		{"SYS_NICE", Const, 0, ""},
-		{"SYS_NLM_SYSCALL", Const, 14, ""},
-		{"SYS_NLSTAT", Const, 0, ""},
-		{"SYS_NMOUNT", Const, 0, ""},
-		{"SYS_NSTAT", Const, 0, ""},
-		{"SYS_NTP_ADJTIME", Const, 0, ""},
-		{"SYS_NTP_GETTIME", Const, 0, ""},
-		{"SYS_NUMA_GETAFFINITY", Const, 14, ""},
-		{"SYS_NUMA_SETAFFINITY", Const, 14, ""},
-		{"SYS_OABI_SYSCALL_BASE", Const, 0, ""},
-		{"SYS_OBREAK", Const, 0, ""},
-		{"SYS_OLDFSTAT", Const, 0, ""},
-		{"SYS_OLDLSTAT", Const, 0, ""},
-		{"SYS_OLDOLDUNAME", Const, 0, ""},
-		{"SYS_OLDSTAT", Const, 0, ""},
-		{"SYS_OLDUNAME", Const, 0, ""},
-		{"SYS_OPEN", Const, 0, ""},
-		{"SYS_OPENAT", Const, 0, ""},
-		{"SYS_OPENBSD_POLL", Const, 0, ""},
-		{"SYS_OPEN_BY_HANDLE_AT", Const, 0, ""},
-		{"SYS_OPEN_DPROTECTED_NP", Const, 16, ""},
-		{"SYS_OPEN_EXTENDED", Const, 0, ""},
-		{"SYS_OPEN_NOCANCEL", Const, 0, ""},
-		{"SYS_OVADVISE", Const, 0, ""},
-		{"SYS_PACCEPT", Const, 1, ""},
-		{"SYS_PATHCONF", Const, 0, ""},
-		{"SYS_PAUSE", Const, 0, ""},
-		{"SYS_PCICONFIG_IOBASE", Const, 0, ""},
-		{"SYS_PCICONFIG_READ", Const, 0, ""},
-		{"SYS_PCICONFIG_WRITE", Const, 0, ""},
-		{"SYS_PDFORK", Const, 0, ""},
-		{"SYS_PDGETPID", Const, 0, ""},
-		{"SYS_PDKILL", Const, 0, ""},
-		{"SYS_PERF_EVENT_OPEN", Const, 0, ""},
-		{"SYS_PERSONALITY", Const, 0, ""},
-		{"SYS_PID_HIBERNATE", Const, 0, ""},
-		{"SYS_PID_RESUME", Const, 0, ""},
-		{"SYS_PID_SHUTDOWN_SOCKETS", Const, 0, ""},
-		{"SYS_PID_SUSPEND", Const, 0, ""},
-		{"SYS_PIPE", Const, 0, ""},
-		{"SYS_PIPE2", Const, 0, ""},
-		{"SYS_PIVOT_ROOT", Const, 0, ""},
-		{"SYS_PMC_CONTROL", Const, 1, ""},
-		{"SYS_PMC_GET_INFO", Const, 1, ""},
-		{"SYS_POLL", Const, 0, ""},
-		{"SYS_POLLTS", Const, 1, ""},
-		{"SYS_POLL_NOCANCEL", Const, 0, ""},
-		{"SYS_POSIX_FADVISE", Const, 0, ""},
-		{"SYS_POSIX_FALLOCATE", Const, 0, ""},
-		{"SYS_POSIX_OPENPT", Const, 0, ""},
-		{"SYS_POSIX_SPAWN", Const, 0, ""},
-		{"SYS_PPOLL", Const, 0, ""},
-		{"SYS_PRCTL", Const, 0, ""},
-		{"SYS_PREAD", Const, 0, ""},
-		{"SYS_PREAD64", Const, 0, ""},
-		{"SYS_PREADV", Const, 0, ""},
-		{"SYS_PREAD_NOCANCEL", Const, 0, ""},
-		{"SYS_PRLIMIT64", Const, 0, ""},
-		{"SYS_PROCCTL", Const, 3, ""},
-		{"SYS_PROCESS_POLICY", Const, 0, ""},
-		{"SYS_PROCESS_VM_READV", Const, 0, ""},
-		{"SYS_PROCESS_VM_WRITEV", Const, 0, ""},
-		{"SYS_PROC_INFO", Const, 0, ""},
-		{"SYS_PROF", Const, 0, ""},
-		{"SYS_PROFIL", Const, 0, ""},
-		{"SYS_PSELECT", Const, 0, ""},
-		{"SYS_PSELECT6", Const, 0, ""},
-		{"SYS_PSET_ASSIGN", Const, 1, ""},
-		{"SYS_PSET_CREATE", Const, 1, ""},
-		{"SYS_PSET_DESTROY", Const, 1, ""},
-		{"SYS_PSYNCH_CVBROAD", Const, 0, ""},
-		{"SYS_PSYNCH_CVCLRPREPOST", Const, 0, ""},
-		{"SYS_PSYNCH_CVSIGNAL", Const, 0, ""},
-		{"SYS_PSYNCH_CVWAIT", Const, 0, ""},
-		{"SYS_PSYNCH_MUTEXDROP", Const, 0, ""},
-		{"SYS_PSYNCH_MUTEXWAIT", Const, 0, ""},
-		{"SYS_PSYNCH_RW_DOWNGRADE", Const, 0, ""},
-		{"SYS_PSYNCH_RW_LONGRDLOCK", Const, 0, ""},
-		{"SYS_PSYNCH_RW_RDLOCK", Const, 0, ""},
-		{"SYS_PSYNCH_RW_UNLOCK", Const, 0, ""},
-		{"SYS_PSYNCH_RW_UNLOCK2", Const, 0, ""},
-		{"SYS_PSYNCH_RW_UPGRADE", Const, 0, ""},
-		{"SYS_PSYNCH_RW_WRLOCK", Const, 0, ""},
-		{"SYS_PSYNCH_RW_YIELDWRLOCK", Const, 0, ""},
-		{"SYS_PTRACE", Const, 0, ""},
-		{"SYS_PUTPMSG", Const, 0, ""},
-		{"SYS_PWRITE", Const, 0, ""},
-		{"SYS_PWRITE64", Const, 0, ""},
-		{"SYS_PWRITEV", Const, 0, ""},
-		{"SYS_PWRITE_NOCANCEL", Const, 0, ""},
-		{"SYS_QUERY_MODULE", Const, 0, ""},
-		{"SYS_QUOTACTL", Const, 0, ""},
-		{"SYS_RASCTL", Const, 1, ""},
-		{"SYS_RCTL_ADD_RULE", Const, 0, ""},
-		{"SYS_RCTL_GET_LIMITS", Const, 0, ""},
-		{"SYS_RCTL_GET_RACCT", Const, 0, ""},
-		{"SYS_RCTL_GET_RULES", Const, 0, ""},
-		{"SYS_RCTL_REMOVE_RULE", Const, 0, ""},
-		{"SYS_READ", Const, 0, ""},
-		{"SYS_READAHEAD", Const, 0, ""},
-		{"SYS_READDIR", Const, 0, ""},
-		{"SYS_READLINK", Const, 0, ""},
-		{"SYS_READLINKAT", Const, 0, ""},
-		{"SYS_READV", Const, 0, ""},
-		{"SYS_READV_NOCANCEL", Const, 0, ""},
-		{"SYS_READ_NOCANCEL", Const, 0, ""},
-		{"SYS_REBOOT", Const, 0, ""},
-		{"SYS_RECV", Const, 0, ""},
-		{"SYS_RECVFROM", Const, 0, ""},
-		{"SYS_RECVFROM_NOCANCEL", Const, 0, ""},
-		{"SYS_RECVMMSG", Const, 0, ""},
-		{"SYS_RECVMSG", Const, 0, ""},
-		{"SYS_RECVMSG_NOCANCEL", Const, 0, ""},
-		{"SYS_REMAP_FILE_PAGES", Const, 0, ""},
-		{"SYS_REMOVEXATTR", Const, 0, ""},
-		{"SYS_RENAME", Const, 0, ""},
-		{"SYS_RENAMEAT", Const, 0, ""},
-		{"SYS_REQUEST_KEY", Const, 0, ""},
-		{"SYS_RESTART_SYSCALL", Const, 0, ""},
-		{"SYS_REVOKE", Const, 0, ""},
-		{"SYS_RFORK", Const, 0, ""},
-		{"SYS_RMDIR", Const, 0, ""},
-		{"SYS_RTPRIO", Const, 0, ""},
-		{"SYS_RTPRIO_THREAD", Const, 0, ""},
-		{"SYS_RT_SIGACTION", Const, 0, ""},
-		{"SYS_RT_SIGPENDING", Const, 0, ""},
-		{"SYS_RT_SIGPROCMASK", Const, 0, ""},
-		{"SYS_RT_SIGQUEUEINFO", Const, 0, ""},
-		{"SYS_RT_SIGRETURN", Const, 0, ""},
-		{"SYS_RT_SIGSUSPEND", Const, 0, ""},
-		{"SYS_RT_SIGTIMEDWAIT", Const, 0, ""},
-		{"SYS_RT_TGSIGQUEUEINFO", Const, 0, ""},
-		{"SYS_SBRK", Const, 0, ""},
-		{"SYS_SCHED_GETAFFINITY", Const, 0, ""},
-		{"SYS_SCHED_GETPARAM", Const, 0, ""},
-		{"SYS_SCHED_GETSCHEDULER", Const, 0, ""},
-		{"SYS_SCHED_GET_PRIORITY_MAX", Const, 0, ""},
-		{"SYS_SCHED_GET_PRIORITY_MIN", Const, 0, ""},
-		{"SYS_SCHED_RR_GET_INTERVAL", Const, 0, ""},
-		{"SYS_SCHED_SETAFFINITY", Const, 0, ""},
-		{"SYS_SCHED_SETPARAM", Const, 0, ""},
-		{"SYS_SCHED_SETSCHEDULER", Const, 0, ""},
-		{"SYS_SCHED_YIELD", Const, 0, ""},
-		{"SYS_SCTP_GENERIC_RECVMSG", Const, 0, ""},
-		{"SYS_SCTP_GENERIC_SENDMSG", Const, 0, ""},
-		{"SYS_SCTP_GENERIC_SENDMSG_IOV", Const, 0, ""},
-		{"SYS_SCTP_PEELOFF", Const, 0, ""},
-		{"SYS_SEARCHFS", Const, 0, ""},
-		{"SYS_SECURITY", Const, 0, ""},
-		{"SYS_SELECT", Const, 0, ""},
-		{"SYS_SELECT_NOCANCEL", Const, 0, ""},
-		{"SYS_SEMCONFIG", Const, 1, ""},
-		{"SYS_SEMCTL", Const, 0, ""},
-		{"SYS_SEMGET", Const, 0, ""},
-		{"SYS_SEMOP", Const, 0, ""},
-		{"SYS_SEMSYS", Const, 0, ""},
-		{"SYS_SEMTIMEDOP", Const, 0, ""},
-		{"SYS_SEM_CLOSE", Const, 0, ""},
-		{"SYS_SEM_DESTROY", Const, 0, ""},
-		{"SYS_SEM_GETVALUE", Const, 0, ""},
-		{"SYS_SEM_INIT", Const, 0, ""},
-		{"SYS_SEM_OPEN", Const, 0, ""},
-		{"SYS_SEM_POST", Const, 0, ""},
-		{"SYS_SEM_TRYWAIT", Const, 0, ""},
-		{"SYS_SEM_UNLINK", Const, 0, ""},
-		{"SYS_SEM_WAIT", Const, 0, ""},
-		{"SYS_SEM_WAIT_NOCANCEL", Const, 0, ""},
-		{"SYS_SEND", Const, 0, ""},
-		{"SYS_SENDFILE", Const, 0, ""},
-		{"SYS_SENDFILE64", Const, 0, ""},
-		{"SYS_SENDMMSG", Const, 0, ""},
-		{"SYS_SENDMSG", Const, 0, ""},
-		{"SYS_SENDMSG_NOCANCEL", Const, 0, ""},
-		{"SYS_SENDTO", Const, 0, ""},
-		{"SYS_SENDTO_NOCANCEL", Const, 0, ""},
-		{"SYS_SETATTRLIST", Const, 0, ""},
-		{"SYS_SETAUDIT", Const, 0, ""},
-		{"SYS_SETAUDIT_ADDR", Const, 0, ""},
-		{"SYS_SETAUID", Const, 0, ""},
-		{"SYS_SETCONTEXT", Const, 0, ""},
-		{"SYS_SETDOMAINNAME", Const, 0, ""},
-		{"SYS_SETEGID", Const, 0, ""},
-		{"SYS_SETEUID", Const, 0, ""},
-		{"SYS_SETFIB", Const, 0, ""},
-		{"SYS_SETFSGID", Const, 0, ""},
-		{"SYS_SETFSGID32", Const, 0, ""},
-		{"SYS_SETFSUID", Const, 0, ""},
-		{"SYS_SETFSUID32", Const, 0, ""},
-		{"SYS_SETGID", Const, 0, ""},
-		{"SYS_SETGID32", Const, 0, ""},
-		{"SYS_SETGROUPS", Const, 0, ""},
-		{"SYS_SETGROUPS32", Const, 0, ""},
-		{"SYS_SETHOSTNAME", Const, 0, ""},
-		{"SYS_SETITIMER", Const, 0, ""},
-		{"SYS_SETLCID", Const, 0, ""},
-		{"SYS_SETLOGIN", Const, 0, ""},
-		{"SYS_SETLOGINCLASS", Const, 0, ""},
-		{"SYS_SETNS", Const, 0, ""},
-		{"SYS_SETPGID", Const, 0, ""},
-		{"SYS_SETPRIORITY", Const, 0, ""},
-		{"SYS_SETPRIVEXEC", Const, 0, ""},
-		{"SYS_SETREGID", Const, 0, ""},
-		{"SYS_SETREGID32", Const, 0, ""},
-		{"SYS_SETRESGID", Const, 0, ""},
-		{"SYS_SETRESGID32", Const, 0, ""},
-		{"SYS_SETRESUID", Const, 0, ""},
-		{"SYS_SETRESUID32", Const, 0, ""},
-		{"SYS_SETREUID", Const, 0, ""},
-		{"SYS_SETREUID32", Const, 0, ""},
-		{"SYS_SETRLIMIT", Const, 0, ""},
-		{"SYS_SETRTABLE", Const, 1, ""},
-		{"SYS_SETSGROUPS", Const, 0, ""},
-		{"SYS_SETSID", Const, 0, ""},
-		{"SYS_SETSOCKOPT", Const, 0, ""},
-		{"SYS_SETTID", Const, 0, ""},
-		{"SYS_SETTID_WITH_PID", Const, 0, ""},
-		{"SYS_SETTIMEOFDAY", Const, 0, ""},
-		{"SYS_SETUID", Const, 0, ""},
-		{"SYS_SETUID32", Const, 0, ""},
-		{"SYS_SETWGROUPS", Const, 0, ""},
-		{"SYS_SETXATTR", Const, 0, ""},
-		{"SYS_SET_MEMPOLICY", Const, 0, ""},
-		{"SYS_SET_ROBUST_LIST", Const, 0, ""},
-		{"SYS_SET_THREAD_AREA", Const, 0, ""},
-		{"SYS_SET_TID_ADDRESS", Const, 0, ""},
-		{"SYS_SGETMASK", Const, 0, ""},
-		{"SYS_SHARED_REGION_CHECK_NP", Const, 0, ""},
-		{"SYS_SHARED_REGION_MAP_AND_SLIDE_NP", Const, 0, ""},
-		{"SYS_SHMAT", Const, 0, ""},
-		{"SYS_SHMCTL", Const, 0, ""},
-		{"SYS_SHMDT", Const, 0, ""},
-		{"SYS_SHMGET", Const, 0, ""},
-		{"SYS_SHMSYS", Const, 0, ""},
-		{"SYS_SHM_OPEN", Const, 0, ""},
-		{"SYS_SHM_UNLINK", Const, 0, ""},
-		{"SYS_SHUTDOWN", Const, 0, ""},
-		{"SYS_SIGACTION", Const, 0, ""},
-		{"SYS_SIGALTSTACK", Const, 0, ""},
-		{"SYS_SIGNAL", Const, 0, ""},
-		{"SYS_SIGNALFD", Const, 0, ""},
-		{"SYS_SIGNALFD4", Const, 0, ""},
-		{"SYS_SIGPENDING", Const, 0, ""},
-		{"SYS_SIGPROCMASK", Const, 0, ""},
-		{"SYS_SIGQUEUE", Const, 0, ""},
-		{"SYS_SIGQUEUEINFO", Const, 1, ""},
-		{"SYS_SIGRETURN", Const, 0, ""},
-		{"SYS_SIGSUSPEND", Const, 0, ""},
-		{"SYS_SIGSUSPEND_NOCANCEL", Const, 0, ""},
-		{"SYS_SIGTIMEDWAIT", Const, 0, ""},
-		{"SYS_SIGWAIT", Const, 0, ""},
-		{"SYS_SIGWAITINFO", Const, 0, ""},
-		{"SYS_SOCKET", Const, 0, ""},
-		{"SYS_SOCKETCALL", Const, 0, ""},
-		{"SYS_SOCKETPAIR", Const, 0, ""},
-		{"SYS_SPLICE", Const, 0, ""},
-		{"SYS_SSETMASK", Const, 0, ""},
-		{"SYS_SSTK", Const, 0, ""},
-		{"SYS_STACK_SNAPSHOT", Const, 0, ""},
-		{"SYS_STAT", Const, 0, ""},
-		{"SYS_STAT64", Const, 0, ""},
-		{"SYS_STAT64_EXTENDED", Const, 0, ""},
-		{"SYS_STATFS", Const, 0, ""},
-		{"SYS_STATFS64", Const, 0, ""},
-		{"SYS_STATV", Const, 0, ""},
-		{"SYS_STATVFS1", Const, 1, ""},
-		{"SYS_STAT_EXTENDED", Const, 0, ""},
-		{"SYS_STIME", Const, 0, ""},
-		{"SYS_STTY", Const, 0, ""},
-		{"SYS_SWAPCONTEXT", Const, 0, ""},
-		{"SYS_SWAPCTL", Const, 1, ""},
-		{"SYS_SWAPOFF", Const, 0, ""},
-		{"SYS_SWAPON", Const, 0, ""},
-		{"SYS_SYMLINK", Const, 0, ""},
-		{"SYS_SYMLINKAT", Const, 0, ""},
-		{"SYS_SYNC", Const, 0, ""},
-		{"SYS_SYNCFS", Const, 0, ""},
-		{"SYS_SYNC_FILE_RANGE", Const, 0, ""},
-		{"SYS_SYSARCH", Const, 0, ""},
-		{"SYS_SYSCALL", Const, 0, ""},
-		{"SYS_SYSCALL_BASE", Const, 0, ""},
-		{"SYS_SYSFS", Const, 0, ""},
-		{"SYS_SYSINFO", Const, 0, ""},
-		{"SYS_SYSLOG", Const, 0, ""},
-		{"SYS_TEE", Const, 0, ""},
-		{"SYS_TGKILL", Const, 0, ""},
-		{"SYS_THREAD_SELFID", Const, 0, ""},
-		{"SYS_THR_CREATE", Const, 0, ""},
-		{"SYS_THR_EXIT", Const, 0, ""},
-		{"SYS_THR_KILL", Const, 0, ""},
-		{"SYS_THR_KILL2", Const, 0, ""},
-		{"SYS_THR_NEW", Const, 0, ""},
-		{"SYS_THR_SELF", Const, 0, ""},
-		{"SYS_THR_SET_NAME", Const, 0, ""},
-		{"SYS_THR_SUSPEND", Const, 0, ""},
-		{"SYS_THR_WAKE", Const, 0, ""},
-		{"SYS_TIME", Const, 0, ""},
-		{"SYS_TIMERFD_CREATE", Const, 0, ""},
-		{"SYS_TIMERFD_GETTIME", Const, 0, ""},
-		{"SYS_TIMERFD_SETTIME", Const, 0, ""},
-		{"SYS_TIMER_CREATE", Const, 0, ""},
-		{"SYS_TIMER_DELETE", Const, 0, ""},
-		{"SYS_TIMER_GETOVERRUN", Const, 0, ""},
-		{"SYS_TIMER_GETTIME", Const, 0, ""},
-		{"SYS_TIMER_SETTIME", Const, 0, ""},
-		{"SYS_TIMES", Const, 0, ""},
-		{"SYS_TKILL", Const, 0, ""},
-		{"SYS_TRUNCATE", Const, 0, ""},
-		{"SYS_TRUNCATE64", Const, 0, ""},
-		{"SYS_TUXCALL", Const, 0, ""},
-		{"SYS_UGETRLIMIT", Const, 0, ""},
-		{"SYS_ULIMIT", Const, 0, ""},
-		{"SYS_UMASK", Const, 0, ""},
-		{"SYS_UMASK_EXTENDED", Const, 0, ""},
-		{"SYS_UMOUNT", Const, 0, ""},
-		{"SYS_UMOUNT2", Const, 0, ""},
-		{"SYS_UNAME", Const, 0, ""},
-		{"SYS_UNDELETE", Const, 0, ""},
-		{"SYS_UNLINK", Const, 0, ""},
-		{"SYS_UNLINKAT", Const, 0, ""},
-		{"SYS_UNMOUNT", Const, 0, ""},
-		{"SYS_UNSHARE", Const, 0, ""},
-		{"SYS_USELIB", Const, 0, ""},
-		{"SYS_USTAT", Const, 0, ""},
-		{"SYS_UTIME", Const, 0, ""},
-		{"SYS_UTIMENSAT", Const, 0, ""},
-		{"SYS_UTIMES", Const, 0, ""},
-		{"SYS_UTRACE", Const, 0, ""},
-		{"SYS_UUIDGEN", Const, 0, ""},
-		{"SYS_VADVISE", Const, 1, ""},
-		{"SYS_VFORK", Const, 0, ""},
-		{"SYS_VHANGUP", Const, 0, ""},
-		{"SYS_VM86", Const, 0, ""},
-		{"SYS_VM86OLD", Const, 0, ""},
-		{"SYS_VMSPLICE", Const, 0, ""},
-		{"SYS_VM_PRESSURE_MONITOR", Const, 0, ""},
-		{"SYS_VSERVER", Const, 0, ""},
-		{"SYS_WAIT4", Const, 0, ""},
-		{"SYS_WAIT4_NOCANCEL", Const, 0, ""},
-		{"SYS_WAIT6", Const, 1, ""},
-		{"SYS_WAITEVENT", Const, 0, ""},
-		{"SYS_WAITID", Const, 0, ""},
-		{"SYS_WAITID_NOCANCEL", Const, 0, ""},
-		{"SYS_WAITPID", Const, 0, ""},
-		{"SYS_WATCHEVENT", Const, 0, ""},
-		{"SYS_WORKQ_KERNRETURN", Const, 0, ""},
-		{"SYS_WORKQ_OPEN", Const, 0, ""},
-		{"SYS_WRITE", Const, 0, ""},
-		{"SYS_WRITEV", Const, 0, ""},
-		{"SYS_WRITEV_NOCANCEL", Const, 0, ""},
-		{"SYS_WRITE_NOCANCEL", Const, 0, ""},
-		{"SYS_YIELD", Const, 0, ""},
-		{"SYS__LLSEEK", Const, 0, ""},
-		{"SYS__LWP_CONTINUE", Const, 1, ""},
-		{"SYS__LWP_CREATE", Const, 1, ""},
-		{"SYS__LWP_CTL", Const, 1, ""},
-		{"SYS__LWP_DETACH", Const, 1, ""},
-		{"SYS__LWP_EXIT", Const, 1, ""},
-		{"SYS__LWP_GETNAME", Const, 1, ""},
-		{"SYS__LWP_GETPRIVATE", Const, 1, ""},
-		{"SYS__LWP_KILL", Const, 1, ""},
-		{"SYS__LWP_PARK", Const, 1, ""},
-		{"SYS__LWP_SELF", Const, 1, ""},
-		{"SYS__LWP_SETNAME", Const, 1, ""},
-		{"SYS__LWP_SETPRIVATE", Const, 1, ""},
-		{"SYS__LWP_SUSPEND", Const, 1, ""},
-		{"SYS__LWP_UNPARK", Const, 1, ""},
-		{"SYS__LWP_UNPARK_ALL", Const, 1, ""},
-		{"SYS__LWP_WAIT", Const, 1, ""},
-		{"SYS__LWP_WAKEUP", Const, 1, ""},
-		{"SYS__NEWSELECT", Const, 0, ""},
-		{"SYS__PSET_BIND", Const, 1, ""},
-		{"SYS__SCHED_GETAFFINITY", Const, 1, ""},
-		{"SYS__SCHED_GETPARAM", Const, 1, ""},
-		{"SYS__SCHED_SETAFFINITY", Const, 1, ""},
-		{"SYS__SCHED_SETPARAM", Const, 1, ""},
-		{"SYS__SYSCTL", Const, 0, ""},
-		{"SYS__UMTX_LOCK", Const, 0, ""},
-		{"SYS__UMTX_OP", Const, 0, ""},
-		{"SYS__UMTX_UNLOCK", Const, 0, ""},
-		{"SYS___ACL_ACLCHECK_FD", Const, 0, ""},
-		{"SYS___ACL_ACLCHECK_FILE", Const, 0, ""},
-		{"SYS___ACL_ACLCHECK_LINK", Const, 0, ""},
-		{"SYS___ACL_DELETE_FD", Const, 0, ""},
-		{"SYS___ACL_DELETE_FILE", Const, 0, ""},
-		{"SYS___ACL_DELETE_LINK", Const, 0, ""},
-		{"SYS___ACL_GET_FD", Const, 0, ""},
-		{"SYS___ACL_GET_FILE", Const, 0, ""},
-		{"SYS___ACL_GET_LINK", Const, 0, ""},
-		{"SYS___ACL_SET_FD", Const, 0, ""},
-		{"SYS___ACL_SET_FILE", Const, 0, ""},
-		{"SYS___ACL_SET_LINK", Const, 0, ""},
-		{"SYS___CAP_RIGHTS_GET", Const, 14, ""},
-		{"SYS___CLONE", Const, 1, ""},
-		{"SYS___DISABLE_THREADSIGNAL", Const, 0, ""},
-		{"SYS___GETCWD", Const, 0, ""},
-		{"SYS___GETLOGIN", Const, 1, ""},
-		{"SYS___GET_TCB", Const, 1, ""},
-		{"SYS___MAC_EXECVE", Const, 0, ""},
-		{"SYS___MAC_GETFSSTAT", Const, 0, ""},
-		{"SYS___MAC_GET_FD", Const, 0, ""},
-		{"SYS___MAC_GET_FILE", Const, 0, ""},
-		{"SYS___MAC_GET_LCID", Const, 0, ""},
-		{"SYS___MAC_GET_LCTX", Const, 0, ""},
-		{"SYS___MAC_GET_LINK", Const, 0, ""},
-		{"SYS___MAC_GET_MOUNT", Const, 0, ""},
-		{"SYS___MAC_GET_PID", Const, 0, ""},
-		{"SYS___MAC_GET_PROC", Const, 0, ""},
-		{"SYS___MAC_MOUNT", Const, 0, ""},
-		{"SYS___MAC_SET_FD", Const, 0, ""},
-		{"SYS___MAC_SET_FILE", Const, 0, ""},
-		{"SYS___MAC_SET_LCTX", Const, 0, ""},
-		{"SYS___MAC_SET_LINK", Const, 0, ""},
-		{"SYS___MAC_SET_PROC", Const, 0, ""},
-		{"SYS___MAC_SYSCALL", Const, 0, ""},
-		{"SYS___OLD_SEMWAIT_SIGNAL", Const, 0, ""},
-		{"SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL", Const, 0, ""},
-		{"SYS___POSIX_CHOWN", Const, 1, ""},
-		{"SYS___POSIX_FCHOWN", Const, 1, ""},
-		{"SYS___POSIX_LCHOWN", Const, 1, ""},
-		{"SYS___POSIX_RENAME", Const, 1, ""},
-		{"SYS___PTHREAD_CANCELED", Const, 0, ""},
-		{"SYS___PTHREAD_CHDIR", Const, 0, ""},
-		{"SYS___PTHREAD_FCHDIR", Const, 0, ""},
-		{"SYS___PTHREAD_KILL", Const, 0, ""},
-		{"SYS___PTHREAD_MARKCANCEL", Const, 0, ""},
-		{"SYS___PTHREAD_SIGMASK", Const, 0, ""},
-		{"SYS___QUOTACTL", Const, 1, ""},
-		{"SYS___SEMCTL", Const, 1, ""},
-		{"SYS___SEMWAIT_SIGNAL", Const, 0, ""},
-		{"SYS___SEMWAIT_SIGNAL_NOCANCEL", Const, 0, ""},
-		{"SYS___SETLOGIN", Const, 1, ""},
-		{"SYS___SETUGID", Const, 0, ""},
-		{"SYS___SET_TCB", Const, 1, ""},
-		{"SYS___SIGACTION_SIGTRAMP", Const, 1, ""},
-		{"SYS___SIGTIMEDWAIT", Const, 1, ""},
-		{"SYS___SIGWAIT", Const, 0, ""},
-		{"SYS___SIGWAIT_NOCANCEL", Const, 0, ""},
-		{"SYS___SYSCTL", Const, 0, ""},
-		{"SYS___TFORK", Const, 1, ""},
-		{"SYS___THREXIT", Const, 1, ""},
-		{"SYS___THRSIGDIVERT", Const, 1, ""},
-		{"SYS___THRSLEEP", Const, 1, ""},
-		{"SYS___THRWAKEUP", Const, 1, ""},
-		{"S_ARCH1", Const, 1, ""},
-		{"S_ARCH2", Const, 1, ""},
-		{"S_BLKSIZE", Const, 0, ""},
-		{"S_IEXEC", Const, 0, ""},
-		{"S_IFBLK", Const, 0, ""},
-		{"S_IFCHR", Const, 0, ""},
-		{"S_IFDIR", Const, 0, ""},
-		{"S_IFIFO", Const, 0, ""},
-		{"S_IFLNK", Const, 0, ""},
-		{"S_IFMT", Const, 0, ""},
-		{"S_IFREG", Const, 0, ""},
-		{"S_IFSOCK", Const, 0, ""},
-		{"S_IFWHT", Const, 0, ""},
-		{"S_IREAD", Const, 0, ""},
-		{"S_IRGRP", Const, 0, ""},
-		{"S_IROTH", Const, 0, ""},
-		{"S_IRUSR", Const, 0, ""},
-		{"S_IRWXG", Const, 0, ""},
-		{"S_IRWXO", Const, 0, ""},
-		{"S_IRWXU", Const, 0, ""},
-		{"S_ISGID", Const, 0, ""},
-		{"S_ISTXT", Const, 0, ""},
-		{"S_ISUID", Const, 0, ""},
-		{"S_ISVTX", Const, 0, ""},
-		{"S_IWGRP", Const, 0, ""},
-		{"S_IWOTH", Const, 0, ""},
-		{"S_IWRITE", Const, 0, ""},
-		{"S_IWUSR", Const, 0, ""},
-		{"S_IXGRP", Const, 0, ""},
-		{"S_IXOTH", Const, 0, ""},
-		{"S_IXUSR", Const, 0, ""},
-		{"S_LOGIN_SET", Const, 1, ""},
-		{"SecurityAttributes", Type, 0, ""},
-		{"SecurityAttributes.InheritHandle", Field, 0, ""},
-		{"SecurityAttributes.Length", Field, 0, ""},
-		{"SecurityAttributes.SecurityDescriptor", Field, 0, ""},
-		{"Seek", Func, 0, "func(fd int, offset int64, whence int) (off int64, err error)"},
-		{"Select", Func, 0, "func(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)"},
-		{"Sendfile", Func, 0, "func(outfd int, infd int, offset *int64, count int) (written int, err error)"},
-		{"Sendmsg", Func, 0, "func(fd int, p []byte, oob []byte, to Sockaddr, flags int) (err error)"},
-		{"SendmsgN", Func, 3, "func(fd int, p []byte, oob []byte, to Sockaddr, flags int) (n int, err error)"},
-		{"Sendto", Func, 0, "func(fd int, p []byte, flags int, to Sockaddr) (err error)"},
-		{"Servent", Type, 0, ""},
-		{"Servent.Aliases", Field, 0, ""},
-		{"Servent.Name", Field, 0, ""},
-		{"Servent.Port", Field, 0, ""},
-		{"Servent.Proto", Field, 0, ""},
-		{"SetBpf", Func, 0, ""},
-		{"SetBpfBuflen", Func, 0, ""},
-		{"SetBpfDatalink", Func, 0, ""},
-		{"SetBpfHeadercmpl", Func, 0, ""},
-		{"SetBpfImmediate", Func, 0, ""},
-		{"SetBpfInterface", Func, 0, ""},
-		{"SetBpfPromisc", Func, 0, ""},
-		{"SetBpfTimeout", Func, 0, ""},
-		{"SetCurrentDirectory", Func, 0, ""},
-		{"SetEndOfFile", Func, 0, ""},
-		{"SetEnvironmentVariable", Func, 0, ""},
-		{"SetFileAttributes", Func, 0, ""},
-		{"SetFileCompletionNotificationModes", Func, 2, ""},
-		{"SetFilePointer", Func, 0, ""},
-		{"SetFileTime", Func, 0, ""},
-		{"SetHandleInformation", Func, 0, ""},
-		{"SetKevent", Func, 0, ""},
-		{"SetLsfPromisc", Func, 0, "func(name string, m bool) error"},
-		{"SetNonblock", Func, 0, "func(fd int, nonblocking bool) (err error)"},
-		{"Setdomainname", Func, 0, "func(p []byte) (err error)"},
-		{"Setegid", Func, 0, "func(egid int) (err error)"},
-		{"Setenv", Func, 0, "func(key string, value string) error"},
-		{"Seteuid", Func, 0, "func(euid int) (err error)"},
-		{"Setfsgid", Func, 0, "func(gid int) (err error)"},
-		{"Setfsuid", Func, 0, "func(uid int) (err error)"},
-		{"Setgid", Func, 0, "func(gid int) (err error)"},
-		{"Setgroups", Func, 0, "func(gids []int) (err error)"},
-		{"Sethostname", Func, 0, "func(p []byte) (err error)"},
-		{"Setlogin", Func, 0, ""},
-		{"Setpgid", Func, 0, "func(pid int, pgid int) (err error)"},
-		{"Setpriority", Func, 0, "func(which int, who int, prio int) (err error)"},
-		{"Setprivexec", Func, 0, ""},
-		{"Setregid", Func, 0, "func(rgid int, egid int) (err error)"},
-		{"Setresgid", Func, 0, "func(rgid int, egid int, sgid int) (err error)"},
-		{"Setresuid", Func, 0, "func(ruid int, euid int, suid int) (err error)"},
-		{"Setreuid", Func, 0, "func(ruid int, euid int) (err error)"},
-		{"Setrlimit", Func, 0, "func(resource int, rlim *Rlimit) error"},
-		{"Setsid", Func, 0, "func() (pid int, err error)"},
-		{"Setsockopt", Func, 0, ""},
-		{"SetsockoptByte", Func, 0, "func(fd int, level int, opt int, value byte) (err error)"},
-		{"SetsockoptICMPv6Filter", Func, 2, "func(fd int, level int, opt int, filter *ICMPv6Filter) error"},
-		{"SetsockoptIPMreq", Func, 0, "func(fd int, level int, opt int, mreq *IPMreq) (err error)"},
-		{"SetsockoptIPMreqn", Func, 0, "func(fd int, level int, opt int, mreq *IPMreqn) (err error)"},
-		{"SetsockoptIPv6Mreq", Func, 0, "func(fd int, level int, opt int, mreq *IPv6Mreq) (err error)"},
-		{"SetsockoptInet4Addr", Func, 0, "func(fd int, level int, opt int, value [4]byte) (err error)"},
-		{"SetsockoptInt", Func, 0, "func(fd int, level int, opt int, value int) (err error)"},
-		{"SetsockoptLinger", Func, 0, "func(fd int, level int, opt int, l *Linger) (err error)"},
-		{"SetsockoptString", Func, 0, "func(fd int, level int, opt int, s string) (err error)"},
-		{"SetsockoptTimeval", Func, 0, "func(fd int, level int, opt int, tv *Timeval) (err error)"},
-		{"Settimeofday", Func, 0, "func(tv *Timeval) (err error)"},
-		{"Setuid", Func, 0, "func(uid int) (err error)"},
-		{"Setxattr", Func, 1, "func(path string, attr string, data []byte, flags int) (err error)"},
-		{"Shutdown", Func, 0, "func(fd int, how int) (err error)"},
-		{"SidTypeAlias", Const, 0, ""},
-		{"SidTypeComputer", Const, 0, ""},
-		{"SidTypeDeletedAccount", Const, 0, ""},
-		{"SidTypeDomain", Const, 0, ""},
-		{"SidTypeGroup", Const, 0, ""},
-		{"SidTypeInvalid", Const, 0, ""},
-		{"SidTypeLabel", Const, 0, ""},
-		{"SidTypeUnknown", Const, 0, ""},
-		{"SidTypeUser", Const, 0, ""},
-		{"SidTypeWellKnownGroup", Const, 0, ""},
-		{"Signal", Type, 0, ""},
-		{"SizeofBpfHdr", Const, 0, ""},
-		{"SizeofBpfInsn", Const, 0, ""},
-		{"SizeofBpfProgram", Const, 0, ""},
-		{"SizeofBpfStat", Const, 0, ""},
-		{"SizeofBpfVersion", Const, 0, ""},
-		{"SizeofBpfZbuf", Const, 0, ""},
-		{"SizeofBpfZbufHeader", Const, 0, ""},
-		{"SizeofCmsghdr", Const, 0, ""},
-		{"SizeofICMPv6Filter", Const, 2, ""},
-		{"SizeofIPMreq", Const, 0, ""},
-		{"SizeofIPMreqn", Const, 0, ""},
-		{"SizeofIPv6MTUInfo", Const, 2, ""},
-		{"SizeofIPv6Mreq", Const, 0, ""},
-		{"SizeofIfAddrmsg", Const, 0, ""},
-		{"SizeofIfAnnounceMsghdr", Const, 1, ""},
-		{"SizeofIfData", Const, 0, ""},
-		{"SizeofIfInfomsg", Const, 0, ""},
-		{"SizeofIfMsghdr", Const, 0, ""},
-		{"SizeofIfaMsghdr", Const, 0, ""},
-		{"SizeofIfmaMsghdr", Const, 0, ""},
-		{"SizeofIfmaMsghdr2", Const, 0, ""},
-		{"SizeofInet4Pktinfo", Const, 0, ""},
-		{"SizeofInet6Pktinfo", Const, 0, ""},
-		{"SizeofInotifyEvent", Const, 0, ""},
-		{"SizeofLinger", Const, 0, ""},
-		{"SizeofMsghdr", Const, 0, ""},
-		{"SizeofNlAttr", Const, 0, ""},
-		{"SizeofNlMsgerr", Const, 0, ""},
-		{"SizeofNlMsghdr", Const, 0, ""},
-		{"SizeofRtAttr", Const, 0, ""},
-		{"SizeofRtGenmsg", Const, 0, ""},
-		{"SizeofRtMetrics", Const, 0, ""},
-		{"SizeofRtMsg", Const, 0, ""},
-		{"SizeofRtMsghdr", Const, 0, ""},
-		{"SizeofRtNexthop", Const, 0, ""},
-		{"SizeofSockFilter", Const, 0, ""},
-		{"SizeofSockFprog", Const, 0, ""},
-		{"SizeofSockaddrAny", Const, 0, ""},
-		{"SizeofSockaddrDatalink", Const, 0, ""},
-		{"SizeofSockaddrInet4", Const, 0, ""},
-		{"SizeofSockaddrInet6", Const, 0, ""},
-		{"SizeofSockaddrLinklayer", Const, 0, ""},
-		{"SizeofSockaddrNetlink", Const, 0, ""},
-		{"SizeofSockaddrUnix", Const, 0, ""},
-		{"SizeofTCPInfo", Const, 1, ""},
-		{"SizeofUcred", Const, 0, ""},
-		{"SlicePtrFromStrings", Func, 1, "func(ss []string) ([]*byte, error)"},
-		{"SockFilter", Type, 0, ""},
-		{"SockFilter.Code", Field, 0, ""},
-		{"SockFilter.Jf", Field, 0, ""},
-		{"SockFilter.Jt", Field, 0, ""},
-		{"SockFilter.K", Field, 0, ""},
-		{"SockFprog", Type, 0, ""},
-		{"SockFprog.Filter", Field, 0, ""},
-		{"SockFprog.Len", Field, 0, ""},
-		{"SockFprog.Pad_cgo_0", Field, 0, ""},
-		{"Sockaddr", Type, 0, ""},
-		{"SockaddrDatalink", Type, 0, ""},
-		{"SockaddrDatalink.Alen", Field, 0, ""},
-		{"SockaddrDatalink.Data", Field, 0, ""},
-		{"SockaddrDatalink.Family", Field, 0, ""},
-		{"SockaddrDatalink.Index", Field, 0, ""},
-		{"SockaddrDatalink.Len", Field, 0, ""},
-		{"SockaddrDatalink.Nlen", Field, 0, ""},
-		{"SockaddrDatalink.Slen", Field, 0, ""},
-		{"SockaddrDatalink.Type", Field, 0, ""},
-		{"SockaddrGen", Type, 0, ""},
-		{"SockaddrInet4", Type, 0, ""},
-		{"SockaddrInet4.Addr", Field, 0, ""},
-		{"SockaddrInet4.Port", Field, 0, ""},
-		{"SockaddrInet6", Type, 0, ""},
-		{"SockaddrInet6.Addr", Field, 0, ""},
-		{"SockaddrInet6.Port", Field, 0, ""},
-		{"SockaddrInet6.ZoneId", Field, 0, ""},
-		{"SockaddrLinklayer", Type, 0, ""},
-		{"SockaddrLinklayer.Addr", Field, 0, ""},
-		{"SockaddrLinklayer.Halen", Field, 0, ""},
-		{"SockaddrLinklayer.Hatype", Field, 0, ""},
-		{"SockaddrLinklayer.Ifindex", Field, 0, ""},
-		{"SockaddrLinklayer.Pkttype", Field, 0, ""},
-		{"SockaddrLinklayer.Protocol", Field, 0, ""},
-		{"SockaddrNetlink", Type, 0, ""},
-		{"SockaddrNetlink.Family", Field, 0, ""},
-		{"SockaddrNetlink.Groups", Field, 0, ""},
-		{"SockaddrNetlink.Pad", Field, 0, ""},
-		{"SockaddrNetlink.Pid", Field, 0, ""},
-		{"SockaddrUnix", Type, 0, ""},
-		{"SockaddrUnix.Name", Field, 0, ""},
-		{"Socket", Func, 0, "func(domain int, typ int, proto int) (fd int, err error)"},
-		{"SocketControlMessage", Type, 0, ""},
-		{"SocketControlMessage.Data", Field, 0, ""},
-		{"SocketControlMessage.Header", Field, 0, ""},
-		{"SocketDisableIPv6", Var, 0, ""},
-		{"Socketpair", Func, 0, "func(domain int, typ int, proto int) (fd [2]int, err error)"},
-		{"Splice", Func, 0, "func(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)"},
-		{"StartProcess", Func, 0, "func(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error)"},
-		{"StartupInfo", Type, 0, ""},
-		{"StartupInfo.Cb", Field, 0, ""},
-		{"StartupInfo.Desktop", Field, 0, ""},
-		{"StartupInfo.FillAttribute", Field, 0, ""},
-		{"StartupInfo.Flags", Field, 0, ""},
-		{"StartupInfo.ShowWindow", Field, 0, ""},
-		{"StartupInfo.StdErr", Field, 0, ""},
-		{"StartupInfo.StdInput", Field, 0, ""},
-		{"StartupInfo.StdOutput", Field, 0, ""},
-		{"StartupInfo.Title", Field, 0, ""},
-		{"StartupInfo.X", Field, 0, ""},
-		{"StartupInfo.XCountChars", Field, 0, ""},
-		{"StartupInfo.XSize", Field, 0, ""},
-		{"StartupInfo.Y", Field, 0, ""},
-		{"StartupInfo.YCountChars", Field, 0, ""},
-		{"StartupInfo.YSize", Field, 0, ""},
-		{"Stat", Func, 0, "func(path string, stat *Stat_t) (err error)"},
-		{"Stat_t", Type, 0, ""},
-		{"Stat_t.Atim", Field, 0, ""},
-		{"Stat_t.Atim_ext", Field, 12, ""},
-		{"Stat_t.Atimespec", Field, 0, ""},
-		{"Stat_t.Birthtimespec", Field, 0, ""},
-		{"Stat_t.Blksize", Field, 0, ""},
-		{"Stat_t.Blocks", Field, 0, ""},
-		{"Stat_t.Btim_ext", Field, 12, ""},
-		{"Stat_t.Ctim", Field, 0, ""},
-		{"Stat_t.Ctim_ext", Field, 12, ""},
-		{"Stat_t.Ctimespec", Field, 0, ""},
-		{"Stat_t.Dev", Field, 0, ""},
-		{"Stat_t.Flags", Field, 0, ""},
-		{"Stat_t.Gen", Field, 0, ""},
-		{"Stat_t.Gid", Field, 0, ""},
-		{"Stat_t.Ino", Field, 0, ""},
-		{"Stat_t.Lspare", Field, 0, ""},
-		{"Stat_t.Lspare0", Field, 2, ""},
-		{"Stat_t.Lspare1", Field, 2, ""},
-		{"Stat_t.Mode", Field, 0, ""},
-		{"Stat_t.Mtim", Field, 0, ""},
-		{"Stat_t.Mtim_ext", Field, 12, ""},
-		{"Stat_t.Mtimespec", Field, 0, ""},
-		{"Stat_t.Nlink", Field, 0, ""},
-		{"Stat_t.Pad_cgo_0", Field, 0, ""},
-		{"Stat_t.Pad_cgo_1", Field, 0, ""},
-		{"Stat_t.Pad_cgo_2", Field, 0, ""},
-		{"Stat_t.Padding0", Field, 12, ""},
-		{"Stat_t.Padding1", Field, 12, ""},
-		{"Stat_t.Qspare", Field, 0, ""},
-		{"Stat_t.Rdev", Field, 0, ""},
-		{"Stat_t.Size", Field, 0, ""},
-		{"Stat_t.Spare", Field, 2, ""},
-		{"Stat_t.Uid", Field, 0, ""},
-		{"Stat_t.X__pad0", Field, 0, ""},
-		{"Stat_t.X__pad1", Field, 0, ""},
-		{"Stat_t.X__pad2", Field, 0, ""},
-		{"Stat_t.X__st_birthtim", Field, 2, ""},
-		{"Stat_t.X__st_ino", Field, 0, ""},
-		{"Stat_t.X__unused", Field, 0, ""},
-		{"Statfs", Func, 0, "func(path string, buf *Statfs_t) (err error)"},
-		{"Statfs_t", Type, 0, ""},
-		{"Statfs_t.Asyncreads", Field, 0, ""},
-		{"Statfs_t.Asyncwrites", Field, 0, ""},
-		{"Statfs_t.Bavail", Field, 0, ""},
-		{"Statfs_t.Bfree", Field, 0, ""},
-		{"Statfs_t.Blocks", Field, 0, ""},
-		{"Statfs_t.Bsize", Field, 0, ""},
-		{"Statfs_t.Charspare", Field, 0, ""},
-		{"Statfs_t.F_asyncreads", Field, 2, ""},
-		{"Statfs_t.F_asyncwrites", Field, 2, ""},
-		{"Statfs_t.F_bavail", Field, 2, ""},
-		{"Statfs_t.F_bfree", Field, 2, ""},
-		{"Statfs_t.F_blocks", Field, 2, ""},
-		{"Statfs_t.F_bsize", Field, 2, ""},
-		{"Statfs_t.F_ctime", Field, 2, ""},
-		{"Statfs_t.F_favail", Field, 2, ""},
-		{"Statfs_t.F_ffree", Field, 2, ""},
-		{"Statfs_t.F_files", Field, 2, ""},
-		{"Statfs_t.F_flags", Field, 2, ""},
-		{"Statfs_t.F_fsid", Field, 2, ""},
-		{"Statfs_t.F_fstypename", Field, 2, ""},
-		{"Statfs_t.F_iosize", Field, 2, ""},
-		{"Statfs_t.F_mntfromname", Field, 2, ""},
-		{"Statfs_t.F_mntfromspec", Field, 3, ""},
-		{"Statfs_t.F_mntonname", Field, 2, ""},
-		{"Statfs_t.F_namemax", Field, 2, ""},
-		{"Statfs_t.F_owner", Field, 2, ""},
-		{"Statfs_t.F_spare", Field, 2, ""},
-		{"Statfs_t.F_syncreads", Field, 2, ""},
-		{"Statfs_t.F_syncwrites", Field, 2, ""},
-		{"Statfs_t.Ffree", Field, 0, ""},
-		{"Statfs_t.Files", Field, 0, ""},
-		{"Statfs_t.Flags", Field, 0, ""},
-		{"Statfs_t.Frsize", Field, 0, ""},
-		{"Statfs_t.Fsid", Field, 0, ""},
-		{"Statfs_t.Fssubtype", Field, 0, ""},
-		{"Statfs_t.Fstypename", Field, 0, ""},
-		{"Statfs_t.Iosize", Field, 0, ""},
-		{"Statfs_t.Mntfromname", Field, 0, ""},
-		{"Statfs_t.Mntonname", Field, 0, ""},
-		{"Statfs_t.Mount_info", Field, 2, ""},
-		{"Statfs_t.Namelen", Field, 0, ""},
-		{"Statfs_t.Namemax", Field, 0, ""},
-		{"Statfs_t.Owner", Field, 0, ""},
-		{"Statfs_t.Pad_cgo_0", Field, 0, ""},
-		{"Statfs_t.Pad_cgo_1", Field, 2, ""},
-		{"Statfs_t.Reserved", Field, 0, ""},
-		{"Statfs_t.Spare", Field, 0, ""},
-		{"Statfs_t.Syncreads", Field, 0, ""},
-		{"Statfs_t.Syncwrites", Field, 0, ""},
-		{"Statfs_t.Type", Field, 0, ""},
-		{"Statfs_t.Version", Field, 0, ""},
-		{"Stderr", Var, 0, ""},
-		{"Stdin", Var, 0, ""},
-		{"Stdout", Var, 0, ""},
-		{"StringBytePtr", Func, 0, "func(s string) *byte"},
-		{"StringByteSlice", Func, 0, "func(s string) []byte"},
-		{"StringSlicePtr", Func, 0, "func(ss []string) []*byte"},
-		{"StringToSid", Func, 0, ""},
-		{"StringToUTF16", Func, 0, ""},
-		{"StringToUTF16Ptr", Func, 0, ""},
-		{"Symlink", Func, 0, "func(oldpath string, newpath string) (err error)"},
-		{"Sync", Func, 0, "func()"},
-		{"SyncFileRange", Func, 0, "func(fd int, off int64, n int64, flags int) (err error)"},
-		{"SysProcAttr", Type, 0, ""},
-		{"SysProcAttr.AdditionalInheritedHandles", Field, 17, ""},
-		{"SysProcAttr.AmbientCaps", Field, 9, ""},
-		{"SysProcAttr.CgroupFD", Field, 20, ""},
-		{"SysProcAttr.Chroot", Field, 0, ""},
-		{"SysProcAttr.Cloneflags", Field, 2, ""},
-		{"SysProcAttr.CmdLine", Field, 0, ""},
-		{"SysProcAttr.CreationFlags", Field, 1, ""},
-		{"SysProcAttr.Credential", Field, 0, ""},
-		{"SysProcAttr.Ctty", Field, 1, ""},
-		{"SysProcAttr.Foreground", Field, 5, ""},
-		{"SysProcAttr.GidMappings", Field, 4, ""},
-		{"SysProcAttr.GidMappingsEnableSetgroups", Field, 5, ""},
-		{"SysProcAttr.HideWindow", Field, 0, ""},
-		{"SysProcAttr.Jail", Field, 21, ""},
-		{"SysProcAttr.NoInheritHandles", Field, 16, ""},
-		{"SysProcAttr.Noctty", Field, 0, ""},
-		{"SysProcAttr.ParentProcess", Field, 17, ""},
-		{"SysProcAttr.Pdeathsig", Field, 0, ""},
-		{"SysProcAttr.Pgid", Field, 5, ""},
-		{"SysProcAttr.PidFD", Field, 22, ""},
-		{"SysProcAttr.ProcessAttributes", Field, 13, ""},
-		{"SysProcAttr.Ptrace", Field, 0, ""},
-		{"SysProcAttr.Setctty", Field, 0, ""},
-		{"SysProcAttr.Setpgid", Field, 0, ""},
-		{"SysProcAttr.Setsid", Field, 0, ""},
-		{"SysProcAttr.ThreadAttributes", Field, 13, ""},
-		{"SysProcAttr.Token", Field, 10, ""},
-		{"SysProcAttr.UidMappings", Field, 4, ""},
-		{"SysProcAttr.Unshareflags", Field, 7, ""},
-		{"SysProcAttr.UseCgroupFD", Field, 20, ""},
-		{"SysProcIDMap", Type, 4, ""},
-		{"SysProcIDMap.ContainerID", Field, 4, ""},
-		{"SysProcIDMap.HostID", Field, 4, ""},
-		{"SysProcIDMap.Size", Field, 4, ""},
-		{"Syscall", Func, 0, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"Syscall12", Func, 0, ""},
-		{"Syscall15", Func, 0, ""},
-		{"Syscall18", Func, 12, ""},
-		{"Syscall6", Func, 0, "func(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr, a4 uintptr, a5 uintptr, a6 uintptr) (r1 uintptr, r2 uintptr, err Errno)"},
-		{"Syscall9", Func, 0, ""},
-		{"SyscallN", Func, 18, ""},
-		{"Sysctl", Func, 0, ""},
-		{"SysctlUint32", Func, 0, ""},
-		{"Sysctlnode", Type, 2, ""},
-		{"Sysctlnode.Flags", Field, 2, ""},
-		{"Sysctlnode.Name", Field, 2, ""},
-		{"Sysctlnode.Num", Field, 2, ""},
-		{"Sysctlnode.Un", Field, 2, ""},
-		{"Sysctlnode.Ver", Field, 2, ""},
-		{"Sysctlnode.X__rsvd", Field, 2, ""},
-		{"Sysctlnode.X_sysctl_desc", Field, 2, ""},
-		{"Sysctlnode.X_sysctl_func", Field, 2, ""},
-		{"Sysctlnode.X_sysctl_parent", Field, 2, ""},
-		{"Sysctlnode.X_sysctl_size", Field, 2, ""},
-		{"Sysinfo", Func, 0, "func(info *Sysinfo_t) (err error)"},
-		{"Sysinfo_t", Type, 0, ""},
-		{"Sysinfo_t.Bufferram", Field, 0, ""},
-		{"Sysinfo_t.Freehigh", Field, 0, ""},
-		{"Sysinfo_t.Freeram", Field, 0, ""},
-		{"Sysinfo_t.Freeswap", Field, 0, ""},
-		{"Sysinfo_t.Loads", Field, 0, ""},
-		{"Sysinfo_t.Pad", Field, 0, ""},
-		{"Sysinfo_t.Pad_cgo_0", Field, 0, ""},
-		{"Sysinfo_t.Pad_cgo_1", Field, 0, ""},
-		{"Sysinfo_t.Procs", Field, 0, ""},
-		{"Sysinfo_t.Sharedram", Field, 0, ""},
-		{"Sysinfo_t.Totalhigh", Field, 0, ""},
-		{"Sysinfo_t.Totalram", Field, 0, ""},
-		{"Sysinfo_t.Totalswap", Field, 0, ""},
-		{"Sysinfo_t.Unit", Field, 0, ""},
-		{"Sysinfo_t.Uptime", Field, 0, ""},
-		{"Sysinfo_t.X_f", Field, 0, ""},
-		{"Systemtime", Type, 0, ""},
-		{"Systemtime.Day", Field, 0, ""},
-		{"Systemtime.DayOfWeek", Field, 0, ""},
-		{"Systemtime.Hour", Field, 0, ""},
-		{"Systemtime.Milliseconds", Field, 0, ""},
-		{"Systemtime.Minute", Field, 0, ""},
-		{"Systemtime.Month", Field, 0, ""},
-		{"Systemtime.Second", Field, 0, ""},
-		{"Systemtime.Year", Field, 0, ""},
-		{"TCGETS", Const, 0, ""},
-		{"TCIFLUSH", Const, 1, ""},
-		{"TCIOFLUSH", Const, 1, ""},
-		{"TCOFLUSH", Const, 1, ""},
-		{"TCPInfo", Type, 1, ""},
-		{"TCPInfo.Advmss", Field, 1, ""},
-		{"TCPInfo.Ato", Field, 1, ""},
-		{"TCPInfo.Backoff", Field, 1, ""},
-		{"TCPInfo.Ca_state", Field, 1, ""},
-		{"TCPInfo.Fackets", Field, 1, ""},
-		{"TCPInfo.Last_ack_recv", Field, 1, ""},
-		{"TCPInfo.Last_ack_sent", Field, 1, ""},
-		{"TCPInfo.Last_data_recv", Field, 1, ""},
-		{"TCPInfo.Last_data_sent", Field, 1, ""},
-		{"TCPInfo.Lost", Field, 1, ""},
-		{"TCPInfo.Options", Field, 1, ""},
-		{"TCPInfo.Pad_cgo_0", Field, 1, ""},
-		{"TCPInfo.Pmtu", Field, 1, ""},
-		{"TCPInfo.Probes", Field, 1, ""},
-		{"TCPInfo.Rcv_mss", Field, 1, ""},
-		{"TCPInfo.Rcv_rtt", Field, 1, ""},
-		{"TCPInfo.Rcv_space", Field, 1, ""},
-		{"TCPInfo.Rcv_ssthresh", Field, 1, ""},
-		{"TCPInfo.Reordering", Field, 1, ""},
-		{"TCPInfo.Retrans", Field, 1, ""},
-		{"TCPInfo.Retransmits", Field, 1, ""},
-		{"TCPInfo.Rto", Field, 1, ""},
-		{"TCPInfo.Rtt", Field, 1, ""},
-		{"TCPInfo.Rttvar", Field, 1, ""},
-		{"TCPInfo.Sacked", Field, 1, ""},
-		{"TCPInfo.Snd_cwnd", Field, 1, ""},
-		{"TCPInfo.Snd_mss", Field, 1, ""},
-		{"TCPInfo.Snd_ssthresh", Field, 1, ""},
-		{"TCPInfo.State", Field, 1, ""},
-		{"TCPInfo.Total_retrans", Field, 1, ""},
-		{"TCPInfo.Unacked", Field, 1, ""},
-		{"TCPKeepalive", Type, 3, ""},
-		{"TCPKeepalive.Interval", Field, 3, ""},
-		{"TCPKeepalive.OnOff", Field, 3, ""},
-		{"TCPKeepalive.Time", Field, 3, ""},
-		{"TCP_CA_NAME_MAX", Const, 0, ""},
-		{"TCP_CONGCTL", Const, 1, ""},
-		{"TCP_CONGESTION", Const, 0, ""},
-		{"TCP_CONNECTIONTIMEOUT", Const, 0, ""},
-		{"TCP_CORK", Const, 0, ""},
-		{"TCP_DEFER_ACCEPT", Const, 0, ""},
-		{"TCP_ENABLE_ECN", Const, 16, ""},
-		{"TCP_INFO", Const, 0, ""},
-		{"TCP_KEEPALIVE", Const, 0, ""},
-		{"TCP_KEEPCNT", Const, 0, ""},
-		{"TCP_KEEPIDLE", Const, 0, ""},
-		{"TCP_KEEPINIT", Const, 1, ""},
-		{"TCP_KEEPINTVL", Const, 0, ""},
-		{"TCP_LINGER2", Const, 0, ""},
-		{"TCP_MAXBURST", Const, 0, ""},
-		{"TCP_MAXHLEN", Const, 0, ""},
-		{"TCP_MAXOLEN", Const, 0, ""},
-		{"TCP_MAXSEG", Const, 0, ""},
-		{"TCP_MAXWIN", Const, 0, ""},
-		{"TCP_MAX_SACK", Const, 0, ""},
-		{"TCP_MAX_WINSHIFT", Const, 0, ""},
-		{"TCP_MD5SIG", Const, 0, ""},
-		{"TCP_MD5SIG_MAXKEYLEN", Const, 0, ""},
-		{"TCP_MINMSS", Const, 0, ""},
-		{"TCP_MINMSSOVERLOAD", Const, 0, ""},
-		{"TCP_MSS", Const, 0, ""},
-		{"TCP_NODELAY", Const, 0, ""},
-		{"TCP_NOOPT", Const, 0, ""},
-		{"TCP_NOPUSH", Const, 0, ""},
-		{"TCP_NOTSENT_LOWAT", Const, 16, ""},
-		{"TCP_NSTATES", Const, 1, ""},
-		{"TCP_QUICKACK", Const, 0, ""},
-		{"TCP_RXT_CONNDROPTIME", Const, 0, ""},
-		{"TCP_RXT_FINDROP", Const, 0, ""},
-		{"TCP_SACK_ENABLE", Const, 1, ""},
-		{"TCP_SENDMOREACKS", Const, 16, ""},
-		{"TCP_SYNCNT", Const, 0, ""},
-		{"TCP_VENDOR", Const, 3, ""},
-		{"TCP_WINDOW_CLAMP", Const, 0, ""},
-		{"TCSAFLUSH", Const, 1, ""},
-		{"TCSETS", Const, 0, ""},
-		{"TF_DISCONNECT", Const, 0, ""},
-		{"TF_REUSE_SOCKET", Const, 0, ""},
-		{"TF_USE_DEFAULT_WORKER", Const, 0, ""},
-		{"TF_USE_KERNEL_APC", Const, 0, ""},
-		{"TF_USE_SYSTEM_THREAD", Const, 0, ""},
-		{"TF_WRITE_BEHIND", Const, 0, ""},
-		{"TH32CS_INHERIT", Const, 4, ""},
-		{"TH32CS_SNAPALL", Const, 4, ""},
-		{"TH32CS_SNAPHEAPLIST", Const, 4, ""},
-		{"TH32CS_SNAPMODULE", Const, 4, ""},
-		{"TH32CS_SNAPMODULE32", Const, 4, ""},
-		{"TH32CS_SNAPPROCESS", Const, 4, ""},
-		{"TH32CS_SNAPTHREAD", Const, 4, ""},
-		{"TIME_ZONE_ID_DAYLIGHT", Const, 0, ""},
-		{"TIME_ZONE_ID_STANDARD", Const, 0, ""},
-		{"TIME_ZONE_ID_UNKNOWN", Const, 0, ""},
-		{"TIOCCBRK", Const, 0, ""},
-		{"TIOCCDTR", Const, 0, ""},
-		{"TIOCCONS", Const, 0, ""},
-		{"TIOCDCDTIMESTAMP", Const, 0, ""},
-		{"TIOCDRAIN", Const, 0, ""},
-		{"TIOCDSIMICROCODE", Const, 0, ""},
-		{"TIOCEXCL", Const, 0, ""},
-		{"TIOCEXT", Const, 0, ""},
-		{"TIOCFLAG_CDTRCTS", Const, 1, ""},
-		{"TIOCFLAG_CLOCAL", Const, 1, ""},
-		{"TIOCFLAG_CRTSCTS", Const, 1, ""},
-		{"TIOCFLAG_MDMBUF", Const, 1, ""},
-		{"TIOCFLAG_PPS", Const, 1, ""},
-		{"TIOCFLAG_SOFTCAR", Const, 1, ""},
-		{"TIOCFLUSH", Const, 0, ""},
-		{"TIOCGDEV", Const, 0, ""},
-		{"TIOCGDRAINWAIT", Const, 0, ""},
-		{"TIOCGETA", Const, 0, ""},
-		{"TIOCGETD", Const, 0, ""},
-		{"TIOCGFLAGS", Const, 1, ""},
-		{"TIOCGICOUNT", Const, 0, ""},
-		{"TIOCGLCKTRMIOS", Const, 0, ""},
-		{"TIOCGLINED", Const, 1, ""},
-		{"TIOCGPGRP", Const, 0, ""},
-		{"TIOCGPTN", Const, 0, ""},
-		{"TIOCGQSIZE", Const, 1, ""},
-		{"TIOCGRANTPT", Const, 1, ""},
-		{"TIOCGRS485", Const, 0, ""},
-		{"TIOCGSERIAL", Const, 0, ""},
-		{"TIOCGSID", Const, 0, ""},
-		{"TIOCGSIZE", Const, 1, ""},
-		{"TIOCGSOFTCAR", Const, 0, ""},
-		{"TIOCGTSTAMP", Const, 1, ""},
-		{"TIOCGWINSZ", Const, 0, ""},
-		{"TIOCINQ", Const, 0, ""},
-		{"TIOCIXOFF", Const, 0, ""},
-		{"TIOCIXON", Const, 0, ""},
-		{"TIOCLINUX", Const, 0, ""},
-		{"TIOCMBIC", Const, 0, ""},
-		{"TIOCMBIS", Const, 0, ""},
-		{"TIOCMGDTRWAIT", Const, 0, ""},
-		{"TIOCMGET", Const, 0, ""},
-		{"TIOCMIWAIT", Const, 0, ""},
-		{"TIOCMODG", Const, 0, ""},
-		{"TIOCMODS", Const, 0, ""},
-		{"TIOCMSDTRWAIT", Const, 0, ""},
-		{"TIOCMSET", Const, 0, ""},
-		{"TIOCM_CAR", Const, 0, ""},
-		{"TIOCM_CD", Const, 0, ""},
-		{"TIOCM_CTS", Const, 0, ""},
-		{"TIOCM_DCD", Const, 0, ""},
-		{"TIOCM_DSR", Const, 0, ""},
-		{"TIOCM_DTR", Const, 0, ""},
-		{"TIOCM_LE", Const, 0, ""},
-		{"TIOCM_RI", Const, 0, ""},
-		{"TIOCM_RNG", Const, 0, ""},
-		{"TIOCM_RTS", Const, 0, ""},
-		{"TIOCM_SR", Const, 0, ""},
-		{"TIOCM_ST", Const, 0, ""},
-		{"TIOCNOTTY", Const, 0, ""},
-		{"TIOCNXCL", Const, 0, ""},
-		{"TIOCOUTQ", Const, 0, ""},
-		{"TIOCPKT", Const, 0, ""},
-		{"TIOCPKT_DATA", Const, 0, ""},
-		{"TIOCPKT_DOSTOP", Const, 0, ""},
-		{"TIOCPKT_FLUSHREAD", Const, 0, ""},
-		{"TIOCPKT_FLUSHWRITE", Const, 0, ""},
-		{"TIOCPKT_IOCTL", Const, 0, ""},
-		{"TIOCPKT_NOSTOP", Const, 0, ""},
-		{"TIOCPKT_START", Const, 0, ""},
-		{"TIOCPKT_STOP", Const, 0, ""},
-		{"TIOCPTMASTER", Const, 0, ""},
-		{"TIOCPTMGET", Const, 1, ""},
-		{"TIOCPTSNAME", Const, 1, ""},
-		{"TIOCPTYGNAME", Const, 0, ""},
-		{"TIOCPTYGRANT", Const, 0, ""},
-		{"TIOCPTYUNLK", Const, 0, ""},
-		{"TIOCRCVFRAME", Const, 1, ""},
-		{"TIOCREMOTE", Const, 0, ""},
-		{"TIOCSBRK", Const, 0, ""},
-		{"TIOCSCONS", Const, 0, ""},
-		{"TIOCSCTTY", Const, 0, ""},
-		{"TIOCSDRAINWAIT", Const, 0, ""},
-		{"TIOCSDTR", Const, 0, ""},
-		{"TIOCSERCONFIG", Const, 0, ""},
-		{"TIOCSERGETLSR", Const, 0, ""},
-		{"TIOCSERGETMULTI", Const, 0, ""},
-		{"TIOCSERGSTRUCT", Const, 0, ""},
-		{"TIOCSERGWILD", Const, 0, ""},
-		{"TIOCSERSETMULTI", Const, 0, ""},
-		{"TIOCSERSWILD", Const, 0, ""},
-		{"TIOCSER_TEMT", Const, 0, ""},
-		{"TIOCSETA", Const, 0, ""},
-		{"TIOCSETAF", Const, 0, ""},
-		{"TIOCSETAW", Const, 0, ""},
-		{"TIOCSETD", Const, 0, ""},
-		{"TIOCSFLAGS", Const, 1, ""},
-		{"TIOCSIG", Const, 0, ""},
-		{"TIOCSLCKTRMIOS", Const, 0, ""},
-		{"TIOCSLINED", Const, 1, ""},
-		{"TIOCSPGRP", Const, 0, ""},
-		{"TIOCSPTLCK", Const, 0, ""},
-		{"TIOCSQSIZE", Const, 1, ""},
-		{"TIOCSRS485", Const, 0, ""},
-		{"TIOCSSERIAL", Const, 0, ""},
-		{"TIOCSSIZE", Const, 1, ""},
-		{"TIOCSSOFTCAR", Const, 0, ""},
-		{"TIOCSTART", Const, 0, ""},
-		{"TIOCSTAT", Const, 0, ""},
-		{"TIOCSTI", Const, 0, ""},
-		{"TIOCSTOP", Const, 0, ""},
-		{"TIOCSTSTAMP", Const, 1, ""},
-		{"TIOCSWINSZ", Const, 0, ""},
-		{"TIOCTIMESTAMP", Const, 0, ""},
-		{"TIOCUCNTL", Const, 0, ""},
-		{"TIOCVHANGUP", Const, 0, ""},
-		{"TIOCXMTFRAME", Const, 1, ""},
-		{"TOKEN_ADJUST_DEFAULT", Const, 0, ""},
-		{"TOKEN_ADJUST_GROUPS", Const, 0, ""},
-		{"TOKEN_ADJUST_PRIVILEGES", Const, 0, ""},
-		{"TOKEN_ADJUST_SESSIONID", Const, 11, ""},
-		{"TOKEN_ALL_ACCESS", Const, 0, ""},
-		{"TOKEN_ASSIGN_PRIMARY", Const, 0, ""},
-		{"TOKEN_DUPLICATE", Const, 0, ""},
-		{"TOKEN_EXECUTE", Const, 0, ""},
-		{"TOKEN_IMPERSONATE", Const, 0, ""},
-		{"TOKEN_QUERY", Const, 0, ""},
-		{"TOKEN_QUERY_SOURCE", Const, 0, ""},
-		{"TOKEN_READ", Const, 0, ""},
-		{"TOKEN_WRITE", Const, 0, ""},
-		{"TOSTOP", Const, 0, ""},
-		{"TRUNCATE_EXISTING", Const, 0, ""},
-		{"TUNATTACHFILTER", Const, 0, ""},
-		{"TUNDETACHFILTER", Const, 0, ""},
-		{"TUNGETFEATURES", Const, 0, ""},
-		{"TUNGETIFF", Const, 0, ""},
-		{"TUNGETSNDBUF", Const, 0, ""},
-		{"TUNGETVNETHDRSZ", Const, 0, ""},
-		{"TUNSETDEBUG", Const, 0, ""},
-		{"TUNSETGROUP", Const, 0, ""},
-		{"TUNSETIFF", Const, 0, ""},
-		{"TUNSETLINK", Const, 0, ""},
-		{"TUNSETNOCSUM", Const, 0, ""},
-		{"TUNSETOFFLOAD", Const, 0, ""},
-		{"TUNSETOWNER", Const, 0, ""},
-		{"TUNSETPERSIST", Const, 0, ""},
-		{"TUNSETSNDBUF", Const, 0, ""},
-		{"TUNSETTXFILTER", Const, 0, ""},
-		{"TUNSETVNETHDRSZ", Const, 0, ""},
-		{"Tee", Func, 0, "func(rfd int, wfd int, len int, flags int) (n int64, err error)"},
-		{"TerminateProcess", Func, 0, ""},
-		{"Termios", Type, 0, ""},
-		{"Termios.Cc", Field, 0, ""},
-		{"Termios.Cflag", Field, 0, ""},
-		{"Termios.Iflag", Field, 0, ""},
-		{"Termios.Ispeed", Field, 0, ""},
-		{"Termios.Lflag", Field, 0, ""},
-		{"Termios.Line", Field, 0, ""},
-		{"Termios.Oflag", Field, 0, ""},
-		{"Termios.Ospeed", Field, 0, ""},
-		{"Termios.Pad_cgo_0", Field, 0, ""},
-		{"Tgkill", Func, 0, "func(tgid int, tid int, sig Signal) (err error)"},
-		{"Time", Func, 0, "func(t *Time_t) (tt Time_t, err error)"},
-		{"Time_t", Type, 0, ""},
-		{"Times", Func, 0, "func(tms *Tms) (ticks uintptr, err error)"},
-		{"Timespec", Type, 0, ""},
-		{"Timespec.Nsec", Field, 0, ""},
-		{"Timespec.Pad_cgo_0", Field, 2, ""},
-		{"Timespec.Sec", Field, 0, ""},
-		{"TimespecToNsec", Func, 0, "func(ts Timespec) int64"},
-		{"Timeval", Type, 0, ""},
-		{"Timeval.Pad_cgo_0", Field, 0, ""},
-		{"Timeval.Sec", Field, 0, ""},
-		{"Timeval.Usec", Field, 0, ""},
-		{"Timeval32", Type, 0, ""},
-		{"Timeval32.Sec", Field, 0, ""},
-		{"Timeval32.Usec", Field, 0, ""},
-		{"TimevalToNsec", Func, 0, "func(tv Timeval) int64"},
-		{"Timex", Type, 0, ""},
-		{"Timex.Calcnt", Field, 0, ""},
-		{"Timex.Constant", Field, 0, ""},
-		{"Timex.Errcnt", Field, 0, ""},
-		{"Timex.Esterror", Field, 0, ""},
-		{"Timex.Freq", Field, 0, ""},
-		{"Timex.Jitcnt", Field, 0, ""},
-		{"Timex.Jitter", Field, 0, ""},
-		{"Timex.Maxerror", Field, 0, ""},
-		{"Timex.Modes", Field, 0, ""},
-		{"Timex.Offset", Field, 0, ""},
-		{"Timex.Pad_cgo_0", Field, 0, ""},
-		{"Timex.Pad_cgo_1", Field, 0, ""},
-		{"Timex.Pad_cgo_2", Field, 0, ""},
-		{"Timex.Pad_cgo_3", Field, 0, ""},
-		{"Timex.Ppsfreq", Field, 0, ""},
-		{"Timex.Precision", Field, 0, ""},
-		{"Timex.Shift", Field, 0, ""},
-		{"Timex.Stabil", Field, 0, ""},
-		{"Timex.Status", Field, 0, ""},
-		{"Timex.Stbcnt", Field, 0, ""},
-		{"Timex.Tai", Field, 0, ""},
-		{"Timex.Tick", Field, 0, ""},
-		{"Timex.Time", Field, 0, ""},
-		{"Timex.Tolerance", Field, 0, ""},
-		{"Timezoneinformation", Type, 0, ""},
-		{"Timezoneinformation.Bias", Field, 0, ""},
-		{"Timezoneinformation.DaylightBias", Field, 0, ""},
-		{"Timezoneinformation.DaylightDate", Field, 0, ""},
-		{"Timezoneinformation.DaylightName", Field, 0, ""},
-		{"Timezoneinformation.StandardBias", Field, 0, ""},
-		{"Timezoneinformation.StandardDate", Field, 0, ""},
-		{"Timezoneinformation.StandardName", Field, 0, ""},
-		{"Tms", Type, 0, ""},
-		{"Tms.Cstime", Field, 0, ""},
-		{"Tms.Cutime", Field, 0, ""},
-		{"Tms.Stime", Field, 0, ""},
-		{"Tms.Utime", Field, 0, ""},
-		{"Token", Type, 0, ""},
-		{"TokenAccessInformation", Const, 0, ""},
-		{"TokenAuditPolicy", Const, 0, ""},
-		{"TokenDefaultDacl", Const, 0, ""},
-		{"TokenElevation", Const, 0, ""},
-		{"TokenElevationType", Const, 0, ""},
-		{"TokenGroups", Const, 0, ""},
-		{"TokenGroupsAndPrivileges", Const, 0, ""},
-		{"TokenHasRestrictions", Const, 0, ""},
-		{"TokenImpersonationLevel", Const, 0, ""},
-		{"TokenIntegrityLevel", Const, 0, ""},
-		{"TokenLinkedToken", Const, 0, ""},
-		{"TokenLogonSid", Const, 0, ""},
-		{"TokenMandatoryPolicy", Const, 0, ""},
-		{"TokenOrigin", Const, 0, ""},
-		{"TokenOwner", Const, 0, ""},
-		{"TokenPrimaryGroup", Const, 0, ""},
-		{"TokenPrivileges", Const, 0, ""},
-		{"TokenRestrictedSids", Const, 0, ""},
-		{"TokenSandBoxInert", Const, 0, ""},
-		{"TokenSessionId", Const, 0, ""},
-		{"TokenSessionReference", Const, 0, ""},
-		{"TokenSource", Const, 0, ""},
-		{"TokenStatistics", Const, 0, ""},
-		{"TokenType", Const, 0, ""},
-		{"TokenUIAccess", Const, 0, ""},
-		{"TokenUser", Const, 0, ""},
-		{"TokenVirtualizationAllowed", Const, 0, ""},
-		{"TokenVirtualizationEnabled", Const, 0, ""},
-		{"Tokenprimarygroup", Type, 0, ""},
-		{"Tokenprimarygroup.PrimaryGroup", Field, 0, ""},
-		{"Tokenuser", Type, 0, ""},
-		{"Tokenuser.User", Field, 0, ""},
-		{"TranslateAccountName", Func, 0, ""},
-		{"TranslateName", Func, 0, ""},
-		{"TransmitFile", Func, 0, ""},
-		{"TransmitFileBuffers", Type, 0, ""},
-		{"TransmitFileBuffers.Head", Field, 0, ""},
-		{"TransmitFileBuffers.HeadLength", Field, 0, ""},
-		{"TransmitFileBuffers.Tail", Field, 0, ""},
-		{"TransmitFileBuffers.TailLength", Field, 0, ""},
-		{"Truncate", Func, 0, "func(path string, length int64) (err error)"},
-		{"UNIX_PATH_MAX", Const, 12, ""},
-		{"USAGE_MATCH_TYPE_AND", Const, 0, ""},
-		{"USAGE_MATCH_TYPE_OR", Const, 0, ""},
-		{"UTF16FromString", Func, 1, ""},
-		{"UTF16PtrFromString", Func, 1, ""},
-		{"UTF16ToString", Func, 0, ""},
-		{"Ucred", Type, 0, ""},
-		{"Ucred.Gid", Field, 0, ""},
-		{"Ucred.Pid", Field, 0, ""},
-		{"Ucred.Uid", Field, 0, ""},
-		{"Umask", Func, 0, "func(mask int) (oldmask int)"},
-		{"Uname", Func, 0, "func(buf *Utsname) (err error)"},
-		{"Undelete", Func, 0, ""},
-		{"UnixCredentials", Func, 0, "func(ucred *Ucred) []byte"},
-		{"UnixRights", Func, 0, "func(fds ...int) []byte"},
-		{"Unlink", Func, 0, "func(path string) error"},
-		{"Unlinkat", Func, 0, "func(dirfd int, path string) error"},
-		{"UnmapViewOfFile", Func, 0, ""},
-		{"Unmount", Func, 0, "func(target string, flags int) (err error)"},
-		{"Unsetenv", Func, 4, "func(key string) error"},
-		{"Unshare", Func, 0, "func(flags int) (err error)"},
-		{"UserInfo10", Type, 0, ""},
-		{"UserInfo10.Comment", Field, 0, ""},
-		{"UserInfo10.FullName", Field, 0, ""},
-		{"UserInfo10.Name", Field, 0, ""},
-		{"UserInfo10.UsrComment", Field, 0, ""},
-		{"Ustat", Func, 0, "func(dev int, ubuf *Ustat_t) (err error)"},
-		{"Ustat_t", Type, 0, ""},
-		{"Ustat_t.Fname", Field, 0, ""},
-		{"Ustat_t.Fpack", Field, 0, ""},
-		{"Ustat_t.Pad_cgo_0", Field, 0, ""},
-		{"Ustat_t.Pad_cgo_1", Field, 0, ""},
-		{"Ustat_t.Tfree", Field, 0, ""},
-		{"Ustat_t.Tinode", Field, 0, ""},
-		{"Utimbuf", Type, 0, ""},
-		{"Utimbuf.Actime", Field, 0, ""},
-		{"Utimbuf.Modtime", Field, 0, ""},
-		{"Utime", Func, 0, "func(path string, buf *Utimbuf) (err error)"},
-		{"Utimes", Func, 0, "func(path string, tv []Timeval) (err error)"},
-		{"UtimesNano", Func, 1, "func(path string, ts []Timespec) (err error)"},
-		{"Utsname", Type, 0, ""},
-		{"Utsname.Domainname", Field, 0, ""},
-		{"Utsname.Machine", Field, 0, ""},
-		{"Utsname.Nodename", Field, 0, ""},
-		{"Utsname.Release", Field, 0, ""},
-		{"Utsname.Sysname", Field, 0, ""},
-		{"Utsname.Version", Field, 0, ""},
-		{"VDISCARD", Const, 0, ""},
-		{"VDSUSP", Const, 1, ""},
-		{"VEOF", Const, 0, ""},
-		{"VEOL", Const, 0, ""},
-		{"VEOL2", Const, 0, ""},
-		{"VERASE", Const, 0, ""},
-		{"VERASE2", Const, 1, ""},
-		{"VINTR", Const, 0, ""},
-		{"VKILL", Const, 0, ""},
-		{"VLNEXT", Const, 0, ""},
-		{"VMIN", Const, 0, ""},
-		{"VQUIT", Const, 0, ""},
-		{"VREPRINT", Const, 0, ""},
-		{"VSTART", Const, 0, ""},
-		{"VSTATUS", Const, 1, ""},
-		{"VSTOP", Const, 0, ""},
-		{"VSUSP", Const, 0, ""},
-		{"VSWTC", Const, 0, ""},
-		{"VT0", Const, 1, ""},
-		{"VT1", Const, 1, ""},
-		{"VTDLY", Const, 1, ""},
-		{"VTIME", Const, 0, ""},
-		{"VWERASE", Const, 0, ""},
-		{"VirtualLock", Func, 0, ""},
-		{"VirtualUnlock", Func, 0, ""},
-		{"WAIT_ABANDONED", Const, 0, ""},
-		{"WAIT_FAILED", Const, 0, ""},
-		{"WAIT_OBJECT_0", Const, 0, ""},
-		{"WAIT_TIMEOUT", Const, 0, ""},
-		{"WALL", Const, 0, ""},
-		{"WALLSIG", Const, 1, ""},
-		{"WALTSIG", Const, 1, ""},
-		{"WCLONE", Const, 0, ""},
-		{"WCONTINUED", Const, 0, ""},
-		{"WCOREFLAG", Const, 0, ""},
-		{"WEXITED", Const, 0, ""},
-		{"WLINUXCLONE", Const, 0, ""},
-		{"WNOHANG", Const, 0, ""},
-		{"WNOTHREAD", Const, 0, ""},
-		{"WNOWAIT", Const, 0, ""},
-		{"WNOZOMBIE", Const, 1, ""},
-		{"WOPTSCHECKED", Const, 1, ""},
-		{"WORDSIZE", Const, 0, ""},
-		{"WSABuf", Type, 0, ""},
-		{"WSABuf.Buf", Field, 0, ""},
-		{"WSABuf.Len", Field, 0, ""},
-		{"WSACleanup", Func, 0, ""},
-		{"WSADESCRIPTION_LEN", Const, 0, ""},
-		{"WSAData", Type, 0, ""},
-		{"WSAData.Description", Field, 0, ""},
-		{"WSAData.HighVersion", Field, 0, ""},
-		{"WSAData.MaxSockets", Field, 0, ""},
-		{"WSAData.MaxUdpDg", Field, 0, ""},
-		{"WSAData.SystemStatus", Field, 0, ""},
-		{"WSAData.VendorInfo", Field, 0, ""},
-		{"WSAData.Version", Field, 0, ""},
-		{"WSAEACCES", Const, 2, ""},
-		{"WSAECONNABORTED", Const, 9, ""},
-		{"WSAECONNRESET", Const, 3, ""},
-		{"WSAENOPROTOOPT", Const, 23, ""},
-		{"WSAEnumProtocols", Func, 2, ""},
-		{"WSAID_CONNECTEX", Var, 1, ""},
-		{"WSAIoctl", Func, 0, ""},
-		{"WSAPROTOCOL_LEN", Const, 2, ""},
-		{"WSAProtocolChain", Type, 2, ""},
-		{"WSAProtocolChain.ChainEntries", Field, 2, ""},
-		{"WSAProtocolChain.ChainLen", Field, 2, ""},
-		{"WSAProtocolInfo", Type, 2, ""},
-		{"WSAProtocolInfo.AddressFamily", Field, 2, ""},
-		{"WSAProtocolInfo.CatalogEntryId", Field, 2, ""},
-		{"WSAProtocolInfo.MaxSockAddr", Field, 2, ""},
-		{"WSAProtocolInfo.MessageSize", Field, 2, ""},
-		{"WSAProtocolInfo.MinSockAddr", Field, 2, ""},
-		{"WSAProtocolInfo.NetworkByteOrder", Field, 2, ""},
-		{"WSAProtocolInfo.Protocol", Field, 2, ""},
-		{"WSAProtocolInfo.ProtocolChain", Field, 2, ""},
-		{"WSAProtocolInfo.ProtocolMaxOffset", Field, 2, ""},
-		{"WSAProtocolInfo.ProtocolName", Field, 2, ""},
-		{"WSAProtocolInfo.ProviderFlags", Field, 2, ""},
-		{"WSAProtocolInfo.ProviderId", Field, 2, ""},
-		{"WSAProtocolInfo.ProviderReserved", Field, 2, ""},
-		{"WSAProtocolInfo.SecurityScheme", Field, 2, ""},
-		{"WSAProtocolInfo.ServiceFlags1", Field, 2, ""},
-		{"WSAProtocolInfo.ServiceFlags2", Field, 2, ""},
-		{"WSAProtocolInfo.ServiceFlags3", Field, 2, ""},
-		{"WSAProtocolInfo.ServiceFlags4", Field, 2, ""},
-		{"WSAProtocolInfo.SocketType", Field, 2, ""},
-		{"WSAProtocolInfo.Version", Field, 2, ""},
-		{"WSARecv", Func, 0, ""},
-		{"WSARecvFrom", Func, 0, ""},
-		{"WSASYS_STATUS_LEN", Const, 0, ""},
-		{"WSASend", Func, 0, ""},
-		{"WSASendTo", Func, 0, ""},
-		{"WSASendto", Func, 0, ""},
-		{"WSAStartup", Func, 0, ""},
-		{"WSTOPPED", Const, 0, ""},
-		{"WTRAPPED", Const, 1, ""},
-		{"WUNTRACED", Const, 0, ""},
-		{"Wait4", Func, 0, "func(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error)"},
-		{"WaitForSingleObject", Func, 0, ""},
-		{"WaitStatus", Type, 0, ""},
-		{"WaitStatus.ExitCode", Field, 0, ""},
-		{"Win32FileAttributeData", Type, 0, ""},
-		{"Win32FileAttributeData.CreationTime", Field, 0, ""},
-		{"Win32FileAttributeData.FileAttributes", Field, 0, ""},
-		{"Win32FileAttributeData.FileSizeHigh", Field, 0, ""},
-		{"Win32FileAttributeData.FileSizeLow", Field, 0, ""},
-		{"Win32FileAttributeData.LastAccessTime", Field, 0, ""},
-		{"Win32FileAttributeData.LastWriteTime", Field, 0, ""},
-		{"Win32finddata", Type, 0, ""},
-		{"Win32finddata.AlternateFileName", Field, 0, ""},
-		{"Win32finddata.CreationTime", Field, 0, ""},
-		{"Win32finddata.FileAttributes", Field, 0, ""},
-		{"Win32finddata.FileName", Field, 0, ""},
-		{"Win32finddata.FileSizeHigh", Field, 0, ""},
-		{"Win32finddata.FileSizeLow", Field, 0, ""},
-		{"Win32finddata.LastAccessTime", Field, 0, ""},
-		{"Win32finddata.LastWriteTime", Field, 0, ""},
-		{"Win32finddata.Reserved0", Field, 0, ""},
-		{"Win32finddata.Reserved1", Field, 0, ""},
-		{"Write", Func, 0, "func(fd int, p []byte) (n int, err error)"},
-		{"WriteConsole", Func, 1, ""},
-		{"WriteFile", Func, 0, ""},
-		{"X509_ASN_ENCODING", Const, 0, ""},
-		{"XCASE", Const, 0, ""},
-		{"XP1_CONNECTIONLESS", Const, 2, ""},
-		{"XP1_CONNECT_DATA", Const, 2, ""},
-		{"XP1_DISCONNECT_DATA", Const, 2, ""},
-		{"XP1_EXPEDITED_DATA", Const, 2, ""},
-		{"XP1_GRACEFUL_CLOSE", Const, 2, ""},
-		{"XP1_GUARANTEED_DELIVERY", Const, 2, ""},
-		{"XP1_GUARANTEED_ORDER", Const, 2, ""},
-		{"XP1_IFS_HANDLES", Const, 2, ""},
-		{"XP1_MESSAGE_ORIENTED", Const, 2, ""},
-		{"XP1_MULTIPOINT_CONTROL_PLANE", Const, 2, ""},
-		{"XP1_MULTIPOINT_DATA_PLANE", Const, 2, ""},
-		{"XP1_PARTIAL_MESSAGE", Const, 2, ""},
-		{"XP1_PSEUDO_STREAM", Const, 2, ""},
-		{"XP1_QOS_SUPPORTED", Const, 2, ""},
-		{"XP1_SAN_SUPPORT_SDP", Const, 2, ""},
-		{"XP1_SUPPORT_BROADCAST", Const, 2, ""},
-		{"XP1_SUPPORT_MULTIPOINT", Const, 2, ""},
-		{"XP1_UNI_RECV", Const, 2, ""},
-		{"XP1_UNI_SEND", Const, 2, ""},
-	},
-	"syscall/js": {
-		{"CopyBytesToGo", Func, 0, ""},
-		{"CopyBytesToJS", Func, 0, ""},
-		{"Error", Type, 0, ""},
-		{"Func", Type, 0, ""},
-		{"FuncOf", Func, 0, ""},
-		{"Global", Func, 0, ""},
-		{"Null", Func, 0, ""},
-		{"Type", Type, 0, ""},
-		{"TypeBoolean", Const, 0, ""},
-		{"TypeFunction", Const, 0, ""},
-		{"TypeNull", Const, 0, ""},
-		{"TypeNumber", Const, 0, ""},
-		{"TypeObject", Const, 0, ""},
-		{"TypeString", Const, 0, ""},
-		{"TypeSymbol", Const, 0, ""},
-		{"TypeUndefined", Const, 0, ""},
-		{"Undefined", Func, 0, ""},
-		{"Value", Type, 0, ""},
-		{"ValueError", Type, 0, ""},
-		{"ValueOf", Func, 0, ""},
-	},
-	"testing": {
-		{"(*B).Chdir", Method, 24, ""},
-		{"(*B).Cleanup", Method, 14, ""},
-		{"(*B).Context", Method, 24, ""},
-		{"(*B).Elapsed", Method, 20, ""},
-		{"(*B).Error", Method, 0, ""},
-		{"(*B).Errorf", Method, 0, ""},
-		{"(*B).Fail", Method, 0, ""},
-		{"(*B).FailNow", Method, 0, ""},
-		{"(*B).Failed", Method, 0, ""},
-		{"(*B).Fatal", Method, 0, ""},
-		{"(*B).Fatalf", Method, 0, ""},
-		{"(*B).Helper", Method, 9, ""},
-		{"(*B).Log", Method, 0, ""},
-		{"(*B).Logf", Method, 0, ""},
-		{"(*B).Loop", Method, 24, ""},
-		{"(*B).Name", Method, 8, ""},
-		{"(*B).ReportAllocs", Method, 1, ""},
-		{"(*B).ReportMetric", Method, 13, ""},
-		{"(*B).ResetTimer", Method, 0, ""},
-		{"(*B).Run", Method, 7, ""},
-		{"(*B).RunParallel", Method, 3, ""},
-		{"(*B).SetBytes", Method, 0, ""},
-		{"(*B).SetParallelism", Method, 3, ""},
-		{"(*B).Setenv", Method, 17, ""},
-		{"(*B).Skip", Method, 1, ""},
-		{"(*B).SkipNow", Method, 1, ""},
-		{"(*B).Skipf", Method, 1, ""},
-		{"(*B).Skipped", Method, 1, ""},
-		{"(*B).StartTimer", Method, 0, ""},
-		{"(*B).StopTimer", Method, 0, ""},
-		{"(*B).TempDir", Method, 15, ""},
-		{"(*F).Add", Method, 18, ""},
-		{"(*F).Chdir", Method, 24, ""},
-		{"(*F).Cleanup", Method, 18, ""},
-		{"(*F).Context", Method, 24, ""},
-		{"(*F).Error", Method, 18, ""},
-		{"(*F).Errorf", Method, 18, ""},
-		{"(*F).Fail", Method, 18, ""},
-		{"(*F).FailNow", Method, 18, ""},
-		{"(*F).Failed", Method, 18, ""},
-		{"(*F).Fatal", Method, 18, ""},
-		{"(*F).Fatalf", Method, 18, ""},
-		{"(*F).Fuzz", Method, 18, ""},
-		{"(*F).Helper", Method, 18, ""},
-		{"(*F).Log", Method, 18, ""},
-		{"(*F).Logf", Method, 18, ""},
-		{"(*F).Name", Method, 18, ""},
-		{"(*F).Setenv", Method, 18, ""},
-		{"(*F).Skip", Method, 18, ""},
-		{"(*F).SkipNow", Method, 18, ""},
-		{"(*F).Skipf", Method, 18, ""},
-		{"(*F).Skipped", Method, 18, ""},
-		{"(*F).TempDir", Method, 18, ""},
-		{"(*M).Run", Method, 4, ""},
-		{"(*PB).Next", Method, 3, ""},
-		{"(*T).Chdir", Method, 24, ""},
-		{"(*T).Cleanup", Method, 14, ""},
-		{"(*T).Context", Method, 24, ""},
-		{"(*T).Deadline", Method, 15, ""},
-		{"(*T).Error", Method, 0, ""},
-		{"(*T).Errorf", Method, 0, ""},
-		{"(*T).Fail", Method, 0, ""},
-		{"(*T).FailNow", Method, 0, ""},
-		{"(*T).Failed", Method, 0, ""},
-		{"(*T).Fatal", Method, 0, ""},
-		{"(*T).Fatalf", Method, 0, ""},
-		{"(*T).Helper", Method, 9, ""},
-		{"(*T).Log", Method, 0, ""},
-		{"(*T).Logf", Method, 0, ""},
-		{"(*T).Name", Method, 8, ""},
-		{"(*T).Parallel", Method, 0, ""},
-		{"(*T).Run", Method, 7, ""},
-		{"(*T).Setenv", Method, 17, ""},
-		{"(*T).Skip", Method, 1, ""},
-		{"(*T).SkipNow", Method, 1, ""},
-		{"(*T).Skipf", Method, 1, ""},
-		{"(*T).Skipped", Method, 1, ""},
-		{"(*T).TempDir", Method, 15, ""},
-		{"(BenchmarkResult).AllocedBytesPerOp", Method, 1, ""},
-		{"(BenchmarkResult).AllocsPerOp", Method, 1, ""},
-		{"(BenchmarkResult).MemString", Method, 1, ""},
-		{"(BenchmarkResult).NsPerOp", Method, 0, ""},
-		{"(BenchmarkResult).String", Method, 0, ""},
-		{"AllocsPerRun", Func, 1, "func(runs int, f func()) (avg float64)"},
-		{"B", Type, 0, ""},
-		{"B.N", Field, 0, ""},
-		{"Benchmark", Func, 0, "func(f func(b *B)) BenchmarkResult"},
-		{"BenchmarkResult", Type, 0, ""},
-		{"BenchmarkResult.Bytes", Field, 0, ""},
-		{"BenchmarkResult.Extra", Field, 13, ""},
-		{"BenchmarkResult.MemAllocs", Field, 1, ""},
-		{"BenchmarkResult.MemBytes", Field, 1, ""},
-		{"BenchmarkResult.N", Field, 0, ""},
-		{"BenchmarkResult.T", Field, 0, ""},
-		{"Cover", Type, 2, ""},
-		{"Cover.Blocks", Field, 2, ""},
-		{"Cover.Counters", Field, 2, ""},
-		{"Cover.CoveredPackages", Field, 2, ""},
-		{"Cover.Mode", Field, 2, ""},
-		{"CoverBlock", Type, 2, ""},
-		{"CoverBlock.Col0", Field, 2, ""},
-		{"CoverBlock.Col1", Field, 2, ""},
-		{"CoverBlock.Line0", Field, 2, ""},
-		{"CoverBlock.Line1", Field, 2, ""},
-		{"CoverBlock.Stmts", Field, 2, ""},
-		{"CoverMode", Func, 8, "func() string"},
-		{"Coverage", Func, 4, "func() float64"},
-		{"F", Type, 18, ""},
-		{"Init", Func, 13, "func()"},
-		{"InternalBenchmark", Type, 0, ""},
-		{"InternalBenchmark.F", Field, 0, ""},
-		{"InternalBenchmark.Name", Field, 0, ""},
-		{"InternalExample", Type, 0, ""},
-		{"InternalExample.F", Field, 0, ""},
-		{"InternalExample.Name", Field, 0, ""},
-		{"InternalExample.Output", Field, 0, ""},
-		{"InternalExample.Unordered", Field, 7, ""},
-		{"InternalFuzzTarget", Type, 18, ""},
-		{"InternalFuzzTarget.Fn", Field, 18, ""},
-		{"InternalFuzzTarget.Name", Field, 18, ""},
-		{"InternalTest", Type, 0, ""},
-		{"InternalTest.F", Field, 0, ""},
-		{"InternalTest.Name", Field, 0, ""},
-		{"M", Type, 4, ""},
-		{"Main", Func, 0, "func(matchString func(pat string, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample)"},
-		{"MainStart", Func, 4, "func(deps testDeps, tests []InternalTest, benchmarks []InternalBenchmark, fuzzTargets []InternalFuzzTarget, examples []InternalExample) *M"},
-		{"PB", Type, 3, ""},
-		{"RegisterCover", Func, 2, "func(c Cover)"},
-		{"RunBenchmarks", Func, 0, "func(matchString func(pat string, str string) (bool, error), benchmarks []InternalBenchmark)"},
-		{"RunExamples", Func, 0, "func(matchString func(pat string, str string) (bool, error), examples []InternalExample) (ok bool)"},
-		{"RunTests", Func, 0, "func(matchString func(pat string, str string) (bool, error), tests []InternalTest) (ok bool)"},
-		{"Short", Func, 0, "func() bool"},
-		{"T", Type, 0, ""},
-		{"TB", Type, 2, ""},
-		{"Testing", Func, 21, "func() bool"},
-		{"Verbose", Func, 1, "func() bool"},
-	},
-	"testing/fstest": {
-		{"(MapFS).Glob", Method, 16, ""},
-		{"(MapFS).Lstat", Method, 25, ""},
-		{"(MapFS).Open", Method, 16, ""},
-		{"(MapFS).ReadDir", Method, 16, ""},
-		{"(MapFS).ReadFile", Method, 16, ""},
-		{"(MapFS).ReadLink", Method, 25, ""},
-		{"(MapFS).Stat", Method, 16, ""},
-		{"(MapFS).Sub", Method, 16, ""},
-		{"MapFS", Type, 16, ""},
-		{"MapFile", Type, 16, ""},
-		{"MapFile.Data", Field, 16, ""},
-		{"MapFile.ModTime", Field, 16, ""},
-		{"MapFile.Mode", Field, 16, ""},
-		{"MapFile.Sys", Field, 16, ""},
-		{"TestFS", Func, 16, "func(fsys fs.FS, expected ...string) error"},
-	},
-	"testing/iotest": {
-		{"DataErrReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"ErrReader", Func, 16, "func(err error) io.Reader"},
-		{"ErrTimeout", Var, 0, ""},
-		{"HalfReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"NewReadLogger", Func, 0, "func(prefix string, r io.Reader) io.Reader"},
-		{"NewWriteLogger", Func, 0, "func(prefix string, w io.Writer) io.Writer"},
-		{"OneByteReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"TestReader", Func, 16, "func(r io.Reader, content []byte) error"},
-		{"TimeoutReader", Func, 0, "func(r io.Reader) io.Reader"},
-		{"TruncateWriter", Func, 0, "func(w io.Writer, n int64) io.Writer"},
-	},
-	"testing/quick": {
-		{"(*CheckEqualError).Error", Method, 0, ""},
-		{"(*CheckError).Error", Method, 0, ""},
-		{"(SetupError).Error", Method, 0, ""},
-		{"Check", Func, 0, "func(f any, config *Config) error"},
-		{"CheckEqual", Func, 0, "func(f any, g any, config *Config) error"},
-		{"CheckEqualError", Type, 0, ""},
-		{"CheckEqualError.CheckError", Field, 0, ""},
-		{"CheckEqualError.Out1", Field, 0, ""},
-		{"CheckEqualError.Out2", Field, 0, ""},
-		{"CheckError", Type, 0, ""},
-		{"CheckError.Count", Field, 0, ""},
-		{"CheckError.In", Field, 0, ""},
-		{"Config", Type, 0, ""},
-		{"Config.MaxCount", Field, 0, ""},
-		{"Config.MaxCountScale", Field, 0, ""},
-		{"Config.Rand", Field, 0, ""},
-		{"Config.Values", Field, 0, ""},
-		{"Generator", Type, 0, ""},
-		{"SetupError", Type, 0, ""},
-		{"Value", Func, 0, "func(t reflect.Type, rand *rand.Rand) (value reflect.Value, ok bool)"},
-	},
-	"testing/slogtest": {
-		{"Run", Func, 22, "func(t *testing.T, newHandler func(*testing.T) slog.Handler, result func(*testing.T) map[string]any)"},
-		{"TestHandler", Func, 21, "func(h slog.Handler, results func() []map[string]any) error"},
-	},
-	"text/scanner": {
-		{"(*Position).IsValid", Method, 0, ""},
-		{"(*Scanner).Init", Method, 0, ""},
-		{"(*Scanner).IsValid", Method, 0, ""},
-		{"(*Scanner).Next", Method, 0, ""},
-		{"(*Scanner).Peek", Method, 0, ""},
-		{"(*Scanner).Pos", Method, 0, ""},
-		{"(*Scanner).Scan", Method, 0, ""},
-		{"(*Scanner).TokenText", Method, 0, ""},
-		{"(Position).String", Method, 0, ""},
-		{"(Scanner).String", Method, 0, ""},
-		{"Char", Const, 0, ""},
-		{"Comment", Const, 0, ""},
-		{"EOF", Const, 0, ""},
-		{"Float", Const, 0, ""},
-		{"GoTokens", Const, 0, ""},
-		{"GoWhitespace", Const, 0, ""},
-		{"Ident", Const, 0, ""},
-		{"Int", Const, 0, ""},
-		{"Position", Type, 0, ""},
-		{"Position.Column", Field, 0, ""},
-		{"Position.Filename", Field, 0, ""},
-		{"Position.Line", Field, 0, ""},
-		{"Position.Offset", Field, 0, ""},
-		{"RawString", Const, 0, ""},
-		{"ScanChars", Const, 0, ""},
-		{"ScanComments", Const, 0, ""},
-		{"ScanFloats", Const, 0, ""},
-		{"ScanIdents", Const, 0, ""},
-		{"ScanInts", Const, 0, ""},
-		{"ScanRawStrings", Const, 0, ""},
-		{"ScanStrings", Const, 0, ""},
-		{"Scanner", Type, 0, ""},
-		{"Scanner.Error", Field, 0, ""},
-		{"Scanner.ErrorCount", Field, 0, ""},
-		{"Scanner.IsIdentRune", Field, 4, ""},
-		{"Scanner.Mode", Field, 0, ""},
-		{"Scanner.Position", Field, 0, ""},
-		{"Scanner.Whitespace", Field, 0, ""},
-		{"SkipComments", Const, 0, ""},
-		{"String", Const, 0, ""},
-		{"TokenString", Func, 0, "func(tok rune) string"},
-	},
-	"text/tabwriter": {
-		{"(*Writer).Flush", Method, 0, ""},
-		{"(*Writer).Init", Method, 0, ""},
-		{"(*Writer).Write", Method, 0, ""},
-		{"AlignRight", Const, 0, ""},
-		{"Debug", Const, 0, ""},
-		{"DiscardEmptyColumns", Const, 0, ""},
-		{"Escape", Const, 0, ""},
-		{"FilterHTML", Const, 0, ""},
-		{"NewWriter", Func, 0, "func(output io.Writer, minwidth int, tabwidth int, padding int, padchar byte, flags uint) *Writer"},
-		{"StripEscape", Const, 0, ""},
-		{"TabIndent", Const, 0, ""},
-		{"Writer", Type, 0, ""},
-	},
-	"text/template": {
-		{"(*Template).AddParseTree", Method, 0, ""},
-		{"(*Template).Clone", Method, 0, ""},
-		{"(*Template).DefinedTemplates", Method, 5, ""},
-		{"(*Template).Delims", Method, 0, ""},
-		{"(*Template).Execute", Method, 0, ""},
-		{"(*Template).ExecuteTemplate", Method, 0, ""},
-		{"(*Template).Funcs", Method, 0, ""},
-		{"(*Template).Lookup", Method, 0, ""},
-		{"(*Template).Name", Method, 0, ""},
-		{"(*Template).New", Method, 0, ""},
-		{"(*Template).Option", Method, 5, ""},
-		{"(*Template).Parse", Method, 0, ""},
-		{"(*Template).ParseFS", Method, 16, ""},
-		{"(*Template).ParseFiles", Method, 0, ""},
-		{"(*Template).ParseGlob", Method, 0, ""},
-		{"(*Template).Templates", Method, 0, ""},
-		{"(ExecError).Error", Method, 6, ""},
-		{"(ExecError).Unwrap", Method, 13, ""},
-		{"(Template).Copy", Method, 2, ""},
-		{"(Template).ErrorContext", Method, 1, ""},
-		{"ExecError", Type, 6, ""},
-		{"ExecError.Err", Field, 6, ""},
-		{"ExecError.Name", Field, 6, ""},
-		{"FuncMap", Type, 0, ""},
-		{"HTMLEscape", Func, 0, "func(w io.Writer, b []byte)"},
-		{"HTMLEscapeString", Func, 0, "func(s string) string"},
-		{"HTMLEscaper", Func, 0, "func(args ...any) string"},
-		{"IsTrue", Func, 6, "func(val any) (truth bool, ok bool)"},
-		{"JSEscape", Func, 0, "func(w io.Writer, b []byte)"},
-		{"JSEscapeString", Func, 0, "func(s string) string"},
-		{"JSEscaper", Func, 0, "func(args ...any) string"},
-		{"Must", Func, 0, "func(t *Template, err error) *Template"},
-		{"New", Func, 0, "func(name string) *Template"},
-		{"ParseFS", Func, 16, "func(fsys fs.FS, patterns ...string) (*Template, error)"},
-		{"ParseFiles", Func, 0, "func(filenames ...string) (*Template, error)"},
-		{"ParseGlob", Func, 0, "func(pattern string) (*Template, error)"},
-		{"Template", Type, 0, ""},
-		{"Template.Tree", Field, 0, ""},
-		{"URLQueryEscaper", Func, 0, "func(args ...any) string"},
-	},
-	"text/template/parse": {
-		{"(*ActionNode).Copy", Method, 0, ""},
-		{"(*ActionNode).String", Method, 0, ""},
-		{"(*BoolNode).Copy", Method, 0, ""},
-		{"(*BoolNode).String", Method, 0, ""},
-		{"(*BranchNode).Copy", Method, 4, ""},
-		{"(*BranchNode).String", Method, 0, ""},
-		{"(*BreakNode).Copy", Method, 18, ""},
-		{"(*BreakNode).String", Method, 18, ""},
-		{"(*ChainNode).Add", Method, 1, ""},
-		{"(*ChainNode).Copy", Method, 1, ""},
-		{"(*ChainNode).String", Method, 1, ""},
-		{"(*CommandNode).Copy", Method, 0, ""},
-		{"(*CommandNode).String", Method, 0, ""},
-		{"(*CommentNode).Copy", Method, 16, ""},
-		{"(*CommentNode).String", Method, 16, ""},
-		{"(*ContinueNode).Copy", Method, 18, ""},
-		{"(*ContinueNode).String", Method, 18, ""},
-		{"(*DotNode).Copy", Method, 0, ""},
-		{"(*DotNode).String", Method, 0, ""},
-		{"(*DotNode).Type", Method, 0, ""},
-		{"(*FieldNode).Copy", Method, 0, ""},
-		{"(*FieldNode).String", Method, 0, ""},
-		{"(*IdentifierNode).Copy", Method, 0, ""},
-		{"(*IdentifierNode).SetPos", Method, 1, ""},
-		{"(*IdentifierNode).SetTree", Method, 4, ""},
-		{"(*IdentifierNode).String", Method, 0, ""},
-		{"(*IfNode).Copy", Method, 0, ""},
-		{"(*IfNode).String", Method, 0, ""},
-		{"(*ListNode).Copy", Method, 0, ""},
-		{"(*ListNode).CopyList", Method, 0, ""},
-		{"(*ListNode).String", Method, 0, ""},
-		{"(*NilNode).Copy", Method, 1, ""},
-		{"(*NilNode).String", Method, 1, ""},
-		{"(*NilNode).Type", Method, 1, ""},
-		{"(*NumberNode).Copy", Method, 0, ""},
-		{"(*NumberNode).String", Method, 0, ""},
-		{"(*PipeNode).Copy", Method, 0, ""},
-		{"(*PipeNode).CopyPipe", Method, 0, ""},
-		{"(*PipeNode).String", Method, 0, ""},
-		{"(*RangeNode).Copy", Method, 0, ""},
-		{"(*RangeNode).String", Method, 0, ""},
-		{"(*StringNode).Copy", Method, 0, ""},
-		{"(*StringNode).String", Method, 0, ""},
-		{"(*TemplateNode).Copy", Method, 0, ""},
-		{"(*TemplateNode).String", Method, 0, ""},
-		{"(*TextNode).Copy", Method, 0, ""},
-		{"(*TextNode).String", Method, 0, ""},
-		{"(*Tree).Copy", Method, 2, ""},
-		{"(*Tree).ErrorContext", Method, 1, ""},
-		{"(*Tree).Parse", Method, 0, ""},
-		{"(*VariableNode).Copy", Method, 0, ""},
-		{"(*VariableNode).String", Method, 0, ""},
-		{"(*WithNode).Copy", Method, 0, ""},
-		{"(*WithNode).String", Method, 0, ""},
-		{"(ActionNode).Position", Method, 1, ""},
-		{"(ActionNode).Type", Method, 0, ""},
-		{"(BoolNode).Position", Method, 1, ""},
-		{"(BoolNode).Type", Method, 0, ""},
-		{"(BranchNode).Position", Method, 1, ""},
-		{"(BranchNode).Type", Method, 0, ""},
-		{"(BreakNode).Position", Method, 18, ""},
-		{"(BreakNode).Type", Method, 18, ""},
-		{"(ChainNode).Position", Method, 1, ""},
-		{"(ChainNode).Type", Method, 1, ""},
-		{"(CommandNode).Position", Method, 1, ""},
-		{"(CommandNode).Type", Method, 0, ""},
-		{"(CommentNode).Position", Method, 16, ""},
-		{"(CommentNode).Type", Method, 16, ""},
-		{"(ContinueNode).Position", Method, 18, ""},
-		{"(ContinueNode).Type", Method, 18, ""},
-		{"(DotNode).Position", Method, 1, ""},
-		{"(FieldNode).Position", Method, 1, ""},
-		{"(FieldNode).Type", Method, 0, ""},
-		{"(IdentifierNode).Position", Method, 1, ""},
-		{"(IdentifierNode).Type", Method, 0, ""},
-		{"(IfNode).Position", Method, 1, ""},
-		{"(IfNode).Type", Method, 0, ""},
-		{"(ListNode).Position", Method, 1, ""},
-		{"(ListNode).Type", Method, 0, ""},
-		{"(NilNode).Position", Method, 1, ""},
-		{"(NodeType).Type", Method, 0, ""},
-		{"(NumberNode).Position", Method, 1, ""},
-		{"(NumberNode).Type", Method, 0, ""},
-		{"(PipeNode).Position", Method, 1, ""},
-		{"(PipeNode).Type", Method, 0, ""},
-		{"(Pos).Position", Method, 1, ""},
-		{"(RangeNode).Position", Method, 1, ""},
-		{"(RangeNode).Type", Method, 0, ""},
-		{"(StringNode).Position", Method, 1, ""},
-		{"(StringNode).Type", Method, 0, ""},
-		{"(TemplateNode).Position", Method, 1, ""},
-		{"(TemplateNode).Type", Method, 0, ""},
-		{"(TextNode).Position", Method, 1, ""},
-		{"(TextNode).Type", Method, 0, ""},
-		{"(VariableNode).Position", Method, 1, ""},
-		{"(VariableNode).Type", Method, 0, ""},
-		{"(WithNode).Position", Method, 1, ""},
-		{"(WithNode).Type", Method, 0, ""},
-		{"ActionNode", Type, 0, ""},
-		{"ActionNode.Line", Field, 0, ""},
-		{"ActionNode.NodeType", Field, 0, ""},
-		{"ActionNode.Pipe", Field, 0, ""},
-		{"ActionNode.Pos", Field, 1, ""},
-		{"BoolNode", Type, 0, ""},
-		{"BoolNode.NodeType", Field, 0, ""},
-		{"BoolNode.Pos", Field, 1, ""},
-		{"BoolNode.True", Field, 0, ""},
-		{"BranchNode", Type, 0, ""},
-		{"BranchNode.ElseList", Field, 0, ""},
-		{"BranchNode.Line", Field, 0, ""},
-		{"BranchNode.List", Field, 0, ""},
-		{"BranchNode.NodeType", Field, 0, ""},
-		{"BranchNode.Pipe", Field, 0, ""},
-		{"BranchNode.Pos", Field, 1, ""},
-		{"BreakNode", Type, 18, ""},
-		{"BreakNode.Line", Field, 18, ""},
-		{"BreakNode.NodeType", Field, 18, ""},
-		{"BreakNode.Pos", Field, 18, ""},
-		{"ChainNode", Type, 1, ""},
-		{"ChainNode.Field", Field, 1, ""},
-		{"ChainNode.Node", Field, 1, ""},
-		{"ChainNode.NodeType", Field, 1, ""},
-		{"ChainNode.Pos", Field, 1, ""},
-		{"CommandNode", Type, 0, ""},
-		{"CommandNode.Args", Field, 0, ""},
-		{"CommandNode.NodeType", Field, 0, ""},
-		{"CommandNode.Pos", Field, 1, ""},
-		{"CommentNode", Type, 16, ""},
-		{"CommentNode.NodeType", Field, 16, ""},
-		{"CommentNode.Pos", Field, 16, ""},
-		{"CommentNode.Text", Field, 16, ""},
-		{"ContinueNode", Type, 18, ""},
-		{"ContinueNode.Line", Field, 18, ""},
-		{"ContinueNode.NodeType", Field, 18, ""},
-		{"ContinueNode.Pos", Field, 18, ""},
-		{"DotNode", Type, 0, ""},
-		{"DotNode.NodeType", Field, 4, ""},
-		{"DotNode.Pos", Field, 1, ""},
-		{"FieldNode", Type, 0, ""},
-		{"FieldNode.Ident", Field, 0, ""},
-		{"FieldNode.NodeType", Field, 0, ""},
-		{"FieldNode.Pos", Field, 1, ""},
-		{"IdentifierNode", Type, 0, ""},
-		{"IdentifierNode.Ident", Field, 0, ""},
-		{"IdentifierNode.NodeType", Field, 0, ""},
-		{"IdentifierNode.Pos", Field, 1, ""},
-		{"IfNode", Type, 0, ""},
-		{"IfNode.BranchNode", Field, 0, ""},
-		{"IsEmptyTree", Func, 0, "func(n Node) bool"},
-		{"ListNode", Type, 0, ""},
-		{"ListNode.NodeType", Field, 0, ""},
-		{"ListNode.Nodes", Field, 0, ""},
-		{"ListNode.Pos", Field, 1, ""},
-		{"Mode", Type, 16, ""},
-		{"New", Func, 0, "func(name string, funcs ...map[string]any) *Tree"},
-		{"NewIdentifier", Func, 0, "func(ident string) *IdentifierNode"},
-		{"NilNode", Type, 1, ""},
-		{"NilNode.NodeType", Field, 4, ""},
-		{"NilNode.Pos", Field, 1, ""},
-		{"Node", Type, 0, ""},
-		{"NodeAction", Const, 0, ""},
-		{"NodeBool", Const, 0, ""},
-		{"NodeBreak", Const, 18, ""},
-		{"NodeChain", Const, 1, ""},
-		{"NodeCommand", Const, 0, ""},
-		{"NodeComment", Const, 16, ""},
-		{"NodeContinue", Const, 18, ""},
-		{"NodeDot", Const, 0, ""},
-		{"NodeField", Const, 0, ""},
-		{"NodeIdentifier", Const, 0, ""},
-		{"NodeIf", Const, 0, ""},
-		{"NodeList", Const, 0, ""},
-		{"NodeNil", Const, 1, ""},
-		{"NodeNumber", Const, 0, ""},
-		{"NodePipe", Const, 0, ""},
-		{"NodeRange", Const, 0, ""},
-		{"NodeString", Const, 0, ""},
-		{"NodeTemplate", Const, 0, ""},
-		{"NodeText", Const, 0, ""},
-		{"NodeType", Type, 0, ""},
-		{"NodeVariable", Const, 0, ""},
-		{"NodeWith", Const, 0, ""},
-		{"NumberNode", Type, 0, ""},
-		{"NumberNode.Complex128", Field, 0, ""},
-		{"NumberNode.Float64", Field, 0, ""},
-		{"NumberNode.Int64", Field, 0, ""},
-		{"NumberNode.IsComplex", Field, 0, ""},
-		{"NumberNode.IsFloat", Field, 0, ""},
-		{"NumberNode.IsInt", Field, 0, ""},
-		{"NumberNode.IsUint", Field, 0, ""},
-		{"NumberNode.NodeType", Field, 0, ""},
-		{"NumberNode.Pos", Field, 1, ""},
-		{"NumberNode.Text", Field, 0, ""},
-		{"NumberNode.Uint64", Field, 0, ""},
-		{"Parse", Func, 0, "func(name string, text string, leftDelim string, rightDelim string, funcs ...map[string]any) (map[string]*Tree, error)"},
-		{"ParseComments", Const, 16, ""},
-		{"PipeNode", Type, 0, ""},
-		{"PipeNode.Cmds", Field, 0, ""},
-		{"PipeNode.Decl", Field, 0, ""},
-		{"PipeNode.IsAssign", Field, 11, ""},
-		{"PipeNode.Line", Field, 0, ""},
-		{"PipeNode.NodeType", Field, 0, ""},
-		{"PipeNode.Pos", Field, 1, ""},
-		{"Pos", Type, 1, ""},
-		{"RangeNode", Type, 0, ""},
-		{"RangeNode.BranchNode", Field, 0, ""},
-		{"SkipFuncCheck", Const, 17, ""},
-		{"StringNode", Type, 0, ""},
-		{"StringNode.NodeType", Field, 0, ""},
-		{"StringNode.Pos", Field, 1, ""},
-		{"StringNode.Quoted", Field, 0, ""},
-		{"StringNode.Text", Field, 0, ""},
-		{"TemplateNode", Type, 0, ""},
-		{"TemplateNode.Line", Field, 0, ""},
-		{"TemplateNode.Name", Field, 0, ""},
-		{"TemplateNode.NodeType", Field, 0, ""},
-		{"TemplateNode.Pipe", Field, 0, ""},
-		{"TemplateNode.Pos", Field, 1, ""},
-		{"TextNode", Type, 0, ""},
-		{"TextNode.NodeType", Field, 0, ""},
-		{"TextNode.Pos", Field, 1, ""},
-		{"TextNode.Text", Field, 0, ""},
-		{"Tree", Type, 0, ""},
-		{"Tree.Mode", Field, 16, ""},
-		{"Tree.Name", Field, 0, ""},
-		{"Tree.ParseName", Field, 1, ""},
-		{"Tree.Root", Field, 0, ""},
-		{"VariableNode", Type, 0, ""},
-		{"VariableNode.Ident", Field, 0, ""},
-		{"VariableNode.NodeType", Field, 0, ""},
-		{"VariableNode.Pos", Field, 1, ""},
-		{"WithNode", Type, 0, ""},
-		{"WithNode.BranchNode", Field, 0, ""},
-	},
-	"time": {
-		{"(*Location).String", Method, 0, ""},
-		{"(*ParseError).Error", Method, 0, ""},
-		{"(*Ticker).Reset", Method, 15, ""},
-		{"(*Ticker).Stop", Method, 0, ""},
-		{"(*Time).GobDecode", Method, 0, ""},
-		{"(*Time).UnmarshalBinary", Method, 2, ""},
-		{"(*Time).UnmarshalJSON", Method, 0, ""},
-		{"(*Time).UnmarshalText", Method, 2, ""},
-		{"(*Timer).Reset", Method, 1, ""},
-		{"(*Timer).Stop", Method, 0, ""},
-		{"(Duration).Abs", Method, 19, ""},
-		{"(Duration).Hours", Method, 0, ""},
-		{"(Duration).Microseconds", Method, 13, ""},
-		{"(Duration).Milliseconds", Method, 13, ""},
-		{"(Duration).Minutes", Method, 0, ""},
-		{"(Duration).Nanoseconds", Method, 0, ""},
-		{"(Duration).Round", Method, 9, ""},
-		{"(Duration).Seconds", Method, 0, ""},
-		{"(Duration).String", Method, 0, ""},
-		{"(Duration).Truncate", Method, 9, ""},
-		{"(Month).String", Method, 0, ""},
-		{"(Time).Add", Method, 0, ""},
-		{"(Time).AddDate", Method, 0, ""},
-		{"(Time).After", Method, 0, ""},
-		{"(Time).AppendBinary", Method, 24, ""},
-		{"(Time).AppendFormat", Method, 5, ""},
-		{"(Time).AppendText", Method, 24, ""},
-		{"(Time).Before", Method, 0, ""},
-		{"(Time).Clock", Method, 0, ""},
-		{"(Time).Compare", Method, 20, ""},
-		{"(Time).Date", Method, 0, ""},
-		{"(Time).Day", Method, 0, ""},
-		{"(Time).Equal", Method, 0, ""},
-		{"(Time).Format", Method, 0, ""},
-		{"(Time).GoString", Method, 17, ""},
-		{"(Time).GobEncode", Method, 0, ""},
-		{"(Time).Hour", Method, 0, ""},
-		{"(Time).ISOWeek", Method, 0, ""},
-		{"(Time).In", Method, 0, ""},
-		{"(Time).IsDST", Method, 17, ""},
-		{"(Time).IsZero", Method, 0, ""},
-		{"(Time).Local", Method, 0, ""},
-		{"(Time).Location", Method, 0, ""},
-		{"(Time).MarshalBinary", Method, 2, ""},
-		{"(Time).MarshalJSON", Method, 0, ""},
-		{"(Time).MarshalText", Method, 2, ""},
-		{"(Time).Minute", Method, 0, ""},
-		{"(Time).Month", Method, 0, ""},
-		{"(Time).Nanosecond", Method, 0, ""},
-		{"(Time).Round", Method, 1, ""},
-		{"(Time).Second", Method, 0, ""},
-		{"(Time).String", Method, 0, ""},
-		{"(Time).Sub", Method, 0, ""},
-		{"(Time).Truncate", Method, 1, ""},
-		{"(Time).UTC", Method, 0, ""},
-		{"(Time).Unix", Method, 0, ""},
-		{"(Time).UnixMicro", Method, 17, ""},
-		{"(Time).UnixMilli", Method, 17, ""},
-		{"(Time).UnixNano", Method, 0, ""},
-		{"(Time).Weekday", Method, 0, ""},
-		{"(Time).Year", Method, 0, ""},
-		{"(Time).YearDay", Method, 1, ""},
-		{"(Time).Zone", Method, 0, ""},
-		{"(Time).ZoneBounds", Method, 19, ""},
-		{"(Weekday).String", Method, 0, ""},
-		{"ANSIC", Const, 0, ""},
-		{"After", Func, 0, "func(d Duration) <-chan Time"},
-		{"AfterFunc", Func, 0, "func(d Duration, f func()) *Timer"},
-		{"April", Const, 0, ""},
-		{"August", Const, 0, ""},
-		{"Date", Func, 0, "func(year int, month Month, day int, hour int, min int, sec int, nsec int, loc *Location) Time"},
-		{"DateOnly", Const, 20, ""},
-		{"DateTime", Const, 20, ""},
-		{"December", Const, 0, ""},
-		{"Duration", Type, 0, ""},
-		{"February", Const, 0, ""},
-		{"FixedZone", Func, 0, "func(name string, offset int) *Location"},
-		{"Friday", Const, 0, ""},
-		{"Hour", Const, 0, ""},
-		{"January", Const, 0, ""},
-		{"July", Const, 0, ""},
-		{"June", Const, 0, ""},
-		{"Kitchen", Const, 0, ""},
-		{"Layout", Const, 17, ""},
-		{"LoadLocation", Func, 0, "func(name string) (*Location, error)"},
-		{"LoadLocationFromTZData", Func, 10, "func(name string, data []byte) (*Location, error)"},
-		{"Local", Var, 0, ""},
-		{"Location", Type, 0, ""},
-		{"March", Const, 0, ""},
-		{"May", Const, 0, ""},
-		{"Microsecond", Const, 0, ""},
-		{"Millisecond", Const, 0, ""},
-		{"Minute", Const, 0, ""},
-		{"Monday", Const, 0, ""},
-		{"Month", Type, 0, ""},
-		{"Nanosecond", Const, 0, ""},
-		{"NewTicker", Func, 0, "func(d Duration) *Ticker"},
-		{"NewTimer", Func, 0, "func(d Duration) *Timer"},
-		{"November", Const, 0, ""},
-		{"Now", Func, 0, "func() Time"},
-		{"October", Const, 0, ""},
-		{"Parse", Func, 0, "func(layout string, value string) (Time, error)"},
-		{"ParseDuration", Func, 0, "func(s string) (Duration, error)"},
-		{"ParseError", Type, 0, ""},
-		{"ParseError.Layout", Field, 0, ""},
-		{"ParseError.LayoutElem", Field, 0, ""},
-		{"ParseError.Message", Field, 0, ""},
-		{"ParseError.Value", Field, 0, ""},
-		{"ParseError.ValueElem", Field, 0, ""},
-		{"ParseInLocation", Func, 1, "func(layout string, value string, loc *Location) (Time, error)"},
-		{"RFC1123", Const, 0, ""},
-		{"RFC1123Z", Const, 0, ""},
-		{"RFC3339", Const, 0, ""},
-		{"RFC3339Nano", Const, 0, ""},
-		{"RFC822", Const, 0, ""},
-		{"RFC822Z", Const, 0, ""},
-		{"RFC850", Const, 0, ""},
-		{"RubyDate", Const, 0, ""},
-		{"Saturday", Const, 0, ""},
-		{"Second", Const, 0, ""},
-		{"September", Const, 0, ""},
-		{"Since", Func, 0, "func(t Time) Duration"},
-		{"Sleep", Func, 0, "func(d Duration)"},
-		{"Stamp", Const, 0, ""},
-		{"StampMicro", Const, 0, ""},
-		{"StampMilli", Const, 0, ""},
-		{"StampNano", Const, 0, ""},
-		{"Sunday", Const, 0, ""},
-		{"Thursday", Const, 0, ""},
-		{"Tick", Func, 0, "func(d Duration) <-chan Time"},
-		{"Ticker", Type, 0, ""},
-		{"Ticker.C", Field, 0, ""},
-		{"Time", Type, 0, ""},
-		{"TimeOnly", Const, 20, ""},
-		{"Timer", Type, 0, ""},
-		{"Timer.C", Field, 0, ""},
-		{"Tuesday", Const, 0, ""},
-		{"UTC", Var, 0, ""},
-		{"Unix", Func, 0, "func(sec int64, nsec int64) Time"},
-		{"UnixDate", Const, 0, ""},
-		{"UnixMicro", Func, 17, "func(usec int64) Time"},
-		{"UnixMilli", Func, 17, "func(msec int64) Time"},
-		{"Until", Func, 8, "func(t Time) Duration"},
-		{"Wednesday", Const, 0, ""},
-		{"Weekday", Type, 0, ""},
-	},
-	"unicode": {
-		{"(SpecialCase).ToLower", Method, 0, ""},
-		{"(SpecialCase).ToTitle", Method, 0, ""},
-		{"(SpecialCase).ToUpper", Method, 0, ""},
-		{"ASCII_Hex_Digit", Var, 0, ""},
-		{"Adlam", Var, 7, ""},
-		{"Ahom", Var, 5, ""},
-		{"Anatolian_Hieroglyphs", Var, 5, ""},
-		{"Arabic", Var, 0, ""},
-		{"Armenian", Var, 0, ""},
-		{"Avestan", Var, 0, ""},
-		{"AzeriCase", Var, 0, ""},
-		{"Balinese", Var, 0, ""},
-		{"Bamum", Var, 0, ""},
-		{"Bassa_Vah", Var, 4, ""},
-		{"Batak", Var, 0, ""},
-		{"Bengali", Var, 0, ""},
-		{"Bhaiksuki", Var, 7, ""},
-		{"Bidi_Control", Var, 0, ""},
-		{"Bopomofo", Var, 0, ""},
-		{"Brahmi", Var, 0, ""},
-		{"Braille", Var, 0, ""},
-		{"Buginese", Var, 0, ""},
-		{"Buhid", Var, 0, ""},
-		{"C", Var, 0, ""},
-		{"Canadian_Aboriginal", Var, 0, ""},
-		{"Carian", Var, 0, ""},
-		{"CaseRange", Type, 0, ""},
-		{"CaseRange.Delta", Field, 0, ""},
-		{"CaseRange.Hi", Field, 0, ""},
-		{"CaseRange.Lo", Field, 0, ""},
-		{"CaseRanges", Var, 0, ""},
-		{"Categories", Var, 0, ""},
-		{"Caucasian_Albanian", Var, 4, ""},
-		{"Cc", Var, 0, ""},
-		{"Cf", Var, 0, ""},
-		{"Chakma", Var, 1, ""},
-		{"Cham", Var, 0, ""},
-		{"Cherokee", Var, 0, ""},
-		{"Chorasmian", Var, 16, ""},
-		{"Co", Var, 0, ""},
-		{"Common", Var, 0, ""},
-		{"Coptic", Var, 0, ""},
-		{"Cs", Var, 0, ""},
-		{"Cuneiform", Var, 0, ""},
-		{"Cypriot", Var, 0, ""},
-		{"Cypro_Minoan", Var, 21, ""},
-		{"Cyrillic", Var, 0, ""},
-		{"Dash", Var, 0, ""},
-		{"Deprecated", Var, 0, ""},
-		{"Deseret", Var, 0, ""},
-		{"Devanagari", Var, 0, ""},
-		{"Diacritic", Var, 0, ""},
-		{"Digit", Var, 0, ""},
-		{"Dives_Akuru", Var, 16, ""},
-		{"Dogra", Var, 13, ""},
-		{"Duployan", Var, 4, ""},
-		{"Egyptian_Hieroglyphs", Var, 0, ""},
-		{"Elbasan", Var, 4, ""},
-		{"Elymaic", Var, 14, ""},
-		{"Ethiopic", Var, 0, ""},
-		{"Extender", Var, 0, ""},
-		{"FoldCategory", Var, 0, ""},
-		{"FoldScript", Var, 0, ""},
-		{"Georgian", Var, 0, ""},
-		{"Glagolitic", Var, 0, ""},
-		{"Gothic", Var, 0, ""},
-		{"Grantha", Var, 4, ""},
-		{"GraphicRanges", Var, 0, ""},
-		{"Greek", Var, 0, ""},
-		{"Gujarati", Var, 0, ""},
-		{"Gunjala_Gondi", Var, 13, ""},
-		{"Gurmukhi", Var, 0, ""},
-		{"Han", Var, 0, ""},
-		{"Hangul", Var, 0, ""},
-		{"Hanifi_Rohingya", Var, 13, ""},
-		{"Hanunoo", Var, 0, ""},
-		{"Hatran", Var, 5, ""},
-		{"Hebrew", Var, 0, ""},
-		{"Hex_Digit", Var, 0, ""},
-		{"Hiragana", Var, 0, ""},
-		{"Hyphen", Var, 0, ""},
-		{"IDS_Binary_Operator", Var, 0, ""},
-		{"IDS_Trinary_Operator", Var, 0, ""},
-		{"Ideographic", Var, 0, ""},
-		{"Imperial_Aramaic", Var, 0, ""},
-		{"In", Func, 2, "func(r rune, ranges ...*RangeTable) bool"},
-		{"Inherited", Var, 0, ""},
-		{"Inscriptional_Pahlavi", Var, 0, ""},
-		{"Inscriptional_Parthian", Var, 0, ""},
-		{"Is", Func, 0, "func(rangeTab *RangeTable, r rune) bool"},
-		{"IsControl", Func, 0, "func(r rune) bool"},
-		{"IsDigit", Func, 0, "func(r rune) bool"},
-		{"IsGraphic", Func, 0, "func(r rune) bool"},
-		{"IsLetter", Func, 0, "func(r rune) bool"},
-		{"IsLower", Func, 0, "func(r rune) bool"},
-		{"IsMark", Func, 0, "func(r rune) bool"},
-		{"IsNumber", Func, 0, "func(r rune) bool"},
-		{"IsOneOf", Func, 0, "func(ranges []*RangeTable, r rune) bool"},
-		{"IsPrint", Func, 0, "func(r rune) bool"},
-		{"IsPunct", Func, 0, "func(r rune) bool"},
-		{"IsSpace", Func, 0, "func(r rune) bool"},
-		{"IsSymbol", Func, 0, "func(r rune) bool"},
-		{"IsTitle", Func, 0, "func(r rune) bool"},
-		{"IsUpper", Func, 0, "func(r rune) bool"},
-		{"Javanese", Var, 0, ""},
-		{"Join_Control", Var, 0, ""},
-		{"Kaithi", Var, 0, ""},
-		{"Kannada", Var, 0, ""},
-		{"Katakana", Var, 0, ""},
-		{"Kawi", Var, 21, ""},
-		{"Kayah_Li", Var, 0, ""},
-		{"Kharoshthi", Var, 0, ""},
-		{"Khitan_Small_Script", Var, 16, ""},
-		{"Khmer", Var, 0, ""},
-		{"Khojki", Var, 4, ""},
-		{"Khudawadi", Var, 4, ""},
-		{"L", Var, 0, ""},
-		{"Lao", Var, 0, ""},
-		{"Latin", Var, 0, ""},
-		{"Lepcha", Var, 0, ""},
-		{"Letter", Var, 0, ""},
-		{"Limbu", Var, 0, ""},
-		{"Linear_A", Var, 4, ""},
-		{"Linear_B", Var, 0, ""},
-		{"Lisu", Var, 0, ""},
-		{"Ll", Var, 0, ""},
-		{"Lm", Var, 0, ""},
-		{"Lo", Var, 0, ""},
-		{"Logical_Order_Exception", Var, 0, ""},
-		{"Lower", Var, 0, ""},
-		{"LowerCase", Const, 0, ""},
-		{"Lt", Var, 0, ""},
-		{"Lu", Var, 0, ""},
-		{"Lycian", Var, 0, ""},
-		{"Lydian", Var, 0, ""},
-		{"M", Var, 0, ""},
-		{"Mahajani", Var, 4, ""},
-		{"Makasar", Var, 13, ""},
-		{"Malayalam", Var, 0, ""},
-		{"Mandaic", Var, 0, ""},
-		{"Manichaean", Var, 4, ""},
-		{"Marchen", Var, 7, ""},
-		{"Mark", Var, 0, ""},
-		{"Masaram_Gondi", Var, 10, ""},
-		{"MaxASCII", Const, 0, ""},
-		{"MaxCase", Const, 0, ""},
-		{"MaxLatin1", Const, 0, ""},
-		{"MaxRune", Const, 0, ""},
-		{"Mc", Var, 0, ""},
-		{"Me", Var, 0, ""},
-		{"Medefaidrin", Var, 13, ""},
-		{"Meetei_Mayek", Var, 0, ""},
-		{"Mende_Kikakui", Var, 4, ""},
-		{"Meroitic_Cursive", Var, 1, ""},
-		{"Meroitic_Hieroglyphs", Var, 1, ""},
-		{"Miao", Var, 1, ""},
-		{"Mn", Var, 0, ""},
-		{"Modi", Var, 4, ""},
-		{"Mongolian", Var, 0, ""},
-		{"Mro", Var, 4, ""},
-		{"Multani", Var, 5, ""},
-		{"Myanmar", Var, 0, ""},
-		{"N", Var, 0, ""},
-		{"Nabataean", Var, 4, ""},
-		{"Nag_Mundari", Var, 21, ""},
-		{"Nandinagari", Var, 14, ""},
-		{"Nd", Var, 0, ""},
-		{"New_Tai_Lue", Var, 0, ""},
-		{"Newa", Var, 7, ""},
-		{"Nko", Var, 0, ""},
-		{"Nl", Var, 0, ""},
-		{"No", Var, 0, ""},
-		{"Noncharacter_Code_Point", Var, 0, ""},
-		{"Number", Var, 0, ""},
-		{"Nushu", Var, 10, ""},
-		{"Nyiakeng_Puachue_Hmong", Var, 14, ""},
-		{"Ogham", Var, 0, ""},
-		{"Ol_Chiki", Var, 0, ""},
-		{"Old_Hungarian", Var, 5, ""},
-		{"Old_Italic", Var, 0, ""},
-		{"Old_North_Arabian", Var, 4, ""},
-		{"Old_Permic", Var, 4, ""},
-		{"Old_Persian", Var, 0, ""},
-		{"Old_Sogdian", Var, 13, ""},
-		{"Old_South_Arabian", Var, 0, ""},
-		{"Old_Turkic", Var, 0, ""},
-		{"Old_Uyghur", Var, 21, ""},
-		{"Oriya", Var, 0, ""},
-		{"Osage", Var, 7, ""},
-		{"Osmanya", Var, 0, ""},
-		{"Other", Var, 0, ""},
-		{"Other_Alphabetic", Var, 0, ""},
-		{"Other_Default_Ignorable_Code_Point", Var, 0, ""},
-		{"Other_Grapheme_Extend", Var, 0, ""},
-		{"Other_ID_Continue", Var, 0, ""},
-		{"Other_ID_Start", Var, 0, ""},
-		{"Other_Lowercase", Var, 0, ""},
-		{"Other_Math", Var, 0, ""},
-		{"Other_Uppercase", Var, 0, ""},
-		{"P", Var, 0, ""},
-		{"Pahawh_Hmong", Var, 4, ""},
-		{"Palmyrene", Var, 4, ""},
-		{"Pattern_Syntax", Var, 0, ""},
-		{"Pattern_White_Space", Var, 0, ""},
-		{"Pau_Cin_Hau", Var, 4, ""},
-		{"Pc", Var, 0, ""},
-		{"Pd", Var, 0, ""},
-		{"Pe", Var, 0, ""},
-		{"Pf", Var, 0, ""},
-		{"Phags_Pa", Var, 0, ""},
-		{"Phoenician", Var, 0, ""},
-		{"Pi", Var, 0, ""},
-		{"Po", Var, 0, ""},
-		{"Prepended_Concatenation_Mark", Var, 7, ""},
-		{"PrintRanges", Var, 0, ""},
-		{"Properties", Var, 0, ""},
-		{"Ps", Var, 0, ""},
-		{"Psalter_Pahlavi", Var, 4, ""},
-		{"Punct", Var, 0, ""},
-		{"Quotation_Mark", Var, 0, ""},
-		{"Radical", Var, 0, ""},
-		{"Range16", Type, 0, ""},
-		{"Range16.Hi", Field, 0, ""},
-		{"Range16.Lo", Field, 0, ""},
-		{"Range16.Stride", Field, 0, ""},
-		{"Range32", Type, 0, ""},
-		{"Range32.Hi", Field, 0, ""},
-		{"Range32.Lo", Field, 0, ""},
-		{"Range32.Stride", Field, 0, ""},
-		{"RangeTable", Type, 0, ""},
-		{"RangeTable.LatinOffset", Field, 1, ""},
-		{"RangeTable.R16", Field, 0, ""},
-		{"RangeTable.R32", Field, 0, ""},
-		{"Regional_Indicator", Var, 10, ""},
-		{"Rejang", Var, 0, ""},
-		{"ReplacementChar", Const, 0, ""},
-		{"Runic", Var, 0, ""},
-		{"S", Var, 0, ""},
-		{"STerm", Var, 0, ""},
-		{"Samaritan", Var, 0, ""},
-		{"Saurashtra", Var, 0, ""},
-		{"Sc", Var, 0, ""},
-		{"Scripts", Var, 0, ""},
-		{"Sentence_Terminal", Var, 7, ""},
-		{"Sharada", Var, 1, ""},
-		{"Shavian", Var, 0, ""},
-		{"Siddham", Var, 4, ""},
-		{"SignWriting", Var, 5, ""},
-		{"SimpleFold", Func, 0, "func(r rune) rune"},
-		{"Sinhala", Var, 0, ""},
-		{"Sk", Var, 0, ""},
-		{"Sm", Var, 0, ""},
-		{"So", Var, 0, ""},
-		{"Soft_Dotted", Var, 0, ""},
-		{"Sogdian", Var, 13, ""},
-		{"Sora_Sompeng", Var, 1, ""},
-		{"Soyombo", Var, 10, ""},
-		{"Space", Var, 0, ""},
-		{"SpecialCase", Type, 0, ""},
-		{"Sundanese", Var, 0, ""},
-		{"Syloti_Nagri", Var, 0, ""},
-		{"Symbol", Var, 0, ""},
-		{"Syriac", Var, 0, ""},
-		{"Tagalog", Var, 0, ""},
-		{"Tagbanwa", Var, 0, ""},
-		{"Tai_Le", Var, 0, ""},
-		{"Tai_Tham", Var, 0, ""},
-		{"Tai_Viet", Var, 0, ""},
-		{"Takri", Var, 1, ""},
-		{"Tamil", Var, 0, ""},
-		{"Tangsa", Var, 21, ""},
-		{"Tangut", Var, 7, ""},
-		{"Telugu", Var, 0, ""},
-		{"Terminal_Punctuation", Var, 0, ""},
-		{"Thaana", Var, 0, ""},
-		{"Thai", Var, 0, ""},
-		{"Tibetan", Var, 0, ""},
-		{"Tifinagh", Var, 0, ""},
-		{"Tirhuta", Var, 4, ""},
-		{"Title", Var, 0, ""},
-		{"TitleCase", Const, 0, ""},
-		{"To", Func, 0, "func(_case int, r rune) rune"},
-		{"ToLower", Func, 0, "func(r rune) rune"},
-		{"ToTitle", Func, 0, "func(r rune) rune"},
-		{"ToUpper", Func, 0, "func(r rune) rune"},
-		{"Toto", Var, 21, ""},
-		{"TurkishCase", Var, 0, ""},
-		{"Ugaritic", Var, 0, ""},
-		{"Unified_Ideograph", Var, 0, ""},
-		{"Upper", Var, 0, ""},
-		{"UpperCase", Const, 0, ""},
-		{"UpperLower", Const, 0, ""},
-		{"Vai", Var, 0, ""},
-		{"Variation_Selector", Var, 0, ""},
-		{"Version", Const, 0, ""},
-		{"Vithkuqi", Var, 21, ""},
-		{"Wancho", Var, 14, ""},
-		{"Warang_Citi", Var, 4, ""},
-		{"White_Space", Var, 0, ""},
-		{"Yezidi", Var, 16, ""},
-		{"Yi", Var, 0, ""},
-		{"Z", Var, 0, ""},
-		{"Zanabazar_Square", Var, 10, ""},
-		{"Zl", Var, 0, ""},
-		{"Zp", Var, 0, ""},
-		{"Zs", Var, 0, ""},
-	},
-	"unicode/utf16": {
-		{"AppendRune", Func, 20, "func(a []uint16, r rune) []uint16"},
-		{"Decode", Func, 0, "func(s []uint16) []rune"},
-		{"DecodeRune", Func, 0, "func(r1 rune, r2 rune) rune"},
-		{"Encode", Func, 0, "func(s []rune) []uint16"},
-		{"EncodeRune", Func, 0, "func(r rune) (r1 rune, r2 rune)"},
-		{"IsSurrogate", Func, 0, "func(r rune) bool"},
-		{"RuneLen", Func, 23, "func(r rune) int"},
-	},
-	"unicode/utf8": {
-		{"AppendRune", Func, 18, "func(p []byte, r rune) []byte"},
-		{"DecodeLastRune", Func, 0, "func(p []byte) (r rune, size int)"},
-		{"DecodeLastRuneInString", Func, 0, "func(s string) (r rune, size int)"},
-		{"DecodeRune", Func, 0, "func(p []byte) (r rune, size int)"},
-		{"DecodeRuneInString", Func, 0, "func(s string) (r rune, size int)"},
-		{"EncodeRune", Func, 0, "func(p []byte, r rune) int"},
-		{"FullRune", Func, 0, "func(p []byte) bool"},
-		{"FullRuneInString", Func, 0, "func(s string) bool"},
-		{"MaxRune", Const, 0, ""},
-		{"RuneCount", Func, 0, "func(p []byte) int"},
-		{"RuneCountInString", Func, 0, "func(s string) (n int)"},
-		{"RuneError", Const, 0, ""},
-		{"RuneLen", Func, 0, "func(r rune) int"},
-		{"RuneSelf", Const, 0, ""},
-		{"RuneStart", Func, 0, "func(b byte) bool"},
-		{"UTFMax", Const, 0, ""},
-		{"Valid", Func, 0, "func(p []byte) bool"},
-		{"ValidRune", Func, 1, "func(r rune) bool"},
-		{"ValidString", Func, 0, "func(s string) bool"},
-	},
-	"unique": {
-		{"(Handle).Value", Method, 23, ""},
-		{"Handle", Type, 23, ""},
-		{"Make", Func, 23, "func[T comparable](value T) Handle[T]"},
-	},
-	"unsafe": {
-		{"Add", Func, 0, ""},
-		{"Alignof", Func, 0, ""},
-		{"Offsetof", Func, 0, ""},
-		{"Pointer", Type, 0, ""},
-		{"Sizeof", Func, 0, ""},
-		{"Slice", Func, 0, ""},
-		{"SliceData", Func, 0, ""},
-		{"String", Func, 0, ""},
-		{"StringData", Func, 0, ""},
-	},
-	"weak": {
-		{"(Pointer).Value", Method, 24, ""},
-		{"Make", Func, 24, "func[T any](ptr *T) Pointer[T]"},
-		{"Pointer", Type, 24, ""},
-	},
-}
diff --git a/vendor/golang.org/x/tools/internal/stdlib/stdlib.go b/vendor/golang.org/x/tools/internal/stdlib/stdlib.go
deleted file mode 100644
index e223e0f..0000000
--- a/vendor/golang.org/x/tools/internal/stdlib/stdlib.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run generate.go
-
-// Package stdlib provides a table of all exported symbols in the
-// standard library, along with the version at which they first
-// appeared. It also provides the import graph of std packages.
-package stdlib
-
-import (
-	"fmt"
-	"strings"
-)
-
-type Symbol struct {
-	Name    string
-	Kind    Kind
-	Version Version // Go version that first included the symbol
-	// Signature provides the type of a function (defined only for Kind=Func).
-	// Imported types are denoted as pkg.T; pkg is not fully qualified.
-	// TODO(adonovan): use an unambiguous encoding that is parseable.
-	//
-	// Example2:
-	//    func[M ~map[K]V, K comparable, V any](m M) M
-	//    func(fi fs.FileInfo, link string) (*Header, error)
-	Signature string // if Kind == stdlib.Func
-}
-
-// A Kind indicates the kind of a symbol:
-// function, variable, constant, type, and so on.
-type Kind int8
-
-const (
-	Invalid Kind = iota // Example name:
-	Type                // "Buffer"
-	Func                // "Println"
-	Var                 // "EOF"
-	Const               // "Pi"
-	Field               // "Point.X"
-	Method              // "(*Buffer).Grow"
-)
-
-func (kind Kind) String() string {
-	return [...]string{
-		Invalid: "invalid",
-		Type:    "type",
-		Func:    "func",
-		Var:     "var",
-		Const:   "const",
-		Field:   "field",
-		Method:  "method",
-	}[kind]
-}
-
-// A Version represents a version of Go of the form "go1.%d".
-type Version int8
-
-// String returns a version string of the form "go1.23", without allocating.
-func (v Version) String() string { return versions[v] }
-
-var versions [30]string // (increase constant as needed)
-
-func init() {
-	for i := range versions {
-		versions[i] = fmt.Sprintf("go1.%d", i)
-	}
-}
-
-// HasPackage reports whether the specified package path is part of
-// the standard library's public API.
-func HasPackage(path string) bool {
-	_, ok := PackageSymbols[path]
-	return ok
-}
-
-// SplitField splits the field symbol name into type and field
-// components. It must be called only on Field symbols.
-//
-// Example: "File.Package" -> ("File", "Package")
-func (sym *Symbol) SplitField() (typename, name string) {
-	if sym.Kind != Field {
-		panic("not a field")
-	}
-	typename, name, _ = strings.Cut(sym.Name, ".")
-	return
-}
-
-// SplitMethod splits the method symbol name into pointer, receiver,
-// and method components. It must be called only on Method symbols.
-//
-// Example: "(*Buffer).Grow" -> (true, "Buffer", "Grow")
-func (sym *Symbol) SplitMethod() (ptr bool, recv, name string) {
-	if sym.Kind != Method {
-		panic("not a method")
-	}
-	recv, name, _ = strings.Cut(sym.Name, ".")
-	recv = recv[len("(") : len(recv)-len(")")]
-	ptr = recv[0] == '*'
-	if ptr {
-		recv = recv[len("*"):]
-	}
-	return
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/common.go b/vendor/golang.org/x/tools/internal/typeparams/common.go
deleted file mode 100644
index cdae2b8..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/common.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package typeparams contains common utilities for writing tools that
-// interact with generic Go code, as introduced with Go 1.18. It
-// supplements the standard library APIs. Notably, the StructuralTerms
-// API computes a minimal representation of the structural
-// restrictions on a type parameter.
-//
-// An external version of these APIs is available in the
-// golang.org/x/exp/typeparams module.
-package typeparams
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-)
-
-// UnpackIndexExpr extracts data from AST nodes that represent index
-// expressions.
-//
-// For an ast.IndexExpr, the resulting indices slice will contain exactly one
-// index expression. For an ast.IndexListExpr (go1.18+), it may have a variable
-// number of index expressions.
-//
-// For nodes that don't represent index expressions, the first return value of
-// UnpackIndexExpr will be nil.
-func UnpackIndexExpr(n ast.Node) (x ast.Expr, lbrack token.Pos, indices []ast.Expr, rbrack token.Pos) {
-	switch e := n.(type) {
-	case *ast.IndexExpr:
-		return e.X, e.Lbrack, []ast.Expr{e.Index}, e.Rbrack
-	case *ast.IndexListExpr:
-		return e.X, e.Lbrack, e.Indices, e.Rbrack
-	}
-	return nil, token.NoPos, nil, token.NoPos
-}
-
-// PackIndexExpr returns an *ast.IndexExpr or *ast.IndexListExpr, depending on
-// the cardinality of indices. Calling PackIndexExpr with len(indices) == 0
-// will panic.
-func PackIndexExpr(x ast.Expr, lbrack token.Pos, indices []ast.Expr, rbrack token.Pos) ast.Expr {
-	switch len(indices) {
-	case 0:
-		panic("empty indices")
-	case 1:
-		return &ast.IndexExpr{
-			X:      x,
-			Lbrack: lbrack,
-			Index:  indices[0],
-			Rbrack: rbrack,
-		}
-	default:
-		return &ast.IndexListExpr{
-			X:       x,
-			Lbrack:  lbrack,
-			Indices: indices,
-			Rbrack:  rbrack,
-		}
-	}
-}
-
-// IsTypeParam reports whether t is a type parameter (or an alias of one).
-func IsTypeParam(t types.Type) bool {
-	_, ok := types.Unalias(t).(*types.TypeParam)
-	return ok
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/coretype.go b/vendor/golang.org/x/tools/internal/typeparams/coretype.go
deleted file mode 100644
index 27a2b17..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/coretype.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeparams
-
-import (
-	"fmt"
-	"go/types"
-)
-
-// CoreType returns the core type of T or nil if T does not have a core type.
-//
-// See https://go.dev/ref/spec#Core_types for the definition of a core type.
-func CoreType(T types.Type) types.Type {
-	U := T.Underlying()
-	if _, ok := U.(*types.Interface); !ok {
-		return U // for non-interface types,
-	}
-
-	terms, err := NormalTerms(U)
-	if len(terms) == 0 || err != nil {
-		// len(terms) -> empty type set of interface.
-		// err != nil => U is invalid, exceeds complexity bounds, or has an empty type set.
-		return nil // no core type.
-	}
-
-	U = terms[0].Type().Underlying()
-	var identical int // i in [0,identical) => Identical(U, terms[i].Type().Underlying())
-	for identical = 1; identical < len(terms); identical++ {
-		if !types.Identical(U, terms[identical].Type().Underlying()) {
-			break
-		}
-	}
-
-	if identical == len(terms) {
-		// https://go.dev/ref/spec#Core_types
-		// "There is a single type U which is the underlying type of all types in the type set of T"
-		return U
-	}
-	ch, ok := U.(*types.Chan)
-	if !ok {
-		return nil // no core type as identical < len(terms) and U is not a channel.
-	}
-	// https://go.dev/ref/spec#Core_types
-	// "the type chan E if T contains only bidirectional channels, or the type chan<- E or
-	// <-chan E depending on the direction of the directional channels present."
-	for chans := identical; chans < len(terms); chans++ {
-		curr, ok := terms[chans].Type().Underlying().(*types.Chan)
-		if !ok {
-			return nil
-		}
-		if !types.Identical(ch.Elem(), curr.Elem()) {
-			return nil // channel elements are not identical.
-		}
-		if ch.Dir() == types.SendRecv {
-			// ch is bidirectional. We can safely always use curr's direction.
-			ch = curr
-		} else if curr.Dir() != types.SendRecv && ch.Dir() != curr.Dir() {
-			// ch and curr are not bidirectional and not the same direction.
-			return nil
-		}
-	}
-	return ch
-}
-
-// NormalTerms returns a slice of terms representing the normalized structural
-// type restrictions of a type, if any.
-//
-// For all types other than *types.TypeParam, *types.Interface, and
-// *types.Union, this is just a single term with Tilde() == false and
-// Type() == typ. For *types.TypeParam, *types.Interface, and *types.Union, see
-// below.
-//
-// Structural type restrictions of a type parameter are created via
-// non-interface types embedded in its constraint interface (directly, or via a
-// chain of interface embeddings). For example, in the declaration type
-// T[P interface{~int; m()}] int the structural restriction of the type
-// parameter P is ~int.
-//
-// With interface embedding and unions, the specification of structural type
-// restrictions may be arbitrarily complex. For example, consider the
-// following:
-//
-//	type A interface{ ~string|~[]byte }
-//
-//	type B interface{ int|string }
-//
-//	type C interface { ~string|~int }
-//
-//	type T[P interface{ A|B; C }] int
-//
-// In this example, the structural type restriction of P is ~string|int: A|B
-// expands to ~string|~[]byte|int|string, which reduces to ~string|~[]byte|int,
-// which when intersected with C (~string|~int) yields ~string|int.
-//
-// NormalTerms computes these expansions and reductions, producing a
-// "normalized" form of the embeddings. A structural restriction is normalized
-// if it is a single union containing no interface terms, and is minimal in the
-// sense that removing any term changes the set of types satisfying the
-// constraint. It is left as a proof for the reader that, modulo sorting, there
-// is exactly one such normalized form.
-//
-// Because the minimal representation always takes this form, NormalTerms
-// returns a slice of tilde terms corresponding to the terms of the union in
-// the normalized structural restriction. An error is returned if the type is
-// invalid, exceeds complexity bounds, or has an empty type set. In the latter
-// case, NormalTerms returns ErrEmptyTypeSet.
-//
-// NormalTerms makes no guarantees about the order of terms, except that it
-// is deterministic.
-func NormalTerms(T types.Type) ([]*types.Term, error) {
-	// typeSetOf(T) == typeSetOf(Unalias(T))
-	typ := types.Unalias(T)
-	if named, ok := typ.(*types.Named); ok {
-		typ = named.Underlying()
-	}
-	switch typ := typ.(type) {
-	case *types.TypeParam:
-		return StructuralTerms(typ)
-	case *types.Union:
-		return UnionTermSet(typ)
-	case *types.Interface:
-		return InterfaceTermSet(typ)
-	default:
-		return []*types.Term{types.NewTerm(false, T)}, nil
-	}
-}
-
-// Deref returns the type of the variable pointed to by t,
-// if t's core type is a pointer; otherwise it returns t.
-//
-// Do not assume that Deref(T)==T implies T is not a pointer:
-// consider "type T *T", for example.
-//
-// TODO(adonovan): ideally this would live in typesinternal, but that
-// creates an import cycle. Move there when we melt this package down.
-func Deref(t types.Type) types.Type {
-	if ptr, ok := CoreType(t).(*types.Pointer); ok {
-		return ptr.Elem()
-	}
-	return t
-}
-
-// MustDeref returns the type of the variable pointed to by t.
-// It panics if t's core type is not a pointer.
-//
-// TODO(adonovan): ideally this would live in typesinternal, but that
-// creates an import cycle. Move there when we melt this package down.
-func MustDeref(t types.Type) types.Type {
-	if ptr, ok := CoreType(t).(*types.Pointer); ok {
-		return ptr.Elem()
-	}
-	panic(fmt.Sprintf("%v is not a pointer", t))
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/free.go b/vendor/golang.org/x/tools/internal/typeparams/free.go
deleted file mode 100644
index 709d2fc..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/free.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeparams
-
-import (
-	"go/types"
-
-	"golang.org/x/tools/internal/aliases"
-)
-
-// Free is a memoization of the set of free type parameters within a
-// type. It makes a sequence of calls to [Free.Has] for overlapping
-// types more efficient. The zero value is ready for use.
-//
-// NOTE: Adapted from go/types/infer.go. If it is later exported, factor.
-type Free struct {
-	seen map[types.Type]bool
-}
-
-// Has reports whether the specified type has a free type parameter.
-func (w *Free) Has(typ types.Type) (res bool) {
-	// detect cycles
-	if x, ok := w.seen[typ]; ok {
-		return x
-	}
-	if w.seen == nil {
-		w.seen = make(map[types.Type]bool)
-	}
-	w.seen[typ] = false
-	defer func() {
-		w.seen[typ] = res
-	}()
-
-	switch t := typ.(type) {
-	case nil, *types.Basic: // TODO(gri) should nil be handled here?
-		break
-
-	case *types.Alias:
-		if aliases.TypeParams(t).Len() > aliases.TypeArgs(t).Len() {
-			return true // This is an uninstantiated Alias.
-		}
-		// The expansion of an alias can have free type parameters,
-		// whether or not the alias itself has type parameters:
-		//
-		//   func _[K comparable]() {
-		//     type Set      = map[K]bool // free(Set)      = {K}
-		//     type MapTo[V] = map[K]V    // free(Map[foo]) = {V}
-		//   }
-		//
-		// So, we must Unalias.
-		return w.Has(types.Unalias(t))
-
-	case *types.Array:
-		return w.Has(t.Elem())
-
-	case *types.Slice:
-		return w.Has(t.Elem())
-
-	case *types.Struct:
-		for i, n := 0, t.NumFields(); i < n; i++ {
-			if w.Has(t.Field(i).Type()) {
-				return true
-			}
-		}
-
-	case *types.Pointer:
-		return w.Has(t.Elem())
-
-	case *types.Tuple:
-		n := t.Len()
-		for i := range n {
-			if w.Has(t.At(i).Type()) {
-				return true
-			}
-		}
-
-	case *types.Signature:
-		// t.tparams may not be nil if we are looking at a signature
-		// of a generic function type (or an interface method) that is
-		// part of the type we're testing. We don't care about these type
-		// parameters.
-		// Similarly, the receiver of a method may declare (rather than
-		// use) type parameters, we don't care about those either.
-		// Thus, we only need to look at the input and result parameters.
-		return w.Has(t.Params()) || w.Has(t.Results())
-
-	case *types.Interface:
-		for i, n := 0, t.NumMethods(); i < n; i++ {
-			if w.Has(t.Method(i).Type()) {
-				return true
-			}
-		}
-		terms, err := InterfaceTermSet(t)
-		if err != nil {
-			return false // ill typed
-		}
-		for _, term := range terms {
-			if w.Has(term.Type()) {
-				return true
-			}
-		}
-
-	case *types.Map:
-		return w.Has(t.Key()) || w.Has(t.Elem())
-
-	case *types.Chan:
-		return w.Has(t.Elem())
-
-	case *types.Named:
-		args := t.TypeArgs()
-		if params := t.TypeParams(); params.Len() > args.Len() {
-			return true // this is an uninstantiated named type.
-		}
-		for i, n := 0, args.Len(); i < n; i++ {
-			if w.Has(args.At(i)) {
-				return true
-			}
-		}
-		return w.Has(t.Underlying()) // recurse for types local to parameterized functions
-
-	case *types.TypeParam:
-		return true
-
-	default:
-		panic(t) // unreachable
-	}
-
-	return false
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/normalize.go b/vendor/golang.org/x/tools/internal/typeparams/normalize.go
deleted file mode 100644
index f49802b..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/normalize.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeparams
-
-import (
-	"errors"
-	"fmt"
-	"go/types"
-	"os"
-	"strings"
-)
-
-//go:generate go run copytermlist.go
-
-const debug = false
-
-var ErrEmptyTypeSet = errors.New("empty type set")
-
-// StructuralTerms returns a slice of terms representing the normalized
-// structural type restrictions of a type parameter, if any.
-//
-// Structural type restrictions of a type parameter are created via
-// non-interface types embedded in its constraint interface (directly, or via a
-// chain of interface embeddings). For example, in the declaration
-//
-//	type T[P interface{~int; m()}] int
-//
-// the structural restriction of the type parameter P is ~int.
-//
-// With interface embedding and unions, the specification of structural type
-// restrictions may be arbitrarily complex. For example, consider the
-// following:
-//
-//	type A interface{ ~string|~[]byte }
-//
-//	type B interface{ int|string }
-//
-//	type C interface { ~string|~int }
-//
-//	type T[P interface{ A|B; C }] int
-//
-// In this example, the structural type restriction of P is ~string|int: A|B
-// expands to ~string|~[]byte|int|string, which reduces to ~string|~[]byte|int,
-// which when intersected with C (~string|~int) yields ~string|int.
-//
-// StructuralTerms computes these expansions and reductions, producing a
-// "normalized" form of the embeddings. A structural restriction is normalized
-// if it is a single union containing no interface terms, and is minimal in the
-// sense that removing any term changes the set of types satisfying the
-// constraint. It is left as a proof for the reader that, modulo sorting, there
-// is exactly one such normalized form.
-//
-// Because the minimal representation always takes this form, StructuralTerms
-// returns a slice of tilde terms corresponding to the terms of the union in
-// the normalized structural restriction. An error is returned if the
-// constraint interface is invalid, exceeds complexity bounds, or has an empty
-// type set. In the latter case, StructuralTerms returns ErrEmptyTypeSet.
-//
-// StructuralTerms makes no guarantees about the order of terms, except that it
-// is deterministic.
-func StructuralTerms(tparam *types.TypeParam) ([]*types.Term, error) {
-	constraint := tparam.Constraint()
-	if constraint == nil {
-		return nil, fmt.Errorf("%s has nil constraint", tparam)
-	}
-	iface, _ := constraint.Underlying().(*types.Interface)
-	if iface == nil {
-		return nil, fmt.Errorf("constraint is %T, not *types.Interface", constraint.Underlying())
-	}
-	return InterfaceTermSet(iface)
-}
-
-// InterfaceTermSet computes the normalized terms for a constraint interface,
-// returning an error if the term set cannot be computed or is empty. In the
-// latter case, the error will be ErrEmptyTypeSet.
-//
-// See the documentation of StructuralTerms for more information on
-// normalization.
-func InterfaceTermSet(iface *types.Interface) ([]*types.Term, error) {
-	return computeTermSet(iface)
-}
-
-// UnionTermSet computes the normalized terms for a union, returning an error
-// if the term set cannot be computed or is empty. In the latter case, the
-// error will be ErrEmptyTypeSet.
-//
-// See the documentation of StructuralTerms for more information on
-// normalization.
-func UnionTermSet(union *types.Union) ([]*types.Term, error) {
-	return computeTermSet(union)
-}
-
-func computeTermSet(typ types.Type) ([]*types.Term, error) {
-	tset, err := computeTermSetInternal(typ, make(map[types.Type]*termSet), 0)
-	if err != nil {
-		return nil, err
-	}
-	if tset.terms.isEmpty() {
-		return nil, ErrEmptyTypeSet
-	}
-	if tset.terms.isAll() {
-		return nil, nil
-	}
-	var terms []*types.Term
-	for _, term := range tset.terms {
-		terms = append(terms, types.NewTerm(term.tilde, term.typ))
-	}
-	return terms, nil
-}
-
-// A termSet holds the normalized set of terms for a given type.
-//
-// The name termSet is intentionally distinct from 'type set': a type set is
-// all types that implement a type (and includes method restrictions), whereas
-// a term set just represents the structural restrictions on a type.
-type termSet struct {
-	complete bool
-	terms    termlist
-}
-
-func indentf(depth int, format string, args ...any) {
-	fmt.Fprintf(os.Stderr, strings.Repeat(".", depth)+format+"\n", args...)
-}
-
-func computeTermSetInternal(t types.Type, seen map[types.Type]*termSet, depth int) (res *termSet, err error) {
-	if t == nil {
-		panic("nil type")
-	}
-
-	if debug {
-		indentf(depth, "%s", t.String())
-		defer func() {
-			if err != nil {
-				indentf(depth, "=> %s", err)
-			} else {
-				indentf(depth, "=> %s", res.terms.String())
-			}
-		}()
-	}
-
-	const maxTermCount = 100
-	if tset, ok := seen[t]; ok {
-		if !tset.complete {
-			return nil, fmt.Errorf("cycle detected in the declaration of %s", t)
-		}
-		return tset, nil
-	}
-
-	// Mark the current type as seen to avoid infinite recursion.
-	tset := new(termSet)
-	defer func() {
-		tset.complete = true
-	}()
-	seen[t] = tset
-
-	switch u := t.Underlying().(type) {
-	case *types.Interface:
-		// The term set of an interface is the intersection of the term sets of its
-		// embedded types.
-		tset.terms = allTermlist
-		for i := 0; i < u.NumEmbeddeds(); i++ {
-			embedded := u.EmbeddedType(i)
-			if _, ok := embedded.Underlying().(*types.TypeParam); ok {
-				return nil, fmt.Errorf("invalid embedded type %T", embedded)
-			}
-			tset2, err := computeTermSetInternal(embedded, seen, depth+1)
-			if err != nil {
-				return nil, err
-			}
-			tset.terms = tset.terms.intersect(tset2.terms)
-		}
-	case *types.Union:
-		// The term set of a union is the union of term sets of its terms.
-		tset.terms = nil
-		for i := 0; i < u.Len(); i++ {
-			t := u.Term(i)
-			var terms termlist
-			switch t.Type().Underlying().(type) {
-			case *types.Interface:
-				tset2, err := computeTermSetInternal(t.Type(), seen, depth+1)
-				if err != nil {
-					return nil, err
-				}
-				terms = tset2.terms
-			case *types.TypeParam, *types.Union:
-				// A stand-alone type parameter or union is not permitted as union
-				// term.
-				return nil, fmt.Errorf("invalid union term %T", t)
-			default:
-				if t.Type() == types.Typ[types.Invalid] {
-					continue
-				}
-				terms = termlist{{t.Tilde(), t.Type()}}
-			}
-			tset.terms = tset.terms.union(terms)
-			if len(tset.terms) > maxTermCount {
-				return nil, fmt.Errorf("exceeded max term count %d", maxTermCount)
-			}
-		}
-	case *types.TypeParam:
-		panic("unreachable")
-	default:
-		// For all other types, the term set is just a single non-tilde term
-		// holding the type itself.
-		if u != types.Typ[types.Invalid] {
-			tset.terms = termlist{{false, t}}
-		}
-	}
-	return tset, nil
-}
-
-// under is a facade for the go/types internal function of the same name. It is
-// used by typeterm.go.
-func under(t types.Type) types.Type {
-	return t.Underlying()
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/termlist.go b/vendor/golang.org/x/tools/internal/typeparams/termlist.go
deleted file mode 100644
index 9bc2914..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/termlist.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Code generated by "go test -run=Generate -write=all"; DO NOT EDIT.
-// Source: ../../cmd/compile/internal/types2/termlist.go
-
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by copytermlist.go DO NOT EDIT.
-
-package typeparams
-
-import (
-	"go/types"
-	"strings"
-)
-
-// A termlist represents the type set represented by the union
-// t1 ∪ y2 ∪ ... tn of the type sets of the terms t1 to tn.
-// A termlist is in normal form if all terms are disjoint.
-// termlist operations don't require the operands to be in
-// normal form.
-type termlist []*term
-
-// allTermlist represents the set of all types.
-// It is in normal form.
-var allTermlist = termlist{new(term)}
-
-// termSep is the separator used between individual terms.
-const termSep = " | "
-
-// String prints the termlist exactly (without normalization).
-func (xl termlist) String() string {
-	if len(xl) == 0 {
-		return "∅"
-	}
-	var buf strings.Builder
-	for i, x := range xl {
-		if i > 0 {
-			buf.WriteString(termSep)
-		}
-		buf.WriteString(x.String())
-	}
-	return buf.String()
-}
-
-// isEmpty reports whether the termlist xl represents the empty set of types.
-func (xl termlist) isEmpty() bool {
-	// If there's a non-nil term, the entire list is not empty.
-	// If the termlist is in normal form, this requires at most
-	// one iteration.
-	for _, x := range xl {
-		if x != nil {
-			return false
-		}
-	}
-	return true
-}
-
-// isAll reports whether the termlist xl represents the set of all types.
-func (xl termlist) isAll() bool {
-	// If there's a � term, the entire list is �.
-	// If the termlist is in normal form, this requires at most
-	// one iteration.
-	for _, x := range xl {
-		if x != nil && x.typ == nil {
-			return true
-		}
-	}
-	return false
-}
-
-// norm returns the normal form of xl.
-func (xl termlist) norm() termlist {
-	// Quadratic algorithm, but good enough for now.
-	// TODO(gri) fix asymptotic performance
-	used := make([]bool, len(xl))
-	var rl termlist
-	for i, xi := range xl {
-		if xi == nil || used[i] {
-			continue
-		}
-		for j := i + 1; j < len(xl); j++ {
-			xj := xl[j]
-			if xj == nil || used[j] {
-				continue
-			}
-			if u1, u2 := xi.union(xj); u2 == nil {
-				// If we encounter a � term, the entire list is �.
-				// Exit early.
-				// (Note that this is not just an optimization;
-				// if we continue, we may end up with a � term
-				// and other terms and the result would not be
-				// in normal form.)
-				if u1.typ == nil {
-					return allTermlist
-				}
-				xi = u1
-				used[j] = true // xj is now unioned into xi - ignore it in future iterations
-			}
-		}
-		rl = append(rl, xi)
-	}
-	return rl
-}
-
-// union returns the union xl ∪ yl.
-func (xl termlist) union(yl termlist) termlist {
-	return append(xl, yl...).norm()
-}
-
-// intersect returns the intersection xl ∩ yl.
-func (xl termlist) intersect(yl termlist) termlist {
-	if xl.isEmpty() || yl.isEmpty() {
-		return nil
-	}
-
-	// Quadratic algorithm, but good enough for now.
-	// TODO(gri) fix asymptotic performance
-	var rl termlist
-	for _, x := range xl {
-		for _, y := range yl {
-			if r := x.intersect(y); r != nil {
-				rl = append(rl, r)
-			}
-		}
-	}
-	return rl.norm()
-}
-
-// equal reports whether xl and yl represent the same type set.
-func (xl termlist) equal(yl termlist) bool {
-	// TODO(gri) this should be more efficient
-	return xl.subsetOf(yl) && yl.subsetOf(xl)
-}
-
-// includes reports whether t ∈ xl.
-func (xl termlist) includes(t types.Type) bool {
-	for _, x := range xl {
-		if x.includes(t) {
-			return true
-		}
-	}
-	return false
-}
-
-// supersetOf reports whether y ⊆ xl.
-func (xl termlist) supersetOf(y *term) bool {
-	for _, x := range xl {
-		if y.subsetOf(x) {
-			return true
-		}
-	}
-	return false
-}
-
-// subsetOf reports whether xl ⊆ yl.
-func (xl termlist) subsetOf(yl termlist) bool {
-	if yl.isEmpty() {
-		return xl.isEmpty()
-	}
-
-	// each term x of xl must be a subset of yl
-	for _, x := range xl {
-		if !yl.supersetOf(x) {
-			return false // x is not a subset yl
-		}
-	}
-	return true
-}
diff --git a/vendor/golang.org/x/tools/internal/typeparams/typeterm.go b/vendor/golang.org/x/tools/internal/typeparams/typeterm.go
deleted file mode 100644
index fa758cd..0000000
--- a/vendor/golang.org/x/tools/internal/typeparams/typeterm.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Code generated by "go test -run=Generate -write=all"; DO NOT EDIT.
-// Source: ../../cmd/compile/internal/types2/typeterm.go
-
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by copytermlist.go DO NOT EDIT.
-
-package typeparams
-
-import "go/types"
-
-// A term describes elementary type sets:
-//
-//	 ∅:  (*term)(nil)     == ∅                      // set of no types (empty set)
-//	 �:  &term{}          == �                      // set of all types (�niverse)
-//	 T:  &term{false, T}  == {T}                    // set of type T
-//	~t:  &term{true, t}   == {t' | under(t') == t}  // set of types with underlying type t
-type term struct {
-	tilde bool // valid if typ != nil
-	typ   types.Type
-}
-
-func (x *term) String() string {
-	switch {
-	case x == nil:
-		return "∅"
-	case x.typ == nil:
-		return "�"
-	case x.tilde:
-		return "~" + x.typ.String()
-	default:
-		return x.typ.String()
-	}
-}
-
-// equal reports whether x and y represent the same type set.
-func (x *term) equal(y *term) bool {
-	// easy cases
-	switch {
-	case x == nil || y == nil:
-		return x == y
-	case x.typ == nil || y.typ == nil:
-		return x.typ == y.typ
-	}
-	// ∅ ⊂ x, y ⊂ �
-
-	return x.tilde == y.tilde && types.Identical(x.typ, y.typ)
-}
-
-// union returns the union x ∪ y: zero, one, or two non-nil terms.
-func (x *term) union(y *term) (_, _ *term) {
-	// easy cases
-	switch {
-	case x == nil && y == nil:
-		return nil, nil // ∅ ∪ ∅ == ∅
-	case x == nil:
-		return y, nil // ∅ ∪ y == y
-	case y == nil:
-		return x, nil // x ∪ ∅ == x
-	case x.typ == nil:
-		return x, nil // � ∪ y == �
-	case y.typ == nil:
-		return y, nil // x ∪ � == �
-	}
-	// ∅ ⊂ x, y ⊂ �
-
-	if x.disjoint(y) {
-		return x, y // x ∪ y == (x, y) if x ∩ y == ∅
-	}
-	// x.typ == y.typ
-
-	// ~t ∪ ~t == ~t
-	// ~t ∪  T == ~t
-	//  T ∪ ~t == ~t
-	//  T ∪  T ==  T
-	if x.tilde || !y.tilde {
-		return x, nil
-	}
-	return y, nil
-}
-
-// intersect returns the intersection x ∩ y.
-func (x *term) intersect(y *term) *term {
-	// easy cases
-	switch {
-	case x == nil || y == nil:
-		return nil // ∅ ∩ y == ∅ and ∩ ∅ == ∅
-	case x.typ == nil:
-		return y // � ∩ y == y
-	case y.typ == nil:
-		return x // x ∩ � == x
-	}
-	// ∅ ⊂ x, y ⊂ �
-
-	if x.disjoint(y) {
-		return nil // x ∩ y == ∅ if x ∩ y == ∅
-	}
-	// x.typ == y.typ
-
-	// ~t ∩ ~t == ~t
-	// ~t ∩  T ==  T
-	//  T ∩ ~t ==  T
-	//  T ∩  T ==  T
-	if !x.tilde || y.tilde {
-		return x
-	}
-	return y
-}
-
-// includes reports whether t ∈ x.
-func (x *term) includes(t types.Type) bool {
-	// easy cases
-	switch {
-	case x == nil:
-		return false // t ∈ ∅ == false
-	case x.typ == nil:
-		return true // t ∈ � == true
-	}
-	// ∅ ⊂ x ⊂ �
-
-	u := t
-	if x.tilde {
-		u = under(u)
-	}
-	return types.Identical(x.typ, u)
-}
-
-// subsetOf reports whether x ⊆ y.
-func (x *term) subsetOf(y *term) bool {
-	// easy cases
-	switch {
-	case x == nil:
-		return true // ∅ ⊆ y == true
-	case y == nil:
-		return false // x ⊆ ∅ == false since x != ∅
-	case y.typ == nil:
-		return true // x ⊆ � == true
-	case x.typ == nil:
-		return false // � ⊆ y == false since y != �
-	}
-	// ∅ ⊂ x, y ⊂ �
-
-	if x.disjoint(y) {
-		return false // x ⊆ y == false if x ∩ y == ∅
-	}
-	// x.typ == y.typ
-
-	// ~t ⊆ ~t == true
-	// ~t ⊆ T == false
-	//  T ⊆ ~t == true
-	//  T ⊆  T == true
-	return !x.tilde || y.tilde
-}
-
-// disjoint reports whether x ∩ y == ∅.
-// x.typ and y.typ must not be nil.
-func (x *term) disjoint(y *term) bool {
-	if debug && (x.typ == nil || y.typ == nil) {
-		panic("invalid argument(s)")
-	}
-	ux := x.typ
-	if y.tilde {
-		ux = under(ux)
-	}
-	uy := y.typ
-	if x.tilde {
-		uy = under(uy)
-	}
-	return !types.Identical(ux, uy)
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/classify_call.go b/vendor/golang.org/x/tools/internal/typesinternal/classify_call.go
deleted file mode 100644
index 3db2a13..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/classify_call.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"fmt"
-	"go/ast"
-	"go/types"
-	_ "unsafe"
-)
-
-// CallKind describes the function position of an [*ast.CallExpr].
-type CallKind int
-
-const (
-	CallStatic     CallKind = iota // static call to known function
-	CallInterface                  // dynamic call through an interface method
-	CallDynamic                    // dynamic call of a func value
-	CallBuiltin                    // call to a builtin function
-	CallConversion                 // a conversion (not a call)
-)
-
-var callKindNames = []string{
-	"CallStatic",
-	"CallInterface",
-	"CallDynamic",
-	"CallBuiltin",
-	"CallConversion",
-}
-
-func (k CallKind) String() string {
-	if i := int(k); i >= 0 && i < len(callKindNames) {
-		return callKindNames[i]
-	}
-	return fmt.Sprintf("typeutil.CallKind(%d)", k)
-}
-
-// ClassifyCall classifies the function position of a call expression ([*ast.CallExpr]).
-// It distinguishes among true function calls, calls to builtins, and type conversions,
-// and further classifies function calls as static calls (where the function is known),
-// dynamic interface calls, and other dynamic calls.
-//
-// For the declarations:
-//
-//	func f() {}
-//	func g[T any]() {}
-//	var v func()
-//	var s []func()
-//	type I interface { M() }
-//	var i I
-//
-// ClassifyCall returns the following:
-//
-//	f()           CallStatic
-//	g[int]()      CallStatic
-//	i.M()         CallInterface
-//	min(1, 2)     CallBuiltin
-//	v()           CallDynamic
-//	s[0]()        CallDynamic
-//	int(x)        CallConversion
-//	[]byte("")    CallConversion
-func ClassifyCall(info *types.Info, call *ast.CallExpr) CallKind {
-	if info.Types == nil {
-		panic("ClassifyCall: info.Types is nil")
-	}
-	tv := info.Types[call.Fun]
-	if tv.IsType() {
-		return CallConversion
-	}
-	if tv.IsBuiltin() {
-		return CallBuiltin
-	}
-	obj := info.Uses[UsedIdent(info, call.Fun)]
-	// Classify the call by the type of the object, if any.
-	switch obj := obj.(type) {
-	case *types.Func:
-		if interfaceMethod(obj) {
-			return CallInterface
-		}
-		return CallStatic
-	default:
-		return CallDynamic
-	}
-}
-
-// UsedIdent returns the identifier such that info.Uses[UsedIdent(info, e)]
-// is the [types.Object] used by e, if any.
-//
-// If e is one of various forms of reference:
-//
-//	f, c, v, T           lexical reference
-//	pkg.X                qualified identifier
-//	f[T] or pkg.F[K,V]   instantiations of the above kinds
-//	expr.f               field or method value selector
-//	T.f                  method expression selector
-//
-// UsedIdent returns the identifier whose is associated value in [types.Info.Uses]
-// is the object to which it refers.
-//
-// For the declarations:
-//
-//	func F[T any] {...}
-//	type I interface { M() }
-//	var (
-//	  x int
-//	  s struct { f  int }
-//	  a []int
-//	  i I
-//	)
-//
-// UsedIdent returns the following:
-//
-//	Expr          UsedIdent
-//	x             x
-//	s.f           f
-//	F[int]        F
-//	i.M           M
-//	I.M           M
-//	min           min
-//	int           int
-//	1             nil
-//	a[0]          nil
-//	[]byte        nil
-//
-// Note: if e is an instantiated function or method, UsedIdent returns
-// the corresponding generic function or method on the generic type.
-func UsedIdent(info *types.Info, e ast.Expr) *ast.Ident {
-	return usedIdent(info, e)
-}
-
-//go:linkname usedIdent golang.org/x/tools/go/types/typeutil.usedIdent
-func usedIdent(info *types.Info, e ast.Expr) *ast.Ident
-
-//go:linkname interfaceMethod golang.org/x/tools/go/types/typeutil.interfaceMethod
-func interfaceMethod(f *types.Func) bool
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/element.go b/vendor/golang.org/x/tools/internal/typesinternal/element.go
deleted file mode 100644
index 4957f02..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/element.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"fmt"
-	"go/types"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// ForEachElement calls f for type T and each type reachable from its
-// type through reflection. It does this by recursively stripping off
-// type constructors; in addition, for each named type N, the type *N
-// is added to the result as it may have additional methods.
-//
-// The caller must provide an initially empty set used to de-duplicate
-// identical types, potentially across multiple calls to ForEachElement.
-// (Its final value holds all the elements seen, matching the arguments
-// passed to f.)
-//
-// TODO(adonovan): share/harmonize with go/callgraph/rta.
-func ForEachElement(rtypes *typeutil.Map, msets *typeutil.MethodSetCache, T types.Type, f func(types.Type)) {
-	var visit func(T types.Type, skip bool)
-	visit = func(T types.Type, skip bool) {
-		if !skip {
-			if seen, _ := rtypes.Set(T, true).(bool); seen {
-				return // de-dup
-			}
-
-			f(T) // notify caller of new element type
-		}
-
-		// Recursion over signatures of each method.
-		tmset := msets.MethodSet(T)
-		for i := 0; i < tmset.Len(); i++ {
-			sig := tmset.At(i).Type().(*types.Signature)
-			// It is tempting to call visit(sig, false)
-			// but, as noted in golang.org/cl/65450043,
-			// the Signature.Recv field is ignored by
-			// types.Identical and typeutil.Map, which
-			// is confusing at best.
-			//
-			// More importantly, the true signature rtype
-			// reachable from a method using reflection
-			// has no receiver but an extra ordinary parameter.
-			// For the Read method of io.Reader we want:
-			//   func(Reader, []byte) (int, error)
-			// but here sig is:
-			//   func([]byte) (int, error)
-			// with .Recv = Reader (though it is hard to
-			// notice because it doesn't affect Signature.String
-			// or types.Identical).
-			//
-			// TODO(adonovan): construct and visit the correct
-			// non-method signature with an extra parameter
-			// (though since unnamed func types have no methods
-			// there is essentially no actual demand for this).
-			//
-			// TODO(adonovan): document whether or not it is
-			// safe to skip non-exported methods (as RTA does).
-			visit(sig.Params(), true)  // skip the Tuple
-			visit(sig.Results(), true) // skip the Tuple
-		}
-
-		switch T := T.(type) {
-		case *types.Alias:
-			visit(types.Unalias(T), skip) // emulates the pre-Alias behavior
-
-		case *types.Basic:
-			// nop
-
-		case *types.Interface:
-			// nop---handled by recursion over method set.
-
-		case *types.Pointer:
-			visit(T.Elem(), false)
-
-		case *types.Slice:
-			visit(T.Elem(), false)
-
-		case *types.Chan:
-			visit(T.Elem(), false)
-
-		case *types.Map:
-			visit(T.Key(), false)
-			visit(T.Elem(), false)
-
-		case *types.Signature:
-			if T.Recv() != nil {
-				panic(fmt.Sprintf("Signature %s has Recv %s", T, T.Recv()))
-			}
-			visit(T.Params(), true)  // skip the Tuple
-			visit(T.Results(), true) // skip the Tuple
-
-		case *types.Named:
-			// A pointer-to-named type can be derived from a named
-			// type via reflection.  It may have methods too.
-			visit(types.NewPointer(T), false)
-
-			// Consider 'type T struct{S}' where S has methods.
-			// Reflection provides no way to get from T to struct{S},
-			// only to S, so the method set of struct{S} is unwanted,
-			// so set 'skip' flag during recursion.
-			visit(T.Underlying(), true) // skip the unnamed type
-
-		case *types.Array:
-			visit(T.Elem(), false)
-
-		case *types.Struct:
-			for i, n := 0, T.NumFields(); i < n; i++ {
-				// TODO(adonovan): document whether or not
-				// it is safe to skip non-exported fields.
-				visit(T.Field(i).Type(), false)
-			}
-
-		case *types.Tuple:
-			for i, n := 0, T.Len(); i < n; i++ {
-				visit(T.At(i).Type(), false)
-			}
-
-		case *types.TypeParam, *types.Union:
-			// forEachReachable must not be called on parameterized types.
-			panic(T)
-
-		default:
-			panic(T)
-		}
-	}
-	visit(T, false)
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
deleted file mode 100644
index 235a6de..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
+++ /dev/null
@@ -1,1560 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-//go:generate stringer -type=ErrorCode
-
-type ErrorCode int
-
-// This file defines the error codes that can be produced during type-checking.
-// Collectively, these codes provide an identifier that may be used to
-// implement special handling for certain types of errors.
-//
-// Error codes should be fine-grained enough that the exact nature of the error
-// can be easily determined, but coarse enough that they are not an
-// implementation detail of the type checking algorithm. As a rule-of-thumb,
-// errors should be considered equivalent if there is a theoretical refactoring
-// of the type checker in which they are emitted in exactly one place. For
-// example, the type checker emits different error messages for "too many
-// arguments" and "too few arguments", but one can imagine an alternative type
-// checker where this check instead just emits a single "wrong number of
-// arguments", so these errors should have the same code.
-//
-// Error code names should be as brief as possible while retaining accuracy and
-// distinctiveness. In most cases names should start with an adjective
-// describing the nature of the error (e.g. "invalid", "unused", "misplaced"),
-// and end with a noun identifying the relevant language object. For example,
-// "DuplicateDecl" or "InvalidSliceExpr". For brevity, naming follows the
-// convention that "bad" implies a problem with syntax, and "invalid" implies a
-// problem with types.
-
-const (
-	// InvalidSyntaxTree occurs if an invalid syntax tree is provided
-	// to the type checker. It should never happen.
-	InvalidSyntaxTree ErrorCode = -1
-)
-
-const (
-	_ ErrorCode = iota
-
-	// Test is reserved for errors that only apply while in self-test mode.
-	Test
-
-	/* package names */
-
-	// BlankPkgName occurs when a package name is the blank identifier "_".
-	//
-	// Per the spec:
-	//  "The PackageName must not be the blank identifier."
-	BlankPkgName
-
-	// MismatchedPkgName occurs when a file's package name doesn't match the
-	// package name already established by other files.
-	MismatchedPkgName
-
-	// InvalidPkgUse occurs when a package identifier is used outside of a
-	// selector expression.
-	//
-	// Example:
-	//  import "fmt"
-	//
-	//  var _ = fmt
-	InvalidPkgUse
-
-	/* imports */
-
-	// BadImportPath occurs when an import path is not valid.
-	BadImportPath
-
-	// BrokenImport occurs when importing a package fails.
-	//
-	// Example:
-	//  import "amissingpackage"
-	BrokenImport
-
-	// ImportCRenamed occurs when the special import "C" is renamed. "C" is a
-	// pseudo-package, and must not be renamed.
-	//
-	// Example:
-	//  import _ "C"
-	ImportCRenamed
-
-	// UnusedImport occurs when an import is unused.
-	//
-	// Example:
-	//  import "fmt"
-	//
-	//  func main() {}
-	UnusedImport
-
-	/* initialization */
-
-	// InvalidInitCycle occurs when an invalid cycle is detected within the
-	// initialization graph.
-	//
-	// Example:
-	//  var x int = f()
-	//
-	//  func f() int { return x }
-	InvalidInitCycle
-
-	/* decls */
-
-	// DuplicateDecl occurs when an identifier is declared multiple times.
-	//
-	// Example:
-	//  var x = 1
-	//  var x = 2
-	DuplicateDecl
-
-	// InvalidDeclCycle occurs when a declaration cycle is not valid.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  type T struct {
-	//  	a [n]int
-	//  }
-	//
-	//  var n = unsafe.Sizeof(T{})
-	InvalidDeclCycle
-
-	// InvalidTypeCycle occurs when a cycle in type definitions results in a
-	// type that is not well-defined.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  type T [unsafe.Sizeof(T{})]int
-	InvalidTypeCycle
-
-	/* decls > const */
-
-	// InvalidConstInit occurs when a const declaration has a non-constant
-	// initializer.
-	//
-	// Example:
-	//  var x int
-	//  const _ = x
-	InvalidConstInit
-
-	// InvalidConstVal occurs when a const value cannot be converted to its
-	// target type.
-	//
-	// TODO(findleyr): this error code and example are not very clear. Consider
-	// removing it.
-	//
-	// Example:
-	//  const _ = 1 << "hello"
-	InvalidConstVal
-
-	// InvalidConstType occurs when the underlying type in a const declaration
-	// is not a valid constant type.
-	//
-	// Example:
-	//  const c *int = 4
-	InvalidConstType
-
-	/* decls > var (+ other variable assignment codes) */
-
-	// UntypedNilUse occurs when the predeclared (untyped) value nil is used to
-	// initialize a variable declared without an explicit type.
-	//
-	// Example:
-	//  var x = nil
-	UntypedNilUse
-
-	// WrongAssignCount occurs when the number of values on the right-hand side
-	// of an assignment or initialization expression does not match the number
-	// of variables on the left-hand side.
-	//
-	// Example:
-	//  var x = 1, 2
-	WrongAssignCount
-
-	// UnassignableOperand occurs when the left-hand side of an assignment is
-	// not assignable.
-	//
-	// Example:
-	//  func f() {
-	//  	const c = 1
-	//  	c = 2
-	//  }
-	UnassignableOperand
-
-	// NoNewVar occurs when a short variable declaration (':=') does not declare
-	// new variables.
-	//
-	// Example:
-	//  func f() {
-	//  	x := 1
-	//  	x := 2
-	//  }
-	NoNewVar
-
-	// MultiValAssignOp occurs when an assignment operation (+=, *=, etc) does
-	// not have single-valued left-hand or right-hand side.
-	//
-	// Per the spec:
-	//  "In assignment operations, both the left- and right-hand expression lists
-	//  must contain exactly one single-valued expression"
-	//
-	// Example:
-	//  func f() int {
-	//  	x, y := 1, 2
-	//  	x, y += 1
-	//  	return x + y
-	//  }
-	MultiValAssignOp
-
-	// InvalidIfaceAssign occurs when a value of type T is used as an
-	// interface, but T does not implement a method of the expected interface.
-	//
-	// Example:
-	//  type I interface {
-	//  	f()
-	//  }
-	//
-	//  type T int
-	//
-	//  var x I = T(1)
-	InvalidIfaceAssign
-
-	// InvalidChanAssign occurs when a chan assignment is invalid.
-	//
-	// Per the spec, a value x is assignable to a channel type T if:
-	//  "x is a bidirectional channel value, T is a channel type, x's type V and
-	//  T have identical element types, and at least one of V or T is not a
-	//  defined type."
-	//
-	// Example:
-	//  type T1 chan int
-	//  type T2 chan int
-	//
-	//  var x T1
-	//  // Invalid assignment because both types are named
-	//  var _ T2 = x
-	InvalidChanAssign
-
-	// IncompatibleAssign occurs when the type of the right-hand side expression
-	// in an assignment cannot be assigned to the type of the variable being
-	// assigned.
-	//
-	// Example:
-	//  var x []int
-	//  var _ int = x
-	IncompatibleAssign
-
-	// UnaddressableFieldAssign occurs when trying to assign to a struct field
-	// in a map value.
-	//
-	// Example:
-	//  func f() {
-	//  	m := make(map[string]struct{i int})
-	//  	m["foo"].i = 42
-	//  }
-	UnaddressableFieldAssign
-
-	/* decls > type (+ other type expression codes) */
-
-	// NotAType occurs when the identifier used as the underlying type in a type
-	// declaration or the right-hand side of a type alias does not denote a type.
-	//
-	// Example:
-	//  var S = 2
-	//
-	//  type T S
-	NotAType
-
-	// InvalidArrayLen occurs when an array length is not a constant value.
-	//
-	// Example:
-	//  var n = 3
-	//  var _ = [n]int{}
-	InvalidArrayLen
-
-	// BlankIfaceMethod occurs when a method name is '_'.
-	//
-	// Per the spec:
-	//  "The name of each explicitly specified method must be unique and not
-	//  blank."
-	//
-	// Example:
-	//  type T interface {
-	//  	_(int)
-	//  }
-	BlankIfaceMethod
-
-	// IncomparableMapKey occurs when a map key type does not support the == and
-	// != operators.
-	//
-	// Per the spec:
-	//  "The comparison operators == and != must be fully defined for operands of
-	//  the key type; thus the key type must not be a function, map, or slice."
-	//
-	// Example:
-	//  var x map[T]int
-	//
-	//  type T []int
-	IncomparableMapKey
-
-	// InvalidIfaceEmbed occurs when a non-interface type is embedded in an
-	// interface.
-	//
-	// Example:
-	//  type T struct {}
-	//
-	//  func (T) m()
-	//
-	//  type I interface {
-	//  	T
-	//  }
-	InvalidIfaceEmbed
-
-	// InvalidPtrEmbed occurs when an embedded field is of the pointer form *T,
-	// and T itself is itself a pointer, an unsafe.Pointer, or an interface.
-	//
-	// Per the spec:
-	//  "An embedded field must be specified as a type name T or as a pointer to
-	//  a non-interface type name *T, and T itself may not be a pointer type."
-	//
-	// Example:
-	//  type T *int
-	//
-	//  type S struct {
-	//  	*T
-	//  }
-	InvalidPtrEmbed
-
-	/* decls > func and method */
-
-	// BadRecv occurs when a method declaration does not have exactly one
-	// receiver parameter.
-	//
-	// Example:
-	//  func () _() {}
-	BadRecv
-
-	// InvalidRecv occurs when a receiver type expression is not of the form T
-	// or *T, or T is a pointer type.
-	//
-	// Example:
-	//  type T struct {}
-	//
-	//  func (**T) m() {}
-	InvalidRecv
-
-	// DuplicateFieldAndMethod occurs when an identifier appears as both a field
-	// and method name.
-	//
-	// Example:
-	//  type T struct {
-	//  	m int
-	//  }
-	//
-	//  func (T) m() {}
-	DuplicateFieldAndMethod
-
-	// DuplicateMethod occurs when two methods on the same receiver type have
-	// the same name.
-	//
-	// Example:
-	//  type T struct {}
-	//  func (T) m() {}
-	//  func (T) m(i int) int { return i }
-	DuplicateMethod
-
-	/* decls > special */
-
-	// InvalidBlank occurs when a blank identifier is used as a value or type.
-	//
-	// Per the spec:
-	//  "The blank identifier may appear as an operand only on the left-hand side
-	//  of an assignment."
-	//
-	// Example:
-	//  var x = _
-	InvalidBlank
-
-	// InvalidIota occurs when the predeclared identifier iota is used outside
-	// of a constant declaration.
-	//
-	// Example:
-	//  var x = iota
-	InvalidIota
-
-	// MissingInitBody occurs when an init function is missing its body.
-	//
-	// Example:
-	//  func init()
-	MissingInitBody
-
-	// InvalidInitSig occurs when an init function declares parameters or
-	// results.
-	//
-	// Example:
-	//  func init() int { return 1 }
-	InvalidInitSig
-
-	// InvalidInitDecl occurs when init is declared as anything other than a
-	// function.
-	//
-	// Example:
-	//  var init = 1
-	InvalidInitDecl
-
-	// InvalidMainDecl occurs when main is declared as anything other than a
-	// function, in a main package.
-	InvalidMainDecl
-
-	/* exprs */
-
-	// TooManyValues occurs when a function returns too many values for the
-	// expression context in which it is used.
-	//
-	// Example:
-	//  func ReturnTwo() (int, int) {
-	//  	return 1, 2
-	//  }
-	//
-	//  var x = ReturnTwo()
-	TooManyValues
-
-	// NotAnExpr occurs when a type expression is used where a value expression
-	// is expected.
-	//
-	// Example:
-	//  type T struct {}
-	//
-	//  func f() {
-	//  	T
-	//  }
-	NotAnExpr
-
-	/* exprs > const */
-
-	// TruncatedFloat occurs when a float constant is truncated to an integer
-	// value.
-	//
-	// Example:
-	//  var _ int = 98.6
-	TruncatedFloat
-
-	// NumericOverflow occurs when a numeric constant overflows its target type.
-	//
-	// Example:
-	//  var x int8 = 1000
-	NumericOverflow
-
-	/* exprs > operation */
-
-	// UndefinedOp occurs when an operator is not defined for the type(s) used
-	// in an operation.
-	//
-	// Example:
-	//  var c = "a" - "b"
-	UndefinedOp
-
-	// MismatchedTypes occurs when operand types are incompatible in a binary
-	// operation.
-	//
-	// Example:
-	//  var a = "hello"
-	//  var b = 1
-	//  var c = a - b
-	MismatchedTypes
-
-	// DivByZero occurs when a division operation is provable at compile
-	// time to be a division by zero.
-	//
-	// Example:
-	//  const divisor = 0
-	//  var x int = 1/divisor
-	DivByZero
-
-	// NonNumericIncDec occurs when an increment or decrement operator is
-	// applied to a non-numeric value.
-	//
-	// Example:
-	//  func f() {
-	//  	var c = "c"
-	//  	c++
-	//  }
-	NonNumericIncDec
-
-	/* exprs > ptr */
-
-	// UnaddressableOperand occurs when the & operator is applied to an
-	// unaddressable expression.
-	//
-	// Example:
-	//  var x = &1
-	UnaddressableOperand
-
-	// InvalidIndirection occurs when a non-pointer value is indirected via the
-	// '*' operator.
-	//
-	// Example:
-	//  var x int
-	//  var y = *x
-	InvalidIndirection
-
-	/* exprs > [] */
-
-	// NonIndexableOperand occurs when an index operation is applied to a value
-	// that cannot be indexed.
-	//
-	// Example:
-	//  var x = 1
-	//  var y = x[1]
-	NonIndexableOperand
-
-	// InvalidIndex occurs when an index argument is not of integer type,
-	// negative, or out-of-bounds.
-	//
-	// Example:
-	//  var s = [...]int{1,2,3}
-	//  var x = s[5]
-	//
-	// Example:
-	//  var s = []int{1,2,3}
-	//  var _ = s[-1]
-	//
-	// Example:
-	//  var s = []int{1,2,3}
-	//  var i string
-	//  var _ = s[i]
-	InvalidIndex
-
-	// SwappedSliceIndices occurs when constant indices in a slice expression
-	// are decreasing in value.
-	//
-	// Example:
-	//  var _ = []int{1,2,3}[2:1]
-	SwappedSliceIndices
-
-	/* operators > slice */
-
-	// NonSliceableOperand occurs when a slice operation is applied to a value
-	// whose type is not sliceable, or is unaddressable.
-	//
-	// Example:
-	//  var x = [...]int{1, 2, 3}[:1]
-	//
-	// Example:
-	//  var x = 1
-	//  var y = 1[:1]
-	NonSliceableOperand
-
-	// InvalidSliceExpr occurs when a three-index slice expression (a[x:y:z]) is
-	// applied to a string.
-	//
-	// Example:
-	//  var s = "hello"
-	//  var x = s[1:2:3]
-	InvalidSliceExpr
-
-	/* exprs > shift */
-
-	// InvalidShiftCount occurs when the right-hand side of a shift operation is
-	// either non-integer, negative, or too large.
-	//
-	// Example:
-	//  var (
-	//  	x string
-	//  	y int = 1 << x
-	//  )
-	InvalidShiftCount
-
-	// InvalidShiftOperand occurs when the shifted operand is not an integer.
-	//
-	// Example:
-	//  var s = "hello"
-	//  var x = s << 2
-	InvalidShiftOperand
-
-	/* exprs > chan */
-
-	// InvalidReceive occurs when there is a channel receive from a value that
-	// is either not a channel, or is a send-only channel.
-	//
-	// Example:
-	//  func f() {
-	//  	var x = 1
-	//  	<-x
-	//  }
-	InvalidReceive
-
-	// InvalidSend occurs when there is a channel send to a value that is not a
-	// channel, or is a receive-only channel.
-	//
-	// Example:
-	//  func f() {
-	//  	var x = 1
-	//  	x <- "hello!"
-	//  }
-	InvalidSend
-
-	/* exprs > literal */
-
-	// DuplicateLitKey occurs when an index is duplicated in a slice, array, or
-	// map literal.
-	//
-	// Example:
-	//  var _ = []int{0:1, 0:2}
-	//
-	// Example:
-	//  var _ = map[string]int{"a": 1, "a": 2}
-	DuplicateLitKey
-
-	// MissingLitKey occurs when a map literal is missing a key expression.
-	//
-	// Example:
-	//  var _ = map[string]int{1}
-	MissingLitKey
-
-	// InvalidLitIndex occurs when the key in a key-value element of a slice or
-	// array literal is not an integer constant.
-	//
-	// Example:
-	//  var i = 0
-	//  var x = []string{i: "world"}
-	InvalidLitIndex
-
-	// OversizeArrayLit occurs when an array literal exceeds its length.
-	//
-	// Example:
-	//  var _ = [2]int{1,2,3}
-	OversizeArrayLit
-
-	// MixedStructLit occurs when a struct literal contains a mix of positional
-	// and named elements.
-	//
-	// Example:
-	//  var _ = struct{i, j int}{i: 1, 2}
-	MixedStructLit
-
-	// InvalidStructLit occurs when a positional struct literal has an incorrect
-	// number of values.
-	//
-	// Example:
-	//  var _ = struct{i, j int}{1,2,3}
-	InvalidStructLit
-
-	// MissingLitField occurs when a struct literal refers to a field that does
-	// not exist on the struct type.
-	//
-	// Example:
-	//  var _ = struct{i int}{j: 2}
-	MissingLitField
-
-	// DuplicateLitField occurs when a struct literal contains duplicated
-	// fields.
-	//
-	// Example:
-	//  var _ = struct{i int}{i: 1, i: 2}
-	DuplicateLitField
-
-	// UnexportedLitField occurs when a positional struct literal implicitly
-	// assigns an unexported field of an imported type.
-	UnexportedLitField
-
-	// InvalidLitField occurs when a field name is not a valid identifier.
-	//
-	// Example:
-	//  var _ = struct{i int}{1: 1}
-	InvalidLitField
-
-	// UntypedLit occurs when a composite literal omits a required type
-	// identifier.
-	//
-	// Example:
-	//  type outer struct{
-	//  	inner struct { i int }
-	//  }
-	//
-	//  var _ = outer{inner: {1}}
-	UntypedLit
-
-	// InvalidLit occurs when a composite literal expression does not match its
-	// type.
-	//
-	// Example:
-	//  type P *struct{
-	//  	x int
-	//  }
-	//  var _ = P {}
-	InvalidLit
-
-	/* exprs > selector */
-
-	// AmbiguousSelector occurs when a selector is ambiguous.
-	//
-	// Example:
-	//  type E1 struct { i int }
-	//  type E2 struct { i int }
-	//  type T struct { E1; E2 }
-	//
-	//  var x T
-	//  var _ = x.i
-	AmbiguousSelector
-
-	// UndeclaredImportedName occurs when a package-qualified identifier is
-	// undeclared by the imported package.
-	//
-	// Example:
-	//  import "go/types"
-	//
-	//  var _ = types.NotAnActualIdentifier
-	UndeclaredImportedName
-
-	// UnexportedName occurs when a selector refers to an unexported identifier
-	// of an imported package.
-	//
-	// Example:
-	//  import "reflect"
-	//
-	//  type _ reflect.flag
-	UnexportedName
-
-	// UndeclaredName occurs when an identifier is not declared in the current
-	// scope.
-	//
-	// Example:
-	//  var x T
-	UndeclaredName
-
-	// MissingFieldOrMethod occurs when a selector references a field or method
-	// that does not exist.
-	//
-	// Example:
-	//  type T struct {}
-	//
-	//  var x = T{}.f
-	MissingFieldOrMethod
-
-	/* exprs > ... */
-
-	// BadDotDotDotSyntax occurs when a "..." occurs in a context where it is
-	// not valid.
-	//
-	// Example:
-	//  var _ = map[int][...]int{0: {}}
-	BadDotDotDotSyntax
-
-	// NonVariadicDotDotDot occurs when a "..." is used on the final argument to
-	// a non-variadic function.
-	//
-	// Example:
-	//  func printArgs(s []string) {
-	//  	for _, a := range s {
-	//  		println(a)
-	//  	}
-	//  }
-	//
-	//  func f() {
-	//  	s := []string{"a", "b", "c"}
-	//  	printArgs(s...)
-	//  }
-	NonVariadicDotDotDot
-
-	// MisplacedDotDotDot occurs when a "..." is used somewhere other than the
-	// final argument to a function call.
-	//
-	// Example:
-	//  func printArgs(args ...int) {
-	//  	for _, a := range args {
-	//  		println(a)
-	//  	}
-	//  }
-	//
-	//  func f() {
-	//  	a := []int{1,2,3}
-	//  	printArgs(0, a...)
-	//  }
-	MisplacedDotDotDot
-
-	// InvalidDotDotDotOperand occurs when a "..." operator is applied to a
-	// single-valued operand.
-	//
-	// Example:
-	//  func printArgs(args ...int) {
-	//  	for _, a := range args {
-	//  		println(a)
-	//  	}
-	//  }
-	//
-	//  func f() {
-	//  	a := 1
-	//  	printArgs(a...)
-	//  }
-	//
-	// Example:
-	//  func args() (int, int) {
-	//  	return 1, 2
-	//  }
-	//
-	//  func printArgs(args ...int) {
-	//  	for _, a := range args {
-	//  		println(a)
-	//  	}
-	//  }
-	//
-	//  func g() {
-	//  	printArgs(args()...)
-	//  }
-	InvalidDotDotDotOperand
-
-	// InvalidDotDotDot occurs when a "..." is used in a non-variadic built-in
-	// function.
-	//
-	// Example:
-	//  var s = []int{1, 2, 3}
-	//  var l = len(s...)
-	InvalidDotDotDot
-
-	/* exprs > built-in */
-
-	// UncalledBuiltin occurs when a built-in function is used as a
-	// function-valued expression, instead of being called.
-	//
-	// Per the spec:
-	//  "The built-in functions do not have standard Go types, so they can only
-	//  appear in call expressions; they cannot be used as function values."
-	//
-	// Example:
-	//  var _ = copy
-	UncalledBuiltin
-
-	// InvalidAppend occurs when append is called with a first argument that is
-	// not a slice.
-	//
-	// Example:
-	//  var _ = append(1, 2)
-	InvalidAppend
-
-	// InvalidCap occurs when an argument to the cap built-in function is not of
-	// supported type.
-	//
-	// See https://golang.org/ref/spec#Length_and_capacity for information on
-	// which underlying types are supported as arguments to cap and len.
-	//
-	// Example:
-	//  var s = 2
-	//  var x = cap(s)
-	InvalidCap
-
-	// InvalidClose occurs when close(...) is called with an argument that is
-	// not of channel type, or that is a receive-only channel.
-	//
-	// Example:
-	//  func f() {
-	//  	var x int
-	//  	close(x)
-	//  }
-	InvalidClose
-
-	// InvalidCopy occurs when the arguments are not of slice type or do not
-	// have compatible type.
-	//
-	// See https://golang.org/ref/spec#Appending_and_copying_slices for more
-	// information on the type requirements for the copy built-in.
-	//
-	// Example:
-	//  func f() {
-	//  	var x []int
-	//  	y := []int64{1,2,3}
-	//  	copy(x, y)
-	//  }
-	InvalidCopy
-
-	// InvalidComplex occurs when the complex built-in function is called with
-	// arguments with incompatible types.
-	//
-	// Example:
-	//  var _ = complex(float32(1), float64(2))
-	InvalidComplex
-
-	// InvalidDelete occurs when the delete built-in function is called with a
-	// first argument that is not a map.
-	//
-	// Example:
-	//  func f() {
-	//  	m := "hello"
-	//  	delete(m, "e")
-	//  }
-	InvalidDelete
-
-	// InvalidImag occurs when the imag built-in function is called with an
-	// argument that does not have complex type.
-	//
-	// Example:
-	//  var _ = imag(int(1))
-	InvalidImag
-
-	// InvalidLen occurs when an argument to the len built-in function is not of
-	// supported type.
-	//
-	// See https://golang.org/ref/spec#Length_and_capacity for information on
-	// which underlying types are supported as arguments to cap and len.
-	//
-	// Example:
-	//  var s = 2
-	//  var x = len(s)
-	InvalidLen
-
-	// SwappedMakeArgs occurs when make is called with three arguments, and its
-	// length argument is larger than its capacity argument.
-	//
-	// Example:
-	//  var x = make([]int, 3, 2)
-	SwappedMakeArgs
-
-	// InvalidMake occurs when make is called with an unsupported type argument.
-	//
-	// See https://golang.org/ref/spec#Making_slices_maps_and_channels for
-	// information on the types that may be created using make.
-	//
-	// Example:
-	//  var x = make(int)
-	InvalidMake
-
-	// InvalidReal occurs when the real built-in function is called with an
-	// argument that does not have complex type.
-	//
-	// Example:
-	//  var _ = real(int(1))
-	InvalidReal
-
-	/* exprs > assertion */
-
-	// InvalidAssert occurs when a type assertion is applied to a
-	// value that is not of interface type.
-	//
-	// Example:
-	//  var x = 1
-	//  var _ = x.(float64)
-	InvalidAssert
-
-	// ImpossibleAssert occurs for a type assertion x.(T) when the value x of
-	// interface cannot have dynamic type T, due to a missing or mismatching
-	// method on T.
-	//
-	// Example:
-	//  type T int
-	//
-	//  func (t *T) m() int { return int(*t) }
-	//
-	//  type I interface { m() int }
-	//
-	//  var x I
-	//  var _ = x.(T)
-	ImpossibleAssert
-
-	/* exprs > conversion */
-
-	// InvalidConversion occurs when the argument type cannot be converted to the
-	// target.
-	//
-	// See https://golang.org/ref/spec#Conversions for the rules of
-	// convertibility.
-	//
-	// Example:
-	//  var x float64
-	//  var _ = string(x)
-	InvalidConversion
-
-	// InvalidUntypedConversion occurs when there is no valid implicit
-	// conversion from an untyped value satisfying the type constraints of the
-	// context in which it is used.
-	//
-	// Example:
-	//  var _ = 1 + ""
-	InvalidUntypedConversion
-
-	/* offsetof */
-
-	// BadOffsetofSyntax occurs when unsafe.Offsetof is called with an argument
-	// that is not a selector expression.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.Offsetof(x)
-	BadOffsetofSyntax
-
-	// InvalidOffsetof occurs when unsafe.Offsetof is called with a method
-	// selector, rather than a field selector, or when the field is embedded via
-	// a pointer.
-	//
-	// Per the spec:
-	//
-	//  "If f is an embedded field, it must be reachable without pointer
-	//  indirections through fields of the struct. "
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  type T struct { f int }
-	//  type S struct { *T }
-	//  var s S
-	//  var _ = unsafe.Offsetof(s.f)
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  type S struct{}
-	//
-	//  func (S) m() {}
-	//
-	//  var s S
-	//  var _ = unsafe.Offsetof(s.m)
-	InvalidOffsetof
-
-	/* control flow > scope */
-
-	// UnusedExpr occurs when a side-effect free expression is used as a
-	// statement. Such a statement has no effect.
-	//
-	// Example:
-	//  func f(i int) {
-	//  	i*i
-	//  }
-	UnusedExpr
-
-	// UnusedVar occurs when a variable is declared but unused.
-	//
-	// Example:
-	//  func f() {
-	//  	x := 1
-	//  }
-	UnusedVar
-
-	// MissingReturn occurs when a function with results is missing a return
-	// statement.
-	//
-	// Example:
-	//  func f() int {}
-	MissingReturn
-
-	// WrongResultCount occurs when a return statement returns an incorrect
-	// number of values.
-	//
-	// Example:
-	//  func ReturnOne() int {
-	//  	return 1, 2
-	//  }
-	WrongResultCount
-
-	// OutOfScopeResult occurs when the name of a value implicitly returned by
-	// an empty return statement is shadowed in a nested scope.
-	//
-	// Example:
-	//  func factor(n int) (i int) {
-	//  	for i := 2; i < n; i++ {
-	//  		if n%i == 0 {
-	//  			return
-	//  		}
-	//  	}
-	//  	return 0
-	//  }
-	OutOfScopeResult
-
-	/* control flow > if */
-
-	// InvalidCond occurs when an if condition is not a boolean expression.
-	//
-	// Example:
-	//  func checkReturn(i int) {
-	//  	if i {
-	//  		panic("non-zero return")
-	//  	}
-	//  }
-	InvalidCond
-
-	/* control flow > for */
-
-	// InvalidPostDecl occurs when there is a declaration in a for-loop post
-	// statement.
-	//
-	// Example:
-	//  func f() {
-	//  	for i := 0; i < 10; j := 0 {}
-	//  }
-	InvalidPostDecl
-
-	// InvalidChanRange occurs when a send-only channel used in a range
-	// expression.
-	//
-	// Example:
-	//  func sum(c chan<- int) {
-	//  	s := 0
-	//  	for i := range c {
-	//  		s += i
-	//  	}
-	//  }
-	InvalidChanRange
-
-	// InvalidIterVar occurs when two iteration variables are used while ranging
-	// over a channel.
-	//
-	// Example:
-	//  func f(c chan int) {
-	//  	for k, v := range c {
-	//  		println(k, v)
-	//  	}
-	//  }
-	InvalidIterVar
-
-	// InvalidRangeExpr occurs when the type of a range expression is not array,
-	// slice, string, map, or channel.
-	//
-	// Example:
-	//  func f(i int) {
-	//  	for j := range i {
-	//  		println(j)
-	//  	}
-	//  }
-	InvalidRangeExpr
-
-	/* control flow > switch */
-
-	// MisplacedBreak occurs when a break statement is not within a for, switch,
-	// or select statement of the innermost function definition.
-	//
-	// Example:
-	//  func f() {
-	//  	break
-	//  }
-	MisplacedBreak
-
-	// MisplacedContinue occurs when a continue statement is not within a for
-	// loop of the innermost function definition.
-	//
-	// Example:
-	//  func sumeven(n int) int {
-	//  	proceed := func() {
-	//  		continue
-	//  	}
-	//  	sum := 0
-	//  	for i := 1; i <= n; i++ {
-	//  		if i % 2 != 0 {
-	//  			proceed()
-	//  		}
-	//  		sum += i
-	//  	}
-	//  	return sum
-	//  }
-	MisplacedContinue
-
-	// MisplacedFallthrough occurs when a fallthrough statement is not within an
-	// expression switch.
-	//
-	// Example:
-	//  func typename(i interface{}) string {
-	//  	switch i.(type) {
-	//  	case int64:
-	//  		fallthrough
-	//  	case int:
-	//  		return "int"
-	//  	}
-	//  	return "unsupported"
-	//  }
-	MisplacedFallthrough
-
-	// DuplicateCase occurs when a type or expression switch has duplicate
-	// cases.
-	//
-	// Example:
-	//  func printInt(i int) {
-	//  	switch i {
-	//  	case 1:
-	//  		println("one")
-	//  	case 1:
-	//  		println("One")
-	//  	}
-	//  }
-	DuplicateCase
-
-	// DuplicateDefault occurs when a type or expression switch has multiple
-	// default clauses.
-	//
-	// Example:
-	//  func printInt(i int) {
-	//  	switch i {
-	//  	case 1:
-	//  		println("one")
-	//  	default:
-	//  		println("One")
-	//  	default:
-	//  		println("1")
-	//  	}
-	//  }
-	DuplicateDefault
-
-	// BadTypeKeyword occurs when a .(type) expression is used anywhere other
-	// than a type switch.
-	//
-	// Example:
-	//  type I interface {
-	//  	m()
-	//  }
-	//  var t I
-	//  var _ = t.(type)
-	BadTypeKeyword
-
-	// InvalidTypeSwitch occurs when .(type) is used on an expression that is
-	// not of interface type.
-	//
-	// Example:
-	//  func f(i int) {
-	//  	switch x := i.(type) {}
-	//  }
-	InvalidTypeSwitch
-
-	// InvalidExprSwitch occurs when a switch expression is not comparable.
-	//
-	// Example:
-	//  func _() {
-	//  	var a struct{ _ func() }
-	//  	switch a /* ERROR cannot switch on a */ {
-	//  	}
-	//  }
-	InvalidExprSwitch
-
-	/* control flow > select */
-
-	// InvalidSelectCase occurs when a select case is not a channel send or
-	// receive.
-	//
-	// Example:
-	//  func checkChan(c <-chan int) bool {
-	//  	select {
-	//  	case c:
-	//  		return true
-	//  	default:
-	//  		return false
-	//  	}
-	//  }
-	InvalidSelectCase
-
-	/* control flow > labels and jumps */
-
-	// UndeclaredLabel occurs when an undeclared label is jumped to.
-	//
-	// Example:
-	//  func f() {
-	//  	goto L
-	//  }
-	UndeclaredLabel
-
-	// DuplicateLabel occurs when a label is declared more than once.
-	//
-	// Example:
-	//  func f() int {
-	//  L:
-	//  L:
-	//  	return 1
-	//  }
-	DuplicateLabel
-
-	// MisplacedLabel occurs when a break or continue label is not on a for,
-	// switch, or select statement.
-	//
-	// Example:
-	//  func f() {
-	//  L:
-	//  	a := []int{1,2,3}
-	//  	for _, e := range a {
-	//  		if e > 10 {
-	//  			break L
-	//  		}
-	//  		println(a)
-	//  	}
-	//  }
-	MisplacedLabel
-
-	// UnusedLabel occurs when a label is declared but not used.
-	//
-	// Example:
-	//  func f() {
-	//  L:
-	//  }
-	UnusedLabel
-
-	// JumpOverDecl occurs when a label jumps over a variable declaration.
-	//
-	// Example:
-	//  func f() int {
-	//  	goto L
-	//  	x := 2
-	//  L:
-	//  	x++
-	//  	return x
-	//  }
-	JumpOverDecl
-
-	// JumpIntoBlock occurs when a forward jump goes to a label inside a nested
-	// block.
-	//
-	// Example:
-	//  func f(x int) {
-	//  	goto L
-	//  	if x > 0 {
-	//  	L:
-	//  		print("inside block")
-	//  	}
-	// }
-	JumpIntoBlock
-
-	/* control flow > calls */
-
-	// InvalidMethodExpr occurs when a pointer method is called but the argument
-	// is not addressable.
-	//
-	// Example:
-	//  type T struct {}
-	//
-	//  func (*T) m() int { return 1 }
-	//
-	//  var _ = T.m(T{})
-	InvalidMethodExpr
-
-	// WrongArgCount occurs when too few or too many arguments are passed by a
-	// function call.
-	//
-	// Example:
-	//  func f(i int) {}
-	//  var x = f()
-	WrongArgCount
-
-	// InvalidCall occurs when an expression is called that is not of function
-	// type.
-	//
-	// Example:
-	//  var x = "x"
-	//  var y = x()
-	InvalidCall
-
-	/* control flow > suspended */
-
-	// UnusedResults occurs when a restricted expression-only built-in function
-	// is suspended via go or defer. Such a suspension discards the results of
-	// these side-effect free built-in functions, and therefore is ineffectual.
-	//
-	// Example:
-	//  func f(a []int) int {
-	//  	defer len(a)
-	//  	return i
-	//  }
-	UnusedResults
-
-	// InvalidDefer occurs when a deferred expression is not a function call,
-	// for example if the expression is a type conversion.
-	//
-	// Example:
-	//  func f(i int) int {
-	//  	defer int32(i)
-	//  	return i
-	//  }
-	InvalidDefer
-
-	// InvalidGo occurs when a go expression is not a function call, for example
-	// if the expression is a type conversion.
-	//
-	// Example:
-	//  func f(i int) int {
-	//  	go int32(i)
-	//  	return i
-	//  }
-	InvalidGo
-
-	// All codes below were added in Go 1.17.
-
-	/* decl */
-
-	// BadDecl occurs when a declaration has invalid syntax.
-	BadDecl
-
-	// RepeatedDecl occurs when an identifier occurs more than once on the left
-	// hand side of a short variable declaration.
-	//
-	// Example:
-	//  func _() {
-	//  	x, y, y := 1, 2, 3
-	//  }
-	RepeatedDecl
-
-	/* unsafe */
-
-	// InvalidUnsafeAdd occurs when unsafe.Add is called with a
-	// length argument that is not of integer type.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var p unsafe.Pointer
-	//  var _ = unsafe.Add(p, float64(1))
-	InvalidUnsafeAdd
-
-	// InvalidUnsafeSlice occurs when unsafe.Slice is called with a
-	// pointer argument that is not of pointer type or a length argument
-	// that is not of integer type, negative, or out of bounds.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.Slice(x, 1)
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.Slice(&x, float64(1))
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.Slice(&x, -1)
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.Slice(&x, uint64(1) << 63)
-	InvalidUnsafeSlice
-
-	// All codes below were added in Go 1.18.
-
-	/* features */
-
-	// UnsupportedFeature occurs when a language feature is used that is not
-	// supported at this Go version.
-	UnsupportedFeature
-
-	/* type params */
-
-	// NotAGenericType occurs when a non-generic type is used where a generic
-	// type is expected: in type or function instantiation.
-	//
-	// Example:
-	//  type T int
-	//
-	//  var _ T[int]
-	NotAGenericType
-
-	// WrongTypeArgCount occurs when a type or function is instantiated with an
-	// incorrect number of type arguments, including when a generic type or
-	// function is used without instantiation.
-	//
-	// Errors involving failed type inference are assigned other error codes.
-	//
-	// Example:
-	//  type T[p any] int
-	//
-	//  var _ T[int, string]
-	//
-	// Example:
-	//  func f[T any]() {}
-	//
-	//  var x = f
-	WrongTypeArgCount
-
-	// CannotInferTypeArgs occurs when type or function type argument inference
-	// fails to infer all type arguments.
-	//
-	// Example:
-	//  func f[T any]() {}
-	//
-	//  func _() {
-	//  	f()
-	//  }
-	//
-	// Example:
-	//   type N[P, Q any] struct{}
-	//
-	//   var _ N[int]
-	CannotInferTypeArgs
-
-	// InvalidTypeArg occurs when a type argument does not satisfy its
-	// corresponding type parameter constraints.
-	//
-	// Example:
-	//  type T[P ~int] struct{}
-	//
-	//  var _ T[string]
-	InvalidTypeArg // arguments? InferenceFailed
-
-	// InvalidInstanceCycle occurs when an invalid cycle is detected
-	// within the instantiation graph.
-	//
-	// Example:
-	//  func f[T any]() { f[*T]() }
-	InvalidInstanceCycle
-
-	// InvalidUnion occurs when an embedded union or approximation element is
-	// not valid.
-	//
-	// Example:
-	//  type _ interface {
-	//   	~int | interface{ m() }
-	//  }
-	InvalidUnion
-
-	// MisplacedConstraintIface occurs when a constraint-type interface is used
-	// outside of constraint position.
-	//
-	// Example:
-	//   type I interface { ~int }
-	//
-	//   var _ I
-	MisplacedConstraintIface
-
-	// InvalidMethodTypeParams occurs when methods have type parameters.
-	//
-	// It cannot be encountered with an AST parsed using go/parser.
-	InvalidMethodTypeParams
-
-	// MisplacedTypeParam occurs when a type parameter is used in a place where
-	// it is not permitted.
-	//
-	// Example:
-	//  type T[P any] P
-	//
-	// Example:
-	//  type T[P any] struct{ *P }
-	MisplacedTypeParam
-
-	// InvalidUnsafeSliceData occurs when unsafe.SliceData is called with
-	// an argument that is not of slice type. It also occurs if it is used
-	// in a package compiled for a language version before go1.20.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var x int
-	//  var _ = unsafe.SliceData(x)
-	InvalidUnsafeSliceData
-
-	// InvalidUnsafeString occurs when unsafe.String is called with
-	// a length argument that is not of integer type, negative, or
-	// out of bounds. It also occurs if it is used in a package
-	// compiled for a language version before go1.20.
-	//
-	// Example:
-	//  import "unsafe"
-	//
-	//  var b [10]byte
-	//  var _ = unsafe.String(&b[0], -1)
-	InvalidUnsafeString
-
-	// InvalidUnsafeStringData occurs if it is used in a package
-	// compiled for a language version before go1.20.
-	_ // not used anymore
-
-)
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
deleted file mode 100644
index 15ecf7c..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Code generated by "stringer -type=ErrorCode"; DO NOT EDIT.
-
-package typesinternal
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[InvalidSyntaxTree - -1]
-	_ = x[Test-1]
-	_ = x[BlankPkgName-2]
-	_ = x[MismatchedPkgName-3]
-	_ = x[InvalidPkgUse-4]
-	_ = x[BadImportPath-5]
-	_ = x[BrokenImport-6]
-	_ = x[ImportCRenamed-7]
-	_ = x[UnusedImport-8]
-	_ = x[InvalidInitCycle-9]
-	_ = x[DuplicateDecl-10]
-	_ = x[InvalidDeclCycle-11]
-	_ = x[InvalidTypeCycle-12]
-	_ = x[InvalidConstInit-13]
-	_ = x[InvalidConstVal-14]
-	_ = x[InvalidConstType-15]
-	_ = x[UntypedNilUse-16]
-	_ = x[WrongAssignCount-17]
-	_ = x[UnassignableOperand-18]
-	_ = x[NoNewVar-19]
-	_ = x[MultiValAssignOp-20]
-	_ = x[InvalidIfaceAssign-21]
-	_ = x[InvalidChanAssign-22]
-	_ = x[IncompatibleAssign-23]
-	_ = x[UnaddressableFieldAssign-24]
-	_ = x[NotAType-25]
-	_ = x[InvalidArrayLen-26]
-	_ = x[BlankIfaceMethod-27]
-	_ = x[IncomparableMapKey-28]
-	_ = x[InvalidIfaceEmbed-29]
-	_ = x[InvalidPtrEmbed-30]
-	_ = x[BadRecv-31]
-	_ = x[InvalidRecv-32]
-	_ = x[DuplicateFieldAndMethod-33]
-	_ = x[DuplicateMethod-34]
-	_ = x[InvalidBlank-35]
-	_ = x[InvalidIota-36]
-	_ = x[MissingInitBody-37]
-	_ = x[InvalidInitSig-38]
-	_ = x[InvalidInitDecl-39]
-	_ = x[InvalidMainDecl-40]
-	_ = x[TooManyValues-41]
-	_ = x[NotAnExpr-42]
-	_ = x[TruncatedFloat-43]
-	_ = x[NumericOverflow-44]
-	_ = x[UndefinedOp-45]
-	_ = x[MismatchedTypes-46]
-	_ = x[DivByZero-47]
-	_ = x[NonNumericIncDec-48]
-	_ = x[UnaddressableOperand-49]
-	_ = x[InvalidIndirection-50]
-	_ = x[NonIndexableOperand-51]
-	_ = x[InvalidIndex-52]
-	_ = x[SwappedSliceIndices-53]
-	_ = x[NonSliceableOperand-54]
-	_ = x[InvalidSliceExpr-55]
-	_ = x[InvalidShiftCount-56]
-	_ = x[InvalidShiftOperand-57]
-	_ = x[InvalidReceive-58]
-	_ = x[InvalidSend-59]
-	_ = x[DuplicateLitKey-60]
-	_ = x[MissingLitKey-61]
-	_ = x[InvalidLitIndex-62]
-	_ = x[OversizeArrayLit-63]
-	_ = x[MixedStructLit-64]
-	_ = x[InvalidStructLit-65]
-	_ = x[MissingLitField-66]
-	_ = x[DuplicateLitField-67]
-	_ = x[UnexportedLitField-68]
-	_ = x[InvalidLitField-69]
-	_ = x[UntypedLit-70]
-	_ = x[InvalidLit-71]
-	_ = x[AmbiguousSelector-72]
-	_ = x[UndeclaredImportedName-73]
-	_ = x[UnexportedName-74]
-	_ = x[UndeclaredName-75]
-	_ = x[MissingFieldOrMethod-76]
-	_ = x[BadDotDotDotSyntax-77]
-	_ = x[NonVariadicDotDotDot-78]
-	_ = x[MisplacedDotDotDot-79]
-	_ = x[InvalidDotDotDotOperand-80]
-	_ = x[InvalidDotDotDot-81]
-	_ = x[UncalledBuiltin-82]
-	_ = x[InvalidAppend-83]
-	_ = x[InvalidCap-84]
-	_ = x[InvalidClose-85]
-	_ = x[InvalidCopy-86]
-	_ = x[InvalidComplex-87]
-	_ = x[InvalidDelete-88]
-	_ = x[InvalidImag-89]
-	_ = x[InvalidLen-90]
-	_ = x[SwappedMakeArgs-91]
-	_ = x[InvalidMake-92]
-	_ = x[InvalidReal-93]
-	_ = x[InvalidAssert-94]
-	_ = x[ImpossibleAssert-95]
-	_ = x[InvalidConversion-96]
-	_ = x[InvalidUntypedConversion-97]
-	_ = x[BadOffsetofSyntax-98]
-	_ = x[InvalidOffsetof-99]
-	_ = x[UnusedExpr-100]
-	_ = x[UnusedVar-101]
-	_ = x[MissingReturn-102]
-	_ = x[WrongResultCount-103]
-	_ = x[OutOfScopeResult-104]
-	_ = x[InvalidCond-105]
-	_ = x[InvalidPostDecl-106]
-	_ = x[InvalidChanRange-107]
-	_ = x[InvalidIterVar-108]
-	_ = x[InvalidRangeExpr-109]
-	_ = x[MisplacedBreak-110]
-	_ = x[MisplacedContinue-111]
-	_ = x[MisplacedFallthrough-112]
-	_ = x[DuplicateCase-113]
-	_ = x[DuplicateDefault-114]
-	_ = x[BadTypeKeyword-115]
-	_ = x[InvalidTypeSwitch-116]
-	_ = x[InvalidExprSwitch-117]
-	_ = x[InvalidSelectCase-118]
-	_ = x[UndeclaredLabel-119]
-	_ = x[DuplicateLabel-120]
-	_ = x[MisplacedLabel-121]
-	_ = x[UnusedLabel-122]
-	_ = x[JumpOverDecl-123]
-	_ = x[JumpIntoBlock-124]
-	_ = x[InvalidMethodExpr-125]
-	_ = x[WrongArgCount-126]
-	_ = x[InvalidCall-127]
-	_ = x[UnusedResults-128]
-	_ = x[InvalidDefer-129]
-	_ = x[InvalidGo-130]
-	_ = x[BadDecl-131]
-	_ = x[RepeatedDecl-132]
-	_ = x[InvalidUnsafeAdd-133]
-	_ = x[InvalidUnsafeSlice-134]
-	_ = x[UnsupportedFeature-135]
-	_ = x[NotAGenericType-136]
-	_ = x[WrongTypeArgCount-137]
-	_ = x[CannotInferTypeArgs-138]
-	_ = x[InvalidTypeArg-139]
-	_ = x[InvalidInstanceCycle-140]
-	_ = x[InvalidUnion-141]
-	_ = x[MisplacedConstraintIface-142]
-	_ = x[InvalidMethodTypeParams-143]
-	_ = x[MisplacedTypeParam-144]
-	_ = x[InvalidUnsafeSliceData-145]
-	_ = x[InvalidUnsafeString-146]
-}
-
-const (
-	_ErrorCode_name_0 = "InvalidSyntaxTree"
-	_ErrorCode_name_1 = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilUseWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidExprSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGoBadDeclRepeatedDeclInvalidUnsafeAddInvalidUnsafeSliceUnsupportedFeatureNotAGenericTypeWrongTypeArgCountCannotInferTypeArgsInvalidTypeArgInvalidInstanceCycleInvalidUnionMisplacedConstraintIfaceInvalidMethodTypeParamsMisplacedTypeParamInvalidUnsafeSliceDataInvalidUnsafeString"
-)
-
-var (
-	_ErrorCode_index_1 = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 218, 234, 253, 261, 277, 295, 312, 330, 354, 362, 377, 393, 411, 428, 443, 450, 461, 484, 499, 511, 522, 537, 551, 566, 581, 594, 603, 617, 632, 643, 658, 667, 683, 703, 721, 740, 752, 771, 790, 806, 823, 842, 856, 867, 882, 895, 910, 926, 940, 956, 971, 988, 1006, 1021, 1031, 1041, 1058, 1080, 1094, 1108, 1128, 1146, 1166, 1184, 1207, 1223, 1238, 1251, 1261, 1273, 1284, 1298, 1311, 1322, 1332, 1347, 1358, 1369, 1382, 1398, 1415, 1439, 1456, 1471, 1481, 1490, 1503, 1519, 1535, 1546, 1561, 1577, 1591, 1607, 1621, 1638, 1658, 1671, 1687, 1701, 1718, 1735, 1752, 1767, 1781, 1795, 1806, 1818, 1831, 1848, 1861, 1872, 1885, 1897, 1906, 1913, 1925, 1941, 1959, 1977, 1992, 2009, 2028, 2042, 2062, 2074, 2098, 2121, 2139, 2161, 2180}
-)
-
-func (i ErrorCode) String() string {
-	switch {
-	case i == -1:
-		return _ErrorCode_name_0
-	case 1 <= i && i <= 146:
-		i -= 1
-		return _ErrorCode_name_1[_ErrorCode_index_1[i]:_ErrorCode_index_1[i+1]]
-	default:
-		return "ErrorCode(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go b/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go
deleted file mode 100644
index b64f714..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"go/ast"
-	"go/types"
-	"strconv"
-)
-
-// FileQualifier returns a [types.Qualifier] function that qualifies
-// imported symbols appropriately based on the import environment of a given
-// file.
-// If the same package is imported multiple times, the last appearance is
-// recorded.
-func FileQualifier(f *ast.File, pkg *types.Package) types.Qualifier {
-	// Construct mapping of import paths to their defined names.
-	// It is only necessary to look at renaming imports.
-	imports := make(map[string]string)
-	for _, imp := range f.Imports {
-		if imp.Name != nil && imp.Name.Name != "_" {
-			path, _ := strconv.Unquote(imp.Path.Value)
-			imports[path] = imp.Name.Name
-		}
-	}
-
-	// Define qualifier to replace full package paths with names of the imports.
-	return func(p *types.Package) string {
-		if p == nil || p == pkg {
-			return ""
-		}
-
-		if name, ok := imports[p.Path()]; ok {
-			if name == "." {
-				return ""
-			} else {
-				return name
-			}
-		}
-
-		// If there is no local renaming, fall back to the package name.
-		return p.Name()
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/recv.go b/vendor/golang.org/x/tools/internal/typesinternal/recv.go
deleted file mode 100644
index 8352ea7..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/recv.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"go/types"
-)
-
-// ReceiverNamed returns the named type (if any) associated with the
-// type of recv, which may be of the form N or *N, or aliases thereof.
-// It also reports whether a Pointer was present.
-//
-// The named result may be nil if recv is from a method on an
-// anonymous interface or struct types or in ill-typed code.
-func ReceiverNamed(recv *types.Var) (isPtr bool, named *types.Named) {
-	t := recv.Type()
-	if ptr, ok := types.Unalias(t).(*types.Pointer); ok {
-		isPtr = true
-		t = ptr.Elem()
-	}
-	named, _ = types.Unalias(t).(*types.Named)
-	return
-}
-
-// Unpointer returns T given *T or an alias thereof.
-// For all other types it is the identity function.
-// It does not look at underlying types.
-// The result may be an alias.
-//
-// Use this function to strip off the optional pointer on a receiver
-// in a field or method selection, without losing the named type
-// (which is needed to compute the method set).
-//
-// See also [typeparams.MustDeref], which removes one level of
-// indirection from the type, regardless of named types (analogous to
-// a LOAD instruction).
-func Unpointer(t types.Type) types.Type {
-	if ptr, ok := types.Unalias(t).(*types.Pointer); ok {
-		return ptr.Elem()
-	}
-	return t
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/toonew.go b/vendor/golang.org/x/tools/internal/typesinternal/toonew.go
deleted file mode 100644
index cc86487..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/toonew.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"go/types"
-
-	"golang.org/x/tools/internal/stdlib"
-	"golang.org/x/tools/internal/versions"
-)
-
-// TooNewStdSymbols computes the set of package-level symbols
-// exported by pkg that are not available at the specified version.
-// The result maps each symbol to its minimum version.
-//
-// The pkg is allowed to contain type errors.
-func TooNewStdSymbols(pkg *types.Package, version string) map[types.Object]string {
-	disallowed := make(map[types.Object]string)
-
-	// Pass 1: package-level symbols.
-	symbols := stdlib.PackageSymbols[pkg.Path()]
-	for _, sym := range symbols {
-		symver := sym.Version.String()
-		if versions.Before(version, symver) {
-			switch sym.Kind {
-			case stdlib.Func, stdlib.Var, stdlib.Const, stdlib.Type:
-				disallowed[pkg.Scope().Lookup(sym.Name)] = symver
-			}
-		}
-	}
-
-	// Pass 2: fields and methods.
-	//
-	// We allow fields and methods if their associated type is
-	// disallowed, as otherwise we would report false positives
-	// for compatibility shims. Consider:
-	//
-	//   //go:build go1.22
-	//   type T struct { F std.Real } // correct new API
-	//
-	//   //go:build !go1.22
-	//   type T struct { F fake } // shim
-	//   type fake struct { ... }
-	//   func (fake) M () {}
-	//
-	// These alternative declarations of T use either the std.Real
-	// type, introduced in go1.22, or a fake type, for the field
-	// F. (The fakery could be arbitrarily deep, involving more
-	// nested fields and methods than are shown here.) Clients
-	// that use the compatibility shim T will compile with any
-	// version of go, whether older or newer than go1.22, but only
-	// the newer version will use the std.Real implementation.
-	//
-	// Now consider a reference to method M in new(T).F.M() in a
-	// module that requires a minimum of go1.21. The analysis may
-	// occur using a version of Go higher than 1.21, selecting the
-	// first version of T, so the method M is Real.M. This would
-	// spuriously cause the analyzer to report a reference to a
-	// too-new symbol even though this expression compiles just
-	// fine (with the fake implementation) using go1.21.
-	for _, sym := range symbols {
-		symVersion := sym.Version.String()
-		if !versions.Before(version, symVersion) {
-			continue // allowed
-		}
-
-		var obj types.Object
-		switch sym.Kind {
-		case stdlib.Field:
-			typename, name := sym.SplitField()
-			if t := pkg.Scope().Lookup(typename); t != nil && disallowed[t] == "" {
-				obj, _, _ = types.LookupFieldOrMethod(t.Type(), false, pkg, name)
-			}
-
-		case stdlib.Method:
-			ptr, recvname, name := sym.SplitMethod()
-			if t := pkg.Scope().Lookup(recvname); t != nil && disallowed[t] == "" {
-				obj, _, _ = types.LookupFieldOrMethod(t.Type(), ptr, pkg, name)
-			}
-		}
-		if obj != nil {
-			disallowed[obj] = symVersion
-		}
-	}
-
-	return disallowed
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/types.go b/vendor/golang.org/x/tools/internal/typesinternal/types.go
deleted file mode 100644
index a5cd7e8..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/types.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package typesinternal provides access to internal go/types APIs that are not
-// yet exported.
-package typesinternal
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-	"reflect"
-	"unsafe"
-
-	"golang.org/x/tools/internal/aliases"
-)
-
-func SetUsesCgo(conf *types.Config) bool {
-	v := reflect.ValueOf(conf).Elem()
-
-	f := v.FieldByName("go115UsesCgo")
-	if !f.IsValid() {
-		f = v.FieldByName("UsesCgo")
-		if !f.IsValid() {
-			return false
-		}
-	}
-
-	addr := unsafe.Pointer(f.UnsafeAddr())
-	*(*bool)(addr) = true
-
-	return true
-}
-
-// ErrorCodeStartEnd extracts additional information from types.Error values
-// generated by Go version 1.16 and later: the error code, start position, and
-// end position. If all positions are valid, start <= err.Pos <= end.
-//
-// If the data could not be read, the final result parameter will be false.
-//
-// TODO(adonovan): eliminate start/end when proposal #71803 is accepted.
-func ErrorCodeStartEnd(err types.Error) (code ErrorCode, start, end token.Pos, ok bool) {
-	var data [3]int
-	// By coincidence all of these fields are ints, which simplifies things.
-	v := reflect.ValueOf(err)
-	for i, name := range []string{"go116code", "go116start", "go116end"} {
-		f := v.FieldByName(name)
-		if !f.IsValid() {
-			return 0, 0, 0, false
-		}
-		data[i] = int(f.Int())
-	}
-	return ErrorCode(data[0]), token.Pos(data[1]), token.Pos(data[2]), true
-}
-
-// NameRelativeTo returns a types.Qualifier that qualifies members of
-// all packages other than pkg, using only the package name.
-// (By contrast, [types.RelativeTo] uses the complete package path,
-// which is often excessive.)
-//
-// If pkg is nil, it is equivalent to [*types.Package.Name].
-func NameRelativeTo(pkg *types.Package) types.Qualifier {
-	return func(other *types.Package) string {
-		if pkg != nil && pkg == other {
-			return "" // same package; unqualified
-		}
-		return other.Name()
-	}
-}
-
-// TypeNameFor returns the type name symbol for the specified type, if
-// it is a [*types.Alias], [*types.Named], [*types.TypeParam], or a
-// [*types.Basic] representing a type.
-//
-// For all other types, and for Basic types representing a builtin,
-// constant, or nil, it returns nil. Be careful not to convert the
-// resulting nil pointer to a [types.Object]!
-//
-// If t is the type of a constant, it may be an "untyped" type, which
-// has no TypeName. To access the name of such types (e.g. "untyped
-// int"), use [types.Basic.Name].
-func TypeNameFor(t types.Type) *types.TypeName {
-	switch t := t.(type) {
-	case *types.Alias:
-		return t.Obj()
-	case *types.Named:
-		return t.Obj()
-	case *types.TypeParam:
-		return t.Obj()
-	case *types.Basic:
-		// See issues #71886 and #66890 for some history.
-		if tname, ok := types.Universe.Lookup(t.Name()).(*types.TypeName); ok {
-			return tname
-		}
-	}
-	return nil
-}
-
-// A NamedOrAlias is a [types.Type] that is named (as
-// defined by the spec) and capable of bearing type parameters: it
-// abstracts aliases ([types.Alias]) and defined types
-// ([types.Named]).
-//
-// Every type declared by an explicit "type" declaration is a
-// NamedOrAlias. (Built-in type symbols may additionally
-// have type [types.Basic], which is not a NamedOrAlias,
-// though the spec regards them as "named"; see [TypeNameFor].)
-//
-// NamedOrAlias cannot expose the Origin method, because
-// [types.Alias.Origin] and [types.Named.Origin] have different
-// (covariant) result types; use [Origin] instead.
-type NamedOrAlias interface {
-	types.Type
-	Obj() *types.TypeName
-	TypeArgs() *types.TypeList
-	TypeParams() *types.TypeParamList
-	SetTypeParams(tparams []*types.TypeParam)
-}
-
-var (
-	_ NamedOrAlias = (*types.Alias)(nil)
-	_ NamedOrAlias = (*types.Named)(nil)
-)
-
-// Origin returns the generic type of the Named or Alias type t if it
-// is instantiated, otherwise it returns t.
-func Origin(t NamedOrAlias) NamedOrAlias {
-	switch t := t.(type) {
-	case *types.Alias:
-		return aliases.Origin(t)
-	case *types.Named:
-		return t.Origin()
-	}
-	return t
-}
-
-// IsPackageLevel reports whether obj is a package-level symbol.
-func IsPackageLevel(obj types.Object) bool {
-	return obj.Pkg() != nil && obj.Parent() == obj.Pkg().Scope()
-}
-
-// NewTypesInfo returns a *types.Info with all maps populated.
-func NewTypesInfo() *types.Info {
-	return &types.Info{
-		Types:        map[ast.Expr]types.TypeAndValue{},
-		Instances:    map[*ast.Ident]types.Instance{},
-		Defs:         map[*ast.Ident]types.Object{},
-		Uses:         map[*ast.Ident]types.Object{},
-		Implicits:    map[ast.Node]types.Object{},
-		Selections:   map[*ast.SelectorExpr]*types.Selection{},
-		Scopes:       map[ast.Node]*types.Scope{},
-		FileVersions: map[*ast.File]string{},
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/varkind.go b/vendor/golang.org/x/tools/internal/typesinternal/varkind.go
deleted file mode 100644
index e5da049..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/varkind.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-// TODO(adonovan): when CL 645115 lands, define the go1.25 version of
-// this API that actually does something.
-
-import "go/types"
-
-type VarKind uint8
-
-const (
-	_          VarKind = iota // (not meaningful)
-	PackageVar                // a package-level variable
-	LocalVar                  // a local variable
-	RecvVar                   // a method receiver variable
-	ParamVar                  // a function parameter variable
-	ResultVar                 // a function result variable
-	FieldVar                  // a struct field
-)
-
-func (kind VarKind) String() string {
-	return [...]string{
-		0:          "VarKind(0)",
-		PackageVar: "PackageVar",
-		LocalVar:   "LocalVar",
-		RecvVar:    "RecvVar",
-		ParamVar:   "ParamVar",
-		ResultVar:  "ResultVar",
-		FieldVar:   "FieldVar",
-	}[kind]
-}
-
-// GetVarKind returns an invalid VarKind.
-func GetVarKind(v *types.Var) VarKind { return 0 }
-
-// SetVarKind has no effect.
-func SetVarKind(v *types.Var, kind VarKind) {}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go b/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go
deleted file mode 100644
index d272949..0000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typesinternal
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"strings"
-)
-
-// ZeroString returns the string representation of the zero value for any type t.
-// The boolean result indicates whether the type is or contains an invalid type
-// or a non-basic (constraint) interface type.
-//
-// Even for invalid input types, ZeroString may return a partially correct
-// string representation. The caller should use the returned isValid boolean
-// to determine the validity of the expression.
-//
-// When assigning to a wider type (such as 'any'), it's the caller's
-// responsibility to handle any necessary type conversions.
-//
-// This string can be used on the right-hand side of an assignment where the
-// left-hand side has that explicit type.
-// References to named types are qualified by an appropriate (optional)
-// qualifier function.
-// Exception: This does not apply to tuples. Their string representation is
-// informational only and cannot be used in an assignment.
-//
-// See [ZeroExpr] for a variant that returns an [ast.Expr].
-func ZeroString(t types.Type, qual types.Qualifier) (_ string, isValid bool) {
-	switch t := t.(type) {
-	case *types.Basic:
-		switch {
-		case t.Info()&types.IsBoolean != 0:
-			return "false", true
-		case t.Info()&types.IsNumeric != 0:
-			return "0", true
-		case t.Info()&types.IsString != 0:
-			return `""`, true
-		case t.Kind() == types.UnsafePointer:
-			fallthrough
-		case t.Kind() == types.UntypedNil:
-			return "nil", true
-		case t.Kind() == types.Invalid:
-			return "invalid", false
-		default:
-			panic(fmt.Sprintf("ZeroString for unexpected type %v", t))
-		}
-
-	case *types.Pointer, *types.Slice, *types.Chan, *types.Map, *types.Signature:
-		return "nil", true
-
-	case *types.Interface:
-		if !t.IsMethodSet() {
-			return "invalid", false
-		}
-		return "nil", true
-
-	case *types.Named:
-		switch under := t.Underlying().(type) {
-		case *types.Struct, *types.Array:
-			return types.TypeString(t, qual) + "{}", true
-		default:
-			return ZeroString(under, qual)
-		}
-
-	case *types.Alias:
-		switch t.Underlying().(type) {
-		case *types.Struct, *types.Array:
-			return types.TypeString(t, qual) + "{}", true
-		default:
-			// A type parameter can have alias but alias type's underlying type
-			// can never be a type parameter.
-			// Use types.Unalias to preserve the info of type parameter instead
-			// of call Underlying() going right through and get the underlying
-			// type of the type parameter which is always an interface.
-			return ZeroString(types.Unalias(t), qual)
-		}
-
-	case *types.Array, *types.Struct:
-		return types.TypeString(t, qual) + "{}", true
-
-	case *types.TypeParam:
-		// Assumes func new is not shadowed.
-		return "*new(" + types.TypeString(t, qual) + ")", true
-
-	case *types.Tuple:
-		// Tuples are not normal values.
-		// We are currently format as "(t[0], ..., t[n])". Could be something else.
-		isValid := true
-		components := make([]string, t.Len())
-		for i := 0; i < t.Len(); i++ {
-			comp, ok := ZeroString(t.At(i).Type(), qual)
-
-			components[i] = comp
-			isValid = isValid && ok
-		}
-		return "(" + strings.Join(components, ", ") + ")", isValid
-
-	case *types.Union:
-		// Variables of these types cannot be created, so it makes
-		// no sense to ask for their zero value.
-		panic(fmt.Sprintf("invalid type for a variable: %v", t))
-
-	default:
-		panic(t) // unreachable.
-	}
-}
-
-// ZeroExpr returns the ast.Expr representation of the zero value for any type t.
-// The boolean result indicates whether the type is or contains an invalid type
-// or a non-basic (constraint) interface type.
-//
-// Even for invalid input types, ZeroExpr may return a partially correct ast.Expr
-// representation. The caller should use the returned isValid boolean to determine
-// the validity of the expression.
-//
-// This function is designed for types suitable for variables and should not be
-// used with Tuple or Union types.References to named types are qualified by an
-// appropriate (optional) qualifier function.
-//
-// See [ZeroString] for a variant that returns a string.
-func ZeroExpr(t types.Type, qual types.Qualifier) (_ ast.Expr, isValid bool) {
-	switch t := t.(type) {
-	case *types.Basic:
-		switch {
-		case t.Info()&types.IsBoolean != 0:
-			return &ast.Ident{Name: "false"}, true
-		case t.Info()&types.IsNumeric != 0:
-			return &ast.BasicLit{Kind: token.INT, Value: "0"}, true
-		case t.Info()&types.IsString != 0:
-			return &ast.BasicLit{Kind: token.STRING, Value: `""`}, true
-		case t.Kind() == types.UnsafePointer:
-			fallthrough
-		case t.Kind() == types.UntypedNil:
-			return ast.NewIdent("nil"), true
-		case t.Kind() == types.Invalid:
-			return &ast.BasicLit{Kind: token.STRING, Value: `"invalid"`}, false
-		default:
-			panic(fmt.Sprintf("ZeroExpr for unexpected type %v", t))
-		}
-
-	case *types.Pointer, *types.Slice, *types.Chan, *types.Map, *types.Signature:
-		return ast.NewIdent("nil"), true
-
-	case *types.Interface:
-		if !t.IsMethodSet() {
-			return &ast.BasicLit{Kind: token.STRING, Value: `"invalid"`}, false
-		}
-		return ast.NewIdent("nil"), true
-
-	case *types.Named:
-		switch under := t.Underlying().(type) {
-		case *types.Struct, *types.Array:
-			return &ast.CompositeLit{
-				Type: TypeExpr(t, qual),
-			}, true
-		default:
-			return ZeroExpr(under, qual)
-		}
-
-	case *types.Alias:
-		switch t.Underlying().(type) {
-		case *types.Struct, *types.Array:
-			return &ast.CompositeLit{
-				Type: TypeExpr(t, qual),
-			}, true
-		default:
-			return ZeroExpr(types.Unalias(t), qual)
-		}
-
-	case *types.Array, *types.Struct:
-		return &ast.CompositeLit{
-			Type: TypeExpr(t, qual),
-		}, true
-
-	case *types.TypeParam:
-		return &ast.StarExpr{ // *new(T)
-			X: &ast.CallExpr{
-				// Assumes func new is not shadowed.
-				Fun: ast.NewIdent("new"),
-				Args: []ast.Expr{
-					ast.NewIdent(t.Obj().Name()),
-				},
-			},
-		}, true
-
-	case *types.Tuple:
-		// Unlike ZeroString, there is no ast.Expr can express tuple by
-		// "(t[0], ..., t[n])".
-		panic(fmt.Sprintf("invalid type for a variable: %v", t))
-
-	case *types.Union:
-		// Variables of these types cannot be created, so it makes
-		// no sense to ask for their zero value.
-		panic(fmt.Sprintf("invalid type for a variable: %v", t))
-
-	default:
-		panic(t) // unreachable.
-	}
-}
-
-// IsZeroExpr uses simple syntactic heuristics to report whether expr
-// is a obvious zero value, such as 0, "", nil, or false.
-// It cannot do better without type information.
-func IsZeroExpr(expr ast.Expr) bool {
-	switch e := expr.(type) {
-	case *ast.BasicLit:
-		return e.Value == "0" || e.Value == `""`
-	case *ast.Ident:
-		return e.Name == "nil" || e.Name == "false"
-	default:
-		return false
-	}
-}
-
-// TypeExpr returns syntax for the specified type. References to named types
-// are qualified by an appropriate (optional) qualifier function.
-// It may panic for types such as Tuple or Union.
-func TypeExpr(t types.Type, qual types.Qualifier) ast.Expr {
-	switch t := t.(type) {
-	case *types.Basic:
-		switch t.Kind() {
-		case types.UnsafePointer:
-			return &ast.SelectorExpr{X: ast.NewIdent(qual(types.NewPackage("unsafe", "unsafe"))), Sel: ast.NewIdent("Pointer")}
-		default:
-			return ast.NewIdent(t.Name())
-		}
-
-	case *types.Pointer:
-		return &ast.UnaryExpr{
-			Op: token.MUL,
-			X:  TypeExpr(t.Elem(), qual),
-		}
-
-	case *types.Array:
-		return &ast.ArrayType{
-			Len: &ast.BasicLit{
-				Kind:  token.INT,
-				Value: fmt.Sprintf("%d", t.Len()),
-			},
-			Elt: TypeExpr(t.Elem(), qual),
-		}
-
-	case *types.Slice:
-		return &ast.ArrayType{
-			Elt: TypeExpr(t.Elem(), qual),
-		}
-
-	case *types.Map:
-		return &ast.MapType{
-			Key:   TypeExpr(t.Key(), qual),
-			Value: TypeExpr(t.Elem(), qual),
-		}
-
-	case *types.Chan:
-		dir := ast.ChanDir(t.Dir())
-		if t.Dir() == types.SendRecv {
-			dir = ast.SEND | ast.RECV
-		}
-		return &ast.ChanType{
-			Dir:   dir,
-			Value: TypeExpr(t.Elem(), qual),
-		}
-
-	case *types.Signature:
-		var params []*ast.Field
-		for i := 0; i < t.Params().Len(); i++ {
-			params = append(params, &ast.Field{
-				Type: TypeExpr(t.Params().At(i).Type(), qual),
-				Names: []*ast.Ident{
-					{
-						Name: t.Params().At(i).Name(),
-					},
-				},
-			})
-		}
-		if t.Variadic() {
-			last := params[len(params)-1]
-			last.Type = &ast.Ellipsis{Elt: last.Type.(*ast.ArrayType).Elt}
-		}
-		var returns []*ast.Field
-		for i := 0; i < t.Results().Len(); i++ {
-			returns = append(returns, &ast.Field{
-				Type: TypeExpr(t.Results().At(i).Type(), qual),
-			})
-		}
-		return &ast.FuncType{
-			Params: &ast.FieldList{
-				List: params,
-			},
-			Results: &ast.FieldList{
-				List: returns,
-			},
-		}
-
-	case *types.TypeParam:
-		pkgName := qual(t.Obj().Pkg())
-		if pkgName == "" || t.Obj().Pkg() == nil {
-			return ast.NewIdent(t.Obj().Name())
-		}
-		return &ast.SelectorExpr{
-			X:   ast.NewIdent(pkgName),
-			Sel: ast.NewIdent(t.Obj().Name()),
-		}
-
-	// types.TypeParam also implements interface NamedOrAlias. To differentiate,
-	// case TypeParam need to be present before case NamedOrAlias.
-	// TODO(hxjiang): remove this comment once TypeArgs() is added to interface
-	// NamedOrAlias.
-	case NamedOrAlias:
-		var expr ast.Expr = ast.NewIdent(t.Obj().Name())
-		if pkgName := qual(t.Obj().Pkg()); pkgName != "." && pkgName != "" {
-			expr = &ast.SelectorExpr{
-				X:   ast.NewIdent(pkgName),
-				Sel: expr.(*ast.Ident),
-			}
-		}
-
-		// TODO(hxjiang): call t.TypeArgs after adding method TypeArgs() to
-		// typesinternal.NamedOrAlias.
-		if hasTypeArgs, ok := t.(interface{ TypeArgs() *types.TypeList }); ok {
-			if typeArgs := hasTypeArgs.TypeArgs(); typeArgs != nil && typeArgs.Len() > 0 {
-				var indices []ast.Expr
-				for i := range typeArgs.Len() {
-					indices = append(indices, TypeExpr(typeArgs.At(i), qual))
-				}
-				expr = &ast.IndexListExpr{
-					X:       expr,
-					Indices: indices,
-				}
-			}
-		}
-
-		return expr
-
-	case *types.Struct:
-		return ast.NewIdent(t.String())
-
-	case *types.Interface:
-		return ast.NewIdent(t.String())
-
-	case *types.Union:
-		if t.Len() == 0 {
-			panic("Union type should have at least one term")
-		}
-		// Same as go/ast, the return expression will put last term in the
-		// Y field at topmost level of BinaryExpr.
-		// For union of type "float32 | float64 | int64", the structure looks
-		// similar to:
-		// {
-		// 	X: {
-		// 		X: float32,
-		// 		Op: |
-		// 		Y: float64,
-		// 	}
-		// 	Op: |,
-		// 	Y: int64,
-		// }
-		var union ast.Expr
-		for i := range t.Len() {
-			term := t.Term(i)
-			termExpr := TypeExpr(term.Type(), qual)
-			if term.Tilde() {
-				termExpr = &ast.UnaryExpr{
-					Op: token.TILDE,
-					X:  termExpr,
-				}
-			}
-			if i == 0 {
-				union = termExpr
-			} else {
-				union = &ast.BinaryExpr{
-					X:  union,
-					Op: token.OR,
-					Y:  termExpr,
-				}
-			}
-		}
-		return union
-
-	case *types.Tuple:
-		panic("invalid input type types.Tuple")
-
-	default:
-		panic("unreachable")
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/versions/features.go b/vendor/golang.org/x/tools/internal/versions/features.go
deleted file mode 100644
index b53f178..0000000
--- a/vendor/golang.org/x/tools/internal/versions/features.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package versions
-
-// This file contains predicates for working with file versions to
-// decide when a tool should consider a language feature enabled.
-
-// GoVersions that features in x/tools can be gated to.
-const (
-	Go1_18 = "go1.18"
-	Go1_19 = "go1.19"
-	Go1_20 = "go1.20"
-	Go1_21 = "go1.21"
-	Go1_22 = "go1.22"
-)
-
-// Future is an invalid unknown Go version sometime in the future.
-// Do not use directly with Compare.
-const Future = ""
-
-// AtLeast reports whether the file version v comes after a Go release.
-//
-// Use this predicate to enable a behavior once a certain Go release
-// has happened (and stays enabled in the future).
-func AtLeast(v, release string) bool {
-	if v == Future {
-		return true // an unknown future version is always after y.
-	}
-	return Compare(Lang(v), Lang(release)) >= 0
-}
-
-// Before reports whether the file version v is strictly before a Go release.
-//
-// Use this predicate to disable a behavior once a certain Go release
-// has happened (and stays enabled in the future).
-func Before(v, release string) bool {
-	if v == Future {
-		return false // an unknown future version happens after y.
-	}
-	return Compare(Lang(v), Lang(release)) < 0
-}
diff --git a/vendor/golang.org/x/tools/internal/versions/gover.go b/vendor/golang.org/x/tools/internal/versions/gover.go
deleted file mode 100644
index bbabcd2..0000000
--- a/vendor/golang.org/x/tools/internal/versions/gover.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This is a fork of internal/gover for use by x/tools until
-// go1.21 and earlier are no longer supported by x/tools.
-
-package versions
-
-import "strings"
-
-// A gover is a parsed Go gover: major[.Minor[.Patch]][kind[pre]]
-// The numbers are the original decimal strings to avoid integer overflows
-// and since there is very little actual math. (Probably overflow doesn't matter in practice,
-// but at the time this code was written, there was an existing test that used
-// go1.99999999999, which does not fit in an int on 32-bit platforms.
-// The "big decimal" representation avoids the problem entirely.)
-type gover struct {
-	major string // decimal
-	minor string // decimal or ""
-	patch string // decimal or ""
-	kind  string // "", "alpha", "beta", "rc"
-	pre   string // decimal or ""
-}
-
-// compare returns -1, 0, or +1 depending on whether
-// x < y, x == y, or x > y, interpreted as toolchain versions.
-// The versions x and y must not begin with a "go" prefix: just "1.21" not "go1.21".
-// Malformed versions compare less than well-formed versions and equal to each other.
-// The language version "1.21" compares less than the release candidate and eventual releases "1.21rc1" and "1.21.0".
-func compare(x, y string) int {
-	vx := parse(x)
-	vy := parse(y)
-
-	if c := cmpInt(vx.major, vy.major); c != 0 {
-		return c
-	}
-	if c := cmpInt(vx.minor, vy.minor); c != 0 {
-		return c
-	}
-	if c := cmpInt(vx.patch, vy.patch); c != 0 {
-		return c
-	}
-	if c := strings.Compare(vx.kind, vy.kind); c != 0 { // "" < alpha < beta < rc
-		return c
-	}
-	if c := cmpInt(vx.pre, vy.pre); c != 0 {
-		return c
-	}
-	return 0
-}
-
-// lang returns the Go language version. For example, lang("1.2.3") == "1.2".
-func lang(x string) string {
-	v := parse(x)
-	if v.minor == "" || v.major == "1" && v.minor == "0" {
-		return v.major
-	}
-	return v.major + "." + v.minor
-}
-
-// isValid reports whether the version x is valid.
-func isValid(x string) bool {
-	return parse(x) != gover{}
-}
-
-// parse parses the Go version string x into a version.
-// It returns the zero version if x is malformed.
-func parse(x string) gover {
-	var v gover
-
-	// Parse major version.
-	var ok bool
-	v.major, x, ok = cutInt(x)
-	if !ok {
-		return gover{}
-	}
-	if x == "" {
-		// Interpret "1" as "1.0.0".
-		v.minor = "0"
-		v.patch = "0"
-		return v
-	}
-
-	// Parse . before minor version.
-	if x[0] != '.' {
-		return gover{}
-	}
-
-	// Parse minor version.
-	v.minor, x, ok = cutInt(x[1:])
-	if !ok {
-		return gover{}
-	}
-	if x == "" {
-		// Patch missing is same as "0" for older versions.
-		// Starting in Go 1.21, patch missing is different from explicit .0.
-		if cmpInt(v.minor, "21") < 0 {
-			v.patch = "0"
-		}
-		return v
-	}
-
-	// Parse patch if present.
-	if x[0] == '.' {
-		v.patch, x, ok = cutInt(x[1:])
-		if !ok || x != "" {
-			// Note that we are disallowing prereleases (alpha, beta, rc) for patch releases here (x != "").
-			// Allowing them would be a bit confusing because we already have:
-			//	1.21 < 1.21rc1
-			// But a prerelease of a patch would have the opposite effect:
-			//	1.21.3rc1 < 1.21.3
-			// We've never needed them before, so let's not start now.
-			return gover{}
-		}
-		return v
-	}
-
-	// Parse prerelease.
-	i := 0
-	for i < len(x) && (x[i] < '0' || '9' < x[i]) {
-		if x[i] < 'a' || 'z' < x[i] {
-			return gover{}
-		}
-		i++
-	}
-	if i == 0 {
-		return gover{}
-	}
-	v.kind, x = x[:i], x[i:]
-	if x == "" {
-		return v
-	}
-	v.pre, x, ok = cutInt(x)
-	if !ok || x != "" {
-		return gover{}
-	}
-
-	return v
-}
-
-// cutInt scans the leading decimal number at the start of x to an integer
-// and returns that value and the rest of the string.
-func cutInt(x string) (n, rest string, ok bool) {
-	i := 0
-	for i < len(x) && '0' <= x[i] && x[i] <= '9' {
-		i++
-	}
-	if i == 0 || x[0] == '0' && i != 1 { // no digits or unnecessary leading zero
-		return "", "", false
-	}
-	return x[:i], x[i:], true
-}
-
-// cmpInt returns cmp.Compare(x, y) interpreting x and y as decimal numbers.
-// (Copied from golang.org/x/mod/semver's compareInt.)
-func cmpInt(x, y string) int {
-	if x == y {
-		return 0
-	}
-	if len(x) < len(y) {
-		return -1
-	}
-	if len(x) > len(y) {
-		return +1
-	}
-	if x < y {
-		return -1
-	} else {
-		return +1
-	}
-}
diff --git a/vendor/golang.org/x/tools/internal/versions/types.go b/vendor/golang.org/x/tools/internal/versions/types.go
deleted file mode 100644
index 0fc10ce..0000000
--- a/vendor/golang.org/x/tools/internal/versions/types.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package versions
-
-import (
-	"go/ast"
-	"go/types"
-)
-
-// FileVersion returns a file's Go version.
-// The reported version is an unknown Future version if a
-// version cannot be determined.
-func FileVersion(info *types.Info, file *ast.File) string {
-	// In tools built with Go >= 1.22, the Go version of a file
-	// follow a cascades of sources:
-	// 1) types.Info.FileVersion, which follows the cascade:
-	//   1.a) file version (ast.File.GoVersion),
-	//   1.b) the package version (types.Config.GoVersion), or
-	// 2) is some unknown Future version.
-	//
-	// File versions require a valid package version to be provided to types
-	// in Config.GoVersion. Config.GoVersion is either from the package's module
-	// or the toolchain (go run). This value should be provided by go/packages
-	// or unitchecker.Config.GoVersion.
-	if v := info.FileVersions[file]; IsValid(v) {
-		return v
-	}
-	// Note: we could instead return runtime.Version() [if valid].
-	// This would act as a max version on what a tool can support.
-	return Future
-}
diff --git a/vendor/golang.org/x/tools/internal/versions/versions.go b/vendor/golang.org/x/tools/internal/versions/versions.go
deleted file mode 100644
index 8d1f745..0000000
--- a/vendor/golang.org/x/tools/internal/versions/versions.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package versions
-
-import (
-	"strings"
-)
-
-// Note: If we use build tags to use go/versions when go >=1.22,
-// we run into go.dev/issue/53737. Under some operations users would see an
-// import of "go/versions" even if they would not compile the file.
-// For example, during `go get -u ./...` (go.dev/issue/64490) we do not try to include
-// For this reason, this library just a clone of go/versions for the moment.
-
-// Lang returns the Go language version for version x.
-// If x is not a valid version, Lang returns the empty string.
-// For example:
-//
-//	Lang("go1.21rc2") = "go1.21"
-//	Lang("go1.21.2") = "go1.21"
-//	Lang("go1.21") = "go1.21"
-//	Lang("go1") = "go1"
-//	Lang("bad") = ""
-//	Lang("1.21") = ""
-func Lang(x string) string {
-	v := lang(stripGo(x))
-	if v == "" {
-		return ""
-	}
-	return x[:2+len(v)] // "go"+v without allocation
-}
-
-// Compare returns -1, 0, or +1 depending on whether
-// x < y, x == y, or x > y, interpreted as Go versions.
-// The versions x and y must begin with a "go" prefix: "go1.21" not "1.21".
-// Invalid versions, including the empty string, compare less than
-// valid versions and equal to each other.
-// The language version "go1.21" compares less than the
-// release candidate and eventual releases "go1.21rc1" and "go1.21.0".
-// Custom toolchain suffixes are ignored during comparison:
-// "go1.21.0" and "go1.21.0-bigcorp" are equal.
-func Compare(x, y string) int { return compare(stripGo(x), stripGo(y)) }
-
-// IsValid reports whether the version x is valid.
-func IsValid(x string) bool { return isValid(stripGo(x)) }
-
-// stripGo converts from a "go1.21" version to a "1.21" version.
-// If v does not start with "go", stripGo returns the empty string (a known invalid version).
-func stripGo(v string) string {
-	v, _, _ = strings.Cut(v, "-") // strip -bigcorp suffix.
-	if len(v) < 2 || v[:2] != "go" {
-		return ""
-	}
-	return v[2:]
-}
diff --git a/vendor/gopkg.in/ini.v1/.editorconfig b/vendor/gopkg.in/ini.v1/.editorconfig
deleted file mode 100644
index 4a2d918..0000000
--- a/vendor/gopkg.in/ini.v1/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*_test.go]
-trim_trailing_whitespace = false
diff --git a/vendor/gopkg.in/ini.v1/.gitignore b/vendor/gopkg.in/ini.v1/.gitignore
index 588388b..1241112 100644
--- a/vendor/gopkg.in/ini.v1/.gitignore
+++ b/vendor/gopkg.in/ini.v1/.gitignore
@@ -4,4 +4,3 @@ ini.sublime-workspace
 testdata/conf_reflect.ini
 .idea
 /.vscode
-.DS_Store
diff --git a/vendor/gopkg.in/ini.v1/.golangci.yml b/vendor/gopkg.in/ini.v1/.golangci.yml
index 631e369..b7256ba 100644
--- a/vendor/gopkg.in/ini.v1/.golangci.yml
+++ b/vendor/gopkg.in/ini.v1/.golangci.yml
@@ -1,9 +1,4 @@
 linters-settings:
-  staticcheck:
-    checks: [
-      "all",
-      "-SA1019" # There are valid use cases of strings.Title
-    ]
   nakedret:
     max-func-lines: 0 # Disallow any unnamed return statement
 
@@ -24,4 +19,3 @@ linters:
     - rowserrcheck
     - unconvert
     - goimports
-    - unparam
diff --git a/vendor/gopkg.in/ini.v1/README.md b/vendor/gopkg.in/ini.v1/README.md
index 30606d9..5d65658 100644
--- a/vendor/gopkg.in/ini.v1/README.md
+++ b/vendor/gopkg.in/ini.v1/README.md
@@ -1,6 +1,6 @@
 # INI
 
-[![GitHub Workflow Status](https://img.shields.io/github/checks-status/go-ini/ini/main?logo=github&style=for-the-badge)](https://github.com/go-ini/ini/actions?query=branch%3Amain)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/go-ini/ini/Go?logo=github&style=for-the-badge)](https://github.com/go-ini/ini/actions?query=workflow%3AGo)
 [![codecov](https://img.shields.io/codecov/c/github/go-ini/ini/master?logo=codecov&style=for-the-badge)](https://codecov.io/gh/go-ini/ini)
 [![GoDoc](https://img.shields.io/badge/GoDoc-Reference-blue?style=for-the-badge&logo=go)](https://pkg.go.dev/github.com/go-ini/ini?tab=doc)
 [![Sourcegraph](https://img.shields.io/badge/view%20on-Sourcegraph-brightgreen.svg?style=for-the-badge&logo=sourcegraph)](https://sourcegraph.com/github.com/go-ini/ini)
@@ -24,7 +24,7 @@ Package ini provides INI file read and write functionality in Go.
 
 ## Installation
 
-The minimum requirement of Go is **1.13**.
+The minimum requirement of Go is **1.6**.
 
 ```sh
 $ go get gopkg.in/ini.v1
diff --git a/vendor/gopkg.in/ini.v1/codecov.yml b/vendor/gopkg.in/ini.v1/codecov.yml
index e02ec84..31f646e 100644
--- a/vendor/gopkg.in/ini.v1/codecov.yml
+++ b/vendor/gopkg.in/ini.v1/codecov.yml
@@ -4,13 +4,6 @@ coverage:
     project:
       default:
         threshold: 1%
-        informational: true
-    patch:
-      defualt:
-        only_pulls: true
-        informational: true
 
 comment:
   layout: 'diff'
-
-github_checks: false
diff --git a/vendor/gopkg.in/ini.v1/deprecated.go b/vendor/gopkg.in/ini.v1/deprecated.go
index 48b8e66..e8bda06 100644
--- a/vendor/gopkg.in/ini.v1/deprecated.go
+++ b/vendor/gopkg.in/ini.v1/deprecated.go
@@ -14,9 +14,12 @@
 
 package ini
 
-var (
+const (
 	// Deprecated: Use "DefaultSection" instead.
 	DEFAULT_SECTION = DefaultSection
+)
+
+var (
 	// Deprecated: AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
 	AllCapsUnderscore = SnackCase
 )
diff --git a/vendor/gopkg.in/ini.v1/error.go b/vendor/gopkg.in/ini.v1/error.go
index f66bc94..d88347c 100644
--- a/vendor/gopkg.in/ini.v1/error.go
+++ b/vendor/gopkg.in/ini.v1/error.go
@@ -32,18 +32,3 @@ func IsErrDelimiterNotFound(err error) bool {
 func (err ErrDelimiterNotFound) Error() string {
 	return fmt.Sprintf("key-value delimiter not found: %s", err.Line)
 }
-
-// ErrEmptyKeyName indicates the error type of no key name is found which there should be one.
-type ErrEmptyKeyName struct {
-	Line string
-}
-
-// IsErrEmptyKeyName returns true if the given error is an instance of ErrEmptyKeyName.
-func IsErrEmptyKeyName(err error) bool {
-	_, ok := err.(ErrEmptyKeyName)
-	return ok
-}
-
-func (err ErrEmptyKeyName) Error() string {
-	return fmt.Sprintf("empty key name: %s", err.Line)
-}
diff --git a/vendor/gopkg.in/ini.v1/file.go b/vendor/gopkg.in/ini.v1/file.go
index f8b2240..b96d172 100644
--- a/vendor/gopkg.in/ini.v1/file.go
+++ b/vendor/gopkg.in/ini.v1/file.go
@@ -142,12 +142,6 @@ func (f *File) GetSection(name string) (*Section, error) {
 	return secs[0], err
 }
 
-// HasSection returns true if the file contains a section with given name.
-func (f *File) HasSection(name string) bool {
-	section, _ := f.GetSection(name)
-	return section != nil
-}
-
 // SectionsByName returns all sections with given name.
 func (f *File) SectionsByName(name string) ([]*Section, error) {
 	if len(name) == 0 {
@@ -174,9 +168,8 @@ func (f *File) SectionsByName(name string) ([]*Section, error) {
 func (f *File) Section(name string) *Section {
 	sec, err := f.GetSection(name)
 	if err != nil {
-		if name == "" {
-			name = DefaultSection
-		}
+		// Note: It's OK here because the only possible error is empty section name,
+		// but if it's empty, this piece of code won't be executed.
 		sec, _ = f.NewSection(name)
 		return sec
 	}
@@ -342,7 +335,6 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
 
 	// Use buffer to make sure target is safe until finish encoding.
 	buf := bytes.NewBuffer(nil)
-	lastSectionIdx := len(f.sectionList) - 1
 	for i, sname := range f.sectionList {
 		sec := f.SectionWithIndex(sname, f.sectionIndexes[i])
 		if len(sec.Comment) > 0 {
@@ -372,13 +364,12 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
 			}
 		}
 
-		isLastSection := i == lastSectionIdx
 		if sec.isRawSection {
 			if _, err := buf.WriteString(sec.rawBody); err != nil {
 				return nil, err
 			}
 
-			if PrettySection && !isLastSection {
+			if PrettySection {
 				// Put a line between sections
 				if _, err := buf.WriteString(LineBreak); err != nil {
 					return nil, err
@@ -444,14 +435,16 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
 				kname = `"""` + kname + `"""`
 			}
 
-			writeKeyValue := func(val string) (bool, error) {
+			for _, val := range key.ValueWithShadows() {
 				if _, err := buf.WriteString(kname); err != nil {
-					return false, err
+					return nil, err
 				}
 
 				if key.isBooleanType {
-					buf.WriteString(LineBreak)
-					return true, nil
+					if kname != sec.keyList[len(sec.keyList)-1] {
+						buf.WriteString(LineBreak)
+					}
+					continue KeyList
 				}
 
 				// Write out alignment spaces before "=" sign
@@ -468,27 +461,10 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
 					val = `"` + val + `"`
 				}
 				if _, err := buf.WriteString(equalSign + val + LineBreak); err != nil {
-					return false, err
-				}
-				return false, nil
-			}
-
-			shadows := key.ValueWithShadows()
-			if len(shadows) == 0 {
-				if _, err := writeKeyValue(""); err != nil {
 					return nil, err
 				}
 			}
 
-			for _, val := range shadows {
-				exitLoop, err := writeKeyValue(val)
-				if err != nil {
-					return nil, err
-				} else if exitLoop {
-					continue KeyList
-				}
-			}
-
 			for _, val := range key.nestedValues {
 				if _, err := buf.WriteString(indent + "  " + val + LineBreak); err != nil {
 					return nil, err
@@ -496,7 +472,7 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
 			}
 		}
 
-		if PrettySection && !isLastSection {
+		if PrettySection {
 			// Put a line between sections
 			if _, err := buf.WriteString(LineBreak); err != nil {
 				return nil, err
diff --git a/vendor/gopkg.in/ini.v1/ini.go b/vendor/gopkg.in/ini.v1/ini.go
index 99e7f86..23f0742 100644
--- a/vendor/gopkg.in/ini.v1/ini.go
+++ b/vendor/gopkg.in/ini.v1/ini.go
@@ -1,3 +1,5 @@
+// +build go1.6
+
 // Copyright 2014 Unknwon
 //
 // Licensed under the Apache License, Version 2.0 (the "License"): you may
@@ -23,15 +25,15 @@ import (
 )
 
 const (
+	// DefaultSection is the name of default section. You can use this constant or the string literal.
+	// In most of cases, an empty string is all you need to access the section.
+	DefaultSection = "DEFAULT"
+
 	// Maximum allowed depth when recursively substituing variable names.
 	depthValues = 99
 )
 
 var (
-	// DefaultSection is the name of default section. You can use this var or the string literal.
-	// In most of cases, an empty string is all you need to access the section.
-	DefaultSection = "DEFAULT"
-
 	// LineBreak is the delimiter to determine or compose a new line.
 	// This variable will be changed to "\r\n" automatically on Windows at package init time.
 	LineBreak = "\n"
@@ -123,8 +125,6 @@ type LoadOptions struct {
 	ReaderBufferSize int
 	// AllowNonUniqueSections indicates whether to allow sections with the same name multiple times.
 	AllowNonUniqueSections bool
-	// AllowDuplicateShadowValues indicates whether values for shadowed keys should be deduplicated.
-	AllowDuplicateShadowValues bool
 }
 
 // DebugFunc is the type of function called to log parse events.
diff --git a/vendor/gopkg.in/ini.v1/key.go b/vendor/gopkg.in/ini.v1/key.go
index a19d9f3..83a7f86 100644
--- a/vendor/gopkg.in/ini.v1/key.go
+++ b/vendor/gopkg.in/ini.v1/key.go
@@ -54,16 +54,14 @@ func (k *Key) addShadow(val string) error {
 		return errors.New("cannot add shadow to auto-increment or boolean key")
 	}
 
-	if !k.s.f.options.AllowDuplicateShadowValues {
-		// Deduplicate shadows based on their values.
-		if k.value == val {
+	// Deduplicate shadows based on their values.
+	if k.value == val {
+		return nil
+	}
+	for i := range k.shadows {
+		if k.shadows[i].value == val {
 			return nil
 		}
-		for i := range k.shadows {
-			if k.shadows[i].value == val {
-				return nil
-			}
-		}
 	}
 
 	shadow := newKey(k.s, k.name, val)
@@ -110,24 +108,15 @@ func (k *Key) Value() string {
 	return k.value
 }
 
-// ValueWithShadows returns raw values of key and its shadows if any. Shadow
-// keys with empty values are ignored from the returned list.
+// ValueWithShadows returns raw values of key and its shadows if any.
 func (k *Key) ValueWithShadows() []string {
 	if len(k.shadows) == 0 {
-		if k.value == "" {
-			return []string{}
-		}
 		return []string{k.value}
 	}
-
-	vals := make([]string, 0, len(k.shadows)+1)
-	if k.value != "" {
-		vals = append(vals, k.value)
-	}
-	for _, s := range k.shadows {
-		if s.value != "" {
-			vals = append(vals, s.value)
-		}
+	vals := make([]string, len(k.shadows)+1)
+	vals[0] = k.value
+	for i := range k.shadows {
+		vals[i+1] = k.shadows[i].value
 	}
 	return vals
 }
diff --git a/vendor/gopkg.in/ini.v1/parser.go b/vendor/gopkg.in/ini.v1/parser.go
index 44fc526..b8b5aa8 100644
--- a/vendor/gopkg.in/ini.v1/parser.go
+++ b/vendor/gopkg.in/ini.v1/parser.go
@@ -164,10 +164,6 @@ func readKeyName(delimiters string, in []byte) (string, int, error) {
 	if endIdx < 0 {
 		return "", -1, ErrDelimiterNotFound{line}
 	}
-	if endIdx == 0 {
-		return "", -1, ErrEmptyKeyName{line}
-	}
-
 	return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
 }
 
@@ -306,9 +302,15 @@ func (p *parser) readPythonMultilines(line string, bufferSize int) (string, erro
 	parserBufferPeekResult, _ := p.buf.Peek(bufferSize)
 	peekBuffer := bytes.NewBuffer(parserBufferPeekResult)
 
+	indentSize := 0
 	for {
 		peekData, peekErr := peekBuffer.ReadBytes('\n')
-		if peekErr != nil && peekErr != io.EOF {
+		if peekErr != nil {
+			if peekErr == io.EOF {
+				p.debug("readPythonMultilines: io.EOF, peekData: %q, line: %q", string(peekData), line)
+				return line, nil
+			}
+
 			p.debug("readPythonMultilines: failed to peek with error: %v", peekErr)
 			return "", peekErr
 		}
@@ -327,6 +329,19 @@ func (p *parser) readPythonMultilines(line string, bufferSize int) (string, erro
 			return line, nil
 		}
 
+		// Determine indent size and line prefix.
+		currentIndentSize := len(peekMatches[1])
+		if indentSize < 1 {
+			indentSize = currentIndentSize
+			p.debug("readPythonMultilines: indent size is %d", indentSize)
+		}
+
+		// Make sure each line is indented at least as far as first line.
+		if currentIndentSize < indentSize {
+			p.debug("readPythonMultilines: end of value, current indent: %d, expected indent: %d, line: %q", currentIndentSize, indentSize, line)
+			return line, nil
+		}
+
 		// Advance the parser reader (buffer) in-sync with the peek buffer.
 		_, err := p.buf.Discard(len(peekData))
 		if err != nil {
@@ -334,7 +349,8 @@ func (p *parser) readPythonMultilines(line string, bufferSize int) (string, erro
 			return "", err
 		}
 
-		line += "\n" + peekMatches[0]
+		// Handle indented empty line.
+		line += "\n" + peekMatches[1][indentSize:] + peekMatches[2]
 	}
 }
 
@@ -445,8 +461,6 @@ func (f *File) parse(reader io.Reader) (err error) {
 			// Reset auto-counter and comments
 			p.comment.Reset()
 			p.count = 1
-			// Nested values can't span sections
-			isLastValueEmpty = false
 
 			inUnparseableSection = false
 			for i := range f.options.UnparseableSections {
@@ -467,9 +481,8 @@ func (f *File) parse(reader io.Reader) (err error) {
 
 		kname, offset, err := readKeyName(f.options.KeyValueDelimiters, line)
 		if err != nil {
-			switch {
 			// Treat as boolean key when desired, and whole line is key name.
-			case IsErrDelimiterNotFound(err):
+			if IsErrDelimiterNotFound(err) {
 				switch {
 				case f.options.AllowBooleanKeys:
 					kname, err := p.readValue(line, parserBufferSize)
@@ -487,8 +500,6 @@ func (f *File) parse(reader io.Reader) (err error) {
 				case f.options.SkipUnrecognizableLines:
 					continue
 				}
-			case IsErrEmptyKeyName(err) && f.options.SkipUnrecognizableLines:
-				continue
 			}
 			return err
 		}
diff --git a/vendor/gopkg.in/square/go-jose.v2/.gitcookies.sh.enc b/vendor/gopkg.in/square/go-jose.v2/.gitcookies.sh.enc
new file mode 100644
index 0000000..730e569
--- /dev/null
+++ b/vendor/gopkg.in/square/go-jose.v2/.gitcookies.sh.enc
@@ -0,0 +1 @@
+'|Ê&{tÄU|gGê(ì�Cy=+¨œòcû:u:/pœ#~žü["±4¤!­nÙAªDK<ŠufÿhÅa¿Â:ºü¸¡´B/£Ø¤¹¤ò_�hÎÛSãT*wÌx¼¯�¹-ç|�àÀÓƒÑÄäóÌ㣗A$$â6£ÁâG)8nÏpûÆË¡3ÌšœoïÏvŽB–3¿­]xÝ“Ó2l§G•|qRÞ¯
ö2
5R–Ó×Ç$´ñ½Yè¡ÞÝ™l‘Ë«yAI"ÛŒ˜®íû¹¼kÄ|Kåþ[9ÆâÒå=°úÿŸñ|@S•3ó#æ�x?¾V„,¾‚SÆÝõœwPíogÒ6&V6	©D.dBŠ7
\ No newline at end of file
diff --git a/vendor/github.com/go-jose/go-jose/v4/.gitignore b/vendor/gopkg.in/square/go-jose.v2/.gitignore
similarity index 50%
rename from vendor/github.com/go-jose/go-jose/v4/.gitignore
rename to vendor/gopkg.in/square/go-jose.v2/.gitignore
index eb29eba..95a8515 100644
--- a/vendor/github.com/go-jose/go-jose/v4/.gitignore
+++ b/vendor/gopkg.in/square/go-jose.v2/.gitignore
@@ -1,2 +1,8 @@
+*~
+.*.swp
+*.out
+*.test
+*.pem
+*.cov
 jose-util/jose-util
 jose-util.t.err
\ No newline at end of file
diff --git a/vendor/gopkg.in/square/go-jose.v2/.travis.yml b/vendor/gopkg.in/square/go-jose.v2/.travis.yml
new file mode 100644
index 0000000..391b99a
--- /dev/null
+++ b/vendor/gopkg.in/square/go-jose.v2/.travis.yml
@@ -0,0 +1,45 @@
+language: go
+
+sudo: false
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - go: tip
+
+go:
+- '1.14.x'
+- '1.15.x'
+- tip
+
+go_import_path: gopkg.in/square/go-jose.v2
+
+before_script:
+- export PATH=$HOME/.local/bin:$PATH
+
+before_install:
+# Install encrypted gitcookies to get around bandwidth-limits
+# that is causing Travis-CI builds to fail. For more info, see
+# https://github.com/golang/go/issues/12933
+- openssl aes-256-cbc -K $encrypted_1528c3c2cafd_key -iv $encrypted_1528c3c2cafd_iv -in .gitcookies.sh.enc -out .gitcookies.sh -d || true
+- bash .gitcookies.sh || true
+- go get github.com/wadey/gocovmerge
+- go get github.com/mattn/goveralls
+- go get github.com/stretchr/testify/assert
+- go get github.com/stretchr/testify/require
+- go get github.com/google/go-cmp/cmp
+- go get golang.org/x/tools/cmd/cover || true
+- go get code.google.com/p/go.tools/cmd/cover || true
+- pip install cram --user
+
+script:
+- go test . -v -covermode=count -coverprofile=profile.cov
+- go test ./cipher -v -covermode=count -coverprofile=cipher/profile.cov
+- go test ./jwt -v -covermode=count -coverprofile=jwt/profile.cov
+- go test ./json -v # no coverage for forked encoding/json package
+- cd jose-util && go build && PATH=$PWD:$PATH cram -v jose-util.t # cram tests jose-util
+- cd ..
+
+after_success:
+- gocovmerge *.cov */*.cov > merged.coverprofile
+- $HOME/gopath/bin/goveralls -coverprofile merged.coverprofile -service=travis-ci
diff --git a/vendor/gopkg.in/square/go-jose.v2/BUG-BOUNTY.md b/vendor/gopkg.in/square/go-jose.v2/BUG-BOUNTY.md
new file mode 100644
index 0000000..3305db0
--- /dev/null
+++ b/vendor/gopkg.in/square/go-jose.v2/BUG-BOUNTY.md
@@ -0,0 +1,10 @@
+Serious about security
+======================
+
+Square recognizes the important contributions the security research community
+can make. We therefore encourage reporting security issues with the code
+contained in this repository.
+
+If you believe you have discovered a security vulnerability, please follow the
+guidelines at <https://bugcrowd.com/squareopensource>.
+
diff --git a/vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md b/vendor/gopkg.in/square/go-jose.v2/CONTRIBUTING.md
similarity index 65%
rename from vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md
rename to vendor/gopkg.in/square/go-jose.v2/CONTRIBUTING.md
index 4b4805a..61b1836 100644
--- a/vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md
+++ b/vendor/gopkg.in/square/go-jose.v2/CONTRIBUTING.md
@@ -7,3 +7,8 @@ When submitting code, please make every effort to follow existing conventions
 and style in order to keep the code as readable as possible. Please also make
 sure all tests pass by running `go test`, and format your code with `go fmt`.
 We also recommend using `golint` and `errcheck`.
+
+Before your code can be accepted into the project you must also sign the
+[Individual Contributor License Agreement][1].
+
+ [1]: https://spreadsheets.google.com/spreadsheet/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1
diff --git a/vendor/github.com/go-jose/go-jose/v4/LICENSE b/vendor/gopkg.in/square/go-jose.v2/LICENSE
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/LICENSE
rename to vendor/gopkg.in/square/go-jose.v2/LICENSE
diff --git a/vendor/gopkg.in/square/go-jose.v2/README.md b/vendor/gopkg.in/square/go-jose.v2/README.md
new file mode 100644
index 0000000..1791bfa
--- /dev/null
+++ b/vendor/gopkg.in/square/go-jose.v2/README.md
@@ -0,0 +1,118 @@
+# Go JOSE 
+
+[![godoc](http://img.shields.io/badge/godoc-version_1-blue.svg?style=flat)](https://godoc.org/gopkg.in/square/go-jose.v1)
+[![godoc](http://img.shields.io/badge/godoc-version_2-blue.svg?style=flat)](https://godoc.org/gopkg.in/square/go-jose.v2)
+[![license](http://img.shields.io/badge/license-apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/square/go-jose/master/LICENSE)
+[![build](https://travis-ci.org/square/go-jose.svg?branch=v2)](https://travis-ci.org/square/go-jose)
+[![coverage](https://coveralls.io/repos/github/square/go-jose/badge.svg?branch=v2)](https://coveralls.io/r/square/go-jose)
+
+Package jose aims to provide an implementation of the Javascript Object Signing
+and Encryption set of standards. This includes support for JSON Web Encryption,
+JSON Web Signature, and JSON Web Token standards.
+
+**Disclaimer**: This library contains encryption software that is subject to
+the U.S. Export Administration Regulations. You may not export, re-export,
+transfer or download this code or any part of it in violation of any United
+States law, directive or regulation. In particular this software may not be
+exported or re-exported in any form or on any media to Iran, North Sudan,
+Syria, Cuba, or North Korea, or to denied persons or entities mentioned on any
+US maintained blocked list.
+
+## Overview
+
+The implementation follows the
+[JSON Web Encryption](http://dx.doi.org/10.17487/RFC7516) (RFC 7516),
+[JSON Web Signature](http://dx.doi.org/10.17487/RFC7515) (RFC 7515), and
+[JSON Web Token](http://dx.doi.org/10.17487/RFC7519) (RFC 7519).
+Tables of supported algorithms are shown below. The library supports both
+the compact and full serialization formats, and has optional support for
+multiple recipients. It also comes with a small command-line utility
+([`jose-util`](https://github.com/square/go-jose/tree/v2/jose-util))
+for dealing with JOSE messages in a shell.
+
+**Note**: We use a forked version of the `encoding/json` package from the Go
+standard library which uses case-sensitive matching for member names (instead
+of [case-insensitive matching](https://www.ietf.org/mail-archive/web/json/current/msg03763.html)).
+This is to avoid differences in interpretation of messages between go-jose and
+libraries in other languages.
+
+### Versions
+
+We use [gopkg.in](https://gopkg.in) for versioning.
+
+[Version 2](https://gopkg.in/square/go-jose.v2)
+([branch](https://github.com/square/go-jose/tree/v2),
+[doc](https://godoc.org/gopkg.in/square/go-jose.v2)) is the current version:
+
+    import "gopkg.in/square/go-jose.v2"
+
+The old `v1` branch ([go-jose.v1](https://gopkg.in/square/go-jose.v1)) will
+still receive backported bug fixes and security fixes, but otherwise
+development is frozen. All new feature development takes place on the `v2`
+branch. Version 2 also contains additional sub-packages such as the
+[jwt](https://godoc.org/gopkg.in/square/go-jose.v2/jwt) implementation
+contributed by [@shaxbee](https://github.com/shaxbee).
+
+### Supported algorithms
+
+See below for a table of supported algorithms. Algorithm identifiers match
+the names in the [JSON Web Algorithms](http://dx.doi.org/10.17487/RFC7518)
+standard where possible. The Godoc reference has a list of constants.
+
+ Key encryption             | Algorithm identifier(s)
+ :------------------------- | :------------------------------
+ RSA-PKCS#1v1.5             | RSA1_5
+ RSA-OAEP                   | RSA-OAEP, RSA-OAEP-256
+ AES key wrap               | A128KW, A192KW, A256KW
+ AES-GCM key wrap           | A128GCMKW, A192GCMKW, A256GCMKW
+ ECDH-ES + AES key wrap     | ECDH-ES+A128KW, ECDH-ES+A192KW, ECDH-ES+A256KW
+ ECDH-ES (direct)           | ECDH-ES<sup>1</sup>
+ Direct encryption          | dir<sup>1</sup>
+
+<sup>1. Not supported in multi-recipient mode</sup>
+
+ Signing / MAC              | Algorithm identifier(s)
+ :------------------------- | :------------------------------
+ RSASSA-PKCS#1v1.5          | RS256, RS384, RS512
+ RSASSA-PSS                 | PS256, PS384, PS512
+ HMAC                       | HS256, HS384, HS512
+ ECDSA                      | ES256, ES384, ES512
+ Ed25519                    | EdDSA<sup>2</sup>
+
+<sup>2. Only available in version 2 of the package</sup>
+
+ Content encryption         | Algorithm identifier(s)
+ :------------------------- | :------------------------------
+ AES-CBC+HMAC               | A128CBC-HS256, A192CBC-HS384, A256CBC-HS512
+ AES-GCM                    | A128GCM, A192GCM, A256GCM 
+
+ Compression                | Algorithm identifiers(s)
+ :------------------------- | -------------------------------
+ DEFLATE (RFC 1951)         | DEF
+
+### Supported key types
+
+See below for a table of supported key types. These are understood by the
+library, and can be passed to corresponding functions such as `NewEncrypter` or
+`NewSigner`. Each of these keys can also be wrapped in a JWK if desired, which
+allows attaching a key id.
+
+ Algorithm(s)               | Corresponding types
+ :------------------------- | -------------------------------
+ RSA                        | *[rsa.PublicKey](http://golang.org/pkg/crypto/rsa/#PublicKey), *[rsa.PrivateKey](http://golang.org/pkg/crypto/rsa/#PrivateKey)
+ ECDH, ECDSA                | *[ecdsa.PublicKey](http://golang.org/pkg/crypto/ecdsa/#PublicKey), *[ecdsa.PrivateKey](http://golang.org/pkg/crypto/ecdsa/#PrivateKey)
+ EdDSA<sup>1</sup>          | [ed25519.PublicKey](https://godoc.org/golang.org/x/crypto/ed25519#PublicKey), [ed25519.PrivateKey](https://godoc.org/golang.org/x/crypto/ed25519#PrivateKey)
+ AES, HMAC                  | []byte
+
+<sup>1. Only available in version 2 of the package</sup>
+
+## Examples
+
+[![godoc](http://img.shields.io/badge/godoc-version_1-blue.svg?style=flat)](https://godoc.org/gopkg.in/square/go-jose.v1)
+[![godoc](http://img.shields.io/badge/godoc-version_2-blue.svg?style=flat)](https://godoc.org/gopkg.in/square/go-jose.v2)
+
+Examples can be found in the Godoc
+reference for this package. The
+[`jose-util`](https://github.com/square/go-jose/tree/v2/jose-util)
+subdirectory also contains a small command-line utility which might be useful
+as an example.
diff --git a/vendor/github.com/go-jose/go-jose/v4/asymmetric.go b/vendor/gopkg.in/square/go-jose.v2/asymmetric.go
similarity index 92%
rename from vendor/github.com/go-jose/go-jose/v4/asymmetric.go
rename to vendor/gopkg.in/square/go-jose.v2/asymmetric.go
index f8d5774..b69aa03 100644
--- a/vendor/github.com/go-jose/go-jose/v4/asymmetric.go
+++ b/vendor/gopkg.in/square/go-jose.v2/asymmetric.go
@@ -20,7 +20,6 @@ import (
 	"crypto"
 	"crypto/aes"
 	"crypto/ecdsa"
-	"crypto/ed25519"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha1"
@@ -29,8 +28,9 @@ import (
 	"fmt"
 	"math/big"
 
-	josecipher "github.com/go-jose/go-jose/v4/cipher"
-	"github.com/go-jose/go-jose/v4/json"
+	"golang.org/x/crypto/ed25519"
+	josecipher "gopkg.in/square/go-jose.v2/cipher"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // A generic RSA-based encrypter/verifier
@@ -285,9 +285,6 @@ func (ctx rsaDecrypterSigner) signPayload(payload []byte, alg SignatureAlgorithm
 
 	switch alg {
 	case RS256, RS384, RS512:
-		// TODO(https://github.com/go-jose/go-jose/issues/40): As of go1.20, the
-		// random parameter is legacy and ignored, and it can be nil.
-		// https://cs.opensource.google/go/go/+/refs/tags/go1.20:src/crypto/rsa/pkcs1v15.go;l=263;bpv=0;bpt=1
 		out, err = rsa.SignPKCS1v15(RandReader, ctx.privateKey, hash, hashed)
 	case PS256, PS384, PS512:
 		out, err = rsa.SignPSS(RandReader, ctx.privateKey, hash, hashed, &rsa.PSSOptions{
@@ -416,28 +413,28 @@ func (ctx ecKeyGenerator) genKey() ([]byte, rawHeader, error) {
 func (ctx ecDecrypterSigner) decryptKey(headers rawHeader, recipient *recipientInfo, generator keyGenerator) ([]byte, error) {
 	epk, err := headers.getEPK()
 	if err != nil {
-		return nil, errors.New("go-jose/go-jose: invalid epk header")
+		return nil, errors.New("square/go-jose: invalid epk header")
 	}
 	if epk == nil {
-		return nil, errors.New("go-jose/go-jose: missing epk header")
+		return nil, errors.New("square/go-jose: missing epk header")
 	}
 
 	publicKey, ok := epk.Key.(*ecdsa.PublicKey)
 	if publicKey == nil || !ok {
-		return nil, errors.New("go-jose/go-jose: invalid epk header")
+		return nil, errors.New("square/go-jose: invalid epk header")
 	}
 
 	if !ctx.privateKey.Curve.IsOnCurve(publicKey.X, publicKey.Y) {
-		return nil, errors.New("go-jose/go-jose: invalid public key in epk header")
+		return nil, errors.New("square/go-jose: invalid public key in epk header")
 	}
 
 	apuData, err := headers.getAPU()
 	if err != nil {
-		return nil, errors.New("go-jose/go-jose: invalid apu header")
+		return nil, errors.New("square/go-jose: invalid apu header")
 	}
 	apvData, err := headers.getAPV()
 	if err != nil {
-		return nil, errors.New("go-jose/go-jose: invalid apv header")
+		return nil, errors.New("square/go-jose: invalid apv header")
 	}
 
 	deriveKey := func(algID string, size int) []byte {
@@ -492,7 +489,7 @@ func (ctx edEncrypterVerifier) verifyPayload(payload []byte, signature []byte, a
 	}
 	ok := ed25519.Verify(ctx.publicKey, payload, signature)
 	if !ok {
-		return errors.New("go-jose/go-jose: ed25519 signature failed to verify")
+		return errors.New("square/go-jose: ed25519 signature failed to verify")
 	}
 	return nil
 }
@@ -516,7 +513,7 @@ func (ctx ecDecrypterSigner) signPayload(payload []byte, alg SignatureAlgorithm)
 
 	curveBits := ctx.privateKey.Curve.Params().BitSize
 	if expectedBitSize != curveBits {
-		return Signature{}, fmt.Errorf("go-jose/go-jose: expected %d bit key, got %d bits instead", expectedBitSize, curveBits)
+		return Signature{}, fmt.Errorf("square/go-jose: expected %d bit key, got %d bits instead", expectedBitSize, curveBits)
 	}
 
 	hasher := hash.New()
@@ -574,7 +571,7 @@ func (ctx ecEncrypterVerifier) verifyPayload(payload []byte, signature []byte, a
 	}
 
 	if len(signature) != 2*keySize {
-		return fmt.Errorf("go-jose/go-jose: invalid signature size, have %d bytes, wanted %d", len(signature), 2*keySize)
+		return fmt.Errorf("square/go-jose: invalid signature size, have %d bytes, wanted %d", len(signature), 2*keySize)
 	}
 
 	hasher := hash.New()
@@ -588,7 +585,7 @@ func (ctx ecEncrypterVerifier) verifyPayload(payload []byte, signature []byte, a
 
 	match := ecdsa.Verify(ctx.publicKey, hashed, r, s)
 	if !match {
-		return errors.New("go-jose/go-jose: ecdsa signature failed to verify")
+		return errors.New("square/go-jose: ecdsa signature failed to verify")
 	}
 
 	return nil
diff --git a/vendor/github.com/go-jose/go-jose/v4/cipher/cbc_hmac.go b/vendor/gopkg.in/square/go-jose.v2/cipher/cbc_hmac.go
similarity index 91%
rename from vendor/github.com/go-jose/go-jose/v4/cipher/cbc_hmac.go
rename to vendor/gopkg.in/square/go-jose.v2/cipher/cbc_hmac.go
index af029ce..f6465c0 100644
--- a/vendor/github.com/go-jose/go-jose/v4/cipher/cbc_hmac.go
+++ b/vendor/gopkg.in/square/go-jose.v2/cipher/cbc_hmac.go
@@ -101,23 +101,23 @@ func (ctx *cbcAEAD) Seal(dst, nonce, plaintext, data []byte) []byte {
 // Open decrypts and authenticates the ciphertext.
 func (ctx *cbcAEAD) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
 	if len(ciphertext) < ctx.authtagBytes {
-		return nil, errors.New("go-jose/go-jose: invalid ciphertext (too short)")
+		return nil, errors.New("square/go-jose: invalid ciphertext (too short)")
 	}
 
 	offset := len(ciphertext) - ctx.authtagBytes
 	expectedTag := ctx.computeAuthTag(data, nonce, ciphertext[:offset])
 	match := subtle.ConstantTimeCompare(expectedTag, ciphertext[offset:])
 	if match != 1 {
-		return nil, errors.New("go-jose/go-jose: invalid ciphertext (auth tag mismatch)")
+		return nil, errors.New("square/go-jose: invalid ciphertext (auth tag mismatch)")
 	}
 
 	cbc := cipher.NewCBCDecrypter(ctx.blockCipher, nonce)
 
 	// Make copy of ciphertext buffer, don't want to modify in place
-	buffer := append([]byte{}, ciphertext[:offset]...)
+	buffer := append([]byte{}, []byte(ciphertext[:offset])...)
 
 	if len(buffer)%ctx.blockCipher.BlockSize() > 0 {
-		return nil, errors.New("go-jose/go-jose: invalid ciphertext (invalid length)")
+		return nil, errors.New("square/go-jose: invalid ciphertext (invalid length)")
 	}
 
 	cbc.CryptBlocks(buffer, buffer)
@@ -177,19 +177,19 @@ func padBuffer(buffer []byte, blockSize int) []byte {
 // Remove padding
 func unpadBuffer(buffer []byte, blockSize int) ([]byte, error) {
 	if len(buffer)%blockSize != 0 {
-		return nil, errors.New("go-jose/go-jose: invalid padding")
+		return nil, errors.New("square/go-jose: invalid padding")
 	}
 
 	last := buffer[len(buffer)-1]
 	count := int(last)
 
 	if count == 0 || count > blockSize || count > len(buffer) {
-		return nil, errors.New("go-jose/go-jose: invalid padding")
+		return nil, errors.New("square/go-jose: invalid padding")
 	}
 
 	padding := bytes.Repeat([]byte{last}, count)
 	if !bytes.HasSuffix(buffer, padding) {
-		return nil, errors.New("go-jose/go-jose: invalid padding")
+		return nil, errors.New("square/go-jose: invalid padding")
 	}
 
 	return buffer[:len(buffer)-count], nil
diff --git a/vendor/github.com/go-jose/go-jose/v4/cipher/concat_kdf.go b/vendor/gopkg.in/square/go-jose.v2/cipher/concat_kdf.go
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/cipher/concat_kdf.go
rename to vendor/gopkg.in/square/go-jose.v2/cipher/concat_kdf.go
diff --git a/vendor/github.com/go-jose/go-jose/v4/cipher/ecdh_es.go b/vendor/gopkg.in/square/go-jose.v2/cipher/ecdh_es.go
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/cipher/ecdh_es.go
rename to vendor/gopkg.in/square/go-jose.v2/cipher/ecdh_es.go
diff --git a/vendor/github.com/go-jose/go-jose/v4/cipher/key_wrap.go b/vendor/gopkg.in/square/go-jose.v2/cipher/key_wrap.go
similarity index 88%
rename from vendor/github.com/go-jose/go-jose/v4/cipher/key_wrap.go
rename to vendor/gopkg.in/square/go-jose.v2/cipher/key_wrap.go
index b9effbc..1d36d50 100644
--- a/vendor/github.com/go-jose/go-jose/v4/cipher/key_wrap.go
+++ b/vendor/gopkg.in/square/go-jose.v2/cipher/key_wrap.go
@@ -28,7 +28,7 @@ var defaultIV = []byte{0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6}
 // KeyWrap implements NIST key wrapping; it wraps a content encryption key (cek) with the given block cipher.
 func KeyWrap(block cipher.Block, cek []byte) ([]byte, error) {
 	if len(cek)%8 != 0 {
-		return nil, errors.New("go-jose/go-jose: key wrap input must be 8 byte blocks")
+		return nil, errors.New("square/go-jose: key wrap input must be 8 byte blocks")
 	}
 
 	n := len(cek) / 8
@@ -51,7 +51,7 @@ func KeyWrap(block cipher.Block, cek []byte) ([]byte, error) {
 		binary.BigEndian.PutUint64(tBytes, uint64(t+1))
 
 		for i := 0; i < 8; i++ {
-			buffer[i] ^= tBytes[i]
+			buffer[i] = buffer[i] ^ tBytes[i]
 		}
 		copy(r[t%n], buffer[8:])
 	}
@@ -68,7 +68,7 @@ func KeyWrap(block cipher.Block, cek []byte) ([]byte, error) {
 // KeyUnwrap implements NIST key unwrapping; it unwraps a content encryption key (cek) with the given block cipher.
 func KeyUnwrap(block cipher.Block, ciphertext []byte) ([]byte, error) {
 	if len(ciphertext)%8 != 0 {
-		return nil, errors.New("go-jose/go-jose: key wrap input must be 8 byte blocks")
+		return nil, errors.New("square/go-jose: key wrap input must be 8 byte blocks")
 	}
 
 	n := (len(ciphertext) / 8) - 1
@@ -87,7 +87,7 @@ func KeyUnwrap(block cipher.Block, ciphertext []byte) ([]byte, error) {
 		binary.BigEndian.PutUint64(tBytes, uint64(t+1))
 
 		for i := 0; i < 8; i++ {
-			buffer[i] ^= tBytes[i]
+			buffer[i] = buffer[i] ^ tBytes[i]
 		}
 		copy(buffer[8:], r[t%n])
 
@@ -97,7 +97,7 @@ func KeyUnwrap(block cipher.Block, ciphertext []byte) ([]byte, error) {
 	}
 
 	if subtle.ConstantTimeCompare(buffer[:8], defaultIV) == 0 {
-		return nil, errors.New("go-jose/go-jose: failed to unwrap key")
+		return nil, errors.New("square/go-jose: failed to unwrap key")
 	}
 
 	out := make([]byte, n*8)
diff --git a/vendor/github.com/go-jose/go-jose/v4/crypter.go b/vendor/gopkg.in/square/go-jose.v2/crypter.go
similarity index 76%
rename from vendor/github.com/go-jose/go-jose/v4/crypter.go
rename to vendor/gopkg.in/square/go-jose.v2/crypter.go
index d81b03b..be7433e 100644
--- a/vendor/github.com/go-jose/go-jose/v4/crypter.go
+++ b/vendor/gopkg.in/square/go-jose.v2/crypter.go
@@ -21,8 +21,9 @@ import (
 	"crypto/rsa"
 	"errors"
 	"fmt"
+	"reflect"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // Encrypter represents an encrypter which produces an encrypted JWE object.
@@ -75,24 +76,14 @@ type recipientKeyInfo struct {
 type EncrypterOptions struct {
 	Compression CompressionAlgorithm
 
-	// Optional map of name/value pairs to be inserted into the protected
-	// header of a JWS object. Some specifications which make use of
-	// JWS require additional values here.
-	//
-	// Values will be serialized by [json.Marshal] and must be valid inputs to
-	// that function.
-	//
-	// [json.Marshal]: https://pkg.go.dev/encoding/json#Marshal
+	// Optional map of additional keys to be inserted into the protected header
+	// of a JWS object. Some specifications which make use of JWS like to insert
+	// additional values here. All values must be JSON-serializable.
 	ExtraHeaders map[HeaderKey]interface{}
 }
 
 // WithHeader adds an arbitrary value to the ExtraHeaders map, initializing it
-// if necessary, and returns the updated EncrypterOptions.
-//
-// The v parameter will be serialized by [json.Marshal] and must be a valid
-// input to that function.
-//
-// [json.Marshal]: https://pkg.go.dev/encoding/json#Marshal
+// if necessary. It returns itself and so can be used in a fluent style.
 func (eo *EncrypterOptions) WithHeader(k HeaderKey, v interface{}) *EncrypterOptions {
 	if eo.ExtraHeaders == nil {
 		eo.ExtraHeaders = map[HeaderKey]interface{}{}
@@ -120,17 +111,7 @@ func (eo *EncrypterOptions) WithType(typ ContentType) *EncrypterOptions {
 // default of 100000 will be used for the count and a 128-bit random salt will
 // be generated.
 type Recipient struct {
-	Algorithm KeyAlgorithm
-	// Key must have one of these types:
-	//  - ed25519.PublicKey
-	//  - *ecdsa.PublicKey
-	//  - *rsa.PublicKey
-	//  - *JSONWebKey
-	//  - JSONWebKey
-	//  - []byte (a symmetric key)
-	//  - Any type that satisfies the OpaqueKeyEncrypter interface
-	//
-	// The type of Key must match the value of Algorithm.
+	Algorithm  KeyAlgorithm
 	Key        interface{}
 	KeyID      string
 	PBES2Count int
@@ -169,17 +150,16 @@ func NewEncrypter(enc ContentEncryption, rcpt Recipient, opts *EncrypterOptions)
 	switch rcpt.Algorithm {
 	case DIRECT:
 		// Direct encryption mode must be treated differently
-		keyBytes, ok := rawKey.([]byte)
-		if !ok {
+		if reflect.TypeOf(rawKey) != reflect.TypeOf([]byte{}) {
 			return nil, ErrUnsupportedKeyType
 		}
-		if encrypter.cipher.keySize() != len(keyBytes) {
+		if encrypter.cipher.keySize() != len(rawKey.([]byte)) {
 			return nil, ErrInvalidKeySize
 		}
 		encrypter.keyGenerator = staticKeyGenerator{
-			key: keyBytes,
+			key: rawKey.([]byte),
 		}
-		recipientInfo, _ := newSymmetricRecipient(rcpt.Algorithm, keyBytes)
+		recipientInfo, _ := newSymmetricRecipient(rcpt.Algorithm, rawKey.([]byte))
 		recipientInfo.keyID = keyID
 		if rcpt.KeyID != "" {
 			recipientInfo.keyID = rcpt.KeyID
@@ -188,16 +168,16 @@ func NewEncrypter(enc ContentEncryption, rcpt Recipient, opts *EncrypterOptions)
 		return encrypter, nil
 	case ECDH_ES:
 		// ECDH-ES (w/o key wrapping) is similar to DIRECT mode
-		keyDSA, ok := rawKey.(*ecdsa.PublicKey)
-		if !ok {
+		typeOf := reflect.TypeOf(rawKey)
+		if typeOf != reflect.TypeOf(&ecdsa.PublicKey{}) {
 			return nil, ErrUnsupportedKeyType
 		}
 		encrypter.keyGenerator = ecKeyGenerator{
 			size:      encrypter.cipher.keySize(),
 			algID:     string(enc),
-			publicKey: keyDSA,
+			publicKey: rawKey.(*ecdsa.PublicKey),
 		}
-		recipientInfo, _ := newECDHRecipient(rcpt.Algorithm, keyDSA)
+		recipientInfo, _ := newECDHRecipient(rcpt.Algorithm, rawKey.(*ecdsa.PublicKey))
 		recipientInfo.keyID = keyID
 		if rcpt.KeyID != "" {
 			recipientInfo.keyID = rcpt.KeyID
@@ -221,8 +201,8 @@ func NewMultiEncrypter(enc ContentEncryption, rcpts []Recipient, opts *Encrypter
 	if cipher == nil {
 		return nil, ErrUnsupportedAlgorithm
 	}
-	if len(rcpts) == 0 {
-		return nil, fmt.Errorf("go-jose/go-jose: recipients is nil or empty")
+	if rcpts == nil || len(rcpts) == 0 {
+		return nil, fmt.Errorf("square/go-jose: recipients is nil or empty")
 	}
 
 	encrypter := &genericEncrypter{
@@ -254,7 +234,7 @@ func (ctx *genericEncrypter) addRecipient(recipient Recipient) (err error) {
 
 	switch recipient.Algorithm {
 	case DIRECT, ECDH_ES:
-		return fmt.Errorf("go-jose/go-jose: key algorithm '%s' not supported in multi-recipient mode", recipient.Algorithm)
+		return fmt.Errorf("square/go-jose: key algorithm '%s' not supported in multi-recipient mode", recipient.Algorithm)
 	}
 
 	recipientInfo, err = makeJWERecipient(recipient.Algorithm, recipient.Key)
@@ -290,8 +270,9 @@ func makeJWERecipient(alg KeyAlgorithm, encryptionKey interface{}) (recipientKey
 		recipient, err := makeJWERecipient(alg, encryptionKey.Key)
 		recipient.keyID = encryptionKey.KeyID
 		return recipient, err
-	case OpaqueKeyEncrypter:
-		return newOpaqueKeyEncrypter(alg, encryptionKey)
+	}
+	if encrypter, ok := encryptionKey.(OpaqueKeyEncrypter); ok {
+		return newOpaqueKeyEncrypter(alg, encrypter)
 	}
 	return recipientKeyInfo{}, ErrUnsupportedKeyType
 }
@@ -319,11 +300,11 @@ func newDecrypter(decryptionKey interface{}) (keyDecrypter, error) {
 		return newDecrypter(decryptionKey.Key)
 	case *JSONWebKey:
 		return newDecrypter(decryptionKey.Key)
-	case OpaqueKeyDecrypter:
-		return &opaqueKeyDecrypter{decrypter: decryptionKey}, nil
-	default:
-		return nil, ErrUnsupportedKeyType
 	}
+	if okd, ok := decryptionKey.(OpaqueKeyDecrypter); ok {
+		return &opaqueKeyDecrypter{decrypter: okd}, nil
+	}
+	return nil, ErrUnsupportedKeyType
 }
 
 // Implementation of encrypt method producing a JWE object.
@@ -345,7 +326,7 @@ func (ctx *genericEncrypter) EncryptWithAuthData(plaintext, aad []byte) (*JSONWe
 	obj.recipients = make([]recipientInfo, len(ctx.recipients))
 
 	if len(ctx.recipients) == 0 {
-		return nil, fmt.Errorf("go-jose/go-jose: no recipients to encrypt to")
+		return nil, fmt.Errorf("square/go-jose: no recipients to encrypt to")
 	}
 
 	cek, headers, err := ctx.keyGenerator.genKey()
@@ -422,55 +403,33 @@ func (ctx *genericEncrypter) Options() EncrypterOptions {
 	}
 }
 
-// Decrypt and validate the object and return the plaintext. This
-// function does not support multi-recipient. If you desire multi-recipient
+// Decrypt and validate the object and return the plaintext. Note that this
+// function does not support multi-recipient, if you desire multi-recipient
 // decryption use DecryptMulti instead.
-//
-// The decryptionKey argument must contain a private or symmetric key
-// and must have one of these types:
-//   - *ecdsa.PrivateKey
-//   - *rsa.PrivateKey
-//   - *JSONWebKey
-//   - JSONWebKey
-//   - *JSONWebKeySet
-//   - JSONWebKeySet
-//   - []byte (a symmetric key)
-//   - string (a symmetric key)
-//   - Any type that satisfies the OpaqueKeyDecrypter interface.
-//
-// Note that ed25519 is only available for signatures, not encryption, so is
-// not an option here.
-//
-// Automatically decompresses plaintext, but returns an error if the decompressed
-// data would be >250kB or >10x the size of the compressed data, whichever is larger.
 func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error) {
 	headers := obj.mergedHeaders(nil)
 
 	if len(obj.recipients) > 1 {
-		return nil, errors.New("go-jose/go-jose: too many recipients in payload; expecting only one")
+		return nil, errors.New("square/go-jose: too many recipients in payload; expecting only one")
 	}
 
 	critical, err := headers.getCritical()
 	if err != nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid crit header")
+		return nil, fmt.Errorf("square/go-jose: invalid crit header")
 	}
 
 	if len(critical) > 0 {
-		return nil, fmt.Errorf("go-jose/go-jose: unsupported crit header")
+		return nil, fmt.Errorf("square/go-jose: unsupported crit header")
 	}
 
-	key, err := tryJWKS(decryptionKey, obj.Header)
-	if err != nil {
-		return nil, err
-	}
-	decrypter, err := newDecrypter(key)
+	decrypter, err := newDecrypter(decryptionKey)
 	if err != nil {
 		return nil, err
 	}
 
 	cipher := getContentCipher(headers.getEncryption())
 	if cipher == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: unsupported enc value '%s'", string(headers.getEncryption()))
+		return nil, fmt.Errorf("square/go-jose: unsupported enc value '%s'", string(headers.getEncryption()))
 	}
 
 	generator := randomKeyGenerator{
@@ -502,41 +461,28 @@ func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error)
 	// The "zip" header parameter may only be present in the protected header.
 	if comp := obj.protected.getCompression(); comp != "" {
 		plaintext, err = decompress(comp, plaintext)
-		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: failed to decompress plaintext: %v", err)
-		}
 	}
 
-	return plaintext, nil
+	return plaintext, err
 }
 
 // DecryptMulti decrypts and validates the object and returns the plaintexts,
 // with support for multiple recipients. It returns the index of the recipient
 // for which the decryption was successful, the merged headers for that recipient,
 // and the plaintext.
-//
-// The decryptionKey argument must have one of the types allowed for the
-// decryptionKey argument of Decrypt().
-//
-// Automatically decompresses plaintext, but returns an error if the decompressed
-// data would be >250kB or >3x the size of the compressed data, whichever is larger.
 func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Header, []byte, error) {
 	globalHeaders := obj.mergedHeaders(nil)
 
 	critical, err := globalHeaders.getCritical()
 	if err != nil {
-		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: invalid crit header")
+		return -1, Header{}, nil, fmt.Errorf("square/go-jose: invalid crit header")
 	}
 
 	if len(critical) > 0 {
-		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: unsupported crit header")
+		return -1, Header{}, nil, fmt.Errorf("square/go-jose: unsupported crit header")
 	}
 
-	key, err := tryJWKS(decryptionKey, obj.Header)
-	if err != nil {
-		return -1, Header{}, nil, err
-	}
-	decrypter, err := newDecrypter(key)
+	decrypter, err := newDecrypter(decryptionKey)
 	if err != nil {
 		return -1, Header{}, nil, err
 	}
@@ -544,7 +490,7 @@ func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Heade
 	encryption := globalHeaders.getEncryption()
 	cipher := getContentCipher(encryption)
 	if cipher == nil {
-		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: unsupported enc value '%s'", string(encryption))
+		return -1, Header{}, nil, fmt.Errorf("square/go-jose: unsupported enc value '%s'", string(encryption))
 	}
 
 	generator := randomKeyGenerator{
@@ -578,21 +524,18 @@ func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Heade
 		}
 	}
 
-	if plaintext == nil {
+	if plaintext == nil || err != nil {
 		return -1, Header{}, nil, ErrCryptoFailure
 	}
 
 	// The "zip" header parameter may only be present in the protected header.
 	if comp := obj.protected.getCompression(); comp != "" {
 		plaintext, err = decompress(comp, plaintext)
-		if err != nil {
-			return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: failed to decompress plaintext: %v", err)
-		}
 	}
 
 	sanitized, err := headers.sanitized()
 	if err != nil {
-		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: failed to sanitize header: %v", err)
+		return -1, Header{}, nil, fmt.Errorf("square/go-jose: failed to sanitize header: %v", err)
 	}
 
 	return index, sanitized, plaintext, err
diff --git a/vendor/github.com/go-jose/go-jose/v4/doc.go b/vendor/gopkg.in/square/go-jose.v2/doc.go
similarity index 84%
rename from vendor/github.com/go-jose/go-jose/v4/doc.go
rename to vendor/gopkg.in/square/go-jose.v2/doc.go
index 0ad40ca..dd1387f 100644
--- a/vendor/github.com/go-jose/go-jose/v4/doc.go
+++ b/vendor/gopkg.in/square/go-jose.v2/doc.go
@@ -15,11 +15,13 @@
  */
 
 /*
+
 Package jose aims to provide an implementation of the Javascript Object Signing
 and Encryption set of standards. It implements encryption and signing based on
-the JSON Web Encryption and JSON Web Signature standards, with optional JSON Web
-Token support available in a sub-package. The library supports both the compact
-and JWS/JWE JSON Serialization formats, and has optional support for multiple
+the JSON Web Encryption and JSON Web Signature standards, with optional JSON
+Web Token support available in a sub-package. The library supports both the
+compact and full serialization formats, and has optional support for multiple
 recipients.
+
 */
 package jose
diff --git a/vendor/github.com/go-jose/go-jose/v4/encoding.go b/vendor/gopkg.in/square/go-jose.v2/encoding.go
similarity index 77%
rename from vendor/github.com/go-jose/go-jose/v4/encoding.go
rename to vendor/gopkg.in/square/go-jose.v2/encoding.go
index 4f6e0d4..70f7385 100644
--- a/vendor/github.com/go-jose/go-jose/v4/encoding.go
+++ b/vendor/gopkg.in/square/go-jose.v2/encoding.go
@@ -21,13 +21,12 @@ import (
 	"compress/flate"
 	"encoding/base64"
 	"encoding/binary"
-	"fmt"
 	"io"
 	"math/big"
 	"strings"
 	"unicode"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // Helper function to serialize known-good objects.
@@ -42,7 +41,7 @@ func mustSerializeJSON(value interface{}) []byte {
 	// MarshalJSON will happily serialize it as the top-level value "null". If
 	// that value is then embedded in another operation, for instance by being
 	// base64-encoded and fed as input to a signing algorithm
-	// (https://github.com/go-jose/go-jose/issues/22), the result will be
+	// (https://github.com/square/go-jose/issues/22), the result will be
 	// incorrect. Because this method is intended for known-good objects, and a nil
 	// pointer is not a known-good object, we are free to panic in this case.
 	// Note: It's not possible to directly check whether the data pointed at by an
@@ -86,7 +85,7 @@ func decompress(algorithm CompressionAlgorithm, input []byte) ([]byte, error) {
 	}
 }
 
-// deflate compresses the input.
+// Compress with DEFLATE
 func deflate(input []byte) ([]byte, error) {
 	output := new(bytes.Buffer)
 
@@ -98,24 +97,15 @@ func deflate(input []byte) ([]byte, error) {
 	return output.Bytes(), err
 }
 
-// inflate decompresses the input.
-//
-// Errors if the decompressed data would be >250kB or >10x the size of the
-// compressed data, whichever is larger.
+// Decompress with DEFLATE
 func inflate(input []byte) ([]byte, error) {
 	output := new(bytes.Buffer)
 	reader := flate.NewReader(bytes.NewBuffer(input))
 
-	maxCompressedSize := max(250_000, 10*int64(len(input)))
-
-	limit := maxCompressedSize + 1
-	n, err := io.CopyN(output, reader, limit)
-	if err != nil && err != io.EOF {
+	_, err := io.Copy(output, reader)
+	if err != nil {
 		return nil, err
 	}
-	if n == limit {
-		return nil, fmt.Errorf("uncompressed data would be too large (>%d bytes)", maxCompressedSize)
-	}
 
 	err = reader.Close()
 	return output.Bytes(), err
@@ -137,7 +127,7 @@ func newBuffer(data []byte) *byteBuffer {
 
 func newFixedSizeBuffer(data []byte, length int) *byteBuffer {
 	if len(data) > length {
-		panic("go-jose/go-jose: invalid call to newFixedSizeBuffer (len(data) > length)")
+		panic("square/go-jose: invalid call to newFixedSizeBuffer (len(data) > length)")
 	}
 	pad := make([]byte, length-len(data))
 	return newBuffer(append(pad, data...))
@@ -193,36 +183,3 @@ func (b byteBuffer) bigInt() *big.Int {
 func (b byteBuffer) toInt() int {
 	return int(b.bigInt().Int64())
 }
-
-func base64EncodeLen(sl []byte) int {
-	return base64.RawURLEncoding.EncodedLen(len(sl))
-}
-
-func base64JoinWithDots(inputs ...[]byte) string {
-	if len(inputs) == 0 {
-		return ""
-	}
-
-	// Count of dots.
-	totalCount := len(inputs) - 1
-
-	for _, input := range inputs {
-		totalCount += base64EncodeLen(input)
-	}
-
-	out := make([]byte, totalCount)
-	startEncode := 0
-	for i, input := range inputs {
-		base64.RawURLEncoding.Encode(out[startEncode:], input)
-
-		if i == len(inputs)-1 {
-			continue
-		}
-
-		startEncode += base64EncodeLen(input)
-		out[startEncode] = '.'
-		startEncode++
-	}
-
-	return string(out)
-}
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/LICENSE b/vendor/gopkg.in/square/go-jose.v2/json/LICENSE
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/json/LICENSE
rename to vendor/gopkg.in/square/go-jose.v2/json/LICENSE
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/README.md b/vendor/gopkg.in/square/go-jose.v2/json/README.md
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/json/README.md
rename to vendor/gopkg.in/square/go-jose.v2/json/README.md
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/decode.go b/vendor/gopkg.in/square/go-jose.v2/json/decode.go
similarity index 99%
rename from vendor/github.com/go-jose/go-jose/v4/json/decode.go
rename to vendor/gopkg.in/square/go-jose.v2/json/decode.go
index 50634dd..4dbc414 100644
--- a/vendor/github.com/go-jose/go-jose/v4/json/decode.go
+++ b/vendor/gopkg.in/square/go-jose.v2/json/decode.go
@@ -75,13 +75,14 @@ import (
 //
 // The JSON null value unmarshals into an interface, map, pointer, or slice
 // by setting that Go value to nil. Because null is often used in JSON to mean
-// “not present,� unmarshaling a JSON null into any other Go type has no effect
+// ``not present,'' unmarshaling a JSON null into any other Go type has no effect
 // on the value and produces no error.
 //
 // When unmarshaling quoted strings, invalid UTF-8 or
 // invalid UTF-16 surrogate pairs are not treated as an error.
 // Instead, they are replaced by the Unicode replacement
 // character U+FFFD.
+//
 func Unmarshal(data []byte, v interface{}) error {
 	// Check for well-formedness.
 	// Avoids filling out half a data structure
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/encode.go b/vendor/gopkg.in/square/go-jose.v2/json/encode.go
similarity index 98%
rename from vendor/github.com/go-jose/go-jose/v4/json/encode.go
rename to vendor/gopkg.in/square/go-jose.v2/json/encode.go
index 98de68c..1dae8bb 100644
--- a/vendor/github.com/go-jose/go-jose/v4/json/encode.go
+++ b/vendor/gopkg.in/square/go-jose.v2/json/encode.go
@@ -58,7 +58,6 @@ import (
 // becomes a member of the object unless
 //   - the field's tag is "-", or
 //   - the field is empty and its tag specifies the "omitempty" option.
-//
 // The empty values are false, 0, any
 // nil pointer or interface value, and any array, slice, map, or string of
 // length zero. The object's default key string is the struct field name
@@ -66,28 +65,28 @@ import (
 // the struct field's tag value is the key name, followed by an optional comma
 // and options. Examples:
 //
-//	// Field is ignored by this package.
-//	Field int `json:"-"`
+//   // Field is ignored by this package.
+//   Field int `json:"-"`
 //
-//	// Field appears in JSON as key "myName".
-//	Field int `json:"myName"`
+//   // Field appears in JSON as key "myName".
+//   Field int `json:"myName"`
 //
-//	// Field appears in JSON as key "myName" and
-//	// the field is omitted from the object if its value is empty,
-//	// as defined above.
-//	Field int `json:"myName,omitempty"`
+//   // Field appears in JSON as key "myName" and
+//   // the field is omitted from the object if its value is empty,
+//   // as defined above.
+//   Field int `json:"myName,omitempty"`
 //
-//	// Field appears in JSON as key "Field" (the default), but
-//	// the field is skipped if empty.
-//	// Note the leading comma.
-//	Field int `json:",omitempty"`
+//   // Field appears in JSON as key "Field" (the default), but
+//   // the field is skipped if empty.
+//   // Note the leading comma.
+//   Field int `json:",omitempty"`
 //
 // The "string" option signals that a field is stored as JSON inside a
 // JSON-encoded string. It applies only to fields of string, floating point,
 // integer, or boolean types. This extra level of encoding is sometimes used
 // when communicating with JavaScript programs:
 //
-//	Int64String int64 `json:",string"`
+//    Int64String int64 `json:",string"`
 //
 // The key name will be used if it's a non-empty string consisting of
 // only Unicode letters, digits, dollar signs, percent signs, hyphens,
@@ -134,6 +133,7 @@ import (
 // JSON cannot represent cyclic data structures and Marshal does not
 // handle them.  Passing cyclic structures to Marshal will result in
 // an infinite recursion.
+//
 func Marshal(v interface{}) ([]byte, error) {
 	e := &encodeState{}
 	err := e.marshal(v)
@@ -648,7 +648,7 @@ func encodeByteSlice(e *encodeState, v reflect.Value, _ bool) {
 		// for large buffers, avoid unnecessary extra temporary
 		// buffer space.
 		enc := base64.NewEncoder(base64.StdEncoding, e)
-		_, _ = enc.Write(s)
+		enc.Write(s)
 		enc.Close()
 	}
 	e.WriteByte('"')
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/indent.go b/vendor/gopkg.in/square/go-jose.v2/json/indent.go
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/json/indent.go
rename to vendor/gopkg.in/square/go-jose.v2/json/indent.go
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/scanner.go b/vendor/gopkg.in/square/go-jose.v2/json/scanner.go
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/json/scanner.go
rename to vendor/gopkg.in/square/go-jose.v2/json/scanner.go
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/stream.go b/vendor/gopkg.in/square/go-jose.v2/json/stream.go
similarity index 99%
rename from vendor/github.com/go-jose/go-jose/v4/json/stream.go
rename to vendor/gopkg.in/square/go-jose.v2/json/stream.go
index f03b171..9b2b926 100644
--- a/vendor/github.com/go-jose/go-jose/v4/json/stream.go
+++ b/vendor/gopkg.in/square/go-jose.v2/json/stream.go
@@ -240,6 +240,7 @@ var _ Unmarshaler = (*RawMessage)(nil)
 //	Number, for JSON numbers
 //	string, for JSON string literals
 //	nil, for JSON null
+//
 type Token interface{}
 
 const (
diff --git a/vendor/github.com/go-jose/go-jose/v4/json/tags.go b/vendor/gopkg.in/square/go-jose.v2/json/tags.go
similarity index 100%
rename from vendor/github.com/go-jose/go-jose/v4/json/tags.go
rename to vendor/gopkg.in/square/go-jose.v2/json/tags.go
diff --git a/vendor/github.com/go-jose/go-jose/v4/jwe.go b/vendor/gopkg.in/square/go-jose.v2/jwe.go
similarity index 60%
rename from vendor/github.com/go-jose/go-jose/v4/jwe.go
rename to vendor/gopkg.in/square/go-jose.v2/jwe.go
index 6102f91..b5a6dcd 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jwe.go
+++ b/vendor/gopkg.in/square/go-jose.v2/jwe.go
@@ -18,11 +18,10 @@ package jose
 
 import (
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // rawJSONWebEncryption represents a raw JWE JSON object. Used for parsing/serializing.
@@ -87,12 +86,11 @@ func (obj JSONWebEncryption) mergedHeaders(recipient *recipientInfo) rawHeader {
 func (obj JSONWebEncryption) computeAuthData() []byte {
 	var protected string
 
-	switch {
-	case obj.original != nil && obj.original.Protected != nil:
+	if obj.original != nil && obj.original.Protected != nil {
 		protected = obj.original.Protected.base64()
-	case obj.protected != nil:
+	} else if obj.protected != nil {
 		protected = base64.RawURLEncoding.EncodeToString(mustSerializeJSON((obj.protected)))
-	default:
+	} else {
 		protected = ""
 	}
 
@@ -105,75 +103,29 @@ func (obj JSONWebEncryption) computeAuthData() []byte {
 	return output
 }
 
-func containsKeyAlgorithm(haystack []KeyAlgorithm, needle KeyAlgorithm) bool {
-	for _, algorithm := range haystack {
-		if algorithm == needle {
-			return true
-		}
-	}
-	return false
-}
-
-func containsContentEncryption(haystack []ContentEncryption, needle ContentEncryption) bool {
-	for _, algorithm := range haystack {
-		if algorithm == needle {
-			return true
-		}
-	}
-	return false
-}
-
-// ParseEncrypted parses an encrypted message in JWE Compact or JWE JSON Serialization.
-//
-// https://datatracker.ietf.org/doc/html/rfc7516#section-3.1
-// https://datatracker.ietf.org/doc/html/rfc7516#section-3.2
-//
-// The keyAlgorithms and contentEncryption parameters are used to validate the "alg" and "enc"
-// header parameters respectively. They must be nonempty, and each "alg" or "enc" header in
-// parsed data must contain a value that is present in the corresponding parameter. That
-// includes the protected and unprotected headers as well as all recipients. To accept
-// multiple algorithms, pass a slice of all the algorithms you want to accept.
-func ParseEncrypted(input string,
-	keyEncryptionAlgorithms []KeyAlgorithm,
-	contentEncryption []ContentEncryption,
-) (*JSONWebEncryption, error) {
+// ParseEncrypted parses an encrypted message in compact or full serialization format.
+func ParseEncrypted(input string) (*JSONWebEncryption, error) {
 	input = stripWhitespace(input)
 	if strings.HasPrefix(input, "{") {
-		return ParseEncryptedJSON(input, keyEncryptionAlgorithms, contentEncryption)
+		return parseEncryptedFull(input)
 	}
 
-	return ParseEncryptedCompact(input, keyEncryptionAlgorithms, contentEncryption)
+	return parseEncryptedCompact(input)
 }
 
-// ParseEncryptedJSON parses a message in JWE JSON Serialization.
-//
-// https://datatracker.ietf.org/doc/html/rfc7516#section-3.2
-func ParseEncryptedJSON(
-	input string,
-	keyEncryptionAlgorithms []KeyAlgorithm,
-	contentEncryption []ContentEncryption,
-) (*JSONWebEncryption, error) {
+// parseEncryptedFull parses a message in compact format.
+func parseEncryptedFull(input string) (*JSONWebEncryption, error) {
 	var parsed rawJSONWebEncryption
 	err := json.Unmarshal([]byte(input), &parsed)
 	if err != nil {
 		return nil, err
 	}
 
-	return parsed.sanitized(keyEncryptionAlgorithms, contentEncryption)
+	return parsed.sanitized()
 }
 
 // sanitized produces a cleaned-up JWE object from the raw JSON.
-func (parsed *rawJSONWebEncryption) sanitized(
-	keyEncryptionAlgorithms []KeyAlgorithm,
-	contentEncryption []ContentEncryption,
-) (*JSONWebEncryption, error) {
-	if len(keyEncryptionAlgorithms) == 0 {
-		return nil, errors.New("go-jose/go-jose: no key algorithms provided")
-	}
-	if len(contentEncryption) == 0 {
-		return nil, errors.New("go-jose/go-jose: no content encryption algorithms provided")
-	}
-
+func (parsed *rawJSONWebEncryption) sanitized() (*JSONWebEncryption, error) {
 	obj := &JSONWebEncryption{
 		original:    parsed,
 		unprotected: parsed.Unprotected,
@@ -194,7 +146,7 @@ func (parsed *rawJSONWebEncryption) sanitized(
 	if parsed.Protected != nil && len(parsed.Protected.bytes()) > 0 {
 		err := json.Unmarshal(parsed.Protected.bytes(), &obj.protected)
 		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid protected header: %s, %s", err, parsed.Protected.base64())
+			return nil, fmt.Errorf("square/go-jose: invalid protected header: %s, %s", err, parsed.Protected.base64())
 		}
 	}
 
@@ -204,7 +156,7 @@ func (parsed *rawJSONWebEncryption) sanitized(
 	mergedHeaders := obj.mergedHeaders(nil)
 	obj.Header, err = mergedHeaders.sanitized()
 	if err != nil {
-		return nil, fmt.Errorf("go-jose/go-jose: cannot sanitize merged headers: %v (%v)", err, mergedHeaders)
+		return nil, fmt.Errorf("square/go-jose: cannot sanitize merged headers: %v (%v)", err, mergedHeaders)
 	}
 
 	if len(parsed.Recipients) == 0 {
@@ -232,31 +184,10 @@ func (parsed *rawJSONWebEncryption) sanitized(
 		}
 	}
 
-	for i, recipient := range obj.recipients {
+	for _, recipient := range obj.recipients {
 		headers := obj.mergedHeaders(&recipient)
-		if headers.getAlgorithm() == "" {
-			return nil, fmt.Errorf(`go-jose/go-jose: recipient %d: missing header "alg"`, i)
-		}
-		if headers.getEncryption() == "" {
-			return nil, fmt.Errorf(`go-jose/go-jose: recipient %d: missing header "enc"`, i)
-		}
-		err := validateAlgEnc(headers, keyEncryptionAlgorithms, contentEncryption)
-		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: recipient %d: %s", i, err)
-		}
-
-	}
-
-	if obj.protected != nil {
-		err := validateAlgEnc(*obj.protected, keyEncryptionAlgorithms, contentEncryption)
-		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: protected header: %s", err)
-		}
-	}
-	if obj.unprotected != nil {
-		err := validateAlgEnc(*obj.unprotected, keyEncryptionAlgorithms, contentEncryption)
-		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: unprotected header: %s", err)
+		if headers.getAlgorithm() == "" || headers.getEncryption() == "" {
+			return nil, fmt.Errorf("square/go-jose: message is missing alg/enc headers")
 		}
 	}
 
@@ -268,40 +199,12 @@ func (parsed *rawJSONWebEncryption) sanitized(
 	return obj, nil
 }
 
-func validateAlgEnc(headers rawHeader, keyAlgorithms []KeyAlgorithm, contentEncryption []ContentEncryption) error {
-	alg := headers.getAlgorithm()
-	enc := headers.getEncryption()
-	if alg != "" && !containsKeyAlgorithm(keyAlgorithms, alg) {
-		return fmt.Errorf("unexpected key algorithm %q; expected %q", alg, keyAlgorithms)
+// parseEncryptedCompact parses a message in compact format.
+func parseEncryptedCompact(input string) (*JSONWebEncryption, error) {
+	parts := strings.Split(input, ".")
+	if len(parts) != 5 {
+		return nil, fmt.Errorf("square/go-jose: compact JWE format must have five parts")
 	}
-	if enc != "" && !containsContentEncryption(contentEncryption, enc) {
-		return fmt.Errorf("unexpected content encryption algorithm %q; expected %q", enc, contentEncryption)
-	}
-	return nil
-}
-
-// ParseEncryptedCompact parses a message in JWE Compact Serialization.
-//
-// https://datatracker.ietf.org/doc/html/rfc7516#section-3.1
-func ParseEncryptedCompact(
-	input string,
-	keyAlgorithms []KeyAlgorithm,
-	contentEncryption []ContentEncryption,
-) (*JSONWebEncryption, error) {
-	var parts [5]string
-	var ok bool
-
-	for i := range 4 {
-		parts[i], input, ok = strings.Cut(input, ".")
-		if !ok {
-			return nil, errors.New("go-jose/go-jose: compact JWE format must have five parts")
-		}
-	}
-	// Validate that the last part does not contain more dots
-	if strings.ContainsRune(input, '.') {
-		return nil, errors.New("go-jose/go-jose: compact JWE format must have five parts")
-	}
-	parts[4] = input
 
 	rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0])
 	if err != nil {
@@ -336,7 +239,7 @@ func ParseEncryptedCompact(
 		Tag:          newBuffer(tag),
 	}
 
-	return raw.sanitized(keyAlgorithms, contentEncryption)
+	return raw.sanitized()
 }
 
 // CompactSerialize serializes an object using the compact serialization format.
@@ -348,13 +251,13 @@ func (obj JSONWebEncryption) CompactSerialize() (string, error) {
 
 	serializedProtected := mustSerializeJSON(obj.protected)
 
-	return base64JoinWithDots(
-		serializedProtected,
-		obj.recipients[0].encryptedKey,
-		obj.iv,
-		obj.ciphertext,
-		obj.tag,
-	), nil
+	return fmt.Sprintf(
+		"%s.%s.%s.%s.%s",
+		base64.RawURLEncoding.EncodeToString(serializedProtected),
+		base64.RawURLEncoding.EncodeToString(obj.recipients[0].encryptedKey),
+		base64.RawURLEncoding.EncodeToString(obj.iv),
+		base64.RawURLEncoding.EncodeToString(obj.ciphertext),
+		base64.RawURLEncoding.EncodeToString(obj.tag)), nil
 }
 
 // FullSerialize serializes an object using the full JSON serialization format.
diff --git a/vendor/github.com/go-jose/go-jose/v4/jwk.go b/vendor/gopkg.in/square/go-jose.v2/jwk.go
similarity index 76%
rename from vendor/github.com/go-jose/go-jose/v4/jwk.go
rename to vendor/gopkg.in/square/go-jose.v2/jwk.go
index 9700f89..222e260 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jwk.go
+++ b/vendor/gopkg.in/square/go-jose.v2/jwk.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"crypto"
 	"crypto/ecdsa"
-	"crypto/ed25519"
 	"crypto/elliptic"
 	"crypto/rsa"
 	"crypto/sha1"
@@ -35,7 +34,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"golang.org/x/crypto/ed25519"
+
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // rawJSONWebKey represents a public or private key in JWK format, used for parsing/serializing.
@@ -62,26 +63,14 @@ type rawJSONWebKey struct {
 	Qi *byteBuffer `json:"qi,omitempty"`
 	// Certificates
 	X5c       []string `json:"x5c,omitempty"`
-	X5u       string   `json:"x5u,omitempty"`
+	X5u       *url.URL `json:"x5u,omitempty"`
 	X5tSHA1   string   `json:"x5t,omitempty"`
 	X5tSHA256 string   `json:"x5t#S256,omitempty"`
 }
 
-// JSONWebKey represents a public or private key in JWK format. It can be
-// marshaled into JSON and unmarshaled from JSON.
+// JSONWebKey represents a public or private key in JWK format.
 type JSONWebKey struct {
-	// Key is the Go in-memory representation of this key. It must have one
-	// of these types:
-	//  - ed25519.PublicKey
-	//  - ed25519.PrivateKey
-	//  - *ecdsa.PublicKey
-	//  - *ecdsa.PrivateKey
-	//  - *rsa.PublicKey
-	//  - *rsa.PrivateKey
-	//  - []byte (a symmetric key)
-	//
-	// When marshaling this JSONWebKey into JSON, the "kty" header parameter
-	// will be automatically set based on the type of this field.
+	// Cryptographic key, can be a symmetric or asymmetric key.
 	Key interface{}
 	// Key identifier, parsed from `kid` header.
 	KeyID string
@@ -121,7 +110,7 @@ func (k JSONWebKey) MarshalJSON() ([]byte, error) {
 	case []byte:
 		raw, err = fromSymmetricKey(key)
 	default:
-		return nil, fmt.Errorf("go-jose/go-jose: unknown key type '%s'", reflect.TypeOf(key))
+		return nil, fmt.Errorf("square/go-jose: unknown key type '%s'", reflect.TypeOf(key))
 	}
 
 	if err != nil {
@@ -140,13 +129,13 @@ func (k JSONWebKey) MarshalJSON() ([]byte, error) {
 	x5tSHA256Len := len(k.CertificateThumbprintSHA256)
 	if x5tSHA1Len > 0 {
 		if x5tSHA1Len != sha1.Size {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid SHA-1 thumbprint (must be %d bytes, not %d)", sha1.Size, x5tSHA1Len)
+			return nil, fmt.Errorf("square/go-jose: invalid SHA-1 thumbprint (must be %d bytes, not %d)", sha1.Size, x5tSHA1Len)
 		}
 		raw.X5tSHA1 = base64.RawURLEncoding.EncodeToString(k.CertificateThumbprintSHA1)
 	}
 	if x5tSHA256Len > 0 {
 		if x5tSHA256Len != sha256.Size {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid SHA-256 thumbprint (must be %d bytes, not %d)", sha256.Size, x5tSHA256Len)
+			return nil, fmt.Errorf("square/go-jose: invalid SHA-256 thumbprint (must be %d bytes, not %d)", sha256.Size, x5tSHA256Len)
 		}
 		raw.X5tSHA256 = base64.RawURLEncoding.EncodeToString(k.CertificateThumbprintSHA256)
 	}
@@ -160,16 +149,14 @@ func (k JSONWebKey) MarshalJSON() ([]byte, error) {
 		expectedSHA256 := sha256.Sum256(k.Certificates[0].Raw)
 
 		if len(k.CertificateThumbprintSHA1) > 0 && !bytes.Equal(k.CertificateThumbprintSHA1, expectedSHA1[:]) {
-			return nil, errors.New("go-jose/go-jose: invalid SHA-1 thumbprint, does not match cert chain")
+			return nil, errors.New("square/go-jose: invalid SHA-1 thumbprint, does not match cert chain")
 		}
 		if len(k.CertificateThumbprintSHA256) > 0 && !bytes.Equal(k.CertificateThumbprintSHA256, expectedSHA256[:]) {
-			return nil, errors.New("go-jose/go-jose: invalid or SHA-256 thumbprint, does not match cert chain")
+			return nil, errors.New("square/go-jose: invalid or SHA-256 thumbprint, does not match cert chain")
 		}
 	}
 
-	if k.CertificatesURL != nil {
-		raw.X5u = k.CertificatesURL.String()
-	}
+	raw.X5u = k.CertificatesURL
 
 	return json.Marshal(raw)
 }
@@ -184,7 +171,7 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 
 	certs, err := parseCertificateChain(raw.X5c)
 	if err != nil {
-		return fmt.Errorf("go-jose/go-jose: failed to unmarshal x5c field: %s", err)
+		return fmt.Errorf("square/go-jose: failed to unmarshal x5c field: %s", err)
 	}
 
 	var key interface{}
@@ -224,7 +211,7 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 		}
 	case "oct":
 		if certPub != nil {
-			return errors.New("go-jose/go-jose: invalid JWK, found 'oct' (symmetric) key with cert chain")
+			return errors.New("square/go-jose: invalid JWK, found 'oct' (symmetric) key with cert chain")
 		}
 		key, err = raw.symmetricKey()
 	case "OKP":
@@ -239,10 +226,10 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 				keyPub = key
 			}
 		} else {
-			return fmt.Errorf("go-jose/go-jose: unknown curve '%s'", raw.Crv)
+			err = fmt.Errorf("square/go-jose: unknown curve %s'", raw.Crv)
 		}
 	default:
-		return fmt.Errorf("go-jose/go-jose: unknown json web key type '%s'", raw.Kty)
+		err = fmt.Errorf("square/go-jose: unknown json web key type '%s'", raw.Kty)
 	}
 
 	if err != nil {
@@ -251,24 +238,19 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 
 	if certPub != nil && keyPub != nil {
 		if !reflect.DeepEqual(certPub, keyPub) {
-			return errors.New("go-jose/go-jose: invalid JWK, public keys in key and x5c fields do not match")
+			return errors.New("square/go-jose: invalid JWK, public keys in key and x5c fields do not match")
 		}
 	}
 
 	*k = JSONWebKey{Key: key, KeyID: raw.Kid, Algorithm: raw.Alg, Use: raw.Use, Certificates: certs}
 
-	if raw.X5u != "" {
-		k.CertificatesURL, err = url.Parse(raw.X5u)
-		if err != nil {
-			return fmt.Errorf("go-jose/go-jose: invalid JWK, x5u header is invalid URL: %w", err)
-		}
-	}
+	k.CertificatesURL = raw.X5u
 
 	// x5t parameters are base64url-encoded SHA thumbprints
 	// See RFC 7517, Section 4.8, https://tools.ietf.org/html/rfc7517#section-4.8
 	x5tSHA1bytes, err := base64.RawURLEncoding.DecodeString(raw.X5tSHA1)
 	if err != nil {
-		return errors.New("go-jose/go-jose: invalid JWK, x5t header has invalid encoding")
+		return errors.New("square/go-jose: invalid JWK, x5t header has invalid encoding")
 	}
 
 	// RFC 7517, Section 4.8 is ambiguous as to whether the digest output should be byte or hex,
@@ -278,7 +260,7 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 	if len(x5tSHA1bytes) == 2*sha1.Size {
 		hx, err := hex.DecodeString(string(x5tSHA1bytes))
 		if err != nil {
-			return fmt.Errorf("go-jose/go-jose: invalid JWK, unable to hex decode x5t: %v", err)
+			return fmt.Errorf("square/go-jose: invalid JWK, unable to hex decode x5t: %v", err)
 
 		}
 		x5tSHA1bytes = hx
@@ -288,13 +270,13 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 
 	x5tSHA256bytes, err := base64.RawURLEncoding.DecodeString(raw.X5tSHA256)
 	if err != nil {
-		return errors.New("go-jose/go-jose: invalid JWK, x5t#S256 header has invalid encoding")
+		return errors.New("square/go-jose: invalid JWK, x5t#S256 header has invalid encoding")
 	}
 
 	if len(x5tSHA256bytes) == 2*sha256.Size {
 		hx256, err := hex.DecodeString(string(x5tSHA256bytes))
 		if err != nil {
-			return fmt.Errorf("go-jose/go-jose: invalid JWK, unable to hex decode x5t#S256: %v", err)
+			return fmt.Errorf("square/go-jose: invalid JWK, unable to hex decode x5t#S256: %v", err)
 		}
 		x5tSHA256bytes = hx256
 	}
@@ -304,10 +286,10 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 	x5tSHA1Len := len(k.CertificateThumbprintSHA1)
 	x5tSHA256Len := len(k.CertificateThumbprintSHA256)
 	if x5tSHA1Len > 0 && x5tSHA1Len != sha1.Size {
-		return errors.New("go-jose/go-jose: invalid JWK, x5t header is of incorrect size")
+		return errors.New("square/go-jose: invalid JWK, x5t header is of incorrect size")
 	}
 	if x5tSHA256Len > 0 && x5tSHA256Len != sha256.Size {
-		return errors.New("go-jose/go-jose: invalid JWK, x5t#S256 header is of incorrect size")
+		return errors.New("square/go-jose: invalid JWK, x5t#S256 header is of incorrect size")
 	}
 
 	// If certificate chain *and* thumbprints are set, verify correctness.
@@ -317,11 +299,11 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
 		sha256sum := sha256.Sum256(leaf.Raw)
 
 		if len(k.CertificateThumbprintSHA1) > 0 && !bytes.Equal(sha1sum[:], k.CertificateThumbprintSHA1) {
-			return errors.New("go-jose/go-jose: invalid JWK, x5c thumbprint does not match x5t value")
+			return errors.New("square/go-jose: invalid JWK, x5c thumbprint does not match x5t value")
 		}
 
 		if len(k.CertificateThumbprintSHA256) > 0 && !bytes.Equal(sha256sum[:], k.CertificateThumbprintSHA256) {
-			return errors.New("go-jose/go-jose: invalid JWK, x5c thumbprint does not match x5t#S256 value")
+			return errors.New("square/go-jose: invalid JWK, x5c thumbprint does not match x5t#S256 value")
 		}
 	}
 
@@ -360,7 +342,7 @@ func ecThumbprintInput(curve elliptic.Curve, x, y *big.Int) (string, error) {
 	}
 
 	if len(x.Bytes()) > coordLength || len(y.Bytes()) > coordLength {
-		return "", errors.New("go-jose/go-jose: invalid elliptic key (too large)")
+		return "", errors.New("square/go-jose: invalid elliptic key (too large)")
 	}
 
 	return fmt.Sprintf(ecThumbprintTemplate, crv,
@@ -377,7 +359,7 @@ func rsaThumbprintInput(n *big.Int, e int) (string, error) {
 func edThumbprintInput(ed ed25519.PublicKey) (string, error) {
 	crv := "Ed25519"
 	if len(ed) > 32 {
-		return "", errors.New("go-jose/go-jose: invalid elliptic key (too large)")
+		return "", errors.New("square/go-jose: invalid elliptic key (too large)")
 	}
 	return fmt.Sprintf(edThumbprintTemplate, crv,
 		newFixedSizeBuffer(ed, 32).base64()), nil
@@ -401,10 +383,8 @@ func (k *JSONWebKey) Thumbprint(hash crypto.Hash) ([]byte, error) {
 		input, err = rsaThumbprintInput(key.N, key.E)
 	case ed25519.PrivateKey:
 		input, err = edThumbprintInput(ed25519.PublicKey(key[32:]))
-	case OpaqueSigner:
-		return key.Public().Thumbprint(hash)
 	default:
-		return nil, fmt.Errorf("go-jose/go-jose: unknown key type '%s'", reflect.TypeOf(key))
+		return nil, fmt.Errorf("square/go-jose: unknown key type '%s'", reflect.TypeOf(key))
 	}
 
 	if err != nil {
@@ -412,7 +392,7 @@ func (k *JSONWebKey) Thumbprint(hash crypto.Hash) ([]byte, error) {
 	}
 
 	h := hash.New()
-	_, _ = h.Write([]byte(input))
+	h.Write([]byte(input))
 	return h.Sum(nil), nil
 }
 
@@ -483,7 +463,7 @@ func (k *JSONWebKey) Valid() bool {
 
 func (key rawJSONWebKey) rsaPublicKey() (*rsa.PublicKey, error) {
 	if key.N == nil || key.E == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid RSA key, missing n/e values")
+		return nil, fmt.Errorf("square/go-jose: invalid RSA key, missing n/e values")
 	}
 
 	return &rsa.PublicKey{
@@ -518,29 +498,29 @@ func (key rawJSONWebKey) ecPublicKey() (*ecdsa.PublicKey, error) {
 	case "P-521":
 		curve = elliptic.P521()
 	default:
-		return nil, fmt.Errorf("go-jose/go-jose: unsupported elliptic curve '%s'", key.Crv)
+		return nil, fmt.Errorf("square/go-jose: unsupported elliptic curve '%s'", key.Crv)
 	}
 
 	if key.X == nil || key.Y == nil {
-		return nil, errors.New("go-jose/go-jose: invalid EC key, missing x/y values")
+		return nil, errors.New("square/go-jose: invalid EC key, missing x/y values")
 	}
 
 	// The length of this octet string MUST be the full size of a coordinate for
 	// the curve specified in the "crv" parameter.
 	// https://tools.ietf.org/html/rfc7518#section-6.2.1.2
 	if curveSize(curve) != len(key.X.data) {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC public key, wrong length for x")
+		return nil, fmt.Errorf("square/go-jose: invalid EC public key, wrong length for x")
 	}
 
 	if curveSize(curve) != len(key.Y.data) {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC public key, wrong length for y")
+		return nil, fmt.Errorf("square/go-jose: invalid EC public key, wrong length for y")
 	}
 
 	x := key.X.bigInt()
 	y := key.Y.bigInt()
 
 	if !curve.IsOnCurve(x, y) {
-		return nil, errors.New("go-jose/go-jose: invalid EC key, X/Y are not on declared curve")
+		return nil, errors.New("square/go-jose: invalid EC key, X/Y are not on declared curve")
 	}
 
 	return &ecdsa.PublicKey{
@@ -552,7 +532,7 @@ func (key rawJSONWebKey) ecPublicKey() (*ecdsa.PublicKey, error) {
 
 func fromEcPublicKey(pub *ecdsa.PublicKey) (*rawJSONWebKey, error) {
 	if pub == nil || pub.X == nil || pub.Y == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC key (nil, or X/Y missing)")
+		return nil, fmt.Errorf("square/go-jose: invalid EC key (nil, or X/Y missing)")
 	}
 
 	name, err := curveName(pub.Curve)
@@ -566,7 +546,7 @@ func fromEcPublicKey(pub *ecdsa.PublicKey) (*rawJSONWebKey, error) {
 	yBytes := pub.Y.Bytes()
 
 	if len(xBytes) > size || len(yBytes) > size {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC key (X/Y too large)")
+		return nil, fmt.Errorf("square/go-jose: invalid EC key (X/Y too large)")
 	}
 
 	key := &rawJSONWebKey{
@@ -589,7 +569,7 @@ func (key rawJSONWebKey) edPrivateKey() (ed25519.PrivateKey, error) {
 	}
 
 	if len(missing) > 0 {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid Ed25519 private key, missing %s value(s)", strings.Join(missing, ", "))
+		return nil, fmt.Errorf("square/go-jose: invalid Ed25519 private key, missing %s value(s)", strings.Join(missing, ", "))
 	}
 
 	privateKey := make([]byte, ed25519.PrivateKeySize)
@@ -601,7 +581,7 @@ func (key rawJSONWebKey) edPrivateKey() (ed25519.PrivateKey, error) {
 
 func (key rawJSONWebKey) edPublicKey() (ed25519.PublicKey, error) {
 	if key.X == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid Ed key, missing x value")
+		return nil, fmt.Errorf("square/go-jose: invalid Ed key, missing x value")
 	}
 	publicKey := make([]byte, ed25519.PublicKeySize)
 	copy(publicKey[0:32], key.X.bytes())
@@ -625,7 +605,7 @@ func (key rawJSONWebKey) rsaPrivateKey() (*rsa.PrivateKey, error) {
 	}
 
 	if len(missing) > 0 {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid RSA private key, missing %s value(s)", strings.Join(missing, ", "))
+		return nil, fmt.Errorf("square/go-jose: invalid RSA private key, missing %s value(s)", strings.Join(missing, ", "))
 	}
 
 	rv := &rsa.PrivateKey{
@@ -695,34 +675,34 @@ func (key rawJSONWebKey) ecPrivateKey() (*ecdsa.PrivateKey, error) {
 	case "P-521":
 		curve = elliptic.P521()
 	default:
-		return nil, fmt.Errorf("go-jose/go-jose: unsupported elliptic curve '%s'", key.Crv)
+		return nil, fmt.Errorf("square/go-jose: unsupported elliptic curve '%s'", key.Crv)
 	}
 
 	if key.X == nil || key.Y == nil || key.D == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC private key, missing x/y/d values")
+		return nil, fmt.Errorf("square/go-jose: invalid EC private key, missing x/y/d values")
 	}
 
 	// The length of this octet string MUST be the full size of a coordinate for
 	// the curve specified in the "crv" parameter.
 	// https://tools.ietf.org/html/rfc7518#section-6.2.1.2
 	if curveSize(curve) != len(key.X.data) {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC private key, wrong length for x")
+		return nil, fmt.Errorf("square/go-jose: invalid EC private key, wrong length for x")
 	}
 
 	if curveSize(curve) != len(key.Y.data) {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC private key, wrong length for y")
+		return nil, fmt.Errorf("square/go-jose: invalid EC private key, wrong length for y")
 	}
 
 	// https://tools.ietf.org/html/rfc7518#section-6.2.2.1
 	if dSize(curve) != len(key.D.data) {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC private key, wrong length for d")
+		return nil, fmt.Errorf("square/go-jose: invalid EC private key, wrong length for d")
 	}
 
 	x := key.X.bigInt()
 	y := key.Y.bigInt()
 
 	if !curve.IsOnCurve(x, y) {
-		return nil, errors.New("go-jose/go-jose: invalid EC key, X/Y are not on declared curve")
+		return nil, errors.New("square/go-jose: invalid EC key, X/Y are not on declared curve")
 	}
 
 	return &ecdsa.PrivateKey{
@@ -742,7 +722,7 @@ func fromEcPrivateKey(ec *ecdsa.PrivateKey) (*rawJSONWebKey, error) {
 	}
 
 	if ec.D == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid EC private key")
+		return nil, fmt.Errorf("square/go-jose: invalid EC private key")
 	}
 
 	raw.D = newFixedSizeBuffer(ec.D.Bytes(), dSize(ec.PublicKey.Curve))
@@ -760,7 +740,7 @@ func dSize(curve elliptic.Curve) int {
 	bitLen := order.BitLen()
 	size := bitLen / 8
 	if bitLen%8 != 0 {
-		size++
+		size = size + 1
 	}
 	return size
 }
@@ -774,50 +754,7 @@ func fromSymmetricKey(key []byte) (*rawJSONWebKey, error) {
 
 func (key rawJSONWebKey) symmetricKey() ([]byte, error) {
 	if key.K == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: invalid OCT (symmetric) key, missing k value")
+		return nil, fmt.Errorf("square/go-jose: invalid OCT (symmetric) key, missing k value")
 	}
 	return key.K.bytes(), nil
 }
-
-var (
-	// ErrJWKSKidNotFound is returned when a JWKS does not contain a JWK with a
-	// key ID which matches one in the provided tokens headers.
-	ErrJWKSKidNotFound = errors.New("go-jose/go-jose: JWK with matching kid not found in JWK Set")
-)
-
-func tryJWKS(key interface{}, headers ...Header) (interface{}, error) {
-	var jwks JSONWebKeySet
-
-	switch jwksType := key.(type) {
-	case *JSONWebKeySet:
-		jwks = *jwksType
-	case JSONWebKeySet:
-		jwks = jwksType
-	default:
-		// If the specified key is not a JWKS, return as is.
-		return key, nil
-	}
-
-	// Determine the KID to search for from the headers.
-	var kid string
-	for _, header := range headers {
-		if header.KeyID != "" {
-			kid = header.KeyID
-			break
-		}
-	}
-
-	// If no KID is specified in the headers, reject.
-	if kid == "" {
-		return nil, ErrJWKSKidNotFound
-	}
-
-	// Find the JWK with the matching KID. If no JWK with the specified KID is
-	// found, reject.
-	keys := jwks.Key(kid)
-	if len(keys) == 0 {
-		return nil, ErrJWKSKidNotFound
-	}
-
-	return keys[0].Key, nil
-}
diff --git a/vendor/github.com/go-jose/go-jose/v4/jws.go b/vendor/gopkg.in/square/go-jose.v2/jws.go
similarity index 59%
rename from vendor/github.com/go-jose/go-jose/v4/jws.go
rename to vendor/gopkg.in/square/go-jose.v2/jws.go
index c40bd3e..7e261f9 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jws.go
+++ b/vendor/gopkg.in/square/go-jose.v2/jws.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // rawJSONWebSignature represents a raw JWS JSON object. Used for parsing/serializing.
@@ -75,64 +75,22 @@ type Signature struct {
 	original  *rawSignatureInfo
 }
 
-// ParseSigned parses a signed message in JWS Compact or JWS JSON Serialization. Validation fails if
-// the JWS is signed with an algorithm that isn't in the provided list of signature algorithms.
-// Applications should decide for themselves which signature algorithms are acceptable. If you're
-// not sure which signature algorithms your application might receive, consult the documentation of
-// the program which provides them or the protocol that you are implementing. You can also try
-// getting an example JWS and decoding it with a tool like https://jwt.io to see what its "alg"
-// header parameter indicates. The signature on the JWS does not get validated during parsing. Call
-// Verify() after parsing to validate the signature and obtain the payload.
-//
-// https://datatracker.ietf.org/doc/html/rfc7515#section-7
-func ParseSigned(
-	signature string,
-	signatureAlgorithms []SignatureAlgorithm,
-) (*JSONWebSignature, error) {
+// ParseSigned parses a signed message in compact or full serialization format.
+func ParseSigned(signature string) (*JSONWebSignature, error) {
 	signature = stripWhitespace(signature)
 	if strings.HasPrefix(signature, "{") {
-		return ParseSignedJSON(signature, signatureAlgorithms)
+		return parseSignedFull(signature)
 	}
 
-	return parseSignedCompact(signature, nil, signatureAlgorithms)
-}
-
-// ParseSignedCompact parses a message in JWS Compact Serialization. Validation fails if the JWS is
-// signed with an algorithm that isn't in the provided list of signature algorithms. Applications
-// should decide for themselves which signature algorithms are acceptable.If you're not sure which
-// signature algorithms your application might receive, consult the documentation of the program
-// which provides them or the protocol that you are implementing. You can also try getting an
-// example JWS and decoding it with a tool like https://jwt.io to see what its "alg" header
-// parameter indicates. The signature on the JWS does not get validated during parsing. Call
-// Verify() after parsing to validate the signature and obtain the payload.
-//
-// https://datatracker.ietf.org/doc/html/rfc7515#section-7.1
-func ParseSignedCompact(
-	signature string,
-	signatureAlgorithms []SignatureAlgorithm,
-) (*JSONWebSignature, error) {
-	return parseSignedCompact(signature, nil, signatureAlgorithms)
+	return parseSignedCompact(signature, nil)
 }
 
 // ParseDetached parses a signed message in compact serialization format with detached payload.
-// Validation fails if the JWS is signed with an algorithm that isn't in the provided list of
-// signature algorithms. Applications should decide for themselves which signature algorithms are
-// acceptable. If you're not sure which signature algorithms your application might receive, consult
-// the documentation of the program which provides them or the protocol that you are implementing.
-// You can also try getting an example JWS and decoding it with a tool like https://jwt.io to see
-// what its "alg" header parameter indicates. The signature on the JWS does not get validated during
-// parsing. Call Verify() after parsing to validate the signature and obtain the payload.
-//
-// https://datatracker.ietf.org/doc/html/rfc7515#appendix-F
-func ParseDetached(
-	signature string,
-	payload []byte,
-	signatureAlgorithms []SignatureAlgorithm,
-) (*JSONWebSignature, error) {
+func ParseDetached(signature string, payload []byte) (*JSONWebSignature, error) {
 	if payload == nil {
-		return nil, errors.New("go-jose/go-jose: nil payload")
+		return nil, errors.New("square/go-jose: nil payload")
 	}
-	return parseSignedCompact(stripWhitespace(signature), payload, signatureAlgorithms)
+	return parseSignedCompact(stripWhitespace(signature), payload)
 }
 
 // Get a header value
@@ -179,57 +137,21 @@ func (obj JSONWebSignature) computeAuthData(payload []byte, signature *Signature
 	return authData.Bytes(), nil
 }
 
-// ParseSignedJSON parses a message in JWS JSON Serialization.
-//
-// https://datatracker.ietf.org/doc/html/rfc7515#section-7.2
-func ParseSignedJSON(
-	input string,
-	signatureAlgorithms []SignatureAlgorithm,
-) (*JSONWebSignature, error) {
+// parseSignedFull parses a message in full format.
+func parseSignedFull(input string) (*JSONWebSignature, error) {
 	var parsed rawJSONWebSignature
 	err := json.Unmarshal([]byte(input), &parsed)
 	if err != nil {
 		return nil, err
 	}
 
-	return parsed.sanitized(signatureAlgorithms)
-}
-
-func containsSignatureAlgorithm(haystack []SignatureAlgorithm, needle SignatureAlgorithm) bool {
-	for _, algorithm := range haystack {
-		if algorithm == needle {
-			return true
-		}
-	}
-	return false
-}
-
-// ErrUnexpectedSignatureAlgorithm is returned when the signature algorithm in
-// the JWS header does not match one of the expected algorithms.
-type ErrUnexpectedSignatureAlgorithm struct {
-	// Got is the signature algorithm found in the JWS header.
-	Got      SignatureAlgorithm
-	expected []SignatureAlgorithm
-}
-
-func (e *ErrUnexpectedSignatureAlgorithm) Error() string {
-	return fmt.Sprintf("unexpected signature algorithm %q; expected %q", e.Got, e.expected)
-}
-
-func newErrUnexpectedSignatureAlgorithm(got SignatureAlgorithm, expected []SignatureAlgorithm) error {
-	return &ErrUnexpectedSignatureAlgorithm{
-		Got:      got,
-		expected: expected,
-	}
+	return parsed.sanitized()
 }
 
 // sanitized produces a cleaned-up JWS object from the raw JSON.
-func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgorithm) (*JSONWebSignature, error) {
-	if len(signatureAlgorithms) == 0 {
-		return nil, errors.New("go-jose/go-jose: no signature algorithms specified")
-	}
+func (parsed *rawJSONWebSignature) sanitized() (*JSONWebSignature, error) {
 	if parsed.Payload == nil {
-		return nil, fmt.Errorf("go-jose/go-jose: missing payload in JWS message")
+		return nil, fmt.Errorf("square/go-jose: missing payload in JWS message")
 	}
 
 	obj := &JSONWebSignature{
@@ -276,11 +198,6 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
 			return nil, err
 		}
 
-		alg := SignatureAlgorithm(signature.Header.Algorithm)
-		if !containsSignatureAlgorithm(signatureAlgorithms, alg) {
-			return nil, newErrUnexpectedSignatureAlgorithm(alg, signatureAlgorithms)
-		}
-
 		if signature.header != nil {
 			signature.Unprotected, err = signature.header.sanitized()
 			if err != nil {
@@ -298,7 +215,7 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
 		// As per RFC 7515 Section 4.1.3, only public keys are allowed to be embedded.
 		jwk := signature.Header.JSONWebKey
 		if jwk != nil && (!jwk.Valid() || !jwk.IsPublic()) {
-			return nil, errors.New("go-jose/go-jose: invalid embedded jwk, must be public key")
+			return nil, errors.New("square/go-jose: invalid embedded jwk, must be public key")
 		}
 
 		obj.Signatures = append(obj.Signatures, signature)
@@ -324,11 +241,6 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
 			return nil, err
 		}
 
-		alg := SignatureAlgorithm(obj.Signatures[i].Header.Algorithm)
-		if !containsSignatureAlgorithm(signatureAlgorithms, alg) {
-			return nil, newErrUnexpectedSignatureAlgorithm(alg, signatureAlgorithms)
-		}
-
 		if obj.Signatures[i].header != nil {
 			obj.Signatures[i].Unprotected, err = obj.Signatures[i].header.sanitized()
 			if err != nil {
@@ -348,7 +260,7 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
 		// As per RFC 7515 Section 4.1.3, only public keys are allowed to be embedded.
 		jwk := obj.Signatures[i].Header.JSONWebKey
 		if jwk != nil && (!jwk.Valid() || !jwk.IsPublic()) {
-			return nil, errors.New("go-jose/go-jose: invalid embedded jwk, must be public key")
+			return nil, errors.New("square/go-jose: invalid embedded jwk, must be public key")
 		}
 
 		// Copy value of sig
@@ -361,43 +273,30 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
 	return obj, nil
 }
 
-const tokenDelim = "."
-
 // parseSignedCompact parses a message in compact format.
-func parseSignedCompact(
-	input string,
-	payload []byte,
-	signatureAlgorithms []SignatureAlgorithm,
-) (*JSONWebSignature, error) {
-	protected, s, ok := strings.Cut(input, tokenDelim)
-	if !ok { // no period found
-		return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
-	}
-	claims, sig, ok := strings.Cut(s, tokenDelim)
-	if !ok { // only one period found
-		return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
-	}
-	if strings.ContainsRune(sig, '.') { // too many periods found
-		return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
+func parseSignedCompact(input string, payload []byte) (*JSONWebSignature, error) {
+	parts := strings.Split(input, ".")
+	if len(parts) != 3 {
+		return nil, fmt.Errorf("square/go-jose: compact JWS format must have three parts")
 	}
 
-	if claims != "" && payload != nil {
-		return nil, fmt.Errorf("go-jose/go-jose: payload is not detached")
+	if parts[1] != "" && payload != nil {
+		return nil, fmt.Errorf("square/go-jose: payload is not detached")
 	}
 
-	rawProtected, err := base64.RawURLEncoding.DecodeString(protected)
+	rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0])
 	if err != nil {
 		return nil, err
 	}
 
 	if payload == nil {
-		payload, err = base64.RawURLEncoding.DecodeString(claims)
+		payload, err = base64.RawURLEncoding.DecodeString(parts[1])
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	signature, err := base64.RawURLEncoding.DecodeString(sig)
+	signature, err := base64.RawURLEncoding.DecodeString(parts[2])
 	if err != nil {
 		return nil, err
 	}
@@ -407,7 +306,7 @@ func parseSignedCompact(
 		Protected: newBuffer(rawProtected),
 		Signature: newBuffer(signature),
 	}
-	return raw.sanitized(signatureAlgorithms)
+	return raw.sanitized()
 }
 
 func (obj JSONWebSignature) compactSerialize(detached bool) (string, error) {
@@ -415,18 +314,15 @@ func (obj JSONWebSignature) compactSerialize(detached bool) (string, error) {
 		return "", ErrNotSupported
 	}
 
-	serializedProtected := mustSerializeJSON(obj.Signatures[0].protected)
+	serializedProtected := base64.RawURLEncoding.EncodeToString(mustSerializeJSON(obj.Signatures[0].protected))
+	payload := ""
+	signature := base64.RawURLEncoding.EncodeToString(obj.Signatures[0].Signature)
 
-	var payload []byte
 	if !detached {
-		payload = obj.payload
+		payload = base64.RawURLEncoding.EncodeToString(obj.payload)
 	}
 
-	return base64JoinWithDots(
-		serializedProtected,
-		payload,
-		obj.Signatures[0].Signature,
-	), nil
+	return fmt.Sprintf("%s.%s.%s", serializedProtected, payload, signature), nil
 }
 
 // CompactSerialize serializes an object using the compact serialization format.
diff --git a/vendor/github.com/go-jose/go-jose/v4/opaque.go b/vendor/gopkg.in/square/go-jose.v2/opaque.go
similarity index 95%
rename from vendor/github.com/go-jose/go-jose/v4/opaque.go
rename to vendor/gopkg.in/square/go-jose.v2/opaque.go
index 4294272..fc3e8d2 100644
--- a/vendor/github.com/go-jose/go-jose/v4/opaque.go
+++ b/vendor/gopkg.in/square/go-jose.v2/opaque.go
@@ -83,9 +83,6 @@ func (o *opaqueVerifier) verifyPayload(payload []byte, signature []byte, alg Sig
 }
 
 // OpaqueKeyEncrypter is an interface that supports encrypting keys with an opaque key.
-//
-// Note: this cannot currently be implemented outside this package because of its
-// unexported method.
 type OpaqueKeyEncrypter interface {
 	// KeyID returns the kid
 	KeyID() string
@@ -124,7 +121,7 @@ func (oke *opaqueKeyEncrypter) encryptKey(cek []byte, alg KeyAlgorithm) (recipie
 	return oke.encrypter.encryptKey(cek, alg)
 }
 
-// OpaqueKeyDecrypter is an interface that supports decrypting keys with an opaque key.
+//OpaqueKeyDecrypter is an interface that supports decrypting keys with an opaque key.
 type OpaqueKeyDecrypter interface {
 	DecryptKey(encryptedKey []byte, header Header) ([]byte, error)
 }
diff --git a/vendor/github.com/go-jose/go-jose/v4/shared.go b/vendor/gopkg.in/square/go-jose.v2/shared.go
similarity index 90%
rename from vendor/github.com/go-jose/go-jose/v4/shared.go
rename to vendor/gopkg.in/square/go-jose.v2/shared.go
index 1ec3396..f72e5a5 100644
--- a/vendor/github.com/go-jose/go-jose/v4/shared.go
+++ b/vendor/gopkg.in/square/go-jose.v2/shared.go
@@ -23,7 +23,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // KeyAlgorithm represents a key management algorithm.
@@ -45,38 +45,32 @@ var (
 	// ErrCryptoFailure represents an error in cryptographic primitive. This
 	// occurs when, for example, a message had an invalid authentication tag or
 	// could not be decrypted.
-	ErrCryptoFailure = errors.New("go-jose/go-jose: error in cryptographic primitive")
+	ErrCryptoFailure = errors.New("square/go-jose: error in cryptographic primitive")
 
 	// ErrUnsupportedAlgorithm indicates that a selected algorithm is not
 	// supported. This occurs when trying to instantiate an encrypter for an
 	// algorithm that is not yet implemented.
-	ErrUnsupportedAlgorithm = errors.New("go-jose/go-jose: unknown/unsupported algorithm")
+	ErrUnsupportedAlgorithm = errors.New("square/go-jose: unknown/unsupported algorithm")
 
 	// ErrUnsupportedKeyType indicates that the given key type/format is not
 	// supported. This occurs when trying to instantiate an encrypter and passing
 	// it a key of an unrecognized type or with unsupported parameters, such as
 	// an RSA private key with more than two primes.
-	ErrUnsupportedKeyType = errors.New("go-jose/go-jose: unsupported key type/format")
+	ErrUnsupportedKeyType = errors.New("square/go-jose: unsupported key type/format")
 
 	// ErrInvalidKeySize indicates that the given key is not the correct size
 	// for the selected algorithm. This can occur, for example, when trying to
 	// encrypt with AES-256 but passing only a 128-bit key as input.
-	ErrInvalidKeySize = errors.New("go-jose/go-jose: invalid key size for algorithm")
+	ErrInvalidKeySize = errors.New("square/go-jose: invalid key size for algorithm")
 
 	// ErrNotSupported serialization of object is not supported. This occurs when
 	// trying to compact-serialize an object which can't be represented in
 	// compact form.
-	ErrNotSupported = errors.New("go-jose/go-jose: compact serialization not supported for object")
+	ErrNotSupported = errors.New("square/go-jose: compact serialization not supported for object")
 
 	// ErrUnprotectedNonce indicates that while parsing a JWS or JWE object, a
 	// nonce header parameter was included in an unprotected header object.
-	ErrUnprotectedNonce = errors.New("go-jose/go-jose: Nonce parameter included in unprotected header")
-
-	// ErrMissingX5cHeader indicates that the JWT header is missing x5c headers.
-	ErrMissingX5cHeader = errors.New("go-jose/go-jose: no x5c header present in message")
-
-	// ErrUnsupportedEllipticCurve indicates unsupported or unknown elliptic curve has been found.
-	ErrUnsupportedEllipticCurve = errors.New("go-jose/go-jose: unsupported/unknown elliptic curve")
+	ErrUnprotectedNonce = errors.New("square/go-jose: Nonce parameter included in unprotected header")
 )
 
 // Key management algorithms
@@ -139,8 +133,8 @@ const (
 type HeaderKey string
 
 const (
-	HeaderType        = "typ" // string
-	HeaderContentType = "cty" // string
+	HeaderType        HeaderKey = "typ" // string
+	HeaderContentType           = "cty" // string
 
 	// These are set by go-jose and shouldn't need to be set by consumers of the
 	// library.
@@ -189,13 +183,8 @@ type Header struct {
 	// Unverified certificate chain parsed from x5c header.
 	certificates []*x509.Certificate
 
-	// At parse time, each header parameter with a name other than "kid",
-	// "jwk", "alg", "nonce", or "x5c"  will have its value passed to
-	// [json.Unmarshal] to unmarshal it into an interface value.
-	// The resulting value will be stored in this map, with the header
-	// parameter name as the key.
-	//
-	// [json.Unmarshal]: https://pkg.go.dev/encoding/json#Unmarshal
+	// Any headers not recognised above get unmarshalled
+	// from JSON in a generic manner and placed in this map.
 	ExtraHeaders map[HeaderKey]interface{}
 }
 
@@ -205,7 +194,7 @@ type Header struct {
 // not be validated with the given verify options.
 func (h Header) Certificates(opts x509.VerifyOptions) ([][]*x509.Certificate, error) {
 	if len(h.certificates) == 0 {
-		return nil, ErrMissingX5cHeader
+		return nil, errors.New("square/go-jose: no x5c header present in message")
 	}
 
 	leaf := h.certificates[0]
@@ -463,8 +452,8 @@ func parseCertificateChain(chain []string) ([]*x509.Certificate, error) {
 	return out, nil
 }
 
-func (parsed rawHeader) isSet(k HeaderKey) bool {
-	dvr := parsed[k]
+func (dst rawHeader) isSet(k HeaderKey) bool {
+	dvr := dst[k]
 	if dvr == nil {
 		return false
 	}
@@ -483,17 +472,17 @@ func (parsed rawHeader) isSet(k HeaderKey) bool {
 }
 
 // Merge headers from src into dst, giving precedence to headers from l.
-func (parsed rawHeader) merge(src *rawHeader) {
+func (dst rawHeader) merge(src *rawHeader) {
 	if src == nil {
 		return
 	}
 
 	for k, v := range *src {
-		if parsed.isSet(k) {
+		if dst.isSet(k) {
 			continue
 		}
 
-		parsed[k] = v
+		dst[k] = v
 	}
 }
 
@@ -507,7 +496,7 @@ func curveName(crv elliptic.Curve) (string, error) {
 	case elliptic.P521():
 		return "P-521", nil
 	default:
-		return "", ErrUnsupportedEllipticCurve
+		return "", fmt.Errorf("square/go-jose: unsupported/unknown elliptic curve")
 	}
 }
 
diff --git a/vendor/github.com/go-jose/go-jose/v4/signing.go b/vendor/gopkg.in/square/go-jose.v2/signing.go
similarity index 80%
rename from vendor/github.com/go-jose/go-jose/v4/signing.go
rename to vendor/gopkg.in/square/go-jose.v2/signing.go
index 3dec011..bad820c 100644
--- a/vendor/github.com/go-jose/go-jose/v4/signing.go
+++ b/vendor/gopkg.in/square/go-jose.v2/signing.go
@@ -19,13 +19,14 @@ package jose
 import (
 	"bytes"
 	"crypto/ecdsa"
-	"crypto/ed25519"
 	"crypto/rsa"
 	"encoding/base64"
 	"errors"
 	"fmt"
 
-	"github.com/go-jose/go-jose/v4/json"
+	"golang.org/x/crypto/ed25519"
+
+	"gopkg.in/square/go-jose.v2/json"
 )
 
 // NonceSource represents a source of random nonces to go into JWS objects
@@ -40,20 +41,6 @@ type Signer interface {
 }
 
 // SigningKey represents an algorithm/key used to sign a message.
-//
-// Key must have one of these types:
-//   - ed25519.PrivateKey
-//   - *ecdsa.PrivateKey
-//   - *rsa.PrivateKey
-//   - *JSONWebKey
-//   - JSONWebKey
-//   - []byte (an HMAC key)
-//   - Any type that satisfies the OpaqueSigner interface
-//
-// If the key is an HMAC key, it must have at least as many bytes as the relevant hash output:
-//   - HS256: 32 bytes
-//   - HS384: 48 bytes
-//   - HS512: 64 bytes
 type SigningKey struct {
 	Algorithm SignatureAlgorithm
 	Key       interface{}
@@ -66,22 +53,12 @@ type SignerOptions struct {
 
 	// Optional map of additional keys to be inserted into the protected header
 	// of a JWS object. Some specifications which make use of JWS like to insert
-	// additional values here.
-	//
-	// Values will be serialized by [json.Marshal] and must be valid inputs to
-	// that function.
-	//
-	// [json.Marshal]: https://pkg.go.dev/encoding/json#Marshal
+	// additional values here. All values must be JSON-serializable.
 	ExtraHeaders map[HeaderKey]interface{}
 }
 
 // WithHeader adds an arbitrary value to the ExtraHeaders map, initializing it
-// if necessary, and returns the updated SignerOptions.
-//
-// The v argument will be serialized by [json.Marshal] and must be a valid
-// input to that function.
-//
-// [json.Marshal]: https://pkg.go.dev/encoding/json#Marshal
+// if necessary. It returns itself and so can be used in a fluent style.
 func (so *SignerOptions) WithHeader(k HeaderKey, v interface{}) *SignerOptions {
 	if so.ExtraHeaders == nil {
 		so.ExtraHeaders = map[HeaderKey]interface{}{}
@@ -197,11 +174,11 @@ func newVerifier(verificationKey interface{}) (payloadVerifier, error) {
 		return newVerifier(verificationKey.Key)
 	case *JSONWebKey:
 		return newVerifier(verificationKey.Key)
-	case OpaqueVerifier:
-		return &opaqueVerifier{verifier: verificationKey}, nil
-	default:
-		return nil, ErrUnsupportedKeyType
 	}
+	if ov, ok := verificationKey.(OpaqueVerifier); ok {
+		return &opaqueVerifier{verifier: ov}, nil
+	}
+	return nil, ErrUnsupportedKeyType
 }
 
 func (ctx *genericSigner) addRecipient(alg SignatureAlgorithm, signingKey interface{}) error {
@@ -228,11 +205,11 @@ func makeJWSRecipient(alg SignatureAlgorithm, signingKey interface{}) (recipient
 		return newJWKSigner(alg, signingKey)
 	case *JSONWebKey:
 		return newJWKSigner(alg, *signingKey)
-	case OpaqueSigner:
-		return newOpaqueSigner(alg, signingKey)
-	default:
-		return recipientSigInfo{}, ErrUnsupportedKeyType
 	}
+	if signer, ok := signingKey.(OpaqueSigner); ok {
+		return newOpaqueSigner(alg, signer)
+	}
+	return recipientSigInfo{}, ErrUnsupportedKeyType
 }
 
 func newJWKSigner(alg SignatureAlgorithm, signingKey JSONWebKey) (recipientSigInfo, error) {
@@ -250,7 +227,7 @@ func newJWKSigner(alg SignatureAlgorithm, signingKey JSONWebKey) (recipientSigIn
 
 		// This should be impossible, but let's check anyway.
 		if !recipient.publicKey().IsPublic() {
-			return recipientSigInfo{}, errors.New("go-jose/go-jose: public key was unexpectedly not public")
+			return recipientSigInfo{}, errors.New("square/go-jose: public key was unexpectedly not public")
 		}
 	}
 	return recipient, nil
@@ -274,7 +251,7 @@ func (ctx *genericSigner) Sign(payload []byte) (*JSONWebSignature, error) {
 			// result of the JOSE spec. We've decided that this library will only include one or
 			// the other to avoid this confusion.
 			//
-			// See https://github.com/go-jose/go-jose/issues/157 for more context.
+			// See https://github.com/square/go-jose/issues/157 for more context.
 			if ctx.embedJWK {
 				protected[headerJWK] = recipient.publicKey()
 			} else {
@@ -288,7 +265,7 @@ func (ctx *genericSigner) Sign(payload []byte) (*JSONWebSignature, error) {
 		if ctx.nonceSource != nil {
 			nonce, err := ctx.nonceSource.Nonce()
 			if err != nil {
-				return nil, fmt.Errorf("go-jose/go-jose: Error generating nonce: %v", err)
+				return nil, fmt.Errorf("square/go-jose: Error generating nonce: %v", err)
 			}
 			protected[headerNonce] = nonce
 		}
@@ -302,7 +279,7 @@ func (ctx *genericSigner) Sign(payload []byte) (*JSONWebSignature, error) {
 
 		if b64, ok := protected[headerB64]; ok {
 			if needsBase64, ok = b64.(bool); !ok {
-				return nil, errors.New("go-jose/go-jose: Invalid b64 header parameter")
+				return nil, errors.New("square/go-jose: Invalid b64 header parameter")
 			}
 		}
 
@@ -326,7 +303,7 @@ func (ctx *genericSigner) Sign(payload []byte) (*JSONWebSignature, error) {
 		for k, v := range protected {
 			b, err := json.Marshal(v)
 			if err != nil {
-				return nil, fmt.Errorf("go-jose/go-jose: Error marshalling item %#v: %v", k, err)
+				return nil, fmt.Errorf("square/go-jose: Error marshalling item %#v: %v", k, err)
 			}
 			(*signatureInfo.protected)[k] = makeRawMessage(b)
 		}
@@ -345,28 +322,12 @@ func (ctx *genericSigner) Options() SignerOptions {
 }
 
 // Verify validates the signature on the object and returns the payload.
-// This function does not support multi-signature. If you desire multi-signature
+// This function does not support multi-signature, if you desire multi-sig
 // verification use VerifyMulti instead.
 //
 // Be careful when verifying signatures based on embedded JWKs inside the
 // payload header. You cannot assume that the key received in a payload is
 // trusted.
-//
-// The verificationKey argument must have one of these types:
-//   - ed25519.PublicKey
-//   - *ecdsa.PublicKey
-//   - *rsa.PublicKey
-//   - *JSONWebKey
-//   - JSONWebKey
-//   - *JSONWebKeySet
-//   - JSONWebKeySet
-//   - []byte (an HMAC key)
-//   - Any type that implements the OpaqueVerifier interface.
-//
-// If the key is an HMAC key, it must have at least as many bytes as the relevant hash output:
-//   - HS256: 32 bytes
-//   - HS384: 48 bytes
-//   - HS512: 64 bytes
 func (obj JSONWebSignature) Verify(verificationKey interface{}) ([]byte, error) {
 	err := obj.DetachedVerify(obj.payload, verificationKey)
 	if err != nil {
@@ -386,21 +347,14 @@ func (obj JSONWebSignature) UnsafePayloadWithoutVerification() []byte {
 // most cases, you will probably want to use Verify instead. DetachedVerify
 // is only useful if you have a payload and signature that are separated from
 // each other.
-//
-// The verificationKey argument must have one of the types allowed for the
-// verificationKey argument of JSONWebSignature.Verify().
 func (obj JSONWebSignature) DetachedVerify(payload []byte, verificationKey interface{}) error {
-	key, err := tryJWKS(verificationKey, obj.headers()...)
-	if err != nil {
-		return err
-	}
-	verifier, err := newVerifier(key)
+	verifier, err := newVerifier(verificationKey)
 	if err != nil {
 		return err
 	}
 
 	if len(obj.Signatures) > 1 {
-		return errors.New("go-jose/go-jose: too many signatures in payload; expecting only one")
+		return errors.New("square/go-jose: too many signatures in payload; expecting only one")
 	}
 
 	signature := obj.Signatures[0]
@@ -434,9 +388,6 @@ func (obj JSONWebSignature) DetachedVerify(payload []byte, verificationKey inter
 // returns the index of the signature that was verified, along with the signature
 // object and the payload. We return the signature and index to guarantee that
 // callers are getting the verified value.
-//
-// The verificationKey argument must have one of the types allowed for the
-// verificationKey argument of JSONWebSignature.Verify().
 func (obj JSONWebSignature) VerifyMulti(verificationKey interface{}) (int, Signature, []byte, error) {
 	idx, sig, err := obj.DetachedVerifyMulti(obj.payload, verificationKey)
 	if err != nil {
@@ -454,15 +405,8 @@ func (obj JSONWebSignature) VerifyMulti(verificationKey interface{}) (int, Signa
 // DetachedVerifyMulti is only useful if you have a payload and signature that are
 // separated from each other, and the signature can have multiple signers at the
 // same time.
-//
-// The verificationKey argument must have one of the types allowed for the
-// verificationKey argument of JSONWebSignature.Verify().
 func (obj JSONWebSignature) DetachedVerifyMulti(payload []byte, verificationKey interface{}) (int, Signature, error) {
-	key, err := tryJWKS(verificationKey, obj.headers()...)
-	if err != nil {
-		return -1, Signature{}, err
-	}
-	verifier, err := newVerifier(key)
+	verifier, err := newVerifier(verificationKey)
 	if err != nil {
 		return -1, Signature{}, err
 	}
@@ -495,11 +439,3 @@ outer:
 
 	return -1, Signature{}, ErrCryptoFailure
 }
-
-func (obj JSONWebSignature) headers() []Header {
-	headers := make([]Header, len(obj.Signatures))
-	for i, sig := range obj.Signatures {
-		headers[i] = sig.Header
-	}
-	return headers
-}
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric.go b/vendor/gopkg.in/square/go-jose.v2/symmetric.go
similarity index 81%
rename from vendor/github.com/go-jose/go-jose/v4/symmetric.go
rename to vendor/gopkg.in/square/go-jose.v2/symmetric.go
index 6176e06..264a0fe 100644
--- a/vendor/github.com/go-jose/go-jose/v4/symmetric.go
+++ b/vendor/gopkg.in/square/go-jose.v2/symmetric.go
@@ -30,25 +30,21 @@ import (
 	"hash"
 	"io"
 
-	josecipher "github.com/go-jose/go-jose/v4/cipher"
+	"golang.org/x/crypto/pbkdf2"
+	"gopkg.in/square/go-jose.v2/cipher"
 )
 
-// RandReader is a cryptographically secure random number generator (stubbed out in tests).
+// Random reader (stubbed out in tests)
 var RandReader = rand.Reader
 
 const (
 	// RFC7518 recommends a minimum of 1,000 iterations:
-	// 	- https://tools.ietf.org/html/rfc7518#section-4.8.1.2
-	//
+	// https://tools.ietf.org/html/rfc7518#section-4.8.1.2
 	// NIST recommends a minimum of 10,000:
-	// 	- https://pages.nist.gov/800-63-3/sp800-63b.html
-	//
-	// 1Password increased in 2023 from 100,000 to 650,000:
-	//  - https://support.1password.com/pbkdf2/
-	//
-	// OWASP recommended 600,000 in Dec 2022:
-	//	- https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2
-	defaultP2C = 600000
+	// https://pages.nist.gov/800-63-3/sp800-63b.html
+	// 1Password uses 100,000:
+	// https://support.1password.com/pbkdf2/
+	defaultP2C = 100000
 	// Default salt size: 128 bits
 	defaultP2SSize = 16
 )
@@ -282,14 +278,8 @@ func (ctx *symmetricKeyCipher) encryptKey(cek []byte, alg KeyAlgorithm) (recipie
 		}
 
 		header := &rawHeader{}
-
-		if err = header.set(headerIV, newBuffer(parts.iv)); err != nil {
-			return recipientInfo{}, err
-		}
-
-		if err = header.set(headerTag, newBuffer(parts.tag)); err != nil {
-			return recipientInfo{}, err
-		}
+		header.set(headerIV, newBuffer(parts.iv))
+		header.set(headerTag, newBuffer(parts.tag))
 
 		return recipientInfo{
 			header:       header,
@@ -328,10 +318,7 @@ func (ctx *symmetricKeyCipher) encryptKey(cek []byte, alg KeyAlgorithm) (recipie
 
 		// derive key
 		keyLen, h := getPbkdf2Params(alg)
-		key, err := pbkdf2Key(h, string(ctx.key), salt, ctx.p2c, keyLen)
-		if err != nil {
-			return recipientInfo{}, nil
-		}
+		key := pbkdf2.Key(ctx.key, salt, ctx.p2c, keyLen, h)
 
 		// use AES cipher with derived key
 		block, err := aes.NewCipher(key)
@@ -345,14 +332,8 @@ func (ctx *symmetricKeyCipher) encryptKey(cek []byte, alg KeyAlgorithm) (recipie
 		}
 
 		header := &rawHeader{}
-
-		if err = header.set(headerP2C, ctx.p2c); err != nil {
-			return recipientInfo{}, err
-		}
-
-		if err = header.set(headerP2S, newBuffer(ctx.p2s)); err != nil {
-			return recipientInfo{}, err
-		}
+		header.set(headerP2C, ctx.p2c)
+		header.set(headerP2S, newBuffer(ctx.p2s))
 
 		return recipientInfo{
 			encryptedKey: jek,
@@ -375,11 +356,11 @@ func (ctx *symmetricKeyCipher) decryptKey(headers rawHeader, recipient *recipien
 
 		iv, err := headers.getIV()
 		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid IV: %v", err)
+			return nil, fmt.Errorf("square/go-jose: invalid IV: %v", err)
 		}
 		tag, err := headers.getTag()
 		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid tag: %v", err)
+			return nil, fmt.Errorf("square/go-jose: invalid tag: %v", err)
 		}
 
 		parts := &aeadParts{
@@ -408,23 +389,18 @@ func (ctx *symmetricKeyCipher) decryptKey(headers rawHeader, recipient *recipien
 	case PBES2_HS256_A128KW, PBES2_HS384_A192KW, PBES2_HS512_A256KW:
 		p2s, err := headers.getP2S()
 		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid P2S: %v", err)
+			return nil, fmt.Errorf("square/go-jose: invalid P2S: %v", err)
 		}
 		if p2s == nil || len(p2s.data) == 0 {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid P2S: must be present")
+			return nil, fmt.Errorf("square/go-jose: invalid P2S: must be present")
 		}
 
 		p2c, err := headers.getP2C()
 		if err != nil {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid P2C: %v", err)
+			return nil, fmt.Errorf("square/go-jose: invalid P2C: %v", err)
 		}
 		if p2c <= 0 {
-			return nil, fmt.Errorf("go-jose/go-jose: invalid P2C: must be a positive integer")
-		}
-		if p2c > 1000000 {
-			// An unauthenticated attacker can set a high P2C value. Set an upper limit to avoid
-			// DoS attacks.
-			return nil, fmt.Errorf("go-jose/go-jose: invalid P2C: too high")
+			return nil, fmt.Errorf("square/go-jose: invalid P2C: must be a positive integer")
 		}
 
 		// salt is UTF8(Alg) || 0x00 || Salt Input
@@ -433,10 +409,7 @@ func (ctx *symmetricKeyCipher) decryptKey(headers rawHeader, recipient *recipien
 
 		// derive key
 		keyLen, h := getPbkdf2Params(alg)
-		key, err := pbkdf2Key(h, string(ctx.key), salt, p2c, keyLen)
-		if err != nil {
-			return nil, err
-		}
+		key := pbkdf2.Key(ctx.key, salt, p2c, keyLen, h)
 
 		// use AES cipher with derived key
 		block, err := aes.NewCipher(key)
@@ -458,7 +431,7 @@ func (ctx *symmetricKeyCipher) decryptKey(headers rawHeader, recipient *recipien
 func (ctx symmetricMac) signPayload(payload []byte, alg SignatureAlgorithm) (Signature, error) {
 	mac, err := ctx.hmac(payload, alg)
 	if err != nil {
-		return Signature{}, err
+		return Signature{}, errors.New("square/go-jose: failed to compute hmac")
 	}
 
 	return Signature{
@@ -471,16 +444,16 @@ func (ctx symmetricMac) signPayload(payload []byte, alg SignatureAlgorithm) (Sig
 func (ctx symmetricMac) verifyPayload(payload []byte, mac []byte, alg SignatureAlgorithm) error {
 	expected, err := ctx.hmac(payload, alg)
 	if err != nil {
-		return errors.New("go-jose/go-jose: failed to compute hmac")
+		return errors.New("square/go-jose: failed to compute hmac")
 	}
 
 	if len(mac) != len(expected) {
-		return errors.New("go-jose/go-jose: invalid hmac")
+		return errors.New("square/go-jose: invalid hmac")
 	}
 
 	match := subtle.ConstantTimeCompare(mac, expected)
 	if match != 1 {
-		return errors.New("go-jose/go-jose: invalid hmac")
+		return errors.New("square/go-jose: invalid hmac")
 	}
 
 	return nil
@@ -490,24 +463,12 @@ func (ctx symmetricMac) verifyPayload(payload []byte, mac []byte, alg SignatureA
 func (ctx symmetricMac) hmac(payload []byte, alg SignatureAlgorithm) ([]byte, error) {
 	var hash func() hash.Hash
 
-	// https://datatracker.ietf.org/doc/html/rfc7518#section-3.2
-	// A key of the same size as the hash output (for instance, 256 bits for
-	// "HS256") or larger MUST be used
 	switch alg {
 	case HS256:
-		if len(ctx.key)*8 < 256 {
-			return nil, ErrInvalidKeySize
-		}
 		hash = sha256.New
 	case HS384:
-		if len(ctx.key)*8 < 384 {
-			return nil, ErrInvalidKeySize
-		}
 		hash = sha512.New384
 	case HS512:
-		if len(ctx.key)*8 < 512 {
-			return nil, ErrInvalidKeySize
-		}
 		hash = sha512.New
 	default:
 		return nil, ErrUnsupportedAlgorithm
diff --git a/vendor/modules.txt b/vendor/modules.txt
index f7bf2b2..042a023 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,8 +1,8 @@
-# github.com/cenkalti/backoff/v4 v4.3.0
-## explicit; go 1.18
+# github.com/cenkalti/backoff/v4 v4.1.1
+## explicit; go 1.13
 github.com/cenkalti/backoff/v4
-# github.com/go-acme/lego/v4 v4.23.1
-## explicit; go 1.23.0
+# github.com/go-acme/lego/v4 v4.4.0
+## explicit; go 1.15
 github.com/go-acme/lego/v4/acme
 github.com/go-acme/lego/v4/acme/api
 github.com/go-acme/lego/v4/acme/api/internal/nonces
@@ -19,19 +19,10 @@ github.com/go-acme/lego/v4/lego
 github.com/go-acme/lego/v4/log
 github.com/go-acme/lego/v4/platform/config/env
 github.com/go-acme/lego/v4/platform/wait
-github.com/go-acme/lego/v4/providers/dns/internal/errutils
-github.com/go-acme/lego/v4/providers/dns/internal/useragent
 github.com/go-acme/lego/v4/providers/dns/ovh
-github.com/go-acme/lego/v4/providers/dns/pdns
-github.com/go-acme/lego/v4/providers/dns/pdns/internal
 github.com/go-acme/lego/v4/registration
-# github.com/go-jose/go-jose/v4 v4.1.1
-## explicit; go 1.23.0
-github.com/go-jose/go-jose/v4
-github.com/go-jose/go-jose/v4/cipher
-github.com/go-jose/go-jose/v4/json
-# github.com/goccy/go-json v0.10.5
-## explicit; go 1.19
+# github.com/goccy/go-json v0.7.8
+## explicit; go 1.12
 github.com/goccy/go-json
 github.com/goccy/go-json/internal/decoder
 github.com/goccy/go-json/internal/encoder
@@ -43,48 +34,56 @@ github.com/goccy/go-json/internal/errors
 github.com/goccy/go-json/internal/runtime
 # github.com/golang-jwt/jwt v3.2.2+incompatible
 ## explicit
-# github.com/golang/snappy v1.0.0
+github.com/golang-jwt/jwt
+# github.com/golang/snappy v0.0.4
 ## explicit
 github.com/golang/snappy
-# github.com/json-iterator/go v1.1.12
+# github.com/google/go-cmp v0.5.5
+## explicit; go 1.8
+# github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04
+## explicit
+# github.com/json-iterator/go v1.1.11
 ## explicit; go 1.12
 github.com/json-iterator/go
-# github.com/labstack/echo/v4 v4.13.4
-## explicit; go 1.23.0
+# github.com/labstack/echo/v4 v4.5.0
+## explicit; go 1.15
 github.com/labstack/echo/v4
 github.com/labstack/echo/v4/middleware
-# github.com/labstack/gommon v0.4.2
-## explicit; go 1.18
+# github.com/labstack/gommon v0.3.0
+## explicit; go 1.12
 github.com/labstack/gommon/bytes
 github.com/labstack/gommon/color
 github.com/labstack/gommon/log
-# github.com/lib/pq v1.10.9
+github.com/labstack/gommon/random
+# github.com/lib/pq v1.10.3
 ## explicit; go 1.13
 github.com/lib/pq
 github.com/lib/pq/oid
 github.com/lib/pq/scram
-# github.com/mattn/go-colorable v0.1.14
-## explicit; go 1.18
+# github.com/mattn/go-colorable v0.1.8
+## explicit; go 1.13
 github.com/mattn/go-colorable
-# github.com/mattn/go-isatty v0.0.20
-## explicit; go 1.15
+# github.com/mattn/go-isatty v0.0.13
+## explicit; go 1.12
 github.com/mattn/go-isatty
-# github.com/miekg/dns v1.1.66
-## explicit; go 1.23.0
+# github.com/miekg/dns v1.1.43
+## explicit; go 1.14
 github.com/miekg/dns
 # github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
 ## explicit
 github.com/modern-go/concurrent
-# github.com/modern-go/reflect2 v1.0.2
-## explicit; go 1.12
+# github.com/modern-go/reflect2 v1.0.1
+## explicit
 github.com/modern-go/reflect2
 # github.com/onsi/ginkgo v1.16.0
 ## explicit; go 1.15
 # github.com/onsi/gomega v1.11.0
 ## explicit; go 1.14
-# github.com/ovh/go-ovh v1.9.0
-## explicit; go 1.18
+# github.com/ovh/go-ovh v1.1.0
+## explicit; go 1.12
 github.com/ovh/go-ovh/ovh
+# github.com/smartystreets/assertions v1.2.0
+## explicit; go 1.13
 # github.com/syndtr/goleveldb v1.0.0
 ## explicit
 github.com/syndtr/goleveldb/leveldb
@@ -102,79 +101,56 @@ github.com/syndtr/goleveldb/leveldb/util
 # github.com/valyala/bytebufferpool v1.0.0
 ## explicit
 github.com/valyala/bytebufferpool
-# github.com/valyala/fasttemplate v1.2.2
+# github.com/valyala/fasttemplate v1.2.1
 ## explicit; go 1.12
 github.com/valyala/fasttemplate
-# golang.org/x/crypto v0.39.0
-## explicit; go 1.23.0
+# golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+## explicit; go 1.17
 golang.org/x/crypto/acme
 golang.org/x/crypto/acme/autocert
+golang.org/x/crypto/ed25519
+golang.org/x/crypto/ed25519/internal/edwards25519
 golang.org/x/crypto/ocsp
 golang.org/x/crypto/pbkdf2
-# golang.org/x/mod v0.25.0
-## explicit; go 1.23.0
-golang.org/x/mod/semver
-# golang.org/x/net v0.41.0
-## explicit; go 1.23.0
+# golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
+## explicit; go 1.17
 golang.org/x/net/bpf
 golang.org/x/net/http/httpguts
 golang.org/x/net/http2
 golang.org/x/net/http2/h2c
 golang.org/x/net/http2/hpack
 golang.org/x/net/idna
-golang.org/x/net/internal/httpcommon
 golang.org/x/net/internal/iana
 golang.org/x/net/internal/socket
 golang.org/x/net/ipv4
 golang.org/x/net/ipv6
-# golang.org/x/oauth2 v0.30.0
-## explicit; go 1.23.0
-golang.org/x/oauth2
-golang.org/x/oauth2/clientcredentials
-golang.org/x/oauth2/internal
-# golang.org/x/sync v0.15.0
-## explicit; go 1.23.0
-golang.org/x/sync/errgroup
-# golang.org/x/sys v0.33.0
-## explicit; go 1.23.0
+# golang.org/x/sys v0.0.0-20210903071746-97244b99971b
+## explicit; go 1.17
+golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/unix
 golang.org/x/sys/windows
-# golang.org/x/text v0.26.0
-## explicit; go 1.23.0
+# golang.org/x/text v0.3.7
+## explicit; go 1.17
 golang.org/x/text/secure/bidirule
 golang.org/x/text/transform
 golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
-# golang.org/x/time v0.12.0
-## explicit; go 1.23.0
+# golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
+## explicit
 golang.org/x/time/rate
-# golang.org/x/tools v0.34.0
-## explicit; go 1.23.0
-golang.org/x/tools/go/gcexportdata
-golang.org/x/tools/go/packages
-golang.org/x/tools/go/types/objectpath
-golang.org/x/tools/go/types/typeutil
-golang.org/x/tools/internal/aliases
-golang.org/x/tools/internal/event
-golang.org/x/tools/internal/event/core
-golang.org/x/tools/internal/event/keys
-golang.org/x/tools/internal/event/label
-golang.org/x/tools/internal/gcimporter
-golang.org/x/tools/internal/gocommand
-golang.org/x/tools/internal/packagesinternal
-golang.org/x/tools/internal/pkgbits
-golang.org/x/tools/internal/stdlib
-golang.org/x/tools/internal/typeparams
-golang.org/x/tools/internal/typesinternal
-golang.org/x/tools/internal/versions
-# gopkg.in/ini.v1 v1.67.0
+# gopkg.in/ini.v1 v1.62.1
 ## explicit
 gopkg.in/ini.v1
-# xorm.io/builder v0.3.13
+# gopkg.in/square/go-jose.v2 v2.6.0
+## explicit
+gopkg.in/square/go-jose.v2
+gopkg.in/square/go-jose.v2/cipher
+gopkg.in/square/go-jose.v2/json
+# xorm.io/builder v0.3.9
 ## explicit; go 1.11
 xorm.io/builder
-# xorm.io/xorm v1.3.9
-## explicit; go 1.18
+# xorm.io/xorm v1.2.3
+## explicit; go 1.13
 xorm.io/xorm
 xorm.io/xorm/caches
 xorm.io/xorm/contexts
diff --git a/vendor/xorm.io/builder/.drone.yml b/vendor/xorm.io/builder/.drone.yml
new file mode 100644
index 0000000..61d323d
--- /dev/null
+++ b/vendor/xorm.io/builder/.drone.yml
@@ -0,0 +1,21 @@
+---
+kind: pipeline
+name: testing
+
+steps:
+- name: test
+  pull: default
+  image: golang:1.11
+  commands:
+  - go get -u golang.org/x/lint/golint
+  - golint ./...
+  - go vet
+  - go test -v -race -coverprofile=coverage.txt -covermode=atomic
+  environment:
+    GOPROXY: https://goproxy.cn
+    GO111MODULE: "on"
+  when:
+    event:
+    - push
+    - tag
+    - pull_request
\ No newline at end of file
diff --git a/vendor/xorm.io/builder/README.md b/vendor/xorm.io/builder/README.md
index 43c205e..53e5403 100644
--- a/vendor/xorm.io/builder/README.md
+++ b/vendor/xorm.io/builder/README.md
@@ -146,19 +146,8 @@ sql, args, _ := ToSQL(In("a", 1, 2, 3))
 // a IN (?,?,?) [1,2,3]
 sql, args, _ := ToSQL(In("a", []int{1, 2, 3}))
 // a IN (?,?,?) [1,2,3]
-sql, args, _ := ToSQL(NotIn("a", Expr("select id from b where c = ?", 1))))
-// a NOT IN (select id from b where c = ?) [1]
-```
-
-* `Exists` and `NotExists`
-
-```Go
-import . "xorm.io/builder"
-
-sql, args, _ := ToSQL(Exists(Select("a").From("table")))
-// EXISTS (SELECT a FROM table)
-sql, args, _ := ToSQL(NotExists(Select("a").From("table")))
-// NOT EXISTS (SELECT a FROM table)
+sql, args, _ := ToSQL(In("a", Expr("select id from b where c = ?", 1))))
+// a IN (select id from b where c = ?) [1]
 ```
 
 * `IsNull` and `NotNull`
@@ -172,7 +161,7 @@ sql, args, _ := ToSQL(NotNull{"b"})
 	// b IS NOT NULL []
 ```
 
-* `And(conds ...Cond)`, And can connect one or more conditions via And
+* `And(conds ...Cond)`, And can connect one or more condtions via And
 
 ```Go
 import . "xorm.io/builder"
diff --git a/vendor/xorm.io/builder/as.go b/vendor/xorm.io/builder/as.go
deleted file mode 100644
index 23345f5..0000000
--- a/vendor/xorm.io/builder/as.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package builder
-
-type Aliased struct {
-	table interface{}
-	alias string
-}
-
-func As(table interface{}, alias string) *Aliased {
-	return &Aliased{table, alias}
-}
diff --git a/vendor/xorm.io/builder/builder.go b/vendor/xorm.io/builder/builder.go
index c6b7742..cccc8a7 100644
--- a/vendor/xorm.io/builder/builder.go
+++ b/vendor/xorm.io/builder/builder.go
@@ -60,15 +60,15 @@ type Builder struct {
 	subQuery   *Builder
 	cond       Cond
 	selects    []string
-	joins      joins
+	joins      []join
 	setOps     []setOp
 	limitation *limit
 	insertCols []string
 	insertVals []interface{}
 	updates    []UpdateCond
-	orderBy    interface{}
+	orderBy    string
 	groupBy    string
-	having     interface{}
+	having     string
 }
 
 // Dialect sets the db dialect of Builder.
@@ -113,31 +113,21 @@ func (b *Builder) Where(cond Cond) *Builder {
 }
 
 // From sets from subject(can be a table name in string or a builder pointer) and its alias
-func (b *Builder) From(subject interface{}, aliasMaybe ...string) *Builder {
-	alias := ""
-	if len(aliasMaybe) > 0 {
-		alias = aliasMaybe[0]
-	}
-
-	if aliased, ok := subject.(*Aliased); ok {
-		subject = aliased.table
-		alias = aliased.alias
-	}
-
-	switch t := subject.(type) {
+func (b *Builder) From(subject interface{}, alias ...string) *Builder {
+	switch subject.(type) {
 	case *Builder:
-		b.subQuery = t
+		b.subQuery = subject.(*Builder)
 
 		if len(alias) > 0 {
-			b.from = alias
+			b.from = alias[0]
 		} else {
 			b.isNested = true
 		}
 	case string:
-		b.from = t
+		b.from = subject.(string)
 
 		if len(alias) > 0 {
-			b.from = b.from + " " + alias
+			b.from = b.from + " " + alias[0]
 		}
 	}
 
@@ -174,6 +164,7 @@ func (b *Builder) Except(distinctType string, cond *Builder) *Builder {
 }
 
 func (b *Builder) setOperation(opType, distinctType string, cond *Builder) *Builder {
+
 	var builder *Builder
 	if b.optype != setOpType {
 		builder = &Builder{cond: NewCond()}
@@ -290,7 +281,7 @@ func (b *Builder) ToSQL() (string, []interface{}, error) {
 		}
 	}
 
-	sql := w.String()
+	var sql = w.String()
 	var err error
 
 	switch b.dialect {
diff --git a/vendor/xorm.io/builder/builder_insert.go b/vendor/xorm.io/builder/builder_insert.go
index 9b0e6ee..8cef5c5 100644
--- a/vendor/xorm.io/builder/builder_insert.go
+++ b/vendor/xorm.io/builder/builder_insert.go
@@ -48,14 +48,14 @@ func (b *Builder) insertWriteTo(w Writer) error {
 		return err
 	}
 
-	args := make([]interface{}, 0)
+	var args = make([]interface{}, 0)
 	var bs []byte
-	valBuffer := bytes.NewBuffer(bs)
+	var valBuffer = bytes.NewBuffer(bs)
 
 	for i, col := range b.insertCols {
 		value := b.insertVals[i]
 		fmt.Fprint(w, col)
-		if e, ok := value.(*Expression); ok {
+		if e, ok := value.(expr); ok {
 			fmt.Fprintf(valBuffer, "(%s)", e.sql)
 			args = append(args, e.args...)
 		} else if value == nil {
@@ -112,7 +112,7 @@ func (s insertColsSorter) Less(i, j int) bool {
 // Insert sets insert SQL
 func (b *Builder) Insert(eq ...interface{}) *Builder {
 	if len(eq) > 0 {
-		paramType := -1
+		var paramType = -1
 		for _, e := range eq {
 			switch t := e.(type) {
 			case Eq:
diff --git a/vendor/xorm.io/builder/builder_join.go b/vendor/xorm.io/builder/builder_join.go
index a8aef0a..a6604c5 100644
--- a/vendor/xorm.io/builder/builder_join.go
+++ b/vendor/xorm.io/builder/builder_join.go
@@ -4,10 +4,6 @@
 
 package builder
 
-import (
-	"fmt"
-)
-
 // InnerJoin sets inner join
 func (b *Builder) InnerJoin(joinTable, joinCond interface{}) *Builder {
 	return b.Join("INNER", joinTable, joinCond)
@@ -44,42 +40,3 @@ func (b *Builder) Join(joinType string, joinTable, joinCond interface{}) *Builde
 
 	return b
 }
-
-type joins []join
-
-func (joins joins) WriteTo(w Writer) error {
-	for _, v := range joins {
-		var joinTable = v.joinTable
-		var alias string
-		if aliased, ok := v.joinTable.(*Aliased); ok {
-			joinTable = aliased.table
-			alias = aliased.alias + " "
-		}
-
-		switch tbl := joinTable.(type) {
-		case *Builder:
-			if _, err := fmt.Fprintf(w, " %s JOIN (", v.joinType); err != nil {
-				return err
-			}
-			if err := tbl.WriteTo(w); err != nil {
-				return err
-			}
-			if _, err := fmt.Fprintf(w, ") %s", alias); err != nil {
-				return err
-			}
-		case string:
-			if _, err := fmt.Fprintf(w, " %s JOIN %s %s", v.joinType, tbl, alias); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprintf(w, "ON "); err != nil {
-			return err
-		}
-
-		if err := v.joinCond.WriteTo(w); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/xorm.io/builder/builder_limit.go b/vendor/xorm.io/builder/builder_limit.go
index 793df37..82e1179 100644
--- a/vendor/xorm.io/builder/builder_limit.go
+++ b/vendor/xorm.io/builder/builder_limit.go
@@ -19,11 +19,12 @@ func (b *Builder) limitWriteTo(w Writer) error {
 		if limit.offset < 0 || limit.limitN <= 0 {
 			return ErrInvalidLimitation
 		}
-		// unset limit condition to prevent final.WriteTo from recursing forever
+		// erase limit condition
 		b.limitation = nil
 		defer func() {
 			b.limitation = limit
 		}()
+		ow := w.(*BytesWriter)
 
 		switch strings.ToLower(strings.TrimSpace(b.dialect)) {
 		case ORACLE:
@@ -54,19 +55,19 @@ func (b *Builder) limitWriteTo(w Writer) error {
 					Where(Gt{"att.RN": limit.offset})
 			}
 
-			return final.WriteTo(w)
+			return final.WriteTo(ow)
 		case SQLITE, MYSQL, POSTGRES:
 			// if type UNION, we need to write previous content back to current writer
 			if b.optype == setOpType {
-				if err := b.WriteTo(w); err != nil {
+				if err := b.WriteTo(ow); err != nil {
 					return err
 				}
 			}
 
 			if limit.offset == 0 {
-				fmt.Fprint(w, " LIMIT ", limit.limitN)
+				fmt.Fprint(ow, " LIMIT ", limit.limitN)
 			} else {
-				fmt.Fprintf(w, " LIMIT %v OFFSET %v", limit.limitN, limit.offset)
+				fmt.Fprintf(ow, " LIMIT %v OFFSET %v", limit.limitN, limit.offset)
 			}
 		case MSSQL:
 			if len(b.selects) == 0 {
@@ -92,7 +93,7 @@ func (b *Builder) limitWriteTo(w Writer) error {
 				final = Dialect(b.dialect).Select(selects...).From(wb, "at").Where(Gt{"at.RN": limit.offset})
 			}
 
-			return final.WriteTo(w)
+			return final.WriteTo(ow)
 		default:
 			return ErrNotSupportType
 		}
diff --git a/vendor/xorm.io/builder/builder_select.go b/vendor/xorm.io/builder/builder_select.go
index a36d2a6..087a71d 100644
--- a/vendor/xorm.io/builder/builder_select.go
+++ b/vendor/xorm.io/builder/builder_select.go
@@ -79,8 +79,27 @@ func (b *Builder) selectWriteTo(w Writer) error {
 		}
 	}
 
-	if err := b.joins.WriteTo(w); err != nil {
-		return err
+	for _, v := range b.joins {
+		b, ok := v.joinTable.(*Builder)
+		if ok {
+			if _, err := fmt.Fprintf(w, " %s JOIN (", v.joinType); err != nil {
+				return err
+			}
+			if err := b.WriteTo(w); err != nil {
+				return err
+			}
+			if _, err := fmt.Fprintf(w, ") ON "); err != nil {
+				return err
+			}
+		} else {
+			if _, err := fmt.Fprintf(w, " %s JOIN %s ON ", v.joinType, v.joinTable); err != nil {
+				return err
+			}
+		}
+
+		if err := v.joinCond.WriteTo(w); err != nil {
+			return err
+		}
 	}
 
 	if b.cond.IsValid() {
@@ -99,45 +118,15 @@ func (b *Builder) selectWriteTo(w Writer) error {
 		}
 	}
 
-	if b.having != nil {
-		switch c := b.having.(type) {
-		case string:
-			if len(c) > 0 {
-				if _, err := fmt.Fprint(w, " HAVING ", c); err != nil {
-					return err
-				}
-			}
-		case Cond:
-			if c.IsValid() {
-				if _, err := fmt.Fprint(w, " HAVING "); err != nil {
-					return err
-				}
-				if err := c.WriteTo(w); err != nil {
-					return err
-				}
-			}
-		default:
-			return fmt.Errorf("unknown having parameter: %#v", b.having)
+	if len(b.having) > 0 {
+		if _, err := fmt.Fprint(w, " HAVING ", b.having); err != nil {
+			return err
 		}
 	}
 
-	if b.orderBy != nil {
-		switch c := b.orderBy.(type) {
-		case string:
-			if len(c) > 0 {
-				if _, err := fmt.Fprint(w, " ORDER BY ", c); err != nil {
-					return err
-				}
-			}
-		case *Expression:
-			if _, err := fmt.Fprint(w, " ORDER BY "); err != nil {
-				return err
-			}
-			if err := c.WriteTo(w); err != nil {
-				return err
-			}
-		default:
-			return fmt.Errorf("unknow orderby parameter: %#v", b.orderBy)
+	if len(b.orderBy) > 0 {
+		if _, err := fmt.Fprint(w, " ORDER BY ", b.orderBy); err != nil {
+			return err
 		}
 	}
 
@@ -151,7 +140,7 @@ func (b *Builder) selectWriteTo(w Writer) error {
 }
 
 // OrderBy orderBy SQL
-func (b *Builder) OrderBy(orderBy interface{}) *Builder {
+func (b *Builder) OrderBy(orderBy string) *Builder {
 	b.orderBy = orderBy
 	return b
 }
@@ -163,7 +152,7 @@ func (b *Builder) GroupBy(groupby string) *Builder {
 }
 
 // Having having SQL
-func (b *Builder) Having(having interface{}) *Builder {
+func (b *Builder) Having(having string) *Builder {
 	b.having = having
 	return b
 }
diff --git a/vendor/xorm.io/builder/builder_set_operations.go b/vendor/xorm.io/builder/builder_set_operations.go
index 6ad1677..b2b4a3d 100644
--- a/vendor/xorm.io/builder/builder_set_operations.go
+++ b/vendor/xorm.io/builder/builder_set_operations.go
@@ -11,7 +11,7 @@ import (
 
 func (b *Builder) setOpWriteTo(w Writer) error {
 	if b.limitation != nil || b.cond.IsValid() ||
-		b.orderBy != nil || b.having != nil || b.groupBy != "" {
+		b.orderBy != "" || b.having != "" || b.groupBy != "" {
 		return ErrNotUnexpectedUnionConditions
 	}
 
diff --git a/vendor/xorm.io/builder/cond_and.go b/vendor/xorm.io/builder/cond_and.go
index 82ee30e..e30bd18 100644
--- a/vendor/xorm.io/builder/cond_and.go
+++ b/vendor/xorm.io/builder/cond_and.go
@@ -12,7 +12,7 @@ var _ Cond = condAnd{}
 
 // And generates AND conditions
 func And(conds ...Cond) Cond {
-	result := make(condAnd, 0, len(conds))
+	var result = make(condAnd, 0, len(conds))
 	for _, cond := range conds {
 		if cond == nil || !cond.IsValid() {
 			continue
@@ -25,7 +25,7 @@ func And(conds ...Cond) Cond {
 func (and condAnd) WriteTo(w Writer) error {
 	for i, cond := range and {
 		_, isOr := cond.(condOr)
-		_, isExpr := cond.(*Expression)
+		_, isExpr := cond.(expr)
 		wrap := isOr || isExpr
 		if wrap {
 			fmt.Fprint(w, "(")
diff --git a/vendor/xorm.io/builder/cond_between.go b/vendor/xorm.io/builder/cond_between.go
index b1541f2..10e0b83 100644
--- a/vendor/xorm.io/builder/cond_between.go
+++ b/vendor/xorm.io/builder/cond_between.go
@@ -20,7 +20,7 @@ func (between Between) WriteTo(w Writer) error {
 	if _, err := fmt.Fprintf(w, "%s BETWEEN ", between.Col); err != nil {
 		return err
 	}
-	if lv, ok := between.LessVal.(*Expression); ok {
+	if lv, ok := between.LessVal.(expr); ok {
 		if err := lv.WriteTo(w); err != nil {
 			return err
 		}
@@ -35,7 +35,7 @@ func (between Between) WriteTo(w Writer) error {
 		return err
 	}
 
-	if mv, ok := between.MoreVal.(*Expression); ok {
+	if mv, ok := between.MoreVal.(expr); ok {
 		if err := mv.WriteTo(w); err != nil {
 			return err
 		}
diff --git a/vendor/xorm.io/builder/cond_compare.go b/vendor/xorm.io/builder/cond_compare.go
index bda3d92..1c29371 100644
--- a/vendor/xorm.io/builder/cond_compare.go
+++ b/vendor/xorm.io/builder/cond_compare.go
@@ -8,8 +8,8 @@ import "fmt"
 
 // WriteMap writes conditions' SQL to Writer, op could be =, <>, >, <, <=, >= and etc.
 func WriteMap(w Writer, data map[string]interface{}, op string) error {
-	args := make([]interface{}, 0, len(data))
-	i := 0
+	var args = make([]interface{}, 0, len(data))
+	var i = 0
 	keys := make([]string, 0, len(data))
 	for k := range data {
 		keys = append(keys, k)
@@ -18,12 +18,12 @@ func WriteMap(w Writer, data map[string]interface{}, op string) error {
 	for _, k := range keys {
 		v := data[k]
 		switch v.(type) {
-		case *Expression:
+		case expr:
 			if _, err := fmt.Fprintf(w, "%s%s(", k, op); err != nil {
 				return err
 			}
 
-			if err := v.(*Expression).WriteTo(w); err != nil {
+			if err := v.(expr).WriteTo(w); err != nil {
 				return err
 			}
 
diff --git a/vendor/xorm.io/builder/cond_eq.go b/vendor/xorm.io/builder/cond_eq.go
index 35fdf42..9976d18 100644
--- a/vendor/xorm.io/builder/cond_eq.go
+++ b/vendor/xorm.io/builder/cond_eq.go
@@ -22,7 +22,7 @@ var _ Cond = Eq{}
 
 // OpWriteTo writes conditions with special operator
 func (eq Eq) OpWriteTo(op string, w Writer) error {
-	i := 0
+	var i = 0
 	for _, k := range eq.sortedKeys() {
 		v := eq[k]
 		switch v.(type) {
@@ -30,12 +30,12 @@ func (eq Eq) OpWriteTo(op string, w Writer) error {
 			if err := In(k, v).WriteTo(w); err != nil {
 				return err
 			}
-		case *Expression:
+		case expr:
 			if _, err := fmt.Fprintf(w, "%s=(", k); err != nil {
 				return err
 			}
 
-			if err := v.(*Expression).WriteTo(w); err != nil {
+			if err := v.(expr).WriteTo(w); err != nil {
 				return err
 			}
 
diff --git a/vendor/xorm.io/builder/cond_exists.go b/vendor/xorm.io/builder/cond_exists.go
deleted file mode 100644
index 2e089a3..0000000
--- a/vendor/xorm.io/builder/cond_exists.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package builder
-
-import (
-	"errors"
-	"io"
-)
-
-type condExists struct {
-	subQuery *Builder
-}
-
-var _ Cond = condExists{}
-
-// Exists returns Cond via condition
-func Exists(subQuery *Builder) Cond {
-	return &condExists{
-		subQuery: subQuery,
-	}
-}
-
-func (condExists condExists) WriteTo(w Writer) error {
-	if !condExists.IsValid() {
-		return errors.New("exists condition is nov valid")
-	}
-	if _, err := io.WriteString(w, "EXISTS ("); err != nil {
-		return err
-	}
-	if err := condExists.subQuery.WriteTo(w); err != nil {
-		return err
-	}
-	_, err := io.WriteString(w, ")")
-	return err
-}
-
-func (condExists condExists) And(conds ...Cond) Cond {
-	return And(condExists, And(conds...))
-}
-
-func (condExists condExists) Or(conds ...Cond) Cond {
-	return Or(condExists, Or(conds...))
-}
-
-func (condExists condExists) IsValid() bool {
-	return condExists.subQuery != nil
-}
diff --git a/vendor/xorm.io/builder/cond_expr.go b/vendor/xorm.io/builder/cond_expr.go
new file mode 100644
index 0000000..8288aa0
--- /dev/null
+++ b/vendor/xorm.io/builder/cond_expr.go
@@ -0,0 +1,43 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package builder
+
+import "fmt"
+
+type expr struct {
+	sql  string
+	args []interface{}
+}
+
+var _ Cond = expr{}
+
+// Expr generate customerize SQL
+func Expr(sql string, args ...interface{}) Cond {
+	return expr{sql, args}
+}
+
+func (expr expr) OpWriteTo(op string, w Writer) error {
+	return expr.WriteTo(w)
+}
+
+func (expr expr) WriteTo(w Writer) error {
+	if _, err := fmt.Fprint(w, expr.sql); err != nil {
+		return err
+	}
+	w.Append(expr.args...)
+	return nil
+}
+
+func (expr expr) And(conds ...Cond) Cond {
+	return And(expr, And(conds...))
+}
+
+func (expr expr) Or(conds ...Cond) Cond {
+	return Or(expr, Or(conds...))
+}
+
+func (expr expr) IsValid() bool {
+	return len(expr.sql) > 0
+}
diff --git a/vendor/xorm.io/builder/cond_in.go b/vendor/xorm.io/builder/cond_in.go
index fa98b56..f6366d3 100644
--- a/vendor/xorm.io/builder/cond_in.go
+++ b/vendor/xorm.io/builder/cond_in.go
@@ -38,199 +38,133 @@ func (condIn condIn) WriteTo(w Writer) error {
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int8]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int16:
 		vals := condIn.vals[0].([]int16)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int16]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int:
 		vals := condIn.vals[0].([]int)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int32:
 		vals := condIn.vals[0].([]int32)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int32]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int64:
 		vals := condIn.vals[0].([]int64)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int64]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint8:
 		vals := condIn.vals[0].([]uint8)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint8]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint16:
 		vals := condIn.vals[0].([]uint16)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint16]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint:
 		vals := condIn.vals[0].([]uint)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint32:
 		vals := condIn.vals[0].([]uint32)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint32]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint64:
 		vals := condIn.vals[0].([]uint64)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint64]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []string:
 		vals := condIn.vals[0].([]string)
 		if len(vals) <= 0 {
 			return condIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[string]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []interface{}:
 		vals := condIn.vals[0].([]interface{})
 		if len(vals) <= 0 {
@@ -241,8 +175,8 @@ func (condIn condIn) WriteTo(w Writer) error {
 			return err
 		}
 		w.Append(vals...)
-	case *Expression:
-		val := condIn.vals[0].(*Expression)
+	case expr:
+		val := condIn.vals[0].(expr)
 		if _, err := fmt.Fprintf(w, "%s IN (", condIn.col); err != nil {
 			return err
 		}
@@ -271,38 +205,15 @@ func (condIn condIn) WriteTo(w Writer) error {
 				return condIn.handleBlank(w)
 			}
 
-			trackMap := make(map[interface{}]bool, l)
-			for i := 0; i < l; i++ {
-				val := v.Index(i).Interface()
-				if _, exists := trackMap[val]; exists {
-					continue
-				}
-				w.Append(val)
-				trackMap[val] = true
-			}
-
-			questionMark := strings.Repeat("?,", len(trackMap))
+			questionMark := strings.Repeat("?,", l)
 			if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 				return err
 			}
-		} else {
-			// Using a map for better efficiency
-			trackMap := make(map[interface{}]bool, len(condIn.vals))
 
-			i := 0
-			for in, val := range condIn.vals {
-				if _, exists := trackMap[val]; exists {
-					// This sets empty values to nil, they get sliced off later.
-					condIn.vals[in] = nil
-					continue
-				}
-				trackMap[val] = true
-				condIn.vals[i] = val
-				i++
+			for i := 0; i < l; i++ {
+				w.Append(v.Index(i).Interface())
 			}
-			// Here we slice the slice to only contain those values we defined as correct.
-			condIn.vals = condIn.vals[:i]
-
+		} else {
 			questionMark := strings.Repeat("?,", len(condIn.vals))
 			if _, err := fmt.Fprintf(w, "%s IN (%s)", condIn.col, questionMark[:len(questionMark)-1]); err != nil {
 				return err
diff --git a/vendor/xorm.io/builder/cond_neq.go b/vendor/xorm.io/builder/cond_neq.go
index 060d845..687c59f 100644
--- a/vendor/xorm.io/builder/cond_neq.go
+++ b/vendor/xorm.io/builder/cond_neq.go
@@ -16,8 +16,8 @@ var _ Cond = Neq{}
 
 // WriteTo writes SQL to Writer
 func (neq Neq) WriteTo(w Writer) error {
-	args := make([]interface{}, 0, len(neq))
-	i := 0
+	var args = make([]interface{}, 0, len(neq))
+	var i = 0
 	for _, k := range neq.sortedKeys() {
 		v := neq[k]
 		switch v.(type) {
@@ -25,12 +25,12 @@ func (neq Neq) WriteTo(w Writer) error {
 			if err := NotIn(k, v).WriteTo(w); err != nil {
 				return err
 			}
-		case *Expression:
+		case expr:
 			if _, err := fmt.Fprintf(w, "%s<>(", k); err != nil {
 				return err
 			}
 
-			if err := v.(*Expression).WriteTo(w); err != nil {
+			if err := v.(expr).WriteTo(w); err != nil {
 				return err
 			}
 
diff --git a/vendor/xorm.io/builder/cond_not_exists.go b/vendor/xorm.io/builder/cond_not_exists.go
deleted file mode 100644
index fc9ea4c..0000000
--- a/vendor/xorm.io/builder/cond_not_exists.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package builder
-
-import (
-	"errors"
-	"io"
-)
-
-type condNotExists struct {
-	subQuery *Builder
-}
-
-var _ Cond = condNotExists{}
-
-// NotExists returns Cond via condition
-func NotExists(subQuery *Builder) Cond {
-	return &condNotExists{
-		subQuery: subQuery,
-	}
-}
-
-func (condNotExists condNotExists) WriteTo(w Writer) error {
-	if !condNotExists.IsValid() {
-		return errors.New("exists condition is nov valid")
-	}
-	if _, err := io.WriteString(w, "NOT EXISTS ("); err != nil {
-		return err
-	}
-	if err := condNotExists.subQuery.WriteTo(w); err != nil {
-		return err
-	}
-	_, err := io.WriteString(w, ")")
-	return err
-}
-
-func (condNotExists condNotExists) And(conds ...Cond) Cond {
-	return And(condNotExists, And(conds...))
-}
-
-func (condNotExists condNotExists) Or(conds ...Cond) Cond {
-	return Or(condNotExists, Or(conds...))
-}
-
-func (condNotExists condNotExists) IsValid() bool {
-	return condNotExists.subQuery != nil
-}
diff --git a/vendor/xorm.io/builder/cond_notin.go b/vendor/xorm.io/builder/cond_notin.go
index 43a2be3..dc3ac49 100644
--- a/vendor/xorm.io/builder/cond_notin.go
+++ b/vendor/xorm.io/builder/cond_notin.go
@@ -35,199 +35,133 @@ func (condNotIn condNotIn) WriteTo(w Writer) error {
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int8]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int16:
 		vals := condNotIn.vals[0].([]int16)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int16]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int:
 		vals := condNotIn.vals[0].([]int)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int32:
 		vals := condNotIn.vals[0].([]int32)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int32]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []int64:
 		vals := condNotIn.vals[0].([]int64)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[int64]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint8:
 		vals := condNotIn.vals[0].([]uint8)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint8]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint16:
 		vals := condNotIn.vals[0].([]uint16)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint16]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint:
 		vals := condNotIn.vals[0].([]uint)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint32:
 		vals := condNotIn.vals[0].([]uint32)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint32]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []uint64:
 		vals := condNotIn.vals[0].([]uint64)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[uint64]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []string:
 		vals := condNotIn.vals[0].([]string)
 		if len(vals) <= 0 {
 			return condNotIn.handleBlank(w)
 		}
-		// We're using this map to track if a parameter was already added to the condition to not add the same multiple times.
-		trackMap := make(map[string]bool, len(vals))
-		for _, val := range vals {
-			if _, exists := trackMap[val]; exists {
-				continue
-			}
-			w.Append(val)
-			trackMap[val] = true
-		}
-		questionMark := strings.Repeat("?,", len(trackMap))
+		questionMark := strings.Repeat("?,", len(vals))
 		if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 			return err
 		}
+		for _, val := range vals {
+			w.Append(val)
+		}
 	case []interface{}:
 		vals := condNotIn.vals[0].([]interface{})
 		if len(vals) <= 0 {
@@ -238,8 +172,8 @@ func (condNotIn condNotIn) WriteTo(w Writer) error {
 			return err
 		}
 		w.Append(vals...)
-	case *Expression:
-		val := condNotIn.vals[0].(*Expression)
+	case expr:
+		val := condNotIn.vals[0].(expr)
 		if _, err := fmt.Fprintf(w, "%s NOT IN (", condNotIn.col); err != nil {
 			return err
 		}
@@ -268,38 +202,15 @@ func (condNotIn condNotIn) WriteTo(w Writer) error {
 				return condNotIn.handleBlank(w)
 			}
 
-			trackMap := make(map[interface{}]bool, l)
-			for i := 0; i < l; i++ {
-				val := v.Index(i).Interface()
-				if _, exists := trackMap[val]; exists {
-					continue
-				}
-				w.Append(val)
-				trackMap[val] = true
-			}
-
-			questionMark := strings.Repeat("?,", len(trackMap))
+			questionMark := strings.Repeat("?,", l)
 			if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 				return err
 			}
-		} else {
-			// Using a map for better efficiency
-			trackMap := make(map[interface{}]bool, len(condNotIn.vals))
 
-			i := 0
-			for in, val := range condNotIn.vals {
-				if _, exists := trackMap[val]; exists {
-					// This sets empty values to nil, they get sliced off later.
-					condNotIn.vals[in] = nil
-					continue
-				}
-				trackMap[val] = true
-				condNotIn.vals[i] = val
-				i++
+			for i := 0; i < l; i++ {
+				w.Append(v.Index(i).Interface())
 			}
-			// Here we slice the slice to only contain those values we defined as correct.
-			condNotIn.vals = condNotIn.vals[:i]
-
+		} else {
 			questionMark := strings.Repeat("?,", len(condNotIn.vals))
 			if _, err := fmt.Fprintf(w, "%s NOT IN (%s)", condNotIn.col, questionMark[:len(questionMark)-1]); err != nil {
 				return err
diff --git a/vendor/xorm.io/builder/cond_or.go b/vendor/xorm.io/builder/cond_or.go
index e032154..5244265 100644
--- a/vendor/xorm.io/builder/cond_or.go
+++ b/vendor/xorm.io/builder/cond_or.go
@@ -12,7 +12,7 @@ var _ Cond = condOr{}
 
 // Or sets OR conditions
 func Or(conds ...Cond) Cond {
-	result := make(condOr, 0, len(conds))
+	var result = make(condOr, 0, len(conds))
 	for _, cond := range conds {
 		if cond == nil || !cond.IsValid() {
 			continue
@@ -27,7 +27,7 @@ func (o condOr) WriteTo(w Writer) error {
 	for i, cond := range o {
 		var needQuote bool
 		switch cond.(type) {
-		case condAnd, *Expression:
+		case condAnd, expr:
 			needQuote = true
 		case Eq:
 			needQuote = (len(cond.(Eq)) > 1)
diff --git a/vendor/xorm.io/builder/expr.go b/vendor/xorm.io/builder/expr.go
deleted file mode 100644
index 3efe3ff..0000000
--- a/vendor/xorm.io/builder/expr.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2016 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package builder
-
-import "fmt"
-
-// Expression represetns a SQL express with arguments
-type Expression struct {
-	sql  string
-	args []interface{}
-}
-
-var _ Cond = &Expression{}
-
-// Expr generate customerize SQL
-func Expr(sql string, args ...interface{}) Cond {
-	return &Expression{sql, args}
-}
-
-func (expr *Expression) Content() string {
-	return expr.sql
-}
-
-func (expr *Expression) Args() []interface{} {
-	return expr.args
-}
-
-// OpWriteTo implements UpdateCond interface
-func (expr *Expression) OpWriteTo(op string, w Writer) error {
-	return expr.WriteTo(w)
-}
-
-// WriteTo implements Cond interface
-func (expr *Expression) WriteTo(w Writer) error {
-	if _, err := fmt.Fprint(w, expr.sql); err != nil {
-		return err
-	}
-	w.Append(expr.args...)
-	return nil
-}
-
-// And implements Cond interface
-func (expr *Expression) And(conds ...Cond) Cond {
-	return And(expr, And(conds...))
-}
-
-// Or implements Cond interface
-func (expr *Expression) Or(conds ...Cond) Cond {
-	return Or(expr, Or(conds...))
-}
-
-// IsValid implements Cond interface
-func (expr *Expression) IsValid() bool {
-	return len(expr.sql) > 0
-}
diff --git a/vendor/xorm.io/xorm/.drone.yml b/vendor/xorm.io/xorm/.drone.yml
new file mode 100644
index 0000000..34b9a51
--- /dev/null
+++ b/vendor/xorm.io/xorm/.drone.yml
@@ -0,0 +1,401 @@
+---
+kind: pipeline
+name: test-mysql
+environment:
+  GO111MODULE: "on"
+  GOPROXY: "https://goproxy.io"
+  CGO_ENABLED: 1
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-vet
+  image: golang:1.15
+  pull: always
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  commands:
+    - make vet
+- name: test-sqlite3
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-vet
+  commands:
+    - make fmt-check
+    - make test
+    - make test-sqlite3
+    - TEST_CACHE_ENABLE=true make test-sqlite3
+- name: test-sqlite
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-vet
+  commands:
+    - make test-sqlite
+    - TEST_QUOTE_POLICY=reserved make test-sqlite
+- name: test-mysql
+  image: golang:1.15
+  pull: never
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-vet
+  environment:
+    TEST_MYSQL_HOST: mysql
+    TEST_MYSQL_CHARSET: utf8
+    TEST_MYSQL_DBNAME: xorm_test
+    TEST_MYSQL_USERNAME: root
+    TEST_MYSQL_PASSWORD:
+  commands:
+  - TEST_CACHE_ENABLE=true make test-mysql
+  
+- name: test-mysql-utf8mb4
+  image: golang:1.15
+  pull: never
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-mysql
+  environment:
+    TEST_MYSQL_HOST: mysql
+    TEST_MYSQL_CHARSET: utf8mb4
+    TEST_MYSQL_DBNAME: xorm_test
+    TEST_MYSQL_USERNAME: root
+    TEST_MYSQL_PASSWORD:
+  commands:
+  - make test-mysql
+  - TEST_QUOTE_POLICY=reserved make test-mysql
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: mysql
+  image: mysql:5.7
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: yes
+    MYSQL_DATABASE: xorm_test
+
+---
+kind: pipeline
+name: test-mysql8
+depends_on:
+  - test-mysql
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-mysql8
+  image: golang:1.15
+  pull: never
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_MYSQL_HOST: mysql8
+    TEST_MYSQL_CHARSET: utf8mb4
+    TEST_MYSQL_DBNAME: xorm_test
+    TEST_MYSQL_USERNAME: root
+    TEST_MYSQL_PASSWORD:
+  commands:
+  - make test-mysql
+  - TEST_CACHE_ENABLE=true make test-mysql
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: mysql8
+  image: mysql:8.0
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: yes
+    MYSQL_DATABASE: xorm_test
+
+---
+kind: pipeline
+name: test-mariadb
+depends_on:
+  - test-mysql8
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-mariadb
+  image: golang:1.15
+  pull: never
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_MYSQL_HOST: mariadb
+    TEST_MYSQL_CHARSET: utf8mb4
+    TEST_MYSQL_DBNAME: xorm_test
+    TEST_MYSQL_USERNAME: root
+    TEST_MYSQL_PASSWORD:
+  commands:
+  - make test-mysql
+  - TEST_QUOTE_POLICY=reserved make test-mysql
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: mariadb
+  image: mariadb:10.4
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: yes
+    MYSQL_DATABASE: xorm_test
+
+---
+kind: pipeline
+name: test-postgres
+depends_on:
+  - test-mariadb
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-postgres
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_PGSQL_HOST: pgsql
+    TEST_PGSQL_DBNAME: xorm_test
+    TEST_PGSQL_USERNAME: postgres
+    TEST_PGSQL_PASSWORD: postgres
+  commands:
+  - make test-postgres
+  - TEST_CACHE_ENABLE=true make test-postgres
+
+- name: test-postgres-schema
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-postgres
+  environment:
+    TEST_PGSQL_HOST: pgsql
+    TEST_PGSQL_SCHEMA: xorm
+    TEST_PGSQL_DBNAME: xorm_test
+    TEST_PGSQL_USERNAME: postgres
+    TEST_PGSQL_PASSWORD: postgres
+  commands:
+  - TEST_QUOTE_POLICY=reserved make test-postgres
+
+- name: test-pgx
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-postgres-schema
+  environment:
+    TEST_PGSQL_HOST: pgsql
+    TEST_PGSQL_DBNAME: xorm_test
+    TEST_PGSQL_USERNAME: postgres
+    TEST_PGSQL_PASSWORD: postgres
+  commands:
+  - make test-pgx
+  - TEST_CACHE_ENABLE=true make test-pgx
+  - TEST_QUOTE_POLICY=reserved make test-pgx
+
+- name: test-pgx-schema
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  depends_on:
+  - test-pgx
+  environment:
+    TEST_PGSQL_HOST: pgsql
+    TEST_PGSQL_SCHEMA: xorm
+    TEST_PGSQL_DBNAME: xorm_test
+    TEST_PGSQL_USERNAME: postgres
+    TEST_PGSQL_PASSWORD: postgres
+  commands:
+  - make test-pgx
+  - TEST_CACHE_ENABLE=true make test-pgx
+  - TEST_QUOTE_POLICY=reserved make test-pgx
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: pgsql
+  image: postgres:9.5
+  environment:
+    POSTGRES_DB: xorm_test
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+
+---
+kind: pipeline
+name: test-mssql
+depends_on:
+  - test-postgres
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-mssql
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_MSSQL_HOST: mssql
+    TEST_MSSQL_DBNAME: xorm_test
+    TEST_MSSQL_USERNAME: sa
+    TEST_MSSQL_PASSWORD: "yourStrong(!)Password"
+  commands:
+  - make test-mssql
+  - TEST_MSSQL_DEFAULT_VARCHAR=NVARCHAR TEST_MSSQL_DEFAULT_CHAR=NCHAR make test-mssql
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: mssql
+  pull: always
+  image: mcr.microsoft.com/mssql/server:latest
+  environment:
+    ACCEPT_EULA: Y
+    SA_PASSWORD: yourStrong(!)Password
+    MSSQL_PID: Standard
+
+---
+kind: pipeline
+name: test-tidb
+depends_on:
+  - test-mssql
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-tidb
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_TIDB_HOST: "tidb:4000"
+    TEST_TIDB_DBNAME: xorm_test
+    TEST_TIDB_USERNAME: root
+    TEST_TIDB_PASSWORD:
+  commands:
+  - make test-tidb
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: tidb
+  image: pingcap/tidb:v3.0.3
+
+---
+kind: pipeline
+name: test-cockroach
+depends_on:
+  - test-tidb
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: test-cockroach
+  pull: never
+  image: golang:1.15
+  volumes:
+  - name: cache
+    path: /go/pkg/mod
+  environment:
+    TEST_COCKROACH_HOST: "cockroach:26257"
+    TEST_COCKROACH_DBNAME: xorm_test
+    TEST_COCKROACH_USERNAME: root
+    TEST_COCKROACH_PASSWORD:
+  commands:
+  - sleep 10
+  - make test-cockroach
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
+services:
+- name: cockroach
+  image: cockroachdb/cockroach:v19.2.4
+  commands:
+  - /cockroach/cockroach start --insecure
+
+---
+kind: pipeline
+name: merge_coverage
+depends_on:
+  - test-mysql
+  - test-mysql8
+  - test-mariadb
+  - test-postgres
+  - test-mssql
+  - test-tidb
+  - test-cockroach
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/*/head
+steps:
+- name: merge_coverage
+  image: golang:1.15
+  commands:
+  - make coverage
+
+---
+kind: pipeline
+name: release-tag
+trigger:
+  event:
+    - tag
+steps:
+- name: release-tag-gitea
+  pull: always
+  image: plugins/gitea-release:latest
+  settings:
+    base_url: https://gitea.com
+    title: '${DRONE_TAG} is released'
+    api_key:
+      from_secret: gitea_token
\ No newline at end of file
diff --git a/vendor/xorm.io/xorm/.gitignore b/vendor/xorm.io/xorm/.gitignore
index 6dc08c0..a183a29 100644
--- a/vendor/xorm.io/xorm/.gitignore
+++ b/vendor/xorm.io/xorm/.gitignore
@@ -35,7 +35,6 @@ test.db.sql
 
 *coverage.out
 test.db
-tests/*.sql
-tests/test_sqlite*
-cover.out
-cover.html
+integrations/*.sql
+integrations/test_sqlite*
+cover.out
\ No newline at end of file
diff --git a/vendor/xorm.io/xorm/.golangci.yml b/vendor/xorm.io/xorm/.golangci.yml
deleted file mode 100644
index 7b91f22..0000000
--- a/vendor/xorm.io/xorm/.golangci.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-linters:
-  enable:
-    - gosimple
-    - deadcode
-    - typecheck
-    - govet
-    - errcheck
-    - staticcheck
-    - unused
-    - structcheck
-    - varcheck
-    - dupl
-    #- gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
-    - gofmt
-    - misspell
-    - gocritic
-    - bidichk
-    - ineffassign
-  enable-all: false
-  disable-all: true
-  fast: false
-
-run:
-  timeout: 3m
\ No newline at end of file
diff --git a/vendor/xorm.io/xorm/.revive.toml b/vendor/xorm.io/xorm/.revive.toml
new file mode 100644
index 0000000..9e3b629
--- /dev/null
+++ b/vendor/xorm.io/xorm/.revive.toml
@@ -0,0 +1,29 @@
+ignoreGeneratedHeader = false
+severity = "warning"
+confidence = 0.8
+errorCode = 1
+warningCode = 1
+
+[rule.blank-imports]
+[rule.context-as-argument]
+[rule.context-keys-type]
+[rule.dot-imports]
+[rule.empty-lines]
+[rule.errorf]
+[rule.error-return]
+[rule.error-strings]
+[rule.error-naming]
+[rule.exported]
+[rule.if-return]
+[rule.increment-decrement]
+[rule.indent-error-flow]
+[rule.package-comments]
+[rule.range]
+[rule.receiver-naming]
+[rule.struct-tag]
+[rule.time-naming]
+[rule.unexported-return]
+[rule.unnecessary-stmt]
+[rule.var-declaration]
+[rule.var-naming]
+  arguments = [["ID", "UID", "UUID", "URL", "JSON"], []]
\ No newline at end of file
diff --git a/vendor/xorm.io/xorm/CHANGELOG.md b/vendor/xorm.io/xorm/CHANGELOG.md
index 6887cb9..0f0f93e 100644
--- a/vendor/xorm.io/xorm/CHANGELOG.md
+++ b/vendor/xorm.io/xorm/CHANGELOG.md
@@ -3,55 +3,6 @@
 This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log.
 
-## [1.3.2](https://gitea.com/xorm/xorm/releases/tag/1.3.2) - 2022-09-03
-
-* BUGFIXES
-  * Change schemas.Column to use int64 (#2160)
-* MISC
-  * Prevent Sync failure with non-regular indexes on Postgres (#2174)
-
-## [1.3.1](https://gitea.com/xorm/xorm/releases/tag/1.3.1) - 2022-06-03
-
-* BREAKING
-  * Refactor orderby and support arguments (#2150)
-  * return a clear error for set TEXT type as compare condition (#2062)
-* BUGFIXES
-  * Fix oid index for postgres (#2154)
-  * Add ORDER BY SEQ_IN_INDEX to MySQL GetIndexes to Fix IndexTests (#2152)
-  * some improvement (#2136)
-* ENHANCEMENTS
-  * Add interface to allow structs to provide specific index information (#2137)
-  * MySQL/MariaDB: return max length for text columns (#2133)
-  * PostgreSQL: enable comment on column (#2131)
-* TESTING
-  * Add test for find date (#2121)
-
-## [1.3.0](https://gitea.com/xorm/xorm/releases/tag/1.3.0) - 2022-04-14
-
-* BREAKING
-  * New Prepare useage (#2061)
-  * Make Get and Rows.Scan accept multiple parameters (#2029)
-  * Drop sync function and rename sync2 to sync (#2018)
-* FEATURES
-  * Add dameng support (#2007)
-* BUGFIXES
-  * bugfix :Oid It's a special index. You can't put it in (#2105)
-  * Fix new-lined query execution in master DB node. (#2066)
-  * Fix bug of Rows (#2048)
-  * Fix bug (#2046)
-  * fix panic when `Iterate()` fails (#2040)
-  * fix panic when convert sql and args with nil time.Time pointer (#2038)
-* ENHANCEMENTS
-  * Fix to add session.statement.IsForUpdate check in Session.queryRows() (#2064)
-  * Expose ScanString / ScanInterface and etc (#2039)
-* TESTING
-  * Add test for mysql tls (#2049)
-* BUILD
-  * Upgrade dependencies modules (#2078)
-* MISC
-  * Fix oracle keyword AS (#2109)
-  * Some performance optimization for get (#2043)
-
 ## [1.2.2](https://gitea.com/xorm/xorm/releases/tag/1.2.2) - 2021-08-11
 
 * MISC
diff --git a/vendor/xorm.io/xorm/CONTRIBUTING.md b/vendor/xorm.io/xorm/CONTRIBUTING.md
index 27e6929..a6925a5 100644
--- a/vendor/xorm.io/xorm/CONTRIBUTING.md
+++ b/vendor/xorm.io/xorm/CONTRIBUTING.md
@@ -1,13 +1,13 @@
 ## Contributing to xorm
 
-`xorm` has a backlog of [pull requests](https://gitea.com/xorm/xorm/pulls), but contributions are still very
-much welcome. You can help with patch review, submitting [bug reports](https://gitea.com/xorm/xorm/issues),
+`xorm` has a backlog of [pull requests](https://help.github.com/articles/using-pull-requests), but contributions are still very
+much welcome. You can help with patch review, submitting bug reports,
 or adding new functionality. There is no formal style guide, but
 please conform to the style of existing code and general Go formatting
 conventions when submitting patches.
 
-* [fork the repo](https://gitea.com/repo/fork/2038)
-* [creating a pull request ](https://docs.gitea.io/en-us/pull-request/)
+* [fork a repo](https://help.github.com/articles/fork-a-repo)
+* [creating a pull request ](https://help.github.com/articles/creating-a-pull-request)
 
 ### Language
 
@@ -15,7 +15,7 @@ Since `xorm` is a world-wide open source project, please describe your issues or
 
 ### Sign your codes with comments
 ```
-// !<your gitea.com id>! your comments
+// !<you github id>! your comments
 
 e.g.,
 
@@ -65,7 +65,7 @@ And if your branch is related with cache, you could also enable it via `TEST_CAC
 
 ### Patch review
 
-Help review existing open [pull requests](https://gitea.com/xorm/xorm/pulls) by commenting on the code or
+Help review existing open [pull requests](https://help.github.com/articles/using-pull-requests) by commenting on the code or
 proposed functionality.
 
 ### Bug reports
diff --git a/vendor/xorm.io/xorm/Makefile b/vendor/xorm.io/xorm/Makefile
index 5dc67e0..e986082 100644
--- a/vendor/xorm.io/xorm/Makefile
+++ b/vendor/xorm.io/xorm/Makefile
@@ -9,7 +9,7 @@ SED_INPLACE := sed -i
 GO_DIRS := caches contexts integrations core dialects internal log migrate names schemas tags
 GOFILES := $(wildcard *.go)
 GOFILES += $(shell find $(GO_DIRS) -name "*.go" -type f)
-INTEGRATION_PACKAGES := xorm.io/xorm/tests
+INTEGRATION_PACKAGES := xorm.io/xorm/integrations
 PACKAGES ?= $(filter-out $(INTEGRATION_PACKAGES),$(shell $(GO) list ./...))
 
 TEST_COCKROACH_HOST ?= cockroach:26257
@@ -25,7 +25,6 @@ TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1
 TEST_MSSQL_DEFAULT_VARCHAR ?= varchar
 TEST_MSSQL_DEFAULT_CHAR ?= char
 TEST_MSSQL_DO_NVARCHAR_OVERRIDE_TEST ?= true
-TEST_MSSQL_COLLATION ?= 
 
 TEST_MYSQL_HOST ?= mysql:3306
 TEST_MYSQL_CHARSET ?= utf8
@@ -44,10 +43,6 @@ TEST_TIDB_DBNAME ?= xorm_test
 TEST_TIDB_USERNAME ?= root
 TEST_TIDB_PASSWORD ?=
 
-TEST_DAMENG_HOST ?= dameng:5236
-TEST_DAMENG_USERNAME ?= SYSDBA
-TEST_DAMENG_PASSWORD ?= SYSDBA
-
 TEST_CACHE_ENABLE ?= false
 TEST_QUOTE_POLICY ?= always
 
@@ -61,7 +56,7 @@ build: go-check $(GO_SOURCES)
 .PHONY: clean
 clean:
 	$(GO) clean -i ./...
-	rm -rf *.sql *.log test.db cover.out cover.html *coverage.out coverage.all integrations/*.sql
+	rm -rf *.sql *.log test.db *coverage.out coverage.all integrations/*.sql
 
 .PHONY: coverage
 coverage:
@@ -99,7 +94,8 @@ help:
 	@echo " - build             creates the entire project"
 	@echo " - clean             delete integration files and build files but not css and js files"
 	@echo " - fmt               format the code"
-	@echo " - lint            	run code linter"
+	@echo " - lint            	run code linter revive"
+	@echo " - misspell          check if a word is written wrong"
 	@echo " - test       		run default unit test"
 	@echo " - test-cockroach    run integration tests for cockroach"
 	@echo " - test-mysql        run integration tests for mysql"
@@ -111,30 +107,32 @@ help:
 	@echo " - vet               examines Go source code and reports suspicious constructs"
 
 .PHONY: lint
-lint: golangci-lint
+lint: revive
 
-.PHONY: golangci-lint
-golangci-lint: golangci-lint-check
-	golangci-lint run --timeout 10m
-
-.PHONY: golangci-lint-check
-golangci-lint-check:
-	$(eval GOLANGCI_LINT_VERSION := $(shell printf "%03d%03d%03d" $(shell golangci-lint --version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');))
-	$(eval MIN_GOLANGCI_LINT_VER_FMT := $(shell printf "%g.%g.%g" $(shell echo $(MIN_GOLANGCI_LINT_VERSION) | grep -o ...)))
-	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		echo "Downloading golangci-lint v${MIN_GOLANGCI_LINT_VER_FMT}"; \
-		export BINARY="golangci-lint"; \
-		curl -sfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${MIN_GOLANGCI_LINT_VER_FMT}/install.sh" | sh -s -- -b $(GOPATH)/bin v$(MIN_GOLANGCI_LINT_VER_FMT); \
-	elif [ "$(GOLANGCI_LINT_VERSION)" -lt "$(MIN_GOLANGCI_LINT_VERSION)" ]; then \
-		echo "Downloading newer version of golangci-lint v${MIN_GOLANGCI_LINT_VER_FMT}"; \
-		export BINARY="golangci-lint"; \
-		curl -sfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${MIN_GOLANGCI_LINT_VER_FMT}/install.sh" | sh -s -- -b $(GOPATH)/bin v$(MIN_GOLANGCI_LINT_VER_FMT); \
+.PHONY: revive
+revive:
+	@hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		$(GO) get -u github.com/mgechev/revive; \
 	fi
+	revive -config .revive.toml -exclude=./vendor/... ./... || exit 1
+
+.PHONY: misspell
+misspell:
+	@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		$(GO) get -u github.com/client9/misspell/cmd/misspell; \
+	fi
+	misspell -w -i unknwon $(GOFILES)
+
+.PHONY: misspell-check
+misspell-check:
+	@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		$(GO) get -u github.com/client9/misspell/cmd/misspell; \
+	fi
+	misspell -error -i unknwon,destory $(GOFILES)
 
 .PHONY: test
 test: go-check
-	$(GO) test -cover -coverprofile=cover.out $(PACKAGES)
-	$(GO) tool cover -html=cover.out -o cover.html
+	$(GO) test $(PACKAGES)
 
 .PNONY: test-cockroach
 test-cockroach: go-check
@@ -154,7 +152,6 @@ test-mssql: go-check
 	-conn_str="server=$(TEST_MSSQL_HOST);user id=$(TEST_MSSQL_USERNAME);password=$(TEST_MSSQL_PASSWORD);database=$(TEST_MSSQL_DBNAME)" \
 	-default_varchar=$(TEST_MSSQL_DEFAULT_VARCHAR) -default_char=$(TEST_MSSQL_DEFAULT_CHAR) \
 	-do_nvarchar_override_test=$(TEST_MSSQL_DO_NVARCHAR_OVERRIDE_TEST) \
-	-collation=$(TEST_MSSQL_COLLATION) \
 	-coverprofile=mssql.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m
 
 .PNONY: test-mssql\#%
@@ -189,18 +186,6 @@ test-mysql\#%: go-check
 	-conn_str="$(TEST_MYSQL_USERNAME):$(TEST_MYSQL_PASSWORD)@tcp($(TEST_MYSQL_HOST))/$(TEST_MYSQL_DBNAME)?charset=$(TEST_MYSQL_CHARSET)" \
 	-coverprofile=mysql.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
 
-.PNONY: test-mysql-tls
-test-mysql-tls: go-check
-	$(GO) test $(INTEGRATION_PACKAGES) -v -race -db=mysql -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \
-	-conn_str="$(TEST_MYSQL_USERNAME):$(TEST_MYSQL_PASSWORD)@tcp($(TEST_MYSQL_HOST))/$(TEST_MYSQL_DBNAME)?charset=$(TEST_MYSQL_CHARSET)&tls=skip-verify" \
-	-coverprofile=mysql.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m
-
-.PHONY: test-mysql-tls\#%
-test-mysql-tls\#%: go-check
-	$(GO) test $(INTEGRATION_PACKAGES) -v -race -run $* -db=mysql -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \
-	-conn_str="$(TEST_MYSQL_USERNAME):$(TEST_MYSQL_PASSWORD)@tcp($(TEST_MYSQL_HOST))/$(TEST_MYSQL_DBNAME)?charset=$(TEST_MYSQL_CHARSET)&tls=skip-verify" \
-	-coverprofile=mysql.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
-
 .PNONY: test-postgres
 test-postgres: go-check
 	$(GO) test $(INTEGRATION_PACKAGES) -v -race -db=postgres -schema='$(TEST_PGSQL_SCHEMA)' -cache=$(TEST_CACHE_ENABLE) \
@@ -255,6 +240,7 @@ test-sqlite\#%: go-check
 	$(GO) test $(INTEGRATION_PACKAGES) -v -race -run $* -cache=$(TEST_CACHE_ENABLE) -db=sqlite -conn_str="./test.db?cache=shared&mode=rwc" \
 	 -quote=$(TEST_QUOTE_POLICY) -coverprofile=sqlite.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
 
+
 .PNONY: test-tidb
 test-tidb: go-check
 	$(GO) test $(INTEGRATION_PACKAGES) -v -race -db=mysql -cache=$(TEST_CACHE_ENABLE) -ignore_select_update=true \
@@ -267,18 +253,6 @@ test-tidb\#%: go-check
 	-conn_str="$(TEST_TIDB_USERNAME):$(TEST_TIDB_PASSWORD)@tcp($(TEST_TIDB_HOST))/$(TEST_TIDB_DBNAME)" \
 	-quote=$(TEST_QUOTE_POLICY) -coverprofile=tidb.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
 
-.PNONY: test-dameng
-test-dameng: go-check
-	$(GO) test $(INTEGRATION_PACKAGES) -v -race -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \
-	-conn_str="dm://$(TEST_DAMENG_USERNAME):$(TEST_DAMENG_PASSWORD)@$(TEST_DAMENG_HOST)" \
-	-coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m
-
-.PHONY: test-dameng\#%
-test-dameng\#%: go-check
-	$(GO) test $(INTEGRATION_PACKAGES) -v -race -run $* -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \
-	-conn_str="dm://$(TEST_DAMENG_USERNAME):$(TEST_DAMENG_PASSWORD)@$(TEST_DAMENG_HOST)" \
-	-coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m
-
 .PHONY: vet
 vet:
 	$(GO) vet $(shell $(GO) list ./...)
diff --git a/vendor/xorm.io/xorm/README.md b/vendor/xorm.io/xorm/README.md
index 5e6418d..f4bee6b 100644
--- a/vendor/xorm.io/xorm/README.md
+++ b/vendor/xorm.io/xorm/README.md
@@ -1,6 +1,6 @@
 # xorm
 
-[中文](https://gitea.com/xorm/xorm/src/branch/v1/README_CN.md)
+[中文](https://gitea.com/xorm/xorm/src/branch/master/README_CN.md)
 
 Xorm is a simple and powerful ORM for Go.
 
@@ -45,15 +45,14 @@ Drivers for Go's sql package which currently support database/sql includes:
 
 * [SQLite](https://sqlite.org)
   - [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3)
-  - [modernc.org/sqlite](https://gitlab.com/cznic/sqlite)
+  - [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) (windows unsupported)
 
 * MsSql
-  - [github.com/microsoft/go-mssqldb](https://github.com/microsoft/go-mssqldb)
+  - [github.com/denisenkom/go-mssqldb](https://github.com/denisenkom/go-mssqldb)
 
 * Oracle
   - [github.com/godror/godror](https://github.com/godror/godror) (experiment)
   - [github.com/mattn/go-oci8](https://github.com/mattn/go-oci8) (experiment)
-  - [github.com/sijms/go-ora](https://github.com/sijms/go-ora) (experiment)
 
 ## Installation
 
@@ -75,7 +74,7 @@ Firstly, we should new an engine for a database.
 engine, err := xorm.NewEngine(driverName, dataSourceName)
 ```
 
-* Define a struct and Sync table struct to database
+* Define a struct and Sync2 table struct to database
 
 ```Go
 type User struct {
@@ -88,7 +87,7 @@ type User struct {
     Updated time.Time `xorm:"updated"`
 }
 
-err := engine.Sync(new(User))
+err := engine.Sync2(new(User))
 ```
 
 * Create Engine Group
@@ -142,24 +141,6 @@ affected, err := engine.Insert(&users)
 affected, err := engine.Insert(&user1, &users)
 // INSERT INTO struct1 () values ()
 // INSERT INTO struct2 () values (),(),()
-
-affected, err := engine.Table("user").Insert(map[string]interface{}{
-    "name": "lunny",
-    "age": 18,
-})
-// INSERT INTO user (name, age) values (?,?)
-
-affected, err := engine.Table("user").Insert([]map[string]interface{}{
-    {
-        "name": "lunny",
-        "age": 18,
-    },
-    {
-        "name": "lunny2",
-        "age": 19,
-    },
-})
-// INSERT INTO user (name, age) values (?,?),(?,?)
 ```
 
 * `Get` query one record from database
@@ -180,11 +161,6 @@ has, err := engine.Table(&user).Where("name = ?", name).Cols("id").Get(&id)
 has, err := engine.SQL("select id from user").Get(&id)
 // SELECT id FROM user WHERE name = ?
 
-var id int64
-var name string
-has, err := engine.Table(&user).Cols("id", "name").Get(&id, &name)
-// SELECT id, name FROM user LIMIT 1
-
 var valuesMap = make(map[string]string)
 has, err := engine.Table(&user).Where("id = ?", id).Get(&valuesMap)
 // SELECT * FROM user WHERE id = ?
@@ -258,11 +234,7 @@ err := engine.BufferSize(100).Iterate(&User{Name:name}, func(idx int, bean inter
 })
 // SELECT * FROM user Limit 0, 100
 // SELECT * FROM user Limit 101, 100
-```
 
-You can use rows which is similiar with `sql.Rows`
-
-```Go
 rows, err := engine.Rows(&User{Name:name})
 // SELECT * FROM user
 defer rows.Close()
@@ -272,19 +244,6 @@ for rows.Next() {
 }
 ```
 
-or
-
-```Go
-rows, err := engine.Cols("name", "age").Rows(&User{Name:name})
-// SELECT * FROM user
-defer rows.Close()
-for rows.Next() {
-    var name string
-    var age int
-    err = rows.Scan(&name, &age)
-}
-```
-
 * `Update` update one or more records, default will update non-empty and non-zero fields except when you use Cols, AllCols and so on.
 
 ```Go
diff --git a/vendor/xorm.io/xorm/README_CN.md b/vendor/xorm.io/xorm/README_CN.md
index ba18755..500bb1f 100644
--- a/vendor/xorm.io/xorm/README_CN.md
+++ b/vendor/xorm.io/xorm/README_CN.md
@@ -1,6 +1,6 @@
 # xorm
 
-[English](https://gitea.com/xorm/xorm/src/branch/v1/README.md)
+[English](https://gitea.com/xorm/xorm/src/branch/master/README.md)
 
 xorm 是一个简�而强大的Go语言ORM库. 通过它�以使数�库�作�常简便。
 
@@ -44,15 +44,14 @@ v1.0.0 相对于 v0.8.2 有以下�兼容的�更：
 
 * [SQLite](https://sqlite.org)
   - [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3)
-  - [modernc.org/sqlite](https://gitlab.com/cznic/sqlite)
+  - [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) (Windows试验性支�)
 
 * MsSql
-  - [github.com/microsoft/go-mssqldb](https://github.com/microsoft/go-mssqldb)
+  - [github.com/denisenkom/go-mssqldb](https://github.com/denisenkom/go-mssqldb)
 
 * Oracle
   - [github.com/godror/godror](https://github.com/godror/godror) (试验性支�)
   - [github.com/mattn/go-oci8](https://github.com/mattn/go-oci8) (试验性支�)
-  - [github.com/sijms/go-ora](https://github.com/sijms/go-ora) (试验性支�)
 
 ## 安装
 
@@ -85,7 +84,7 @@ type User struct {
     Updated time.Time `xorm:"updated"`
 }
 
-err := engine.Sync(new(User))
+err := engine.Sync2(new(User))
 ```
 
 * 创建Engine组
@@ -139,24 +138,6 @@ affected, err := engine.Insert(&users)
 affected, err := engine.Insert(&user1, &users)
 // INSERT INTO struct1 () values ()
 // INSERT INTO struct2 () values (),(),()
-
-affected, err := engine.Table("user").Insert(map[string]interface{}{
-    "name": "lunny",
-    "age": 18,
-})
-// INSERT INTO user (name, age) values (?,?)
-
-affected, err := engine.Table("user").Insert([]map[string]interface{}{
-    {
-        "name": "lunny",
-        "age": 18,
-    },
-    {
-        "name": "lunny2",
-        "age": 19,
-    },
-})
-// INSERT INTO user (name, age) values (?,?),(?,?)
 ```
 
 * `Get` 查询��记录
@@ -177,11 +158,6 @@ has, err := engine.Table(&user).Where("name = ?", name).Cols("id").Get(&id)
 has, err := engine.SQL("select id from user").Get(&id)
 // SELECT id FROM user WHERE name = ?
 
-var id int64
-var name string
-has, err := engine.Table(&user).Cols("id", "name").Get(&id, &name)
-// SELECT id, name FROM user LIMIT 1
-
 var valuesMap = make(map[string]string)
 has, err := engine.Table(&user).Where("id = ?", id).Get(&valuesMap)
 // SELECT * FROM user WHERE id = ?
@@ -233,7 +209,7 @@ type UserDetail struct {
 }
 
 var users []UserDetail
-err := engine.Table("user").Select("user.*, detail.*").
+err := engine.Table("user").Select("user.*, detail.*")
     Join("INNER", "detail", "detail.user_id = user.id").
     Where("user.name = ?", name).Limit(10, 0).
     Find(&users)
@@ -255,11 +231,7 @@ err := engine.BufferSize(100).Iterate(&User{Name:name}, func(idx int, bean inter
 })
 // SELECT * FROM user Limit 0, 100
 // SELECT * FROM user Limit 101, 100
-```
 
-Rows 的用法类似 `sql.Rows`。
-
-```Go
 rows, err := engine.Rows(&User{Name:name})
 // SELECT * FROM user
 defer rows.Close()
@@ -269,19 +241,6 @@ for rows.Next() {
 }
 ```
 
-或者
-
-```Go
-rows, err := engine.Cols("name", "age").Rows(&User{Name:name})
-// SELECT * FROM user
-defer rows.Close()
-for rows.Next() {
-    var name string
-    var age int
-    err = rows.Scan(&name, &age)
-}
-```
-
 * `Update` 更新数�，除�使用Cols,AllCols函数指明，默认�更新�空和�0的字段
 
 ```Go
diff --git a/vendor/xorm.io/xorm/caches/encode.go b/vendor/xorm.io/xorm/caches/encode.go
index 8659668..95536d7 100644
--- a/vendor/xorm.io/xorm/caches/encode.go
+++ b/vendor/xorm.io/xorm/caches/encode.go
@@ -16,19 +16,19 @@ import (
 // Md5 return md5 hash string
 func Md5(str string) string {
 	m := md5.New()
-	_, _ = io.WriteString(m, str)
+	io.WriteString(m, str)
 	return fmt.Sprintf("%x", m.Sum(nil))
 }
 
 // Encode Encode data
 func Encode(data interface{}) ([]byte, error) {
-	// return JsonEncode(data)
+	//return JsonEncode(data)
 	return GobEncode(data)
 }
 
 // Decode decode data
 func Decode(data []byte, to interface{}) error {
-	// return JsonDecode(data, to)
+	//return JsonDecode(data, to)
 	return GobDecode(data, to)
 }
 
diff --git a/vendor/xorm.io/xorm/caches/lru.go b/vendor/xorm.io/xorm/caches/lru.go
index 885f02d..6b45ac9 100644
--- a/vendor/xorm.io/xorm/caches/lru.go
+++ b/vendor/xorm.io/xorm/caches/lru.go
@@ -56,7 +56,7 @@ func (m *LRUCacher) GC() {
 	var removedNum int
 	for e := m.idList.Front(); e != nil; {
 		if removedNum <= CacheGcMaxRemoved &&
-			time.Since(e.Value.(*idNode).lastVisit) > m.Expired {
+			time.Now().Sub(e.Value.(*idNode).lastVisit) > m.Expired {
 			removedNum++
 			next := e.Next()
 			node := e.Value.(*idNode)
@@ -70,7 +70,7 @@ func (m *LRUCacher) GC() {
 	removedNum = 0
 	for e := m.sqlList.Front(); e != nil; {
 		if removedNum <= CacheGcMaxRemoved &&
-			time.Since(e.Value.(*sqlNode).lastVisit) > m.Expired {
+			time.Now().Sub(e.Value.(*sqlNode).lastVisit) > m.Expired {
 			removedNum++
 			next := e.Next()
 			node := e.Value.(*sqlNode)
@@ -96,7 +96,7 @@ func (m *LRUCacher) GetIds(tableName, sql string) interface{} {
 		} else {
 			lastTime := el.Value.(*sqlNode).lastVisit
 			// if expired, remove the node and return nil
-			if time.Since(lastTime) > m.Expired {
+			if time.Now().Sub(lastTime) > m.Expired {
 				m.delIds(tableName, sql)
 				return nil
 			}
@@ -122,7 +122,7 @@ func (m *LRUCacher) GetBean(tableName string, id string) interface{} {
 		if el, ok := m.idIndex[tableName][id]; ok {
 			lastTime := el.Value.(*idNode).lastVisit
 			// if expired, remove the node and return nil
-			if time.Since(lastTime) > m.Expired {
+			if time.Now().Sub(lastTime) > m.Expired {
 				m.delBean(tableName, id)
 				return nil
 			}
@@ -145,7 +145,7 @@ func (m *LRUCacher) clearIds(tableName string) {
 	if tis, ok := m.sqlIndex[tableName]; ok {
 		for sql, v := range tis {
 			m.sqlList.Remove(v)
-			_ = m.store.Del(sql)
+			m.store.Del(sql)
 		}
 	}
 	m.sqlIndex[tableName] = make(map[string]*list.Element)
@@ -163,7 +163,7 @@ func (m *LRUCacher) clearBeans(tableName string) {
 		for id, v := range tis {
 			m.idList.Remove(v)
 			tid := genID(tableName, id)
-			_ = m.store.Del(tid)
+			m.store.Del(tid)
 		}
 	}
 	m.idIndex[tableName] = make(map[string]*list.Element)
@@ -188,7 +188,7 @@ func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) {
 	} else {
 		el.Value.(*sqlNode).lastVisit = time.Now()
 	}
-	_ = m.store.Put(sql, ids)
+	m.store.Put(sql, ids)
 	if m.sqlList.Len() > m.MaxElementSize {
 		e := m.sqlList.Front()
 		node := e.Value.(*sqlNode)
@@ -210,7 +210,7 @@ func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) {
 		el.Value.(*idNode).lastVisit = time.Now()
 	}
 
-	_ = m.store.Put(genID(tableName, id), obj)
+	m.store.Put(genID(tableName, id), obj)
 	if m.idList.Len() > m.MaxElementSize {
 		e := m.idList.Front()
 		node := e.Value.(*idNode)
@@ -226,7 +226,7 @@ func (m *LRUCacher) delIds(tableName, sql string) {
 			m.sqlList.Remove(el)
 		}
 	}
-	_ = m.store.Del(sql)
+	m.store.Del(sql)
 }
 
 // DelIds deletes ids
@@ -243,7 +243,7 @@ func (m *LRUCacher) delBean(tableName string, id string) {
 		m.idList.Remove(el)
 		m.clearIds(tableName)
 	}
-	_ = m.store.Del(tid)
+	m.store.Del(tid)
 }
 
 // DelBean deletes beans in some table
@@ -265,6 +265,10 @@ type sqlNode struct {
 	lastVisit time.Time
 }
 
+func genSQLKey(sql string, args interface{}) string {
+	return fmt.Sprintf("%s-%v", sql, args)
+}
+
 func genID(prefix string, id string) string {
 	return fmt.Sprintf("%s-%s", prefix, id)
 }
diff --git a/vendor/xorm.io/xorm/contexts/hook.go b/vendor/xorm.io/xorm/contexts/hook.go
index f6d86cf..70f114d 100644
--- a/vendor/xorm.io/xorm/contexts/hook.go
+++ b/vendor/xorm.io/xorm/contexts/hook.go
@@ -36,7 +36,7 @@ func (c *ContextHook) End(ctx context.Context, result sql.Result, err error) {
 	c.Ctx = ctx
 	c.Result = result
 	c.Err = err
-	c.ExecuteTime = time.Since(c.start)
+	c.ExecuteTime = time.Now().Sub(c.start)
 }
 
 // Hook represents a hook behaviour
diff --git a/vendor/xorm.io/xorm/convert/conversion.go b/vendor/xorm.io/xorm/convert/conversion.go
index 5577e86..78a9fd7 100644
--- a/vendor/xorm.io/xorm/convert/conversion.go
+++ b/vendor/xorm.io/xorm/convert/conversion.go
@@ -16,21 +16,11 @@ import (
 	"time"
 )
 
-// ConversionFrom is an inteface to allow retrieve data from database
-type ConversionFrom interface {
-	FromDB([]byte) error
-}
-
-// ConversionTo is an interface to allow store data to database
-type ConversionTo interface {
-	ToDB() ([]byte, error)
-}
-
 // Conversion is an interface. A type implements Conversion will according
 // the custom method to fill into database and retrieve from database.
 type Conversion interface {
-	ConversionFrom
-	ConversionTo
+	FromDB([]byte) error
+	ToDB() ([]byte, error)
 }
 
 // ErrNilPtr represents an error
@@ -293,9 +283,11 @@ func Assign(dest, src interface{}, originalLocation *time.Location, convertedLoc
 		}
 	}
 
+	var sv reflect.Value
+
 	switch d := dest.(type) {
 	case *string:
-		var sv = reflect.ValueOf(src)
+		sv = reflect.ValueOf(src)
 		switch sv.Kind() {
 		case reflect.Bool,
 			reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
diff --git a/vendor/xorm.io/xorm/convert/int.go b/vendor/xorm.io/xorm/convert/int.go
index 0399477..af8d4f7 100644
--- a/vendor/xorm.io/xorm/convert/int.go
+++ b/vendor/xorm.io/xorm/convert/int.go
@@ -35,56 +35,6 @@ func AsInt64(src interface{}) (int64, error) {
 		return int64(v), nil
 	case uint64:
 		return int64(v), nil
-	case *int:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *int16:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *int32:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *int8:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *int64:
-		if v == nil {
-			return 0, nil
-		}
-		return *v, nil
-	case *uint:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *uint8:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *uint16:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *uint32:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
-	case *uint64:
-		if v == nil {
-			return 0, nil
-		}
-		return int64(*v), nil
 	case []byte:
 		return strconv.ParseInt(string(v), 10, 64)
 	case string:
@@ -160,7 +110,9 @@ func AsUint64(src interface{}) (uint64, error) {
 	return 0, fmt.Errorf("unsupported value %T as uint64", src)
 }
 
-var _ sql.Scanner = &NullUint64{}
+var (
+	_ sql.Scanner = &NullUint64{}
+)
 
 // NullUint64 represents an uint64 that may be null.
 // NullUint64 implements the Scanner interface so
@@ -190,7 +142,9 @@ func (n NullUint64) Value() (driver.Value, error) {
 	return n.Uint64, nil
 }
 
-var _ sql.Scanner = &NullUint32{}
+var (
+	_ sql.Scanner = &NullUint32{}
+)
 
 // NullUint32 represents an uint32 that may be null.
 // NullUint32 implements the Scanner interface so
diff --git a/vendor/xorm.io/xorm/convert/interface.go b/vendor/xorm.io/xorm/convert/interface.go
index 2cc8d9f..b0f28c8 100644
--- a/vendor/xorm.io/xorm/convert/interface.go
+++ b/vendor/xorm.io/xorm/convert/interface.go
@@ -24,10 +24,7 @@ func Interface2Interface(userLocation *time.Location, v interface{}) (interface{
 		return vv.String, nil
 	case *sql.RawBytes:
 		if len([]byte(*vv)) > 0 {
-			src := []byte(*vv)
-			dest := make([]byte, len(src))
-			copy(dest, src)
-			return dest, nil
+			return []byte(*vv), nil
 		}
 		return nil, nil
 	case *sql.NullInt32:
diff --git a/vendor/xorm.io/xorm/convert/time.go b/vendor/xorm.io/xorm/convert/time.go
index 8447214..e53a19c 100644
--- a/vendor/xorm.io/xorm/convert/time.go
+++ b/vendor/xorm.io/xorm/convert/time.go
@@ -15,7 +15,6 @@ import (
 )
 
 // String2Time converts a string to time with original location
-// be aware for time strings (HH:mm:ss) returns zero year (LMT) for converted location
 func String2Time(s string, originalLocation *time.Location, convertedLocation *time.Location) (*time.Time, error) {
 	if len(s) == 19 {
 		if s == utils.ZeroTime0 || s == utils.ZeroTime1 {
@@ -28,9 +27,6 @@ func String2Time(s string, originalLocation *time.Location, convertedLocation *t
 		dt = dt.In(convertedLocation)
 		return &dt, nil
 	} else if len(s) == 20 && s[10] == 'T' && s[19] == 'Z' {
-		if strings.HasPrefix(s, "0000-00-00T00:00:00") || strings.HasPrefix(s, "0001-01-01T00:00:00") {
-			return &time.Time{}, nil
-		}
 		dt, err := time.ParseInLocation("2006-01-02T15:04:05", s[:19], originalLocation)
 		if err != nil {
 			return nil, err
@@ -38,63 +34,23 @@ func String2Time(s string, originalLocation *time.Location, convertedLocation *t
 		dt = dt.In(convertedLocation)
 		return &dt, nil
 	} else if len(s) == 25 && s[10] == 'T' && s[19] == '+' && s[22] == ':' {
-		if strings.HasPrefix(s, "0000-00-00T00:00:00") || strings.HasPrefix(s, "0001-01-01T00:00:00") {
-			return &time.Time{}, nil
-		}
 		dt, err := time.Parse(time.RFC3339, s)
 		if err != nil {
 			return nil, err
 		}
 		dt = dt.In(convertedLocation)
 		return &dt, nil
-	} else if len(s) >= 21 && s[10] == 'T' && s[19] == '.' {
-		if strings.HasPrefix(s, "0000-00-00T00:00:00."+strings.Repeat("0", len(s)-20)) ||
-			strings.HasPrefix(s, "0001-01-01T00:00:00."+strings.Repeat("0", len(s)-20)) {
-			return &time.Time{}, nil
-		}
-		dt, err := time.Parse(time.RFC3339Nano, s)
-		if err != nil {
-			return nil, err
-		}
-		dt = dt.In(convertedLocation)
-		return &dt, nil
 	} else if len(s) >= 21 && s[19] == '.' {
-		if strings.HasPrefix(s, "0000-00-00T00:00:00."+strings.Repeat("0", len(s)-20)) ||
-			strings.HasPrefix(s, "0001-01-01T00:00:00."+strings.Repeat("0", len(s)-20)) {
-			return &time.Time{}, nil
-		}
-		layout := "2006-01-02 15:04:05." + strings.Repeat("0", len(s)-20)
+		var layout = "2006-01-02 15:04:05." + strings.Repeat("0", len(s)-20)
 		dt, err := time.ParseInLocation(layout, s, originalLocation)
 		if err != nil {
 			return nil, err
 		}
 		dt = dt.In(convertedLocation)
 		return &dt, nil
-	} else if len(s) == 10 && s[4] == '-' {
-		if s == "0000-00-00" || s == "0001-01-01" {
-			return &time.Time{}, nil
-		}
-		dt, err := time.ParseInLocation("2006-01-02", s, originalLocation)
-		if err != nil {
-			return nil, err
-		}
-		dt = dt.In(convertedLocation)
-		return &dt, nil
-	} else if len(s) == 8 && s[2] == ':' && s[5] == ':' {
-		dt, err := time.ParseInLocation("15:04:05", s, originalLocation)
-		if err != nil {
-			return nil, err
-		}
-		dt = dt.AddDate(2006, 01, 02).In(convertedLocation)
-		// back to zero year
-		dt = dt.AddDate(-2006, -01, -02)
-		return &dt, nil
 	} else {
 		i, err := strconv.ParseInt(s, 10, 64)
 		if err == nil {
-			if i == 0 {
-				return &time.Time{}, nil
-			}
 			tm := time.Unix(i, 0).In(convertedLocation)
 			return &tm, nil
 		}
@@ -121,9 +77,6 @@ func AsTime(src interface{}, dbLoc *time.Location, uiLoc *time.Location) (*time.
 		if !t.Valid {
 			return nil, nil
 		}
-		if utils.IsTimeZero(t.Time) {
-			return &time.Time{}, nil
-		}
 		z, _ := t.Time.Zone()
 		if len(z) == 0 || t.Time.Year() == 0 || t.Time.Location().String() != dbLoc.String() {
 			tm := time.Date(t.Time.Year(), t.Time.Month(), t.Time.Day(), t.Time.Hour(),
@@ -133,9 +86,6 @@ func AsTime(src interface{}, dbLoc *time.Location, uiLoc *time.Location) (*time.
 		tm := t.Time.In(uiLoc)
 		return &tm, nil
 	case *time.Time:
-		if utils.IsTimeZero(*t) {
-			return &time.Time{}, nil
-		}
 		z, _ := t.Zone()
 		if len(z) == 0 || t.Year() == 0 || t.Location().String() != dbLoc.String() {
 			tm := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(),
@@ -145,9 +95,6 @@ func AsTime(src interface{}, dbLoc *time.Location, uiLoc *time.Location) (*time.
 		tm := t.In(uiLoc)
 		return &tm, nil
 	case time.Time:
-		if utils.IsTimeZero(t) {
-			return &time.Time{}, nil
-		}
 		z, _ := t.Zone()
 		if len(z) == 0 || t.Year() == 0 || t.Location().String() != dbLoc.String() {
 			tm := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(),
@@ -157,21 +104,12 @@ func AsTime(src interface{}, dbLoc *time.Location, uiLoc *time.Location) (*time.
 		tm := t.In(uiLoc)
 		return &tm, nil
 	case int:
-		if t == 0 {
-			return &time.Time{}, nil
-		}
 		tm := time.Unix(int64(t), 0).In(uiLoc)
 		return &tm, nil
 	case int64:
-		if t == 0 {
-			return &time.Time{}, nil
-		}
 		tm := time.Unix(t, 0).In(uiLoc)
 		return &tm, nil
 	case *sql.NullInt64:
-		if t.Int64 == 0 {
-			return &time.Time{}, nil
-		}
 		tm := time.Unix(t.Int64, 0).In(uiLoc)
 		return &tm, nil
 	}
diff --git a/vendor/xorm.io/xorm/core/db.go b/vendor/xorm.io/xorm/core/db.go
index b476ef9..ef5ab22 100644
--- a/vendor/xorm.io/xorm/core/db.go
+++ b/vendor/xorm.io/xorm/core/db.go
@@ -136,7 +136,7 @@ func (db *DB) reflectNew(typ reflect.Type) reflect.Value {
 		cs = &cacheStruct{reflect.MakeSlice(reflect.SliceOf(typ), DefaultCacheSize, DefaultCacheSize), 0}
 		db.reflectCache[typ] = cs
 	} else {
-		cs.idx++
+		cs.idx = cs.idx + 1
 	}
 	return cs.value.Index(cs.idx).Addr()
 }
diff --git a/vendor/xorm.io/xorm/core/rows.go b/vendor/xorm.io/xorm/core/rows.go
index 75d6ebf..c15a59a 100644
--- a/vendor/xorm.io/xorm/core/rows.go
+++ b/vendor/xorm.io/xorm/core/rows.go
@@ -62,7 +62,7 @@ func (rs *Rows) ScanStructByIndex(dest ...interface{}) error {
 	for _, vvv := range vvvs {
 		for j := 0; j < vvv.NumField(); j++ {
 			newDest[i] = vvv.Field(j).Addr().Interface()
-			i++
+			i = i + 1
 		}
 	}
 
diff --git a/vendor/xorm.io/xorm/core/stmt.go b/vendor/xorm.io/xorm/core/stmt.go
index 3247efe..260843d 100644
--- a/vendor/xorm.io/xorm/core/stmt.go
+++ b/vendor/xorm.io/xorm/core/stmt.go
@@ -93,7 +93,7 @@ func (s *Stmt) ExecContext(ctx context.Context, args ...interface{}) (sql.Result
 	if err != nil {
 		return nil, err
 	}
-	res, err := s.Stmt.ExecContext(ctx, args...)
+	res, err := s.Stmt.ExecContext(ctx, args)
 	hookCtx.End(ctx, res, err)
 	if err := s.db.afterProcess(hookCtx); err != nil {
 		return nil, err
diff --git a/vendor/xorm.io/xorm/dialects/dameng.go b/vendor/xorm.io/xorm/dialects/dameng.go
deleted file mode 100644
index d1120fe..0000000
--- a/vendor/xorm.io/xorm/dialects/dameng.go
+++ /dev/null
@@ -1,1218 +0,0 @@
-// Copyright 2021 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dialects
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"xorm.io/xorm/convert"
-	"xorm.io/xorm/core"
-	"xorm.io/xorm/internal/utils"
-	"xorm.io/xorm/schemas"
-)
-
-func init() {
-	RegisterDriver("dm", &damengDriver{})
-	RegisterDialect(schemas.DAMENG, func() Dialect {
-		return &dameng{}
-	})
-}
-
-var (
-	damengReservedWords = map[string]bool{
-		"ACCESS":                    true,
-		"ACCOUNT":                   true,
-		"ACTIVATE":                  true,
-		"ADD":                       true,
-		"ADMIN":                     true,
-		"ADVISE":                    true,
-		"AFTER":                     true,
-		"ALL":                       true,
-		"ALL_ROWS":                  true,
-		"ALLOCATE":                  true,
-		"ALTER":                     true,
-		"ANALYZE":                   true,
-		"AND":                       true,
-		"ANY":                       true,
-		"ARCHIVE":                   true,
-		"ARCHIVELOG":                true,
-		"ARRAY":                     true,
-		"AS":                        true,
-		"ASC":                       true,
-		"AT":                        true,
-		"AUDIT":                     true,
-		"AUTHENTICATED":             true,
-		"AUTHORIZATION":             true,
-		"AUTOEXTEND":                true,
-		"AUTOMATIC":                 true,
-		"BACKUP":                    true,
-		"BECOME":                    true,
-		"BEFORE":                    true,
-		"BEGIN":                     true,
-		"BETWEEN":                   true,
-		"BFILE":                     true,
-		"BITMAP":                    true,
-		"BLOB":                      true,
-		"BLOCK":                     true,
-		"BODY":                      true,
-		"BY":                        true,
-		"CACHE":                     true,
-		"CACHE_INSTANCES":           true,
-		"CANCEL":                    true,
-		"CASCADE":                   true,
-		"CAST":                      true,
-		"CFILE":                     true,
-		"CHAINED":                   true,
-		"CHANGE":                    true,
-		"CHAR":                      true,
-		"CHAR_CS":                   true,
-		"CHARACTER":                 true,
-		"CHECK":                     true,
-		"CHECKPOINT":                true,
-		"CHOOSE":                    true,
-		"CHUNK":                     true,
-		"CLEAR":                     true,
-		"CLOB":                      true,
-		"CLONE":                     true,
-		"CLOSE":                     true,
-		"CLOSE_CACHED_OPEN_CURSORS": true,
-		"CLUSTER":                   true,
-		"COALESCE":                  true,
-		"COLUMN":                    true,
-		"COLUMNS":                   true,
-		"COMMENT":                   true,
-		"COMMIT":                    true,
-		"COMMITTED":                 true,
-		"COMPATIBILITY":             true,
-		"COMPILE":                   true,
-		"COMPLETE":                  true,
-		"COMPOSITE_LIMIT":           true,
-		"COMPRESS":                  true,
-		"COMPUTE":                   true,
-		"CONNECT":                   true,
-		"CONNECT_TIME":              true,
-		"CONSTRAINT":                true,
-		"CONSTRAINTS":               true,
-		"CONTENTS":                  true,
-		"CONTINUE":                  true,
-		"CONTROLFILE":               true,
-		"CONVERT":                   true,
-		"COST":                      true,
-		"CPU_PER_CALL":              true,
-		"CPU_PER_SESSION":           true,
-		"CREATE":                    true,
-		"CURRENT":                   true,
-		"CURRENT_SCHEMA":            true,
-		"CURREN_USER":               true,
-		"CURSOR":                    true,
-		"CYCLE":                     true,
-		"DANGLING":                  true,
-		"DATABASE":                  true,
-		"DATAFILE":                  true,
-		"DATAFILES":                 true,
-		"DATAOBJNO":                 true,
-		"DATE":                      true,
-		"DBA":                       true,
-		"DBHIGH":                    true,
-		"DBLOW":                     true,
-		"DBMAC":                     true,
-		"DEALLOCATE":                true,
-		"DEBUG":                     true,
-		"DEC":                       true,
-		"DECIMAL":                   true,
-		"DECLARE":                   true,
-		"DEFAULT":                   true,
-		"DEFERRABLE":                true,
-		"DEFERRED":                  true,
-		"DEGREE":                    true,
-		"DELETE":                    true,
-		"DEREF":                     true,
-		"DESC":                      true,
-		"DIRECTORY":                 true,
-		"DISABLE":                   true,
-		"DISCONNECT":                true,
-		"DISMOUNT":                  true,
-		"DISTINCT":                  true,
-		"DISTRIBUTED":               true,
-		"DML":                       true,
-		"DOUBLE":                    true,
-		"DROP":                      true,
-		"DUMP":                      true,
-		"EACH":                      true,
-		"ELSE":                      true,
-		"ENABLE":                    true,
-		"END":                       true,
-		"ENFORCE":                   true,
-		"ENTRY":                     true,
-		"ESCAPE":                    true,
-		"EXCEPT":                    true,
-		"EXCEPTIONS":                true,
-		"EXCHANGE":                  true,
-		"EXCLUDING":                 true,
-		"EXCLUSIVE":                 true,
-		"EXECUTE":                   true,
-		"EXISTS":                    true,
-		"EXPIRE":                    true,
-		"EXPLAIN":                   true,
-		"EXTENT":                    true,
-		"EXTENTS":                   true,
-		"EXTERNALLY":                true,
-		"FAILED_LOGIN_ATTEMPTS":     true,
-		"FALSE":                     true,
-		"FAST":                      true,
-		"FILE":                      true,
-		"FIRST_ROWS":                true,
-		"FLAGGER":                   true,
-		"FLOAT":                     true,
-		"FLOB":                      true,
-		"FLUSH":                     true,
-		"FOR":                       true,
-		"FORCE":                     true,
-		"FOREIGN":                   true,
-		"FREELIST":                  true,
-		"FREELISTS":                 true,
-		"FROM":                      true,
-		"FULL":                      true,
-		"FUNCTION":                  true,
-		"GLOBAL":                    true,
-		"GLOBALLY":                  true,
-		"GLOBAL_NAME":               true,
-		"GRANT":                     true,
-		"GROUP":                     true,
-		"GROUPS":                    true,
-		"HASH":                      true,
-		"HASHKEYS":                  true,
-		"HAVING":                    true,
-		"HEADER":                    true,
-		"HEAP":                      true,
-		"IDENTIFIED":                true,
-		"IDGENERATORS":              true,
-		"IDLE_TIME":                 true,
-		"IF":                        true,
-		"IMMEDIATE":                 true,
-		"IN":                        true,
-		"INCLUDING":                 true,
-		"INCREMENT":                 true,
-		"INDEX":                     true,
-		"INDEXED":                   true,
-		"INDEXES":                   true,
-		"INDICATOR":                 true,
-		"IND_PARTITION":             true,
-		"INITIAL":                   true,
-		"INITIALLY":                 true,
-		"INITRANS":                  true,
-		"INSERT":                    true,
-		"INSTANCE":                  true,
-		"INSTANCES":                 true,
-		"INSTEAD":                   true,
-		"INT":                       true,
-		"INTEGER":                   true,
-		"INTERMEDIATE":              true,
-		"INTERSECT":                 true,
-		"INTO":                      true,
-		"IS":                        true,
-		"ISOLATION":                 true,
-		"ISOLATION_LEVEL":           true,
-		"KEEP":                      true,
-		"KEY":                       true,
-		"KILL":                      true,
-		"LABEL":                     true,
-		"LAYER":                     true,
-		"LESS":                      true,
-		"LEVEL":                     true,
-		"LIBRARY":                   true,
-		"LIKE":                      true,
-		"LIMIT":                     true,
-		"LINK":                      true,
-		"LIST":                      true,
-		"LOB":                       true,
-		"LOCAL":                     true,
-		"LOCK":                      true,
-		"LOCKED":                    true,
-		"LOG":                       true,
-		"LOGFILE":                   true,
-		"LOGGING":                   true,
-		"LOGICAL_READS_PER_CALL":    true,
-		"LOGICAL_READS_PER_SESSION": true,
-		"LONG":                      true,
-		"MANAGE":                    true,
-		"MASTER":                    true,
-		"MAX":                       true,
-		"MAXARCHLOGS":               true,
-		"MAXDATAFILES":              true,
-		"MAXEXTENTS":                true,
-		"MAXINSTANCES":              true,
-		"MAXLOGFILES":               true,
-		"MAXLOGHISTORY":             true,
-		"MAXLOGMEMBERS":             true,
-		"MAXSIZE":                   true,
-		"MAXTRANS":                  true,
-		"MAXVALUE":                  true,
-		"MIN":                       true,
-		"MEMBER":                    true,
-		"MINIMUM":                   true,
-		"MINEXTENTS":                true,
-		"MINUS":                     true,
-		"MINVALUE":                  true,
-		"MLSLABEL":                  true,
-		"MLS_LABEL_FORMAT":          true,
-		"MODE":                      true,
-		"MODIFY":                    true,
-		"MOUNT":                     true,
-		"MOVE":                      true,
-		"MTS_DISPATCHERS":           true,
-		"MULTISET":                  true,
-		"NATIONAL":                  true,
-		"NCHAR":                     true,
-		"NCHAR_CS":                  true,
-		"NCLOB":                     true,
-		"NEEDED":                    true,
-		"NESTED":                    true,
-		"NETWORK":                   true,
-		"NEW":                       true,
-		"NEXT":                      true,
-		"NOARCHIVELOG":              true,
-		"NOAUDIT":                   true,
-		"NOCACHE":                   true,
-		"NOCOMPRESS":                true,
-		"NOCYCLE":                   true,
-		"NOFORCE":                   true,
-		"NOLOGGING":                 true,
-		"NOMAXVALUE":                true,
-		"NOMINVALUE":                true,
-		"NONE":                      true,
-		"NOORDER":                   true,
-		"NOOVERRIDE":                true,
-		"NOPARALLEL":                true,
-		"NOREVERSE":                 true,
-		"NORMAL":                    true,
-		"NOSORT":                    true,
-		"NOT":                       true,
-		"NOTHING":                   true,
-		"NOWAIT":                    true,
-		"NULL":                      true,
-		"NUMBER":                    true,
-		"NUMERIC":                   true,
-		"NVARCHAR2":                 true,
-		"OBJECT":                    true,
-		"OBJNO":                     true,
-		"OBJNO_REUSE":               true,
-		"OF":                        true,
-		"OFF":                       true,
-		"OFFLINE":                   true,
-		"OID":                       true,
-		"OIDINDEX":                  true,
-		"OLD":                       true,
-		"ON":                        true,
-		"ONLINE":                    true,
-		"ONLY":                      true,
-		"OPCODE":                    true,
-		"OPEN":                      true,
-		"OPTIMAL":                   true,
-		"OPTIMIZER_GOAL":            true,
-		"OPTION":                    true,
-		"OR":                        true,
-		"ORDER":                     true,
-		"ORGANIZATION":              true,
-		"OSLABEL":                   true,
-		"OVERFLOW":                  true,
-		"OWN":                       true,
-		"PACKAGE":                   true,
-		"PARALLEL":                  true,
-		"PARTITION":                 true,
-		"PASSWORD":                  true,
-		"PASSWORD_GRACE_TIME":       true,
-		"PASSWORD_LIFE_TIME":        true,
-		"PASSWORD_LOCK_TIME":        true,
-		"PASSWORD_REUSE_MAX":        true,
-		"PASSWORD_REUSE_TIME":       true,
-		"PASSWORD_VERIFY_FUNCTION":  true,
-		"PCTFREE":                   true,
-		"PCTINCREASE":               true,
-		"PCTTHRESHOLD":              true,
-		"PCTUSED":                   true,
-		"PCTVERSION":                true,
-		"PERCENT":                   true,
-		"PERMANENT":                 true,
-		"PLAN":                      true,
-		"PLSQL_DEBUG":               true,
-		"POST_TRANSACTION":          true,
-		"PRECISION":                 true,
-		"PRESERVE":                  true,
-		"PRIMARY":                   true,
-		"PRIOR":                     true,
-		"PRIVATE":                   true,
-		"PRIVATE_SGA":               true,
-		"PRIVILEGE":                 true,
-		"PRIVILEGES":                true,
-		"PROCEDURE":                 true,
-		"PROFILE":                   true,
-		"PUBLIC":                    true,
-		"PURGE":                     true,
-		"QUEUE":                     true,
-		"QUOTA":                     true,
-		"RANGE":                     true,
-		"RAW":                       true,
-		"RBA":                       true,
-		"READ":                      true,
-		"READUP":                    true,
-		"REAL":                      true,
-		"REBUILD":                   true,
-		"RECOVER":                   true,
-		"RECOVERABLE":               true,
-		"RECOVERY":                  true,
-		"REF":                       true,
-		"REFERENCES":                true,
-		"REFERENCING":               true,
-		"REFRESH":                   true,
-		"RENAME":                    true,
-		"REPLACE":                   true,
-		"RESET":                     true,
-		"RESETLOGS":                 true,
-		"RESIZE":                    true,
-		"RESOURCE":                  true,
-		"RESTRICTED":                true,
-		"RETURN":                    true,
-		"RETURNING":                 true,
-		"REUSE":                     true,
-		"REVERSE":                   true,
-		"REVOKE":                    true,
-		"ROLE":                      true,
-		"ROLES":                     true,
-		"ROLLBACK":                  true,
-		"ROW":                       true,
-		"ROWID":                     true,
-		"ROWNUM":                    true,
-		"ROWS":                      true,
-		"RULE":                      true,
-		"SAMPLE":                    true,
-		"SAVEPOINT":                 true,
-		"SB4":                       true,
-		"SCAN_INSTANCES":            true,
-		"SCHEMA":                    true,
-		"SCN":                       true,
-		"SCOPE":                     true,
-		"SD_ALL":                    true,
-		"SD_INHIBIT":                true,
-		"SD_SHOW":                   true,
-		"SEGMENT":                   true,
-		"SEG_BLOCK":                 true,
-		"SEG_FILE":                  true,
-		"SELECT":                    true,
-		"SEQUENCE":                  true,
-		"SERIALIZABLE":              true,
-		"SESSION":                   true,
-		"SESSION_CACHED_CURSORS":    true,
-		"SESSIONS_PER_USER":         true,
-		"SET":                       true,
-		"SHARE":                     true,
-		"SHARED":                    true,
-		"SHARED_POOL":               true,
-		"SHRINK":                    true,
-		"SIZE":                      true,
-		"SKIP":                      true,
-		"SKIP_UNUSABLE_INDEXES":     true,
-		"SMALLINT":                  true,
-		"SNAPSHOT":                  true,
-		"SOME":                      true,
-		"SORT":                      true,
-		"SPECIFICATION":             true,
-		"SPLIT":                     true,
-		"SQL_TRACE":                 true,
-		"STANDBY":                   true,
-		"START":                     true,
-		"STATEMENT_ID":              true,
-		"STATISTICS":                true,
-		"STOP":                      true,
-		"STORAGE":                   true,
-		"STORE":                     true,
-		"STRUCTURE":                 true,
-		"SUCCESSFUL":                true,
-		"SWITCH":                    true,
-		"SYS_OP_ENFORCE_NOT_NULL$":  true,
-		"SYS_OP_NTCIMG$":            true,
-		"SYNONYM":                   true,
-		"SYSDATE":                   true,
-		"SYSDBA":                    true,
-		"SYSOPER":                   true,
-		"SYSTEM":                    true,
-		"TABLE":                     true,
-		"TABLES":                    true,
-		"TABLESPACE":                true,
-		"TABLESPACE_NO":             true,
-		"TABNO":                     true,
-		"TEMPORARY":                 true,
-		"THAN":                      true,
-		"THE":                       true,
-		"THEN":                      true,
-		"THREAD":                    true,
-		"TIMESTAMP":                 true,
-		"TIME":                      true,
-		"TO":                        true,
-		"TOPLEVEL":                  true,
-		"TRACE":                     true,
-		"TRACING":                   true,
-		"TRANSACTION":               true,
-		"TRANSITIONAL":              true,
-		"TRIGGER":                   true,
-		"TRIGGERS":                  true,
-		"TRUE":                      true,
-		"TRUNCATE":                  true,
-		"TX":                        true,
-		"TYPE":                      true,
-		"UB2":                       true,
-		"UBA":                       true,
-		"UID":                       true,
-		"UNARCHIVED":                true,
-		"UNDO":                      true,
-		"UNION":                     true,
-		"UNIQUE":                    true,
-		"UNLIMITED":                 true,
-		"UNLOCK":                    true,
-		"UNRECOVERABLE":             true,
-		"UNTIL":                     true,
-		"UNUSABLE":                  true,
-		"UNUSED":                    true,
-		"UPDATABLE":                 true,
-		"UPDATE":                    true,
-		"USAGE":                     true,
-		"USE":                       true,
-		"USER":                      true,
-		"USING":                     true,
-		"VALIDATE":                  true,
-		"VALIDATION":                true,
-		"VALUE":                     true,
-		"VALUES":                    true,
-		"VARCHAR":                   true,
-		"VARCHAR2":                  true,
-		"VARYING":                   true,
-		"VIEW":                      true,
-		"WHEN":                      true,
-		"WHENEVER":                  true,
-		"WHERE":                     true,
-		"WITH":                      true,
-		"WITHOUT":                   true,
-		"WORK":                      true,
-		"WRITE":                     true,
-		"WRITEDOWN":                 true,
-		"WRITEUP":                   true,
-		"XID":                       true,
-		"YEAR":                      true,
-		"ZONE":                      true,
-	}
-
-	damengQuoter = schemas.Quoter{
-		Prefix:     '"',
-		Suffix:     '"',
-		IsReserved: schemas.AlwaysReserve,
-	}
-)
-
-type dameng struct {
-	Base
-}
-
-func (db *dameng) Init(uri *URI) error {
-	db.quoter = damengQuoter
-	return db.Base.Init(db, uri)
-}
-
-func (db *dameng) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
-	rows, err := queryer.QueryContext(ctx, "SELECT * FROM V$VERSION") // select id_code
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	var version string
-	if !rows.Next() {
-		if rows.Err() != nil {
-			return nil, rows.Err()
-		}
-		return nil, errors.New("unknow version")
-	}
-
-	if err := rows.Scan(&version); err != nil {
-		return nil, err
-	}
-	return &schemas.Version{
-		Number: version,
-	}, nil
-}
-
-func (db *dameng) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: SequenceAutoincrMode,
-	}
-}
-
-// DropIndexSQL returns a SQL to drop index
-func (db *dameng) DropIndexSQL(tableName string, index *schemas.Index) string {
-	quote := db.dialect.Quoter().Quote
-	var name string
-	if index.IsRegular {
-		name = index.XName(tableName)
-	} else {
-		name = index.Name
-	}
-	return fmt.Sprintf("DROP INDEX %v", quote(name))
-}
-
-func (db *dameng) SQLType(c *schemas.Column) string {
-	var res string
-	switch t := c.SQLType.Name; t {
-	case schemas.TinyInt, "BYTE":
-		return "TINYINT"
-	case schemas.SmallInt, schemas.MediumInt, schemas.Int, schemas.Integer, schemas.UnsignedTinyInt:
-		return "INTEGER"
-	case schemas.BigInt,
-		schemas.UnsignedBigInt, schemas.UnsignedBit, schemas.UnsignedInt,
-		schemas.Serial, schemas.BigSerial:
-		return "BIGINT"
-	case schemas.Bit, schemas.Bool, schemas.Boolean:
-		return schemas.Bit
-	case schemas.Uuid:
-		res = schemas.Varchar
-		c.Length = 40
-	case schemas.Binary:
-		if c.Length == 0 {
-			return schemas.Binary + "(MAX)"
-		}
-	case schemas.VarBinary, schemas.Blob, schemas.TinyBlob, schemas.MediumBlob, schemas.LongBlob, schemas.Bytea:
-		return schemas.VarBinary
-	case schemas.Date:
-		return schemas.Date
-	case schemas.Time:
-		if c.Length > 0 {
-			return fmt.Sprintf("%s(%d)", schemas.Time, c.Length)
-		}
-		return schemas.Time
-	case schemas.DateTime, schemas.TimeStamp:
-		res = schemas.TimeStamp
-	case schemas.TimeStampz:
-		if c.Length > 0 {
-			return fmt.Sprintf("TIMESTAMP(%d) WITH TIME ZONE", c.Length)
-		}
-		return "TIMESTAMP WITH TIME ZONE"
-	case schemas.Float:
-		res = "FLOAT"
-	case schemas.Real, schemas.Double:
-		res = "REAL"
-	case schemas.Numeric, schemas.Decimal, "NUMBER":
-		res = "NUMERIC"
-	case schemas.Text, schemas.Json:
-		return "TEXT"
-	case schemas.MediumText, schemas.LongText:
-		res = "CLOB"
-	case schemas.Char, schemas.Varchar, schemas.TinyText:
-		res = "VARCHAR2"
-	default:
-		res = t
-	}
-
-	hasLen1 := c.Length > 0
-	hasLen2 := c.Length2 > 0
-
-	if hasLen2 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + "," + strconv.FormatInt(c.Length2, 10) + ")"
-	} else if hasLen1 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + ")"
-	}
-	return res
-}
-
-func (db *dameng) ColumnTypeKind(t string) int {
-	switch strings.ToUpper(t) {
-	case "DATE":
-		return schemas.TIME_TYPE
-	case "CHAR", "NCHAR", "VARCHAR", "VARCHAR2", "NVARCHAR2", "LONG", "CLOB", "NCLOB":
-		return schemas.TEXT_TYPE
-	case "NUMBER":
-		return schemas.NUMERIC_TYPE
-	case "BLOB":
-		return schemas.BLOB_TYPE
-	default:
-		return schemas.UNKNOW_TYPE
-	}
-}
-
-func (db *dameng) AutoIncrStr() string {
-	return "IDENTITY"
-}
-
-func (db *dameng) IsReserved(name string) bool {
-	_, ok := damengReservedWords[strings.ToUpper(name)]
-	return ok
-}
-
-func (db *dameng) DropTableSQL(tableName string) (string, bool) {
-	return fmt.Sprintf("DROP TABLE %s", db.quoter.Quote(tableName)), false
-}
-
-// ModifyColumnSQL returns a SQL to modify SQL
-func (db *dameng) ModifyColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, false, false)
-	return fmt.Sprintf("ALTER TABLE %s MODIFY %s", db.quoter.Quote(tableName), s)
-}
-
-func (db *dameng) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
-	if tableName == "" {
-		tableName = table.Name
-	}
-
-	quoter := db.Quoter()
-	var b strings.Builder
-	if _, err := b.WriteString("CREATE TABLE "); err != nil {
-		return "", false, err
-	}
-	if err := quoter.QuoteTo(&b, tableName); err != nil {
-		return "", false, err
-	}
-	if _, err := b.WriteString(" ("); err != nil {
-		return "", false, err
-	}
-
-	pkList := table.PrimaryKeys
-
-	for i, colName := range table.ColumnsSeq() {
-		col := table.GetColumn(colName)
-		if col.SQLType.IsBool() && !col.DefaultIsEmpty {
-			if col.Default == "true" {
-				col.Default = "1"
-			} else if col.Default == "false" {
-				col.Default = "0"
-			}
-		}
-
-		s, _ := ColumnString(db, col, false, false)
-		if _, err := b.WriteString(s); err != nil {
-			return "", false, err
-		}
-		if i != len(table.ColumnsSeq())-1 {
-			if _, err := b.WriteString(", "); err != nil {
-				return "", false, err
-			}
-		}
-	}
-
-	if len(pkList) > 0 {
-		if len(table.ColumnsSeq()) > 0 {
-			if _, err := b.WriteString(", "); err != nil {
-				return "", false, err
-			}
-		}
-		if _, err := b.WriteString("CONSTRAINT PK_"); err != nil {
-			return "", false, err
-		}
-		if _, err := b.WriteString(tableName); err != nil {
-			return "", false, err
-		}
-		if _, err := b.WriteString(" PRIMARY KEY ("); err != nil {
-			return "", false, err
-		}
-		if err := quoter.JoinWrite(&b, pkList, ","); err != nil {
-			return "", false, err
-		}
-		if _, err := b.WriteString(")"); err != nil {
-			return "", false, err
-		}
-	}
-	if _, err := b.WriteString(")"); err != nil {
-		return "", false, err
-	}
-
-	return b.String(), false, nil
-}
-
-func (db *dameng) SetQuotePolicy(quotePolicy QuotePolicy) {
-	switch quotePolicy {
-	case QuotePolicyNone:
-		q := damengQuoter
-		q.IsReserved = schemas.AlwaysNoReserve
-		db.quoter = q
-	case QuotePolicyReserved:
-		q := damengQuoter
-		q.IsReserved = db.IsReserved
-		db.quoter = q
-	case QuotePolicyAlways:
-		fallthrough
-	default:
-		db.quoter = damengQuoter
-	}
-}
-
-func (db *dameng) IndexCheckSQL(tableName, idxName string) (string, []interface{}) {
-	args := []interface{}{tableName, idxName}
-	return `SELECT INDEX_NAME FROM USER_INDEXES ` +
-		`WHERE TABLE_NAME = ? AND INDEX_NAME = ?`, args
-}
-
-func (db *dameng) IsTableExist(queryer core.Queryer, ctx context.Context, tableName string) (bool, error) {
-	return db.HasRecords(queryer, ctx, `SELECT table_name FROM user_tables WHERE table_name = ?`, tableName)
-}
-
-func (db *dameng) IsSequenceExist(ctx context.Context, queryer core.Queryer, seqName string) (bool, error) {
-	var cnt int
-	rows, err := queryer.QueryContext(ctx, "SELECT COUNT(*) FROM user_sequences WHERE sequence_name = ?", seqName)
-	if err != nil {
-		return false, err
-	}
-	defer rows.Close()
-	if !rows.Next() {
-		if rows.Err() != nil {
-			return false, rows.Err()
-		}
-		return false, errors.New("query sequence failed")
-	}
-
-	if err := rows.Scan(&cnt); err != nil {
-		return false, err
-	}
-	return cnt > 0, nil
-}
-
-func (db *dameng) IsColumnExist(queryer core.Queryer, ctx context.Context, tableName, colName string) (bool, error) {
-	args := []interface{}{tableName, colName}
-	query := "SELECT column_name FROM USER_TAB_COLUMNS WHERE table_name = ?" +
-		" AND column_name = ?"
-	return db.HasRecords(queryer, ctx, query, args...)
-}
-
-var _ sql.Scanner = &dmClobScanner{}
-
-type dmClobScanner struct {
-	valid bool
-	data  string
-}
-
-type dmClobObject interface {
-	GetLength() (int64, error)
-	ReadString(int, int) (string, error)
-}
-
-// var _ dmClobObject = &dm.DmClob{}
-
-func (d *dmClobScanner) Scan(data interface{}) error {
-	if data == nil {
-		return nil
-	}
-
-	switch t := data.(type) {
-	case dmClobObject: // *dm.DmClob
-		if t == nil {
-			return nil
-		}
-		l, err := t.GetLength()
-		if err != nil {
-			return err
-		}
-		if l == 0 {
-			d.valid = true
-			return nil
-		}
-		d.data, err = t.ReadString(1, int(l))
-		if err != nil {
-			return err
-		}
-		d.valid = true
-		return nil
-	case []byte:
-		if t == nil {
-			return nil
-		}
-		d.data = string(t)
-		d.valid = true
-		return nil
-	case string:
-		if len(t) <= 0 {
-			return nil
-		}
-		d.data = string(t)
-		d.valid = true
-		return nil
-	default:
-		return fmt.Errorf("cannot convert %T as dmClobScanner", data)
-	}
-}
-
-func addSingleQuote(name string) string {
-	if len(name) < 2 {
-		return name
-	}
-	if name[0] == '\'' && name[len(name)-1] == '\'' {
-		return name
-	}
-	var b strings.Builder
-	b.WriteRune('\'')
-	b.WriteString(name)
-	b.WriteRune('\'')
-	return b.String()
-}
-
-func (db *dameng) GetColumns(queryer core.Queryer, ctx context.Context, tableName string) ([]string, map[string]*schemas.Column, error) {
-	s := `select   column_name   from   user_cons_columns   
-  where   constraint_name   =   (select   constraint_name   from   user_constraints   
-			  where   table_name   =   ?  and   constraint_type   ='P')`
-	rows, err := queryer.QueryContext(ctx, s, tableName)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer rows.Close()
-
-	var pkNames []string
-	for rows.Next() {
-		var pkName string
-		err = rows.Scan(&pkName)
-		if err != nil {
-			return nil, nil, err
-		}
-		pkNames = append(pkNames, pkName)
-	}
-	if rows.Err() != nil {
-		return nil, nil, rows.Err()
-	}
-	rows.Close()
-
-	s = `SELECT USER_TAB_COLS.COLUMN_NAME, USER_TAB_COLS.DATA_DEFAULT, USER_TAB_COLS.DATA_TYPE, USER_TAB_COLS.DATA_LENGTH, 
-		USER_TAB_COLS.data_precision, USER_TAB_COLS.data_scale, USER_TAB_COLS.NULLABLE,
-		user_col_comments.comments
-		FROM USER_TAB_COLS 
-		LEFT JOIN user_col_comments on user_col_comments.TABLE_NAME=USER_TAB_COLS.TABLE_NAME 
-		AND user_col_comments.COLUMN_NAME=USER_TAB_COLS.COLUMN_NAME
-		WHERE USER_TAB_COLS.table_name = ?`
-	rows, err = queryer.QueryContext(ctx, s, tableName)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer rows.Close()
-
-	cols := make(map[string]*schemas.Column)
-	colSeq := make([]string, 0)
-	for rows.Next() {
-		col := new(schemas.Column)
-		col.Indexes = make(map[string]int)
-
-		var colDefault dmClobScanner
-		var colName, nullable, dataType, dataPrecision, comment sql.NullString
-		var dataScale, dataLen sql.NullInt64
-
-		err = rows.Scan(&colName, &colDefault, &dataType, &dataLen, &dataPrecision,
-			&dataScale, &nullable, &comment)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if !colName.Valid {
-			return nil, nil, errors.New("column name is nil")
-		}
-
-		col.Name = strings.Trim(colName.String, `" `)
-		if colDefault.valid {
-			col.Default = colDefault.data
-		} else {
-			col.DefaultIsEmpty = true
-		}
-
-		if nullable.String == "Y" {
-			col.Nullable = true
-		} else {
-			col.Nullable = false
-		}
-
-		if !comment.Valid {
-			col.Comment = comment.String
-		}
-		if utils.IndexSlice(pkNames, col.Name) > -1 {
-			col.IsPrimaryKey = true
-			has, err := db.HasRecords(queryer, ctx, "SELECT * FROM USER_SEQUENCES WHERE SEQUENCE_NAME = ?", utils.SeqName(tableName))
-			if err != nil {
-				return nil, nil, err
-			}
-			if has {
-				col.IsAutoIncrement = true
-			}
-		}
-
-		var (
-			ignore     bool
-			dt         string
-			len1, len2 int64
-		)
-
-		dts := strings.Split(dataType.String, "(")
-		dt = dts[0]
-		if len(dts) > 1 {
-			lens := strings.Split(dts[1][:len(dts[1])-1], ",")
-			if len(lens) > 1 {
-				len1, _ = strconv.ParseInt(lens[0], 10, 64)
-				len2, _ = strconv.ParseInt(lens[1], 10, 64)
-			} else {
-				len1, _ = strconv.ParseInt(lens[0], 10, 64)
-			}
-		}
-
-		switch dt {
-		case "VARCHAR2":
-			col.SQLType = schemas.SQLType{Name: "VARCHAR2", DefaultLength: len1, DefaultLength2: len2}
-		case "VARCHAR":
-			col.SQLType = schemas.SQLType{Name: schemas.Varchar, DefaultLength: len1, DefaultLength2: len2}
-		case "TIMESTAMP WITH TIME ZONE":
-			col.SQLType = schemas.SQLType{Name: schemas.TimeStampz, DefaultLength: 0, DefaultLength2: 0}
-		case "NUMBER":
-			col.SQLType = schemas.SQLType{Name: "NUMBER", DefaultLength: len1, DefaultLength2: len2}
-		case "LONG", "LONG RAW", "NCLOB", "CLOB", "TEXT":
-			col.SQLType = schemas.SQLType{Name: schemas.Text, DefaultLength: 0, DefaultLength2: 0}
-		case "RAW":
-			col.SQLType = schemas.SQLType{Name: schemas.Binary, DefaultLength: 0, DefaultLength2: 0}
-		case "ROWID":
-			col.SQLType = schemas.SQLType{Name: schemas.Varchar, DefaultLength: 18, DefaultLength2: 0}
-		case "AQ$_SUBSCRIBERS":
-			ignore = true
-		default:
-			col.SQLType = schemas.SQLType{Name: strings.ToUpper(dt), DefaultLength: len1, DefaultLength2: len2}
-		}
-
-		if ignore {
-			continue
-		}
-
-		if _, ok := schemas.SqlTypes[col.SQLType.Name]; !ok {
-			return nil, nil, fmt.Errorf("unknown colType %v %v", dataType.String, col.SQLType)
-		}
-
-		if col.SQLType.Name == "TIMESTAMP" {
-			col.Length = dataScale.Int64
-		} else {
-			col.Length = dataLen.Int64
-		}
-
-		if col.SQLType.IsTime() {
-			if !col.DefaultIsEmpty && !strings.EqualFold(col.Default, "CURRENT_TIMESTAMP") {
-				col.Default = addSingleQuote(col.Default)
-			}
-		}
-		cols[col.Name] = col
-		colSeq = append(colSeq, col.Name)
-	}
-	if rows.Err() != nil {
-		return nil, nil, rows.Err()
-	}
-
-	return colSeq, cols, nil
-}
-
-func (db *dameng) GetTables(queryer core.Queryer, ctx context.Context) ([]*schemas.Table, error) {
-	s := "SELECT table_name FROM user_tables WHERE temporary = 'N' AND table_name NOT LIKE ?"
-	args := []interface{}{strings.ToUpper(db.uri.User), "%$%"}
-
-	rows, err := queryer.QueryContext(ctx, s, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	tables := make([]*schemas.Table, 0)
-	for rows.Next() {
-		table := schemas.NewEmptyTable()
-		err = rows.Scan(&table.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		tables = append(tables, table)
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-	return tables, nil
-}
-
-func (db *dameng) GetIndexes(queryer core.Queryer, ctx context.Context, tableName string) (map[string]*schemas.Index, error) {
-	args := []interface{}{tableName, tableName}
-	s := "SELECT t.column_name,i.uniqueness,i.index_name FROM user_ind_columns t,user_indexes i " +
-		"WHERE t.index_name = i.index_name and t.table_name = i.table_name and t.table_name =?" +
-		" AND t.index_name not in (SELECT index_name FROM ALL_CONSTRAINTS WHERE CONSTRAINT_TYPE='P' AND table_name = ?)"
-
-	rows, err := queryer.QueryContext(ctx, s, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	indexes := make(map[string]*schemas.Index)
-	for rows.Next() {
-		var indexType int
-		var indexName, colName, uniqueness string
-
-		err = rows.Scan(&colName, &uniqueness, &indexName)
-		if err != nil {
-			return nil, err
-		}
-
-		indexName = strings.Trim(indexName, `" `)
-
-		var isRegular bool
-		if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) {
-			indexName = indexName[5+len(tableName):]
-			isRegular = true
-		}
-
-		if uniqueness == "UNIQUE" {
-			indexType = schemas.UniqueType
-		} else {
-			indexType = schemas.IndexType
-		}
-
-		var index *schemas.Index
-		var ok bool
-		if index, ok = indexes[indexName]; !ok {
-			index = new(schemas.Index)
-			index.Type = indexType
-			index.Name = indexName
-			index.IsRegular = isRegular
-			indexes[indexName] = index
-		}
-		index.AddColumn(colName)
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-	return indexes, nil
-}
-
-func (db *dameng) Filters() []Filter {
-	return []Filter{}
-}
-
-type damengDriver struct {
-	baseDriver
-}
-
-// Features return features
-func (d *damengDriver) Features() *DriverFeatures {
-	return &DriverFeatures{
-		SupportReturnInsertedID: false,
-	}
-}
-
-// Parse parse the datasource
-// dm://userName:password@ip:port
-func (d *damengDriver) Parse(driverName, dataSourceName string) (*URI, error) {
-	u, err := url.Parse(dataSourceName)
-	if err != nil {
-		return nil, err
-	}
-
-	if u.User == nil {
-		return nil, errors.New("user/password needed")
-	}
-
-	passwd, _ := u.User.Password()
-	return &URI{
-		DBType: schemas.DAMENG,
-		Proto:  u.Scheme,
-		Host:   u.Hostname(),
-		Port:   u.Port(),
-		DBName: u.User.Username(),
-		User:   u.User.Username(),
-		Passwd: passwd,
-	}, nil
-}
-
-func (d *damengDriver) GenScanResult(colType string) (interface{}, error) {
-	switch colType {
-	case "CHAR", "NCHAR", "VARCHAR", "VARCHAR2", "NVARCHAR2", "LONG", "CLOB", "NCLOB":
-		var s sql.NullString
-		return &s, nil
-	case "NUMBER":
-		var s sql.NullString
-		return &s, nil
-	case "BIGINT":
-		var s sql.NullInt64
-		return &s, nil
-	case "INTEGER":
-		var s sql.NullInt32
-		return &s, nil
-	case "DATE", "TIMESTAMP":
-		var s sql.NullString
-		return &s, nil
-	case "BLOB":
-		var r sql.RawBytes
-		return &r, nil
-	case "FLOAT":
-		var s sql.NullFloat64
-		return &s, nil
-	default:
-		var r sql.RawBytes
-		return &r, nil
-	}
-}
-
-func (d *damengDriver) Scan(ctx *ScanContext, rows *core.Rows, types []*sql.ColumnType, vv ...interface{}) error {
-	scanResults := make([]interface{}, 0, len(types))
-	replaces := make([]bool, 0, len(types))
-	var err error
-	for i, v := range vv {
-		var replaced bool
-		var scanResult interface{}
-		switch types[i].DatabaseTypeName() {
-		case "CLOB", "TEXT":
-			scanResult = &dmClobScanner{}
-			replaced = true
-		case "TIMESTAMP":
-			scanResult = &sql.NullString{}
-			replaced = true
-		default:
-			scanResult = v
-		}
-
-		scanResults = append(scanResults, scanResult)
-		replaces = append(replaces, replaced)
-	}
-
-	if err = rows.Scan(scanResults...); err != nil {
-		return err
-	}
-
-	for i, replaced := range replaces {
-		if replaced {
-			switch t := scanResults[i].(type) {
-			case *dmClobScanner:
-				var d interface{}
-				if t.valid {
-					d = t.data
-				} else {
-					d = nil
-				}
-				if err := convert.Assign(vv[i], d, ctx.DBLocation, ctx.UserLocation); err != nil {
-					return err
-				}
-			default:
-				switch types[i].DatabaseTypeName() {
-				case "TIMESTAMP":
-					ns := t.(*sql.NullString)
-					if !ns.Valid {
-						break
-					}
-					s := ns.String
-					fields := strings.Split(s, "+")
-					if err := convert.Assign(vv[i], strings.Replace(fields[0], "T", " ", -1), ctx.DBLocation, ctx.UserLocation); err != nil {
-						return err
-					}
-				default:
-					return fmt.Errorf("don't support convert %T to %T", t, vv[i])
-				}
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/dialects/dialect.go b/vendor/xorm.io/xorm/dialects/dialect.go
index 8e512c4..b6c0853 100644
--- a/vendor/xorm.io/xorm/dialects/dialect.go
+++ b/vendor/xorm.io/xorm/dialects/dialect.go
@@ -38,23 +38,11 @@ func (uri *URI) SetSchema(schema string) {
 	}
 }
 
-// enumerates all autoincr mode
-const (
-	IncrAutoincrMode = iota
-	SequenceAutoincrMode
-)
-
-// DialectFeatures represents a dialect parameters
-type DialectFeatures struct {
-	AutoincrMode int // 0 autoincrement column, 1 sequence
-}
-
 // Dialect represents a kind of database
 type Dialect interface {
 	Init(*URI) error
 	URI() *URI
 	Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error)
-	Features() *DialectFeatures
 
 	SQLType(*schemas.Column) string
 	Alias(string) string       // return what a sql type's alias of
@@ -73,18 +61,16 @@ type Dialect interface {
 
 	GetTables(queryer core.Queryer, ctx context.Context) ([]*schemas.Table, error)
 	IsTableExist(queryer core.Queryer, ctx context.Context, tableName string) (bool, error)
-	CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error)
+	CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool)
 	DropTableSQL(tableName string) (string, bool)
 
-	CreateSequenceSQL(ctx context.Context, queryer core.Queryer, seqName string) (string, error)
-	IsSequenceExist(ctx context.Context, queryer core.Queryer, seqName string) (bool, error)
-	DropSequenceSQL(seqName string) (string, error)
-
 	GetColumns(queryer core.Queryer, ctx context.Context, tableName string) ([]string, map[string]*schemas.Column, error)
 	IsColumnExist(queryer core.Queryer, ctx context.Context, tableName string, colName string) (bool, error)
 	AddColumnSQL(tableName string, col *schemas.Column) string
 	ModifyColumnSQL(tableName string, col *schemas.Column) string
 
+	ForUpdateSQL(query string) string
+
 	Filters() []Filter
 	SetParams(params map[string]string)
 }
@@ -118,7 +104,7 @@ func (db *Base) URI() *URI {
 }
 
 // CreateTableSQL implements Dialect
-func (db *Base) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
+func (db *Base) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -126,14 +112,12 @@ func (db *Base) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 	quoter := db.dialect.Quoter()
 	var b strings.Builder
 	b.WriteString("CREATE TABLE IF NOT EXISTS ")
-	if err := quoter.QuoteTo(&b, tableName); err != nil {
-		return "", false, err
-	}
+	quoter.QuoteTo(&b, tableName)
 	b.WriteString(" (")
 
 	for i, colName := range table.ColumnsSeq() {
 		col := table.GetColumn(colName)
-		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1, false)
+		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1)
 		b.WriteString(s)
 
 		if i != len(table.ColumnsSeq())-1 {
@@ -149,25 +133,7 @@ func (db *Base) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 
 	b.WriteString(")")
 
-	return b.String(), false, nil
-}
-
-func (db *Base) CreateSequenceSQL(ctx context.Context, queryer core.Queryer, seqName string) (string, error) {
-	return fmt.Sprintf(`CREATE SEQUENCE %s 
-	minvalue 1
-	   nomaxvalue
-	   start with 1
-	   increment by 1
-	   nocycle
-	nocache`, seqName), nil
-}
-
-func (db *Base) IsSequenceExist(ctx context.Context, queryer core.Queryer, seqName string) (bool, error) {
-	return false, fmt.Errorf("unsupported sequence feature")
-}
-
-func (db *Base) DropSequenceSQL(seqName string) (string, error) {
-	return fmt.Sprintf("DROP SEQUENCE %s", seqName), nil
+	return []string{b.String()}, false
 }
 
 // DropTableSQL returns drop table SQL
@@ -207,8 +173,8 @@ func (db *Base) IsColumnExist(queryer core.Queryer, ctx context.Context, tableNa
 
 // AddColumnSQL returns a SQL to add a column
 func (db *Base) AddColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, true, false)
-	return fmt.Sprintf("ALTER TABLE %s ADD %s", db.dialect.Quoter().Quote(tableName), s)
+	s, _ := ColumnString(db.dialect, col, true)
+	return fmt.Sprintf("ALTER TABLE %v ADD %v", db.dialect.Quoter().Quote(tableName), s)
 }
 
 // CreateIndexSQL returns a SQL to create index
@@ -239,15 +205,22 @@ func (db *Base) DropIndexSQL(tableName string, index *schemas.Index) string {
 
 // ModifyColumnSQL returns a SQL to modify SQL
 func (db *Base) ModifyColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, false, false)
-	return fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN %s", db.quoter.Quote(tableName), s)
+	s, _ := ColumnString(db.dialect, col, false)
+	return fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN %s", tableName, s)
+}
+
+// ForUpdateSQL returns for updateSQL
+func (db *Base) ForUpdateSQL(query string) string {
+	return query + " FOR UPDATE"
 }
 
 // SetParams set params
 func (db *Base) SetParams(params map[string]string) {
 }
 
-var dialects = map[string]func() Dialect{}
+var (
+	dialects = map[string]func() Dialect{}
+)
 
 // RegisterDialect register database dialect
 func RegisterDialect(dbName schemas.DBType, dialectFunc func() Dialect) {
@@ -281,7 +254,6 @@ func regDrvsNDialects() bool {
 		"sqlite":   {"sqlite3", func() Driver { return &sqlite3Driver{} }, func() Dialect { return &sqlite3{} }},
 		"oci8":     {"oracle", func() Driver { return &oci8Driver{} }, func() Dialect { return &oracle{} }},
 		"godror":   {"oracle", func() Driver { return &godrorDriver{} }, func() Dialect { return &oracle{} }},
-		"oracle":   {"oracle", func() Driver { return &oracleDriver{} }, func() Dialect { return &oracle{} }},
 	}
 
 	for driverName, v := range providedDrvsNDialects {
@@ -298,7 +270,7 @@ func init() {
 }
 
 // ColumnString generate column description string according dialect
-func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey, supportCollation bool) (string, error) {
+func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey bool) (string, error) {
 	bd := strings.Builder{}
 
 	if err := dialect.Quoter().QuoteTo(&bd, col.Name); err != nil {
@@ -313,50 +285,43 @@ func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey, suppo
 		return "", err
 	}
 
-	if supportCollation && col.Collation != "" {
-		if _, err := bd.WriteString(" COLLATE "); err != nil {
-			return "", err
-		}
-		if _, err := bd.WriteString(col.Collation); err != nil {
-			return "", err
-		}
+	if err := bd.WriteByte(' '); err != nil {
+		return "", err
 	}
 
 	if includePrimaryKey && col.IsPrimaryKey {
-		if _, err := bd.WriteString(" PRIMARY KEY"); err != nil {
+		if _, err := bd.WriteString("PRIMARY KEY "); err != nil {
 			return "", err
 		}
+
 		if col.IsAutoIncrement {
-			if err := bd.WriteByte(' '); err != nil {
+			if _, err := bd.WriteString(dialect.AutoIncrStr()); err != nil {
 				return "", err
 			}
-			if _, err := bd.WriteString(dialect.AutoIncrStr()); err != nil {
+			if err := bd.WriteByte(' '); err != nil {
 				return "", err
 			}
 		}
 	}
 
-	if !col.DefaultIsEmpty {
-		if _, err := bd.WriteString(" DEFAULT "); err != nil {
+	if col.Default != "" {
+		if _, err := bd.WriteString("DEFAULT "); err != nil {
 			return "", err
 		}
-		if col.Default == "" {
-			if _, err := bd.WriteString("''"); err != nil {
-				return "", err
-			}
-		} else {
-			if _, err := bd.WriteString(col.Default); err != nil {
-				return "", err
-			}
+		if _, err := bd.WriteString(col.Default); err != nil {
+			return "", err
+		}
+		if err := bd.WriteByte(' '); err != nil {
+			return "", err
 		}
 	}
 
 	if col.Nullable {
-		if _, err := bd.WriteString(" NULL"); err != nil {
+		if _, err := bd.WriteString("NULL "); err != nil {
 			return "", err
 		}
 	} else {
-		if _, err := bd.WriteString(" NOT NULL"); err != nil {
+		if _, err := bd.WriteString("NOT NULL "); err != nil {
 			return "", err
 		}
 	}
diff --git a/vendor/xorm.io/xorm/dialects/filter.go b/vendor/xorm.io/xorm/dialects/filter.go
index ab7c65b..bfe2e93 100644
--- a/vendor/xorm.io/xorm/dialects/filter.go
+++ b/vendor/xorm.io/xorm/dialects/filter.go
@@ -5,24 +5,22 @@
 package dialects
 
 import (
-	"context"
 	"fmt"
-	"strconv"
 	"strings"
 )
 
 // Filter is an interface to filter SQL
 type Filter interface {
-	Do(ctx context.Context, sql string) string
+	Do(sql string) string
 }
 
-// postgresSeqFilter filter SQL replace ?, ? ... to $1, $2 ...
-type postgresSeqFilter struct {
+// SeqFilter filter SQL replace ?, ? ... to $1, $2 ...
+type SeqFilter struct {
 	Prefix string
 	Start  int
 }
 
-func postgresSeqFilterConvertQuestionMark(sql, prefix string, start int) string {
+func convertQuestionMark(sql, prefix string, start int) string {
 	var buf strings.Builder
 	var beginSingleQuote bool
 	var isLineComment bool
@@ -30,77 +28,10 @@ func postgresSeqFilterConvertQuestionMark(sql, prefix string, start int) string
 	var isMaybeLineComment bool
 	var isMaybeComment bool
 	var isMaybeCommentEnd bool
-	var isMaybeJsonbQuestion bool
-	index := start
-	for i, c := range sql {
-		if !beginSingleQuote && !isLineComment && !isComment && !isMaybeJsonbQuestion && c == '?' {
-			buf.WriteString(fmt.Sprintf("%s%v", prefix, index))
-			index++
-		} else {
-			if isMaybeJsonbQuestion && c == '?' {
-				isMaybeJsonbQuestion = false
-			} else if isMaybeLineComment {
-				if c == '-' {
-					isLineComment = true
-				}
-				isMaybeLineComment = false
-			} else if isMaybeComment {
-				if c == '*' {
-					isComment = true
-				}
-				isMaybeComment = false
-			} else if isMaybeCommentEnd {
-				if c == '/' {
-					isComment = false
-				}
-				isMaybeCommentEnd = false
-			} else if isLineComment {
-				if c == '\n' {
-					isLineComment = false
-				}
-			} else if isComment {
-				if c == '*' {
-					isMaybeCommentEnd = true
-				}
-			} else if !beginSingleQuote && c == '-' {
-				isMaybeLineComment = true
-			} else if !beginSingleQuote && c == '/' {
-				isMaybeComment = true
-			} else if !beginSingleQuote && c == ' ' && i >= 7 && strings.TrimSpace(sql[i-7:i]) == "::jsonb" {
-				isMaybeJsonbQuestion = true
-			} else if c == '\'' {
-				beginSingleQuote = !beginSingleQuote
-			}
-			buf.WriteRune(c)
-		}
-	}
-	return buf.String()
-}
-
-// Do implements Filter
-func (s *postgresSeqFilter) Do(ctx context.Context, sql string) string {
-	return postgresSeqFilterConvertQuestionMark(sql, s.Prefix, s.Start)
-}
-
-// oracleSeqFilter filter SQL replace ?, ? ... to :1, :2 ...
-type oracleSeqFilter struct {
-	Prefix string
-	Start  int
-}
-
-func oracleSeqFilterConvertQuestionMark(sql, prefix string, start int) string {
-	var buf strings.Builder
-	var beginSingleQuote bool
-	var isLineComment bool
-	var isComment bool
-	var isMaybeLineComment bool
-	var isMaybeComment bool
-	var isMaybeCommentEnd bool
-	index := start
+	var index = start
 	for _, c := range sql {
 		if !beginSingleQuote && !isLineComment && !isComment && c == '?' {
-			buf.WriteString(prefix)
-			buf.WriteString(strconv.Itoa(index))
+			buf.WriteString(fmt.Sprintf("%s%v", prefix, index))
 			index++
 		} else {
 			if isMaybeLineComment {
@@ -140,6 +71,6 @@ func oracleSeqFilterConvertQuestionMark(sql, prefix string, start int) string {
 }
 
 // Do implements Filter
-func (s *oracleSeqFilter) Do(ctx context.Context, sql string) string {
-	return oracleSeqFilterConvertQuestionMark(sql, s.Prefix, s.Start)
+func (s *SeqFilter) Do(sql string) string {
+	return convertQuestionMark(sql, s.Prefix, s.Start)
 }
diff --git a/vendor/xorm.io/xorm/dialects/mssql.go b/vendor/xorm.io/xorm/dialects/mssql.go
index a7a8da1..ab010eb 100644
--- a/vendor/xorm.io/xorm/dialects/mssql.go
+++ b/vendor/xorm.io/xorm/dialects/mssql.go
@@ -217,7 +217,6 @@ type mssql struct {
 	Base
 	defaultVarchar string
 	defaultChar    string
-	useLegacy      bool
 }
 
 func (db *mssql) Init(uri *URI) error {
@@ -227,12 +226,10 @@ func (db *mssql) Init(uri *URI) error {
 	return db.Base.Init(db, uri)
 }
 
-func (db *mssql) UseLegacyLimitOffset() bool { return db.useLegacy }
-
 func (db *mssql) SetParams(params map[string]string) {
 	defaultVarchar, ok := params["DEFAULT_VARCHAR"]
 	if ok {
-		t := strings.ToUpper(defaultVarchar)
+		var t = strings.ToUpper(defaultVarchar)
 		switch t {
 		case "NVARCHAR", "VARCHAR":
 			db.defaultVarchar = t
@@ -245,7 +242,7 @@ func (db *mssql) SetParams(params map[string]string) {
 
 	defaultChar, ok := params["DEFAULT_CHAR"]
 	if ok {
-		t := strings.ToUpper(defaultChar)
+		var t = strings.ToUpper(defaultChar)
 		switch t {
 		case "NCHAR", "CHAR":
 			db.defaultChar = t
@@ -255,13 +252,6 @@ func (db *mssql) SetParams(params map[string]string) {
 	} else {
 		db.defaultChar = "CHAR"
 	}
-
-	useLegacy, ok := params["USE_LEGACY_LIMIT_OFFSET"]
-	if ok {
-		if b, _ := strconv.ParseBool(useLegacy); b {
-			db.useLegacy = true
-		}
-	}
 }
 
 func (db *mssql) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
@@ -292,12 +282,6 @@ func (db *mssql) Version(ctx context.Context, queryer core.Queryer) (*schemas.Ve
 	}, nil
 }
 
-func (db *mssql) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: IncrAutoincrMode,
-	}
-}
-
 func (db *mssql) SQLType(c *schemas.Column) string {
 	var res string
 	switch t := c.SQLType.Name; t {
@@ -330,15 +314,19 @@ func (db *mssql) SQLType(c *schemas.Column) string {
 			res += "(MAX)"
 		}
 	case schemas.TimeStamp, schemas.DateTime:
-		return "DATETIME2"
+		if c.Length > 3 {
+			res = "DATETIME2"
+		} else {
+			return schemas.DateTime
+		}
 	case schemas.TimeStampz:
 		res = "DATETIMEOFFSET"
 		c.Length = 7
-	case schemas.MediumInt, schemas.SmallInt, schemas.UnsignedMediumInt, schemas.UnsignedTinyInt, schemas.UnsignedSmallInt:
+	case schemas.MediumInt, schemas.TinyInt, schemas.SmallInt, schemas.UnsignedMediumInt, schemas.UnsignedTinyInt, schemas.UnsignedSmallInt:
 		res = schemas.Int
 	case schemas.Text, schemas.MediumText, schemas.TinyText, schemas.LongText, schemas.Json:
 		res = db.defaultVarchar + "(MAX)"
-	case schemas.Double, schemas.UnsignedFloat:
+	case schemas.Double:
 		res = schemas.Real
 	case schemas.Uuid:
 		res = schemas.Varchar
@@ -377,13 +365,13 @@ func (db *mssql) SQLType(c *schemas.Column) string {
 		return res
 	}
 
-	hasLen1 := c.Length > 0
-	hasLen2 := c.Length2 > 0
+	hasLen1 := (c.Length > 0)
+	hasLen2 := (c.Length2 > 0)
 
 	if hasLen2 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + "," + strconv.FormatInt(c.Length2, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + "," + strconv.Itoa(c.Length2) + ")"
 	} else if hasLen1 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + ")"
 	}
 	return res
 }
@@ -409,11 +397,11 @@ func (db *mssql) IsReserved(name string) bool {
 func (db *mssql) SetQuotePolicy(quotePolicy QuotePolicy) {
 	switch quotePolicy {
 	case QuotePolicyNone:
-		q := mssqlQuoter
+		var q = mssqlQuoter
 		q.IsReserved = schemas.AlwaysNoReserve
 		db.quoter = q
 	case QuotePolicyReserved:
-		q := mssqlQuoter
+		var q = mssqlQuoter
 		q.IsReserved = db.IsReserved
 		db.quoter = q
 	case QuotePolicyAlways:
@@ -434,8 +422,8 @@ func (db *mssql) DropTableSQL(tableName string) (string, bool) {
 }
 
 func (db *mssql) ModifyColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, false, true)
-	return fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s", db.quoter.Quote(tableName), s)
+	s, _ := ColumnString(db.dialect, col, false)
+	return fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s", tableName, s)
 }
 
 func (db *mssql) IndexCheckSQL(tableName, idxName string) (string, []interface{}) {
@@ -460,7 +448,7 @@ func (db *mssql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 	s := `select a.name as name, b.name as ctype,a.max_length,a.precision,a.scale,a.is_nullable as nullable,
 		  "default_is_null" = (CASE WHEN c.text is null THEN 1 ELSE 0 END),
 	      replace(replace(isnull(c.text,''),'(',''),')','') as vdefault,
-		  ISNULL(p.is_primary_key, 0), a.is_identity as is_identity, a.collation_name
+		  ISNULL(p.is_primary_key, 0), a.is_identity as is_identity
           from sys.columns a 
 		  left join sys.types b on a.user_type_id=b.user_type_id
           left join sys.syscomments c on a.default_object_id=c.id
@@ -481,10 +469,9 @@ func (db *mssql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 	colSeq := make([]string, 0)
 	for rows.Next() {
 		var name, ctype, vdefault string
-		var collation *string
-		var maxLen, precision, scale int64
+		var maxLen, precision, scale int
 		var nullable, isPK, defaultIsNull, isIncrement bool
-		err = rows.Scan(&name, &ctype, &maxLen, &precision, &scale, &nullable, &defaultIsNull, &vdefault, &isPK, &isIncrement, &collation)
+		err = rows.Scan(&name, &ctype, &maxLen, &precision, &scale, &nullable, &defaultIsNull, &vdefault, &isPK, &isIncrement)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -506,9 +493,6 @@ func (db *mssql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 		} else {
 			col.Length = maxLen
 		}
-		if collation != nil {
-			col.Collation = *collation
-		}
 		switch ct {
 		case "DATETIMEOFFSET":
 			col.SQLType = schemas.SQLType{Name: schemas.TimeStampz, DefaultLength: 0, DefaultLength2: 0}
@@ -582,10 +566,10 @@ func (db *mssql) GetIndexes(queryer core.Queryer, ctx context.Context, tableName
 IXS.NAME                    AS  [INDEX_NAME],
 C.NAME                      AS  [COLUMN_NAME],
 IXS.is_unique AS [IS_UNIQUE]
-FROM sys.indexes IXS
-INNER JOIN sys.index_columns IXCS
+FROM SYS.INDEXES IXS
+INNER JOIN SYS.INDEX_COLUMNS   IXCS
 ON IXS.OBJECT_ID=IXCS.OBJECT_ID  AND IXS.INDEX_ID = IXCS.INDEX_ID
-INNER   JOIN sys.columns C  ON IXS.OBJECT_ID=C.OBJECT_ID
+INNER   JOIN SYS.COLUMNS C  ON IXS.OBJECT_ID=C.OBJECT_ID
 AND IXCS.COLUMN_ID=C.COLUMN_ID
 WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =?
 `
@@ -641,7 +625,7 @@ WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =?
 	return indexes, nil
 }
 
-func (db *mssql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
+func (db *mssql) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -656,7 +640,7 @@ func (db *mssql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 
 	for i, colName := range table.ColumnsSeq() {
 		col := table.GetColumn(colName)
-		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1, true)
+		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1)
 		b.WriteString(s)
 
 		if i != len(table.ColumnsSeq())-1 {
@@ -672,7 +656,11 @@ func (db *mssql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 
 	b.WriteString(")")
 
-	return b.String(), true, nil
+	return []string{b.String()}, true
+}
+
+func (db *mssql) ForUpdateSQL(query string) string {
+	return query
 }
 
 func (db *mssql) Filters() []Filter {
diff --git a/vendor/xorm.io/xorm/dialects/mysql.go b/vendor/xorm.io/xorm/dialects/mysql.go
index d11c728..0489904 100644
--- a/vendor/xorm.io/xorm/dialects/mysql.go
+++ b/vendor/xorm.io/xorm/dialects/mysql.go
@@ -6,6 +6,7 @@ package dialects
 
 import (
 	"context"
+	"crypto/tls"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -38,7 +39,6 @@ var (
 		"CALL":              true,
 		"CASCADE":           true,
 		"CASE":              true,
-		"CHAIN":             true,
 		"CHANGE":            true,
 		"CHAR":              true,
 		"CHARACTER":         true,
@@ -129,7 +129,6 @@ var (
 		"OUT": true, "OUTER": true, "OUTFILE": true,
 		"PRECISION": true, "PRIMARY": true, "PROCEDURE": true,
 		"PURGE": true, "RAID0": true, "RANGE": true,
-		"RANK": true,
 		"READ": true, "READS": true, "REAL": true,
 		"REFERENCES": true, "REGEXP": true, "RELEASE": true,
 		"RENAME": true, "REPEAT": true, "REPLACE": true,
@@ -173,7 +172,16 @@ var (
 
 type mysql struct {
 	Base
-	rowFormat string
+	net               string
+	addr              string
+	params            map[string]string
+	loc               *time.Location
+	timeout           time.Duration
+	tls               *tls.Config
+	allowAllFiles     bool
+	allowOldPasswords bool
+	clientFoundRows   bool
+	rowFormat         string
 }
 
 func (db *mysql) Init(uri *URI) error {
@@ -181,9 +189,11 @@ func (db *mysql) Init(uri *URI) error {
 	return db.Base.Init(db, uri)
 }
 
-var mysqlColAliases = map[string]string{
-	"numeric": "decimal",
-}
+var (
+	mysqlColAliases = map[string]string{
+		"numeric": "decimal",
+	}
+)
 
 // Alias returns a alias of column
 func (db *mysql) Alias(col string) string {
@@ -234,16 +244,10 @@ func (db *mysql) Version(ctx context.Context, queryer core.Queryer) (*schemas.Ve
 	}, nil
 }
 
-func (db *mysql) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: IncrAutoincrMode,
-	}
-}
-
 func (db *mysql) SetParams(params map[string]string) {
 	rowFormat, ok := params["rowFormat"]
 	if ok {
-		t := strings.ToUpper(rowFormat)
+		var t = strings.ToUpper(rowFormat)
 		switch t {
 		case "COMPACT":
 			fallthrough
@@ -319,15 +323,12 @@ func (db *mysql) SQLType(c *schemas.Column) string {
 	case schemas.UnsignedTinyInt:
 		res = schemas.TinyInt
 		isUnsigned = true
-	case schemas.UnsignedFloat:
-		res = schemas.Float
-		isUnsigned = true
 	default:
 		res = t
 	}
 
-	hasLen1 := c.Length > 0
-	hasLen2 := c.Length2 > 0
+	hasLen1 := (c.Length > 0)
+	hasLen2 := (c.Length2 > 0)
 
 	if res == schemas.BigInt && !hasLen1 && !hasLen2 {
 		c.Length = 20
@@ -335,9 +336,9 @@ func (db *mysql) SQLType(c *schemas.Column) string {
 	}
 
 	if hasLen2 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + "," + strconv.FormatInt(c.Length2, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + "," + strconv.Itoa(c.Length2) + ")"
 	} else if hasLen1 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + ")"
 	}
 
 	if isUnsigned {
@@ -385,27 +386,12 @@ func (db *mysql) IsTableExist(queryer core.Queryer, ctx context.Context, tableNa
 
 func (db *mysql) AddColumnSQL(tableName string, col *schemas.Column) string {
 	quoter := db.dialect.Quoter()
-	s, _ := ColumnString(db, col, true, true)
-	var b strings.Builder
-	b.WriteString("ALTER TABLE ")
-	quoter.QuoteTo(&b, tableName)
-	b.WriteString(" ADD ")
-	b.WriteString(s)
+	s, _ := ColumnString(db, col, true)
+	sql := fmt.Sprintf("ALTER TABLE %v ADD %v", quoter.Quote(tableName), s)
 	if len(col.Comment) > 0 {
-		b.WriteString(" COMMENT '")
-		b.WriteString(col.Comment)
-		b.WriteString("'")
+		sql += " COMMENT '" + col.Comment + "'"
 	}
-	return b.String()
-}
-
-// ModifyColumnSQL returns a SQL to modify SQL
-func (db *mysql) ModifyColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, false, true)
-	if col.Comment != "" {
-		s += fmt.Sprintf(" COMMENT '%s'", col.Comment)
-	}
-	return fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN %s", db.quoter.Quote(tableName), s)
+	return sql
 }
 
 func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName string) ([]string, map[string]*schemas.Column, error) {
@@ -417,10 +403,10 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 		"(SUBSTRING_INDEX(SUBSTRING(VERSION(), 4), '.', 1) = 2 && " +
 		"SUBSTRING_INDEX(SUBSTRING(VERSION(), 6), '-', 1) >= 7)))))"
 	s := "SELECT `COLUMN_NAME`, `IS_NULLABLE`, `COLUMN_DEFAULT`, `COLUMN_TYPE`," +
-		" `COLUMN_KEY`, `EXTRA`, `COLUMN_COMMENT`, `CHARACTER_MAXIMUM_LENGTH`, " +
-		alreadyQuoted + " AS NEEDS_QUOTE, `COLLATION_NAME` " +
+		" `COLUMN_KEY`, `EXTRA`, `COLUMN_COMMENT`, " +
+		alreadyQuoted + " AS NEEDS_QUOTE " +
 		"FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?" +
-		" ORDER BY `COLUMNS`.ORDINAL_POSITION ASC"
+		" ORDER BY `COLUMNS`.ORDINAL_POSITION"
 
 	rows, err := queryer.QueryContext(ctx, s, args...)
 	if err != nil {
@@ -436,8 +422,8 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 
 		var columnName, nullableStr, colType, colKey, extra, comment string
 		var alreadyQuoted, isUnsigned bool
-		var colDefault, maxLength, collation *string
-		err = rows.Scan(&columnName, &nullableStr, &colDefault, &colType, &colKey, &extra, &comment, &maxLength, &alreadyQuoted, &collation)
+		var colDefault *string
+		err = rows.Scan(&columnName, &nullableStr, &colDefault, &colType, &colKey, &extra, &comment, &alreadyQuoted)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -453,9 +439,6 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 		} else {
 			col.DefaultIsEmpty = true
 		}
-		if collation != nil {
-			col.Collation = *collation
-		}
 
 		fields := strings.Fields(colType)
 		if len(fields) == 2 && fields[1] == "unsigned" {
@@ -467,7 +450,7 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 		// Remove the /* mariadb-5.3 */ suffix from coltypes
 		colName = strings.TrimSuffix(colName, "/* mariadb-5.3 */")
 		colType = strings.ToUpper(colName)
-		var len1, len2 int64
+		var len1, len2 int
 		if len(cts) == 2 {
 			idx := strings.Index(cts[1], ")")
 			if colType == schemas.Enum && cts[1][0] == '\'' { // enum
@@ -488,42 +471,35 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 				}
 			} else {
 				lens := strings.Split(cts[1][0:idx], ",")
-				len1, err = strconv.ParseInt(strings.TrimSpace(lens[0]), 10, 64)
+				len1, err = strconv.Atoi(strings.TrimSpace(lens[0]))
 				if err != nil {
 					return nil, nil, err
 				}
 				if len(lens) == 2 {
-					len2, err = strconv.ParseInt(lens[1], 10, 64)
+					len2, err = strconv.Atoi(lens[1])
 					if err != nil {
 						return nil, nil, err
 					}
 				}
 			}
-		} else {
-			switch colType {
-			case "MEDIUMTEXT", "LONGTEXT", "TEXT":
-				len1, err = strconv.ParseInt(*maxLength, 10, 64)
-				if err != nil {
-					return nil, nil, err
-				}
-			}
 		}
 		if isUnsigned {
 			colType = "UNSIGNED " + colType
 		}
 		col.Length = len1
 		col.Length2 = len2
-		if _, ok := schemas.SqlTypes[colType]; !ok {
-			return nil, nil, fmt.Errorf("unknown colType %v", colType)
+		if _, ok := schemas.SqlTypes[colType]; ok {
+			col.SQLType = schemas.SQLType{Name: colType, DefaultLength: len1, DefaultLength2: len2}
+		} else {
+			return nil, nil, fmt.Errorf("Unknown colType %v", colType)
 		}
-		col.SQLType = schemas.SQLType{Name: colType, DefaultLength: len1, DefaultLength2: len2}
 
 		if colKey == "PRI" {
 			col.IsPrimaryKey = true
 		}
-		// if colKey == "UNI" {
-		// col.is
-		// }
+		if colKey == "UNI" {
+			// col.is
+		}
 
 		if extra == "auto_increment" {
 			col.IsAutoIncrement = true
@@ -547,7 +523,7 @@ func (db *mysql) GetColumns(queryer core.Queryer, ctx context.Context, tableName
 
 func (db *mysql) GetTables(queryer core.Queryer, ctx context.Context) ([]*schemas.Table, error) {
 	args := []interface{}{db.uri.DBName}
-	s := "SELECT `TABLE_NAME`, `ENGINE`, `AUTO_INCREMENT`, `TABLE_COMMENT`, `TABLE_COLLATION` from " +
+	s := "SELECT `TABLE_NAME`, `ENGINE`, `AUTO_INCREMENT`, `TABLE_COMMENT` from " +
 		"`INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? AND (`ENGINE`='MyISAM' OR `ENGINE` = 'InnoDB' OR `ENGINE` = 'TokuDB')"
 
 	rows, err := queryer.QueryContext(ctx, s, args...)
@@ -559,9 +535,9 @@ func (db *mysql) GetTables(queryer core.Queryer, ctx context.Context) ([]*schema
 	tables := make([]*schemas.Table, 0)
 	for rows.Next() {
 		table := schemas.NewEmptyTable()
-		var name, engine, collation string
+		var name, engine string
 		var autoIncr, comment *string
-		err = rows.Scan(&name, &engine, &autoIncr, &comment, &collation)
+		err = rows.Scan(&name, &engine, &autoIncr, &comment)
 		if err != nil {
 			return nil, err
 		}
@@ -571,7 +547,6 @@ func (db *mysql) GetTables(queryer core.Queryer, ctx context.Context) ([]*schema
 			table.Comment = *comment
 		}
 		table.StoreEngine = engine
-		table.Collation = collation
 		tables = append(tables, table)
 	}
 	if rows.Err() != nil {
@@ -583,11 +558,11 @@ func (db *mysql) GetTables(queryer core.Queryer, ctx context.Context) ([]*schema
 func (db *mysql) SetQuotePolicy(quotePolicy QuotePolicy) {
 	switch quotePolicy {
 	case QuotePolicyNone:
-		q := mysqlQuoter
+		var q = mysqlQuoter
 		q.IsReserved = schemas.AlwaysNoReserve
 		db.quoter = q
 	case QuotePolicyReserved:
-		q := mysqlQuoter
+		var q = mysqlQuoter
 		q.IsReserved = db.IsReserved
 		db.quoter = q
 	case QuotePolicyAlways:
@@ -599,7 +574,7 @@ func (db *mysql) SetQuotePolicy(quotePolicy QuotePolicy) {
 
 func (db *mysql) GetIndexes(queryer core.Queryer, ctx context.Context, tableName string) (map[string]*schemas.Index, error) {
 	args := []interface{}{db.uri.DBName, tableName}
-	s := "SELECT `INDEX_NAME`, `NON_UNIQUE`, `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`STATISTICS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? ORDER BY `SEQ_IN_INDEX`"
+	s := "SELECT `INDEX_NAME`, `NON_UNIQUE`, `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`STATISTICS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?"
 
 	rows, err := queryer.QueryContext(ctx, s, args...)
 	if err != nil {
@@ -650,7 +625,7 @@ func (db *mysql) GetIndexes(queryer core.Queryer, ctx context.Context, tableName
 	return indexes, nil
 }
 
-func (db *mysql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
+func (db *mysql) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -663,7 +638,7 @@ func (db *mysql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 
 	for i, colName := range table.ColumnsSeq() {
 		col := table.GetColumn(colName)
-		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1, true)
+		s, _ := ColumnString(db.dialect, col, col.IsPrimaryKey && len(table.PrimaryKeys) == 1)
 		b.WriteString(s)
 
 		if len(col.Comment) > 0 {
@@ -690,7 +665,7 @@ func (db *mysql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 		b.WriteString(table.StoreEngine)
 	}
 
-	charset := table.Charset
+	var charset = table.Charset
 	if len(charset) == 0 {
 		charset = db.URI().Charset
 	}
@@ -703,14 +678,7 @@ func (db *mysql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table
 		b.WriteString(" ROW_FORMAT=")
 		b.WriteString(db.rowFormat)
 	}
-
-	if table.Comment != "" {
-		b.WriteString(" COMMENT='")
-		b.WriteString(table.Comment)
-		b.WriteString("'")
-	}
-
-	return b.String(), true, nil
+	return []string{b.String()}, true
 }
 
 func (db *mysql) Filters() []Filter {
@@ -761,9 +729,8 @@ func (p *mysqlDriver) Parse(driverName, dataSourceName string) (*URI, error) {
 }
 
 func (p *mysqlDriver) GenScanResult(colType string) (interface{}, error) {
-	colType = strings.Replace(colType, "UNSIGNED ", "", -1)
 	switch colType {
-	case "CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT", "ENUM", "SET", "JSON":
+	case "CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT", "ENUM", "SET":
 		var s sql.NullString
 		return &s, nil
 	case "BIGINT":
@@ -805,7 +772,7 @@ func (p *mymysqlDriver) Parse(driverName, dataSourceName string) (*URI, error) {
 		// Parse protocol part of URI
 		p := strings.SplitN(pd[0], ":", 2)
 		if len(p) != 2 {
-			return nil, errors.New("wrong protocol part of URI")
+			return nil, errors.New("Wrong protocol part of URI")
 		}
 		uri.Proto = p[0]
 		options := strings.Split(p[1], ",")
@@ -828,7 +795,7 @@ func (p *mymysqlDriver) Parse(driverName, dataSourceName string) (*URI, error) {
 				}
 				uri.Timeout = to
 			default:
-				return nil, errors.New("unknown option: " + k)
+				return nil, errors.New("Unknown option: " + k)
 			}
 		}
 		// Remove protocol part
diff --git a/vendor/xorm.io/xorm/dialects/oracle.go b/vendor/xorm.io/xorm/dialects/oracle.go
index 5f614b1..11a6653 100644
--- a/vendor/xorm.io/xorm/dialects/oracle.go
+++ b/vendor/xorm.io/xorm/dialects/oracle.go
@@ -509,7 +509,6 @@ var (
 
 type oracle struct {
 	Base
-	useLegacy bool
 }
 
 func (db *oracle) Init(uri *URI) error {
@@ -517,17 +516,6 @@ func (db *oracle) Init(uri *URI) error {
 	return db.Base.Init(db, uri)
 }
 
-func (db *oracle) UseLegacyLimitOffset() bool { return db.useLegacy }
-
-func (db *oracle) SetParams(params map[string]string) {
-	useLegacy, ok := params["USE_LEGACY_LIMIT_OFFSET"]
-	if ok {
-		if b, _ := strconv.ParseBool(useLegacy); b {
-			db.useLegacy = true
-		}
-	}
-}
-
 func (db *oracle) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
 	rows, err := queryer.QueryContext(ctx, "select * from v$version where banner like 'Oracle%'")
 	if err != nil {
@@ -551,23 +539,10 @@ func (db *oracle) Version(ctx context.Context, queryer core.Queryer) (*schemas.V
 	}, nil
 }
 
-func (db *oracle) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: SequenceAutoincrMode,
-	}
-}
-
 func (db *oracle) SQLType(c *schemas.Column) string {
 	var res string
 	switch t := c.SQLType.Name; t {
-	case schemas.Bool:
-		if c.Default == "true" {
-			c.Default = "1"
-		} else if c.Default == "false" {
-			c.Default = "0"
-		}
-		res = "NUMBER(1,0)"
-	case schemas.Bit, schemas.TinyInt, schemas.SmallInt, schemas.MediumInt, schemas.Int, schemas.Integer, schemas.BigInt, schemas.Serial, schemas.BigSerial:
+	case schemas.Bit, schemas.TinyInt, schemas.SmallInt, schemas.MediumInt, schemas.Int, schemas.Integer, schemas.BigInt, schemas.Bool, schemas.Serial, schemas.BigSerial:
 		res = "NUMBER"
 	case schemas.Binary, schemas.VarBinary, schemas.Blob, schemas.TinyBlob, schemas.MediumBlob, schemas.LongBlob, schemas.Bytea:
 		return schemas.Blob
@@ -585,13 +560,13 @@ func (db *oracle) SQLType(c *schemas.Column) string {
 		res = t
 	}
 
-	hasLen1 := c.Length > 0
-	hasLen2 := c.Length2 > 0
+	hasLen1 := (c.Length > 0)
+	hasLen2 := (c.Length2 > 0)
 
 	if hasLen2 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + "," + strconv.FormatInt(c.Length2, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + "," + strconv.Itoa(c.Length2) + ")"
 	} else if hasLen1 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + ")"
 	}
 	return res
 }
@@ -621,11 +596,11 @@ func (db *oracle) IsReserved(name string) bool {
 }
 
 func (db *oracle) DropTableSQL(tableName string) (string, bool) {
-	return fmt.Sprintf("DROP TABLE \"%s\"", tableName), false
+	return fmt.Sprintf("DROP TABLE `%s`", tableName), false
 }
 
-func (db *oracle) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
-	sql := "CREATE TABLE "
+func (db *oracle) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
+	var sql = "CREATE TABLE "
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -640,7 +615,7 @@ func (db *oracle) CreateTableSQL(ctx context.Context, queryer core.Queryer, tabl
 		/*if col.IsPrimaryKey && len(pkList) == 1 {
 			sql += col.String(b.dialect)
 		} else {*/
-		s, _ := ColumnString(db, col, false, false)
+		s, _ := ColumnString(db, col, false)
 		sql += s
 		// }
 		sql = strings.TrimSpace(sql)
@@ -654,21 +629,17 @@ func (db *oracle) CreateTableSQL(ctx context.Context, queryer core.Queryer, tabl
 	}
 
 	sql = sql[:len(sql)-2] + ")"
-	return sql, false, nil
-}
-
-func (db *oracle) IsSequenceExist(ctx context.Context, queryer core.Queryer, seqName string) (bool, error) {
-	return db.HasRecords(queryer, ctx, `SELECT sequence_name FROM user_sequences WHERE sequence_name = :1`, seqName)
+	return []string{sql}, false
 }
 
 func (db *oracle) SetQuotePolicy(quotePolicy QuotePolicy) {
 	switch quotePolicy {
 	case QuotePolicyNone:
-		q := oracleQuoter
+		var q = oracleQuoter
 		q.IsReserved = schemas.AlwaysNoReserve
 		db.quoter = q
 	case QuotePolicyReserved:
-		q := oracleQuoter
+		var q = oracleQuoter
 		q.IsReserved = db.IsReserved
 		db.quoter = q
 	case QuotePolicyAlways:
@@ -713,7 +684,7 @@ func (db *oracle) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
 		col.Indexes = make(map[string]int)
 
 		var colName, colDefault, nullable, dataType, dataPrecision, dataScale *string
-		var dataLen int64
+		var dataLen int
 
 		err = rows.Scan(&colName, &colDefault, &dataType, &dataLen, &dataPrecision,
 			&dataScale, &nullable)
@@ -736,16 +707,16 @@ func (db *oracle) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
 		var ignore bool
 
 		var dt string
-		var len1, len2 int64
+		var len1, len2 int
 		dts := strings.Split(*dataType, "(")
 		dt = dts[0]
 		if len(dts) > 1 {
 			lens := strings.Split(dts[1][:len(dts[1])-1], ",")
 			if len(lens) > 1 {
-				len1, _ = strconv.ParseInt(lens[0], 10, 64)
-				len2, _ = strconv.ParseInt(lens[1], 10, 64)
+				len1, _ = strconv.Atoi(lens[0])
+				len2, _ = strconv.Atoi(lens[1])
 			} else {
-				len1, _ = strconv.ParseInt(lens[0], 10, 64)
+				len1, _ = strconv.Atoi(lens[0])
 			}
 		}
 
@@ -875,7 +846,7 @@ func (db *oracle) GetIndexes(queryer core.Queryer, ctx context.Context, tableNam
 
 func (db *oracle) Filters() []Filter {
 	return []Filter{
-		&oracleSeqFilter{Prefix: ":", Start: 1},
+		&SeqFilter{Prefix: ":", Start: 1},
 	}
 }
 
@@ -955,7 +926,3 @@ func (o *oci8Driver) Parse(driverName, dataSourceName string) (*URI, error) {
 	}
 	return db, nil
 }
-
-type oracleDriver struct {
-	godrorDriver
-}
diff --git a/vendor/xorm.io/xorm/dialects/postgres.go b/vendor/xorm.io/xorm/dialects/postgres.go
index 6e37958..6b5a8b2 100644
--- a/vendor/xorm.io/xorm/dialects/postgres.go
+++ b/vendor/xorm.io/xorm/dialects/postgres.go
@@ -821,8 +821,6 @@ func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (*schemas
 	}
 
 	// Postgres: 9.5.22 on x86_64-pc-linux-gnu (Debian 9.5.22-1.pgdg90+1), compiled by gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, 64-bit
-	// Postgres: PostgreSQL 15.3, compiled by Visual C++ build 1914, 64-bit
-	// KingbaseES V008R006C008B0014 on x64, compiled by Visual C++ build 1800, 64-bit
 	// CockroachDB CCL v19.2.4 (x86_64-unknown-linux-gnu, built
 	if strings.HasPrefix(version, "CockroachDB") {
 		versions := strings.Split(strings.TrimPrefix(version, "CockroachDB CCL "), " ")
@@ -831,37 +829,12 @@ func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (*schemas
 			Edition: "CockroachDB",
 		}, nil
 	} else if strings.HasPrefix(version, "PostgreSQL") {
-		if strings.Contains(version, " on ") {
-			versions := strings.Split(strings.TrimPrefix(version, "PostgreSQL "), " on ")
-			return &schemas.Version{
-				Number:  versions[0],
-				Level:   versions[1],
-				Edition: "PostgreSQL",
-			}, nil
-		} else {
-			versions := strings.Split(strings.TrimPrefix(version, "PostgreSQL "), ",")
-			return &schemas.Version{
-				Number:  versions[0],
-				Level:   versions[1],
-				Edition: "PostgreSQL",
-			}, nil
-		}
-	} else if strings.HasPrefix(version, "KingbaseES") {
-		if strings.Contains(version, " on ") {
-			versions := strings.Split(strings.TrimPrefix(version, "KingbaseES "), " on ")
-			return &schemas.Version{
-				Number:  versions[0],
-				Level:   versions[1],
-				Edition: "KingbaseES",
-			}, nil
-		} else {
-			versions := strings.Split(strings.TrimPrefix(version, "KingbaseES "), ",")
-			return &schemas.Version{
-				Number:  versions[0],
-				Level:   versions[1],
-				Edition: "KingbaseES",
-			}, nil
-		}
+		versions := strings.Split(strings.TrimPrefix(version, "PostgreSQL "), " on ")
+		return &schemas.Version{
+			Number:  versions[0],
+			Level:   versions[1],
+			Edition: "PostgreSQL",
+		}, nil
 	}
 
 	return nil, errors.New("unknow database version")
@@ -889,11 +862,11 @@ func (db *postgres) needQuote(name string) bool {
 func (db *postgres) SetQuotePolicy(quotePolicy QuotePolicy) {
 	switch quotePolicy {
 	case QuotePolicyNone:
-		q := postgresQuoter
+		var q = postgresQuoter
 		q.IsReserved = schemas.AlwaysNoReserve
 		db.quoter = q
 	case QuotePolicyReserved:
-		q := postgresQuoter
+		var q = postgresQuoter
 		q.IsReserved = db.needQuote
 		db.quoter = q
 	case QuotePolicyAlways:
@@ -944,7 +917,7 @@ func (db *postgres) SQLType(c *schemas.Column) string {
 		return schemas.Uuid
 	case schemas.Blob, schemas.TinyBlob, schemas.MediumBlob, schemas.LongBlob:
 		return schemas.Bytea
-	case schemas.Double, schemas.UnsignedFloat:
+	case schemas.Double:
 		return "DOUBLE PRECISION"
 	default:
 		if c.IsAutoIncrement {
@@ -957,23 +930,17 @@ func (db *postgres) SQLType(c *schemas.Column) string {
 		// for bool, we don't need length information
 		return res
 	}
-	hasLen1 := c.Length > 0
-	hasLen2 := c.Length2 > 0
+	hasLen1 := (c.Length > 0)
+	hasLen2 := (c.Length2 > 0)
 
 	if hasLen2 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + "," + strconv.FormatInt(c.Length2, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + "," + strconv.Itoa(c.Length2) + ")"
 	} else if hasLen1 {
-		res += "(" + strconv.FormatInt(c.Length, 10) + ")"
+		res += "(" + strconv.Itoa(c.Length) + ")"
 	}
 	return res
 }
 
-func (db *postgres) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: IncrAutoincrMode,
-	}
-}
-
 func (db *postgres) ColumnTypeKind(t string) int {
 	switch strings.ToUpper(t) {
 	case "DATETIME", "TIMESTAMP":
@@ -1018,37 +985,13 @@ func (db *postgres) IsTableExist(queryer core.Queryer, ctx context.Context, tabl
 		db.getSchema(), tableName)
 }
 
-func (db *postgres) AddColumnSQL(tableName string, col *schemas.Column) string {
-	s, _ := ColumnString(db.dialect, col, true, false)
-
-	quoter := db.dialect.Quoter()
-	addColumnSQL := ""
-	commentSQL := "; "
-	if len(db.getSchema()) == 0 || strings.Contains(tableName, ".") {
-		addColumnSQL = fmt.Sprintf("ALTER TABLE %s ADD %s", quoter.Quote(tableName), s)
-		commentSQL += fmt.Sprintf("COMMENT ON COLUMN %s.%s IS '%s'", quoter.Quote(tableName), quoter.Quote(col.Name), col.Comment)
-		return addColumnSQL + commentSQL
-	}
-
-	addColumnSQL = fmt.Sprintf("ALTER TABLE %s.%s ADD %s", quoter.Quote(db.getSchema()), quoter.Quote(tableName), s)
-	commentSQL += fmt.Sprintf("COMMENT ON COLUMN %s.%s.%s IS '%s'", quoter.Quote(db.getSchema()), quoter.Quote(tableName), quoter.Quote(col.Name), col.Comment)
-	return addColumnSQL + commentSQL
-}
-
 func (db *postgres) ModifyColumnSQL(tableName string, col *schemas.Column) string {
-	quoter := db.dialect.Quoter()
-	modifyColumnSQL := ""
-	commentSQL := "; "
-
 	if len(db.getSchema()) == 0 || strings.Contains(tableName, ".") {
-		modifyColumnSQL = fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s TYPE %s", quoter.Quote(tableName), quoter.Quote(col.Name), db.SQLType(col))
-		commentSQL += fmt.Sprintf("COMMENT ON COLUMN %s.%s IS '%s'", quoter.Quote(tableName), quoter.Quote(col.Name), col.Comment)
-		return modifyColumnSQL + commentSQL
+		return fmt.Sprintf("alter table %s ALTER COLUMN %s TYPE %s",
+			tableName, col.Name, db.SQLType(col))
 	}
-
-	modifyColumnSQL = fmt.Sprintf("ALTER TABLE %s.%s ALTER COLUMN %s TYPE %s", quoter.Quote(db.getSchema()), quoter.Quote(tableName), quoter.Quote(col.Name), db.SQLType(col))
-	commentSQL += fmt.Sprintf("COMMENT ON COLUMN %s.%s.%s IS '%s'", quoter.Quote(db.getSchema()), quoter.Quote(tableName), quoter.Quote(col.Name), col.Comment)
-	return modifyColumnSQL + commentSQL
+	return fmt.Sprintf("alter table %s.%s ALTER COLUMN %s TYPE %s",
+		db.getSchema(), tableName, col.Name, db.SQLType(col))
 }
 
 func (db *postgres) DropIndexSQL(tableName string, index *schemas.Index) string {
@@ -1057,10 +1000,11 @@ func (db *postgres) DropIndexSQL(tableName string, index *schemas.Index) string
 	tableParts := strings.Split(strings.Replace(tableName, `"`, "", -1), ".")
 	tableName = tableParts[len(tableParts)-1]
 
-	if index.IsRegular {
-		if index.Type == schemas.UniqueType && !strings.HasPrefix(idxName, "UQE_") {
+	if !strings.HasPrefix(idxName, "UQE_") &&
+		!strings.HasPrefix(idxName, "IDX_") {
+		if index.Type == schemas.UniqueType {
 			idxName = fmt.Sprintf("UQE_%v_%v", tableName, index.Name)
-		} else if index.Type == schemas.IndexType && !strings.HasPrefix(idxName, "IDX_") {
+		} else {
 			idxName = fmt.Sprintf("IDX_%v_%v", tableName, index.Name)
 		}
 	}
@@ -1105,7 +1049,7 @@ FROM pg_attribute f
     LEFT JOIN pg_constraint p ON p.conrelid = c.oid AND f.attnum = ANY (p.conkey)
     LEFT JOIN pg_class AS g ON p.confrelid = g.oid
     LEFT JOIN INFORMATION_SCHEMA.COLUMNS s ON s.column_name=f.attname AND c.relname=s.table_name
-WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.attnum > 0 ORDER BY f.attnum;`
+WHERE n.nspname= s.table_schema AND c.relkind = 'r'::char AND c.relname = $1%s AND f.attnum > 0 ORDER BY f.attnum;`
 
 	schema := db.getSchema()
 	if schema != "" {
@@ -1136,9 +1080,9 @@ WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.a
 			return nil, nil, err
 		}
 
-		var maxLen int64
+		var maxLen int
 		if maxLenStr != nil {
-			maxLen, err = strconv.ParseInt(*maxLenStr, 10, 64)
+			maxLen, err = strconv.Atoi(*maxLenStr)
 			if err != nil {
 				return nil, nil, err
 			}
@@ -1151,7 +1095,7 @@ WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.a
 		col.Name = strings.Trim(colName, `" `)
 
 		if colDefault != nil {
-			theDefault := *colDefault
+			var theDefault = *colDefault
 			// cockroach has type with the default value with :::
 			// and postgres with ::, we should remove them before store them
 			idx := strings.Index(theDefault, ":::")
@@ -1185,7 +1129,7 @@ WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.a
 			col.IsPrimaryKey = true
 		}
 
-		col.Nullable = isNullable == "YES"
+		col.Nullable = (isNullable == "YES")
 
 		switch strings.ToLower(dataType) {
 		case "character varying", "string":
@@ -1212,7 +1156,7 @@ WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.a
 			startIdx := strings.Index(strings.ToLower(dataType), "string(")
 			if startIdx != -1 && strings.HasSuffix(dataType, ")") {
 				length := dataType[startIdx+8 : len(dataType)-1]
-				l, _ := strconv.ParseInt(length, 10, 64)
+				l, _ := strconv.Atoi(length)
 				col.SQLType = schemas.SQLType{Name: "STRING", DefaultLength: l, DefaultLength2: 0}
 			} else {
 				col.SQLType = schemas.SQLType{Name: strings.ToUpper(dataType), DefaultLength: 0, DefaultLength2: 0}
@@ -1232,7 +1176,9 @@ WHERE n.nspname= s.table_schema AND c.relkind = 'r' AND c.relname = $1%s AND f.a
 					col.Default = "'" + col.Default + "'"
 				}
 			} else if col.SQLType.IsTime() {
-				col.Default = strings.TrimSuffix(col.Default, "::timestamp without time zone")
+				if strings.HasSuffix(col.Default, "::timestamp without time zone") {
+					col.Default = strings.TrimSuffix(col.Default, "::timestamp without time zone")
+				}
 			}
 		}
 		cols[col.Name] = col
@@ -1293,7 +1239,7 @@ func (db *postgres) GetIndexes(queryer core.Queryer, ctx context.Context, tableN
 	s := "SELECT indexname, indexdef FROM pg_indexes WHERE tablename=$1"
 	if len(db.getSchema()) != 0 {
 		args = append(args, db.getSchema())
-		s += " AND schemaname=$2"
+		s = s + " AND schemaname=$2"
 	}
 
 	rows, err := queryer.QueryContext(ctx, s, args...)
@@ -1326,12 +1272,6 @@ func (db *postgres) GetIndexes(queryer core.Queryer, ctx context.Context, tableN
 			indexType = schemas.IndexType
 		}
 		colNames = getIndexColName(indexdef)
-
-		// Oid It's a special index. You can't put it in. TODO: This is not perfect.
-		if indexName == tableName+"_oid_index" && len(colNames) == 1 && colNames[0] == "oid" {
-			continue
-		}
-
 		var isRegular bool
 		if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) {
 			newIdxName := indexName[5+len(tableName):]
@@ -1356,36 +1296,8 @@ func (db *postgres) GetIndexes(queryer core.Queryer, ctx context.Context, tableN
 	return indexes, nil
 }
 
-func (db *postgres) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
-	quoter := db.dialect.Quoter()
-	if len(db.getSchema()) != 0 && !strings.Contains(tableName, ".") {
-		tableName = fmt.Sprintf("%s.%s", db.getSchema(), tableName)
-	}
-
-	createTableSQL, ok, err := db.Base.CreateTableSQL(ctx, queryer, table, tableName)
-	if err != nil {
-		return "", ok, err
-	}
-
-	commentSQL := "; "
-	if table.Comment != "" {
-		// support schema.table -> "schema"."table"
-		commentSQL += fmt.Sprintf("COMMENT ON TABLE %s IS '%s'; ", quoter.Quote(tableName), table.Comment)
-	}
-
-	for _, colName := range table.ColumnsSeq() {
-		col := table.GetColumn(colName)
-
-		if len(col.Comment) > 0 {
-			commentSQL += fmt.Sprintf("COMMENT ON COLUMN %s.%s IS '%s'; ", quoter.Quote(tableName), quoter.Quote(col.Name), col.Comment)
-		}
-	}
-
-	return createTableSQL + commentSQL, true, nil
-}
-
 func (db *postgres) Filters() []Filter {
-	return []Filter{&postgresSeqFilter{Prefix: "$", Start: 1}}
+	return []Filter{&SeqFilter{Prefix: "$", Start: 1}}
 }
 
 type pqDriver struct {
diff --git a/vendor/xorm.io/xorm/dialects/sqlite3.go b/vendor/xorm.io/xorm/dialects/sqlite3.go
index ece360e..4eba8da 100644
--- a/vendor/xorm.io/xorm/dialects/sqlite3.go
+++ b/vendor/xorm.io/xorm/dialects/sqlite3.go
@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
-	"unicode"
 
 	"xorm.io/xorm/core"
 	"xorm.io/xorm/schemas"
@@ -185,20 +184,14 @@ func (db *sqlite3) Version(ctx context.Context, queryer core.Queryer) (*schemas.
 	}, nil
 }
 
-func (db *sqlite3) Features() *DialectFeatures {
-	return &DialectFeatures{
-		AutoincrMode: IncrAutoincrMode,
-	}
-}
-
 func (db *sqlite3) SetQuotePolicy(quotePolicy QuotePolicy) {
 	switch quotePolicy {
 	case QuotePolicyNone:
-		q := sqlite3Quoter
+		var q = sqlite3Quoter
 		q.IsReserved = schemas.AlwaysNoReserve
 		db.quoter = q
 	case QuotePolicyReserved:
-		q := sqlite3Quoter
+		var q = sqlite3Quoter
 		q.IsReserved = db.IsReserved
 		db.quoter = q
 	case QuotePolicyAlways:
@@ -292,6 +285,10 @@ func (db *sqlite3) DropIndexSQL(tableName string, index *schemas.Index) string {
 	return fmt.Sprintf("DROP INDEX %v", db.Quoter().Quote(idxName))
 }
 
+func (db *sqlite3) ForUpdateSQL(query string) string {
+	return query
+}
+
 func (db *sqlite3) IsColumnExist(queryer core.Queryer, ctx context.Context, tableName, colName string) (bool, error) {
 	query := "SELECT * FROM " + tableName + " LIMIT 0"
 	rows, err := queryer.QueryContext(ctx, query)
@@ -317,11 +314,11 @@ func (db *sqlite3) IsColumnExist(queryer core.Queryer, ctx context.Context, tabl
 // splitColStr splits a sqlite col strings as fields
 func splitColStr(colStr string) []string {
 	colStr = strings.TrimSpace(colStr)
-	results := make([]string, 0, 10)
+	var results = make([]string, 0, 10)
 	var lastIdx int
 	var hasC, hasQuote bool
 	for i, c := range colStr {
-		if unicode.IsSpace(c) && !hasQuote {
+		if c == ' ' && !hasQuote {
 			if hasC {
 				results = append(results, colStr[lastIdx:i])
 				hasC = false
@@ -351,7 +348,7 @@ func parseString(colStr string) (*schemas.Column, error) {
 
 	for idx, field := range fields {
 		if idx == 0 {
-			col.Name = strings.Trim(strings.TrimSpace(field), "`[]'\"")
+			col.Name = strings.Trim(strings.Trim(field, "`[] "), `"`)
 			continue
 		} else if idx == 1 {
 			col.SQLType = schemas.SQLType{Name: field, DefaultLength: 0, DefaultLength2: 0}
@@ -401,8 +398,6 @@ func (db *sqlite3) GetColumns(queryer core.Queryer, ctx context.Context, tableNa
 		return nil, nil, errors.New("no table named " + tableName)
 	}
 
-	name = strings.ReplaceAll(name, "\n", " ")
-
 	nStart := strings.Index(name, "(")
 	nEnd := strings.LastIndex(name, ")")
 	reg := regexp.MustCompile(`[^\(,\)]*(\([^\(]*\))?`)
@@ -486,7 +481,7 @@ func (db *sqlite3) GetIndexes(queryer core.Queryer, ctx context.Context, tableNa
 		if !tmpSQL.Valid {
 			continue
 		}
-		sql := strings.ReplaceAll(tmpSQL.String, "\n", " ")
+		sql := tmpSQL.String
 
 		index := new(schemas.Index)
 		nNStart := strings.Index(sql, "INDEX")
diff --git a/vendor/xorm.io/xorm/dialects/table_name.go b/vendor/xorm.io/xorm/dialects/table_name.go
index 8a0baea..e190cd4 100644
--- a/vendor/xorm.io/xorm/dialects/table_name.go
+++ b/vendor/xorm.io/xorm/dialects/table_name.go
@@ -11,14 +11,14 @@ import (
 
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/names"
-	"xorm.io/xorm/schemas"
 )
 
 // TableNameWithSchema will add schema prefix on table name if possible
 func TableNameWithSchema(dialect Dialect, tableName string) string {
 	// Add schema name as prefix of table name.
 	// Only for postgres database.
-	if dialect.URI().Schema != "" && !strings.Contains(tableName, ".") {
+	if dialect.URI().Schema != "" &&
+		strings.Index(tableName, ".") == -1 {
 		return fmt.Sprintf("%s.%s", dialect.URI().Schema, tableName)
 	}
 	return tableName
@@ -27,21 +27,20 @@ func TableNameWithSchema(dialect Dialect, tableName string) string {
 // TableNameNoSchema returns table name with given tableName
 func TableNameNoSchema(dialect Dialect, mapper names.Mapper, tableName interface{}) string {
 	quote := dialect.Quoter().Quote
-	switch tt := tableName.(type) {
+	switch tableName.(type) {
 	case []string:
-		if len(tt) > 1 {
-			if dialect.URI().DBType == schemas.ORACLE {
-				return fmt.Sprintf("%v %v", quote(tt[0]), quote(tt[1]))
-			}
-			return fmt.Sprintf("%v AS %v", quote(tt[0]), quote(tt[1]))
-		} else if len(tt) == 1 {
-			return quote(tt[0])
+		t := tableName.([]string)
+		if len(t) > 1 {
+			return fmt.Sprintf("%v AS %v", quote(t[0]), quote(t[1]))
+		} else if len(t) == 1 {
+			return quote(t[0])
 		}
 	case []interface{}:
-		l := len(tt)
+		t := tableName.([]interface{})
+		l := len(t)
 		var table string
 		if l > 0 {
-			f := tt[0]
+			f := t[0]
 			switch f.(type) {
 			case string:
 				table = f.(string)
@@ -58,10 +57,7 @@ func TableNameNoSchema(dialect Dialect, mapper names.Mapper, tableName interface
 			}
 		}
 		if l > 1 {
-			if dialect.URI().DBType == schemas.ORACLE {
-				return fmt.Sprintf("%v %v", quote(table), quote(fmt.Sprintf("%v", tt[1])))
-			}
-			return fmt.Sprintf("%v AS %v", quote(table), quote(fmt.Sprintf("%v", tt[1])))
+			return fmt.Sprintf("%v AS %v", quote(table), quote(fmt.Sprintf("%v", t[1])))
 		} else if l == 1 {
 			return quote(table)
 		}
diff --git a/vendor/xorm.io/xorm/dialects/time.go b/vendor/xorm.io/xorm/dialects/time.go
index 4a6beb7..f0bbb76 100644
--- a/vendor/xorm.io/xorm/dialects/time.go
+++ b/vendor/xorm.io/xorm/dialects/time.go
@@ -7,26 +7,23 @@ package dialects
 import (
 	"strings"
 	"time"
-	"xorm.io/xorm/internal/utils"
 
 	"xorm.io/xorm/schemas"
 )
 
 // FormatColumnTime format column time
 func FormatColumnTime(dialect Dialect, dbLocation *time.Location, col *schemas.Column, t time.Time) (interface{}, error) {
-	if utils.IsTimeZero(t) {
+	if t.IsZero() {
 		if col.Nullable {
 			return nil, nil
 		}
+
 		if col.SQLType.IsNumeric() {
 			return 0, nil
 		}
-		if col.SQLType.Name == schemas.TimeStamp || col.SQLType.Name == schemas.TimeStampz {
-			t = time.Unix(0, 0)
-		}
 	}
 
-	tmZone := dbLocation
+	var tmZone = dbLocation
 	if col.TimeZone != nil {
 		tmZone = col.TimeZone
 	}
@@ -37,17 +34,15 @@ func FormatColumnTime(dialect Dialect, dbLocation *time.Location, col *schemas.C
 	case schemas.Date:
 		return t.Format("2006-01-02"), nil
 	case schemas.Time:
-		layout := "15:04:05"
+		var layout = "15:04:05"
 		if col.Length > 0 {
-			// we can use int(...) casting here as it's very unlikely to a huge sized field
-			layout += "." + strings.Repeat("0", int(col.Length))
+			layout += "." + strings.Repeat("0", col.Length)
 		}
 		return t.Format(layout), nil
 	case schemas.DateTime, schemas.TimeStamp:
-		layout := "2006-01-02 15:04:05"
+		var layout = "2006-01-02 15:04:05"
 		if col.Length > 0 {
-			// we can use int(...) casting here as it's very unlikely to a huge sized field
-			layout += "." + strings.Repeat("0", int(col.Length))
+			layout += "." + strings.Repeat("0", col.Length)
 		}
 		return t.Format(layout), nil
 	case schemas.Varchar:
diff --git a/vendor/xorm.io/xorm/doc.go b/vendor/xorm.io/xorm/doc.go
index f88f537..d065323 100644
--- a/vendor/xorm.io/xorm/doc.go
+++ b/vendor/xorm.io/xorm/doc.go
@@ -3,246 +3,231 @@
 // license that can be found in the LICENSE file.
 
 /*
+
 Package xorm is a simple and powerful ORM for Go.
 
-# Installation
+Installation
 
 Make sure you have installed Go 1.11+ and then:
 
-	go get xorm.io/xorm
+    go get xorm.io/xorm
 
-# Create Engine
+Create Engine
 
 Firstly, we should create an engine for a database
 
-	engine, err := xorm.NewEngine(driverName, dataSourceName)
+    engine, err := xorm.NewEngine(driverName, dataSourceName)
 
 Method NewEngine's parameters are the same as sql.Open which depend drivers' implementation.
 Generally, one engine for an application is enough. You can define it as a package variable.
 
-# Raw Methods
+Raw Methods
 
 XORM supports raw SQL execution:
 
 1. query with a SQL string, the returned results is []map[string][]byte
 
-	results, err := engine.Query("select * from user")
+    results, err := engine.Query("select * from user")
 
 2. query with a SQL string, the returned results is []map[string]string
 
-	results, err := engine.QueryString("select * from user")
+    results, err := engine.QueryString("select * from user")
 
 3. query with a SQL string, the returned results is []map[string]interface{}
 
-	results, err := engine.QueryInterface("select * from user")
+    results, err := engine.QueryInterface("select * from user")
 
 4. execute with a SQL string, the returned results
 
-	affected, err := engine.Exec("update user set .... where ...")
+    affected, err := engine.Exec("update user set .... where ...")
 
-# ORM Methods
+ORM Methods
 
 There are 8 major ORM methods and many helpful methods to use to operate database.
 
 1. Insert one or multiple records to database
 
-	affected, err := engine.Insert(&struct)
-	// INSERT INTO struct () values ()
-	affected, err := engine.Insert(&struct1, &struct2)
-	// INSERT INTO struct1 () values ()
-	// INSERT INTO struct2 () values ()
-	affected, err := engine.Insert(&sliceOfStruct)
-	// INSERT INTO struct () values (),(),()
-	affected, err := engine.Insert(&struct1, &sliceOfStruct2)
-	// INSERT INTO struct1 () values ()
-	// INSERT INTO struct2 () values (),(),()
+    affected, err := engine.Insert(&struct)
+    // INSERT INTO struct () values ()
+    affected, err := engine.Insert(&struct1, &struct2)
+    // INSERT INTO struct1 () values ()
+    // INSERT INTO struct2 () values ()
+    affected, err := engine.Insert(&sliceOfStruct)
+    // INSERT INTO struct () values (),(),()
+    affected, err := engine.Insert(&struct1, &sliceOfStruct2)
+    // INSERT INTO struct1 () values ()
+    // INSERT INTO struct2 () values (),(),()
 
 2. Query one record or one variable from database
 
-	has, err := engine.Get(&user)
-	// SELECT * FROM user LIMIT 1
+    has, err := engine.Get(&user)
+    // SELECT * FROM user LIMIT 1
 
-	var id int64
-	has, err := engine.Table("user").Where("name = ?", name).Get(&id)
-	// SELECT id FROM user WHERE name = ? LIMIT 1
-
-	var id int64
-	var name string
-	has, err := engine.Table(&user).Cols("id", "name").Get(&id, &name)
-	// SELECT id, name FROM user LIMIT 1
+    var id int64
+    has, err := engine.Table("user").Where("name = ?", name).Get(&id)
+    // SELECT id FROM user WHERE name = ? LIMIT 1
 
 3. Query multiple records from database
 
-	var sliceOfStructs []Struct
-	err := engine.Find(&sliceOfStructs)
-	// SELECT * FROM user
+    var sliceOfStructs []Struct
+    err := engine.Find(&sliceOfStructs)
+    // SELECT * FROM user
 
-	var mapOfStructs = make(map[int64]Struct)
-	err := engine.Find(&mapOfStructs)
-	// SELECT * FROM user
+    var mapOfStructs = make(map[int64]Struct)
+    err := engine.Find(&mapOfStructs)
+    // SELECT * FROM user
 
-	var int64s []int64
-	err := engine.Table("user").Cols("id").Find(&int64s)
-	// SELECT id FROM user
+    var int64s []int64
+    err := engine.Table("user").Cols("id").Find(&int64s)
+    // SELECT id FROM user
 
 4. Query multiple records and record by record handle, there two methods, one is Iterate,
 another is Rows
 
-	err := engine.Iterate(new(User), func(i int, bean interface{}) error {
-	    // do something
-	})
-	// SELECT * FROM user
+    err := engine.Iterate(new(User), func(i int, bean interface{}) error {
+        // do something
+    })
+    // SELECT * FROM user
 
-	rows, err := engine.Rows(...)
-	// SELECT * FROM user
-	defer rows.Close()
-	bean := new(Struct)
-	for rows.Next() {
-	    err = rows.Scan(bean)
-	}
-
-or
-
-	rows, err := engine.Cols("name", "age").Rows(...)
-	// SELECT * FROM user
-	defer rows.Close()
-	for rows.Next() {
-	    var name string
-	    var age int
-	    err = rows.Scan(&name, &age)
-	}
+    rows, err := engine.Rows(...)
+    // SELECT * FROM user
+    defer rows.Close()
+    bean := new(Struct)
+    for rows.Next() {
+        err = rows.Scan(bean)
+    }
 
 5. Update one or more records
 
-	affected, err := engine.ID(...).Update(&user)
-	// UPDATE user SET ...
+    affected, err := engine.ID(...).Update(&user)
+    // UPDATE user SET ...
 
 6. Delete one or more records, Delete MUST has condition
 
-	affected, err := engine.Where(...).Delete(&user)
-	// DELETE FROM user Where ...
+    affected, err := engine.Where(...).Delete(&user)
+    // DELETE FROM user Where ...
 
 7. Count records
 
-	counts, err := engine.Count(&user)
-	// SELECT count(*) AS total FROM user
+    counts, err := engine.Count(&user)
+    // SELECT count(*) AS total FROM user
 
-	counts, err := engine.SQL("select count(*) FROM user").Count()
-	// select count(*) FROM user
+    counts, err := engine.SQL("select count(*) FROM user").Count()
+    // select count(*) FROM user
 
 8. Sum records
 
-	sumFloat64, err := engine.Sum(&user, "id")
-	// SELECT sum(id) from user
+    sumFloat64, err := engine.Sum(&user, "id")
+    // SELECT sum(id) from user
 
-	sumFloat64s, err := engine.Sums(&user, "id1", "id2")
-	// SELECT sum(id1), sum(id2) from user
+    sumFloat64s, err := engine.Sums(&user, "id1", "id2")
+    // SELECT sum(id1), sum(id2) from user
 
-	sumInt64s, err := engine.SumsInt(&user, "id1", "id2")
-	// SELECT sum(id1), sum(id2) from user
+    sumInt64s, err := engine.SumsInt(&user, "id1", "id2")
+    // SELECT sum(id1), sum(id2) from user
 
-# Conditions
+Conditions
 
 The above 8 methods could use with condition methods chainable.
 Notice: the above 8 methods should be the last chainable method.
 
 1. ID, In
 
-	engine.ID(1).Get(&user) // for single primary key
-	// SELECT * FROM user WHERE id = 1
-	engine.ID(schemas.PK{1, 2}).Get(&user) // for composite primary keys
-	// SELECT * FROM user WHERE id1 = 1 AND id2 = 2
-	engine.In("id", 1, 2, 3).Find(&users)
-	// SELECT * FROM user WHERE id IN (1, 2, 3)
-	engine.In("id", []int{1, 2, 3}).Find(&users)
-	// SELECT * FROM user WHERE id IN (1, 2, 3)
+    engine.ID(1).Get(&user) // for single primary key
+    // SELECT * FROM user WHERE id = 1
+    engine.ID(schemas.PK{1, 2}).Get(&user) // for composite primary keys
+    // SELECT * FROM user WHERE id1 = 1 AND id2 = 2
+    engine.In("id", 1, 2, 3).Find(&users)
+    // SELECT * FROM user WHERE id IN (1, 2, 3)
+    engine.In("id", []int{1, 2, 3}).Find(&users)
+    // SELECT * FROM user WHERE id IN (1, 2, 3)
 
 2. Where, And, Or
 
-	engine.Where().And().Or().Find()
-	// SELECT * FROM user WHERE (.. AND ..) OR ...
+    engine.Where().And().Or().Find()
+    // SELECT * FROM user WHERE (.. AND ..) OR ...
 
 3. OrderBy, Asc, Desc
 
-	engine.Asc().Desc().Find()
-	// SELECT * FROM user ORDER BY .. ASC, .. DESC
-	engine.OrderBy().Find()
-	// SELECT * FROM user ORDER BY ..
+    engine.Asc().Desc().Find()
+    // SELECT * FROM user ORDER BY .. ASC, .. DESC
+    engine.OrderBy().Find()
+    // SELECT * FROM user ORDER BY ..
 
 4. Limit, Top
 
-	engine.Limit().Find()
-	// SELECT * FROM user LIMIT .. OFFSET ..
-	engine.Top(5).Find()
-	// SELECT TOP 5 * FROM user // for mssql
-	// SELECT * FROM user LIMIT .. OFFSET 0 //for other databases
+    engine.Limit().Find()
+    // SELECT * FROM user LIMIT .. OFFSET ..
+    engine.Top(5).Find()
+    // SELECT TOP 5 * FROM user // for mssql
+    // SELECT * FROM user LIMIT .. OFFSET 0 //for other databases
 
 5. SQL, let you custom SQL
 
-	var users []User
-	engine.SQL("select * from user").Find(&users)
+    var users []User
+    engine.SQL("select * from user").Find(&users)
 
 6. Cols, Omit, Distinct
 
-	var users []*User
-	engine.Cols("col1, col2").Find(&users)
-	// SELECT col1, col2 FROM user
-	engine.Cols("col1", "col2").Where().Update(user)
-	// UPDATE user set col1 = ?, col2 = ? Where ...
-	engine.Omit("col1").Find(&users)
-	// SELECT col2, col3 FROM user
-	engine.Omit("col1").Insert(&user)
-	// INSERT INTO table (non-col1) VALUES ()
-	engine.Distinct("col1").Find(&users)
-	// SELECT DISTINCT col1 FROM user
+    var users []*User
+    engine.Cols("col1, col2").Find(&users)
+    // SELECT col1, col2 FROM user
+    engine.Cols("col1", "col2").Where().Update(user)
+    // UPDATE user set col1 = ?, col2 = ? Where ...
+    engine.Omit("col1").Find(&users)
+    // SELECT col2, col3 FROM user
+    engine.Omit("col1").Insert(&user)
+    // INSERT INTO table (non-col1) VALUES ()
+    engine.Distinct("col1").Find(&users)
+    // SELECT DISTINCT col1 FROM user
 
 7. Join, GroupBy, Having
 
-	engine.GroupBy("name").Having("name='xlw'").Find(&users)
-	//SELECT * FROM user GROUP BY name HAVING name='xlw'
-	engine.Join("LEFT", "userdetail", "user.id=userdetail.id").Find(&users)
-	//SELECT * FROM user LEFT JOIN userdetail ON user.id=userdetail.id
+    engine.GroupBy("name").Having("name='xlw'").Find(&users)
+    //SELECT * FROM user GROUP BY name HAVING name='xlw'
+    engine.Join("LEFT", "userdetail", "user.id=userdetail.id").Find(&users)
+    //SELECT * FROM user LEFT JOIN userdetail ON user.id=userdetail.id
 
-# Builder
+Builder
 
 xorm could work with xorm.io/builder directly.
 
 1. With Where
 
-	var cond = builder.Eq{"a":1, "b":2}
-	engine.Where(cond).Find(&users)
+    var cond = builder.Eq{"a":1, "b":2}
+    engine.Where(cond).Find(&users)
 
 2. With In
 
-	var subQuery = builder.Select("name").From("group")
-	engine.In("group_name", subQuery).Find(&users)
+    var subQuery = builder.Select("name").From("group")
+    engine.In("group_name", subQuery).Find(&users)
 
 3. With Join
 
-	var subQuery = builder.Select("name").From("group")
-	engine.Join("INNER", subQuery, "group.id = user.group_id").Find(&users)
+    var subQuery = builder.Select("name").From("group")
+    engine.Join("INNER", subQuery, "group.id = user.group_id").Find(&users)
 
 4. With SetExprs
 
-	var subQuery = builder.Select("name").From("group")
-	engine.ID(1).SetExprs("name", subQuery).Update(new(User))
+    var subQuery = builder.Select("name").From("group")
+    engine.ID(1).SetExprs("name", subQuery).Update(new(User))
 
 5. With SQL
 
-	var query = builder.Select("name").From("group")
-	results, err := engine.SQL(query).Find(&groups)
+    var query = builder.Select("name").From("group")
+    results, err := engine.SQL(query).Find(&groups)
 
 6. With Query
 
-	var query = builder.Select("name").From("group")
-	results, err := engine.Query(query)
-	results, err := engine.QueryString(query)
-	results, err := engine.QueryInterface(query)
+    var query = builder.Select("name").From("group")
+    results, err := engine.Query(query)
+    results, err := engine.QueryString(query)
+    results, err := engine.QueryInterface(query)
 
 7. With Exec
 
-	var query = builder.Insert("a, b").Into("table1").Select("b, c").From("table2")
-	results, err := engine.Exec(query)
+    var query = builder.Insert("a, b").Into("table1").Select("b, c").From("table2")
+    results, err := engine.Exec(query)
 
 More usage, please visit http://xorm.io/docs
 */
diff --git a/vendor/xorm.io/xorm/engine.go b/vendor/xorm.io/xorm/engine.go
index bb7d232..ec06610 100644
--- a/vendor/xorm.io/xorm/engine.go
+++ b/vendor/xorm.io/xorm/engine.go
@@ -7,13 +7,12 @@ package xorm
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"reflect"
-	"regexp"
 	"runtime"
-	"strconv"
 	"strings"
 	"time"
 
@@ -51,7 +50,7 @@ type Engine struct {
 
 // NewEngine new a db manager according to the parameter. Currently support four
 // drivers
-func NewEngine(driverName string, dataSourceName string, driverOptions ...func(db *sql.DB) error) (*Engine, error) {
+func NewEngine(driverName string, dataSourceName string) (*Engine, error) {
 	dialect, err := dialects.OpenDialect(driverName, dataSourceName)
 	if err != nil {
 		return nil, err
@@ -62,12 +61,6 @@ func NewEngine(driverName string, dataSourceName string, driverOptions ...func(d
 		return nil, err
 	}
 
-	for _, driverOption := range driverOptions {
-		if err := driverOption(db.DB); err != nil {
-			return nil, err
-		}
-	}
-
 	return newEngine(driverName, dataSourceName, dialect, db)
 }
 
@@ -255,16 +248,16 @@ func (engine *Engine) SQLType(c *schemas.Column) string {
 	return engine.dialect.SQLType(c)
 }
 
+// AutoIncrStr Database's autoincrement statement
+func (engine *Engine) AutoIncrStr() string {
+	return engine.dialect.AutoIncrStr()
+}
+
 // SetConnMaxLifetime sets the maximum amount of time a connection may be reused.
 func (engine *Engine) SetConnMaxLifetime(d time.Duration) {
 	engine.DB().SetConnMaxLifetime(d)
 }
 
-// SetConnMaxIdleTime sets the maximum amount of time a connection may be idle.
-func (engine *Engine) SetConnMaxIdleTime(d time.Duration) {
-	engine.DB().SetConnMaxIdleTime(d)
-}
-
 // SetMaxOpenConns is only available for go 1.2+
 func (engine *Engine) SetMaxOpenConns(conns int) {
 	engine.DB().SetMaxOpenConns(conns)
@@ -341,7 +334,7 @@ func (engine *Engine) Ping() error {
 // SQL method let's you manually write raw SQL and operate
 // For example:
 //
-//	engine.SQL("select * from user").Find(&users)
+//         engine.SQL("select * from user").Find(&users)
 //
 // This    code will execute "select * from user" and set the records to users
 func (engine *Engine) SQL(query interface{}, args ...interface{}) *Session {
@@ -366,15 +359,15 @@ func (engine *Engine) NoAutoCondition(no ...bool) *Session {
 	return session.NoAutoCondition(no...)
 }
 
-func (engine *Engine) loadTableInfo(ctx context.Context, table *schemas.Table) error {
-	colSeq, cols, err := engine.dialect.GetColumns(engine.db, ctx, table.Name)
+func (engine *Engine) loadTableInfo(table *schemas.Table) error {
+	colSeq, cols, err := engine.dialect.GetColumns(engine.db, engine.defaultContext, table.Name)
 	if err != nil {
 		return err
 	}
 	for _, name := range colSeq {
 		table.AddColumn(cols[name])
 	}
-	indexes, err := engine.dialect.GetIndexes(engine.db, ctx, table.Name)
+	indexes, err := engine.dialect.GetIndexes(engine.db, engine.defaultContext, table.Name)
 	if err != nil {
 		return err
 	}
@@ -391,7 +384,7 @@ func (engine *Engine) loadTableInfo(ctx context.Context, table *schemas.Table) e
 					seq = 0
 				}
 			}
-			colName := strings.Trim(parts[0], `"`)
+			var colName = strings.Trim(parts[0], `"`)
 			if col := table.GetColumn(colName); col != nil {
 				col.Indexes[index.Name] = index.Type
 			} else {
@@ -410,7 +403,7 @@ func (engine *Engine) DBMetas() ([]*schemas.Table, error) {
 	}
 
 	for _, table := range tables {
-		if err = engine.loadTableInfo(engine.defaultContext, table); err != nil {
+		if err = engine.loadTableInfo(table); err != nil {
 			return nil, err
 		}
 	}
@@ -448,23 +441,23 @@ func (engine *Engine) DumpTablesToFile(tables []*schemas.Table, fp string, tp ..
 
 // DumpTables dump specify tables to io.Writer
 func (engine *Engine) DumpTables(tables []*schemas.Table, w io.Writer, tp ...schemas.DBType) error {
-	return engine.dumpTables(context.Background(), tables, w, tp...)
+	return engine.dumpTables(tables, w, tp...)
 }
 
-func formatBool(s bool, dstDialect dialects.Dialect) string {
-	if dstDialect.URI().DBType != schemas.POSTGRES {
-		if s {
+func formatBool(s string, dstDialect dialects.Dialect) string {
+	if dstDialect.URI().DBType == schemas.MSSQL {
+		switch s {
+		case "true":
 			return "1"
+		case "false":
+			return "0"
 		}
-		return "0"
 	}
-	return strconv.FormatBool(s)
+	return s
 }
 
-var controlCharactersRe = regexp.MustCompile(`[\x00-\x1f\x7f]+`)
-
 // dumpTables dump database all table structs and data to w with specify db type
-func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w io.Writer, tp ...schemas.DBType) error {
+func (engine *Engine) dumpTables(tables []*schemas.Table, w io.Writer, tp ...schemas.DBType) error {
 	var dstDialect dialects.Dialect
 	if len(tp) == 0 {
 		dstDialect = engine.dialect
@@ -478,14 +471,9 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 		destURI := dialects.URI{
 			DBType: tp[0],
 			DBName: uri.DBName,
-			// DO NOT SET SCHEMA HERE
-		}
-		if tp[0] == schemas.POSTGRES {
-			destURI.Schema = engine.dialect.URI().Schema
-		}
-		if err := dstDialect.Init(&destURI); err != nil {
-			return err
+			Schema: uri.Schema,
 		}
+		dstDialect.Init(&destURI)
 	}
 	cacherMgr := caches.NewManager()
 	dstTableCache := tags.NewParser("xorm", dstDialect, engine.GetTableMapper(), engine.GetColumnMapper(), cacherMgr)
@@ -496,13 +484,6 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 		return err
 	}
 
-	if dstDialect.URI().DBType == schemas.MYSQL {
-		// For MySQL set NO_BACKLASH_ESCAPES so that strings work properly
-		if _, err := io.WriteString(w, "SET sql_mode='NO_BACKSLASH_ESCAPES';\n"); err != nil {
-			return err
-		}
-	}
-
 	for i, table := range tables {
 		dstTable := table
 		if table.Type != nil {
@@ -514,11 +495,8 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 		}
 
 		dstTableName := dstTable.Name
-		quoter := dstDialect.Quoter().Quote
-		quotedDstTableName := quoter(dstTable.Name)
 		if dstDialect.URI().Schema != "" {
 			dstTableName = fmt.Sprintf("%s.%s", dstDialect.URI().Schema, dstTable.Name)
-			quotedDstTableName = fmt.Sprintf("%s.%s", quoter(dstDialect.URI().Schema), quoter(dstTable.Name))
 		}
 		originalTableName := table.Name
 		if engine.dialect.URI().Schema != "" {
@@ -531,26 +509,13 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 			}
 		}
 
-		if dstTable.AutoIncrement != "" && dstDialect.Features().AutoincrMode == dialects.SequenceAutoincrMode {
-			sqlstr, err := dstDialect.CreateSequenceSQL(ctx, engine.db, utils.SeqName(dstTableName))
-			if err != nil {
-				return err
-			}
-			_, err = io.WriteString(w, sqlstr+";\n")
+		sqls, _ := dstDialect.CreateTableSQL(dstTable, dstTableName)
+		for _, s := range sqls {
+			_, err = io.WriteString(w, s+";\n")
 			if err != nil {
 				return err
 			}
 		}
-
-		sqlstr, _, err := dstDialect.CreateTableSQL(ctx, engine.db, dstTable, dstTableName)
-		if err != nil {
-			return err
-		}
-		_, err = io.WriteString(w, sqlstr+";\n")
-		if err != nil {
-			return err
-		}
-
 		if len(dstTable.PKColumns()) > 0 && dstDialect.URI().DBType == schemas.MSSQL {
 			fmt.Fprintf(w, "SET IDENTITY_INSERT [%s] ON;\n", dstTable.Name)
 		}
@@ -587,7 +552,7 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 		sess := engine.NewSession()
 		defer sess.Close()
 		for rows.Next() {
-			_, err = io.WriteString(w, "INSERT INTO "+quotedDstTableName+" ("+destColNames+") VALUES (")
+			_, err = io.WriteString(w, "INSERT INTO "+dstDialect.Quoter().Quote(dstTableName)+" ("+destColNames+") VALUES (")
 			if err != nil {
 				return err
 			}
@@ -598,210 +563,38 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 			}
 			for i, scanResult := range scanResults {
 				stp := schemas.SQLType{Name: types[i].DatabaseTypeName()}
-				s := scanResult.(*sql.NullString)
-				if !s.Valid {
-					if _, err = io.WriteString(w, "NULL"); err != nil {
-						return err
-					}
-				} else {
-					if table.Columns()[i].SQLType.IsBool() || stp.IsBool() || (dstDialect.URI().DBType == schemas.MSSQL && strings.EqualFold(stp.Name, schemas.Bit)) {
-						val, err := strconv.ParseBool(s.String)
-						if err != nil {
+				if stp.IsNumeric() {
+					s := scanResult.(*sql.NullString)
+					if s.Valid {
+						if _, err = io.WriteString(w, formatBool(s.String, dstDialect)); err != nil {
 							return err
 						}
-
-						if _, err = io.WriteString(w, formatBool(val, dstDialect)); err != nil {
-							return err
-						}
-					} else if stp.IsNumeric() {
-						if _, err = io.WriteString(w, s.String); err != nil {
-							return err
-						}
-					} else if sess.engine.dialect.URI().DBType == schemas.DAMENG && stp.IsTime() && len(s.String) == 25 {
-						r := strings.ReplaceAll(s.String[:19], "T", " ")
-						if _, err = io.WriteString(w, "'"+r+"'"); err != nil {
-							return err
-						}
-					} else if len(s.String) == 0 {
-						if _, err := io.WriteString(w, "''"); err != nil {
-							return err
-						}
-					} else if dstDialect.URI().DBType == schemas.POSTGRES {
-						if dstTable.Columns()[i].SQLType.IsBlob() {
-							// Postgres has the escape format and we should use that for bytea data
-							if _, err := fmt.Fprintf(w, "'\\x%x'", s.String); err != nil {
-								return err
-							}
-						} else {
-							// Postgres concatentates strings using || (NOTE: a NUL byte in a text segment will fail)
-							toCheck := strings.ReplaceAll(s.String, "'", "''")
-							for len(toCheck) > 0 {
-								loc := controlCharactersRe.FindStringIndex(toCheck)
-								if loc == nil {
-									if _, err := io.WriteString(w, "'"+toCheck+"'"); err != nil {
-										return err
-									}
-									break
-								}
-								if loc[0] > 0 {
-									if _, err := io.WriteString(w, "'"+toCheck[:loc[0]]+"' || "); err != nil {
-										return err
-									}
-								}
-								if _, err := io.WriteString(w, "e'"); err != nil {
-									return err
-								}
-								for i := loc[0]; i < loc[1]; i++ {
-									if _, err := fmt.Fprintf(w, "\\x%02x", toCheck[i]); err != nil {
-										return err
-									}
-								}
-								toCheck = toCheck[loc[1]:]
-								if len(toCheck) > 0 {
-									if _, err := io.WriteString(w, "' || "); err != nil {
-										return err
-									}
-								} else {
-									if _, err := io.WriteString(w, "'"); err != nil {
-										return err
-									}
-								}
-							}
-						}
-					} else if dstDialect.URI().DBType == schemas.MYSQL {
-						loc := controlCharactersRe.FindStringIndex(s.String)
-						if loc == nil {
-							if _, err := io.WriteString(w, "'"+strings.ReplaceAll(s.String, "'", "''")+"'"); err != nil {
-								return err
-							}
-						} else {
-							if _, err := io.WriteString(w, "CONCAT("); err != nil {
-								return err
-							}
-							toCheck := strings.ReplaceAll(s.String, "'", "''")
-							for len(toCheck) > 0 {
-								loc := controlCharactersRe.FindStringIndex(toCheck)
-								if loc == nil {
-									if _, err := io.WriteString(w, "'"+toCheck+"')"); err != nil {
-										return err
-									}
-									break
-								}
-								if loc[0] > 0 {
-									if _, err := io.WriteString(w, "'"+toCheck[:loc[0]]+"', "); err != nil {
-										return err
-									}
-								}
-								for i := loc[0]; i < loc[1]-1; i++ {
-									if _, err := io.WriteString(w, "CHAR("+strconv.Itoa(int(toCheck[i]))+"), "); err != nil {
-										return err
-									}
-								}
-								char := toCheck[loc[1]-1]
-								toCheck = toCheck[loc[1]:]
-								if len(toCheck) > 0 {
-									if _, err := io.WriteString(w, "CHAR("+strconv.Itoa(int(char))+"), "); err != nil {
-										return err
-									}
-								} else {
-									if _, err = io.WriteString(w, "CHAR("+strconv.Itoa(int(char))+"))"); err != nil {
-										return err
-									}
-								}
-							}
-						}
-					} else if dstDialect.URI().DBType == schemas.SQLITE {
-						if dstTable.Columns()[i].SQLType.IsBlob() {
-							// SQLite has its escape format
-							if _, err := fmt.Fprintf(w, "X'%x'", s.String); err != nil {
-								return err
-							}
-						} else {
-							// SQLite concatentates strings using || (NOTE: a NUL byte in a text segment will fail)
-							toCheck := strings.ReplaceAll(s.String, "'", "''")
-							for len(toCheck) > 0 {
-								loc := controlCharactersRe.FindStringIndex(toCheck)
-								if loc == nil {
-									if _, err := io.WriteString(w, "'"+toCheck+"'"); err != nil {
-										return err
-									}
-									break
-								}
-								if loc[0] > 0 {
-									if _, err := io.WriteString(w, "'"+toCheck[:loc[0]]+"' || "); err != nil {
-										return err
-									}
-								}
-								if _, err := fmt.Fprintf(w, "X'%x'", toCheck[loc[0]:loc[1]]); err != nil {
-									return err
-								}
-								toCheck = toCheck[loc[1]:]
-								if len(toCheck) > 0 {
-									if _, err := io.WriteString(w, " || "); err != nil {
-										return err
-									}
-								}
-							}
-						}
-					} else if dstDialect.URI().DBType == schemas.DAMENG || dstDialect.URI().DBType == schemas.ORACLE {
-						if dstTable.Columns()[i].SQLType.IsBlob() {
-							// ORACLE/DAMENG uses HEXTORAW
-							if _, err := fmt.Fprintf(w, "HEXTORAW('%x')", s.String); err != nil {
-								return err
-							}
-						} else {
-							// ORACLE/DAMENG concatentates strings in multiple ways but uses CHAR and has CONCAT
-							// (NOTE: a NUL byte in a text segment will fail)
-							if _, err := io.WriteString(w, "CONCAT("); err != nil {
-								return err
-							}
-							toCheck := strings.ReplaceAll(s.String, "'", "''")
-							for len(toCheck) > 0 {
-								loc := controlCharactersRe.FindStringIndex(toCheck)
-								if loc == nil {
-									if _, err := io.WriteString(w, "'"+toCheck+"')"); err != nil {
-										return err
-									}
-									break
-								}
-								if loc[0] > 0 {
-									if _, err := io.WriteString(w, "'"+toCheck[:loc[0]]+"', "); err != nil {
-										return err
-									}
-								}
-								for i := loc[0]; i < loc[1]-1; i++ {
-									if _, err := io.WriteString(w, "CHAR("+strconv.Itoa(int(toCheck[i]))+"), "); err != nil {
-										return err
-									}
-								}
-								char := toCheck[loc[1]-1]
-								toCheck = toCheck[loc[1]:]
-								if len(toCheck) > 0 {
-									if _, err := io.WriteString(w, "CHAR("+strconv.Itoa(int(char))+"), "); err != nil {
-										return err
-									}
-								} else {
-									if _, err = io.WriteString(w, "CHAR("+strconv.Itoa(int(char))+"))"); err != nil {
-										return err
-									}
-								}
-							}
-						}
-					} else if dstDialect.URI().DBType == schemas.MSSQL {
-						if dstTable.Columns()[i].SQLType.IsBlob() {
-							// MSSQL uses CONVERT(VARBINARY(MAX), '0xDEADBEEF', 1)
-							if _, err := fmt.Fprintf(w, "CONVERT(VARBINARY(MAX), '0x%x', 1)", s.String); err != nil {
-								return err
-							}
-						} else {
-							if _, err = io.WriteString(w, "N'"+strings.ReplaceAll(s.String, "'", "''")+"'"); err != nil {
-								return err
-							}
-						}
 					} else {
+						if _, err = io.WriteString(w, "NULL"); err != nil {
+							return err
+						}
+					}
+				} else if stp.IsBool() {
+					s := scanResult.(*sql.NullString)
+					if s.Valid {
+						if _, err = io.WriteString(w, formatBool(s.String, dstDialect)); err != nil {
+							return err
+						}
+					} else {
+						if _, err = io.WriteString(w, "NULL"); err != nil {
+							return err
+						}
+					}
+				} else {
+					s := scanResult.(*sql.NullString)
+					if s.Valid {
 						if _, err = io.WriteString(w, "'"+strings.ReplaceAll(s.String, "'", "''")+"'"); err != nil {
 							return err
 						}
+					} else {
+						if _, err = io.WriteString(w, "NULL"); err != nil {
+							return err
+						}
 					}
 				}
 				if i < len(scanResults)-1 {
@@ -826,9 +619,6 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w
 				return err
 			}
 		}
-		// !datbeohbbh! if no error, manually close
-		rows.Close()
-		sess.Close()
 	}
 	return nil
 }
@@ -1010,8 +800,9 @@ func (engine *Engine) Desc(colNames ...string) *Session {
 // Asc will generate "ORDER BY column1,column2 Asc"
 // This method can chainable use.
 //
-//	engine.Desc("name").Asc("age").Find(&users)
-//	// SELECT * FROM user ORDER BY name DESC, age ASC
+//        engine.Desc("name").Asc("age").Find(&users)
+//        // SELECT * FROM user ORDER BY name DESC, age ASC
+//
 func (engine *Engine) Asc(colNames ...string) *Session {
 	session := engine.NewSession()
 	session.isAutoClose = true
@@ -1019,10 +810,10 @@ func (engine *Engine) Asc(colNames ...string) *Session {
 }
 
 // OrderBy will generate "ORDER BY order"
-func (engine *Engine) OrderBy(order interface{}, args ...interface{}) *Session {
+func (engine *Engine) OrderBy(order string) *Session {
 	session := engine.NewSession()
 	session.isAutoClose = true
-	return session.OrderBy(order, args...)
+	return session.OrderBy(order)
 }
 
 // Prepare enables prepare statement
@@ -1033,7 +824,7 @@ func (engine *Engine) Prepare() *Session {
 }
 
 // Join the join_operator should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN
-func (engine *Engine) Join(joinOperator string, tablename interface{}, condition interface{}, args ...interface{}) *Session {
+func (engine *Engine) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *Session {
 	session := engine.NewSession()
 	session.isAutoClose = true
 	return session.Join(joinOperator, tablename, condition, args...)
@@ -1126,6 +917,112 @@ func (engine *Engine) UnMapType(t reflect.Type) {
 	engine.tagParser.ClearCacheTable(t)
 }
 
+// Sync the new struct changes to database, this method will automatically add
+// table, column, index, unique. but will not delete or change anything.
+// If you change some field, you should change the database manually.
+func (engine *Engine) Sync(beans ...interface{}) error {
+	session := engine.NewSession()
+	defer session.Close()
+
+	for _, bean := range beans {
+		v := utils.ReflectValue(bean)
+		tableNameNoSchema := dialects.FullTableName(engine.dialect, engine.GetTableMapper(), bean)
+		table, err := engine.tagParser.ParseWithCache(v)
+		if err != nil {
+			return err
+		}
+
+		isExist, err := session.Table(bean).isTableExist(tableNameNoSchema)
+		if err != nil {
+			return err
+		}
+		if !isExist {
+			err = session.createTable(bean)
+			if err != nil {
+				return err
+			}
+		}
+		/*isEmpty, err := engine.IsEmptyTable(bean)
+		  if err != nil {
+		      return err
+		  }*/
+		var isEmpty bool
+		if isEmpty {
+			err = session.dropTable(bean)
+			if err != nil {
+				return err
+			}
+			err = session.createTable(bean)
+			if err != nil {
+				return err
+			}
+		} else {
+			for _, col := range table.Columns() {
+				isExist, err := engine.dialect.IsColumnExist(engine.db, session.ctx, tableNameNoSchema, col.Name)
+				if err != nil {
+					return err
+				}
+				if !isExist {
+					if err := session.statement.SetRefBean(bean); err != nil {
+						return err
+					}
+					err = session.addColumn(col.Name)
+					if err != nil {
+						return err
+					}
+				}
+			}
+
+			for name, index := range table.Indexes {
+				if err := session.statement.SetRefBean(bean); err != nil {
+					return err
+				}
+				if index.Type == schemas.UniqueType {
+					isExist, err := session.isIndexExist2(tableNameNoSchema, index.Cols, true)
+					if err != nil {
+						return err
+					}
+					if !isExist {
+						if err := session.statement.SetRefBean(bean); err != nil {
+							return err
+						}
+
+						err = session.addUnique(tableNameNoSchema, name)
+						if err != nil {
+							return err
+						}
+					}
+				} else if index.Type == schemas.IndexType {
+					isExist, err := session.isIndexExist2(tableNameNoSchema, index.Cols, false)
+					if err != nil {
+						return err
+					}
+					if !isExist {
+						if err := session.statement.SetRefBean(bean); err != nil {
+							return err
+						}
+
+						err = session.addIndex(tableNameNoSchema, name)
+						if err != nil {
+							return err
+						}
+					}
+				} else {
+					return errors.New("unknow index type")
+				}
+			}
+		}
+	}
+	return nil
+}
+
+// Sync2 synchronize structs to database tables
+func (engine *Engine) Sync2(beans ...interface{}) error {
+	s := engine.NewSession()
+	defer s.Close()
+	return s.Sync2(beans...)
+}
+
 // CreateTables create tabls according bean
 func (engine *Engine) CreateTables(beans ...interface{}) error {
 	session := engine.NewSession()
@@ -1139,7 +1036,7 @@ func (engine *Engine) CreateTables(beans ...interface{}) error {
 	for _, bean := range beans {
 		err = session.createTable(bean)
 		if err != nil {
-			_ = session.Rollback()
+			session.Rollback()
 			return err
 		}
 	}
@@ -1159,7 +1056,7 @@ func (engine *Engine) DropTables(beans ...interface{}) error {
 	for _, bean := range beans {
 		err = session.dropTable(bean)
 		if err != nil {
-			_ = session.Rollback()
+			session.Rollback()
 			return err
 		}
 	}
@@ -1212,16 +1109,15 @@ func (engine *Engine) Insert(beans ...interface{}) (int64, error) {
 func (engine *Engine) InsertOne(bean interface{}) (int64, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Insert(bean)
+	return session.InsertOne(bean)
 }
 
 // Update records, bean's non-empty fields are updated contents,
 // condiBean' non-empty filds are conditions
 // CAUTION:
-//
-//	1.bool will defaultly be updated content nor conditions
-//	 You should call UseBool if you have bool to use.
-//	2.float32 & float64 may be not inexact as conditions
+//        1.bool will defaultly be updated content nor conditions
+//         You should call UseBool if you have bool to use.
+//        2.float32 & float64 may be not inexact as conditions
 func (engine *Engine) Update(bean interface{}, condiBeans ...interface{}) (int64, error) {
 	session := engine.NewSession()
 	defer session.Close()
@@ -1229,27 +1125,18 @@ func (engine *Engine) Update(bean interface{}, condiBeans ...interface{}) (int64
 }
 
 // Delete records, bean's non-empty fields are conditions
-// At least one condition must be set.
 func (engine *Engine) Delete(beans ...interface{}) (int64, error) {
 	session := engine.NewSession()
 	defer session.Close()
 	return session.Delete(beans...)
 }
 
-// Truncate records, bean's non-empty fields are conditions
-// In contrast to Delete this method allows deletes without conditions.
-func (engine *Engine) Truncate(beans ...interface{}) (int64, error) {
-	session := engine.NewSession()
-	defer session.Close()
-	return session.Truncate(beans...)
-}
-
 // Get retrieve one record from table, bean's non-empty fields
 // are conditions
-func (engine *Engine) Get(beans ...interface{}) (bool, error) {
+func (engine *Engine) Get(bean interface{}) (bool, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Get(beans...)
+	return session.Get(bean)
 }
 
 // Exist returns true if the record exist otherwise return false
@@ -1439,10 +1326,3 @@ func (engine *Engine) Transaction(f func(*Session) (interface{}, error)) (interf
 
 	return result, nil
 }
-
-func (engine *Engine) IndexHint(op, forType, indexerOrColName string) *Session {
-	session := engine.NewSession()
-	session.isAutoClose = true
-	session.statement.LastError = session.statement.IndexHint(op, forType, indexerOrColName)
-	return session
-}
diff --git a/vendor/xorm.io/xorm/interface.go b/vendor/xorm.io/xorm/interface.go
index 03dfd23..5d68f53 100644
--- a/vendor/xorm.io/xorm/interface.go
+++ b/vendor/xorm.io/xorm/interface.go
@@ -31,14 +31,13 @@ type Interface interface {
 	Decr(column string, arg ...interface{}) *Session
 	Desc(...string) *Session
 	Delete(...interface{}) (int64, error)
-	Truncate(...interface{}) (int64, error)
 	Distinct(columns ...string) *Session
 	DropIndexes(bean interface{}) error
 	Exec(sqlOrArgs ...interface{}) (sql.Result, error)
 	Exist(bean ...interface{}) (bool, error)
 	Find(interface{}, ...interface{}) error
 	FindAndCount(interface{}, ...interface{}) (int64, error)
-	Get(...interface{}) (bool, error)
+	Get(interface{}) (bool, error)
 	GroupBy(keys string) *Session
 	ID(interface{}) *Session
 	In(string, ...interface{}) *Session
@@ -53,9 +52,9 @@ type Interface interface {
 	NoAutoCondition(...bool) *Session
 	NotIn(string, ...interface{}) *Session
 	Nullable(...string) *Session
-	Join(joinOperator string, tablename interface{}, condition interface{}, args ...interface{}) *Session
+	Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *Session
 	Omit(columns ...string) *Session
-	OrderBy(order interface{}, args ...interface{}) *Session
+	OrderBy(order string) *Session
 	Ping() error
 	Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error)
 	QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error)
@@ -100,7 +99,6 @@ type EngineInterface interface {
 	MapCacher(interface{}, caches.Cacher) error
 	NewSession() *Session
 	NoAutoTime() *Session
-	Prepare() *Session
 	Quote(string) string
 	SetCacher(string, caches.Cacher)
 	SetConnMaxLifetime(time.Duration)
@@ -121,7 +119,6 @@ type EngineInterface interface {
 	ShowSQL(show ...bool)
 	Sync(...interface{}) error
 	Sync2(...interface{}) error
-	SyncWithOptions(SyncOptions, ...interface{}) (*SyncResult, error)
 	StoreEngine(storeEngine string) *Session
 	TableInfo(bean interface{}) (*schemas.Table, error)
 	TableName(interface{}, ...bool) string
diff --git a/vendor/xorm.io/xorm/internal/json/gojson.go b/vendor/xorm.io/xorm/internal/json/gojson.go
index 9bfa5c2..4f1448e 100644
--- a/vendor/xorm.io/xorm/internal/json/gojson.go
+++ b/vendor/xorm.io/xorm/internal/json/gojson.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build gojson
 // +build gojson
 
 package json
diff --git a/vendor/xorm.io/xorm/internal/json/jsoniter.go b/vendor/xorm.io/xorm/internal/json/jsoniter.go
index be93ac4..cfe7a19 100644
--- a/vendor/xorm.io/xorm/internal/json/jsoniter.go
+++ b/vendor/xorm.io/xorm/internal/json/jsoniter.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build jsoniter
 // +build jsoniter
 
 package json
diff --git a/vendor/xorm.io/xorm/internal/statements/args.go b/vendor/xorm.io/xorm/internal/statements/args.go
deleted file mode 100644
index 727d597..0000000
--- a/vendor/xorm.io/xorm/internal/statements/args.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2019 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"xorm.io/builder"
-	"xorm.io/xorm/schemas"
-)
-
-// WriteArg writes an arg
-func (statement *Statement) WriteArg(w *builder.BytesWriter, arg interface{}) error {
-	switch argv := arg.(type) {
-	case *builder.Builder:
-		if _, err := w.WriteString("("); err != nil {
-			return err
-		}
-		if err := argv.WriteTo(w); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(")"); err != nil {
-			return err
-		}
-	default:
-		if err := w.WriteByte('?'); err != nil {
-			return err
-		}
-		if v, ok := arg.(bool); ok && statement.dialect.URI().DBType == schemas.MSSQL {
-			if v {
-				w.Append(1)
-			} else {
-				w.Append(0)
-			}
-		} else {
-			w.Append(arg)
-		}
-	}
-	return nil
-}
-
-// WriteArgs writes args
-func (statement *Statement) WriteArgs(w *builder.BytesWriter, args []interface{}) error {
-	for i, arg := range args {
-		if err := statement.WriteArg(w, arg); err != nil {
-			return err
-		}
-
-		if i+1 != len(args) {
-			if _, err := w.WriteString(","); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/cache.go b/vendor/xorm.io/xorm/internal/statements/cache.go
index 9dd7675..669cd01 100644
--- a/vendor/xorm.io/xorm/internal/statements/cache.go
+++ b/vendor/xorm.io/xorm/internal/statements/cache.go
@@ -6,7 +6,6 @@ package statements
 
 import (
 	"fmt"
-	"strconv"
 	"strings"
 
 	"xorm.io/xorm/internal/utils"
@@ -27,19 +26,14 @@ func (statement *Statement) ConvertIDSQL(sqlStr string) string {
 			return ""
 		}
 
-		var b strings.Builder
-		b.WriteString("SELECT ")
+		var top string
 		pLimitN := statement.LimitN
 		if pLimitN != nil && statement.dialect.URI().DBType == schemas.MSSQL {
-			b.WriteString("TOP ")
-			b.WriteString(strconv.Itoa(*pLimitN))
-			b.WriteString(" ")
+			top = fmt.Sprintf("TOP %d ", *pLimitN)
 		}
-		b.WriteString(colstrs)
-		b.WriteString(" FROM ")
-		b.WriteString(sqls[1])
 
-		return b.String()
+		newsql := fmt.Sprintf("SELECT %s%s FROM %v", top, colstrs, sqls[1])
+		return newsql
 	}
 	return ""
 }
@@ -60,7 +54,7 @@ func (statement *Statement) ConvertUpdateSQL(sqlStr string) (string, string) {
 		return "", ""
 	}
 
-	whereStr := sqls[1]
+	var whereStr = sqls[1]
 
 	// TODO: for postgres only, if any other database?
 	var paraStr string
diff --git a/vendor/xorm.io/xorm/internal/statements/cond.go b/vendor/xorm.io/xorm/internal/statements/cond.go
deleted file mode 100644
index dfc6c20..0000000
--- a/vendor/xorm.io/xorm/internal/statements/cond.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"xorm.io/builder"
-	"xorm.io/xorm/schemas"
-)
-
-type QuoteReplacer struct {
-	*builder.BytesWriter
-	quoter schemas.Quoter
-}
-
-func (q *QuoteReplacer) Write(p []byte) (n int, err error) {
-	c := q.quoter.Replace(string(p))
-	return q.BytesWriter.Builder.WriteString(c)
-}
-
-func (statement *Statement) QuoteReplacer(w *builder.BytesWriter) *QuoteReplacer {
-	return &QuoteReplacer{
-		BytesWriter: w,
-		quoter:      statement.dialect.Quoter(),
-	}
-}
-
-// Where add Where statement
-func (statement *Statement) Where(query interface{}, args ...interface{}) *Statement {
-	return statement.And(query, args...)
-}
-
-// And add Where & and statement
-func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
-	switch qr := query.(type) {
-	case string:
-		cond := builder.Expr(qr, args...)
-		statement.cond = statement.cond.And(cond)
-	case map[string]interface{}:
-		cond := make(builder.Eq)
-		for k, v := range qr {
-			cond[statement.quote(k)] = v
-		}
-		statement.cond = statement.cond.And(cond)
-	case builder.Cond:
-		statement.cond = statement.cond.And(qr)
-		for _, v := range args {
-			if vv, ok := v.(builder.Cond); ok {
-				statement.cond = statement.cond.And(vv)
-			}
-		}
-	default:
-		statement.LastError = ErrConditionType
-	}
-
-	return statement
-}
-
-// Or add Where & Or statement
-func (statement *Statement) Or(query interface{}, args ...interface{}) *Statement {
-	switch qr := query.(type) {
-	case string:
-		cond := builder.Expr(qr, args...)
-		statement.cond = statement.cond.Or(cond)
-	case map[string]interface{}:
-		cond := make(builder.Eq)
-		for k, v := range qr {
-			cond[statement.quote(k)] = v
-		}
-		statement.cond = statement.cond.Or(cond)
-	case builder.Cond:
-		statement.cond = statement.cond.Or(qr)
-		for _, v := range args {
-			if vv, ok := v.(builder.Cond); ok {
-				statement.cond = statement.cond.Or(vv)
-			}
-		}
-	default:
-		statement.LastError = ErrConditionType
-	}
-	return statement
-}
-
-// In generate "Where column IN (?) " statement
-func (statement *Statement) In(column string, args ...interface{}) *Statement {
-	in := builder.In(statement.quote(column), args...)
-	statement.cond = statement.cond.And(in)
-	return statement
-}
-
-// NotIn generate "Where column NOT IN (?) " statement
-func (statement *Statement) NotIn(column string, args ...interface{}) *Statement {
-	notIn := builder.NotIn(statement.quote(column), args...)
-	statement.cond = statement.cond.And(notIn)
-	return statement
-}
-
-// SetNoAutoCondition if you do not want convert bean's field as query condition, then use this function
-func (statement *Statement) SetNoAutoCondition(no ...bool) *Statement {
-	statement.NoAutoCondition = true
-	if len(no) > 0 {
-		statement.NoAutoCondition = no[0]
-	}
-	return statement
-}
-
-// Conds returns condtions
-func (statement *Statement) Conds() builder.Cond {
-	return statement.cond
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/delete.go b/vendor/xorm.io/xorm/internal/statements/delete.go
deleted file mode 100644
index 6e85939..0000000
--- a/vendor/xorm.io/xorm/internal/statements/delete.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	"xorm.io/builder"
-	"xorm.io/xorm/internal/utils"
-	"xorm.io/xorm/schemas"
-)
-
-func (statement *Statement) writeDeleteOrder(w *builder.BytesWriter) error {
-	if err := statement.writeOrderBys(w); err != nil {
-		return err
-	}
-
-	if statement.LimitN != nil && *statement.LimitN > 0 {
-		if statement.Start > 0 {
-			return fmt.Errorf("Delete with Limit start is unsupported")
-		}
-		limitNValue := *statement.LimitN
-		if _, err := fmt.Fprintf(w, " LIMIT %d", limitNValue); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ErrNotImplemented not implemented
-var ErrNotImplemented = errors.New("Not implemented")
-
-func (statement *Statement) writeOrderCond(orderCondWriter *builder.BytesWriter, tableName string) error {
-	orderSQLWriter := builder.NewWriter()
-	if err := statement.writeDeleteOrder(orderSQLWriter); err != nil {
-		return err
-	}
-
-	if orderSQLWriter.Len() == 0 {
-		return nil
-	}
-
-	switch statement.dialect.URI().DBType {
-	case schemas.POSTGRES:
-		if statement.cond.IsValid() {
-			if _, err := fmt.Fprint(orderCondWriter, " AND "); err != nil {
-				return err
-			}
-		} else {
-			if _, err := fmt.Fprint(orderCondWriter, " WHERE "); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprintf(orderCondWriter, "ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQLWriter.String()); err != nil {
-			return err
-		}
-		orderCondWriter.Append(orderSQLWriter.Args()...)
-		return nil
-	case schemas.SQLITE:
-		if statement.cond.IsValid() {
-			if _, err := fmt.Fprint(orderCondWriter, " AND "); err != nil {
-				return err
-			}
-		} else {
-			if _, err := fmt.Fprint(orderCondWriter, " WHERE "); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprintf(orderCondWriter, "rowid IN (SELECT rowid FROM %s%s)", tableName, orderSQLWriter.String()); err != nil {
-			return err
-		}
-		orderCondWriter.Append(orderSQLWriter.Args()...)
-		return nil
-		// TODO: how to handle delete limit on mssql?
-	case schemas.MSSQL:
-		return ErrNotImplemented
-	default:
-		return utils.WriteBuilder(orderCondWriter, orderSQLWriter)
-	}
-}
-
-func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.BytesWriter, nowTime func(*schemas.Column) (interface{}, time.Time, error)) error {
-	tableNameNoQuote := statement.TableName()
-	tableName := statement.dialect.Quoter().Quote(tableNameNoQuote)
-	table := statement.RefTable
-	if _, err := fmt.Fprint(deleteSQLWriter, "DELETE FROM ", tableName); err != nil {
-		return err
-	}
-	if err := statement.writeWhere(deleteSQLWriter); err != nil {
-		return err
-	}
-
-	orderCondWriter := builder.NewWriter()
-	if err := statement.writeOrderCond(orderCondWriter, tableName); err != nil {
-		return err
-	}
-
-	if statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled
-		return utils.WriteBuilder(realSQLWriter, deleteSQLWriter, orderCondWriter)
-	}
-
-	deletedColumn := table.DeletedColumn()
-	if _, err := fmt.Fprintf(realSQLWriter, "UPDATE %v SET %v = ?",
-		statement.dialect.Quoter().Quote(statement.TableName()),
-		statement.dialect.Quoter().Quote(deletedColumn.Name)); err != nil {
-		return err
-	}
-
-	val, _, err := nowTime(deletedColumn)
-	if err != nil {
-		return err
-	}
-	realSQLWriter.Append(val)
-
-	if err := statement.writeWhere(realSQLWriter); err != nil {
-		return err
-	}
-
-	return utils.WriteBuilder(realSQLWriter, orderCondWriter)
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/index.go b/vendor/xorm.io/xorm/internal/statements/index.go
deleted file mode 100644
index 5c1420e..0000000
--- a/vendor/xorm.io/xorm/internal/statements/index.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"strings"
-
-	"xorm.io/builder"
-	"xorm.io/xorm/schemas"
-)
-
-type ErrInvalidIndexHintOperator struct {
-	Op string
-}
-
-func (e ErrInvalidIndexHintOperator) Error() string {
-	return "invalid index hint operator: " + e.Op
-}
-
-func (statement *Statement) IndexHint(op, forType, indexName string) error {
-	op = strings.ToUpper(op)
-	statement.indexHints = append(statement.indexHints, indexHint{
-		op:        op,
-		forType:   forType,
-		indexName: indexName,
-	})
-	return nil
-}
-
-func (statement *Statement) writeIndexHints(w *builder.BytesWriter) error {
-	if len(statement.indexHints) == 0 {
-		return nil
-	}
-
-	switch statement.dialect.URI().DBType {
-	case schemas.MYSQL:
-		return statement.writeIndexHintsMySQL(w)
-	default:
-		return ErrNotImplemented
-	}
-}
-
-func (statement *Statement) writeIndexHintsMySQL(w *builder.BytesWriter) error {
-	for _, hint := range statement.indexHints {
-		if hint.op != "USE" && hint.op != "FORCE" && hint.op != "IGNORE" {
-			return ErrInvalidIndexHintOperator{Op: hint.op}
-		}
-		if err := statement.writeStrings(" ", hint.op, " INDEX")(w); err != nil {
-			return err
-		}
-		if hint.forType != "" {
-			if err := statement.writeStrings(" FOR ", hint.forType)(w); err != nil {
-				return err
-			}
-		}
-
-		if err := statement.writeStrings("(", hint.indexName, ")")(w); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/insert.go b/vendor/xorm.io/xorm/internal/statements/insert.go
index aa39643..84547cd 100644
--- a/vendor/xorm.io/xorm/internal/statements/insert.go
+++ b/vendor/xorm.io/xorm/internal/statements/insert.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"xorm.io/builder"
-	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
 )
 
@@ -43,19 +42,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 		return "", nil, err
 	}
 
-	hasInsertColumns := len(colNames) > 0
-	needSeq := len(table.AutoIncrement) > 0 && (statement.dialect.URI().DBType == schemas.ORACLE || statement.dialect.URI().DBType == schemas.DAMENG)
-	if needSeq {
-		for _, col := range colNames {
-			if strings.EqualFold(col, table.AutoIncrement) {
-				needSeq = false
-				break
-			}
-		}
-	}
-
-	if !hasInsertColumns && statement.dialect.URI().DBType != schemas.ORACLE &&
-		statement.dialect.URI().DBType != schemas.DAMENG {
+	if len(colNames) <= 0 {
 		if statement.dialect.URI().DBType == schemas.MYSQL {
 			if _, err := buf.WriteString(" VALUES ()"); err != nil {
 				return "", nil, err
@@ -73,10 +60,6 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 			return "", nil, err
 		}
 
-		if needSeq {
-			colNames = append(colNames, table.AutoIncrement)
-		}
-
 		if err := statement.dialect.Quoter().JoinWrite(buf.Builder, append(colNames, exprs.ColNames()...), ","); err != nil {
 			return "", nil, err
 		}
@@ -89,7 +72,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 		}
 
 		if statement.Conds().IsValid() {
-			if err := statement.writeStrings(" SELECT ")(buf); err != nil {
+			if _, err := buf.WriteString(" SELECT "); err != nil {
 				return "", nil, err
 			}
 
@@ -97,23 +80,13 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 				return "", nil, err
 			}
 
-			if needSeq {
-				if len(args) > 0 {
-					if _, err := buf.WriteString(","); err != nil {
-						return "", nil, err
-					}
-				}
-				if _, err := buf.WriteString(utils.SeqName(tableName) + ".nextval"); err != nil {
-					return "", nil, err
-				}
-			}
 			if len(exprs) > 0 {
 				if _, err := buf.WriteString(","); err != nil {
 					return "", nil, err
 				}
-				if err := exprs.WriteArgs(buf); err != nil {
-					return "", nil, err
-				}
+			}
+			if err := exprs.WriteArgs(buf); err != nil {
+				return "", nil, err
 			}
 
 			if _, err := buf.WriteString(" FROM "); err != nil {
@@ -124,7 +97,11 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 				return "", nil, err
 			}
 
-			if err := statement.writeWhere(buf); err != nil {
+			if _, err := buf.WriteString(" WHERE "); err != nil {
+				return "", nil, err
+			}
+
+			if err := statement.Conds().WriteTo(buf); err != nil {
 				return "", nil, err
 			}
 		} else {
@@ -136,18 +113,6 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 				return "", nil, err
 			}
 
-			// Insert tablename (id) Values(seq_tablename.nextval)
-			if needSeq {
-				if hasInsertColumns {
-					if _, err := buf.WriteString(","); err != nil {
-						return "", nil, err
-					}
-				}
-				if _, err := buf.WriteString(utils.SeqName(tableName) + ".nextval"); err != nil {
-					return "", nil, err
-				}
-			}
-
 			if len(exprs) > 0 {
 				if _, err := buf.WriteString(","); err != nil {
 					return "", nil, err
@@ -293,99 +258,3 @@ func (statement *Statement) GenInsertMultipleMapSQL(columns []string, argss [][]
 
 	return buf.String(), buf.Args(), nil
 }
-
-func (statement *Statement) writeColumns(w *builder.BytesWriter, slice []string) error {
-	for i, s := range slice {
-		if i > 0 {
-			if _, err := fmt.Fprint(w, ","); err != nil {
-				return err
-			}
-		}
-		if err := statement.dialect.Quoter().QuoteTo(w.Builder, s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) writeQuestions(w *builder.BytesWriter, length int) error {
-	for i := 0; i < length; i++ {
-		if i > 0 {
-			if _, err := fmt.Fprint(w, ","); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprint(w, "?"); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) oracleWriteInsertMultiple(w *builder.BytesWriter, tableName string, colNames []string, colMultiPlaces []string) error {
-	if _, err := fmt.Fprint(w, "INSERT ALL"); err != nil {
-		return err
-	}
-
-	for _, cols := range colMultiPlaces {
-		if _, err := fmt.Fprint(w, " INTO "); err != nil {
-			return err
-		}
-		if err := statement.dialect.Quoter().QuoteTo(w.Builder, tableName); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprint(w, " ("); err != nil {
-			return err
-		}
-		if err := statement.writeColumns(w, colNames); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprint(w, ") VALUES ("); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprintf(w, cols, ")"); err != nil {
-			return err
-		}
-	}
-
-	if _, err := fmt.Fprint(w, " SELECT 1 FROM DUAL"); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (statement *Statement) WriteInsertMultiple(w *builder.BytesWriter, tableName string, colNames []string, colMultiPlaces []string) error {
-	if statement.dialect.URI().DBType == schemas.ORACLE {
-		return statement.oracleWriteInsertMultiple(w, tableName, colNames, colMultiPlaces)
-	}
-	return statement.plainWriteInsertMultiple(w, tableName, colNames, colMultiPlaces)
-}
-
-func (statement *Statement) plainWriteInsertMultiple(w *builder.BytesWriter, tableName string, colNames []string, colMultiPlaces []string) error {
-	if _, err := fmt.Fprint(w, "INSERT INTO "); err != nil {
-		return err
-	}
-	if err := statement.dialect.Quoter().QuoteTo(w.Builder, tableName); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprint(w, " ("); err != nil {
-		return err
-	}
-	if err := statement.writeColumns(w, colNames); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprint(w, ") VALUES ("); err != nil {
-		return err
-	}
-	for i, cols := range colMultiPlaces {
-		if _, err := fmt.Fprint(w, cols, ")"); err != nil {
-			return err
-		}
-		if i < len(colMultiPlaces)-1 {
-			if _, err := fmt.Fprint(w, ",("); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/join.go b/vendor/xorm.io/xorm/internal/statements/join.go
deleted file mode 100644
index 6fa42ea..0000000
--- a/vendor/xorm.io/xorm/internal/statements/join.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"fmt"
-	"strings"
-
-	"xorm.io/builder"
-	"xorm.io/xorm/dialects"
-	"xorm.io/xorm/internal/utils"
-	"xorm.io/xorm/schemas"
-)
-
-// Join The joinOP should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN
-func (statement *Statement) Join(joinOP string, joinTable interface{}, condition interface{}, args ...interface{}) *Statement {
-	statement.joins = append(statement.joins, join{
-		op:        joinOP,
-		table:     joinTable,
-		condition: condition,
-		args:      args,
-	})
-	return statement
-}
-
-func (statement *Statement) writeJoins(w *builder.BytesWriter) error {
-	for _, join := range statement.joins {
-		if err := statement.writeJoin(w, join); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) writeJoinTable(buf *builder.BytesWriter, join join) error {
-	switch tp := join.table.(type) {
-	case builder.Builder:
-		if _, err := fmt.Fprintf(buf, " ("); err != nil {
-			return err
-		}
-		if err := tp.WriteTo(statement.QuoteReplacer(buf)); err != nil {
-			return err
-		}
-
-		fields := strings.Split(tp.TableName(), ".")
-		aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
-		aliasName = schemas.CommonQuoter.Trim(aliasName)
-
-		if _, err := fmt.Fprintf(buf, ") %s", statement.quote(aliasName)); err != nil {
-			return err
-		}
-	case *builder.Builder:
-		if _, err := fmt.Fprintf(buf, " ("); err != nil {
-			return err
-		}
-		if err := tp.WriteTo(statement.QuoteReplacer(buf)); err != nil {
-			return err
-		}
-
-		fields := strings.Split(tp.TableName(), ".")
-		aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
-		aliasName = schemas.CommonQuoter.Trim(aliasName)
-
-		if _, err := fmt.Fprintf(buf, ") %s", statement.quote(aliasName)); err != nil {
-			return err
-		}
-	default:
-		tbName := dialects.FullTableName(statement.dialect, statement.tagParser.GetTableMapper(), join.table, true)
-		if !utils.IsSubQuery(tbName) {
-			var sb strings.Builder
-			if err := statement.dialect.Quoter().QuoteTo(&sb, tbName); err != nil {
-				return err
-			}
-			tbName = sb.String()
-		} else {
-			tbName = statement.ReplaceQuote(tbName)
-		}
-		if _, err := fmt.Fprint(buf, " ", tbName); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) writeJoin(buf *builder.BytesWriter, join join) error {
-	// write join operator
-	if _, err := fmt.Fprint(buf, " ", join.op, " JOIN"); err != nil {
-		return err
-	}
-
-	// write join table or subquery
-	if err := statement.writeJoinTable(buf, join); err != nil {
-		return err
-	}
-
-	// write on condition
-	if _, err := fmt.Fprint(buf, " ON "); err != nil {
-		return err
-	}
-
-	switch condTp := join.condition.(type) {
-	case string:
-		if _, err := fmt.Fprint(buf, statement.ReplaceQuote(condTp)); err != nil {
-			return err
-		}
-	case builder.Cond:
-		if err := condTp.WriteTo(statement.QuoteReplacer(buf)); err != nil {
-			return err
-		}
-	default:
-		return fmt.Errorf("unsupported join condition type: %v", condTp)
-	}
-	buf.Append(join.args...)
-
-	return nil
-}
-
-func (statement *Statement) convertJoinCondition(join join) (builder.Cond, error) {
-	switch condTp := join.condition.(type) {
-	case string:
-		return builder.Expr(statement.ReplaceQuote(condTp), join.args...), nil
-	case builder.Cond:
-		return condTp, nil
-	default:
-		return nil, fmt.Errorf("unsupported join condition type: %v", condTp)
-	}
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/legacy_select.go b/vendor/xorm.io/xorm/internal/statements/legacy_select.go
deleted file mode 100644
index c6fd86b..0000000
--- a/vendor/xorm.io/xorm/internal/statements/legacy_select.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"xorm.io/builder"
-)
-
-// isUsingLegacy returns true if xorm uses legacy LIMIT OFFSET.
-// It's only available in sqlserver and oracle, if param USE_LEGACY_LIMIT_OFFSET is set to "true"
-func (statement *Statement) isUsingLegacyLimitOffset() bool {
-	u, ok := statement.dialect.(interface{ UseLegacyLimitOffset() bool })
-	return ok && u.UseLegacyLimitOffset()
-}
-
-// write mssql legacy query sql
-func (statement *Statement) writeMssqlLegacySelect(buf *builder.BytesWriter, columnStr string) error {
-	return statement.writeMultiple(buf,
-		statement.writeStrings("SELECT"),
-		statement.writeDistinct,
-		statement.writeTop,
-		statement.writeFrom,
-		statement.writeWhereWithMssqlPagination,
-		statement.writeGroupBy,
-		statement.writeHaving,
-		statement.writeOrderBys,
-		statement.writeForUpdate,
-	)
-}
-
-func (statement *Statement) writeOracleLegacySelect(buf *builder.BytesWriter, columnStr string) error {
-	return statement.writeMultiple(buf,
-		statement.writeSelectColumns(columnStr),
-		statement.writeFrom,
-		statement.writeWhere,
-		statement.writeOracleLimit(columnStr),
-		statement.writeGroupBy,
-		statement.writeHaving,
-		statement.writeOrderBys,
-		statement.writeForUpdate,
-	)
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/order_by.go b/vendor/xorm.io/xorm/internal/statements/order_by.go
deleted file mode 100644
index 04197fb..0000000
--- a/vendor/xorm.io/xorm/internal/statements/order_by.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"errors"
-	"fmt"
-
-	"xorm.io/builder"
-)
-
-type orderBy struct {
-	orderStr  interface{}
-	orderArgs []interface{}
-	direction string // ASC, DESC or "", "" means raw orderStr
-}
-
-func (ob orderBy) CheckValid() error {
-	if ob.orderStr == nil {
-		return fmt.Errorf("order by string is nil")
-	}
-	switch t := ob.orderStr.(type) {
-	case string:
-		if t == "" {
-			return fmt.Errorf("order by string is empty")
-		}
-		return nil
-	case *builder.Expression:
-		if t.Content() == "" {
-			return fmt.Errorf("order by string is empty")
-		}
-		return nil
-	default:
-		return fmt.Errorf("order by string is not string or builder.Expression")
-	}
-}
-
-func (statement *Statement) HasOrderBy() bool {
-	return len(statement.orderBy) > 0
-}
-
-// ResetOrderBy reset ordery conditions
-func (statement *Statement) ResetOrderBy() {
-	statement.orderBy = []orderBy{}
-}
-
-var ErrNoColumnName = errors.New("no column name")
-
-func (statement *Statement) writeOrderBy(w *builder.BytesWriter, orderBy orderBy) error {
-	switch t := orderBy.orderStr.(type) {
-	case *builder.Expression:
-		if _, err := fmt.Fprint(w.Builder, statement.dialect.Quoter().Replace(t.Content())); err != nil {
-			return err
-		}
-		w.Append(t.Args()...)
-		return nil
-	case string:
-		if orderBy.direction == "" {
-			if _, err := fmt.Fprint(w.Builder, statement.dialect.Quoter().Replace(t)); err != nil {
-				return err
-			}
-			w.Append(orderBy.orderArgs...)
-			return nil
-		}
-		if err := statement.dialect.Quoter().QuoteTo(w.Builder, t); err != nil {
-			return err
-		}
-		_, err := fmt.Fprint(w, " ", orderBy.direction)
-		return err
-	default:
-		return ErrUnSupportedSQLType
-	}
-}
-
-// WriteOrderBy write order by to writer
-func (statement *Statement) writeOrderBys(w *builder.BytesWriter) error {
-	if len(statement.orderBy) == 0 {
-		return nil
-	}
-
-	if _, err := fmt.Fprint(w, " ORDER BY "); err != nil {
-		return err
-	}
-	for i, ob := range statement.orderBy {
-		if err := statement.writeOrderBy(w, ob); err != nil {
-			return err
-		}
-		if i < len(statement.orderBy)-1 {
-			if _, err := fmt.Fprint(w, ", "); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// OrderBy generate "Order By order" statement
-func (statement *Statement) OrderBy(order interface{}, args ...interface{}) *Statement {
-	ob := orderBy{order, args, ""}
-	if err := ob.CheckValid(); err != nil {
-		statement.LastError = err
-		return statement
-	}
-	statement.orderBy = append(statement.orderBy, ob)
-	return statement
-}
-
-// Desc generate `ORDER BY xx DESC`
-func (statement *Statement) Desc(colNames ...string) *Statement {
-	if len(colNames) == 0 {
-		statement.LastError = ErrNoColumnName
-		return statement
-	}
-	for _, colName := range colNames {
-		ob := orderBy{colName, nil, "DESC"}
-		statement.orderBy = append(statement.orderBy, ob)
-		if err := ob.CheckValid(); err != nil {
-			statement.LastError = err
-			return statement
-		}
-	}
-	return statement
-}
-
-// Asc provide asc order by query condition, the input parameters are columns.
-func (statement *Statement) Asc(colNames ...string) *Statement {
-	if len(colNames) == 0 {
-		statement.LastError = ErrNoColumnName
-		return statement
-	}
-	for _, colName := range colNames {
-		ob := orderBy{colName, nil, "ASC"}
-		statement.orderBy = append(statement.orderBy, ob)
-		if err := ob.CheckValid(); err != nil {
-			statement.LastError = err
-			return statement
-		}
-	}
-	return statement
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/pagination.go b/vendor/xorm.io/xorm/internal/statements/pagination.go
deleted file mode 100644
index 24a9d20..0000000
--- a/vendor/xorm.io/xorm/internal/statements/pagination.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"errors"
-	"fmt"
-
-	"xorm.io/builder"
-	"xorm.io/xorm/internal/utils"
-	"xorm.io/xorm/schemas"
-)
-
-func (statement *Statement) writePagination(bw *builder.BytesWriter) error {
-	dbType := statement.dialect.URI().DBType
-	if dbType == schemas.MSSQL || dbType == schemas.ORACLE {
-		return statement.writeOffsetFetch(bw)
-	}
-	return statement.writeLimitOffset(bw)
-}
-
-func (statement *Statement) writeLimitOffset(w builder.Writer) error {
-	if statement.Start > 0 {
-		if statement.LimitN != nil {
-			_, err := fmt.Fprintf(w, " LIMIT %v OFFSET %v", *statement.LimitN, statement.Start)
-			return err
-		}
-		_, err := fmt.Fprintf(w, " OFFSET %v", statement.Start)
-		return err
-	}
-	if statement.LimitN != nil {
-		_, err := fmt.Fprint(w, " LIMIT ", *statement.LimitN)
-		return err
-	}
-	// no limit statement
-	return nil
-}
-
-func (statement *Statement) writeOffsetFetch(w builder.Writer) error {
-	if statement.LimitN != nil {
-		_, err := fmt.Fprintf(w, " OFFSET %v ROWS FETCH NEXT %v ROWS ONLY", statement.Start, *statement.LimitN)
-		return err
-	}
-	if statement.Start > 0 {
-		_, err := fmt.Fprintf(w, " OFFSET %v ROWS", statement.Start)
-		return err
-	}
-	return nil
-}
-
-func (statement *Statement) writeWhereWithMssqlPagination(w *builder.BytesWriter) error {
-	if statement.cond.IsValid() {
-		if _, err := fmt.Fprint(w, " WHERE "); err != nil {
-			return err
-		}
-		if err := statement.cond.WriteTo(statement.QuoteReplacer(w)); err != nil {
-			return err
-		}
-	}
-
-	return statement.writeMssqlPaginationCond(w)
-}
-
-// write subquery to implement limit offset
-// (mssql legacy only)
-func (statement *Statement) writeMssqlPaginationCond(w *builder.BytesWriter) error {
-	if statement.Start <= 0 {
-		return nil
-	}
-
-	if statement.RefTable == nil {
-		return errors.New("unsupported query limit without reference table")
-	}
-
-	var column string
-	if len(statement.RefTable.PKColumns()) == 0 {
-		for _, index := range statement.RefTable.Indexes {
-			if len(index.Cols) == 1 {
-				column = index.Cols[0]
-				break
-			}
-		}
-		if len(column) == 0 {
-			column = statement.RefTable.ColumnsSeq()[0]
-		}
-	} else {
-		column = statement.RefTable.PKColumns()[0].Name
-	}
-	if statement.NeedTableName() {
-		if len(statement.TableAlias) > 0 {
-			column = fmt.Sprintf("%s.%s", statement.TableAlias, column)
-		} else {
-			column = fmt.Sprintf("%s.%s", statement.TableName(), column)
-		}
-	}
-
-	subWriter := builder.NewWriter()
-	if _, err := fmt.Fprintf(subWriter, "(%s NOT IN (SELECT TOP %d %s",
-		column, statement.Start, column); err != nil {
-		return err
-	}
-	if err := statement.writeFrom(subWriter); err != nil {
-		return err
-	}
-	if err := statement.writeWhere(subWriter); err != nil {
-		return err
-	}
-	if err := statement.writeOrderBys(subWriter); err != nil {
-		return err
-	}
-	if err := statement.writeGroupBy(subWriter); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprint(subWriter, "))"); err != nil {
-		return err
-	}
-	if err := statement.writeWhereOrAnd(w, statement.cond.IsValid()); err != nil {
-		return err
-	}
-
-	return utils.WriteBuilder(w, subWriter)
-}
-
-func (statement *Statement) writeOracleLimit(columnStr string) func(w *builder.BytesWriter) error {
-	return func(w *builder.BytesWriter) error {
-		if statement.LimitN == nil {
-			return nil
-		}
-
-		oldString := w.String()
-		w.Reset()
-		rawColStr := columnStr
-		if rawColStr == "*" {
-			rawColStr = "at.*"
-		}
-		_, err := fmt.Fprintf(w, "SELECT %v FROM (SELECT %v,ROWNUM RN FROM (%v) at WHERE ROWNUM <= %d) aat WHERE RN > %d",
-			columnStr, rawColStr, oldString, statement.Start+*statement.LimitN, statement.Start)
-		return err
-	}
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/query.go b/vendor/xorm.io/xorm/internal/statements/query.go
index e817403..76946cb 100644
--- a/vendor/xorm.io/xorm/internal/statements/query.go
+++ b/vendor/xorm.io/xorm/internal/statements/query.go
@@ -28,15 +28,49 @@ func (statement *Statement) GenQuerySQL(sqlOrArgs ...interface{}) (string, []int
 		return "", nil, ErrTableNotFound
 	}
 
+	var columnStr = statement.ColumnStr()
+	if len(statement.SelectStr) > 0 {
+		columnStr = statement.SelectStr
+	} else {
+		if statement.JoinStr == "" {
+			if columnStr == "" {
+				if statement.GroupByStr != "" {
+					columnStr = statement.quoteColumnStr(statement.GroupByStr)
+				} else {
+					columnStr = statement.genColumnStr()
+				}
+			}
+		} else {
+			if columnStr == "" {
+				if statement.GroupByStr != "" {
+					columnStr = statement.quoteColumnStr(statement.GroupByStr)
+				} else {
+					columnStr = "*"
+				}
+			}
+		}
+		if columnStr == "" {
+			columnStr = "*"
+		}
+	}
+
 	if err := statement.ProcessIDParam(); err != nil {
 		return "", nil, err
 	}
 
-	buf := builder.NewWriter()
-	if err := statement.writeSelect(buf, statement.genSelectColumnStr(), false); err != nil {
+	sqlStr, condArgs, err := statement.genSelectSQL(columnStr, true, true)
+	if err != nil {
 		return "", nil, err
 	}
-	return buf.String(), buf.Args(), nil
+	args := append(statement.joinArgs, condArgs...)
+
+	// for mssql and use limit
+	qs := strings.Count(sqlStr, "?")
+	if len(args)*2 == qs {
+		args = append(args, args...)
+	}
+
+	return sqlStr, args, nil
 }
 
 // GenSumSQL generates sum SQL
@@ -45,11 +79,9 @@ func (statement *Statement) GenSumSQL(bean interface{}, columns ...string) (stri
 		return statement.GenRawSQL(), statement.RawParams, nil
 	}
 
-	if err := statement.SetRefBean(bean); err != nil {
-		return "", nil, err
-	}
+	statement.SetRefBean(bean)
 
-	sumStrs := make([]string, 0, len(columns))
+	var sumStrs = make([]string, 0, len(columns))
 	for _, colName := range columns {
 		if !strings.Contains(colName, " ") && !strings.Contains(colName, "(") {
 			colName = statement.quote(colName)
@@ -58,16 +90,18 @@ func (statement *Statement) GenSumSQL(bean interface{}, columns ...string) (stri
 		}
 		sumStrs = append(sumStrs, fmt.Sprintf("COALESCE(sum(%s),0)", colName))
 	}
+	sumSelect := strings.Join(sumStrs, ", ")
 
-	if err := statement.MergeConds(bean); err != nil {
+	if err := statement.mergeConds(bean); err != nil {
 		return "", nil, err
 	}
 
-	buf := builder.NewWriter()
-	if err := statement.writeSelect(buf, strings.Join(sumStrs, ", "), true); err != nil {
+	sqlStr, condArgs, err := statement.genSelectSQL(sumSelect, true, true)
+	if err != nil {
 		return "", nil, err
 	}
-	return buf.String(), buf.Args(), nil
+
+	return sqlStr, append(statement.joinArgs, condArgs...), nil
 }
 
 // GenGetSQL generates Get SQL
@@ -77,18 +111,16 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
 		v := rValue(bean)
 		isStruct = v.Kind() == reflect.Struct
 		if isStruct {
-			if err := statement.SetRefBean(bean); err != nil {
-				return "", nil, err
-			}
+			statement.SetRefBean(bean)
 		}
 	}
 
-	columnStr := statement.ColumnStr()
+	var columnStr = statement.ColumnStr()
 	if len(statement.SelectStr) > 0 {
 		columnStr = statement.SelectStr
 	} else {
 		// TODO: always generate column names, not use * even if join
-		if len(statement.joins) == 0 {
+		if len(statement.JoinStr) == 0 {
 			if len(columnStr) == 0 {
 				if len(statement.GroupByStr) > 0 {
 					columnStr = statement.quoteColumnStr(statement.GroupByStr)
@@ -110,7 +142,7 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
 	}
 
 	if isStruct {
-		if err := statement.MergeConds(bean); err != nil {
+		if err := statement.mergeConds(bean); err != nil {
 			return "", nil, err
 		}
 	} else {
@@ -119,11 +151,12 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
 		}
 	}
 
-	buf := builder.NewWriter()
-	if err := statement.writeSelect(buf, columnStr, false); err != nil {
+	sqlStr, condArgs, err := statement.genSelectSQL(columnStr, true, true)
+	if err != nil {
 		return "", nil, err
 	}
-	return buf.String(), buf.Args(), nil
+
+	return sqlStr, append(statement.joinArgs, condArgs...), nil
 }
 
 // GenCountSQL generates the SQL for counting
@@ -132,16 +165,16 @@ func (statement *Statement) GenCountSQL(beans ...interface{}) (string, []interfa
 		return statement.GenRawSQL(), statement.RawParams, nil
 	}
 
+	var condArgs []interface{}
+	var err error
 	if len(beans) > 0 {
-		if err := statement.SetRefBean(beans[0]); err != nil {
-			return "", nil, err
-		}
-		if err := statement.MergeConds(beans[0]); err != nil {
+		statement.SetRefBean(beans[0])
+		if err := statement.mergeConds(beans[0]); err != nil {
 			return "", nil, err
 		}
 	}
 
-	selectSQL := statement.SelectStr
+	var selectSQL = statement.SelectStr
 	if len(selectSQL) <= 0 {
 		if statement.IsDistinct {
 			selectSQL = fmt.Sprintf("count(DISTINCT %s)", statement.ColumnStr())
@@ -151,14 +184,6 @@ func (statement *Statement) GenCountSQL(beans ...interface{}) (string, []interfa
 			selectSQL = "count(*)"
 		}
 	}
-
-	buf := builder.NewWriter()
-	if statement.GroupByStr != "" {
-		if _, err := fmt.Fprintf(buf, "SELECT %s FROM (", selectSQL); err != nil {
-			return "", nil, err
-		}
-	}
-
 	var subQuerySelect string
 	if statement.GroupByStr != "" {
 		subQuerySelect = statement.GroupByStr
@@ -166,124 +191,149 @@ func (statement *Statement) GenCountSQL(beans ...interface{}) (string, []interfa
 		subQuerySelect = selectSQL
 	}
 
-	if err := statement.writeSelect(buf, subQuerySelect, true); err != nil {
+	sqlStr, condArgs, err := statement.genSelectSQL(subQuerySelect, false, false)
+	if err != nil {
 		return "", nil, err
 	}
 
 	if statement.GroupByStr != "" {
-		if _, err := fmt.Fprintf(buf, ") sub"); err != nil {
-			return "", nil, err
-		}
+		sqlStr = fmt.Sprintf("SELECT %s FROM (%s) sub", selectSQL, sqlStr)
 	}
 
-	return buf.String(), buf.Args(), nil
+	return sqlStr, append(statement.joinArgs, condArgs...), nil
 }
 
-func (statement *Statement) writeFrom(w *builder.BytesWriter) error {
-	return statement.writeMultiple(w,
-		statement.writeStrings(" FROM "),
-		statement.writeTableName,
-		statement.writeAlias,
-		statement.writeIndexHints,
-		statement.writeJoins,
+func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderBy bool) (string, []interface{}, error) {
+	var (
+		distinct                  string
+		dialect                   = statement.dialect
+		quote                     = statement.quote
+		fromStr                   = " FROM "
+		top, mssqlCondi, whereStr string
 	)
-}
-
-// write "TOP <n>" (mssql only)
-func (statement *Statement) writeTop(w *builder.BytesWriter) error {
-	if statement.LimitN == nil {
-		return nil
-	}
-	_, err := fmt.Fprintf(w, " TOP %d", *statement.LimitN)
-	return err
-}
-
-func (statement *Statement) writeDistinct(w *builder.BytesWriter) error {
-	if statement.IsDistinct && !strings.HasPrefix(statement.SelectStr, "count(") {
-		_, err := fmt.Fprint(w, " DISTINCT")
-		return err
-	}
-	return nil
-}
-
-func (statement *Statement) writeSelectColumns(columnStr string) func(w *builder.BytesWriter) error {
-	return statement.groupWriteFns(
-		statement.writeStrings("SELECT"),
-		statement.writeDistinct,
-		statement.writeStrings(" ", columnStr),
-	)
-}
-
-func (statement *Statement) writeWhereCond(w *builder.BytesWriter, cond builder.Cond) error {
-	if !cond.IsValid() {
-		return nil
+	if statement.IsDistinct && !strings.HasPrefix(columnStr, "count") {
+		distinct = "DISTINCT "
 	}
 
-	if _, err := fmt.Fprint(w, " WHERE "); err != nil {
-		return err
+	condSQL, condArgs, err := statement.GenCondSQL(statement.cond)
+	if err != nil {
+		return "", nil, err
 	}
-	return cond.WriteTo(statement.QuoteReplacer(w))
-}
-
-func (statement *Statement) writeWhere(w *builder.BytesWriter) error {
-	return statement.writeWhereCond(w, statement.cond)
-}
-
-func (statement *Statement) writeForUpdate(w *builder.BytesWriter) error {
-	if !statement.IsForUpdate {
-		return nil
+	if len(condSQL) > 0 {
+		whereStr = " WHERE " + condSQL
 	}
 
-	if statement.dialect.URI().DBType != schemas.MYSQL {
-		return errors.New("only support mysql for update")
+	if dialect.URI().DBType == schemas.MSSQL && strings.Contains(statement.TableName(), "..") {
+		fromStr += statement.TableName()
+	} else {
+		fromStr += quote(statement.TableName())
 	}
-	_, err := fmt.Fprint(w, " FOR UPDATE")
-	return err
-}
 
-func (statement *Statement) writeSelect(buf *builder.BytesWriter, columnStr string, isCounting bool) error {
-	dbType := statement.dialect.URI().DBType
-	if statement.isUsingLegacyLimitOffset() {
-		if dbType == "mssql" {
-			return statement.writeMssqlLegacySelect(buf, columnStr)
-		}
-		if dbType == "oracle" {
-			return statement.writeOracleLegacySelect(buf, columnStr)
+	if statement.TableAlias != "" {
+		if dialect.URI().DBType == schemas.ORACLE {
+			fromStr += " " + quote(statement.TableAlias)
+		} else {
+			fromStr += " AS " + quote(statement.TableAlias)
 		}
 	}
+	if statement.JoinStr != "" {
+		fromStr = fmt.Sprintf("%v %v", fromStr, statement.JoinStr)
+	}
 
-	return statement.writeMultiple(buf,
-		statement.writeSelectColumns(columnStr),
-		statement.writeFrom,
-		statement.writeWhere,
-		statement.writeGroupBy,
-		statement.writeHaving,
-		func(bw *builder.BytesWriter) (err error) {
-			if dbType == "mssql" && len(statement.orderBy) == 0 {
-				// ORDER BY is mandatory to use OFFSET and FETCH clause (only in sqlserver)
-				if statement.LimitN == nil && statement.Start == 0 {
-					// no need to add
-					return
-				}
-				if statement.IsDistinct || len(statement.GroupByStr) > 0 || isCounting {
-					// the order-by column should be one of distincts or group-bys
-					// order by the first column
-					_, err = bw.WriteString(" ORDER BY 1 ASC")
-					return
-				}
-				if statement.RefTable == nil || len(statement.RefTable.PrimaryKeys) != 1 {
-					// no primary key, order by the first column
-					_, err = bw.WriteString(" ORDER BY 1 ASC")
-					return
-				}
-				// order by primary key
-				statement.orderBy = []orderBy{{orderStr: statement.colName(statement.RefTable.GetColumn(statement.RefTable.PrimaryKeys[0]), statement.TableName()), direction: "ASC"}}
+	pLimitN := statement.LimitN
+	if dialect.URI().DBType == schemas.MSSQL {
+		if pLimitN != nil {
+			LimitNValue := *pLimitN
+			top = fmt.Sprintf("TOP %d ", LimitNValue)
+		}
+		if statement.Start > 0 {
+			if statement.RefTable == nil {
+				return "", nil, errors.New("Unsupported query limit without reference table")
 			}
-			return statement.writeOrderBys(bw)
-		},
-		statement.writePagination,
-		statement.writeForUpdate,
-	)
+			var column string
+			if len(statement.RefTable.PKColumns()) == 0 {
+				for _, index := range statement.RefTable.Indexes {
+					if len(index.Cols) == 1 {
+						column = index.Cols[0]
+						break
+					}
+				}
+				if len(column) == 0 {
+					column = statement.RefTable.ColumnsSeq()[0]
+				}
+			} else {
+				column = statement.RefTable.PKColumns()[0].Name
+			}
+			if statement.needTableName() {
+				if len(statement.TableAlias) > 0 {
+					column = statement.TableAlias + "." + column
+				} else {
+					column = statement.TableName() + "." + column
+				}
+			}
+
+			var orderStr string
+			if needOrderBy && len(statement.OrderStr) > 0 {
+				orderStr = " ORDER BY " + statement.OrderStr
+			}
+
+			var groupStr string
+			if len(statement.GroupByStr) > 0 {
+				groupStr = " GROUP BY " + statement.GroupByStr
+			}
+			mssqlCondi = fmt.Sprintf("(%s NOT IN (SELECT TOP %d %s%s%s%s%s))",
+				column, statement.Start, column, fromStr, whereStr, orderStr, groupStr)
+		}
+	}
+
+	var buf strings.Builder
+	fmt.Fprintf(&buf, "SELECT %v%v%v%v%v", distinct, top, columnStr, fromStr, whereStr)
+	if len(mssqlCondi) > 0 {
+		if len(whereStr) > 0 {
+			fmt.Fprint(&buf, " AND ", mssqlCondi)
+		} else {
+			fmt.Fprint(&buf, " WHERE ", mssqlCondi)
+		}
+	}
+
+	if statement.GroupByStr != "" {
+		fmt.Fprint(&buf, " GROUP BY ", statement.GroupByStr)
+	}
+	if statement.HavingStr != "" {
+		fmt.Fprint(&buf, " ", statement.HavingStr)
+	}
+	if needOrderBy && statement.OrderStr != "" {
+		fmt.Fprint(&buf, " ORDER BY ", statement.OrderStr)
+	}
+	if needLimit {
+		if dialect.URI().DBType != schemas.MSSQL && dialect.URI().DBType != schemas.ORACLE {
+			if statement.Start > 0 {
+				if pLimitN != nil {
+					fmt.Fprintf(&buf, " LIMIT %v OFFSET %v", *pLimitN, statement.Start)
+				} else {
+					fmt.Fprintf(&buf, "LIMIT 0 OFFSET %v", statement.Start)
+				}
+			} else if pLimitN != nil {
+				fmt.Fprint(&buf, " LIMIT ", *pLimitN)
+			}
+		} else if dialect.URI().DBType == schemas.ORACLE {
+			if statement.Start != 0 && pLimitN != nil {
+				oldString := buf.String()
+				buf.Reset()
+				rawColStr := columnStr
+				if rawColStr == "*" {
+					rawColStr = "at.*"
+				}
+				fmt.Fprintf(&buf, "SELECT %v FROM (SELECT %v,ROWNUM RN FROM (%v) at WHERE ROWNUM <= %d) aat WHERE RN > %d",
+					columnStr, rawColStr, oldString, statement.Start+*pLimitN, statement.Start)
+			}
+		}
+	}
+	if statement.IsForUpdate {
+		return dialect.ForUpdateSQL(buf.String()), condArgs, nil
+	}
+
+	return buf.String(), condArgs, nil
 }
 
 // GenExistSQL generates Exist SQL
@@ -292,6 +342,10 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
 		return statement.GenRawSQL(), statement.RawParams, nil
 	}
 
+	var sqlStr string
+	var args []interface{}
+	var joinStr string
+	var err error
 	var b interface{}
 	if len(bean) > 0 {
 		b = bean[0]
@@ -310,87 +364,45 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
 	if len(tableName) <= 0 {
 		return "", nil, ErrTableNotFound
 	}
-	if statement.RefTable != nil {
-		return statement.Limit(1).GenGetSQL(b)
-	}
+	if statement.RefTable == nil {
+		tableName = statement.quote(tableName)
+		if len(statement.JoinStr) > 0 {
+			joinStr = statement.JoinStr
+		}
 
-	tableName = statement.quote(tableName)
-
-	buf := builder.NewWriter()
-	if statement.dialect.URI().DBType == schemas.MSSQL {
-		if _, err := fmt.Fprintf(buf, "SELECT TOP 1 * FROM %s", tableName); err != nil {
-			return "", nil, err
-		}
-		if err := statement.writeJoins(buf); err != nil {
-			return "", nil, err
-		}
-		if err := statement.writeWhere(buf); err != nil {
-			return "", nil, err
-		}
-	} else if statement.dialect.URI().DBType == schemas.ORACLE {
-		if _, err := fmt.Fprintf(buf, "SELECT * FROM %s", tableName); err != nil {
-			return "", nil, err
-		}
-		if err := statement.writeJoins(buf); err != nil {
-			return "", nil, err
-		}
-		if _, err := fmt.Fprintf(buf, " WHERE "); err != nil {
-			return "", nil, err
-		}
 		if statement.Conds().IsValid() {
-			if err := statement.Conds().WriteTo(statement.QuoteReplacer(buf)); err != nil {
+			condSQL, condArgs, err := statement.GenCondSQL(statement.Conds())
+			if err != nil {
 				return "", nil, err
 			}
-			if _, err := fmt.Fprintf(buf, " AND "); err != nil {
-				return "", nil, err
+
+			if statement.dialect.URI().DBType == schemas.MSSQL {
+				sqlStr = fmt.Sprintf("SELECT TOP 1 * FROM %s %s WHERE %s", tableName, joinStr, condSQL)
+			} else if statement.dialect.URI().DBType == schemas.ORACLE {
+				sqlStr = fmt.Sprintf("SELECT * FROM %s WHERE (%s) %s AND ROWNUM=1", tableName, joinStr, condSQL)
+			} else {
+				sqlStr = fmt.Sprintf("SELECT * FROM %s %s WHERE %s LIMIT 1", tableName, joinStr, condSQL)
 			}
-		}
-		if _, err := fmt.Fprintf(buf, "ROWNUM=1"); err != nil {
-			return "", nil, err
+			args = condArgs
+		} else {
+			if statement.dialect.URI().DBType == schemas.MSSQL {
+				sqlStr = fmt.Sprintf("SELECT TOP 1 * FROM %s %s", tableName, joinStr)
+			} else if statement.dialect.URI().DBType == schemas.ORACLE {
+				sqlStr = fmt.Sprintf("SELECT * FROM  %s %s WHERE ROWNUM=1", tableName, joinStr)
+			} else {
+				sqlStr = fmt.Sprintf("SELECT * FROM %s %s LIMIT 1", tableName, joinStr)
+			}
+			args = []interface{}{}
 		}
 	} else {
-		if _, err := fmt.Fprintf(buf, "SELECT 1 FROM %s", tableName); err != nil {
-			return "", nil, err
-		}
-		if err := statement.writeJoins(buf); err != nil {
-			return "", nil, err
-		}
-		if err := statement.writeWhere(buf); err != nil {
-			return "", nil, err
-		}
-		if _, err := fmt.Fprintf(buf, " LIMIT 1"); err != nil {
+		statement.Limit(1)
+		sqlStr, args, err = statement.GenGetSQL(b)
+		if err != nil {
 			return "", nil, err
 		}
 	}
 
-	return buf.String(), buf.Args(), nil
-}
-
-func (statement *Statement) genSelectColumnStr() string {
-	// manually select columns
-	if len(statement.SelectStr) > 0 {
-		return statement.SelectStr
-	}
-
-	columnStr := statement.ColumnStr()
-	if columnStr != "" {
-		return columnStr
-	}
-
-	// autodetect columns
-	if statement.GroupByStr != "" {
-		return statement.quoteColumnStr(statement.GroupByStr)
-	}
-
-	if len(statement.joins) != 0 {
-		return "*"
-	}
-
-	columnStr = statement.genColumnStr()
-	if columnStr == "" {
-		columnStr = "*"
-	}
-	return columnStr
+	return sqlStr, args, nil
 }
 
 // GenFindSQL generates Find SQL
@@ -399,15 +411,52 @@ func (statement *Statement) GenFindSQL(autoCond builder.Cond) (string, []interfa
 		return statement.GenRawSQL(), statement.RawParams, nil
 	}
 
+	var sqlStr string
+	var args []interface{}
+	var err error
+
 	if len(statement.TableName()) <= 0 {
 		return "", nil, ErrTableNotFound
 	}
 
+	var columnStr = statement.ColumnStr()
+	if len(statement.SelectStr) > 0 {
+		columnStr = statement.SelectStr
+	} else {
+		if statement.JoinStr == "" {
+			if columnStr == "" {
+				if statement.GroupByStr != "" {
+					columnStr = statement.quoteColumnStr(statement.GroupByStr)
+				} else {
+					columnStr = statement.genColumnStr()
+				}
+			}
+		} else {
+			if columnStr == "" {
+				if statement.GroupByStr != "" {
+					columnStr = statement.quoteColumnStr(statement.GroupByStr)
+				} else {
+					columnStr = "*"
+				}
+			}
+		}
+		if columnStr == "" {
+			columnStr = "*"
+		}
+	}
+
 	statement.cond = statement.cond.And(autoCond)
 
-	buf := builder.NewWriter()
-	if err := statement.writeSelect(buf, statement.genSelectColumnStr(), false); err != nil {
+	sqlStr, condArgs, err := statement.genSelectSQL(columnStr, true, true)
+	if err != nil {
 		return "", nil, err
 	}
-	return buf.String(), buf.Args(), nil
+	args = append(statement.joinArgs, condArgs...)
+	// for mssql and use limit
+	qs := strings.Count(sqlStr, "?")
+	if len(args)*2 == qs {
+		args = append(args, args...)
+	}
+
+	return sqlStr, args, nil
 }
diff --git a/vendor/xorm.io/xorm/internal/statements/select.go b/vendor/xorm.io/xorm/internal/statements/select.go
deleted file mode 100644
index 59161d7..0000000
--- a/vendor/xorm.io/xorm/internal/statements/select.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"fmt"
-	"strings"
-
-	"xorm.io/xorm/schemas"
-)
-
-// Select replace select
-func (statement *Statement) Select(str string) *Statement {
-	statement.SelectStr = statement.ReplaceQuote(str)
-	return statement
-}
-
-func col2NewCols(columns ...string) []string {
-	newColumns := make([]string, 0, len(columns))
-	for _, col := range columns {
-		col = strings.Replace(col, "`", "", -1)
-		col = strings.Replace(col, `"`, "", -1)
-		ccols := strings.Split(col, ",")
-		for _, c := range ccols {
-			newColumns = append(newColumns, strings.TrimSpace(c))
-		}
-	}
-	return newColumns
-}
-
-// Cols generate "col1, col2" statement
-func (statement *Statement) Cols(columns ...string) *Statement {
-	cols := col2NewCols(columns...)
-	for _, nc := range cols {
-		statement.ColumnMap.Add(nc)
-	}
-	return statement
-}
-
-// ColumnStr returns column string
-func (statement *Statement) ColumnStr() string {
-	return statement.dialect.Quoter().Join(statement.ColumnMap, ", ")
-}
-
-// AllCols update use only: update all columns
-func (statement *Statement) AllCols() *Statement {
-	statement.useAllCols = true
-	return statement
-}
-
-// MustCols update use only: must update columns
-func (statement *Statement) MustCols(columns ...string) *Statement {
-	newColumns := col2NewCols(columns...)
-	for _, nc := range newColumns {
-		statement.MustColumnMap[strings.ToLower(nc)] = true
-	}
-	return statement
-}
-
-// UseBool indicates that use bool fields as update contents and query contiditions
-func (statement *Statement) UseBool(columns ...string) *Statement {
-	if len(columns) > 0 {
-		statement.MustCols(columns...)
-	} else {
-		statement.allUseBool = true
-	}
-	return statement
-}
-
-// Omit do not use the columns
-func (statement *Statement) Omit(columns ...string) {
-	newColumns := col2NewCols(columns...)
-	for _, nc := range newColumns {
-		statement.OmitColumnMap = append(statement.OmitColumnMap, nc)
-	}
-}
-
-func (statement *Statement) genColumnStr() string {
-	if statement.RefTable == nil {
-		return ""
-	}
-
-	var buf strings.Builder
-	columns := statement.RefTable.Columns()
-
-	for _, col := range columns {
-		if statement.OmitColumnMap.Contain(col.Name) {
-			continue
-		}
-
-		if len(statement.ColumnMap) > 0 && !statement.ColumnMap.Contain(col.Name) {
-			continue
-		}
-
-		if col.MapType == schemas.ONLYTODB {
-			continue
-		}
-
-		if buf.Len() != 0 {
-			buf.WriteString(", ")
-		}
-
-		if len(statement.joins) > 0 {
-			if statement.TableAlias != "" {
-				buf.WriteString(statement.TableAlias)
-			} else {
-				buf.WriteString(statement.TableName())
-			}
-
-			buf.WriteString(".")
-		}
-
-		statement.dialect.Quoter().QuoteTo(&buf, col.Name)
-	}
-
-	return buf.String()
-}
-
-func (statement *Statement) colName(col *schemas.Column, tableName string) string {
-	if statement.NeedTableName() {
-		nm := tableName
-		if len(statement.TableAlias) > 0 {
-			nm = statement.TableAlias
-		}
-		return fmt.Sprintf("%s.%s", statement.quote(nm), statement.quote(col.Name))
-	}
-	return statement.quote(col.Name)
-}
-
-// Distinct generates "DISTINCT col1, col2 " statement
-func (statement *Statement) Distinct(columns ...string) *Statement {
-	statement.IsDistinct = true
-	statement.Cols(columns...)
-	return statement
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/statement.go b/vendor/xorm.io/xorm/internal/statements/statement.go
index 734cc19..1fcc0bb 100644
--- a/vendor/xorm.io/xorm/internal/statements/statement.go
+++ b/vendor/xorm.io/xorm/internal/statements/statement.go
@@ -34,19 +34,6 @@ var (
 	ErrTableNotFound = errors.New("Table not found")
 )
 
-type join struct {
-	op        string
-	table     interface{}
-	condition interface{}
-	args      []interface{}
-}
-
-type indexHint struct {
-	op        string
-	forType   string
-	indexName string
-}
-
 // Statement save all the sql info for executing SQL
 type Statement struct {
 	RefTable        *schemas.Table
@@ -56,8 +43,9 @@ type Statement struct {
 	Start           int
 	LimitN          *int
 	idParam         schemas.PK
-	orderBy         []orderBy
-	joins           []join
+	OrderStr        string
+	JoinStr         string
+	joinArgs        []interface{}
 	GroupByStr      string
 	HavingStr       string
 	SelectStr       string
@@ -90,7 +78,6 @@ type Statement struct {
 	BufferSize      int
 	Context         contexts.ContextCache
 	LastError       error
-	indexHints      []indexHint
 }
 
 // NewStatement creates a new statement
@@ -114,6 +101,15 @@ func (statement *Statement) GenRawSQL() string {
 	return statement.ReplaceQuote(statement.RawSQL)
 }
 
+// GenCondSQL generates condition SQL
+func (statement *Statement) GenCondSQL(condOrBuilder interface{}) (string, []interface{}, error) {
+	condSQL, condArgs, err := builder.ToSQL(condOrBuilder)
+	if err != nil {
+		return "", nil, err
+	}
+	return statement.ReplaceQuote(condSQL), condArgs, nil
+}
+
 // ReplaceQuote replace sql key words with quote
 func (statement *Statement) ReplaceQuote(sql string) string {
 	if sql == "" || statement.dialect.URI().DBType == schemas.MYSQL ||
@@ -133,9 +129,10 @@ func (statement *Statement) Reset() {
 	statement.RefTable = nil
 	statement.Start = 0
 	statement.LimitN = nil
-	statement.ResetOrderBy()
+	statement.OrderStr = ""
 	statement.UseCascade = true
-	statement.joins = nil
+	statement.JoinStr = ""
+	statement.joinArgs = make([]interface{}, 0)
 	statement.GroupByStr = ""
 	statement.HavingStr = ""
 	statement.ColumnMap = columnMap{}
@@ -167,17 +164,32 @@ func (statement *Statement) Reset() {
 	statement.LastError = nil
 }
 
+// SetNoAutoCondition if you do not want convert bean's field as query condition, then use this function
+func (statement *Statement) SetNoAutoCondition(no ...bool) *Statement {
+	statement.NoAutoCondition = true
+	if len(no) > 0 {
+		statement.NoAutoCondition = no[0]
+	}
+	return statement
+}
+
+// Alias set the table alias
+func (statement *Statement) Alias(alias string) *Statement {
+	statement.TableAlias = alias
+	return statement
+}
+
 // SQL adds raw sql statement
 func (statement *Statement) SQL(query interface{}, args ...interface{}) *Statement {
-	switch t := query.(type) {
-	case *builder.Builder:
+	switch query.(type) {
+	case (*builder.Builder):
 		var err error
-		statement.RawSQL, statement.RawParams, err = t.ToSQL()
+		statement.RawSQL, statement.RawParams, err = query.(*builder.Builder).ToSQL()
 		if err != nil {
 			statement.LastError = err
 		}
 	case string:
-		statement.RawSQL = t
+		statement.RawSQL = query.(string)
 		statement.RawParams = args
 	default:
 		statement.LastError = ErrUnSupportedSQLType
@@ -186,10 +198,80 @@ func (statement *Statement) SQL(query interface{}, args ...interface{}) *Stateme
 	return statement
 }
 
+// Where add Where statement
+func (statement *Statement) Where(query interface{}, args ...interface{}) *Statement {
+	return statement.And(query, args...)
+}
+
 func (statement *Statement) quote(s string) string {
 	return statement.dialect.Quoter().Quote(s)
 }
 
+// And add Where & and statement
+func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
+	switch qr := query.(type) {
+	case string:
+		cond := builder.Expr(qr, args...)
+		statement.cond = statement.cond.And(cond)
+	case map[string]interface{}:
+		cond := make(builder.Eq)
+		for k, v := range qr {
+			cond[statement.quote(k)] = v
+		}
+		statement.cond = statement.cond.And(cond)
+	case builder.Cond:
+		statement.cond = statement.cond.And(qr)
+		for _, v := range args {
+			if vv, ok := v.(builder.Cond); ok {
+				statement.cond = statement.cond.And(vv)
+			}
+		}
+	default:
+		statement.LastError = ErrConditionType
+	}
+
+	return statement
+}
+
+// Or add Where & Or statement
+func (statement *Statement) Or(query interface{}, args ...interface{}) *Statement {
+	switch qr := query.(type) {
+	case string:
+		cond := builder.Expr(qr, args...)
+		statement.cond = statement.cond.Or(cond)
+	case map[string]interface{}:
+		cond := make(builder.Eq)
+		for k, v := range qr {
+			cond[statement.quote(k)] = v
+		}
+		statement.cond = statement.cond.Or(cond)
+	case builder.Cond:
+		statement.cond = statement.cond.Or(qr)
+		for _, v := range args {
+			if vv, ok := v.(builder.Cond); ok {
+				statement.cond = statement.cond.Or(vv)
+			}
+		}
+	default:
+		statement.LastError = ErrConditionType
+	}
+	return statement
+}
+
+// In generate "Where column IN (?) " statement
+func (statement *Statement) In(column string, args ...interface{}) *Statement {
+	in := builder.In(statement.quote(column), args...)
+	statement.cond = statement.cond.And(in)
+	return statement
+}
+
+// NotIn generate "Where column NOT IN (?) " statement
+func (statement *Statement) NotIn(column string, args ...interface{}) *Statement {
+	notIn := builder.NotIn(statement.quote(column), args...)
+	statement.cond = statement.cond.And(notIn)
+	return statement
+}
+
 // SetRefValue set ref value
 func (statement *Statement) SetRefValue(v reflect.Value) error {
 	var err error
@@ -216,8 +298,28 @@ func (statement *Statement) SetRefBean(bean interface{}) error {
 	return nil
 }
 
-func (statement *Statement) NeedTableName() bool {
-	return len(statement.joins) > 0
+func (statement *Statement) needTableName() bool {
+	return len(statement.JoinStr) > 0
+}
+
+func (statement *Statement) colName(col *schemas.Column, tableName string) string {
+	if statement.needTableName() {
+		var nm = tableName
+		if len(statement.TableAlias) > 0 {
+			nm = statement.TableAlias
+		}
+		return statement.quote(nm) + "." + statement.quote(col.Name)
+	}
+	return statement.quote(col.Name)
+}
+
+// TableName return current tableName
+func (statement *Statement) TableName() string {
+	if statement.AltTableName != "" {
+		return statement.AltTableName
+	}
+
+	return statement.tableName
 }
 
 // Incr Generate  "Update ... Set column = column + arg" statement
@@ -250,12 +352,85 @@ func (statement *Statement) SetExpr(column string, expression interface{}) *Stat
 	return statement
 }
 
+// Distinct generates "DISTINCT col1, col2 " statement
+func (statement *Statement) Distinct(columns ...string) *Statement {
+	statement.IsDistinct = true
+	statement.Cols(columns...)
+	return statement
+}
+
 // ForUpdate generates "SELECT ... FOR UPDATE" statement
 func (statement *Statement) ForUpdate() *Statement {
 	statement.IsForUpdate = true
 	return statement
 }
 
+// Select replace select
+func (statement *Statement) Select(str string) *Statement {
+	statement.SelectStr = statement.ReplaceQuote(str)
+	return statement
+}
+
+func col2NewCols(columns ...string) []string {
+	newColumns := make([]string, 0, len(columns))
+	for _, col := range columns {
+		col = strings.Replace(col, "`", "", -1)
+		col = strings.Replace(col, `"`, "", -1)
+		ccols := strings.Split(col, ",")
+		for _, c := range ccols {
+			newColumns = append(newColumns, strings.TrimSpace(c))
+		}
+	}
+	return newColumns
+}
+
+// Cols generate "col1, col2" statement
+func (statement *Statement) Cols(columns ...string) *Statement {
+	cols := col2NewCols(columns...)
+	for _, nc := range cols {
+		statement.ColumnMap.Add(nc)
+	}
+	return statement
+}
+
+// ColumnStr returns column string
+func (statement *Statement) ColumnStr() string {
+	return statement.dialect.Quoter().Join(statement.ColumnMap, ", ")
+}
+
+// AllCols update use only: update all columns
+func (statement *Statement) AllCols() *Statement {
+	statement.useAllCols = true
+	return statement
+}
+
+// MustCols update use only: must update columns
+func (statement *Statement) MustCols(columns ...string) *Statement {
+	newColumns := col2NewCols(columns...)
+	for _, nc := range newColumns {
+		statement.MustColumnMap[strings.ToLower(nc)] = true
+	}
+	return statement
+}
+
+// UseBool indicates that use bool fields as update contents and query contiditions
+func (statement *Statement) UseBool(columns ...string) *Statement {
+	if len(columns) > 0 {
+		statement.MustCols(columns...)
+	} else {
+		statement.allUseBool = true
+	}
+	return statement
+}
+
+// Omit do not use the columns
+func (statement *Statement) Omit(columns ...string) {
+	newColumns := col2NewCols(columns...)
+	for _, nc := range newColumns {
+		statement.OmitColumnMap = append(statement.OmitColumnMap, nc)
+	}
+}
+
 // Nullable Update use only: update columns to null when value is nullable and zero-value
 func (statement *Statement) Nullable(columns ...string) {
 	newColumns := col2NewCols(columns...)
@@ -279,6 +454,54 @@ func (statement *Statement) Limit(limit int, start ...int) *Statement {
 	return statement
 }
 
+// OrderBy generate "Order By order" statement
+func (statement *Statement) OrderBy(order string) *Statement {
+	if len(statement.OrderStr) > 0 {
+		statement.OrderStr += ", "
+	}
+	statement.OrderStr += statement.ReplaceQuote(order)
+	return statement
+}
+
+// Desc generate `ORDER BY xx DESC`
+func (statement *Statement) Desc(colNames ...string) *Statement {
+	var buf strings.Builder
+	if len(statement.OrderStr) > 0 {
+		fmt.Fprint(&buf, statement.OrderStr, ", ")
+	}
+	for i, col := range colNames {
+		if i > 0 {
+			fmt.Fprint(&buf, ", ")
+		}
+		statement.dialect.Quoter().QuoteTo(&buf, col)
+		fmt.Fprint(&buf, " DESC")
+	}
+	statement.OrderStr = buf.String()
+	return statement
+}
+
+// Asc provide asc order by query condition, the input parameters are columns.
+func (statement *Statement) Asc(colNames ...string) *Statement {
+	var buf strings.Builder
+	if len(statement.OrderStr) > 0 {
+		fmt.Fprint(&buf, statement.OrderStr, ", ")
+	}
+	for i, col := range colNames {
+		if i > 0 {
+			fmt.Fprint(&buf, ", ")
+		}
+		statement.dialect.Quoter().QuoteTo(&buf, col)
+		fmt.Fprint(&buf, " ASC")
+	}
+	statement.OrderStr = buf.String()
+	return statement
+}
+
+// Conds returns condtions
+func (statement *Statement) Conds() builder.Cond {
+	return statement.cond
+}
+
 // SetTable tempororily set table name, the parameter could be a string or a pointer of struct
 func (statement *Statement) SetTable(tableNameOrBean interface{}) error {
 	v := rValue(tableNameOrBean)
@@ -295,34 +518,78 @@ func (statement *Statement) SetTable(tableNameOrBean interface{}) error {
 	return nil
 }
 
+// Join The joinOP should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN
+func (statement *Statement) Join(joinOP string, tablename interface{}, condition string, args ...interface{}) *Statement {
+	var buf strings.Builder
+	if len(statement.JoinStr) > 0 {
+		fmt.Fprintf(&buf, "%v %v JOIN ", statement.JoinStr, joinOP)
+	} else {
+		fmt.Fprintf(&buf, "%v JOIN ", joinOP)
+	}
+
+	switch tp := tablename.(type) {
+	case builder.Builder:
+		subSQL, subQueryArgs, err := tp.ToSQL()
+		if err != nil {
+			statement.LastError = err
+			return statement
+		}
+
+		fields := strings.Split(tp.TableName(), ".")
+		aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
+		aliasName = schemas.CommonQuoter.Trim(aliasName)
+
+		fmt.Fprintf(&buf, "(%s) %s ON %v", statement.ReplaceQuote(subSQL), aliasName, statement.ReplaceQuote(condition))
+		statement.joinArgs = append(statement.joinArgs, subQueryArgs...)
+	case *builder.Builder:
+		subSQL, subQueryArgs, err := tp.ToSQL()
+		if err != nil {
+			statement.LastError = err
+			return statement
+		}
+
+		fields := strings.Split(tp.TableName(), ".")
+		aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
+		aliasName = schemas.CommonQuoter.Trim(aliasName)
+
+		fmt.Fprintf(&buf, "(%s) %s ON %v", statement.ReplaceQuote(subSQL), aliasName, statement.ReplaceQuote(condition))
+		statement.joinArgs = append(statement.joinArgs, subQueryArgs...)
+	default:
+		tbName := dialects.FullTableName(statement.dialect, statement.tagParser.GetTableMapper(), tablename, true)
+		if !utils.IsSubQuery(tbName) {
+			var buf strings.Builder
+			statement.dialect.Quoter().QuoteTo(&buf, tbName)
+			tbName = buf.String()
+		}
+		fmt.Fprintf(&buf, "%s ON %v", tbName, statement.ReplaceQuote(condition))
+	}
+
+	statement.JoinStr = buf.String()
+	statement.joinArgs = append(statement.joinArgs, args...)
+	return statement
+}
+
+// tbNameNoSchema get some table's table name
+func (statement *Statement) tbNameNoSchema(table *schemas.Table) string {
+	if len(statement.AltTableName) > 0 {
+		return statement.AltTableName
+	}
+
+	return table.Name
+}
+
 // GroupBy generate "Group By keys" statement
 func (statement *Statement) GroupBy(keys string) *Statement {
 	statement.GroupByStr = statement.ReplaceQuote(keys)
 	return statement
 }
 
-func (statement *Statement) writeGroupBy(w *builder.BytesWriter) error {
-	if statement.GroupByStr == "" {
-		return nil
-	}
-	_, err := fmt.Fprint(w, " GROUP BY ", statement.GroupByStr)
-	return err
-}
-
 // Having generate "Having conditions" statement
 func (statement *Statement) Having(conditions string) *Statement {
-	statement.HavingStr = conditions
+	statement.HavingStr = fmt.Sprintf("HAVING %v", statement.ReplaceQuote(conditions))
 	return statement
 }
 
-func (statement *Statement) writeHaving(w *builder.BytesWriter) error {
-	if statement.HavingStr == "" {
-		return nil
-	}
-	_, err := fmt.Fprint(w, " HAVING ", statement.ReplaceQuote(statement.HavingStr))
-	return err
-}
-
 // SetUnscoped always disable struct tag "deleted"
 func (statement *Statement) SetUnscoped() *Statement {
 	statement.unscoped = true
@@ -334,6 +601,55 @@ func (statement *Statement) GetUnscoped() bool {
 	return statement.unscoped
 }
 
+func (statement *Statement) genColumnStr() string {
+	if statement.RefTable == nil {
+		return ""
+	}
+
+	var buf strings.Builder
+	columns := statement.RefTable.Columns()
+
+	for _, col := range columns {
+		if statement.OmitColumnMap.Contain(col.Name) {
+			continue
+		}
+
+		if len(statement.ColumnMap) > 0 && !statement.ColumnMap.Contain(col.Name) {
+			continue
+		}
+
+		if col.MapType == schemas.ONLYTODB {
+			continue
+		}
+
+		if buf.Len() != 0 {
+			buf.WriteString(", ")
+		}
+
+		if statement.JoinStr != "" {
+			if statement.TableAlias != "" {
+				buf.WriteString(statement.TableAlias)
+			} else {
+				buf.WriteString(statement.TableName())
+			}
+
+			buf.WriteString(".")
+		}
+
+		statement.dialect.Quoter().QuoteTo(&buf, col.Name)
+	}
+
+	return buf.String()
+}
+
+// GenCreateTableSQL generated create table SQL
+func (statement *Statement) GenCreateTableSQL() []string {
+	statement.RefTable.StoreEngine = statement.StoreEngine
+	statement.RefTable.Charset = statement.Charset
+	s, _ := statement.dialect.CreateTableSQL(statement.RefTable, statement.TableName())
+	return s
+}
+
 // GenIndexSQL generated create index SQL
 func (statement *Statement) GenIndexSQL() []string {
 	var sqls []string
@@ -464,7 +780,7 @@ func (statement *Statement) asDBCond(fieldValue reflect.Value, fieldType reflect
 				if len(table.PrimaryKeys) == 1 {
 					pkField := reflect.Indirect(fieldValue).FieldByName(table.PKColumns()[0].FieldName)
 					// fix non-int pk issues
-					// if pkField.Int() != 0 {
+					//if pkField.Int() != 0 {
 					if pkField.IsValid() && !utils.IsZero(pkField.Interface()) {
 						return pkField.Interface(), true, nil
 					}
@@ -513,8 +829,7 @@ func (statement *Statement) asDBCond(fieldValue reflect.Value, fieldType reflect
 func (statement *Statement) buildConds2(table *schemas.Table, bean interface{},
 	includeVersion bool, includeUpdated bool, includeNil bool,
 	includeAutoIncr bool, allUseBool bool, useAllCols bool, unscoped bool,
-	mustColumnMap map[string]bool, tableName, aliasName string, addedTableName bool,
-) (builder.Cond, error) {
+	mustColumnMap map[string]bool, tableName, aliasName string, addedTableName bool) (builder.Cond, error) {
 	var conds []builder.Cond
 	for _, col := range table.Columns() {
 		if !includeVersion && col.IsVersion {
@@ -527,13 +842,17 @@ func (statement *Statement) buildConds2(table *schemas.Table, bean interface{},
 			continue
 		}
 
+		if statement.dialect.URI().DBType == schemas.MSSQL && (col.SQLType.Name == schemas.Text ||
+			col.SQLType.IsBlob() || col.SQLType.Name == schemas.TimeStampz) {
+			continue
+		}
 		if col.IsJSON {
 			continue
 		}
 
 		var colName string
 		if addedTableName {
-			nm := tableName
+			var nm = tableName
 			if len(aliasName) > 0 {
 				nm = aliasName
 			}
@@ -544,6 +863,9 @@ func (statement *Statement) buildConds2(table *schemas.Table, bean interface{},
 
 		fieldValuePtr, err := col.ValueOf(bean)
 		if err != nil {
+			if !strings.Contains(err.Error(), "is not valid") {
+				//engine.logger.Warn(err)
+			}
 			continue
 		} else if fieldValuePtr == nil {
 			continue
@@ -558,15 +880,6 @@ func (statement *Statement) buildConds2(table *schemas.Table, bean interface{},
 			continue
 		}
 
-		if statement.dialect.URI().DBType == schemas.MSSQL && (col.SQLType.Name == schemas.Text ||
-			col.SQLType.IsBlob() || col.SQLType.Name == schemas.TimeStampz) {
-			if utils.IsValueZero(fieldValue) {
-				continue
-			}
-
-			return nil, fmt.Errorf("column %s is a TEXT type with data %#v which cannot be as compare condition", col.Name, fieldValue.Interface())
-		}
-
 		requiredField := useAllCols
 		if b, ok := getFlagForColumn(mustColumnMap, col); ok {
 			if b {
@@ -613,10 +926,9 @@ func (statement *Statement) BuildConds(table *schemas.Table, bean interface{}, i
 		statement.unscoped, statement.MustColumnMap, statement.TableName(), statement.TableAlias, addedTableName)
 }
 
-// MergeConds merge conditions from bean and id
-func (statement *Statement) MergeConds(bean interface{}) error {
+func (statement *Statement) mergeConds(bean interface{}) error {
 	if !statement.NoAutoCondition && statement.RefTable != nil {
-		addedTableName := len(statement.joins) > 0
+		var addedTableName = (len(statement.JoinStr) > 0)
 		autoCond, err := statement.BuildConds(statement.RefTable, bean, true, true, false, true, addedTableName)
 		if err != nil {
 			return err
@@ -627,6 +939,15 @@ func (statement *Statement) MergeConds(bean interface{}) error {
 	return statement.ProcessIDParam()
 }
 
+// GenConds generates conditions
+func (statement *Statement) GenConds(bean interface{}) (string, []interface{}, error) {
+	if err := statement.mergeConds(bean); err != nil {
+		return "", nil, err
+	}
+
+	return statement.GenCondSQL(statement.cond)
+}
+
 func (statement *Statement) quoteColumnStr(columnStr string) string {
 	columns := strings.Split(columnStr, ",")
 	return statement.dialect.Quoter().Join(columns, ",")
@@ -645,29 +966,12 @@ func (statement *Statement) convertSQLOrArgs(sqlOrArgs ...interface{}) (string,
 	switch sqlOrArgs[0].(type) {
 	case string:
 		if len(sqlOrArgs) > 1 {
-			newArgs := make([]interface{}, 0, len(sqlOrArgs)-1)
+			var newArgs = make([]interface{}, 0, len(sqlOrArgs)-1)
 			for _, arg := range sqlOrArgs[1:] {
-				if v, ok := arg.(time.Time); ok {
+				if v, ok := arg.(*time.Time); ok {
 					newArgs = append(newArgs, v.In(statement.defaultTimeZone).Format("2006-01-02 15:04:05"))
-				} else if v, ok := arg.(*time.Time); ok && v != nil {
+				} else if v, ok := arg.(time.Time); ok {
 					newArgs = append(newArgs, v.In(statement.defaultTimeZone).Format("2006-01-02 15:04:05"))
-				} else if v, ok := arg.(convert.ConversionTo); ok {
-					r, err := v.ToDB()
-					if err != nil {
-						return "", nil, err
-					}
-					if r != nil {
-						// for nvarchar column on mssql, bytes have to be converted as ucs-2 external of driver
-						// for binary column, a string will be converted as bytes directly. So we have to
-						// convert bytes as string
-						if statement.dialect.URI().DBType == schemas.MSSQL {
-							newArgs = append(newArgs, string(r))
-						} else {
-							newArgs = append(newArgs, r)
-						}
-					} else {
-						newArgs = append(newArgs, nil)
-					}
 				} else {
 					newArgs = append(newArgs, arg)
 				}
@@ -686,7 +990,7 @@ func (statement *Statement) convertSQLOrArgs(sqlOrArgs ...interface{}) (string,
 }
 
 func (statement *Statement) joinColumns(cols []*schemas.Column, includeTableName bool) string {
-	colnames := make([]string, len(cols))
+	var colnames = make([]string, len(cols))
 	for i, col := range cols {
 		if includeTableName {
 			colnames[i] = statement.quote(statement.TableName()) +
@@ -700,8 +1004,8 @@ func (statement *Statement) joinColumns(cols []*schemas.Column, includeTableName
 
 // CondDeleted returns the conditions whether a record is soft deleted.
 func (statement *Statement) CondDeleted(col *schemas.Column) builder.Cond {
-	colName := statement.quote(col.Name)
-	if len(statement.joins) > 0 {
+	var colName = statement.quote(col.Name)
+	if statement.JoinStr != "" {
 		var prefix string
 		if statement.TableAlias != "" {
 			prefix = statement.TableAlias
@@ -710,17 +1014,14 @@ func (statement *Statement) CondDeleted(col *schemas.Column) builder.Cond {
 		}
 		colName = statement.quote(prefix) + "." + statement.quote(col.Name)
 	}
-	cond := builder.NewCond()
+	var cond = builder.NewCond()
 	if col.SQLType.IsNumeric() {
 		cond = builder.Eq{colName: 0}
-	} else if col.SQLType.Name == schemas.TimeStamp || col.SQLType.Name == schemas.TimeStampz {
-		tmZone := statement.defaultTimeZone
-		if col.TimeZone != nil {
-			tmZone = col.TimeZone
-		}
-		cond = builder.Eq{colName: time.Unix(0, 0).In(tmZone).Format("2006-01-02 15:04:05.999999999")}
 	} else {
-		cond = builder.Eq{colName: utils.ZeroTime1}
+		// FIXME: mssql: The conversion of a nvarchar data type to a datetime data type resulted in an out-of-range value.
+		if statement.dialect.URI().DBType != schemas.MSSQL {
+			cond = builder.Eq{colName: utils.ZeroTime1}
+		}
 	}
 
 	if col.Nullable {
diff --git a/vendor/xorm.io/xorm/internal/statements/statement_args.go b/vendor/xorm.io/xorm/internal/statements/statement_args.go
new file mode 100644
index 0000000..64089c1
--- /dev/null
+++ b/vendor/xorm.io/xorm/internal/statements/statement_args.go
@@ -0,0 +1,134 @@
+// Copyright 2019 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package statements
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"time"
+
+	"xorm.io/builder"
+	"xorm.io/xorm/schemas"
+)
+
+func quoteNeeded(a interface{}) bool {
+	switch a.(type) {
+	case int, int8, int16, int32, int64:
+		return false
+	case uint, uint8, uint16, uint32, uint64:
+		return false
+	case float32, float64:
+		return false
+	case bool:
+		return false
+	case string:
+		return true
+	case time.Time, *time.Time:
+		return true
+	case builder.Builder, *builder.Builder:
+		return false
+	}
+
+	t := reflect.TypeOf(a)
+	switch t.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return false
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return false
+	case reflect.Float32, reflect.Float64:
+		return false
+	case reflect.Bool:
+		return false
+	case reflect.String:
+		return true
+	}
+
+	return true
+}
+
+func convertStringSingleQuote(arg string) string {
+	return "'" + strings.Replace(arg, "'", "''", -1) + "'"
+}
+
+func convertString(arg string) string {
+	var buf strings.Builder
+	buf.WriteRune('\'')
+	for _, c := range arg {
+		if c == '\\' || c == '\'' {
+			buf.WriteRune('\\')
+		}
+		buf.WriteRune(c)
+	}
+	buf.WriteRune('\'')
+	return buf.String()
+}
+
+func convertArg(arg interface{}, convertFunc func(string) string) string {
+	if quoteNeeded(arg) {
+		argv := fmt.Sprintf("%v", arg)
+		return convertFunc(argv)
+	}
+
+	return fmt.Sprintf("%v", arg)
+}
+
+const insertSelectPlaceHolder = true
+
+// WriteArg writes an arg
+func (statement *Statement) WriteArg(w *builder.BytesWriter, arg interface{}) error {
+	switch argv := arg.(type) {
+	case *builder.Builder:
+		if _, err := w.WriteString("("); err != nil {
+			return err
+		}
+		if err := argv.WriteTo(w); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(")"); err != nil {
+			return err
+		}
+	default:
+		if insertSelectPlaceHolder {
+			if err := w.WriteByte('?'); err != nil {
+				return err
+			}
+			if v, ok := arg.(bool); ok && statement.dialect.URI().DBType == schemas.MSSQL {
+				if v {
+					w.Append(1)
+				} else {
+					w.Append(0)
+				}
+			} else {
+				w.Append(arg)
+			}
+		} else {
+			var convertFunc = convertStringSingleQuote
+			if statement.dialect.URI().DBType == schemas.MYSQL {
+				convertFunc = convertString
+			}
+			if _, err := w.WriteString(convertArg(arg, convertFunc)); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+// WriteArgs writes args
+func (statement *Statement) WriteArgs(w *builder.BytesWriter, args []interface{}) error {
+	for i, arg := range args {
+		if err := statement.WriteArg(w, arg); err != nil {
+			return err
+		}
+
+		if i+1 != len(args) {
+			if _, err := w.WriteString(","); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/vendor/xorm.io/xorm/internal/statements/table_name.go b/vendor/xorm.io/xorm/internal/statements/table_name.go
deleted file mode 100644
index 1396b7d..0000000
--- a/vendor/xorm.io/xorm/internal/statements/table_name.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"fmt"
-	"strings"
-
-	"xorm.io/builder"
-	"xorm.io/xorm/schemas"
-)
-
-// TableName return current tableName
-func (statement *Statement) TableName() string {
-	if statement.AltTableName != "" {
-		return statement.AltTableName
-	}
-
-	return statement.tableName
-}
-
-// Alias set the table alias
-func (statement *Statement) Alias(alias string) *Statement {
-	statement.TableAlias = alias
-	return statement
-}
-
-func (statement *Statement) writeAlias(w *builder.BytesWriter) error {
-	if statement.TableAlias != "" {
-		if statement.dialect.URI().DBType == schemas.ORACLE {
-			if _, err := fmt.Fprint(w, " ", statement.quote(statement.TableAlias)); err != nil {
-				return err
-			}
-		} else {
-			if _, err := fmt.Fprint(w, " AS ", statement.quote(statement.TableAlias)); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) writeTableName(w *builder.BytesWriter) error {
-	if statement.dialect.URI().DBType == schemas.MSSQL && strings.Contains(statement.TableName(), "..") {
-		if _, err := fmt.Fprint(w, statement.TableName()); err != nil {
-			return err
-		}
-	} else {
-		if _, err := fmt.Fprint(w, statement.quote(statement.TableName())); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/update.go b/vendor/xorm.io/xorm/internal/statements/update.go
index 34c6111..40159e0 100644
--- a/vendor/xorm.io/xorm/internal/statements/update.go
+++ b/vendor/xorm.io/xorm/internal/statements/update.go
@@ -11,7 +11,6 @@ import (
 	"reflect"
 	"time"
 
-	"xorm.io/builder"
 	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
 	"xorm.io/xorm/internal/json"
@@ -20,8 +19,7 @@ import (
 )
 
 func (statement *Statement) ifAddColUpdate(col *schemas.Column, includeVersion, includeUpdated, includeNil,
-	includeAutoIncr, update bool,
-) (bool, error) {
+	includeAutoIncr, update bool) (bool, error) {
 	columnMap := statement.ColumnMap
 	omitColumnMap := statement.OmitColumnMap
 	unscoped := statement.unscoped
@@ -66,16 +64,15 @@ func (statement *Statement) ifAddColUpdate(col *schemas.Column, includeVersion,
 // BuildUpdates auto generating update columnes and values according a struct
 func (statement *Statement) BuildUpdates(tableValue reflect.Value,
 	includeVersion, includeUpdated, includeNil,
-	includeAutoIncr, update bool,
-) ([]string, []interface{}, error) {
+	includeAutoIncr, update bool) ([]string, []interface{}, error) {
 	table := statement.RefTable
 	allUseBool := statement.allUseBool
 	useAllCols := statement.useAllCols
 	mustColumnMap := statement.MustColumnMap
 	nullableMap := statement.NullableMap
 
-	colNames := make([]string, 0)
-	args := make([]interface{}, 0)
+	var colNames = make([]string, 0)
+	var args = make([]interface{}, 0)
 
 	for _, col := range table.Columns() {
 		ok, err := statement.ifAddColUpdate(col, includeVersion, includeUpdated, includeNil,
@@ -126,9 +123,6 @@ func (statement *Statement) BuildUpdates(tableValue reflect.Value,
 
 		if fieldValue.CanAddr() {
 			if structConvert, ok := fieldValue.Addr().Interface().(convert.Conversion); ok {
-				if utils.IsZero(fieldValue.Interface()) {
-					continue
-				}
 				data, err := structConvert.ToDB()
 				if err != nil {
 					return nil, nil, err
@@ -312,446 +306,3 @@ func (statement *Statement) BuildUpdates(tableValue reflect.Value,
 
 	return colNames, args, nil
 }
-
-func (statement *Statement) writeUpdateTop(updateWriter *builder.BytesWriter) error {
-	if statement.dialect.URI().DBType != schemas.MSSQL || statement.LimitN == nil {
-		return nil
-	}
-
-	table := statement.RefTable
-	if statement.HasOrderBy() && table != nil && len(table.PrimaryKeys) == 1 {
-		return nil
-	}
-
-	_, err := fmt.Fprintf(updateWriter, " TOP (%d)", *statement.LimitN)
-	return err
-}
-
-func (statement *Statement) writeUpdateTableName(updateWriter *builder.BytesWriter) error {
-	tableName := statement.quote(statement.TableName())
-	if statement.TableAlias == "" {
-		_, err := fmt.Fprint(updateWriter, " ", tableName)
-		return err
-	}
-
-	switch statement.dialect.URI().DBType {
-	case schemas.MSSQL:
-		_, err := fmt.Fprint(updateWriter, " ", statement.TableAlias)
-		return err
-	default:
-		_, err := fmt.Fprint(updateWriter, " ", tableName, " AS ", statement.TableAlias)
-		return err
-	}
-}
-
-func (statement *Statement) writeUpdateFrom(updateWriter *builder.BytesWriter) (builder.Cond, error) {
-	if statement.dialect.URI().DBType == schemas.MSSQL {
-		if _, err := fmt.Fprint(updateWriter, " FROM"); err != nil {
-			return nil, err
-		}
-
-		if _, err := fmt.Fprint(updateWriter, " ", statement.quote(statement.TableName())); err != nil {
-			return nil, err
-		}
-		if statement.TableAlias != "" {
-			if _, err := fmt.Fprint(updateWriter, " ", statement.TableAlias); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	if len(statement.joins) == 0 {
-		return builder.NewCond(), nil
-	}
-
-	if statement.dialect.URI().DBType != schemas.MSSQL {
-		if _, err := fmt.Fprint(updateWriter, " FROM"); err != nil {
-			return nil, err
-		}
-	}
-
-	cond := builder.NewCond()
-	for i, join := range statement.joins {
-		if statement.dialect.URI().DBType == schemas.MSSQL || i > 0 {
-			if _, err := fmt.Fprint(updateWriter, ","); err != nil {
-				return nil, err
-			}
-		}
-		if err := statement.writeJoinTable(updateWriter, join); err != nil {
-			return nil, err
-		}
-
-		joinCond, err := statement.convertJoinCondition(join)
-		if err != nil {
-			return nil, err
-		}
-		cond = cond.And(joinCond)
-	}
-
-	return cond, nil
-}
-
-func (statement *Statement) writeWhereOrAnd(updateWriter *builder.BytesWriter, hasConditions bool) error {
-	if hasConditions {
-		_, err := fmt.Fprint(updateWriter, " AND ")
-		return err
-	}
-	_, err := fmt.Fprint(updateWriter, " WHERE ")
-	return err
-}
-
-func (statement *Statement) writeUpdateLimit(updateWriter *builder.BytesWriter, cond builder.Cond) error {
-	if statement.LimitN == nil {
-		return nil
-	}
-
-	table := statement.RefTable
-	tableName := statement.TableName()
-
-	limitValue := *statement.LimitN
-	switch statement.dialect.URI().DBType {
-	case schemas.MYSQL:
-		_, err := fmt.Fprintf(updateWriter, " LIMIT %d", limitValue)
-		return err
-	case schemas.SQLITE:
-		if err := statement.writeWhereOrAnd(updateWriter, cond.IsValid()); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprint(updateWriter, "rowid IN (SELECT rowid FROM ", statement.quote(tableName)); err != nil {
-			return err
-		}
-		if err := statement.writeWhereCond(updateWriter, cond); err != nil {
-			return err
-		}
-		if err := statement.writeOrderBys(updateWriter); err != nil {
-			return err
-		}
-		_, err := fmt.Fprintf(updateWriter, " LIMIT %d)", limitValue)
-		return err
-	case schemas.POSTGRES:
-		if err := statement.writeWhereOrAnd(updateWriter, cond.IsValid()); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprint(updateWriter, "CTID IN (SELECT CTID FROM ", statement.quote(tableName)); err != nil {
-			return err
-		}
-		if err := statement.writeWhereCond(updateWriter, cond); err != nil {
-			return err
-		}
-		if err := statement.writeOrderBys(updateWriter); err != nil {
-			return err
-		}
-		_, err := fmt.Fprintf(updateWriter, " LIMIT %d)", limitValue)
-		return err
-	case schemas.MSSQL:
-		if statement.HasOrderBy() && table != nil && len(table.PrimaryKeys) == 1 {
-			if _, err := fmt.Fprintf(updateWriter, " WHERE %s IN (SELECT TOP (%d) %s FROM %v",
-				table.PrimaryKeys[0], limitValue, table.PrimaryKeys[0],
-				statement.quote(tableName)); err != nil {
-				return err
-			}
-			if err := statement.writeWhereCond(updateWriter, cond); err != nil {
-				return err
-			}
-			if err := statement.writeOrderBys(updateWriter); err != nil {
-				return err
-			}
-			_, err := fmt.Fprint(updateWriter, ")")
-			return err
-		}
-		return nil
-	default: // TODO: Oracle support needed
-		return fmt.Errorf("not implemented")
-	}
-}
-
-func (statement *Statement) GenConditionsFromMap(m interface{}) ([]builder.Cond, error) {
-	switch t := m.(type) {
-	case map[string]interface{}:
-		conds := []builder.Cond{}
-		for k, v := range t {
-			conds = append(conds, builder.Eq{k: v})
-		}
-		return conds, nil
-	case map[string]string:
-		conds := []builder.Cond{}
-		for k, v := range t {
-			conds = append(conds, builder.Eq{k: v})
-		}
-		return conds, nil
-	default:
-		return nil, fmt.Errorf("unsupported condition map type %v", t)
-	}
-}
-
-func (statement *Statement) writeVersionIncrSet(w builder.Writer, v reflect.Value, hasPreviousSet bool) error {
-	if v.Type().Kind() != reflect.Struct {
-		return nil
-	}
-
-	table := statement.RefTable
-	if !(statement.RefTable != nil && table.Version != "" && statement.CheckVersion) {
-		return nil
-	}
-
-	verValue, err := table.VersionColumn().ValueOfV(&v)
-	if err != nil {
-		return err
-	}
-
-	if verValue == nil {
-		return nil
-	}
-
-	if hasPreviousSet {
-		if _, err := fmt.Fprint(w, ", "); err != nil {
-			return err
-		}
-	}
-
-	if _, err := fmt.Fprint(w, statement.quote(table.Version), " = ", statement.quote(table.Version), " + 1"); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (statement *Statement) writeIncrSets(w builder.Writer, hasPreviousSets bool) error {
-	for i, expr := range statement.IncrColumns {
-		if i > 0 || hasPreviousSets {
-			if _, err := fmt.Fprint(w, ", "); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprint(w, statement.quote(expr.ColName), " = ", statement.quote(expr.ColName), " + ?"); err != nil {
-			return err
-		}
-		w.Append(expr.Arg)
-	}
-	return nil
-}
-
-func (statement *Statement) writeDecrSets(w builder.Writer, hasPreviousSets bool) error {
-	// for update action to like "column = column - ?"
-	for i, expr := range statement.DecrColumns {
-		if i > 0 || hasPreviousSets {
-			if _, err := fmt.Fprint(w, ", "); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprint(w, statement.quote(expr.ColName), " = ", statement.quote(expr.ColName), " - ?"); err != nil {
-			return err
-		}
-		w.Append(expr.Arg)
-	}
-	return nil
-}
-
-func (statement *Statement) writeExprSets(w *builder.BytesWriter, hasPreviousSets bool) error {
-	// for update action to like "column = expression"
-	for i, expr := range statement.ExprColumns {
-		if i > 0 || hasPreviousSets {
-			if _, err := fmt.Fprint(w, ", "); err != nil {
-				return err
-			}
-		}
-		switch tp := expr.Arg.(type) {
-		case string:
-			if len(tp) == 0 {
-				tp = "''"
-			}
-			if _, err := fmt.Fprint(w, statement.quote(expr.ColName), " = ", tp); err != nil {
-				return err
-			}
-		case *builder.Builder:
-			if _, err := fmt.Fprint(w, statement.quote(expr.ColName), " = ("); err != nil {
-				return err
-			}
-			if err := tp.WriteTo(statement.QuoteReplacer(w)); err != nil {
-				return err
-			}
-			if _, err := fmt.Fprint(w, ")"); err != nil {
-				return err
-			}
-		default:
-			if _, err := fmt.Fprint(w, statement.quote(expr.ColName), " = ?"); err != nil {
-				return err
-			}
-			w.Append(expr.Arg)
-		}
-	}
-	return nil
-}
-
-func (statement *Statement) writeSetColumns(colNames []string, args []interface{}) func(w *builder.BytesWriter) error {
-	return func(w *builder.BytesWriter) error {
-		if len(colNames) == 0 {
-			return nil
-		}
-		if len(colNames) != len(args) {
-			return fmt.Errorf("columns elements %d but args elements %d", len(colNames), len(args))
-		}
-		for i, colName := range colNames {
-			if i > 0 {
-				if _, err := fmt.Fprint(w, ", "); err != nil {
-					return err
-				}
-			}
-			if statement.dialect.URI().DBType != schemas.SQLITE && statement.dialect.URI().DBType != schemas.POSTGRES && len(statement.joins) > 0 {
-				tbName := statement.TableAlias
-				if tbName == "" {
-					tbName = statement.TableName()
-				}
-				if _, err := fmt.Fprint(w, tbName, ".", colName); err != nil {
-					return err
-				}
-			} else {
-				if _, err := fmt.Fprint(w, colName); err != nil {
-					return err
-				}
-			}
-		}
-		w.Append(args...)
-		return nil
-	}
-}
-
-func (statement *Statement) writeUpdateSets(w *builder.BytesWriter, v reflect.Value, colNames []string, args []interface{}) error {
-	// write set
-	if _, err := fmt.Fprint(w, " SET "); err != nil {
-		return err
-	}
-	previousLen := w.Len()
-
-	if err := statement.writeSetColumns(colNames, args)(w); err != nil {
-		return err
-	}
-
-	setNumber := len(colNames)
-	if err := statement.writeIncrSets(w, setNumber > 0); err != nil {
-		return err
-	}
-
-	setNumber += len(statement.IncrColumns)
-	if err := statement.writeDecrSets(w, setNumber > 0); err != nil {
-		return err
-	}
-
-	setNumber += len(statement.DecrColumns)
-	if err := statement.writeExprSets(w, setNumber > 0); err != nil {
-		return err
-	}
-
-	setNumber += len(statement.ExprColumns)
-	if err := statement.writeVersionIncrSet(w, v, setNumber > 0); err != nil {
-		return err
-	}
-
-	// if no columns to be updated, return error
-	if previousLen == w.Len() {
-		return ErrNoColumnsTobeUpdated
-	}
-	return nil
-}
-
-var ErrNoColumnsTobeUpdated = errors.New("no columns found to be updated")
-
-func (statement *Statement) WriteUpdate(updateWriter *builder.BytesWriter, cond builder.Cond, v reflect.Value, colNames []string, args []interface{}) error {
-	switch statement.dialect.URI().DBType {
-	case schemas.MYSQL:
-		return statement.writeUpdateMySQL(updateWriter, cond, v, colNames, args)
-	case schemas.MSSQL:
-		return statement.writeUpdateMSSQL(updateWriter, cond, v, colNames, args)
-	default:
-		return statement.writeUpdateCommon(updateWriter, cond, v, colNames, args)
-	}
-}
-
-func (statement *Statement) writeUpdateMySQL(updateWriter *builder.BytesWriter, cond builder.Cond, v reflect.Value, colNames []string, args []interface{}) error {
-	if _, err := fmt.Fprintf(updateWriter, "UPDATE"); err != nil {
-		return err
-	}
-	if err := statement.writeUpdateTableName(updateWriter); err != nil {
-		return err
-	}
-	if err := statement.writeJoins(updateWriter); err != nil {
-		return err
-	}
-	if err := statement.writeUpdateSets(updateWriter, v, colNames, args); err != nil {
-		return err
-	}
-	// write where
-	if err := statement.writeWhereCond(updateWriter, cond); err != nil {
-		return err
-	}
-	if err := statement.writeOrderBys(updateWriter); err != nil {
-		return err
-	}
-	return statement.writeUpdateLimit(updateWriter, cond)
-}
-
-func (statement *Statement) writeUpdateMSSQL(updateWriter *builder.BytesWriter, cond builder.Cond, v reflect.Value, colNames []string, args []interface{}) error {
-	if _, err := fmt.Fprintf(updateWriter, "UPDATE"); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateTop(updateWriter); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateTableName(updateWriter); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateSets(updateWriter, v, colNames, args); err != nil {
-		return err
-	}
-
-	// write from
-	joinConds, err := statement.writeUpdateFrom(updateWriter)
-	if err != nil {
-		return err
-	}
-
-	table := statement.RefTable
-	if statement.HasOrderBy() && table != nil && len(table.PrimaryKeys) == 1 {
-	} else {
-		// write where
-		if err := statement.writeWhereCond(updateWriter, cond.And(joinConds)); err != nil {
-			return err
-		}
-	}
-
-	return statement.writeUpdateLimit(updateWriter, cond.And(joinConds))
-}
-
-// writeUpdateCommon write update sql for non mysql && non mssql
-func (statement *Statement) writeUpdateCommon(updateWriter *builder.BytesWriter, cond builder.Cond, v reflect.Value, colNames []string, args []interface{}) error {
-	if _, err := fmt.Fprintf(updateWriter, "UPDATE"); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateTop(updateWriter); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateTableName(updateWriter); err != nil {
-		return err
-	}
-
-	if err := statement.writeUpdateSets(updateWriter, v, colNames, args); err != nil {
-		return err
-	}
-
-	// write from
-	joinConds, err := statement.writeUpdateFrom(updateWriter)
-	if err != nil {
-		return err
-	}
-
-	// write where
-	if err := statement.writeWhereCond(updateWriter, cond.And(joinConds)); err != nil {
-		return err
-	}
-
-	return statement.writeUpdateLimit(updateWriter, cond.And(joinConds))
-}
diff --git a/vendor/xorm.io/xorm/internal/statements/writer.go b/vendor/xorm.io/xorm/internal/statements/writer.go
deleted file mode 100644
index b4ca804..0000000
--- a/vendor/xorm.io/xorm/internal/statements/writer.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package statements
-
-import (
-	"fmt"
-
-	"xorm.io/builder"
-)
-
-func (statement *Statement) writeStrings(strs ...string) func(w *builder.BytesWriter) error {
-	return func(w *builder.BytesWriter) error {
-		for _, str := range strs {
-			if _, err := fmt.Fprint(w, str); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-}
-
-func (statement *Statement) groupWriteFns(writeFuncs ...func(*builder.BytesWriter) error) func(*builder.BytesWriter) error {
-	return func(bw *builder.BytesWriter) error {
-		return statement.writeMultiple(bw, writeFuncs...)
-	}
-}
-
-func (statement *Statement) writeMultiple(buf *builder.BytesWriter, writeFuncs ...func(*builder.BytesWriter) error) (err error) {
-	for _, fn := range writeFuncs {
-		if err = fn(buf); err != nil {
-			return
-		}
-	}
-	return
-}
diff --git a/vendor/xorm.io/xorm/internal/utils/builder.go b/vendor/xorm.io/xorm/internal/utils/builder.go
deleted file mode 100644
index bc97526..0000000
--- a/vendor/xorm.io/xorm/internal/utils/builder.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package utils
-
-import (
-	"fmt"
-
-	"xorm.io/builder"
-)
-
-type BuildReader interface {
-	String() string
-	Args() []interface{}
-}
-
-// WriteBuilder writes writers to one
-func WriteBuilder(w *builder.BytesWriter, inputs ...BuildReader) error {
-	for _, input := range inputs {
-		if _, err := fmt.Fprint(w, input.String()); err != nil {
-			return err
-		}
-		w.Append(input.Args()...)
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/internal/utils/name.go b/vendor/xorm.io/xorm/internal/utils/name.go
index aeef683..840dd9e 100644
--- a/vendor/xorm.io/xorm/internal/utils/name.go
+++ b/vendor/xorm.io/xorm/internal/utils/name.go
@@ -6,15 +6,9 @@ package utils
 
 import (
 	"fmt"
-	"strings"
 )
 
 // IndexName returns index name
 func IndexName(tableName, idxName string) string {
 	return fmt.Sprintf("IDX_%v_%v", tableName, idxName)
 }
-
-// SeqName returns sequence name for some table
-func SeqName(tableName string) string {
-	return "SEQ_" + strings.ToUpper(tableName)
-}
diff --git a/vendor/xorm.io/xorm/internal/utils/slice.go b/vendor/xorm.io/xorm/internal/utils/slice.go
index 82289b1..8968570 100644
--- a/vendor/xorm.io/xorm/internal/utils/slice.go
+++ b/vendor/xorm.io/xorm/internal/utils/slice.go
@@ -11,8 +11,8 @@ func SliceEq(left, right []string) bool {
 	if len(left) != len(right) {
 		return false
 	}
-	sort.Strings(left)
-	sort.Strings(right)
+	sort.Sort(sort.StringSlice(left))
+	sort.Sort(sort.StringSlice(right))
 	for i := 0; i < len(left); i++ {
 		if left[i] != right[i] {
 			return false
@@ -20,13 +20,3 @@ func SliceEq(left, right []string) bool {
 	}
 	return true
 }
-
-// IndexSlice search c in slice s and return the index, return -1 if s don't contain c
-func IndexSlice(s []string, c string) int {
-	for i, ss := range s {
-		if c == ss {
-			return i
-		}
-	}
-	return -1
-}
diff --git a/vendor/xorm.io/xorm/internal/utils/zero.go b/vendor/xorm.io/xorm/internal/utils/zero.go
index 22c2407..007e3c3 100644
--- a/vendor/xorm.io/xorm/internal/utils/zero.go
+++ b/vendor/xorm.io/xorm/internal/utils/zero.go
@@ -146,6 +146,6 @@ const (
 
 // IsTimeZero return true if a time is zero
 func IsTimeZero(t time.Time) bool {
-	return t.IsZero() || t.Format("2006-01-02 15:04:05.999999999") == ZeroTime0 ||
-		t.Format("2006-01-02 15:04:05.999999999") == ZeroTime1
+	return t.IsZero() || t.Format("2006-01-02 15:04:05") == ZeroTime0 ||
+		t.Format("2006-01-02 15:04:05") == ZeroTime1
 }
diff --git a/vendor/xorm.io/xorm/log/logger.go b/vendor/xorm.io/xorm/log/logger.go
index b8798c3..3b6db34 100644
--- a/vendor/xorm.io/xorm/log/logger.go
+++ b/vendor/xorm.io/xorm/log/logger.go
@@ -130,56 +130,56 @@ func NewSimpleLogger3(out io.Writer, prefix string, flag int, l LogLevel) *Simpl
 // Error implement ILogger
 func (s *SimpleLogger) Error(v ...interface{}) {
 	if s.level <= LOG_ERR {
-		_ = s.ERR.Output(2, fmt.Sprintln(v...))
+		s.ERR.Output(2, fmt.Sprintln(v...))
 	}
 }
 
 // Errorf implement ILogger
 func (s *SimpleLogger) Errorf(format string, v ...interface{}) {
 	if s.level <= LOG_ERR {
-		_ = s.ERR.Output(2, fmt.Sprintf(format, v...))
+		s.ERR.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
 // Debug implement ILogger
 func (s *SimpleLogger) Debug(v ...interface{}) {
 	if s.level <= LOG_DEBUG {
-		_ = s.DEBUG.Output(2, fmt.Sprintln(v...))
+		s.DEBUG.Output(2, fmt.Sprintln(v...))
 	}
 }
 
 // Debugf implement ILogger
 func (s *SimpleLogger) Debugf(format string, v ...interface{}) {
 	if s.level <= LOG_DEBUG {
-		_ = s.DEBUG.Output(2, fmt.Sprintf(format, v...))
+		s.DEBUG.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
 // Info implement ILogger
 func (s *SimpleLogger) Info(v ...interface{}) {
 	if s.level <= LOG_INFO {
-		_ = s.INFO.Output(2, fmt.Sprintln(v...))
+		s.INFO.Output(2, fmt.Sprintln(v...))
 	}
 }
 
 // Infof implement ILogger
 func (s *SimpleLogger) Infof(format string, v ...interface{}) {
 	if s.level <= LOG_INFO {
-		_ = s.INFO.Output(2, fmt.Sprintf(format, v...))
+		s.INFO.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
 // Warn implement ILogger
 func (s *SimpleLogger) Warn(v ...interface{}) {
 	if s.level <= LOG_WARNING {
-		_ = s.WARN.Output(2, fmt.Sprintln(v...))
+		s.WARN.Output(2, fmt.Sprintln(v...))
 	}
 }
 
 // Warnf implement ILogger
 func (s *SimpleLogger) Warnf(format string, v ...interface{}) {
 	if s.level <= LOG_WARNING {
-		_ = s.WARN.Output(2, fmt.Sprintf(format, v...))
+		s.WARN.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
diff --git a/vendor/xorm.io/xorm/log/syslogger.go b/vendor/xorm.io/xorm/log/syslogger.go
index 4427258..0b3e381 100644
--- a/vendor/xorm.io/xorm/log/syslogger.go
+++ b/vendor/xorm.io/xorm/log/syslogger.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !windows && !nacl && !plan9
 // +build !windows,!nacl,!plan9
 
 package log
@@ -27,42 +26,42 @@ func NewSyslogLogger(w *syslog.Writer) *SyslogLogger {
 
 // Debug log content as Debug
 func (s *SyslogLogger) Debug(v ...interface{}) {
-	_ = s.w.Debug(fmt.Sprint(v...))
+	s.w.Debug(fmt.Sprint(v...))
 }
 
 // Debugf log content as Debug and format
 func (s *SyslogLogger) Debugf(format string, v ...interface{}) {
-	_ = s.w.Debug(fmt.Sprintf(format, v...))
+	s.w.Debug(fmt.Sprintf(format, v...))
 }
 
 // Error log content as Error
 func (s *SyslogLogger) Error(v ...interface{}) {
-	_ = s.w.Err(fmt.Sprint(v...))
+	s.w.Err(fmt.Sprint(v...))
 }
 
 // Errorf log content as Errorf and format
 func (s *SyslogLogger) Errorf(format string, v ...interface{}) {
-	_ = s.w.Err(fmt.Sprintf(format, v...))
+	s.w.Err(fmt.Sprintf(format, v...))
 }
 
 // Info log content as Info
 func (s *SyslogLogger) Info(v ...interface{}) {
-	_ = s.w.Info(fmt.Sprint(v...))
+	s.w.Info(fmt.Sprint(v...))
 }
 
 // Infof log content as Infof and format
 func (s *SyslogLogger) Infof(format string, v ...interface{}) {
-	_ = s.w.Info(fmt.Sprintf(format, v...))
+	s.w.Info(fmt.Sprintf(format, v...))
 }
 
 // Warn log content as Warn
 func (s *SyslogLogger) Warn(v ...interface{}) {
-	_ = s.w.Warning(fmt.Sprint(v...))
+	s.w.Warning(fmt.Sprint(v...))
 }
 
 // Warnf log content as Warnf and format
 func (s *SyslogLogger) Warnf(format string, v ...interface{}) {
-	_ = s.w.Warning(fmt.Sprintf(format, v...))
+	s.w.Warning(fmt.Sprintf(format, v...))
 }
 
 // Level shows log level
diff --git a/vendor/xorm.io/xorm/names/mapper.go b/vendor/xorm.io/xorm/names/mapper.go
index 4f5910e..69f6717 100644
--- a/vendor/xorm.io/xorm/names/mapper.go
+++ b/vendor/xorm.io/xorm/names/mapper.go
@@ -149,7 +149,7 @@ func isASCIIUpper(r rune) bool {
 
 func toASCIIUpper(r rune) rune {
 	if 'a' <= r && r <= 'z' {
-		r -= 'a' - 'A'
+		r -= ('a' - 'A')
 	}
 	return r
 }
diff --git a/vendor/xorm.io/xorm/names/table_name.go b/vendor/xorm.io/xorm/names/table_name.go
index d7d71b5..cc0e927 100644
--- a/vendor/xorm.io/xorm/names/table_name.go
+++ b/vendor/xorm.io/xorm/names/table_name.go
@@ -14,15 +14,9 @@ type TableName interface {
 	TableName() string
 }
 
-type TableComment interface {
-	TableComment() string
-}
-
 var (
-	tpTableName    = reflect.TypeOf((*TableName)(nil)).Elem()
-	tpTableComment = reflect.TypeOf((*TableComment)(nil)).Elem()
-	tvCache        sync.Map
-	tcCache        sync.Map
+	tpTableName = reflect.TypeOf((*TableName)(nil)).Elem()
+	tvCache     sync.Map
 )
 
 // GetTableName returns table name
@@ -61,40 +55,3 @@ func GetTableName(mapper Mapper, v reflect.Value) string {
 
 	return mapper.Obj2Table(v.Type().Name())
 }
-
-// GetTableComment returns table comment
-func GetTableComment(v reflect.Value) string {
-	if v.Type().Implements(tpTableComment) {
-		return v.Interface().(TableComment).TableComment()
-	}
-
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-		if v.Type().Implements(tpTableComment) {
-			return v.Interface().(TableComment).TableComment()
-		}
-	} else if v.CanAddr() {
-		v1 := v.Addr()
-		if v1.Type().Implements(tpTableComment) {
-			return v1.Interface().(TableComment).TableComment()
-		}
-	} else {
-		comment, ok := tcCache.Load(v.Type())
-		if ok {
-			if comment.(string) != "" {
-				return comment.(string)
-			}
-		} else {
-			v2 := reflect.New(v.Type())
-			if v2.Type().Implements(tpTableComment) {
-				tableComment := v2.Interface().(TableComment).TableComment()
-				tcCache.Store(v.Type(), tableComment)
-				return tableComment
-			}
-
-			tcCache.Store(v.Type(), "")
-		}
-	}
-
-	return ""
-}
diff --git a/vendor/xorm.io/xorm/rows.go b/vendor/xorm.io/xorm/rows.go
index c539410..8e7cc07 100644
--- a/vendor/xorm.io/xorm/rows.go
+++ b/vendor/xorm.io/xorm/rows.go
@@ -11,6 +11,7 @@ import (
 
 	"xorm.io/builder"
 	"xorm.io/xorm/core"
+	"xorm.io/xorm/internal/utils"
 )
 
 // Rows rows wrapper a rows to
@@ -40,14 +41,14 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
 		return nil, err
 	}
 
-	if len(session.statement.TableName()) == 0 {
+	if len(session.statement.TableName()) <= 0 {
 		return nil, ErrTableNotFound
 	}
 
 	if rows.session.statement.RawSQL == "" {
 		var autoCond builder.Cond
-		addedTableName := session.statement.NeedTableName()
-		table := rows.session.statement.RefTable
+		var addedTableName = (len(session.statement.JoinStr) > 0)
+		var table = rows.session.statement.RefTable
 
 		if !session.statement.NoAutoCondition {
 			var err error
@@ -83,41 +84,26 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
 
 // Next move cursor to next record, return false if end has reached
 func (rows *Rows) Next() bool {
-	if rows.rows != nil {
-		return rows.rows.Next()
-	}
-	return false
+	return rows.rows.Next()
 }
 
 // Err returns the error, if any, that was encountered during iteration. Err may be called after an explicit or implicit Close.
 func (rows *Rows) Err() error {
-	if rows.rows != nil {
-		return rows.rows.Err()
-	}
-	return nil
+	return rows.rows.Err()
 }
 
 // Scan row record to bean properties
-func (rows *Rows) Scan(beans ...interface{}) error {
+func (rows *Rows) Scan(bean interface{}) error {
 	if rows.Err() != nil {
 		return rows.Err()
 	}
 
-	bean := beans[0]
-	tp := reflect.TypeOf(bean)
-	if tp.Kind() == reflect.Ptr {
-		tp = tp.Elem()
+	if reflect.Indirect(reflect.ValueOf(bean)).Type() != rows.beanType {
+		return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType)
 	}
-	beanKind := tp.Kind()
 
-	if len(beans) == 1 {
-		if reflect.Indirect(reflect.ValueOf(bean)).Type() != rows.beanType {
-			return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType)
-		}
-
-		if err := rows.session.statement.SetRefBean(bean); err != nil {
-			return err
-		}
+	if err := rows.session.statement.SetRefBean(bean); err != nil {
+		return err
 	}
 
 	fields, err := rows.rows.Columns()
@@ -129,9 +115,14 @@ func (rows *Rows) Scan(beans ...interface{}) error {
 		return err
 	}
 
-	columnsSchema := ParseColumnsSchema(fields, types, rows.session.statement.RefTable)
+	scanResults, err := rows.session.row2Slice(rows.rows, fields, types, bean)
+	if err != nil {
+		return err
+	}
 
-	if err := rows.session.scan(rows.rows, rows.session.statement.RefTable, beanKind, beans, columnsSchema, types, fields); err != nil {
+	dataStruct := utils.ReflectValue(bean)
+	_, err = rows.session.slice2Bean(scanResults, fields, bean, &dataStruct, rows.session.statement.RefTable)
+	if err != nil {
 		return err
 	}
 
@@ -144,11 +135,9 @@ func (rows *Rows) Close() error {
 		defer rows.session.Close()
 	}
 
-	defer rows.session.resetStatement()
-
 	if rows.rows != nil {
 		return rows.rows.Close()
 	}
 
-	return nil
+	return rows.Err()
 }
diff --git a/vendor/xorm.io/xorm/scan.go b/vendor/xorm.io/xorm/scan.go
index 00cee4d..56d3c9d 100644
--- a/vendor/xorm.io/xorm/scan.go
+++ b/vendor/xorm.io/xorm/scan.go
@@ -22,7 +22,7 @@ func genScanResultsByBeanNullable(bean interface{}) (interface{}, bool, error) {
 	switch t := bean.(type) {
 	case *interface{}:
 		return t, false, nil
-	case *sql.NullInt64, *sql.NullBool, *sql.NullFloat64, *sql.NullString, *sql.RawBytes, *[]byte:
+	case *sql.NullInt64, *sql.NullBool, *sql.NullFloat64, *sql.NullString, *sql.RawBytes:
 		return t, false, nil
 	case *time.Time:
 		return &sql.NullString{}, true, nil
@@ -67,7 +67,7 @@ func genScanResultsByBeanNullable(bean interface{}) (interface{}, bool, error) {
 	case reflect.Uint32, reflect.Uint, reflect.Uint16, reflect.Uint8:
 		return &convert.NullUint32{}, true, nil
 	default:
-		return nil, false, fmt.Errorf("genScanResultsByBeanNullable: unsupported type: %#v", bean)
+		return nil, false, fmt.Errorf("unsupported type: %#v", bean)
 	}
 }
 
@@ -125,12 +125,63 @@ func genScanResultsByBean(bean interface{}) (interface{}, bool, error) {
 	case reflect.Float64:
 		return new(float64), true, nil
 	default:
-		return nil, false, fmt.Errorf("genScanResultsByBean: unsupported type: %#v", bean)
+		return nil, false, fmt.Errorf("unsupported type: %#v", bean)
 	}
 }
 
+func (engine *Engine) row2mapStr(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]string, error) {
+	var scanResults = make([]interface{}, len(fields))
+	for i := 0; i < len(fields); i++ {
+		var s sql.NullString
+		scanResults[i] = &s
+	}
+
+	if err := rows.Scan(scanResults...); err != nil {
+		return nil, err
+	}
+
+	result := make(map[string]string, len(fields))
+	for i, key := range fields {
+		s := scanResults[i].(*sql.NullString)
+		if s.String == "" {
+			result[key] = ""
+			continue
+		}
+
+		if schemas.TIME_TYPE == engine.dialect.ColumnTypeKind(types[i].DatabaseTypeName()) {
+			t, err := convert.String2Time(s.String, engine.DatabaseTZ, engine.TZLocation)
+			if err != nil {
+				return nil, err
+			}
+			result[key] = t.Format("2006-01-02 15:04:05")
+		} else {
+			result[key] = s.String
+		}
+	}
+	return result, nil
+}
+
+func row2mapBytes(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string][]byte, error) {
+	var scanResults = make([]interface{}, len(fields))
+	for i := 0; i < len(fields); i++ {
+		var s sql.NullString
+		scanResults[i] = &s
+	}
+
+	if err := rows.Scan(scanResults...); err != nil {
+		return nil, err
+	}
+
+	result := make(map[string][]byte, len(fields))
+	for ii, key := range fields {
+		s := scanResults[ii].(*sql.NullString)
+		result[key] = []byte(s.String)
+	}
+	return result, nil
+}
+
 func (engine *Engine) scanStringInterface(rows *core.Rows, fields []string, types []*sql.ColumnType) ([]interface{}, error) {
-	scanResults := make([]interface{}, len(types))
+	var scanResults = make([]interface{}, len(types))
 	for i := 0; i < len(types); i++ {
 		var s sql.NullString
 		scanResults[i] = &s
@@ -144,8 +195,8 @@ func (engine *Engine) scanStringInterface(rows *core.Rows, fields []string, type
 
 // scan is a wrap of driver.Scan but will automatically change the input values according requirements
 func (engine *Engine) scan(rows *core.Rows, fields []string, types []*sql.ColumnType, vv ...interface{}) error {
-	scanResults := make([]interface{}, 0, len(types))
-	replaces := make([]bool, 0, len(types))
+	var scanResults = make([]interface{}, 0, len(types))
+	var replaces = make([]bool, 0, len(types))
 	var err error
 	for _, v := range vv {
 		var replaced bool
@@ -194,7 +245,7 @@ func (engine *Engine) scan(rows *core.Rows, fields []string, types []*sql.Column
 }
 
 func (engine *Engine) scanInterfaces(rows *core.Rows, fields []string, types []*sql.ColumnType) ([]interface{}, error) {
-	scanResultContainers := make([]interface{}, len(types))
+	var scanResultContainers = make([]interface{}, len(types))
 	for i := 0; i < len(types); i++ {
 		scanResult, err := engine.driver.GenScanResult(types[i].DatabaseTypeName())
 		if err != nil {
@@ -208,12 +259,45 @@ func (engine *Engine) scanInterfaces(rows *core.Rows, fields []string, types []*
 	return scanResultContainers, nil
 }
 
-////////////////////
-// row -> map[string]interface{}
+func (engine *Engine) row2sliceStr(rows *core.Rows, types []*sql.ColumnType, fields []string) ([]string, error) {
+	scanResults, err := engine.scanStringInterface(rows, fields, types)
+	if err != nil {
+		return nil, err
+	}
+
+	var results = make([]string, 0, len(fields))
+	for i := 0; i < len(fields); i++ {
+		results = append(results, scanResults[i].(*sql.NullString).String)
+	}
+	return results, nil
+}
+
+func rows2maps(rows *core.Rows) (resultsSlice []map[string][]byte, err error) {
+	fields, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+	types, err := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		result, err := row2mapBytes(rows, types, fields)
+		if err != nil {
+			return nil, err
+		}
+		resultsSlice = append(resultsSlice, result)
+	}
+	if rows.Err() != nil {
+		return nil, rows.Err()
+	}
+
+	return resultsSlice, nil
+}
 
 func (engine *Engine) row2mapInterface(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]interface{}, error) {
-	resultsMap := make(map[string]interface{}, len(fields))
-	scanResultContainers := make([]interface{}, len(fields))
+	var resultsMap = make(map[string]interface{}, len(fields))
+	var scanResultContainers = make([]interface{}, len(fields))
 	for i := 0; i < len(fields); i++ {
 		scanResult, err := engine.driver.GenScanResult(types[i].DatabaseTypeName())
 		if err != nil {
@@ -234,206 +318,3 @@ func (engine *Engine) row2mapInterface(rows *core.Rows, types []*sql.ColumnType,
 	}
 	return resultsMap, nil
 }
-
-// ScanInterfaceMap scan result from *core.Rows and return a map
-func (engine *Engine) ScanInterfaceMap(rows *core.Rows) (map[string]interface{}, error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-
-	return engine.row2mapInterface(rows, types, fields)
-}
-
-// ScanInterfaceMaps scan results from *core.Rows and return a slice of map
-func (engine *Engine) ScanInterfaceMaps(rows *core.Rows) (resultsSlice []map[string]interface{}, err error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		result, err := engine.row2mapInterface(rows, types, fields)
-		if err != nil {
-			return nil, err
-		}
-		resultsSlice = append(resultsSlice, result)
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-
-	return resultsSlice, nil
-}
-
-////////////////////
-// row -> map[string]string
-
-func (engine *Engine) row2mapStr(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]string, error) {
-	scanResults := make([]interface{}, len(fields))
-	for i := 0; i < len(fields); i++ {
-		var s sql.NullString
-		scanResults[i] = &s
-	}
-
-	if err := engine.driver.Scan(&dialects.ScanContext{
-		DBLocation:   engine.DatabaseTZ,
-		UserLocation: engine.TZLocation,
-	}, rows, types, scanResults...); err != nil {
-		return nil, err
-	}
-
-	result := make(map[string]string, len(fields))
-	for i, key := range fields {
-		s := scanResults[i].(*sql.NullString)
-		if s.String == "" {
-			result[key] = ""
-			continue
-		}
-
-		if schemas.TIME_TYPE == engine.dialect.ColumnTypeKind(types[i].DatabaseTypeName()) {
-			t, err := convert.String2Time(s.String, engine.DatabaseTZ, engine.TZLocation)
-			if err != nil {
-				return nil, err
-			}
-			result[key] = t.Format("2006-01-02 15:04:05")
-		} else {
-			result[key] = s.String
-		}
-	}
-	return result, nil
-}
-
-// ScanStringMap scan results from *core.Rows and return a map
-func (engine *Engine) ScanStringMap(rows *core.Rows) (map[string]string, error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-	return engine.row2mapStr(rows, types, fields)
-}
-
-// ScanStringMaps scan results from *core.Rows and return a slice of map
-func (engine *Engine) ScanStringMaps(rows *core.Rows) (resultsSlice []map[string]string, err error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-
-	for rows.Next() {
-		result, err := engine.row2mapStr(rows, types, fields)
-		if err != nil {
-			return nil, err
-		}
-		resultsSlice = append(resultsSlice, result)
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-
-	return resultsSlice, nil
-}
-
-////////////////////
-// row -> map[string][]byte
-
-func convertMapStr2Bytes(m map[string]string) map[string][]byte {
-	r := make(map[string][]byte, len(m))
-	for k, v := range m {
-		r[k] = []byte(v)
-	}
-	return r
-}
-
-func (engine *Engine) scanByteMaps(rows *core.Rows) (resultsSlice []map[string][]byte, err error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		result, err := engine.row2mapStr(rows, types, fields)
-		if err != nil {
-			return nil, err
-		}
-		resultsSlice = append(resultsSlice, convertMapStr2Bytes(result))
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-
-	return resultsSlice, nil
-}
-
-////////////////////
-// row -> []string
-
-func (engine *Engine) row2sliceStr(rows *core.Rows, types []*sql.ColumnType, fields []string) ([]string, error) {
-	scanResults, err := engine.scanStringInterface(rows, fields, types)
-	if err != nil {
-		return nil, err
-	}
-
-	results := make([]string, 0, len(fields))
-	for i := 0; i < len(fields); i++ {
-		results = append(results, scanResults[i].(*sql.NullString).String)
-	}
-	return results, nil
-}
-
-// ScanStringSlice scan results from *core.Rows and return a slice of one row
-func (engine *Engine) ScanStringSlice(rows *core.Rows) ([]string, error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-
-	return engine.row2sliceStr(rows, types, fields)
-}
-
-// ScanStringSlices scan results from *core.Rows and return a slice of all rows
-func (engine *Engine) ScanStringSlices(rows *core.Rows) (resultsSlice [][]string, err error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-
-	for rows.Next() {
-		record, err := engine.row2sliceStr(rows, types, fields)
-		if err != nil {
-			return nil, err
-		}
-		resultsSlice = append(resultsSlice, record)
-	}
-	if rows.Err() != nil {
-		return nil, rows.Err()
-	}
-
-	return resultsSlice, nil
-}
diff --git a/vendor/xorm.io/xorm/schemas/collation.go b/vendor/xorm.io/xorm/schemas/collation.go
deleted file mode 100644
index acec526..0000000
--- a/vendor/xorm.io/xorm/schemas/collation.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package schemas
-
-type Collation struct {
-	Name   string
-	Column string // blank means it's a table collation
-}
diff --git a/vendor/xorm.io/xorm/schemas/column.go b/vendor/xorm.io/xorm/schemas/column.go
index 08d34b9..4bbb6c2 100644
--- a/vendor/xorm.io/xorm/schemas/column.go
+++ b/vendor/xorm.io/xorm/schemas/column.go
@@ -26,8 +26,8 @@ type Column struct {
 	FieldIndex      []int  // Available only when parsed from a struct
 	SQLType         SQLType
 	IsJSON          bool
-	Length          int64
-	Length2         int64
+	Length          int
+	Length2         int
 	Nullable        bool
 	Default         string
 	Indexes         map[string]int
@@ -45,11 +45,10 @@ type Column struct {
 	DisableTimeZone bool
 	TimeZone        *time.Location // column specified time zone
 	Comment         string
-	Collation       string
 }
 
 // NewColumn creates a new column
-func NewColumn(name, fieldName string, sqlType SQLType, len1, len2 int64, nullable bool) *Column {
+func NewColumn(name, fieldName string, sqlType SQLType, len1, len2 int, nullable bool) *Column {
 	return &Column{
 		Name:            name,
 		IsJSON:          sqlType.IsJson(),
@@ -83,15 +82,13 @@ func (col *Column) ValueOf(bean interface{}) (*reflect.Value, error) {
 
 // ValueOfV returns column's filed of struct's value accept reflevt value
 func (col *Column) ValueOfV(dataStruct *reflect.Value) (*reflect.Value, error) {
-	v := *dataStruct
+	var v = *dataStruct
 	for _, i := range col.FieldIndex {
 		if v.Kind() == reflect.Ptr {
 			if v.IsNil() {
 				v.Set(reflect.New(v.Type().Elem()))
 			}
 			v = v.Elem()
-		} else if v.Kind() == reflect.Interface {
-			v = reflect.Indirect(v.Elem())
 		}
 		v = v.FieldByIndex([]int{i})
 	}
diff --git a/vendor/xorm.io/xorm/schemas/index.go b/vendor/xorm.io/xorm/schemas/index.go
index 47027ea..8f31af5 100644
--- a/vendor/xorm.io/xorm/schemas/index.go
+++ b/vendor/xorm.io/xorm/schemas/index.go
@@ -32,7 +32,7 @@ func NewIndex(name string, indexType int) *Index {
 func (index *Index) XName(tableName string) string {
 	if !strings.HasPrefix(index.Name, "UQE_") &&
 		!strings.HasPrefix(index.Name, "IDX_") {
-		tableParts := strings.Split(strings.ReplaceAll(tableName, `"`, ""), ".")
+		tableParts := strings.Split(strings.Replace(tableName, `"`, "", -1), ".")
 		tableName = tableParts[len(tableParts)-1]
 		if index.Type == UniqueType {
 			return fmt.Sprintf("UQE_%v_%v", tableName, index.Name)
diff --git a/vendor/xorm.io/xorm/schemas/quote.go b/vendor/xorm.io/xorm/schemas/quote.go
index 63230bf..71040ad 100644
--- a/vendor/xorm.io/xorm/schemas/quote.go
+++ b/vendor/xorm.io/xorm/schemas/quote.go
@@ -37,7 +37,7 @@ func (q Quoter) IsEmpty() bool {
 // Quote quote a string
 func (q Quoter) Quote(s string) string {
 	var buf strings.Builder
-	_ = q.QuoteTo(&buf, s)
+	q.QuoteTo(&buf, s)
 	return buf.String()
 }
 
@@ -64,7 +64,7 @@ func (q Quoter) Trim(s string) string {
 // Join joins a slice with quoters
 func (q Quoter) Join(a []string, sep string) string {
 	var b strings.Builder
-	_ = q.JoinWrite(&b, a, sep)
+	q.JoinWrite(&b, a, sep)
 	return b.String()
 }
 
@@ -86,9 +86,7 @@ func (q Quoter) JoinWrite(b *strings.Builder, a []string, sep string) error {
 				return err
 			}
 		}
-		if err := q.QuoteTo(b, strings.TrimSpace(s)); err != nil {
-			return err
-		}
+		q.QuoteTo(b, strings.TrimSpace(s))
 	}
 	return nil
 }
@@ -111,7 +109,7 @@ func findStart(value string, start int) int {
 		return start
 	}
 
-	k := -1
+	var k = -1
 	for j := start; j < len(value); j++ {
 		if value[j] != ' ' {
 			k = j
@@ -122,10 +120,8 @@ func findStart(value string, start int) int {
 		return len(value)
 	}
 
-	if k+1 < len(value) &&
-		(value[k] == 'A' || value[k] == 'a') &&
-		(value[k+1] == 'S' || value[k+1] == 's') {
-		k += 2
+	if (value[k] == 'A' || value[k] == 'a') && (value[k+1] == 'S' || value[k+1] == 's') {
+		k = k + 2
 	}
 
 	for j := k; j < len(value); j++ {
@@ -137,7 +133,7 @@ func findStart(value string, start int) int {
 }
 
 func (q Quoter) quoteWordTo(buf *strings.Builder, word string) error {
-	realWord := word
+	var realWord = word
 	if (word[0] == CommanQuoteMark && word[len(word)-1] == CommanQuoteMark) ||
 		(word[0] == q.Prefix && word[len(word)-1] == q.Suffix) {
 		realWord = word[1 : len(word)-1]
@@ -165,18 +161,17 @@ func (q Quoter) quoteWordTo(buf *strings.Builder, word string) error {
 }
 
 // QuoteTo quotes the table or column names. i.e. if the quotes are [ and ]
-//
-//	name -> [name]
-//	`name` -> [name]
-//	[name] -> [name]
-//	schema.name -> [schema].[name]
-//	`schema`.`name` -> [schema].[name]
-//	`schema`.name -> [schema].[name]
-//	schema.`name` -> [schema].[name]
-//	[schema].name -> [schema].[name]
-//	schema.[name] -> [schema].[name]
-//	name AS a  ->  [name] AS a
-//	schema.name AS a  ->  [schema].[name] AS a
+//   name -> [name]
+//   `name` -> [name]
+//   [name] -> [name]
+//   schema.name -> [schema].[name]
+//   `schema`.`name` -> [schema].[name]
+//   `schema`.name -> [schema].[name]
+//   schema.`name` -> [schema].[name]
+//   [schema].name -> [schema].[name]
+//   schema.[name] -> [schema].[name]
+//   name AS a  ->  [name] AS a
+//   schema.name AS a  ->  [schema].[name] AS a
 func (q Quoter) QuoteTo(buf *strings.Builder, value string) error {
 	var i int
 	for i < len(value) {
@@ -190,7 +185,7 @@ func (q Quoter) QuoteTo(buf *strings.Builder, value string) error {
 			return nil
 		}
 
-		nextEnd := findWord(value, start)
+		var nextEnd = findWord(value, start)
 		if err := q.quoteWordTo(buf, value[start:nextEnd]); err != nil {
 			return err
 		}
@@ -201,7 +196,7 @@ func (q Quoter) QuoteTo(buf *strings.Builder, value string) error {
 
 // Strings quotes a slice of string
 func (q Quoter) Strings(s []string) []string {
-	res := make([]string, 0, len(s))
+	var res = make([]string, 0, len(s))
 	for _, a := range s {
 		res = append(res, q.Quote(a))
 	}
@@ -220,7 +215,7 @@ func (q Quoter) Replace(sql string) string {
 	var beginSingleQuote bool
 	for i := 0; i < len(sql); i++ {
 		if !beginSingleQuote && sql[i] == CommanQuoteMark {
-			j := i + 1
+			var j = i + 1
 			for ; j < len(sql); j++ {
 				if sql[j] == CommanQuoteMark {
 					break
diff --git a/vendor/xorm.io/xorm/schemas/table.go b/vendor/xorm.io/xorm/schemas/table.go
index 5c38cc7..91b33e0 100644
--- a/vendor/xorm.io/xorm/schemas/table.go
+++ b/vendor/xorm.io/xorm/schemas/table.go
@@ -27,7 +27,6 @@ type Table struct {
 	StoreEngine   string
 	Charset       string
 	Comment       string
-	Collation     string
 }
 
 // NewEmptyTable creates an empty table
@@ -37,8 +36,7 @@ func NewEmptyTable() *Table {
 
 // NewTable creates a new Table object
 func NewTable(name string, t reflect.Type) *Table {
-	return &Table{
-		Name: name, Type: t,
+	return &Table{Name: name, Type: t,
 		columnsSeq:  make([]string, 0),
 		columns:     make([]*Column, 0),
 		columnsMap:  make(map[string][]*Column),
diff --git a/vendor/xorm.io/xorm/schemas/type.go b/vendor/xorm.io/xorm/schemas/type.go
index 3dbcee7..cf73013 100644
--- a/vendor/xorm.io/xorm/schemas/type.go
+++ b/vendor/xorm.io/xorm/schemas/type.go
@@ -22,14 +22,13 @@ const (
 	MYSQL    DBType = "mysql"
 	MSSQL    DBType = "mssql"
 	ORACLE   DBType = "oracle"
-	DAMENG   DBType = "dameng"
 )
 
 // SQLType represents SQL types
 type SQLType struct {
 	Name           string
-	DefaultLength  int64
-	DefaultLength2 int64
+	DefaultLength  int
+	DefaultLength2 int
 }
 
 // enumerates all columns types
@@ -106,14 +105,12 @@ var (
 	Integer           = "INTEGER"
 	BigInt            = "BIGINT"
 	UnsignedBigInt    = "UNSIGNED BIGINT"
-	Number            = "NUMBER"
 
 	Enum = "ENUM"
 	Set  = "SET"
 
 	Char             = "CHAR"
 	Varchar          = "VARCHAR"
-	VARCHAR2         = "VARCHAR2"
 	NChar            = "NCHAR"
 	NVarchar         = "NVARCHAR"
 	TinyText         = "TINYTEXT"
@@ -139,10 +136,9 @@ var (
 	Money      = "MONEY"
 	SmallMoney = "SMALLMONEY"
 
-	Real          = "REAL"
-	Float         = "FLOAT"
-	UnsignedFloat = "UNSIGNED FLOAT"
-	Double        = "DOUBLE"
+	Real   = "REAL"
+	Float  = "FLOAT"
+	Double = "DOUBLE"
 
 	Binary     = "BINARY"
 	VarBinary  = "VARBINARY"
@@ -178,7 +174,6 @@ var (
 		Integer:           NUMERIC_TYPE,
 		BigInt:            NUMERIC_TYPE,
 		UnsignedBigInt:    NUMERIC_TYPE,
-		Number:            NUMERIC_TYPE,
 
 		Enum:  TEXT_TYPE,
 		Set:   TEXT_TYPE,
@@ -190,7 +185,6 @@ var (
 		Char:       TEXT_TYPE,
 		NChar:      TEXT_TYPE,
 		Varchar:    TEXT_TYPE,
-		VARCHAR2:   TEXT_TYPE,
 		NVarchar:   TEXT_TYPE,
 		TinyText:   TEXT_TYPE,
 		Text:       TEXT_TYPE,
@@ -209,14 +203,13 @@ var (
 		SmallDateTime: TIME_TYPE,
 		Year:          TIME_TYPE,
 
-		Decimal:       NUMERIC_TYPE,
-		Numeric:       NUMERIC_TYPE,
-		Real:          NUMERIC_TYPE,
-		Float:         NUMERIC_TYPE,
-		UnsignedFloat: NUMERIC_TYPE,
-		Double:        NUMERIC_TYPE,
-		Money:         NUMERIC_TYPE,
-		SmallMoney:    NUMERIC_TYPE,
+		Decimal:    NUMERIC_TYPE,
+		Numeric:    NUMERIC_TYPE,
+		Real:       NUMERIC_TYPE,
+		Float:      NUMERIC_TYPE,
+		Double:     NUMERIC_TYPE,
+		Money:      NUMERIC_TYPE,
+		SmallMoney: NUMERIC_TYPE,
 
 		Binary:    BLOB_TYPE,
 		VarBinary: BLOB_TYPE,
@@ -334,10 +327,6 @@ func SQLType2Type(st SQLType) reflect.Type {
 		return IntType
 	case BigInt, BigSerial:
 		return Int64Type
-	case UnsignedBit, UnsignedTinyInt, UnsignedSmallInt, UnsignedMediumInt, UnsignedInt:
-		return UintType
-	case UnsignedBigInt:
-		return Uint64Type
 	case Float, Real:
 		return Float32Type
 	case Double:
diff --git a/vendor/xorm.io/xorm/session.go b/vendor/xorm.io/xorm/session.go
index 14d0781..499b7df 100644
--- a/vendor/xorm.io/xorm/session.go
+++ b/vendor/xorm.io/xorm/session.go
@@ -16,6 +16,8 @@ import (
 	"io"
 	"reflect"
 	"strconv"
+	"strings"
+
 	"xorm.io/xorm/contexts"
 	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
@@ -77,8 +79,7 @@ type Session struct {
 	afterClosures   []func(interface{})
 	afterProcessors []executedProcessor
 
-	stmtCache   map[uint32]*core.Stmt // key: hash.Hash32 of (queryStr, len(queryStr))
-	txStmtCache map[uint32]*core.Stmt // for tx statement
+	stmtCache map[uint32]*core.Stmt //key: hash.Hash32 of (queryStr, len(queryStr))
 
 	lastSQL     string
 	lastSQLArgs []interface{}
@@ -122,14 +123,13 @@ func newSession(engine *Engine) *Session {
 		autoResetStatement:     true,
 		prepareStmt:            false,
 
-		afterInsertBeans: make(map[interface{}]*[]func(interface{})),
-		afterUpdateBeans: make(map[interface{}]*[]func(interface{})),
-		afterDeleteBeans: make(map[interface{}]*[]func(interface{})),
+		afterInsertBeans: make(map[interface{}]*[]func(interface{}), 0),
+		afterUpdateBeans: make(map[interface{}]*[]func(interface{}), 0),
+		afterDeleteBeans: make(map[interface{}]*[]func(interface{}), 0),
 		beforeClosures:   make([]func(interface{}), 0),
 		afterClosures:    make([]func(interface{}), 0),
 		afterProcessors:  make([]executedProcessor, 0),
 		stmtCache:        make(map[uint32]*core.Stmt),
-		txStmtCache:      make(map[uint32]*core.Stmt),
 
 		lastSQL:     "",
 		lastSQLArgs: make([]interface{}, 0),
@@ -150,12 +150,6 @@ func (session *Session) Close() error {
 		}
 	}
 
-	for _, v := range session.txStmtCache {
-		if err := v.Close(); err != nil {
-			return err
-		}
-	}
-
 	if !session.isClosed {
 		// When Close be called, if session is a transaction and do not call
 		// Commit or Rollback, then call Rollback.
@@ -166,7 +160,6 @@ func (session *Session) Close() error {
 		}
 		session.tx = nil
 		session.stmtCache = nil
-		session.txStmtCache = nil
 		session.isClosed = true
 	}
 	return nil
@@ -207,7 +200,6 @@ func (session *Session) IsClosed() bool {
 func (session *Session) resetStatement() {
 	if session.autoResetStatement {
 		session.statement.Reset()
-		session.prepareStmt = false
 	}
 }
 
@@ -273,8 +265,8 @@ func (session *Session) Limit(limit int, start ...int) *Session {
 
 // OrderBy provide order by query condition, the input parameter is the content
 // after order by on a sql statement.
-func (session *Session) OrderBy(order interface{}, args ...interface{}) *Session {
-	session.statement.OrderBy(order, args...)
+func (session *Session) OrderBy(order string) *Session {
+	session.statement.OrderBy(order)
 	return session
 }
 
@@ -312,7 +304,7 @@ func (session *Session) Cascade(trueOrFalse ...bool) *Session {
 
 // MustLogSQL means record SQL or not and don't follow engine's setting
 func (session *Session) MustLogSQL(logs ...bool) *Session {
-	showSQL := true
+	var showSQL = true
 	if len(logs) > 0 {
 		showSQL = logs[0]
 	}
@@ -328,7 +320,7 @@ func (session *Session) NoCache() *Session {
 }
 
 // Join join_operator should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN
-func (session *Session) Join(joinOperator string, tablename interface{}, condition interface{}, args ...interface{}) *Session {
+func (session *Session) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *Session {
 	session.statement.Join(joinOperator, tablename, condition, args...)
 	return session
 }
@@ -352,7 +344,7 @@ func (session *Session) DB() *core.DB {
 
 func (session *Session) canCache() bool {
 	if session.statement.RefTable == nil ||
-		session.statement.NeedTableName() ||
+		session.statement.JoinStr != "" ||
 		session.statement.RawSQL != "" ||
 		!session.statement.UseCache ||
 		session.statement.IsForUpdate ||
@@ -378,25 +370,10 @@ func (session *Session) doPrepare(db *core.DB, sqlStr string) (stmt *core.Stmt,
 	return
 }
 
-func (session *Session) doPrepareTx(sqlStr string) (stmt *core.Stmt, err error) {
-	crc := crc32.ChecksumIEEE([]byte(sqlStr))
-	// TODO try hash(sqlStr+len(sqlStr))
-	var has bool
-	stmt, has = session.txStmtCache[crc]
-	if !has {
-		stmt, err = session.tx.PrepareContext(session.ctx, sqlStr)
-		if err != nil {
-			return nil, err
-		}
-		session.txStmtCache[crc] = stmt
-	}
-	return
-}
-
-func getField(dataStruct *reflect.Value, table *schemas.Table, field *QueryedField) (*schemas.Column, *reflect.Value, error) {
-	col := field.ColumnSchema
+func (session *Session) getField(dataStruct *reflect.Value, table *schemas.Table, colName string, idx int) (*schemas.Column, *reflect.Value, error) {
+	var col = table.GetColumnIdx(colName, idx)
 	if col == nil {
-		return nil, nil, ErrFieldIsNotExist{field.FieldName, table.Name}
+		return nil, nil, ErrFieldIsNotExist{colName, table.Name}
 	}
 
 	fieldValue, err := col.ValueOfV(dataStruct)
@@ -404,10 +381,10 @@ func getField(dataStruct *reflect.Value, table *schemas.Table, field *QueryedFie
 		return nil, nil, err
 	}
 	if fieldValue == nil {
-		return nil, nil, ErrFieldIsNotValid{field.FieldName, table.Name}
+		return nil, nil, ErrFieldIsNotValid{colName, table.Name}
 	}
 	if !fieldValue.IsValid() || !fieldValue.CanSet() {
-		return nil, nil, ErrFieldIsNotValid{field.FieldName, table.Name}
+		return nil, nil, ErrFieldIsNotValid{colName, table.Name}
 	}
 
 	return col, fieldValue, nil
@@ -416,12 +393,11 @@ func getField(dataStruct *reflect.Value, table *schemas.Table, field *QueryedFie
 // Cell cell is a result of one column field
 type Cell *interface{}
 
-func (session *Session) rows2Beans(rows *core.Rows, columnsSchema *ColumnsSchema, fields []string, types []*sql.ColumnType,
+func (session *Session) rows2Beans(rows *core.Rows, fields []string, types []*sql.ColumnType,
 	table *schemas.Table, newElemFunc func([]string) reflect.Value,
-	sliceValueSetFunc func(*reflect.Value, schemas.PK) error,
-) error {
+	sliceValueSetFunc func(*reflect.Value, schemas.PK) error) error {
 	for rows.Next() {
-		newValue := newElemFunc(fields)
+		var newValue = newElemFunc(fields)
 		bean := newValue.Interface()
 		dataStruct := newValue.Elem()
 
@@ -430,7 +406,7 @@ func (session *Session) rows2Beans(rows *core.Rows, columnsSchema *ColumnsSchema
 		if err != nil {
 			return err
 		}
-		pk, err := session.slice2Bean(scanResults, columnsSchema, fields, bean, &dataStruct, table)
+		pk, err := session.slice2Bean(scanResults, fields, bean, &dataStruct, table)
 		if err != nil {
 			return err
 		}
@@ -464,7 +440,7 @@ func (session *Session) row2Slice(rows *core.Rows, fields []string, types []*sql
 	return scanResults, nil
 }
 
-func setJSON(fieldValue *reflect.Value, fieldType reflect.Type, scanResult interface{}) error {
+func (session *Session) setJSON(fieldValue *reflect.Value, fieldType reflect.Type, scanResult interface{}) error {
 	bs, ok := convert.AsBytes(scanResult)
 	if !ok {
 		return fmt.Errorf("unsupported database data type: %#v", scanResult)
@@ -532,11 +508,8 @@ func asKind(vv reflect.Value, tp reflect.Type) (interface{}, error) {
 	return nil, fmt.Errorf("unsupported primary key type: %v, %v", tp, vv)
 }
 
-var uint8ZeroValue = reflect.ValueOf(uint8(0))
-
 func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflect.Value,
-	scanResult interface{}, table *schemas.Table,
-) error {
+	scanResult interface{}, table *schemas.Table) error {
 	v, ok := scanResult.(*interface{})
 	if ok {
 		scanResult = *v
@@ -551,9 +524,6 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 			if !ok {
 				return fmt.Errorf("cannot convert %#v as bytes", scanResult)
 			}
-			if data == nil {
-				return nil
-			}
 			return structConvert.FromDB(data)
 		}
 	}
@@ -578,7 +548,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 	fieldType := fieldValue.Type()
 
 	if col.IsJSON {
-		return setJSON(fieldValue, fieldType, scanResult)
+		return session.setJSON(fieldValue, fieldType, scanResult)
 	}
 
 	switch fieldType.Kind() {
@@ -597,8 +567,8 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 		}
 		return nil
 	case reflect.Complex64, reflect.Complex128:
-		return setJSON(fieldValue, fieldType, scanResult)
-	case reflect.Slice:
+		return session.setJSON(fieldValue, fieldType, scanResult)
+	case reflect.Slice, reflect.Array:
 		bs, ok := convert.AsBytes(scanResult)
 		if ok && fieldType.Elem().Kind() == reflect.Uint8 {
 			if col.SQLType.IsText() {
@@ -609,29 +579,15 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 				}
 				fieldValue.Set(x.Elem())
 			} else {
-				fieldValue.Set(reflect.ValueOf(bs))
-			}
-			return nil
-		}
-	case reflect.Array:
-		bs, ok := convert.AsBytes(scanResult)
-		if ok && fieldType.Elem().Kind() == reflect.Uint8 {
-			if col.SQLType.IsText() {
-				x := reflect.New(fieldType)
-				err := json.DefaultJSONHandler.Unmarshal(bs, x.Interface())
-				if err != nil {
-					return err
-				}
-				fieldValue.Set(x.Elem())
-			} else {
-				if fieldValue.Len() < vv.Len() {
-					return fmt.Errorf("Set field %s[Array] failed because of data too long", col.Name)
-				}
-				for i := 0; i < fieldValue.Len(); i++ {
-					if i < vv.Len() {
-						fieldValue.Index(i).Set(vv.Index(i))
-					} else {
-						fieldValue.Index(i).Set(uint8ZeroValue)
+				if fieldValue.Len() > 0 {
+					for i := 0; i < fieldValue.Len(); i++ {
+						if i < vv.Len() {
+							fieldValue.Index(i).Set(vv.Index(i))
+						}
+					}
+				} else {
+					for i := 0; i < vv.Len(); i++ {
+						fieldValue.Set(reflect.Append(*fieldValue, vv.Index(i)))
 					}
 				}
 			}
@@ -675,7 +631,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 			if len(table.PrimaryKeys) != 1 {
 				return errors.New("unsupported non or composited primary key cascade")
 			}
-			pk := make(schemas.PK, len(table.PrimaryKeys))
+			var pk = make(schemas.PK, len(table.PrimaryKeys))
 			pk[0], err = asKind(vv, reflect.TypeOf(scanResult))
 			if err != nil {
 				return err
@@ -703,22 +659,35 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 	return convert.AssignValue(fieldValue.Addr(), scanResult)
 }
 
-func (session *Session) slice2Bean(scanResults []interface{}, columnsSchema *ColumnsSchema, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) {
+func (session *Session) slice2Bean(scanResults []interface{}, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) {
 	defer func() {
 		executeAfterSet(bean, fields, scanResults)
 	}()
 
 	buildAfterProcessors(session, bean)
 
+	var tempMap = make(map[string]int)
 	var pk schemas.PK
-	for i, field := range columnsSchema.Fields {
-		col, fieldValue, err := getField(dataStruct, table, field)
-		if _, ok := err.(ErrFieldIsNotExist); ok {
-			continue
-		} else if err != nil {
-			return nil, err
-		}
+	for i, colName := range fields {
+		var idx int
+		var lKey = strings.ToLower(colName)
+		var ok bool
 
+		if idx, ok = tempMap[lKey]; !ok {
+			idx = 0
+		} else {
+			idx = idx + 1
+		}
+		tempMap[lKey] = idx
+
+		col, fieldValue, err := session.getField(dataStruct, table, colName, idx)
+		if err != nil {
+			if _, ok := err.(ErrFieldIsNotExist); ok {
+				continue
+			} else {
+				return nil, err
+			}
+		}
 		if fieldValue == nil {
 			continue
 		}
@@ -761,12 +730,6 @@ func (session *Session) incrVersionFieldValue(fieldValue *reflect.Value) {
 
 // Context sets the context on this session
 func (session *Session) Context(ctx context.Context) *Session {
-	if session.engine.logSessionID && session.ctx != nil {
-		ctx = context.WithValue(ctx, log.SessionIDKey, session.ctx.Value(log.SessionIDKey))
-		ctx = context.WithValue(ctx, log.SessionKey, session.ctx.Value(log.SessionKey))
-		ctx = context.WithValue(ctx, log.SessionShowSQLKey, session.ctx.Value(log.SessionShowSQLKey))
-	}
-
 	session.ctx = ctx
 	return session
 }
@@ -780,13 +743,3 @@ func (session *Session) PingContext(ctx context.Context) error {
 	session.engine.logger.Infof("PING DATABASE %v", session.engine.DriverName())
 	return session.DB().PingContext(ctx)
 }
-
-// disable version check
-func (session *Session) NoVersionCheck() *Session {
-	session.statement.CheckVersion = false
-	return session
-}
-
-func SetDefaultJSONHandler(jsonHandler json.Interface) {
-	json.DefaultJSONHandler = jsonHandler
-}
diff --git a/vendor/xorm.io/xorm/session_delete.go b/vendor/xorm.io/xorm/session_delete.go
index 7336040..37b9c1c 100644
--- a/vendor/xorm.io/xorm/session_delete.go
+++ b/vendor/xorm.io/xorm/session_delete.go
@@ -6,15 +6,20 @@ package xorm
 
 import (
 	"errors"
+	"fmt"
 	"strconv"
 
-	"xorm.io/builder"
 	"xorm.io/xorm/caches"
 	"xorm.io/xorm/schemas"
 )
 
-// ErrNeedDeletedCond delete needs less one condition error
-var ErrNeedDeletedCond = errors.New("Delete action needs at least one condition")
+var (
+	// ErrNeedDeletedCond delete needs less one condition error
+	ErrNeedDeletedCond = errors.New("Delete action needs at least one condition")
+
+	// ErrNotImplemented not implemented
+	ErrNotImplemented = errors.New("Not implemented")
+)
 
 func (session *Session) cacheDelete(table *schemas.Table, tableName, sqlStr string, args ...interface{}) error {
 	if table == nil ||
@@ -23,7 +28,7 @@ func (session *Session) cacheDelete(table *schemas.Table, tableName, sqlStr stri
 	}
 
 	for _, filter := range session.engine.dialect.Filters() {
-		sqlStr = filter.Do(session.ctx, sqlStr)
+		sqlStr = filter.Do(sqlStr)
 	}
 
 	newsql := session.statement.ConvertIDSQL(sqlStr)
@@ -35,13 +40,7 @@ func (session *Session) cacheDelete(table *schemas.Table, tableName, sqlStr stri
 	pkColumns := table.PKColumns()
 	ids, err := caches.GetCacheSql(cacher, tableName, newsql, args)
 	if err != nil {
-		rows, err := session.queryRows(newsql, args...)
-		if err != nil {
-			return err
-		}
-		defer rows.Close()
-
-		resultsSlice, err := session.engine.ScanStringMaps(rows)
+		resultsSlice, err := session.queryBytes(newsql, args...)
 		if err != nil {
 			return err
 		}
@@ -54,9 +53,9 @@ func (session *Session) cacheDelete(table *schemas.Table, tableName, sqlStr stri
 					if v, ok := data[col.Name]; !ok {
 						return errors.New("no id")
 					} else if col.SQLType.IsText() {
-						pk = append(pk, v)
+						pk = append(pk, string(v))
 					} else if col.SQLType.IsNumeric() {
-						id, err = strconv.ParseInt(v, 10, 64)
+						id, err = strconv.ParseInt(string(v), 10, 64)
 						if err != nil {
 							return err
 						}
@@ -84,18 +83,7 @@ func (session *Session) cacheDelete(table *schemas.Table, tableName, sqlStr stri
 }
 
 // Delete records, bean's non-empty fields are conditions
-// At least one condition must be set.
 func (session *Session) Delete(beans ...interface{}) (int64, error) {
-	return session.delete(beans, true)
-}
-
-// Truncate records, bean's non-empty fields are conditions
-// In contrast to Delete this method allows deletes without conditions.
-func (session *Session) Truncate(beans ...interface{}) (int64, error) {
-	return session.delete(beans, false)
-}
-
-func (session *Session) delete(beans []interface{}, mustHaveConditions bool) (int64, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
@@ -105,8 +93,10 @@ func (session *Session) delete(beans []interface{}, mustHaveConditions bool) (in
 	}
 
 	var (
-		err  error
-		bean interface{}
+		condSQL  string
+		condArgs []interface{}
+		err      error
+		bean     interface{}
 	)
 	if len(beans) > 0 {
 		bean = beans[0]
@@ -120,50 +110,127 @@ func (session *Session) delete(beans []interface{}, mustHaveConditions bool) (in
 			processor.BeforeDelete()
 		}
 
-		if err = session.statement.MergeConds(bean); err != nil {
-			return 0, err
-		}
+		condSQL, condArgs, err = session.statement.GenConds(bean)
+	} else {
+		condSQL, condArgs, err = session.statement.GenCondSQL(session.statement.Conds())
 	}
-
-	pLimitN := session.statement.LimitN
-	if mustHaveConditions && !session.statement.Conds().IsValid() && (pLimitN == nil || *pLimitN == 0) {
-		return 0, ErrNeedDeletedCond
-	}
-
-	tableNameNoQuote := session.statement.TableName()
-	table := session.statement.RefTable
-
-	realSQLWriter := builder.NewWriter()
-	deleteSQLWriter := builder.NewWriter()
-	if err := session.statement.WriteDelete(realSQLWriter, deleteSQLWriter, session.engine.nowTime); err != nil {
+	if err != nil {
 		return 0, err
 	}
 
-	if session.statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled
+	pLimitN := session.statement.LimitN
+	if len(condSQL) == 0 && (pLimitN == nil || *pLimitN == 0) {
+		return 0, ErrNeedDeletedCond
+	}
+
+	var tableNameNoQuote = session.statement.TableName()
+	var tableName = session.engine.Quote(tableNameNoQuote)
+	var table = session.statement.RefTable
+	var deleteSQL string
+	if len(condSQL) > 0 {
+		deleteSQL = fmt.Sprintf("DELETE FROM %v WHERE %v", tableName, condSQL)
 	} else {
+		deleteSQL = fmt.Sprintf("DELETE FROM %v", tableName)
+	}
+
+	var orderSQL string
+	if len(session.statement.OrderStr) > 0 {
+		orderSQL += fmt.Sprintf(" ORDER BY %s", session.statement.OrderStr)
+	}
+	if pLimitN != nil && *pLimitN > 0 {
+		limitNValue := *pLimitN
+		orderSQL += fmt.Sprintf(" LIMIT %d", limitNValue)
+	}
+
+	if len(orderSQL) > 0 {
+		switch session.engine.dialect.URI().DBType {
+		case schemas.POSTGRES:
+			inSQL := fmt.Sprintf("ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQL)
+			if len(condSQL) > 0 {
+				deleteSQL += " AND " + inSQL
+			} else {
+				deleteSQL += " WHERE " + inSQL
+			}
+		case schemas.SQLITE:
+			inSQL := fmt.Sprintf("rowid IN (SELECT rowid FROM %s%s)", tableName, orderSQL)
+			if len(condSQL) > 0 {
+				deleteSQL += " AND " + inSQL
+			} else {
+				deleteSQL += " WHERE " + inSQL
+			}
+			// TODO: how to handle delete limit on mssql?
+		case schemas.MSSQL:
+			return 0, ErrNotImplemented
+		default:
+			deleteSQL += orderSQL
+		}
+	}
+
+	var realSQL string
+	argsForCache := make([]interface{}, 0, len(condArgs)*2)
+	if session.statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled
+		realSQL = deleteSQL
+		copy(argsForCache, condArgs)
+		argsForCache = append(condArgs, argsForCache...)
+	} else {
+		// !oinume! sqlStrForCache and argsForCache is needed to behave as executing "DELETE FROM ..." for caches.
+		copy(argsForCache, condArgs)
+		argsForCache = append(condArgs, argsForCache...)
+
 		deletedColumn := table.DeletedColumn()
-		_, t, err := session.engine.nowTime(deletedColumn)
+		realSQL = fmt.Sprintf("UPDATE %v SET %v = ? WHERE %v",
+			session.engine.Quote(session.statement.TableName()),
+			session.engine.Quote(deletedColumn.Name),
+			condSQL)
+
+		if len(orderSQL) > 0 {
+			switch session.engine.dialect.URI().DBType {
+			case schemas.POSTGRES:
+				inSQL := fmt.Sprintf("ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQL)
+				if len(condSQL) > 0 {
+					realSQL += " AND " + inSQL
+				} else {
+					realSQL += " WHERE " + inSQL
+				}
+			case schemas.SQLITE:
+				inSQL := fmt.Sprintf("rowid IN (SELECT rowid FROM %s%s)", tableName, orderSQL)
+				if len(condSQL) > 0 {
+					realSQL += " AND " + inSQL
+				} else {
+					realSQL += " WHERE " + inSQL
+				}
+				// TODO: how to handle delete limit on mssql?
+			case schemas.MSSQL:
+				return 0, ErrNotImplemented
+			default:
+				realSQL += orderSQL
+			}
+		}
+
+		// !oinume! Insert nowTime to the head of session.statement.Params
+		condArgs = append(condArgs, "")
+		paramsLen := len(condArgs)
+		copy(condArgs[1:paramsLen], condArgs[0:paramsLen-1])
+
+		val, t, err := session.engine.nowTime(deletedColumn)
 		if err != nil {
 			return 0, err
 		}
+		condArgs[0] = val
 
-		colName := deletedColumn.Name
+		var colName = deletedColumn.Name
 		session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 			col := table.GetColumn(colName)
 			setColumnTime(bean, col, t)
 		})
 	}
 
-	argsForCache := make([]interface{}, 0, len(deleteSQLWriter.Args())*2)
-	copy(argsForCache, deleteSQLWriter.Args())
-	argsForCache = append(deleteSQLWriter.Args(), argsForCache...)
-
 	if cacher := session.engine.GetCacher(tableNameNoQuote); cacher != nil && session.statement.UseCache {
-		_ = session.cacheDelete(table, tableNameNoQuote, deleteSQLWriter.String(), argsForCache...)
+		session.cacheDelete(table, tableNameNoQuote, deleteSQL, argsForCache...)
 	}
 
 	session.statement.RefTable = table
-	res, err := session.exec(realSQLWriter.String(), realSQLWriter.Args()...)
+	res, err := session.exec(realSQL, condArgs...)
 	if err != nil {
 		return 0, err
 	}
diff --git a/vendor/xorm.io/xorm/session_find.go b/vendor/xorm.io/xorm/session_find.go
index 1026910..47a3d30 100644
--- a/vendor/xorm.io/xorm/session_find.go
+++ b/vendor/xorm.io/xorm/session_find.go
@@ -5,10 +5,8 @@
 package xorm
 
 import (
-	"database/sql"
 	"errors"
 	"reflect"
-	"strings"
 
 	"xorm.io/builder"
 	"xorm.io/xorm/caches"
@@ -59,10 +57,12 @@ func (session *Session) FindAndCount(rowsSlicePtr interface{}, condiBean ...inte
 	if session.statement.SelectStr != "" {
 		session.statement.SelectStr = ""
 	}
-	if len(session.statement.ColumnMap) > 0 && !session.statement.IsDistinct {
+	if len(session.statement.ColumnMap) > 0 {
 		session.statement.ColumnMap = []string{}
 	}
-	session.statement.ResetOrderBy()
+	if session.statement.OrderStr != "" {
+		session.statement.OrderStr = ""
+	}
 	if session.statement.LimitN != nil {
 		session.statement.LimitN = nil
 	}
@@ -71,11 +71,7 @@ func (session *Session) FindAndCount(rowsSlicePtr interface{}, condiBean ...inte
 	}
 
 	// session has stored the conditions so we use `unscoped` to avoid duplicated condition.
-	if sliceElementType.Kind() == reflect.Struct {
-		return session.Unscoped().Count(reflect.New(sliceElementType).Interface())
-	}
-
-	return session.Unscoped().Count()
+	return session.Unscoped().Count(reflect.New(sliceElementType).Interface())
 }
 
 func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{}) error {
@@ -85,15 +81,15 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
 	}
 
 	sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr))
-	isSlice := sliceValue.Kind() == reflect.Slice
-	isMap := sliceValue.Kind() == reflect.Map
+	var isSlice = sliceValue.Kind() == reflect.Slice
+	var isMap = sliceValue.Kind() == reflect.Map
 	if !isSlice && !isMap {
 		return errors.New("needs a pointer to a slice or a map")
 	}
 
 	sliceElementType := sliceValue.Type().Elem()
 
-	tp := tpStruct
+	var tp = tpStruct
 	if session.statement.RefTable == nil {
 		if sliceElementType.Kind() == reflect.Ptr {
 			if sliceElementType.Elem().Kind() == reflect.Struct {
@@ -116,7 +112,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
 
 	var (
 		table          = session.statement.RefTable
-		addedTableName = session.statement.NeedTableName()
+		addedTableName = (len(session.statement.JoinStr) > 0)
 		autoCond       builder.Cond
 	)
 	if tp == tpStruct {
@@ -156,6 +152,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
 			if err != ErrCacheFailed {
 				return err
 			}
+			err = nil // !nashtsai! reset err to nil for ErrCacheFailed
 			session.engine.logger.Warnf("Cache Find Failed")
 		}
 	}
@@ -163,64 +160,6 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
 	return session.noCacheFind(table, sliceValue, sqlStr, args...)
 }
 
-type QueryedField struct {
-	FieldName      string
-	LowerFieldName string
-	ColumnType     *sql.ColumnType
-	TempIndex      int
-	ColumnSchema   *schemas.Column
-}
-
-type ColumnsSchema struct {
-	Fields     []*QueryedField
-	FieldNames []string
-	Types      []*sql.ColumnType
-}
-
-func (columnsSchema *ColumnsSchema) ParseTableSchema(table *schemas.Table) {
-	for _, field := range columnsSchema.Fields {
-		field.ColumnSchema = table.GetColumnIdx(field.FieldName, field.TempIndex)
-	}
-}
-
-func ParseColumnsSchema(fieldNames []string, types []*sql.ColumnType, table *schemas.Table) *ColumnsSchema {
-	var columnsSchema ColumnsSchema
-
-	fields := make([]*QueryedField, 0, len(fieldNames))
-
-	for i, fieldName := range fieldNames {
-		field := &QueryedField{
-			FieldName:      fieldName,
-			LowerFieldName: strings.ToLower(fieldName),
-			ColumnType:     types[i],
-		}
-		fields = append(fields, field)
-	}
-
-	columnsSchema.Fields = fields
-
-	tempMap := make(map[string]int)
-	for _, field := range fields {
-		var idx int
-		var ok bool
-
-		if idx, ok = tempMap[field.LowerFieldName]; !ok {
-			idx = 0
-		} else {
-			idx++
-		}
-
-		tempMap[field.LowerFieldName] = idx
-		field.TempIndex = idx
-	}
-
-	if table != nil {
-		columnsSchema.ParseTableSchema(table)
-	}
-
-	return &columnsSchema
-}
-
 func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect.Value, sqlStr string, args ...interface{}) error {
 	elemType := containerValue.Type().Elem()
 	var isPointer bool
@@ -248,7 +187,7 @@ func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect
 		return err
 	}
 
-	newElemFunc := func(fields []string) reflect.Value {
+	var newElemFunc = func(fields []string) reflect.Value {
 		return utils.New(elemType, len(fields), len(fields))
 	}
 
@@ -293,15 +232,12 @@ func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect
 	}
 
 	if elemType.Kind() == reflect.Struct {
-		newValue := newElemFunc(fields)
+		var newValue = newElemFunc(fields)
 		tb, err := session.engine.tagParser.ParseWithCache(newValue)
 		if err != nil {
 			return err
 		}
-
-		columnsSchema := ParseColumnsSchema(fields, types, tb)
-
-		err = session.rows2Beans(rows, columnsSchema, fields, types, tb, newElemFunc, containerValueSetFunc)
+		err = session.rows2Beans(rows, fields, types, tb, newElemFunc, containerValueSetFunc)
 		rows.Close()
 		if err != nil {
 			return err
@@ -310,14 +246,14 @@ func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect
 	}
 
 	for rows.Next() {
-		newValue := newElemFunc(fields)
+		var newValue = newElemFunc(fields)
 		bean := newValue.Interface()
 
 		switch elemType.Kind() {
 		case reflect.Slice:
-			err = session.getSlice(rows, types, fields, bean)
+			err = rows.ScanSlice(bean)
 		case reflect.Map:
-			err = session.getMap(rows, types, fields, bean)
+			err = rows.ScanMap(bean)
 		default:
 			err = rows.Scan(bean)
 		}
@@ -346,7 +282,7 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 	}
 
 	for _, filter := range session.engine.dialect.Filters() {
-		sqlStr = filter.Do(session.ctx, sqlStr)
+		sqlStr = filter.Do(sqlStr)
 	}
 
 	newsql := session.statement.ConvertIDSQL(sqlStr)
@@ -371,7 +307,7 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 				session.engine.logger.Debugf("[cacheFind] ids length > 500, no cache")
 				return ErrCacheFailed
 			}
-			res := make([]string, len(table.PrimaryKeys))
+			var res = make([]string, len(table.PrimaryKeys))
 			err = rows.ScanSlice(&res)
 			if err != nil {
 				return err
@@ -403,7 +339,7 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 
 	ididxes := make(map[string]int)
 	var ides []schemas.PK
-	temps := make([]interface{}, len(ids))
+	var temps = make([]interface{}, len(ids))
 
 	for idx, id := range ids {
 		sid, err := id.ToString()
@@ -518,7 +454,7 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 				sliceValue.Set(reflect.Append(sliceValue, reflect.Indirect(reflect.ValueOf(bean))))
 			}
 		} else if sliceValue.Kind() == reflect.Map {
-			key := ids[j]
+			var key = ids[j]
 			keyType := sliceValue.Type().Key()
 			keyValue := reflect.New(keyType)
 			var ikey interface{}
diff --git a/vendor/xorm.io/xorm/session_get.go b/vendor/xorm.io/xorm/session_get.go
index 76ccaf9..0817252 100644
--- a/vendor/xorm.io/xorm/session_get.go
+++ b/vendor/xorm.io/xorm/session_get.go
@@ -6,6 +6,7 @@ package xorm
 
 import (
 	"database/sql"
+	"database/sql/driver"
 	"errors"
 	"fmt"
 	"math/big"
@@ -27,11 +28,11 @@ var (
 
 // Get retrieve one record from database, bean's non-empty fields
 // will be as conditions
-func (session *Session) Get(beans ...interface{}) (bool, error) {
+func (session *Session) Get(bean interface{}) (bool, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
-	return session.get(beans...)
+	return session.get(bean)
 }
 
 func isPtrOfTime(v interface{}) bool {
@@ -47,17 +48,14 @@ func isPtrOfTime(v interface{}) bool {
 	return el.Type().ConvertibleTo(schemas.TimeType)
 }
 
-func (session *Session) get(beans ...interface{}) (bool, error) {
+func (session *Session) get(bean interface{}) (bool, error) {
 	defer session.resetStatement()
 
 	if session.statement.LastError != nil {
 		return false, session.statement.LastError
 	}
-	if len(beans) == 0 {
-		return false, errors.New("needs at least one parameter for get")
-	}
 
-	beanValue := reflect.ValueOf(beans[0])
+	beanValue := reflect.ValueOf(bean)
 	if beanValue.Kind() != reflect.Ptr {
 		return false, errors.New("needs a pointer to a value")
 	} else if beanValue.Elem().Kind() == reflect.Ptr {
@@ -66,9 +64,8 @@ func (session *Session) get(beans ...interface{}) (bool, error) {
 		return false, ErrObjectIsNil
 	}
 
-	var isStruct = beanValue.Elem().Kind() == reflect.Struct && !isPtrOfTime(beans[0])
-	if isStruct {
-		if err := session.statement.SetRefBean(beans[0]); err != nil {
+	if beanValue.Elem().Kind() == reflect.Struct && !isPtrOfTime(bean) {
+		if err := session.statement.SetRefBean(bean); err != nil {
 			return false, err
 		}
 	}
@@ -78,11 +75,11 @@ func (session *Session) get(beans ...interface{}) (bool, error) {
 	var err error
 
 	if session.statement.RawSQL == "" {
-		if len(session.statement.TableName()) == 0 {
+		if len(session.statement.TableName()) <= 0 {
 			return false, ErrTableNotFound
 		}
 		session.statement.Limit(1)
-		sqlStr, args, err = session.statement.GenGetSQL(beans[0])
+		sqlStr, args, err = session.statement.GenGetSQL(bean)
 		if err != nil {
 			return false, err
 		}
@@ -93,10 +90,10 @@ func (session *Session) get(beans ...interface{}) (bool, error) {
 
 	table := session.statement.RefTable
 
-	if session.statement.ColumnMap.IsEmpty() && session.canCache() && isStruct {
+	if session.statement.ColumnMap.IsEmpty() && session.canCache() && beanValue.Elem().Kind() == reflect.Struct {
 		if cacher := session.engine.GetCacher(session.statement.TableName()); cacher != nil &&
 			!session.statement.GetUnscoped() {
-			has, err := session.cacheGet(beans[0], sqlStr, args...)
+			has, err := session.cacheGet(bean, sqlStr, args...)
 			if err != ErrCacheFailed {
 				return has, err
 			}
@@ -104,12 +101,12 @@ func (session *Session) get(beans ...interface{}) (bool, error) {
 	}
 
 	context := session.statement.Context
-	if context != nil && isStruct {
+	if context != nil {
 		res := context.Get(fmt.Sprintf("%v-%v", sqlStr, args))
 		if res != nil {
 			session.engine.logger.Debugf("hit context cache: %s", sqlStr)
 
-			structValue := reflect.Indirect(reflect.ValueOf(beans[0]))
+			structValue := reflect.Indirect(reflect.ValueOf(bean))
 			structValue.Set(reflect.Indirect(reflect.ValueOf(res)))
 			session.lastSQL = ""
 			session.lastSQLArgs = nil
@@ -117,18 +114,29 @@ func (session *Session) get(beans ...interface{}) (bool, error) {
 		}
 	}
 
-	has, err := session.nocacheGet(beanValue.Elem().Kind(), table, beans, sqlStr, args...)
+	has, err := session.nocacheGet(beanValue.Elem().Kind(), table, bean, sqlStr, args...)
 	if err != nil || !has {
 		return has, err
 	}
 
-	if context != nil && isStruct {
-		context.Put(fmt.Sprintf("%v-%v", sqlStr, args), beans[0])
+	if context != nil {
+		context.Put(fmt.Sprintf("%v-%v", sqlStr, args), bean)
 	}
 
 	return true, nil
 }
 
+var (
+	valuerTypePlaceHolder driver.Valuer
+	valuerType            = reflect.TypeOf(&valuerTypePlaceHolder).Elem()
+
+	scannerTypePlaceHolder sql.Scanner
+	scannerType            = reflect.TypeOf(&scannerTypePlaceHolder).Elem()
+
+	conversionTypePlaceHolder convert.Conversion
+	conversionType            = reflect.TypeOf(&conversionTypePlaceHolder).Elem()
+)
+
 func isScannableStruct(bean interface{}, typeLen int) bool {
 	switch bean.(type) {
 	case *time.Time:
@@ -143,7 +151,7 @@ func isScannableStruct(bean interface{}, typeLen int) bool {
 	return true
 }
 
-func (session *Session) nocacheGet(beanKind reflect.Kind, table *schemas.Table, beans []interface{}, sqlStr string, args ...interface{}) (bool, error) {
+func (session *Session) nocacheGet(beanKind reflect.Kind, table *schemas.Table, bean interface{}, sqlStr string, args ...interface{}) (bool, error) {
 	rows, err := session.queryRows(sqlStr, args...)
 	if err != nil {
 		return false, err
@@ -163,53 +171,27 @@ func (session *Session) nocacheGet(beanKind reflect.Kind, table *schemas.Table,
 	if err != nil {
 		return true, err
 	}
-
-	columnsSchema := ParseColumnsSchema(fields, types, table)
-
-	if err := session.scan(rows, table, beanKind, beans, columnsSchema, types, fields); err != nil {
-		return true, err
-	}
-	rows.Close()
-
-	return true, session.executeProcessors()
-}
-
-func (session *Session) scan(rows *core.Rows, table *schemas.Table, firstBeanKind reflect.Kind, beans []interface{}, columnsSchema *ColumnsSchema, types []*sql.ColumnType, fields []string) error {
-	if len(beans) == 1 {
-		bean := beans[0]
-		switch firstBeanKind {
-		case reflect.Struct:
-			if !isScannableStruct(bean, len(types)) {
-				break
-			}
-			scanResults, err := session.row2Slice(rows, fields, types, bean)
-			if err != nil {
-				return err
-			}
-
-			dataStruct := utils.ReflectValue(bean)
-			_, err = session.slice2Bean(scanResults, columnsSchema, fields, bean, &dataStruct, table)
-			return err
-		case reflect.Slice:
-			return session.getSlice(rows, types, fields, bean)
-		case reflect.Map:
-			return session.getMap(rows, types, fields, bean)
+	switch beanKind {
+	case reflect.Struct:
+		if !isScannableStruct(bean, len(types)) {
+			break
 		}
+		return session.getStruct(rows, types, fields, table, bean)
+	case reflect.Slice:
+		return session.getSlice(rows, types, fields, bean)
+	case reflect.Map:
+		return session.getMap(rows, types, fields, bean)
 	}
 
-	if len(beans) != len(types) {
-		return fmt.Errorf("expected columns %d, but only %d variables", len(types), len(beans))
-	}
-
-	return session.engine.scan(rows, fields, types, beans...)
+	return session.getVars(rows, types, fields, bean)
 }
 
-func (session *Session) getSlice(rows *core.Rows, types []*sql.ColumnType, fields []string, bean interface{}) error {
+func (session *Session) getSlice(rows *core.Rows, types []*sql.ColumnType, fields []string, bean interface{}) (bool, error) {
 	switch t := bean.(type) {
 	case *[]string:
 		res, err := session.engine.scanStringInterface(rows, fields, types)
 		if err != nil {
-			return err
+			return true, err
 		}
 
 		var needAppend = len(*t) == 0 // both support slice is empty or has been initlized
@@ -220,17 +202,17 @@ func (session *Session) getSlice(rows *core.Rows, types []*sql.ColumnType, field
 				(*t)[i] = r.(*sql.NullString).String
 			}
 		}
-		return nil
+		return true, nil
 	case *[]interface{}:
 		scanResults, err := session.engine.scanInterfaces(rows, fields, types)
 		if err != nil {
-			return err
+			return true, err
 		}
 		var needAppend = len(*t) == 0
 		for ii := range fields {
 			s, err := convert.Interface2Interface(session.engine.DatabaseTZ, scanResults[ii])
 			if err != nil {
-				return err
+				return true, err
 			}
 			if needAppend {
 				*t = append(*t, s)
@@ -238,41 +220,67 @@ func (session *Session) getSlice(rows *core.Rows, types []*sql.ColumnType, field
 				(*t)[ii] = s
 			}
 		}
-		return nil
+		return true, nil
 	default:
-		return fmt.Errorf("unsupported slice type: %t", t)
+		return true, fmt.Errorf("unspoorted slice type: %t", t)
 	}
 }
 
-func (session *Session) getMap(rows *core.Rows, types []*sql.ColumnType, fields []string, bean interface{}) error {
+func (session *Session) getMap(rows *core.Rows, types []*sql.ColumnType, fields []string, bean interface{}) (bool, error) {
 	switch t := bean.(type) {
 	case *map[string]string:
 		scanResults, err := session.engine.scanStringInterface(rows, fields, types)
 		if err != nil {
-			return err
+			return true, err
 		}
 		for ii, key := range fields {
 			(*t)[key] = scanResults[ii].(*sql.NullString).String
 		}
-		return nil
+		return true, nil
 	case *map[string]interface{}:
 		scanResults, err := session.engine.scanInterfaces(rows, fields, types)
 		if err != nil {
-			return err
+			return true, err
 		}
 		for ii, key := range fields {
 			s, err := convert.Interface2Interface(session.engine.DatabaseTZ, scanResults[ii])
 			if err != nil {
-				return err
+				return true, err
 			}
 			(*t)[key] = s
 		}
-		return nil
+		return true, nil
 	default:
-		return fmt.Errorf("unsupported map type: %t", t)
+		return true, fmt.Errorf("unspoorted map type: %t", t)
 	}
 }
 
+func (session *Session) getVars(rows *core.Rows, types []*sql.ColumnType, fields []string, beans ...interface{}) (bool, error) {
+	if len(beans) != len(types) {
+		return false, fmt.Errorf("expected columns %d, but only %d variables", len(types), len(beans))
+	}
+
+	err := session.engine.scan(rows, fields, types, beans...)
+	return true, err
+}
+
+func (session *Session) getStruct(rows *core.Rows, types []*sql.ColumnType, fields []string, table *schemas.Table, bean interface{}) (bool, error) {
+	scanResults, err := session.row2Slice(rows, fields, types, bean)
+	if err != nil {
+		return false, err
+	}
+	// close it before convert data
+	rows.Close()
+
+	dataStruct := utils.ReflectValue(bean)
+	_, err = session.slice2Bean(scanResults, fields, bean, &dataStruct, table)
+	if err != nil {
+		return true, err
+	}
+
+	return true, session.executeProcessors()
+}
+
 func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interface{}) (has bool, err error) {
 	// if has no reftable, then don't use cache currently
 	if !session.canCache() {
@@ -280,7 +288,7 @@ func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interf
 	}
 
 	for _, filter := range session.engine.dialect.Filters() {
-		sqlStr = filter.Do(session.ctx, sqlStr)
+		sqlStr = filter.Do(sqlStr)
 	}
 	newsql := session.statement.ConvertIDSQL(sqlStr)
 	if newsql == "" {
@@ -349,7 +357,7 @@ func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interf
 		cacheBean := cacher.GetBean(tableName, sid)
 		if cacheBean == nil {
 			cacheBean = bean
-			has, err = session.nocacheGet(reflect.Struct, table, []interface{}{cacheBean}, sqlStr, args...)
+			has, err = session.nocacheGet(reflect.Struct, table, cacheBean, sqlStr, args...)
 			if err != nil || !has {
 				return has, err
 			}
diff --git a/vendor/xorm.io/xorm/session_insert.go b/vendor/xorm.io/xorm/session_insert.go
index 7cc1524..a8f365c 100644
--- a/vendor/xorm.io/xorm/session_insert.go
+++ b/vendor/xorm.io/xorm/session_insert.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"xorm.io/builder"
 	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
 	"xorm.io/xorm/internal/utils"
@@ -81,7 +80,7 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 	}
 
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
@@ -91,6 +90,7 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 		colNames       []string
 		colMultiPlaces []string
 		args           []interface{}
+		cols           []*schemas.Column
 	)
 
 	for i := 0; i < size; i++ {
@@ -123,12 +123,6 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 			}
 			fieldValue := *ptrFieldValue
 			if col.IsAutoIncrement && utils.IsZero(fieldValue.Interface()) {
-				if session.engine.dialect.Features().AutoincrMode == dialects.SequenceAutoincrMode {
-					if i == 0 {
-						colNames = append(colNames, col.Name)
-					}
-					colPlaces = append(colPlaces, utils.SeqName(tableName)+".nextval")
-				}
 				continue
 			}
 			if col.MapType == schemas.ONLYFROMDB {
@@ -143,13 +137,6 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 			if len(session.statement.ColumnMap) > 0 && !session.statement.ColumnMap.Contain(col.Name) {
 				continue
 			}
-			// !satorunooshie! set fieldValue as nil when column is nullable and zero-value
-			if _, ok := getFlagForColumn(session.statement.NullableMap, col); ok {
-				if col.Nullable && utils.IsValueZero(fieldValue) {
-					var nilValue *int
-					fieldValue = reflect.ValueOf(nilValue)
-				}
-			}
 			if (col.IsCreated || col.IsUpdated) && session.statement.UseAutoTime {
 				val, t, err := session.engine.nowTime(col)
 				if err != nil {
@@ -157,14 +144,14 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 				}
 				args = append(args, val)
 
-				colName := col.Name
+				var colName = col.Name
 				session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 					col := table.GetColumn(colName)
 					setColumnTime(bean, col, t)
 				})
 			} else if col.IsVersion && session.statement.CheckVersion {
 				args = append(args, 1)
-				colName := col.Name
+				var colName = col.Name
 				session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 					col := table.GetColumn(colName)
 					setColumnInt(bean, col, 1)
@@ -179,6 +166,7 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 
 			if i == 0 {
 				colNames = append(colNames, col.Name)
+				cols = append(cols, col)
 			}
 			colPlaces = append(colPlaces, "?")
 		}
@@ -187,17 +175,29 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
 	}
 	cleanupProcessorsClosures(&session.beforeClosures)
 
-	w := builder.NewWriter()
-	if err := session.statement.WriteInsertMultiple(w, tableName, colNames, colMultiPlaces); err != nil {
-		return 0, err
+	quoter := session.engine.dialect.Quoter()
+	var sql string
+	colStr := quoter.Join(colNames, ",")
+	if session.engine.dialect.URI().DBType == schemas.ORACLE {
+		temp := fmt.Sprintf(") INTO %s (%v) VALUES (",
+			quoter.Quote(tableName),
+			colStr)
+		sql = fmt.Sprintf("INSERT ALL INTO %s (%v) VALUES (%v) SELECT 1 FROM DUAL",
+			quoter.Quote(tableName),
+			colStr,
+			strings.Join(colMultiPlaces, temp))
+	} else {
+		sql = fmt.Sprintf("INSERT INTO %s (%v) VALUES (%v)",
+			quoter.Quote(tableName),
+			colStr,
+			strings.Join(colMultiPlaces, "),("))
 	}
-
-	res, err := session.exec(w.String(), args...)
+	res, err := session.exec(sql, args...)
 	if err != nil {
 		return 0, err
 	}
 
-	_ = session.cacheInsert(tableName)
+	session.cacheInsert(tableName)
 
 	lenAfterClosures := len(session.afterClosures)
 	for i := 0; i < size; i++ {
@@ -251,7 +251,7 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 	if err := session.statement.SetRefBean(bean); err != nil {
 		return 0, err
 	}
-	if len(session.statement.TableName()) == 0 {
+	if len(session.statement.TableName()) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
@@ -265,7 +265,7 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 		processor.BeforeInsert()
 	}
 
-	tableName := session.statement.TableName()
+	var tableName = session.statement.TableName()
 	table := session.statement.RefTable
 
 	colNames, args, err := session.genInsertColumns(bean)
@@ -277,7 +277,6 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	sqlStr = session.engine.dialect.Quoter().Replace(sqlStr)
 
 	handleAfterInsertProcessorFunc := func(bean interface{}) {
 		if session.isAutoCommit {
@@ -308,53 +307,20 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 
 	// if there is auto increment column and driver don't support return it
 	if len(table.AutoIncrement) > 0 && !session.engine.driver.Features().SupportReturnInsertedID {
-		var sql string
-		var newArgs []interface{}
-		var needCommit bool
-		var id int64
-		if session.engine.dialect.URI().DBType == schemas.ORACLE || session.engine.dialect.URI().DBType == schemas.DAMENG {
-			if session.isAutoCommit { // if it's not in transaction
-				if err := session.Begin(); err != nil {
-					return 0, err
-				}
-				needCommit = true
-			}
-			_, err := session.exec(sqlStr, args...)
-			if err != nil {
-				return 0, err
-			}
-			i := utils.IndexSlice(colNames, table.AutoIncrement)
-			if i > -1 {
-				id, err = convert.AsInt64(args[i])
-				if err != nil {
-					return 0, err
-				}
-			} else {
-				sql = fmt.Sprintf("select %s.currval from dual", utils.SeqName(tableName))
-			}
-		} else {
-			sql = sqlStr
-			newArgs = args
+		var sql = sqlStr
+		if session.engine.dialect.URI().DBType == schemas.ORACLE {
+			sql = "select seq_atable.currval from dual"
 		}
 
-		if id == 0 {
-			err := session.queryRow(sql, newArgs...).Scan(&id)
-			if err != nil {
-				return 0, err
-			}
-		}
-		if needCommit {
-			if err := session.Commit(); err != nil {
-				return 0, err
-			}
-		}
-		if id == 0 {
-			return 0, errors.New("insert successfully but not returned id")
+		rows, err := session.queryRows(sql, args...)
+		if err != nil {
+			return 0, err
 		}
+		defer rows.Close()
 
 		defer handleAfterInsertProcessorFunc(bean)
 
-		_ = session.cacheInsert(tableName)
+		session.cacheInsert(tableName)
 
 		if table.Version != "" && session.statement.CheckVersion {
 			verValue, err := table.VersionColumn().ValueOf(bean)
@@ -365,6 +331,16 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 			}
 		}
 
+		var id int64
+		if !rows.Next() {
+			if rows.Err() != nil {
+				return 0, rows.Err()
+			}
+			return 0, errors.New("insert successfully but not returned id")
+		}
+		if err := rows.Scan(&id); err != nil {
+			return 1, err
+		}
 		aiValue, err := table.AutoIncrColumn().ValueOf(bean)
 		if err != nil {
 			session.engine.logger.Errorf("%v", err)
@@ -384,7 +360,7 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 
 	defer handleAfterInsertProcessorFunc(bean)
 
-	_ = session.cacheInsert(tableName)
+	session.cacheInsert(tableName)
 
 	if table.Version != "" && session.statement.CheckVersion {
 		verValue, err := table.VersionColumn().ValueOf(bean)
@@ -424,7 +400,6 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
 // InsertOne insert only one struct into database as a record.
 // The in parameter bean must a struct or a point to struct. The return
 // parameter is inserted and error
-// Deprecated: Please use Insert directly
 func (session *Session) InsertOne(bean interface{}) (int64, error) {
 	if session.isAutoClose {
 		defer session.Close()
@@ -471,8 +446,7 @@ func (session *Session) genInsertColumns(bean interface{}) ([]string, []interfac
 		}
 
 		if col.IsDeleted {
-			zeroTime := time.Date(1, 1, 1, 0, 0, 0, 0, session.engine.DatabaseTZ)
-			arg, err := dialects.FormatColumnTime(session.engine.dialect, session.engine.DatabaseTZ, col, zeroTime)
+			arg, err := dialects.FormatColumnTime(session.engine.dialect, session.engine.DatabaseTZ, col, time.Time{})
 			if err != nil {
 				return nil, nil, err
 			}
@@ -507,7 +481,7 @@ func (session *Session) genInsertColumns(bean interface{}) ([]string, []interfac
 			}
 			args = append(args, val)
 
-			colName := col.Name
+			var colName = col.Name
 			session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 				col := table.GetColumn(colName)
 				setColumnTime(bean, col, t)
@@ -533,11 +507,11 @@ func (session *Session) insertMapInterface(m map[string]interface{}) (int64, err
 	}
 
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
-	columns := make([]string, 0, len(m))
+	var columns = make([]string, 0, len(m))
 	exprs := session.statement.ExprColumns
 	for k := range m {
 		if !exprs.IsColExist(k) {
@@ -546,7 +520,7 @@ func (session *Session) insertMapInterface(m map[string]interface{}) (int64, err
 	}
 	sort.Strings(columns)
 
-	args := make([]interface{}, 0, len(m))
+	var args = make([]interface{}, 0, len(m))
 	for _, colName := range columns {
 		args = append(args, m[colName])
 	}
@@ -555,16 +529,16 @@ func (session *Session) insertMapInterface(m map[string]interface{}) (int64, err
 }
 
 func (session *Session) insertMultipleMapInterface(maps []map[string]interface{}) (int64, error) {
-	if len(maps) == 0 {
+	if len(maps) <= 0 {
 		return 0, ErrNoElementsOnSlice
 	}
 
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
-	columns := make([]string, 0, len(maps[0]))
+	var columns = make([]string, 0, len(maps[0]))
 	exprs := session.statement.ExprColumns
 	for k := range maps[0] {
 		if !exprs.IsColExist(k) {
@@ -573,9 +547,9 @@ func (session *Session) insertMultipleMapInterface(maps []map[string]interface{}
 	}
 	sort.Strings(columns)
 
-	argss := make([][]interface{}, 0, len(maps))
+	var argss = make([][]interface{}, 0, len(maps))
 	for _, m := range maps {
-		args := make([]interface{}, 0, len(m))
+		var args = make([]interface{}, 0, len(m))
 		for _, colName := range columns {
 			args = append(args, m[colName])
 		}
@@ -591,11 +565,11 @@ func (session *Session) insertMapString(m map[string]string) (int64, error) {
 	}
 
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
-	columns := make([]string, 0, len(m))
+	var columns = make([]string, 0, len(m))
 	exprs := session.statement.ExprColumns
 	for k := range m {
 		if !exprs.IsColExist(k) {
@@ -605,7 +579,7 @@ func (session *Session) insertMapString(m map[string]string) (int64, error) {
 
 	sort.Strings(columns)
 
-	args := make([]interface{}, 0, len(m))
+	var args = make([]interface{}, 0, len(m))
 	for _, colName := range columns {
 		args = append(args, m[colName])
 	}
@@ -614,16 +588,16 @@ func (session *Session) insertMapString(m map[string]string) (int64, error) {
 }
 
 func (session *Session) insertMultipleMapString(maps []map[string]string) (int64, error) {
-	if len(maps) == 0 {
+	if len(maps) <= 0 {
 		return 0, ErrNoElementsOnSlice
 	}
 
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
-	columns := make([]string, 0, len(maps[0]))
+	var columns = make([]string, 0, len(maps[0]))
 	exprs := session.statement.ExprColumns
 	for k := range maps[0] {
 		if !exprs.IsColExist(k) {
@@ -632,9 +606,9 @@ func (session *Session) insertMultipleMapString(maps []map[string]string) (int64
 	}
 	sort.Strings(columns)
 
-	argss := make([][]interface{}, 0, len(maps))
+	var argss = make([][]interface{}, 0, len(maps))
 	for _, m := range maps {
-		args := make([]interface{}, 0, len(m))
+		var args = make([]interface{}, 0, len(m))
 		for _, colName := range columns {
 			args = append(args, m[colName])
 		}
@@ -646,7 +620,7 @@ func (session *Session) insertMultipleMapString(maps []map[string]string) (int64
 
 func (session *Session) insertMap(columns []string, args []interface{}) (int64, error) {
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
@@ -654,7 +628,6 @@ func (session *Session) insertMap(columns []string, args []interface{}) (int64,
 	if err != nil {
 		return 0, err
 	}
-	sql = session.engine.dialect.Quoter().Replace(sql)
 
 	if err := session.cacheInsert(tableName); err != nil {
 		return 0, err
@@ -673,7 +646,7 @@ func (session *Session) insertMap(columns []string, args []interface{}) (int64,
 
 func (session *Session) insertMultipleMap(columns []string, argss [][]interface{}) (int64, error) {
 	tableName := session.statement.TableName()
-	if len(tableName) == 0 {
+	if len(tableName) <= 0 {
 		return 0, ErrTableNotFound
 	}
 
@@ -681,7 +654,6 @@ func (session *Session) insertMultipleMap(columns []string, argss [][]interface{
 	if err != nil {
 		return 0, err
 	}
-	sql = session.engine.dialect.Quoter().Replace(sql)
 
 	if err := session.cacheInsert(tableName); err != nil {
 		return 0, err
diff --git a/vendor/xorm.io/xorm/session_iterate.go b/vendor/xorm.io/xorm/session_iterate.go
index ff42555..f630100 100644
--- a/vendor/xorm.io/xorm/session_iterate.go
+++ b/vendor/xorm.io/xorm/session_iterate.go
@@ -27,12 +27,6 @@ func (session *Session) Iterate(bean interface{}, fun IterFunc) error {
 		defer session.Close()
 	}
 
-	session.autoResetStatement = false
-	defer func() {
-		session.autoResetStatement = true
-		session.resetStatement()
-	}()
-
 	if session.statement.LastError != nil {
 		return session.statement.LastError
 	}
@@ -70,15 +64,15 @@ func (session *Session) BufferSize(size int) *Session {
 }
 
 func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
-	bufferSize := session.statement.BufferSize
-	pLimitN := session.statement.LimitN
+	var bufferSize = session.statement.BufferSize
+	var pLimitN = session.statement.LimitN
 	if pLimitN != nil && bufferSize > *pLimitN {
 		bufferSize = *pLimitN
 	}
-	start := session.statement.Start
+	var start = session.statement.Start
 	v := utils.ReflectValue(bean)
 	sliceType := reflect.SliceOf(v.Type())
-	idx := 0
+	var idx = 0
 	session.autoResetStatement = false
 	defer func() {
 		session.autoResetStatement = true
@@ -101,7 +95,7 @@ func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
 			break
 		}
 
-		start += slice.Elem().Len()
+		start = start + slice.Elem().Len()
 		if pLimitN != nil && start+bufferSize > *pLimitN {
 			bufferSize = *pLimitN - start
 		}
diff --git a/vendor/xorm.io/xorm/session_query.go b/vendor/xorm.io/xorm/session_query.go
new file mode 100644
index 0000000..a407098
--- /dev/null
+++ b/vendor/xorm.io/xorm/session_query.go
@@ -0,0 +1,154 @@
+// Copyright 2017 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xorm
+
+import (
+	"xorm.io/xorm/core"
+)
+
+// Query runs a raw sql and return records as []map[string][]byte
+func (session *Session) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) {
+	if session.isAutoClose {
+		defer session.Close()
+	}
+
+	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
+	if err != nil {
+		return nil, err
+	}
+
+	return session.queryBytes(sqlStr, args...)
+}
+
+func (session *Session) rows2Strings(rows *core.Rows) (resultsSlice []map[string]string, err error) {
+	fields, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+	types, err := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
+
+	for rows.Next() {
+		result, err := session.engine.row2mapStr(rows, types, fields)
+		if err != nil {
+			return nil, err
+		}
+		resultsSlice = append(resultsSlice, result)
+	}
+	if rows.Err() != nil {
+		return nil, rows.Err()
+	}
+
+	return resultsSlice, nil
+}
+
+func (session *Session) rows2SliceString(rows *core.Rows) (resultsSlice [][]string, err error) {
+	fields, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+	types, err := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
+
+	for rows.Next() {
+		record, err := session.engine.row2sliceStr(rows, types, fields)
+		if err != nil {
+			return nil, err
+		}
+		resultsSlice = append(resultsSlice, record)
+	}
+	if rows.Err() != nil {
+		return nil, rows.Err()
+	}
+
+	return resultsSlice, nil
+}
+
+// QueryString runs a raw sql and return records as []map[string]string
+func (session *Session) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
+	if session.isAutoClose {
+		defer session.Close()
+	}
+
+	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := session.queryRows(sqlStr, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return session.rows2Strings(rows)
+}
+
+// QuerySliceString runs a raw sql and return records as [][]string
+func (session *Session) QuerySliceString(sqlOrArgs ...interface{}) ([][]string, error) {
+	if session.isAutoClose {
+		defer session.Close()
+	}
+
+	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := session.queryRows(sqlStr, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return session.rows2SliceString(rows)
+}
+
+func (session *Session) rows2Interfaces(rows *core.Rows) (resultsSlice []map[string]interface{}, err error) {
+	fields, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+	types, err := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		result, err := session.engine.row2mapInterface(rows, types, fields)
+		if err != nil {
+			return nil, err
+		}
+		resultsSlice = append(resultsSlice, result)
+	}
+	if rows.Err() != nil {
+		return nil, rows.Err()
+	}
+
+	return resultsSlice, nil
+}
+
+// QueryInterface runs a raw sql and return records as []map[string]interface{}
+func (session *Session) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
+	if session.isAutoClose {
+		defer session.Close()
+	}
+
+	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := session.queryRows(sqlStr, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return session.rows2Interfaces(rows)
+}
diff --git a/vendor/xorm.io/xorm/session_raw.go b/vendor/xorm.io/xorm/session_raw.go
index 99f6be9..2b48898 100644
--- a/vendor/xorm.io/xorm/session_raw.go
+++ b/vendor/xorm.io/xorm/session_raw.go
@@ -13,7 +13,7 @@ import (
 
 func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) {
 	for _, filter := range session.engine.dialect.Filters() {
-		*sqlStr = filter.Do(session.ctx, *sqlStr)
+		*sqlStr = filter.Do(*sqlStr)
 	}
 
 	session.lastSQL = *sqlStr
@@ -33,7 +33,7 @@ func (session *Session) queryRows(sqlStr string, args ...interface{}) (*core.Row
 
 	if session.isAutoCommit {
 		var db *core.DB
-		if session.sessionType == groupSession && strings.EqualFold(strings.TrimSpace(sqlStr)[:6], "select") && !session.statement.IsForUpdate {
+		if session.sessionType == groupSession && strings.EqualFold(sqlStr[:6], "select") {
 			db = session.engine.engineGroup.Slave().DB()
 		} else {
 			db = session.DB()
@@ -46,106 +46,39 @@ func (session *Session) queryRows(sqlStr string, args ...interface{}) (*core.Row
 				return nil, err
 			}
 
-			return stmt.QueryContext(session.ctx, args...)
+			rows, err := stmt.QueryContext(session.ctx, args...)
+			if err != nil {
+				return nil, err
+			}
+			return rows, nil
 		}
 
-		return db.QueryContext(session.ctx, sqlStr, args...)
-	}
-
-	if session.prepareStmt {
-		stmt, err := session.doPrepareTx(sqlStr)
+		rows, err := db.QueryContext(session.ctx, sqlStr, args...)
 		if err != nil {
 			return nil, err
 		}
-
-		return stmt.QueryContext(session.ctx, args...)
+		return rows, nil
 	}
 
-	return session.tx.QueryContext(session.ctx, sqlStr, args...)
+	rows, err := session.tx.QueryContext(session.ctx, sqlStr, args...)
+	if err != nil {
+		return nil, err
+	}
+	return rows, nil
 }
 
 func (session *Session) queryRow(sqlStr string, args ...interface{}) *core.Row {
 	return core.NewRow(session.queryRows(sqlStr, args...))
 }
 
-// Query runs a raw sql and return records as []map[string][]byte
-func (session *Session) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) {
-	if session.isAutoClose {
-		defer session.Close()
-	}
-
-	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
-	if err != nil {
-		return nil, err
-	}
-
+func (session *Session) queryBytes(sqlStr string, args ...interface{}) ([]map[string][]byte, error) {
 	rows, err := session.queryRows(sqlStr, args...)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	return session.engine.scanByteMaps(rows)
-}
-
-// QueryString runs a raw sql and return records as []map[string]string
-func (session *Session) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
-	if session.isAutoClose {
-		defer session.Close()
-	}
-
-	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := session.queryRows(sqlStr, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	return session.engine.ScanStringMaps(rows)
-}
-
-// QuerySliceString runs a raw sql and return records as [][]string
-func (session *Session) QuerySliceString(sqlOrArgs ...interface{}) ([][]string, error) {
-	if session.isAutoClose {
-		defer session.Close()
-	}
-
-	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := session.queryRows(sqlStr, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	return session.engine.ScanStringSlices(rows)
-}
-
-// QueryInterface runs a raw sql and return records as []map[string]interface{}
-func (session *Session) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
-	if session.isAutoClose {
-		defer session.Close()
-	}
-
-	sqlStr, args, err := session.statement.GenQuerySQL(sqlOrArgs...)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := session.queryRows(sqlStr, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	return session.engine.ScanInterfaceMaps(rows)
+	return rows2maps(rows)
 }
 
 func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, error) {
@@ -157,13 +90,6 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 	session.lastSQLArgs = args
 
 	if !session.isAutoCommit {
-		if session.prepareStmt {
-			stmt, err := session.doPrepareTx(sqlStr)
-			if err != nil {
-				return nil, err
-			}
-			return stmt.ExecContext(session.ctx, args...)
-		}
 		return session.tx.ExecContext(session.ctx, sqlStr, args...)
 	}
 
@@ -172,7 +98,12 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 		if err != nil {
 			return nil, err
 		}
-		return stmt.ExecContext(session.ctx, args...)
+
+		res, err := stmt.ExecContext(session.ctx, args...)
+		if err != nil {
+			return nil, err
+		}
+		return res, nil
 	}
 
 	return session.DB().ExecContext(session.ctx, sqlStr, args...)
diff --git a/vendor/xorm.io/xorm/session_schema.go b/vendor/xorm.io/xorm/session_schema.go
index 4bb0b85..2e64350 100644
--- a/vendor/xorm.io/xorm/session_schema.go
+++ b/vendor/xorm.io/xorm/session_schema.go
@@ -6,15 +6,14 @@ package xorm
 
 import (
 	"bufio"
-	"context"
 	"database/sql"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 
-	"xorm.io/xorm/dialects"
 	"xorm.io/xorm/internal/utils"
+	"xorm.io/xorm/schemas"
 )
 
 // Ping test if database is ok
@@ -41,28 +40,13 @@ func (session *Session) createTable(bean interface{}) error {
 		return err
 	}
 
-	session.statement.RefTable.StoreEngine = session.statement.StoreEngine
-	session.statement.RefTable.Charset = session.statement.Charset
-	tableName := session.statement.TableName()
-	refTable := session.statement.RefTable
-	if refTable.AutoIncrement != "" && session.engine.dialect.Features().AutoincrMode == dialects.SequenceAutoincrMode {
-		sqlStr, err := session.engine.dialect.CreateSequenceSQL(context.Background(), session.engine.db, utils.SeqName(tableName))
+	sqlStrs := session.statement.GenCreateTableSQL()
+	for _, s := range sqlStrs {
+		_, err := session.exec(s)
 		if err != nil {
 			return err
 		}
-		if _, err := session.exec(sqlStr); err != nil {
-			return err
-		}
 	}
-
-	sqlStr, _, err := session.engine.dialect.CreateTableSQL(context.Background(), session.engine.db, refTable, tableName)
-	if err != nil {
-		return err
-	}
-	if _, err := session.exec(sqlStr); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -157,32 +141,11 @@ func (session *Session) dropTable(beanOrTableName interface{}) error {
 		checkIfExist = exist
 	}
 
-	if !checkIfExist {
-		return nil
-	}
-	if _, err := session.exec(sqlStr); err != nil {
+	if checkIfExist {
+		_, err := session.exec(sqlStr)
 		return err
 	}
-
-	if session.engine.dialect.Features().AutoincrMode == dialects.IncrAutoincrMode {
-		return nil
-	}
-
-	seqName := utils.SeqName(tableName)
-	exist, err := session.engine.dialect.IsSequenceExist(session.ctx, session.getQueryer(), seqName)
-	if err != nil {
-		return err
-	}
-	if !exist {
-		return nil
-	}
-
-	sqlStr, err = session.engine.dialect.DropSequenceSQL(seqName)
-	if err != nil {
-		return err
-	}
-	_, err = session.exec(sqlStr)
-	return err
+	return nil
 }
 
 // IsTableExist if a table is exist
@@ -222,6 +185,24 @@ func (session *Session) isTableEmpty(tableName string) (bool, error) {
 	return total == 0, nil
 }
 
+// find if index is exist according cols
+func (session *Session) isIndexExist2(tableName string, cols []string, unique bool) (bool, error) {
+	indexes, err := session.engine.dialect.GetIndexes(session.getQueryer(), session.ctx, tableName)
+	if err != nil {
+		return false, err
+	}
+
+	for _, index := range indexes {
+		if utils.SliceEq(index.Cols, cols) {
+			if unique {
+				return index.Type == schemas.UniqueType, nil
+			}
+			return index.Type == schemas.IndexType, nil
+		}
+	}
+	return false, nil
+}
+
 func (session *Session) addColumn(colName string) error {
 	col := session.statement.RefTable.GetColumn(colName)
 	sql := session.engine.dialect.AddColumnSQL(session.statement.TableName(), col)
@@ -243,6 +224,220 @@ func (session *Session) addUnique(tableName, uqeName string) error {
 	return err
 }
 
+// Sync2 synchronize structs to database tables
+func (session *Session) Sync2(beans ...interface{}) error {
+	engine := session.engine
+
+	if session.isAutoClose {
+		session.isAutoClose = false
+		defer session.Close()
+	}
+
+	tables, err := engine.dialect.GetTables(session.getQueryer(), session.ctx)
+	if err != nil {
+		return err
+	}
+
+	session.autoResetStatement = false
+	defer func() {
+		session.autoResetStatement = true
+		session.resetStatement()
+	}()
+
+	for _, bean := range beans {
+		v := utils.ReflectValue(bean)
+		table, err := engine.tagParser.ParseWithCache(v)
+		if err != nil {
+			return err
+		}
+		var tbName string
+		if len(session.statement.AltTableName) > 0 {
+			tbName = session.statement.AltTableName
+		} else {
+			tbName = engine.TableName(bean)
+		}
+		tbNameWithSchema := engine.tbNameWithSchema(tbName)
+
+		var oriTable *schemas.Table
+		for _, tb := range tables {
+			if strings.EqualFold(engine.tbNameWithSchema(tb.Name), engine.tbNameWithSchema(tbName)) {
+				oriTable = tb
+				break
+			}
+		}
+
+		// this is a new table
+		if oriTable == nil {
+			err = session.StoreEngine(session.statement.StoreEngine).createTable(bean)
+			if err != nil {
+				return err
+			}
+
+			err = session.createUniques(bean)
+			if err != nil {
+				return err
+			}
+
+			err = session.createIndexes(bean)
+			if err != nil {
+				return err
+			}
+			continue
+		}
+
+		// this will modify an old table
+		if err = engine.loadTableInfo(oriTable); err != nil {
+			return err
+		}
+
+		// check columns
+		for _, col := range table.Columns() {
+			var oriCol *schemas.Column
+			for _, col2 := range oriTable.Columns() {
+				if strings.EqualFold(col.Name, col2.Name) {
+					oriCol = col2
+					break
+				}
+			}
+
+			// column is not exist on table
+			if oriCol == nil {
+				session.statement.RefTable = table
+				session.statement.SetTableName(tbNameWithSchema)
+				if err = session.addColumn(col.Name); err != nil {
+					return err
+				}
+				continue
+			}
+
+			err = nil
+			expectedType := engine.dialect.SQLType(col)
+			curType := engine.dialect.SQLType(oriCol)
+			if expectedType != curType {
+				if expectedType == schemas.Text &&
+					strings.HasPrefix(curType, schemas.Varchar) {
+					// currently only support mysql & postgres
+					if engine.dialect.URI().DBType == schemas.MYSQL ||
+						engine.dialect.URI().DBType == schemas.POSTGRES {
+						engine.logger.Infof("Table %s column %s change type from %s to %s\n",
+							tbNameWithSchema, col.Name, curType, expectedType)
+						_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
+					} else {
+						engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s\n",
+							tbNameWithSchema, col.Name, curType, expectedType)
+					}
+				} else if strings.HasPrefix(curType, schemas.Varchar) && strings.HasPrefix(expectedType, schemas.Varchar) {
+					if engine.dialect.URI().DBType == schemas.MYSQL {
+						if oriCol.Length < col.Length {
+							engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
+								tbNameWithSchema, col.Name, oriCol.Length, col.Length)
+							_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
+						}
+					}
+				} else {
+					if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') {
+						if !strings.EqualFold(schemas.SQLTypeName(curType), engine.dialect.Alias(schemas.SQLTypeName(expectedType))) {
+							engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
+								tbNameWithSchema, col.Name, curType, expectedType)
+						}
+					}
+				}
+			} else if expectedType == schemas.Varchar {
+				if engine.dialect.URI().DBType == schemas.MYSQL {
+					if oriCol.Length < col.Length {
+						engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
+							tbNameWithSchema, col.Name, oriCol.Length, col.Length)
+						_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
+					}
+				}
+			}
+
+			if col.Default != oriCol.Default {
+				switch {
+				case col.IsAutoIncrement: // For autoincrement column, don't check default
+				case (col.SQLType.Name == schemas.Bool || col.SQLType.Name == schemas.Boolean) &&
+					((strings.EqualFold(col.Default, "true") && oriCol.Default == "1") ||
+						(strings.EqualFold(col.Default, "false") && oriCol.Default == "0")):
+				default:
+					engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s",
+						tbName, col.Name, oriCol.Default, col.Default)
+				}
+			}
+			if col.Nullable != oriCol.Nullable {
+				engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v",
+					tbName, col.Name, oriCol.Nullable, col.Nullable)
+			}
+
+			if err != nil {
+				return err
+			}
+		}
+
+		var foundIndexNames = make(map[string]bool)
+		var addedNames = make(map[string]*schemas.Index)
+
+		for name, index := range table.Indexes {
+			var oriIndex *schemas.Index
+			for name2, index2 := range oriTable.Indexes {
+				if index.Equal(index2) {
+					oriIndex = index2
+					foundIndexNames[name2] = true
+					break
+				}
+			}
+
+			if oriIndex != nil {
+				if oriIndex.Type != index.Type {
+					sql := engine.dialect.DropIndexSQL(tbNameWithSchema, oriIndex)
+					_, err = session.exec(sql)
+					if err != nil {
+						return err
+					}
+					oriIndex = nil
+				}
+			}
+
+			if oriIndex == nil {
+				addedNames[name] = index
+			}
+		}
+
+		for name2, index2 := range oriTable.Indexes {
+			if _, ok := foundIndexNames[name2]; !ok {
+				sql := engine.dialect.DropIndexSQL(tbNameWithSchema, index2)
+				_, err = session.exec(sql)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		for name, index := range addedNames {
+			if index.Type == schemas.UniqueType {
+				session.statement.RefTable = table
+				session.statement.SetTableName(tbNameWithSchema)
+				err = session.addUnique(tbNameWithSchema, name)
+			} else if index.Type == schemas.IndexType {
+				session.statement.RefTable = table
+				session.statement.SetTableName(tbNameWithSchema)
+				err = session.addIndex(tbNameWithSchema, name)
+			}
+			if err != nil {
+				return err
+			}
+		}
+
+		// check all the columns which removed from struct fields but left on database tables.
+		for _, colName := range oriTable.ColumnsSeq() {
+			if table.GetColumn(colName) == nil {
+				engine.logger.Warnf("Table %s has column %s but struct has not related field", engine.TableName(oriTable.Name, true), colName)
+			}
+		}
+	}
+
+	return nil
+}
+
 // ImportFile SQL DDL file
 func (session *Session) ImportFile(ddlPath string) ([]sql.Result, error) {
 	file, err := os.Open(ddlPath)
@@ -267,7 +462,7 @@ func (session *Session) Import(r io.Reader) ([]sql.Result, error) {
 		if atEOF && len(data) == 0 {
 			return 0, nil, nil
 		}
-		oriInSingleQuote := inSingleQuote
+		var oriInSingleQuote = inSingleQuote
 		for i, b := range data {
 			if startComment {
 				if b == '\n' {
@@ -311,8 +506,3 @@ func (session *Session) Import(r io.Reader) ([]sql.Result, error) {
 
 	return results, lastError
 }
-
-func (session *Session) IndexHint(op, forType, indexerOrColName string) *Session {
-	session.statement.IndexHint(op, forType, indexerOrColName)
-	return session
-}
diff --git a/vendor/xorm.io/xorm/session_stats.go b/vendor/xorm.io/xorm/session_stats.go
index be98e46..17d0a67 100644
--- a/vendor/xorm.io/xorm/session_stats.go
+++ b/vendor/xorm.io/xorm/session_stats.go
@@ -24,7 +24,7 @@ func (session *Session) Count(bean ...interface{}) (int64, error) {
 
 	var total int64
 	err = session.queryRow(sqlStr, args...).Scan(&total)
-	if err == nil {
+	if err == sql.ErrNoRows || err == nil {
 		return total, nil
 	}
 
@@ -70,12 +70,12 @@ func (session *Session) SumInt(bean interface{}, columnName string) (res int64,
 
 // Sums call sum some columns. bean's non-empty fields are conditions.
 func (session *Session) Sums(bean interface{}, columnNames ...string) ([]float64, error) {
-	res := make([]float64, len(columnNames))
+	var res = make([]float64, len(columnNames), len(columnNames))
 	return res, session.sum(&res, bean, columnNames...)
 }
 
 // SumsInt sum specify columns and return as []int64 instead of []float64
 func (session *Session) SumsInt(bean interface{}, columnNames ...string) ([]int64, error) {
-	res := make([]int64, len(columnNames))
+	var res = make([]int64, len(columnNames), len(columnNames))
 	return res, session.sum(&res, bean, columnNames...)
 }
diff --git a/vendor/xorm.io/xorm/session_tx.go b/vendor/xorm.io/xorm/session_tx.go
index 4fa5689..8763784 100644
--- a/vendor/xorm.io/xorm/session_tx.go
+++ b/vendor/xorm.io/xorm/session_tx.go
@@ -75,7 +75,7 @@ func (session *Session) Commit() error {
 		}
 		cleanUpFunc := func(slices *map[interface{}]*[]func(interface{})) {
 			if len(*slices) > 0 {
-				*slices = make(map[interface{}]*[]func(interface{}))
+				*slices = make(map[interface{}]*[]func(interface{}), 0)
 			}
 		}
 		cleanUpFunc(&session.afterInsertBeans)
diff --git a/vendor/xorm.io/xorm/session_update.go b/vendor/xorm.io/xorm/session_update.go
index b3640ad..7d91346 100644
--- a/vendor/xorm.io/xorm/session_update.go
+++ b/vendor/xorm.io/xorm/session_update.go
@@ -5,61 +5,148 @@
 package xorm
 
 import (
+	"errors"
+	"fmt"
 	"reflect"
+	"strconv"
+	"strings"
 
 	"xorm.io/builder"
-	"xorm.io/xorm/internal/statements"
+	"xorm.io/xorm/caches"
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
 )
 
 // enumerated all errors
 var (
-	ErrNoColumnsTobeUpdated = statements.ErrNoColumnsTobeUpdated
+	ErrNoColumnsTobeUpdated = errors.New("no columns found to be updated")
 )
 
-func (session *Session) genAutoCond(condiBean interface{}) (builder.Cond, error) {
-	if session.statement.NoAutoCondition {
-		return builder.NewCond(), nil
+func (session *Session) cacheUpdate(table *schemas.Table, tableName, sqlStr string, args ...interface{}) error {
+	if table == nil ||
+		session.tx != nil {
+		return ErrCacheFailed
 	}
 
-	if c, ok := condiBean.(map[string]interface{}); ok {
-		eq := make(builder.Eq)
-		for k, v := range c {
-			eq[session.engine.Quote(k)] = v
+	oldhead, newsql := session.statement.ConvertUpdateSQL(sqlStr)
+	if newsql == "" {
+		return ErrCacheFailed
+	}
+	for _, filter := range session.engine.dialect.Filters() {
+		newsql = filter.Do(newsql)
+	}
+	session.engine.logger.Debugf("[cache] new sql: %v, %v", oldhead, newsql)
+
+	var nStart int
+	if len(args) > 0 {
+		if strings.Index(sqlStr, "?") > -1 {
+			nStart = strings.Count(oldhead, "?")
+		} else {
+			// only for pq, TODO: if any other databse?
+			nStart = strings.Count(oldhead, "$")
 		}
-
-		if session.statement.RefTable != nil {
-			if col := session.statement.RefTable.DeletedColumn(); col != nil && !session.statement.GetUnscoped() { // tag "deleted" is enabled
-				return eq.And(session.statement.CondDeleted(col)), nil
-			}
-		}
-		return eq, nil
 	}
 
-	ct := reflect.TypeOf(condiBean)
-	k := ct.Kind()
-	if k == reflect.Ptr {
-		k = ct.Elem().Kind()
-	}
-	if k != reflect.Struct {
-		return nil, ErrConditionType
-	}
-
-	condTable, err := session.engine.TableInfo(condiBean)
+	cacher := session.engine.GetCacher(tableName)
+	session.engine.logger.Debugf("[cache] get cache sql: %v, %v", newsql, args[nStart:])
+	ids, err := caches.GetCacheSql(cacher, tableName, newsql, args[nStart:])
 	if err != nil {
-		return nil, err
+		rows, err := session.NoCache().queryRows(newsql, args[nStart:]...)
+		if err != nil {
+			return err
+		}
+		defer rows.Close()
+
+		ids = make([]schemas.PK, 0)
+		for rows.Next() {
+			var res = make([]string, len(table.PrimaryKeys))
+			err = rows.ScanSlice(&res)
+			if err != nil {
+				return err
+			}
+			var pk schemas.PK = make([]interface{}, len(table.PrimaryKeys))
+			for i, col := range table.PKColumns() {
+				if col.SQLType.IsNumeric() {
+					n, err := strconv.ParseInt(res[i], 10, 64)
+					if err != nil {
+						return err
+					}
+					pk[i] = n
+				} else if col.SQLType.IsText() {
+					pk[i] = res[i]
+				} else {
+					return errors.New("not supported")
+				}
+			}
+
+			ids = append(ids, pk)
+		}
+		if rows.Err() != nil {
+			return rows.Err()
+		}
+		session.engine.logger.Debugf("[cache] find updated id: %v", ids)
+	} /*else {
+	    session.engine.LogDebug("[xorm:cacheUpdate] del cached sql:", tableName, newsql, args)
+	    cacher.DelIds(tableName, genSqlKey(newsql, args))
+	}*/
+
+	for _, id := range ids {
+		sid, err := id.ToString()
+		if err != nil {
+			return err
+		}
+		if bean := cacher.GetBean(tableName, sid); bean != nil {
+			sqls := utils.SplitNNoCase(sqlStr, "where", 2)
+			if len(sqls) == 0 || len(sqls) > 2 {
+				return ErrCacheFailed
+			}
+
+			sqls = utils.SplitNNoCase(sqls[0], "set", 2)
+			if len(sqls) != 2 {
+				return ErrCacheFailed
+			}
+			kvs := strings.Split(strings.TrimSpace(sqls[1]), ",")
+
+			for idx, kv := range kvs {
+				sps := strings.SplitN(kv, "=", 2)
+				sps2 := strings.Split(sps[0], ".")
+				colName := sps2[len(sps2)-1]
+				colName = session.engine.dialect.Quoter().Trim(colName)
+				colName = schemas.CommonQuoter.Trim(colName)
+
+				if col := table.GetColumn(colName); col != nil {
+					fieldValue, err := col.ValueOf(bean)
+					if err != nil {
+						session.engine.logger.Errorf("%v", err)
+					} else {
+						session.engine.logger.Debugf("[cache] set bean field: %v, %v, %v", bean, colName, fieldValue.Interface())
+						if col.IsVersion && session.statement.CheckVersion {
+							session.incrVersionFieldValue(fieldValue)
+						} else {
+							fieldValue.Set(reflect.ValueOf(args[idx]))
+						}
+					}
+				} else {
+					session.engine.logger.Errorf("[cache] ERROR: column %v is not table %v's",
+						colName, table.Name)
+				}
+			}
+
+			session.engine.logger.Debugf("[cache] update cache: %v, %v, %v", tableName, id, bean)
+			cacher.PutBean(tableName, sid, bean)
+		}
 	}
-	return session.statement.BuildConds(condTable, condiBean, true, true, false, true, false)
+	session.engine.logger.Debugf("[cache] clear cached table sql: %v", tableName)
+	cacher.ClearIds(tableName)
+	return nil
 }
 
 // Update records, bean's non-empty fields are updated contents,
 // condiBean' non-empty filds are conditions
 // CAUTION:
-//
-//	1.bool will defaultly be updated content nor conditions
-//	 You should call UseBool if you have bool to use.
-//	2.float32 & float64 may be not inexact as conditions
+//        1.bool will defaultly be updated content nor conditions
+//         You should call UseBool if you have bool to use.
+//        2.float32 & float64 may be not inexact as conditions
 func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int64, error) {
 	if session.isAutoClose {
 		defer session.Close()
@@ -74,6 +161,9 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 	v := utils.ReflectValue(bean)
 	t := v.Type()
 
+	var colNames []string
+	var args []interface{}
+
 	// handle before update processors
 	for _, closure := range session.beforeClosures {
 		closure(bean)
@@ -84,17 +174,15 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 	}
 	// --
 
-	var colNames []string
-	var args []interface{}
 	var err error
-	isMap := t.Kind() == reflect.Map
-	isStruct := t.Kind() == reflect.Struct
+	var isMap = t.Kind() == reflect.Map
+	var isStruct = t.Kind() == reflect.Struct
 	if isStruct {
 		if err := session.statement.SetRefBean(bean); err != nil {
 			return 0, err
 		}
 
-		if len(session.statement.TableName()) == 0 {
+		if len(session.statement.TableName()) <= 0 {
 			return 0, ErrTableNotFound
 		}
 
@@ -137,7 +225,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 				args = append(args, val)
 			}
 
-			colName := col.Name
+			var colName = col.Name
 			if isStruct {
 				session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 					col := table.GetColumn(colName)
@@ -147,53 +235,196 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 		}
 	}
 
+	// for update action to like "column = column + ?"
+	incColumns := session.statement.IncrColumns
+	for _, expr := range incColumns {
+		colNames = append(colNames, session.engine.Quote(expr.ColName)+" = "+session.engine.Quote(expr.ColName)+" + ?")
+		args = append(args, expr.Arg)
+	}
+	// for update action to like "column = column - ?"
+	decColumns := session.statement.DecrColumns
+	for _, expr := range decColumns {
+		colNames = append(colNames, session.engine.Quote(expr.ColName)+" = "+session.engine.Quote(expr.ColName)+" - ?")
+		args = append(args, expr.Arg)
+	}
+	// for update action to like "column = expression"
+	exprColumns := session.statement.ExprColumns
+	for _, expr := range exprColumns {
+		switch tp := expr.Arg.(type) {
+		case string:
+			if len(tp) == 0 {
+				tp = "''"
+			}
+			colNames = append(colNames, session.engine.Quote(expr.ColName)+"="+tp)
+		case *builder.Builder:
+			subQuery, subArgs, err := session.statement.GenCondSQL(tp)
+			if err != nil {
+				return 0, err
+			}
+			colNames = append(colNames, session.engine.Quote(expr.ColName)+"=("+subQuery+")")
+			args = append(args, subArgs...)
+		default:
+			colNames = append(colNames, session.engine.Quote(expr.ColName)+"=?")
+			args = append(args, expr.Arg)
+		}
+	}
+
 	if err = session.statement.ProcessIDParam(); err != nil {
 		return 0, err
 	}
 
 	var autoCond builder.Cond
-	if len(condiBean) > 0 {
-		autoCond, err = session.genAutoCond(condiBean[0])
-		if err != nil {
-			return 0, err
-		}
-	} else if table != nil {
-		if col := table.DeletedColumn(); col != nil && !session.statement.GetUnscoped() { // tag "deleted" is enabled
-			autoCond1 := session.statement.CondDeleted(col)
-
-			if autoCond == nil {
-				autoCond = autoCond1
+	if !session.statement.NoAutoCondition {
+		condBeanIsStruct := false
+		if len(condiBean) > 0 {
+			if c, ok := condiBean[0].(map[string]interface{}); ok {
+				autoCond = builder.Eq(c)
 			} else {
-				autoCond = autoCond.And(autoCond1)
+				ct := reflect.TypeOf(condiBean[0])
+				k := ct.Kind()
+				if k == reflect.Ptr {
+					k = ct.Elem().Kind()
+				}
+				if k == reflect.Struct {
+					condTable, err := session.engine.TableInfo(condiBean[0])
+					if err != nil {
+						return 0, err
+					}
+
+					autoCond, err = session.statement.BuildConds(condTable, condiBean[0], true, true, false, true, false)
+					if err != nil {
+						return 0, err
+					}
+					condBeanIsStruct = true
+				} else {
+					return 0, ErrConditionType
+				}
+			}
+		}
+
+		if !condBeanIsStruct && table != nil {
+			if col := table.DeletedColumn(); col != nil && !session.statement.GetUnscoped() { // tag "deleted" is enabled
+				autoCond1 := session.statement.CondDeleted(col)
+
+				if autoCond == nil {
+					autoCond = autoCond1
+				} else {
+					autoCond = autoCond.And(autoCond1)
+				}
 			}
 		}
 	}
 
+	st := session.statement
+
 	var (
+		sqlStr   string
+		condArgs []interface{}
+		condSQL  string
 		cond     = session.statement.Conds().And(autoCond)
+
 		doIncVer = isStruct && (table != nil && table.Version != "" && session.statement.CheckVersion)
 		verValue *reflect.Value
 	)
 	if doIncVer {
-		verValue, err = table.VersionColumn().ValueOfV(&v)
+		verValue, err = table.VersionColumn().ValueOf(bean)
 		if err != nil {
 			return 0, err
 		}
 
 		if verValue != nil {
 			cond = cond.And(builder.Eq{session.engine.Quote(table.Version): verValue.Interface()})
+			colNames = append(colNames, session.engine.Quote(table.Version)+" = "+session.engine.Quote(table.Version)+" + 1")
 		}
 	}
 
-	updateWriter := builder.NewWriter()
-	if err := session.statement.WriteUpdate(updateWriter, cond, v, colNames, args); err != nil {
+	if len(colNames) <= 0 {
+		return 0, ErrNoColumnsTobeUpdated
+	}
+
+	condSQL, condArgs, err = session.statement.GenCondSQL(cond)
+	if err != nil {
 		return 0, err
 	}
 
-	tableName := session.statement.TableName() // table name must been get before exec because statement will be reset
-	useCache := session.statement.UseCache
+	if len(condSQL) > 0 {
+		condSQL = "WHERE " + condSQL
+	}
 
-	res, err := session.exec(updateWriter.String(), updateWriter.Args()...)
+	if st.OrderStr != "" {
+		condSQL = condSQL + fmt.Sprintf(" ORDER BY %v", st.OrderStr)
+	}
+
+	var tableName = session.statement.TableName()
+	// TODO: Oracle support needed
+	var top string
+	if st.LimitN != nil {
+		limitValue := *st.LimitN
+		switch session.engine.dialect.URI().DBType {
+		case schemas.MYSQL:
+			condSQL = condSQL + fmt.Sprintf(" LIMIT %d", limitValue)
+		case schemas.SQLITE:
+			tempCondSQL := condSQL + fmt.Sprintf(" LIMIT %d", limitValue)
+			cond = cond.And(builder.Expr(fmt.Sprintf("rowid IN (SELECT rowid FROM %v %v)",
+				session.engine.Quote(tableName), tempCondSQL), condArgs...))
+			condSQL, condArgs, err = session.statement.GenCondSQL(cond)
+			if err != nil {
+				return 0, err
+			}
+			if len(condSQL) > 0 {
+				condSQL = "WHERE " + condSQL
+			}
+		case schemas.POSTGRES:
+			tempCondSQL := condSQL + fmt.Sprintf(" LIMIT %d", limitValue)
+			cond = cond.And(builder.Expr(fmt.Sprintf("CTID IN (SELECT CTID FROM %v %v)",
+				session.engine.Quote(tableName), tempCondSQL), condArgs...))
+			condSQL, condArgs, err = session.statement.GenCondSQL(cond)
+			if err != nil {
+				return 0, err
+			}
+
+			if len(condSQL) > 0 {
+				condSQL = "WHERE " + condSQL
+			}
+		case schemas.MSSQL:
+			if st.OrderStr != "" && table != nil && len(table.PrimaryKeys) == 1 {
+				cond = builder.Expr(fmt.Sprintf("%s IN (SELECT TOP (%d) %s FROM %v%v)",
+					table.PrimaryKeys[0], limitValue, table.PrimaryKeys[0],
+					session.engine.Quote(tableName), condSQL), condArgs...)
+
+				condSQL, condArgs, err = session.statement.GenCondSQL(cond)
+				if err != nil {
+					return 0, err
+				}
+				if len(condSQL) > 0 {
+					condSQL = "WHERE " + condSQL
+				}
+			} else {
+				top = fmt.Sprintf("TOP (%d) ", limitValue)
+			}
+		}
+	}
+
+	var tableAlias = session.engine.Quote(tableName)
+	var fromSQL string
+	if session.statement.TableAlias != "" {
+		switch session.engine.dialect.URI().DBType {
+		case schemas.MSSQL:
+			fromSQL = fmt.Sprintf("FROM %s %s ", tableAlias, session.statement.TableAlias)
+			tableAlias = session.statement.TableAlias
+		default:
+			tableAlias = fmt.Sprintf("%s AS %s", tableAlias, session.statement.TableAlias)
+		}
+	}
+
+	sqlStr = fmt.Sprintf("UPDATE %v%v SET %v %v%v",
+		top,
+		tableAlias,
+		strings.Join(colNames, ", "),
+		fromSQL,
+		condSQL)
+
+	res, err := session.exec(sqlStr, append(args, condArgs...)...)
 	if err != nil {
 		return 0, err
 	} else if doIncVer {
@@ -202,7 +433,8 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 		}
 	}
 
-	if cacher := session.engine.GetCacher(tableName); cacher != nil && useCache {
+	if cacher := session.engine.GetCacher(tableName); cacher != nil && session.statement.UseCache {
+		// session.cacheUpdate(table, tableName, sqlStr, args...)
 		session.engine.logger.Debugf("[cache] clear table: %v", tableName)
 		cacher.ClearIds(tableName)
 		cacher.ClearBeans(tableName)
@@ -298,7 +530,7 @@ func (session *Session) genUpdateColumns(bean interface{}) ([]string, []interfac
 			}
 			args = append(args, val)
 
-			colName := col.Name
+			var colName = col.Name
 			session.afterClosures = append(session.afterClosures, func(bean interface{}) {
 				col := table.GetColumn(colName)
 				setColumnTime(bean, col, t)
diff --git a/vendor/xorm.io/xorm/sync.go b/vendor/xorm.io/xorm/sync.go
deleted file mode 100644
index f1b5e59..0000000
--- a/vendor/xorm.io/xorm/sync.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2023 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xorm
-
-import (
-	"strings"
-
-	"xorm.io/xorm/internal/utils"
-	"xorm.io/xorm/schemas"
-)
-
-type SyncOptions struct {
-	WarnIfDatabaseColumnMissed bool
-	// IgnoreConstrains will not add, delete or update unique constrains
-	IgnoreConstrains bool
-	// IgnoreIndices will not add or delete indices
-	IgnoreIndices bool
-	// IgnoreDropIndices will not delete indices
-	IgnoreDropIndices bool
-}
-
-type SyncResult struct{}
-
-// Sync the new struct changes to database, this method will automatically add
-// table, column, index, unique. but will not delete or change anything.
-// If you change some field, you should change the database manually.
-func (engine *Engine) Sync(beans ...interface{}) error {
-	session := engine.NewSession()
-	defer session.Close()
-	return session.Sync(beans...)
-}
-
-// SyncWithOptions sync the database schemas according options and table structs
-func (engine *Engine) SyncWithOptions(opts SyncOptions, beans ...interface{}) (*SyncResult, error) {
-	session := engine.NewSession()
-	defer session.Close()
-	return session.SyncWithOptions(opts, beans...)
-}
-
-// Sync2 synchronize structs to database tables
-// Depricated
-func (engine *Engine) Sync2(beans ...interface{}) error {
-	return engine.Sync(beans...)
-}
-
-// Sync2 synchronize structs to database tables
-// Depricated
-func (session *Session) Sync2(beans ...interface{}) error {
-	return session.Sync(beans...)
-}
-
-// Sync synchronize structs to database tables
-func (session *Session) Sync(beans ...interface{}) error {
-	_, err := session.SyncWithOptions(SyncOptions{
-		WarnIfDatabaseColumnMissed: false,
-		IgnoreConstrains:           false,
-		IgnoreIndices:              false,
-		IgnoreDropIndices:          false,
-	}, beans...)
-	return err
-}
-
-func (session *Session) SyncWithOptions(opts SyncOptions, beans ...interface{}) (*SyncResult, error) {
-	engine := session.engine
-
-	if session.isAutoClose {
-		session.isAutoClose = false
-		defer session.Close()
-	}
-
-	tables, err := engine.dialect.GetTables(session.getQueryer(), session.ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	session.autoResetStatement = false
-	defer func() {
-		session.autoResetStatement = true
-		session.resetStatement()
-	}()
-
-	var syncResult SyncResult
-
-	for _, bean := range beans {
-		v := utils.ReflectValue(bean)
-		table, err := engine.tagParser.ParseWithCache(v)
-		if err != nil {
-			return nil, err
-		}
-		var tbName string
-		if len(session.statement.AltTableName) > 0 {
-			tbName = session.statement.AltTableName
-		} else {
-			tbName = engine.TableName(bean)
-		}
-		tbNameWithSchema := engine.tbNameWithSchema(tbName)
-
-		var oriTable *schemas.Table
-		for _, tb := range tables {
-			if strings.EqualFold(engine.tbNameWithSchema(tb.Name), engine.tbNameWithSchema(tbName)) {
-				oriTable = tb
-				break
-			}
-		}
-
-		// this is a new table
-		if oriTable == nil {
-			err = session.StoreEngine(session.statement.StoreEngine).createTable(bean)
-			if err != nil {
-				return nil, err
-			}
-
-			if !opts.IgnoreConstrains {
-				err = session.createUniques(bean)
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			if !opts.IgnoreIndices {
-				err = session.createIndexes(bean)
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			continue
-		}
-
-		// this will modify an old table
-		if err = engine.loadTableInfo(session.ctx, oriTable); err != nil {
-			return nil, err
-		}
-
-		// check columns
-		for _, col := range table.Columns() {
-			var oriCol *schemas.Column
-			for _, col2 := range oriTable.Columns() {
-				if strings.EqualFold(col.Name, col2.Name) {
-					oriCol = col2
-					break
-				}
-			}
-
-			// column is not exist on table
-			if oriCol == nil {
-				session.statement.RefTable = table
-				session.statement.SetTableName(tbNameWithSchema)
-				if err = session.addColumn(col.Name); err != nil {
-					return nil, err
-				}
-				continue
-			}
-
-			err = nil
-			expectedType := engine.dialect.SQLType(col)
-			curType := engine.dialect.SQLType(oriCol)
-			if expectedType != curType {
-				if expectedType == schemas.Text &&
-					strings.HasPrefix(curType, schemas.Varchar) {
-					// currently only support mysql & postgres
-					if engine.dialect.URI().DBType == schemas.MYSQL ||
-						engine.dialect.URI().DBType == schemas.POSTGRES {
-						engine.logger.Infof("Table %s column %s change type from %s to %s\n",
-							tbNameWithSchema, col.Name, curType, expectedType)
-						_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
-					} else {
-						engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s\n",
-							tbNameWithSchema, col.Name, curType, expectedType)
-					}
-				} else if strings.HasPrefix(curType, schemas.Varchar) && strings.HasPrefix(expectedType, schemas.Varchar) {
-					if engine.dialect.URI().DBType == schemas.MYSQL {
-						if oriCol.Length < col.Length {
-							engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
-								tbNameWithSchema, col.Name, oriCol.Length, col.Length)
-							_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
-						}
-					}
-				} else {
-					if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') {
-						if !strings.EqualFold(schemas.SQLTypeName(curType), engine.dialect.Alias(schemas.SQLTypeName(expectedType))) {
-							engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
-								tbNameWithSchema, col.Name, curType, expectedType)
-						}
-					}
-				}
-			} else if expectedType == schemas.Varchar {
-				if engine.dialect.URI().DBType == schemas.MYSQL {
-					if oriCol.Length < col.Length {
-						engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
-							tbNameWithSchema, col.Name, oriCol.Length, col.Length)
-						_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
-					}
-				}
-			} else if col.Comment != oriCol.Comment {
-				if engine.dialect.URI().DBType == schemas.POSTGRES ||
-					engine.dialect.URI().DBType == schemas.MYSQL {
-					_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
-				}
-			}
-
-			if col.Default != oriCol.Default {
-				switch {
-				case col.IsAutoIncrement: // For autoincrement column, don't check default
-				case (col.SQLType.Name == schemas.Bool || col.SQLType.Name == schemas.Boolean) &&
-					((strings.EqualFold(col.Default, "true") && oriCol.Default == "1") ||
-						(strings.EqualFold(col.Default, "false") && oriCol.Default == "0")):
-				default:
-					engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s",
-						tbName, col.Name, oriCol.Default, col.Default)
-				}
-			}
-			if col.Nullable != oriCol.Nullable {
-				engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v",
-					tbName, col.Name, oriCol.Nullable, col.Nullable)
-			}
-
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		// indices found in orig table
-		foundIndexNames := make(map[string]bool)
-		// indices to be added
-		addedNames := make(map[string]*schemas.Index)
-
-		// drop indices that exist in orig and new table schema but are not equal
-		for name, index := range table.Indexes {
-			var oriIndex *schemas.Index
-			for name2, index2 := range oriTable.Indexes {
-				if index.Equal(index2) {
-					oriIndex = index2
-					foundIndexNames[name2] = true
-					break
-				}
-			}
-
-			if oriIndex == nil {
-				addedNames[name] = index
-			}
-		}
-
-		// drop all indices that do not exist in new schema or have changed
-		for name2, index2 := range oriTable.Indexes {
-			if _, ok := foundIndexNames[name2]; !ok {
-				// ignore based on there type
-				if (index2.Type == schemas.IndexType && (opts.IgnoreIndices || opts.IgnoreDropIndices)) ||
-					(index2.Type == schemas.UniqueType && opts.IgnoreConstrains) {
-					// make sure we do not add a index with same name later
-					delete(addedNames, name2)
-					continue
-				}
-
-				sql := engine.dialect.DropIndexSQL(tbNameWithSchema, index2)
-				_, err = session.exec(sql)
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-
-		// Add new indices because either they did not exist before or were dropped to update them
-		for name, index := range addedNames {
-			if index.Type == schemas.UniqueType && !opts.IgnoreConstrains {
-				session.statement.RefTable = table
-				session.statement.SetTableName(tbNameWithSchema)
-				err = session.addUnique(tbNameWithSchema, name)
-			} else if index.Type == schemas.IndexType && !opts.IgnoreIndices {
-				session.statement.RefTable = table
-				session.statement.SetTableName(tbNameWithSchema)
-				err = session.addIndex(tbNameWithSchema, name)
-			}
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		if opts.WarnIfDatabaseColumnMissed {
-			// check all the columns which removed from struct fields but left on database tables.
-			for _, colName := range oriTable.ColumnsSeq() {
-				if table.GetColumn(colName) == nil {
-					engine.logger.Warnf("Table %s has column %s but struct has not related field", engine.TableName(oriTable.Name, true), colName)
-				}
-			}
-		}
-	}
-
-	return &syncResult, nil
-}
diff --git a/vendor/xorm.io/xorm/tags/parser.go b/vendor/xorm.io/xorm/tags/parser.go
index 53ef0c1..efee11e 100644
--- a/vendor/xorm.io/xorm/tags/parser.go
+++ b/vendor/xorm.io/xorm/tags/parser.go
@@ -21,21 +21,10 @@ import (
 	"xorm.io/xorm/schemas"
 )
 
-// ErrUnsupportedType represents an unsupported type error
-var ErrUnsupportedType = errors.New("unsupported type")
-
-// TableIndices is an interface that describes structs that provide additional index information above that which is automatically parsed
-type TableIndices interface {
-	TableIndices() []*schemas.Index
-}
-
-var tpTableIndices = reflect.TypeOf((*TableIndices)(nil)).Elem()
-
-type TableCollations interface {
-	TableCollations() []*schemas.Collation
-}
-
-var tpTableCollations = reflect.TypeOf((*TableCollations)(nil)).Elem()
+var (
+	// ErrUnsupportedType represents an unsupported type error
+	ErrUnsupportedType = errors.New("unsupported type")
+)
 
 // Parser represents a parser for xorm tag
 type Parser struct {
@@ -188,7 +177,7 @@ func (parser *Parser) parseFieldWithNoTag(fieldIndex int, field reflect.StructFi
 }
 
 func (parser *Parser) parseFieldWithTags(table *schemas.Table, fieldIndex int, field reflect.StructField, fieldValue reflect.Value, tags []tag) (*schemas.Column, error) {
-	col := &schemas.Column{
+	var col = &schemas.Column{
 		FieldName:       field.Name,
 		FieldIndex:      []int{fieldIndex},
 		Nullable:        true,
@@ -199,7 +188,7 @@ func (parser *Parser) parseFieldWithTags(table *schemas.Table, fieldIndex int, f
 		DefaultIsEmpty:  true,
 	}
 
-	ctx := Context{
+	var ctx = Context{
 		table:      table,
 		col:        col,
 		fieldValue: fieldValue,
@@ -327,7 +316,6 @@ func (parser *Parser) Parse(v reflect.Value) (*schemas.Table, error) {
 	table := schemas.NewEmptyTable()
 	table.Type = t
 	table.Name = names.GetTableName(parser.tableMapper, v)
-	table.Comment = names.GetTableComment(v)
 
 	for i := 0; i < t.NumField(); i++ {
 		col, err := parser.parseField(table, i, t.Field(i), v.Field(i))
@@ -340,81 +328,5 @@ func (parser *Parser) Parse(v reflect.Value) (*schemas.Table, error) {
 		table.AddColumn(col)
 	} // end for
 
-	indices := tableIndices(v)
-	for _, index := range indices {
-		// Override old information
-		if oldIndex, ok := table.Indexes[index.Name]; ok {
-			for _, colName := range oldIndex.Cols {
-				col := table.GetColumn(colName)
-				if col == nil {
-					return nil, ErrUnsupportedType
-				}
-				delete(col.Indexes, index.Name)
-			}
-		}
-		table.AddIndex(index)
-		for _, colName := range index.Cols {
-			col := table.GetColumn(colName)
-			if col == nil {
-				return nil, ErrUnsupportedType
-			}
-			col.Indexes[index.Name] = index.Type
-		}
-	}
-
-	collations := tableCollations(v)
-	for _, collation := range collations {
-		if collation.Name == "" {
-			continue
-		}
-		if collation.Column == "" {
-			table.Collation = collation.Name
-		} else {
-			col := table.GetColumn(collation.Column)
-			if col == nil {
-				return nil, ErrUnsupportedType
-			}
-			col.Collation = collation.Name // this may override definition in struct tag
-		}
-	}
-
 	return table, nil
 }
-
-func tableIndices(v reflect.Value) []*schemas.Index {
-	if v.Type().Implements(tpTableIndices) {
-		return v.Interface().(TableIndices).TableIndices()
-	}
-
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-		if v.Type().Implements(tpTableIndices) {
-			return v.Interface().(TableIndices).TableIndices()
-		}
-	} else if v.CanAddr() {
-		v1 := v.Addr()
-		if v1.Type().Implements(tpTableIndices) {
-			return v1.Interface().(TableIndices).TableIndices()
-		}
-	}
-	return nil
-}
-
-func tableCollations(v reflect.Value) []*schemas.Collation {
-	if v.Type().Implements(tpTableCollations) {
-		return v.Interface().(TableCollations).TableCollations()
-	}
-
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-		if v.Type().Implements(tpTableCollations) {
-			return v.Interface().(TableCollations).TableCollations()
-		}
-	} else if v.CanAddr() {
-		v1 := v.Addr()
-		if v1.Type().Implements(tpTableCollations) {
-			return v1.Interface().(TableCollations).TableCollations()
-		}
-	}
-	return nil
-}
diff --git a/vendor/xorm.io/xorm/tags/tag.go b/vendor/xorm.io/xorm/tags/tag.go
index 55f0b7c..4e1f1ce 100644
--- a/vendor/xorm.io/xorm/tags/tag.go
+++ b/vendor/xorm.io/xorm/tags/tag.go
@@ -99,32 +99,33 @@ type Context struct {
 // Handler describes tag handler for XORM
 type Handler func(ctx *Context) error
 
-// defaultTagHandlers enumerates all the default tag handler
-var defaultTagHandlers = map[string]Handler{
-	"-":        IgnoreHandler,
-	"<-":       OnlyFromDBTagHandler,
-	"->":       OnlyToDBTagHandler,
-	"PK":       PKTagHandler,
-	"NULL":     NULLTagHandler,
-	"NOT":      NotTagHandler,
-	"AUTOINCR": AutoIncrTagHandler,
-	"DEFAULT":  DefaultTagHandler,
-	"CREATED":  CreatedTagHandler,
-	"UPDATED":  UpdatedTagHandler,
-	"DELETED":  DeletedTagHandler,
-	"VERSION":  VersionTagHandler,
-	"UTC":      UTCTagHandler,
-	"LOCAL":    LocalTagHandler,
-	"NOTNULL":  NotNullTagHandler,
-	"INDEX":    IndexTagHandler,
-	"UNIQUE":   UniqueTagHandler,
-	"CACHE":    CacheTagHandler,
-	"NOCACHE":  NoCacheTagHandler,
-	"COMMENT":  CommentTagHandler,
-	"EXTENDS":  ExtendsTagHandler,
-	"UNSIGNED": UnsignedTagHandler,
-	"COLLATE":  CollateTagHandler,
-}
+var (
+	// defaultTagHandlers enumerates all the default tag handler
+	defaultTagHandlers = map[string]Handler{
+		"-":        IgnoreHandler,
+		"<-":       OnlyFromDBTagHandler,
+		"->":       OnlyToDBTagHandler,
+		"PK":       PKTagHandler,
+		"NULL":     NULLTagHandler,
+		"NOT":      NotTagHandler,
+		"AUTOINCR": AutoIncrTagHandler,
+		"DEFAULT":  DefaultTagHandler,
+		"CREATED":  CreatedTagHandler,
+		"UPDATED":  UpdatedTagHandler,
+		"DELETED":  DeletedTagHandler,
+		"VERSION":  VersionTagHandler,
+		"UTC":      UTCTagHandler,
+		"LOCAL":    LocalTagHandler,
+		"NOTNULL":  NotNullTagHandler,
+		"INDEX":    IndexTagHandler,
+		"UNIQUE":   UniqueTagHandler,
+		"CACHE":    CacheTagHandler,
+		"NOCACHE":  NoCacheTagHandler,
+		"COMMENT":  CommentTagHandler,
+		"EXTENDS":  ExtendsTagHandler,
+		"UNSIGNED": UnsignedTagHandler,
+	}
+)
 
 func init() {
 	for k := range schemas.SqlTypes {
@@ -163,7 +164,7 @@ func PKTagHandler(ctx *Context) error {
 
 // NULLTagHandler describes null tag handler
 func NULLTagHandler(ctx *Context) error {
-	ctx.col.Nullable = strings.ToUpper(ctx.preTag) != "NOT"
+	ctx.col.Nullable = (strings.ToUpper(ctx.preTag) != "NOT")
 	return nil
 }
 
@@ -283,20 +284,10 @@ func CommentTagHandler(ctx *Context) error {
 	return nil
 }
 
-func CollateTagHandler(ctx *Context) error {
-	if len(ctx.params) > 0 {
-		ctx.col.Collation = ctx.params[0]
-	} else {
-		ctx.col.Collation = ctx.nextTag
-		ctx.ignoreNext = true
-	}
-	return nil
-}
-
 // SQLTypeTagHandler describes SQL Type tag handler
 func SQLTypeTagHandler(ctx *Context) error {
 	ctx.col.SQLType = schemas.SQLType{Name: ctx.tagUname}
-	if ctx.tagUname == "JSON" || ctx.tagUname == "JSONB" {
+	if ctx.tagUname == "JSON" {
 		ctx.col.IsJSON = true
 	}
 	if len(ctx.params) == 0 {
@@ -321,16 +312,16 @@ func SQLTypeTagHandler(ctx *Context) error {
 	default:
 		var err error
 		if len(ctx.params) == 2 {
-			ctx.col.Length, err = strconv.ParseInt(ctx.params[0], 10, 64)
+			ctx.col.Length, err = strconv.Atoi(ctx.params[0])
 			if err != nil {
 				return err
 			}
-			ctx.col.Length2, err = strconv.ParseInt(ctx.params[1], 10, 64)
+			ctx.col.Length2, err = strconv.Atoi(ctx.params[1])
 			if err != nil {
 				return err
 			}
 		} else if len(ctx.params) == 1 {
-			ctx.col.Length, err = strconv.ParseInt(ctx.params[0], 10, 64)
+			ctx.col.Length, err = strconv.Atoi(ctx.params[0])
 			if err != nil {
 				return err
 			}
@@ -341,8 +332,8 @@ func SQLTypeTagHandler(ctx *Context) error {
 
 // ExtendsTagHandler describes extends tag handler
 func ExtendsTagHandler(ctx *Context) error {
-	fieldValue := ctx.fieldValue
-	isPtr := false
+	var fieldValue = ctx.fieldValue
+	var isPtr = false
 	switch fieldValue.Kind() {
 	case reflect.Ptr:
 		f := fieldValue.Type().Elem()
@@ -364,7 +355,7 @@ func ExtendsTagHandler(ctx *Context) error {
 			col.FieldName = fmt.Sprintf("%v.%v", ctx.col.FieldName, col.FieldName)
 			col.FieldIndex = append(ctx.col.FieldIndex, col.FieldIndex...)
 
-			tagPrefix := ctx.col.FieldName
+			var tagPrefix = ctx.col.FieldName
 			if len(ctx.params) > 0 {
 				col.Nullable = isPtr
 				tagPrefix = strings.Trim(ctx.params[0], "'")
@@ -387,7 +378,7 @@ func ExtendsTagHandler(ctx *Context) error {
 			}
 		}
 	default:
-		// TODO: warning
+		//TODO: warning
 	}
 	return ErrIgnoreField
 }